From c618d6dbbfe4dc736762bf320a30f3e89a996764 Mon Sep 17 00:00:00 2001
From: "Louis (loco)" <loco@odoo.com>
Date: Wed, 8 Oct 2025 09:07:42 +0200
Subject: [PATCH 001/673] [FIX] html_builder, *: set contenteditable attribute
 on correct elements

*: html_editor, website

The goal of this commit is to fix the behavior of the
`extra_contenteditable_handlers` resource; its goal is to mark as
editable an element that is inside an `.o_not_editable`. The problem is
that this was not working as intended as the elements given as argument
to the handler were a list that was filtered of the elements that have
an `.o_not_editable` ancestor.

Note: even if it is in stable, the `force_editable_selector` resource
has been renamed as `content_editable_providers` as a provider is needed
in some cases. Because it has become a provider, the
`force_not_editable_selector` resource has also been renamed and becomes
a provider. This choice has been made to maintain consistency throughout
the plugin.

closes odoo/odoo#233662

X-original-commit: https://github.com/odoo/odoo/commit/13565e0330bbc44eeecbb5d2ecd3acd7b4cdded4
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
---
 .../core/builder_content_editable_plugin.js   | 42 +++++++++---
 .../background_image_option_plugin.js         |  2 +-
 .../background_shape_option_plugin.js         |  2 +-
 .../src/plugins/date_time_field_plugin.js     |  2 +-
 .../static/src/plugins/image_field_plugin.js  |  4 +-
 .../src/plugins/many2one_option_plugin.js     |  2 +-
 .../src/plugins/monetary_field_plugin.js      |  4 +-
 .../static/tests/contenteditable.test.js      | 65 ++++++++++++++++++-
 .../src/core/content_editable_plugin.js       | 35 +++++-----
 .../static/src/main/separator_plugin.js       |  4 +-
 .../static/src/main/tabulation_plugin.js      |  3 +-
 .../static/tests/content_editable.test.js     |  5 +-
 .../builder/plugins/company_team_plugin.js    | 13 ++--
 .../plugins/form/form_option_plugin.js        |  4 +-
 .../plugins/options/facebook_option_plugin.js |  2 +-
 .../plugins/options/parallax_option_plugin.js |  2 +-
 .../options/social_media_option_plugin.js     | 20 ++----
 .../options/table_of_content_option_plugin.js |  2 +-
 ...able_of_content_option_plugin_translate.js |  2 +-
 .../tests/builder/content_editable.test.js    | 13 +++-
 20 files changed, 156 insertions(+), 72 deletions(-)

diff --git a/addons/html_builder/static/src/core/builder_content_editable_plugin.js b/addons/html_builder/static/src/core/builder_content_editable_plugin.js
index 1f328d8d4f353..23659eee47507 100644
--- a/addons/html_builder/static/src/core/builder_content_editable_plugin.js
+++ b/addons/html_builder/static/src/core/builder_content_editable_plugin.js
@@ -1,21 +1,24 @@
 import { Plugin } from "@html_editor/plugin";
+import { selectElements } from "@html_editor/utils/dom_traversal";
 import { registry } from "@web/core/registry";
 
 export class BuilderContentEditablePlugin extends Plugin {
     static id = "builderContentEditablePlugin";
     resources = {
-        force_not_editable_selector: [
+        content_not_editable_selectors: [
             "section:has(> .o_container_small, > .container, > .container-fluid)",
             ".o_not_editable",
             "[data-oe-field='arch']:empty",
         ],
-        force_editable_selector: [
+        content_editable_selectors: [
             "section > .o_container_small",
             "section > .container",
             "section > .container-fluid",
             ".o_editable",
         ],
-        filter_contenteditable_handlers: this.filterContentEditable.bind(this),
+        valid_contenteditable_predicates: this.isValidContentEditable.bind(this),
+        content_editable_providers: this.getContentEditableEls.bind(this),
+        content_not_editable_providers: this.getContentNotEditableEls.bind(this),
         contenteditable_to_remove_selector: "[contenteditable]",
     };
 
@@ -23,12 +26,33 @@ export class BuilderContentEditablePlugin extends Plugin {
         this.editable.setAttribute("contenteditable", false);
     }
 
-    filterContentEditable(contentEditableEls) {
-        return contentEditableEls.filter(
-            (el) =>
-                !el.matches("input, [data-oe-readonly]") &&
-                el.closest(".o_editable") &&
-                !el.closest(".o_not_editable")
+    getContentEditableEls(rootEl) {
+        const editableSelector = this.getResource("content_editable_selectors").join(",");
+        return [...selectElements(rootEl, editableSelector)];
+    }
+
+    getContentNotEditableEls(rootEl) {
+        const notEditableSelector = this.getResource("content_not_editable_selectors").join(",");
+        return [...selectElements(rootEl, notEditableSelector)];
+    }
+
+    isValidContentEditable(contentEditableEl) {
+        // Check if an element is inside a ".o_not_editable" element that is not
+        // inside a snippet.
+        const isDescendantOfNotEditableNotSnippet = (el) => {
+            let notEditableEl = el.closest(".o_not_editable");
+            if (!notEditableEl) {
+                return false;
+            }
+            while (notEditableEl.parentElement.closest(".o_not_editable")) {
+                notEditableEl = notEditableEl.parentElement.closest(".o_not_editable");
+            }
+            return !notEditableEl.closest("[data-snippet]");
+        };
+        return (
+            !contentEditableEl.matches("input, [data-oe-readonly]") &&
+            contentEditableEl.closest(".o_editable") &&
+            !isDescendantOfNotEditableNotSnippet(contentEditableEl)
         );
     }
 }
diff --git a/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
index c64ec6e4c7e6a..c3045c1c5cb66 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
@@ -25,7 +25,7 @@ export class BackgroundImageOptionPlugin extends Plugin {
             ReplaceBgImageAction,
             DynamicColorAction,
         },
-        force_not_editable_selector: ".o_we_bg_filter",
+        content_not_editable_selectors: ".o_we_bg_filter",
         get_target_element_providers: withSequence(5, (el) => el),
     };
     /**
diff --git a/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
index 66f005179b9f5..05a9b27a11c74 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
@@ -27,7 +27,7 @@ export class BackgroundShapeOptionPlugin extends Plugin {
         background_shape_target_providers: withSequence(5, (editingElement) =>
             editingElement.querySelector(":scope > .o_we_bg_filter")
         ),
-        force_not_editable_selector: ".o_we_shape",
+        content_not_editable_selectors: ".o_we_shape",
     };
     static shared = [
         "getShapeStyleUrl",
diff --git a/addons/html_builder/static/src/plugins/date_time_field_plugin.js b/addons/html_builder/static/src/plugins/date_time_field_plugin.js
index 6d94a11ec4858..44909de642eb7 100644
--- a/addons/html_builder/static/src/plugins/date_time_field_plugin.js
+++ b/addons/html_builder/static/src/plugins/date_time_field_plugin.js
@@ -4,7 +4,7 @@ import { registry } from "@web/core/registry";
 class DateTimeFieldPlugin extends Plugin {
     static id = "dateTimeField";
     resources = {
-        force_not_editable_selector: [
+        content_not_editable_selectors: [
             "[data-oe-field][data-oe-type=date]",
             "[data-oe-field][data-oe-type=datetime]",
         ],
diff --git a/addons/html_builder/static/src/plugins/image_field_plugin.js b/addons/html_builder/static/src/plugins/image_field_plugin.js
index 80f92ebc65ffe..051567f4e99b0 100644
--- a/addons/html_builder/static/src/plugins/image_field_plugin.js
+++ b/addons/html_builder/static/src/plugins/image_field_plugin.js
@@ -4,8 +4,8 @@ import { registry } from "@web/core/registry";
 export class ImageFieldPlugin extends Plugin {
     static id = "imageField";
     resources = {
-        force_editable_selector: "[data-oe-field][data-oe-type=image] img",
-        force_not_editable_selector: "[data-oe-field][data-oe-type=image]",
+        content_editable_selectors: "[data-oe-field][data-oe-type=image] img",
+        content_not_editable_selectors: "[data-oe-field][data-oe-type=image]",
     };
 }
 
diff --git a/addons/html_builder/static/src/plugins/many2one_option_plugin.js b/addons/html_builder/static/src/plugins/many2one_option_plugin.js
index 746cf7e7247e3..1e1188bc87d3f 100644
--- a/addons/html_builder/static/src/plugins/many2one_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/many2one_option_plugin.js
@@ -16,7 +16,7 @@ export class Many2OneOptionPlugin extends Plugin {
         builder_actions: {
             Many2OneAction,
         },
-        force_not_editable_selector: "[data-oe-field][data-oe-many2one-id]",
+        content_not_editable_selectors: "[data-oe-field][data-oe-many2one-id]",
     };
 }
 
diff --git a/addons/html_builder/static/src/plugins/monetary_field_plugin.js b/addons/html_builder/static/src/plugins/monetary_field_plugin.js
index 600631347977f..fd3b1027b5c0d 100644
--- a/addons/html_builder/static/src/plugins/monetary_field_plugin.js
+++ b/addons/html_builder/static/src/plugins/monetary_field_plugin.js
@@ -7,8 +7,8 @@ export class MonetaryFieldPlugin extends Plugin {
     static id = "monetaryField";
     static dependencies = ["selection"];
     resources = {
-        force_editable_selector: `${monetarySel} .oe_currency_value`,
-        force_not_editable_selector: monetarySel,
+        content_editable_selectors: `${monetarySel} .oe_currency_value`,
+        content_not_editable_selectors: monetarySel,
     };
 
     setup() {
diff --git a/addons/html_builder/static/tests/contenteditable.test.js b/addons/html_builder/static/tests/contenteditable.test.js
index e42721def000f..33adb7308d64e 100644
--- a/addons/html_builder/static/tests/contenteditable.test.js
+++ b/addons/html_builder/static/tests/contenteditable.test.js
@@ -3,6 +3,7 @@ import {
     addBuilderPlugin,
     setupHTMLBuilder,
     dummyBase64Img,
+    addBuilderAction,
 } from "@html_builder/../tests/helpers";
 import { Plugin } from "@html_editor/plugin";
 import { expect, test, describe } from "@odoo/hoot";
@@ -10,12 +11,13 @@ import { xml } from "@odoo/owl";
 import { contains, onRpc } from "@web/../tests/web_test_helpers";
 
 describe.current.tags("desktop");
+import { BuilderAction } from "@html_builder/core/builder_action";
 
 test("Do not set contenteditable to true on elements inside o_not_editable", async () => {
     class TestPlugin extends Plugin {
         static id = "testPlugin";
         resources = {
-            force_editable_selector: ".target",
+            content_editable_selectors: ".target",
         };
     }
     addBuilderPlugin(TestPlugin);
@@ -78,3 +80,64 @@ test("clone of editable media inside not editable area should be editable", asyn
     await contains(":iframe section:last-of-type img").click();
     expect(".options-container[data-container-title='Image']").toBeDisplayed();
 });
+
+const setupEditable = async (contentEl) => {
+    class TestPlugin extends Plugin {
+        static id = "test";
+        resources = {
+            content_editable_selectors: ".target-extra",
+        };
+    }
+    addBuilderPlugin(TestPlugin);
+    addBuilderOption({
+        selector: ".parent",
+        template: xml`<BuilderButton action="'customAction'">Custom Action</BuilderButton>`,
+    });
+    addBuilderOption({
+        selector: ".parent",
+        template: xml`<BuilderButton classAction="'dummy'">Dummy action</BuilderButton>`,
+    });
+    addBuilderAction({
+        customAction: class extends BuilderAction {
+            static id = "customAction";
+            apply({ editingElement }) {
+                editingElement.querySelector(".target").classList.add("target-extra");
+            }
+        },
+    });
+    await setupHTMLBuilder(contentEl);
+    await contains(":iframe .parent").click();
+    // Dummy action to mark the editable as "dirty"
+    await contains("[data-class-action='dummy']").click();
+    await contains("[data-action-id='customAction']").click();
+};
+
+test("Set contenteditable attribute to true on element that is descendant of '.o_not_editable' that is itself descendant of a snippet", async () => {
+    await setupEditable(`
+        <div class="parent" data-snippet="test">
+            <div class="o_not_editable">
+                Not editable
+                <div class="target">
+                    Target
+                </div>
+            </div>
+        </div>
+    `);
+    expect(":iframe .target-extra").toHaveAttribute("contenteditable", "true");
+});
+
+test("Don't set contenteditable attribute to true on element that is inside '.o_not_editable' that is not a descendant of a snippet", async () => {
+    await setupEditable(`
+        <div class="parent">
+            <div class="o_not_editable">
+                <div class="o_not_editable" data-snippet="test">
+                    Not editable
+                    <div class="target">
+                        Target
+                    </div>
+                </div>
+            </div>
+        </div>
+    `);
+    expect(":iframe .target-extra").not.toHaveAttribute("contenteditable", "true");
+});
diff --git a/addons/html_editor/static/src/core/content_editable_plugin.js b/addons/html_editor/static/src/core/content_editable_plugin.js
index a33fab5cc7f5f..c58fe5e5e7844 100644
--- a/addons/html_editor/static/src/core/content_editable_plugin.js
+++ b/addons/html_editor/static/src/core/content_editable_plugin.js
@@ -7,8 +7,8 @@ import { withSequence } from "@html_editor/utils/resource";
  * This plugin is responsible for setting the contenteditable attribute on some
  * elements.
  *
- * The force_editable_selector and force_not_editable_selector resources allow
- * other plugins to easily add editable or non editable elements.
+ * The content_editable_providers and content_not_editable_providers resources
+ * allow other plugins to easily add editable or non editable elements.
  */
 
 export class ContentEditablePlugin extends Plugin {
@@ -19,26 +19,21 @@ export class ContentEditablePlugin extends Plugin {
     };
 
     normalize(root) {
-        const toDisableSelector = this.getResource("force_not_editable_selector").join(",");
-        const toDisableEls = toDisableSelector ? [...selectElements(root, toDisableSelector)] : [];
-        for (const toDisable of toDisableEls) {
-            toDisable.setAttribute("contenteditable", "false");
+        const contentNotEditableEls = [];
+        for (const fn of this.getResource("content_not_editable_providers")) {
+            contentNotEditableEls.push(...fn(root));
         }
-        const toEnableSelector = this.getResource("force_editable_selector").join(",");
-        let filteredContentEditableEls = toEnableSelector
-            ? [...selectElements(root, toEnableSelector)]
-            : [];
-        for (const fn of this.getResource("filter_contenteditable_handlers")) {
-            filteredContentEditableEls = [...fn(filteredContentEditableEls)];
+        for (const contentNotEditableEl of contentNotEditableEls) {
+            contentNotEditableEl.setAttribute("contenteditable", "false");
         }
-        const extraContentEditableEls = [];
-        for (const fn of this.getResource("extra_contenteditable_handlers")) {
-            extraContentEditableEls.push(...fn(filteredContentEditableEls));
+        const contentEditableEls = [];
+        for (const fn of this.getResource("content_editable_providers")) {
+            contentEditableEls.push(...fn(root));
         }
-        for (const contentEditableEl of [
-            ...filteredContentEditableEls,
-            ...extraContentEditableEls,
-        ]) {
+        const filteredContentEditableEls = contentEditableEls.filter((contentEditableEl) =>
+            this.getResource("valid_contenteditable_predicates").every((p) => p(contentEditableEl))
+        );
+        for (const contentEditableEl of filteredContentEditableEls) {
             if (
                 isMediaElement(contentEditableEl) &&
                 !contentEditableEl.parentNode.isContentEditable
@@ -48,7 +43,7 @@ export class ContentEditablePlugin extends Plugin {
             }
             if (
                 !contentEditableEl.isContentEditable &&
-                !contentEditableEl.matches(toDisableSelector)
+                !contentNotEditableEls.includes(contentEditableEl)
             ) {
                 contentEditableEl.setAttribute("contenteditable", true);
             }
diff --git a/addons/html_editor/static/src/main/separator_plugin.js b/addons/html_editor/static/src/main/separator_plugin.js
index b22f5e35cc5cf..df604c15a72d9 100644
--- a/addons/html_editor/static/src/main/separator_plugin.js
+++ b/addons/html_editor/static/src/main/separator_plugin.js
@@ -1,7 +1,7 @@
 import { _t } from "@web/core/l10n/translation";
 import { Plugin } from "../plugin";
 import { closestBlock } from "../utils/blocks";
-import { closestElement, firstLeaf } from "../utils/dom_traversal";
+import { closestElement, firstLeaf, selectElements } from "../utils/dom_traversal";
 import {
     isEmptyBlock,
     isListItemElement,
@@ -30,7 +30,7 @@ export class SeparatorPlugin extends Plugin {
             categoryId: "structure",
             commandId: "insertSeparator",
         }),
-        force_not_editable_selector: "hr",
+        content_not_editable_providers: (rootEl) => [...selectElements(rootEl, "hr")],
         contenteditable_to_remove_selector: "hr[contenteditable]",
         shorthands: [
             {
diff --git a/addons/html_editor/static/src/main/tabulation_plugin.js b/addons/html_editor/static/src/main/tabulation_plugin.js
index 4dfb1b12d5118..5bd4d411d4d51 100644
--- a/addons/html_editor/static/src/main/tabulation_plugin.js
+++ b/addons/html_editor/static/src/main/tabulation_plugin.js
@@ -7,6 +7,7 @@ import {
     getAdjacentPreviousSiblings,
     closestElement,
     firstLeaf,
+    selectElements,
 } from "@html_editor/utils/dom_traversal";
 import { parseHTML } from "@html_editor/utils/html";
 import { DIRECTIONS, childNodeIndex } from "@html_editor/utils/position";
@@ -55,7 +56,7 @@ export class TabulationPlugin extends Plugin {
             { hotkey: "tab", commandId: "tab" },
             { hotkey: "shift+tab", commandId: "shiftTab" },
         ],
-        force_not_editable_selector: ".oe-tabs",
+        content_not_editable_providers: (rootEl) => [...selectElements(rootEl, ".oe-tabs")],
         contenteditable_to_remove_selector: "span.oe-tabs",
 
         /** Handlers */
diff --git a/addons/html_editor/static/tests/content_editable.test.js b/addons/html_editor/static/tests/content_editable.test.js
index ee6796c51f81a..3706f06478392 100644
--- a/addons/html_editor/static/tests/content_editable.test.js
+++ b/addons/html_editor/static/tests/content_editable.test.js
@@ -2,13 +2,14 @@ import { expect, test } from "@odoo/hoot";
 import { setupEditor } from "./_helpers/editor";
 import { Plugin } from "@html_editor/plugin";
 import { MAIN_PLUGINS } from "@html_editor/plugin_sets";
+import { selectElements } from "@html_editor/utils/dom_traversal";
 
 test("set o_editable_media class on contenteditable false media elements", async () => {
     class TestPlugin extends Plugin {
         static id = "test";
         resources = {
-            force_not_editable_selector: "i",
-            force_editable_selector: "i",
+            content_not_editable_providers: (rootEl) => [...selectElements(rootEl, "i")],
+            content_editable_providers: (rootEl) => [...selectElements(rootEl, "i")],
         };
     }
     const Plugins = [...MAIN_PLUGINS, TestPlugin];
diff --git a/addons/website/static/src/builder/plugins/company_team_plugin.js b/addons/website/static/src/builder/plugins/company_team_plugin.js
index 962c05552ae07..5c569aec07664 100644
--- a/addons/website/static/src/builder/plugins/company_team_plugin.js
+++ b/addons/website/static/src/builder/plugins/company_team_plugin.js
@@ -1,21 +1,18 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { isMediaElement } from "@html_editor/utils/dom_info";
+import { selectElements } from "@html_editor/utils/dom_traversal";
 
 class CompanyTeamPlugin extends Plugin {
     static id = "companyTeam";
     resources = {
-        extra_contenteditable_handlers: this.extraContentEditableHandlers.bind(this),
+        content_editable_providers: this.getEditableEls.bind(this),
     };
 
-    extraContentEditableHandlers(filteredContentEditableEls) {
+    getEditableEls(rootEl) {
         // To fix db in stable
-        const extraContentEditableEls = filteredContentEditableEls.flatMap(
-            (filteredContentEditableEl) => [
-                ...filteredContentEditableEl.querySelectorAll(".s_company_team .o_not_editable *"),
-            ]
-        );
-        return extraContentEditableEls.filter((el) => isMediaElement(el));
+        const contentEditableEls = [...selectElements(rootEl, ".s_company_team .o_not_editable *")];
+        return contentEditableEls.filter((el) => isMediaElement(el));
     }
 }
 
diff --git a/addons/website/static/src/builder/plugins/form/form_option_plugin.js b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
index 8d39229521c2c..5d4e9ce3952d4 100644
--- a/addons/website/static/src/builder/plugins/form/form_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
@@ -169,8 +169,8 @@ export class FormOptionPlugin extends Plugin {
             SetRequirementComparatorAction,
             SetMultipleFilesAction,
         },
-        force_not_editable_selector: ".s_website_form form",
-        force_editable_selector: [
+        content_not_editable_selectors: ".s_website_form form",
+        content_editable_selectors: [
             ".s_website_form_send",
             ".s_website_form_field_description",
             ".s_website_form_recaptcha",
diff --git a/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js b/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
index 14d707a62a5bd..59de8cff92cfa 100644
--- a/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
@@ -20,7 +20,7 @@ class FacebookOptionPlugin extends Plugin {
             CheckFacebookLinkAction,
         },
         normalize_handlers: this.normalize.bind(this),
-        force_not_editable_selector: ".o_facebook_page",
+        content_not_editable_selectors: ".o_facebook_page",
     };
 
     normalize(root) {
diff --git a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
index 36c204890d2ba..6694bf3e37453 100644
--- a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
@@ -14,7 +14,7 @@ class WebsiteParallaxPlugin extends Plugin {
             SetParallaxTypeAction,
         },
         on_bg_image_hide_handlers: this.onBgImageHide.bind(this),
-        force_not_editable_selector: ".s_parallax_bg, section.s_parallax > .oe_structure",
+        content_not_editable_selectors: ".s_parallax_bg, section.s_parallax > .oe_structure",
         get_target_element_providers: withSequence(1, this.getTargetElement),
     };
     setup() {
diff --git a/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js b/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
index e2ba84ee83d8a..e88818b8ffa32 100644
--- a/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
@@ -159,21 +159,15 @@ class SocialMediaOptionPlugin extends Plugin {
         },
         normalize_handlers: this.normalize.bind(this),
         save_handlers: this.saveRecordedSocialMedia.bind(this),
-        extra_contenteditable_handlers: this.extraContentEditableHandlers.bind(this),
-        force_not_editable_selector: [".s_share"],
-        force_editable_selector: [".s_share a > i", ".s_share .s_share_title"],
+        content_not_editable_selectors: [".s_share"],
+        content_editable_selectors: [
+            ".s_share a > i",
+            ".s_share .s_share_title",
+            ".s_social_media a > i",
+            ".s_social_media .s_social_media_title",
+        ],
     };
 
-    extraContentEditableHandlers(filteredContentEditableEls) {
-        // To fix db in stable
-        // grep: SOCIAL_MEDIA_TITLE_CONTENTEDITABLE
-        return filteredContentEditableEls.flatMap((filteredContentEditableEl) => [
-            ...filteredContentEditableEl.querySelectorAll(
-                ".s_social_media a > i, .s_social_media .s_social_media_title"
-            ),
-        ]);
-    }
-
     /** The social media's name for which there is an entry in the orm */
     async getRecordedSocialMediaNames() {
         await this.fetchRecordedSocialMedia();
diff --git a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
index 41829b58177ee..63d6421323733 100644
--- a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
@@ -54,7 +54,7 @@ class TableOfContentOptionPlugin extends Plugin {
             return true;
         },
         is_unremovable_selector: ".s_table_of_content_navbar_wrap, .s_table_of_content_main",
-        force_not_editable_selector: ".s_table_of_content_navbar",
+        content_not_editable_selectors: ".s_table_of_content_navbar",
     };
 
     normalize(root) {
diff --git a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js
index 613624d84371e..36af8399dc46f 100644
--- a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js
+++ b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js
@@ -6,7 +6,7 @@ export class TranslateTableOfContentOptionPlugin extends Plugin {
 
     resources = {
         normalize_handlers: this.normalize.bind(this),
-        force_not_editable_selector: [".s_table_of_content_navbar"],
+        content_not_editable_selectors: [".s_table_of_content_navbar"],
     };
 
     normalize(root) {
diff --git a/addons/website/static/tests/builder/content_editable.test.js b/addons/website/static/tests/builder/content_editable.test.js
index 4a2f5e6718a22..590949c4afbd0 100644
--- a/addons/website/static/tests/builder/content_editable.test.js
+++ b/addons/website/static/tests/builder/content_editable.test.js
@@ -65,8 +65,8 @@ test("Do not set contenteditable attribute on data-oe-readonly", async () => {
     class TestPlugin extends Plugin {
         static id = "testPlugin";
         resources = {
-            force_editable_selector: ".target",
-            force_not_editable_selector: ".non-editable",
+            content_editable_selectors: ".target",
+            content_not_editable_selectors: ".non-editable",
         };
     }
     addPlugin(TestPlugin);
@@ -124,3 +124,12 @@ test("feff on links are cleaned up", async () => {
     await contains(".o-snippets-top-actions button:contains(Save)").click();
     expect.verifySteps(["save"]);
 });
+
+test("Set contenteditable to true on social media title", async () => {
+    await setupWebsiteBuilder(`
+        <div class="s_social_media text-start o_not_editable" data-snippet="s_social_media">
+            <h4 class="s_social_media_title">Social Media</h4>
+        </div>
+    `);
+    expect(":iframe .s_social_media_title").toHaveAttribute("contenteditable", "true");
+});

From 914a2099e0d4df726f5232ff061b17e9494127f0 Mon Sep 17 00:00:00 2001
From: "Mahdi Alijani (malj)" <malj@odoo.com>
Date: Wed, 15 Oct 2025 09:57:32 +0000
Subject: [PATCH 002/673] [FIX] mrp: non-deterministic duration fail assertion
 in backorder test

Issue:

The test test_mrp_backorder_operations behaves non-deterministically.
It may fail at this assertion:
https://github.com/odoo/odoo/blob/6e37542b53f9c9ec1baf8d58b1eeca376252186f/addons/mrp/tests/test_backorder.py#L986-L989

Because the duration of done workorder can vary.

Cause:
The delta time between button_start() and button_finish()
https://github.com/odoo/odoo/blob/6e37542b53f9c9ec1baf8d58b1eeca376252186f/addons/mrp/tests/test_backorder.py#L983-L985
button_finish() triggers Productivity._close()
https://github.com/odoo/odoo/blob/6e37542b53f9c9ec1baf8d58b1eeca376252186f/addons/mrp/models/mrp_workcenter.py#L572-L576
which sets Productivity.duration to 0 if delta time is zero.
Consequently, workorder.duration also becomes zero.
When bo_2.button_mark_done() is called, the duration is set to
duration_expected (240 in this test), which the assertion only
can pass in that case.

If delta time isn't zero, then duration will also be non-zero.
So it will not set to duration_expected. As a result the assertion will fail.

runbot-233247

closes odoo/odoo#233646

X-original-commit: 7669a43b3a4695abe541b4059776601229bd3a97
Signed-off-by: Lancelot Semal (lase) <lase@odoo.com>
Signed-off-by: Mohammadmahdi Alijani (malj) <malj@odoo.com>
---
 addons/mrp/tests/test_backorder.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/tests/test_backorder.py b/addons/mrp/tests/test_backorder.py
index 1985f02ff2add..a871fd6f4370e 100644
--- a/addons/mrp/tests/test_backorder.py
+++ b/addons/mrp/tests/test_backorder.py
@@ -5,7 +5,7 @@
 from odoo import Command
 from odoo.addons.mrp.tests.common import TestMrpCommon
 from odoo.tests import tagged, Form
-from odoo.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase, freeze_time
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
@@ -933,6 +933,7 @@ def setUpClass(cls):
         cls.bom_finished1.bom_line_ids[0].operation_id = cls.bom_finished1.operation_ids[0].id
         cls.bom_finished1.bom_line_ids[1].operation_id = cls.bom_finished1.operation_ids[1].id
 
+    @freeze_time('2025-10-27 12:00:00')
     def test_mrp_backorder_operations(self):
         """
         Checks that the operations'data are correclty set on a backorder:

From 4b3569e2dee00c4f60dfeae2a9997b98ee37267f Mon Sep 17 00:00:00 2001
From: David Monnom <moda@odoo.com>
Date: Thu, 2 Oct 2025 11:50:06 +0000
Subject: [PATCH 003/673] [REF] point_of_sale, pos_*: improve tax computation
 in PoS

*: l10n_es_pos, l10n_sa_pos, point_of_sale, pos_discount,
  pos_loyalty, pos_razorpay, pos_restaurant, pos_self_order

Before this commit taxes computation was a mess in PoS, with differents
implementations in different places, and some of them not taking into
account all the complexity of the tax system (taxes included in price,
taxes on taxes, etc.).

This commit aims to unify all the tax computation logic in a single
place, and to make it more robust and easier to understand.

---

What's changes:

Rounding methods available in PoS are now:
1) Rounding applied only on cash payments
    In this case the remaining due is rounded only if there is at least
    one cash payment line and the remaining due is less than the
    rounding tolerance.

2) Rounding applied on all payment methods
    In this case the remaining due is always rounded even if a card
    payment method is used. The remaining due is rounded if it is less
    than the rounding tolerance. No payment method is rounded in this
    case, the whole order is rounded instead.

Taxes computation is now done globally on the order, and not on each
line. This way we ensure that the total tax amount is always correct,
even if there is some rounding issues on the lines.

---

Changes in tests:

`test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_with_residual_rounding`
`test_cash_rounding_up_add_invoice_line_not_only_round_cash_method`

Are removed because the tested behavior is not longer present. Now when
rounding is enabled with only_round_cash_method=False, the whole order
is always rounded.

Accounting tests are now principally tested with Hoot instead of tours.

---

Developer note:

No prices should be calculated manually in the code base. Getters have
been created for this purpose in the following files:
- `product_template_accounting.js`
- `pos_order_accounting.js`
- `pos_order_line_accounting.js`

In the future, all PRs containing tax calculations must justify them.

closes odoo/odoo#233196

Taskid: 5143758
X-original-commit: 9538698f13d5763b49b00f4c06a1a2afc0d6b39e
Related: odoo/enterprise#98167
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../static/src/app/models/pos_order.js        |   2 +-
 .../static/src/xml/OrderReceipt.xml           |   2 +-
 .../static/src/xml/OrderSummary.xml           |   2 +-
 addons/l10n_fr_pos_cert/tests/test_hash.py    |   2 +-
 .../tests/test_myinvois_pos.py                |  18 +
 .../static/src/overrides/models/pos_order.js  |   4 +-
 addons/point_of_sale/models/pos_order.py      |   7 +-
 .../order_display/order_display.xml           |  11 +-
 .../src/app/components/orderline/orderline.js | 115 +++-
 .../app/components/orderline/orderline.xml    |  71 +--
 .../product_configurator_popup.js             |   2 +-
 .../customer_display_adapter.js               |  13 +-
 .../src/app/models/account_fiscal_position.js |  29 +
 .../models/accounting/pos_order_accounting.js | 261 +++++++++
 .../accounting/pos_order_line_accounting.js   | 165 ++++++
 .../accounting/product_template_accounting.js | 163 ++++++
 .../static/src/app/models/pos_config.js       |   6 +
 .../static/src/app/models/pos_order.js        | 303 ++---------
 .../static/src/app/models/pos_order_line.js   | 247 +--------
 .../static/src/app/models/product_template.js | 187 +------
 .../static/src/app/models/utils/tax_utils.js  |  86 ---
 .../screens/payment_screen/payment_screen.js  |  12 +-
 .../screens/payment_screen/payment_screen.xml |   2 +-
 .../payment_status/payment_status.js          |  39 +-
 .../payment_status/payment_status.xml         |  16 +-
 .../order_summary/order_summary.js            |   9 +-
 .../screens/product_screen/product_screen.js  |   6 +-
 .../receipt_screen/receipt/order_receipt.xml  |  14 +-
 .../screens/receipt_screen/receipt_screen.js  |   4 +-
 .../screens/ticket_screen/ticket_screen.js    |   2 +-
 .../static/src/app/services/pos_store.js      |  61 +--
 .../static/src/app/utils/numbers.js           |   6 -
 .../src/app/utils/order_payment_validation.js |  24 +-
 .../static/tests/pos/tours/acceptance_tour.js |  25 -
 .../tests/pos/tours/payment_screen_tour.js    |  63 +--
 .../tests/pos/tours/pos_cash_rounding_tour.js | 513 ------------------
 .../tests/pos/tours/product_screen_tour.js    |   2 +-
 .../pos/tours/utils/payment_screen_util.js    |   4 +-
 .../pos/tours/utils/receipt_screen_util.js    |  13 -
 .../tests/unit/accounting/discount.test.js    |  44 ++
 .../tests/unit/accounting/old_tour.test.js    | 363 +++++++++++++
 .../tests/unit/accounting/price.test.js       |  54 ++
 .../tests/unit/accounting/rounding.test.js    | 328 +++++++++++
 .../static/tests/unit/accounting/utils.js     |  66 +++
 .../tests/unit/components/orderline.test.js   |   9 +-
 .../unit/components/product_screen.test.js    |   4 +-
 .../tests/unit/data/account_tax.data.js       |  15 +-
 .../tests/unit/data/account_tax_group.data.js |  10 +
 .../tests/unit/data/product_product.data.js   |  24 +
 .../tests/unit/data/product_template.data.js  |  70 ++-
 .../tests/unit/models/pos_category.test.js    |  12 +-
 .../tests/unit/models/pos_order.test.js       |  96 ++--
 .../tests/unit/models/pos_order_line.test.js  | 128 ++---
 .../tests/unit/services/pos_service.test.js   |  19 +-
 .../point_of_sale/static/tests/unit/utils.js  |   5 +
 addons/point_of_sale/tests/common.py          |   3 +-
 addons/point_of_sale/tests/test_frontend.py   |  60 +-
 .../tests/test_pos_cash_rounding.py           | 294 ----------
 .../screens/ticket_screen/ticket_screen.js    |  10 +-
 .../tests/test_taxes_global_discount.py       |   2 +-
 .../screens/product_screen/product_screen.js  |   8 -
 .../manage_giftcard_popup.js                  |   2 +-
 .../static/src/app/models/pos_order.js        |  61 +--
 .../control_buttons/control_buttons.js        |   2 +-
 .../control_buttons/control_buttons.xml       |   2 +-
 .../static/src/app/services/pos_store.js      |   2 +-
 .../tours/pos_loyalty_loyalty_program_tour.js |   2 +-
 .../tests/unit/services/pos_service.test.js   |  28 -
 .../src/app/utils/order_payment_validation.js |   2 +-
 .../screens/payment_screen/payment_screen.js  |   2 +-
 .../static/src/app/services/pos_store.js      |  28 +-
 .../app/components/orderline/orderline.xml    |   4 +-
 .../static/src/app/models/pos_order.js        |   2 +-
 .../payment_screen_payment_lines.xml          |   2 +-
 .../order_receipt/order_receipt.xml           |   2 +-
 .../split_bill_screen/split_bill_screen.js    |   3 +-
 .../split_bill_screen/split_bill_screen.xml   |   2 +-
 .../src/app/screens/tip_screen/tip_screen.js  |   4 +-
 .../static/src/app/services/pos_store.js      |   2 -
 .../tests/unit/components/tip_screen.test.js  |   2 +-
 .../static/src/app/services/pos_store.js      |   3 +-
 .../tests/unit/components/orderline.test.js   |   2 +-
 .../static/tests/unit/data/pos_config.data.js |   2 +-
 .../tests/unit/data/product_product.data.js   |   4 +-
 .../tests/unit/data/product_template.data.js  |   2 +-
 .../tests/unit/models/pos_order_line.test.js  |   4 +-
 .../tests/unit/services/pos_store.test.js     |  24 +-
 addons/pos_sale/tests/test_pos_sale_report.py |   4 +-
 .../components/order_widget/order_widget.js   |   6 +-
 .../static/src/app/models/pos_order_line.js   |   7 +-
 .../src/app/pages/cart_page/cart_page.xml     |   4 +-
 .../order_history_page/order_history_page.js  |   4 +-
 .../app/pages/product_page/product_page.js    |  20 +-
 .../static/src/app/services/card_utils.js     |  20 +-
 .../src/app/services/self_order_service.js    |  21 +-
 .../unit/services/self_order_service.test.js  |   1 -
 .../screens/payment_screen/payment_screen.js  |   2 +-
 97 files changed, 2145 insertions(+), 2274 deletions(-)
 create mode 100644 addons/point_of_sale/static/src/app/models/account_fiscal_position.js
 create mode 100644 addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
 create mode 100644 addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js
 create mode 100644 addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js
 delete mode 100644 addons/point_of_sale/static/src/app/models/utils/tax_utils.js
 create mode 100644 addons/point_of_sale/static/tests/unit/accounting/discount.test.js
 create mode 100644 addons/point_of_sale/static/tests/unit/accounting/old_tour.test.js
 create mode 100644 addons/point_of_sale/static/tests/unit/accounting/price.test.js
 create mode 100644 addons/point_of_sale/static/tests/unit/accounting/rounding.test.js
 create mode 100644 addons/point_of_sale/static/tests/unit/accounting/utils.js

diff --git a/addons/l10n_es_pos/static/src/app/models/pos_order.js b/addons/l10n_es_pos/static/src/app/models/pos_order.js
index 856c4d5a0cb9f..5e47875c15958 100644
--- a/addons/l10n_es_pos/static/src/app/models/pos_order.js
+++ b/addons/l10n_es_pos/static/src/app/models/pos_order.js
@@ -6,7 +6,7 @@ patch(PosOrder.prototype, {
     canBeSimplifiedInvoiced() {
         return (
             this.config.is_spanish &&
-            roundCurrency(this.getTotalWithTax(), this.currency) <
+            roundCurrency(this.priceIncl, this.currency) <
                 this.company.l10n_es_simplified_invoice_limit
         );
     },
diff --git a/addons/l10n_fr_pos_cert/static/src/xml/OrderReceipt.xml b/addons/l10n_fr_pos_cert/static/src/xml/OrderReceipt.xml
index b58420770ca7d..ad0a7c6758325 100644
--- a/addons/l10n_fr_pos_cert/static/src/xml/OrderReceipt.xml
+++ b/addons/l10n_fr_pos_cert/static/src/xml/OrderReceipt.xml
@@ -15,7 +15,7 @@
                     Old unit price:
                     <span class="oldPrice">
                         <s>
-                            <t t-out="formatCurrency(line.getTaxedlstUnitPrice())" /> / Units
+                            <t t-out="line.currencyDisplayPrice" /> / Units
                         </s>
                     </span>
                 </div>
diff --git a/addons/l10n_fr_pos_cert/static/src/xml/OrderSummary.xml b/addons/l10n_fr_pos_cert/static/src/xml/OrderSummary.xml
index bf15be86ad673..89e663f3cfb4c 100644
--- a/addons/l10n_fr_pos_cert/static/src/xml/OrderSummary.xml
+++ b/addons/l10n_fr_pos_cert/static/src/xml/OrderSummary.xml
@@ -7,7 +7,7 @@
                     Old unit price:
                     <span class="oldPrice">
                         <s>
-                            <t t-esc="env.utils.formatCurrency(line.getTaxedlstUnitPrice())" /> / Units
+                            <t t-esc="line.currencyDisplayPrice" /> / Units
                         </s>
                     </span>
                 </li>
diff --git a/addons/l10n_fr_pos_cert/tests/test_hash.py b/addons/l10n_fr_pos_cert/tests/test_hash.py
index 4ced00ecebe90..215976de6a9d1 100644
--- a/addons/l10n_fr_pos_cert/tests/test_hash.py
+++ b/addons/l10n_fr_pos_cert/tests/test_hash.py
@@ -44,7 +44,7 @@ def test_hashes_should_be_equal_if_no_alteration(self):
         paid_order = {
             'access_token': False,
             'amount_paid': 20,
-            'amount_return': 5.0,
+            'amount_return': -5.0,
             'amount_tax': 0,
             'amount_total': 15.0,
             'date_order': fields.Datetime.to_string(fields.Datetime.now()),
diff --git a/addons/l10n_my_edi_pos/tests/test_myinvois_pos.py b/addons/l10n_my_edi_pos/tests/test_myinvois_pos.py
index dcbca6e0b2414..287dbb5a988bc 100644
--- a/addons/l10n_my_edi_pos/tests/test_myinvois_pos.py
+++ b/addons/l10n_my_edi_pos/tests/test_myinvois_pos.py
@@ -469,6 +469,9 @@ def test_refund_constrains_consolidated_invoice(self):
                 # Fails, the order should be invoiced in such a case
                 with self.assertRaises(UserError):
                     self._create_order({
+                        'pos_order_ui_args': {
+                            'is_refund': True,
+                        },
                         'pos_order_lines_ui_args': [
                             {
                                 'product': self.product_one,
@@ -480,6 +483,9 @@ def test_refund_constrains_consolidated_invoice(self):
                 # If it is, it will work
                 self.invoicing_customer.vat = 'EI00000000010'
                 self._create_order({
+                    'pos_order_ui_args': {
+                        'is_refund': True,
+                    },
                     'pos_order_lines_ui_args': [
                         {
                             'product': self.product_one,
@@ -500,6 +506,9 @@ def test_refund_constrains_regular_invoice(self):
                 # Fails, the order should be invoiced in such a case
                 with self.assertRaises(UserError):
                     self._create_order({
+                        'pos_order_ui_args': {
+                            'is_refund': True,
+                        },
                         'pos_order_lines_ui_args': [
                             {
                                 'product': self.product_one,
@@ -510,6 +519,9 @@ def test_refund_constrains_regular_invoice(self):
                     })
                 # If invoicing is checked, it will work.
                 self._create_order({
+                    'pos_order_ui_args': {
+                        'is_refund': True,
+                    },
                     'pos_order_lines_ui_args': [
                         {
                             'product': self.product_one,
@@ -571,6 +583,9 @@ def test_consolidate_invoices_refund_with_customer(self):
             # We then create the refund for the order
             with self.with_pos_session(), patch(CONTACT_PROXY_METHOD, new=self._mock_successful_submission):
                 self._create_order({
+                    'pos_order_ui_args': {
+                        'is_refund': True,
+                    },
                     'pos_order_lines_ui_args': [
                         {
                             'product': self.product_one,
@@ -690,6 +705,9 @@ def test_consolidate_invoices_refund_export_xml(self):
             # We then create the refund for the first_order
             with self.with_pos_session(), patch(CONTACT_PROXY_METHOD, new=self._mock_successful_submission):
                 self._create_order({
+                    'pos_order_ui_args': {
+                        'is_refund': True,
+                    },
                     'pos_order_lines_ui_args': [
                         {
                             'product': product_1,
diff --git a/addons/l10n_sa_pos/static/src/overrides/models/pos_order.js b/addons/l10n_sa_pos/static/src/overrides/models/pos_order.js
index 8f5ed69b6bd7f..121d16e69d2c5 100644
--- a/addons/l10n_sa_pos/static/src/overrides/models/pos_order.js
+++ b/addons/l10n_sa_pos/static/src/overrides/models/pos_order.js
@@ -16,8 +16,8 @@ patch(PosOrder.prototype, {
                     company.name,
                     company.vat,
                     this.date_order,
-                    this.getTotalWithTax(),
-                    this.getTotalTax()
+                    this.priceIncl,
+                    this.amountTaxes
                 );
                 const qr_code_svg = new XMLSerializer().serializeToString(
                     codeWriter.write(qr_values, 200, 200)
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 00a38c65f45f4..90e289be84316 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -188,7 +188,7 @@ def _process_payment_lines(self, pos_order, order, pos_session, draft):
             return_payment_vals = {
                 'name': _('return'),
                 'pos_order_id': order.id,
-                'amount': -pos_order['amount_return'],
+                'amount': pos_order['amount_return'],
                 'payment_date': fields.Datetime.now(),
                 'payment_method_id': cash_payment_method.id,
                 'is_change': True,
@@ -209,7 +209,7 @@ def _prepare_tax_base_line_values(self):
     @api.model
     def _get_invoice_lines_values(self, line_values, pos_line, move_type):
         # correct quantity sign based on move type and if line is refund.
-        is_refund_order = pos_line.order_id.amount_total < 0.0
+        is_refund_order = pos_line.order_id.is_refund
         qty_sign = -1 if (
             (move_type == 'out_invoice' and is_refund_order)
             or (move_type == 'out_refund' and not is_refund_order)
@@ -847,8 +847,7 @@ def _prepare_invoice_vals(self):
         fiscal_position = self.fiscal_position_id
         pos_config = self.config_id
         rounding_method = pos_config.rounding_method
-        amount_total = sum(order.amount_total for order in self)
-        move_type = 'out_invoice' if amount_total >= 0 else 'out_refund'
+        move_type = 'out_invoice' if not any(order.is_refund for order in self) else 'out_refund'
         invoice_payment_term_id = (
             self.partner_id.property_payment_term_id.id
             if self.partner_id.property_payment_term_id and any(p.payment_method_id.type == 'pay_later' for p in self.payment_ids)
diff --git a/addons/point_of_sale/static/src/app/components/order_display/order_display.xml b/addons/point_of_sale/static/src/app/components/order_display/order_display.xml
index 50861d71c34fc..a36f69bbf2fad 100644
--- a/addons/point_of_sale/static/src/app/components/order_display/order_display.xml
+++ b/addons/point_of_sale/static/src/app/components/order_display/order_display.xml
@@ -29,18 +29,15 @@
                         </t>
                     </div>
                 </div>
-                <t t-set="taxTotals" t-value="order.taxTotals" />
-                <div t-if="taxTotals and props.mode !== 'receipt'" class="order-summary d-flex flex-column gap-1 p-2 border-bottom fw-bolder lh-sm">
-                    <div t-if="taxTotals.has_tax_groups" class="tax-info subentry d-flex justify-content-between w-100 fs-6 text-muted ">
+                <div t-if="props.mode !== 'receipt'" class="order-summary d-flex flex-column gap-1 p-2 border-bottom fw-bolder lh-sm">
+                    <div t-if="order.prices.taxDetails.has_tax_groups" class="tax-info subentry d-flex justify-content-between w-100 fs-6 text-muted ">
                         Taxes
                         <div id="order-widget-taxes">
-                            <span t-esc="formatCurrency(taxTotals.order_sign * taxTotals.tax_amount_currency)" class="tax"/>
+                            <span t-esc="order.currencyAmountTaxes" class="tax"/>
                         </div>
                     </div>
                     <div class="d-flex justify-content-between w-100 fs-3">
-                        Total
-                        <span t-esc="formatCurrency(taxTotals.order_sign * taxTotals.order_total)"
-                              class="total"/>
+                        Total <span t-esc="order.currencyDisplayPrice" class="total"/>
                     </div>
                 </div>
             </div>
diff --git a/addons/point_of_sale/static/src/app/components/orderline/orderline.js b/addons/point_of_sale/static/src/app/components/orderline/orderline.js
index db2cab3742d87..bc90e16a82523 100644
--- a/addons/point_of_sale/static/src/app/components/orderline/orderline.js
+++ b/addons/point_of_sale/static/src/app/components/orderline/orderline.js
@@ -27,27 +27,6 @@ export class Orderline extends Component {
         onLongPress: () => {},
     };
 
-    formatCurrency(amount) {
-        return formatCurrency(amount, this.line.currency.id);
-    }
-
-    get line() {
-        return this.props.line;
-    }
-
-    get taxGroup() {
-        return [
-            ...new Set(
-                this.line.product_id.taxes_id
-                    ?.map((tax) => tax.tax_group_id.pos_receipt_label)
-                    .filter((label) => label)
-            ),
-        ].join(" ");
-    }
-    getInternalNotes() {
-        return JSON.parse(this.line.note || "[]");
-    }
-
     setup() {
         this.root = useRef("root");
         if (this.props.mode === "display") {
@@ -69,4 +48,98 @@ export class Orderline extends Component {
             ]);
         }
     }
+
+    get line() {
+        return this.props.line;
+    }
+
+    get lineContainerClasses() {
+        return {
+            selected: this.line.isSelected() && this.props.mode === "display",
+            ...this.line.getDisplayClasses(),
+            ...(this.props.class || []),
+            "border-start": this.props.mode != "receipt" && this.line.combo_parent_id,
+            "orderline-combo fst-italic ms-4": this.line.combo_parent_id,
+            "position-relative d-flex align-items-center lh-sm cursor-pointer": true, // Keep all classes here
+        };
+    }
+
+    get lineClasses() {
+        const line = this.line;
+        const props = this.props;
+        if (line.combo_parent_id) {
+            return props.mode === "receipt" ? "px-2" : "p-2";
+        } else {
+            if (props.mode === "receipt") {
+                return line.combo_line_ids.length > 0 ? "" : "py-1";
+            } else {
+                return "p-2";
+            }
+        }
+    }
+
+    get infoListClasses() {
+        const line = this.line;
+        const props = this.props;
+        if (props.mode === "receipt") {
+            return "";
+        }
+        if (line.customer_note || line.note || line.discount || line.packLotLines?.length) {
+            return "gap-2 mt-1";
+        }
+        return "";
+    }
+
+    /**
+     * To avoid to much logic in the template, we compute all values here
+     * and use them in the template.
+     */
+    get lineScreenValues() {
+        const line = this.line;
+
+        // Prevent rendering if the line is not yet linked to an order
+        // this can happen during related models connections
+        if (!line.order_id) {
+            return {};
+        }
+
+        const imageUrl = line.product_id?.getImageUrl();
+        const basic = this.props.basic_receipt;
+        const unitPart = line.getQuantityStr().unitPart;
+        const decimalPart = line.getQuantityStr().decimalPart;
+        const decimalPoint = line.getQuantityStr().decimalPoint;
+        const discount = line.getDiscountStr();
+        const mode = this.props.mode;
+        const attributeStr = line.orderDisplayProductName.attributeString;
+        const taxGroup = [
+            ...new Set(
+                this.line.product_id.taxes_id
+                    ?.map((tax) => tax.tax_group_id.pos_receipt_label)
+                    .filter((label) => label)
+            ),
+        ].join(" ");
+        const showPrice =
+            !basic &&
+            line.getQuantityStr() != 1 &&
+            (mode === "receipt" || (line.price_type !== "original" && !line.combo_parent_id));
+        const priceUnit = `${line.currencyDisplayPriceUnit} / ${
+            line.product_id?.uom_id?.name || ""
+        }`;
+        return {
+            name: mode === "receipt" ? line.full_product_name : line.orderDisplayProductName.name,
+            attributeString: mode === "display" && attributeStr && `- ${attributeStr}`,
+            internalNote: mode === "display" && line.note && JSON.parse(this.line.note || "[]"),
+            isReceipt: mode === "receipt",
+            isDisplay: mode === "display",
+            discount: !basic && discount && discount !== "0" && !line.combo_parent_id && discount,
+            noDiscountPrice: formatCurrency(line.displayPriceNoDiscount, line.currency.id),
+            displayPriceUnit: showPrice && line.price !== 0 && priceUnit,
+            unitPart: unitPart,
+            decimalPart: decimalPart && `${decimalPoint}${decimalPart}`,
+            productImage: this.props.showImage && imageUrl,
+            taxGroup: this.props.showTaxGroup && taxGroup,
+            price: !basic && !line.combo_parent_id && this.line.currencyDisplayPrice,
+            lotLines: line.product_id.tracking !== "none" && (line.packLotLines || []),
+        };
+    }
 }
diff --git a/addons/point_of_sale/static/src/app/components/orderline/orderline.xml b/addons/point_of_sale/static/src/app/components/orderline/orderline.xml
index e4b75adbf8af0..8996360e0261f 100644
--- a/addons/point_of_sale/static/src/app/components/orderline/orderline.xml
+++ b/addons/point_of_sale/static/src/app/components/orderline/orderline.xml
@@ -1,70 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="point_of_sale.Orderline">
-        <li t-ref="root" t-if="line.order_id" class="orderline position-relative d-flex align-items-center lh-sm cursor-pointer"
-            t-attf-class="{{ line.combo_parent_id ? 'orderline-combo fst-italic ms-4' : '' }}"
-            t-att-class="{'selected' : line.isSelected() and this.props.mode === 'display', ...line.getDisplayClasses(), ...(props.class || []), 'border-start': props.mode != 'receipt' and line.combo_parent_id}">
-            <div class="product-order"></div>
-            <div t-if="props.showImage and line.product_id.getImageUrl()" class="o_line_container d-flex align-items-center justify-content-center">
-                <img t-attf-style="border-radius: 1rem;" t-att-src="line.product_id.getImageUrl()"/>
+        <t t-set="vals" t-value="lineScreenValues" />
+        <li t-ref="root" t-if="line.order_id" t-att-class="lineContainerClasses" class="orderline">
+            <div t-if="vals.productImage" class="o_line_container d-flex align-items-center justify-content-center">
+                <img t-attf-style="border-radius: 1rem;" t-att-src="vals.productImage"/>
             </div>
-            <div class="d-flex flex-column w-100"
-                 t-attf-class="{{ line.combo_parent_id ? props.mode == 'receipt' ? 'px-2' : 'p-2' : props.mode == 'receipt' ? line.combo_line_ids.length > 0 ? '' : 'py-1' : 'p-2' }}">
-                <div class="line-details d-flex justify-content-between" t-att-class="{ 'align-items-center' : props.mode == 'receipt' }">
-                    <div class="product-name d-flex flex-grow-1 pe-2 text-truncate" t-att-class="{ 'align-items-center' : props.mode == 'receipt' }">
-                        <span class="qty d-inline-block fw-bolder"
-                            t-attf-class="{{ props.mode == 'receipt' ? 'pe-2' : 'px-1' }}">
-                            <t t-esc="line.getQuantityStr().unitPart"/>
-                            <small t-if="line.getQuantityStr().decimalPart" class="fw-normal" style="font-size: 85%;">
-                                <t t-esc="line.getQuantityStr().decimalPoint"/>
-                                <t t-esc="line.getQuantityStr().decimalPart"/>
-                            </small>
+            <div class="d-flex flex-column w-100" t-att-class="lineClasses">
+                <div class="line-details d-flex justify-content-between" t-att-class="{ 'align-items-center' : vals.isReceipt }">
+                    <div class="product-name d-flex flex-grow-1 pe-2 text-truncate" t-att-class="{ 'align-items-center' : vals.isReceipt }">
+                        <span class="qty d-inline-block fw-bolder" t-attf-class="{{ vals.isReceipt ? 'pe-2' : 'px-1' }}">
+                            <t t-esc="vals.unitPart"/>
+                            <small t-if="vals.decimalPart" t-out="vals.decimalPart" class="fw-normal" style="font-size: 85%;" />
                         </span>
                         <span class="text-wrap d-inline">
-                            <t t-if="props.mode == 'receipt'">
-                                <t t-out="line.full_product_name" />
-                            </t>
-                            <t t-else="">
-                                <t t-esc="line.orderDisplayProductName.name" />
-                                <br/>
-                                <small class="attribute-line fst-italic" t-if="line.orderDisplayProductName.attributeString">
-                                    - <t t-esc="line.orderDisplayProductName.attributeString" />
-                                </small>
-                            </t>
+                            <t t-esc="vals.name" /><br/>
+                            <small t-if="vals.attributeString" t-out="vals.attributeString" class="attribute-line fst-italic" />
                         </span>
                     </div>
-                    <div t-if="!props.basic_receipt and !line.combo_parent_id" t-out="line.getPriceString()" class="product-price price" t-attf-class="{{ props.mode == 'receipt' ? 'font-monospace' : 'fw-bolder' }}"/>
-                    <div t-if="props.showTaxGroup" t-esc="this.taxGroup" class="text-end" style="width: 2rem"/>
+                    <div t-if="vals.price" t-out="vals.price" class="product-price price" t-attf-class="{{ vals.isReceipt ? 'font-monospace' : 'fw-bolder' }}"
+                    />
+                    <div t-if="vals.taxGroup" t-esc="vals.taxGroup" class="text-end" style="width: 2rem"/>
                 </div>
-                <ul class="info-list d-flex flex-column mb-0 ms-2" t-att-style="props.mode == 'receipt' and 'font-size: 75%;'" t-attf-class="{{ props.mode === 'receipt' ? '' : (line.customer_note || line.note || line.discount || line.packLotLines?.length) ? 'gap-2 mt-1' : '' }}">
-                    <li class="price-per-unit" t-if="!props.basic_receipt and this.props.line.getQuantity() != 1 and (props.mode == 'receipt' || (line.price_type !== 'original' and !line.combo_parent_id))">
-                        <t t-if="line.price !== 0">
-                            <t t-esc="formatCurrency(line.unitDisplayPrice)" />
-                        </t>
-                        /
-                        <t t-if="line.product_id.uom_id?.name" t-esc="line.product_id.uom_id?.name" />
-                    </li>
-                    <li t-if="line.discount" class="price-per-unit">
-                        <t t-set="discount" t-value="line.getDiscountStr()" />
-                        <t t-if="!props.basic_receipt and discount and discount !== '0' and !line.combo_parent_id">
-                            <i class="fa fa-tag pe-1"/><em><t t-esc="discount" />% </em> discount off on <t t-esc="line.computePriceWithTaxBeforeDiscount()"/>
-                        </t>
+                <ul class="info-list d-flex flex-column mb-0 ms-2" t-att-style="vals.isReceipt and 'font-size: 75%;'" t-att-class="infoListClasses">
+                    <li class="price-per-unit" t-if="vals.displayPriceUnit" t-out="vals.displayPriceUnit" />
+                    <li t-if="vals.discount" class="price-per-unit">
+                        <i class="fa fa-tag pe-1"/><em><t t-esc="vals.discount" />% </em> discount off on <t t-esc="vals.noDiscountPrice"/>
                     </li>
-                    <li t-if="line.customer_note" class="customer-note w-100 rounded text-break bg-opacity-25" t-att-class="{'bg-warning text-warning p-2': this.props.mode === 'display'}">
+                    <li t-if="line.customer_note" class="customer-note w-100 rounded text-break bg-opacity-25" t-att-class="{'bg-warning text-warning p-2': vals.isDisplay}">
                         <i class="fa fa-sticky-note me-1" role="img" aria-label="Customer Note" title="Customer Note"/>
                         <t t-esc="line.customer_note" />
                     </li>
                     <div t-if="this.props.mode === 'display' and line.note" class="internal-note-container d-flex gap-2 flex-wrap">
-                        <t t-foreach="getInternalNotes()" t-as="note" t-key="note.id or note_index">
+                        <t t-foreach="vals.internalNote" t-as="note" t-key="note.id or note_index">
                             <BadgeTag color="note.colorIndex" text="note.text"/>
                         </t>
                     </div>
-                    <li t-if="line.product_id.tracking !== 'none'" class="row flex-wrap w-100 m-0">
-                        <div class="col-auto" t-attf-class="{{ props.mode == 'receipt' ? 'p-0' : 'px-1' }}">
+                    <li t-if="vals.lotLines" class="row flex-wrap w-100 m-0">
+                        <div class="col-auto" t-attf-class="{{ vals.isReceipt ? 'p-0' : 'px-1' }}">
                             <t t-slot="pack-lot-icon" />
                         </div>
                         <div class="col ps-0">
-                            <li class="lot-number" t-foreach="line.packLotLines or []" t-as="lot" t-key="lot_index" t-esc="lot" />
+                            <li class="lot-number" t-foreach="vals.lotLines" t-as="lot" t-key="lot_index" t-esc="lot" />
                         </div>
                     </li>
                     <t t-slot="default" />
diff --git a/addons/point_of_sale/static/src/app/components/popups/product_configurator_popup/product_configurator_popup.js b/addons/point_of_sale/static/src/app/components/popups/product_configurator_popup/product_configurator_popup.js
index 5355fc2ce2089..4dd1d9141b980 100644
--- a/addons/point_of_sale/static/src/app/components/popups/product_configurator_popup/product_configurator_popup.js
+++ b/addons/point_of_sale/static/src/app/components/popups/product_configurator_popup/product_configurator_popup.js
@@ -238,7 +238,7 @@ export class ProductConfiguratorPopup extends Component {
     }
 
     get title() {
-        const info = this.props.productTemplate.getProductPriceInfo(this.product, this.pos.company);
+        const info = this.props.productTemplate.getTaxDetails();
         const name = this.props.productTemplate.display_name;
         const total = this.env.utils.formatCurrency(info?.raw_total_included_currency || 0.0);
         const taxName = info?.taxes_data[0]?.name || "";
diff --git a/addons/point_of_sale/static/src/app/customer_display/customer_display_adapter.js b/addons/point_of_sale/static/src/app/customer_display/customer_display_adapter.js
index 9d904bf1ad7d2..d6f036de8a2bc 100644
--- a/addons/point_of_sale/static/src/app/customer_display/customer_display_adapter.js
+++ b/addons/point_of_sale/static/src/app/customer_display/customer_display_adapter.js
@@ -34,8 +34,8 @@ export class CustomerDisplayPosAdapter {
         this.data = {
             finalized: order.finalized,
             general_customer_note: order.general_customer_note,
-            amount: formatCurrency(order.getTotalWithTax() || 0, order.currency),
-            change: order.getChange() && formatCurrency(order.getChange(), order.currency),
+            amount: order.currencyDisplayPrice,
+            change: order.change && formatCurrency(order.change, order.currency),
             paymentLines: order.payment_ids.map((pl) => this.getPaymentData(pl)),
             lines: order.lines.map((l) => this.getOrderlineData(l)),
             qrPaymentData: toRaw(order.getSelectedPaymentline()?.qrPaymentData),
@@ -50,16 +50,13 @@ export class CustomerDisplayPosAdapter {
             customerNote: line.getCustomerNote() || "",
             internalNote: line.getNote() || "[]",
             productName: line.getFullProductName(),
-            price: line.getPriceString(),
+            price: line.currencyDisplayPrice,
             qty: line.getQuantityStr().qtyStr,
             unit: line.product_id.uom_id ? line.product_id.uom_id.name : "",
-            unitPrice: formatCurrency(line.unitDisplayPrice, line.currency),
+            unitPrice: line.currencyDisplayPriceUnit,
             packLotLines: line.packLotLines,
             comboParent: line.combo_parent_id?.getFullProductName?.() || "",
-            price_without_discount: formatCurrency(
-                line.getUnitDisplayPriceBeforeDiscount(),
-                line.currency
-            ),
+            price_without_discount: formatCurrency(line.displayPriceNoDiscount, line.currency),
             isSelected: line.isSelected(),
         };
     }
diff --git a/addons/point_of_sale/static/src/app/models/account_fiscal_position.js b/addons/point_of_sale/static/src/app/models/account_fiscal_position.js
new file mode 100644
index 0000000000000..65631c3457a18
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/models/account_fiscal_position.js
@@ -0,0 +1,29 @@
+import { registry } from "@web/core/registry";
+import { Base } from "./related_models";
+
+export class AccountFiscalPosition extends Base {
+    static pythonModel = "account.fiscal.position";
+
+    getTaxesAfterFiscalPosition(taxes) {
+        if (!this.tax_ids?.length) {
+            return [];
+        }
+
+        const newTaxIds = [];
+        for (const tax of taxes) {
+            if (this.tax_map[tax.id]) {
+                for (const mapTaxId of this.tax_map[tax.id]) {
+                    newTaxIds.push(mapTaxId);
+                }
+            } else {
+                newTaxIds.push(tax.id);
+            }
+        }
+
+        return this.models["account.tax"].filter((tax) => newTaxIds.includes(tax.id));
+    }
+}
+
+registry
+    .category("pos_available_models")
+    .add(AccountFiscalPosition.pythonModel, AccountFiscalPosition);
diff --git a/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
new file mode 100644
index 0000000000000..7b0d23f9d97f9
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
@@ -0,0 +1,261 @@
+import { Base } from "../related_models";
+import { accountTaxHelpers } from "@account/helpers/account_tax";
+import { logPosMessage } from "../../utils/pretty_console_log";
+import { formatCurrency } from "@web/core/currency";
+
+const CONSOLE_COLOR = "#4EFF4D";
+
+export class PosOrderAccounting extends Base {
+    /**
+     * Currency formatted prices, these getters already handle included/excluded tax configuration.
+     * They must be used each time a price is displayed to the user.
+     */
+    get currencyDisplayPrice() {
+        return formatCurrency(this.displayPrice, this.currency.id);
+    }
+
+    get currencyAmountTaxes() {
+        return formatCurrency(this.amountTaxes, this.currency.id);
+    }
+
+    /**
+     * Display price depending on the tax configuration (included or excluded).
+     */
+    get displayPrice() {
+        return this.config.iface_tax_included === "total"
+            ? this.currency.round(this.priceIncl)
+            : this.currency.round(this.priceExcl);
+    }
+
+    /**
+     * Remaining due take into account the rounding of the order, the rounding can be configured
+     * in two different ways:
+     *
+     * 1) Rounding applied only on cash payments
+     *    In this case the remaining due is rounded only if there is at least one cash payment line.
+     *    and the remaining due is less than the rounding tolerance.
+     *
+     * 2) Rounding applied on all payment methods
+     *    In this case the remaining due is always rounded even if a card payment method is used.
+     *    The remaining due is rounded if it is less than the rounding tolerance. No payment method
+     *    is rounded in this case, the whole order is rounded instead.
+     *
+     * !!! Keep in mind that from 19.0 only one cash payment line can be used in an order !!!
+     */
+    get remainingDue() {
+        const isNegative = this.totalDue < 0;
+        const total = this.totalDue;
+        const remaining = total - this.amountPaid;
+
+        // Amount paid covers the total due
+        if ((isNegative && remaining >= 0) || (!isNegative && remaining <= 0)) {
+            return 0;
+        }
+
+        const tolerance = this.orderIsRounded ? this.config.rounding_method.rounding : 0;
+        const amount = Math.abs(total - this.amountPaid) <= tolerance ? 0 : Math.abs(remaining);
+        return isNegative ? this.currency.round(-amount) : this.currency.round(amount);
+    }
+    get change() {
+        const isNegative = this.totalDue < 0;
+        const roundingSanatizer = this.orderIsRounded ? this.appliedRounding : 0;
+        const remaining = this.totalDue - this.amountPaid;
+
+        // Amount paid covers the total due
+        if ((isNegative && remaining <= 0) || (!isNegative && remaining >= 0)) {
+            return 0;
+        }
+
+        const total =
+            Math.abs(this.displayPrice) -
+            Math.abs(this.amountPaid) +
+            (isNegative ? -roundingSanatizer : roundingSanatizer);
+
+        const amount = isNegative ? -this.currency.round(total) : this.currency.round(total);
+        return this.config.cash_rounding ? this.config.rounding_method.round(amount) : amount;
+    }
+    get orderIsRounded() {
+        const cashPm = this.payment_ids.some((p) => p.payment_method_id.is_cash_count);
+        return this.config.hasGlobalRounding || (cashPm && this.config.hasCashRounding);
+    }
+    get appliedRounding() {
+        const total = this.prices.taxDetails.total_amount_no_rounding;
+        const isNegative = this.amountPaid > total;
+        const remaining = total - this.amountPaid;
+        const tolerance = this.orderIsRounded ? this.config.rounding_method.rounding : 0;
+        const amount = Math.abs(total - this.amountPaid) <= tolerance ? Math.abs(remaining) : 0;
+        return isNegative ? this.currency.round(amount) : this.currency.round(-amount);
+    }
+
+    /**
+     * Getters are preferred to methods because they are cached.
+     * These getters must be used each time the order prices are needed.
+     *
+     * Do not try to make your own price computation outside these getters.
+     */
+    get prices() {
+        return this._constructPriceData();
+    }
+    get priceIncl() {
+        return this.prices.taxDetails.total_amount_no_rounding;
+    }
+    get priceExcl() {
+        return this.prices.taxDetails.base_amount;
+    }
+    get totalDue() {
+        return this.config.hasCashRounding
+            ? this.currency.round(this.prices.taxDetails.total_amount_no_rounding)
+            : this.currency.round(this.prices.taxDetails.total_amount);
+    }
+    get amountTaxes() {
+        return this.prices.taxDetails.tax_amount_currency;
+    }
+    get orderHasZeroRemaining() {
+        return this.currency.isZero(this.remainingDue);
+    }
+    get amountPaid() {
+        return this.currency.round(
+            this.payment_ids.reduce(function (sum, paymentLine) {
+                // Return lines are created after the sync, should not be taken into account in
+                // the paid amount otherwise, the change would be wrong.
+                if (paymentLine.isDone() && paymentLine.name !== "return") {
+                    sum += paymentLine.getAmount();
+                }
+                return sum;
+            }, 0)
+        );
+    }
+    get orderSign() {
+        return this.prices.taxDetails.order_sign;
+    }
+
+    /**
+     * Determine if the amount to pay should be rounded depending on the payment method
+     * and the cash rounding configuration.
+     *
+     * Rounding on payment methods happen only when cash_rounding is enabled and
+     * only_round_cash_method is enabled too. In this case only cash payment methods
+     * will have a rounded amount to pay.
+     *
+     * If only_round_cash_method is disabled, no payment method will have a rounded amount to pay.
+     * The whole order is rounded instead.
+     */
+    shouldRound(paymentMethod) {
+        return paymentMethod.is_cash_count && this.config.hasCashRounding;
+    }
+
+    /**
+     * Get the amount to pay by default when creating a new payment.
+     * @param paymentMethod: The payment method of the payment to be created.
+     * @returns A monetary value.
+     */
+    getDefaultAmountDueToPayIn(paymentMethod) {
+        const amount = this.shouldRound(paymentMethod)
+            ? this.config_id.rounding_method.round(this.remainingDue)
+            : this.remainingDue;
+        return amount || this.change;
+    }
+
+    /**
+     * Since prices are computed on the fly, we need to set them before sending
+     * the order to the backend.
+     *
+     * This method is called when the order is pushed to the backend.
+     */
+    setOrderPrices() {
+        this.amount_paid = this.amountPaid; // Already rounded by the getter
+        this.amount_tax = this.amountTaxes; // Already rounded by the getter
+        this.amount_total = this.currency.round(this.priceIncl);
+        this.amount_return = this.change; // Already rounded by the getter
+        this.lines.forEach((line) => {
+            line.price_subtotal = line.displayPriceUnit;
+            line.price_subtotal_incl = line.displayPrice;
+        });
+    }
+    /**
+     * This method is used when extra options need to be passed to the price computation.
+     * All these options will finally reach these methods:
+     * - prepareBaseLineForTaxesComputationExtraValues
+     * - prepare_base_line_for_taxes_computation (accounting helpers)
+     *
+     * For example you can pass a specific set of lines to compute the price of
+     * only these lines instead of the whole order.
+     */
+    getPriceWithOptions(opts = {}) {
+        return this._constructPriceData(opts);
+    }
+
+    /**
+     * @private
+     *
+     * Private method computing all prices and tax details.
+     * DO NOT USE THIS METHOD OUTSIDE THIS FILE !!!
+     */
+    _constructPriceData(opts = {}) {
+        const data = this._computeAllPrices(opts);
+        const noDiscount = this._computeAllPrices({ baseLineOpts: { discount: 0.0 }, ...opts });
+        const currency = this.currency;
+
+        for (const key of Object.keys(data.baseLineByLineUuids)) {
+            const ndData = noDiscount.baseLineByLineUuids[key].tax_details;
+            const dData = data.baseLineByLineUuids[key].tax_details;
+
+            Object.assign(data.baseLineByLineUuids[key].tax_details, {
+                discount_amount: currency.round(ndData.total_included - dData.total_included),
+                no_discount_total_excluded: ndData.total_excluded,
+                no_discount_total_included: ndData.total_included,
+                no_discount_total_included_currency: ndData.total_included_currency,
+                no_discount_total_excluded_currency: ndData.total_excluded_currency,
+                no_discount_taxes_data: ndData.taxes_data,
+                no_discount_delta_total_excluded: ndData.delta_total_excluded,
+                no_discount_delta_total_included: ndData.delta_total_included,
+            });
+        }
+
+        logPosMessage("Accounting", "_constructPriceData", "Recompute allPrices", CONSOLE_COLOR, [
+            data,
+        ]);
+        return data;
+    }
+
+    /**
+     * @private
+     *
+     * Private method computing all prices and tax details.
+     * DO NOT USE THIS METHOD OUTSIDE THIS FILE !!!
+     */
+    _computeAllPrices(opts = {}) {
+        const currency = this.currency;
+        const lines = opts.lines || this.lines;
+        const documentSign = this.isRefund ? -1 : 1;
+        const company = this.company;
+        const baseLines = lines.map((l) =>
+            l.getBaseLine({
+                quantity: l.qty,
+                price_unit: l.price_unit,
+                ...(opts.baseLineOpts || {}),
+            })
+        );
+
+        accountTaxHelpers.add_tax_details_in_base_lines(baseLines, company);
+        accountTaxHelpers.round_base_lines_tax_details(baseLines, company);
+
+        // Cash rounding is added only if the document needs to be globaly rounded.
+        // See cash_rounding and only_round_cash_method config fields.
+        const cashRounding = this.config.cash_rounding ? this.config.rounding_method : null;
+        const data = accountTaxHelpers.get_tax_totals_summary(baseLines, currency, company, {
+            cash_rounding: cashRounding,
+        });
+        const total = data.total_amount_currency - (data.cash_rounding_base_amount_currency || 0.0);
+
+        data.order_sign = documentSign;
+        data.total_amount_no_rounding = total;
+
+        const baseLineByLineUuids = baseLines.reduce((acc, line) => {
+            acc[line.record.uuid] = line;
+            return acc;
+        }, {});
+
+        return { taxDetails: data, baseLines: baseLines, baseLineByLineUuids: baseLineByLineUuids };
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js
new file mode 100644
index 0000000000000..74794bed162a1
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js
@@ -0,0 +1,165 @@
+import { formatCurrency } from "@web/core/currency";
+import { Base } from "../related_models";
+import { accountTaxHelpers } from "@account/helpers/account_tax";
+import { _t } from "@web/core/l10n/translation";
+
+export class PosOrderlineAccounting extends Base {
+    /**
+     * Display price in the currency format, depending on the tax configuration (included or excluded).
+     *
+     * All getters in this section are used in XML files, their goal is to be shown in the UI.
+     */
+    get currencyDisplayPrice() {
+        if (this.combo_parent_id) {
+            return "";
+        }
+
+        if (this.getDiscount() === 100) {
+            return _t("Free");
+        }
+
+        return formatCurrency(this.displayPrice, this.currency.id);
+    }
+    get currencyDisplayPriceUnit() {
+        return formatCurrency(this.displayPriceUnit, this.currency.id);
+    }
+
+    /**
+     * Display price depending on the tax configuration (included or excluded).
+     */
+    get displayPrice() {
+        return !this.combo_line_ids.length
+            ? this.config.iface_tax_included === "total"
+                ? this.priceIncl
+                : this.priceExcl
+            : this.combo_line_ids.reduce((total, cl) => {
+                  const price =
+                      this.config.iface_tax_included === "total" ? cl.priceIncl : cl.priceExcl;
+                  return total + price;
+              }, 0);
+    }
+    get displayPriceNoDiscount() {
+        return !this.combo_line_ids.length
+            ? this.config.iface_tax_included === "total"
+                ? this.priceInclNoDiscount
+                : this.priceExclNoDiscount
+            : this.combo_line_ids.reduce((total, cl) => {
+                  const price =
+                      this.config.iface_tax_included === "total"
+                          ? cl.priceInclNoDiscount
+                          : cl.priceExclNoDiscount;
+                  return total + price;
+              }, 0);
+    }
+    get displayPriceUnit() {
+        return this.unitPrices.total_excluded * this.order_id.orderSign;
+    }
+
+    get priceIncl() {
+        return this.currency.round(this.prices.total_included * this.order_id.orderSign);
+    }
+    get priceExcl() {
+        return this.currency.round(this.prices.total_excluded * this.order_id.orderSign);
+    }
+    get priceInclNoDiscount() {
+        return this.currency.round(
+            this.prices.no_discount_total_included * this.order_id.orderSign
+        );
+    }
+    get priceExclNoDiscount() {
+        return this.currency.round(
+            this.prices.no_discount_total_excluded * this.order_id.orderSign
+        );
+    }
+
+    /**
+     * Return all prices details of an orderlines based on the order prices computation.
+     * This is the preferred way to get prices of an orderline since its rounded globally.
+     */
+    get prices() {
+        const data = this.order_id.prices.baseLineByLineUuids[this.uuid];
+        return data.tax_details;
+    }
+
+    /**
+     * Same as "get prices" but the prices are computed as if the quantity was 1.
+     */
+    get unitPrices() {
+        const data = this.order_id._constructPriceData({
+            baseLineOpts: { quantity: 1 },
+        }).baseLineByLineUuids[this.uuid];
+        return data.tax_details;
+    }
+
+    get productProductPrice() {
+        return this.product_id.getPrice(
+            this.config.pricelist_id,
+            1,
+            this.price_extra,
+            false,
+            this.product_id
+        );
+    }
+
+    get comboTotalPrice() {
+        const allLines = this.getAllLinesInCombo();
+        return allLines.reduce((total, line) => total + line.displayPrice, 0);
+    }
+
+    get comboTotalPriceWithoutTax() {
+        const allLines = this.getAllLinesInCombo();
+        return allLines.reduce((total, line) => total + line.displayPriceUnit, 0);
+    }
+
+    get taxGroupLabels() {
+        return this.tax_ids
+            ?.map((tax) => tax.tax_group_id?.pos_receipt_label)
+            .filter((label) => label)
+            .join(" ");
+    }
+
+    /**
+     * Prepare extra values for the base line used in taxes computation.
+     */
+    prepareBaseLineForTaxesComputationExtraValues(customValues = {}) {
+        const order = this.order_id;
+        const currency = order.config.currency_id;
+        const extraValues = { currency_id: currency };
+        const product = this.getProduct();
+        const priceUnit = this.price_unit || 0;
+        const discount = this.getDiscount();
+        const values = {
+            ...extraValues,
+            quantity: this.qty,
+            price_unit: priceUnit,
+            discount: discount,
+            tax_ids: this.tax_ids,
+            product_id: product,
+            rate: 1.0,
+            is_refund: this.qty * priceUnit < 0,
+            ...customValues,
+        };
+        if (order.fiscal_position_id) {
+            // Recompute taxes based on product and fiscal position.
+            values.tax_ids = order.fiscal_position_id.getTaxesAfterFiscalPosition(
+                values.product_id.taxes_id
+            );
+        }
+        return values;
+    }
+
+    /**
+     * Get the base line for taxes computation.
+     */
+    getBaseLine(opts = {}) {
+        return accountTaxHelpers.prepare_base_line_for_taxes_computation(
+            this,
+            this.prepareBaseLineForTaxesComputationExtraValues({
+                price_unit: this.productProductPrice,
+                quantity: this.getQuantity(),
+                tax_ids: this.tax_ids,
+                ...opts,
+            })
+        );
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js
new file mode 100644
index 0000000000000..c610545c2c9c3
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js
@@ -0,0 +1,163 @@
+import { roundPrecision } from "@web/core/utils/numbers";
+import { Base } from "../related_models";
+import { accountTaxHelpers } from "@account/helpers/account_tax";
+import { _t } from "@web/core/l10n/translation";
+
+export class ProductTemplateAccounting extends Base {
+    static pythonModel = "product.template";
+
+    prepareProductBaseLineForTaxesComputationExtraValues(opts = {}) {
+        const { price = false, pricelist = false, fiscalPosition = false } = opts;
+        const isVariant = Boolean(this?.product_tmpl_id);
+        const config = this.models["pos.config"].getFirst();
+        const productTemplate = isVariant ? this.product_tmpl_id : this;
+        const baseP = productTemplate.getPrice(pricelist, 1, 0, false, isVariant ? this : false);
+        const priceUnit = price || price === 0 ? price : baseP;
+        const currency = config.currency_id;
+
+        let taxes = this.taxes_id;
+
+        // Fiscal position.
+        if (fiscalPosition) {
+            taxes = fiscalPosition.getTaxesAfterFiscalPosition(taxes);
+        }
+
+        return {
+            currency_id: currency,
+            product_id: this,
+            quantity: 1,
+            price_unit: priceUnit,
+            tax_ids: taxes,
+            ...opts,
+        };
+    }
+
+    // Port of _get_product_price on product.pricelist.
+    //
+    // Anything related to UOM can be ignored, the POS will always use
+    // the default UOM set on the product and the user cannot change
+    // it.
+    //
+    // Pricelist items do not have to be sorted. All
+    // product.pricelist.item records are loaded with a search_read
+    // and were automatically sorted based on their _order by the
+    // ORM. After that they are added in this order to the pricelists.
+    getPrice(
+        pricelist,
+        quantity,
+        price_extra = 0,
+        recurring = false,
+        variant = false,
+        original_line = false,
+        related_lines = []
+    ) {
+        // In case of nested pricelists, it is necessary that all pricelists are made available in
+        // the POS. Display a basic alert to the user in the case where there is a pricelist item
+        // but we can't load the base pricelist to get the price when calling this method again.
+        // As this method is also call without pricelist available in the POS, we can't just check
+        // the absence of pricelist.
+        if (recurring && !pricelist) {
+            alert(
+                _t(
+                    "An error occurred when loading product prices. " +
+                        "Make sure all pricelists are available in the POS."
+                )
+            );
+        }
+
+        const product = variant;
+        const productTmpl = variant.product_tmpl_id || this;
+        const standardPrice = variant ? variant.standard_price : this.standard_price;
+        const basePrice = variant ? variant.lst_price : this.list_price;
+        let price = basePrice + (price_extra || 0);
+
+        if (!pricelist) {
+            return price;
+        }
+
+        if (original_line && original_line.isLotTracked()) {
+            related_lines.push(
+                ...original_line.order_id.lines.filter(
+                    (line) => line.product_id.product_tmpl_id.id == this.id
+                )
+            );
+            quantity = related_lines.reduce((sum, line) => sum + line.getQuantity(), 0);
+        }
+
+        const tmplRules = (productTmpl.backLink("<-product.pricelist.item.product_tmpl_id") || [])
+            .filter((rule) => rule.pricelist_id.id === pricelist.id && !rule.product_id)
+            .sort((a, b) => b.min_quantity - a.min_quantity);
+        const productRules = (product?.backLink?.("<-product.pricelist.item.product_id") || [])
+            .filter((rule) => rule.pricelist_id.id === pricelist.id)
+            .sort((a, b) => b.min_quantity - a.min_quantity);
+
+        const tmplRulesSet = new Set(tmplRules.map((rule) => rule.id));
+        const productRulesSet = new Set(productRules.map((rule) => rule.id));
+        const generalRulesIds = pricelist.getGeneralRulesIdsByCategories(this.parentCategories);
+        const rules = this.models["product.pricelist.item"]
+            .readMany([...productRulesSet, ...tmplRulesSet, ...generalRulesIds])
+            .filter((r) => r.min_quantity <= quantity);
+
+        const rule = rules.length && rules[0];
+        if (!rule) {
+            return price;
+        }
+        if (rule.base === "pricelist") {
+            if (rule.base_pricelist_id) {
+                price = this.getPrice(rule.base_pricelist_id, quantity, 0, true, variant);
+            }
+        } else if (rule.base === "standard_price") {
+            price = standardPrice;
+        }
+
+        if (rule.compute_price === "fixed") {
+            price = rule.fixed_price;
+        } else if (rule.compute_price === "percentage") {
+            price = price - price * (rule.percent_price / 100);
+        } else {
+            var price_limit = price;
+            price -= price * (rule.price_discount / 100);
+            if (rule.price_round) {
+                price = roundPrecision(price, rule.price_round);
+            }
+            if (rule.price_surcharge) {
+                price += rule.price_surcharge;
+            }
+            if (rule.price_min_margin) {
+                price = Math.max(price, price_limit + rule.price_min_margin);
+            }
+            if (rule.price_max_margin) {
+                price = Math.min(price, price_limit + rule.price_max_margin);
+            }
+        }
+
+        // This return value has to be rounded with round_di before
+        // being used further. Note that this cannot happen here,
+        // because it would cause inconsistencies with the backend for
+        // pricelist that have base == 'pricelist'.
+        return price;
+    }
+
+    getBaseLine(opts = {}) {
+        const vals = opts.overridedValues || {};
+        const { price = false, pricelist = false, fiscalPosition = false } = vals;
+
+        return accountTaxHelpers.prepare_base_line_for_taxes_computation(
+            {},
+            this.prepareProductBaseLineForTaxesComputationExtraValues({
+                price,
+                pricelist,
+                fiscalPosition,
+                ...vals,
+            })
+        );
+    }
+
+    getTaxDetails(opts = {}) {
+        const config = this.models["pos.config"].getFirst();
+        const baseLine = this.getBaseLine(opts);
+        accountTaxHelpers.add_tax_details_in_base_line(baseLine, config.company_id);
+        accountTaxHelpers.round_base_lines_tax_details([baseLine], config.company_id);
+        return baseLine.tax_details;
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/models/pos_config.js b/addons/point_of_sale/static/src/app/models/pos_config.js
index e488bb4f21e09..aa74dcb6256a8 100644
--- a/addons/point_of_sale/static/src/app/models/pos_config.js
+++ b/addons/point_of_sale/static/src/app/models/pos_config.js
@@ -13,6 +13,12 @@ export class PosConfig extends Base {
         this.uiState = {};
     }
 
+    get hasCashRounding() {
+        return this.cash_rounding && this.only_round_cash_method;
+    }
+    get hasGlobalRounding() {
+        return this.cash_rounding && !this.only_round_cash_method;
+    }
     get canInvoice() {
         return Boolean(this.raw.invoice_journal_id);
     }
diff --git a/addons/point_of_sale/static/src/app/models/pos_order.js b/addons/point_of_sale/static/src/app/models/pos_order.js
index 69845567e7471..6551acb5f5136 100644
--- a/addons/point_of_sale/static/src/app/models/pos_order.js
+++ b/addons/point_of_sale/static/src/app/models/pos_order.js
@@ -1,16 +1,14 @@
 import { registry } from "@web/core/registry";
-import { Base } from "./related_models";
 import { _t } from "@web/core/l10n/translation";
-import { roundCurrency } from "@point_of_sale/app/models/utils/currency";
 import { computeComboItems } from "./utils/compute_combo_items";
-import { accountTaxHelpers } from "@account/helpers/account_tax";
 import { localization } from "@web/core/l10n/localization";
 import { formatDate, serializeDateTime } from "@web/core/l10n/dates";
 import { getStrNotes } from "./utils/order_change";
+import { PosOrderAccounting } from "./accounting/pos_order_accounting";
 
 const { DateTime } = luxon;
 
-export class PosOrder extends Base {
+export class PosOrder extends PosOrderAccounting {
     static pythonModel = "pos.order";
 
     setup(vals) {
@@ -194,127 +192,12 @@ export class PosOrder extends Base {
         }
     }
 
-    /**
-     * Get the details total amounts with and without taxes, the details of taxes per subtotal and per tax group.
-     * @returns See '_get_tax_totals_summary' in account_tax.py for the full details.
-     */
-    get taxTotals() {
-        return this.getTaxTotalsOfLines(this.lines);
-    }
-
-    getTaxTotalsOfLines(lines) {
-        const currency = this.currency;
-        const company = this.company;
-
-        // If each line is negative, we assume it's a refund order.
-        // It's a normal order if it doesn't contain a line (useful for pos_settle_due).
-        // TODO: Properly differentiate refund orders from normal ones.
-        const documentSign = this.isRefund ? -1 : 1;
-        const baseLines = lines.map((line) =>
-            accountTaxHelpers.prepare_base_line_for_taxes_computation(
-                line,
-                line.prepareBaseLineForTaxesComputationExtraValues({
-                    quantity: documentSign * line.qty,
-                })
-            )
-        );
-        accountTaxHelpers.add_tax_details_in_base_lines(baseLines, company);
-        accountTaxHelpers.round_base_lines_tax_details(baseLines, company);
-
-        // For the generic 'get_tax_totals_summary', we only support the cash rounding that round the whole document.
-        const cashRounding =
-            !this.config.only_round_cash_method && this.config.cash_rounding
-                ? this.config.rounding_method
-                : null;
-
-        const taxTotals = accountTaxHelpers.get_tax_totals_summary(baseLines, currency, company, {
-            cash_rounding: cashRounding,
-        });
-
-        taxTotals.order_sign = documentSign;
-        taxTotals.order_total =
-            taxTotals.total_amount_currency - (taxTotals.cash_rounding_base_amount_currency || 0.0);
-
-        let order_rounding = 0;
-        let remaining = taxTotals.order_total;
-        const validPayments = this.payment_ids.filter((p) => p.isDone() && !p.is_change);
-        for (const [payment, isLast] of validPayments.map((p, i) => [
-            p,
-            i === validPayments.length - 1,
-        ])) {
-            const paymentAmount = documentSign * payment.getAmount();
-            if (isLast) {
-                if (this.config.cash_rounding) {
-                    const roundedRemaining = this.getRoundedRemaining(
-                        this.config.rounding_method,
-                        remaining
-                    );
-                    if (!this.currency.isZero(paymentAmount - remaining)) {
-                        order_rounding = roundedRemaining - remaining;
-                    }
-                }
-            }
-            remaining -= paymentAmount;
-        }
-
-        taxTotals.order_rounding = order_rounding;
-        taxTotals.order_remaining = remaining;
-
-        return taxTotals;
-    }
-
-    shouldRound(paymentMethod) {
-        return (
-            this.config.cash_rounding &&
-            (!this.config.only_round_cash_method || paymentMethod.is_cash_count)
-        );
-    }
-
-    get orderHasZeroRemaining() {
-        const { order_remaining, order_rounding } = this.taxTotals;
-        const remaining_with_rounding = order_remaining + order_rounding;
-        return this.currency.isZero(remaining_with_rounding);
-    }
-
-    /**
-     * Get the amount to pay by default when creating a new payment.
-     * @param paymentMethod: The payment method of the payment to be created.
-     * @returns A monetary value.
-     */
-    getDefaultAmountDueToPayIn(paymentMethod) {
-        const { order_remaining, order_sign } = this.taxTotals;
-        const amount = this.shouldRound(paymentMethod)
-            ? this.getRoundedRemaining(this.config.rounding_method, order_remaining)
-            : order_remaining;
-        return order_sign * amount;
-    }
-
-    getRoundedRemaining(roundingMethod, remaining) {
-        remaining = roundCurrency(remaining, this.currency);
-        if (this.currency.isZero(remaining)) {
-            return 0;
-        } else if (this.currency.isNegative(remaining)) {
-            return roundingMethod.asymmetricRound(remaining);
-        } else {
-            return roundingMethod.round(remaining);
-        }
-    }
-
     getCashierName() {
         return this.user_id?.name?.split(" ").at(0);
     }
     canPay() {
         return this.lines.length;
     }
-    recomputeOrderData() {
-        this.amount_paid = this.getTotalPaid();
-        this.amount_tax = this.getTotalTax();
-        this.amount_total = this.getTotalWithTax();
-        this.amount_return = this.getChange();
-        this.lines.forEach((line) => {
-            line.setLinePrice();
-        });
-    }
 
     get isBooked() {
         return Boolean(this.uiState.booked || !this.isEmpty() || typeof this.id === "number");
@@ -416,7 +299,7 @@ export class PosOrder extends Base {
         } else {
             for (const line of lines) {
                 if (line.getProduct() === tip_product) {
-                    return line.getUnitPrice();
+                    return line.prices.total_excluded_currency;
                 }
             }
             return 0;
@@ -548,25 +431,34 @@ export class PosOrder extends Base {
     /* ---- Payment Lines --- */
     addPaymentline(payment_method) {
         this.assertEditable();
+        const existingCash = this.payment_ids.find((pl) => pl.payment_method_id.is_cash_count);
+
         if (this.electronicPaymentInProgress()) {
-            return false;
-        } else {
-            const totalAmountDue = this.getDefaultAmountDueToPayIn(payment_method);
-            const newPaymentLine = this.models["pos.payment"].create({
-                pos_order_id: this,
-                payment_method_id: payment_method,
-            });
-            this.selectPaymentline(newPaymentLine);
-            newPaymentLine.setAmount(totalAmountDue);
-
-            if (
-                (payment_method.payment_terminal && !this.isRefund) ||
-                payment_method.payment_method_type === "qr_code"
-            ) {
-                newPaymentLine.setPaymentStatus("pending");
-            }
-            return newPaymentLine;
+            return {
+                status: false,
+                data: _t("There is already an electronic payment in progress."),
+            };
         }
+
+        if (existingCash && payment_method.is_cash_count) {
+            return { status: false, data: _t("There is already a cash payment line.") };
+        }
+
+        const totalAmountDue = this.getDefaultAmountDueToPayIn(payment_method);
+        const newPaymentLine = this.models["pos.payment"].create({
+            pos_order_id: this,
+            payment_method_id: payment_method,
+        });
+        this.selectPaymentline(newPaymentLine);
+        newPaymentLine.setAmount(totalAmountDue);
+
+        if (
+            (payment_method.payment_terminal && !this.isRefund) ||
+            payment_method.payment_method_type === "qr_code"
+        ) {
+            newPaymentLine.setPaymentStatus("pending");
+        }
+        return { status: true, data: newPaymentLine };
     }
 
     getPaymentlineByUuid(uuid) {
@@ -604,27 +496,6 @@ export class PosOrder extends Base {
         });
     }
 
-    getTotalWithTax() {
-        return this.taxTotals.order_sign * this.taxTotals.order_total;
-    }
-
-    getTotalWithTaxOfLines(lines) {
-        const taxTotals = this.getTaxTotalsOfLines(lines);
-        return taxTotals.order_sign * taxTotals.total_amount_currency;
-    }
-
-    getTotalWithoutTax() {
-        const base_amount =
-            this.taxTotals.base_amount_currency +
-            (this.taxTotals.cash_rounding_base_amount_currency || 0.0);
-        return this.taxTotals.order_sign * base_amount;
-    }
-
-    getTotalWithoutTaxOfLines(lines) {
-        const taxTotals = this.getTaxTotalsOfLines(lines);
-        return taxTotals.order_sign * taxTotals.base_amount_currency;
-    }
-
     _getIgnoredProductIdsTotalDiscount() {
         return [];
     }
@@ -634,17 +505,16 @@ export class PosOrder extends Base {
         return this.currency.round(
             this.lines.reduce((sum, orderLine) => {
                 if (!ignored_product_ids.includes(orderLine.product_id.id)) {
-                    sum +=
-                        orderLine.getAllPrices().priceWithTaxBeforeDiscount -
-                        orderLine.getAllPrices().priceWithTax;
+                    const data = orderLine.order_id.prices.baseLineByLineUuids[orderLine.uuid];
+                    sum += data.tax_details.discount_amount;
                     if (
                         orderLine.displayDiscountPolicy() === "without_discount" &&
                         !(orderLine.price_type === "manual") &&
                         orderLine.discount == 0
                     ) {
                         sum +=
-                            (orderLine.getTaxedlstUnitPrice() -
-                                orderLine.getUnitDisplayPriceBeforeDiscount()) *
+                            (orderLine.currencyDisplayPriceUnit -
+                                orderLine.unitPrices.no_discount_total_included) *
                             orderLine.getQuantity();
                     }
                 }
@@ -653,103 +523,8 @@ export class PosOrder extends Base {
         );
     }
 
-    getTotalTax() {
-        return this.taxTotals.order_sign * this.taxTotals.tax_amount_currency;
-    }
-
-    getTotalPaid() {
-        return this.currency.round(
-            this.payment_ids.reduce(function (sum, paymentLine) {
-                if (paymentLine.isDone()) {
-                    sum += paymentLine.getAmount();
-                }
-                return sum;
-            }, 0)
-        );
-    }
-
-    getTotalDue() {
-        return this.taxTotals.order_sign * this.taxTotals.order_total;
-    }
-
-    getTaxDetails() {
-        return this.getTaxDetailsOfLines(this.lines);
-    }
-
-    getTaxDetailsOfLines(lines) {
-        const taxDetails = {};
-        for (const line of lines) {
-            for (const taxData of line.allPrices.taxesData) {
-                const taxId = taxData.tax.id;
-                if (!taxDetails[taxId]) {
-                    taxDetails[taxId] = Object.assign({}, taxData, {
-                        amount: 0.0,
-                        base: 0.0,
-                        tax_percentage: taxData.tax.amount,
-                    });
-                }
-                taxDetails[taxId].base += taxData.base_amount_currency;
-                taxDetails[taxId].amount += taxData.tax_amount_currency;
-            }
-        }
-        return Object.values(taxDetails);
-    }
-
-    // TODO: deprecated. Remove it and fix l10n_de_pos_cert accordingly.
-    getTotalForTaxes(tax_id) {
-        let total = 0;
-
-        if (!(tax_id instanceof Array)) {
-            tax_id = [tax_id];
-        }
-
-        const tax_set = {};
-
-        for (var i = 0; i < tax_id.length; i++) {
-            tax_set[tax_id[i]] = true;
-        }
-
-        this.lines.forEach((line) => {
-            var taxes_ids = this.tax_ids || line.getProduct().taxes_id;
-            for (var i = 0; i < taxes_ids.length; i++) {
-                if (tax_set[taxes_ids[i]]) {
-                    total += line.getPriceWithTax();
-                    return;
-                }
-            }
-        });
-
-        return total;
-    }
-
-    /**
-     * Checks whether to show "Remaining" or "Change" in the payment status.
-     * If the remaining amount is compensated by the rounding, then we show "Remaining".
-     */
-    hasRemainingAmount() {
-        const { order_remaining } = this.taxTotals;
-        return this.orderHasZeroRemaining || !this.currency.isNegative(order_remaining);
-    }
-
-    getChange() {
-        let { order_sign, order_remaining: remaining } = this.taxTotals;
-        if (this.config.cash_rounding) {
-            remaining = this.getRoundedRemaining(this.config.rounding_method, remaining);
-        }
-        return -order_sign * remaining;
-    }
-
-    getDue() {
-        return this.taxTotals.order_sign * this.currency.round(this.taxTotals.order_remaining);
-    }
-
-    getRoundingApplied() {
-        return this.taxTotals.order_sign * (this.taxTotals.order_rounding || 0.0);
-    }
-
     isPaid() {
-        const { order_remaining } = this.taxTotals;
-        return this.orderHasZeroRemaining || this.currency.isNegative(order_remaining);
+        return this.orderHasZeroRemaining;
     }
 
     isRefundInProcess() {
@@ -954,16 +729,8 @@ export class PosOrder extends Base {
         this.internal_note = note || "";
     }
 
-    get orderChange() {
-        return this.getChange();
-    }
-
-    get showRounding() {
-        return !this.currency.isZero(this.taxTotals.order_rounding);
-    }
-
     get showChange() {
-        return !this.currency.isZero(this.orderChange) && this.finalized;
+        return !this.currency.isZero(this.change) && this.finalized;
     }
 
     getOrderData(reprint = false) {
diff --git a/addons/point_of_sale/static/src/app/models/pos_order_line.js b/addons/point_of_sale/static/src/app/models/pos_order_line.js
index 5e456514fe924..51430f28441e1 100644
--- a/addons/point_of_sale/static/src/app/models/pos_order_line.js
+++ b/addons/point_of_sale/static/src/app/models/pos_order_line.js
@@ -1,15 +1,12 @@
 import { registry } from "@web/core/registry";
 import { constructFullProductName, constructAttributeString } from "@point_of_sale/utils";
-import { Base } from "./related_models";
 import { parseFloat } from "@web/views/fields/parsers";
 import { formatFloat } from "@web/core/utils/numbers";
-import { formatCurrency } from "./utils/currency";
 import { _t } from "@web/core/l10n/translation";
 import { localization as l10n } from "@web/core/l10n/localization";
-import { getTaxesAfterFiscalPosition } from "@point_of_sale/app/models/utils/tax_utils";
-import { accountTaxHelpers } from "@account/helpers/account_tax";
+import { PosOrderlineAccounting } from "./accounting/pos_order_line_accounting";
 
-export class PosOrderline extends Base {
+export class PosOrderline extends PosOrderlineAccounting {
     static pythonModel = "pos.order.line";
 
     setup(vals) {
@@ -227,17 +224,6 @@ export class PosOrderline extends Base {
 
         const disc = Math.min(Math.max(parsed_discount || 0, 0), 100);
         this.discount = disc;
-        this.order_id.recomputeOrderData();
-    }
-
-    setLinePrice() {
-        const prices = this.getAllPrices();
-        if (this.price_subtotal !== prices.priceWithoutTax) {
-            this.price_subtotal = prices.priceWithoutTax;
-        }
-        if (this.price_subtotal_incl !== prices.priceWithTax) {
-            this.price_subtotal_incl = prices.priceWithTax;
-        }
     }
 
     // sets the qty of the product. The qty will be rounded according to the
@@ -393,35 +379,6 @@ export class PosOrderline extends Base {
         });
     }
 
-    prepareBaseLineForTaxesComputationExtraValues(customValues = {}) {
-        const order = this.order_id;
-        const currency = order.config.currency_id;
-        const extraValues = { currency_id: currency };
-        const product = this.getProduct();
-        const priceUnit = this.getUnitPrice();
-        const discount = this.getDiscount();
-
-        const values = {
-            ...extraValues,
-            quantity: this.qty,
-            price_unit: priceUnit,
-            discount: discount,
-            tax_ids: this.tax_ids,
-            product_id: product,
-            rate: 1.0,
-            is_refund: this.qty * priceUnit < 0,
-            ...customValues,
-        };
-        if (order.fiscal_position_id) {
-            values.tax_ids = getTaxesAfterFiscalPosition(
-                values.tax_ids,
-                order.fiscal_position_id,
-                order.models
-            );
-        }
-        return values;
-    }
-
     setUnitPrice(price) {
         const ProductPrice = this.models["decimal.precision"].find(
             (dp) => dp.name === "Product Price"
@@ -434,157 +391,6 @@ export class PosOrderline extends Base {
         this.price_unit = ProductPrice.round(parsed_price || 0);
     }
 
-    getUnitPrice() {
-        const ProductPrice = this.models["decimal.precision"].find(
-            (dp) => dp.name === "Product Price"
-        );
-        return ProductPrice.round(this.price_unit || 0);
-    }
-
-    get unitDisplayPrice() {
-        const prices =
-            this.combo_line_ids.length > 0
-                ? this.combo_line_ids.reduce(
-                      (acc, cl) => ({
-                          priceWithTax: acc.priceWithTax + cl.allUnitPrices.priceWithTax,
-                          priceWithoutTax: acc.priceWithoutTax + cl.allUnitPrices.priceWithoutTax,
-                      }),
-                      { priceWithTax: 0, priceWithoutTax: 0 }
-                  )
-                : this.allUnitPrices;
-
-        return this.config.iface_tax_included === "total"
-            ? prices.priceWithTax
-            : prices.priceWithoutTax;
-    }
-
-    getUnitDisplayPriceBeforeDiscount() {
-        if (this.config.iface_tax_included === "total") {
-            return this.allUnitPrices.priceWithTaxBeforeDiscount;
-        } else {
-            return this.allUnitPrices.priceWithoutTaxBeforeDiscount;
-        }
-    }
-    getBasePrice() {
-        return this.currency.round(
-            this.getUnitPrice() * this.getQuantity() * (1 - this.getDiscount() / 100)
-        );
-    }
-
-    getDisplayPrice() {
-        if (this.config.iface_tax_included === "total") {
-            return this.getPriceWithTax();
-        } else {
-            return this.getPriceWithoutTax();
-        }
-    }
-
-    getTaxedlstUnitPrice() {
-        const company = this.company;
-        const product = this.getProduct();
-        const baseLine = accountTaxHelpers.prepare_base_line_for_taxes_computation(
-            this,
-            this.prepareBaseLineForTaxesComputationExtraValues({
-                price_unit: this.getlstPrice(),
-                quantity: 1,
-                tax_ids: product.taxes_id,
-            })
-        );
-        accountTaxHelpers.add_tax_details_in_base_line(baseLine, company);
-        accountTaxHelpers.round_base_lines_tax_details([baseLine], company);
-        const taxDetails = baseLine.tax_details;
-
-        if (this.config.iface_tax_included === "total") {
-            return taxDetails.total_included_currency;
-        } else {
-            return taxDetails.total_excluded_currency;
-        }
-    }
-
-    getPriceWithoutTax() {
-        return this.allPrices.priceWithoutTax;
-    }
-
-    getPriceWithTax() {
-        return this.allPrices.priceWithTax;
-    }
-
-    getTax() {
-        return this.allPrices.tax;
-    }
-
-    getTaxDetails() {
-        return this.allPrices.taxDetails;
-    }
-
-    getAllPrices(qty = this.getQuantity()) {
-        const company = this.company;
-        const product = this.getProduct();
-        const taxes = this.tax_ids || product.taxes_id;
-        const baseLine = accountTaxHelpers.prepare_base_line_for_taxes_computation(
-            this,
-            this.prepareBaseLineForTaxesComputationExtraValues({
-                quantity: qty,
-                tax_ids: taxes,
-            })
-        );
-        accountTaxHelpers.add_tax_details_in_base_line(baseLine, company);
-        accountTaxHelpers.round_base_lines_tax_details([baseLine], company);
-
-        const baseLineNoDiscount = accountTaxHelpers.prepare_base_line_for_taxes_computation(
-            this,
-            this.prepareBaseLineForTaxesComputationExtraValues({
-                quantity: qty,
-                tax_ids: taxes,
-                discount: 0.0,
-            })
-        );
-        accountTaxHelpers.add_tax_details_in_base_line(baseLineNoDiscount, company);
-        accountTaxHelpers.round_base_lines_tax_details([baseLineNoDiscount], company);
-
-        // Tax details.
-        const taxDetails = {};
-        for (const taxData of baseLine.tax_details.taxes_data) {
-            taxDetails[taxData.tax.id] = {
-                amount: taxData.tax_amount_currency,
-                base: taxData.base_amount_currency,
-            };
-        }
-
-        return {
-            priceWithTax: baseLine.tax_details.total_included_currency,
-            priceWithoutTax: baseLine.tax_details.total_excluded_currency,
-            priceWithTaxBeforeDiscount: baseLineNoDiscount.tax_details.total_included_currency,
-            priceWithoutTaxBeforeDiscount: baseLineNoDiscount.tax_details.total_excluded_currency,
-            tax:
-                baseLine.tax_details.total_included_currency -
-                baseLine.tax_details.total_excluded_currency,
-            taxDetails: taxDetails,
-            taxesData: baseLine.tax_details.taxes_data,
-        };
-    }
-
-    computePriceWithTaxBeforeDiscount() {
-        return this.combo_line_ids.length > 0
-            ? // total of all combo lines if it is combo parent
-              formatCurrency(
-                  this.combo_line_ids.reduce(
-                      (total, cl) => total + cl.allPrices.priceWithTaxBeforeDiscount,
-                      0
-                  ),
-                  this.currency
-              )
-            : formatCurrency(this.allPrices.priceWithTaxBeforeDiscount, this.currency);
-    }
-
-    get allPrices() {
-        return this.getAllPrices();
-    }
-
-    get allUnitPrices() {
-        return this.getAllPrices(1);
-    }
-
     displayDiscountPolicy() {
         // Sales dropped `discount_policy`, and we only show discount if applied pricelist rule
         // is a percentage discount. However we don't have that information in pos
@@ -600,16 +406,6 @@ export class PosOrderline extends Base {
         return "with_discount";
     }
 
-    getlstPrice() {
-        return this.product_id.getPrice(
-            this.config.pricelist_id,
-            1,
-            this.price_extra,
-            false,
-            this.product_id
-        );
-    }
-
     setCustomerNote(note) {
         this.customer_note = note || "";
     }
@@ -650,31 +446,6 @@ export class PosOrderline extends Base {
         return Boolean(this.combo_parent_id || this.combo_line_ids?.length);
     }
 
-    getComboTotalPrice() {
-        const allLines = this.getAllLinesInCombo();
-        return allLines.reduce((total, line) => total + line.allUnitPrices.priceWithTax, 0);
-    }
-    getComboTotalPriceWithoutTax() {
-        const allLines = this.getAllLinesInCombo();
-        return allLines.reduce((total, line) => total + line.getBasePrice() / line.qty, 0);
-    }
-
-    getPriceString() {
-        return this.getDiscountStr() === "100"
-            ? // free if the discount is 100
-              _t("Free")
-            : this.combo_line_ids.length > 0
-            ? // total of all combo lines if it is combo parent
-              formatCurrency(
-                  this.combo_line_ids.reduce((total, cl) => total + cl.getDisplayPrice(), 0),
-                  this.currency
-              )
-            : this.combo_parent_id
-            ? // empty string if it has combo parent
-              ""
-            : formatCurrency(this.getDisplayPrice(), this.currency);
-    }
-
     get packLotLines() {
         return this.pack_lot_ids.map(
             (l) =>
@@ -684,20 +455,6 @@ export class PosOrderline extends Base {
         );
     }
 
-    get taxGroupLabels() {
-        return [
-            ...new Set(
-                getTaxesAfterFiscalPosition(
-                    this.product_id.taxes_id,
-                    this.order_id.fiscal_position_id,
-                    this.models
-                )
-                    ?.map((tax) => tax.tax_group_id?.pos_receipt_label)
-                    .filter((label) => label)
-            ),
-        ].join(" ");
-    }
-
     getDiscount() {
         return this.discount || 0;
     }
diff --git a/addons/point_of_sale/static/src/app/models/product_template.js b/addons/point_of_sale/static/src/app/models/product_template.js
index 311e650a58e2f..779c1340a865e 100644
--- a/addons/point_of_sale/static/src/app/models/product_template.js
+++ b/addons/point_of_sale/static/src/app/models/product_template.js
@@ -1,10 +1,6 @@
 import { registry } from "@web/core/registry";
-import { Base } from "./related_models";
-import { _t } from "@web/core/l10n/translation";
-import { roundPrecision } from "@web/core/utils/numbers";
 import { markup } from "@odoo/owl";
-import { getTaxesAfterFiscalPosition, getTaxesValues } from "./utils/tax_utils";
-import { accountTaxHelpers } from "@account/helpers/account_tax";
+import { ProductTemplateAccounting } from "./accounting/product_template_accounting";
 
 /**
  * ProductProduct, shadow of product.product in python.
@@ -15,82 +11,9 @@ import { accountTaxHelpers } from "@account/helpers/account_tax";
  * Models to load: product.product, uom.uom
  */
 
-export class ProductTemplate extends Base {
+export class ProductTemplate extends ProductTemplateAccounting {
     static pythonModel = "product.template";
 
-    prepareProductBaseLineForTaxesComputationExtraValues(
-        price,
-        pricelist = false,
-        fiscalPosition = false
-    ) {
-        const config = this.models["pos.config"].getFirst();
-        const productTemplate = this instanceof ProductTemplate ? this : this.product_tmpl_id;
-        const basePrice = this?.lst_price || productTemplate.getPrice(pricelist, 1);
-        const priceUnit = price || price === 0 ? price : basePrice;
-        const currency = config.currency_id;
-        const extraValues = { currency_id: currency };
-
-        let taxes = this.taxes_id;
-
-        // Fiscal position.
-        if (fiscalPosition) {
-            taxes = getTaxesAfterFiscalPosition(taxes, fiscalPosition, this.models);
-        }
-
-        return {
-            ...extraValues,
-            product_id: this,
-            quantity: 1,
-            price_unit: priceUnit,
-            tax_ids: taxes,
-        };
-    }
-
-    getProductPrice(price = false, pricelist = false, fiscalPosition = false) {
-        const config = this.models["pos.config"].getFirst();
-        const baseLine = accountTaxHelpers.prepare_base_line_for_taxes_computation(
-            {},
-            this.prepareProductBaseLineForTaxesComputationExtraValues(
-                price,
-                pricelist,
-                fiscalPosition
-            )
-        );
-        accountTaxHelpers.add_tax_details_in_base_line(baseLine, config.company_id);
-        accountTaxHelpers.round_base_lines_tax_details([baseLine], config.company_id);
-
-        if (config.iface_tax_included === "total") {
-            return baseLine.tax_details.total_included_currency;
-        } else {
-            return baseLine.tax_details.total_excluded_currency;
-        }
-    }
-    getProductPriceInfo(product, company, pricelist = false, fiscalPosition = false) {
-        if (!product) {
-            product = this.product_variant_ids[0];
-        }
-        const price = this.getPrice(pricelist, 1, 0, false, product);
-
-        const extraValues = this.prepareProductBaseLineForTaxesComputationExtraValues(
-            price,
-            pricelist,
-            fiscalPosition
-        );
-
-        // Taxes computation.
-        const taxesData = getTaxesValues(
-            extraValues.tax_ids,
-            extraValues.price_unit,
-            extraValues.quantity,
-            product,
-            extraValues.product_id,
-            company,
-            extraValues.currency_id
-        );
-
-        return taxesData;
-    }
-
     isAllowOnlyOneLot() {
         return this.tracking === "lot" || !this.uom_id || !this.uom_id.is_pos_groupable;
     }
@@ -157,112 +80,6 @@ export class ProductTemplate extends Base {
         return current;
     }
 
-    // Port of _get_product_price on product.pricelist.
-    //
-    // Anything related to UOM can be ignored, the POS will always use
-    // the default UOM set on the product and the user cannot change
-    // it.
-    //
-    // Pricelist items do not have to be sorted. All
-    // product.pricelist.item records are loaded with a search_read
-    // and were automatically sorted based on their _order by the
-    // ORM. After that they are added in this order to the pricelists.
-    getPrice(
-        pricelist,
-        quantity,
-        price_extra = 0,
-        recurring = false,
-        variant = false,
-        original_line = false,
-        related_lines = []
-    ) {
-        // In case of nested pricelists, it is necessary that all pricelists are made available in
-        // the POS. Display a basic alert to the user in the case where there is a pricelist item
-        // but we can't load the base pricelist to get the price when calling this method again.
-        // As this method is also call without pricelist available in the POS, we can't just check
-        // the absence of pricelist.
-        if (recurring && !pricelist) {
-            alert(
-                _t(
-                    "An error occurred when loading product prices. " +
-                        "Make sure all pricelists are available in the POS."
-                )
-            );
-        }
-
-        const product = variant;
-        const productTmpl = variant.product_tmpl_id || this;
-        const standardPrice = variant ? variant.standard_price : this.standard_price;
-        const basePrice = variant ? variant.lst_price : this.list_price;
-        let price = basePrice + (price_extra || 0);
-
-        if (!pricelist) {
-            return price;
-        }
-
-        if (original_line && original_line.isLotTracked()) {
-            related_lines.push(
-                ...original_line.order_id.lines.filter(
-                    (line) => line.product_id.product_tmpl_id.id == this.id
-                )
-            );
-            quantity = related_lines.reduce((sum, line) => sum + line.getQuantity(), 0);
-        }
-
-        const tmplRules = (productTmpl.backLink("<-product.pricelist.item.product_tmpl_id") || [])
-            .filter((rule) => rule.pricelist_id.id === pricelist.id && !rule.product_id)
-            .sort((a, b) => b.min_quantity - a.min_quantity);
-        const productRules = (product?.backLink?.("<-product.pricelist.item.product_id") || [])
-            .filter((rule) => rule.pricelist_id.id === pricelist.id)
-            .sort((a, b) => b.min_quantity - a.min_quantity);
-
-        const tmplRulesSet = new Set(tmplRules.map((rule) => rule.id));
-        const productRulesSet = new Set(productRules.map((rule) => rule.id));
-        const generalRulesIds = pricelist.getGeneralRulesIdsByCategories(this.parentCategories);
-        const rules = this.models["product.pricelist.item"]
-            .readMany([...productRulesSet, ...tmplRulesSet, ...generalRulesIds])
-            .filter((r) => r.min_quantity <= quantity);
-
-        const rule = rules.length && rules[0];
-        if (!rule) {
-            return price;
-        }
-        if (rule.base === "pricelist") {
-            if (rule.base_pricelist_id) {
-                price = this.getPrice(rule.base_pricelist_id, quantity, 0, true, variant);
-            }
-        } else if (rule.base === "standard_price") {
-            price = standardPrice;
-        }
-
-        if (rule.compute_price === "fixed") {
-            price = rule.fixed_price;
-        } else if (rule.compute_price === "percentage") {
-            price = price - price * (rule.percent_price / 100);
-        } else {
-            var price_limit = price;
-            price -= price * (rule.price_discount / 100);
-            if (rule.price_round) {
-                price = roundPrecision(price, rule.price_round);
-            }
-            if (rule.price_surcharge) {
-                price += rule.price_surcharge;
-            }
-            if (rule.price_min_margin) {
-                price = Math.max(price, price_limit + rule.price_min_margin);
-            }
-            if (rule.price_max_margin) {
-                price = Math.min(price, price_limit + rule.price_max_margin);
-            }
-        }
-
-        // This return value has to be rounded with round_di before
-        // being used further. Note that this cannot happen here,
-        // because it would cause inconsistencies with the backend for
-        // pricelist that have base == 'pricelist'.
-        return price;
-    }
-
     getImageUrl() {
         return (
             (this.image_128 &&
diff --git a/addons/point_of_sale/static/src/app/models/utils/tax_utils.js b/addons/point_of_sale/static/src/app/models/utils/tax_utils.js
deleted file mode 100644
index 1a9e6720a83ee..0000000000000
--- a/addons/point_of_sale/static/src/app/models/utils/tax_utils.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { accountTaxHelpers } from "@account/helpers/account_tax";
-
-/**
- * This method will return a new price so that if you apply the taxes the price will remain the same
- * For example if the original price is 50. It will compute a new price so that if you apply the tax_ids
- * the price would still be 50.
- */
-export const computePriceForcePriceInclude = (
-    tax_ids,
-    price,
-    product,
-    product_default_values,
-    company,
-    currency,
-    models
-) => {
-    const tax_res = getTaxesValues(
-        tax_ids,
-        price,
-        1,
-        product,
-        product_default_values,
-        company,
-        currency,
-        "total_included"
-    );
-    let new_price = tax_res.total_excluded;
-    new_price += tax_res.taxes_data
-        .filter((tax) => models["account.tax"].get(tax.id).price_include)
-        .reduce((sum, tax) => (sum += tax.tax_amount), 0);
-    return new_price;
-};
-
-export const getTaxesValues = (
-    taxes,
-    priceUnit,
-    quantity,
-    product,
-    productDefaultValues,
-    company,
-    currency,
-    special_mode = null
-) => {
-    const baseLine = accountTaxHelpers.prepare_base_line_for_taxes_computation(
-        {},
-        {
-            product_id: product,
-            tax_ids: taxes,
-            price_unit: priceUnit,
-            quantity: quantity,
-            currency_id: currency,
-            special_mode: special_mode,
-        }
-    );
-    accountTaxHelpers.add_tax_details_in_base_line(baseLine, company);
-    accountTaxHelpers.round_base_lines_tax_details([baseLine], company);
-
-    const results = baseLine.tax_details;
-    for (const taxData of results.taxes_data) {
-        Object.assign(taxData, taxData.tax.raw);
-    }
-    return results;
-};
-
-export const getTaxesAfterFiscalPosition = (taxes, fiscalPosition, models) => {
-    if (!fiscalPosition) {
-        return taxes;
-    }
-
-    if (fiscalPosition.tax_ids?.length == 0) {
-        return [];
-    }
-
-    const newTaxIds = [];
-    for (const tax of taxes) {
-        if (fiscalPosition.tax_map[tax.id]) {
-            for (const mapTaxId of fiscalPosition.tax_map[tax.id]) {
-                newTaxIds.push(mapTaxId);
-            }
-        } else {
-            newTaxIds.push(tax.id);
-        }
-    }
-
-    return models["account.tax"].filter((tax) => newTaxIds.includes(tax.id));
-};
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
index d2a4866a63480..c3f7fa125c199 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
@@ -146,8 +146,8 @@ export class PaymentScreen extends Component {
         }
         // original function: click_paymentmethods
         const result = this.currentOrder.addPaymentline(paymentMethod);
-        if (result) {
-            this.numberBuffer.set(result.amount.toString());
+        if (result.status) {
+            this.numberBuffer.set(result.data.amount.toString());
             if (
                 paymentMethod.use_payment_terminal &&
                 !this.isRefundOrder &&
@@ -188,11 +188,11 @@ export class PaymentScreen extends Component {
         );
         if (
             !hasCashPaymentMethod &&
-            amount > this.currentOrder.getDue() + this.selectedPaymentLine.amount
+            amount > this.currentOrder.remainingDue + this.selectedPaymentLine.amount
         ) {
             this.selectedPaymentLine.setAmount(0);
-            this.numberBuffer.set(this.currentOrder.getDue().toString());
-            amount = this.currentOrder.getDue();
+            this.numberBuffer.set(this.currentOrder.remainingDue.toString());
+            amount = this.currentOrder.remainingDue;
             this.showMaxValueError();
         }
         if (
@@ -223,7 +223,7 @@ export class PaymentScreen extends Component {
     }
     async addTip() {
         const tip = this.currentOrder.getTip();
-        const change = this.currentOrder.getChange();
+        const change = Math.abs(this.currentOrder.change);
         const value = tip === 0 && change > 0 ? change : tip;
         const newTip = await makeAwaitable(this.dialog, NumberPopup, {
             title: tip ? _t("Change Tip") : _t("Add Tip"),
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml
index b23cf21324746..c3d44e5be47b4 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.xml
@@ -72,7 +72,7 @@
             }">
             <div class="total text-center text-dark"
                 t-att-style="!ui.isSmall? 'font-size: 125px;' : ''" >
-                <PriceFormatter price="this.env.utils.formatCurrency(currentOrder.getTotalDue())" />
+                <PriceFormatter price="this.env.utils.formatCurrency(currentOrder.totalDue)" />
             </div>
         </section>
     </t>
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.js b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.js
index fe571d8c17d78..24464c9ca88dd 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.js
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.js
@@ -1,5 +1,6 @@
 import { Component } from "@odoo/owl";
 import { PriceFormatter } from "@point_of_sale/app/components/price_formatter/price_formatter";
+import { _t } from "@web/core/l10n/translation";
 
 export class PaymentScreenStatus extends Component {
     static template = "point_of_sale.PaymentScreenStatus";
@@ -8,14 +9,38 @@ export class PaymentScreenStatus extends Component {
     };
     static components = { PriceFormatter };
 
-    get changeText() {
-        return this.env.utils.formatCurrency(this.props.order.getChange());
+    get isComplete() {
+        return this.isRemaining && this.order.orderHasZeroRemaining;
     }
-    get remainingText() {
-        const { order_remaining, order_sign } = this.props.order.taxTotals;
-        if (this.props.order.orderHasZeroRemaining) {
-            return this.env.utils.formatCurrency(0);
+
+    get order() {
+        return this.props.order;
+    }
+
+    get isRemaining() {
+        const isNegative = this.order.totalDue < 0;
+        const remainingDue = this.order.remainingDue;
+
+        if ((isNegative && remainingDue > 0) || (!isNegative && remainingDue <= 0)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    get statusText() {
+        if (!this.isRemaining) {
+            return _t("Change");
+        } else {
+            return _t("Remaining");
+        }
+    }
+
+    get amountText() {
+        if (!this.isRemaining) {
+            return this.env.utils.formatCurrency(this.order.change);
+        } else {
+            return this.env.utils.formatCurrency(this.order.remainingDue);
         }
-        return this.env.utils.formatCurrency(order_sign * order_remaining);
     }
 }
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml
index 82d020d0c5f0a..d52c672523daa 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml
@@ -5,18 +5,12 @@
         <div t-if="props.order.payment_ids.length == 0" class="d-flex justify-content-center align-items-center text-center fs-4 flex-grow-1">
     Please select a payment method
         </div>
-        <section t-else="" t-attf-class="paymentlines-container border-top pt-3 {{ props.order.getDue() > 0 ? 'text-danger' : 'text-success'}}">
+        <section t-else="" t-attf-class="paymentlines-container border-top pt-3 {{ !isComplete ? 'text-danger' : 'text-success'}}">
             <div class="payment-status-container d-flex flex-column-reverse flex-lg-row justify-content-between fs-2">
-                <div t-if="this.props.order.hasRemainingAmount()" class="payment-status-remaining d-flex justify-content-between flex-grow-1">
-                    <span class="label pe-2">Remaining</span>
-                    <span class="amount align-self-end me-5 pe-5" t-att-class="{ 'highlight text-danger fw-bolder': props.order.getDue() > 0 }">
-                        <PriceFormatter price="remainingText" />
-                    </span>
-                </div>
-                <div t-else="" class="payment-status-change d-flex justify-content-between flex-grow-1">
-                    <span class="label pe-2">Change</span>
-                    <span class="amount align-self-end me-5 pe-5" t-att-class="{ 'highlight text-success fw-bolder': props.order.getChange() > 0 }">
-                        <PriceFormatter price="changeText" />
+                <div class="payment-status-amount d-flex justify-content-between flex-grow-1">
+                    <span class="label pe-2" t-out="statusText" />
+                    <span class="amount align-self-end me-5 pe-5" t-att-class="{ 'highlight text-danger fw-bolder': !isComplete }">
+                        <PriceFormatter price="amountText" />
                     </span>
                 </div>
             </div>
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js b/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js
index 702c6931e2217..d1fff9314b0ad 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js
@@ -158,7 +158,7 @@ export class OrderSummary extends Component {
             } else if (this.pos.numpadMode === "discount") {
                 buffer = selectedLine.getDiscount() * -1;
             } else if (this.pos.numpadMode === "price") {
-                buffer = selectedLine.getUnitPrice() * -1;
+                buffer = selectedLine.prices.total_excluded_currency * -1;
             }
             this.numberBuffer.state.buffer = buffer.toString();
         }
@@ -211,7 +211,7 @@ export class OrderSummary extends Component {
         ) {
             this.numberBuffer.reset();
             const inputNumber = await makeAwaitable(this.dialog, NumberPopup, {
-                startingValue: selectedLine.getUnitPrice(),
+                startingValue: selectedLine.prices.total_excluded_currency,
                 title: _t("Set the new price"),
             });
             if (inputNumber) {
@@ -305,7 +305,7 @@ export class OrderSummary extends Component {
                 current_saved_quantity += line.uiState.savedQuantity;
             } else if (
                 line.product_id.id === selectedLine.product_id.id &&
-                line.getUnitPrice() === selectedLine.getUnitPrice()
+                line.prices.total_excluded_currency === selectedLine.prices.total_excluded_currency
             ) {
                 current_saved_quantity += line.qty;
             }
@@ -328,7 +328,8 @@ export class OrderSummary extends Component {
             for (const line of selectedLine.order_id.lines) {
                 if (
                     line.product_id.id === selectedLine.product_id.id &&
-                    line.getUnitPrice() === selectedLine.getUnitPrice() &&
+                    line.prices.total_excluded_currency ===
+                        selectedLine.prices.total_excluded_currency &&
                     line.getQuantity() * sign < 0 &&
                     line !== selectedLine
                 ) {
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js b/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
index 22c73d6e5aeb0..fd30fcaf0df9b 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js
@@ -194,7 +194,7 @@ export class ProductScreen extends Component {
         return this.pos.getOrder();
     }
     get total() {
-        return this.env.utils.formatCurrency(this.currentOrder?.getTotalWithTax() ?? 0);
+        return this.currentOrder?.currencyDisplayPrice || 0;
     }
     get items() {
         return this.env.utils.formatProductQty(
@@ -321,10 +321,6 @@ export class ProductScreen extends Component {
         this.pos.switchPane();
     }
 
-    getProductPrice(product) {
-        return this.pos.getProductPrice(product, false, true);
-    }
-
     getProductImage(product) {
         return product.getImageUrl();
     }
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
index 08cf15909985c..745095c1b1d97 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
+++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
@@ -15,12 +15,12 @@
                 </Orderline>
             </OrderDisplay>
             <t t-if="!props.basic_receipt">
-                <t t-set="taxTotals" t-value="order.taxTotals"/>
+                <t t-set="taxTotals" t-value="order.prices.taxDetails"/>
                 <div t-if="taxTotals and taxTotals.has_tax_groups" class="pos-receipt-taxes pt-3">
                     <t t-foreach="taxTotals.subtotals" t-as="subtotal" t-key="subtotal.name">
                         <div class="d-flex">
                             <span class="text-nowrap mw-100">Subtotal</span>
-                            <span t-out="formatCurrency(subtotal.base_amount_currency)" class="ms-auto font-monospace"/>
+                            <span t-out="formatCurrency(order.priceExcl)" class="ms-auto font-monospace"/>
                         </div>
 
                         <div t-foreach="subtotal.tax_groups" t-as="tax_group" t-key="tax_group.id" class="d-flex">
@@ -42,16 +42,16 @@
                 <!-- Total -->
                 <div class="pos-receipt-amount receipt-total fw-bolder">
                     <span class="label-total">Total</span>
-                    <span t-out="formatCurrency(taxTotals.order_sign * taxTotals.order_total)" class="pos-receipt-right-align font-monospace"/>
+                    <span t-out="order.currencyDisplayPrice" class="pos-receipt-right-align font-monospace"/>
                 </div>
-                <t t-if="order.showRounding">
+                <t t-if="order.appliedRounding">
                     <div class="pos-receipt-amount receipt-rounding">
                         <span class="label-rounding">Rounding</span>
-                        <span t-out='formatCurrency(taxTotals.order_sign * taxTotals.order_rounding)' class="pos-receipt-right-align font-monospace"/>
+                        <span t-out='formatCurrency(order.appliedRounding)' class="pos-receipt-right-align font-monospace"/>
                     </div>
                     <div class="pos-receipt-amount receipt-to-pay">
                         To Pay
-                        <span t-out='formatCurrency(taxTotals.order_sign * (taxTotals.order_total + taxTotals.order_rounding))' class="pos-receipt-right-align font-monospace"/>
+                        <span t-out='formatCurrency(order.totalDue)' class="pos-receipt-right-align font-monospace"/>
                     </div>
                 </t>
 
@@ -63,7 +63,7 @@
 
                 <div t-if="order.showChange" class="pos-receipt-amount receipt-change">
                     <span class="label-change">Change</span>
-                    <span t-out="formatCurrency(order.orderChange)" class="pos-receipt-right-align font-monospace"/>
+                    <span t-out="formatCurrency(order.change)" class="pos-receipt-right-align font-monospace"/>
                 </div>
 
                 <!-- Extra Payment Info -->
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
index e8ed59dc414ef..789b8889f2ff3 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
@@ -51,12 +51,12 @@ export class ReceiptScreen extends Component {
     }
     get orderAmountPlusTip() {
         const order = this.currentOrder;
-        const orderTotalAmount = order.getTotalWithTax();
+        const orderTotalAmount = order.priceIncl;
         const tip_product_id = this.pos.config.tip_product_id?.id;
         const tipLine = order
             .getOrderlines()
             .find((line) => tip_product_id && line.product_id.id === tip_product_id);
-        const tipAmount = tipLine ? tipLine.allPrices.priceWithTax : 0;
+        const tipAmount = tipLine ? tipLine.prices.total_included : 0;
         const orderAmountStr = this.env.utils.formatCurrency(orderTotalAmount - tipAmount);
         if (!tipAmount) {
             return orderAmountStr;
diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
index aff00f2a53c8d..b29f36ae23428 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
@@ -463,7 +463,7 @@ export class TicketScreen extends Component {
         return this.pos.getDate(order.date_order);
     }
     getTotal(order) {
-        return this.env.utils.formatCurrency(order.getTotalWithTax());
+        return this.env.utils.formatCurrency(order.priceIncl);
     }
     getPartner(order) {
         return order.getPartnerName();
diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index 9cd5577380601..97945edc8d73f 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -293,24 +293,6 @@ export class PosStore extends WithLazyGetterTrap {
         this._storeConnectedCashier(user);
     }
 
-    getProductPrice(product, price = false, formatted = false) {
-        const order = this.getOrder();
-        const fiscalPosition = order.fiscal_position_id || this.config.fiscal_position_id;
-        const pricelist = order.pricelist_id || this.config.pricelist_id;
-        const pPrice = product.getProductPrice(price, pricelist, fiscalPosition);
-
-        if (formatted) {
-            const formattedPrice = this.env.utils.formatCurrency(pPrice);
-            if (product.to_weight) {
-                return `${formattedPrice}/${product.uom_id.name}`;
-            } else {
-                return formattedPrice;
-            }
-        }
-
-        return pPrice;
-    }
-
     _getConnectedCashier() {
         const cashier_id = Number(sessionStorage.getItem(`connected_cashier_${this.config.id}`));
         if (cashier_id && this.models["res.users"].get(cashier_id)) {
@@ -530,7 +512,7 @@ export class PosStore extends WithLazyGetterTrap {
                 body: _t(
                     "%s has a total amount of %s, are you sure you want to delete this order?",
                     order.pos_reference,
-                    this.env.utils.formatCurrency(order.getTotalWithTax())
+                    this.env.utils.formatCurrency(order.priceIncl)
                 ),
             });
             if (!confirmed) {
@@ -818,6 +800,7 @@ export class PosStore extends WithLazyGetterTrap {
         if (typeof vals.product_tmpl_id == "number") {
             vals.product_tmpl_id = this.data.models["product.template"].get(vals.product_tmpl_id);
         }
+
         const productTemplate = vals.product_tmpl_id;
         const values = {
             price_type: "price_unit" in vals ? "manual" : "original",
@@ -902,7 +885,7 @@ export class PosStore extends WithLazyGetterTrap {
                 this.scale.setProduct(
                     values.product_id,
                     decimalAccuracy,
-                    this.getProductPrice(values.product_id)
+                    values.product_id.getTaxDetails().total_included
                 );
                 const weight = await this.weighProduct();
                 if (weight) {
@@ -962,9 +945,6 @@ export class PosStore extends WithLazyGetterTrap {
             });
         }
 
-        // FIXME: Put this in an effect so that we don't have to call it manually.
-        order.recomputeOrderData();
-
         if (configure) {
             this.numberBuffer.reset();
         }
@@ -1270,8 +1250,6 @@ export class PosStore extends WithLazyGetterTrap {
             this.selectPreset(this.config.default_preset_id, order);
         }
 
-        order.recomputeOrderData();
-
         return order;
     }
     addNewOrder(data = {}) {
@@ -1404,8 +1382,14 @@ export class PosStore extends WithLazyGetterTrap {
         };
     }
 
-    // There for override
-    async preSyncAllOrders(orders) {}
+    async preSyncAllOrders(orders) {
+        // Prices are computed on the fly on the pos.order and pos.order.line model
+        // we need to set them before sending the orders to the backend
+        for (const order of orders) {
+            order.setOrderPrices();
+        }
+    }
+
     postSyncAllOrders(orders) {}
     async syncAllOrders(options = {}) {
         const { orderToCreate, orderToUpdate } = this.getPendingOrder();
@@ -1435,11 +1419,6 @@ export class PosStore extends WithLazyGetterTrap {
             // Add order IDs to the syncing set
             orders.forEach((order) => this.syncingOrders.add(order.uuid));
 
-            // Re-compute all taxes, prices and other information needed for the backend
-            for (const order of orders) {
-                order.recomputeOrderData();
-            }
-
             const serializedOrder = orders.map((order) => order.serializeForORM());
             const data = await this.data.call("pos.order", "sync_from_ui", [serializedOrder], {
                 context,
@@ -1579,14 +1558,14 @@ export class PosStore extends WithLazyGetterTrap {
 
         const priceWithoutTax = productInfo["all_prices"]["price_without_tax"];
         const margin = priceWithoutTax - productTemplate.standard_price;
-        const orderPriceWithoutTax = order.getTotalWithoutTax();
+        const orderPriceWithoutTax = order.priceExcl;
         const orderCost = order.getTotalCost();
         const orderMargin = orderPriceWithoutTax - orderCost;
         const orderTaxTotalCurrency = this.env.utils.formatCurrency(
-            order.taxTotals.order_sign * order.taxTotals.tax_amount_currency
+            order.prices.taxDetails.order_sign * order.prices.taxDetails.tax_amount_currency
         );
         const orderPriceWithTaxCurrency = this.env.utils.formatCurrency(
-            order.taxTotals.order_sign * order.taxTotals.total_amount_currency
+            order.prices.taxDetails.order_sign * order.prices.taxDetails.total_amount_currency
         );
         const taxAmount = this.env.utils.formatCurrency(
             productInfo.all_prices.tax_details[0]?.amount || 0
@@ -2649,19 +2628,9 @@ export class PosStore extends WithLazyGetterTrap {
 
         return this.sortByWordIndex(matches, words);
     }
-
     getPaymentMethodFmtAmount(pm, order) {
-        const { cash_rounding, only_round_cash_method } = this.config;
         const amount = order.getDefaultAmountDueToPayIn(pm);
-        const fmtAmount = this.env.utils.formatCurrency(amount, true);
-        if (
-            this.currency.isPositive(amount) &&
-            cash_rounding &&
-            !only_round_cash_method &&
-            pm.type === "cash"
-        ) {
-            return fmtAmount;
-        }
+        return this.env.utils.formatCurrency(amount, true);
     }
     getDate(date) {
         const todayTs = DateTime.now().startOf("day").ts;
diff --git a/addons/point_of_sale/static/src/app/utils/numbers.js b/addons/point_of_sale/static/src/app/utils/numbers.js
index 32e8c5c52fb23..9e6a2e2877f2d 100644
--- a/addons/point_of_sale/static/src/app/utils/numbers.js
+++ b/addons/point_of_sale/static/src/app/utils/numbers.js
@@ -70,12 +70,6 @@ export class AbstractNumbers extends Base {
         return roundPrecision(a, this.precision, this.method);
     }
 
-    /**
-     * ```
-     * asymmetricRound(1.23, { precision: 0.1, method: "UP" }) // 1.3
-     * asymmetricRound(-1.23, { precision: 0.1, method: "UP" }) // -1.2
-     * ```
-     */
     asymmetricRound(a) {
         return roundPrecision(
             a,
diff --git a/addons/point_of_sale/static/src/app/utils/order_payment_validation.js b/addons/point_of_sale/static/src/app/utils/order_payment_validation.js
index a714bd56119a1..b225423f195d4 100644
--- a/addons/point_of_sale/static/src/app/utils/order_payment_validation.js
+++ b/addons/point_of_sale/static/src/app/utils/order_payment_validation.js
@@ -141,7 +141,7 @@ export default class OrderPaymentValidation {
     }
 
     async finalizeValidation() {
-        if (this.order.isPaidWithCash() || this.order.getChange()) {
+        if (this.order.isPaidWithCash() || this.order.change) {
             this.pos.hardwareProxy.openCashbox();
         }
 
@@ -239,11 +239,12 @@ export default class OrderPaymentValidation {
     }
 
     checkCashRoundingHasBeenWellApplied() {
-        const cashRounding = this.pos.config.rounding_method;
-        if (!cashRounding) {
+        const useRound = this.pos.config.hasCashRounding;
+        if (!useRound) {
             return true;
         }
 
+        const cashRounding = this.pos.config.rounding_method;
         const order = this.pos.getOrder();
         const currency = this.pos.currency;
         for (const payment of order.payment_ids) {
@@ -329,7 +330,7 @@ export default class OrderPaymentValidation {
         }
 
         if (
-            !this.pos.currency.isZero(this.order.getTotalWithTax()) &&
+            !this.pos.currency.isZero(this.order.priceIncl) &&
             this.order.payment_ids.length === 0
         ) {
             this.pos.notification.add(_t("Select a payment method to validate the order."));
@@ -342,11 +343,8 @@ export default class OrderPaymentValidation {
 
         // The exact amount must be paid if there is no cash payment method defined.
         if (
-            Math.abs(
-                this.order.getTotalWithTax() -
-                    this.order.getTotalPaid() +
-                    this.order.getRoundingApplied()
-            ) > 0.00001
+            Math.abs(this.order.priceIncl - this.order.amountPaid + this.order.appliedRounding) >
+            0.00001
         ) {
             if (!this.pos.models["pos.payment.method"].some((pm) => pm.is_cash_count)) {
                 this.pos.dialog.add(AlertDialog, {
@@ -362,19 +360,19 @@ export default class OrderPaymentValidation {
         // if the change is too large, it's probably an input error, make the user confirm.
         if (
             !isForceValidate &&
-            this.order.getTotalWithTax() > 0 &&
-            this.order.getTotalWithTax() * 1000 < this.order.getTotalPaid()
+            this.order.priceIncl > 0 &&
+            this.order.priceIncl * 1000 < this.order.amountPaid
         ) {
             this.pos.dialog.add(ConfirmationDialog, {
                 title: _t("Please Confirm Large Amount"),
                 body:
                     _t("Are you sure that the customer wants to  pay") +
                     " " +
-                    this.pos.env.utils.formatCurrency(this.order.getTotalPaid()) +
+                    this.pos.env.utils.formatCurrency(this.order.amountPaid) +
                     " " +
                     _t("for an order of") +
                     " " +
-                    this.pos.env.utils.formatCurrency(this.order.getTotalWithTax()) +
+                    this.pos.env.utils.formatCurrency(this.order.priceIncl) +
                     " " +
                     _t('? Clicking "Confirm" will validate the payment.'),
                 confirm: () => this.validateOrder(true),
diff --git a/addons/point_of_sale/static/tests/pos/tours/acceptance_tour.js b/addons/point_of_sale/static/tests/pos/tours/acceptance_tour.js
index f0eb20351ae49..a32ec7aa3d8b1 100644
--- a/addons/point_of_sale/static/tests/pos/tours/acceptance_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/acceptance_tour.js
@@ -5,31 +5,6 @@ import { inLeftSide, waitForLoading } from "@point_of_sale/../tests/pos/tours/ut
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
-import * as OfflineUtil from "@point_of_sale/../tests/generic_helpers/offline_util";
-
-registry.category("web_tour.tours").add("pos_basic_order_01_multi_payment_and_change", {
-    steps: () =>
-        [
-            waitForLoading(),
-            Chrome.startPoS(),
-            OfflineUtil.setOfflineMode(),
-            ProductScreen.clickDisplayedProduct("Desk Organizer", true, "1", "5.10"),
-            ProductScreen.clickDisplayedProduct("Desk Organizer", true, "2", "10.20"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.enterPaymentLineAmount("Cash", "5", true, {
-                amount: "5.0",
-                remaining: "5.20",
-            }),
-            PaymentScreen.clickPaymentMethod("Bank", true, { amount: "5.2" }),
-            PaymentScreen.enterPaymentLineAmount("Bank", "6", true, {
-                amount: "6.0",
-                change: "0.80",
-            }),
-            OfflineUtil.setOnlineMode(),
-            ProductScreen.finishOrder(),
-        ].flat(),
-});
 
 registry.category("web_tour.tours").add("pos_basic_order_02_decimal_order_quantity", {
     steps: () =>
diff --git a/addons/point_of_sale/static/tests/pos/tours/payment_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/payment_screen_tour.js
index 4aa633ef1d6f2..e713bcaa5c569 100644
--- a/addons/point_of_sale/static/tests/pos/tours/payment_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/payment_screen_tour.js
@@ -145,50 +145,6 @@ registry.category("web_tour.tours").add("PaymentScreenRoundingDown", {
         ].flat(),
 });
 
-registry.category("web_tour.tours").add("PaymentScreenRoundingHalfUp", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.addOrderline("Product Test 1.20", "1"),
-            ProductScreen.clickPayButton(),
-
-            PaymentScreen.totalIs("1.20"),
-            PaymentScreen.clickPaymentMethod("Cash", true, { remaining: "0.0", amount: "1.00" }),
-
-            Chrome.clickOrders(),
-            Chrome.createFloatingOrder(),
-
-            ProductScreen.addOrderline("Product Test 1.25", "1"),
-            ProductScreen.clickPayButton(),
-
-            PaymentScreen.totalIs("1.25"),
-            PaymentScreen.clickPaymentMethod("Cash", true, { remaining: "0.0", amount: "1.50" }),
-
-            Chrome.clickOrders(),
-            Chrome.createFloatingOrder(),
-
-            ProductScreen.addOrderline("Product Test 1.4", "1"),
-            ProductScreen.clickPayButton(),
-
-            PaymentScreen.totalIs("1.4"),
-            PaymentScreen.clickPaymentMethod("Cash", true, { remaining: "0.0", amount: "1.50" }),
-
-            Chrome.clickOrders(),
-            Chrome.createFloatingOrder(),
-
-            ProductScreen.addOrderline("Product Test 1.20", "1"),
-            ProductScreen.clickPayButton(),
-
-            PaymentScreen.totalIs("1.20"),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickNumpad("2"),
-            PaymentScreen.fillPaymentLineAmountMobile("Cash", "2"),
-
-            PaymentScreen.changeIs("1.0"),
-        ].flat(),
-});
-
 registry.category("web_tour.tours").add("PaymentScreenTotalDueWithOverPayment", {
     steps: () =>
         [
@@ -199,7 +155,7 @@ registry.category("web_tour.tours").add("PaymentScreenTotalDueWithOverPayment",
             PaymentScreen.totalIs("1.98"),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.enterPaymentLineAmount("Cash", "5", true, {
-                change: "3.05",
+                change: "3",
             }),
         ].flat(),
 });
@@ -221,23 +177,6 @@ registry.category("web_tour.tours").add("InvoiceShipLaterAccessRight", {
         ].flat(),
 });
 
-registry.category("web_tour.tours").add("CashRoundingPayment", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.addOrderline("Magnetic Board", "1"),
-            ProductScreen.clickPayButton(),
-
-            // Pay it with exact amount but with incorrect rounding so there should be an error popup.
-            PaymentScreen.totalIs("1.98"),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.enterPaymentLineAmount("Cash", "1.98"),
-            PaymentScreen.clickValidate(),
-            Dialog.is(),
-        ].flat(),
-});
-
 registry.category("web_tour.tours").add("PaymentScreenInvoiceOrder", {
     steps: () =>
         [
diff --git a/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js b/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js
index f3b8158820cf0..64b0972c3ce87 100644
--- a/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js
@@ -6,443 +6,6 @@ import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import { registry } from "@web/core/registry";
 
-registry
-    .category("web_tour.tours")
-    .add("test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method", {
-        steps: () =>
-            [
-                Chrome.startPoS(),
-                Dialog.confirm("Open Register"),
-
-                // Order.
-                ProductScreen.addOrderline("random_product", "1"),
-                ProductScreen.checkTaxAmount("2.05"),
-                ProductScreen.checkTotalAmount("15.72"),
-                ProductScreen.clickPartnerButton(),
-                ProductScreen.clickCustomer("AAAAAA"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("15.72"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickInvoiceButton(),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-                ReceiptScreen.receiptToPayAmountIs("15.70"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-
-                // Refund.
-                Chrome.clickOrders(),
-                TicketScreen.selectFilter("Active"),
-                TicketScreen.selectFilter("Paid"),
-
-                TicketScreen.selectOrder("0001"),
-                TicketScreen.confirmRefund(),
-
-                PaymentScreen.isShown(),
-                PaymentScreen.clickBack(),
-
-                ProductScreen.checkTaxAmount("-2.05"),
-                ProductScreen.checkTotalAmount("-15.72"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("-15.72"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("0.02"),
-                ReceiptScreen.receiptToPayAmountIs("-15.70"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-            ].flat(),
-    });
-
-registry
-    .category("web_tour.tours")
-    .add(
-        "test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method_pay_by_bank_and_cash",
-        {
-            steps: () =>
-                [
-                    Chrome.startPoS(),
-                    Dialog.confirm("Open Register"),
-
-                    // Order.
-                    ProductScreen.addOrderline("random_product", "1"),
-                    ProductScreen.checkTaxAmount("2.05"),
-                    ProductScreen.checkTotalAmount("15.72"),
-                    ProductScreen.clickPartnerButton(),
-                    ProductScreen.clickCustomer("AAAAAA"),
-                    ProductScreen.clickPayButton(),
-
-                    PaymentScreen.totalIs("15.72"),
-                    PaymentScreen.clickPaymentMethod("Bank"),
-                    PaymentScreen.clickNumpad("0 . 6 8"),
-                    PaymentScreen.fillPaymentLineAmountMobile("Bank", "0.68"),
-                    PaymentScreen.remainingIs("15.04"),
-                    PaymentScreen.clickPaymentMethod("Cash"),
-                    PaymentScreen.remainingIs("0.0"),
-                    PaymentScreen.clickInvoiceButton(),
-                    PaymentScreen.clickValidate(),
-
-                    ReceiptScreen.receiptAmountTotalIs("15.72"),
-                    ReceiptScreen.receiptRoundingAmountIs("0.01"),
-                    ReceiptScreen.receiptToPayAmountIs("15.73"),
-                    ReceiptScreen.receiptChangeAmountIsNotThere(),
-                    ReceiptScreen.clickNextOrder(),
-
-                    // Refund.
-                    Chrome.clickOrders(),
-                    TicketScreen.selectFilter("Active"),
-                    TicketScreen.selectFilter("Paid"),
-                    TicketScreen.selectOrder("0001"),
-                    TicketScreen.confirmRefund(),
-
-                    PaymentScreen.isShown(),
-                    PaymentScreen.clickBack(),
-
-                    ProductScreen.checkTaxAmount("-2.05"),
-                    ProductScreen.checkTotalAmount("-15.72"),
-                    ProductScreen.clickPayButton(),
-
-                    PaymentScreen.totalIs("-15.72"),
-                    PaymentScreen.clickPaymentMethod("Bank"),
-                    PaymentScreen.clickNumpad("0 . 6 8 +/-"),
-                    PaymentScreen.fillPaymentLineAmountMobile("Bank", "-0.68"),
-                    PaymentScreen.remainingIs("-15.04"),
-                    PaymentScreen.clickPaymentMethod("Cash"),
-                    PaymentScreen.remainingIs("0.0"),
-                    PaymentScreen.clickValidate(),
-
-                    ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                    ReceiptScreen.receiptRoundingAmountIs("-0.01"),
-                    ReceiptScreen.receiptToPayAmountIs("-15.73"),
-                    ReceiptScreen.receiptChangeAmountIsNotThere(),
-                    ReceiptScreen.clickNextOrder(),
-                ].flat(),
-        }
-    );
-
-registry
-    .category("web_tour.tours")
-    .add("test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_no_rounding_left", {
-        steps: () =>
-            [
-                Chrome.startPoS(),
-                Dialog.confirm("Open Register"),
-
-                // Order.
-                ProductScreen.addOrderline("random_product", "1"),
-                ProductScreen.checkTaxAmount("2.05"),
-                ProductScreen.checkTotalAmount("15.72"),
-                ProductScreen.clickPartnerButton(),
-                ProductScreen.clickCustomer("AAAAAA"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("15.72"),
-                PaymentScreen.clickPaymentMethod("Bank"),
-                PaymentScreen.clickNumpad("0 . 6 7"),
-                PaymentScreen.fillPaymentLineAmountMobile("Bank", "0.67"),
-                PaymentScreen.remainingIs("15.05"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickInvoiceButton(),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIsNotThere(),
-                ReceiptScreen.receiptToPayAmountIsNotThere(),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-
-                // Refund.
-                Chrome.clickOrders(),
-                TicketScreen.selectFilter("Active"),
-                TicketScreen.selectFilter("Paid"),
-
-                TicketScreen.selectOrder("0001"),
-                TicketScreen.confirmRefund(),
-
-                PaymentScreen.isShown(),
-                PaymentScreen.clickBack(),
-
-                ProductScreen.checkTaxAmount("-2.05"),
-                ProductScreen.checkTotalAmount("-15.72"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("-15.72"),
-                PaymentScreen.clickPaymentMethod("Bank"),
-                PaymentScreen.clickNumpad("0 . 6 7 +/-"),
-                PaymentScreen.fillPaymentLineAmountMobile("Bank", "-0.67"),
-                PaymentScreen.remainingIs("-15.05"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIsNotThere(),
-                ReceiptScreen.receiptToPayAmountIsNotThere(),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-            ].flat(),
-    });
-
-registry
-    .category("web_tour.tours")
-    .add(
-        "test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_with_residual_rounding",
-        {
-            steps: () =>
-                [
-                    Chrome.startPoS(),
-                    Dialog.confirm("Open Register"),
-
-                    // Order.
-                    ProductScreen.addOrderline("random_product", "1"),
-                    ProductScreen.checkTaxAmount("2.05"),
-                    ProductScreen.checkTotalAmount("15.72"),
-                    ProductScreen.clickPartnerButton(),
-                    ProductScreen.clickCustomer("AAAAAA"),
-                    ProductScreen.clickPayButton(),
-
-                    PaymentScreen.totalIs("15.72"),
-                    PaymentScreen.clickPaymentMethod("Bank"),
-                    PaymentScreen.clickNumpad("0 . 6 8"),
-                    PaymentScreen.fillPaymentLineAmountMobile("Bank", "0.68"),
-                    PaymentScreen.remainingIs("15.04"),
-                    PaymentScreen.clickPaymentMethod("Cash"),
-                    PaymentScreen.remainingIs("0.0"),
-                    PaymentScreen.clickInvoiceButton(),
-                    PaymentScreen.clickValidate(),
-
-                    ReceiptScreen.receiptAmountTotalIs("15.72"),
-                    ReceiptScreen.receiptRoundingAmountIs("-0.04"),
-                    ReceiptScreen.receiptToPayAmountIs("15.68"),
-                    ReceiptScreen.receiptChangeAmountIsNotThere(),
-                    ReceiptScreen.clickNextOrder(),
-
-                    // Refund.
-                    Chrome.clickOrders(),
-                    TicketScreen.selectFilter("Active"),
-                    TicketScreen.selectFilter("Paid"),
-                    TicketScreen.selectOrder("0001"),
-                    TicketScreen.confirmRefund(),
-
-                    PaymentScreen.isShown(),
-                    PaymentScreen.clickBack(),
-
-                    ProductScreen.checkTaxAmount("-2.05"),
-                    ProductScreen.checkTotalAmount("-15.72"),
-                    ProductScreen.clickPayButton(),
-
-                    PaymentScreen.totalIs("-15.72"),
-                    PaymentScreen.clickPaymentMethod("Bank"),
-                    PaymentScreen.clickNumpad("0 . 6 8 +/-"),
-                    PaymentScreen.fillPaymentLineAmountMobile("Bank", "-0.68"),
-                    PaymentScreen.remainingIs("-15.04"),
-                    PaymentScreen.clickPaymentMethod("Cash"),
-                    PaymentScreen.remainingIs("0.0"),
-                    PaymentScreen.clickValidate(),
-
-                    ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                    ReceiptScreen.receiptRoundingAmountIs("0.04"),
-                    ReceiptScreen.receiptToPayAmountIs("-15.68"),
-                    ReceiptScreen.receiptChangeAmountIsNotThere(),
-                    ReceiptScreen.clickNextOrder(),
-                ].flat(),
-        }
-    );
-
-registry
-    .category("web_tour.tours")
-    .add("test_cash_rounding_up_add_invoice_line_not_only_round_cash_method", {
-        steps: () =>
-            [
-                Chrome.startPoS(),
-                Dialog.confirm("Open Register"),
-
-                // Order.
-                ProductScreen.addOrderline("random_product", "1"),
-                ProductScreen.checkTaxAmount("2.05"),
-                ProductScreen.checkTotalAmount("15.72"),
-                ProductScreen.clickPartnerButton(),
-                ProductScreen.clickCustomer("AAAAAA"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("15.72"),
-                PaymentScreen.clickPaymentMethod("Bank"),
-                PaymentScreen.clickNumpad("0 . 6 4"),
-                PaymentScreen.fillPaymentLineAmountMobile("Bank", "0.64"),
-                PaymentScreen.remainingIs("15.08"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickInvoiceButton(),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("0.02"),
-                ReceiptScreen.receiptToPayAmountIs("15.74"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-
-                // Refund.
-                Chrome.clickOrders(),
-                TicketScreen.selectFilter("Active"),
-                TicketScreen.selectFilter("Paid"),
-                TicketScreen.selectOrder("0001"),
-                TicketScreen.confirmRefund(),
-
-                PaymentScreen.isShown(),
-                PaymentScreen.clickBack(),
-
-                ProductScreen.checkTaxAmount("-2.05"),
-                ProductScreen.checkTotalAmount("-15.72"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("-15.72"),
-                PaymentScreen.clickPaymentMethod("Bank"),
-                PaymentScreen.clickNumpad("0 . 6 4 +/-"),
-                PaymentScreen.fillPaymentLineAmountMobile("Bank", "-0.64"),
-                PaymentScreen.remainingIs("-15.08"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-                ReceiptScreen.receiptToPayAmountIs("-15.74"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-            ].flat(),
-    });
-
-registry
-    .category("web_tour.tours")
-    .add("test_cash_rounding_halfup_add_invoice_line_only_round_cash_method", {
-        steps: () =>
-            [
-                Chrome.startPoS(),
-                Dialog.confirm("Open Register"),
-
-                // Order.
-                ProductScreen.addOrderline("random_product", "1"),
-                ProductScreen.checkTaxAmount("2.05"),
-                ProductScreen.checkRoundingAmountIsNotThere(),
-                ProductScreen.checkTotalAmount("15.72"),
-                ProductScreen.clickPartnerButton(),
-                ProductScreen.clickCustomer("AAAAAA"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("15.72"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickInvoiceButton(),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-                ReceiptScreen.receiptToPayAmountIs("15.70"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-
-                // Refund.
-                Chrome.clickOrders(),
-                TicketScreen.selectFilter("Active"),
-                TicketScreen.selectFilter("Paid"),
-                TicketScreen.selectOrder("0001"),
-                TicketScreen.confirmRefund(),
-
-                PaymentScreen.isShown(),
-                PaymentScreen.clickBack(),
-
-                ProductScreen.checkTaxAmount("-2.05"),
-                ProductScreen.checkRoundingAmountIsNotThere(),
-                ProductScreen.checkTotalAmount("-15.72"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("-15.72"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("0.02"),
-                ReceiptScreen.receiptToPayAmountIs("-15.70"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-            ].flat(),
-    });
-
-registry
-    .category("web_tour.tours")
-    .add("test_cash_rounding_halfup_add_invoice_line_only_round_cash_method_pay_by_bank_and_cash", {
-        steps: () =>
-            [
-                Chrome.startPoS(),
-                Dialog.confirm("Open Register"),
-
-                // Order.
-                ProductScreen.addOrderline("random_product", "1"),
-                ProductScreen.checkTaxAmount("2.05"),
-                ProductScreen.checkRoundingAmountIsNotThere(),
-                ProductScreen.checkTotalAmount("15.72"),
-                ProductScreen.clickPartnerButton(),
-                ProductScreen.clickCustomer("AAAAAA"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("15.72"),
-                PaymentScreen.clickPaymentMethod("Bank"),
-                PaymentScreen.clickNumpad("0 . 6 8"),
-                PaymentScreen.fillPaymentLineAmountMobile("Bank", "0.68"),
-                PaymentScreen.remainingIs("15.04"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickInvoiceButton(),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("0.01"),
-                ReceiptScreen.receiptToPayAmountIs("15.73"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-
-                // Refund.
-                Chrome.clickOrders(),
-                TicketScreen.selectFilter("Active"),
-                TicketScreen.selectFilter("Paid"),
-                TicketScreen.selectOrder("0001"),
-                TicketScreen.confirmRefund(),
-
-                PaymentScreen.isShown(),
-                PaymentScreen.clickBack(),
-
-                ProductScreen.checkTaxAmount("-2.05"),
-                ProductScreen.checkRoundingAmountIsNotThere(),
-                ProductScreen.checkTotalAmount("-15.72"),
-                ProductScreen.clickPayButton(),
-
-                PaymentScreen.totalIs("-15.72"),
-                PaymentScreen.clickPaymentMethod("Bank"),
-                PaymentScreen.clickNumpad("0 . 6 8 +/-"),
-                PaymentScreen.fillPaymentLineAmountMobile("Bank", "-0.68"),
-                PaymentScreen.remainingIs("-15.04"),
-                PaymentScreen.clickPaymentMethod("Cash"),
-                PaymentScreen.remainingIs("0.0"),
-                PaymentScreen.clickValidate(),
-
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.01"),
-                ReceiptScreen.receiptToPayAmountIs("-15.73"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
-            ].flat(),
-    });
-
 registry
     .category("web_tour.tours")
     .add("test_cash_rounding_halfup_biggest_tax_not_only_round_cash_method", {
@@ -684,79 +247,3 @@ registry
                 ReceiptScreen.clickNextOrder(),
             ].flat(),
     });
-
-registry.category("web_tour.tours").add("test_cash_rounding_with_change", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-
-            ProductScreen.addOrderline("random_product", "1"),
-            ProductScreen.checkTaxAmount("2.05"),
-            ProductScreen.checkTotalAmount("15.72"),
-            ProductScreen.clickPartnerButton(),
-            ProductScreen.clickCustomer("AAAAAA"),
-            ProductScreen.clickPayButton(),
-
-            PaymentScreen.totalIs("15.72"),
-            PaymentScreen.clickPaymentMethod("Bank"),
-            PaymentScreen.clickNumpad("2 0"),
-            PaymentScreen.fillPaymentLineAmountMobile("Bank", "20.00"),
-            PaymentScreen.changeIs("4.30"),
-            PaymentScreen.clickInvoiceButton(),
-            PaymentScreen.clickValidate(),
-
-            ReceiptScreen.receiptAmountTotalIs("15.72"),
-            ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-            ReceiptScreen.receiptToPayAmountIs("15.70"),
-            ReceiptScreen.receiptChangeAmountIs("4.30"),
-            ReceiptScreen.clickNextOrder(),
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("test_cash_rounding_up_with_change", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-
-            ProductScreen.addOrderline("product_a", "1"),
-            ProductScreen.addOrderline("product_b", "2"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.totalIs("179"),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickNumpad("2 0 0"),
-
-            PaymentScreen.changeIs("21"),
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("test_cash_rounding_only_cash_method_with_change", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-
-            ProductScreen.addOrderline("random_product", "1"),
-            ProductScreen.checkTaxAmount("2.05"),
-            ProductScreen.checkTotalAmount("15.72"),
-            ProductScreen.clickPartnerButton(),
-            ProductScreen.clickCustomer("AAAAAA"),
-            ProductScreen.clickPayButton(),
-
-            PaymentScreen.totalIs("15.72"),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickNumpad("2 0"),
-            PaymentScreen.fillPaymentLineAmountMobile("Cash", "20.00"),
-            PaymentScreen.changeIs("4.30"),
-
-            PaymentScreen.clickInvoiceButton(),
-            PaymentScreen.clickValidate(),
-
-            ReceiptScreen.receiptAmountTotalIs("15.72"),
-            ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-            ReceiptScreen.receiptToPayAmountIs("15.70"),
-            ReceiptScreen.receiptChangeAmountIs("4.30"),
-            ReceiptScreen.clickNextOrder(),
-        ].flat(),
-});
diff --git a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
index f68788d2550f6..f7bef4f28aea6 100644
--- a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
@@ -352,7 +352,7 @@ registry.category("web_tour.tours").add("ShowTaxExcludedTour", {
             Dialog.confirm("Open Register"),
 
             ProductScreen.clickDisplayedProduct("Test Product", true, "1", "100.0"),
-            ProductScreen.totalAmountIs("110.0"),
+            ProductScreen.totalAmountIs("100.0"), // Order total is also displayed excluding tax
             Chrome.endTour(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
index 00c55fba19b6d..11769c53c618c 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
@@ -249,7 +249,7 @@ export function changeIs(amount) {
     return [
         {
             content: `change is ${amount}`,
-            trigger: `.payment-status-change .amount:contains("${amount}")`,
+            trigger: `.payment-status-amount .amount:contains("${amount}")`,
         },
     ];
 }
@@ -269,7 +269,7 @@ export function remainingIs(amount) {
     return [
         {
             content: `remaining amount is ${amount}`,
-            trigger: `.payment-status-remaining .amount:contains("${amount}")`,
+            trigger: `.payment-status-amount .amount:contains("${amount}")`,
         },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js
index 5de3586bf94df..91fc8fc357007 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js
@@ -104,19 +104,6 @@ export function paymentLineContains(paymentMethodName, amount) {
         },
     ];
 }
-export function receiptRoundingAmountIsNotThere() {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: ".receipt-screen",
-            run: function () {
-                if (document.querySelector(".receipt-rounding")) {
-                    throw new Error("A rounding amount has been found in receipt.");
-                }
-            },
-        },
-    ];
-}
 export function receiptToPayAmountIs(value) {
     return [
         {
diff --git a/addons/point_of_sale/static/tests/unit/accounting/discount.test.js b/addons/point_of_sale/static/tests/unit/accounting/discount.test.js
new file mode 100644
index 0000000000000..85db30fdd8e10
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/accounting/discount.test.js
@@ -0,0 +1,44 @@
+import { test, expect } from "@odoo/hoot";
+import { expectFormattedPrice, setupPosEnv } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { getFilledOrderForPriceCheck } from "./utils";
+
+definePosModels();
+
+test("Taxes object should contain no discount values", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrderForPriceCheck(store);
+    order.lines[0].setDiscount(10);
+    order.lines[1].setDiscount(20);
+
+    const details = order.prices.taxDetails;
+    const line1 = order.lines[0].prices;
+    const line2 = order.lines[1].prices;
+
+    // Order prices
+    expect(details.base_amount).toBe(980); // Base amount is 980 = (1000 - 10%) + (100 - 20%)
+    expect(details.tax_amount).toBe(257); // Tax amount is 257 = (250 - 10%) + (15 - 20%) + (25 - 20%)
+    expect(details.total_amount).toBe(1237); // Total amount is 1237 = 980 + 257
+
+    // Formatted prices
+    expectFormattedPrice(order.currencyDisplayPrice, "$ 1,237.00");
+    expectFormattedPrice(order.currencyAmountTaxes, "$ 257.00");
+    expectFormattedPrice(order.lines[0].currencyDisplayPrice, "$ 1,125.00");
+    expectFormattedPrice(order.lines[0].currencyDisplayPriceUnit, "$ 900.00");
+    expectFormattedPrice(order.lines[1].currencyDisplayPrice, "$ 112.00");
+    expectFormattedPrice(order.lines[1].currencyDisplayPriceUnit, "$ 80.00");
+
+    // First line (25% on 1000) - no discount
+    expect(line1.no_discount_total_included).toBe(1250);
+    expect(line1.no_discount_total_excluded).toBe(1000);
+    expect(line1.no_discount_taxes_data[0].tax_amount).toBe(250);
+    expect(line1.no_discount_taxes_data[0].tax.amount).toBe(25);
+
+    // Second line (15% + 25% on 100) - no discount
+    expect(line2.no_discount_total_included).toBe(140);
+    expect(line2.no_discount_total_excluded).toBe(100);
+    expect(line2.no_discount_taxes_data[0].tax_amount).toBe(15);
+    expect(line2.no_discount_taxes_data[0].tax.amount).toBe(15);
+    expect(line2.no_discount_taxes_data[1].tax_amount).toBe(25);
+    expect(line2.no_discount_taxes_data[1].tax.amount).toBe(25);
+});
diff --git a/addons/point_of_sale/static/tests/unit/accounting/old_tour.test.js b/addons/point_of_sale/static/tests/unit/accounting/old_tour.test.js
new file mode 100644
index 0000000000000..2cbf517606f0f
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/accounting/old_tour.test.js
@@ -0,0 +1,363 @@
+/**
+ * This file contains old tour tests related to accounting that were migrated to Hoot.
+ * These tours were not checking anything on the Python side, so they were simply
+ * converted to Hoot tests without any additional checks.
+ */
+
+import { test, expect } from "@odoo/hoot";
+import { setupPosEnv } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { prepareRoundingVals } from "./utils";
+
+definePosModels();
+
+test("[Old Tour] pos_basic_order_01_multi_payment_and_change", async () => {
+    const store = await setupPosEnv();
+    const product1 = store.models["product.template"].get(15);
+    product1.list_price = 5.1;
+    product1.product_variant_ids[0].lst_price = 5.1;
+    product1.taxes_id = [];
+
+    const cashPm = store.models["pos.payment.method"].find((pm) => pm.is_cash_count);
+    const cardPm = store.models["pos.payment.method"].find((pm) => !pm.is_cash_count);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    // Add products
+    await store.addLineToOrder({ product_tmpl_id: product1, qty: 2 }, order);
+    order.addPaymentline(cashPm);
+    order.payment_ids[0].setAmount(5);
+    expect(order.remainingDue).toBe(5.2);
+
+    order.addPaymentline(cardPm);
+    order.payment_ids[1].setAmount(6);
+    expect(order.change).toBe(-0.8);
+});
+
+test("[Old Tour] PaymentScreenRoundingHalfUp", async () => {
+    const store = await setupPosEnv();
+    const product1_2 = store.models["product.template"].get(12);
+    const product1_25 = store.models["product.template"].get(13);
+    const product1_40 = store.models["product.template"].get(14);
+    const { cashPm } = prepareRoundingVals(store, 0.5, "HALF-UP", true);
+
+    product1_2.list_price = 1.2;
+    product1_2.product_variant_ids[0].lst_price = 1.2;
+    product1_2.taxes_id = [];
+    product1_25.list_price = 1.25;
+    product1_25.product_variant_ids[0].lst_price = 1.25;
+    product1_25.taxes_id = [];
+    product1_40.list_price = 1.4;
+    product1_40.product_variant_ids[0].lst_price = 1.4;
+    product1_40.taxes_id = [];
+
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+    await store.addLineToOrder({ product_tmpl_id: product1_2, qty: 1 }, order);
+    expect(order.totalDue).toBe(1.2);
+    order.addPaymentline(cashPm);
+    expect(order.amountPaid).toBe(1.0);
+    expect(order.appliedRounding).toBe(-0.2);
+    expect(order.change).toBe(0.0);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    await store.addLineToOrder({ product_tmpl_id: product1_25, qty: 1 }, order2);
+    expect(order2.totalDue).toBe(1.25);
+    order2.addPaymentline(cashPm);
+    expect(order2.amountPaid).toBe(1.5);
+    expect(order2.appliedRounding).toBe(0.25);
+    expect(order2.change).toBe(0.0);
+
+    const order3 = store.addNewOrder();
+    order3.pricelist_id = false;
+    await store.addLineToOrder({ product_tmpl_id: product1_40, qty: 1 }, order3);
+    expect(order3.totalDue).toBe(1.4);
+    order3.addPaymentline(cashPm);
+    expect(order3.amountPaid).toBe(1.5);
+    expect(order3.appliedRounding).toBe(0.1);
+    expect(order3.change).toBe(0.0);
+
+    const order4 = store.addNewOrder();
+    order4.pricelist_id = false;
+    await store.addLineToOrder({ product_tmpl_id: product1_2, qty: 1 }, order4);
+    expect(order4.totalDue).toBe(1.2);
+    order4.addPaymentline(cashPm);
+    order4.payment_ids[0].setAmount(2);
+    expect(order4.amountPaid).toBe(2.0);
+    expect(order4.change).toBe(-1.0);
+});
+
+const prepareProduct = (store) => {
+    const product = store.models["product.template"].get(15);
+    const tax15 = store.models["account.tax"].get(1);
+    product.list_price = 13.67;
+    product.product_variant_ids[0].lst_price = 13.67;
+    product.taxes_id = [tax15];
+    return product;
+};
+
+test("[Old Tour] test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method", async () => {
+    const store = await setupPosEnv();
+    const { cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.7);
+    order.addPaymentline(cardPm);
+    expect(order.amountPaid).toBe(15.7);
+    expect(order.appliedRounding).toBe(-0.02);
+    expect(order.change).toBe(0.0);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.7);
+    order2.addPaymentline(cardPm);
+    expect(order2.amountPaid).toBe(-15.7);
+    expect(order2.appliedRounding).toBe(0.02);
+    expect(order2.change).toBe(0.0);
+});
+
+test("[Old Tour] test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method_pay_by_bank_and_cash", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.7);
+    order.addPaymentline(cardPm);
+    order.payment_ids[0].setAmount(0.68);
+    expect(order.amountPaid).toBe(0.68);
+    expect(order.remainingDue).toBe(15.02); // Order is rounded globaly so remaining due is rounded
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[1].amount).toBe(15.02);
+    expect(order.amountPaid).toBe(15.7);
+    expect(order.appliedRounding).toBe(-0.02);
+    expect(order.change).toBe(0.0);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order2.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.7);
+    order2.addPaymentline(cardPm);
+    order2.payment_ids[0].setAmount(-0.68);
+    expect(order2.amountPaid).toBe(-0.68);
+    expect(order2.remainingDue).toBe(-15.02); // Order is rounded globaly so remaining due is rounded
+    order2.addPaymentline(cashPm);
+    expect(order2.payment_ids[1].amount).toBe(-15.02);
+    expect(order2.amountPaid).toBe(-15.7);
+    expect(order2.appliedRounding).toBe(0.02);
+    expect(order2.change).toBe(0.0);
+});
+
+test("[Old Tour] test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_no_rounding_left", async () => {
+    const store = await setupPosEnv();
+    const { cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.7);
+    order.addPaymentline(cardPm);
+    order.payment_ids[0].setAmount(0.67);
+    expect(order.amountPaid).toBe(0.67);
+    expect(order.remainingDue).toBe(15.03);
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[1].amount).toBe(15.03);
+    expect(order.amountPaid).toBe(15.7);
+    expect(order.appliedRounding).toBe(-0.02);
+    expect(order.change).toBe(0.0);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order2.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.7);
+    order2.addPaymentline(cardPm);
+    order2.payment_ids[0].setAmount(-0.67);
+    expect(order2.amountPaid).toBe(-0.67);
+    expect(order2.remainingDue).toBe(-15.03);
+    order2.addPaymentline(cardPm);
+    expect(order2.payment_ids[1].amount).toBe(-15.03);
+    expect(order2.amountPaid).toBe(-15.7);
+    expect(order2.appliedRounding).toBe(0.02);
+    expect(order2.change).toBe(0.0);
+});
+
+test("[Old Tour] test_cash_rounding_halfup_add_invoice_line_only_round_cash_method", async () => {
+    const store = await setupPosEnv();
+    const { cashPm } = prepareRoundingVals(store, 0.05, "HALF-UP", true);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.72);
+    order.addPaymentline(cashPm);
+    expect(order.amountPaid).toBe(15.7);
+    expect(order.appliedRounding).toBe(-0.02);
+    expect(order.change).toBe(0.0);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order2.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.72);
+    order2.addPaymentline(cashPm);
+    expect(order2.amountPaid).toBe(-15.7);
+    expect(order2.appliedRounding).toBe(0.02);
+    expect(order2.change).toBe(0.0);
+});
+
+test("[Old Tour] test_cash_rounding_halfup_add_invoice_line_only_round_cash_method_pay_by_bank_and_cash", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", true);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.72);
+    order.addPaymentline(cardPm);
+    order.payment_ids[0].setAmount(0.68);
+    expect(order.amountPaid).toBe(0.68);
+    expect(order.remainingDue).toBe(15.04);
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[1].amount).toBe(15.05);
+    expect(order.amountPaid).toBe(15.73);
+    expect(order.appliedRounding).toBe(0.01);
+    expect(order.change).toBe(0.0);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order2.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.72);
+    order2.addPaymentline(cardPm);
+    order2.payment_ids[0].setAmount(-0.68);
+    expect(order2.amountPaid).toBe(-0.68);
+    expect(order2.remainingDue).toBe(-15.04);
+    order2.addPaymentline(cashPm);
+    expect(order2.payment_ids[1].amount).toBe(-15.05);
+    expect(order2.amountPaid).toBe(-15.73);
+    expect(order2.appliedRounding).toBe(-0.01);
+    expect(order2.change).toBe(0.0);
+});
+
+test("[Old Tour] test_cash_rounding_with_change", async () => {
+    const store = await setupPosEnv();
+    const { cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.7);
+    order.addPaymentline(cardPm);
+    order.payment_ids[0].setAmount(20);
+    expect(order.amountPaid).toBe(20);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(-4.3);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order2.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.7);
+    order2.addPaymentline(cardPm);
+    order2.payment_ids[0].setAmount(-20);
+    expect(order2.amountPaid).toBe(-20);
+    expect(order2.appliedRounding).toBe(0);
+    expect(order2.change).toBe(4.3);
+});
+
+test("[Old Tour] test_cash_rounding_only_cash_method_with_change", async () => {
+    const store = await setupPosEnv();
+    const { cashPm } = prepareRoundingVals(store, 0.05, "HALF-UP", true);
+    const product = prepareProduct(store);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    await store.addLineToOrder({ product_tmpl_id: product, qty: 1 }, order);
+    expect(order.displayPrice).toBe(15.72);
+    expect(order.priceExcl).toBe(13.67);
+    expect(order.totalDue).toBe(15.72);
+    order.addPaymentline(cashPm);
+    order.payment_ids[0].setAmount(20);
+    expect(order.amountPaid).toBe(20);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(-4.3);
+
+    const order2 = store.addNewOrder();
+    order2.pricelist_id = false;
+    order2.is_refund = true;
+    await store.addLineToOrder({ product_tmpl_id: product, qty: -1 }, order2);
+    expect(order2.displayPrice).toBe(-15.72);
+    expect(order2.priceExcl).toBe(-13.67);
+    expect(order2.totalDue).toBe(-15.72);
+    order2.addPaymentline(cashPm);
+    order2.payment_ids[0].setAmount(-20);
+    expect(order2.amountPaid).toBe(-20);
+    expect(order2.appliedRounding).toBe(0);
+    expect(order2.change).toBe(4.3);
+});
+
+test(["[Old Tour] test_cash_rounding_up_with_change"], async () => {
+    const store = await setupPosEnv();
+    const { cashPm } = prepareRoundingVals(store, 1, "UP", true);
+    const order = store.addNewOrder();
+    order.pricelist_id = false;
+
+    const tax = store.models["account.tax"].get(3);
+    const productA = store.models["product.template"].get(15);
+    const productB = store.models["product.template"].get(16);
+    productA.list_price = 95;
+    productA.product_variant_ids[0].lst_price = 95;
+    productA.taxes_id = [tax];
+    productB.list_price = 42;
+    productB.product_variant_ids[0].lst_price = 42;
+    productB.taxes_id = [tax];
+
+    await store.addLineToOrder({ product_tmpl_id: productA, qty: 1 }, order);
+    await store.addLineToOrder({ product_tmpl_id: productB, qty: 2 }, order);
+
+    expect(order.displayPrice).toBe(179);
+    expect(order.totalDue).toBe(179);
+    order.addPaymentline(cashPm);
+    order.payment_ids[0].setAmount(200);
+    expect(order.amountPaid).toBe(200);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(-21);
+});
diff --git a/addons/point_of_sale/static/tests/unit/accounting/price.test.js b/addons/point_of_sale/static/tests/unit/accounting/price.test.js
new file mode 100644
index 0000000000000..6c23ed5cfdf2f
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/accounting/price.test.js
@@ -0,0 +1,54 @@
+import { test, expect } from "@odoo/hoot";
+import { expectFormattedPrice, setupPosEnv } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { getFilledOrderForPriceCheck } from "./utils";
+
+definePosModels();
+
+test("Prices includes", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrderForPriceCheck(store);
+    const details = order.prices.taxDetails;
+    const line1 = order.lines[0].prices;
+    const line2 = order.lines[1].prices;
+
+    // Order prices
+    expect(details.base_amount).toBe(1100);
+    expect(details.tax_amount).toBe(290);
+    expect(details.total_amount).toBe(1390);
+
+    // First line (25% on 1000)
+    expect(line1.total_included).toBe(1250);
+    expect(line1.total_excluded).toBe(1000);
+    expect(line1.taxes_data[0].tax_amount).toBe(250);
+    expect(line1.taxes_data[0].tax.amount).toBe(25);
+
+    // Second line (15% + 25% on 100)
+    expect(line2.total_included).toBe(140);
+    expect(line2.total_excluded).toBe(100);
+    expect(line2.taxes_data[0].tax_amount).toBe(15);
+    expect(line2.taxes_data[0].tax.amount).toBe(15);
+    expect(line2.taxes_data[1].tax_amount).toBe(25);
+    expect(line2.taxes_data[1].tax.amount).toBe(25);
+
+    // Formatted prices
+    expectFormattedPrice(order.currencyDisplayPrice, "$ 1,390.00");
+    expectFormattedPrice(order.currencyAmountTaxes, "$ 290.00");
+    expectFormattedPrice(order.lines[0].currencyDisplayPrice, "$ 1,250.00");
+    expectFormattedPrice(order.lines[0].currencyDisplayPriceUnit, "$ 1,000.00");
+    expectFormattedPrice(order.lines[1].currencyDisplayPrice, "$ 140.00");
+    expectFormattedPrice(order.lines[1].currencyDisplayPriceUnit, "$ 100.00");
+});
+
+test("Prices excludes", async () => {
+    const store = await setupPosEnv();
+    store.config.iface_tax_included = "subtotal";
+    const order = await getFilledOrderForPriceCheck(store);
+
+    // Formatted prices
+    expectFormattedPrice(order.currencyDisplayPrice, "$ 1,100.00");
+    expectFormattedPrice(order.lines[0].currencyDisplayPrice, "$ 1,000.00");
+    expectFormattedPrice(order.lines[0].currencyDisplayPriceUnit, "$ 1,000.00");
+    expectFormattedPrice(order.lines[1].currencyDisplayPrice, "$ 100.00");
+    expectFormattedPrice(order.lines[1].currencyDisplayPriceUnit, "$ 100.00");
+});
diff --git a/addons/point_of_sale/static/tests/unit/accounting/rounding.test.js b/addons/point_of_sale/static/tests/unit/accounting/rounding.test.js
new file mode 100644
index 0000000000000..8c5586e9f854b
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/accounting/rounding.test.js
@@ -0,0 +1,328 @@
+import { test, expect } from "@odoo/hoot";
+import { setupPosEnv } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { getFilledOrderForPriceCheck, prepareRoundingVals } from "./utils";
+
+definePosModels();
+
+test("Rounding sale HALF-UP 0.05 (cash only)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", true);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(52.54);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(52.55);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.01);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding sale HALF-UP 0.05 (all methods)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(52.55);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.01);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(52.55);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.01);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding sale UP 10  (cash only)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 10, "UP", true);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(52.54);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(60);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(7.46);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding sale UP 10 (all methods)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 10, "UP", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(60);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(7.46);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(60);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(7.46);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding sale DOWN 1 (cash only)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 1, "DOWN", true);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(52.54);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(52);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-0.54);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding sale DOWN 1 (all methods)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 1, "DOWN", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(52);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-0.54);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(52);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-0.54);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding refund HALF-UP 0.05 (cash only)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", true);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    order.is_refund = true;
+    order.lines.map((line) => line.setQuantity(-line.qty));
+
+    expect(order.displayPrice).toBe(-52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(-52.54);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(-52.55);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-0.01);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding refund HALF-UP 0.05 (all methods)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    order.is_refund = true;
+    order.lines.map((line) => line.setQuantity(-line.qty));
+
+    expect(order.displayPrice).toBe(-52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(-52.55);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-0.01);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(-52.55);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-0.01);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding refund UP 10 (cash only)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 10, "UP", true);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    order.is_refund = true;
+    order.lines.map((line) => line.setQuantity(-line.qty));
+
+    expect(order.displayPrice).toBe(-52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(-52.54);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(-60);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-7.46);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding refund UP 10 (all methods)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 10, "UP", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    order.is_refund = true;
+    order.lines.map((line) => line.setQuantity(-line.qty));
+
+    expect(order.displayPrice).toBe(-52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(-60);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-7.46);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(-60);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(-7.46);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding refund DOWN 1 (cash only)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 1, "DOWN", true);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    order.is_refund = true;
+    order.lines.map((line) => line.setQuantity(-line.qty));
+
+    expect(order.displayPrice).toBe(-52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(-52.54);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(-52);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.54);
+    expect(order.change).toBe(0);
+});
+
+test("Rounding refund DOWN 1 (all methods)", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 1, "DOWN", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    order.is_refund = true;
+    order.lines.map((line) => line.setQuantity(-line.qty));
+
+    expect(order.displayPrice).toBe(-52.54);
+
+    order.addPaymentline(cardPm);
+    expect(order.payment_ids[0].amount).toBe(-52);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.54);
+    expect(order.change).toBe(0);
+    order.payment_ids[0].delete();
+    expect(order.canBeValidated()).toBe(false);
+
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[0].amount).toBe(-52);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.54);
+    expect(order.change).toBe(0);
+});
+
+test("Rouding sale HALF-UP 0.05 with two payment method", async () => {
+    const store = await setupPosEnv();
+    const { cashPm, cardPm } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+    const order = await getFilledOrderForPriceCheck(store);
+
+    expect(order.displayPrice).toBe(52.54);
+
+    // only_round_cash_method is false so the order due is 52.55
+    order.addPaymentline(cardPm);
+    order.payment_ids[0].setAmount(2.54);
+    expect(order.payment_ids[0].amount).toBe(2.54);
+    expect(order.canBeValidated()).toBe(false);
+    expect(order.remainingDue).toBe(50.01);
+    order.addPaymentline(cashPm);
+
+    // Cash rounding is not applied on the cash payment line but on the order due
+    expect(order.payment_ids[1].amount).toBe(50.01);
+    expect(order.remainingDue).toBe(0);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0.01);
+    expect(order.change).toBe(0);
+
+    // Set only_round_cash_method to true and check that the order due is now 52.54
+    order.config_id.only_round_cash_method = true;
+    order.payment_ids = [];
+    order.addPaymentline(cardPm);
+    order.payment_ids[0].setAmount(2.54);
+    expect(order.payment_ids[0].amount).toBe(2.54);
+    expect(order.canBeValidated()).toBe(false);
+    expect(order.remainingDue).toBe(50);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+    order.addPaymentline(cashPm);
+    expect(order.payment_ids[1].amount).toBe(50);
+    expect(order.remainingDue).toBe(0);
+    expect(order.canBeValidated()).toBe(true);
+    expect(order.appliedRounding).toBe(0);
+    expect(order.change).toBe(0);
+});
diff --git a/addons/point_of_sale/static/tests/unit/accounting/utils.js b/addons/point_of_sale/static/tests/unit/accounting/utils.js
new file mode 100644
index 0000000000000..0e95252b41b01
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/accounting/utils.js
@@ -0,0 +1,66 @@
+const { DateTime } = luxon;
+
+/**
+ * We use a dedicated method for the price check because we don't want to use
+ * getFilledOrder in case of modification of this method breaks the price test.
+ *
+ * This method is a copy of getFilledOrder from utils.js
+ */
+export const getFilledOrderForPriceCheck = async (store, data = {}) => {
+    const order = store.addNewOrder(data);
+    // This product1 has a 25% tax with a 100.0 price
+    // This product2 has a 15% + 25% tax with a 1000.0 price
+    const product1 = store.models["product.template"].get(15);
+    const product2 = store.models["product.template"].get(16);
+
+    const date = DateTime.now();
+    order.write_date = date;
+    order.create_date = date;
+    order.pricelist_id = false;
+
+    await store.addLineToOrder(
+        {
+            product_tmpl_id: product1,
+            qty: 1,
+            write_date: date,
+            create_date: date,
+        },
+        order
+    );
+    await store.addLineToOrder(
+        {
+            product_tmpl_id: product2,
+            qty: 1,
+            write_date: date,
+            create_date: date,
+        },
+        order
+    );
+    store.addPendingOrder([order.id]);
+    return order;
+};
+
+export const prepareRoundingVals = (store, roundingAmount, roundingMethod, onlyCash = true) => {
+    const config = store.config;
+    const product1 = store.models["product.template"].get(15);
+    const product2 = store.models["product.template"].get(16);
+    const cashPm = store.models["pos.payment.method"].find((pm) => pm.is_cash_count);
+    const cardPm = store.models["pos.payment.method"].find((pm) => !pm.is_cash_count);
+
+    // Changes prices to have a non rounded change
+    product1.list_price = 15.73;
+    product2.list_price = 23.49;
+    product1.product_variant_ids[0].lst_price = 15.73;
+    product2.product_variant_ids[0].lst_price = 23.49;
+
+    config.cash_rounding = true;
+    config.only_round_cash_method = onlyCash;
+    config.rounding_method = store.models["account.cash.rounding"].create({
+        name: "roudning",
+        rounding: roundingAmount,
+        rounding_method: roundingMethod,
+        strategy: "add_invoice_line",
+    });
+
+    return { config, cashPm, cardPm };
+};
diff --git a/addons/point_of_sale/static/tests/unit/components/orderline.test.js b/addons/point_of_sale/static/tests/unit/components/orderline.test.js
index a9b10645a5aaa..f13e2892b18f3 100644
--- a/addons/point_of_sale/static/tests/unit/components/orderline.test.js
+++ b/addons/point_of_sale/static/tests/unit/components/orderline.test.js
@@ -1,7 +1,7 @@
 import { test, expect } from "@odoo/hoot";
 import { mountWithCleanup } from "@web/../tests/web_test_helpers";
 import { Orderline } from "@point_of_sale/app/components/orderline/orderline";
-import { setupPosEnv } from "../utils";
+import { expectFormattedPrice, setupPosEnv } from "../utils";
 import { definePosModels } from "../data/generate_model_definitions";
 
 definePosModels();
@@ -22,11 +22,10 @@ test("orderline.js", async () => {
     const comp = await mountWithCleanup(Orderline, {
         props: { line },
     });
-
+    const lineData = comp.lineScreenValues;
     expect(comp.line.id).toEqual(line.id);
-    expect(comp.taxGroup).toBeEmpty();
-    expect(comp.formatCurrency(comp.line.price_subtotal_incl)).toBe("$\u00a010.35");
-    expect(comp.getInternalNotes()).toEqual([
+    expectFormattedPrice(comp.line.currencyDisplayPrice, "$ 10.35");
+    expect(lineData.internalNote).toEqual([
         {
             text: "Test 1",
             colorIndex: 0,
diff --git a/addons/point_of_sale/static/tests/unit/components/product_screen.test.js b/addons/point_of_sale/static/tests/unit/components/product_screen.test.js
index 36b6f7d740da4..5c0733fa94c64 100644
--- a/addons/point_of_sale/static/tests/unit/components/product_screen.test.js
+++ b/addons/point_of_sale/static/tests/unit/components/product_screen.test.js
@@ -13,7 +13,7 @@ test("_getProductByBarcode", async () => {
     const comp = await mountWithCleanup(ProductScreen, { props: { orderUuid: order.uuid } });
     await comp.addProductToOrder(store.models["product.template"].get(5));
 
-    expect(order.amount_total).toBe(3.45);
+    expect(order.displayPrice).toBe(3.45);
     expect(comp.total).toBe("$\u00a03.45");
     expect(comp.items).toBe("1");
 
@@ -31,7 +31,7 @@ test("fastValidate", async () => {
     });
     await productScreen.addProductToOrder(store.models["product.template"].get(5));
 
-    expect(order.amount_total).toBe(3.45);
+    expect(order.displayPrice).toBe(3.45);
     expect(productScreen.total).toBe("$\u00a03.45");
     expect(productScreen.items).toBe("1");
 
diff --git a/addons/point_of_sale/static/tests/unit/data/account_tax.data.js b/addons/point_of_sale/static/tests/unit/data/account_tax.data.js
index a218623531238..f9989c2868d9c 100644
--- a/addons/point_of_sale/static/tests/unit/data/account_tax.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/account_tax.data.js
@@ -48,7 +48,20 @@ export class AccountTax extends models.ServerModel {
             amount: 25.0,
             company_id: 250,
             sequence: 1,
-            tax_group_id: 1,
+            tax_group_id: 3,
+        },
+        {
+            id: 3,
+            name: "tax incl",
+            type_tax_use: "sale",
+            amount_type: "percent",
+            amount: 7,
+            price_include_override: "tax_included",
+            include_base_amount: true,
+            has_negative_factor: true,
+            company_id: 250,
+            is_base_affected: true,
+            tax_group_id: 4,
         },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/unit/data/account_tax_group.data.js b/addons/point_of_sale/static/tests/unit/data/account_tax_group.data.js
index d17dfd496f72d..923614cc47556 100644
--- a/addons/point_of_sale/static/tests/unit/data/account_tax_group.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/account_tax_group.data.js
@@ -18,5 +18,15 @@ export class AccountTaxGroup extends models.ServerModel {
             name: "Tax 0%",
             pos_receipt_label: false,
         },
+        {
+            id: 3,
+            name: "Tax 25%",
+            pos_receipt_label: false,
+        },
+        {
+            id: 4,
+            name: "No group",
+            pos_receipt_label: false,
+        },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/unit/data/product_product.data.js b/addons/point_of_sale/static/tests/unit/data/product_product.data.js
index 177997fbf8d31..b9d23b89c7156 100644
--- a/addons/point_of_sale/static/tests/unit/data/product_product.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/product_product.data.js
@@ -154,5 +154,29 @@ export class ProductProduct extends models.ServerModel {
             product_template_attribute_value_ids: [],
             product_template_variant_value_ids: [],
         },
+        {
+            id: 15,
+            product_tmpl_id: 15,
+            lst_price: 1000,
+            standard_price: 0,
+            display_name: "Accounting Test Product 1",
+            product_tag_ids: [],
+            barcode: false,
+            default_code: false,
+            product_template_attribute_value_ids: [],
+            product_template_variant_value_ids: [],
+        },
+        {
+            id: 16,
+            product_tmpl_id: 16,
+            lst_price: 100,
+            standard_price: 0,
+            display_name: "Accounting Test Product 2",
+            product_tag_ids: [],
+            barcode: false,
+            default_code: false,
+            product_template_attribute_value_ids: [],
+            product_template_variant_value_ids: [],
+        },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/unit/data/product_template.data.js b/addons/point_of_sale/static/tests/unit/data/product_template.data.js
index c95920e8f970e..3b702f1d7ac6e 100644
--- a/addons/point_of_sale/static/tests/unit/data/product_template.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/product_template.data.js
@@ -369,7 +369,7 @@ export class ProductTemplate extends models.ServerModel {
             attribute_line_ids: [],
             active: true,
             image_128: false,
-            product_variant_ids: [12],
+            product_variant_ids: [13],
             public_description: false,
             pos_optional_product_ids: [],
             sequence: 1,
@@ -402,7 +402,73 @@ export class ProductTemplate extends models.ServerModel {
             attribute_line_ids: [],
             active: true,
             image_128: false,
-            product_variant_ids: [12],
+            product_variant_ids: [14],
+            public_description: false,
+            pos_optional_product_ids: [],
+            sequence: 1,
+            product_tag_ids: [],
+        },
+        {
+            id: 15,
+            display_name: "Accounting Test Product 1",
+            standard_price: 0,
+            categ_id: false,
+            pos_categ_ids: [],
+            taxes_id: [2],
+            barcode: false,
+            name: "Accounting Test Product 1",
+            list_price: 1000,
+            is_favorite: false,
+            default_code: false,
+            to_weight: false,
+            uom_id: 1,
+            description_sale: false,
+            description: false,
+            tracking: "none",
+            type: "consu",
+            service_tracking: "no",
+            is_storable: false,
+            write_date: "2025-07-03 13:04:14",
+            color: 0,
+            pos_sequence: 5,
+            available_in_pos: true,
+            attribute_line_ids: [],
+            active: true,
+            image_128: false,
+            product_variant_ids: [15],
+            public_description: false,
+            pos_optional_product_ids: [],
+            sequence: 1,
+            product_tag_ids: [],
+        },
+        {
+            id: 16,
+            display_name: "Accounting Test Product 2",
+            standard_price: 0,
+            categ_id: false,
+            pos_categ_ids: [],
+            taxes_id: [1, 2],
+            barcode: false,
+            name: "Accounting Test Product 2",
+            list_price: 100,
+            is_favorite: false,
+            default_code: false,
+            to_weight: false,
+            uom_id: 1,
+            description_sale: false,
+            description: false,
+            tracking: "none",
+            type: "consu",
+            service_tracking: "no",
+            is_storable: false,
+            write_date: "2025-07-03 13:04:14",
+            color: 0,
+            pos_sequence: 5,
+            available_in_pos: true,
+            attribute_line_ids: [],
+            active: true,
+            image_128: false,
+            product_variant_ids: [16],
             public_description: false,
             pos_optional_product_ids: [],
             sequence: 1,
diff --git a/addons/point_of_sale/static/tests/unit/models/pos_category.test.js b/addons/point_of_sale/static/tests/unit/models/pos_category.test.js
index 833c7e8eaf2aa..dbc0cb5c87141 100644
--- a/addons/point_of_sale/static/tests/unit/models/pos_category.test.js
+++ b/addons/point_of_sale/static/tests/unit/models/pos_category.test.js
@@ -8,11 +8,7 @@ test("getAllChildren", async () => {
     const store = await setupPosEnv();
     const category = store.models["pos.category"].get(3);
     const children = category.getAllChildren();
-    expect(children).toEqual([
-        store.models["pos.category"].get(3),
-        store.models["pos.category"].get(4),
-        store.models["pos.category"].get(5),
-    ]);
+    expect(children.map((c) => c.id).sort()).toEqual([3, 4, 5]);
 });
 
 test("get allParents", async () => {
@@ -26,9 +22,5 @@ test("get associatedProducts", async () => {
     const store = await setupPosEnv();
     const category = store.models["pos.category"].get(3);
     const associatedProducts = category.associatedProducts;
-    expect(associatedProducts).toEqual([
-        store.models["product.template"].get(14),
-        store.models["product.template"].get(12),
-        store.models["product.template"].get(13),
-    ]);
+    expect(associatedProducts.map((p) => p.id).sort()).toEqual([12, 13, 14]);
 });
diff --git a/addons/point_of_sale/static/tests/unit/models/pos_order.test.js b/addons/point_of_sale/static/tests/unit/models/pos_order.test.js
index 2e68526adce56..facda0f18b898 100644
--- a/addons/point_of_sale/static/tests/unit/models/pos_order.test.js
+++ b/addons/point_of_sale/static/tests/unit/models/pos_order.test.js
@@ -50,49 +50,6 @@ test("setPreset", async () => {
     expect(order.fiscal_position_id).toBe(inPreset.fiscal_position_id);
 });
 
-test("getTaxTotalsOfLines", async () => {
-    const store = await setupPosEnv();
-    const order = store.addNewOrder();
-    const product = store.models["product.template"].get(5);
-    const product2 = store.models["product.template"].get(6);
-
-    await store.addLineToOrder(
-        {
-            product_tmpl_id: product,
-            qty: 1,
-        },
-        order
-    );
-    await store.addLineToOrder(
-        {
-            product_tmpl_id: product2,
-            qty: 1,
-        },
-        order
-    );
-
-    // With pricelist prices are at 3 each
-    const taxTotalsWPricelist = order.getTaxTotalsOfLines(order.lines);
-    expect(taxTotalsWPricelist.base_amount).toBe(6);
-    expect(taxTotalsWPricelist.total_amount).toBe(7.2);
-    expect(taxTotalsWPricelist.tax_amount_currency).toBe(1.2);
-    expect(taxTotalsWPricelist.subtotals[0].tax_groups[0].involved_tax_ids).toEqual([
-        product.taxes_id[0].id,
-        product2.taxes_id[0].id,
-    ]);
-
-    // Without pricelist prices are at 100 each
-    order.setPricelist(null);
-    const taxTotals = order.getTaxTotalsOfLines(order.lines);
-    expect(taxTotals.base_amount).toBe(200);
-    expect(taxTotals.total_amount).toBe(240); // Tax of 15% and 25% on 100 each
-    expect(taxTotals.tax_amount_currency).toBe(40);
-    expect(taxTotals.subtotals[0].tax_groups[0].involved_tax_ids).toEqual([
-        product.taxes_id[0].id,
-        product2.taxes_id[0].id,
-    ]);
-});
-
 test("updateLastOrderChange", async () => {
     const store = await setupPosEnv();
     const order = await getFilledOrder(store);
@@ -124,8 +81,8 @@ test("addPaymentline", async () => {
     const cashPaymentMethod = store.models["pos.payment.method"].get(1);
     // Test that the payment line is correctly created
     const result = order.addPaymentline(cashPaymentMethod);
-    expect(result.payment_method_id.id).toBe(cashPaymentMethod.id);
-    expect(result.amount).toBe(17.85);
+    expect(result.data.payment_method_id.id).toBe(cashPaymentMethod.id);
+    expect(result.data.amount).toBe(17.85);
 });
 
 test("getTotalDiscount", async () => {
@@ -133,7 +90,7 @@ test("getTotalDiscount", async () => {
     const order = await getFilledOrder(store);
     const discount = order.getTotalDiscount();
     expect(discount).toBe(0);
-    const taxTotals = order.getTaxTotalsOfLines(order.lines);
+    const taxTotals = order.prices.taxDetails;
     expect(taxTotals.base_amount).toBe(15);
     expect(taxTotals.total_amount).toBe(17.85);
     expect(taxTotals.tax_amount_currency).toBe(2.85);
@@ -144,7 +101,7 @@ test("getTotalDiscount", async () => {
     line1.setDiscount(20);
     line2.setDiscount(50);
     expect(order.getTotalDiscount()).toBe(5.82);
-    const taxTotalsWDiscount = order.getTaxTotalsOfLines(order.lines);
+    const taxTotalsWDiscount = order.prices.taxDetails;
     expect(taxTotalsWDiscount.base_amount).toBe(10.2);
     expect(taxTotalsWDiscount.total_amount).toBe(12.03);
     expect(taxTotalsWDiscount.tax_amount_currency).toBe(1.83);
@@ -268,3 +225,48 @@ test("setShippingDate and getShippingDate with Luxon", async () => {
     order.setShippingDate(null);
     expect(order.getShippingDate()).toBeEmpty();
 });
+
+test("[get prices] check prices and taxes", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrder(store);
+    const data = order.prices;
+
+    // Check taxes on order base_amount is 15 with 15% taxes
+    const orderTaxes = data.taxDetails;
+    expect(orderTaxes.base_amount).toBe(15.0);
+    expect(orderTaxes.total_amount).toBe(17.85);
+    expect(orderTaxes.tax_amount).toBe(2.85);
+
+    // Order prices data also return the prices of all lines
+    // Check first line with a price_unit of 3 and 3 qty
+    const line1Data = data.baseLineByLineUuids[order.lines[0].uuid].tax_details;
+    expect(line1Data.total_excluded).toBe(9.0);
+    expect(line1Data.total_included).toBe(10.35);
+    expect(line1Data.taxes_data[0].tax_amount).toBe(1.35);
+
+    // Check second line with a price_unit of 3 and 2 qty
+    const line2Data = data.baseLineByLineUuids[order.lines[1].uuid].tax_details;
+    expect(line2Data.total_excluded).toBe(6.0);
+    expect(line2Data.total_included).toBe(7.5);
+    expect(line2Data.taxes_data[0].tax_amount).toBe(1.5);
+
+    // Check with a discount on first line of 30%
+    order.lines[0].setDiscount(30);
+    const dataWDiscount = order.prices;
+    const orderTaxesWDiscount = dataWDiscount.taxDetails;
+    expect(orderTaxesWDiscount.base_amount).toBe(12.3);
+    expect(orderTaxesWDiscount.total_amount).toBe(14.75);
+    expect(orderTaxesWDiscount.tax_amount).toBe(2.45);
+
+    // Check first line with a price_unit of 3, 3 qty and 30% discount
+    const line1DataWDiscount = dataWDiscount.baseLineByLineUuids[order.lines[0].uuid].tax_details;
+    expect(line1DataWDiscount.total_excluded).toBe(6.3);
+    expect(line1DataWDiscount.total_included).toBe(7.25);
+    expect(line1DataWDiscount.taxes_data[0].tax_amount).toBe(0.95);
+    expect(line1DataWDiscount.discount_amount).toBe(3.1);
+
+    // No discount values should still represent the line without discount
+    expect(line1DataWDiscount.no_discount_total_excluded).toBe(9.0);
+    expect(line1DataWDiscount.no_discount_total_included).toBe(10.35);
+    expect(line1DataWDiscount.no_discount_taxes_data[0].tax_amount).toBe(1.35);
+});
diff --git a/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js b/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js
index 77a27847b96c1..63a276c8e788f 100644
--- a/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js
+++ b/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js
@@ -10,6 +10,7 @@ function getAllPricesData(otherData = {}) {
             {
                 id: 1,
                 name: "Test Order",
+                lines: [1],
             },
         ],
         "pos.order.line": [
@@ -26,82 +27,85 @@ function getAllPricesData(otherData = {}) {
     };
 }
 
-test("[getAllPrices()] Base test", async () => {
+test("[get prices()] Base test", async () => {
     const store = await setupPosEnv();
     const models = store.models;
     const data = models.loadConnectedData(getAllPricesData());
 
-    const lineTax = data["pos.order.line"][0].getAllPrices();
-    expect(lineTax.priceWithTax).toBe(230.0);
-    expect(lineTax.priceWithoutTax).toBe(200.0);
-    expect(lineTax.taxesData[0].tax).toEqual(models["account.tax"].getFirst());
-    expect(lineTax.taxDetails[1].base).toBe(200.0);
-    expect(lineTax.taxDetails[1].amount).toBe(30.0);
+    const lineTax = data["pos.order.line"][0].prices;
+    expect(lineTax.total_included).toBe(230.0);
+    expect(lineTax.total_excluded).toBe(200.0);
+    expect(lineTax.taxes_data[0].base_amount).toBe(200.0);
+    expect(lineTax.taxes_data[0].tax_amount).toBe(30.0);
 
     // Test with line qty = 0
     data["pos.order.line"][0].qty = 0;
-    const zeroQtyLineTax = data["pos.order.line"][0].getAllPrices();
-    expect(zeroQtyLineTax.priceWithTax).toBe(0.0);
-    expect(zeroQtyLineTax.priceWithoutTax).toBe(0.0);
-    expect(zeroQtyLineTax.tax).toBe(0.0);
-    expect(Object.keys(zeroQtyLineTax.taxDetails).length).toBe(1);
+    const zeroQtyLineTax = data["pos.order.line"][0].prices;
+    expect(zeroQtyLineTax.total_included).toBe(0.0);
+    expect(zeroQtyLineTax.total_excluded).toBe(0.0);
+    expect(zeroQtyLineTax.taxes_data[0].base_amount).toBe(0.0);
+    expect(zeroQtyLineTax.taxes_data[0].tax_amount).toBe(0.0);
 });
 
-test("[getAllPrices()] with discount applied", async () => {
+test("[get prices()] with discount applied", async () => {
     const store = await setupPosEnv();
     const models = store.models;
     const data = models.loadConnectedData(getAllPricesData());
     const orderLine = data["pos.order.line"][0];
-    orderLine.setDiscount(10.0); // 10% discount
-    const lineTax = orderLine.getAllPrices();
+
     // Prices with a discount of 10% applied: 230 * 0.9 = 207.0
-    expect(lineTax.priceWithTax).toBe(207.0);
-    expect(lineTax.priceWithoutTax).toBe(180.0);
-    expect(lineTax.taxDetails[1].amount).toBe(27.0);
+    orderLine.setDiscount(10.0); // 10% discount
+    const lineTax = orderLine.prices;
+    expect(lineTax.total_included).toBe(207.0);
+    expect(lineTax.total_excluded).toBe(180.0);
+    expect(lineTax.taxes_data[0].tax_amount).toBe(27.0);
+
     // Price with a discount of 100% applied
     orderLine.setDiscount(100.0);
-    const updatedLineTax = orderLine.getAllPrices();
-    expect(updatedLineTax.priceWithoutTax).toBe(0.0);
-    expect(updatedLineTax.priceWithTax).toBe(0.0);
-    expect(updatedLineTax.tax).toBe(0.0);
-    expect(updatedLineTax.taxDetails[1].amount).toBe(0.0);
+    const updatedLineTax = orderLine.prices;
+    expect(updatedLineTax.total_excluded).toBe(0.0);
+    expect(updatedLineTax.total_included).toBe(0.0);
+    expect(updatedLineTax.taxes_data[0].tax_amount).toBe(0.0);
 });
 
-test("[getAllPrices()] with multiple taxes settings", async () => {
+test("[get prices()] with multiple taxes settings", async () => {
     const store = await setupPosEnv();
     const models = store.models;
-    const data = models.loadConnectedData(getAllPricesData());
+    const rawData = getAllPricesData();
+    const product = models["product.product"].get(5);
+    product.taxes_id = models["account.tax"].readMany([1, 2]); // Set two taxes on the product
+    rawData["pos.order.line"][0].qty = 1;
+    rawData["pos.order.line"][0].tax_ids = [1, 2];
+
+    const data = models.loadConnectedData(rawData);
     const orderLine = data["pos.order.line"][0];
+
     // Test with two taxes applied (15% and 25%)
-    orderLine.tax_ids = [1, 2];
-    orderLine.qty = 1;
-    const lineTax = orderLine.getAllPrices();
-    expect(lineTax.priceWithoutTax).toBe(100.0);
-    expect(lineTax.priceWithTax).toBe(140.0);
-    expect(lineTax.tax).toBe(40.0);
-    expect(lineTax.taxDetails[1].amount).toBe(15.0);
-    expect(lineTax.taxDetails[2].amount).toBe(25.0);
+    const lineTax = orderLine.prices;
+    expect(lineTax.total_excluded).toBe(100.0);
+    expect(lineTax.total_included).toBe(140.0);
+    expect(lineTax.taxes_data[0].tax_amount).toBe(15.0);
+    expect(lineTax.taxes_data[1].tax_amount).toBe(25.0);
 
     // Test with "include_base_amount" and "include_base_amount" to true for both taxes
     models["account.tax"].get(1).include_base_amount = true;
     models["account.tax"].get(2).include_base_amount = true;
-    const updatedLineTax = data["pos.order.line"][0].getAllPrices();
-    expect(updatedLineTax.priceWithoutTax).toBe(100.0);
-    expect(updatedLineTax.priceWithTax).toBe(143.75);
-    expect(updatedLineTax.tax).toBe(43.75);
-    expect(updatedLineTax.taxDetails[1].amount).toBe(15.0);
-    expect(updatedLineTax.taxDetails[2].amount).toBe(28.75);
+    const updatedLineTax = data["pos.order.line"][0].prices;
+    expect(updatedLineTax.total_excluded).toBe(100.0);
+    expect(updatedLineTax.total_included).toBe(143.75);
+    expect(updatedLineTax.taxes_data[0].tax_amount).toBe(15.0);
+    expect(updatedLineTax.taxes_data[1].tax_amount).toBe(28.75);
 
     // Test without any taxes
-    orderLine.tax_ids = [];
-    const noTaxLine = data["pos.order.line"][0].getAllPrices();
-    expect(noTaxLine.priceWithoutTax).toBe(100.0);
-    expect(noTaxLine.priceWithTax).toBe(100.0);
-    expect(noTaxLine.tax).toBe(0.0);
-    expect(Object.keys(noTaxLine.taxDetails).length).toBe(0);
+    product.taxes_id = [];
+    data["pos.order.line"][0].tax_ids = [];
+    const noTaxLine = data["pos.order.line"][0].prices;
+    expect(noTaxLine.total_excluded).toBe(100.0);
+    expect(noTaxLine.total_included).toBe(100.0);
+    expect(noTaxLine.taxes_data).toHaveLength(0);
 });
 
-test("[getAllPrices()] with fixed-amount tax", async () => {
+test("[get prices()] with fixed-amount tax", async () => {
     const store = await setupPosEnv();
     const models = store.models;
     const data = models.loadConnectedData(getAllPricesData());
@@ -109,30 +113,32 @@ test("[getAllPrices()] with fixed-amount tax", async () => {
     const orderLine = data["pos.order.line"][0];
     orderLine.qty = 3;
     orderLine.price_unit = 10.0;
-    const lineTax = orderLine.getAllPrices();
+    const lineTax = orderLine.prices;
     // 3 * 10 = 30, tax = 3 * 15 = 45
-    expect(lineTax.priceWithoutTax).toBe(30.0);
-    expect(lineTax.priceWithTax).toBe(75.0);
-    expect(lineTax.tax).toBe(45.0);
-    expect(lineTax.taxDetails[1].amount).toBe(45.0);
+    expect(lineTax.total_excluded).toBe(30.0);
+    expect(lineTax.total_included).toBe(75.0);
+    expect(lineTax.taxes_data[0].tax_amount).toBe(45.0);
 });
 
-test("[getAllPrices()] with one price-included and one price-excluded tax", async () => {
+test("[get prices()] with one price-included and one price-excluded tax", async () => {
     const store = await setupPosEnv();
     const models = store.models;
-    const data = models.loadConnectedData(getAllPricesData());
+    const product = models["product.product"].get(5);
+    const rawData = getAllPricesData();
+    models["account.tax"].get(1).price_include = true;
+    product.taxes_id = models["account.tax"].readMany([1, 2]);
+    rawData["pos.order.line"][0].tax_ids = [1, 2];
+
+    const data = models.loadConnectedData(rawData);
     const orderLine = data["pos.order.line"][0];
-    orderLine.tax_ids = [1, 2];
     orderLine.qty = 1;
     orderLine.price_unit = 115.0; // price includes 15% tax
-    models["account.tax"].get(1).price_include = true;
-    const lineTax = orderLine.getAllPrices();
+    const lineTax = orderLine.prices;
     // priceWithoutTax: 115 / 1.15 = 100, 25% tax = 25, priceWithTax = 115 + 25 = 140
-    expect(lineTax.priceWithoutTax).toBe(100.0);
-    expect(lineTax.priceWithTax).toBe(140.0);
-    expect(lineTax.tax).toBe(40.0);
-    expect(lineTax.taxDetails[1].amount).toBe(15.0);
-    expect(lineTax.taxDetails[2].amount).toBe(25.0);
+    expect(lineTax.total_excluded).toBe(100.0);
+    expect(lineTax.total_included).toBe(140.0);
+    expect(lineTax.taxes_data[0].tax_amount).toBe(15.0);
+    expect(lineTax.taxes_data[1].tax_amount).toBe(25.0);
 });
 
 test("[get quantityStr] Base test", async () => {
diff --git a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
index ab3f46c9bad01..c6cf00004c7b3 100644
--- a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
+++ b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
@@ -12,21 +12,6 @@ import {
 definePosModels();
 
 describe("pos_store.js", () => {
-    test("getProductPrice", async () => {
-        const store = await setupPosEnv();
-        const order = store.addNewOrder();
-        const product = store.models["product.template"].get(5);
-        const price = store.getProductPrice(product);
-        expect(price).toBe(3.45);
-        order.setPricelist(null);
-
-        const newPrice = store.getProductPrice(product);
-        expect(newPrice).toBe(115.0);
-
-        const formattedPrice = store.getProductPrice(product, false, true);
-        expect(formattedPrice).toBe("$\u00a0115.00");
-    });
-
     test("setTip", async () => {
         const store = await setupPosEnv();
         const order = await getFilledOrder(store); // Should have 2 lines
@@ -337,7 +322,7 @@ describe("pos_store.js", () => {
         store.selectedCategory = store.models["pos.category"].get(1);
         store.searchProductWord = "TEST";
         products = store.productsToDisplay;
-        expect(products.length).toBe(2);
+        expect(products.length).toBe(4);
         expect(products[0].id).toBe(5);
         expect(products[1].id).toBe(6);
         expect(store.selectedCategory).toBe(undefined);
@@ -355,7 +340,7 @@ describe("pos_store.js", () => {
         let grouped = store.productToDisplayByCateg;
         expect(grouped.length).toBe(1); //Only one group
         expect(grouped[0][0]).toBe(0);
-        expect(grouped[0][1].length).toBe(10); //10 products in same group
+        expect(grouped[0][1].length).toBe(12); //10 products in same group
 
         // Case 2: Grouping enabled
         store.config.iface_group_by_categ = true;
diff --git a/addons/point_of_sale/static/tests/unit/utils.js b/addons/point_of_sale/static/tests/unit/utils.js
index 7454c539cede2..dcd721bb1bc87 100644
--- a/addons/point_of_sale/static/tests/unit/utils.js
+++ b/addons/point_of_sale/static/tests/unit/utils.js
@@ -5,6 +5,7 @@ import { Deferred } from "@odoo/hoot-mock";
 import { MainComponentsContainer } from "@web/core/main_components_container";
 import { patch } from "@web/core/utils/patch";
 import { onMounted } from "@odoo/owl";
+import { expect } from "@odoo/hoot";
 
 const { DateTime } = luxon;
 
@@ -101,3 +102,7 @@ export const patchDialogComponent = (component) => {
         },
     });
 };
+
+export const expectFormattedPrice = (value, expected) => {
+    expect(value).toBe(expected.replaceAll(" ", "\u00a0"));
+};
diff --git a/addons/point_of_sale/tests/common.py b/addons/point_of_sale/tests/common.py
index fd8fb1ada37a6..8795a45d09058 100644
--- a/addons/point_of_sale/tests/common.py
+++ b/addons/point_of_sale/tests/common.py
@@ -697,7 +697,7 @@ def create_tax_fixed(amount, price_include_override='tax_excluded', include_base
     def create_random_uid(self):
         return ('%05d-%03d-%04d' % (randint(1, 99999), randint(1, 999), randint(1, 9999)))
 
-    def create_ui_order_data(self, pos_order_lines_ui_args, customer=False, is_invoiced=False, payments=None, uuid=None):
+    def create_ui_order_data(self, pos_order_lines_ui_args, pos_order_ui_args={}, customer=False, is_invoiced=False, payments=None, uuid=None):
         """ Mocks the order_data generated by the pos ui.
 
         This is useful in making orders in an open pos session without making tours.
@@ -802,6 +802,7 @@ def create_payment(payment_method, amount):
             'uuid': uuid,
             'user_id': self.env.uid,
             'to_invoice': is_invoiced,
+            **pos_order_ui_args,
         }
 
     @classmethod
diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py
index e0f2bcf39f111..2c66bf7432fd4 100644
--- a/addons/point_of_sale/tests/test_frontend.py
+++ b/addons/point_of_sale/tests/test_frontend.py
@@ -627,7 +627,6 @@ def test_01_pos_basic_order(self):
         self.env['ir.module.module'].search([('name', '=', 'point_of_sale')], limit=1).state = 'installed'
 
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'pos_pricelist', login="pos_user")
-        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'pos_basic_order_01_multi_payment_and_change', login="pos_user")
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'pos_basic_order_02_decimal_order_quantity', login="pos_user")
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'pos_basic_order_03_tax_position', login="pos_user")
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'FloatingOrderTour', login="pos_user")
@@ -805,6 +804,7 @@ def test_rounding_up(self):
         self.main_pos_config.write({
             'rounding_method': rouding_method.id,
             'cash_rounding': True,
+            'only_round_cash_method': True,
         })
 
         self.main_pos_config.with_user(self.pos_user).open_ui()
@@ -827,6 +827,7 @@ def test_rounding_down(self):
         self.main_pos_config.write({
             'rounding_method': rouding_method.id,
             'cash_rounding': True,
+            'only_round_cash_method': True,
         })
 
         self.main_pos_config.with_user(self.pos_user).open_ui()
@@ -834,42 +835,6 @@ def test_rounding_down(self):
         self.env["pos.order"].search([('state', '=', 'draft')]).write({'state': 'cancel'})
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'PaymentScreenTotalDueWithOverPayment', login="pos_user")
 
-    def test_rounding_half_up(self):
-        rouding_method = self.env['account.cash.rounding'].create({
-            'name': 'Rounding HALF-UP',
-            'rounding': 0.5,
-            'rounding_method': 'HALF-UP',
-        })
-
-        self.env['product.product'].create({
-            'name': 'Product Test 1.20',
-            'available_in_pos': True,
-            'list_price': 1.2,
-            'taxes_id': False,
-        })
-
-        self.env['product.product'].create({
-            'name': 'Product Test 1.25',
-            'available_in_pos': True,
-            'list_price': 1.25,
-            'taxes_id': False,
-        })
-
-        self.env['product.product'].create({
-            'name': 'Product Test 1.4',
-            'available_in_pos': True,
-            'list_price': 1.4,
-            'taxes_id': False,
-        })
-
-        self.main_pos_config.write({
-            'rounding_method': rouding_method.id,
-            'cash_rounding': True,
-        })
-
-        self.main_pos_config.with_user(self.pos_user).open_ui()
-        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'PaymentScreenRoundingHalfUp', login="pos_user")
-
     def test_pos_closing_cash_details(self):
         """Test cash difference *loss* at closing.
         """
@@ -1729,27 +1694,6 @@ def test_product_combo_discount(self):
             login="pos_user",
         )
 
-    def test_cash_rounding_payment(self):
-        """Verify than an error popup is shown if the payment value is more precise than the rounding method"""
-        rounding_method = self.env['account.cash.rounding'].create({
-            'name': 'Down 0.10',
-            'rounding': 0.10,
-            'strategy': 'add_invoice_line',
-            'profit_account_id': self.company_data['default_account_revenue'].copy().id,
-            'loss_account_id': self.company_data['default_account_expense'].copy().id,
-            'rounding_method': 'DOWN',
-        })
-
-        self.main_pos_config.write({
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-            'rounding_method': rounding_method.id,
-        })
-
-        self.env['ir.config_parameter'].sudo().set_int('barcode.max_time_between_keys_in_ms', 1)
-        self.main_pos_config.open_ui()
-        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'CashRoundingPayment', login="accountman")
-
     def test_product_categories_order(self):
         """ Verify that the order of categories doesnt change in the frontend """
         self.env['pos.category'].search([]).write({'sequence': 100})
diff --git a/addons/point_of_sale/tests/test_pos_cash_rounding.py b/addons/point_of_sale/tests/test_pos_cash_rounding.py
index a9733ce567b79..49ff6032e13ba 100644
--- a/addons/point_of_sale/tests/test_pos_cash_rounding.py
+++ b/addons/point_of_sale/tests/test_pos_cash_rounding.py
@@ -1,5 +1,3 @@
-from unittest import skip
-
 from odoo import Command
 from odoo.addons.point_of_sale.tests.test_frontend import TestPointOfSaleHttpCommon
 from odoo.tests import tagged
@@ -37,220 +35,6 @@ def setUpClass(cls):
             'pos_categ_ids': [Command.set(cls.pos_desk_misc_test.ids)],
         })
 
-    def test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method(self):
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.7,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.65,
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.7,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.65,
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-            }])
-
-    def test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method_pay_by_bank_and_cash(self):
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_halfup_add_invoice_line_not_only_round_cash_method_pay_by_bank_and_cash')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.73,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.68,
-                'amount_tax': 2.05,
-                'amount_total': 15.73,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.73,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.68,
-                'amount_tax': 2.05,
-                'amount_total': 15.73,
-            }])
-
-    def test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_no_rounding_left(self):
-        self.cash_rounding_add_invoice_line.rounding_method = 'DOWN'
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_no_rounding_left')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.72,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.67,
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.72,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.67,
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-            }])
-
-    def test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_with_residual_rounding(self):
-        self.cash_rounding_add_invoice_line.rounding_method = 'DOWN'
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_down_add_invoice_line_not_only_round_cash_method_with_residual_rounding')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.68,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.63,
-                'amount_tax': 2.05,
-                'amount_total': 15.68,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.68,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.63,
-                'amount_tax': 2.05,
-                'amount_total': 15.68,
-            }])
-
-    @skip('Temporary to fast merge new valuation')
-    def test_cash_rounding_up_add_invoice_line_not_only_round_cash_method(self):
-        self.cash_rounding_add_invoice_line.rounding_method = 'UP'
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_up_add_invoice_line_not_only_round_cash_method')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.74,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.69,
-                'amount_tax': 2.05,
-                'amount_total': 15.74,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.74,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.69,
-                'amount_tax': 2.05,
-                'amount_total': 15.74,
-            }])
-
-    def test_cash_rounding_halfup_add_invoice_line_only_round_cash_method(self):
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': True,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_halfup_add_invoice_line_only_round_cash_method')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.7,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.65,
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.7,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.65,
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-            }])
-
-    def test_cash_rounding_halfup_add_invoice_line_only_round_cash_method_pay_by_bank_and_cash(self):
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': True,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_halfup_add_invoice_line_only_round_cash_method_pay_by_bank_and_cash')
-            refund, order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=2)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.73,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.68,
-                'amount_tax': 2.05,
-                'amount_total': 15.73,
-            }])
-            self.assertRecordValues(refund, [{
-                'amount_tax': -2.05,
-                'amount_total': -15.72,
-                'amount_paid': -15.73,
-            }])
-            self.assertRecordValues(refund.account_move, [{
-                'amount_untaxed': 13.68,
-                'amount_tax': 2.05,
-                'amount_total': 15.73,
-            }])
-
     def test_cash_rounding_halfup_biggest_tax_not_only_round_cash_method(self):
         self.skipTest('To re-introduce when feature is ready')
         self.main_pos_config.write({
@@ -375,84 +159,6 @@ def test_cash_rounding_halfup_biggest_tax_only_round_cash_method_pay_by_bank_and
                 'amount_total': 15.73,
             }])
 
-    def test_cash_rounding_with_change(self):
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': False,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_with_change')
-            order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=1)
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-                'amount_paid': 15.7,
-            }])
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.65,
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-            }])
-
-    def test_cash_rounding_only_cash_method_with_change(self):
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': True,
-        })
-        with self.with_new_session(user=self.pos_user) as session:
-            self.start_pos_tour('test_cash_rounding_only_cash_method_with_change')
-            order = self.env['pos.order'].search([('session_id', '=', session.id)], limit=1)
-            self.assertRecordValues(order.account_move, [{
-                'amount_untaxed': 13.65,
-                'amount_tax': 2.05,
-                'amount_total': 15.7,
-            }])
-            self.assertRecordValues(order, [{
-                'amount_tax': 2.05,
-                'amount_total': 15.72,
-                'amount_paid': 15.7,
-            }])
-
-    def test_cash_rounding_up_with_change(self):
-        self.cash_rounding_add_invoice_line = self.env['account.cash.rounding'].create({
-            'name': "cash_rounding_up_1",
-            'rounding': 1.00,
-            'rounding_method': 'UP',
-            'strategy': 'add_invoice_line',
-            'profit_account_id': self.env.company.default_cash_difference_income_account_id.id,
-            'loss_account_id': self.env.company.default_cash_difference_expense_account_id.id,
-        })
-        self.main_pos_config.write({
-            'rounding_method': self.cash_rounding_add_invoice_line.id,
-            'cash_rounding': True,
-            'only_round_cash_method': True,
-        })
-        tax_include = self.env['account.tax'].create({
-            'name': 'tax incl',
-            'type_tax_use': 'sale',
-            'amount_type': 'percent',
-            'amount': 7,
-            'price_include_override': 'tax_included',
-            'include_base_amount': True,
-        })
-        self.env['product.product'].create({
-            'name': "product_a",
-            'available_in_pos': True,
-            'list_price': 95.00,
-            'taxes_id': tax_include,
-            'pos_categ_ids': [Command.set(self.pos_desk_misc_test.ids)],
-        })
-        self.env['product.product'].create({
-            'name': "product_b",
-            'available_in_pos': True,
-            'list_price': 42.00,
-            'taxes_id': tax_include,
-            'pos_categ_ids': [Command.set(self.pos_desk_misc_test.ids)],
-        })
-        self.start_pos_tour('test_cash_rounding_up_with_change')
-
     def test_remove_archived_product_from_cache(self):
         self.pos_admin.write({
             'group_ids': [
diff --git a/addons/pos_discount/static/src/app/screens/ticket_screen/ticket_screen.js b/addons/pos_discount/static/src/app/screens/ticket_screen/ticket_screen.js
index f21af3f6b29a4..59147b0ea3a82 100644
--- a/addons/pos_discount/static/src/app/screens/ticket_screen/ticket_screen.js
+++ b/addons/pos_discount/static/src/app/screens/ticket_screen/ticket_screen.js
@@ -11,12 +11,14 @@ patch(TicketScreen.prototype, {
         const destinationOrder = this.pos.getOrder();
 
         if (discountLine && destinationOrder && !destinationOrder.getDiscountLine()) {
-            const globalDiscount = -discountLine.price_subtotal_incl;
+            const globalDiscount = -discountLine.priceIncl;
+            const priceUnit =
+                (globalDiscount * destinationOrder.prices.taxDetails.total_amount) /
+                    (order.amount_total + globalDiscount) || 1;
+
             this.pos.models["pos.order.line"].create({
                 qty: 1,
-                price_unit:
-                    (globalDiscount * destinationOrder.taxTotals.total_amount) /
-                        (order.amount_total + globalDiscount) || 1,
+                price_unit: destinationOrder.orderSign * priceUnit,
                 product_id: this.pos.config.discount_product_id,
                 order_id: destinationOrder,
             });
diff --git a/addons/pos_discount/tests/test_taxes_global_discount.py b/addons/pos_discount/tests/test_taxes_global_discount.py
index 21dccedcc55f3..650163b8d3055 100644
--- a/addons/pos_discount/tests/test_taxes_global_discount.py
+++ b/addons/pos_discount/tests/test_taxes_global_discount.py
@@ -113,7 +113,7 @@ def test_pos_global_discount_sell_and_refund(self):
         self.assertAlmostEqual(refund_order.amount_total, -2.85)
         self.assertEqual(len(refund_order.lines), 2)
         self.assertEqual(refund_order.lines[1].product_id.id, self.main_pos_config.discount_product_id.id)
-        self.assertAlmostEqual(refund_order.lines[1].price_subtotal_incl, 0.15)
+        self.assertAlmostEqual(refund_order.lines[1].price_subtotal_incl, -0.15)
         pos_order = orders[1]
         self.assertAlmostEqual(pos_order.amount_total, 2.85)
         self.assertEqual(len(pos_order.lines), 2)
diff --git a/addons/pos_event/static/src/app/screens/product_screen/product_screen.js b/addons/pos_event/static/src/app/screens/product_screen/product_screen.js
index 77f0b8a545e57..9fef8fb23247b 100644
--- a/addons/pos_event/static/src/app/screens/product_screen/product_screen.js
+++ b/addons/pos_event/static/src/app/screens/product_screen/product_screen.js
@@ -2,7 +2,6 @@ import { ProductScreen } from "@point_of_sale/app/screens/product_screen/product
 import { makeAwaitable } from "@point_of_sale/app/utils/make_awaitable_dialog";
 import { patch } from "@web/core/utils/patch";
 import { EventConfiguratorPopup } from "@pos_event/app/components/popup/event_configurator_popup/event_configurator_popup";
-import { _t } from "@web/core/l10n/translation";
 import { EventRegistrationPopup } from "../../components/popup/event_registration_popup/event_registration_popup";
 import { EventSlotSelectionPopup } from "../../components/popup/event_slot_selection_popup/event_slot_selection_popup";
 
@@ -13,13 +12,6 @@ patch(ProductScreen.prototype, {
         const products = super.products;
         return [...products].filter((p) => p.service_tracking !== "event");
     },
-    getProductPrice(productTemplate) {
-        if (!productTemplate.event_id) {
-            return super.getProductPrice(productTemplate);
-        }
-
-        return _t("From %s", this.pos.getProductPrice(productTemplate, false, true));
-    },
     getProductImage(product) {
         if (!product.event_id) {
             return super.getProductImage(product);
diff --git a/addons/pos_loyalty/static/src/app/components/popups/manage_giftcard_popup/manage_giftcard_popup.js b/addons/pos_loyalty/static/src/app/components/popups/manage_giftcard_popup/manage_giftcard_popup.js
index 07eff1351d066..7f9f5611c3d18 100644
--- a/addons/pos_loyalty/static/src/app/components/popups/manage_giftcard_popup/manage_giftcard_popup.js
+++ b/addons/pos_loyalty/static/src/app/components/popups/manage_giftcard_popup/manage_giftcard_popup.js
@@ -35,7 +35,7 @@ export class ManageGiftCardPopup extends Component {
             lockGiftCardFields: false,
             loading: false,
             inputValue: this.props.startingValue,
-            amountValue: this.props.line.getPriceWithTax().toString(),
+            amountValue: this.props.line.prices.total_included.toString(),
             error: false,
             amountError: false,
             expirationDate: luxon.DateTime.now().plus({ year: 1 }),
diff --git a/addons/pos_loyalty/static/src/app/models/pos_order.js b/addons/pos_loyalty/static/src/app/models/pos_order.js
index b2b82c8f1a659..05e3a1c7a5323 100644
--- a/addons/pos_loyalty/static/src/app/models/pos_order.js
+++ b/addons/pos_loyalty/static/src/app/models/pos_order.js
@@ -3,7 +3,6 @@ import { patch } from "@web/core/utils/patch";
 import { floatIsZero } from "@web/core/utils/numbers";
 import { _t } from "@web/core/l10n/translation";
 import { loyaltyIdsGenerator } from "@pos_loyalty/app/services/pos_store";
-import { computePriceForcePriceInclude } from "@point_of_sale/app/models/utils/tax_utils";
 const { DateTime } = luxon;
 
 function _newRandomRewardCode() {
@@ -374,7 +373,7 @@ patch(PosOrder.prototype, {
      */
     _getPointsCorrection(program) {
         const rewardLines = this.lines.filter((line) => line.is_reward_line);
-        if (!this._canGenerateRewards(program, this.getTotalWithTax(), this.getTotalWithoutTax())) {
+        if (!this._canGenerateRewards(program, this.priceIncl, this.priceExcl)) {
             return 0;
         }
         let res = 0;
@@ -387,7 +386,7 @@ patch(PosOrder.prototype, {
                 if (this._validForPointsCorrection(reward, line, rule)) {
                     if (rule.reward_point_mode === "money") {
                         res -= ProductPrice.round(
-                            rule.reward_point_amount * line.getPriceWithTax()
+                            rule.reward_point_amount * line.prices.total_included
                         );
                     } else if (rule.reward_point_mode === "unit") {
                         res += rule.reward_point_amount * line.getQuantity();
@@ -430,7 +429,6 @@ patch(PosOrder.prototype, {
     /**
      * @returns {number} The points that are left for the given coupon for this order.
      */
-    //FIXME use of pos
     _getRealCouponPoints(coupon_id) {
         let points = 0;
         const dbCoupon = this.models["loyalty.card"].get(coupon_id);
@@ -555,16 +553,16 @@ patch(PosOrder.prototype, {
                     (sum, line) =>
                         sum +
                         (line.combo_line_ids.length > 0
-                            ? line.getComboTotalPrice()
-                            : line.getPriceWithTax()),
+                            ? line.comboTotalPrice
+                            : line.prices.total_included),
                     0
                 );
                 const amountWithoutTax = linesForRule.reduce(
                     (sum, line) =>
                         sum +
                         (line.combo_line_ids.length > 0
-                            ? line.getComboTotalPriceWithoutTax()
-                            : line.getPriceWithoutTax()),
+                            ? line.comboTotalPriceWithoutTax
+                            : line.prices.total_excluded),
                     0
                 );
                 const amountCheck =
@@ -607,8 +605,8 @@ patch(PosOrder.prototype, {
                         }
                         orderedProductPaid +=
                             line.combo_line_ids.length > 0
-                                ? line.getComboTotalPrice()
-                                : line.getPriceWithTax();
+                                ? line.comboTotalPrice
+                                : line.prices.total_included;
                         if (!line.is_reward_line) {
                             totalProductQty += lineQty;
                         }
@@ -646,7 +644,7 @@ patch(PosOrder.prototype, {
                                 continue;
                             }
                             const pointsPerUnit = ProductPrice.round(
-                                (rule.reward_point_amount * line.getPriceWithTax()) /
+                                (rule.reward_point_amount * line.prices.total_included) /
                                     line.getQuantity()
                             );
                             if (pointsPerUnit > 0) {
@@ -749,8 +747,8 @@ patch(PosOrder.prototype, {
                 }))
             );
         const result = [];
-        const totalWithTax = this.getTotalWithTax();
-        const totalWithoutTax = this.getTotalWithoutTax();
+        const totalWithTax = this.priceIncl;
+        const totalWithoutTax = this.priceExcl;
         const totalIsZero = totalWithTax === 0;
         const globalDiscountLines = this._getGlobalDiscountLines();
         const globalDiscountPercent = globalDiscountLines.length
@@ -954,11 +952,11 @@ patch(PosOrder.prototype, {
             const taxKey = ["ewallet", "gift_card"].includes(reward.program_id.program_type)
                 ? line.tax_ids.map((t) => t.id)
                 : line.tax_ids.filter((t) => t.amount_type !== "fixed").map((t) => t.id);
-            discountable += line.getPriceWithTax();
+            discountable += line.prices.total_included;
             if (!discountablePerTax[taxKey]) {
                 discountablePerTax[taxKey] = 0;
             }
-            discountablePerTax[taxKey] += line.getBasePrice();
+            discountablePerTax[taxKey] += line.prices.total_excluded;
         }
         return { discountable, discountablePerTax };
     },
@@ -976,7 +974,7 @@ patch(PosOrder.prototype, {
                 applicableProductIds.has(line.getProduct().id)
         );
         return filtered_lines.toSorted(
-            (lineA, lineB) => lineA.getComboTotalPrice() - lineB.getComboTotalPrice()
+            (lineA, lineB) => lineA.comboTotalPrice / lineA.qty - lineB.comboTotalPrice / lineB.qty
         )[0];
     },
     /**
@@ -989,9 +987,9 @@ patch(PosOrder.prototype, {
         }
         const taxKey = cheapestLine.tax_ids.map((t) => t.id);
         return {
-            discountable: cheapestLine.getComboTotalPriceWithoutTax(),
+            discountable: cheapestLine.comboTotalPriceWithoutTax,
             discountablePerTax: Object.fromEntries([
-                [taxKey, cheapestLine.getComboTotalPriceWithoutTax()],
+                [taxKey, cheapestLine.comboTotalPriceWithoutTax],
             ]),
         };
     },
@@ -1032,7 +1030,7 @@ patch(PosOrder.prototype, {
             if (!line.getQuantity() || !line.price_unit) {
                 continue;
             }
-            remainingAmountPerLine[line.uuid] = line.getPriceWithTax();
+            remainingAmountPerLine[line.uuid] = line.prices.total_included;
             const product_id = line.combo_parent_id?.product_id.id || line.getProduct().id;
             if (
                 applicableProductIds.has(product_id) ||
@@ -1103,7 +1101,8 @@ patch(PosOrder.prototype, {
                 discountablePerTax[taxKey] = 0;
             }
             discountablePerTax[taxKey] +=
-                line.getBasePrice() * (remainingAmountPerLine[line.uuid] / line.getPriceWithTax());
+                line.prices.total_excluded *
+                (remainingAmountPerLine[line.uuid] / line.prices.total_included);
         }
         return { discountable, discountablePerTax };
     },
@@ -1142,7 +1141,7 @@ patch(PosOrder.prototype, {
             return _t("Unknown discount type");
         }
         let { discountable, discountablePerTax } = getDiscountable(reward);
-        discountable = Math.min(this.getTotalWithTax(), discountable);
+        discountable = Math.min(this.priceIncl, discountable);
         if (floatIsZero(discountable)) {
             return [];
         }
@@ -1169,20 +1168,18 @@ patch(PosOrder.prototype, {
         // These are considered payments and do not require to be either taxed or split by tax
         const discountProduct = reward.discount_line_product_id;
         if (["ewallet", "gift_card"].includes(reward.program_id.program_type)) {
-            const new_price = computePriceForcePriceInclude(
-                discountProduct.taxes_id,
-                -Math.min(maxDiscount, discountable),
-                discountProduct,
-                {},
-                this.company,
-                this.currency,
-                this.models
-            );
+            const price = discountProduct.getTaxDetails({
+                overridedValues: {
+                    tax_ids: discountProduct.taxes_id,
+                    price_unit: -Math.min(maxDiscount, discountable),
+                    special_mode: "total_included",
+                },
+            });
 
             return [
                 {
                     product_id: discountProduct,
-                    price_unit: new_price,
+                    price_unit: price.total_excluded,
                     qty: 1,
                     reward_id: reward,
                     is_reward_line: true,
@@ -1205,7 +1202,7 @@ patch(PosOrder.prototype, {
 
             lst.push({
                 product_id: discountProduct,
-                price_unit: -(Math.min(this.getTotalWithTax(), entry[1]) * discountFactor),
+                price_unit: -(Math.min(this.priceIncl, entry[1]) * discountFactor),
                 qty: 1,
                 reward_id: reward,
                 is_reward_line: true,
diff --git a/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js b/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js
index 62cb0c44a7fb4..1e8f40f2b3800 100644
--- a/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js
+++ b/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js
@@ -35,7 +35,7 @@ patch(ControlButtons.prototype, {
     async onClickWallet() {
         const order = this.pos.getOrder();
         const eWalletPrograms = this._getEWalletPrograms();
-        const orderTotal = order.getTotalWithTax();
+        const orderTotal = order.priceIncl;
         const eWalletRewards = this._getEWalletRewards(order);
         if (eWalletRewards.length === 0 && orderTotal >= 0) {
             this.dialog.add(AlertDialog, {
diff --git a/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.xml b/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.xml
index 1a00c0c41d053..fafe1cde5b6d5 100644
--- a/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.xml
+++ b/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.xml
@@ -5,7 +5,7 @@
             expr="//t[@t-if='props.showRemainingButtons']/div/button[hasclass('o_pricelist_button')]"
             position="before">
             <t t-if="pos.models['loyalty.program'].some((p) => p.program_type == 'ewallet')">
-                <t t-set="_orderTotal" t-value="pos.getOrder().getTotalWithTax()" />
+                <t t-set="_orderTotal" t-value="pos.getOrder().priceIncl" />
                 <t t-set="_eWalletPrograms" t-value="_getEWalletPrograms()" />
                 <t t-set="_eWalletRewards" t-value="_getEWalletRewards(pos.getOrder())" />
                 <button t-att-class="buttonClass"
diff --git a/addons/pos_loyalty/static/src/app/services/pos_store.js b/addons/pos_loyalty/static/src/app/services/pos_store.js
index 6ae54dd07d55d..8aae47744321d 100644
--- a/addons/pos_loyalty/static/src/app/services/pos_store.js
+++ b/addons/pos_loyalty/static/src/app/services/pos_store.js
@@ -385,7 +385,7 @@ patch(PosStore.prototype, {
             selectedProgram = linkedPrograms[0];
         }
 
-        const orderTotal = this.getOrder().getTotalWithTax();
+        const orderTotal = this.getOrder().priceIncl;
         if (
             selectedProgram &&
             ["gift_card", "ewallet"].includes(selectedProgram.program_type) &&
diff --git a/addons/pos_loyalty/static/tests/tours/pos_loyalty_loyalty_program_tour.js b/addons/pos_loyalty/static/tests/tours/pos_loyalty_loyalty_program_tour.js
index 4d8fd61ddfe10..c6f86f80e15c7 100644
--- a/addons/pos_loyalty/static/tests/tours/pos_loyalty_loyalty_program_tour.js
+++ b/addons/pos_loyalty/static/tests/tours/pos_loyalty_loyalty_program_tour.js
@@ -266,7 +266,7 @@ registry.category("web_tour.tours").add("PosCheapestProductTaxInclude", {
             ProductScreen.clickDisplayedProduct("Product"),
             ProductScreen.addOrderline("Desk Organizer", "1"),
             Order.hasLine({ productName: "10% on the cheapest product" }),
-            PosLoyalty.orderTotalIs("6.00"),
+            PosLoyalty.orderTotalIs("6.01"), // taxe of 9 cents (≈ 10% HT)
         ].flat(),
 });
 
diff --git a/addons/pos_loyalty/static/tests/unit/services/pos_service.test.js b/addons/pos_loyalty/static/tests/unit/services/pos_service.test.js
index d20d34f10735a..5ff4b7b21c659 100644
--- a/addons/pos_loyalty/static/tests/unit/services/pos_service.test.js
+++ b/addons/pos_loyalty/static/tests/unit/services/pos_service.test.js
@@ -65,32 +65,4 @@ describe("PosStore - loyalty essentials", () => {
 
         expect(card.id).toBe(2);
     });
-
-    test("preSyncAllOrders", async () => {
-        const store = await setupPosEnv();
-        const models = store.models;
-
-        const coupon = models["loyalty.card"].create({
-            id: -5,
-            code: "X",
-            program_id: 1,
-            points: 0,
-        });
-        const rewardProduct = models["product.product"].get(1);
-
-        const fakeOrderData = {
-            lines: [
-                {
-                    uuid: "uuid-1",
-                    coupon_id: coupon,
-                    _reward_product_id: rewardProduct,
-                },
-            ],
-        };
-
-        await store.preSyncAllOrders([fakeOrderData]);
-
-        expect(store.couponByLineUuidCache["uuid-1"]).toBe(coupon.id);
-        expect(store.rewardProductByLineUuidCache["uuid-1"]).toBe(rewardProduct.id);
-    });
 });
diff --git a/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js b/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
index e5aab397ccd4d..d112dd018e089 100644
--- a/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
+++ b/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
@@ -214,7 +214,7 @@ patch(OrderPaymentValidation.prototype, {
 
         // Now, do practically the normal flow
         if (
-            (this.order.isPaidWithCash() || this.order.getChange()) &&
+            (this.order.isPaidWithCash() || this.order.change) &&
             this.pos.config.iface_cashdrawer
         ) {
             this.hardwareProxy.printer.openCashbox();
diff --git a/addons/pos_razorpay/static/src/app/screens/payment_screen/payment_screen.js b/addons/pos_razorpay/static/src/app/screens/payment_screen/payment_screen.js
index e4e650ebbc30d..c623ba342d19a 100644
--- a/addons/pos_razorpay/static/src/app/screens/payment_screen/payment_screen.js
+++ b/addons/pos_razorpay/static/src/app/screens/payment_screen/payment_screen.js
@@ -38,7 +38,7 @@ patch(PaymentScreen.prototype, {
                     pi.payment_method_id.use_payment_terminal === "razorpay" &&
                     !transactionsIds.find((x) => x === pi.transaction_id)
             );
-            const currentDue = this.currentOrder.getDue();
+            const currentDue = this.currentOrder.remainingDue;
             if (!razorpayPaymentline || currentDue === 0) {
                 this.pos.notification.add(
                     _t(
diff --git a/addons/pos_razorpay/static/src/app/services/pos_store.js b/addons/pos_razorpay/static/src/app/services/pos_store.js
index 8d02fef3e7926..5fcb03cf7035b 100644
--- a/addons/pos_razorpay/static/src/app/services/pos_store.js
+++ b/addons/pos_razorpay/static/src/app/services/pos_store.js
@@ -12,12 +12,16 @@ patch(PosStore.prototype, {
         if (razorpayPaymentMethod && refundedOrder) {
             const paymentIds = refundedOrder.payment_ids || [];
             // Add all the available payment lines in the refunded order if the current order amount is the same as the refunded order
-            if (Math.abs(currentOrder.getTotalDue()) === refundedOrder.amount_total) {
+            if (Math.abs(currentOrder.totalDue) === refundedOrder.amount_total) {
                 paymentIds.forEach((pi) => {
                     if (pi.payment_method_id) {
-                        const paymentLine = currentOrder.addPaymentline(pi.payment_method_id);
-                        paymentLine.setAmount(-pi.amount);
-                        paymentLine.updateRefundPaymentLine(pi);
+                        const result = currentOrder.addPaymentline(pi.payment_method_id);
+                        if (!result.status) {
+                            return;
+                        }
+
+                        result.data.setAmount(-pi.amount);
+                        result.data.updateRefundPaymentLine(pi);
                     }
                 });
             } else {
@@ -27,16 +31,20 @@ patch(PosStore.prototype, {
                     (pi) => pi.payment_method_id.use_payment_terminal === "razorpay"
                 );
                 razorpayPaymentlines.forEach((pi) => {
-                    const currentDue = currentOrder.getDue();
+                    const currentDue = currentOrder.remainingDue;
                     if (currentDue < 0) {
-                        const paymentLine = currentOrder.addPaymentline(pi.payment_method_id);
-                        paymentLine.setAmount(-Math.min(Math.abs(currentDue), pi.amount));
-                        paymentLine.updateRefundPaymentLine(pi);
+                        const result = currentOrder.addPaymentline(pi.payment_method_id);
+                        if (!result.status) {
+                            return false;
+                        }
+
+                        result.data.setAmount(-Math.min(Math.abs(currentDue), pi.amount));
+                        result.data.updateRefundPaymentLine(pi);
                     }
                 });
-                if (currentOrder.getDue() < 0) {
+                if (currentOrder.remainingDue < 0) {
                     paymentIds.forEach((pi) => {
-                        const currentDue = currentOrder.getDue();
+                        const currentDue = currentOrder.remainingDue;
                         if (
                             currentDue < 0 &&
                             pi.payment_method_id &&
diff --git a/addons/pos_restaurant/static/src/app/components/orderline/orderline.xml b/addons/pos_restaurant/static/src/app/components/orderline/orderline.xml
index 29c892ed4cb99..78cf63a62f9b1 100644
--- a/addons/pos_restaurant/static/src/app/components/orderline/orderline.xml
+++ b/addons/pos_restaurant/static/src/app/components/orderline/orderline.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="pos_sale.Orderline" t-inherit="point_of_sale.Orderline" t-inherit-mode="extension">
-        <xpath expr="//t[@t-esc='line.getQuantityStr().unitPart']" position="replace">
-            <t t-esc="line.uiState.splitQty or line.getQuantityStr().unitPart"/>
+        <xpath expr="//t[@t-esc='vals.unitPart']" position="replace">
+            <t t-esc="line.uiState.splitQty or vals.unitPart"/>
         </xpath>
     </t>
 </templates>
diff --git a/addons/pos_restaurant/static/src/app/models/pos_order.js b/addons/pos_restaurant/static/src/app/models/pos_order.js
index 83485318a84cf..f8dc9b47fcba6 100644
--- a/addons/pos_restaurant/static/src/app/models/pos_order.js
+++ b/addons/pos_restaurant/static/src/app/models/pos_order.js
@@ -33,7 +33,7 @@ patch(PosOrder.prototype, {
         if (numCustomers === 0) {
             return 0;
         }
-        return this.getTotalDue() / numCustomers;
+        return this.totalDue / numCustomers;
     },
     setBooked(booked) {
         this.uiState.booked = booked;
diff --git a/addons/pos_restaurant/static/src/app/screens/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml b/addons/pos_restaurant/static/src/app/screens/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml
index c3b2b0a02a020..c233a019ae414 100644
--- a/addons/pos_restaurant/static/src/app/screens/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml
+++ b/addons/pos_restaurant/static/src/app/screens/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml
@@ -3,7 +3,7 @@
 
     <t t-name="pos_restaurant.PaymentScreenPaymentLines" t-inherit="point_of_sale.PaymentScreenPaymentLines" t-inherit-mode="extension">
         <xpath expr="//div[hasclass('send_payment_reversal')]/.." position="replace">
-            <t t-if="line.canBeAdjusted() &amp;&amp; line.pos_order_id.getTotalPaid() &lt; line.pos_order_id.getTotalWithTax()">
+            <t t-if="line.canBeAdjusted() &amp;&amp; line.pos_order_id.amountPaid &lt; line.pos_order_id.priceIncl">
                 <div class="button send_adjust_amount" title="Adjust Amount" t-on-click="() => this.sendPaymentAdjust(line)">
                     Adjust Amount
                 </div>
diff --git a/addons/pos_restaurant/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml b/addons/pos_restaurant/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml
index 5a05f70dc01d1..916ceda577d6a 100644
--- a/addons/pos_restaurant/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml
+++ b/addons/pos_restaurant/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml
@@ -10,7 +10,7 @@
                 <div class="tip-form py-3">
                     <div class="title text-center mt-3">For convenience, we are providing the following gratuity calculations:</div>
                     <div class="percentage-options percentage-options d-flex flex-nowrap mt-3">
-                        <t t-set="totalAmount" t-value="order.getTotalWithTax()"/>
+                        <t t-set="totalAmount" t-value="order.priceIncl"/>
                         <div class="option d-flex flex-column flex-nowrap align-items-center justify-content-center flex-grow-1">
                             <div>15%</div>
                             <div class="amount">
diff --git a/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.js b/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.js
index c4bd0fbc948ef..bead8094de8da 100644
--- a/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.js
+++ b/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.js
@@ -53,7 +53,8 @@ export class SplitBillScreen extends Component {
             const currentQty = this.qtyTracker[uuid] || 0;
             const nextQty = currentQty === maxQty ? 0 : currentQty + 1;
             this.qtyTracker[uuid] = Math.min(nextQty, maxQty);
-            this.priceTracker[uuid] = (line.getPriceWithTax() / line.qty) * this.qtyTracker[uuid];
+            this.priceTracker[uuid] =
+                (line.prices.total_included / line.qty) * this.qtyTracker[uuid];
             this.setLineQtyStr(line);
         }
     }
diff --git a/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.xml b/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.xml
index c74b226ebb46e..deaec177464b6 100644
--- a/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.xml
+++ b/addons/pos_restaurant/static/src/app/screens/split_bill_screen/split_bill_screen.xml
@@ -34,7 +34,7 @@
                                 </span>
                                 <span class="text-dark text-start ms-2"
                                     t-attf-class="{{ this.ui.isSmall ? 'fs-6' : 'fs-2' }}">
-                                    / <PriceFormatter price="env.utils.formatCurrency(currentOrder.getTotalWithTax())" />
+                                    / <PriceFormatter price="env.utils.formatCurrency(currentOrder.priceIncl)" />
                                 </span>
                             </div>
                             <div class="text-dark"
diff --git a/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js b/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
index f9a43e12ad9de..dc7b5ffcfdb56 100644
--- a/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
+++ b/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
@@ -19,7 +19,7 @@ export class TipScreen extends Component {
         this.dialog = useService("dialog");
         this.printer = useService("printer");
         this.state = this.currentOrder.uiState.TipScreen;
-        this._totalAmount = this.currentOrder.getTotalWithTax();
+        this._totalAmount = this.currentOrder.priceIncl;
         useRouterParamsChecker();
 
         onMounted(async () => {
@@ -96,7 +96,7 @@ export class TipScreen extends Component {
         const serverTipLine = await this.pos.data.create("pos.order.line", [serializedTipLine]);
         await this.pos.data.write("pos.order", [serverId], {
             is_tipped: true,
-            tip_amount: serverTipLine[0].price_subtotal_incl,
+            tip_amount: serverTipLine[0].priceIncl,
         });
         this.goNextScreen();
     }
diff --git a/addons/pos_restaurant/static/src/app/services/pos_store.js b/addons/pos_restaurant/static/src/app/services/pos_store.js
index 7788be8e1f6d1..431b957113270 100644
--- a/addons/pos_restaurant/static/src/app/services/pos_store.js
+++ b/addons/pos_restaurant/static/src/app/services/pos_store.js
@@ -926,7 +926,6 @@ patch(PosStore.prototype, {
                 name: _t("Course ") + order.getNextCourseIndex(),
             });
         }
-        order.recomputeOrderData(); // To ensure that courses are stored locally
         order.selectCourse(selectedCourse);
         return course;
     },
@@ -998,7 +997,6 @@ patch(PosStore.prototype, {
             line.course_id = destCourse.id;
         });
         order.selectCourse(destCourse);
-        order.recomputeOrderData();
     },
     async loadSampleData() {
         if (this.config.module_pos_restaurant) {
diff --git a/addons/pos_restaurant/static/tests/unit/components/tip_screen.test.js b/addons/pos_restaurant/static/tests/unit/components/tip_screen.test.js
index a28d3f2ec35a7..e5010bbeb1431 100644
--- a/addons/pos_restaurant/static/tests/unit/components/tip_screen.test.js
+++ b/addons/pos_restaurant/static/tests/unit/components/tip_screen.test.js
@@ -51,7 +51,7 @@ test("overallAmountStr", async () => {
     });
     screen.state.inputTipAmount = "2";
     const result = screen.overallAmountStr;
-    const total = order.getTotalWithTax();
+    const total = order.priceIncl;
     const original = screen.env.utils.formatCurrency(total);
     const tip = screen.env.utils.formatCurrency(2);
     const overall = screen.env.utils.formatCurrency(total + 2);
diff --git a/addons/pos_sale/static/src/app/services/pos_store.js b/addons/pos_sale/static/src/app/services/pos_store.js
index b8c13890c1873..086e3890e2a6f 100644
--- a/addons/pos_sale/static/src/app/services/pos_store.js
+++ b/addons/pos_sale/static/src/app/services/pos_store.js
@@ -8,7 +8,6 @@ import { enhancedButtons } from "@point_of_sale/app/components/numpad/numpad";
 import { patch } from "@web/core/utils/patch";
 import { PosStore } from "@point_of_sale/app/services/pos_store";
 import { accountTaxHelpers } from "@account/helpers/account_tax";
-import { getTaxesAfterFiscalPosition } from "@point_of_sale/app/models/utils/tax_utils";
 
 patch(PosStore.prototype, {
     async onClickSaleOrder(clickedOrderId) {
@@ -100,7 +99,7 @@ patch(PosStore.prototype, {
                 line.product_id = this.config.down_payment_product_id;
             }
 
-            const taxes = getTaxesAfterFiscalPosition(line.tax_ids, orderFiscalPos, this.models);
+            const taxes = orderFiscalPos?.getTaxesAfterFiscalPosition(line.tax_ids) || line.tax_ids;
             const newLineValues = {
                 product_tmpl_id: line.product_id?.product_tmpl_id,
                 product_id: line.product_id,
diff --git a/addons/pos_sale/static/tests/unit/components/orderline.test.js b/addons/pos_sale/static/tests/unit/components/orderline.test.js
index c69c032422c87..d2f08f681baca 100644
--- a/addons/pos_sale/static/tests/unit/components/orderline.test.js
+++ b/addons/pos_sale/static/tests/unit/components/orderline.test.js
@@ -10,7 +10,7 @@ test("Displays the table with details of the down payment", async () => {
     const store = await setupPosEnv();
     const order = store.addNewOrder();
 
-    const productDownPayment = store.models["product.template"].get(15);
+    const productDownPayment = store.models["product.template"].get(105);
     const sol1 = store.models["sale.order.line"].get(1);
     const sol2 = store.models["sale.order.line"].get(2);
     const line = await store.addLineToOrder(
diff --git a/addons/pos_sale/static/tests/unit/data/pos_config.data.js b/addons/pos_sale/static/tests/unit/data/pos_config.data.js
index db0bfe247835c..876c152939023 100644
--- a/addons/pos_sale/static/tests/unit/data/pos_config.data.js
+++ b/addons/pos_sale/static/tests/unit/data/pos_config.data.js
@@ -4,7 +4,7 @@ PosConfig._records = PosConfig._records.map((config) => {
     if (config.id === 1) {
         return {
             ...config,
-            down_payment_product_id: 15,
+            down_payment_product_id: 105,
         };
     }
     return config;
diff --git a/addons/pos_sale/static/tests/unit/data/product_product.data.js b/addons/pos_sale/static/tests/unit/data/product_product.data.js
index 9d1fc5c735739..aad8a1c9e4469 100644
--- a/addons/pos_sale/static/tests/unit/data/product_product.data.js
+++ b/addons/pos_sale/static/tests/unit/data/product_product.data.js
@@ -3,8 +3,8 @@ import { ProductProduct } from "@point_of_sale/../tests/unit/data/product_produc
 ProductProduct._records = [
     ...ProductProduct._records,
     {
-        id: 15,
-        product_tmpl_id: 15,
+        id: 105,
+        product_tmpl_id: 105,
         lst_price: 0,
         standard_price: 0,
         display_name: "Down Payment (POS)",
diff --git a/addons/pos_sale/static/tests/unit/data/product_template.data.js b/addons/pos_sale/static/tests/unit/data/product_template.data.js
index 0865a16a3cc66..9f4b4178d63fb 100644
--- a/addons/pos_sale/static/tests/unit/data/product_template.data.js
+++ b/addons/pos_sale/static/tests/unit/data/product_template.data.js
@@ -10,7 +10,7 @@ patch(ProductTemplate.prototype, {
 ProductTemplate._records = [
     ...ProductTemplate._records,
     {
-        id: 15,
+        id: 105,
         display_name: "Down Payment (POS)",
         standard_price: 0,
         categ_id: false,
diff --git a/addons/pos_sale/static/tests/unit/models/pos_order_line.test.js b/addons/pos_sale/static/tests/unit/models/pos_order_line.test.js
index 8f4716476a498..c0624192e5675 100644
--- a/addons/pos_sale/static/tests/unit/models/pos_order_line.test.js
+++ b/addons/pos_sale/static/tests/unit/models/pos_order_line.test.js
@@ -9,7 +9,7 @@ describe("saleDetails", () => {
         const store = await setupPosEnv();
         const order = store.addNewOrder();
 
-        const productDownPayment = store.models["product.template"].get(15);
+        const productDownPayment = store.models["product.template"].get(105);
         const line = await store.addLineToOrder(
             {
                 product_tmpl_id: productDownPayment,
@@ -49,7 +49,7 @@ describe("saleDetails", () => {
         const store = await setupPosEnv();
         const order = store.addNewOrder();
 
-        const productDownPayment = store.models["product.template"].get(15);
+        const productDownPayment = store.models["product.template"].get(105);
         const line = await store.addLineToOrder(
             {
                 product_tmpl_id: productDownPayment,
diff --git a/addons/pos_sale/static/tests/unit/services/pos_store.test.js b/addons/pos_sale/static/tests/unit/services/pos_store.test.js
index 2d755de44c7ee..6044d1eee9a7c 100644
--- a/addons/pos_sale/static/tests/unit/services/pos_store.test.js
+++ b/addons/pos_sale/static/tests/unit/services/pos_store.test.js
@@ -52,22 +52,22 @@ describe("onClickSaleOrder", () => {
         expect(currentOrder.lines[0].product_id.id).toBe(5);
         expect(currentOrder.lines[0].qty).toBe(3);
         expect(currentOrder.lines[0].price_unit).toBe(3);
-        expect(currentOrder.lines[0].price_subtotal).toBe(9);
+        expect(currentOrder.lines[0].prices.total_excluded).toBe(9);
 
         expect(currentOrder.lines[1].product_id.id).toBe(6);
         expect(currentOrder.lines[1].qty).toBe(2);
         expect(currentOrder.lines[1].price_unit).toBe(3);
-        expect(currentOrder.lines[1].price_subtotal).toBe(6);
+        expect(currentOrder.lines[1].prices.total_excluded).toBe(6);
 
         expect(currentOrder.lines[2].product_id.id).toBe(5);
         expect(currentOrder.lines[2].qty).toBe(5);
         expect(currentOrder.lines[2].price_unit).toBe(100);
-        expect(currentOrder.lines[2].price_subtotal).toBe(500);
+        expect(currentOrder.lines[2].prices.total_excluded).toBe(500);
 
         expect(currentOrder.lines[3].product_id.id).toBe(6);
         expect(currentOrder.lines[3].qty).toBe(3);
         expect(currentOrder.lines[3].price_unit).toBe(50);
-        expect(currentOrder.lines[3].price_subtotal).toBe(150);
+        expect(currentOrder.lines[3].prices.total_excluded).toBe(150);
     });
 
     test("dpPercentage → calls downPaymentSO", async () => {
@@ -93,17 +93,17 @@ describe("onClickSaleOrder", () => {
         expect(currentOrder.lines[0].product_id.id).toBe(5);
         expect(currentOrder.lines[0].qty).toBe(3);
         expect(currentOrder.lines[0].price_unit).toBe(3);
-        expect(currentOrder.lines[0].price_subtotal).toBe(9);
+        expect(currentOrder.lines[0].prices.total_excluded).toBe(9);
 
         expect(currentOrder.lines[1].product_id.id).toBe(6);
         expect(currentOrder.lines[1].qty).toBe(2);
         expect(currentOrder.lines[1].price_unit).toBe(3);
-        expect(currentOrder.lines[1].price_subtotal).toBe(6);
+        expect(currentOrder.lines[1].prices.total_excluded).toBe(6);
 
-        expect(currentOrder.lines[2].product_id.id).toBe(15);
+        expect(currentOrder.lines[2].product_id.id).toBe(105);
         expect(currentOrder.lines[2].qty).toBe(1);
         expect(currentOrder.lines[2].price_unit).toBe(325);
-        expect(currentOrder.lines[2].price_subtotal).toBe(325);
+        expect(currentOrder.lines[2].prices.total_excluded).toBe(325);
 
         const comp = await mountWithCleanup(Orderline, {
             props: { line: currentOrder.lines[2] },
@@ -147,17 +147,17 @@ describe("onClickSaleOrder", () => {
         expect(currentOrder.lines[0].product_id.id).toBe(5);
         expect(currentOrder.lines[0].qty).toBe(3);
         expect(currentOrder.lines[0].price_unit).toBe(3);
-        expect(currentOrder.lines[0].price_subtotal).toBe(9);
+        expect(currentOrder.lines[0].prices.total_excluded).toBe(9);
 
         expect(currentOrder.lines[1].product_id.id).toBe(6);
         expect(currentOrder.lines[1].qty).toBe(2);
         expect(currentOrder.lines[1].price_unit).toBe(3);
-        expect(currentOrder.lines[1].price_subtotal).toBe(6);
+        expect(currentOrder.lines[1].prices.total_excluded).toBe(6);
 
-        expect(currentOrder.lines[2].product_id.id).toBe(15);
+        expect(currentOrder.lines[2].product_id.id).toBe(105);
         expect(currentOrder.lines[2].qty).toBe(1);
         expect(currentOrder.lines[2].price_unit).toBe(50);
-        expect(currentOrder.lines[2].price_subtotal).toBe(50);
+        expect(currentOrder.lines[2].prices.total_excluded).toBe(50);
 
         const comp = await mountWithCleanup(Orderline, {
             props: { line: currentOrder.lines[2] },
diff --git a/addons/pos_sale/tests/test_pos_sale_report.py b/addons/pos_sale/tests/test_pos_sale_report.py
index 3145b610117da..efe2a202d9fdd 100644
--- a/addons/pos_sale/tests/test_pos_sale_report.py
+++ b/addons/pos_sale/tests/test_pos_sale_report.py
@@ -104,7 +104,7 @@ def test_different_shipping_address(self):
         })
         self.open_new_session()
 
-        data = self.create_ui_order_data([(product_0, 1)], self.customer, True)
+        data = self.create_ui_order_data([(product_0, 1)], {}, self.customer, True)
         data['lines'][0][2]['sale_order_origin_id'] = sale_order.id
         data['lines'][0][2]['sale_order_line_id'] = sale_order.order_line[0].id
         order_ids = self.env['pos.order'].sync_from_ui([data])
@@ -140,7 +140,7 @@ def test_qty_deliverd_qty_to_deliver_in_sales_report(self):
 
         orders = []
 
-        orders.append(self.create_ui_order_data([(self.product0, 5, 100), (self.product0, 3)], self.partner_1))
+        orders.append(self.create_ui_order_data([(self.product0, 5, 100), (self.product0, 3)], {}, self.partner_1))
         orders[0]['shipping_date'] = fields.Date.to_string(fields.Date.today())
 
         order = self.env['pos.order'].sync_from_ui(orders)
diff --git a/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js b/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js
index 89ee0fa1b2bea..32739d77c3ebd 100644
--- a/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js
+++ b/addons/pos_self_order/static/src/app/components/order_widget/order_widget.js
@@ -66,7 +66,11 @@ export class OrderWidget extends Component {
                     if (!line.combo_parent_id) {
                         acc.count += value.qty;
                     }
-                    acc.price += line.getDisplayPrice();
+                    if (line.combo_parent_id) {
+                        return acc;
+                    }
+
+                    acc.price += line.displayPrice;
                 }
                 return acc;
             },
diff --git a/addons/pos_self_order/static/src/app/models/pos_order_line.js b/addons/pos_self_order/static/src/app/models/pos_order_line.js
index 3fcec4bc34b64..bd77c88543f69 100644
--- a/addons/pos_self_order/static/src/app/models/pos_order_line.js
+++ b/addons/pos_self_order/static/src/app/models/pos_order_line.js
@@ -39,12 +39,13 @@ patch(PosOrderline.prototype, {
         return false;
     },
     getDisplayPriceWithQty(qty) {
-        const prices = this.getAllPrices(qty);
+        const prices = this.order_id._constructPriceData({ baseLineOpts: { quantity: qty } })
+            .baseLineByLineUuids[this.uuid].tax_details;
 
         if (this.config.iface_tax_included === "total") {
-            return prices.priceWithTax;
+            return prices.total_included;
         } else {
-            return prices.priceWithoutTax;
+            return prices.total_excluded;
         }
     },
 });
diff --git a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.xml b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.xml
index 253348286a983..5b18856f67832 100644
--- a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.xml
+++ b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.xml
@@ -71,8 +71,8 @@
             </div>
             <div class="o_self_footer border-top border-bottom bg-white py-2 py-lg-3" t-att-class="{'o_self_shadow_bottom': scrollShadow.bottom}">
                 <div class="container o_self_container order-price d-flex flex-column gap-0 gap-lg-1 align-items-end px-md-4" >
-                    <div class="fs-3 fw-bold o-so-tabular-nums mb-0 pe-sm-2 pe-kiosk-p-4">Total: <span class="text-primary"><t t-esc="selfOrder.formatMonetary(selfOrder.currentOrder.getTotalWithTax())" /></span></div>
-                    <div class="fs-4 o-so-tabular-nums mb-0 pe-sm-2 pe-kiosk-p-4 text-muted" t-if="displayTaxes">Taxes: <t t-esc="selfOrder.formatMonetary(selfOrder.currentOrder.getTotalTax())" /></div>
+                    <div class="fs-3 fw-bold o-so-tabular-nums mb-0 pe-sm-2 pe-kiosk-p-4">Total: <span class="text-primary"><t t-esc="selfOrder.formatMonetary(selfOrder.currentOrder.priceIncl)" /></span></div>
+                    <div class="fs-4 o-so-tabular-nums mb-0 pe-sm-2 pe-kiosk-p-4 text-muted" t-if="displayTaxes">Taxes: <t t-esc="selfOrder.formatMonetary(selfOrder.currentOrder.amountTaxes)" /></div>
                  </div>
             </div>
             <OrderWidget t-if="this.selfOrder.ordering" action.bind="pay" removeTopClasses="true"/>
diff --git a/addons/pos_self_order/static/src/app/pages/order_history_page/order_history_page.js b/addons/pos_self_order/static/src/app/pages/order_history_page/order_history_page.js
index cca13f6f35611..4ba6c74c75c55 100644
--- a/addons/pos_self_order/static/src/app/pages/order_history_page/order_history_page.js
+++ b/addons/pos_self_order/static/src/app/pages/order_history_page/order_history_page.js
@@ -23,9 +23,7 @@ export class OrdersHistoryPage extends Component {
     }
 
     getPrice(line) {
-        return this.selfOrder.config.iface_tax_included
-            ? line.price_subtotal_incl
-            : line.price_subtotal;
+        return line.displayPrice;
     }
 
     getOrderState(state) {
diff --git a/addons/pos_self_order/static/src/app/pages/product_page/product_page.js b/addons/pos_self_order/static/src/app/pages/product_page/product_page.js
index 9472292c574f4..e0eeb1187b3bc 100644
--- a/addons/pos_self_order/static/src/app/pages/product_page/product_page.js
+++ b/addons/pos_self_order/static/src/app/pages/product_page/product_page.js
@@ -2,7 +2,6 @@ import { Component, onWillUnmount, useState, useSubEnv, useRef, onMounted } from
 import { useSelfOrder } from "@pos_self_order/app/services/self_order_service";
 import { useService } from "@web/core/utils/hooks";
 import { AttributeSelection } from "@pos_self_order/app/components/attribute_selection/attribute_selection";
-import { computeProductPrice } from "../../services/card_utils";
 import { useScrollShadow } from "../../utils/scroll_shadow_hook";
 
 export class ProductPage extends Component {
@@ -122,12 +121,21 @@ export class ProductPage extends Component {
     }
 
     getProductPrice() {
-        return computeProductPrice(
-            this.selfOrder,
-            this.props.productTemplate,
-            this.getSelectedAttributesValues(),
-            this.state.qty
+        const productTmplAttrModel = this.selfOrder.models["product.template.attribute.value"];
+        const attributeIds = this.getSelectedAttributesValues();
+        const attributes = productTmplAttrModel.readMany(attributeIds);
+        const priceExtra = attributes.reduce((sum, attr) => sum + attr.price_extra, 0);
+        const price = this.props.productTemplate.getPrice(
+            this.selfOrder.currentOrder.pricelist_id,
+            1,
+            priceExtra
         );
+        const taxDetails = this.props.productTemplate.getTaxDetails({
+            overridedValues: { price_unit: price, quantity: this.state.qty },
+        });
+        return this.selfOrder.isTaxesIncludedInPrice()
+            ? taxDetails.total_included
+            : taxDetails.total_excluded;
     }
 
     getSelectedAttributesValues() {
diff --git a/addons/pos_self_order/static/src/app/services/card_utils.js b/addons/pos_self_order/static/src/app/services/card_utils.js
index 90c70292a9c31..a2e0daf4dbcb6 100644
--- a/addons/pos_self_order/static/src/app/services/card_utils.js
+++ b/addons/pos_self_order/static/src/app/services/card_utils.js
@@ -2,20 +2,6 @@ import { PosOrderline } from "@point_of_sale/app/models/pos_order_line";
 import { STORE_SYMBOL } from "@point_of_sale/app/models/related_models/utils";
 import { computeComboItems } from "@point_of_sale/app/models/utils/compute_combo_items";
 
-export function computeProductPrice(selfOrder, productTemplate, selectedAttributes, qty) {
-    const lineValues = getOrderLineValues(selfOrder, productTemplate, qty, "", selectedAttributes);
-    const order = lineValues.order_id;
-    const line = createTransientLine(order, {
-        ...lineValues,
-        order_id: order.id,
-        product_id: lineValues.product_id.id,
-        tax_ids: lineValues.tax_ids.map((t) => t.id),
-        attribute_value_ids: lineValues.attribute_value_ids?.map((a) => a.id),
-    });
-
-    return selfOrder.isTaxesIncludedInPrice() ? line.getPriceWithTax() : line.getPriceWithoutTax();
-}
-
 export function computeTotalComboPrice(selfOrder, productTemplate, comboValues, qty) {
     if (!comboValues || !comboValues.length) {
         return selfOrder.getProductDisplayPrice(productTemplate);
@@ -43,9 +29,9 @@ export function computeTotalComboPrice(selfOrder, productTemplate, comboValues,
             attribute_value_ids: comboLine.attribute_value_ids?.map((a) => a.id),
         });
     });
-    return selfOrder.isTaxesIncludedInPrice()
-        ? order.getTotalWithTaxOfLines(transientLines)
-        : order.getTotalWithoutTaxOfLines(transientLines);
+
+    const taxDetails = order.getPriceWithOptions({ lines: transientLines }).taxDetails;
+    return selfOrder.isTaxesIncludedInPrice() ? taxDetails.total_amount : taxDetails.base_amount;
 }
 
 export function getOrderLineValues(
diff --git a/addons/pos_self_order/static/src/app/services/self_order_service.js b/addons/pos_self_order/static/src/app/services/self_order_service.js
index bb45a238dfccd..2f35f2c236966 100644
--- a/addons/pos_self_order/static/src/app/services/self_order_service.js
+++ b/addons/pos_self_order/static/src/app/services/self_order_service.js
@@ -20,10 +20,6 @@ import {
     orderUsageUTCtoLocalUtil,
 } from "@point_of_sale/utils";
 import { getOrderLineValues } from "./card_utils";
-import {
-    getTaxesAfterFiscalPosition,
-    getTaxesValues,
-} from "@point_of_sale/app/models/utils/tax_utils";
 import {
     changesToOrder,
     filterChangeByCategories,
@@ -615,9 +611,9 @@ export class SelfOrder extends Reactive {
         }
 
         try {
+            this.currentOrder.setOrderPrices();
             const tableIdentifier = this.router.getTableIdentifier([]);
             let uuid = this.selectedOrderUuid;
-            this.currentOrder.recomputeOrderData();
             const data = await rpc(
                 `/pos-self-order/process-order/${this.config.self_ordering_mode}`,
                 {
@@ -815,21 +811,18 @@ export class SelfOrder extends Reactive {
             ? this.currentOrder.preset_id?.pricelist_id
             : this.config.pricelist_id;
         const price = productTemplate.getPrice(pricelist, 1, 0, false, product);
-        let taxes = productTemplate.taxes_id;
 
         if (!product) {
             product = productTemplate;
         }
 
-        // Fiscal position.
-        const order = this.currentOrder;
-        if (order && order.fiscal_position_id) {
-            taxes = getTaxesAfterFiscalPosition(taxes, order.fiscal_position_id, this.models);
-        }
-
         // Taxes computation.
-        const taxesData = getTaxesValues(taxes, price, 1, product, {}, this.company, this.currency);
-
+        const order = this.currentOrder;
+        const taxesData = product.getTaxDetails({
+            price_unit: price,
+            quantity: 1,
+            fiscalPosition: order?.fiscal_position_id || false,
+        });
         return { pricelist_price: price, ...taxesData };
     }
     getProductDisplayPrice(productTemplate, product) {
diff --git a/addons/pos_self_order/static/tests/unit/services/self_order_service.test.js b/addons/pos_self_order/static/tests/unit/services/self_order_service.test.js
index 8762980ded51d..b3356e7d86efa 100644
--- a/addons/pos_self_order/static/tests/unit/services/self_order_service.test.js
+++ b/addons/pos_self_order/static/tests/unit/services/self_order_service.test.js
@@ -32,7 +32,6 @@ describe("initProducts", () => {
         const tipProductTmpl = models["product.template"].get(1);
 
         expect(store.config._pos_special_products_ids.includes(tipProductTmpl.id)).toBe(true);
-        expect(store.productByCategIds["0"]).toBeEmpty(); // No Uncategorised products
 
         models["product.template"].get(14).pos_categ_ids = [];
         store.initData();
diff --git a/addons/pos_viva_com/static/src/app/screens/payment_screen/payment_screen.js b/addons/pos_viva_com/static/src/app/screens/payment_screen/payment_screen.js
index f0abab7da8e0f..229ed128446d4 100644
--- a/addons/pos_viva_com/static/src/app/screens/payment_screen/payment_screen.js
+++ b/addons/pos_viva_com/static/src/app/screens/payment_screen/payment_screen.js
@@ -21,7 +21,7 @@ patch(PaymentScreen.prototype, {
     async addNewPaymentLine(paymentMethod) {
         if (paymentMethod.use_payment_terminal === "viva_com" && this.isRefundOrder) {
             const refundedOrder = this.currentOrder.lines[0]?.refunded_orderline_id?.order_id;
-            const amountDue = Math.abs(this.currentOrder.getDue());
+            const amountDue = Math.abs(this.currentOrder.remainingDue);
             const matchedPaymentLine = refundedOrder.payment_ids.find(
                 (line) =>
                     line.payment_method_id.use_payment_terminal === "viva_com" &&

From a71a799bfcc65ede05be159b8c3520457c0d43d0 Mon Sep 17 00:00:00 2001
From: Bhavik Darji <bda@odoo.com>
Date: Thu, 9 Oct 2025 10:52:19 +0000
Subject: [PATCH 004/673] [REM] l10n_fr_pos_cert: remove obsolete migration
 deprecated POS sequence fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- In Odoo 19, the pos.config fields sequence_id and sequence_line_id were
  renamed to order_seq_id and order_line_seq_id. The removed migration script
https://github.com/odoo/odoo/commit/2ead34e974f55dadf791ff6b2924edbf43442b34#diff-4c6e412c7d8f4df2a05831547e7df93d0b91f510d03b7b3ed0d689a18f5dae44R98-L132
  still referenced the old field names, causing UndefinedColumn errors during
  upgrade. The logic is already handled by the main migration script using the
https://github.com/odoo/upgrade/pull/8197/files#diff-d415d26b86040ad22ab82c184e6db20ec4e9a61058d9a9dbf3668ca21bcbaf19R42-R50
  new field names, so this file is no longer required.

```
Traceback (most recent call last):
  File "/home/odoo/src/odoo/19.0/odoo/service/server.py", line 1509, in preload_registries
    registry = Registry.new(dbname, update_module=update_module, install_modules=config['init'], upgrade_modules=config['update'], reinit_modules=config['reinit'])
  File "/home/odoo/src/odoo/19.0/odoo/tools/func.py", line 88, in locked
    return func(inst, *args, **kwargs)
  File "/home/odoo/src/odoo/19.0/odoo/orm/registry.py", line 185, in new
    load_modules(
  File "/home/odoo/src/odoo/19.0/odoo/modules/loading.py", line 449, in load_modules
    load_module_graph(
  File "/home/odoo/src/odoo/19.0/odoo/modules/loading.py", line 217, in load_module_graph
    migrations.migrate_module(package, 'post')
  File "/home/odoo/src/odoo/19.0/odoo/modules/migration.py", line 220, in migrate_module
    exec_script(self.cr, installed_version, pyfile, pkg.name, stage, stageformat[stage] % version)
  File "/home/odoo/src/odoo/19.0/odoo/modules/migration.py", line 257, in exec_script
    mod.migrate(cr, installed_version)
  File "/home/odoo/src/odoo/19.0/addons/l10n_fr_pos_cert/upgrades/1.1/post-sequence-no-gap.py", line 2, in migrate
    cr.execute("""
  File "/home/odoo/src/odoo/19.0/odoo/sql_db.py", line 426, in execute
    self._obj.execute(query, params)
psycopg2.errors.UndefinedColumn: column pconfig.sequence_id does not exist
LINE 9:         AND (pconfig.sequence_id = iseq.id or pconfig.sequen...
                     ^
```

opw-5152559
upg-3179288
tbg-2205

closes odoo/odoo#233761

X-original-commit: 88d5b0a814255b6f75f2a5bb573473eecc14f9db
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: Bhavik Darji (bda) <bda@odoo.com>
---
 .../upgrades/1.1/post-sequence-no-gap.py             | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 addons/l10n_fr_pos_cert/upgrades/1.1/post-sequence-no-gap.py

diff --git a/addons/l10n_fr_pos_cert/upgrades/1.1/post-sequence-no-gap.py b/addons/l10n_fr_pos_cert/upgrades/1.1/post-sequence-no-gap.py
deleted file mode 100644
index 6dbf8169fb645..0000000000000
--- a/addons/l10n_fr_pos_cert/upgrades/1.1/post-sequence-no-gap.py
+++ /dev/null
@@ -1,12 +0,0 @@
-def migrate(cr, version):
-    cr.execute("""
-        UPDATE ir_sequence iseq
-        SET implementation = 'no_gap'
-        FROM pos_config pconfig,res_company rcomp, res_country rcount, res_partner rpart
-        WHERE rcount.code in ('FR', 'MF', 'MQ', 'NC', 'PF', 'RE', 'GF', 'GP', 'TF', 'BL', 'PM', 'YT', 'WF')
-        AND rpart.country_id = rcount.id
-        AND rcomp.partner_id = rpart.id
-        AND pconfig.company_id = rcomp.id
-        AND (pconfig.sequence_id = iseq.id or pconfig.sequence_line_id = iseq.id)
-        AND iseq.implementation = 'standard'
-        """)

From 245e5891eadce961011ed201095876dc5a34ccb7 Mon Sep 17 00:00:00 2001
From: Sven Fuehr <svfu@odoo.com>
Date: Thu, 28 Aug 2025 13:13:12 +0000
Subject: [PATCH 005/673] [FIX] account_edi_ubl_cii: missing parenthesis in
 invoice_edi_format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to commit 860c0974f9b541be63f4079ef52366f91c1994ce .
There we improved the eInvoice format labels for clarity.
But 2 label were formatted differently than the others.
This commit fixes that.

task-4737164

X-original-commit: 09358c076062641b11b03d0f0db1d858adb3686d
Part-of: odoo/odoo#233764
Signed-off-by: Sven Führ (svfu) <svfu@odoo.com>
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
---
 addons/account_edi_ubl_cii/models/res_partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_edi_ubl_cii/models/res_partner.py b/addons/account_edi_ubl_cii/models/res_partner.py
index f978ac75b7caf..37a7539452e13 100644
--- a/addons/account_edi_ubl_cii/models/res_partner.py
+++ b/addons/account_edi_ubl_cii/models/res_partner.py
@@ -26,8 +26,8 @@ class ResPartner(models.Model):
             ('ubl_bis3', "EU Standard (Peppol Bis 3.0)"),
             ('xrechnung', "Germany (XRechnung)"),
             ('nlcius', "Netherlands (NLCIUS)"),
-            ('ubl_a_nz', "Australia BIS Billing 3.0 A-NZ"),
-            ('ubl_sg', "Singapore BIS Billing 3.0 SG"),
+            ('ubl_a_nz', "Australia (BIS Billing 3.0 A-NZ)"),
+            ('ubl_sg', "Singapore (BIS Billing 3.0 SG)"),
         ],
     )
     is_ubl_format = fields.Boolean(compute='_compute_is_ubl_format')

From 9c0930402ba5fb81ba2e9c0ba085ff3298abaae8 Mon Sep 17 00:00:00 2001
From: Sven Fuehr <svfu@odoo.com>
Date: Fri, 16 May 2025 14:31:17 +0000
Subject: [PATCH 006/673] [FIX] account_peppol: disallow disabling services
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently it is possible to disallow any services in the configuration.
This can lead to complicance issues; i.e. if someone disables "BIS Billing 3.0".

1. Ensure Peppol is activated (test mode or production; not demo)
2. Settings -> Accounting -> PEPPOL Electronic Invoicing -> Advanced configuration
3. Any service can be disabled.

This commit hides the services configuration from the peppol
configuration wizard.

part-of
task-4737164

closes odoo/odoo#233764

X-original-commit: 1b8ce2501d878241e16c071cf00550fc6a5e8ebf
Signed-off-by: Sven Führ (svfu) <svfu@odoo.com>
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
---
 .../wizard/peppol_config_wizard.py            | 31 +++----------------
 .../wizard/peppol_config_wizard.xml           |  5 ++-
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/addons/account_peppol/wizard/peppol_config_wizard.py b/addons/account_peppol/wizard/peppol_config_wizard.py
index dfd91c7399eae..345116b9c2410 100644
--- a/addons/account_peppol/wizard/peppol_config_wizard.py
+++ b/addons/account_peppol/wizard/peppol_config_wizard.py
@@ -136,7 +136,10 @@ def _inverse_peppol_activate_self_billing(self):
             self_billing_services.write({'enabled': wizard.peppol_activate_self_billing})
 
     def button_sync_form_with_peppol_proxy(self):
-        """Interpret changes to the services, and add or remove them on the IAP accordingly."""
+        """Update the peppol contact email on IAP.
+        Note: The service configuration is DEPRECATED / hidden in the view.
+        Disabling services can lead to complicance issues and is not necessary
+        since all existing services should just work."""
         self.ensure_one()
 
         # Update company details
@@ -152,32 +155,6 @@ def button_sync_form_with_peppol_proxy(self):
                 params=params,
             )
 
-        # Update services
-        if self.account_peppol_proxy_state == 'receiver':
-            services = self.service_ids.read(['document_identifier', 'enabled'])
-            service_json = self.service_json or {}
-            to_add, to_remove = [], []
-
-            for service in services:
-                if service['document_identifier'] in service_json and not service['enabled']:
-                    to_remove.append(service['document_identifier'])
-
-                if service['document_identifier'] not in service_json and service['enabled']:
-                    to_add.append(service['document_identifier'])
-
-            if to_add:
-                self.account_peppol_edi_user._call_peppol_proxy(
-                    "/api/peppol/2/add_services", {
-                        'document_identifiers': to_add,
-                    },
-                )
-            if to_remove:
-                self.account_peppol_edi_user._call_peppol_proxy(
-                    "/api/peppol/2/remove_services", {
-                        'document_identifiers': to_remove,
-                    },
-                )
-
         return True
 
     def button_peppol_unregister(self):
diff --git a/addons/account_peppol/wizard/peppol_config_wizard.xml b/addons/account_peppol/wizard/peppol_config_wizard.xml
index f5b2f3b443723..fd8104ac9f3fd 100644
--- a/addons/account_peppol/wizard/peppol_config_wizard.xml
+++ b/addons/account_peppol/wizard/peppol_config_wizard.xml
@@ -33,7 +33,10 @@
                     <field name="peppol_activate_self_billing" invisible="account_peppol_proxy_state not in ('sender', 'receiver')"/>
                     <field name="peppol_self_billing_reception_journal_id" invisible="account_peppol_proxy_state != 'receiver'"/>
                 </group>
-                <group string="Configure your Peppol Services and allowed formats" invisible="not service_ids">
+                <!-- Note: Deprecated -->
+                <!-- Disabling services can lead to complicance issues and is not necessary -->
+                <!-- since all existing services should just work. -->
+                <group string="Configure your Peppol Services and allowed formats" invisible="1">
                     <div colspan="2">
                         <field name="service_info" role="status" class="o_field_html alert alert-info" invisible="not service_info"/>
                         <field name="service_ids"

From 0c616a02a3dd468ff4ea28521e4fb9f67154200b Mon Sep 17 00:00:00 2001
From: bhna-odoo <bhna@odoo.com>
Date: Mon, 13 Oct 2025 11:01:25 +0000
Subject: [PATCH 007/673] [FIX] purchase_stock: prevent type mismatch error on
 valuation report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, an error occurs when a user attempts to access the stock valuation
report for a date beyond today.

Steps to replicate:
- Install `stock_account`, `purchase_stock`, `accountant`.
- Go to settings, set `Inventory Cost Method` to Average Cost(AVCO) and Turn on
 `Lots and Serial Numbers`.
- Go to Products and create a new one with name `test`, set `Track Inventory` -
 `by lots`.
- On the `Inventory` page turn on `Valuation by Lots/Serial`.
- Open RFQs, Create a new one with test product and Click
 `Confirm Order` > Click `Receive`.
- Set the Lot name by clicking the `Details` button on the move lines.
- Click `Validate`, go to `Purchase > Orders > Purchase Orders`.
- Select the currently made Purchase Order (It will be in the `Waiting Bills`
  state) and Click on the `Create bills` Button, Confirm it (it should be in the
  paid state now).
- Now go to `Accountant > Review > Inventory Evaluation` and select and date
  ahead of today, the error will occur.

TL;DR:
- Install `stock_account, purchase_stock, and accountant`.
- Create a product tracked by lots with AVCO costing and
 `Valuation by Lots/Serial` enabled.
- Create a Purchase order and receive it (assign a lot), then create and confirm
  the bill for the same.
- Finally, go to `Accountant > Review > Inventory Valuation`, select a future
  date — the error occurs.

Error:
`TypeError: can't compare datetime.datetime to datetime.date`

Cause:
- The error occurs because of recent commit [PR] where `aml.date` is typecasted
  from `datetime.date` to `datetime.datetime`, but the `at_date` is received as
 `datetime.date` [1] and this causes the error.
- The `at_date` is converted to `datetime.date` from string at line [2].

Solution:
- Now we don't convert `aml.date` to datetime since both `aml.date` [3] and
  `at_date` [4] are instances of `datetime.date`. Additionally, account.move
  are based on date rather than datetime.

[PR]: https://github.com/odoo/odoo/pull/227567/commits/aec7d3244aa25af626cefd875f021d0d24ce418d

[1]: https://github.com/odoo/odoo/blob/7e0cc5ec686a52b8c1f8270213acac54575ed469/addons/purchase_stock/models/stock_move.py#L157

[2]: https://github.com/odoo/odoo/blob/7e0cc5ec686a52b8c1f8270213acac54575ed469/addons/stock_account/report/stock_valuation_report.py#L32

[3]: https://github.com/odoo/odoo/blob/385d8473952eeaa9dcc7740bacfc2c9cbdc2d1e2/addons/account/models/account_move_line.py#L69-L73

[4]: https://github.com/odoo/odoo/blob/385d8473952eeaa9dcc7740bacfc2c9cbdc2d1e2/addons/stock_account/report/stock_valuation_report.py#L32

sentry-6933268158

closes odoo/odoo#233763

X-original-commit: 318c6784ce6c49f3e3dafe1704f4631428b4ea2f
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
Signed-off-by: Bhavya Ashesh Nanavati (bhna) <bhna@odoo.com>
---
 addons/purchase_stock/models/stock_move.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_stock/models/stock_move.py b/addons/purchase_stock/models/stock_move.py
index 0c808d246ee7b..bfa7989c08089 100644
--- a/addons/purchase_stock/models/stock_move.py
+++ b/addons/purchase_stock/models/stock_move.py
@@ -154,7 +154,7 @@ def _get_value_from_account_move(self, quantity, at_date=None):
         value = 0
         aml_ids = set()
         for aml in self.purchase_line_id.invoice_lines:
-            if at_date and fields.Datetime.to_datetime(aml.date) > at_date:
+            if at_date and aml.date > at_date:
                 continue
             if aml.move_id.state != 'posted':
                 continue

From 075ae3bbc57eb84bb85b3f7e62487703f563b0f1 Mon Sep 17 00:00:00 2001
From: David Beguin <dbe@odoo.com>
Date: Wed, 25 Jun 2025 11:37:41 +0200
Subject: [PATCH 008/673] [IMP] hr_recruitment: copy attachments from pool to
 applicant

When creating an application from the talent pool: the last joined document
should follow.
When adding an applicant to the first applicant's talent pool:
all documents should follow the newly created talent.

Task-4876754

closes odoo/odoo#215796

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 .../tests/test_recruitment_talent_pools.py    | 30 +++++++++++++++++++
 .../wizard/job_add_applicants.py              | 16 ++++++++--
 .../wizard/talent_pool_add_applicants.py      |  7 +++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/tests/test_recruitment_talent_pools.py b/addons/hr_recruitment/tests/test_recruitment_talent_pools.py
index 808060faabf3b..18f166e29ff2c 100644
--- a/addons/hr_recruitment/tests/test_recruitment_talent_pools.py
+++ b/addons/hr_recruitment/tests/test_recruitment_talent_pools.py
@@ -1,5 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from odoo import Command
 from odoo.fields import Domain
 from odoo.tests import Form, tagged, TransactionCase
 from odoo.exceptions import ValidationError
@@ -185,6 +186,12 @@ def test_add_talent_to_one_job(self):
         """
         Test that a talent is duplicated when added to a job
         """
+        self.t_applicant_1.attachment_ids = [Command.link(attachment_id) for attachment_id in self.env['ir.attachment'].create([{
+            'name': 'Test',
+            'res_model': self.t_applicant_1._name,
+            'res_id': self.t_applicant_1.id
+        }] * 2).ids]
+
         pool_wizard = Form(self.env["talent.pool.add.applicants"])
         pool_wizard.talent_pool_ids = self.t_talent_pool_1
         pool_wizard.applicant_ids = self.t_applicant_1
@@ -200,6 +207,10 @@ def test_add_talent_to_one_job(self):
         self.assertEqual(
             len(talent_pool_applicant), 1, "Exactly one 'talent' should be created when adding an applicant to a pool"
         )
+        self.assertEqual(
+            len(talent_pool_applicant.attachment_ids), len(self.t_applicant_1.attachment_ids),
+            "Talent Pool Applicant should have the same attachments then the original one."
+        )
 
         job_wizard = Form(
             self.env["job.add.applicants"].with_context({"default_applicant_ids": talent_pool_applicant.ids})
@@ -334,6 +345,25 @@ def test_talent_must_have_at_least_one_pool(self):
         with self.assertRaises(ValidationError):
             talent.write({"talent_pool_ids": [(5, 0, 0)]})
 
+    def test_attachment_following_applicant_from_pool(self):
+        self.t_applicant_1.attachment_ids = [Command.link(attachment_id) for attachment_id in self.env['ir.attachment'].create([{
+            'name': 'Test %s' % i,
+            'res_model': self.t_applicant_1._name,
+            'res_id': self.t_applicant_1.id
+        } for i in range(2)]).ids]
+        job_wizard = Form(
+            self.env["job.add.applicants"].with_context({"default_applicant_ids": self.t_applicant_1.ids})
+        )
+        job_wizard.job_ids = self.t_job_2
+        job_2_applicant = job_wizard.save()._add_applicants_to_job()
+        # last attachment from origin applicant should be copied on the target applicant
+        self.assertEqual(len(job_2_applicant.attachment_ids), 1)
+        self.assertEqual(self.t_applicant_1.attachment_ids[0].name, job_2_applicant.attachment_ids.name)
+        self.assertEqual(job_2_applicant.attachment_ids[0].res_id, job_2_applicant.id)
+        # Just ensure that attachment from origin applicant still exists
+        self.assertEqual(len(self.t_applicant_1.attachment_ids), 2)
+        self.assertEqual(self.t_applicant_1.attachment_ids[0].res_id, self.t_applicant_1.id)
+
     def flush_tracking(self):
         """ Force the creation of tracking values. """
         self.env.flush_all()
diff --git a/addons/hr_recruitment/wizard/job_add_applicants.py b/addons/hr_recruitment/wizard/job_add_applicants.py
index d2ff98a82772a..45d8532272b12 100644
--- a/addons/hr_recruitment/wizard/job_add_applicants.py
+++ b/addons/hr_recruitment/wizard/job_add_applicants.py
@@ -1,4 +1,4 @@
-from odoo import fields, models
+from odoo import Command, fields, models
 
 
 class JobAddApplicants(models.TransientModel):
@@ -9,7 +9,19 @@ class JobAddApplicants(models.TransientModel):
     job_ids = fields.Many2many("hr.job", string="Job Positions", required=True)
 
     def _add_applicants_to_job(self):
-        applicant_data = self.with_context(no_copy_in_partner_name=True).applicant_ids.copy_data()
+        applicants = self.with_context(no_copy_in_partner_name=True).applicant_ids
+        applicant_data = []
+        copy_data_values = {}
+        for applicant in applicants:
+            # last attachment should follow - [0] is the last as order = id Desc (should be a CV in most cases)
+            if applicant.attachment_ids:
+                applicant_attachment = applicant.attachment_ids[0].copy({
+                    'res_id': applicant.id
+                })
+                copy_data_values = {
+                    'attachment_ids': [Command.link(applicant_attachment.id)]
+                }
+            applicant_data.append(applicant.with_context(no_copy_in_partner_name=True).copy_data(copy_data_values)[0])
         new_applicants_vals = []
         stage_per_job = dict(self.env['hr.recruitment.stage']._read_group(
             domain=[('job_ids', 'in', self.job_ids.ids + [False]), ('fold', '=', False)],
diff --git a/addons/hr_recruitment/wizard/talent_pool_add_applicants.py b/addons/hr_recruitment/wizard/talent_pool_add_applicants.py
index 0b352a3a18449..8d20ebd042e32 100644
--- a/addons/hr_recruitment/wizard/talent_pool_add_applicants.py
+++ b/addons/hr_recruitment/wizard/talent_pool_add_applicants.py
@@ -37,8 +37,15 @@ def _add_applicants_to_pool(self):
                 )
                 talents += applicant
             else:
+                applicant_attachments = self.env['ir.attachment']
+                for attachment in applicant.attachment_ids:
+                    applicant_attachments |= attachment.copy({
+                        'res_id': applicant.id
+                    })
                 talent = applicant.with_context(no_copy_in_partner_name=True).copy(
                     {
+                        'attachment_ids': [Command.link(applicant_attachment.id)
+                                           for applicant_attachment in applicant_attachments],
                         "job_id": False,
                         "talent_pool_ids": self.talent_pool_ids,
                         "categ_ids": applicant.categ_ids + self.categ_ids,

From 5009d2d3b7d8fbedc22954e00afe8e31f6322437 Mon Sep 17 00:00:00 2001
From: Mahmoudk3m <kmah@odoo.com>
Date: Wed, 22 Oct 2025 07:22:52 +0200
Subject: [PATCH 009/673] [IMP] hr_attendance: improve presence state logic and
 tooltips

- Fix presence state for employees without users to show as 'present' instead of 'absent'
- Fix presence state for employees not in contract to show as 'out_of_working_hour'
- Add custom tooltips: "Present (untracked)" for employees without users
- Add "Off-Hours" tooltip for out of working hours state

task-5082763

closes odoo/odoo#227930

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_employee.py               |  4 ++-
 addons/hr_attendance/models/hr_employee.py    | 13 +++++++---
 .../hr_attendance_presence_status.js          | 25 +++++++++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 addons/hr_attendance/static/src/components/hr_presence_status/hr_attendance_presence_status.js

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 92932c6726749..2b9dda106bf86 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -888,7 +888,9 @@ def _compute_presence_state(self):
             if employee.company_id.sudo().hr_presence_control_login:
                 # sudo: res.users - can access presence of accessible user
                 presence_status = employee.user_id.sudo().presence_ids.status or "offline"
-                if presence_status == "online":
+                if not employee.sudo().is_in_contract:
+                    state = "out_of_working_hour"
+                elif presence_status == "online":
                     state = 'present'
                 elif presence_status == "offline" and employee.id in working_now_list:
                     state = 'absent'
diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 27e0ee83237d4..818101c22cf74 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -242,11 +242,16 @@ def _compute_presence_state(self):
                                                             and e.hr_presence_state == "out_of_working_hour")
         working_now_list = employee_to_check_working._get_employee_working_now()
         for employee in employees:
-            if employee.attendance_state == "checked_out" and employee.hr_presence_state == "out_of_working_hour" and \
-                    employee.id in working_now_list:
+            if employee.attendance_state == "checked_in" or not employee.user_id:
+                if not employee.user_id and not employee.is_in_contract:
+                    employee.hr_presence_state = "out_of_working_hour"
+                else:
+                    employee.hr_presence_state = "present"
+            elif employee.attendance_state == "checked_out" and \
+                 employee.hr_presence_state == "out_of_working_hour" and \
+                 employee.id in working_now_list and \
+                 employee.is_in_contract:
                 employee.hr_presence_state = "absent"
-            elif employee.attendance_state == "checked_in":
-                employee.hr_presence_state = "present"
 
     def _compute_presence_icon(self):
         res = super()._compute_presence_icon()
diff --git a/addons/hr_attendance/static/src/components/hr_presence_status/hr_attendance_presence_status.js b/addons/hr_attendance/static/src/components/hr_presence_status/hr_attendance_presence_status.js
new file mode 100644
index 0000000000000..7f77cee0b0cc7
--- /dev/null
+++ b/addons/hr_attendance/static/src/components/hr_presence_status/hr_attendance_presence_status.js
@@ -0,0 +1,25 @@
+import { hrPresenceStatus, HrPresenceStatus } from "@hr/components/hr_presence_status/hr_presence_status";
+import { patch } from "@web/core/utils/patch";
+import { _t } from "@web/core/l10n/translation";
+
+patch(HrPresenceStatus.prototype, {
+    get label() {
+        if (this.value === 'presence_present') {
+            const hasUser = this.props.record.data.user_id;
+            if (!hasUser) {
+                return _t("Present (untracked)");
+            }
+        } else if (this.value === 'presence_out_of_working_hour') {
+            return _t("Off-Hours");
+        }
+        
+        return super.label;
+    }
+});
+
+Object.assign(hrPresenceStatus, {
+    fieldDependencies: [
+        ...hrPresenceStatus.fieldDependencies,
+        { name: "user_id", type: "many2one" },
+    ],
+});

From dfdefa39f665b0e8cd66852eca3610a45d45076f Mon Sep 17 00:00:00 2001
From: SaraBriki <brsa@odoo.com>
Date: Fri, 29 Aug 2025 11:48:10 +0200
Subject: [PATCH 010/673] [FIX] project_timesheet_holidays: skip validation for
 flexible hours

Reproduce:
- Go to Time Off > Management > Time Off
- Create a Time Off for an employee with empty "Working Hours"
  (Payroll tab on profile).
- Ensure the Time Off Type has "Requires allocation" unchecked so it
  appears in the dropdown.
- Save and then try to Validate.

Issue:
During validation, `_validate_leave_request` assumes the employee has a
working calendar and tries to access `calendar.tz`. When "Working Hours"
is empty, `resource_calendar_id` is False, leading to the traceback.

Fix:
Skip timesheet generation and upper bound check when the employee has no working
calendar (fully flexible case). A placeholder "Flexible" was also added to
the `hr.employee` form view on the field "Working Hours" when empty.

task-5048761

closes odoo/odoo#224769

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/views/hr_employee_views.xml                | 2 +-
 addons/project_timesheet_holidays/models/hr_leave.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index f5805012aef35..9a3132f7b8024 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -384,7 +384,7 @@
                                                 domain="['|', ('country_id', '=', False), ('country_id', '=', company_country_id)]"/>
 
                                         <separator name="schedule" string="Schedule"/>
-                                        <field name="resource_calendar_id" help="The default working hours are set in configuration."/>
+                                        <field name="resource_calendar_id" help="The default working hours are set in configuration." placeholder="Flexible"/>
                                     </group>
                                 </group>
                             </page>
diff --git a/addons/project_timesheet_holidays/models/hr_leave.py b/addons/project_timesheet_holidays/models/hr_leave.py
index 672f5b618c39f..b12ca92a8e4c0 100644
--- a/addons/project_timesheet_holidays/models/hr_leave.py
+++ b/addons/project_timesheet_holidays/models/hr_leave.py
@@ -34,6 +34,10 @@ def _generate_timesheets(self, ignored_resource_calendar_leaves=None):
                 continue
 
             calendar = leave.employee_id.resource_calendar_id
+
+            if not calendar or not calendar.tz:
+                continue
+
             calendar_timezone = pytz.timezone(calendar.tz)
 
             if calendar.flexible_hours and (leave.request_unit_hours or leave.request_unit_half or leave.date_from.date() == leave.date_to.date()):

From eb438af699d8224e226d7ce3ed4d6b4e52fa8cba Mon Sep 17 00:00:00 2001
From: "Abdelrahman Mahmoud (amah)" <amah@odoo.com>
Date: Wed, 1 Oct 2025 11:28:44 +0200
Subject: [PATCH 011/673] [IMP] hr_attendance: add record rule to limit country
 access

add rule for multi campany where each company sees the overtime ruleset assign to its country

Task: 5102385
Part-of: odoo/odoo#229484
Related: odoo/enterprise#95999
Related: odoo/upgrade#8528
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_attendance/security/hr_attendance_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/hr_attendance/security/hr_attendance_security.xml b/addons/hr_attendance/security/hr_attendance_security.xml
index 53ef378680228..704e7c87e6b82 100644
--- a/addons/hr_attendance/security/hr_attendance_security.xml
+++ b/addons/hr_attendance/security/hr_attendance_security.xml
@@ -85,5 +85,12 @@
             <field name="perm_unlink" eval="0"/>
             <field name="perm_read" eval="1"/>
         </record>
+
+        <!-- Overtime Ruleset -->
+        <record id="hr_attendance_overtime_ruleset_rule_multi_company" model="ir.rule">
+            <field name="name">Overtime Ruleset: Multi Company</field>
+            <field name="model_id" ref="model_hr_attendance_overtime_ruleset"/>
+            <field name="domain_force">[('country_id', 'in', user.env.companies.mapped('country_id').ids + [False])]</field>
+        </record>
     </data>
 </odoo>

From cad5f657891455b410c9b50a0935b4cd0fb94b8d Mon Sep 17 00:00:00 2001
From: "Abdelrahman Mahmoud (amah)" <amah@odoo.com>
Date: Wed, 1 Oct 2025 13:13:06 +0200
Subject: [PATCH 012/673] [IMP] hr_attendance: add SA overtime ruleset data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Introduce a default overtime ruleset tailored for Saudi Arabian companies.
- Add a corresponding work entry type to ensure proper association with the ruleset’s rules through the appropriate bridge module.

closes odoo/odoo#229484

Task: 5102385
Related: odoo/enterprise#95999
Related: odoo/upgrade#8528
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_attendance/__manifest__.py           |  1 +
 .../hr_attendance_overtime_ruleset_data.xml    | 18 ++++++++++++++++++
 .../data/hr_work_entry_type_data.xml           |  9 +++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml

diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index 58502ba731310..778b7b6f498ed 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/addons/hr_attendance/__manifest__.py
@@ -20,6 +20,7 @@
         'data/hr_attendance_data.xml',
         'security/hr_attendance_security.xml',
         'security/ir.model.access.csv',
+        'data/hr_attendance_overtime_ruleset_data.xml',
         'views/hr_attendance_view.xml',
         'views/hr_department_view.xml',
         'views/hr_employee_view.xml',
diff --git a/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml b/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml
new file mode 100644
index 0000000000000..f98e0cbd904a3
--- /dev/null
+++ b/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+<!-- SA : Saudi Arabia -->
+        <record id="l10n_sa_overtime_ruleset" model="hr.attendance.overtime.ruleset">
+            <field name="name">Saudi Overtime Ruleset</field>
+            <field name="rate_combination_mode">sum</field>
+            <field name="country_id" ref="base.sa"/>
+        </record>
+        <record id="l10n_sa_workdays_overtime_rule" model="hr.attendance.overtime.rule">
+            <field name="name">Workdays Overtime</field>
+            <field name="ruleset_id" ref="l10n_sa_overtime_ruleset"/>
+            <field name="base_off">quantity</field>
+            <field name="quantity_period">day</field>
+            <field name="expected_hours_from_contract" eval="True"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/hr_work_entry/data/hr_work_entry_type_data.xml b/addons/hr_work_entry/data/hr_work_entry_type_data.xml
index b7c94fe9045aa..9e52986a41bb8 100644
--- a/addons/hr_work_entry/data/hr_work_entry_type_data.xml
+++ b/addons/hr_work_entry/data/hr_work_entry_type_data.xml
@@ -1401,6 +1401,15 @@
         <field name="is_leave" eval="True"/>
         <field name="country_id" ref="base.sa"/>
     </record>
+    <record id="l10n_sa_work_entry_type_overtime" model="hr.work.entry.type">
+        <field name="name">Overtime</field>
+        <field name="code">SAOVERTIME</field>
+        <field name="color">4</field>
+        <field name="is_leave" eval="False"/>
+        <field name="is_extra_hours" eval="True"/>
+        <field name="amount_rate">1.5</field>
+        <field name="country_id" ref="base.sa"/>
+    </record>
 
 <!-- SK : Slovakia -->
     <record id="l10n_sk_work_entry_type_sick_25" model="hr.work.entry.type">

From bd30fa419b05c8294eac451ca6752c4ae216dc4f Mon Sep 17 00:00:00 2001
From: manv-afk <manv@odoo.com>
Date: Thu, 28 Aug 2025 16:58:28 +0200
Subject: [PATCH 013/673] [REM] point_of_sale,*: remove python dead code

Remove useless python dead code in point_of_sale and submodules.

closes odoo/odoo#224984

Task-id: 5006039
Related: odoo/enterprise#93628
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../models/pos_order.py                       |  6 --
 addons/l10n_my_edi_pos/models/pos_order.py    |  9 +--
 addons/point_of_sale/models/pos_config.py     | 34 ----------
 addons/point_of_sale/models/pos_order.py      |  4 --
 addons/point_of_sale/models/pos_session.py    | 65 -------------------
 addons/pos_loyalty/models/pos_order.py        |  5 --
 addons/pos_mercado_pago/models/__init__.py    |  1 -
 addons/pos_mercado_pago/models/pos_session.py | 11 ----
 addons/pos_restaurant/models/__init__.py      |  1 -
 addons/pos_restaurant/models/pos_payment.py   | 15 -----
 .../pos_restaurant/models/pos_restaurant.py   |  4 --
 .../models/pos_payment.py                     |  7 --
 addons/pos_restaurant_stripe/__init__.py      |  2 -
 .../pos_restaurant_stripe/models/__init__.py  |  4 --
 .../models/pos_payment.py                     | 16 -----
 addons/pos_sale/models/pos_order.py           | 22 -------
 addons/pos_self_order/models/pos_config.py    | 23 -------
 .../pos_self_order/models/product_product.py  | 13 ----
 18 files changed, 1 insertion(+), 241 deletions(-)
 delete mode 100644 addons/pos_restaurant/models/pos_payment.py
 delete mode 100644 addons/pos_restaurant_stripe/models/__init__.py
 delete mode 100644 addons/pos_restaurant_stripe/models/pos_payment.py

diff --git a/addons/l10n_es_edi_verifactu_pos/models/pos_order.py b/addons/l10n_es_edi_verifactu_pos/models/pos_order.py
index ff34779e06baa..fa21793789318 100644
--- a/addons/l10n_es_edi_verifactu_pos/models/pos_order.py
+++ b/addons/l10n_es_edi_verifactu_pos/models/pos_order.py
@@ -210,12 +210,6 @@ def _l10n_es_edi_verifactu_mark_for_next_batch(self, cancellation=False):
         self.env['l10n_es_edi_verifactu.document'].trigger_next_batch()
         return document_map
 
-    def _order_fields(self, ui_order):
-        # EXTENDS 'point_of_sale'
-        vals = super()._order_fields(ui_order)
-        vals['l10n_es_edi_verifactu_refund_reason'] = ui_order.get('l10n_es_edi_verifactu_refund_reason', False)
-        return vals
-
     def _process_saved_order(self, draft):
         self.ensure_one()
         if self.l10n_es_edi_verifactu_required:
diff --git a/addons/l10n_my_edi_pos/models/pos_order.py b/addons/l10n_my_edi_pos/models/pos_order.py
index 202f76c5b7802..b86fc2b1d3174 100644
--- a/addons/l10n_my_edi_pos/models/pos_order.py
+++ b/addons/l10n_my_edi_pos/models/pos_order.py
@@ -1,5 +1,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import Command, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 
 
@@ -61,13 +61,6 @@ def _process_order(self, order, existing_order):
 
         return super()._process_order(order, existing_order)
 
-    @api.model
-    def _order_fields(self, ui_order):
-        order_fields = super()._order_fields(ui_order)
-        if ui_order.get('consolidated_invoice_ids'):
-            order_fields['consolidated_invoice_ids'] = [Command.link(ui_order['consolidated_invoice_ids'])]
-        return order_fields
-
     @api.model
     def _generate_pos_order_invoice(self):
         # EXTENDS 'point_of_sale'
diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py
index c1b572bc6b483..199a163255ece 100644
--- a/addons/point_of_sale/models/pos_config.py
+++ b/addons/point_of_sale/models/pos_config.py
@@ -884,40 +884,6 @@ def open_opened_rescue_session_form(self):
                 'type': 'ir.actions.act_window',
             }
 
-    def _link_same_non_cash_payment_methods(self, source_config):
-        pms = source_config.payment_method_ids.filtered(lambda pm: not pm.is_cash_count)
-        if pms:
-            self.payment_method_ids = [Command.link(pm.id) for pm in pms]
-
-    def _is_journal_exist(self, journal_code, name, company_id):
-        account_journal = self.env['account.journal']
-        existing_journal = account_journal.search([
-            ('name', '=', name),
-            ('code', '=', journal_code),
-            ('company_id', '=', company_id),
-        ], limit=1)
-
-        return existing_journal.id or account_journal.create({
-            'name': name,
-            'code': journal_code,
-            'type': 'cash',
-            'company_id': company_id,
-        }).id
-
-    def _is_pos_pm_exist(self, name, journal_id, company_id):
-        pos_payment = self.env['pos.payment.method']
-        existing_pos_cash_pm = pos_payment.search([
-            ('name', '=', name),
-            ('journal_id', '=', journal_id),
-            ('company_id', '=', company_id),
-        ], limit=1)
-
-        return existing_pos_cash_pm.id or pos_payment.create({
-            'name': name,
-            'journal_id': journal_id,
-            'company_id': company_id,
-        }).id
-
     def get_limited_product_count(self):
         return self.env['ir.config_parameter'].sudo().get_int('point_of_sale.limited_product_count') or DEFAULT_LIMIT_LOAD_PRODUCT
 
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 90e289be84316..758e859c71a56 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -1519,10 +1519,6 @@ def _load_pos_data_fields(self, config):
             'extra_tax_data', 'write_date',
         ]
 
-    @api.model
-    def _is_field_accepted(self, field):
-        return field in self._fields and not field in ['combo_parent_id', 'combo_line_ids']
-
     @api.depends('refund_orderline_ids', 'refund_orderline_ids.order_id.state')
     def _compute_refund_qty(self):
         for orderline in self:
diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py
index 21dd4aeec6f31..34fac11d8c9bd 100644
--- a/addons/point_of_sale/models/pos_session.py
+++ b/addons/point_of_sale/models/pos_session.py
@@ -1535,16 +1535,6 @@ def _update_amounts(self, old_amounts, amounts_to_add, date, round=True, force_c
 
         return new_amounts
 
-    def _round_amounts(self, amounts):
-        new_amounts = {}
-        for key, amount in amounts.items():
-            if key == 'amount_converted':
-                # round the amount_converted using the company currency.
-                new_amounts[key] = self.company_id.currency_id.round(amount)
-            else:
-                new_amounts[key] = self.currency_id.round(amount)
-        return new_amounts
-
     def _credit_amounts(self, partial_move_line_vals, amount, amount_converted, force_company_currency=False):
         """ `partial_move_line_vals` is completed by `credit`ing the given amounts.
 
@@ -1784,58 +1774,6 @@ def delete_cash_in_out(self, absl_id, partner_id):
         absl.unlink()
         self.log_partner_message(partner_id, action, "CASH_IN_OUT_UNLINK")
 
-    def _get_attributes_by_ptal_id(self):
-        # performance trick: prefetch fields with search_fetch() and fetch()
-        product_attributes = self.env['product.attribute'].search_fetch(
-            [('create_variant', '=', 'no_variant')],
-            ['name', 'display_type'],
-        )
-        product_template_attribute_values = self.env['product.template.attribute.value'].search_fetch(
-            [('attribute_id', 'in', product_attributes.ids)],
-            ['attribute_id', 'attribute_line_id', 'product_attribute_value_id', 'price_extra'],
-        )
-        product_template_attribute_values.product_attribute_value_id.fetch(['name', 'is_custom', 'html_color', 'image'])
-
-        key1 = lambda ptav: (ptav.attribute_line_id.id, ptav.attribute_id.id)
-        key2 = lambda ptav: (ptav.attribute_line_id.id, ptav.attribute_id)
-        res = {}
-        for key, group in groupby(sorted(product_template_attribute_values, key=key1), key=key2):
-            attribute_line_id, attribute = key
-            values = [{**ptav.product_attribute_value_id.read(['name', 'is_custom', 'html_color', 'image'])[0],
-                       'price_extra': ptav.price_extra,
-                       # id of a value should be from the "product.template.attribute.value" record
-                       'id': ptav.id,
-                       } for ptav in list(group)]
-            res[attribute_line_id] = {
-                'id': attribute_line_id,
-                'name': attribute.name,
-                'display_type': attribute.display_type,
-                'values': values,
-                'sequence': attribute.sequence,
-            }
-
-        return res
-
-    def _get_partners_domain(self):
-        return []
-
-    def find_product_by_barcode(self, barcode, config_id):
-        # Kept for backward compatibility.
-        return self.env['product.template'].load_product_from_pos(config_id, [
-            '|',
-            ('product_variant_ids.barcode', '=', barcode),
-            ('barcode', '=', barcode),
-            ('available_in_pos', '=', True),
-            ('sale_ok', '=', True),
-        ])
-
-    def get_total_discount(self):
-        amount = 0
-        for line in self.env['pos.order.line'].search([('order_id', 'in', self._get_closed_orders().ids), ('discount', '>', 0)]):
-            amount += line._get_discount_amount()
-
-        return amount
-
     def _get_invoice_total_list(self):
         invoice_list = []
         for order in self.order_ids.filtered(lambda o: o.is_invoiced):
@@ -1865,9 +1803,6 @@ def log_partner_message(self, partner_id, action, message_type):
 
         self.message_post(body=body, author_id=partner_id)
 
-    def _pos_has_valid_product(self):
-        return self.env['product.product'].sudo().search_count([('available_in_pos', '=', True), ('list_price', '>=', 0), ('id', 'not in', self.env['pos.config']._get_special_products().ids), '|', ('active', '=', False), ('active', '=', True)], limit=1) > 0
-
     def _get_closed_orders(self):
         return self.order_ids.filtered(lambda o: o.state not in ['draft', 'cancel'])
 
diff --git a/addons/pos_loyalty/models/pos_order.py b/addons/pos_loyalty/models/pos_order.py
index 53ba3587e5186..6dd4483a45252 100644
--- a/addons/pos_loyalty/models/pos_order.py
+++ b/addons/pos_loyalty/models/pos_order.py
@@ -282,11 +282,6 @@ def _remove_duplicate_coupon_data(self, coupon_data):
         for item in items_to_remove:
             coupon_data.pop(item)
 
-    def _get_fields_for_order_line(self):
-        fields = super(PosOrder, self)._get_fields_for_order_line()
-        fields.extend(['is_reward_line', 'reward_id', 'coupon_id', 'reward_identifier_code', 'points_cost'])
-        return fields
-
     def _add_mail_attachment(self, name, ticket, basic_receipt):
         attachment = super()._add_mail_attachment(name, ticket, basic_receipt)
         gift_card_programs = self.config_id._get_program_ids().filtered(lambda p: p.program_type == 'gift_card' and
diff --git a/addons/pos_mercado_pago/models/__init__.py b/addons/pos_mercado_pago/models/__init__.py
index 620d811f13ad0..e590fb19ae817 100644
--- a/addons/pos_mercado_pago/models/__init__.py
+++ b/addons/pos_mercado_pago/models/__init__.py
@@ -1,3 +1,2 @@
 from . import mercado_pago_pos_request
 from . import pos_payment_method
-from . import pos_session
diff --git a/addons/pos_mercado_pago/models/pos_session.py b/addons/pos_mercado_pago/models/pos_session.py
index 8d6325d90b29b..e69de29bb2d1d 100644
--- a/addons/pos_mercado_pago/models/pos_session.py
+++ b/addons/pos_mercado_pago/models/pos_session.py
@@ -1,11 +0,0 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import models
-
-
-class PosSession(models.Model):
-    _inherit = 'pos.session'
-
-    def _loader_params_pos_payment_method(self):
-        result = super()._loader_params_pos_payment_method()
-        result['search_params']['fields'].append('mp_id_point_smart')
-        return result
diff --git a/addons/pos_restaurant/models/__init__.py b/addons/pos_restaurant/models/__init__.py
index 5d3adcde87c28..7eb501218794e 100644
--- a/addons/pos_restaurant/models/__init__.py
+++ b/addons/pos_restaurant/models/__init__.py
@@ -4,7 +4,6 @@
 from . import pos_config
 from . import pos_order
 from . import pos_order_line
-from . import pos_payment
 from . import pos_restaurant
 from . import pos_session
 from . import res_config_settings
diff --git a/addons/pos_restaurant/models/pos_payment.py b/addons/pos_restaurant/models/pos_payment.py
deleted file mode 100644
index a5b1d05be4018..0000000000000
--- a/addons/pos_restaurant/models/pos_payment.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api, fields, models
-
-
-class PosPayment(models.Model):
-    _inherit = 'pos.payment'
-
-    def _update_payment_line_for_tip(self, tip_amount):
-        """Inherit this method to perform reauthorization or capture on electronic payment."""
-        self.ensure_one()
-        self.write({
-            "amount": self.amount + tip_amount,
-        })
diff --git a/addons/pos_restaurant/models/pos_restaurant.py b/addons/pos_restaurant/models/pos_restaurant.py
index 3dd74d45a017b..3172b8caaa0b9 100644
--- a/addons/pos_restaurant/models/pos_restaurant.py
+++ b/addons/pos_restaurant/models/pos_restaurant.py
@@ -55,10 +55,6 @@ def write(self, vals):
 
         return super().write(vals)
 
-    def rename_floor(self, new_name):
-        for floor in self:
-            floor.name = new_name
-
     @api.model
     def sync_from_ui(self, name, background_color, config_id):
         floor_fields = {
diff --git a/addons/pos_restaurant_adyen/models/pos_payment.py b/addons/pos_restaurant_adyen/models/pos_payment.py
index 4c62cacf50cd4..e54a17a854157 100644
--- a/addons/pos_restaurant_adyen/models/pos_payment.py
+++ b/addons/pos_restaurant_adyen/models/pos_payment.py
@@ -12,13 +12,6 @@
 class PosPayment(models.Model):
     _inherit = 'pos.payment'
 
-    def _update_payment_line_for_tip(self, tip_amount):
-        """Capture the payment when a tip is set."""
-        res = super(PosPayment, self)._update_payment_line_for_tip(tip_amount)
-        if self.payment_method_id.use_payment_terminal == 'adyen':
-            self._adyen_capture()
-        return res
-
     def _adyen_capture(self):
         data = {
             'originalReference': self.transaction_id,
diff --git a/addons/pos_restaurant_stripe/__init__.py b/addons/pos_restaurant_stripe/__init__.py
index dc5e6b693d19d..67dee8c60dbf8 100644
--- a/addons/pos_restaurant_stripe/__init__.py
+++ b/addons/pos_restaurant_stripe/__init__.py
@@ -1,4 +1,2 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import models
diff --git a/addons/pos_restaurant_stripe/models/__init__.py b/addons/pos_restaurant_stripe/models/__init__.py
deleted file mode 100644
index 9306a5bdb2c1c..0000000000000
--- a/addons/pos_restaurant_stripe/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# coding: utf-8
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import pos_payment
diff --git a/addons/pos_restaurant_stripe/models/pos_payment.py b/addons/pos_restaurant_stripe/models/pos_payment.py
deleted file mode 100644
index cbf3dd42f5ef7..0000000000000
--- a/addons/pos_restaurant_stripe/models/pos_payment.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# coding: utf-8
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import models
-
-
-class PosPayment(models.Model):
-    _inherit = 'pos.payment'
-
-    def _update_payment_line_for_tip(self, tip_amount):
-        """Capture the payment when a tip is set."""
-        res = super(PosPayment, self)._update_payment_line_for_tip(tip_amount)
-
-        if self.payment_method_id.use_payment_terminal == 'stripe':
-            self.payment_method_id.stripe_capture_payment(self.transaction_id, amount=self.amount)
-
-        return res
diff --git a/addons/pos_sale/models/pos_order.py b/addons/pos_sale/models/pos_order.py
index cf892946cba7c..fd2b20c0156d4 100644
--- a/addons/pos_sale/models/pos_order.py
+++ b/addons/pos_sale/models/pos_order.py
@@ -138,28 +138,6 @@ def action_view_sale_order(self):
             'domain': [('id', 'in', linked_orders.ids)],
         }
 
-    def _get_fields_for_order_line(self):
-        fields = super(PosOrder, self)._get_fields_for_order_line()
-        fields.extend([
-            'sale_order_origin_id',
-            'down_payment_details',
-            'sale_order_line_id',
-        ])
-        return fields
-
-    def _prepare_order_line(self, order_line):
-        order_line = super()._prepare_order_line(order_line)
-        if order_line.get('sale_order_origin_id'):
-            order_line['sale_order_origin_id'] = {
-                'id': order_line['sale_order_origin_id'][0],
-                'name': order_line['sale_order_origin_id'][1],
-            }
-        if order_line.get('sale_order_line_id'):
-            order_line['sale_order_line_id'] = {
-                'id': order_line['sale_order_line_id'][0],
-            }
-        return order_line
-
     def _get_invoice_lines_values(self, line_values, pos_line, move_type):
         inv_line_vals = super()._get_invoice_lines_values(line_values, pos_line, move_type)
 
diff --git a/addons/pos_self_order/models/pos_config.py b/addons/pos_self_order/models/pos_config.py
index 3d6bedc51146e..15f536b7038c6 100644
--- a/addons/pos_self_order/models/pos_config.py
+++ b/addons/pos_self_order/models/pos_config.py
@@ -270,15 +270,6 @@ def preview_self_order_app(self):
             "target": "new",
         }
 
-    def _get_self_ordering_attachment(self, images):
-        encoded_images = []
-        for image in images:
-            encoded_images.append({
-                'id': image.id,
-                'data': image.sudo().datas.decode('utf-8'),
-            })
-        return encoded_images
-
     def _load_self_data_models(self):
         return ['pos.session', 'pos.preset', 'resource.calendar.attendance', 'pos.order', 'pos.order.line', 'pos.payment', 'pos.payment.method', 'res.partner',
             'res.currency', 'pos.category', 'product.template', 'product.product', 'product.combo', 'product.combo.item', 'res.company', 'account.tax',
@@ -336,20 +327,6 @@ def load_data_params(self):
 
         return response
 
-    def _split_qr_codes_list(self, floors: List[Dict], cols: int) -> List[Dict]:
-        """
-        :floors: the list of floors
-        :cols: the number of qr codes per row
-        """
-        self.ensure_one()
-        return [
-            {
-                "name": floor.get("name"),
-                "rows_of_tables": list(split_every(cols, floor["tables"], list)),
-            }
-            for floor in floors
-        ]
-
     def _compute_self_ordering_url(self):
         for record in self:
             record.self_ordering_url = record.get_base_url() + record._get_self_order_route()
diff --git a/addons/pos_self_order/models/product_product.py b/addons/pos_self_order/models/product_product.py
index 77f94c5198f48..d5ce9157038b2 100644
--- a/addons/pos_self_order/models/product_product.py
+++ b/addons/pos_self_order/models/product_product.py
@@ -89,19 +89,6 @@ def _can_return_content(self, field_name=None, access_token=None):
 class ProductProduct(models.Model):
     _inherit = "product.product"
 
-    def _filter_applicable_attributes(self, attributes_by_ptal_id: dict) -> list[dict]:
-        """
-        The attributes_by_ptal_id is a dictionary that contains all the attributes that have
-        [('create_variant', '=', 'no_variant')]
-        This method filters out the attributes that are not applicable to the product in self
-        """
-        self.ensure_one()
-        return [
-            attributes_by_ptal_id[id]
-            for id in self.attribute_line_ids.ids
-            if attributes_by_ptal_id.get(id) is not None
-        ]
-
     def write(self, vals):
         res = super().write(vals)
         if 'self_order_available' in vals:

From 29b3bf5b0e7e6add8df2cda0bb1067be055b5f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir=20=28rar=29?= <rar@odoo.com>
Date: Thu, 30 Oct 2025 13:28:50 +0100
Subject: [PATCH 014/673] [IMP] spreadsheet: update o_spreadsheet to latest
 version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### Contains the following commits:

https://github.com/odoo/o-spreadsheet/commit/d0b65e9e48 [REL] 19.1.0-alpha.10 [Task: 0](https://www.odoo.com/odoo/2328/tasks/0)
https://github.com/odoo/o-spreadsheet/commit/5c8b4fa7f9 [FIX] upgrade: half-versions are missing in mapping [Task: 5116401](https://www.odoo.com/odoo/2328/tasks/5116401)
https://github.com/odoo/o-spreadsheet/commit/e7f35060bd [FIX] style: remove circular dependency [Task: 0](https://www.odoo.com/odoo/2328/tasks/0)
https://github.com/odoo/o-spreadsheet/commit/e97442f56e [IMP] filters: auto focus input [Task: 4862354](https://www.odoo.com/odoo/2328/tasks/4862354)
https://github.com/odoo/o-spreadsheet/commit/9f76cbe835 [IMP] CF: auto focus input [Task: 4862354](https://www.odoo.com/odoo/2328/tasks/4862354)
https://github.com/odoo/o-spreadsheet/commit/7eeea68b53 [IMP] DV: auto focus input [Task: 4862354](https://www.odoo.com/odoo/2328/tasks/4862354)
https://github.com/odoo/o-spreadsheet/commit/b0f275b719 [IMP] tests: add .not.toHaveClass() failure message [](https://www.odoo.com/odoo/2328/tasks/)
https://github.com/odoo/o-spreadsheet/commit/edae4603fd [IMP] doc: add links to data model documentation [Task: 5194507](https://www.odoo.com/odoo/2328/tasks/5194507)
https://github.com/odoo/o-spreadsheet/commit/2be1aa14d0 [FIX] doc: better formatting for data model [Task: 5194507](https://www.odoo.com/odoo/2328/tasks/5194507)
https://github.com/odoo/o-spreadsheet/commit/d1b802bee2 [FIX] charts: wrong padding for humanize number section [Task: 5155591](https://www.odoo.com/odoo/2328/tasks/5155591)
https://github.com/odoo/o-spreadsheet/commit/4a726a82a9 [FIX] charts: missing `humanizeNumbers` checkbox in some panels [Task: 5155591](https://www.odoo.com/odoo/2328/tasks/5155591)
https://github.com/odoo/o-spreadsheet/commit/83c34559d5 [FIX] charts: correctly humanize decimal numbers [Task: 5155591](https://www.odoo.com/odoo/2328/tasks/5155591)
https://github.com/odoo/o-spreadsheet/commit/a370995bbf [REF] tests: remove chart snapshot tests [Task: 5160031](https://www.odoo.com/odoo/2328/tasks/5160031)
https://github.com/odoo/o-spreadsheet/commit/49d514299c [REF] style: decouple style from cells [Task: [4930719](https://www.odoo.com/odoo/2328/tasks/4930719)](https://www.odoo.com/odoo/2328/tasks/[4930719](https://www.odoo.com/odoo/2328/tasks/4930719))

closes odoo/odoo#233775

Related: odoo/enterprise#98469
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Co-authored-by: Anthony Hendrickx (anhe) <anhe@odoo.com>
Co-authored-by: Alexis Lacroix (laa) <laa@odoo.com>
Co-authored-by: Lucas Lefèvre (lul) <lul@odoo.com>
Co-authored-by: Dhrutik Patel (dhrp) <dhrp@odoo.com>
Co-authored-by: Adrien Minne (adrm) <adrm@odoo.com>
Co-authored-by: Ronak Mukeshbhai Bharadiya <rmbh@odoo.com>
Co-authored-by: Florian Damhaut (flda) <flda@odoo.com>
Co-authored-by: Rémi Rahir (rar) <rar@odoo.com>
Co-authored-by: Pierre Rousseau (pro) <pro@odoo.com>
Co-authored-by: Vincent Schippefilt (vsc) <vsc@odoo.com>
---
 .../src/o_spreadsheet/o_spreadsheet.css       |   6 +-
 .../static/src/o_spreadsheet/o_spreadsheet.js | 778 +++++++++++++-----
 .../src/o_spreadsheet/o_spreadsheet.xml       |  43 +-
 3 files changed, 594 insertions(+), 233 deletions(-)

diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
index f1dcb1266c603..b1db956424c91 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
@@ -2,9 +2,9 @@
 /*
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.1.0-alpha.9
- * @date 2025-10-23T11:12:27.876Z
- * @hash bd756ddcb
+ * @version 19.1.0-alpha.10
+ * @date 2025-10-30T12:28:49.805Z
+ * @hash d0b65e9e4
  */
 :root {
   --os-gray-100: #f9fafb;
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
index c85e9456b5494..7bde6eae733c9 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.1.0-alpha.9
- * @date 2025-10-23T11:12:21.757Z
- * @hash bd756ddcb
+ * @version 19.1.0-alpha.10
+ * @date 2025-10-30T12:28:44.205Z
+ * @hash d0b65e9e4
  */
 odoo.define('@spreadsheet/o_spreadsheet/o_spreadsheet', ['@odoo/owl'], function (require) {
 'use strict';
@@ -1768,7 +1768,10 @@ function hasOverlappingZones(zones) {
 }
 function isInside(col, row, zone) {
     const { left, right, top, bottom } = zone;
-    return col >= left && col <= right && row >= top && row <= bottom;
+    return (col >= left &&
+        (right === undefined || col <= right) &&
+        row >= top &&
+        (bottom === undefined || row <= bottom));
 }
 /**
  * Check if a zone is inside another
@@ -5852,10 +5855,18 @@ function _roundFormat(internalFormat) {
     };
 }
 function humanizeNumber({ value, format }, locale) {
-    const numberFormat = formatLargeNumber({
-        value,
-        format,
-    }, undefined, locale);
+    const numberValue = tryToNumber(value, locale);
+    if (numberValue === undefined) {
+        return "";
+    }
+    let numberFormat = format;
+    if (Math.abs(numberValue) < 1000) {
+        const hasDecimal = numberValue % 1 !== 0;
+        numberFormat = !format && hasDecimal ? "0.####" : format;
+    }
+    else {
+        numberFormat = formatLargeNumber({ value, format }, undefined, locale);
+    }
     return formatValue$1(value, { format: numberFormat, locale });
 }
 function formatLargeNumber(arg, unit, locale) {
@@ -6338,6 +6349,8 @@ const invalidateChartEvaluationCommands = new Set([
     "UNHIDE_COLUMNS_ROWS",
     "HIDE_COLUMNS_ROWS",
     "GROUP_HEADERS",
+    "SET_FORMATTING",
+    "CLEAR_FORMATTING",
     "UNGROUP_HEADERS",
     "FOLD_ALL_HEADER_GROUPS",
     "FOLD_HEADER_GROUP",
@@ -19827,12 +19840,12 @@ function getCanvas(width = 100, height = 100) {
 /**
  * Get the default height of the cell given its style.
  */
-function getDefaultCellHeight(ctx, cell, colSize) {
+function getDefaultCellHeight(ctx, cell, style, colSize) {
     if (!cell || (!cell.isFormula && !cell.content)) {
         return DEFAULT_CELL_HEIGHT;
     }
     const content = cell.isFormula ? "" : cell.content;
-    return getCellContentHeight(ctx, content, cell.style, colSize);
+    return getCellContentHeight(ctx, content, style, colSize);
 }
 function getCellContentHeight(ctx, content, style, colSize) {
     const maxWidth = style?.wrapping === "wrap" ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
@@ -33491,8 +33504,10 @@ const LEGACY_VERSION_MAPPING = {
     17: "17.4",
     16: "17.3",
     15: "17.2",
+    "14.5": "16.4.1",
     14: "16.4",
     13: "16.3",
+    "12.5": "15.4.1",
     12: "15.4",
     // not accurate starting at this point
     11: "0.10",
@@ -34476,7 +34491,6 @@ class CellPlugin extends CorePlugin {
         "zoneToXC",
         "getCells",
         "getTranslatedCellFormula",
-        "getCellStyle",
         "getCellById",
         "getFormulaString",
         "getFormulaMovedInSheet",
@@ -34519,9 +34533,6 @@ class CellPlugin extends CorePlugin {
     handle(cmd) {
         switch (cmd.type) {
             case "SET_FORMATTING":
-                if ("style" in cmd) {
-                    this.setStyle(cmd.sheetId, cmd.target, cmd.style);
-                }
                 if ("format" in cmd && cmd.format !== undefined) {
                     this.setFormatter(cmd.sheetId, cmd.target, cmd.format);
                 }
@@ -34531,10 +34542,10 @@ class CellPlugin extends CorePlugin {
                 break;
             case "ADD_COLUMNS_ROWS":
                 if (cmd.dimension === "COL") {
-                    this.handleAddColumnsRows(cmd, this.copyColumnStyle.bind(this));
+                    this.handleAddColumnsRows(cmd, this.copyColumnFormat.bind(this));
                 }
                 else {
-                    this.handleAddColumnsRows(cmd, this.copyRowStyle.bind(this));
+                    this.handleAddColumnsRows(cmd, this.copyRowFormat.bind(this));
                 }
                 break;
             case "UPDATE_CELL":
@@ -34546,7 +34557,6 @@ class CellPlugin extends CorePlugin {
                     col: cmd.col,
                     row: cmd.row,
                     content: "",
-                    style: null,
                     format: "",
                 });
                 break;
@@ -34606,7 +34616,6 @@ class CellPlugin extends CorePlugin {
                         sheetId,
                         col,
                         row,
-                        style: null,
                         format: "",
                     });
                 }
@@ -34625,7 +34634,6 @@ class CellPlugin extends CorePlugin {
                         col,
                         row,
                         content: "",
-                        style: null,
                         format: "",
                     });
                 }
@@ -34633,7 +34641,7 @@ class CellPlugin extends CorePlugin {
         }
     }
     /**
-     * Copy the style of the reference column/row to the new columns/rows.
+     * Copy the format of the reference column/row to the new columns/rows.
      */
     handleAddColumnsRows(cmd, fn) {
         // The new elements have already been inserted in the sheet at this point.
@@ -34664,25 +34672,20 @@ class CellPlugin extends CorePlugin {
                     cellsData.set(position, { content: sheet.cells[xc] });
                 }
             }
-            // cells style and format
-            for (const [cellProperty, valuesByZones] of [
-                ["style", sheet.styles],
-                ["format", sheet.formats],
-            ]) {
-                for (const [position, itemId] of iterateItemIdsPositions(sheet.id, valuesByZones)) {
-                    const cellData = cellsData.get(position);
-                    if (cellData) {
-                        cellData[cellProperty] = itemId;
-                    }
-                    else {
-                        cellsData.set(position, { [cellProperty]: itemId });
-                    }
+            // cell format
+            for (const [position, itemId] of iterateItemIdsPositions(sheet.id, sheet.formats)) {
+                const cellData = cellsData.get(position);
+                if (cellData) {
+                    cellData["format"] = itemId;
+                }
+                else {
+                    cellsData.set(position, { format: itemId });
                 }
             }
             for (const position of cellsData.keysForSheet(sheetId)) {
                 const cellData = cellsData.get(position);
-                if (cellData?.content || cellData?.format || cellData?.style) {
-                    const cell = this.importCell(sheet.id, cellData?.content, cellData?.style ? data.styles[cellData?.style] : undefined, cellData?.format ? data.formats[cellData?.format] : undefined);
+                if (cellData?.content || cellData?.format) {
+                    const cell = this.importCell(sheet.id, cellData?.content, cellData?.format ? data.formats[cellData?.format] : undefined);
                     this.history.update("cells", sheet.id, cell.id, cell);
                     this.dispatch("UPDATE_CELL_POSITION", {
                         cellId: cell.id,
@@ -34693,10 +34696,8 @@ class CellPlugin extends CorePlugin {
         }
     }
     export(data) {
-        const styles = {};
         const formats = {};
         for (const _sheet of data.sheets) {
-            const positionsByStyle = [];
             const positionsByFormat = [];
             const cells = {};
             const positions = Object.keys(this.cells[_sheet.id] || {})
@@ -34705,12 +34706,6 @@ class CellPlugin extends CorePlugin {
             for (const position of positions) {
                 const cell = this.getters.getCell(position);
                 const xc = toXC(position.col, position.row);
-                const style = this.removeDefaultStyleValues(cell.style);
-                if (Object.keys(style).length) {
-                    const styleId = getItemId(style, styles);
-                    positionsByStyle[styleId] ??= [];
-                    positionsByStyle[styleId].push(position);
-                }
                 if (cell.format) {
                     const formatId = getItemId(cell.format, formats);
                     positionsByFormat[formatId] ??= [];
@@ -34720,16 +34715,14 @@ class CellPlugin extends CorePlugin {
                     cells[xc] = cell.content;
                 }
             }
-            _sheet.styles = groupItemIdsByZones(positionsByStyle);
             _sheet.formats = groupItemIdsByZones(positionsByFormat);
             _sheet.cells = cells;
         }
-        data.styles = styles;
         data.formats = formats;
     }
-    importCell(sheetId, content, style, format) {
+    importCell(sheetId, content, format) {
         const cellId = this.getNextUid();
-        return this.createCell(cellId, content || "", format, style, sheetId);
+        return this.createCell(cellId, content || "", format, sheetId);
     }
     exportForExcel(data) {
         this.export(data);
@@ -34751,15 +34744,6 @@ class CellPlugin extends CorePlugin {
             }
         }
     }
-    removeDefaultStyleValues(style) {
-        const cleanedStyle = { ...style };
-        for (const property in DEFAULT_STYLE) {
-            if (cleanedStyle[property] === DEFAULT_STYLE[property]) {
-                delete cleanedStyle[property];
-            }
-        }
-        return cleanedStyle;
-    }
     // ---------------------------------------------------------------------------
     // GETTERS
     // ---------------------------------------------------------------------------
@@ -34804,9 +34788,6 @@ class CellPlugin extends CorePlugin {
         const adaptedDependencies = this.getters.removeRangesSheetPrefix(targetSheetId, dependencies);
         return this.getFormulaString(targetSheetId, tokens, adaptedDependencies);
     }
-    getCellStyle(position) {
-        return this.getters.getCell(position)?.style || {};
-    }
     /**
      * Converts a zone to a XC coordinate system
      *
@@ -34843,28 +34824,13 @@ class CellPlugin extends CorePlugin {
         }
         return topLeft;
     }
-    setStyle(sheetId, target, style) {
-        for (const zone of recomputeZones(target)) {
-            for (let col = zone.left; col <= zone.right; col++) {
-                for (let row = zone.top; row <= zone.bottom; row++) {
-                    const cell = this.getters.getCell({ sheetId, col, row });
-                    this.dispatch("UPDATE_CELL", {
-                        sheetId,
-                        col,
-                        row,
-                        style: style ? { ...cell?.style, ...style } : undefined,
-                    });
-                }
-            }
-        }
-    }
     /**
-     * Copy the style of one column to other columns.
+     * Copy the format of one column to other columns.
      */
-    copyColumnStyle(sheetId, refColumn, targetCols) {
+    copyColumnFormat(sheetId, refColumn, targetCols) {
         for (let row = 0; row < this.getters.getNumberRows(sheetId); row++) {
             const format = this.getFormat(sheetId, refColumn, row);
-            if (format.style || format.format) {
+            if (format.format) {
                 for (const col of targetCols) {
                     this.dispatch("UPDATE_CELL", { sheetId, col, row, ...format });
                 }
@@ -34872,12 +34838,12 @@ class CellPlugin extends CorePlugin {
         }
     }
     /**
-     * Copy the style of one row to other rows.
+     * Copy the format of one row to other rows.
      */
-    copyRowStyle(sheetId, refRow, targetRows) {
+    copyRowFormat(sheetId, refRow, targetRows) {
         for (let col = 0; col < this.getters.getNumberCols(sheetId); col++) {
             const format = this.getFormat(sheetId, col, refRow);
-            if (format.style || format.format) {
+            if (format.format) {
                 for (const row of targetRows) {
                     this.dispatch("UPDATE_CELL", { sheetId, col, row, ...format });
                 }
@@ -34885,16 +34851,13 @@ class CellPlugin extends CorePlugin {
         }
     }
     /**
-     * gets the currently used style/border of a cell based on it's coordinates
+     * gets the currently used style and format of a cell based on it's coordinates
      */
     getFormat(sheetId, col, row) {
         const format = {};
         const position = this.getters.getMainCellPosition({ sheetId, col, row });
         const cell = this.getters.getCell(position);
         if (cell) {
-            if (cell.style) {
-                format["style"] = cell.style;
-            }
             if (cell.format) {
                 format["format"] = cell.format;
             }
@@ -34911,24 +34874,16 @@ class CellPlugin extends CorePlugin {
         const hasContent = "content" in after || "formula" in after;
         // Compute the new cell properties
         const afterContent = hasContent ? replaceNewLines(after?.content) : before?.content || "";
-        let style;
-        if (after.style !== undefined) {
-            style = after.style || undefined;
-        }
-        else {
-            style = before ? before.style : undefined;
-        }
         const format = "format" in after ? after.format : before && before.format;
         /* Read the following IF as:
          * we need to remove the cell if it is completely empty, but we can know if it completely empty if:
-         * - the command says the new content is empty and has no border/format/style
+         * - the command says the new content is empty and has no format
          * - the command has no content property, in this case
-         *     - either there wasn't a cell at this place and the command says border/format/style is empty
-         *     - or there was a cell at this place, but it's an empty cell and the command says border/format/style is empty
+         *     - either there wasn't a cell at this place and the command says format is empty
+         *     - or there was a cell at this place, but it's an empty cell and the command says format is empty
          *  */
         if (((hasContent && !afterContent && !after.formula) ||
             (!hasContent && (!before || before.content === ""))) &&
-            !style &&
             !format) {
             if (before) {
                 this.history.update("cells", sheetId, before.id, undefined);
@@ -34942,17 +34897,17 @@ class CellPlugin extends CorePlugin {
             return;
         }
         const cellId = before?.id || this.getNextUid();
-        const cell = this.createCell(cellId, afterContent, format, style, sheetId);
+        const cell = this.createCell(cellId, afterContent, format, sheetId);
         this.history.update("cells", sheetId, cell.id, cell);
         this.dispatch("UPDATE_CELL_POSITION", { cellId: cell.id, col, row, sheetId });
     }
-    createCell(id, content, format, style, sheetId) {
+    createCell(id, content, format, sheetId) {
         if (!content.startsWith("=")) {
-            return this.createLiteralCell(id, content, format, style);
+            return this.createLiteralCell(id, content, format);
         }
-        return this.createFormulaCell(id, content, format, style, sheetId);
+        return this.createFormulaCell(id, content, format, sheetId);
     }
-    createLiteralCell(id, content, format, style) {
+    createLiteralCell(id, content, format) {
         const locale = this.getters.getLocale();
         const parsedValue = parseLiteral(content, locale);
         format =
@@ -34966,21 +34921,19 @@ class CellPlugin extends CorePlugin {
         return {
             id,
             content,
-            style,
             format,
             isFormula: false,
             parsedValue,
         };
     }
-    createFormulaCell(id, content, format, style, sheetId) {
+    createFormulaCell(id, content, format, sheetId) {
         const compiledFormula = compile(content);
         if (compiledFormula.dependencies.length) {
-            return this.createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId);
+            return this.createFormulaCellWithDependencies(id, compiledFormula, format, sheetId);
         }
         return {
             id,
             content,
-            style,
             format,
             isFormula: true,
             compiledFormula: {
@@ -34993,12 +34946,12 @@ class CellPlugin extends CorePlugin {
      * Create a new formula cell with the content
      * being a computed property to rebuild the dependencies XC.
      */
-    createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId) {
+    createFormulaCellWithDependencies(id, compiledFormula, format, sheetId) {
         const dependencies = [];
         for (const xc of compiledFormula.dependencies) {
             dependencies.push(this.getters.getRangeFromSheetXC(sheetId, xc));
         }
-        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getters.getRangeString);
+        return new FormulaCellWithDependencies(id, compiledFormula, format, dependencies, sheetId, this.getters.getRangeString);
     }
     checkCellOutOfSheet(cmd) {
         const { sheetId, col, row } = cmd;
@@ -35010,9 +34963,10 @@ class CellPlugin extends CorePlugin {
     }
     checkUselessClearCell(cmd) {
         const cell = this.getters.getCell(cmd);
+        const style = this.getters.getCellStyle(cmd);
         if (!cell)
             return "NoChanges" /* CommandResult.NoChanges */;
-        if (!cell.content && !cell.style && !cell.format) {
+        if (!cell.content && !style && !cell.format) {
             return "NoChanges" /* CommandResult.NoChanges */;
         }
         return "Success" /* CommandResult.Success */;
@@ -35021,9 +34975,10 @@ class CellPlugin extends CorePlugin {
         const cell = this.getters.getCell(cmd);
         const hasContent = "content" in cmd || "formula" in cmd;
         const hasStyle = "style" in cmd;
+        const oldStyle = hasStyle && this.getters.getCellStyle(cmd);
         const hasFormat = "format" in cmd;
         if ((!hasContent || cell?.content === cmd.content) &&
-            (!hasStyle || deepEquals$1(cell?.style, cmd.style)) &&
+            (!hasStyle || deepEquals$1(oldStyle, cmd.style)) &&
             (!hasFormat || cell?.format === cmd.format)) {
             return "NoChanges" /* CommandResult.NoChanges */;
         }
@@ -35033,15 +34988,13 @@ class CellPlugin extends CorePlugin {
 class FormulaCellWithDependencies {
     id;
     format;
-    style;
     sheetId;
     getRangeString;
     isFormula = true;
     compiledFormula;
-    constructor(id, compiledFormula, format, style, dependencies, sheetId, getRangeString) {
+    constructor(id, compiledFormula, format, dependencies, sheetId, getRangeString) {
         this.id = id;
         this.format = format;
-        this.style = style;
         this.sheetId = sheetId;
         this.getRangeString = getRangeString;
         let rangeIndex = 0;
@@ -36563,13 +36516,13 @@ class DataValidationPlugin extends CorePlugin {
     }
     setCenterStyleToBooleanCells(rule) {
         for (const position of getCellPositionsInRanges(rule.ranges)) {
-            const cell = this.getters.getCell(position);
-            const style = {
-                ...cell?.style,
-                align: cell?.style?.align ?? "center",
-                verticalAlign: cell?.style?.verticalAlign ?? "middle",
+            const style = this.getters.getCellStyle(position);
+            const newStyle = {
+                ...style,
+                align: style?.align ?? "center",
+                verticalAlign: style?.verticalAlign ?? "middle",
             };
-            this.dispatch("UPDATE_CELL", { ...position, style });
+            this.dispatch("UPDATE_CELL", { ...position, style: newStyle });
         }
     }
     checkEmptyRange(cmd) {
@@ -38165,7 +38118,6 @@ class MergePlugin extends CorePlugin {
         if (tl === br) {
             return;
         }
-        const topLeft = this.getters.getCell({ sheetId, col: left, row: top });
         const id = this.nextId++;
         this.history.update("merges", sheetId, id, this.getters.getRangeFromSheetXC(sheetId, zoneToXc({ left, top, right, bottom })));
         const previousMerges = new Set();
@@ -38176,7 +38128,6 @@ class MergePlugin extends CorePlugin {
                         sheetId,
                         col,
                         row,
-                        style: topLeft ? topLeft.style : null,
                         content: "",
                     });
                 }
@@ -39335,6 +39286,18 @@ class SheetPlugin extends CorePlugin {
                 return "Success" /* CommandResult.Success */;
         }
     }
+    beforeHandle(cmd) {
+        switch (cmd.type) {
+            case "REMOVE_COLUMNS_ROWS":
+                if (cmd.dimension === "COL") {
+                    this.removeColumns(this.sheets[cmd.sheetId], [...cmd.elements]);
+                }
+                else {
+                    this.removeRows(this.sheets[cmd.sheetId], [...cmd.elements]);
+                }
+                break;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "SET_GRID_LINES_VISIBILITY":
@@ -39365,14 +39328,6 @@ class SheetPlugin extends CorePlugin {
             case "DELETE_SHEET":
                 this.deleteSheet(this.sheets[cmd.sheetId]);
                 break;
-            case "REMOVE_COLUMNS_ROWS":
-                if (cmd.dimension === "COL") {
-                    this.removeColumns(this.sheets[cmd.sheetId], [...cmd.elements]);
-                }
-                else {
-                    this.removeRows(this.sheets[cmd.sheetId], [...cmd.elements]);
-                }
-                break;
             case "ADD_COLUMNS_ROWS":
                 if (cmd.dimension === "COL") {
                     this.addColumns(this.sheets[cmd.sheetId], cmd.base, cmd.position, cmd.quantity);
@@ -39832,14 +39787,15 @@ class SheetPlugin extends CorePlugin {
         this.history.update("orderedSheetIds", orderedSheetIds);
         this.history.update("sheets", Object.assign({}, this.sheets, { [newSheet.id]: newSheet }));
         for (const cell of Object.values(this.getters.getCells(fromId))) {
-            const { col, row } = this.getCellPosition(cell.id);
+            const { sheetId, col, row } = this.getCellPosition(cell.id);
+            const style = this.getters.getCellStyle({ sheetId, col, row });
             this.dispatch("UPDATE_CELL", {
                 sheetId: newSheet.id,
                 col,
                 row,
                 content: cell.content,
                 format: cell.format,
-                style: cell.style,
+                style,
             });
         }
         const sheetIdsMapName = Object.assign({}, this.sheetIdsMapName);
@@ -40145,6 +40101,251 @@ class SpreadsheetPivotCorePlugin extends CorePlugin {
     }
 }
 
+const DEFAULT_STYLE_NO_ALIGN = {
+    verticalAlign: "bottom",
+    wrapping: "overflow",
+    bold: false,
+    italic: false,
+    strikethrough: false,
+    underline: false,
+    fontSize: 10,
+    fillColor: "",
+    textColor: "",
+};
+class StylePlugin extends CorePlugin {
+    static getters = [
+        "getCellStyle",
+        "getCellStyleInZone",
+        "getZoneStyles",
+        "getStyleColors",
+    ];
+    styles = {};
+    handle(cmd) {
+        switch (cmd.type) {
+            case "ADD_MERGE":
+                for (const zone of cmd.target) {
+                    this.onMerge(cmd.sheetId, zone);
+                }
+                break;
+            case "SET_FORMATTING":
+                if ("style" in cmd) {
+                    if (cmd.style) {
+                        this.setStyles(cmd.sheetId, cmd.target, cmd.style);
+                    }
+                    else {
+                        this.clearStyle(cmd.sheetId, cmd.target);
+                    }
+                }
+                break;
+            case "CLEAR_FORMATTING":
+                this.clearStyle(cmd.sheetId, cmd.target);
+                break;
+            case "UPDATE_CELL":
+                if ("style" in cmd) {
+                    if (cmd.style) {
+                        this.setStyles(cmd.sheetId, [positionToZone(cmd)], cmd.style);
+                    }
+                    else {
+                        this.clearStyle(cmd.sheetId, [positionToZone(cmd)]);
+                    }
+                }
+                break;
+            case "ADD_COLUMNS_ROWS":
+                if (cmd.dimension === "COL") {
+                    this.handleAddColumnn(cmd);
+                }
+                else {
+                    this.handleAddRows(cmd);
+                }
+                break;
+            case "CLEAR_CELL":
+                this.clearStyle(cmd.sheetId, [positionToZone(cmd)]);
+                break;
+            case "CLEAR_CELLS":
+                this.clearStyle(cmd.sheetId, cmd.target);
+                break;
+            case "DELETE_SHEET":
+                this.history.update("styles", cmd.sheetId, undefined);
+                break;
+        }
+    }
+    adaptRanges(applyChange, sheetId) {
+        const newStyles = [];
+        for (const style of this.styles[sheetId] ?? []) {
+            const change = applyChange(this.getters.getRangeFromZone(sheetId, style.zone));
+            switch (change.changeType) {
+                case "RESIZE":
+                case "CHANGE":
+                case "MOVE":
+                    newStyles.push({ style: style.style, zone: change.range.unboundedZone });
+                    break;
+                case "NONE":
+                    newStyles.push(style);
+                    break;
+            }
+        }
+        this.history.update("styles", sheetId, newStyles);
+    }
+    handleAddColumnn(cmd) {
+        const styles = this.styles[cmd.sheetId] ?? [];
+        for (let styleIdx = 0; styleIdx < styles.length; styleIdx++) {
+            const style = styles[styleIdx];
+            if (style.zone.left - cmd.quantity === cmd.base && cmd.position === "before") {
+                this.history.update("styles", cmd.sheetId, styleIdx, "zone", "left", style.zone.left - cmd.quantity);
+            }
+            else if (style.zone.right === cmd.base && cmd.position === "after") {
+                this.history.update("styles", cmd.sheetId, styleIdx, "zone", "right", style.zone.right + cmd.quantity);
+            }
+        }
+    }
+    handleAddRows(cmd) {
+        const styles = this.styles[cmd.sheetId] ?? [];
+        for (let styleIdx = 0; styleIdx < styles.length; styleIdx++) {
+            const style = styles[styleIdx];
+            if (style.zone.top - cmd.quantity === cmd.base && cmd.position === "before") {
+                this.history.update("styles", cmd.sheetId, styleIdx, "zone", "top", style.zone.top - cmd.quantity);
+            }
+            else if (style.zone.bottom === cmd.base && cmd.position === "after") {
+                this.history.update("styles", cmd.sheetId, styleIdx, "zone", "bottom", style.zone.bottom + cmd.quantity);
+            }
+        }
+    }
+    styleIsDefault(style) {
+        return deepEquals$1(this.removeDefaultStyleValues(style), {});
+    }
+    removeDefaultStyleValues(style) {
+        const cleanedStyle = { ...style };
+        for (const property in DEFAULT_STYLE_NO_ALIGN) {
+            if (cleanedStyle[property] === DEFAULT_STYLE_NO_ALIGN[property]) {
+                delete cleanedStyle[property];
+            }
+        }
+        return cleanedStyle;
+    }
+    onMerge(sheetId, zone) {
+        this.setStyle(sheetId, zone, this.getCellStyle({ sheetId, col: zone.left, row: zone.top }), {
+            force: true,
+        });
+    }
+    setStyles(sheetId, zones, style, options = { force: false }) {
+        for (const zone of zones) {
+            this.setStyle(sheetId, zone, style, options);
+        }
+    }
+    setStyle(sheetId, zone, style, options = { force: false }) {
+        const styles = [];
+        let editingZone = [this.getters.expandZone(sheetId, zone)];
+        for (const existingStyle of this.styles[sheetId] ?? []) {
+            const inter = intersection(existingStyle.zone, zone);
+            if (!inter) {
+                styles.push(existingStyle);
+                continue;
+            }
+            let newStyle = options.force ? style : { ...existingStyle.style, ...style };
+            newStyle = this.removeDefaultStyleValues(newStyle);
+            if (!deepEquals$1(existingStyle.style, newStyle)) {
+                if (newStyle && !this.styleIsDefault(newStyle)) {
+                    styles.push({ zone: inter, style: newStyle });
+                }
+                for (const updatedBorderZone of recomputeZones([existingStyle.zone], [inter])) {
+                    styles.push({ zone: updatedBorderZone, style: existingStyle.style });
+                }
+            }
+            else {
+                styles.push(existingStyle);
+            }
+            editingZone = recomputeZones(editingZone, [inter]);
+        }
+        if (style) {
+            const newStyle = this.removeDefaultStyleValues(style);
+            styles.push(...editingZone.map((zone) => {
+                return { zone, style: newStyle };
+            }));
+        }
+        this.history.update("styles", sheetId, styles.filter((zoneStyle) => !this.styleIsDefault(zoneStyle.style)));
+    }
+    clearStyle(sheetId, zones) {
+        this.setStyles(sheetId, zones, undefined, { force: true });
+    }
+    // ---------------------------------------------------------------------------
+    // Getters
+    // ---------------------------------------------------------------------------
+    getCellStyle(cellPosition) {
+        const style = this.styles[cellPosition.sheetId]?.find((zoneStyle) => {
+            return isInside(cellPosition.col, cellPosition.row, zoneStyle.zone);
+        });
+        return style?.style;
+    }
+    getCellStyleInZone(sheetId, zone) {
+        const styles = new PositionMap();
+        for (const { zone: z, style } of this.styles[sheetId] ?? []) {
+            const inter = intersection(z, zone);
+            if (!inter)
+                continue;
+            for (let col = inter.left; col <= inter.right; col++) {
+                for (let row = inter.top; row <= inter.bottom; row++) {
+                    styles.set({ sheetId, col, row }, style);
+                }
+            }
+        }
+        return styles;
+    }
+    getZoneStyles(sheetId, zone) {
+        const styles = [];
+        for (const style of this.styles[sheetId] ?? []) {
+            const inter = intersection(style.zone, zone);
+            if (inter)
+                styles.push({ zone: inter, style: style.style });
+        }
+        return styles;
+    }
+    getStyleColors(sheetId) {
+        const colors = new Set();
+        for (const style of this.styles[sheetId] ?? []) {
+            if (style.style.textColor) {
+                colors.add(style.style.textColor);
+            }
+            if (style.style.fillColor) {
+                colors.add(style.style.fillColor);
+            }
+        }
+        return [...colors];
+    }
+    // ---------------------------------------------------------------------------
+    // Import/Export
+    // ---------------------------------------------------------------------------
+    import(data) {
+        if (Object.keys(data.styles || {}).length) {
+            for (const sheet of data.sheets) {
+                for (const zoneXc in sheet.styles) {
+                    const styleId = sheet.styles[zoneXc];
+                    this.setStyle(sheet.id, toZone(zoneXc), data.styles[styleId]);
+                }
+            }
+            for (const sheetData of data.sheets) {
+                if (sheetData.merges) {
+                    for (const merge of sheetData.merges) {
+                        this.onMerge(sheetData.id, toZone(merge));
+                    }
+                }
+            }
+        }
+    }
+    export(data) {
+        const styles = {};
+        for (const sheet of data.sheets) {
+            sheet.styles = {};
+            for (const style of this.styles[sheet.id] ?? []) {
+                sheet.styles[zoneToXc(style.zone)] = getItemId(style.style, styles);
+            }
+        }
+        data.styles = styles;
+    }
+    exportForExcel(data) {
+        this.export(data);
+    }
+}
+
 class TableStylePlugin extends CorePlugin {
     static getters = [
         "getNewCustomTableStyleName",
@@ -42895,6 +43096,7 @@ class EvaluationPlugin extends CoreViewPlugin {
         "getEvaluatedCell",
         "getEvaluatedCells",
         "getEvaluatedCellsInZone",
+        "getEvaluatedCellsPositionInZone",
         "getEvaluatedCellsPositions",
         "getSpreadZone",
         "getArrayFormulaSpreadingOn",
@@ -43006,7 +43208,13 @@ class EvaluationPlugin extends CoreViewPlugin {
         return this.evaluator.getEvaluatedPositionsInSheet(sheetId);
     }
     getEvaluatedCellsInZone(sheetId, zone) {
-        return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
+        return cellPositions(sheetId, zone).map(this.getters.getEvaluatedCell);
+    }
+    getEvaluatedCellsPositionInZone(sheetId, zone) {
+        return cellPositions(sheetId, zone).map((position) => [
+            position,
+            this.getters.getEvaluatedCell(position),
+        ]);
     }
     /**
      * Return the spread zone the position is part of, if any
@@ -43285,9 +43493,9 @@ class CellIconPlugin extends CoreViewPlugin {
     }
     getCellIconRect(icon, cellRect) {
         const cellPosition = icon.position;
-        const cell = this.getters.getCell(cellPosition);
+        const verticalAlign = this.getters.getCellStyle(cellPosition)?.verticalAlign;
         const x = this.getIconHorizontalPosition(cellRect, icon.horizontalAlign, icon);
-        const y = this.getters.computeTextYCoordinate(cellRect, icon.size, cell?.style?.verticalAlign);
+        const y = this.getters.computeTextYCoordinate(cellRect, icon.size, verticalAlign);
         return { x: x, y: y, width: icon.size, height: icon.size };
     }
     getIconHorizontalPosition(rect, align, icon) {
@@ -43425,15 +43633,9 @@ class CustomColorsPlugin extends CoreViewPlugin {
         return [...new Set([...usedColors])];
     }
     getColorsFromCells(sheetId) {
-        const cells = Object.values(this.getters.getCells(sheetId));
         const colors = new Set();
-        for (const cell of cells) {
-            if (cell.style?.textColor) {
-                colors.add(cell.style.textColor);
-            }
-            if (cell.style?.fillColor) {
-                colors.add(cell.style.fillColor);
-            }
+        for (const color of this.getters.getStyleColors(sheetId)) {
+            colors.add(color);
         }
         for (const color of this.getters.getBordersColors(sheetId)) {
             colors.add(color);
@@ -44331,6 +44533,14 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
                     }
                 }
                 break;
+            case "SET_FORMATTING":
+                if (cmd.style && ("fontSize" in cmd.style || "wrapping" in cmd.style)) {
+                    for (const zone of cmd.target) {
+                        // TODO FLDA use rangeSet
+                        this.updateRowSizeForZoneChange(cmd.sheetId, zone);
+                    }
+                }
+                break;
             case "UPDATE_CELL":
                 this.updateRowSizeForCellChange(cmd.sheetId, cmd.row, cmd.col);
                 break;
@@ -44373,6 +44583,12 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
             ? this.getRowSize(sheetId, index)
             : this.getters.getColSize(sheetId, index);
     }
+    updateRowSizeForZoneChange(sheetId, zone) {
+        for (let row = zone.top; row <= zone.bottom; row++) {
+            const newTallestCell = this.getRowTallestCell(sheetId, row);
+            this.history.update("tallestCellInRow", sheetId, row, newTallestCell);
+        }
+    }
     updateRowSizeForCellChange(sheetId, row, col) {
         const tallestCellInRow = this.tallestCellInRow[sheetId]?.[row];
         if (tallestCellInRow?.cell.col === col) {
@@ -44406,8 +44622,9 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
             return DEFAULT_CELL_HEIGHT;
         }
         const cell = this.getters.getCell(position);
+        const style = this.getters.getCellStyle(position);
         const colSize = this.getters.getColSize(position.sheetId, position.col);
-        return getDefaultCellHeight(this.ctx, cell, colSize);
+        return getDefaultCellHeight(this.ctx, cell, style, colSize);
     }
     isInMultiRowMerge(position) {
         const merge = this.getters.getMerge(position);
@@ -46551,7 +46768,7 @@ autofillModifiersRegistry
         return {
             cellData: {
                 border: data.border,
-                style: data.cell && data.cell.style,
+                style: data.style,
                 format: data.cell && data.cell.format,
                 content,
             },
@@ -46568,7 +46785,7 @@ autofillModifiersRegistry
         return {
             cellData: {
                 border: data.border,
-                style: data.cell && data.cell.style,
+                style: data.style,
                 format: data.cell && data.cell.format,
                 content,
             },
@@ -46589,7 +46806,7 @@ autofillModifiersRegistry
         return {
             cellData: {
                 border: data.border,
-                style: data.cell && data.cell.style,
+                style: data.style,
                 format: data.cell && data.cell.format,
                 content: value.toString(),
             },
@@ -46604,7 +46821,7 @@ autofillModifiersRegistry
         return {
             cellData: {
                 border: data.border,
-                style: data.cell && data.cell.style,
+                style: data.style,
                 format: data.cell && data.cell.format,
                 content,
             },
@@ -46652,7 +46869,7 @@ autofillModifiersRegistry
         return {
             cellData: {
                 border: data.border,
-                style: cell.style,
+                style: data.style,
                 format: cell.format,
                 content,
             },
@@ -47331,9 +47548,10 @@ class AutofillPlugin extends UIPlugin {
                 const newRule = this.getRule(cellData.cell, cells);
                 rule = newRule || rule;
             }
-            const border = this.getters.getCellBorder(cellData) || undefined;
+            const border = this.getters.getCellBorder(cellData);
+            const style = this.getters.getCellStyle(cellData);
             nextCells.push({
-                data: { ...cellData, border },
+                data: { ...cellData, border, style },
                 rule,
             });
         }
@@ -47685,7 +47903,12 @@ class AutomaticSumPlugin extends UIPlugin {
 }
 
 class TableComputedStylePlugin extends UIPlugin {
-    static getters = ["getCellTableStyle", "getCellTableBorder", "getCellTableBorderZone"];
+    static getters = [
+        "getCellTableStyle",
+        "getCellTableBorder",
+        "getCellTableBorderZone",
+        "getCellTableStyleZone",
+    ];
     tableStyles = {};
     handle(cmd) {
         if (invalidateEvaluationCommands.has(cmd.type) ||
@@ -47723,6 +47946,23 @@ class TableComputedStylePlugin extends UIPlugin {
         }
         return this.tableStyles[position.sheetId][table.id]().styles[position.col]?.[position.row];
     }
+    getCellTableStyleZone(sheetId, zone) {
+        const map = new PositionMap();
+        for (const table of this.getters.getTablesOverlappingZones(sheetId, [zone])) {
+            const tableStyles = this.tableStyles[sheetId][table.id]().styles;
+            for (const colIdx of Object.keys(tableStyles)) {
+                const colStyle = tableStyles[colIdx];
+                const col = parseInt(colIdx);
+                for (const rowIdx of Object.keys(colStyle)) {
+                    const cellStyle = colStyle[rowIdx];
+                    if (cellStyle) {
+                        map.set({ sheetId, col, row: parseInt(rowIdx) }, cellStyle);
+                    }
+                }
+            }
+        }
+        return map;
+    }
     getCellTableBorder(position) {
         const table = this.getters.getTable(position);
         if (!table) {
@@ -47734,11 +47974,14 @@ class TableComputedStylePlugin extends UIPlugin {
         const map = new PositionMap();
         for (const table of this.getters.getTablesOverlappingZones(sheetId, [zone])) {
             const tableBorders = this.tableStyles[sheetId][table.id]().borders;
-            for (const [colIdx, colStyle] of Object.entries(tableBorders)) {
+            for (const colIdx of Object.keys(tableBorders)) {
+                const colStyle = tableBorders[colIdx];
                 const col = parseInt(colIdx);
-                for (const [rowIdx, cellStyle] of Object.entries(colStyle)) {
-                    if (cellStyle)
-                        map.set({ sheetId, col, row: parseInt(rowIdx) }, cellStyle);
+                for (const rowIdx of Object.keys(colStyle)) {
+                    const cellBorder = colStyle[rowIdx];
+                    if (cellBorder) {
+                        map.set({ sheetId, col, row: parseInt(rowIdx) }, cellBorder);
+                    }
                 }
             }
         }
@@ -47926,30 +48169,36 @@ class CellComputedStylePlugin extends UIPlugin {
             }
         }
     }
-    getCellComputedStyle(position) {
+    getCellComputedStyle(position, precomputeZone) {
         let style = this.styles.get(position);
         if (style === undefined) {
-            style = this.computeCellStyle(position);
-            this.styles.set(position, style);
+            this.precomputeCellStyle(position.sheetId, precomputeZone ?? positionToZone(position));
+            style = this.styles.get(position) ?? {};
         }
         return style;
     }
-    computeCellStyle(position) {
-        const cell = this.getters.getCell(position);
-        const cfStyle = this.getters.getCellConditionalFormatStyle(position);
-        const tableStyle = this.getters.getCellTableStyle(position);
-        const dataValidationStyle = this.getters.getDataValidationCellStyle(position);
-        const computedStyle = {
-            ...removeFalsyAttributes$1(tableStyle),
-            ...removeFalsyAttributes$1(dataValidationStyle),
-            ...removeFalsyAttributes$1(cell?.style),
-            ...removeFalsyAttributes$1(cfStyle),
-        };
-        const evaluatedCell = this.getters.getEvaluatedCell(position);
-        if (evaluatedCell.link && !computedStyle.textColor) {
-            computedStyle.textColor = LINK_COLOR;
+    precomputeCellStyle(sheetId, zone) {
+        //Todo batch cf/dv style
+        const styles = this.getters.getCellStyleInZone(sheetId, zone);
+        const tableStyles = this.getters.getCellTableStyleZone(sheetId, zone);
+        for (let col = zone.left; col <= zone.right; col++) {
+            for (let row = zone.top; row <= zone.bottom; row++) {
+                const position = { sheetId, col, row };
+                if (this.styles.get(position) !== undefined)
+                    continue;
+                const computedStyle = {
+                    ...removeFalsyAttributes$1(tableStyles.get(position)),
+                    ...removeFalsyAttributes$1(this.getters.getDataValidationCellStyle(position)),
+                    ...removeFalsyAttributes$1(styles.get(position)),
+                    ...removeFalsyAttributes$1(this.getters.getCellConditionalFormatStyle(position)),
+                };
+                const evaluatedCell = this.getters.getEvaluatedCell(position);
+                if (evaluatedCell.link && !computedStyle.textColor) {
+                    computedStyle.textColor = LINK_COLOR;
+                }
+                this.styles.set(position, computedStyle);
+            }
         }
-        return computedStyle;
     }
 }
 
@@ -48900,12 +49149,13 @@ class SortPlugin extends UIPlugin {
         const updateCellCommands = [];
         for (let c = 0; c < width; c++) {
             for (let r = 0; r < height; r++) {
-                const { col, row, sheetId } = cellPositions[c][sortedIndex[r]];
-                const cell = this.getters.getCell({ sheetId, col, row });
+                const position = cellPositions[c][sortedIndex[r]];
+                const cell = this.getters.getCell(position);
+                const style = this.getters.getCellStyle(position);
                 const newCol = sortZone.left + c * stepX;
                 const newRow = sortZone.top + r * stepY;
                 const newCellValues = {
-                    sheetId: sheetId,
+                    sheetId: position.sheetId,
                     col: newCol,
                     row: newRow,
                     content: "",
@@ -48917,7 +49167,7 @@ class SortPlugin extends UIPlugin {
                         // we only have a vertical offset
                         content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula.tokens);
                     }
-                    newCellValues.style = cell.style;
+                    newCellValues.style = style;
                     newCellValues.content = content;
                     newCellValues.format = cell.format;
                 }
@@ -49007,6 +49257,7 @@ class SplitToColumnsPlugin extends UIPlugin {
             const splittedContent = splitted[i];
             const col = selection.left;
             const mainCell = this.getters.getCell({ sheetId, col, row });
+            const mainCellStyle = this.getters.getCellStyle({ sheetId, col, row });
             if (splittedContent.length === 1 && splittedContent[0] === mainCell?.content) {
                 continue;
             }
@@ -49017,7 +49268,7 @@ class SplitToColumnsPlugin extends UIPlugin {
                     row,
                     content: canonicalizeNumberContent(content, this.getters.getLocale()),
                     format: "",
-                    style: mainCell?.style || null,
+                    style: { ...DEFAULT_STYLE_NO_ALIGN, ...mainCellStyle },
                 });
             }
         }
@@ -49349,11 +49600,12 @@ class SheetUIPlugin extends UIPlugin {
             return "";
         }
         else {
+            const style = this.getters.getCellStyle(position);
             const evaluatedCell = this.getters.getEvaluatedCell(position);
             const formatWidth = args?.availableWidth
                 ? {
                     availableWidth: args.availableWidth,
-                    measureText: (text) => computeTextWidth(this.ctx, text, cell?.style || {}),
+                    measureText: (text) => computeTextWidth(this.ctx, text, style || {}),
                 }
                 : undefined;
             return formatValue$1(evaluatedCell.value, {
@@ -49476,29 +49728,23 @@ class SheetUIPlugin extends UIPlugin {
         const rowSizes = [];
         for (const row of rows) {
             let evaluatedRowSize = 0;
-            for (const cellId of this.getters.getRowCells(sheetId, row)) {
-                const cell = this.getters.getCellById(cellId);
-                if (!cell) {
+            let tallestCell = undefined;
+            for (const [position, evaluatedCell] of this.getters.getEvaluatedCellsPositionInZone(sheetId, this.getters.getRowsZone(sheetId, row, row))) {
+                if (evaluatedCell.value === undefined)
                     continue;
-                }
-                const position = this.getters.getCellPosition(cell.id);
                 const colSize = this.getters.getColSize(sheetId, position.col);
-                if (cell.isFormula || this.getters.getArrayFormulaSpreadingOn(position)) {
-                    const content = this.getters.getEvaluatedCell(position).formattedValue;
-                    const evaluatedSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
-                    if (evaluatedSize > evaluatedRowSize && evaluatedSize > DEFAULT_CELL_HEIGHT) {
-                        evaluatedRowSize = evaluatedSize;
-                    }
-                }
-                else {
-                    const content = cell.content;
-                    const dynamicRowSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
-                    // Only keep the size of evaluated cells if it's bigger than the dynamic row size
-                    if (dynamicRowSize >= evaluatedRowSize && dynamicRowSize > DEFAULT_CELL_HEIGHT) {
-                        evaluatedRowSize = 0;
-                    }
+                const style = this.getters.getCellStyle(position);
+                const content = evaluatedCell.formattedValue;
+                const evaluatedSize = getCellContentHeight(this.ctx, content, style, colSize);
+                if (evaluatedSize > evaluatedRowSize && evaluatedSize > DEFAULT_CELL_HEIGHT) {
+                    evaluatedRowSize = evaluatedSize;
+                    tallestCell = position;
                 }
             }
+            const cell = tallestCell && this.getters.getCell(tallestCell);
+            if (cell && !cell.isFormula) {
+                evaluatedRowSize = 0;
+            }
             rowSizes.push(evaluatedRowSize || null);
         }
         const groupedSizes = new Map(rowSizes.map((size) => [size, []]));
@@ -50762,6 +51008,8 @@ class HeaderPositionsUIPlugin extends UIPlugin {
                 }
                 break;
             case "UPDATE_CELL":
+            case "SET_FORMATTING":
+            case "CLEAR_FORMATTING":
                 this.headerPositions = {};
                 this.isDirty = true;
                 break;
@@ -51114,7 +51362,7 @@ class GridSelectionPlugin extends UIPlugin {
     getCurrentStyle() {
         const zone = this.getters.getSelectedZone();
         const sheetId = this.getters.getActiveSheetId();
-        return this.getters.getCellStyle({ sheetId, col: zone.left, row: zone.top });
+        return this.getters.getCellStyle({ sheetId, col: zone.left, row: zone.top }) ?? {};
     }
     getSelectedZones() {
         return deepCopy$1(this.gridSelection.zones);
@@ -52036,8 +52284,12 @@ class SheetViewPlugin extends UIPlugin {
                 this.sheetsWithDirtyViewports.add(cmd.sheetId);
                 break;
             case "UPDATE_CELL":
+            case "SET_FORMATTING":
                 // update cell content or format can change hidden rows because of data filters
-                if ("content" in cmd || "format" in cmd || cmd.style?.fontSize !== undefined) {
+                if ("content" in cmd ||
+                    "format" in cmd ||
+                    cmd.style?.fontSize !== undefined ||
+                    cmd.style?.wrapping !== undefined) {
                     for (const sheetId of this.getters.getSheetIds()) {
                         this.sheetsWithDirtyViewports.add(sheetId);
                     }
@@ -52642,6 +52894,7 @@ const corePluginRegistry = new Registry$1()
     .add("dataValidation", DataValidationPlugin)
     .add("cell", CellPlugin)
     .add("merge", MergePlugin)
+    .add("style", StylePlugin)
     .add("headerSize", HeaderSizePlugin)
     .add("borders", BordersPlugin)
     .add("conditional formatting", ConditionalFormatPlugin)
@@ -61349,12 +61602,13 @@ class CriterionForm extends Component {
         criterion: Object,
         onCriterionChanged: Function,
         disableFormulas: { type: Boolean, optional: true },
+        autofocus: { type: Boolean, optional: true },
     };
     setup() {
         const composerFocusStore = useStore(ComposerFocusStore);
-        onMounted(() => {
+        if (composerFocusStore.activeComposer.editionMode !== "inactive") {
             composerFocusStore.activeComposer.stopEdition();
-        });
+        }
     }
     updateCriterion(criterion) {
         const filteredCriterion = {
@@ -63612,6 +63866,7 @@ class StandaloneComposer extends Component {
         title: { type: String, optional: true },
         class: { type: String, optional: true },
         invalid: { type: Boolean, optional: true },
+        autofocus: { type: Boolean, optional: true },
         getContextualColoredSymbolToken: { type: Function, optional: true },
     };
     static components = { Composer };
@@ -63643,6 +63898,12 @@ class StandaloneComposer extends Component {
             setCurrentContent: this.standaloneComposerStore.setCurrentContent,
             stopEdition: this.standaloneComposerStore.stopEdition,
         };
+        onMounted(() => {
+            if (this.props.autofocus && this.focus === "inactive") {
+                this.composerFocusStore.focusComposer(this.composerInterface, {});
+                this.composerFocusStore.activeComposer.editionMode;
+            }
+        });
     }
     get focus() {
         return this.composerFocusStore.activeComposer === this.composerInterface
@@ -63689,7 +63950,7 @@ class CriterionInput extends Component {
     inputRef = useRef("input");
     setup() {
         useEffect(() => {
-            if (this.props.focused) {
+            if (this.props.focused && this.inputRef.el) {
                 this.inputRef.el.focus();
             }
         }, () => [this.props.focused, this.inputRef.el]);
@@ -63731,6 +63992,7 @@ class CriterionInput extends Component {
             defaultRangeSheetId: this.env.model.getters.getActiveSheetId(),
             invalid: this.state.shouldDisplayError && !!this.errorMessage,
             defaultStatic: true,
+            autofocus: this.props.focused,
         };
     }
     get errorMessage() {
@@ -64043,6 +64305,7 @@ class ListCriterionForm extends CriterionForm {
     static components = { CriterionInput, RoundColorPicker };
     state = useState({
         numberOfValues: Math.max(this.props.criterion.values.length, 2),
+        focusedValueIndex: this.props.autofocus ? 0 : undefined,
     });
     setup() {
         super.setup();
@@ -64765,6 +65028,7 @@ class SelectionInput extends Component {
         ranges: Array,
         hasSingleRange: { type: Boolean, optional: true },
         required: { type: Boolean, optional: true },
+        autofocus: { type: Boolean, optional: true },
         isInvalid: { type: Boolean, optional: true },
         class: { type: String, optional: true },
         onSelectionChanged: { type: Function, optional: true },
@@ -64804,6 +65068,9 @@ class SelectionInput extends Component {
     setup() {
         useEffect(() => this.focusedInput.el?.focus(), () => [this.focusedInput.el]);
         this.store = useLocalStore(SelectionInputStore, this.props.ranges, this.props.hasSingleRange || false, this.props.colors, this.props.disabledRanges);
+        if (this.props.autofocus) {
+            this.store.focusById(this.store.selectionInputs[0]?.id);
+        }
         onWillUpdateProps((nextProps) => {
             if (nextProps.ranges.join() !== this.store.selectionInputValues.join()) {
                 this.triggerChange();
@@ -66181,7 +66448,7 @@ function buildMultiColumnChart(columns, getters) {
     };
 }
 function buildScorecard(zone, getters) {
-    const cell = getters.getCell({
+    const style = getters.getCellStyle({
         sheetId: getters.getActiveSheetId(),
         col: zone.left,
         row: zone.top,
@@ -66190,7 +66457,7 @@ function buildScorecard(zone, getters) {
         type: "scorecard",
         title: {},
         keyValue: getUnboundRange(getters, zone),
-        background: cell?.style?.fillColor,
+        background: style?.fillColor,
         baselineMode: DEFAULT_SCORECARD_BASELINE_MODE,
         baselineColorUp: DEFAULT_SCORECARD_BASELINE_COLOR_UP,
         baselineColorDown: DEFAULT_SCORECARD_BASELINE_COLOR_DOWN,
@@ -70789,6 +71056,7 @@ function useHoveredElement(ref) {
 const PAINT_FORMAT_HANDLER_KEYS = [
     "cell",
     "border",
+    "style",
     "table",
     "conditionalFormat",
     "merge",
@@ -72312,7 +72580,7 @@ class GridRenderer extends SpreadsheetStore {
         if (cell?.isFormula && this.getters.shouldShowFormulas()) {
             return "left";
         }
-        const { align } = this.getters.getCellStyle(position);
+        const align = this.getters.getCellComputedStyle(position)?.align;
         const evaluatedCell = this.getters.getEvaluatedCell(position);
         if (formatHasRepeatedChar(evaluatedCell.value, evaluatedCell.format)) {
             return "left";
@@ -72322,7 +72590,7 @@ class GridRenderer extends SpreadsheetStore {
         }
         return align || evaluatedCell.defaultAlign;
     }
-    createZoneBox(sheetId, zone, viewport, precomputeZone) {
+    createZoneBox(sheetId, zone, viewport) {
         const { left, right } = viewport;
         const col = zone.left;
         const row = zone.top;
@@ -72331,8 +72599,8 @@ class GridRenderer extends SpreadsheetStore {
         const showFormula = this.getters.shouldShowFormulas();
         const { x, y, width, height } = this.getters.getRect(zone);
         const chipStyle = this.getters.getDataValidationChipStyle(position);
-        const border = this.getters.getCellComputedBorder(position, precomputeZone);
-        let style = this.getters.getCellComputedStyle(position);
+        const border = this.getters.getCellComputedBorder(position, viewport);
+        let style = this.getters.getCellComputedStyle(position, viewport);
         if (this.fingerprints.isEnabled) {
             const fingerprintColor = this.fingerprints.colors.get(position);
             style = { ...style, fillColor: fingerprintColor };
@@ -72507,7 +72775,7 @@ class GridRenderer extends SpreadsheetStore {
                 if (this.getters.isInMerge(position)) {
                     continue;
                 }
-                boxes.push(this.createZoneBox(sheetId, positionToZone(position), viewport, zone));
+                boxes.push(this.createZoneBox(sheetId, positionToZone(position), viewport));
             }
         }
         for (const merge of this.getters.getMerges(sheetId)) {
@@ -72515,7 +72783,7 @@ class GridRenderer extends SpreadsheetStore {
                 continue;
             }
             if (overlap(merge, viewport)) {
-                const box = this.createZoneBox(sheetId, merge, viewport, zone);
+                const box = this.createZoneBox(sheetId, merge, viewport);
                 const borderBottomRight = this.getters.getCellComputedBorder({
                     sheetId,
                     col: merge.right,
@@ -74377,6 +74645,12 @@ class ChartHumanizeNumbers extends Component {
         updateChart: Function,
         canUpdateChart: Function,
     };
+    get title() {
+        const locale = this.env.model.getters.getLocale();
+        const format = formatLargeNumber({ value: 1234567 }, undefined, locale);
+        const value = formatValue$1(1234567, { format, locale });
+        return _t$1("E.g. 1234567 -> %(value)s", { value });
+    }
 }
 
 class ChartLegend extends Component {
@@ -75502,6 +75776,7 @@ class SunburstChartDesignPanel extends Component {
         RoundColorPicker,
         ChartLegend,
         PieHoleSize,
+        ChartHumanizeNumbers,
     };
     static props = {
         chartId: String,
@@ -75615,6 +75890,7 @@ class TreeMapChartDesignPanel extends Component {
         BadgeSelection,
         TreeMapCategoryColors,
         TreeMapColorScale,
+        ChartHumanizeNumbers,
     };
     static props = {
         chartId: String,
@@ -76818,7 +77094,11 @@ class DataValidationEditor extends Component {
         onExit: Function,
         onCloseSidePanel: { type: Function, optional: true },
     };
-    state = useState({ rule: this.defaultDataValidationRule, errors: [] });
+    state = useState({
+        rule: this.defaultDataValidationRule,
+        errors: [],
+        isTypeUpdated: false,
+    });
     editingSheetId;
     setup() {
         this.editingSheetId = this.env.model.getters.getActiveSheetId();
@@ -76832,6 +77112,7 @@ class DataValidationEditor extends Component {
     }
     onCriterionTypeChanged(type) {
         this.state.rule.criterion.type = type;
+        this.state.isTypeUpdated = true;
     }
     onRangesChanged(ranges) {
         this.state.rule.ranges = ranges;
@@ -81149,7 +81430,6 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
                         const pivotFormula = createPivotFormula(formulaPivotId, pivotCell);
                         cell = {
                             id: cell?.id || "",
-                            style: cell?.style,
                             format: cell?.format,
                             content: pivotFormula,
                             isFormula: false,
@@ -81165,7 +81445,6 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
                             : formatValue$1(evaluatedCell.value, { locale: this.getters.getLocale() });
                         cell = {
                             id: cell?.id || "",
-                            style: cell?.style,
                             format: evaluatedCell.format,
                             content,
                             isFormula: false,
@@ -81175,7 +81454,6 @@ class CellClipboardHandler extends AbstractCellClipboardHandler {
                 }
                 cellsInRow.push({
                     content: cell?.content ?? "",
-                    style: cell?.style,
                     format: cell?.format,
                     tokens: cell?.isFormula
                         ? cell.compiledFormula.tokens.map(({ value, type }) => ({ value, type }))
@@ -87519,6 +87797,71 @@ class SheetClipboardHandler extends AbstractCellClipboardHandler {
     }
 }
 
+class StyleClipboardHandler extends AbstractCellClipboardHandler {
+    copy(data) {
+        const sheetId = data.sheetId;
+        if (data.zones.length === 0) {
+            return;
+        }
+        const styles = [];
+        let colsBefore = 0;
+        for (const cols of groupConsecutive$1(data.columnsIndexes)) {
+            let rowsBefore = 0;
+            for (const rows of groupConsecutive$1(data.rowsIndexes)) {
+                const zone = {
+                    left: cols[0],
+                    right: cols[cols.length - 1],
+                    top: rows[0],
+                    bottom: rows[rows.length - 1],
+                };
+                styles.push(...this.getters.getZoneStyles(sheetId, zone).map((zb) => {
+                    return {
+                        zone: {
+                            left: zb.zone.left - zone.left + colsBefore,
+                            right: zb.zone.right && zb.zone.right - zone.left + colsBefore,
+                            top: zb.zone.top - zone.top + rowsBefore,
+                            bottom: zb.zone.bottom && zb.zone.bottom - zone.top + rowsBefore,
+                        },
+                        style: zb.style,
+                    };
+                }));
+                rowsBefore += rows.length;
+            }
+            colsBefore += cols.length;
+        }
+        return { styles: styles, width: data.columnsIndexes.length, height: data.rowsIndexes.length };
+    }
+    paste(target, content, options) {
+        const sheetId = target.sheetId;
+        if (options.pasteOption === "asValue") {
+            return;
+        }
+        const zones = target.zones;
+        if (!options.isCutOperation) {
+            for (const zone of zones) {
+                for (const pasteZone of splitZoneForPaste(zone, content.width, content.height)) {
+                    this.pasteStyleZone(sheetId, pasteZone.left, pasteZone.top, content.styles);
+                }
+            }
+        }
+        else {
+            const { left, top } = zones[0];
+            this.pasteStyleZone(sheetId, left, top, content.styles);
+        }
+    }
+    pasteStyleZone(sheetId, col, row, styles) {
+        for (const zoneStyle of styles) {
+            const zone = {
+                left: zoneStyle.zone.left + col,
+                right: (zoneStyle.zone.right && zoneStyle.zone.right + col) || zoneStyle.zone.left + col,
+                top: zoneStyle.zone.top + row,
+                bottom: (zoneStyle.zone.bottom && zoneStyle.zone.bottom + row) || zoneStyle.zone.top + row,
+            };
+            this.dispatch("SET_FORMATTING", { sheetId, target: [zone], style: zoneStyle.style });
+        }
+    }
+}
+
 class TableClipboardHandler extends AbstractCellClipboardHandler {
     copy(data, isCutOperation, mode = "copyPaste") {
         const sheetId = data.sheetId;
@@ -87674,7 +88017,8 @@ clipboardHandlersRegistries.cellHandlers
     .add("table", TableClipboardHandler)
     .add("conditionalFormat", ConditionalFormatClipboardHandler)
     .add("references", ReferenceClipboardHandler)
-    .add("border", BorderClipboardHandler);
+    .add("border", BorderClipboardHandler)
+    .add("style", StyleClipboardHandler);
 
 /**
  * We export here all entities that needs to be accessed publicly by Odoo.
@@ -87910,9 +88254,9 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 Object.assign(__exports, { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler,CellErrorType:  CellErrorType$1, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DEFAULT_LOCALE, DEFAULT_LOCALES, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, categories, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, createAutocompleteArgumentsProvider, findCellInNewZone, functionCache, getCaretDownSvg, getCaretUpSvg, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize });
 
 
-__info__.version = "19.1.0-alpha.9";
-__info__.date = "2025-10-23T11:12:21.757Z";
-__info__.hash = "bd756ddcb";
+__info__.version = "19.1.0-alpha.10";
+__info__.date = "2025-10-30T12:28:44.205Z";
+__info__.hash = "d0b65e9e4";
 //# sourceMappingURL=o_spreadsheet.esm.js.map
 return __exports;
 });
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
index 5e85ec714002c..42c31c62cdcbd 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
@@ -1,9 +1,9 @@
 <!--
  This file is generated by o-spreadsheet build tools. Do not edit it.
  @see https://github.com/odoo/o-spreadsheet
- @version 19.1.0-alpha.9
- @date 2025-10-23T11:12:27.280Z
- @hash bd756ddcb
+ @version 19.1.0-alpha.10
+ @date 2025-10-30T12:28:49.303Z
+ @hash d0b65e9e4
 -->
 <odoo>
   <t t-name="o-spreadsheet-ValidationMessages">
@@ -1607,6 +1607,7 @@
             t-key="state.rule.criterion.type"
             criterion="state.rule.criterion"
             onCriterionChanged.bind="onCriterionChanged"
+            autofocus="state.isTypeUpdated"
           />
         </div>
       </Section>
@@ -1717,6 +1718,7 @@
       onSelectionChanged="(ranges) => this.onRangeChanged(ranges[0])"
       required="true"
       hasSingleRange="true"
+      autofocus="props.autofocus"
     />
     <t t-foreach="values" t-as="value" t-key="value_index">
       <div class="o-dv-list-values p-1 d-flex align-items-center">
@@ -1786,6 +1788,7 @@
       onValueChanged.bind="onValueChanged"
       criterionType="props.criterion.type"
       disableFormulas="props.disableFormulas"
+      focused="props.autofocus"
     />
   </t>
 
@@ -1795,6 +1798,7 @@
       onValueChanged.bind="onFirstValueChanged"
       criterionType="props.criterion.type"
       disableFormulas="props.disableFormulas"
+      focused="props.autofocus"
     />
     <CriterionInput
       value="props.criterion.values[1]"
@@ -1822,6 +1826,7 @@
       onValueChanged.bind="onValueChanged"
       criterionType="props.criterion.type"
       disableFormulas="props.disableFormulas"
+      focused="props.autofocus"
     />
   </t>
 
@@ -2278,6 +2283,7 @@
         t-key="state.rules.cellIs.operator"
         criterion="genericCriterion"
         onCriterionChanged.bind="onRuleValuesChanged"
+        autofocus="this.state.hasEditedCf"
       />
 
       <div class="o-section-subtitle pt-3">Formatting style</div>
@@ -2484,6 +2490,9 @@
             className="'mb-2'"
           />
         </Section>
+        <Section class="'pt-0'" title.translate="Number formatting">
+          <ChartHumanizeNumbers t-props="props"/>
+        </Section>
       </t>
     </GeneralDesignEditor>
     <SeriesWithAxisDesignEditor t-props="props"/>
@@ -2523,7 +2532,7 @@
             className="'mb-2'"
           />
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -2662,6 +2671,9 @@
             hasVerticalAlign="true"
           />
         </Section>
+        <Section class="'pt-0'" title.translate="Number formatting">
+          <ChartHumanizeNumbers t-props="props"/>
+        </Section>
       </t>
     </SidePanelCollapsible>
   </t>
@@ -2722,6 +2734,9 @@
     <GeneralDesignEditor t-props="props">
       <t t-set-slot="general-extension">
         <ChartLegend t-props="props"/>
+        <Section class="'pt-0'" title.translate="Number formatting">
+          <ChartHumanizeNumbers t-props="props"/>
+        </Section>
       </t>
     </GeneralDesignEditor>
 
@@ -2773,7 +2788,7 @@
     <t t-set="color_down">Color Down</t>
     <GeneralDesignEditor t-props="props" defaultChartTitleFontSize="defaultScorecardTitleFontSize">
       <t t-set-slot="general-extension">
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -2887,7 +2902,7 @@
           <ChartShowValues t-props="props"/>
           <ChartShowDataMarkers t-props="props"/>
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -2902,7 +2917,7 @@
         <Section class="'pt-0'" title.translate="Values">
           <ChartShowValues t-props="props"/>
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
         <PieHoleSize
@@ -2977,7 +2992,7 @@
             className="'mb-2'"
           />
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -3086,7 +3101,7 @@
             <option value="left">Bottom left</option>
           </select>
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -3179,7 +3194,7 @@
   <t t-name="o-spreadsheet-GaugeChartDesignPanel">
     <GeneralDesignEditor t-props="props">
       <t t-set-slot="general-extension">
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -3325,7 +3340,7 @@
         <Section class="'pt-0'" title.translate="Values">
           <ChartShowValues t-props="props"/>
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -3365,7 +3380,7 @@
             className="'mb-2'"
           />
         </Section>
-        <Section class="'pt-1'" title.translate="Number formatting">
+        <Section class="'pt-0'" title.translate="Number formatting">
           <ChartHumanizeNumbers t-props="props"/>
         </Section>
       </t>
@@ -4044,7 +4059,8 @@
   <t t-name="o-spreadsheet-ChartHumanizeNumbers">
     <Checkbox
       name="'humanizeNumbers'"
-      label.translate="Make numbers human-readable"
+      label.translate="Use compact format"
+      title="title"
       value="props.definition.humanize ?? true"
       onChange="(humanize) => props.updateChart(this.props.chartId, { humanize })"
     />
@@ -6324,6 +6340,7 @@
       criterion="state.criterion"
       onCriterionChanged.bind="onCriterionChanged"
       disableFormulas="true"
+      autofocus="true"
     />
   </t>
 

From bc377d36d957e7911a1003bc79dd1184fbfe40f9 Mon Sep 17 00:00:00 2001
From: khaj-odoo <khaj@odoo.com>
Date: Thu, 16 Oct 2025 11:22:44 +0530
Subject: [PATCH 015/673] [FIX] website: create test menu for
 test_website_edit_menus_delete_parent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description
- The test was failing because the default `Contact us` menu was removed
  In commit https://github.com/odoo/odoo/pull/223724.
Fix
- Created a test menu to ensure the test has two menus to work with.

runbot-233330

closes odoo/odoo#231833

Signed-off-by: Soukéina Bojabza (sobo) <sobo@odoo.com>
---
 addons/website/tests/test_ui.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index d9e0e15b4f74b..66ae34d55b35b 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -656,6 +656,12 @@ def test_website_no_dirty_lazy_image(self):
 
     def test_website_edit_menus_delete_parent(self):
         website = self.env['website'].browse(1)
+        self.env['website.menu'].create({
+            'name': 'Test Child Menu',
+            'url': '/test-child',
+            'website_id': website.id,
+            'parent_id': website.menu_id.id,
+        })
         menu_tree = self.env['website.menu'].get_tree(website.id)
 
         parent_menu = menu_tree['children'][0]['fields']

From a54a30553fddc7aad2784785759cca3de8eb4117 Mon Sep 17 00:00:00 2001
From: "Lulu Grimalkin (lugr)" <lugr@odoo.com>
Date: Fri, 25 Apr 2025 09:52:09 +0200
Subject: [PATCH 016/673] [IMP] mrp,purchase,repair,stock: hardcode width for
 priority fields

The priority column takes up too much unnecessary space in the list view
because it is defined as a selection rather than a boolean (because
modules like `project` add further values to the priority field) and the
selection field has a high default minimum width in list views.

Thus, we hardcode the column width to 20 px to accommodate exactly one
star, making sure the `nolabel="1"` attribute is set (existing
behaviour), so we don't end up with an ugly truncated label.

The priority widget is used in the following modules within the
Inventory scope:
* `maintenance`: Only used in kanban and form views.
* `mrp_plm`: Only used in a kanban view.
* `mrp`: Set to 20px in `mrp.production` list view.
* `purchase`: Set to 20px in `purchase.order` list views.
* `quality_control`: Only used in kanban and form views.
* `repair`: Set to 20px in `repair.order` list view.
* `stock_barcode_mrp`: Only used in a kanban view.
* `stock`: Set to 20px in `stock.picking` list view.

Task ID: 4688315

closes odoo/odoo#207409

Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
---
 addons/mrp/views/mrp_production_views.xml  | 2 +-
 addons/purchase/views/purchase_views.xml   | 6 +++---
 addons/repair/views/repair_views.xml       | 2 +-
 addons/stock/views/stock_picking_views.xml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 1de39eca5feb3..77b1118cdcc95 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -48,7 +48,7 @@
                         <button name="action_cancel" type="object" string="Cancel" confirm="Are you sure you want to cancel these manufacturing orders?"/>
                     </header>
                     <field name="company_id" column_invisible="True"/>
-                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                    <field name="priority" optional="show" widget="priority" nolabel="1" width="20px"/>
                     <field name="message_needaction" column_invisible="True"/>
                     <field name="name" decoration-bf="1"/>
                     <field name="date_start" optional="show" widget="remaining_days"/>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 085e5fd440abd..edd238b667097 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -554,7 +554,7 @@
             <field name="arch" type="xml">
                 <list string="Purchase Order"
                       decoration-muted="state=='cancel'" sample="1">
-                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                    <field name="priority" optional="show" widget="priority" nolabel="1" width="20px"/>
                     <field name="partner_ref" optional="hide"/>
                     <field name="name" string="Reference" readonly="1" decoration-info="state in ('draft','sent')"/>
                     <field name="date_order" column_invisible="not context.get('quotation_only', False)" readonly="state in ['cancel', 'purchase']" optional="show"/>
@@ -591,7 +591,7 @@
                         <button name="button_cancel" type="object" string="Cancel"
                             confirm="Are you sure you want to cancel the selected RFQs/Orders?"/>
                     </header>
-                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                    <field name="priority" optional="show" widget="priority" nolabel="1" width="20px"/>
                     <field name="partner_ref" optional="hide"/>
                     <field name="name" string="Reference" readonly="1" decoration-bf="1"/>
                     <field name="date_approve" column_invisible="context.get('quotation_only', False)" optional="show"/>
@@ -634,7 +634,7 @@
                         <button name="button_cancel" type="object" string="Cancel"
                             confirm="Are you sure you want to cancel the selected RFQs/Orders?"/>
                     </header>
-                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                    <field name="priority" optional="show" widget="priority" nolabel="1" width="20px"/>
                     <field name="partner_ref" optional="hide"/>
                     <field name="name" string="Reference" readonly="1" decoration-bf="1" decoration-info="state in ('draft','sent')"/>
                     <field name="date_approve" column_invisible="context.get('quotation_only', False)" optional="show"/>
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index fe3bcca48c009..aa6ef4547c975 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -28,7 +28,7 @@
         <field name="arch" type="xml">
             <list string="Repairs order" multi_edit="1" sample="1" decoration-info="state == 'draft'">
                 <field name="company_id" column_invisible="True"/>
-                <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                <field name="priority" optional="show" widget="priority" nolabel="1" width="20px"/>
                 <field name="name"/>
                 <field name="schedule_date" optional="show" widget="remaining_days"/>
                 <field name="product_id" readonly="1" optional="show"/>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index f0e0a76545510..98ed18821f73c 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -73,7 +73,7 @@
                         <button name="action_assign" type="object" string="Check Availability"/>
                     </header>
                     <field name="company_id" column_invisible="True"/>
-                    <field name="priority" optional="show" widget="priority" nolabel="1"/>
+                    <field name="priority" optional="show" widget="priority" nolabel="1" width="20px"/>
                     <field name="name" decoration-bf="1"/>
                     <field name="location_id" options="{'no_create': True}" string="From" groups="stock.group_stock_multi_locations" optional="show" readonly="state == 'done'"/>
                     <field name="location_dest_id" options="{'no_create': True}" string="To" groups="stock.group_stock_multi_locations" optional="show" readonly="state == 'done'"/>

From 04df42cc918a70f7766addb7cb0af2fe0da46f97 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Thu, 30 Oct 2025 16:34:40 +0100
Subject: [PATCH 017/673] [IMP] mail: allow adding more poll options before
 filling them

Before this commit, one would have to fill every option
from the poll create dialog before being able to add more.

Sometimes, you'd want to create every option you need then
fill them all in a row.

This commit removes this arbitrary limitation. We can now
add as many option as we want. Empty options will be filtered
out when creating the poll.

closes odoo/odoo#233823

Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/mail/static/src/core/common/create_poll_dialog.js  | 4 ----
 addons/mail/static/src/core/common/create_poll_dialog.xml | 2 +-
 addons/mail/static/tests/tours/mail_poll_tour.js          | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/core/common/create_poll_dialog.js b/addons/mail/static/src/core/common/create_poll_dialog.js
index d96ef13e91716..3e96dec9d7e34 100644
--- a/addons/mail/static/src/core/common/create_poll_dialog.js
+++ b/addons/mail/static/src/core/common/create_poll_dialog.js
@@ -58,8 +58,4 @@ export class CreatePollDialog extends Component {
     get questionMissing() {
         return this.state.submitted && !this.state.question?.trim();
     }
-
-    get canAddOption() {
-        return this.state.options.every(({ label }) => Boolean(label));
-    }
 }
diff --git a/addons/mail/static/src/core/common/create_poll_dialog.xml b/addons/mail/static/src/core/common/create_poll_dialog.xml
index b03d7e06218f2..a0ee91608d389 100644
--- a/addons/mail/static/src/core/common/create_poll_dialog.xml
+++ b/addons/mail/static/src/core/common/create_poll_dialog.xml
@@ -13,7 +13,7 @@
         <div class="mb-3">
             <span class="mb-2 d-inline-block fw-bold">Options</span>
             <CreatePollOptionDialog t-foreach="state.options" t-as="option" t-key="option_index" model="option" deletable="state.options.length > 2" onClickRemove="() => this.onClickRemoveOption(option_index)"/>
-            <button class="btn btn-link align-self-end" t-on-click="onClickAddOption" t-att-disabled="!canAddOption"><i class="fa fa-plus me-1"/> Add another option</button>
+            <button class="btn btn-link align-self-end" t-on-click="onClickAddOption"><i class="fa fa-plus me-1"/> Add another option</button>
             <div t-if="optionsMissing" class="text-danger form-text ms-1">At least two options are required</div>
         </div>
         <div class="d-flex justify-content-between gap-3">
diff --git a/addons/mail/static/tests/tours/mail_poll_tour.js b/addons/mail/static/tests/tours/mail_poll_tour.js
index ac03cab40a1a0..39aaf1a600d9b 100644
--- a/addons/mail/static/tests/tours/mail_poll_tour.js
+++ b/addons/mail/static/tests/tours/mail_poll_tour.js
@@ -6,10 +6,10 @@ registry.category("web_tour.tours").add("mail_poll_tour.js", {
         { trigger: "button:contains('Start a poll')", run: "click" },
         { trigger: ".modal-header:contains('Create a poll')" },
         { trigger: "input[name='poll_question']", run: "edit What is your favorite color?" },
-        { trigger: "button:contains('Add another option'):disabled" },
+        { trigger: "button:contains('Add another option'):enabled" },
         { trigger: ".o-mail-CreatePollOptionDialog input:eq(0)", run: "edit Red" },
         { trigger: ".o-mail-CreatePollOptionDialog input:eq(1)", run: "edit Green" },
-        { trigger: "button:contains('Add another option'):enabled", run: "click" },
+        { trigger: "button:contains('Add another option')", run: "click" },
         { trigger: ".o-mail-CreatePollOptionDialog input:eq(2)", run: "edit Blue" },
         { trigger: "button:contains(Post)", run: "click" },
         { trigger: ".o-mail-Poll :contains('What is your favorite color?')" },

From 80d043b36d140c2e894542c56269d221fd529a6f Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Tue, 28 Oct 2025 12:51:25 +0100
Subject: [PATCH 018/673] [IMP] mail: refactor message previewText
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, message preview prefix was a subtemplate of
ChatBubble. Since this template is reused, being a subtemplate isn't
very practical.
This commit refactor previewText to include the prefix.

closes odoo/odoo#233399

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/core/common/chat_bubble.xml    | 19 +------
 .../static/src/core/common/message_model.js   | 51 ++++++++++++-------
 .../src/core/public_web/messaging_menu.xml    |  7 ---
 .../core/public_web/sub_channel_preview.xml   |  5 +-
 4 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/addons/mail/static/src/core/common/chat_bubble.xml b/addons/mail/static/src/core/common/chat_bubble.xml
index b91a9226e8029..abc4e53981320 100644
--- a/addons/mail/static/src/core/common/chat_bubble.xml
+++ b/addons/mail/static/src/core/common/chat_bubble.xml
@@ -25,27 +25,10 @@
             <div class="text-truncate base-fs fw-bolder mb-0 mx-2 px-1" t-esc="props.chatWindow.channel.displayName"/>
             <t t-set="message" t-value="channel.newestPersistentOfAllMessage" />
             <div t-if="previewText" class="text-truncate small mx-2 px-1 text-muted">
-                <t t-call="mail.message_preview_prefix">
-                    <t t-set="message" t-value="message"/>
-                </t>
                 <MessageSeenIndicator t-if="message.showSeenIndicator(channel.thread)" message="message" thread="channel.thread" />
-                <t t-if="message.hasOnlyAttachments">
-                    <i class="fa me-1" t-att-class="message.previewIcon"/>
-                    <t t-out="message.previewText" />
-                </t>
-                <t t-else="" t-out="previewText" />
+                <t t-out="message.previewText" />
             </div>
         </div>
     </t>
 
-    <!-- @type {import("models").Message} message -->
-    <t t-name="mail.message_preview_prefix">
-        <t t-if="message.isSelfAuthored">
-            <i class="fa fa-mail-reply me-1 opacity-75"/>You:
-        </t>
-        <t t-elif="!message.author?.eq(channel?.correspondent?.persona)">
-            <t t-esc="message.authorName"/>:
-        </t>
-    </t>
-
 </templates>
diff --git a/addons/mail/static/src/core/common/message_model.js b/addons/mail/static/src/core/common/message_model.js
index 47e4c1c511707..7ad7dd3626d67 100644
--- a/addons/mail/static/src/core/common/message_model.js
+++ b/addons/mail/static/src/core/common/message_model.js
@@ -462,28 +462,43 @@ export class Message extends Record {
     previewText = fields.Html("", {
         /** @this {import("models").Message} */
         compute() {
+            let messageBody = "";
             if (!this.hasOnlyAttachments) {
-                return this.inlineBody || this.subtype_id?.description;
+                messageBody = this.inlineBody || this.subtype_id?.description;
+            } else {
+                const attachments = this.attachment_ids;
+                switch (attachments.length) {
+                    case 1:
+                        messageBody = attachments[0].previewName;
+                        break;
+                    case 2:
+                        messageBody = _t("%(file1)s and %(file2)s", {
+                            file1: attachments[0].previewName,
+                            file2: attachments[1].previewName,
+                            count: attachments.length - 1,
+                        });
+                        break;
+                    default:
+                        messageBody = _t("%(file1)s and %(count)s other attachments", {
+                            file1: attachments[0].previewName,
+                            count: attachments.length - 1,
+                        });
+                }
+                messageBody = markup`<i class="fa me-1 ${this.previewIcon}"></i>${messageBody}`;
             }
-            const { attachment_ids: attachments } = this;
-            if (!attachments || attachments.length === 0) {
-                return "";
+            if (this.isSelfAuthored) {
+                return markup`<i class="fa fa-mail-reply me-1 opacity-75"></i>${_t(
+                    "You: %(message_content)s",
+                    { message_content: messageBody }
+                )}`;
             }
-            switch (attachments.length) {
-                case 1:
-                    return attachments[0].previewName;
-                case 2:
-                    return _t("%(file1)s and %(file2)s", {
-                        file1: attachments[0].previewName,
-                        file2: attachments[1].previewName,
-                        count: attachments.length - 1,
-                    });
-                default:
-                    return _t("%(file1)s and %(count)s other attachments", {
-                        file1: attachments[0].previewName,
-                        count: attachments.length - 1,
-                    });
+            if (!this.author || this.author.notEq(this.thread?.channel?.correspondent?.persona)) {
+                return _t("%(authorName)s: %(message_content)s", {
+                    authorName: this.authorName,
+                    message_content: messageBody,
+                });
             }
+            return messageBody;
         },
     });
 
diff --git a/addons/mail/static/src/core/public_web/messaging_menu.xml b/addons/mail/static/src/core/public_web/messaging_menu.xml
index 92f524cf44691..105ee7c9c8093 100644
--- a/addons/mail/static/src/core/public_web/messaging_menu.xml
+++ b/addons/mail/static/src/core/public_web/messaging_menu.xml
@@ -37,7 +37,6 @@
                     </t>
                     <t t-set-slot="body">
                         <t t-if="message?.hasOnlyAttachments">
-                            <i class="fa me-1" t-att-class="message.previewIcon"/>
                             <t t-out="message.previewText" />
                         </t>
                         <span t-else="" t-out="message?.previewText" t-att-class="{ 'opacity-75': message?.isEmpty }"/>
@@ -46,12 +45,6 @@
                         <ImStatus t-if="thread.channel_type === 'chat' and thread.correspondent" member="thread.correspondent" className="'position-absolute top-100 start-100 translate-middle mt-n1 ' + (thread.correspondent.isTyping ? 'ms-n2' : 'ms-n1')"/>
                         <CountryFlag t-if="thread.showCorrespondentCountry" country="thread.correspondentCountry" class="'o-mail-NotificationItem-country position-absolute border shadow-sm'"/>
                     </t>
-                    <t t-if="message" t-set-slot="body-icon">
-                        <t t-call="mail.message_preview_prefix">
-                            <t t-set="message" t-value="message"/>
-                            <t t-set="channel" t-value="thread.channel"/>
-                        </t>
-                    </t>
                 </NotificationItem>
                 <t t-set="itemIndex" t-value="itemIndex + 1"/>
             </t>
diff --git a/addons/mail/static/src/discuss/core/public_web/sub_channel_preview.xml b/addons/mail/static/src/discuss/core/public_web/sub_channel_preview.xml
index 230a5e506ac62..8be14803c03b0 100644
--- a/addons/mail/static/src/discuss/core/public_web/sub_channel_preview.xml
+++ b/addons/mail/static/src/discuss/core/public_web/sub_channel_preview.xml
@@ -10,10 +10,7 @@
                     <span t-if="message" class="text-muted smaller flex-shrink-0" t-esc="dateText(message)"/>
                 </div>
                 <div class="o-mail-SubChannelPreview-lastMessage text-start text-muted fw-normal smaller overflow-hidden ms-2">
-                    <t t-if="message" t-call="mail.message_preview_prefix">
-                        <t t-set="message" t-value="message"/>
-                    </t>
-                    <t t-out="message?.inlineBody"/>
+                    <t t-out="message?.previewText"/>
                 </div>
             </div>
             <i t-if="env.inMessage" class="oi oi-chevron-right ms-2 opacity-50"/>

From d75f103fda76a5525a30965a03cc58b3a21fe676 Mon Sep 17 00:00:00 2001
From: "Pierrot (prro)" <prro@odoo.com>
Date: Tue, 31 Dec 2024 12:58:53 +0000
Subject: [PATCH 019/673] [IMP] account: use better management of invalid
 statements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit brings more clarity on invalid statements. The reflected
changes are :
- Hiding Last Statement if its date is <= Lock Date
- "Invalid Statement(s)" alert on the journal dashboard
- Red balance amount and warning in the BankRecW when it contains
invalid statements (clicking on the warning applies the filter)
- Possibility to choose a statement when creating a transaction
- Invalid statement warning in the statement creation form
- Displays all warnings in the statement form view
- When a file generate a statement, it is kept in its attachments
- Prevent deletion of transactions if they belong to a valid statement
- Empty statement are not taken into account for the dashboard
Last Statement and the BankRecW balance

task-4413473

closes odoo/odoo#232246

X-original-commit: f3cf5dfe29d9acd63b94e36ac3a94034ea06b270
Related: odoo/enterprise#97597
Signed-off-by: Maximilien La Barre (malb) <malb@odoo.com>
Signed-off-by: Pierre-Rodéric Roose (prro) <prro@odoo.com>
---
 addons/account/i18n/account.pot               | 418 ++++++++++--------
 .../account/models/account_bank_statement.py  |   4 +
 .../models/account_bank_statement_line.py     |   6 +
 addons/account/models/account_journal.py      |  11 +
 .../models/account_journal_dashboard.py       |  13 +
 .../views/account_journal_dashboard_view.xml  |  12 +-
 6 files changed, 286 insertions(+), 178 deletions(-)

diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 88392017b1d86..e6cbe9a3a08dc 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 19.0\n"
+"Project-Id-Version: Odoo Server 19.1a1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-12 14:42+0000\n"
-"PO-Revision-Date: 2025-09-12 14:42+0000\n"
+"POT-Creation-Date: 2025-10-30 08:38+0000\n"
+"PO-Revision-Date: 2025-10-30 08:38+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -201,18 +201,13 @@ msgstr ""
 msgid "%d moves"
 msgstr ""
 
-#. module: account
-#. odoo-python
-#: code:addons/account/models/account_tax.py:0
-msgid "%s (Copy)"
-msgstr ""
-
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_account.py:0
 #: code:addons/account/models/account_journal.py:0
 #: code:addons/account/models/account_payment_term.py:0
 #: code:addons/account/models/account_reconcile_model.py:0
+#: code:addons/account/models/account_tax.py:0
 msgid "%s (copy)"
 msgstr ""
 
@@ -1019,8 +1014,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:account.portal_my_details
 msgid ""
 "<small class=\"form-text text-muted\">\n"
-"                    You can choose how you want us to send your invoices, and with which electronic format.\n"
-"                </small>"
+"                        You can choose how you want us to send your invoices, and with which electronic format.\n"
+"                    </small>"
 msgstr ""
 
 #. module: account
@@ -1577,7 +1572,7 @@ msgid ""
 "                                        You have received <t t-if=\"invoice_count &gt; 1\">new electronic invoices!</t><t t-else=\"\">a new electronic invoice!</t>\n"
 "                                    </td>\n"
 "                                    <td align=\"right\" style=\"padding-right: 16px;\">\n"
-"                                        <img alt=\"Odoo\" src=\"/web/static/img/odoo_logo_dark.svg\" style=\"height: 2em; object-fit: contain;\" class=\"align-baseline w-auto\"/>\n"
+"                                        <img alt=\"Odoo\" src=\"/web/static/img/logo_inverse_white_206px.png\" style=\"height: 2em; object-fit: contain;\" class=\"align-baseline w-auto\"/>\n"
 "                                    </td>\n"
 "                                </tr>\n"
 "                            </table>\n"
@@ -2041,7 +2036,6 @@ msgid "Account Number"
 msgstr ""
 
 #. module: account
-#: model:account.account,name:account.1_payable
 #: model:ir.model.fields,field_description:account.field_res_partner__property_account_payable_id
 #: model:ir.model.fields,field_description:account.field_res_users__property_account_payable_id
 msgid "Account Payable"
@@ -2058,17 +2052,11 @@ msgid "Account Properties"
 msgstr ""
 
 #. module: account
-#: model:account.account,name:account.1_receivable
 #: model:ir.model.fields,field_description:account.field_res_partner__property_account_receivable_id
 #: model:ir.model.fields,field_description:account.field_res_users__property_account_receivable_id
 msgid "Account Receivable"
 msgstr ""
 
-#. module: account
-#: model:account.account,name:account.1_pos_receivable
-msgid "Account Receivable (PoS)"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__is_account_reconcile
 msgid "Account Reconcile"
@@ -2352,6 +2340,7 @@ msgid "Accounts Mapping of Fiscal Position"
 msgstr ""
 
 #. module: account
+#: model:account.account,name:account.1_payable
 #: model:account.account,name:account.2_account_account_us_payable
 msgid "Accounts Payable"
 msgstr ""
@@ -2368,11 +2357,13 @@ msgid "Accounts Prefixes"
 msgstr ""
 
 #. module: account
+#: model:account.account,name:account.1_receivable
 #: model:account.account,name:account.2_account_account_us_receivable
 msgid "Accounts Receivable"
 msgstr ""
 
 #. module: account
+#: model:account.account,name:account.1_pos_receivable
 #: model:account.account,name:account.2_account_account_us_pos_receivable
 msgid "Accounts Receivable (PoS)"
 msgstr ""
@@ -2398,8 +2389,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account/wizard/accrued_orders.py:0
 msgid ""
-"Accrual entry created on %(date)s: %(accrual_entry)s.                    And"
-" its reverse entry: %(reverse_entry)s."
+"Accrual entry created on %(date)s: %(accrual_entry)s.                And its"
+" reverse entry: %(reverse_entry)s."
 msgstr ""
 
 #. module: account
@@ -2510,6 +2501,17 @@ msgstr ""
 msgid "Activity Exception Decoration"
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_account__activity_plans_ids
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__activity_plans_ids
+#: model:ir.model.fields,field_description:account.field_account_journal__activity_plans_ids
+#: model:ir.model.fields,field_description:account.field_account_move__activity_plans_ids
+#: model:ir.model.fields,field_description:account.field_account_payment__activity_plans_ids
+#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__activity_plans_ids
+#: model:ir.model.fields,field_description:account.field_res_partner_bank__activity_plans_ids
+msgid "Activity Plans"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account__activity_state
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__activity_state
@@ -3138,11 +3140,6 @@ msgstr ""
 msgid "Analytic Distribution Models"
 msgstr ""
 
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_report__filter_analytic
-msgid "Analytic Filter"
-msgstr ""
-
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_analytic_lines_tree
 msgid "Analytic Items"
@@ -3160,7 +3157,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_applicability
-msgid "Analytic Plan's Applicabilities"
+msgid "Analytic Plan's Applicability"
 msgstr ""
 
 #. module: account
@@ -3514,6 +3511,11 @@ msgstr ""
 msgid "Automatic Entry Default Journal"
 msgstr ""
 
+#. module: account
+#: model:account.fiscal.position,name:account.1_account_fiscal_position_avatax_us
+msgid "Automatic Tax Mapping (AvaTax)"
+msgstr ""
+
 #. module: account
 #: model:ir.model,name:account.model_sequence_mixin
 msgid "Automatic sequence"
@@ -3531,6 +3533,11 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_665
+msgid "Automobile Expenses"
+msgstr ""
+
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_move.py:0
@@ -3654,8 +3661,8 @@ msgstr ""
 #. odoo-python
 #: code:addons/account/models/account_journal.py:0
 #: code:addons/account/models/chart_template.py:0
-#: model:account.account,name:account.1_bank_journal_default_account_44
-#: model:account.account,name:account.2_bank_journal_default_account_149
+#: model:account.account,name:account.1_bank_journal_default_account_43
+#: model:account.account,name:account.2_bank_journal_default_account_148
 #: model:account.journal,name:account.1_bank
 #: model:account.journal,name:account.2_bank
 #: model:ir.model.fields,field_description:account.field_account_journal__bank_id
@@ -3682,6 +3689,7 @@ msgid "Bank & Cash accounts cannot be shared between companies."
 msgstr ""
 
 #. module: account
+#: model:ir.model,name:account.model_res_partner_bank
 #: model:ir.model.fields,field_description:account.field_account_journal__bank_account_id
 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "Bank Account"
@@ -3733,7 +3741,6 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_supplier_accounts
-#: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
 msgstr ""
 
@@ -3778,6 +3785,11 @@ msgstr ""
 msgid "Bank Reconciliation Move preset"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_650
+msgid "Bank Service Charges"
+msgstr ""
+
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Bank Setup"
@@ -3930,11 +3942,6 @@ msgstr ""
 msgid "Based on Payment"
 msgstr ""
 
-#. module: account
-#: model:res.groups,name:account.group_account_basic
-msgid "Basic"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__batch_payment_sequence_id
 msgid "Batch Payment Sequence"
@@ -3945,6 +3952,22 @@ msgstr ""
 msgid "Batch Payments"
 msgstr ""
 
+#. module: account
+#. odoo-python
+#: code:addons/account/wizard/account_move_send_batch_wizard.py:0
+msgid ""
+"Batch invoice sending is unavailable. Please, activate the cron to enable "
+"batch sending of invoices."
+msgstr ""
+
+#. module: account
+#. odoo-python
+#: code:addons/account/wizard/account_move_send_batch_wizard.py:0
+msgid ""
+"Batch invoice sending is unavailable. Please, contact your system "
+"administrator to activate the cron to enable batch sending of invoices."
+msgstr ""
+
 #. module: account
 #. odoo-javascript
 #: code:addons/account/static/src/components/account_resequence/account_resequence.xml:0
@@ -4075,6 +4098,11 @@ msgstr ""
 msgid "Body content is the same as the template"
 msgstr ""
 
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Bookkeeper"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields.selection,name:account.selection__account_report_column__figure_type__boolean
 #: model:ir.model.fields.selection,name:account.selection__account_report_expression__figure_type__boolean
@@ -4109,6 +4137,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_buildings
+#: model:account.asset,name:account.2_account_asset_us_buildings
 msgid "Buildings"
 msgstr ""
 
@@ -4344,7 +4373,6 @@ msgstr ""
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_journal.py:0
-#: model:account.account,name:account.1_cash_journal_default_account_160
 #: model:ir.model.fields.selection,name:account.selection__account_journal__type__cash
 #: model_terms:ir.ui.view,arch_db:account.view_account_move_filter
 #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter
@@ -4356,16 +4384,6 @@ msgstr ""
 msgid "Cash Account"
 msgstr ""
 
-#. module: account
-#: model:account.account,name:account.1_cash_journal_default_account_157
-msgid "Cash Bakery"
-msgstr ""
-
-#. module: account
-#: model:account.account,name:account.1_cash_journal_default_account_159
-msgid "Cash Bar"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__tax_exigibility
 msgid "Cash Basis"
@@ -4403,11 +4421,6 @@ msgstr ""
 msgid "Cash Basis Transition Account"
 msgstr ""
 
-#. module: account
-#: model:account.account,name:account.1_cash_journal_default_account_156
-msgid "Cash Clothes Shop"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__default_cash_difference_expense_account_id
 msgid "Cash Difference Expense"
@@ -4465,22 +4478,12 @@ msgstr ""
 msgid "Cash Discount Write-Off Loss Account"
 msgstr ""
 
-#. module: account
-#: model:account.account,name:account.1_cash_journal_default_account_155
-msgid "Cash Furn. Shop"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Cash Registers"
 msgstr ""
 
-#. module: account
-#: model:account.account,name:account.1_cash_journal_default_account_158
-msgid "Cash Restaurant"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__group_cash_rounding
 msgid "Cash Rounding"
@@ -4715,6 +4718,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_payment__payment_method_code
 #: model:ir.model.fields,field_description:account.field_account_payment_method__code
 #: model:ir.model.fields,field_description:account.field_account_payment_method_line__code
+#: model:ir.model.fields,field_description:account.field_account_payment_register__payment_method_code
 #: model:ir.model.fields,field_description:account.field_account_report_line__code
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
 #: model_terms:ir.ui.view,arch_db:account.view_account_list
@@ -4815,7 +4819,6 @@ msgid "Communication history"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_res_company
 #: model:ir.model.fields,field_description:account.field_account_account__company_ids
 #: model:ir.model.fields,field_description:account.field_account_merge_wizard_line__company_ids
 msgid "Companies"
@@ -4828,6 +4831,7 @@ msgid "Companies that refers to partner"
 msgstr ""
 
 #. module: account
+#: model:ir.model,name:account.model_res_company
 #: model:ir.model.fields,field_description:account.field_account_accrued_orders_wizard__company_id
 #: model:ir.model.fields,field_description:account.field_account_automatic_entry_wizard__company_id
 #: model:ir.model.fields,field_description:account.field_account_bank_statement__company_id
@@ -4908,11 +4912,6 @@ msgstr ""
 msgid "Company Fiscal Country Code"
 msgstr ""
 
-#. module: account
-#: model:ir.model.fields,field_description:account.field_res_company__company_registry_placeholder
-msgid "Company Registry Placeholder"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__is_storno
 msgid "Company Storno Accounting"
@@ -5047,6 +5046,14 @@ msgstr ""
 msgid "Consider paying the %(btn_start)sfull amount%(btn_end)s."
 msgstr ""
 
+#. module: account
+#. odoo-python
+#: code:addons/account/wizard/account_payment_register.py:0
+msgid ""
+"Consider paying the amount with %(btn_start)searly payment "
+"discount%(btn_end)s instead."
+msgstr ""
+
 #. module: account
 #: model:account.account,description:account.2_account_account_us_buildings
 msgid "Construction of buildings and costs associated to buildings"
@@ -5104,6 +5111,7 @@ msgstr ""
 #. module: account
 #: model:account.account,name:account.1_cost_of_goods_sold
 #: model:account.account,name:account.2_account_account_us_cost_of_goods_sold
+#: model:account.group,name:account.2_us_group_5
 #: model:ir.model.fields.selection,name:account.selection__account_move_line__display_type__cogs
 msgid "Cost of Goods Sold"
 msgstr ""
@@ -5255,11 +5263,6 @@ msgstr ""
 msgid "Create Payments"
 msgstr ""
 
-#. module: account
-#: model:ir.model,website_form_label:account.model_res_partner
-msgid "Create a Customer"
-msgstr ""
-
 #. module: account
 #. odoo-python
 #: code:addons/account/wizard/account_move_send_wizard.py:0
@@ -6269,6 +6272,12 @@ msgstr ""
 msgid "Default taxes used when selling the product"
 msgstr ""
 
+#. module: account
+#. odoo-python
+#: code:addons/account/models/account_move.py:0
+msgid "Default value for 'company_id' for %(record)s is not an integer"
+msgstr ""
+
 #. module: account
 #: model:account.account,name:account.1_deferred_revenue
 #: model:account.account,name:account.2_account_account_us_deferred_revenue
@@ -7097,11 +7106,6 @@ msgid ""
 "between the standard price and the bill price."
 msgstr ""
 
-#. module: account
-#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_reports
-msgid "Dynamic Reports"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax_repartition_line__tag_ids_domain
 msgid "Dynamic domain used for the tag that can be set on tax"
@@ -7231,7 +7235,7 @@ msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_mail_template
-msgid "Email Templates"
+msgid "Email Template"
 msgstr ""
 
 #. module: account
@@ -7623,6 +7627,12 @@ msgstr ""
 msgid "Expired"
 msgstr ""
 
+#. module: account
+#. odoo-python
+#: code:addons/account/models/account_move.py:0
+msgid "Export ZIP"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_report_column__expression_label
 msgid "Expression Label"
@@ -7938,10 +7948,6 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.1_fixed_assets
-msgid "Fixed Asset"
-msgstr ""
-
-#. module: account
 #: model:ir.model.fields.selection,name:account.selection__account_account__account_type__asset_fixed
 #: model_terms:ir.ui.view,arch_db:account.view_account_search
 msgid "Fixed Assets"
@@ -8266,12 +8272,16 @@ msgid "Full access, including configuration rights."
 msgstr ""
 
 #. module: account
+#. odoo-python
+#: code:addons/account/models/chart_template.py:0
+#: model:account.account,name:account.1_transfer_account_id
 #: model:account.account,name:account.2_transfer_account_id
 msgid "Funds in Transit"
 msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_furniture
+#: model:account.asset,name:account.2_account_asset_us_furniture
 msgid "Furniture & Fixtures"
 msgstr ""
 
@@ -8327,7 +8337,7 @@ msgstr ""
 #. module: account
 #. odoo-python
 #: code:addons/account/models/template_generic_coa.py:0
-msgid "Generic Chart of Accounts"
+msgid "Generic (Minimal) Chart of Accounts"
 msgstr ""
 
 #. module: account
@@ -8352,6 +8362,12 @@ msgstr ""
 msgid "Global Lock Date"
 msgstr ""
 
+#. module: account
+#. odoo-python
+#: code:addons/account/wizard/account_move_send_batch_wizard.py:0
+msgid "Go to cron configuration"
+msgstr ""
+
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_move.py:0
@@ -8476,6 +8492,12 @@ msgstr ""
 msgid "Has Iban Warning"
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement__journal_has_invalid_statements
+#: model:ir.model.fields,field_description:account.field_account_journal__has_invalid_statements
+msgid "Has Invalid Statements"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account__has_message
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__has_message
@@ -9026,6 +9048,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_improvements
+#: model:account.asset,name:account.2_account_asset_us_improvements
 msgid "Improvements"
 msgstr ""
 
@@ -9242,6 +9265,11 @@ msgstr ""
 msgid "Installments Switch Html"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_655
+msgid "Insurance Expenses"
+msgstr ""
+
 #. module: account
 #: model:account.account,description:account.2_account_account_us_professional_liability_insurance
 msgid "Insurance for damage caused to third parties"
@@ -9390,10 +9418,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#. odoo-python
-#: code:addons/account/models/account_report.py:0
-msgid ""
-"Invalid domain for expression '%(label)s' of line '%(line)s': %(formula)s"
+#: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
+msgid "Invalid Statement(s)"
 msgstr ""
 
 #. module: account
@@ -9403,9 +9429,15 @@ msgid "Invalid fiscal year last day"
 msgstr ""
 
 #. module: account
+#. odoo-python
+#: code:addons/account/models/account_report.py:0
+msgid ""
+"Invalid formula for expression '%(label)s' of line '%(line)s': %(formula)s"
+msgstr ""
+
+#. module: account
+#: model:account.account,name:account.1_stock_valuation
 #: model:account.account,name:account.2_account_account_us_inventory_valuation
-#: model:account.journal,name:account.1_inventory_valuation
-#: model:account.journal,name:account.2_inventory_valuation
 msgid "Inventory Valuation"
 msgstr ""
 
@@ -9677,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #. odoo-python
+#: code:addons/account/controllers/download_docs.py:0
 #: code:addons/account/controllers/portal.py:0
 #: model:ir.actions.act_window,name:account.action_move_out_invoice
 #: model:ir.actions.act_window,name:account.action_move_out_invoice_type
@@ -9724,7 +9757,7 @@ msgstr ""
 
 #. module: account
 #. odoo-python
-#: code:addons/account/models/account_move.py:0
+#: code:addons/account/models/account_move_send.py:0
 msgid "Invoices in error"
 msgstr ""
 
@@ -9741,13 +9774,13 @@ msgstr ""
 
 #. module: account
 #. odoo-python
-#: code:addons/account/models/account_move.py:0
+#: code:addons/account/models/account_move_send.py:0
 msgid "Invoices sent"
 msgstr ""
 
 #. module: account
 #. odoo-python
-#: code:addons/account/models/account_move.py:0
+#: code:addons/account/models/account_move_send.py:0
 msgid "Invoices sent successfully."
 msgstr ""
 
@@ -9783,6 +9816,11 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
+#. module: account
+#: model:res.groups,name:account.group_account_basic
+msgid "Invoicing & Banks"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields.selection,name:account.selection__account_invoice_report__payment_state__invoicing_legacy
 #: model:ir.model.fields.selection,name:account.selection__account_move__payment_state__invoicing_legacy
@@ -10598,13 +10636,6 @@ msgstr ""
 msgid "Liquidity"
 msgstr ""
 
-#. module: account
-#. odoo-python
-#: code:addons/account/models/chart_template.py:0
-#: model:account.account,name:account.1_transfer_account_id
-msgid "Liquidity Transfer"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax__original_tax_ids
 msgid ""
@@ -10622,6 +10653,11 @@ msgstr ""
 msgid "Loan Interest Expense"
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_loan_extract
+msgid "Loans Digitization"
+msgstr ""
+
 #. module: account
 #: model:account.account,description:account.2_account_account_us_property_tax
 msgid "Local taxes that have to be paid due to the ownership of property"
@@ -10705,6 +10741,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_machines
+#: model:account.asset,name:account.2_account_asset_us_machines
 msgid "Machines & Tools"
 msgstr ""
 
@@ -10876,6 +10913,11 @@ msgstr ""
 msgid "Mark as fully paid"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_67
+msgid "Marketing Expenses"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields.selection,name:account.selection__account_reconcile_model__match_label__match_regex
 msgid "Match Regex"
@@ -11376,17 +11418,6 @@ msgstr ""
 msgid "Next Activity"
 msgstr ""
 
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_account__activity_calendar_event_id
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__activity_calendar_event_id
-#: model:ir.model.fields,field_description:account.field_account_journal__activity_calendar_event_id
-#: model:ir.model.fields,field_description:account.field_account_move__activity_calendar_event_id
-#: model:ir.model.fields,field_description:account.field_account_payment__activity_calendar_event_id
-#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__activity_calendar_event_id
-#: model:ir.model.fields,field_description:account.field_res_partner_bank__activity_calendar_event_id
-msgid "Next Activity Calendar Event"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account__activity_date_deadline
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__activity_date_deadline
@@ -11811,6 +11842,11 @@ msgstr ""
 msgid "Off-Balance Sheet"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_651
+msgid "Office Expenses"
+msgstr ""
+
 #. module: account
 #: model:account.account.tag,name:account.demo_office_furniture_account
 msgid "Office Furniture"
@@ -11903,7 +11939,7 @@ msgstr ""
 
 #. module: account
 #. odoo-python
-#: code:addons/account/models/account_move.py:0
+#: code:addons/account/models/account_move_send.py:0
 msgid "One or more invoices couldn't be processed."
 msgstr ""
 
@@ -11991,7 +12027,7 @@ msgstr ""
 
 #. module: account
 #. odoo-python
-#: code:addons/account/models/account_move.py:0
+#: code:addons/account/models/account_move_send.py:0
 #: model:ir.model.fields.selection,name:account.selection__account_invoice_report__state__posted
 msgid "Open"
 msgstr ""
@@ -12054,6 +12090,11 @@ msgstr ""
 msgid "Operating Activities"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_6
+msgid "Operating Expenses"
+msgstr ""
+
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 msgid "Operation Templates"
@@ -12155,6 +12196,7 @@ msgid "Other Employees Benefits"
 msgstr ""
 
 #. module: account
+#: model:account.group,name:account.2_us_group_7
 #: model:ir.model.fields.selection,name:account.selection__account_account__account_type__expense_other
 msgid "Other Expenses"
 msgstr ""
@@ -12173,6 +12215,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_other_property
+#: model:account.asset,name:account.2_account_asset_us_other_property
 msgid "Other property"
 msgstr ""
 
@@ -12447,12 +12490,6 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
-#. module: account
-#: model:ir.model.fields,field_description:account.field_res_partner__partner_company_registry_placeholder
-#: model:ir.model.fields,field_description:account.field_res_users__partner_company_registry_placeholder
-msgid "Partner Company Registry Placeholder"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_partner__contract_ids
 #: model:ir.model.fields,field_description:account.field_res_users__contract_ids
@@ -12563,6 +12600,7 @@ msgstr ""
 #. odoo-python
 #: code:addons/account/models/account_move.py:0
 #: code:addons/account/models/account_payment.py:0
+#: model:ir.model,name:account.model_account_payment
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__origin_payment_id
 #: model:ir.model.fields,field_description:account.field_account_move__origin_payment_id
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
@@ -12627,6 +12665,7 @@ msgid "Payment Items"
 msgstr ""
 
 #. module: account
+#: model:ir.model,name:account.model_account_payment_method
 #: model:ir.model.fields,field_description:account.field_account_payment__payment_method_line_id
 #: model:ir.model.fields,field_description:account.field_account_payment_method_line__payment_method_id
 #: model:ir.model.fields,field_description:account.field_account_payment_register__payment_method_line_id
@@ -12638,6 +12677,7 @@ msgid "Payment Method"
 msgstr ""
 
 #. module: account
+#: model:ir.model,name:account.model_account_payment_method_line
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
 msgid "Payment Method Line"
 msgstr ""
@@ -12653,8 +12693,6 @@ msgid "Payment Method:"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_payment_method
-#: model:ir.model,name:account.model_account_payment_method_line
 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "Payment Methods"
 msgstr ""
@@ -12809,7 +12847,6 @@ msgstr ""
 #: code:addons/account/models/account_move.py:0
 #: code:addons/account/wizard/account_payment_register.py:0
 #: model:ir.actions.act_window,name:account.action_account_all_payments
-#: model:ir.model,name:account.model_account_payment
 #: model:ir.model.fields,field_description:account.field_account_move__payment_ids
 #: model:ir.ui.menu,name:account.menu_action_account_payments_payable
 #: model:ir.ui.menu,name:account.menu_action_account_payments_receivable
@@ -12834,6 +12871,17 @@ msgid ""
 "Payments related to partners with no bank account specified will be skipped."
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement_line__reconciled_payment_ids
+#: model:ir.model.fields,help:account.field_account_move__reconciled_payment_ids
+msgid "Payments that have been reconciled with this invoice."
+msgstr ""
+
+#. module: account
+#: model:account.group,name:account.2_us_group_61
+msgid "Payroll Expenses"
+msgstr ""
+
 #. module: account
 #: model:account.account,name:account.2_account_account_us_payroll_tax
 msgid "Payroll Tax"
@@ -13084,13 +13132,12 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: model:account.account,name:account.1_prepaid_expenses
+#: model:account.account,name:account.1_prepayments
 #: model:account.account,name:account.2_account_account_us_prepaid_expenses
 msgid "Prepaid Expenses"
 msgstr ""
 
 #. module: account
-#: model:account.account,name:account.1_prepayments
 #: model:account.account,name:account.2_account_account_us_prepayments
 #: model:ir.model.fields.selection,name:account.selection__account_account__account_type__asset_prepayments
 msgid "Prepayments"
@@ -13271,6 +13318,11 @@ msgstr ""
 msgid "Professional %"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_62
+msgid "Professional Fees"
+msgstr ""
+
 #. module: account
 #: model:account.account,name:account.2_account_account_us_professional_insurance
 msgid "Professional Insurance"
@@ -13492,20 +13544,6 @@ msgstr ""
 msgid "RD Expenses"
 msgstr ""
 
-#. module: account
-#: model:ir.model.fields,field_description:account.field_account_account__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_journal__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_move__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_payment__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_reconcile_model__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__rating_ids
-#: model:ir.model.fields,field_description:account.field_account_tax__rating_ids
-#: model:ir.model.fields,field_description:account.field_res_company__rating_ids
-#: model:ir.model.fields,field_description:account.field_res_partner_bank__rating_ids
-msgid "Ratings"
-msgstr ""
-
 #. module: account
 #: model:account.account,name:account.2_account_account_us_raw_materials
 msgid "Raw Materials"
@@ -13516,6 +13554,11 @@ msgstr ""
 msgid "Re-Sequence"
 msgstr ""
 
+#. module: account
+#: model:res.groups,name:account.group_account_readonly
+msgid "Read-only"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_lock_exception__reason
 msgid "Reason"
@@ -13625,6 +13668,12 @@ msgstr ""
 msgid "Reconciled Lines Excluding Exchange Diff"
 msgstr ""
 
+#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__reconciled_payment_ids
+#: model:ir.model.fields,field_description:account.field_account_move__reconciled_payment_ids
+msgid "Reconciled Payments"
+msgstr ""
+
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment__reconciled_statement_line_ids
 msgid "Reconciled Statement Lines"
@@ -13689,11 +13738,6 @@ msgid ""
 " name, etc."
 msgstr ""
 
-#. module: account
-#: model_terms:ir.ui.view,arch_db:account.view_move_form
-msgid "Refresh currency rate to the invoice date"
-msgstr ""
-
 #. module: account
 #. odoo-javascript
 #: code:addons/account/static/src/components/fetch_einvoices/fetch_einvoices_cog.js:0
@@ -13915,6 +13959,11 @@ msgstr ""
 msgid "Resequence"
 msgstr ""
 
+#. module: account
+#: model_terms:ir.ui.view,arch_db:account.view_move_form
+msgid "Reset the currency rate to the default accordingly to the invoice date"
+msgstr ""
+
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_form
 #: model_terms:ir.ui.view,arch_db:account.view_move_form
@@ -13992,6 +14041,7 @@ msgstr ""
 #. module: account
 #. odoo-python
 #: code:addons/account/wizard/accrued_orders.py:0
+#: model:account.group,name:account.2_us_group_4
 #: model:ir.model.fields,field_description:account.field_digest_digest__kpi_account_total_revenue
 #: model:ir.model.fields.selection,name:account.selection__account_automatic_entry_wizard__account_type__income
 msgid "Revenue"
@@ -14586,7 +14636,9 @@ msgid "Selected Payment Method Codes"
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_line__is_self_billing
 #: model:ir.model.fields,field_description:account.field_account_journal__is_self_billing
+#: model:ir.model.fields,field_description:account.field_account_move__is_self_billing
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Self Billing"
 msgstr ""
@@ -14723,7 +14775,7 @@ msgstr ""
 
 #. module: account
 #. odoo-python
-#: code:addons/account/models/account_move.py:0
+#: code:addons/account/models/account_move_send.py:0
 msgid "Sent invoices"
 msgstr ""
 
@@ -14948,11 +15000,6 @@ msgstr ""
 msgid "Show Aba Routing"
 msgstr ""
 
-#. module: account
-#: model:res.groups,name:account.group_account_readonly
-msgid "Show Accounting Features - Readonly"
-msgstr ""
-
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_partner__show_credit_limit
 #: model:ir.model.fields,field_description:account.field_res_users__show_credit_limit
@@ -14981,11 +15028,6 @@ msgstr ""
 msgid "Show E-Invoice Status Buttons"
 msgstr ""
 
-#. module: account
-#: model:res.groups,name:account.group_account_user
-msgid "Show Full Accounting Features"
-msgstr ""
-
 #. module: account
 #: model:res.groups,name:account.group_account_secured
 msgid "Show Inalterability Features"
@@ -15316,11 +15358,6 @@ msgstr ""
 msgid "Step completed!"
 msgstr ""
 
-#. module: account
-#: model:account.account,name:account.1_stock_valuation
-msgid "Stock Valuation"
-msgstr ""
-
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Storno Accounting"
@@ -15899,6 +15936,7 @@ msgstr ""
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_account.py:0
+#: model:account.group,name:account.2_us_group_8
 #: model:ir.actions.act_window,name:account.action_tax_form
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position__tax_ids
 #: model:ir.model.fields,field_description:account.field_account_move_line__tax_ids
@@ -16019,6 +16057,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_technology
+#: model:account.asset,name:account.2_account_asset_us_technology
 msgid "Technology"
 msgstr ""
 
@@ -17289,7 +17328,9 @@ msgid "This journal entry has been secured."
 msgstr ""
 
 #. module: account
+#: model:ir.model.fields,help:account.field_account_bank_statement_line__is_self_billing
 #: model:ir.model.fields,help:account.field_account_journal__is_self_billing
+#: model:ir.model.fields,help:account.field_account_move__is_self_billing
 msgid ""
 "This journal is for self-billing invoices. Invoices will be created using a "
 "different sequence per partner."
@@ -17748,6 +17789,11 @@ msgstr ""
 msgid "Transfer to %s"
 msgstr ""
 
+#. module: account
+#: model:account.group,name:account.2_us_group_661
+msgid "Travel Expenses"
+msgstr ""
+
 #. module: account
 #: model:account.account,description:account.2_account_account_us_public_transportation
 msgid "Travel expenses done using public transit (metro, bus, tramways, ...)"
@@ -17774,6 +17820,10 @@ msgid "True"
 msgstr ""
 
 #. module: account
+#. odoo-javascript
+#: code:addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml:0
+#: code:addons/account/static/src/components/manyone_banks/many2one_banks.js:0
+#: code:addons/account/static/src/components/manyone_banks/many2one_banks.xml:0
 #: model_terms:ir.ui.view,arch_db:account.view_partner_bank_search_inherit
 msgid "Trusted"
 msgstr ""
@@ -17998,6 +18048,10 @@ msgid "Untaxed amount"
 msgstr ""
 
 #. module: account
+#. odoo-javascript
+#: code:addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml:0
+#: code:addons/account/static/src/components/manyone_banks/many2one_banks.js:0
+#: code:addons/account/static/src/components/manyone_banks/many2one_banks.xml:0
 #: model_terms:ir.ui.view,arch_db:account.view_partner_bank_search_inherit
 msgid "Untrusted"
 msgstr ""
@@ -18224,6 +18278,7 @@ msgstr ""
 
 #. module: account
 #: model:account.account,name:account.2_account_account_us_utilities
+#: model:account.group,name:account.2_us_group_64
 msgid "Utilities"
 msgstr ""
 
@@ -18336,6 +18391,7 @@ msgstr ""
 #. module: account
 #: model:account.account,name:account.2_account_account_us_vehicles
 #: model:account.account,name:account.2_account_account_us_vehicles_expense
+#: model:account.asset,name:account.2_account_asset_us_vehicles
 msgid "Vehicles"
 msgstr ""
 
@@ -18475,12 +18531,6 @@ msgid ""
 "vendor ?"
 msgstr ""
 
-#. module: account
-#. odoo-javascript
-#: code:addons/account/static/src/components/json_checkboxes/json_checkboxes.xml:0
-msgid "Warning"
-msgstr ""
-
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_move.py:0
@@ -18697,6 +18747,14 @@ msgid ""
 "3/ select them all and post or delete them through the action menu"
 msgstr ""
 
+#. module: account
+#. odoo-python
+#: code:addons/account/models/account_bank_statement_line.py:0
+msgid ""
+"You can not delete a transaction from a valid statement.\n"
+"If you want to delete it, please remove the statement first."
+msgstr ""
+
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_move_line.py:0
@@ -19397,7 +19455,20 @@ msgstr ""
 #. module: account
 #. odoo-python
 #: code:addons/account/models/account_move.py:0
-msgid "[Partner name]"
+msgid "[Partner id]"
+msgstr ""
+
+#. module: account
+#: model:res.groups,comment:account.group_account_user
+msgid ""
+"access to all Accounting features, including reporting, asset management, "
+"analytic accounting, without configuration rights."
+msgstr ""
+
+#. module: account
+#: model:res.groups,comment:account.group_account_readonly
+msgid ""
+"access to all the accounting data but in readonly mode, no actions allowed."
 msgstr ""
 
 #. module: account
@@ -19416,6 +19487,11 @@ msgstr ""
 msgid "activate the currency of the invoice"
 msgstr ""
 
+#. module: account
+#: model:res.groups,comment:account.group_account_basic
+msgid "adds the accounting dashboard, bank management and follow-up reports."
+msgstr ""
+
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "alias"
@@ -19824,12 +19900,6 @@ msgstr ""
 msgid "to create the taxes for this country."
 msgstr ""
 
-#. module: account
-#. odoo-python
-#: code:addons/account/models/res_partner_bank.py:0
-msgid "trusted"
-msgstr ""
-
 #. module: account
 #. odoo-javascript
 #: code:addons/account/static/src/components/bill_guide/bill_guide.xml:0
@@ -19855,12 +19925,6 @@ msgstr ""
 msgid "until"
 msgstr ""
 
-#. module: account
-#. odoo-python
-#: code:addons/account/models/res_partner_bank.py:0
-msgid "untrusted"
-msgstr ""
-
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_register_form
 msgid "untrusted bank accounts"
diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index 29216c839476a..e1e4b2c435044 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -94,6 +94,10 @@ class AccountBankStatement(models.Model):
         search='_search_is_valid',
     )
 
+    journal_has_invalid_statements = fields.Boolean(
+        related='journal_id.has_invalid_statements',
+    )
+
     problem_description = fields.Text(
         compute='_compute_problem_description',
     )
diff --git a/addons/account/models/account_bank_statement_line.py b/addons/account/models/account_bank_statement_line.py
index 232c55252419d..2efd547ef32e8 100644
--- a/addons/account/models/account_bank_statement_line.py
+++ b/addons/account/models/account_bank_statement_line.py
@@ -474,6 +474,12 @@ def action_undo_reconciliation(self):
     # HELPERS
     # -------------------------------------------------------------------------
 
+    @api.ondelete(at_uninstall=False)
+    def _check_allow_unlink(self):
+        if self.statement_id.filtered(lambda stmt: stmt.is_valid and stmt.is_complete):
+            raise UserError(_("You can not delete a transaction from a valid statement.\n"
+                              "If you want to delete it, please remove the statement first."))
+
     def _find_or_create_bank_account(self):
         self.ensure_one()
 
diff --git a/addons/account/models/account_journal.py b/addons/account/models/account_journal.py
index 1d424b152efe0..b7e8f2d732c6d 100644
--- a/addons/account/models/account_journal.py
+++ b/addons/account/models/account_journal.py
@@ -264,6 +264,7 @@ def _get_default_account_domain(self):
     )
     accounting_date = fields.Date(compute='_compute_accounting_date')
     display_alias_fields = fields.Boolean(compute='_compute_display_alias_fields')
+    has_invalid_statements = fields.Boolean(compute='_compute_has_invalid_statements')
 
     show_fetch_in_einvoices_button = fields.Boolean(
         string="Show E-Invoice Buttons",
@@ -287,6 +288,16 @@ def _get_default_account_domain(self):
         'Journal codes must be unique per company.',
     )
 
+    def _compute_has_invalid_statements(self):
+        journals_with_invalid_statements = self.env['account.bank.statement'].search([
+            ('journal_id', 'in', self.ids),
+            '|',
+            ('is_valid', '=', False),
+            ('is_complete', '=', False),
+        ]).journal_id
+        journals_with_invalid_statements.has_invalid_statements = True
+        (self - journals_with_invalid_statements).has_invalid_statements = False
+
     def _compute_display_alias_fields(self):
         self.display_alias_fields = self.env['mail.alias.domain'].search_count([], limit=1)
 
diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index 43d72250f8aa5..2d9dc80172c09 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -51,6 +51,7 @@ def _compute_last_bank_statement(self):
                       SELECT id, company_id
                         FROM account_bank_statement
                        WHERE journal_id = journal.id
+                         AND first_line_index IS NOT NULL
                     ORDER BY first_line_index DESC
                        LIMIT 1
                    ) statement ON TRUE
@@ -526,6 +527,11 @@ def _fill_bank_cash_dashboard_data(self, dashboard_data):
                 'image': '/account/static/src/img/bank.svg' if journal.type in ('bank', 'credit') else '/web/static/img/rfq.svg',
                 'text': _('Drop to import transactions'),
             }
+            last_statement_visible = (
+                not journal.company_id.fiscalyear_lock_date
+                or journal.last_statement_id.date
+                and journal.company_id.fiscalyear_lock_date < journal.last_statement_id.date
+            )
 
             dashboard_data[journal.id].update({
                 'number_to_check': number_to_check,
@@ -538,6 +544,8 @@ def _fill_bank_cash_dashboard_data(self, dashboard_data):
                 'nb_lines_outstanding_pay_account_balance': has_outstanding,
                 'last_balance': currency.format(journal.last_statement_id.balance_end_real),
                 'last_statement_id': journal.last_statement_id.id,
+                'last_statement_visible': last_statement_visible,
+                'has_invalid_statements': journal.has_invalid_statements,
                 'bank_statements_source': journal.bank_statements_source,
                 'is_sample_data': journal.has_statement_lines,
                 'nb_misc_operations': number_misc,
@@ -802,6 +810,7 @@ def _get_journal_dashboard_bank_running_balance(self):
                              FROM account_bank_statement
                             WHERE journal_id = journal.id
                               AND company_id = ANY(%s)
+                              AND first_line_index IS NOT NULL
                          ORDER BY date DESC, id DESC
                             LIMIT 1
                    ) statement ON TRUE
@@ -1119,6 +1128,10 @@ def open_bank_difference_action(self):
             }
         return action
 
+    def open_invalid_statements_action(self):
+        self.ensure_one()
+        return self.env["ir.actions.act_window"]._for_xml_id('account.action_bank_statement_tree')
+
     def _show_sequence_holes(self, domain):
         return {
             'type': 'ir.actions.act_window',
diff --git a/addons/account/views/account_journal_dashboard_view.xml b/addons/account/views/account_journal_dashboard_view.xml
index fd1b8b9adbe8f..772c31ad587e5 100644
--- a/addons/account/views/account_journal_dashboard_view.xml
+++ b/addons/account/views/account_journal_dashboard_view.xml
@@ -257,7 +257,7 @@
                                     <span dir="ltr"><t t-out="dashboard.account_balance"/></span>
                                 </div>
                             </div>
-                            <t t-if="dashboard.has_at_least_one_statement and dashboard.account_balance != dashboard.last_balance">
+                            <t t-if="dashboard.has_at_least_one_statement and dashboard.account_balance != dashboard.last_balance and dashboard.last_statement_visible">
                                 <div class="row" name="latest_statement">
                                     <div class="col overflow-hidden text-start">
                                         <span title="Latest Statement">Last Statement</span>
@@ -290,6 +290,16 @@
                                 </div>
                             </div>
                             <t t-call="JournalChecks"/>
+                            <t t-if="dashboard.has_invalid_statements">
+                                <div class="row">
+                                    <a type="object"
+                                       name="open_invalid_statements_action"
+                                       title="Invalid Statement(s)"
+                                       class="text-danger">
+                                        Invalid Statement(s)
+                                    </a>
+                                </div>
+                            </t>
                         </div>
                     </t>
                     <t t-name="JournalBodySalePurchase" id="account.JournalBodySalePurchase">

From f8392500d6c2d8b02ea937a9c006895869bd86fb Mon Sep 17 00:00:00 2001
From: nees-odoo <nees@odoo.com>
Date: Wed, 29 Oct 2025 11:31:11 +0530
Subject: [PATCH 020/673] [FIX] mail: prevent traceback when adding emojis to a
 poll option

Purpose of this commit:
Fix the traceback that occurs when adding emojis to a poll.

Steps to Reproduce:
- Start a poll
- Try adding emojis to a poll option

Before this commit, the emoji picker element was correctly referenced in the
component, but was not used properly inside the useEmojiPicker hook.
As a result, the code attempted to access an undefined reference, causing an
error when interacting with the picker.

This commit ensures that the correct reference is used within useEmojiPicker,
resolving the issue.

closes odoo/odoo#233560

Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 .../core/common/create_poll_option_dialog.js  |  2 +-
 addons/mail/static/tests/poll/poll.test.js    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 addons/mail/static/tests/poll/poll.test.js

diff --git a/addons/mail/static/src/core/common/create_poll_option_dialog.js b/addons/mail/static/src/core/common/create_poll_option_dialog.js
index 21cad39b29fab..0378209b28d82 100644
--- a/addons/mail/static/src/core/common/create_poll_option_dialog.js
+++ b/addons/mail/static/src/core/common/create_poll_option_dialog.js
@@ -33,7 +33,7 @@ export class CreatePollOptionDialog extends Component {
                 this.props.model.label = firstPart + str + secondPart;
                 this.selection.moveCursor((firstPart + str).length);
                 if (!this.ui.isSmall) {
-                    this.ref.el.focus();
+                    this.pickerRef.el.focus();
                 }
             },
         });
diff --git a/addons/mail/static/tests/poll/poll.test.js b/addons/mail/static/tests/poll/poll.test.js
new file mode 100644
index 0000000000000..eb473fe4d59ae
--- /dev/null
+++ b/addons/mail/static/tests/poll/poll.test.js
@@ -0,0 +1,25 @@
+import {
+    click,
+    contains,
+    defineMailModels,
+    openDiscuss,
+    start,
+    startServer,
+} from "@mail/../tests/mail_test_helpers";
+import { describe, test } from "@odoo/hoot";
+
+describe.current.tags("desktop");
+defineMailModels();
+
+test("can add emojis to a poll option", async () => {
+    const pyEnv = await startServer();
+    const channelId = pyEnv["discuss.channel"].create({ name: "General" });
+    await start();
+    await openDiscuss(channelId);
+    await click(".o-mail-Composer button[title='More Actions']");
+    await click(".o-dropdown-item:contains('Start a Poll')");
+    await contains(".modal-header", { text: "Create a poll" });
+    await click(".o-mail-CreatePollOptionDialog:first .fa-smile-o");
+    await click(".o-Emoji:contains('😀')");
+    await contains(".o-mail-CreatePollOptionDialog input:eq(0)", { value: "😀" });
+});

From c8d81a737c49049654b6a4bd1d3d6a10a1cf041a Mon Sep 17 00:00:00 2001
From: SaraBriki <brsa@odoo.com>
Date: Thu, 4 Sep 2025 10:06:49 +0200
Subject: [PATCH 021/673] [IMP] hr: format private and emergency phone numbers
 on employee
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up of: https://github.com/odoo/odoo/pull/224224

Behavior before PR:
Employee private_phone and emergency_phone are saved as entered, without
automatic formatting.

Only work_phone and mobile_phone benefit from automatic formatting
(added in the previous PR).

Behavior after PR:
`private_phone` and `emergency_phone` are now also formatted according
to the employee’s private country (from the current version).

Solution:
Add an onchange method to hr.employee to format `private_phone` and
`emergency_phone` automatically when edited in the UI, using
`_phone_format()` from phone_validation.

task-5063306

closes odoo/odoo#225482

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_employee.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 2b9dda106bf86..a3ce4190cf7a6 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -396,6 +396,16 @@ def check_no_existing_contract(self, date):
                                              "Please select a date outside existing contracts",
                                              format_date_abbr(self.env, date)))
 
+    @api.onchange('private_phone')
+    def _onchange_private_phone_validation(self):
+        if self.private_phone:
+            self.private_phone = self._phone_format(fname="private_phone", force_format="INTERNATIONAL") or self.private_phone
+
+    @api.onchange('emergency_phone')
+    def _onchange_emergency_phone_validation(self):
+        if self.emergency_phone:
+            self.emergency_phone = self._phone_format(fname="emergency_phone", force_format="INTERNATIONAL") or self.emergency_phone
+
     @api.onchange('contract_template_id')
     def _onchange_contract_template_id(self):
         if self.contract_template_id:

From ca47a9e24cedca1ce6c8b331e950e49f9da01e04 Mon Sep 17 00:00:00 2001
From: Florian Vranckx <flvr@odoo.com>
Date: Tue, 15 Jul 2025 14:57:42 +0000
Subject: [PATCH 022/673] [FIX] hr_expense: Broken access rights

The state changes right check was only done on specific method but it
wasn't check at write level. Which allowed to bypass it.

The record rule on hr_expense_user without a check on the state is in
draft allow to change data on approved expense sheets.

closes odoo/odoo#233097

X-original-commit: 07626ca770cb05a4c275783c1c96b62c6006affb
Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
---
 .../tests/test_expenses_access_rights.py      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/hr_expense/tests/test_expenses_access_rights.py b/addons/hr_expense/tests/test_expenses_access_rights.py
index 4ef341ef0c667..22f29400188d4 100644
--- a/addons/hr_expense/tests/test_expenses_access_rights.py
+++ b/addons/hr_expense/tests/test_expenses_access_rights.py
@@ -28,6 +28,25 @@ def test_expense_access_rights(self):
                 'price_unit': 1,
             })
 
+        expense = self.env['hr.expense'].with_user(self.expense_user_employee).create({
+            'name': 'expense_1',
+            'date': '2016-01-01',
+            'product_id': self.product_a.id,
+            'quantity': 10.0,
+            'employee_id': self.expense_employee.id,
+        })
+
+        # The expense employee shouldn't be able to bypass the submit state.
+        with self.assertRaises(UserError):
+            expense.with_user(self.expense_user_employee).state = 'approved'
+
+        expense.with_user(self.expense_user_employee).action_submit()
+        self.assertEqual(expense.state, 'submitted')
+
+        # Employee can also revert from the submitted state to a draft state
+        expense.with_user(self.expense_user_employee).action_reset()
+        self.assertEqual(expense.state, 'draft')
+
     def test_expense_access_rights_user(self):
         # The expense base user (without other rights) is able to create and read sheet
 

From e0aecbdcdf9d3c2105f416a40671ff73932ca4ee Mon Sep 17 00:00:00 2001
From: metu-odoo <metu@odoo.com>
Date: Thu, 30 Oct 2025 05:10:04 +0000
Subject: [PATCH 023/673] [FIX] website_sale: make "Add to Cart" translatable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- t-out is used for variables, so static text inside it isn’t picked up
  for translation.
- Replaced it with a direct <span> so the text is automatically translatable

Steps to reproduce before the fix:

Go to Website → change the website language to any non-English language.
Add any product to the cart.
A Product Configuration wizard (for options) will open.
The “Add to Cart” button for options is not translated.

closes odoo/odoo#233759

X-original-commit: 3934eebbb7070c3eaa4854b7b725700e4a336b36
Signed-off-by: Louis Tinel (loti) <loti@odoo.com>
---
 addons/website_sale/static/src/js/product/product.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/static/src/js/product/product.xml b/addons/website_sale/static/src/js/product/product.xml
index b28f3b799bd4b..37fa65d1aeaf7 100644
--- a/addons/website_sale/static/src/js/product/product.xml
+++ b/addons/website_sale/static/src/js/product/product.xml
@@ -17,8 +17,8 @@
         >
             <attribute name="class" remove="oi oi-plus" add="fa fa-shopping-cart" separator=" "/>
         </xpath>
-        <span name="add_button" position="attributes">
-            <attribute name="t-out">'Add to Cart'</attribute>
+        <span name="add_button" position="replace">
+            <span name="add_button" class="ms-2 d-none d-md-inline">Add to Cart</span>
         </span>
 
         <button name="sale_product_configurator_add_button" position="after">

From 4ec2814681e73e3d2e565f3983e08394c91bbca8 Mon Sep 17 00:00:00 2001
From: Yassin Abdelkarim <yabd@odoo.com>
Date: Mon, 22 Sep 2025 11:58:47 +0000
Subject: [PATCH 024/673] [IMP] hr_skills: Make resume section consider
 contract dates

Previously, the resume section showed dates depending on the starting
dates of version, neglecting the cases when a contract might end and
the next version starting later in time. This PR fixes that by taking
into account the contract dates of each version.

Task-5102961

closes odoo/odoo#233800

X-original-commit: 2555781240bf6094326e083cae798fcbb663b63f
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Yassin Walid Abdelkarim (yabd) <yabd@odoo.com>
---
 addons/hr_skills/models/hr_employee.py | 58 +++++++++++++++++---------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/addons/hr_skills/models/hr_employee.py b/addons/hr_skills/models/hr_employee.py
index c36fc8a3d9693..7aeefdfc41fe1 100644
--- a/addons/hr_skills/models/hr_employee.py
+++ b/addons/hr_skills/models/hr_employee.py
@@ -2,6 +2,7 @@
 
 from collections import defaultdict
 
+from datetime import date
 from dateutil.relativedelta import relativedelta
 
 from odoo import api, fields, models
@@ -155,31 +156,48 @@ def get_internal_resume_lines(self, res_id, res_model):
             raise AccessError(self.env._("You cannot access the resume of this employee."))
         res = []
         employee_versions = self.env['hr.employee'].sudo().browse(res_id).version_ids
-        if len(employee_versions) == 1 and employee_versions[0].job_title:
-            return [{
-                'id': employee_versions[0].id,
-                'job_title': employee_versions[0].job_title,
-                'date_start': employee_versions[0].date_start,
-                'date_end': False,
-            }]
-        current_date_start = employee_versions[0].date_start
+        interval_date_start = False
         for i in range(len(employee_versions) - 1):
             current_version = employee_versions[i]
             next_version = employee_versions[i + 1]
-            if current_version.job_title != next_version.job_title and current_version.job_title:
+            current_date_start = max(current_version.date_version, current_version.contract_date_start or date.min)
+            current_date_end = min(next_version.date_version + relativedelta(days=-1), current_version.contract_date_end or date.max)
+            if not current_version.job_title:
+                if interval_date_start:
+                    previous_version = employee_versions[i - 1]
+                    res.append({
+                        'id': previous_version.id,
+                        'job_title': previous_version.job_title,
+                        'date_start': interval_date_start,
+                        'date_end': current_date_start + relativedelta(days=-1),
+                    })
+                    interval_date_start = False
+            elif current_version.job_title != next_version.job_title or current_date_end + relativedelta(days=1) != next_version.date_version:
                 res.append({
                     'id': current_version.id,
                     'job_title': current_version.job_title,
-                    'date_start': current_date_start,
-                    'date_end': next_version.date_start - relativedelta(days=1),
-                })
-                current_date_start = next_version.date_start
-            if i == len(employee_versions) - 2 and next_version.job_title:
-                # Last version, add it to the result
-                res.append({
-                    'id': next_version.id,
-                    'job_title': next_version.job_title,
-                    'date_start': current_date_start,
-                    'date_end': False,
+                    'date_start': interval_date_start or current_date_start,
+                    'date_end': current_date_end,
                 })
+                interval_date_start = False
+            else:
+                interval_date_start = interval_date_start or current_date_start
+
+        last_version = employee_versions[-1]
+        if last_version.job_title:
+            current_date_start = max(last_version.date_version, last_version.contract_date_start or date.min)
+            res.append({
+                'id': last_version.id,
+                'job_title': last_version.job_title,
+                'date_start': interval_date_start or current_date_start,
+                'date_end': last_version.contract_date_end or False,
+            })
+        elif interval_date_start:
+            previous_version = employee_versions[-2]
+            res.append({
+                'id': previous_version.id,
+                'job_title': previous_version.job_title,
+                'date_start': interval_date_start,
+                'date_end': current_date_start + relativedelta(days=-1),
+            })
         return res[::-1]

From 783ea2dd5294e916eda2c6227721c88f4fc502bf Mon Sep 17 00:00:00 2001
From: "Abdelrahman Mahmoud (amah)" <amah@odoo.com>
Date: Wed, 24 Sep 2025 08:04:37 +0000
Subject: [PATCH 025/673] [FIX] hr_attendance: gaurd the unusual_days keys
 access

add extra gaurd for access unusual_days dict using `.get(key, None)` instead of normal `dict[key]`

closes odoo/odoo#233799

Task: 5107868
X-original-commit: 2eabe347811d2e38573bc34a9bc8e1e7104a30bf
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Abdelrahman Mahmoud (amah) <amah@odoo.com>
---
 addons/hr_attendance/models/hr_attendance_overtime_rule.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/models/hr_attendance_overtime_rule.py b/addons/hr_attendance/models/hr_attendance_overtime_rule.py
index 1b45ffe7d7544..72c6c9fb8a3cc 100644
--- a/addons/hr_attendance/models/hr_attendance_overtime_rule.py
+++ b/addons/hr_attendance/models/hr_attendance_overtime_rule.py
@@ -188,7 +188,7 @@ def _get1_timing_overtime_intervals(self, attendances, version_map):
 
             attendance_intervals = []
             for date, day_attendances in attendances.filtered(
-                lambda att: unusual_days[att.date.strftime('%Y-%m-%d')] == (self.timing_type == 'non_work_days')
+                lambda att: unusual_days.get(att.date.strftime('%Y-%m-%d'), None) == (self.timing_type == 'non_work_days')
             ).grouped('date').items():
                 tz = timezone(version_map[employee][date]._get_tz())
                 time_start = self._get_local_time_start(date, tz)

From c5936755415044886f29f68db5073d9a9cdb4b78 Mon Sep 17 00:00:00 2001
From: Max Whale <mawh@odoo.com>
Date: Tue, 2 Sep 2025 13:17:15 +0000
Subject: [PATCH 026/673] [IMP] pos_glory_cash: changes for certification

This commit contains several changes and bug fixes for the Glory cash
machine implementation, needed to meet the certification criteria.

- Added button to reset cash machine
- Added button to download logs
- Added verification check (a verification is automatically triggered if
  the machine reports an error with the inventory)
- Fixed cashier role having manager access to cash machine
- Fixed several issues relating to session timeouts
- Fixed no message appearing when cash machine disconnects
- Fixed traceback when cancelling a payment

task-5064871

closes odoo/odoo#233798

X-original-commit: 9b65591b2e4b967a54707eeb3b5f936d3ff406c7
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 .../payment_lines/payment_lines.xml           |   2 +-
 .../static/src/@types/models.ts               |   1 +
 addons/pos_glory_cash/static/src/glory.js     | 303 +++++++++++++++---
 .../payment_lines/payment_lines.xml           |  11 +-
 .../static/src/utils/constants.js             |  10 +
 .../static/src/utils/glory_xml.js             |  66 ++++
 .../static/src/utils/socket_io.js             |  20 +-
 .../static/tests/socket_io.test.js            |  46 ++-
 8 files changed, 391 insertions(+), 68 deletions(-)

diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml
index fa3ac6e1d8186..a46c1e2c47145 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml
@@ -124,7 +124,7 @@
                         <div class="paymentline d-flex align-items-center bg-view border rounded-3"
                             t-att-class="unselectedLineClass(line)">
                              <div class="payment-infos d-flex align-items-center justify-content-between flex-grow-1 px-3 py-3 text-truncate cursor-pointer fs-2" t-on-click="() => this.selectLine(line)">
-                                 <t t-esc="line.payment_method_id.name" />
+                                 <t t-esc="line.payment_method_id?.name" />
                                  <div class="payment-amount px-3">
                                     <PriceFormatter price="env.utils.formatCurrency(line.getAmount())" />
                                 </div>
diff --git a/addons/pos_glory_cash/static/src/@types/models.ts b/addons/pos_glory_cash/static/src/@types/models.ts
index 5b2d26e087f15..16f5a133d7d7d 100644
--- a/addons/pos_glory_cash/static/src/@types/models.ts
+++ b/addons/pos_glory_cash/static/src/@types/models.ts
@@ -44,6 +44,7 @@ declare module "models" {
 
     export type SocketIoCallbacks = {
         onConnect: () => void;
+        onClose: () => void;
         onEvent: (eventBody: any[]) => void;
         onBinaryEvent: (eventBody: Blob) => void;
     };
diff --git a/addons/pos_glory_cash/static/src/glory.js b/addons/pos_glory_cash/static/src/glory.js
index 82762b5f3c6c3..528092db457fd 100644
--- a/addons/pos_glory_cash/static/src/glory.js
+++ b/addons/pos_glory_cash/static/src/glory.js
@@ -1,9 +1,14 @@
 import { PaymentInterface } from "@point_of_sale/app/utils/payment/payment_interface";
 import { uuidv4 } from "@point_of_sale/utils";
 import { CancelDialog } from "@pos_glory_cash/app/components/cancel_dialog";
-import { serializeGloryXml, parseGloryXml, makeGloryHeader } from "@pos_glory_cash/utils/glory_xml";
 import {
-    GLORY_RESULT,
+    serializeGloryXml,
+    parseGloryXml,
+    makeGloryHeader,
+    parseGloryResult,
+    parseVerificationInfo,
+} from "@pos_glory_cash/utils/glory_xml";
+import {
     GLORY_STATUS,
     GLORY_STATUS_STRING,
     GLORY_CURRENCY_STATUS,
@@ -16,6 +21,8 @@ import { AlertDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
 import { _t } from "@web/core/l10n/translation";
 import { sortBy } from "@web/core/utils/arrays";
 import { browser } from "@web/core/browser/browser";
+import { ask } from "@point_of_sale/app/utils/make_awaitable_dialog";
+import { Logger } from "@bus/workers/bus_worker_utils";
 
 const { DateTime } = luxon;
 
@@ -27,6 +34,7 @@ export class GloryService extends PaymentInterface {
     setup() {
         super.setup(...arguments);
         this.dialog = this.env.services.dialog;
+        this.logger = new Logger("pos_glory_cash");
 
         /**
          * @type {import("models").GlorySettings}
@@ -62,6 +70,21 @@ export class GloryService extends PaymentInterface {
 
         this.socketIo = new SocketIoService(websocketEndpoint, {
             onConnect: () => this.onConnect(),
+            onClose: () => {
+                if (this.state.status !== "DISCONNECTED") {
+                    this.state.status = "DISCONNECTED";
+                    // When the tab is in the background, we get false-positive disconnections due to the ping running too
+                    // slowly (Chrome slows down timers for inactive tabs). Therefore we only show the disconnection message
+                    // if the tab is focused.
+                    if (!document.hidden) {
+                        this.showError(
+                            _t(
+                                "Failed to connect to Glory cash machine, please ensure it is switched on and connected to the network."
+                            )
+                        );
+                    }
+                }
+            },
             onEvent: ([responseType, data]) => {
                 if (this.resolvers[responseType]) {
                     this.resolvers[responseType](data);
@@ -69,6 +92,7 @@ export class GloryService extends PaymentInterface {
             },
             onBinaryEvent: (data) =>
                 parseGloryXml(data).then((response) => {
+                    this.logXml("RECV", response);
                     const message = response.firstChild;
                     if (this.resolvers[message.tagName]) {
                         this.resolvers[message.tagName](message);
@@ -77,6 +101,16 @@ export class GloryService extends PaymentInterface {
                     }
                 }),
         });
+
+        setTimeout(() => {
+            if (this.state.status === "DISCONNECTED") {
+                this.showError(
+                    _t(
+                        "Failed to connect to Glory cash machine, please ensure it is switched on and connected to the network."
+                    )
+                );
+            }
+        }, 5000);
     }
 
     async login() {
@@ -92,15 +126,102 @@ export class GloryService extends PaymentInterface {
         }
 
         // If access control is enabled and we don't have a valid user/pass, we receive this 'credential ng' message
-        this.waitForResponseWithType("credential ng").then(
-            () => (this.state.status = "BAD_CREDENTIALS")
-        );
+        this.waitForResponseWithType("credential ng").then(() => {
+            this.state.status = "BAD_CREDENTIALS";
+            this.showError(
+                _t(
+                    "Failed to login to Glory cash machine, please check the configured username and password."
+                )
+            );
+        });
         await this.sendWebsocketRequest(
             WEBSOCKET_REQUESTS.checkCredentials,
             this.gloryUser?.session_id
         );
     }
 
+    async checkStatusAndVerifyIfNeeded() {
+        const firstConnection = this.state.inventory.length === 0;
+        const { xmlResponse } = await this.sendXmlRequest(XML_REQUESTS.getStatus, [
+            { name: "RequireVerification", attributes: { type: "1" } },
+        ]);
+        this.statusChangeHandler(xmlResponse, true);
+
+        const requireVerifyType = parseVerificationInfo(xmlResponse);
+        if (!firstConnection || !requireVerifyType) {
+            return;
+        }
+
+        this.showError(
+            _t(
+                "The cash machine requires verification of its contents, a collection process will now start. Please refer to the cash machine display."
+            )
+        );
+
+        const { statusCode } = await this.sendXmlRequest(XML_REQUESTS.collect, [
+            { name: "RequireVerification", attributes: { type: requireVerifyType.toString() } },
+        ]);
+
+        if (statusCode === "EXCLUSIVE_ERROR") {
+            this.showError(
+                _t(
+                    "The cash machine contents could not be verified as it is busy with another operation."
+                )
+            );
+        }
+    }
+
+    async reset(skipDialog = false) {
+        if (!skipDialog) {
+            const userConfirmed = await ask(this.dialog, {
+                title: _t("Reset cash machine"),
+                body: _t("Are you sure you want to reset the cash machine?"),
+                confirmLabel: _t("Reset"),
+                cancelLabel: _t("Discard"),
+            });
+            if (!userConfirmed) {
+                return;
+            }
+        }
+
+        if (this.settings.OccupyEnable && !this.occupied) {
+            await this.occupy();
+        }
+
+        await this.sendXmlRequest(XML_REQUESTS.reset);
+
+        if (this.occupied) {
+            await this.release();
+        }
+    }
+
+    logXml(message, xml) {
+        if (typeof xml === "string") {
+            xml = xml.replace("\0", "");
+        } else {
+            xml = new XMLSerializer().serializeToString(xml);
+        }
+
+        this.logger.log(
+            `${luxon.DateTime.now().toFormat("yyyy-LL-dd HH:mm:ss")} ${message}: ${xml}`
+        );
+    }
+
+    async downloadLogs() {
+        const logs = await this.logger.getLogs();
+        const blob = new Blob([logs.join("\n")], {
+            type: "text/plain",
+        });
+        const url = URL.createObjectURL(blob);
+        const aElement = document.createElement("a");
+        aElement.href = url;
+        aElement.download = `glory_logs_${luxon.DateTime.now().toFormat(
+            "yyyy-LL-dd-HH-mm-ss"
+        )}.txt`;
+        aElement.click();
+        URL.revokeObjectURL(url);
+    }
+
     async onConnect() {
         await this.login();
 
@@ -112,15 +233,13 @@ export class GloryService extends PaymentInterface {
         }
 
         await this.setDateAndTime();
+        await this.checkStatusAndVerifyIfNeeded();
 
-        const initialStatus = await this.sendXmlRequest(XML_REQUESTS.getStatus);
-        this.statusChangeHandler(initialStatus, true);
-
-        const initialInventory = await this.sendXmlRequest(XML_REQUESTS.getInventory, [
+        const { xmlResponse } = await this.sendXmlRequest(XML_REQUESTS.getInventory, [
             // Option Type 2 = 'Payable' inventory, see p76 of the IF Specification document
             { name: "Option", attributes: { type: "2" } },
         ]);
-        this.inventoryChangeHandler(initialInventory);
+        this.inventoryChangeHandler(xmlResponse);
     }
 
     get status() {
@@ -157,6 +276,13 @@ export class GloryService extends PaymentInterface {
 
         this.state.status = GLORY_STATUS[statusCodeElement.textContent];
 
+        if (this.state.status === "WAITING_ERROR_RECOVERY") {
+            this.showError(
+                _t("The cash machine has an error, please consult its display for details.")
+            );
+            return;
+        }
+
         if (!this.paymentLine) {
             return;
         }
@@ -190,6 +316,28 @@ export class GloryService extends PaymentInterface {
         }
     }
 
+    parseGloryCashElement(cashElement) {
+        const denominationElements = Array.from(cashElement.getElementsByTagName("Denomination"));
+        return denominationElements.map((denomination) => ({
+            value: this.gloryAmountToPosAmount(denomination.getAttribute("fv")),
+            amount: parseInt(denomination.getElementsByTagName("Piece")[0].textContent),
+            status: GLORY_CURRENCY_STATUS[
+                denomination.getElementsByTagName("Status")[0].textContent
+            ],
+        }));
+    }
+
+    /**
+     * @param {Element} cashElement
+     * @returns {number}
+     */
+    getTotalFromGloryCashElement(cashElement) {
+        const denominations = this.parseGloryCashElement(cashElement);
+        return this.env.utils.roundCurrency(
+            denominations.reduce((total, next) => total + next.amount * next.value, 0)
+        );
+    }
+
     inventoryChangeHandler(inventoryResponse) {
         const cashElements = Array.from(inventoryResponse.getElementsByTagName("Cash"));
         const dispensableCash = cashElements.find(
@@ -199,16 +347,7 @@ export class GloryService extends PaymentInterface {
             return;
         }
 
-        const denominationElements = Array.from(
-            dispensableCash.getElementsByTagName("Denomination")
-        );
-        const denominations = denominationElements.map((denomination) => ({
-            value: this.gloryAmountToPosAmount(denomination.getAttribute("fv")),
-            amount: denomination.getElementsByTagName("Piece")[0].textContent,
-            status: GLORY_CURRENCY_STATUS[
-                denomination.getElementsByTagName("Status")[0].textContent
-            ],
-        }));
+        const denominations = this.parseGloryCashElement(dispensableCash);
         this.state.inventory = sortBy(denominations, "value");
     }
 
@@ -217,7 +356,7 @@ export class GloryService extends PaymentInterface {
             return false;
         }
 
-        if (this.paymentLine.amount < 0 && this.pos.getCashier().role !== "manager") {
+        if (this.paymentLine.amount < 0 && this.pos.getCashier()._role !== "manager") {
             this.showError(_t("Only managers can withdraw cash from the cash machine."));
             return false;
         }
@@ -235,16 +374,26 @@ export class GloryService extends PaymentInterface {
             );
             return false;
         }
+        if (this.state.status === "COLLECTING" || this.state.status === "WAITING_REPLENISHMENT") {
+            this.showError(
+                _t(
+                    "The cash machine is currently in collection/replenishment mode, please finish this process on the machine before making a payment."
+                )
+            );
+            return false;
+        }
 
         if (this.settings.OccupyEnable) {
             await this.occupy();
         }
 
         this.state.amountInserted = 0;
-        const amountString = Math.round(this.paymentLine.amount * 100).toString(10);
+        const amountString = Math.round(
+            this.paymentLine.amount * Math.pow(10, this.pos.currency.decimal_places)
+        ).toString(10);
         this.newSequenceNumber();
 
-        const paymentResponse = await this.sendXmlRequest(XML_REQUESTS.startPayment, [
+        const { xmlResponse } = await this.sendXmlRequest(XML_REQUESTS.startPayment, [
             {
                 name: "Amount",
                 children: [amountString],
@@ -256,41 +405,38 @@ export class GloryService extends PaymentInterface {
             },
         ]);
 
-        if (this.cancellationResolver) {
-            this.cancellationResolver();
-            this.cancellationResolver = null;
-        }
-
-        const result = await this.handlePaymentResponse(paymentResponse);
+        const result = await this.handlePaymentResponse(xmlResponse);
 
         if (this.occupied) {
             await this.release();
         }
 
+        if (this.cancellationResolver) {
+            this.cancellationResolver();
+            this.cancellationResolver = null;
+        }
+
         return result;
     }
 
+    /**
+     * @param {Element} paymentResponse
+     * @returns {Promise<boolean>}
+     */
     async handlePaymentResponse(paymentResponse) {
         if (!this.paymentLine) {
             console.warn("Glory payment response received, but no payment in progress");
             return false;
         }
 
-        const paymentStatus = GLORY_RESULT[paymentResponse.getAttribute("result")];
-
-        switch (paymentStatus) {
+        switch (parseGloryResult(paymentResponse)) {
             case "SUCCESS": {
-                this.paymentLine.setAmount(this.state.amountInserted);
+                this.setPaymentInfo(paymentResponse, true);
                 return true;
             }
-            case "SESSION_TIMEOUT":
-            case "INVALID_SESSION": {
-                await this.refreshSession();
-                return this.sendPaymentRequest();
-            }
             case "CHANGE_SHORTAGE":
-                this.paymentLine.setAmount(this.state.amountInserted);
-                this.pos.printReceipt({ printBillActionTriggered: true });
+                this.setPaymentInfo(paymentResponse, false);
+                await this.pos.printReceipt({ printBillActionTriggered: true });
                 this.showError(_t("There is insufficient cash in the machine to give change."));
                 return false;
             case "OCCUPIED_BY_OTHER":
@@ -321,13 +467,7 @@ export class GloryService extends PaymentInterface {
             return false;
         }
 
-        const cancelResponse = await this.sendXmlRequest(XML_REQUESTS.cancelPayment);
-
-        const cancelStatus = GLORY_RESULT[cancelResponse.getAttribute("result")];
-        if (cancelStatus === "SESSION_TIMEOUT" || cancelStatus === "INVALID_SESSION") {
-            await this.refreshSession();
-            return this.sendPaymentCancel();
-        }
+        await this.sendXmlRequest(XML_REQUESTS.cancelPayment);
 
         const cancelPromise = new Promise((resolve) => {
             this.cancellationResolver = resolve;
@@ -335,6 +475,53 @@ export class GloryService extends PaymentInterface {
         return await cancelPromise;
     }
 
+    /**
+     * @param {Element} paymentResponse
+     * @param {boolean} isSuccessful
+     */
+    setPaymentInfo(paymentResponse, isSuccessful) {
+        const cashElements = Array.from(paymentResponse.getElementsByTagName("Cash"));
+        const cashGivenElement = cashElements.find(
+            (cashElement) => cashElement.getAttribute("type") === "1"
+        );
+        const cashReturnedElement = cashElements.find(
+            (cashElement) => cashElement.getAttribute("type") === "2"
+        );
+        const cashGiven = this.getTotalFromGloryCashElement(cashGivenElement);
+        const cashReturned = this.getTotalFromGloryCashElement(cashReturnedElement);
+        const transactionId = paymentResponse.getElementsByTagName("TransactionId")[0].textContent;
+
+        this.paymentLine.transaction_id = transactionId;
+        this.paymentLine.setAmount(cashGiven);
+        this.paymentLine.setReceiptInfo(
+            this.makeReceiptMessage(transactionId, cashGiven, cashReturned, isSuccessful)
+        );
+    }
+
+    /**
+     * @param {string} transactionId
+     * @param {number} amountDeposited
+     * @param {number} amountReturned
+     * @param {boolean} isSuccessful
+     * @returns {string}
+     */
+    makeReceiptMessage(transactionId, amountDeposited, amountReturned, isSuccessful) {
+        const header = isSuccessful
+            ? _t("GLORY TRANSACTION SUCCESSFUL")
+            : _t("GLORY TRANSACTION CANCELLED");
+        const transactionIdLine = _t("Transaction ID: %s", transactionId);
+        const depositedLine = _t(
+            "Cash deposited: %s",
+            this.env.utils.formatCurrency(amountDeposited)
+        );
+        const changeGivenLine = _t(
+            "Change given: %s",
+            this.env.utils.formatCurrency(amountReturned)
+        );
+
+        return `${header}\n${transactionIdLine}\n${depositedLine}\n${changeGivenLine}\n\n`;
+    }
+
     async setDateAndTime() {
         const now = DateTime.now();
         await this.sendXmlRequest(XML_REQUESTS.setDateAndTime, [
@@ -390,7 +577,7 @@ export class GloryService extends PaymentInterface {
      * @param {import("models").GloryRequestInfo} request
      * @param {import("models").GloryXmlElement[]?} children
      */
-    sendXmlRequest(request, children) {
+    async sendXmlRequest(request, children, secondAttempt = false) {
         const xmlElement = {
             name: request.requestName,
             children: [
@@ -399,9 +586,21 @@ export class GloryService extends PaymentInterface {
             ],
         };
         const xmlString = serializeGloryXml(xmlElement);
+        this.logXml("SEND", xmlString);
         this.socketIo.sendMessage(["xml send", xmlString]);
 
-        return this.waitForResponseWithType(request.responseName);
+        const xmlResponse = await this.waitForResponseWithType(request.responseName);
+        const statusCode = parseGloryResult(xmlResponse);
+
+        if (
+            !secondAttempt &&
+            (statusCode === "SESSION_TIMEOUT" || statusCode === "INVALID_SESSION")
+        ) {
+            await this.refreshSession();
+            return this.sendXmlRequest(request, children, true);
+        }
+
+        return { statusCode, xmlResponse };
     }
 
     gloryAmountToPosAmount(amountStringInCents) {
@@ -428,9 +627,9 @@ export class GloryService extends PaymentInterface {
                     await this.occupy();
                 }
 
-                const cancelResponse = await this.sendXmlRequest(XML_REQUESTS.cancelPayment);
-                if (GLORY_RESULT[cancelResponse.getAttribute("result")] !== "SUCCESS") {
-                    await this.sendXmlRequest(XML_REQUESTS.reset);
+                const { statusCode } = await this.sendXmlRequest(XML_REQUESTS.cancelPayment);
+                if (statusCode !== "SUCCESS") {
+                    await this.reset(true);
                 }
 
                 if (this.occupied) {
diff --git a/addons/pos_glory_cash/static/src/screens/payment_screen/payment_lines/payment_lines.xml b/addons/pos_glory_cash/static/src/screens/payment_screen/payment_lines/payment_lines.xml
index 03ff432e6b2bf..eeac231b4a4a6 100644
--- a/addons/pos_glory_cash/static/src/screens/payment_screen/payment_lines/payment_lines.xml
+++ b/addons/pos_glory_cash/static/src/screens/payment_screen/payment_lines/payment_lines.xml
@@ -15,6 +15,11 @@
                     <t t-out="glory.status"/>
                 </div>
 
+                <div t-if="line.payment_status === 'pending' and glory.state.status !== 'RESETTING' and glory.state.status !== 'DISCONNECTED'" class="d-flex gap-2 fs-2 mb-3">
+                    <button class="btn btn-secondary" t-on-click="() => glory.reset()">Reset cash machine</button>
+                    <button class="btn btn-secondary" t-on-click="() => glory.downloadLogs()">Download logs</button>
+                </div>
+
                 <t t-set="emptyDenominations" t-value="glory.getDenominationsWithStatus('EMPTY')"/>
                 <t t-set="fullDenominations" t-value="glory.getDenominationsWithStatus('FULL')"/>
                 <t t-set="nearEmptyDenominations" t-value="glory.getDenominationsWithStatus('NEAR_EMPTY')"/>
@@ -33,7 +38,7 @@
                     The cash machine must be emptied, the following coins/bills are full:
                     <ul class="my-1 ps-4">
                         <li style="list-style-type: disc;" t-foreach="fullDenominations" t-as="denomination" t-key="denomination.value">
-                            <t t-out="env.utils.formatCurrency(denomination.value)"/> <t t-if="pos.getCashier().role === 'manager'" t-out="'(' + denomination.amount + ')'"/>
+                            <t t-out="env.utils.formatCurrency(denomination.value)"/> <t t-if="pos.getCashier()._role === 'manager'" t-out="'(' + denomination.amount + ')'"/>
                         </li>
                     </ul>
                 </div>
@@ -42,7 +47,7 @@
                     The cash machine is running low on the following coins/bills:
                     <ul class="my-1 ps-4">
                         <li style="list-style-type: disc;" t-foreach="nearEmptyDenominations" t-as="denomination" t-key="denomination.value">
-                            <t t-out="env.utils.formatCurrency(denomination.value)"/> <t t-if="pos.getCashier().role === 'manager'" t-out="'(' + denomination.amount + ')'"/>
+                            <t t-out="env.utils.formatCurrency(denomination.value)"/> <t t-if="pos.getCashier()._role === 'manager'" t-out="'(' + denomination.amount + ')'"/>
                         </li>
                     </ul>
                 </div>
@@ -51,7 +56,7 @@
                     Consider emptying the cash machine, the following coins/bills are nearly full:
                     <ul class="my-1 ps-4">
                         <li style="list-style-type: disc;" t-foreach="nearFullDenominations" t-as="denomination" t-key="denomination.value">
-                            <t t-out="env.utils.formatCurrency(denomination.value)"/> <t t-if="pos.getCashier().role === 'manager'" t-out="'(' + denomination.amount + ')'"/>
+                            <t t-out="env.utils.formatCurrency(denomination.value)"/> <t t-if="pos.getCashier()._role === 'manager'" t-out="'(' + denomination.amount + ')'"/>
                         </li>
                     </ul>
                 </div>
diff --git a/addons/pos_glory_cash/static/src/utils/constants.js b/addons/pos_glory_cash/static/src/utils/constants.js
index ad52187b8f26d..c5d530c7da3c8 100644
--- a/addons/pos_glory_cash/static/src/utils/constants.js
+++ b/addons/pos_glory_cash/static/src/utils/constants.js
@@ -42,6 +42,10 @@ export const XML_REQUESTS = {
         requestName: "ChangeCancelRequest",
         responseName: "ChangeCancelResponse",
     },
+    collect: {
+        requestName: "CollectRequest",
+        responseName: "CollectResponse",
+    },
     setDateAndTime: {
         requestName: "AdjustTimeRequest",
         responseName: "AdjustTimeResponse",
@@ -103,10 +107,14 @@ export const GLORY_STATUS_STRING = {
     STARTING_PAYMENT: _t("Starting payment"),
     WAITING_PAYMENT: _t("Waiting for insertion of cash"),
     COUNTING: _t("Counting"),
+    COUNTING_REPLENISHMENT: _t("Counting replenished cash"),
+    COLLECTING: _t("Collection in progress"),
     ERROR: _t("Error"),
     DISPENSING: _t("Dispensing"),
     WAITING_CASH_IN_REMOVE: _t("Waiting for cash to be removed"),
     WAITING_CASH_OUT_REMOVE: _t("Waiting for cash to be removed"),
+    WAITING_COFT_REMOVAL: _t("Waiting for coin overflow removal"),
+    WAITING_REPLENISHMENT: _t("Waiting for cash to be replenished"),
     RESETTING: _t("Resetting"),
     CANCELLING: _t("Cancelling payment"),
     CALCULATING_CHANGE: _t("Calculating change"),
@@ -123,6 +131,7 @@ export const GLORY_RESULT = {
     1: "CANCEL",
     2: "RESET",
     3: "OCCUPIED_BY_OTHER",
+    4: "OCCUPATION_NOT_AVAILABLE",
     5: "NOT_OCCUPIED",
     6: "DESIGNATION_SHORTAGE",
     9: "CANCEL_CHANGE_SHORTAGE",
@@ -137,6 +146,7 @@ export const GLORY_RESULT = {
     43: "EXCHANGE_RATE_ERROR",
     44: "COUNTED_CATEGORY_2_3",
     96: "DUPLICATE_TRANSACTION",
+    98: "PARAMETER_ERROR",
     99: "PROGRAM_ERROR",
     100: "DEVICE_ERROR",
 };
diff --git a/addons/pos_glory_cash/static/src/utils/glory_xml.js b/addons/pos_glory_cash/static/src/utils/glory_xml.js
index 27bcfcae5e3b3..37989e88482b3 100644
--- a/addons/pos_glory_cash/static/src/utils/glory_xml.js
+++ b/addons/pos_glory_cash/static/src/utils/glory_xml.js
@@ -1,4 +1,5 @@
 import { parseXML } from "@web/core/utils/xml";
+import { GLORY_RESULT } from "./constants";
 
 /**
  * @param {Blob} xmlBlob
@@ -58,3 +59,68 @@ export const makeGloryHeader = (sequenceNumber, sessionId) => {
         },
     ];
 };
+
+/**
+ * Takes an XML response and returns a status
+ * string e.g. "SUCCESS" or "CHANGE_SHORTAGE"
+ *
+ * @param {Element} xmlResponse
+ * @returns {string}
+ */
+export function parseGloryResult(xmlResponse) {
+    const resultString = GLORY_RESULT[xmlResponse.getAttribute("result")];
+    if (!resultString) {
+        throw new Error("Not a valid Glory XML response");
+    }
+
+    return resultString;
+}
+
+/**
+ * Takes an XML response containing the verification status
+ * of the Glory machine, and returns a number from 0-3
+ * corresponding to the required verification action:
+ *
+ *   `0`: No verification needed
+ *
+ *   `1`: Notes and coins need verification
+ *
+ *   `2`: Notes need verification
+ *
+ *   `3`: Coins need verification
+ *
+ * This result can be passed directly into a `CollectRequest`
+ * to trigger the verification process.
+ *
+ * @param {Element} xmlResponse
+ * @returns {0 | 1 | 2 | 3}
+ */
+export function parseVerificationInfo(xmlResponse) {
+    const denominationInfos = Array.from(
+        xmlResponse.getElementsByTagName("RequireVerifyDenomination")
+    );
+    const collectionContainerInfos = Array.from(
+        xmlResponse.getElementsByTagName("RequireVerifyCollectionContainer")
+    );
+    const mixStackerInfos = Array.from(xmlResponse.getElementsByTagName("RequireVerifyMixStacker"));
+    const allInfos = [...denominationInfos, ...collectionContainerInfos, ...mixStackerInfos];
+
+    const notesRequireVerify = allInfos.some(
+        (info) => info.getAttribute("devid") === "1" && info.getAttribute("val") === "1"
+    );
+    const coinsRequireVerify = allInfos.some(
+        (info) => info.getAttribute("devid") === "2" && info.getAttribute("val") === "1"
+    );
+
+    if (notesRequireVerify && coinsRequireVerify) {
+        return 1;
+    }
+    if (notesRequireVerify) {
+        return 2;
+    }
+    if (coinsRequireVerify) {
+        return 3;
+    }
+
+    return 0;
+}
diff --git a/addons/pos_glory_cash/static/src/utils/socket_io.js b/addons/pos_glory_cash/static/src/utils/socket_io.js
index fd70e8fc8ff2c..d360e3bd5fae7 100644
--- a/addons/pos_glory_cash/static/src/utils/socket_io.js
+++ b/addons/pos_glory_cash/static/src/utils/socket_io.js
@@ -18,6 +18,8 @@ const MSG_TYPES = {
     BINARY_ACK: "6",
 };
 
+const CONNECTION_TIMEOUT_MS = 10000;
+
 export class SocketIoService {
     /**
      * @param {string} url
@@ -35,6 +37,7 @@ export class SocketIoService {
         this.websocket = null;
         this.socketId = null;
         this.pingIntervalId = null;
+        this.pongTimeoutIds = [];
 
         this.callbacks = callbacks;
         this._connect(url);
@@ -57,6 +60,7 @@ export class SocketIoService {
             if (this.pingIntervalId) {
                 clearInterval(this.pingIntervalId);
             }
+            this.callbacks.onClose();
             setTimeout(() => this._connect(url), 5000);
         };
         this.websocket.onmessage = (event) => this._onMessageReceived(event.data);
@@ -69,10 +73,13 @@ export class SocketIoService {
     _handleOpenMessage(data) {
         const info = JSON.parse(data);
         this.socketId = info.sid;
-        this.pingIntervalId = setInterval(
-            () => this.websocket.send(PACKET_TYPES.PING),
-            info.pingInterval
-        );
+        this.pingIntervalId = setInterval(() => {
+            this.websocket.send(PACKET_TYPES.PING);
+            const pongTimeoutId = setTimeout(() => {
+                this.websocket.close();
+            }, CONNECTION_TIMEOUT_MS);
+            this.pongTimeoutIds.push(pongTimeoutId);
+        }, info.pingInterval);
     }
 
     async _handleMessage(data) {
@@ -104,6 +111,11 @@ export class SocketIoService {
         const packetData = data.slice(1);
         if (packetType === PACKET_TYPES.OPEN) {
             this._handleOpenMessage(packetData);
+        } else if (packetType === PACKET_TYPES.PONG) {
+            for (const timeoutId of this.pongTimeoutIds) {
+                clearTimeout(timeoutId);
+            }
+            this.pongTimeoutIds = [];
         } else if (packetType === PACKET_TYPES.MESSAGE) {
             this._handleMessage(packetData);
         }
diff --git a/addons/pos_glory_cash/static/tests/socket_io.test.js b/addons/pos_glory_cash/static/tests/socket_io.test.js
index 5250d2275a05e..0b0d32462afd7 100644
--- a/addons/pos_glory_cash/static/tests/socket_io.test.js
+++ b/addons/pos_glory_cash/static/tests/socket_io.test.js
@@ -10,6 +10,7 @@ const websocketState = {
 };
 
 const PING_MESSAGE = "2";
+const PONG_MESSAGE = "3";
 const OPEN_MESSAGE = '0{"sid":"testSocketId", "pingInterval": 5000}';
 const CONNECT_MESSAGE = "40";
 const EVENT_MESSAGE = '42["test message"]';
@@ -22,7 +23,7 @@ beforeEach(() => {
         websocketState.instance = ws;
         websocketState.closed = false;
         ws.addEventListener("message", (event) => {
-            websocketState.received.push(event.data);
+            websocketState.sent.push(event.data);
         });
         ws.addEventListener("close", () => {
             websocketState.closed = true;
@@ -33,7 +34,7 @@ beforeEach(() => {
 afterEach(() => {
     websocketState.instance?.close();
     websocketState.instance = null;
-    websocketState.received = [];
+    websocketState.sent = [];
     websocketState.closed = true;
 });
 
@@ -48,15 +49,42 @@ describe("when open message is received", () => {
     });
 
     test("sends ping request every 5 seconds", async () => {
-        new SocketIoService("mockUrl", {});
+        new SocketIoService("mockUrl", { onClose: () => {} });
         await waitUntil(() => websocketState.instance.readyState);
 
         websocketState.instance.send(OPEN_MESSAGE);
         await advanceTime(11000);
 
-        expect(websocketState.received).toHaveLength(2);
-        expect(websocketState.received[0]).toBe(PING_MESSAGE);
-        expect(websocketState.received[1]).toBe(PING_MESSAGE);
+        expect(websocketState.sent).toHaveLength(2);
+        expect(websocketState.sent[0]).toBe(PING_MESSAGE);
+        expect(websocketState.sent[1]).toBe(PING_MESSAGE);
+    });
+
+    test("closes connection if pong response is not received in 10s after ping", async () => {
+        new SocketIoService("mockUrl", { onClose: () => {} });
+        await waitUntil(() => websocketState.instance.readyState);
+
+        websocketState.instance.send(OPEN_MESSAGE);
+        await advanceTime(6000);
+        expect(websocketState.sent).toHaveLength(1);
+        expect(websocketState.sent[0]).toBe(PING_MESSAGE);
+        await advanceTime(10000);
+
+        expect(websocketState.closed).toBe(true);
+    });
+
+    test("keep connection open if pong response is received", async () => {
+        new SocketIoService("mockUrl", {});
+        await waitUntil(() => websocketState.instance.readyState);
+
+        websocketState.instance.send(OPEN_MESSAGE);
+        await advanceTime(1000);
+        websocketState.instance.send(PONG_MESSAGE);
+        await advanceTime(5000);
+        websocketState.instance.send(PONG_MESSAGE);
+        await advanceTime(5000);
+
+        expect(websocketState.closed).toBe(false);
     });
 });
 
@@ -80,6 +108,7 @@ describe("when event message is received", () => {
     test("does not call callback and closes websocket if message is empty", async () => {
         let eventReceived = null;
         new SocketIoService("mockUrl", {
+            onClose: () => {},
             onEvent: (event) => {
                 eventReceived = event;
             },
@@ -95,6 +124,7 @@ describe("when event message is received", () => {
     test("does not call callback and closes websocket if message is invalid", async () => {
         let eventReceived = null;
         new SocketIoService("mockUrl", {
+            onClose: () => {},
             onEvent: (event) => {
                 eventReceived = event;
             },
@@ -147,7 +177,7 @@ describe("when sending a message", () => {
 
         socketIo.sendMessage("test");
 
-        expect(websocketState.received).toHaveLength(1);
-        expect(websocketState.received[0]).toBe('42["test"]');
+        expect(websocketState.sent).toHaveLength(1);
+        expect(websocketState.sent[0]).toBe('42["test"]');
     });
 });

From 8affa008a36b3e21f69b48e3158e7f3dcc3c802a Mon Sep 17 00:00:00 2001
From: "Walid (wasa)" <wasa@odoo.com>
Date: Tue, 30 Sep 2025 07:59:10 +0000
Subject: [PATCH 027/673] [FIX] html_editor: prevent unformatted typing at link
 edges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
If we add a link on a slice of formatted text we end up being able
to type unformatted content at the link edges.

Cause:
After https://github.com/odoo/odoo/commit/3bcbd6f34facb9c88290dbd6496cc5103665a0a2
the `span` can be split and `feff`s are placed around the link,
precisely between the link and the `span`. This allows writing
unformatted content at the caret when placed between them.

Solution:
Ensure that the link is created inside the `span`. Also prevent the
formatting applied by `.btn` when the link is inside a `span`.

Steps to reproduce:
1. Add "abc".
2. Format all the text: set font size 48 (or whatever).
3. Select "b".
4. Create a link on "b" only.
5. Put caret before "a".
6. Press Arrow left.
7. Type any character.
→ The character is not formatted as the link content.

task-5092298

closes odoo/odoo#233801

X-original-commit: f8012b9f71e2013a871d5c591b5fbc88e199b0de
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Walid Sahli (wasa) <wasa@odoo.com>
---
 .../static/src/main/link/link.scss            |  10 ++
 .../static/src/main/link/link_plugin.js       | 112 +++++++-----------
 .../static/src/utils/formatting.js            |   1 +
 .../static/tests/link/button.test.js          |  66 ++++++++++-
 .../static/tests/link/popover.test.js         |  63 +---------
 5 files changed, 116 insertions(+), 136 deletions(-)

diff --git a/addons/html_editor/static/src/main/link/link.scss b/addons/html_editor/static/src/main/link/link.scss
index d8b1a64c11f06..d07c2957e2b53 100644
--- a/addons/html_editor/static/src/main/link/link.scss
+++ b/addons/html_editor/static/src/main/link/link.scss
@@ -16,4 +16,14 @@
     [contenteditable=false] .btn {
         cursor: pointer;
     }
+
+    // Unset the font size and family applied by `.btn` 
+    // if inside `FONT_SIZE_CLASSES`.
+    span[class$="-fs"],
+    span.small {
+        .btn:not(:has(span[class$="-fs"], span.small)) {
+            font-family: unset;
+            font-size: unset;
+        }
+    }
 }
diff --git a/addons/html_editor/static/src/main/link/link_plugin.js b/addons/html_editor/static/src/main/link/link_plugin.js
index 7b62129da6884..54eee86079751 100644
--- a/addons/html_editor/static/src/main/link/link_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_plugin.js
@@ -13,7 +13,6 @@ import { memoize } from "@web/core/utils/functions";
 import { withSequence } from "@html_editor/utils/resource";
 import { isBlock, closestBlock } from "@html_editor/utils/blocks";
 import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
-import { FONT_SIZE_CLASSES } from "@html_editor/utils/formatting";
 import { isBrowserFirefox } from "@web/core/browser/feature_detection";
 
 /**
@@ -507,18 +506,10 @@ export class LinkPlugin extends Plugin {
                 }
             } else if (url) {
                 // prevent the link creation if the url field was empty
-                const sameTextOrImage =
-                    (selectionTextContent && selectionTextContent === label) || isImage;
-                if (sameTextOrImage || label) {
-                    // Create a new link with current selection as a content.
+
+                // create a new link with current selection as a content
+                if ((selectionTextContent && selectionTextContent === label) || isImage) {
                     const link = this.createLink(url);
-                    const fontSizeWrapper = closestElement(
-                        selection.commonAncestorContainer,
-                        (el) =>
-                            el.tagName === "SPAN" &&
-                            (FONT_SIZE_CLASSES.some((cls) => el.classList.contains(cls)) ||
-                                el.style?.fontSize)
-                    );
                     if (relValue) {
                         link.setAttribute("rel", relValue);
                     }
@@ -526,74 +517,48 @@ export class LinkPlugin extends Plugin {
                     const figure =
                         image?.parentElement?.matches("figure[contenteditable=false]") &&
                         image.parentElement;
-                    let content;
-
-                    // Split selection to include font-size <span>
-                    // inside <a> to preserve styling.
-                    if (fontSizeWrapper) {
-                        this.dependencies.split.splitSelection();
-                        const selectedNodes = this.dependencies.selection
-                            .getTargetedNodes()
-                            .filter(
-                                this.dependencies.selection.areNodeContentsFullySelected.bind(this)
-                            );
-                        content = this.dependencies.split.splitAroundUntil(
-                            selectedNodes,
-                            fontSizeWrapper
-                        );
-                        const [anchorNode, anchorOffset] = leftPos(content);
-                        // Force selection to correct spot after split to prevent wrong link placement.
-                        this.dependencies.selection.setSelection(
-                            { anchorNode, anchorOffset },
-                            { normalize: false }
-                        );
-                        if (!sameTextOrImage) {
-                            // If label changed, clear existing content and set new text.
-                            content.textContent = label;
-                        }
-                    } else if (sameTextOrImage) {
-                        if (figure) {
-                            figure.before(link);
-                            link.append(figure);
-                            if (link.parentElement === this.editable) {
-                                const baseContainer =
-                                    this.dependencies.baseContainer.createBaseContainer();
-                                link.before(baseContainer);
-                                baseContainer.append(link);
-                            }
-                        } else {
-                            content = this.dependencies.selection.extractContent(selection);
-                            selection = this.dependencies.selection.getEditableSelection();
-                            const anchorClosestElement = closestElement(selection.anchorNode);
-                            if (commonAncestor !== anchorClosestElement && !fontSizeWrapper) {
-                                // We force the cursor after the anchorClosestElement
-                                // To be sure the link is inserted in the correct place in the dom.
-                                const [anchorNode, anchorOffset] = rightPos(anchorClosestElement);
-                                this.dependencies.selection.setSelection(
-                                    { anchorNode, anchorOffset },
-                                    { normalize: false }
-                                );
-                            }
+                    if (figure) {
+                        figure.before(link);
+                        link.append(figure);
+                        if (link.parentElement === this.editable) {
+                            const baseContainer =
+                                this.dependencies.baseContainer.createBaseContainer();
+                            link.before(baseContainer);
+                            baseContainer.append(link);
                         }
                     } else {
-                        content = this.document.createTextNode(label);
-                        if (customStyle) {
-                            link.setAttribute("style", customStyle);
-                        }
-                        if (linkTarget) {
-                            link.setAttribute("target", linkTarget);
+                        const content = this.dependencies.selection.extractContent(selection);
+                        link.append(content);
+                        link.normalize();
+                        cursorsToRestore = null;
+                        selection = this.dependencies.selection.getEditableSelection();
+                        const anchorClosestElement = closestElement(selection.anchorNode);
+                        if (commonAncestor !== anchorClosestElement) {
+                            // We force the cursor after the anchorClosestElement
+                            // To be sure the link is inserted in the correct place in the dom.
+                            const [anchorNode, anchorOffset] = rightPos(anchorClosestElement);
+                            this.dependencies.selection.setSelection(
+                                { anchorNode, anchorOffset },
+                                { normalize: false }
+                            );
                         }
+                        this.dependencies.dom.insert(link);
                     }
                     this.linkInDocument = link;
+                } else if (label) {
+                    const link = this.createLink(url, label);
                     if (classes) {
                         link.className = classes;
                     }
-                    if (!figure) {
-                        link.append(content);
-                        link.normalize();
-                        cursorsToRestore = null;
-                        this.dependencies.dom.insert(link);
+                    if (customStyle) {
+                        link.setAttribute("style", customStyle);
                     }
+                    if (linkTarget) {
+                        link.setAttribute("target", linkTarget);
+                    }
+                    this.linkInDocument = link;
+                    cursorsToRestore = null;
+                    this.dependencies.dom.insert(link);
                 }
             }
             if (attachmentId) {
@@ -801,7 +766,10 @@ export class LinkPlugin extends Plugin {
         if (!selectionData.currentSelectionIsInEditable) {
             const popoverEl = document.querySelector(".o-we-linkpopover");
             const anchorNode = document.getSelection()?.anchorNode;
-            if ((popoverEl && !selectionData.documentSelection) || (anchorNode && isElement(anchorNode) && anchorNode.closest(".o-we-linkpopover"))) {
+            if (
+                (popoverEl && !selectionData.documentSelection) ||
+                (anchorNode && isElement(anchorNode) && anchorNode.closest(".o-we-linkpopover"))
+            ) {
                 return;
             }
             this.linkInDocument = null;
diff --git a/addons/html_editor/static/src/utils/formatting.js b/addons/html_editor/static/src/utils/formatting.js
index b15b1d3f510cb..f94ac2f5f838e 100644
--- a/addons/html_editor/static/src/utils/formatting.js
+++ b/addons/html_editor/static/src/utils/formatting.js
@@ -148,6 +148,7 @@ export const formatsSpecs = {
             node.classList.add(props.className);
         },
         removeStyle: (node) => {
+            removeStyle(node, "font-size");
             removeClass(node, ...FONT_SIZE_CLASSES);
             // Typography classes should be preserved on block elements since
             // they act as semantic equivalents of <h1>, <h2>, etc., not just
diff --git a/addons/html_editor/static/tests/link/button.test.js b/addons/html_editor/static/tests/link/button.test.js
index 967676249838b..3cbd937c252f3 100644
--- a/addons/html_editor/static/tests/link/button.test.js
+++ b/addons/html_editor/static/tests/link/button.test.js
@@ -11,8 +11,8 @@ import {
     manuallyDispatchProgrammaticEvent,
 } from "@odoo/hoot-dom";
 import { animationFrame } from "@odoo/hoot-mock";
-import { contains } from "@web/../tests/web_test_helpers";
-import { setupEditor } from "../_helpers/editor";
+import { contains, onRpc } from "@web/../tests/web_test_helpers";
+import { setupEditor, testEditor } from "../_helpers/editor";
 import { cleanLinkArtifacts, unformat } from "../_helpers/format";
 import { getContent, setSelection } from "../_helpers/selection";
 import { insertText } from "../_helpers/user_actions";
@@ -50,6 +50,68 @@ describe("button style", () => {
         el.setAttribute("contenteditable", "false");
         expect(queryOne(".test-btn")).toHaveStyle({ userSelect: "none" });
     });
+    test("Button styling should not override inner font size", async () => {
+        onRpc("/test", () => ({}));
+        onRpc("/html_editor/link_preview_internal", () => ({
+            description: "test",
+            link_preview_name: "test",
+        }));
+        const { el } = await setupEditor(
+            unformat(`
+                <div>
+                    <span class="display-1-fs">a[b]c</span>
+                </div>
+            `)
+        );
+        await waitFor(".o-we-toolbar");
+        await click("button[name='link']");
+        await animationFrame();
+        await click('select[name="link_type"]');
+        await animationFrame();
+        await select("primary");
+        await animationFrame();
+        await contains(".o-we-linkpopover input.o_we_href_input_link").edit("/test");
+
+        // Ensure `.display-1-fs` overrides the `.btn`'s default font size.
+        const link = el.querySelector("a.btn");
+        const span = el.querySelector("span.display-1-fs");
+        expect(getComputedStyle(link).fontSize).toBe(getComputedStyle(span).fontSize);
+
+        expect(el).toHaveInnerHTML(
+            unformat(`
+                <div class="o-paragraph">
+                    <span class="display-1-fs">a\ufeff<a href="/test" class="btn btn-primary">\ufeffb\ufeff</a>\ufeffc</span>
+                </div>
+            `)
+        );
+    });
+
+    test("Should be able to change button style", async () => {
+        await testEditor({
+            contentBefore: unformat(`
+                <div class="o-paragraph">
+                    <span class="display-1-fs">a<a class="btn btn-fill-primary" href="#">[b]</a>c</span>
+                </div>
+            `),
+            stepFunction: (editor) => {
+                editor.shared.format.formatSelection("setFontSizeClassName", {
+                    formatProps: { className: "h1-fs" },
+                    applyStyle: true,
+                });
+            },
+            contentAfter: unformat(`
+                <div>
+                    <span class="display-1-fs">
+                        a
+                        <a class="btn btn-fill-primary" href="#">
+                            <span class="h1-fs">[b]</span>
+                        </a>
+                        c
+                    </span>
+                </div>
+            `),
+        });
+    });
 });
 
 const allowCustomOpt = {
diff --git a/addons/html_editor/static/tests/link/popover.test.js b/addons/html_editor/static/tests/link/popover.test.js
index 2d2c9493af898..3c548fd257c44 100644
--- a/addons/html_editor/static/tests/link/popover.test.js
+++ b/addons/html_editor/static/tests/link/popover.test.js
@@ -15,7 +15,7 @@ import { animationFrame, tick } from "@odoo/hoot-mock";
 import { markup } from "@odoo/owl";
 import { contains, onRpc, patchWithCleanup } from "@web/../tests/web_test_helpers";
 import { setupEditor } from "../_helpers/editor";
-import { cleanLinkArtifacts, unformat } from "../_helpers/format";
+import { cleanLinkArtifacts } from "../_helpers/format";
 import { getContent, setContent, setSelection } from "../_helpers/selection";
 import { expectElementCount } from "../_helpers/ui_expectations";
 import { insertLineBreak, insertText, splitBlock, undo } from "../_helpers/user_actions";
@@ -844,67 +844,6 @@ describe("Link creation", () => {
                 `<p>[<a href="https://www.test.com">Hello</a> my friend]</p>`
             );
         });
-        test("should wrap selected text with link and preserve styles", async () => {
-            const { el } = await setupEditor(
-                `<p><span style="font-size: 48px;"><strong>s[trong</strong><u>underlin]e</u></span></p>`
-            );
-            await waitFor(".o-we-toolbar");
-            await click(".o-we-toolbar .fa-link");
-            await expectElementCount(".o-we-linkpopover", 1);
-            queryOne(".o_we_href_input_link").focus();
-            expect(".o_we_href_input_link").toBeFocused();
-            await fill("http://test.com");
-            await click('select[name="link_type"');
-            await select("primary");
-            await animationFrame();
-            await click(".o_we_apply_link");
-            await animationFrame();
-            expect(cleanLinkArtifacts(getContent(el))).toBe(
-                unformat(`
-                    <p>
-                        <span style="font-size: 48px;"><strong>s</strong></span>
-                        <a href="http://test.com" class="btn btn-primary">
-                            <span style="font-size: 48px;"><strong>trong</strong><u>underlin[]</u></span>
-                        </a>
-                        <span style="font-size: 48px;"><u>e</u></span>
-                    </p>
-                `)
-            );
-        });
-        test("should apply link over split text nodes while preserving styles", async () => {
-            const { el } = await setupEditor(`<p><span class="display-1-fs"></span></p>`);
-
-            const fontSizeSpan = queryOne("span.display-1-fs");
-            fontSizeSpan.appendChild(document.createTextNode("te"));
-            fontSizeSpan.appendChild(document.createTextNode("st"));
-            setSelection({
-                anchorNode: fontSizeSpan.firstChild,
-                anchorOffset: 1,
-                focusNode: fontSizeSpan.lastChild,
-                focusOffset: 1,
-            });
-
-            await waitFor(".o-we-toolbar");
-            await click(".o-we-toolbar .fa-link");
-            await expectElementCount(".o-we-linkpopover", 1);
-            queryOne(".o_we_href_input_link").focus();
-            expect(".o_we_href_input_link").toBeFocused();
-            await fill("http://test.com");
-            await animationFrame();
-            await click(".o_we_apply_link");
-            await animationFrame();
-            expect(cleanLinkArtifacts(getContent(el))).toBe(
-                unformat(`
-                    <p>
-                        <span class="display-1-fs">t</span>
-                        <a href="http://test.com">
-                            <span class="display-1-fs">es[]</span>
-                        </a>
-                        <span class="display-1-fs">t</span>
-                    </p>
-                `)
-            );
-        });
     });
 });
 

From 5548043b849c32ef17b5d6864dc429fd003fc367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Tue, 28 Oct 2025 17:09:19 +0000
Subject: [PATCH 028/673] [FIX] mail: search panel in mailbox takes whole
 screen width in mobile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, the search panel in mailboxes (inbox, starred,
history) took only part of the screen in mobile.

This happens because the template being used in mobile for mailbox
is the same as desktop UI for discuss app. This component
`DiscussContent` is used because mailboxes are not supported in chat
windows, and full-screen conversations in discuss on mobile are
actually chat windows. Reusing the `DiscussContent` component is
almost the desired UX/UI. The side panel however was not designed
for small screen, thus action panel is very narrow and is hard to use
in mobile.

This commit fixes the issue by making the action panel mutually
exclusive to message list in mobile, so that when search panel is
open it takes the whole width of screen. We don't need to see message
list in mobile, and thanks to chat window also using search panel
that takes the whole screen, the search panel is already designed to
auto-close itself and jump to a message.

Part of Task-4967066

closes odoo/odoo#233762

X-original-commit: c1db1d223b0aebd7aad0c3091315d5f09c1a4c58
Signed-off-by: Didier Debondt (did) <did@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/core/public_web/discuss_content.xml   |  4 +-
 .../discuss/search_messages_panel.test.js     | 58 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/core/public_web/discuss_content.xml b/addons/mail/static/src/core/public_web/discuss_content.xml
index 7d0567cb60ad0..84e0b99a5d959 100644
--- a/addons/mail/static/src/core/public_web/discuss_content.xml
+++ b/addons/mail/static/src/core/public_web/discuss_content.xml
@@ -67,11 +67,11 @@
             <div class="o-mail-DiscussContent-core overflow-auto o-scrollbar-thin d-flex flex-grow-1 w-100" t-ref="core">
                 <t name="core-content">
                     <t t-if="thread">
-                        <div class="d-flex flex-column flex-grow-1 bg-inherit">
+                        <div t-if="!ui.isSmall or !threadActions.activeAction?.actionPanelComponentCondition" class="d-flex flex-column flex-grow-1 bg-inherit">
                             <t name="thread"><Thread thread="thread" t-key="thread.localId" jumpPresent="state.jumpThreadPresent"/></t>
                             <Composer t-if="thread.model !== 'mail.box' or thread.composer.replyToMessage" t-key="thread.localId" composer="thread.composer" autofocus="true" onDiscardCallback="() => (thread.composer.replyToMessage = undefined)" onPostCallback.bind="() => this.state.jumpThreadPresent++" dropzoneRef="root" type="thread.composer.replyToMessage ? (thread.composer.replyToMessage.isNote ? 'note' : 'message') : undefined"/>
                         </div>
-                        <div t-if="threadActions.activeAction?.actionPanelComponentCondition" t-attf-class="{{ threadActions.activeAction.actionPanelOuterClass }}" class="o-mail-DiscussContent-panelContainer o-mail-discussSidebarBgColor h-100 border-start border-secondary flex-shrink-0">
+                        <div t-if="threadActions.activeAction?.actionPanelComponentCondition" t-attf-class="{{ threadActions.activeAction.actionPanelOuterClass }}" class="o-mail-DiscussContent-panelContainer o-mail-discussSidebarBgColor h-100 border-start border-secondary flex-shrink-0" t-att-class="{ 'w-100': ui.isSmall }">
                             <t t-component="threadActions.activeAction.actionPanelComponent" thread="thread" t-props="threadActions.activeAction.actionPanelComponentProps"/>
                         </div>
                     </t>
diff --git a/addons/mail/static/tests/discuss/search_messages_panel.test.js b/addons/mail/static/tests/discuss/search_messages_panel.test.js
index b5a8e72bbb3fc..9cf25c593e8a3 100644
--- a/addons/mail/static/tests/discuss/search_messages_panel.test.js
+++ b/addons/mail/static/tests/discuss/search_messages_panel.test.js
@@ -5,21 +5,23 @@ import {
     insertText,
     onRpcBefore,
     openDiscuss,
+    patchUiSize,
     scroll,
+    SIZES,
     start,
     startServer,
     triggerHotkey,
 } from "@mail/../tests/mail_test_helpers";
-import { describe, expect, test } from "@odoo/hoot";
+import { expect, mockTouch, mockUserAgent, test } from "@odoo/hoot";
 import { press } from "@odoo/hoot-dom";
 import { tick } from "@odoo/hoot-mock";
 import { serverState } from "@web/../tests/web_test_helpers";
 
 import { HIGHLIGHT_CLASS } from "@mail/core/common/message_search_hook";
 
-describe.current.tags("desktop");
 defineMailModels();
 
+test.tags("desktop");
 test("Should have a search button", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -28,6 +30,7 @@ test("Should have a search button", async () => {
     await contains("[title='Search Messages']");
 });
 
+test.tags("desktop");
 test("Should open the search panel when search button is clicked", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -39,6 +42,7 @@ test("Should open the search panel when search button is clicked", async () => {
     await contains(".o_searchview_input");
 });
 
+test.tags("desktop");
 test("Should open the search panel with hotkey 'f'", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -57,6 +61,7 @@ test("Should open the search panel with hotkey 'f'", async () => {
     await contains(".o-mail-SearchMessagesPanel");
 });
 
+test.tags("desktop");
 test("Search a message", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -77,6 +82,7 @@ test("Search a message", async () => {
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
 });
 
+test.tags("desktop");
 test("Search should be hightlighted", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -97,6 +103,7 @@ test("Search should be hightlighted", async () => {
     await contains(`.o-mail-SearchMessagesPanel .o-mail-Message .${HIGHLIGHT_CLASS}`);
 });
 
+test.tags("desktop");
 test("Search a starred message", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -118,6 +125,7 @@ test("Search a starred message", async () => {
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
 });
 
+test.tags("desktop");
 test("Search a message in inbox", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -139,7 +147,8 @@ test("Search a message in inbox", async () => {
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
 });
 
-test("Search a message in history", async () => {
+test.tags("desktop");
+test("Search a message in history (desktop)", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
     const messageId = pyEnv["mail.message"].create({
@@ -166,6 +175,44 @@ test("Search a message in history", async () => {
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
 });
 
+test.tags("mobile");
+test("Search a message in history (mobile)", async () => {
+    mockTouch(true);
+    mockUserAgent("android");
+    patchUiSize({ size: SIZES.SM });
+    const pyEnv = await startServer();
+    const channelId = pyEnv["discuss.channel"].create({ name: "General" });
+    const messageId = pyEnv["mail.message"].create({
+        author_id: serverState.partnerId,
+        body: "This is a message",
+        attachment_ids: [],
+        message_type: "comment",
+        model: "discuss.channel",
+        res_id: channelId,
+        needaction: false,
+    });
+    pyEnv["mail.notification"].create({
+        is_read: true,
+        mail_message_id: messageId,
+        notification_status: "sent",
+        notification_type: "inbox",
+        res_partner_id: serverState.partnerId,
+    });
+    await start();
+    await openDiscuss("mail.box_history");
+    await contains(".o-mail-Thread");
+    await click("[title='Search Messages']");
+    await contains(".o-mail-SearchMessagesPanel");
+    await contains(".o-mail-Thread", { count: 0 });
+    await insertText(".o_searchview_input", "message");
+    await triggerHotkey("Enter");
+    await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
+    await click(".o-mail-MessageCard-jump");
+    await contains(".o-mail-Thread");
+    await contains(".o-mail-SearchMessagesPanel", { count: 0 });
+});
+
+test.tags("desktop");
 test("Should close the search panel when search button is clicked again", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -176,6 +223,7 @@ test("Should close the search panel when search button is clicked again", async
     await contains(".o-mail-SearchMessagesPanel");
 });
 
+test.tags("desktop");
 test("Search a message in 60 messages should return 30 message first", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -201,6 +249,7 @@ test("Search a message in 60 messages should return 30 message first", async ()
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message", { count: 30 });
 });
 
+test.tags("desktop");
 test("Scrolling to the bottom should load more searched message", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -228,6 +277,7 @@ test("Scrolling to the bottom should load more searched message", async () => {
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message", { count: 60 });
 });
 
+test.tags("desktop");
 test("Editing the searched term should not edit the current searched term", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -256,6 +306,7 @@ test("Editing the searched term should not edit the current searched term", asyn
     await scroll(".o-mail-SearchMessagesPanel .o-mail-ActionPanel", "bottom");
 });
 
+test.tags("desktop");
 test("Search a message containing round brackets", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
@@ -276,6 +327,7 @@ test("Search a message containing round brackets", async () => {
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
 });
 
+test.tags("desktop");
 test("Search a message containing single quotes", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });

From 7b78b7fa9a1fd9385cff768fdcc12b7f44e9055c Mon Sep 17 00:00:00 2001
From: Serge Bayet <seba@odoo.com>
Date: Mon, 27 Oct 2025 07:41:50 +0000
Subject: [PATCH 029/673] [FIX] website_blog, *: allow editing blog landing
 title

*: html_builder, website

Since [1] and [2] reverting it by mistake, the blog landing title was
not editable anymore.

Steps to reproduce:
- Open /blog in the website editor.
- Try to edit the "Our Latest Posts" heading.

After this commit the heading becomes editable in the website editor.

[1]: https://github.com/odoo/odoo/commit/ec49429d0d405948fcb93228e7350dfea585246f
[2]: https://github.com/odoo/odoo/commit/f503f98915ab39efff80a5904494c879805bb057

closes odoo/odoo#233789

X-original-commit: ed381be04a56f1ce83269e9e250cc8ae83b4bc59
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
Signed-off-by: Serge Bayet (seba) <seba@odoo.com>
---
 addons/html_builder/static/src/core/setup_editor_plugin.js | 1 +
 addons/website/static/src/builder/website_builder.js       | 2 +-
 addons/website_blog/views/website_blog_templates.xml       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/html_builder/static/src/core/setup_editor_plugin.js b/addons/html_builder/static/src/core/setup_editor_plugin.js
index a062c9c0068ab..29c4fde517658 100644
--- a/addons/html_builder/static/src/core/setup_editor_plugin.js
+++ b/addons/html_builder/static/src/core/setup_editor_plugin.js
@@ -17,6 +17,7 @@ export class SetupEditorPlugin extends Plugin {
             "#wrap .o_homepage_editor_welcome_message"
         );
         welcomeMessageEl?.remove();
+        this.dispatchTo("before_setup_editor_handlers");
         let editableEls = this.getEditableElements(
             this.getResource("o_editable_selectors").join(", ")
         )
diff --git a/addons/website/static/src/builder/website_builder.js b/addons/website/static/src/builder/website_builder.js
index 7037c4cba63a2..ce4e28d2aad73 100644
--- a/addons/website/static/src/builder/website_builder.js
+++ b/addons/website/static/src/builder/website_builder.js
@@ -156,7 +156,7 @@ export class WebsiteBuilder extends Component {
     get builderProps() {
         const builderProps = Object.assign({}, this.props.builderProps);
         const websitePlugins = this.props.translation
-            ? TRANSLATION_PLUGINS
+            ? [...TRANSLATION_PLUGINS, ...registry.category("website-translation-plugins").getAll()]
             : [
                   ...registry.category("builder-plugins").getAll(),
                   ...registry.category("website-plugins").getAll(),
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 59be0dc70121d..4bc7642c54992 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -108,7 +108,7 @@ list of filtered posts (by date or tag).
                     </div>
                 </t>
                 <t t-else="">
-                    <div class="h1 o_not_editable" style="text-align:center;">Our Latest Posts</div>
+                    <div class="h1" style="text-align:center;">Our Latest Posts</div>
                 </t>
                 <div class="col-12 mt-3"> <hr/> </div>
             </div>
@@ -134,7 +134,7 @@ list of filtered posts (by date or tag).
             </div>
         </t>
         <t t-else="">
-            <div class="h1 my-4 o_not_editable" style="text-align:center;">Our Latest Posts</div>
+            <div class="h1 my-4" style="text-align:center;">Our Latest Posts</div>
         </t>
     </xpath>
 </template>

From 9ab89c290b3430387d7d119f09589d85fdc5b99c Mon Sep 17 00:00:00 2001
From: ELCO <elco@odoo.com>
Date: Mon, 27 Oct 2025 13:02:48 +0000
Subject: [PATCH 030/673] [IMP] web: sample data backpedaling

This commit removes the sample data ribbon introduced in #208864 and
adds an opacity blur over sample data.

task-5207352

closes odoo/odoo#233797

X-original-commit: 6ee090c29f1f4e1745c6cae2d50ea77d3324965b
Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
---
 addons/web/static/src/scss/utils.scss                    | 1 -
 addons/web/static/src/views/action_helper.js             | 4 ----
 addons/web/static/src/views/action_helper.xml            | 6 ------
 addons/web/static/src/views/view.scss                    | 5 +++++
 addons/web/static/tests/views/graph/graph_view.test.js   | 5 -----
 addons/web/static/tests/views/kanban/kanban_view.test.js | 5 -----
 addons/web/static/tests/views/list/list_view.test.js     | 6 ------
 addons/web/static/tests/views/pivot_view.test.js         | 5 -----
 8 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss
index 3b7a70bc9441e..346c1276cc99b 100644
--- a/addons/web/static/src/scss/utils.scss
+++ b/addons/web/static/src/scss/utils.scss
@@ -332,7 +332,6 @@
 
 // Sample data
 @mixin o-sample-data-disabled {
-    opacity: 0.06;
     pointer-events: none;
     user-select: none;
 }
diff --git a/addons/web/static/src/views/action_helper.js b/addons/web/static/src/views/action_helper.js
index 5698c2ebf0fa3..dade37482e277 100644
--- a/addons/web/static/src/views/action_helper.js
+++ b/addons/web/static/src/views/action_helper.js
@@ -13,8 +13,4 @@ export class ActionHelper extends Component {
     get showDefaultHelper() {
         return !this.props.noContentHelp;
     }
-
-    showWidgetSampleData() {
-        return this.props.showRibbon;
-    }
 }
diff --git a/addons/web/static/src/views/action_helper.xml b/addons/web/static/src/views/action_helper.xml
index d85dde2f4839e..427905b25416c 100644
--- a/addons/web/static/src/views/action_helper.xml
+++ b/addons/web/static/src/views/action_helper.xml
@@ -4,12 +4,6 @@
     <t t-name="web.ActionHelper">
         <div class="o_view_nocontent">
             <div class="o_nocontent_help">
-                <t t-if="showWidgetSampleData()">
-                    <RibbonWidget  t-props="{
-                        text: 'SAMPLE DATA',
-                        bgClass: 'text-bg-danger',
-                    }"/>
-                </t>
                 <t t-if="showDefaultHelper">
                     <p class="o_view_nocontent_empty_folder">
                         <t t-if="title" t-esc="title"/>
diff --git a/addons/web/static/src/views/view.scss b/addons/web/static/src/views/view.scss
index 0074ab67b6741..3101716a98f43 100644
--- a/addons/web/static/src/views/view.scss
+++ b/addons/web/static/src/views/view.scss
@@ -18,6 +18,11 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    background-image:  radial-gradient(
+        at 50% 50%,
+        #{$o-view-background-color} 0px,
+        #{rgba($o-view-background-color, 0.5)} 100%
+    );
 
     .o_nocontent_help {
         @include o-nocontent-empty;
diff --git a/addons/web/static/tests/views/graph/graph_view.test.js b/addons/web/static/tests/views/graph/graph_view.test.js
index fddbdd37baa99..36859382306b0 100644
--- a/addons/web/static/tests/views/graph/graph_view.test.js
+++ b/addons/web/static/tests/views/graph/graph_view.test.js
@@ -2291,8 +2291,6 @@ test("empty graph view with sample data", async () => {
 
     expect(".o_graph_view .o_content").toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent").toHaveCount(1);
-    expect(".ribbon").toHaveCount(1);
-    expect(".ribbon").toHaveText("SAMPLE DATA");
     expect(".o_graph_canvas_container canvas").toHaveCount(1);
 
     await toggleSearchBarMenu();
@@ -2300,7 +2298,6 @@ test("empty graph view with sample data", async () => {
 
     expect(".o_graph_view .o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent").toHaveCount(0);
-    expect(".ribbon").toHaveCount(0);
     expect(".o_graph_canvas_container canvas").toHaveCount(1);
 });
 
@@ -2325,7 +2322,6 @@ test("non empty graph view with sample data", async () => {
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent").toHaveCount(0);
     expect(".o_graph_canvas_container canvas").toHaveCount(1);
-    expect(".ribbon").toHaveCount(0);
 
     await toggleSearchBarMenu();
     await toggleMenuItem("False Domain");
@@ -2333,7 +2329,6 @@ test("non empty graph view with sample data", async () => {
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_graph_canvas_container canvas").toHaveCount(0);
     expect(".o_view_nocontent").toHaveCount(1);
-    expect(".ribbon").toHaveCount(0);
 });
 
 test("empty graph view without sample data after filter", async () => {
diff --git a/addons/web/static/tests/views/kanban/kanban_view.test.js b/addons/web/static/tests/views/kanban/kanban_view.test.js
index 0e6356c1aa9fa..51796323f7a7a 100644
--- a/addons/web/static/tests/views/kanban/kanban_view.test.js
+++ b/addons/web/static/tests/views/kanban/kanban_view.test.js
@@ -4178,8 +4178,6 @@ test("empty kanban with sample data", async () => {
         message: "there should be 10 sample records",
     });
     expect(".o_view_nocontent").toHaveCount(1);
-    expect(".ribbon").toHaveCount(1);
-    expect(".ribbon").toHaveText("SAMPLE DATA");
 
     await toggleSearchBarMenu();
     await toggleMenuItem("Match nothing");
@@ -4187,7 +4185,6 @@ test("empty kanban with sample data", async () => {
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_kanban_record:not(.o_kanban_ghost)").toHaveCount(0);
     expect(".o_view_nocontent").toHaveCount(1);
-    expect(".ribbon").toHaveCount(0);
 });
 
 test("empty grouped kanban with sample data and many2many_tags", async () => {
@@ -4307,14 +4304,12 @@ test("non empty kanban with sample data", async () => {
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_kanban_record:not(.o_kanban_ghost)").toHaveCount(4);
     expect(".o_view_nocontent").toHaveCount(0);
-    expect(".ribbon").toHaveCount(0);
 
     await toggleSearchBarMenu();
     await toggleMenuItem("Match nothing");
 
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_kanban_record:not(.o_kanban_ghost)").toHaveCount(0);
-    expect(".ribbon").toHaveCount(0);
 });
 
 test("empty grouped kanban with sample data: add a column", async () => {
diff --git a/addons/web/static/tests/views/list/list_view.test.js b/addons/web/static/tests/views/list/list_view.test.js
index 2242e2a2f102e..851b304595e21 100644
--- a/addons/web/static/tests/views/list/list_view.test.js
+++ b/addons/web/static/tests/views/list/list_view.test.js
@@ -7239,8 +7239,6 @@ test(`empty list with sample data`, async () => {
     expect(`.o_list_table`).toHaveCount(1);
     expect(`.o_data_row`).toHaveCount(10);
     expect(`.o_nocontent_help`).toHaveCount(1);
-    expect(".ribbon").toHaveCount(1);
-    expect(".ribbon").toHaveText("SAMPLE DATA");
 
     // Check list sample data
     expect(`.o_data_row .o_data_cell:eq(0)`).toHaveText("", {
@@ -7269,7 +7267,6 @@ test(`empty list with sample data`, async () => {
     expect(`.o_list_view .o_content`).not.toHaveClass("o_view_sample_data");
     expect(`.o_list_table`).toHaveCount(1);
     expect(`.o_nocontent_help`).toHaveCount(1);
-    expect(".ribbon").toHaveCount(0);
 
     await toggleMenuItem("False Domain");
     await toggleMenuItem("True Domain");
@@ -7277,7 +7274,6 @@ test(`empty list with sample data`, async () => {
     expect(`.o_list_table`).toHaveCount(1);
     expect(`.o_data_row`).toHaveCount(4);
     expect(`.o_nocontent_help`).toHaveCount(0);
-    expect(".ribbon").toHaveCount(0);
 });
 
 test(`refresh empty list with sample data`, async () => {
@@ -7428,7 +7424,6 @@ test(`non empty list with sample data`, async () => {
     expect(`.o_list_table`).toHaveCount(1);
     expect(`.o_data_row`).toHaveCount(4);
     expect(`.o_list_view .o_content`).not.toHaveClass("o_view_sample_data");
-    expect(".ribbon").toHaveCount(0);
 
     await toggleSearchBarMenu();
     await toggleMenuItem("true_domain");
@@ -7436,7 +7431,6 @@ test(`non empty list with sample data`, async () => {
     expect(`.o_list_table`).toHaveCount(1);
     expect(`.o_data_row`).toHaveCount(0);
     expect(`.o_list_view .o_content`).not.toHaveClass("o_view_sample_data");
-    expect(".ribbon").toHaveCount(0);
 });
 
 test(`click on header in empty list with sample data`, async () => {
diff --git a/addons/web/static/tests/views/pivot_view.test.js b/addons/web/static/tests/views/pivot_view.test.js
index 9b0e3c008546e..653ec398a9464 100644
--- a/addons/web/static/tests/views/pivot_view.test.js
+++ b/addons/web/static/tests/views/pivot_view.test.js
@@ -2814,12 +2814,9 @@ test("empty pivot view with sample data", async () => {
 
     expect(".o_pivot_view .o_content").toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent .abc").toHaveCount(1);
-    expect(".ribbon").toHaveCount(1);
-    expect(".ribbon").toHaveText("SAMPLE DATA");
     await removeFacet();
     expect(".o_pivot_view .o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent .abc").toHaveCount(0);
-    expect(".ribbon").toHaveCount(0);
     expect("table").toHaveCount(1);
 });
 
@@ -2843,13 +2840,11 @@ test("non empty pivot view with sample data", async () => {
 
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent .abc").toHaveCount(0);
-    expect(".ribbon").toHaveCount(0);
     expect("table").toHaveCount(1);
     await toggleSearchBarMenu();
     await toggleMenuItem("Small Than 0");
     expect(".o_content").not.toHaveClass("o_view_sample_data");
     expect(".o_view_nocontent .abc").toHaveCount(1);
-    expect(".ribbon").toHaveCount(0);
     expect("table").toHaveCount(0);
 });
 

From 664876d1f95b72dba50957556757e8bdb4e9de7d Mon Sep 17 00:00:00 2001
From: "Mahdi Alijani (malj)" <malj@odoo.com>
Date: Tue, 7 Oct 2025 13:44:42 +0000
Subject: [PATCH 031/673] [FIX] mrp: workorder duration inverse matching
 compute logic

Issue:

In this bug, workorder duration inverse is causing some
time_ids to be deleted.

To reproduce:
1- Create a db with mrp installed, and enable work orders in
   Setting
2- Create a MO, and confirm it
3- Add a new work order to the MO
4- Add two time tracking lines:
   - First one 10:00 -> 12:00
   - Second one 10:00 -> 11:00
5- As you see, duration reflects duration of first line as
 it is the interval duration
6- Save and close work center form. Then save MO form.
7- Open work orders again: As you see second line is unlinked

Cause:

The reason to this bug, is because in Enterprise, the
`_compute_duration` override changes the logic of how duration
is computed but the inverse function doesn't reflect the same
logic.

To be specific this is the compute function override:
https://github.com/odoo/enterprise/blob/3cbe2bbbfd989a3daaa32769a843aeaa09c7ed3e/mrp_workorder/models/mrp_workorder.py#L757-L766

In which duration is calculated using get_duration:
https://github.com/odoo/enterprise/blob/3cbe2bbbfd989a3daaa32769a843aeaa09c7ed3e/mrp_workorder/models/mrp_workorder.py#L828-L837

Which doesn't sum the durations, but calculates the intervals
duration counting overlaps only once.

However, there is no override of inverse method in Enterprise,
meaning that the logic behind inverse will not match with this
logic. In the inverse it is assumed duration is sum of all
time_ids intervals:
https://github.com/odoo/odoo/blob/9b286285a6c66bc2d629eacf651c3439cffb55cc/addons/mrp/models/mrp_workorder.py#L355-L400

As a result, if time_ids overlap:
new_order_duration < old_order_duration

As a result some time_ids will be unlinked and some will have
duration changed.

Fix:

Inside the inverse function in Community we can do:
```diff
+ old_order_duration = order.get_duration()
- sum(order.time_ids.mapped('duration'))
```

As get_duration in Odoo Community is:
https://github.com/odoo/odoo/blob/9b286285a6c66bc2d629eacf651c3439cffb55cc/addons/mrp/models/mrp_workorder.py#L889-L899

The order.get_duration will be sum of duration of all time_ids
in community, hence the logic will be unchanged.

In Enterprise, this is going to reflect the logic implemented
in override of get_duration, as a result the duration logic
will be consistent in compute and inverse function.

However, this might cause another issue:
If `order.duration` is not computed yet, and inverse method
`_set_duration` is called, then `get_duration` inside
`_set_duration` will be called before the `get_duration` in
compute method. As a result there might be a small unexpected
time difference between `old_order_duration` and
`new_order_diuration`. To avoid that inside
`get_working_duration` we can use cursor now instead:
```diff
+ now = self.env.cr.now()
- now = datetime.now()
```

opw-5082477

closes odoo/odoo#233828

X-original-commit: 937b2acde71eb187d9dbeaa6456d4498146253c9
Related: odoo/enterprise#98488
Signed-off-by: Lancelot Semal (lase) <lase@odoo.com>
Signed-off-by: Mohammadmahdi Alijani (malj) <malj@odoo.com>
---
 addons/mrp/models/mrp_workorder.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/models/mrp_workorder.py b/addons/mrp/models/mrp_workorder.py
index 7bfed5f008ee9..6fc1f2510aacf 100644
--- a/addons/mrp/models/mrp_workorder.py
+++ b/addons/mrp/models/mrp_workorder.py
@@ -345,7 +345,7 @@ def _compute_duration_expected(self):
     @api.depends('time_ids.duration', 'qty_produced')
     def _compute_duration(self):
         for order in self:
-            order.duration = sum(order.time_ids.mapped('duration'))
+            order.duration = order.get_duration()
             order.duration_unit = round(order.duration / max(order.qty_produced, 1), 2)  # rounding 2 because it is a time
             if order.duration_expected:
                 order.duration_percent = max(-2147483648, min(2147483647, 100 * (order.duration_expected - order.duration) / order.duration_expected))
@@ -360,7 +360,7 @@ def _float_duration_to_second(duration):
             return minutes * 60 + seconds
 
         for order in self:
-            old_order_duration = sum(order.time_ids.mapped('duration'))
+            old_order_duration = order.get_duration()
             new_order_duration = order.duration
             if new_order_duration == old_order_duration:
                 continue
@@ -890,8 +890,9 @@ def get_working_duration(self):
         """Get the additional duration for 'open times' i.e. productivity lines with no date_end."""
         self.ensure_one()
         duration = 0
+        now = self.env.cr.now()
         for time in self.time_ids.filtered(lambda time: not time.date_end):
-            duration += (datetime.now() - time.date_start).total_seconds() / 60
+            duration += (now - time.date_start).total_seconds() / 60
         return duration
 
     def get_duration(self):

From 6ee721da51f90e56487901488f28145fe4d25e7f Mon Sep 17 00:00:00 2001
From: Elliot ELCO <elco@odoo.com>
Date: Wed, 8 Oct 2025 14:54:33 +0000
Subject: [PATCH 032/673] [IMP] web: calendar view wrong end time at create

When creating an event in week view spanning over multiple days, all
parts of the event display 12pm as end date (except the last one) and
00am as the start date (except the first one).

This fix allow calendar views to display the correct hour in week view
when the event spans multiple days.

task-4700158

closes odoo/odoo#233827

X-original-commit: 22cec35b0ff10042851589b6171b13ae9cbd21e7
Signed-off-by: Bastien Pierre (ipb) <ipb@odoo.com>
Signed-off-by: Elliot Cosneau (elco) <elco@odoo.com>
---
 .../calendar_common_renderer.js                | 16 ++++++++++------
 .../tests/views/calendar/calendar_view.test.js | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
index 7fc628d2d2982..148694267d88f 100644
--- a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
+++ b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
@@ -68,7 +68,7 @@ export class CalendarCommonRenderer extends Component {
         this.fc = useFullCalendar("fullCalendar", this.options);
         this.clickTimeoutId = null;
         this.popover = useCalendarPopover(this.constructor.components.Popover);
-
+        this.timeFormat = is24HourFormat() ? "HH:mm" : "hh:mm a";
         useBus(this.props.model.bus, "SCROLL_TO_CURRENT_HOUR", () =>
             this.fc.api.scrollToTime(`${luxon.DateTime.local().hour - 2}:00:00`)
         );
@@ -175,13 +175,11 @@ export class CalendarCommonRenderer extends Component {
     }
 
     getStartTime(record) {
-        const timeFormat = is24HourFormat() ? "HH:mm" : "hh:mm a";
-        return record.start.toFormat(timeFormat);
+        return record.start.toFormat(this.timeFormat);
     }
 
     getEndTime(record) {
-        const timeFormat = is24HourFormat() ? "HH:mm" : "hh:mm a";
-        return record.end.toFormat(timeFormat);
+        return record.end.toFormat(this.timeFormat);
     }
 
     computeEventSelector(event) {
@@ -253,7 +251,13 @@ export class CalendarCommonRenderer extends Component {
             }, 250);
         }
     }
-    onEventContent({ event }) {
+    onEventContent(arg) {
+        const { event } = arg;
+        if (event.start && event.end) {
+            const dateFmt = (date) =>
+                luxon.DateTime.fromJSDate(date).toFormat(this.timeFormat);
+            arg.timeText = `${dateFmt(event.start)} - ${dateFmt(event.end)}`;
+        }
         const record = this.props.model.records[event.id];
         if (record) {
             // This is needed in order to give the possibility to change the event template.
diff --git a/addons/web/static/tests/views/calendar/calendar_view.test.js b/addons/web/static/tests/views/calendar/calendar_view.test.js
index a10a11b81f312..f2dcb576d7f42 100644
--- a/addons/web/static/tests/views/calendar/calendar_view.test.js
+++ b/addons/web/static/tests/views/calendar/calendar_view.test.js
@@ -1445,7 +1445,6 @@ test(`create event with timezone in week mode European locale`, async () => {
             </calendar>
         `,
     });
-
     await selectTimeRange("2016-12-13 08:00:00", "2016-12-13 10:00:00");
     expect(`.fc-event-main .fc-event-time`).toHaveText("08:00 - 10:00");
 
@@ -1460,6 +1459,23 @@ test(`create event with timezone in week mode European locale`, async () => {
     expect(`.fc-event-main`).toHaveCount(0);
 });
 
+test(`create multi day event in week mode`, async () => {
+    mockTimeZone(2);
+
+    patchWithCleanup(CalendarCommonRenderer.prototype, {
+        get options() {
+            return { ...super.options, selectAllow: () => true };
+        },
+    });
+    await mountView({
+        resModel: "event",
+        type: "calendar",
+        arch: `<calendar date_start="start" date_stop="stop" mode="week"/>`,
+    });
+    await selectTimeRange("2016-12-13 11:00:00", "2016-12-14 16:00:00");
+    expect(`.fc-event-main .fc-event-time`).toHaveText("11:00 - 16:00");
+});
+
 test(`default week start (US)`, async () => {
     // if not given any option, default week start is on Sunday
     mockTimeZone(-7);

From 58392e961de7cc94bd501026a1371e4fee2f5313 Mon Sep 17 00:00:00 2001
From: adip-odoo <adip@odoo.com>
Date: Mon, 13 Oct 2025 11:34:02 +0000
Subject: [PATCH 033/673] [FIX] stock: prevent error when horizon days field is
 empty

Currently, an error occurs when the Horizon days field was cleared in the
Replenishment view by the user.

Step to Reproduce:
- Install the purchase_stock module.
- Create a new product and set the Minimum Quantity in the reordering rule (e.g., 5).
- Update the In Hand Quantity to a value greater than the minimum (e.g., 10).
- Go to Inventory > Operations > Replenishment.
- In the Horizon section on the left panel, clear the days field.

Error:
TypeError- unsupported operand type(s) for +: 'NoneType' and 'int'

Cause:
When the Horizon days field is cleared, NaN value is assigned to the context as
`global_horizon_days` at [1]. As a result, the get_horizon_days() method
returns None, which later triggers an error at [2] when performing date computation.

Fix:
This commit handles the issue by defaulting the Horizon days value to 0,
when the input is empty.

[1] - https://github.com/odoo/odoo/blob/e7aeef2fca0897e5240b087e2c3b95291ed6d568/addons/stock/static/src/views/search/stock_orderpoint_search_panel.js#L21-L24
[2] - https://github.com/odoo/odoo/blob/e7aeef2fca0897e5240b087e2c3b95291ed6d568/addons/stock/models/stock_orderpoint.py#L816

sentry-6936562315

closes odoo/odoo#233835

X-original-commit: b081d313f47b4e7f545ba5f7ddbfd3e17b05efd8
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 .../static/src/views/search/stock_orderpoint_search_panel.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/static/src/views/search/stock_orderpoint_search_panel.js b/addons/stock/static/src/views/search/stock_orderpoint_search_panel.js
index 2bcef8a6f277d..21493c9d5f684 100644
--- a/addons/stock/static/src/views/search/stock_orderpoint_search_panel.js
+++ b/addons/stock/static/src/views/search/stock_orderpoint_search_panel.js
@@ -19,7 +19,7 @@ export class StockOrderpointSearchPanel extends SearchPanel {
     }
 
     async applyGlobalHorizonDays(ev) {
-        this.globalHorizonDays.value = Math.max(parseInt(ev.target.value), 0);
+        this.globalHorizonDays.value = Math.max(parseInt(ev.target.value || 0), 0);
         await this.env.searchModel.applyGlobalHorizonDays(this.globalHorizonDays.value);
     }
 }

From 8772a6eca78f870c9ef009f3020d09d26a127646 Mon Sep 17 00:00:00 2001
From: utma-odoo <utma@odoo.com>
Date: Mon, 27 Oct 2025 12:54:14 +0000
Subject: [PATCH 034/673] [FIX] tools: prevent error when uploading invalid pdf
 file

Currently, an error occurs when trying to preview the first page of a PDF
attachment in Discuss if the PDF has no raw data.

Steps to produce:
- Install the mail module.
- Open Discuss and attach the PDF file without raw data [1].

Error:
TypeError: a bytes-like object is required, not 'bool'

Root cause:
At [3], to_pdf_stream directly calls io.BytesIO(), when the attachment has no
raw data, Python raises an error.

Fix:
This commit prevents errors when a user attaches a PDF file that has no raw data.

[1]:
https://drive.google.com/file/d/1onJYlCL_k51UwqKhc0kFaYFJynKuk4fT/view?usp=sharing

[2]:
https://github.com/odoo/odoo/blob/d42102cac8fff3967cb605a897bbb0e8690464ed/odoo/tools/pdf/__init__.py#L222

sentry-6963775400

closes odoo/odoo#233863

X-original-commit: 7563392be6c457b799b2700d39b2d424ca32a02e
Signed-off-by: Chong Wang (cwg) <cwg@odoo.com>
Signed-off-by: Utsav Maru (utma) <utma@odoo.com>
---
 odoo/tools/pdf/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/odoo/tools/pdf/__init__.py b/odoo/tools/pdf/__init__.py
index e23e88b9956b3..5ac4f44b55bec 100644
--- a/odoo/tools/pdf/__init__.py
+++ b/odoo/tools/pdf/__init__.py
@@ -217,8 +217,11 @@ def rotate_pdf(pdf):
         return _buffer.getvalue()
 
 
-def to_pdf_stream(attachment) -> io.BytesIO:
+def to_pdf_stream(attachment) -> io.BytesIO | None:
     """Get the byte stream of the attachment as a PDF."""
+    if not attachment.raw:
+        _logger.warning("%s has no raw data.", attachment)
+        return None
     stream = io.BytesIO(attachment.raw)
     if attachment.mimetype == 'application/pdf':
         return stream
@@ -227,6 +230,7 @@ def to_pdf_stream(attachment) -> io.BytesIO:
         Image.open(stream).convert("RGB").save(output_stream, format="pdf")
         return output_stream
     _logger.warning("mimetype (%s) not recognized for %s", attachment.mimetype, attachment)
+    return None
 
 
 def extract_page(attachment, num_page=0) -> io.BytesIO | None:

From 0f13ce988215a313c436b725b46336aeae12e642 Mon Sep 17 00:00:00 2001
From: Ian <iada@odoo.com>
Date: Thu, 2 Oct 2025 21:44:28 +0000
Subject: [PATCH 035/673] [FIX] hr: traceback when archiving employee

Issue:
The tracking is not implemented for the html field,
so when we archive an employee the tracking cannot work.

Purpose of this PR:
The tracking has been removed from the html field.
The tracking is now replaced by a message in the chatter in the write method.

Steps to Reproduce on Runbot:
install hr
archive employee
set a `departure description`

Notes:
originally fixed by #140527
reintroduced by #223342

opw-5137695

closes odoo/odoo#233855

X-original-commit: 48d7ce6849563c2d0ea4f5a23da98e2e49c469e7
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Ian Dao (iada) <iada@odoo.com>
---
 addons/hr/tests/test_hr_version.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr/tests/test_hr_version.py b/addons/hr/tests/test_hr_version.py
index 6ffec2c5add38..d262b7fa8f953 100644
--- a/addons/hr/tests/test_hr_version.py
+++ b/addons/hr/tests/test_hr_version.py
@@ -652,6 +652,7 @@ def test_hr_version_fields_tracking(self):
             "currency_id",
             "date_end",
             "date_start",
+            "departure_description",
             "display_name",
             "id",
             "is_current",

From 54ebb4ca3cc196c6a22a5b6c7a95f84f8f238b58 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Tue, 28 Oct 2025 13:54:05 +0000
Subject: [PATCH 036/673] [FIX] project_todo: reset context to avoid adding
 additional todo vals

Before this commit, when the user creates a new user from the user_ids
field of a task, an onboarding todo will be created with the context
given by Framework JS, which means, if the context contains
`default_project_id` the onboarding todo will become a task inside the
project instead of being a real todo (task with no project set).

This commit makes sure the context is reset before creating the
onboarding todo.

task-5217306

closes odoo/odoo#233758

X-original-commit: c10c50a964021ff714a5f72ca24a786fe30a644d
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/project_todo/models/res_users.py              |  2 +-
 .../tests/test_todo_onboarding_for_users.py          | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/project_todo/models/res_users.py b/addons/project_todo/models/res_users.py
index 2f200031897d4..e73f9a252a5a3 100644
--- a/addons/project_todo/models/res_users.py
+++ b/addons/project_todo/models/res_users.py
@@ -104,4 +104,4 @@ def _generate_onboarding_todo(self):
                 "name": title,
             })
         if create_vals:
-            self.env["project.task"].with_user(SUPERUSER_ID).with_context(mail_auto_subscribe_no_notify=True).create(create_vals)
+            self.env["project.task"].with_user(SUPERUSER_ID).with_context({'mail_auto_subscribe_no_notify': True}).create(create_vals)
diff --git a/addons/project_todo/tests/test_todo_onboarding_for_users.py b/addons/project_todo/tests/test_todo_onboarding_for_users.py
index e700937031cbf..73ecb976c9763 100644
--- a/addons/project_todo/tests/test_todo_onboarding_for_users.py
+++ b/addons/project_todo/tests/test_todo_onboarding_for_users.py
@@ -17,6 +17,7 @@ def test_onboarding_stages_and_task_created_for_new_users(self):
         onboarding_tasks = ProjectTaskSudo.search([('user_ids', 'in', internal_user.ids)])
 
         self.assertEqual(len(onboarding_tasks), 1, "Exactly 1 onboarding task should be created for internal users upon creation.")
+        self.assertFalse(onboarding_tasks.project_id, "Onboarding task should not be linked to any project.")
         portal_user = new_test_user(
             self.env,
             login="portal_user",
@@ -32,3 +33,14 @@ def test_onboarding_stages_and_task_created_for_new_users(self):
         )
         onboarding_tasks = ProjectTaskSudo.search([('user_ids', 'in', public_user.ids)])
         self.assertEqual(len(onboarding_tasks), 0, "Public users should not receive onboarding tasks upon creation.")
+
+        project = self.env['project.project'].create({'name': 'Test Project'})
+        other_internal_user = new_test_user(
+            self.env,
+            login="other_internal_user",
+            groups="base.group_user",
+            context={'default_project_id': project.id},
+        )
+        onboarding_tasks = ProjectTaskSudo.search([('user_ids', 'in', other_internal_user.ids)])
+        self.assertEqual(len(onboarding_tasks), 1, "Exactly 1 onboarding task should be created for internal users upon creation.")
+        self.assertFalse(onboarding_tasks.project_id, "Onboarding task should not be linked to any project.")

From 9d5efd1493cb9b7a098b258bc027735e0d50f2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Thu, 30 Oct 2025 14:03:43 +0000
Subject: [PATCH 037/673] [FIX] im_livechat, *: last agent leaving from chat
 window ends convo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: mail

Before this commit, when the last agent from a live chat conversation
leave, the live chat conversation did not end.

Steps to reproduce:
- install "ai" and "im_livechat" modules
- have a visitor initiate a live chat conversation with 1 available
human agent
- have have human agent open conversation in chat window and close
chat window + confirm button
=> the live chat conversation does not end

When live chat agent is about to close the chat window of live chat,
there's a warning to tell that this will make him/her leave the
conversation and thus end the conversation. When proceeding, it
doesn't actually do this.

This is a bug caused by overrides of `ChatWindow._onClose()`, which
is a function invoked during the closing of chat window, that has
an option `notifyState` that determines whether the user leaves the
conversation or not. The overridden code had to ensure the param is
preserved and passed to `super` calls, but they fail to do this, and
thus the closing of chat window is not making the user leave the
conversation.

This commit fixes the issue by passing `...arguments` to super calls
to make sure the params are preserved as expected by original code
of the `_onClose` function.

Note that we had a test for the good working of the feature, but this
test run with `im_livechat` assets and not overrides on top of it
such as `ai` module. The main culpit of the problem was caused by
the override in `ai` module. To have test coverage for this problem,
the test is not executed in both `im_livechat` test suite and the
`test_discuss_full_enterprise`, which is a module whose HOOT suite
runs code of discuss with all overrides such as `ai` module.

closes odoo/odoo#233876

X-original-commit: 3b4e170f2845f7709521cf24bd1cd931c812ea82
Related: odoo/enterprise#98513
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../public_web/chat_window_model_patch.js     |  4 +-
 .../static/tests/channel_join_leave.test.js   | 31 +------------
 .../static/tests/im_livechat_shared_tests.js  | 43 +++++++++++++++++++
 .../src/core/web/chat_window_model_patch.js   |  2 +-
 4 files changed, 48 insertions(+), 32 deletions(-)
 create mode 100644 addons/im_livechat/static/tests/im_livechat_shared_tests.js

diff --git a/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js b/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js
index 958b3b44bae31..be2f5cf8e9335 100644
--- a/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js
@@ -8,13 +8,13 @@ patch(ChatWindow.prototype, {
             this.channel.livechatVisitorMember?.persona?.notEq(this.store.self)
         ) {
             const channel = this.channel; // save ref before delete
-            super._onClose();
+            super._onClose(...arguments);
             this.delete();
             if (options.notifyState) {
                 channel.leaveChannel({ force: true });
             }
         } else {
-            super._onClose();
+            super._onClose(...arguments);
         }
     },
 });
diff --git a/addons/im_livechat/static/tests/channel_join_leave.test.js b/addons/im_livechat/static/tests/channel_join_leave.test.js
index a30d132ba9065..39a9d0ddd50c4 100644
--- a/addons/im_livechat/static/tests/channel_join_leave.test.js
+++ b/addons/im_livechat/static/tests/channel_join_leave.test.js
@@ -13,6 +13,7 @@ import { describe, test } from "@odoo/hoot";
 import { withGuest } from "@mail/../tests/mock_server/mail_mock_server";
 import { rpc } from "@web/core/network/rpc";
 import { serializeDate, today } from "@web/core/l10n/dates";
+import { livechatLastAgentLeaveFromChatWindow } from "./im_livechat_shared_tests";
 
 describe.current.tags("desktop");
 defineLivechatModels();
@@ -105,35 +106,7 @@ test("from the command palette", async () => {
     await contains(".o_notification", { text: "You joined HR." });
 });
 
-test("from chat window", async () => {
-    const pyEnv = await startServer();
-    pyEnv["res.users"].write([serverState.userId], {
-        group_ids: pyEnv["res.groups"]
-            .search_read([["id", "=", serverState.groupLivechatId]])
-            .map(({ id }) => id),
-    });
-    const guestId = pyEnv["mail.guest"].create({ name: "Visitor" });
-    const livechatChannelId = pyEnv["im_livechat.channel"].create({
-        name: "HR",
-        user_ids: [serverState.userId],
-    });
-    const channelId = pyEnv["discuss.channel"].create({
-        channel_type: "livechat",
-        channel_member_ids: [
-            Command.create({ partner_id: serverState.partnerId, livechat_member_type: "agent" }),
-            Command.create({ guest_id: guestId, livechat_member_type: "visitor" }),
-        ],
-        livechat_channel_id: livechatChannelId,
-        livechat_operator_id: serverState.partnerId,
-        create_uid: serverState.publicUserId,
-    });
-    setupChatHub({ opened: [channelId] });
-    await start();
-    await contains(".o-mail-ChatWindow");
-    await click("button[title*='Close Chat Window']");
-    await click("button:contains('Yes, leave conversation')");
-    await contains(".o-mail-ChatWindow", { count: 0 });
-});
+test("from chat window", livechatLastAgentLeaveFromChatWindow);
 
 test("visitor leaving ends the livechat conversation", async () => {
     const pyEnv = await startServer();
diff --git a/addons/im_livechat/static/tests/im_livechat_shared_tests.js b/addons/im_livechat/static/tests/im_livechat_shared_tests.js
new file mode 100644
index 0000000000000..97c29e316de6c
--- /dev/null
+++ b/addons/im_livechat/static/tests/im_livechat_shared_tests.js
@@ -0,0 +1,43 @@
+import { expect } from "@odoo/hoot";
+import {
+    click,
+    contains,
+    setupChatHub,
+    start,
+    startServer,
+} from "@mail/../tests/mail_test_helpers";
+import { Command, onRpc, serverState } from "@web/../tests/web_test_helpers";
+
+export async function livechatLastAgentLeaveFromChatWindow() {
+    const pyEnv = await startServer();
+    pyEnv["res.users"].write([serverState.userId], {
+        group_ids: pyEnv["res.groups"]
+            .search_read([["id", "=", serverState.groupLivechatId]])
+            .map(({ id }) => id),
+    });
+    const guestId = pyEnv["mail.guest"].create({ name: "Visitor" });
+    const livechatChannelId = pyEnv["im_livechat.channel"].create({
+        name: "HR",
+        user_ids: [serverState.userId],
+    });
+    const channelId = pyEnv["discuss.channel"].create({
+        channel_type: "livechat",
+        channel_member_ids: [
+            Command.create({ partner_id: serverState.partnerId, livechat_member_type: "agent" }),
+            Command.create({ guest_id: guestId, livechat_member_type: "visitor" }),
+        ],
+        livechat_channel_id: livechatChannelId,
+        livechat_operator_id: serverState.partnerId,
+        create_uid: serverState.publicUserId,
+    });
+    setupChatHub({ opened: [channelId] });
+    onRpc("discuss.channel", "action_unfollow", () => {
+        expect.step("action_unfollow");
+    });
+    await start();
+    await contains(".o-mail-ChatWindow");
+    await click("button[title*='Close Chat Window']");
+    await click("button:contains('Yes, leave conversation')");
+    await expect.waitForSteps(["action_unfollow"]);
+    await contains(".o-mail-ChatWindow", { count: 0 });
+}
diff --git a/addons/mail/static/src/core/web/chat_window_model_patch.js b/addons/mail/static/src/core/web/chat_window_model_patch.js
index 33debc927a76a..7890a1c5a0325 100644
--- a/addons/mail/static/src/core/web/chat_window_model_patch.js
+++ b/addons/mail/static/src/core/web/chat_window_model_patch.js
@@ -17,6 +17,6 @@ patch(ChatWindow.prototype, {
             // ensure messaging menu is opened before chat window is closed
             await Promise.resolve();
         }
-        await super._onClose(options);
+        await super._onClose(...arguments);
     },
 });

From c3776136dcb99a4108881b0e2d77980fb30e09ea Mon Sep 17 00:00:00 2001
From: tong-odoo <tong@odoo.com>
Date: Tue, 28 Oct 2025 05:39:10 +0000
Subject: [PATCH 038/673] [FIX] pos_imin: iMin cashbox not working

Explanation:

openCashbox() is calling this.connected to check if iMin is connected.
However the variable is changed to isConnected in the previous PR.
Therefore it will always return null.

closes odoo/odoo#233375

X-original-commit: 66042dcccd99009d58b704ea2e0a99a35d8306e2
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Tommy Ng (tong) <tong@odoo.com>
---
 addons/pos_imin/static/src/app/utils/imin_printer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/pos_imin/static/src/app/utils/imin_printer.js b/addons/pos_imin/static/src/app/utils/imin_printer.js
index b1c0143510297..bbd965f2b1cb7 100644
--- a/addons/pos_imin/static/src/app/utils/imin_printer.js
+++ b/addons/pos_imin/static/src/app/utils/imin_printer.js
@@ -114,7 +114,7 @@ export class IminPrinterAdapter extends BasePrinter {
      * @override
      */
     openCashbox() {
-        if (!this.connected) {
+        if (!this.isConnected) {
             return;
         }
         try {

From 6f91f3f5ab6ca50b1ea92d73b2184a56dd21156f Mon Sep 17 00:00:00 2001
From: adip-odoo <adip@odoo.com>
Date: Mon, 27 Oct 2025 11:57:57 +0000
Subject: [PATCH 039/673] [FIX] mrp: prevent error on splitting multiple
 manufacturing orders at once

Currently, an error occurs when trying to split multiple manufacturing orders
at once from the list view.

Steps to Reproduce:
1. Install the MRP module with demo data.
2. Select multiple manufacturing orders from the list view.
3. Click on the "Split" option under the Action button.

Error:
ValueError - Expected singleton: mrp.production.split(1, 2, 3, 4, 5, 6, 7, 8, 9)

Cause:
The `_compute_num_splits` method referenced `self.max_batch_size` directly,
which expects a single record. When multiple records were processed at once,
this caused a singleton error.

Fix:
This commit handles multiple manufacturing order splits to prevent the error.

sentry-6951925545

closes odoo/odoo#233862

X-original-commit: 2b3f7520d5106159608e2fee3827190eb4034072
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
Signed-off-by: Aditi Patel (adip) <adip@odoo.com>
---
 addons/mrp/tests/test_backorder.py        | 33 +++++++++++++++++++++++
 addons/mrp/wizard/mrp_production_split.py |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/tests/test_backorder.py b/addons/mrp/tests/test_backorder.py
index a871fd6f4370e..7b70a434c1acb 100644
--- a/addons/mrp/tests/test_backorder.py
+++ b/addons/mrp/tests/test_backorder.py
@@ -662,6 +662,39 @@ def test_split_mo(self):
         self.assertEqual(mo.product_qty, 1)
         self.assertEqual(mo.move_raw_ids.mapped('product_uom_qty'), [0.5, 1])
 
+    def test_split_multiple_MOs(self):
+        """
+        Test that when multiple MOs are selected and the split
+        action is triggered, each MO is processed and split correctly.
+        """
+        mos = self.env['mrp.production'].create([
+            {
+                'product_id': self.product_4.id,
+                'product_qty': 10,
+            }, {
+                'product_id': self.product_6.id,
+                'product_qty': 20,
+            }
+        ])
+        for mo in mos:
+            self.assertEqual(mo.state, 'draft')
+
+        # trigger the split wizard for both MOs
+        action = mos.action_split()
+        wizard = Form.from_action(self.env, action)
+        wizard_record = wizard.save()
+
+        # simulate clicking the “Split Production” button for each MO line
+        for line in wizard_record.production_ids:
+            split_action = line.action_prepare_split()
+            split_wizard = Form.from_action(self.env, split_action)
+            split_wizard.max_batch_size = 5
+            split_wizard.save().action_split()
+
+        # verify that each MO is split into expected number of productions
+        self.assertEqual(len(mos[0].production_group_id.production_ids), 2)
+        self.assertEqual(len(mos[1].production_group_id.production_ids), 4)
+
     def test_split_mo_partially_available(self):
         """
         Test that an MO components availability is correct after split.
diff --git a/addons/mrp/wizard/mrp_production_split.py b/addons/mrp/wizard/mrp_production_split.py
index ec3d875bf5a08..3c54ea2c9eaac 100644
--- a/addons/mrp/wizard/mrp_production_split.py
+++ b/addons/mrp/wizard/mrp_production_split.py
@@ -39,7 +39,7 @@ def _compute_max_batch_size(self):
     def _compute_num_splits(self):
         self.num_splits = 0
         for wizard in self:
-            if wizard.product_uom_id.compare(self.max_batch_size, 0) > 0:
+            if wizard.product_uom_id.compare(wizard.max_batch_size, 0) > 0:
                 wizard.num_splits = float_round(
                     wizard.product_qty / wizard.max_batch_size,
                     precision_digits=0,

From f29066b6a7e9ac6fbb2d165b17405168748feb7b Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@odoo.com>
Date: Wed, 29 Oct 2025 12:44:20 +0000
Subject: [PATCH 040/673] [FIX] im_livechat: fix operator not able to pin
 message in LC session

To reproduce (on runbot):

- S1: Connect as "admin", leave the "YourWebsite.com" then logout
- S1: Connect as "demo" user

- S2: As public user, go to /contactus and start a chat session
- S2: On the chatbot interaction, choose "I have a pricing question"
      (this will forward to the operator)
- S2: enter a message

- S1: On the livechat session, try to pin the last user message

Since 1ecddc3d79dd an `AccessError` is raised, as the "demo" user
(which is only `LiveChat / User`) don't have access to the chatbot step
anymore.

As we're not in the interacting with the chatbot when pinning a message,
simplify skip that part if there is no "chatbotx answner" context to
prevent the `AccessError`.

tmp

closes odoo/odoo#233878

X-original-commit: cc197141c4e3b2f68ad583aa1615f2fdce53bc04
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/im_livechat/models/discuss_channel.py   |  4 ++--
 addons/website_livechat/controllers/chatbot.py | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/im_livechat/models/discuss_channel.py b/addons/im_livechat/models/discuss_channel.py
index a1772ff7b4876..cbae615e1afcc 100644
--- a/addons/im_livechat/models/discuss_channel.py
+++ b/addons/im_livechat/models/discuss_channel.py
@@ -755,13 +755,13 @@ def _message_post_after_hook(self, message, msg_vals):
         It's created only if the mail channel is linked to a chatbot step. We also need to save the
         user answer if the current step is a question selection.
         """
-        if self.chatbot_current_step_id:
+        if self.chatbot_current_step_id and not self.livechat_agent_history_ids:
             selected_answer = (
                 self.env["chatbot.script.answer"]
                 .browse(self.env.context.get("selected_answer_id"))
                 .exists()
             )
-            if selected_answer in self.chatbot_current_step_id.answer_ids:
+            if selected_answer and selected_answer in self.chatbot_current_step_id.answer_ids:
                 # sudo - chatbot.message: finding the question message to update the user answer is allowed.
                 question_msg = (
                     self.env["chatbot.message"]
diff --git a/addons/website_livechat/controllers/chatbot.py b/addons/website_livechat/controllers/chatbot.py
index 4c46837a5817f..e284124797d8b 100644
--- a/addons/website_livechat/controllers/chatbot.py
+++ b/addons/website_livechat/controllers/chatbot.py
@@ -33,9 +33,15 @@ def chatbot_test_script(self, chatbot_script):
                         # so that the channel is unpinned
                         "unpin_dt": fields.Datetime.now(),
                         "last_interest_dt": fields.Datetime.now() - timedelta(seconds=30),
-                    }
+                        "livechat_member_type": "bot",
+                    },
+                ),
+                Command.create(
+                    {
+                        "partner_id": request.env.user.partner_id.id,
+                        "livechat_member_type": "visitor",
+                    },
                 ),
-                Command.create({"partner_id": request.env.user.partner_id.id}),
             ],
             'livechat_operator_id': chatbot_script.operator_partner_id.id,
             'chatbot_current_step_id': chatbot_script._get_welcome_steps()[-1].id,

From 76c891e4e9d53d62b8971cc0d68ec24e3e93fd93 Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Thu, 16 Oct 2025 07:59:52 +0000
Subject: [PATCH 041/673] [IMP] html_builder, website: reset crop after shape
 removal

Steps to reproduce:

- Enter website edit mode.
- Drag and drop a snippet containing an image onto the page.
- Click the image.
- Apply a shape that enforces a 1/1 ratio with stretch disabled (e.g the
first one).
- Remove the shape with the close button.

Before this commit, removing the shape kept data-aspect-ratio at 1/1,
so the picture stayed cropped or distorted.

After this commit, removing the shape clears the crop dataset when no
manual crop values exist, restoring the original proportions.

task-5170195

closes odoo/odoo#233852

X-original-commit: 0c4ad96e585980c62e219c7bfd28e08c75964705
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 .../plugins/image/image_shape_option_plugin.js | 13 +++++++++++++
 .../static/tests/builder/image_shape.test.js   | 18 ++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js
index 849d6856bc852..292b06cd15596 100644
--- a/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js
@@ -5,6 +5,7 @@ import { getShapeURL } from "@html_builder/plugins/image/image_helpers";
 import {
     activateCropper,
     createDataURL,
+    cropperDataFields,
     loadImage,
     loadImageInfo,
     isGif,
@@ -406,6 +407,18 @@ export class SetImageShapeAction extends BuilderAction {
     static dependencies = ["imageShapeOption"];
     async load({ editingElement: img, value: shapeId }) {
         const params = { shape: shapeId };
+        // A crop is applied to the image at the same time as certain shapes,
+        // which is why we reset the crop here or when the shape is removed.
+        // However, we don’t reset it when the crop was applied intentionally.
+        // In that case, there are crop values; otherwise, there are none,
+        // only a 'data-aspect-ratio'.
+        if (
+            !shapeId &&
+            img.dataset.aspectRatio &&
+            !cropperDataFields.some((field) => field in img.dataset)
+        ) {
+            params["aspectRatio"] = undefined;
+        }
         // todo nby: re-read the old option method `setImgShape` and be sure all the logic is in there
         return this.dependencies.imageShapeOption.loadShape(img, params);
     }
diff --git a/addons/website/static/tests/builder/image_shape.test.js b/addons/website/static/tests/builder/image_shape.test.js
index 7311b224273f2..4e7469fbed357 100644
--- a/addons/website/static/tests/builder/image_shape.test.js
+++ b/addons/website/static/tests/builder/image_shape.test.js
@@ -524,3 +524,21 @@ describe("toggle ratio", () => {
         expect(`:iframe .test-options-target img`).not.toHaveAttribute("src", croppedSrc);
     });
 });
+
+test("Should reset crop when removing shape with ratio", async () => {
+    const { waitSidebarUpdated } = await setupWebsiteBuilder(`
+        <div class="test-options-target">
+            ${testImg}
+        </div>
+    `);
+
+    await contains(":iframe .test-options-target img").click();
+    await contains("[data-label='Shape'] .dropdown").click();
+    await contains("[data-action-value='html_builder/geometric/geo_shuriken']").click();
+    await waitSidebarUpdated();
+    expect(`:iframe .test-options-target img`).toHaveAttribute("data-aspect-ratio");
+    // Remove the shape.
+    await contains("[data-action-id='setImageShape']").click();
+    await waitSidebarUpdated();
+    expect(`:iframe .test-options-target img`).not.toHaveAttribute("data-aspect-ratio");
+});

From c85df20341092d0f354a25db4a2f0bbec00ecdfb Mon Sep 17 00:00:00 2001
From: plha-odoo <plha@odoo.com>
Date: Fri, 3 Oct 2025 17:03:36 +0000
Subject: [PATCH 042/673] [FIX] mrp_subcontracting: prevent unbuild
 subcontracted MO

**Problem:**
unbuilding a Manufactring order created through a subcontracting
process gives the wrong account move lines

**Steps to reproduce:**
- create a storable product (the comp) and set a cost
- create a storable product (the final product), set a cost
and set a vendor
- for the final product set the category as avco and automated
- for the final product create a bill of materials subcontracted
 and set the same vendor
- for the components add the comp for a quantity of 1
- create a Purchase order for the final product and the same vendor
and confirm
- validate the receipt
- From the receipt click on the valuation smart button and click on
the book widget of the line of the final product
- notice how there is 3 journal items line including one
crediting "stock interim (Received)"
- unarchive the operation type "subcontracting"
- open Manufacturing/Manufacturing Orders, delete the "to do"
filter and search for a Manufacturing order with your final product
- unbuild it
- Open accounting/journal entries and select the journal entry for
the unbuild

**Current behavior:**
There is only two account lines.
There is no line balancing the "Stock Interim" line of the
manufacturing order.

**Cause of the issue:**
The override of _generate_valuation_lines_data in
mrp_subcontracted_account adds the stock interim line on the
manufacturing order.
However when unbuilding, the qty is negative so we exit the function
https://github.com/odoo/odoo/blob/1358f93a4c73de5a28cda72ec78769625c863efd/addons/mrp_subcontracting_account/models/stock_move.py#L20

**fix**
Because subcontracted Manufacturing orders are not meant
to be unbuilt, we prevent it

opw-4998137

closes odoo/odoo#233742

X-original-commit: 7d7488acb00232c51348e6a66966f0bf12a56207
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
Signed-off-by: Pierre-Louis Hance (plha) <plha@odoo.com>
---
 addons/mrp_subcontracting/models/__init__.py     |  1 +
 addons/mrp_subcontracting/models/mrp_unbuild.py  | 15 +++++++++++++++
 .../tests/test_subcontracting.py                 | 16 ++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 addons/mrp_subcontracting/models/mrp_unbuild.py

diff --git a/addons/mrp_subcontracting/models/__init__.py b/addons/mrp_subcontracting/models/__init__.py
index 33434a1c1f6a5..6547f4657d3e8 100644
--- a/addons/mrp_subcontracting/models/__init__.py
+++ b/addons/mrp_subcontracting/models/__init__.py
@@ -12,3 +12,4 @@
 from . import stock_rule
 from . import stock_warehouse
 from . import mrp_production
+from . import mrp_unbuild
diff --git a/addons/mrp_subcontracting/models/mrp_unbuild.py b/addons/mrp_subcontracting/models/mrp_unbuild.py
new file mode 100644
index 0000000000000..ee71a0dbcc33b
--- /dev/null
+++ b/addons/mrp_subcontracting/models/mrp_unbuild.py
@@ -0,0 +1,15 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, _
+from odoo.exceptions import UserError
+
+
+class MrpProduction(models.Model):
+    _inherit = 'mrp.production'
+
+    def button_unbuild(self):
+        if self.subcontractor_id:
+            raise UserError(_(
+                "You can't unbuild a subcontracted Manufacturing Order.",
+            ))
+        return super().button_unbuild()
diff --git a/addons/mrp_subcontracting/tests/test_subcontracting.py b/addons/mrp_subcontracting/tests/test_subcontracting.py
index e71c6f67080ad..441cde23b59bd 100644
--- a/addons/mrp_subcontracting/tests/test_subcontracting.py
+++ b/addons/mrp_subcontracting/tests/test_subcontracting.py
@@ -933,6 +933,22 @@ def test_replenish_with_subcontracting_bom(self):
         })
         self.assertFalse(replenish_wizard.allowed_route_ids)
 
+    def test_subcontracting_unbuild_warning(self):
+        with Form(self.env['stock.picking']) as picking_form:
+            picking_form.picking_type_id = self.env.ref('stock.picking_type_in')
+            picking_form.partner_id = self.subcontractor_partner1
+            with picking_form.move_ids.new() as move:
+                move.product_id = self.finished
+                move.product_uom_qty = 3
+                move.quantity = 3
+            picking_receipt = picking_form.save()
+        picking_receipt.action_confirm()
+        subcontract = picking_receipt._get_subcontract_production()
+        error_message = "You can't unbuild a subcontracted Manufacturing Order."
+        with self.assertRaisesRegex(UserError, error_message):
+            subcontract.button_unbuild()
+
+
 @tagged('post_install', '-at_install')
 class TestSubcontractingTracking(TransactionCase):
 

From 2235a3aa522bbf8d8e13704dfbdf92cf616dca51 Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Tue, 21 Oct 2025 14:13:14 +0000
Subject: [PATCH 043/673] [FIX] pos_self_order: remove call to
 resetTableIdentifier

Before this commit, there was still a call to the resetTableIdentifier,
even though the function had been removed, which could cause errors.

opw-5166737

closes odoo/odoo#233829

X-original-commit: aa1ac27d046e9f77e2f646f2b6ac39969db16801
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 .../pos_self_order/static/src/app/services/self_order_service.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/pos_self_order/static/src/app/services/self_order_service.js b/addons/pos_self_order/static/src/app/services/self_order_service.js
index 2f35f2c236966..f1b9fed6f0920 100644
--- a/addons/pos_self_order/static/src/app/services/self_order_service.js
+++ b/addons/pos_self_order/static/src/app/services/self_order_service.js
@@ -724,7 +724,6 @@ export class SelfOrder extends Reactive {
                 cleanOrders = true;
             } else if (error?.data?.name === "odoo.exceptions.UserError") {
                 message = error.data.message;
-                this.resetTableIdentifier();
             }
         } else if (error instanceof ConnectionLostError) {
             this.dialog.add(NetworkConnectionLostPopup, {

From 0c8ff49676cd50b1eff8ffc9091461b694af766e Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Mon, 27 Oct 2025 16:53:30 +0000
Subject: [PATCH 044/673] [FIX] pos_sale: prevent setting lot when user cancels
 lot selection

Before this commit, when loading a sale order containing an order line
tracked by lot, the system prompted the user to select a lot. However,
even if the user canceled the selection, the lot was still added to the
order line.

After this commit, the lot will no longer be set if the user cancels
the selection.

opw-5162487

closes odoo/odoo#233873

X-original-commit: e0d95a1b1158589e36598e7a56db1004849f8ead
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 .../pos_sale/static/src/app/services/pos_store.js   |  6 +++++-
 addons/pos_sale/static/tests/tours/pos_sale_tour.js | 13 +++++++++++++
 .../static/tests/tours/utils/pos_sale_utils.js      |  6 ++++--
 addons/pos_sale/tests/test_pos_sale_flow.py         |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/addons/pos_sale/static/src/app/services/pos_store.js b/addons/pos_sale/static/src/app/services/pos_store.js
index 086e3890e2a6f..fd50ed0d18bec 100644
--- a/addons/pos_sale/static/src/app/services/pos_store.js
+++ b/addons/pos_sale/static/src/app/services/pos_store.js
@@ -178,7 +178,11 @@ patch(PosStore.prototype, {
             }
 
             // Order line can only hold one lot, so we need to split the line if there are multiple lots
-            if (line.product_id.tracking == "lot" && converted_line.lot_names.length > 0) {
+            if (
+                line.product_id.tracking == "lot" &&
+                converted_line.lot_names.length > 0 &&
+                useLoadedLots
+            ) {
                 newLine.delete();
                 for (const lot of converted_line.lot_names) {
                     const splitted_line = this.models["pos.order.line"].create({
diff --git a/addons/pos_sale/static/tests/tours/pos_sale_tour.js b/addons/pos_sale/static/tests/tours/pos_sale_tour.js
index 05533dbfdbe92..8f705ae78d3bc 100644
--- a/addons/pos_sale/static/tests/tours/pos_sale_tour.js
+++ b/addons/pos_sale/static/tests/tours/pos_sale_tour.js
@@ -516,6 +516,19 @@ registry.category("web_tour.tours").add("test_multiple_lots_sale_order_1", {
 });
 
 registry.category("web_tour.tours").add("test_multiple_lots_sale_order_2", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            PosSale.settleNthOrder(1, { loadSN: false }),
+            Order.hasLine({ productName: "Product", quantity: "3.0" }),
+            {
+                content: "Check that the line-lot-icon has text-danger class",
+                trigger: `.order-container .orderline:has(.product-name:contains("Product")) .line-lot-icon.text-danger`,
+            },
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("test_multiple_lots_sale_order_3", {
     steps: () =>
         [
             Chrome.startPoS(),
diff --git a/addons/pos_sale/static/tests/tours/utils/pos_sale_utils.js b/addons/pos_sale/static/tests/tours/utils/pos_sale_utils.js
index 7923f099395a5..f02ceaa922f6f 100644
--- a/addons/pos_sale/static/tests/tours/utils/pos_sale_utils.js
+++ b/addons/pos_sale/static/tests/tours/utils/pos_sale_utils.js
@@ -39,10 +39,12 @@ export function settleNthOrder(n, options = {}) {
             run: "click",
         },
     ];
-    if (loadSN) {
+    if (loadSN !== undefined) {
         step.push({
             content: `Choose to auto link the lot number to the order line`,
-            trigger: `.modal-content:contains('Do you want to load the SN/Lots linked to the Sales Order?') button:contains('Ok')`,
+            trigger: `.modal-content:contains('Do you want to load the SN/Lots linked to the Sales Order?') button:contains('${
+                loadSN ? "Ok" : "Cancel"
+            }')`,
             run: "click",
         });
     }
diff --git a/addons/pos_sale/tests/test_pos_sale_flow.py b/addons/pos_sale/tests/test_pos_sale_flow.py
index 09f17faf06bab..2094e00d19c18 100644
--- a/addons/pos_sale/tests/test_pos_sale_flow.py
+++ b/addons/pos_sale/tests/test_pos_sale_flow.py
@@ -1525,6 +1525,7 @@ def test_multiple_lots_sale_order(self):
         self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'test_multiple_lots_sale_order_1', login="accountman")
         sale_order.action_confirm()
         self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'test_multiple_lots_sale_order_2', login="accountman")
+        self.start_tour("/pos/ui?config_id=%d" % self.main_pos_config.id, 'test_multiple_lots_sale_order_3', login="accountman")
         self.main_pos_config.current_session_id.action_pos_session_close()
         picking = sale_order.pos_order_line_ids.order_id.picking_ids
         self.assertEqual(picking.move_ids.quantity, 3)

From d2987732c8addf657fded6f97f2bde235b1c9940 Mon Sep 17 00:00:00 2001
From: "Maruan Aguerdouh (magm)" <magm@odoo.com>
Date: Tue, 28 Oct 2025 16:52:11 +0000
Subject: [PATCH 045/673] [FIX] mass_mailing: ensure MassMailingHtmlField works
 on Safari

There is an issue with the MassMailingHtmlField on WebKit browsers such as
Safari where, once a "mail theme" is selected, the iframe stays blank and the
user is not able to edit the mailing.

Steps to reproduce:
  1. On Safari, got to Email Marketing app.
  2. Create a new email campaign.
  3. Select any of the pre-built templates (mail theme).

Cause:
There is an [issue] with the WebKit implementation of `iframe` `sandbox`:
- For an iframe with `src="about:blank"` (equivalent to no `src`) with
  `sandbox="allow-same-origin"`, if the parent document adds event listeners on
  elements inside the iframe contentDocument, they can not be executed without
  the flag `allow-scripts`, which defeats the purpose of the `sandbox` in our
  case.
Other JavaScript engines don't have this issue.

Resolution:
Event listeners set by the parent document currently are an essential feature of
the `HtmlBuilder` editor, and are also used to load scss bundles inside the
iframe. A major refactoring would be needed to not require them (the only
viable solution would be to make an editor endpoint, and enclose the whole
editor feature inside the iframe, and communicate with an Odoo view through
`postMessage`, sandbox would be set to "allow-scripts" only).

To alleviate the Odoo issue in the short term, `script-src`
Content-Security-Policy is set to none inside the iframe, and `allow-scripts`
flag is added to the sandbox attribute for browsers identifying as Safari. This
effectively allows event listeners set by the parent document to run, but still
prevents script execution inside the iframe.

[issue]: https://bugs.webkit.org/show_bug.cgi?id=218086

opw-5208425

closes odoo/odoo#233877

X-original-commit: 5cb84f4e7b0385162f6c38c11a1cb6bad397bae7
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
Co-authored-by: Damien Abeloos <abd@odoo.com>
Co-authored-by: Maruan Aguerdouh <magm@odoo.com>
---
 .../mass_mailing/static/src/iframe/mass_mailing_iframe.js  | 7 ++++++-
 .../mass_mailing/static/src/iframe/mass_mailing_iframe.xml | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
index e71da2a66c4e2..7f1b38c112d05 100644
--- a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
+++ b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
@@ -20,6 +20,7 @@ import { useThrottleForAnimation } from "@web/core/utils/timing";
 import { closestScrollableY } from "@web/core/utils/scrolling";
 import { _t } from "@web/core/l10n/translation";
 import { localization } from "@web/core/l10n/localization";
+import { isBrowserSafari } from "@web/core/browser/feature_detection";
 
 const IFRAME_VALUE_SELECTOR = ".o_mass_mailing_value";
 
@@ -192,7 +193,12 @@ export class MassMailingIframe extends Component {
         );
     }
 
+    get isBrowserSafari() {
+        return isBrowserSafari();
+    }
+
     async setupIframe() {
+        this.iframeRef.el?.contentDocument.head.appendChild(this.renderHeadContent());
         await this.loadIframeAssets();
         if (status(this) === "destroyed") {
             return;
@@ -204,7 +210,6 @@ export class MassMailingIframe extends Component {
         } else {
             this.iframeRef.el.contentDocument.body.classList.add("bg-white");
         }
-        this.iframeRef.el.contentDocument.head.appendChild(this.renderHeadContent());
         this.iframeRef.el.contentDocument.body.appendChild(this.renderBodyContent());
         htmlResizeObserver.observe(
             this.iframeRef.el.contentDocument.body.querySelector(IFRAME_VALUE_SELECTOR)
diff --git a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.xml b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.xml
index 564536d70ad5e..4f1ff65a53a6b 100644
--- a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.xml
+++ b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.xml
@@ -9,7 +9,8 @@
                 <div class="flex-grow-1" t-att-class="{'align-self-center': this.state.isMobile}">
                     <LocalOverlayContainer localOverlay="overlayRef" identifier="env.localOverlayContainerKey"/>
                     <div t-att-class="{ 'o_is_mobile': this.state.isMobile, 'h-100': !this.state.isMobile }">
-                        <iframe sandbox="allow-same-origin" t-att-scrolling="this.state.isMobile ? '' : 'no'"
+                        <iframe t-att-sandbox="this.isBrowserSafari ? 'allow-same-origin allow-scripts' : 'allow-same-origin'"
+                            t-att-scrolling="this.state.isMobile ? '' : 'no'"
                             t-att-class="{ 'd-none': props.showThemeSelector or props.showCodeView }"
                             t-ref="iframeRef" t-on-blur="onBlur"/>
                     </div>
@@ -30,6 +31,7 @@
         </div>
     </t>
     <t t-name="mass_mailing.IframeHead">
+        <meta http-equiv="Content-Security-Policy" content="script-src 'none';"/>
         <meta charset="utf-8"/>
         <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>

From bf434be9e257f2ea51d8ac88fe535766cf95c1a3 Mon Sep 17 00:00:00 2001
From: Adrien Schoffeniels <adsc@odoo.com>
Date: Wed, 15 Oct 2025 14:48:32 +0200
Subject: [PATCH 046/673] [IMP] cloud_storage: disable cloud storage for chats
 with ai agents

Purpose:
--------
The related enterprise PR introduces the ability to upload files when
chatting with ai agents. This feature is not available with attachments
of type url. This commit disables cloud storage when chatting with an ai
agent. Changes have been done in the cloud_storage module to avoid a bridge
module.

Task-5031785

closes odoo/odoo#231695

Related: odoo/enterprise#92885
Signed-off-by: Adrien Schoffeniels (adsc) <adsc@odoo.com>
---
 .../src/core/common/attachment_upload_service_patch.js    | 1 +
 .../static/src/core/common/composer_patch.js              | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/cloud_storage/static/src/core/common/attachment_upload_service_patch.js b/addons/cloud_storage/static/src/core/common/attachment_upload_service_patch.js
index 0ffc07601fb88..2a28c7f1bc876 100644
--- a/addons/cloud_storage/static/src/core/common/attachment_upload_service_patch.js
+++ b/addons/cloud_storage/static/src/core/common/attachment_upload_service_patch.js
@@ -85,6 +85,7 @@ patch(AttachmentUploadService.prototype, {
 
     async _upload(thread, composer, file, options, tmpId, tmpURL) {
         if (
+            !thread.channel?.ai_agent_id && // ai_agent (enterprise) does not support url files
             session.cloud_storage_min_file_size !== undefined &&
             file.size > session.cloud_storage_min_file_size &&
             !session.cloud_storage_unsupported_models.includes(thread.model)
diff --git a/addons/cloud_storage/static/src/core/common/composer_patch.js b/addons/cloud_storage/static/src/core/common/composer_patch.js
index 5256a68fe1cfc..5906ba4e93558 100644
--- a/addons/cloud_storage/static/src/core/common/composer_patch.js
+++ b/addons/cloud_storage/static/src/core/common/composer_patch.js
@@ -4,8 +4,10 @@ import { patch } from "@web/core/utils/patch";
 import { session } from "@web/session";
 
 patch(Composer.prototype, {
-    setup() {
-        super.setup();
-        this.cloudStorageUsable = session.cloud_storage_min_file_size !== undefined;
+    get cloudStorageUsable() {
+        return (
+            !this.thread?.channel?.ai_agent_id && // ai_agent (enterprise) does not support url files
+            session.cloud_storage_min_file_size !== undefined
+        );
     },
 });

From eaea723fbd5e46180cef177abf4f002dc8472aee Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Fri, 17 Oct 2025 07:18:07 +0000
Subject: [PATCH 047/673] [PERF] orm: skip nary optimization if nothing changed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we already did BASIC optimizations, children are sorted and merged.
In the following levels, if the children remain exactly the same
objects, there is no need to try to merge them because the optimization
is independent from the level.

Skipping these, we can gain up to 15% when optimizing complex domains.

closes odoo/odoo#232067

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 odoo/orm/domains.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/odoo/orm/domains.py b/odoo/orm/domains.py
index 964f65b90301d..15702a4f28375 100644
--- a/odoo/orm/domains.py
+++ b/odoo/orm/domains.py
@@ -654,6 +654,15 @@ def _optimize_step(self, model: BaseModel, level: OptimizationLevel) -> Domain:
         children = self._flatten(child._optimize(model, level) for child in self.children)
         size = len(children)
         if size > 1:
+            # nary-optimizations are independent of the level, so if BASIC was
+            # performed and all children are exactly the same, there is no need
+            # to try to merge them again
+            if (
+                level > OptimizationLevel.BASIC
+                and len(self.children) == size
+                and all(map(operator.is_, self.children, children))
+            ):
+                return self
             # sort children in order to ease their grouping by field and operator
             children.sort(key=_optimize_nary_sort_key)
             # run optimizations until some merge happens

From f0d9af75ab31a378d605294c708088c7c4e3f38f Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Tue, 21 Oct 2025 11:45:49 +0000
Subject: [PATCH 048/673] [IMP] orm: doamin |, & with bool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When combining a domain with a boolean, just keep the object instead of
creating a new domain. This allows to optimization levels to be kept.

closes odoo/odoo#232507

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 odoo/orm/domains.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/odoo/orm/domains.py b/odoo/orm/domains.py
index 15702a4f28375..3f09a2e106c6e 100644
--- a/odoo/orm/domains.py
+++ b/odoo/orm/domains.py
@@ -317,14 +317,18 @@ def __delattr__(self, name):
 
     def __and__(self, other):
         """Domain & Domain"""
+        if isinstance(other, DomainBool):
+            return other & self
         if isinstance(other, Domain):
-            return DomainAnd.apply([self, other])
+            return DomainAnd.apply((self, other))
         return NotImplemented
 
     def __or__(self, other):
         """Domain | Domain"""
+        if isinstance(other, DomainBool):
+            return other | self
         if isinstance(other, Domain):
-            return DomainOr.apply([self, other])
+            return DomainOr.apply((self, other))
         return NotImplemented
 
     def __invert__(self):

From 0a3eaa1a747abe4a9ba77eb32974df5c18e71a0f Mon Sep 17 00:00:00 2001
From: dhka-odoo <dhka@odoo.com>
Date: Mon, 4 Aug 2025 18:35:43 +0530
Subject: [PATCH 049/673] [IMP] hr_payroll: edit scaffold for payroll
 localization

Converted the appears_on_payslip field from a boolean to a Selection field
Adjustments have been made in the scaffold for the l10n_payroll salary rule
template to reflect this change.

task-4979423

closes odoo/odoo#221860

Related: odoo/enterprise#91685
Related: odoo/upgrade#8168
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 .../data/hr_salary_rule_data.xml.template            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/odoo/cli/templates/l10n_payroll/data/hr_salary_rule_data.xml.template b/odoo/cli/templates/l10n_payroll/data/hr_salary_rule_data.xml.template
index ebd69d52526a0..551dcac47127a 100644
--- a/odoo/cli/templates/l10n_payroll/data/hr_salary_rule_data.xml.template
+++ b/odoo/cli/templates/l10n_payroll/data/hr_salary_rule_data.xml.template
@@ -29,7 +29,7 @@ result = categories.BASIC
 result_rate = payslip.rule_parameter('l10n_{{code}}_social_employer_rate')
 result = categories.BASIC
         </field>
-        <field name="appears_on_payslip" eval="False"/>
+        <field name="appears_on_payslip">never</field>
         <field name="struct_id" ref="l10n_{{code}}_hr_payroll.l10n_{{code}}_hr_payroll_structure_{{code}}_employee_salary"/>
     </record>
 
@@ -43,7 +43,7 @@ result = categories.BASIC
         <field name="amount_python_compute">
 result = categories['SOCIAL.EMPLOYEE']
         </field>
-        <field name="appears_on_payslip" eval="True"/>
+        <field name="appears_on_payslip">always</field>
         <field name="struct_id" ref="l10n_{{code}}_hr_payroll.l10n_{{code}}_hr_payroll_structure_{{code}}_employee_salary"/>
     </record>
 
@@ -57,7 +57,7 @@ result = categories['SOCIAL.EMPLOYEE']
         <field name="amount_python_compute">
 result = categories['SOCIAL.EMPLOYER']
         </field>
-        <field name="appears_on_payslip" eval="False"/>
+        <field name="appears_on_payslip">never</field>
         <field name="struct_id" ref="l10n_{{code}}_hr_payroll.l10n_{{code}}_hr_payroll_structure_{{code}}_employee_salary"/>
     </record>
 
@@ -71,7 +71,7 @@ result = categories['SOCIAL.EMPLOYER']
         <field name="amount_python_compute">
 result = categories.GROSS
         </field>
-        <field name="appears_on_payslip" eval="True"/>
+        <field name="appears_on_payslip">always</field>
         <field name="struct_id" ref="l10n_{{code}}_hr_payroll.l10n_{{code}}_hr_payroll_structure_{{code}}_employee_salary"/>
     </record>
 
@@ -92,7 +92,7 @@ for low, high, prev, rate in brackets:
         if low &lt;= taxable &lt; high:
             result = -(prev + (taxable - low) * rate / 100)
         </field>
-        <field name="appears_on_payslip" eval="True"/>
+        <field name="appears_on_payslip">always</field>
         <field name="struct_id" ref="l10n_{{code}}_hr_payroll.l10n_{{code}}_hr_payroll_structure_{{code}}_employee_salary"/>
     </record>
 
@@ -117,7 +117,7 @@ elif children == 3:
 elif children &gt;= 4:
     result = amounts[0] + amounts[1] + amounts[2] + (children - 3) * amounts[3]
         </field>
-        <field name="appears_on_payslip" eval="True"/>
+        <field name="appears_on_payslip">always</field>
         <field name="struct_id" ref="l10n_{{code}}_hr_payroll.l10n_{{code}}_hr_payroll_structure_{{code}}_employee_salary"/>
     </record>
 

From dfcdfedbe36087082ceff9abb806e9b8a16e35e8 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Tue, 21 Oct 2025 08:16:14 +0000
Subject: [PATCH 050/673] [FIX] website: missing flush in fuzzy search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#233754

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/test_website/tests/test_fuzzy.py | 2 +-
 addons/website/models/website.py        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/test_website/tests/test_fuzzy.py b/addons/test_website/tests/test_fuzzy.py
index eff8ade5265cf..706cdca688940 100644
--- a/addons/test_website/tests/test_fuzzy.py
+++ b/addons/test_website/tests/test_fuzzy.py
@@ -108,7 +108,7 @@ def test_02_pages_search(self):
         test_page.name = 'testTotallyUnique'
 
         # Editor and Designer see pages in result
-        self._autocomplete_page('testTotallyUnique', 1, None)
+        self._autocomplete_page('testTotallyUnique', 1, False)
 
         test_page.visibility = 'connected'
         self._autocomplete_page('testTotallyUnique', 1, False)
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 86f1c5c0dea6f..3740114bef26f 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -2247,8 +2247,7 @@ def get_similarity_subquery(model, fields, id_column, rel_table='', rel_joinkey=
                 ORDER BY _best_similarity DESC
                 LIMIT 1000
             """, SQL("\nUNION ALL\n").join(subqueries))  # UNION ALL allows to hit GIST indexes in subplans.
-            self.env.cr.execute(query)
-            ids = {row[0] for row in self.env.cr.fetchall()}
+            ids = {row[0] for row in self.env.execute_query(query)}
             domain = Domain.AND([domain, Domain([('id', 'in', list(ids))])])
             records = model.search_read(domain, direct_fields, limit=limit)
             for record in records:

From 8ceea093815ba9c8d3dd2ced736a9010ccc5b779 Mon Sep 17 00:00:00 2001
From: Gorash <chm@odoo.com>
Date: Fri, 31 Oct 2025 11:04:03 +0000
Subject: [PATCH 051/673] [IMP] website*: remove useless invisible fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Invisible field from views are useless since:

closes odoo/odoo#230098

See: https://github.com/odoo/odoo/commit/5639ed865c5a3b82bab25b0ecac28c68c02e93065639ed8
See: https://github.com/odoo/odoo/pull/137031
Related: odoo/enterprise#96402
Related: odoo/upgrade#8586
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 .../website/views/ir_actions_server_views.xml |  1 -
 .../views/res_config_settings_views.xml       |  1 -
 .../views/website_controller_pages_views.xml  |  3 --
 addons/website/views/website_pages_views.xml  |  6 +---
 addons/website/views/website_views.xml        |  1 -
 .../website/views/website_visitor_views.xml   |  3 --
 addons/website_blog/views/blog_post_add.xml   |  2 +-
 .../website_blog/views/website_blog_views.xml |  2 --
 .../views/website_pages_views.xml             |  2 --
 .../views/crm_reveal_views.xml                |  1 -
 .../views/crm_lead_views.xml                  |  1 -
 .../wizard/crm_forward_to_partner_view.xml    |  2 +-
 .../views/res_partner_views.xml               |  1 -
 .../website_event/views/event_event_add.xml   |  3 +-
 .../website_event/views/event_event_views.xml | 10 +-----
 .../website_event/views/event_tag_views.xml   |  3 --
 .../views/website_pages_views.xml             |  2 +-
 .../views/event_booth_views.xml               |  1 -
 .../views/event_event_views.xml               |  4 +--
 .../views/event_sponsor_views.xml             |  2 --
 .../views/event_event_views.xml               |  4 +--
 .../views/event_track_views.xml               | 12 ++-----
 .../views/event_track_views.xml               |  2 +-
 .../views/event_event_views.xml               |  4 ---
 .../views/event_quiz_question_views.xml       |  1 -
 .../views/event_track_views.xml               |  1 -
 .../website_forum/views/forum_forum_views.xml |  2 --
 .../website_forum/views/forum_post_views.xml  |  2 --
 .../views/hr_job_views.xml                    |  1 -
 .../views/website_pages_views.xml             |  1 -
 .../views/website_visitor_views.xml           |  2 +-
 .../views/product_image_views.xml             |  2 --
 .../views/product_pricelist_views.xml         |  1 -
 .../views/product_product_add.xml             |  2 +-
 .../wizard/coupon_share_views.xml             |  2 --
 .../views/slide_channel_views.xml             |  2 --
 addons/website_sale_stock/__manifest__.py     |  1 -
 .../views/res_config_settings_views.xml       |  2 --
 .../views/stock_picking_views.xml             | 13 -------
 .../views/rating_rating_views.xml             |  6 ++--
 .../views/slide_channel_add.xml               |  2 +-
 .../views/slide_channel_partner_views.xml     |  3 +-
 .../views/slide_channel_tag_views.xml         |  2 --
 .../views/slide_channel_views.xml             | 28 +++++++--------
 .../views/slide_question_views.xml            |  1 -
 .../views/slide_slide_partner_views.xml       |  1 -
 .../views/slide_slide_views.xml               | 16 +++------
 .../views/website_pages_views.xml             |  2 +-
 .../wizard/slide_channel_invite_views.xml     |  7 ----
 .../views/slide_channel_partner_views.xml     |  1 -
 .../views/slide_channel_views.xml             |  1 -
 .../views/website_visitor_views.xml           |  3 --
 odoo/addons/base/tests/test_views.py          | 36 -------------------
 53 files changed, 38 insertions(+), 179 deletions(-)
 delete mode 100644 addons/website_sale_stock/views/stock_picking_views.xml

diff --git a/addons/website/views/ir_actions_server_views.xml b/addons/website/views/ir_actions_server_views.xml
index 481eb854fc1c8..0283ca491e41f 100644
--- a/addons/website/views/ir_actions_server_views.xml
+++ b/addons/website/views/ir_actions_server_views.xml
@@ -11,7 +11,6 @@
                     <xpath expr="//page[@name='usage']" position="inside">
                         <group invisible="state != 'code' or context.get('is_modal')">
                             <field name="website_published" string="Use in website"/>
-                            <field name="xml_id" invisible="1"/>
                             <field name="website_path" invisible="not website_published"/>
                             <field name="website_url" widget="url" readonly="1" invisible="not website_published"/>
                         </group>
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 3bc0370175fbc..6ba2b1cb691b1 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -45,7 +45,6 @@
                                  documentation="/applications/websites/website/configuration/translate.html">
                             <field name="language_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" required="website_id"/>
                             <div class="row mt8" invisible="website_language_count &lt; 2">
-                                <field name="website_language_count" invisible="1"/>
                                 <label class="col-lg-3" string="Default" for="website_default_lang_id"/>
                                 <field name="website_default_lang_id" options="{'no_open': True, 'no_create': True}" required="website_id"/>
                             </div>
diff --git a/addons/website/views/website_controller_pages_views.xml b/addons/website/views/website_controller_pages_views.xml
index 551951dd44a88..de3285934966e 100644
--- a/addons/website/views/website_controller_pages_views.xml
+++ b/addons/website/views/website_controller_pages_views.xml
@@ -21,7 +21,6 @@
                     </group>
                     <group colspan="1" string="Settings">
                         <field name="model_id" readonly="id"/>
-                        <field name="model" invisible="1" />
                         <field name="record_domain" widget="domain" options="{'in_dialog': True, 'model': 'model'}"/>
                         <field name="default_layout"/>
                     </group>
@@ -54,7 +53,6 @@
             when the group is enabled, but we need the field to be there all the
             time for `PageRendererMixin`'s `recordFilter' to be able to filter
             correctly. -->
-            <field name="website_id" column_invisible="True"/>
             <field name="website_id" groups="website.group_multi_website"/>
             <field name="url_demo"/>
             <field name="is_published" widget="boolean_toggle"/>
@@ -68,7 +66,6 @@
     <field name="arch" type="xml">
         <kanban class="o-website-controller-page-kanban">
             <t t-name="card">
-                <field name="website_published" invisible="1" />
                 <widget name="web_ribbon" text="Published" invisible="not website_published" />
                 <widget name="web_ribbon" text="Unpublished" invisible="website_published" bg_color="text-bg-danger" />
                     <div data-section="data" class="d-flex align-items-center">
diff --git a/addons/website/views/website_pages_views.xml b/addons/website/views/website_pages_views.xml
index 971f70b031b5d..9525a08ccf761 100644
--- a/addons/website/views/website_pages_views.xml
+++ b/addons/website/views/website_pages_views.xml
@@ -54,8 +54,6 @@
     <field name="arch" type="xml">
         <xpath expr="//group/*" position="before"> <!-- Top -->
             <field name="name" string="Page Title" placeholder="e.g. Home Page"/>
-            <field name="website_id" invisible="1"/>
-
             <label for="url" string="Page URL"/>
             <div class="o_col">
                 <field name="url" widget="page_url"/>
@@ -98,7 +96,7 @@
     <field name="priority">99</field>
     <field name="arch" type="xml">
         <list js_class="website_pages_list" type="object" action="open_website_url" multi_edit="1" default_order="url asc, id asc">
-            <field name="is_homepage" column_invisible="True"/>
+            <field name="is_homepage" column_invisible="True"/>  <!-- Use to to display the small house icon from javascript ui -->
             <field name="name" string="Page Title"/>
             <field name="website_url" string="Page URL"/>
 
@@ -212,7 +210,6 @@
                 <field name="key"/>
                 <button title="Show site map" invisible="type != 'qweb'" name="website.action_website_view_hierarchy" icon="fa-sitemap" type="action" class="btn btn-link"/>
             </div>
-            <field name="page_ids" invisible="1" />
             <field name="first_page_id" invisible="not page_ids" />
             <label for="visibility"/>
             <div>
@@ -244,7 +241,6 @@
             <attribute name="decoration-muted">not active</attribute>
         </list>
         <field name="name" position="after">
-            <field name="active" column_invisible="True"/>
             <field name="website_id" groups="website.group_multi_website"/>
         </field>
         <field name="xml_id" position="before">
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index d71522d56d00e..8da155a5ea8fe 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -28,7 +28,6 @@
                             <field name="name"/>
                             <field name="domain"/>
                             <field name="logo" widget="image" class="oe_avatar w-auto float-start"/>
-                            <field name="language_count" invisible="1"/>
                             <field name="company_id" options="{'no_open': True, 'no_create': True}" groups="base.group_multi_company"/>
                             <field name="language_ids" widget="many2many_tags" options="{'no_open': True, 'no_create': True}"/>
                             <field name="default_lang_id" options="{'no_open': True, 'no_create': True}"
diff --git a/addons/website/views/website_visitor_views.xml b/addons/website/views/website_visitor_views.xml
index 7c0da3d0b8373..10a50b749fe49 100644
--- a/addons/website/views/website_visitor_views.xml
+++ b/addons/website/views/website_visitor_views.xml
@@ -180,7 +180,6 @@
                     </div>
                     <group id="general_info">
                         <group string="Details">
-                            <field name="is_connected" invisible="1"/>
                             <field name="partner_id"/>
                             <field name="email"/>
                             <field name="mobile" class="o_force_ltr"/>
@@ -213,8 +212,6 @@
                 <field name="visit_count"/>
                 <field name="page_ids" widget="many2many_tags" string="Pages"/>
                 <field name="last_visited_page_id" string="Last Page" optional="hide"/>
-                <field name="is_connected" column_invisible="True"/>
-                <field name="email" column_invisible="True"/>
                 <button string="Email" name="action_send_mail" type="object"
                     icon="fa-envelope" invisible="not email"/>
             </list>
diff --git a/addons/website_blog/views/blog_post_add.xml b/addons/website_blog/views/blog_post_add.xml
index 4bc41ba3eb91b..4948e306f6986 100644
--- a/addons/website_blog/views/blog_post_add.xml
+++ b/addons/website_blog/views/blog_post_add.xml
@@ -7,7 +7,7 @@
     <field name="arch" type="xml">
         <form js_class="website_new_content_form">
             <group>
-                <field name="website_url" invisible="1"/>
+                <field name="website_url" invisible="1"/>  <!-- We need this for `computePath` used in `onAddContent` to redirect to the blog after creation. -->
                 <field name="blog_id" string="Select Blog"/>
                 <field name="name" placeholder="Blog Post Title"/>
             </group>
diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml
index 3f83c8af3d437..9f9b74badf059 100644
--- a/addons/website_blog/views/website_blog_views.xml
+++ b/addons/website_blog/views/website_blog_views.xml
@@ -10,7 +10,6 @@
                     <field name="name"/>
                     <field name="blog_post_count"/>
                     <field name="website_id" groups="website.group_multi_website"/>
-                    <field name="active" column_invisible="True"/>
                 </list>
             </field>
         </record>
@@ -22,7 +21,6 @@
                     <sheet>
                         <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
                         <group>
-                            <field name="active" invisible="1"/>
                             <field name="name"/>
                             <field name="subtitle"/>
                             <field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/>
diff --git a/addons/website_blog/views/website_pages_views.xml b/addons/website_blog/views/website_pages_views.xml
index 4c717094759eb..4966873178b4f 100644
--- a/addons/website_blog/views/website_pages_views.xml
+++ b/addons/website_blog/views/website_pages_views.xml
@@ -13,7 +13,6 @@
                 <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
                 <group name="blog_details">
                     <field name="blog_id"/>
-                    <field name="active" invisible="1"/>
                     <field name="name" placeholder="Blog Post Title"/>
                     <field name="subtitle" placeholder="Blog Subtitle"/>
                     <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
@@ -100,7 +99,6 @@
     <field name="priority">99</field>
     <field name="arch" type="xml">
         <list js_class="website_pages_list" type="object" action="open_website_url" multi_edit="1">
-            <field name="active" column_invisible="True"/>
             <field name="name"/>
             <field name="website_url"/>
 
diff --git a/addons/website_crm_iap_reveal/views/crm_reveal_views.xml b/addons/website_crm_iap_reveal/views/crm_reveal_views.xml
index ed5de12b46abf..731eed958d27e 100644
--- a/addons/website_crm_iap_reveal/views/crm_reveal_views.xml
+++ b/addons/website_crm_iap_reveal/views/crm_reveal_views.xml
@@ -69,7 +69,6 @@
                             <field name="seniority_id" invisible="contact_filter_type != 'seniority'" options="{'no_create_edit': True, 'no_quick_create': True}"/>
                         </group>
                     </group>
-                    <field name="lead_type" invisible="1"/>
                     <separator invisible="lead_type != 'lead'" string="Lead Data" />
                     <separator invisible="lead_type != 'opportunity'" string="Opportunity Data" />
                     <group>
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 628b3fd561d9a..88f8f1e732275 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -43,7 +43,6 @@
             <field name="arch" type="xml">
                 <field name="priority" position="after">
                     <field name="partner_assigned_id" optional="hide"/>
-                    <field name="date_partner_assign" column_invisible="True"/>
                  </field>
             </field>
         </record>
diff --git a/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 184489f00d604..045d0e79374c1 100644
--- a/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/website_crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -21,7 +21,7 @@
                             <field name="lead_location" readonly="1"/>
                             <field name="partner_assigned_id"/>
                             <field name="partner_location" readonly="1"/>
-                            <field name="lead_link" column_invisible="True"/>
+                            <field name="lead_link" column_invisible="True"/>  <!-- Set via the default_get of the parent wizard. required to save it. -->
                         </list>
                     </field>
                     <notebook colspan="4" groups="base.group_no_one">
diff --git a/addons/website_customer/views/res_partner_views.xml b/addons/website_customer/views/res_partner_views.xml
index dd42bd1e3b00c..1d08d9804aaf9 100644
--- a/addons/website_customer/views/res_partner_views.xml
+++ b/addons/website_customer/views/res_partner_views.xml
@@ -39,7 +39,6 @@
                     <field name="name"/>
                     <field name="classname"/>
                     <field name="is_published"/>
-                    <field name="active" column_invisible="True"/>
                 </list>
             </field>
         </record>
diff --git a/addons/website_event/views/event_event_add.xml b/addons/website_event/views/event_event_add.xml
index e5a8836fddcab..c34adeb89559d 100644
--- a/addons/website_event/views/event_event_add.xml
+++ b/addons/website_event/views/event_event_add.xml
@@ -11,8 +11,7 @@
             <attribute name="js_class">website_new_content_form</attribute>
         </xpath>
         <xpath expr="//form" position="inside">
-            <!-- We need this for `computePath` used in `onAddContent` to redirect to the event after creation. -->
-            <field name="website_url" invisible="1"/>
+            <field name="website_url" invisible="1"/>  <!-- We need this for `computePath` used in `onAddContent` to redirect to the event after creation. -->
         </xpath>
         <xpath expr="//header" position="replace"/>
         <xpath expr="//div[hasclass('oe_button_box')]" position="replace"/>
diff --git a/addons/website_event/views/event_event_views.xml b/addons/website_event/views/event_event_views.xml
index 21141c6f95a07..10a8800ef06b0 100644
--- a/addons/website_event/views/event_event_views.xml
+++ b/addons/website_event/views/event_event_views.xml
@@ -8,8 +8,6 @@
         <field name="inherit_id" ref="event.view_event_form"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@name='right_event_details']/field[@name='company_id']" position="after">
-                <field name="website_id" invisible="1"/>
-                <field name="website_published" invisible="1"/>
                 <field name="website_id" options="{'no_create': True}" domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]" groups="website.group_multi_website"/>
                 <label for="website_visibility" string="Visibility"/>
                 <div class="d-flex row">
@@ -32,18 +30,13 @@
             <xpath expr="//button[@name='%(event.event_registration_action_stats_from_event)d']" position="before">
                 <field name="is_published" widget="website_redirect_button"/>
             </xpath>
-            <div name="button_box" position="inside">
-                <field name="website_url" invisible="1"/>
-            </div>
             <xpath expr="//div[hasclass('oe_title')]" position="after">
                 <div name="event_menu_configuration" groups="base.group_no_one">
                     <label for="website_menu" string="Website Submenu" class="me-1"/>
                     <field name="website_menu" class="me-3"/>
                     <!-- hidden sub-menus, they are triggered all at once based on "website_menu" -->
-                    <field name="introduction_menu" invisible="1"/>
-                    <field name="register_menu" invisible="1"/>
                     <label for="community_menu" string="Community" invisible="1" class="me-1"/>
-                    <field name="community_menu" invisible="1" class="me-3"/>
+                    <field name="community_menu" invisible="1" class="me-3"/>  <!-- The computation relies on `_origin` for an `onchange` context. Changed from a template that has no community menu to one that has a community menu. -->
                 </div>
             </xpath>
             <field name="tag_ids" position="attributes">
@@ -64,7 +57,6 @@
         <field name="inherit_id" ref="event.view_event_tree"/>
         <field name="arch" type="xml">
             <field name="company_id" position="after">
-                <field name="company_id" column_invisible="True"/>
                 <field name="website_id" groups="website.group_multi_website" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" optional="show"/>
             </field>
         </field>
diff --git a/addons/website_event/views/event_tag_views.xml b/addons/website_event/views/event_tag_views.xml
index 1ca34909bd2f2..f2cb0f62b4572 100644
--- a/addons/website_event/views/event_tag_views.xml
+++ b/addons/website_event/views/event_tag_views.xml
@@ -5,9 +5,6 @@
         <field name="model">event.tag</field>
         <field name="inherit_id" ref="event.event_tag_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='category_id']" position="before">
-                <field name="website_id" invisible="1"/>
-            </xpath>
 
             <xpath expr="//field[@name='category_id']" position="attributes">
                 <attribute name="domain">['|', ('website_id', '=', website_id), ('website_id', '=', False)]</attribute>
diff --git a/addons/website_event/views/website_pages_views.xml b/addons/website_event/views/website_pages_views.xml
index 45c9b42d76b31..20e10222f690b 100644
--- a/addons/website_event/views/website_pages_views.xml
+++ b/addons/website_event/views/website_pages_views.xml
@@ -58,7 +58,7 @@
             <attribute name="default_group_by">user_id</attribute>
         </xpath>
         <xpath expr="//kanban" position="inside">
-            <field name="website_url" invisible="1"/>
+            <field name="website_url"/>
         </xpath>
         <xpath expr="//main" position="inside">
             <div class="text-muted" t-if="record.website_id.value" groups="website.group_multi_website">
diff --git a/addons/website_event_booth_exhibitor/views/event_booth_views.xml b/addons/website_event_booth_exhibitor/views/event_booth_views.xml
index dcbe741f856a0..ff46758db4099 100644
--- a/addons/website_event_booth_exhibitor/views/event_booth_views.xml
+++ b/addons/website_event_booth_exhibitor/views/event_booth_views.xml
@@ -8,7 +8,6 @@
         <field name="priority">5</field>
         <field name="arch" type="xml">
             <div name="button_box" position="inside">
-                <field name="sponsor_id" invisible="1"/>
                 <button name="action_view_sponsor" type="object" class="oe_stat_button"
                         icon="fa-black-tie" string="Sponsor" invisible="not sponsor_id">
                 </button>
diff --git a/addons/website_event_exhibitor/views/event_event_views.xml b/addons/website_event_exhibitor/views/event_event_views.xml
index 8fe6353dfcbec..fd18676baf9be 100644
--- a/addons/website_event_exhibitor/views/event_event_views.xml
+++ b/addons/website_event_exhibitor/views/event_event_views.xml
@@ -7,7 +7,7 @@
         <field name="priority" eval="5"/>
         <field name="inherit_id" ref="website_event.event_event_view_form"/>
         <field name="arch" type="xml">
-            <field name="website_url" position="before">
+            <field name="is_published" position="before">
                 <button name="%(event_sponsor_action_from_event)d"
                         type="action"
                         class="oe_stat_button"
@@ -15,7 +15,7 @@
                     <field name="sponsor_count" string="Sponsors" widget="statinfo"/>
                 </button>
             </field>
-            <xpath expr="//label[@for='community_menu']" position="before">
+            <xpath expr="//label[@for='website_menu']" position="before">
                 <label for="exhibitor_menu" class="me-1"/>
                 <field name="exhibitor_menu" class="me-3"/>
             </xpath>
diff --git a/addons/website_event_exhibitor/views/event_sponsor_views.xml b/addons/website_event_exhibitor/views/event_sponsor_views.xml
index 7f14297240deb..e286afb3e5bd7 100644
--- a/addons/website_event_exhibitor/views/event_sponsor_views.xml
+++ b/addons/website_event_exhibitor/views/event_sponsor_views.xml
@@ -73,12 +73,10 @@
             <form>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <field name="website_url" invisible="1"/>
                         <field name="is_published" widget="website_redirect_button"
                             invisible="exhibitor_type == 'sponsor'"/>
                     </div>
                     <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
-                    <field name="active" invisible="1"/>
                     <field name="image_512" widget="image" class="oe_avatar"/>
                     <div class="oe_title">
                         <label for="name" string="Sponsor Name"/>
diff --git a/addons/website_event_track/views/event_event_views.xml b/addons/website_event_track/views/event_event_views.xml
index ee820428edda9..dc9699170c572 100644
--- a/addons/website_event_track/views/event_event_views.xml
+++ b/addons/website_event_track/views/event_event_views.xml
@@ -7,14 +7,14 @@
         <field name="model">event.event</field>
         <field name="priority" eval="3"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='website_url']" position="before">
+            <div name="button_box" position="inside">
                 <button name="%(action_event_track_from_event)d"
                         type="action"
                         class="oe_stat_button"
                         icon="fa-microphone">
                     <field name="track_count" string="Tracks" widget="statinfo"/>
                 </button>
-            </xpath>
+            </div>
             <xpath expr="//field[@name='website_menu']" position="after">
                 <label for="website_track" string="Showcase Tracks" class="me-1"/>
                 <field name="website_track" class="me-3"/>
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index c4fd049ccfa60..368ce576af4cd 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -137,8 +137,6 @@
                 </header>
                 <sheet string="Track">
                     <div class="oe_button_box" name="button_box">
-                        <field name="website_url" invisible="1"/>
-                        <field name="wishlist_visitor_count" invisible="1"/>
                         <button name="%(website_event_track.website_visitor_action_from_track)d"
                             type="action" class="oe_stat_button" icon="fa-bell"
                             groups="event.group_event_user" invisible="wishlist_visitor_count == 0">
@@ -146,9 +144,6 @@
                         </button>
                         <field name="is_published" widget="website_redirect_button"/>
                     </div>
-                    <field name="legend_blocked" invisible="1"/>
-                    <field name="legend_normal" invisible="1"/>
-                    <field name="legend_done" invisible="1"/>
                     <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
                     <div class="d-flex gap-4 mb-3">
                         <div class="flex-grow-1">
@@ -165,11 +160,9 @@
                             <field name="date"/>
                             <field name="location_id"/>
                             <field name="duration" widget="float_time"/>
-                            <field name="active" invisible="1"/>
                             <field name="wishlisted_by_default"/>
                         </group>
                         <group>
-                            <field name="company_id" invisible="1"/>
                             <field name="user_id" widget="many2one_avatar_user" domain="[('share', '=', False)]"/>
                             <field name="event_id" placeholder="All Events"/>
                             <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
@@ -236,7 +229,6 @@
         <field name="arch" type="xml">
             <list string="Event Track" multi_edit="1">
                 <field name="name"/>
-                <field name="active" column_invisible="True"/>
                 <field name="partner_name" string="Speaker Name"/>
                 <field name="partner_id" optional="hide"/>
                 <field name="partner_email" optional="hide"/>
@@ -259,8 +251,8 @@
             <graph string="Tracks" sample="1">
                 <field name="location_id"/>
                 <field name="duration" operator="+"/>
-                <field name="website_cta_delay" invisible="1"/>
-                <field name="color" invisible="1"/>
+                <field name="website_cta_delay"/>
+                <field name="color"/>
             </graph>
         </field>
     </record>
diff --git a/addons/website_event_track_live/views/event_track_views.xml b/addons/website_event_track_live/views/event_track_views.xml
index 934ebebf58786..e76a389ce1799 100644
--- a/addons/website_event_track_live/views/event_track_views.xml
+++ b/addons/website_event_track_live/views/event_track_views.xml
@@ -6,7 +6,7 @@
         <field name="model">event.track</field>
         <field name="inherit_id" ref="website_event_track.view_event_track_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='active']" position="after">
+            <xpath expr="//field[@name='duration']" position="after">
                 <field name="youtube_video_url" widget="url" />
                 <field name="is_youtube_replay"
                     invisible="not youtube_video_url or youtube_video_url == ''" />
diff --git a/addons/website_event_track_quiz/views/event_event_views.xml b/addons/website_event_track_quiz/views/event_event_views.xml
index c84de0800b604..e6c52db215e31 100644
--- a/addons/website_event_track_quiz/views/event_event_views.xml
+++ b/addons/website_event_track_quiz/views/event_event_views.xml
@@ -6,9 +6,6 @@
         <field name="model">event.event</field>
         <field name="inherit_id" ref="website_event.event_event_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//label[@for='community_menu']" position="attributes">
-                <attribute name="invisible">0</attribute>
-            </xpath>
             <field name="community_menu" position="attributes">
                 <attribute name="invisible">0</attribute>
             </field>
@@ -16,4 +13,3 @@
     </record>
 
 </data></odoo>
-
diff --git a/addons/website_event_track_quiz/views/event_quiz_question_views.xml b/addons/website_event_track_quiz/views/event_quiz_question_views.xml
index 552994018f6a9..46c317e782282 100644
--- a/addons/website_event_track_quiz/views/event_quiz_question_views.xml
+++ b/addons/website_event_track_quiz/views/event_quiz_question_views.xml
@@ -50,7 +50,6 @@
                     </h1>
                     <group>
                         <field name="quiz_id"/>
-                        <field name="awarded_points" invisible="1"/>
                     </group>
                     <group name="questions">
                         <field name="answer_ids" nolabel="1">
diff --git a/addons/website_event_track_quiz/views/event_track_views.xml b/addons/website_event_track_quiz/views/event_track_views.xml
index 806aa6ec7bfad..507962a182995 100644
--- a/addons/website_event_track_quiz/views/event_track_views.xml
+++ b/addons/website_event_track_quiz/views/event_track_views.xml
@@ -6,7 +6,6 @@
         <field name="inherit_id" ref="website_event_track.view_event_track_form"/>
         <field name="arch" type="xml">
             <field name='stage_id' position="before">
-                <field name="quiz_id" invisible="1"/>
                 <button name="action_add_quiz"
                     type="object" class="btn btn-primary" string="Add Quiz"
                     invisible="quiz_id"
diff --git a/addons/website_forum/views/forum_forum_views.xml b/addons/website_forum/views/forum_forum_views.xml
index 11ec88e9e96f5..6ed52a02f60b1 100644
--- a/addons/website_forum/views/forum_forum_views.xml
+++ b/addons/website_forum/views/forum_forum_views.xml
@@ -14,7 +14,6 @@
                     <field name="total_views" sum="Total Views"/>
                     <field name="total_answers" optional="hide"/>
                     <field name="total_favorites" optional="hide"/>
-                    <field name="active" column_invisible="True"/>
                 </list>
             </field>
         </record>
@@ -48,7 +47,6 @@
                                 </div>
                             </button>
                         </div>
-                        <field name="active" invisible="1"/>
                         <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
                         <field name="image_1920" widget="image" options="{'preview_image': 'image_128'}" class="oe_avatar"/>
                         <div class="oe_title">
diff --git a/addons/website_forum/views/forum_post_views.xml b/addons/website_forum/views/forum_post_views.xml
index b73c8b5dd8b72..4c827ee2d5cd0 100644
--- a/addons/website_forum/views/forum_post_views.xml
+++ b/addons/website_forum/views/forum_post_views.xml
@@ -21,7 +21,6 @@
                 </h1>
                 <group>
                     <group name="forum_details">
-                        <field name="active" invisible="1"/>
                         <field name="forum_id"/>
                         <field name="website_id" groups="website.group_multi_website"/>
                         <field name="parent_id" invisible="not parent_id"/>
@@ -108,7 +107,6 @@
     <field name="priority">99</field>
     <field name="arch" type="xml">
         <list js_class="website_pages_list" create="false" type="object" action="go_to_website" multi_edit="1">
-            <field name="active" column_invisible="True"/>
             <field name="name"/>
             <field name="website_url"/>
 
diff --git a/addons/website_hr_recruitment/views/hr_job_views.xml b/addons/website_hr_recruitment/views/hr_job_views.xml
index 66060fb01590a..ca681025dd5e8 100644
--- a/addons/website_hr_recruitment/views/hr_job_views.xml
+++ b/addons/website_hr_recruitment/views/hr_job_views.xml
@@ -9,7 +9,6 @@
                 <attribute name="default_order">is_published desc, is_favorite desc, create_date DESC</attribute>
             </xpath>
             <xpath expr="//t[@t-name='card']/div" position="before">
-                <field name="website_published" invisible="1"/>
                 <widget name="web_ribbon" title="Published" bg_color="text-bg-success" invisible="not website_published"/>
             </xpath>
             <xpath expr="//button[@name='%(hr_recruitment.action_hr_job_applications)d']" position="replace">
diff --git a/addons/website_hr_recruitment/views/website_pages_views.xml b/addons/website_hr_recruitment/views/website_pages_views.xml
index a91c406b1daf8..01f9e44e1d58f 100644
--- a/addons/website_hr_recruitment/views/website_pages_views.xml
+++ b/addons/website_hr_recruitment/views/website_pages_views.xml
@@ -17,7 +17,6 @@
 
         <field name="name" position="after">
             <field name="website_url"/>
-            <field name="company_id" column_invisible="True"/>
         </field>
         <xpath expr="//list">
             <field name="is_seo_optimized"/>
diff --git a/addons/website_livechat/views/website_visitor_views.xml b/addons/website_livechat/views/website_visitor_views.xml
index 44d8e944d8824..f9c62b3154b6b 100644
--- a/addons/website_livechat/views/website_visitor_views.xml
+++ b/addons/website_livechat/views/website_visitor_views.xml
@@ -88,7 +88,7 @@
         <field name="model">website.visitor</field>
         <field name="inherit_id" ref="website.website_visitor_view_tree"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='email']" position="after">
+            <xpath expr="//field[@name='last_visited_page_id']" position="after">
                 <field name="livechat_operator_id" optional="hide"/>
                 <button name="action_send_chat_request" string="Chat" type="object" icon="fa-comments"
                         invisible="livechat_operator_id or not is_connected"/>
diff --git a/addons/website_sale/views/product_image_views.xml b/addons/website_sale/views/product_image_views.xml
index dbafc7925f31c..5b4a33e7676fa 100644
--- a/addons/website_sale/views/product_image_views.xml
+++ b/addons/website_sale/views/product_image_views.xml
@@ -7,7 +7,6 @@
         <field name="model">product.image</field>
         <field name="arch" type="xml">
             <form string="Product Images">
-                <field name="sequence" invisible="1"/>
                 <div class="row o_website_sale_image_modal">
                     <div class="col-md-6 col-xl-5">
                         <label for="name" string="Image Name"/>
@@ -41,7 +40,6 @@
         <field name="model">product.image</field>
         <field name="arch" type="xml">
             <kanban string="Product Images" default_order="sequence">
-                <field name="video_url" invisible="1"/>
                 <field name="sequence" widget="handle"/>
                 <templates>
                     <t t-name="card" class="p-0 border-0">
diff --git a/addons/website_sale/views/product_pricelist_views.xml b/addons/website_sale/views/product_pricelist_views.xml
index 0598065afe4b4..c0d7f54dc5bd5 100644
--- a/addons/website_sale/views/product_pricelist_views.xml
+++ b/addons/website_sale/views/product_pricelist_views.xml
@@ -9,7 +9,6 @@
             <notebook position="inside">
                 <page name="pricelist_config" string="Ecommerce">
                     <group name="pricelist_website">
-                        <field name="company_id" invisible="1"/>
                         <field name="website_id"
                             options="{'no_create': True}"
                             placeholder="Select a website"/>
diff --git a/addons/website_sale/views/product_product_add.xml b/addons/website_sale/views/product_product_add.xml
index 0811a7498f22f..ddb4770520c7d 100644
--- a/addons/website_sale/views/product_product_add.xml
+++ b/addons/website_sale/views/product_product_add.xml
@@ -11,7 +11,7 @@
                 <attribute name="js_class">website_new_content_form</attribute>
             </xpath>
             <xpath expr="//field[@name='company_id']" position="before">
-                <field name="website_url" invisible="1"/>
+                <field name="website_url" invisible="1"/>  <!-- We need this for `computePath` used in `onAddContent` to redirect to the product after creation. -->
             </xpath>
         </field>
     </record>
diff --git a/addons/website_sale_loyalty/wizard/coupon_share_views.xml b/addons/website_sale_loyalty/wizard/coupon_share_views.xml
index edd0b111dc77c..a75754ba92471 100644
--- a/addons/website_sale_loyalty/wizard/coupon_share_views.xml
+++ b/addons/website_sale_loyalty/wizard/coupon_share_views.xml
@@ -5,8 +5,6 @@
         <field name="model">coupon.share</field>
         <field name="arch" type="xml">
             <form string="Share Loyalty Card" edit="1" create="0">
-                <field name="website_id" invisible="1"/>
-                <field name="program_website_id" invisible="1"/>
                 <group>
                     <div colspan="2">
                         <p>
diff --git a/addons/website_sale_slides/views/slide_channel_views.xml b/addons/website_sale_slides/views/slide_channel_views.xml
index ef5459b72b097..a24acd5c3c69e 100644
--- a/addons/website_sale_slides/views/slide_channel_views.xml
+++ b/addons/website_sale_slides/views/slide_channel_views.xml
@@ -38,7 +38,6 @@
         <field name="inherit_id" ref="website_slides.slide_channel_view_tree_report"/>
         <field name="arch" type="xml">
             <field name="members_completed_count" position="after">
-                <field name="currency_id" column_invisible="True"/>
                 <field name="product_sale_revenues" string="Total Revenues" sum="Total Revenues" widget="monetary"/>
             </field>
         </field>
@@ -53,7 +52,6 @@
                 <div class="d-flex" invisible="enroll != 'payment'">
                     <label for="product_sale_revenues" class="mb0 me-auto">Sales</label>
                     <field class="text-nowrap" name="product_sale_revenues" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                    <field name="currency_id" invisible="True"/>
                 </div>
             </xpath>
         </field>
diff --git a/addons/website_sale_stock/__manifest__.py b/addons/website_sale_stock/__manifest__.py
index 7de0e82da7578..b3b60eaff206f 100644
--- a/addons/website_sale_stock/__manifest__.py
+++ b/addons/website_sale_stock/__manifest__.py
@@ -19,7 +19,6 @@
         'views/product_template_views.xml',
         'views/res_config_settings_views.xml',
         'views/website_sale_stock_templates.xml',
-        'views/stock_picking_views.xml',
         'views/website_pages_views.xml',
         'data/template_email.xml',
         'data/ir_cron_data.xml',
diff --git a/addons/website_sale_stock/views/res_config_settings_views.xml b/addons/website_sale_stock/views/res_config_settings_views.xml
index b80697e1fd269..a835dc61f2c19 100644
--- a/addons/website_sale_stock/views/res_config_settings_views.xml
+++ b/addons/website_sale_stock/views/res_config_settings_views.xml
@@ -16,7 +16,6 @@
                         <div class="row mt16"
                             id="website_warehouse_setting"
                             groups="stock.group_stock_multi_warehouses">
-                            <field name="website_company_id" invisible="1"/>
                             <label for="website_warehouse_id" string="Warehouse" class="col-lg-3 o_light_label" />
                             <field name="website_warehouse_id" placeholder="All warehouses"/>
                         </div>
@@ -50,4 +49,3 @@
     </record>
 
 </odoo>
-
diff --git a/addons/website_sale_stock/views/stock_picking_views.xml b/addons/website_sale_stock/views/stock_picking_views.xml
deleted file mode 100644
index 1153465fdd100..0000000000000
--- a/addons/website_sale_stock/views/stock_picking_views.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="view_picking_form_inherit_website_sale_stock" model="ir.ui.view">
-        <field name="name">stock.picking.form.inherit.website.sale.stock</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//page[@name='extra']/group/group/field[@name='company_id']" position="before">
-                <field name="website_id" groups="website.group_multi_website" invisible="1"/>
-            </xpath>
-        </field>
-    </record>
-</odoo>
diff --git a/addons/website_slides/views/rating_rating_views.xml b/addons/website_slides/views/rating_rating_views.xml
index 46c5ab8150348..2714256814264 100644
--- a/addons/website_slides/views/rating_rating_views.xml
+++ b/addons/website_slides/views/rating_rating_views.xml
@@ -25,10 +25,10 @@
         <field name="priority">64</field>
         <field name="arch" type="xml">
             <graph string="Reviews" type="bar" sample="1">
-                <field name="res_name" invisible="1"/>
+                <field name="res_name"/>
                 <field name="rating" type="measure"/>
-                <field name="res_id" invisible="1"/>
-                <field name="parent_res_id" invisible="1"/>
+                <field name="res_id"/>
+                <field name="parent_res_id"/>
             </graph>
         </field>
     </record>
diff --git a/addons/website_slides/views/slide_channel_add.xml b/addons/website_slides/views/slide_channel_add.xml
index bd235c426df45..c6988342d8dc8 100644
--- a/addons/website_slides/views/slide_channel_add.xml
+++ b/addons/website_slides/views/slide_channel_add.xml
@@ -11,7 +11,7 @@
                 <h1><field name="name" placeholder="e.g. Computer Science for kids" class="w-100"/></h1>
             </div>
             <group>
-                <field name="website_url" invisible="1"/>
+                <field name="website_url" invisible="1"/>  <!-- We need this for `computePath` used in `onAddContent` to redirect to the slide after creation. -->
                 <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/>
                 <field name="channel_type" widget="image_radio" options="{'images': ['/website_slides/static/src/img/channel-training-layout.png', '/website_slides/static/src/img/channel-documentation-layout.png']}" string="Choose a layout"/>
                 <field name="description" placeholder="Common tasks for a computer scientist is asking the right questions and answering questions..." class="mb-3"/>
diff --git a/addons/website_slides/views/slide_channel_partner_views.xml b/addons/website_slides/views/slide_channel_partner_views.xml
index 2d655002a4271..1866df63e5d61 100644
--- a/addons/website_slides/views/slide_channel_partner_views.xml
+++ b/addons/website_slides/views/slide_channel_partner_views.xml
@@ -51,7 +51,6 @@
                         decoration-warning="channel_enroll == 'payment'"
                         optional="hide"/>
                     <field name="channel_website_id" groups="website.group_multi_website" optional="hide"/>
-                    <field name="active" column_invisible="True"/>
                     <button name="action_archive" title="Archive" icon="fa-times" type="object"
                         invisible="not active"/>
                     <button name="action_unarchive" title="Unarchive" icon="fa-undo" type="object"
@@ -92,7 +91,7 @@
             <field name="model">slide.channel.partner</field>
             <field name="arch" type="xml">
                 <pivot string="Attendees" sample="1">
-                    <field name="completion" invisible="1"/>
+                    <field name="completion"/>
                 </pivot>
             </field>
         </record>
diff --git a/addons/website_slides/views/slide_channel_tag_views.xml b/addons/website_slides/views/slide_channel_tag_views.xml
index 27f47f5a7f2ba..df9d496025f92 100644
--- a/addons/website_slides/views/slide_channel_tag_views.xml
+++ b/addons/website_slides/views/slide_channel_tag_views.xml
@@ -33,7 +33,6 @@
         <field name="arch" type="xml">
             <list string="Course Tags" editable="top">
                 <field name="sequence" widget="handle"/>
-                <field name="group_sequence" column_invisible="True"/>
                 <field name="name"/>
                 <field name="group_id"/>
             </list>
@@ -73,7 +72,6 @@
                         <field name="tag_ids" nolabel="1" colspan="2">
                             <list editable="bottom">
                                 <field name="sequence" widget="handle"/>
-                                <field name="group_sequence" column_invisible="True"/>
                                 <field name="name" string="Tag Name"/>
                                 <field name="color" string="Color" widget="color_picker"/>
                                 <control>
diff --git a/addons/website_slides/views/slide_channel_views.xml b/addons/website_slides/views/slide_channel_views.xml
index fea4ab7542321..31eadc82bf262 100644
--- a/addons/website_slides/views/slide_channel_views.xml
+++ b/addons/website_slides/views/slide_channel_views.xml
@@ -68,7 +68,6 @@
                             <h1><field name="name" options="{'line_breaks': False}" widget="text" default_focus="1" placeholder='e.g. "Computer Science for kids"'/></h1>
                         </div>
                         <div>
-                            <field name="active" invisible="1"/>
                             <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/>
                         </div>
                         <notebook colspan="4">
@@ -82,7 +81,6 @@
                                         <field name="total_views" invisible="slide_category == 'category'"/>
                                         <field name="is_preview" string="Preview"/>
                                         <field name="is_published" string="Published"/>
-                                        <field name="is_category" column_invisible="True"/>
                                         <control>
                                             <create name="add_slide_section" string="Add Section" context="{'default_is_category': True}"/>
                                             <create name="add_slide_lesson" string="Add Content"/>
@@ -100,7 +98,6 @@
                                         <field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/>
                                     </group>
                                     <group name="access_rights" string="Access Rights">
-                                        <field name="website_published" invisible="1"/>
                                         <field name="prerequisite_channel_ids" widget="many2many_tags"/>
                                         <field name="prerequisite_of_channel_ids" widget="many2many_tags"
                                                readonly="1"
@@ -167,7 +164,6 @@
                     <field name="visibility"/>
                     <field name="enroll" widget="badge" decoration-success="enroll == 'public'" decoration-info="enroll == 'invite'" decoration-warning="enroll == 'payment'" optional="hide"/>
                     <field name="is_published" string="Published"/>
-                    <field name="active" column_invisible="True"/>
                 </list>
             </field>
         </record>
@@ -212,12 +208,12 @@
                 <graph string="Courses" sample="1">
                     <field name="name"/>
                     <field name="total_views" type="measure"/>
-                    <field name="karma_slide_comment" invisible="1"/>
-                    <field name="karma_review" invisible="1"/>
-                    <field name="color" invisible="1"/>
-                    <field name="karma_gen_channel_finish" invisible="1"/>
-                    <field name="karma_gen_channel_rank" invisible="1"/>
-                    <field name="sequence" invisible="1"/>
+                    <field name="karma_slide_comment"/>
+                    <field name="karma_review"/>
+                    <field name="color"/>
+                    <field name="karma_gen_channel_finish"/>
+                    <field name="karma_gen_channel_rank"/>
+                    <field name="sequence"/>
                 </graph>
             </field>
         </record>
@@ -229,12 +225,12 @@
                 <pivot string="Pivot" default_order="create_date desc" sample="1">
                     <field type="row" name="name" />
                     <field type="measure" name="total_views"/>
-                    <field name="karma_slide_comment" invisible="1"/>
-                    <field name="karma_review" invisible="1"/>
-                    <field name="color" invisible="1"/>
-                    <field name="karma_gen_channel_finish" invisible="1"/>
-                    <field name="karma_gen_channel_rank" invisible="1"/>
-                    <field name="sequence" invisible="1"/>
+                    <field name="karma_slide_comment"/>
+                    <field name="karma_review"/>
+                    <field name="color"/>
+                    <field name="karma_gen_channel_finish"/>
+                    <field name="karma_gen_channel_rank"/>
+                    <field name="sequence"/>
                 </pivot>
             </field>
         </record>
diff --git a/addons/website_slides/views/slide_question_views.xml b/addons/website_slides/views/slide_question_views.xml
index d3f4682db3f51..b1db226b0faea 100644
--- a/addons/website_slides/views/slide_question_views.xml
+++ b/addons/website_slides/views/slide_question_views.xml
@@ -18,7 +18,6 @@
                     </div>
                     <field name="answer_ids">
                         <list editable="bottom" create="true" delete="true">
-                            <field name="display_name" column_invisible="True"/>
                             <field name="text_value"/>
                             <field name="is_correct"/>
                             <field name="comment"/>
diff --git a/addons/website_slides/views/slide_slide_partner_views.xml b/addons/website_slides/views/slide_slide_partner_views.xml
index 73f23be58a90c..223d46e7bbcf5 100644
--- a/addons/website_slides/views/slide_slide_partner_views.xml
+++ b/addons/website_slides/views/slide_slide_partner_views.xml
@@ -45,7 +45,6 @@
                         <group>
                             <field name="partner_id"/>
                             <field name="slide_id"/>
-                            <field name="slide_category" invisible="1"/>
                             <field name="channel_id"/>
                         </group>
                         <group>
diff --git a/addons/website_slides/views/slide_slide_views.xml b/addons/website_slides/views/slide_slide_views.xml
index c3e8e187117b4..94425e5c7eb69 100644
--- a/addons/website_slides/views/slide_slide_views.xml
+++ b/addons/website_slides/views/slide_slide_views.xml
@@ -47,8 +47,6 @@
             <field name="arch" type="xml">
                 <form string="Lesson">
                     <sheet>
-                        <field name="channel_type" invisible="1" readonly="1"/>
-                        <field name="channel_allow_comment" invisible="1" readonly="1"/>
                         <div class="oe_button_box" name="button_box">
                             <button name="%(slide_slide_partner_action_from_slide)d"
                                     class="oe_stat_button" type="action" icon="fa-graduation-cap"
@@ -86,7 +84,6 @@
                             </div>
                             <h1>
                                 <field name="name" default_focus="1" placeholder="e.g. Setting up your computer" class="me-0"/>
-                                <field name="is_category" invisible="1"/>
                             </h1>
                             <field name="tag_ids" invisible="is_category" widget="many2many_tags" placeholder="Tags..."/>
                         </div>
@@ -94,10 +91,8 @@
                             <page name="document" string="Document">
                                 <group>
                                     <group name="lesson_details">
-                                        <field name="active" invisible="1"/>
                                         <field name="channel_id"/>
                                         <field name="slide_category" string="Content Type"/>
-                                        <field name="slide_type" invisible="1"/>
                                         <div class="text-muted" colspan="2" invisible="slide_category != 'quiz'">
                                             You can add questions to this quiz in the 'Quiz' tab.
                                         </div>
@@ -148,7 +143,6 @@
                                             <field name="sequence" widget="handle"/>
                                             <field name="resource_type"/>
                                             <field name="name" required="1"/>
-                                            <field name="file_name" column_invisible="True"/>
                                             <field name="data" readonly="resource_type == 'url'" filename="file_name"/>
                                             <field name="link" string="Link"
                                                 readonly="resource_type == 'file'"
@@ -325,11 +319,11 @@
                     <field name="channel_id"/>
                     <field name="slide_category"/>
                     <field name="total_views" type="measure"/>
-                    <field name="quiz_first_attempt_reward" invisible="1"/>
-                    <field name="quiz_second_attempt_reward" invisible="1"/>
-                    <field name="quiz_third_attempt_reward" invisible="1"/>
-                    <field name="quiz_fourth_attempt_reward" invisible="1"/>
-                    <field name="sequence" invisible="1"/>
+                    <field name="quiz_first_attempt_reward"/>
+                    <field name="quiz_second_attempt_reward"/>
+                    <field name="quiz_third_attempt_reward"/>
+                    <field name="quiz_fourth_attempt_reward"/>
+                    <field name="sequence"/>
                 </graph>
             </field>
         </record>
diff --git a/addons/website_slides/views/website_pages_views.xml b/addons/website_slides/views/website_pages_views.xml
index 043d0d0b4ad8a..3be8aac9fe444 100644
--- a/addons/website_slides/views/website_pages_views.xml
+++ b/addons/website_slides/views/website_pages_views.xml
@@ -39,7 +39,7 @@
             <attribute name="action">open_website_url</attribute>
         </xpath>
         <xpath expr="//kanban" position="inside">
-            <field name="website_url" invisible="1"/>
+            <field name="website_url"/>
         </xpath>
         <xpath expr="//div[@name='card_primary_left']" position="replace">
             <div class="col-6 text-primary" t-if="record.website_id.value" groups="website.group_multi_website">
diff --git a/addons/website_slides/wizard/slide_channel_invite_views.xml b/addons/website_slides/wizard/slide_channel_invite_views.xml
index e905e6b576422..7f8f23f03e615 100644
--- a/addons/website_slides/wizard/slide_channel_invite_views.xml
+++ b/addons/website_slides/wizard/slide_channel_invite_views.xml
@@ -10,10 +10,6 @@
                         This course is not published. Attendees may not be able to access its contents.
                     </div>
                     <sheet>
-                        <field name="channel_id" invisible="1"/>
-                        <field name="channel_published" invisible="1"/>
-                        <field name="channel_visibility" invisible="1"/>
-                        <field name="enroll_mode" invisible="1"/>
                         <group col="1">
                             <group col="2" invisible="enroll_mode or channel_visibility != 'public'">
                                 <field name="channel_invite_url" readonly="1" widget="CopyClipboardChar"/>
@@ -28,11 +24,8 @@
                                     context="{'show_email': True, 'form_view_ref': 'base.view_partner_simple_form'}"/>
                             </group>
                             <group col="2" invisible="not send_email">
-                                <field name="lang" invisible="1"/>
-                                <field name="render_model" invisible="1"/>
                                 <field name="subject" placeholder="Subject..."/>
                             </group>
-                            <field name="can_edit_body" invisible="1"/>
                             <field name="body" class="oe-bordered-editor" widget="html_mail" invisible="not send_email" readonly="not can_edit_body" force_save="1"/>
                             <group invisible="not send_email">
                                 <group>
diff --git a/addons/website_slides_survey/views/slide_channel_partner_views.xml b/addons/website_slides_survey/views/slide_channel_partner_views.xml
index 3c92ccb26c69f..21e8a1d4c68a3 100644
--- a/addons/website_slides_survey/views/slide_channel_partner_views.xml
+++ b/addons/website_slides_survey/views/slide_channel_partner_views.xml
@@ -7,7 +7,6 @@
             <field name="inherit_id" ref="website_slides.slide_channel_partner_view_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='member_status']" position="after">
-                    <field name="nbr_certification" column_invisible="True"/>
                     <field name="survey_certification_success" invisible="nbr_certification == 0" optional="hide"/>
                 </xpath>
             </field>
diff --git a/addons/website_slides_survey/views/slide_channel_views.xml b/addons/website_slides_survey/views/slide_channel_views.xml
index 0ad424cadff87..c4eea480e246a 100644
--- a/addons/website_slides_survey/views/slide_channel_views.xml
+++ b/addons/website_slides_survey/views/slide_channel_views.xml
@@ -6,7 +6,6 @@
         <field name="inherit_id" ref="website_slides.view_slide_channel_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@name='action_redirect_to_completed_members']" position="after">
-                <field  name="nbr_certification" invisible="1"/>
                 <button name="action_redirect_to_certified_members"
                     invisible="nbr_certification == 0"
                     type="object"
diff --git a/addons/website_sms/views/website_visitor_views.xml b/addons/website_sms/views/website_visitor_views.xml
index 37df55ef8fdec..facf501e7a846 100644
--- a/addons/website_sms/views/website_visitor_views.xml
+++ b/addons/website_sms/views/website_visitor_views.xml
@@ -33,9 +33,6 @@
         <field name="model">website.visitor</field>
         <field name="inherit_id" ref="website.website_visitor_view_tree"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='is_connected']" position="before">
-                <field name="mobile" column_invisible="True"/>
-            </xpath>
             <xpath expr="//button[@name='action_send_mail']" position="after">
                 <button name="action_send_sms" type="object" icon="fa-mobile"
                         invisible="not mobile" string="SMS"/>
diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py
index 51aebe4d37869..4af06b3a46575 100644
--- a/odoo/addons/base/tests/test_views.py
+++ b/odoo/addons/base/tests/test_views.py
@@ -4815,9 +4815,7 @@ def test_uncommented_invisible_field(self):
         # NEVER add new name in this list ! The new addons must add comment for all always invisible field.
         only_log_modules = (
             'account',
-            'account_3way_match',
             'account_accountant',
-            'account_accountant_batch_payment',
             'account_asset',
             'account_asset_fleet',
             'account_auto_transfer',
@@ -5183,40 +5181,6 @@ def test_uncommented_invisible_field(self):
             'voip',
             'web',
             'web_studio',
-            'website',
-            'website_appointment',
-            'website_blog',
-            'website_crm_iap_reveal',
-            'website_crm_partner_assign',
-            'website_customer',
-            'website_delivery_sendcloud',
-            'website_event',
-            'website_event_booth_exhibitor',
-            'website_event_exhibitor',
-            'website_event_social',
-            'website_event_track',
-            'website_event_track_gantt',
-            'website_event_track_quiz',
-            'website_event_track_social',
-            'website_event_twitter_wall',
-            'website_forum',
-            'website_helpdesk_forum',
-            'website_hr_recruitment',
-            'website_knowledge',
-            'website_livechat',
-            'website_payment',
-            'website_sale',
-            'website_sale_loyalty',
-            'website_sale_slides',
-            'website_sale_stock',
-            'website_slides',
-            'website_slides_survey',
-            'website_sms',
-            'website_studio',
-            'website_twitter_wall',
-            'whatsapp',
-            'whatsapp_payment',
-            'worksheet',
         )
 
         modules_without_error = set(self.env['ir.module.module'].search([('state', '=', 'intalled'), ('name', 'in', only_log_modules)]).mapped('name'))

From 1c867721de38b7918142813ed5d4860e905d2759 Mon Sep 17 00:00:00 2001
From: "Abdelrahman Mahmoud (amah)" <amah@odoo.com>
Date: Thu, 4 Sep 2025 11:29:58 +0200
Subject: [PATCH 052/673] [IMP] hr_attendance: enhance inheritability

In this PR we add some naming to ehance the inheritability of hr_attendance for loca

closes odoo/odoo#212356

Task: 4598879
Related: odoo/enterprise#86699
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_attendance/views/hr_attendance_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index 44119d0c12e70..cd5746902fac1 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -104,7 +104,7 @@
                                 <field name="check_in" options="{'rounding': 0}" readonly="not is_manager"/>
                                 <field name="check_out" options="{'rounding': 0}" placeholder="Currently Working" readonly="not is_manager"/>
                             </group>
-                            <group col="2">
+                            <group col="2" name="group_worked_hours">
                                 <field name="worked_hours" string="Worked Time" widget="float_time"/>
                                 <field name="overtime_hours" widget="float_time" string="Worked Extra Hours" invisible="overtime_hours == validated_overtime_hours"/>
                                 <label for="validated_overtime_hours"/>

From 6edf180913e0cf65ecd7dadc0592b108a66a4d41 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Dufays <pydu@odoo.com>
Date: Thu, 2 Oct 2025 11:07:40 +0200
Subject: [PATCH 053/673] [IMP] survey: remove unnecessary sudo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The sudo was present in the /survey/session/next_question/<token> route "to
avoid potential access right issues" because "a user can create a live session
from any survey but they can only write on their own survey.". But following
the security configuration, user belonging to the survey_user group can write
and see all surveys not restricted to other users (since commit 027a2a66). So
a user have either full access or no access at all. That's why we remove here
the sudos.

To avoid errors in the future, we avoid to return the survey in sudo in
_fetch_from_session_code. Instead, we just return the start URL.

Task-5089292

Part-of: odoo/odoo#227426
Signed-off-by: Warnon Aurélien (awa) <awa@odoo.com>
---
 .../controllers/survey_session_manage.py      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/addons/survey/controllers/survey_session_manage.py b/addons/survey/controllers/survey_session_manage.py
index 5e226a6942574..06c70434782a2 100644
--- a/addons/survey/controllers/survey_session_manage.py
+++ b/addons/survey/controllers/survey_session_manage.py
@@ -18,18 +18,18 @@ def _fetch_from_token(self, survey_token):
         Unlike the regular survey controller, user trying to access the survey must have full access rights! """
         return request.env['survey.survey'].search([('access_token', '=', survey_token)])
 
-    def _fetch_from_session_code(self, session_code):
+    def _fetch_start_url_from_session_code(self, session_code):
         """ Matches a survey against a passed session_code, and checks if it is valid.
-        If it is valid, returns the start url. Else, the error type."""
+        If it is valid, returns (start url, None). Else, the error type (None, { 'error': ...})."""
         if not session_code:
             return None, {'error': 'survey_wrong'}
-        survey = request.env['survey.survey'].sudo().search([('session_code', '=', session_code)], limit=1)
-        if not survey or survey.certification:
+        survey_sudo = request.env['survey.survey'].sudo().search([('session_code', '=', session_code)], limit=1)
+        if not survey_sudo or survey_sudo.certification:
             return None, {'error': 'survey_wrong'}
-        if survey.session_state in ['ready', 'in_progress']:
-            return survey, None
+        if survey_sudo.session_state in ['ready', 'in_progress']:
+            return survey_sudo.get_start_url(), None
         if request.env.user.has_group("survey.group_survey_user"):
-            return None, {'error': 'survey_session_not_launched', 'survey_id': survey.id}
+            return None, {'error': 'survey_session_not_launched', 'survey_id': survey_sudo.id}
         return None, {'error': 'survey_session_not_launched'}
 
     # ------------------------------------------------------------
@@ -80,10 +80,6 @@ def survey_session_next_question(self, survey_token, go_back=False, **kwargs):
 
         Frontend should take the delay into account by displaying the appropriate animations.
 
-        Writing the next question on the survey is sudo'ed to avoid potential access right issues.
-        e.g: a survey user can create a live session from any survey but they can only write
-        on their own survey.
-
         In addition to return a pre-rendered html template with the next question, we also return the background
         to display. Background image depends on the next question to display and cannot be extracted from the
         html rendered question template. The background needs to be changed at frontend side on a specific selector."""
@@ -102,7 +98,7 @@ def survey_session_next_question(self, survey_token, go_back=False, **kwargs):
         # using datetime.datetime because we want the millis portion
         if next_question:
             now = datetime.datetime.now()
-            survey.sudo().write({
+            survey.write({
                 'session_question_id': next_question.id,
                 'session_question_start_time': fields.Datetime.now() + relativedelta(seconds=1)
             })
@@ -175,22 +171,22 @@ def survey_start_short(self, session_code):
         """" Redirects to 'survey_start' route using a shortened link & token.
         Shows an error message if the survey is not valid.
         This route is used in survey sessions where we need short links for people to type. """
-        survey, survey_error = self._fetch_from_session_code(session_code)
+        survey_start_url, survey_error = self._fetch_start_url_from_session_code(session_code)
 
         if survey_error:
             return request.render('survey.survey_session_code',
                                   dict(**survey_error, session_code=session_code))
-        return request.redirect(survey.get_start_url())
+        return request.redirect(survey_start_url)
 
     @http.route('/survey/check_session_code/<string:session_code>', type='jsonrpc', auth='public', website=True)
     def survey_check_session_code(self, session_code):
         """ Checks if the given code is matching a survey session_code.
         If yes, redirect to /s/code route.
         If not, return error. The user is invited to type again the code."""
-        survey, survey_error = self._fetch_from_session_code(session_code)
+        survey_start_url, survey_error = self._fetch_start_url_from_session_code(session_code)
         if survey_error:
             return survey_error
-        return {'survey_url': survey.get_start_url()}
+        return {'survey_url': survey_start_url}
 
     def _prepare_manage_session_values(self, survey):
         is_first_question, is_last_question = False, False

From b8988319e535c4df580772c25e55bbccc4b3e4dc Mon Sep 17 00:00:00 2001
From: Pierre-Yves Dufays <pydu@odoo.com>
Date: Mon, 20 Oct 2025 15:03:58 +0200
Subject: [PATCH 054/673] [IMP] survey: prevent submission after showing
 answers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We prevent user to submit answer after having shown the correct answers.

Example of the problem we fix:
- Create a live survey
- Add a question to get the name and toggle the nickname option
- Add a question with an answer that grants 5 points
- Add a second question with 3 points
- Start a live session
- Register 2 participants: P1 and P2
- At the first question for P1, answer the correct answer for 5 pt and don't
answer for P2.
- Go to the leaderboard to displays the score, P1 has 5 pt and P2 0pt.
- Before going to the next question, submit the correct answer for P2
- Go to the next question
- Answer correctly for both participant (they all get 3 points)
- Display the leaderboard

The 2 participants have 8 points while the P2 should only have 3 points.

Task-5089292

closes odoo/odoo#227426

Signed-off-by: Warnon Aurélien (awa) <awa@odoo.com>
---
 addons/survey/controllers/main.py             |  2 +
 .../controllers/survey_session_manage.py      |  8 ++
 addons/survey/models/survey_survey.py         |  1 +
 .../src/interactions/survey_session_manage.js | 11 ++-
 addons/survey/tests/common.py                 |  6 ++
 addons/survey/tests/test_survey_controller.py | 91 ++++++++++++++++++-
 6 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index ddb61cec0019c..15f1f4d7abf9b 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -527,6 +527,8 @@ def survey_submit(self, survey_token, answer_token, **post):
 
         if answer_sudo.state == 'done':
             return {}, {'error': 'unauthorized'}
+        if answer_sudo.is_session_answer and not answer_sudo.test_entry and not survey_sudo.session_question_can_answer:
+            return {}, {'error': 'validation', 'fields': {survey_sudo.session_question_id.id: _('We do not accept submissions for this question anymore.')}}
 
         questions, page_or_question_id = survey_sudo._get_survey_questions(answer=answer_sudo,
                                                                            page_id=post.get('page_id'),
diff --git a/addons/survey/controllers/survey_session_manage.py b/addons/survey/controllers/survey_session_manage.py
index 06c70434782a2..49cc381a18344 100644
--- a/addons/survey/controllers/survey_session_manage.py
+++ b/addons/survey/controllers/survey_session_manage.py
@@ -65,6 +65,13 @@ def survey_session_manage(self, survey_token, **kwargs):
         # Note that at this stage survey.session_state can be False meaning that the survey has ended (session closed)
         return request.render('survey.user_input_session_manage', self._prepare_manage_session_values(survey))
 
+    @http.route('/survey/session/disable_answers/<string:survey_token>', type='jsonrpc', auth='user', website=True)
+    def survey_session_disable_answers(self, survey_token, **kwargs):
+        """ This route is called when the host shows answers to prevent more submissions. """
+        if (survey := self._fetch_from_token(survey_token)) and survey.session_state == 'in_progress':
+            survey.session_question_can_answer = False
+        return {}
+
     @http.route('/survey/session/next_question/<string:survey_token>', type='jsonrpc', auth='user', website=True)
     def survey_session_next_question(self, survey_token, go_back=False, **kwargs):
         """ This route is called when the host goes to the next question of the session.
@@ -99,6 +106,7 @@ def survey_session_next_question(self, survey_token, go_back=False, **kwargs):
         if next_question:
             now = datetime.datetime.now()
             survey.write({
+                'session_question_can_answer': True,
                 'session_question_id': next_question.id,
                 'session_question_start_time': fields.Datetime.now() + relativedelta(seconds=1)
             })
diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py
index 19a81e8264ad1..3d51151d35c85 100644
--- a/addons/survey/models/survey_survey.py
+++ b/addons/survey/models/survey_survey.py
@@ -156,6 +156,7 @@ def default_get(self, fields):
     # live sessions - current question fields
     session_question_id = fields.Many2one('survey.question', string="Current Question", copy=False,
         help="The current question of the survey session.")
+    session_question_can_answer = fields.Boolean("Can Answer Current Question", default=True, copy=False)
     session_start_time = fields.Datetime("Current Session Start Time", copy=False)
     session_question_start_time = fields.Datetime("Current Question Start Time", copy=False,
         help="The time at which the current question has started, used to handle the timer for attendees.")
diff --git a/addons/survey/static/src/interactions/survey_session_manage.js b/addons/survey/static/src/interactions/survey_session_manage.js
index d485546e99e95..5ad5ff0a982bd 100644
--- a/addons/survey/static/src/interactions/survey_session_manage.js
+++ b/addons/survey/static/src/interactions/survey_session_manage.js
@@ -206,13 +206,16 @@ export class SurveySessionManage extends Interaction {
      *
      * @param {Event} ev
      */
-    onNext(ev) {
+    async onNext(ev) {
         const screenToDisplay = this.getNextScreen();
         switch (screenToDisplay) {
             case "userInputs":
                 this.chartUpdateState({ showInputs: true });
                 break;
             case "results":
+                await this.waitFor(
+                    rpc(`/survey/session/disable_answers/${this.surveyAccessToken}`)
+                );
                 this.chartUpdateState({ showAnswers: true });
                 // when showing results, stop refreshing answers
                 clearInterval(this.resultsRefreshInterval);
@@ -476,10 +479,10 @@ export class SurveySessionManage extends Interaction {
      *
      * @param {KeyboardEvent} ev
      */
-    onKeyDown(ev) {
+    async onKeyDown(ev) {
         const hotkey = getActiveHotkey(ev);
         if (hotkey === "arrowright" || hotkey === "space") {
-            this.onNext(ev);
+            await this.onNext(ev);
         } else if (hotkey === "arrowleft") {
             this.onBack(ev);
         }
@@ -587,7 +590,7 @@ export class SurveySessionManage extends Interaction {
         if (this.timerEl && !questionTimeLimitReached && !hasAnswered && timeLimitMinutes) {
             this.addListener(surveyManagerEl, "time_up", async () => {
                 if (this.currentScreen === "question" && this.isScoredQuestion) {
-                    this.onNext();
+                    await this.onNext();
                 }
             });
             this.timerEl.dispatchEvent(
diff --git a/addons/survey/tests/common.py b/addons/survey/tests/common.py
index 553f6c752966d..a4fb291948c8d 100644
--- a/addons/survey/tests/common.py
+++ b/addons/survey/tests/common.py
@@ -230,6 +230,12 @@ def _format_submission_data(self, question, answer, additional_post_data):
         post_data.update(**additional_post_data)
         return post_data
 
+    def _session_next_question(self, survey):
+        return self.url_open(survey.get_base_url() + f'/survey/session/next_question/{survey.access_token}', json={})
+
+    def _session_disable_answers(self, survey):
+        return self.url_open(survey.get_base_url() + f'/survey/session/disable_answers/{survey.access_token}', json={})
+
     # ------------------------------------------------------------
     # UTILS / TOOLS
     # ------------------------------------------------------------
diff --git a/addons/survey/tests/test_survey_controller.py b/addons/survey/tests/test_survey_controller.py
index 0d7a6f31c647b..d0a71ae95113c 100644
--- a/addons/survey/tests/test_survey_controller.py
+++ b/addons/survey/tests/test_survey_controller.py
@@ -6,6 +6,7 @@
 from odoo import Command
 from odoo.addons.survey.tests import common
 from odoo.tests.common import tagged, HttpCase
+from odoo.tools import mute_logger
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
@@ -103,7 +104,9 @@ def test_submit_route_scoring_after_page(self):
                 # Submit answers and check the submit route is returning the accurate correct answers
                 response = self._access_submit(survey, answer_token, post_data)
                 self.assertResponse(response, 200)
-                self.assertEqual(response.json()['result'][0], expected_correct_answers)
+                result = response.json()['result']
+                self.assertFalse(result[1].get('error'))
+                self.assertEqual(result[0], expected_correct_answers)
 
                 user_input.invalidate_recordset() # TDE note: necessary as lots of sudo in controllers messing with cache
 
@@ -122,3 +125,89 @@ def test_live_session_without_question(self):
         session_manage_url = f'/survey/session/manage/{survey.access_token}'
         response = self.url_open(session_manage_url)
         self.assertEqual(response.status_code, 200, "Should be able to open live session manage page")
+
+    def test_live_session_answer_after_result(self):
+        """Verify that participants can no longer answer once the results have been shown."""
+        survey = self.env['survey.survey'].with_user(self.survey_manager).create({
+            'title': 'Live Session Survey',
+            'survey_type': 'live_session',
+            'question_and_page_ids': [
+                Command.create({
+                    'title': question, 'question_type': 'multiple_choice',
+                    'suggested_answer_ids': [
+                        Command.create({'value': '1pt', 'is_correct': True, 'answer_score': 1}),
+                        Command.create({'value': '0pt', 'is_correct': False, 'answer_score': 0}),
+                    ]
+                })
+                for question in ('Question1', 'Question2')
+            ],
+        })
+        questions = survey.question_ids
+
+        # Host: Start the live survey
+        self.authenticate('survey_manager', 'survey_manager')
+        survey.action_start_session()
+        self.assertEqual(self._session_next_question(survey).status_code, 200)
+        self.assertTrue(survey.session_question_can_answer)
+        self.assertEqual(self._session_disable_answers(survey).status_code, 200)
+        self.assertFalse(survey.session_question_can_answer)
+
+        # User not member of survey groups cannot go to the next question
+        self.authenticate('user_emp', 'user_emp')
+        self.assertEqual(survey.session_question_id, questions[0])
+        with mute_logger('odoo.http'):
+            self._session_next_question(survey)
+        self.assertEqual(survey.session_question_id, questions[0], "Only survey user go to the next question")
+
+        # Participant: Attempt to answer question 1 while it is already closed
+        self.authenticate(None, None)
+        res = self.url_open(survey.get_start_url())
+        self.assertEqual(res.status_code, 200)
+        answer_token = res.url.split('/')[-1]
+        csrf_token = self._find_csrf_token(res.text)
+        self.assertIn('Question1', res.text)
+        post_data = self._format_submission_data(
+            survey.question_ids[0], [questions[0].suggested_answer_ids[0].id],
+            {'csrf_token': csrf_token, 'token': answer_token})
+        res = self._access_submit(survey, answer_token, post_data)
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(
+            res.json()['result'][1],
+            {"error": "validation",
+             "fields": {str(survey.question_ids[0].id): "We do not accept submissions for this question anymore."}})
+
+        # Host: Go to Question 2
+        self.authenticate('survey_manager', 'survey_manager')
+        self.assertEqual(self._session_next_question(survey).status_code, 200)
+        self.assertTrue(survey.session_question_can_answer)
+
+        # User not member of survey groups cannot set the result state
+        self.authenticate('user_emp', 'user_emp')
+        with mute_logger('odoo.http'):
+            self._session_disable_answers(survey)
+        self.assertTrue(survey.session_question_can_answer, "Only survey user can change session_question_can_answer")
+
+        # Participant: Answer correctly question 2
+        self.authenticate(None, None)
+        res = self.url_open(survey.get_start_url())
+        self.assertEqual(res.status_code, 200)
+        self.assertIn('Question2', res.text)
+        answer_token = res.url.split('/')[-1]
+        csrf_token = self._find_csrf_token(res.text)
+        post_data = self._format_submission_data(
+            survey.question_ids[1], [questions[1].suggested_answer_ids[0].id],
+            {'csrf_token': csrf_token, 'token': answer_token})
+        res = self._access_submit(survey, answer_token, post_data)
+        self.assertEqual(res.status_code, 200)
+        self.assertFalse(res.json()['result'][1].get('error'))
+
+        # Host: Check answered questions and scores
+        self.authenticate('survey_manager', 'survey_manager')
+        self.assertEqual(self._session_next_question(survey).status_code, 200)
+        user_inputs = self.env['survey.user_input'].search([
+            ('survey_id', '=', survey.id),
+            ('create_date', '>=', survey.session_start_time)
+        ], order='id')
+        self.assertEqual(user_inputs.mapped('user_input_line_ids.question_id.title'), ['Question2'],
+                         "Only question 2 has been answered.")
+        self.assertEqual(user_inputs.mapped('scoring_total'), [0, 1])

From e2995b7713d2ac9dfab14e099fed19af391e9c18 Mon Sep 17 00:00:00 2001
From: "Benoit Socias (bso)" <bso@odoo.com>
Date: Thu, 9 Oct 2025 15:29:35 +0000
Subject: [PATCH 055/673] [FIX] html_builder, website: prevent removing last
 list item in form

Since `html_builder`, the last element of a multiple checkboxes form
field can be removed, but it leads to a situation where no element can
be added anymore to the field.

To avoid this, this commit restores the former behavior which did forbid
the removal of the last element.

Steps to reproduce:
- Drop a form snippet
- Add a field
- Set the field type to "Multiple checkboxes"
- Remove all options

=> It was possible to remove the last option.

task-4367641

closes odoo/odoo#233013

X-original-commit: e7c3f210b2be017e0eafa1c94111055431ca3dd1
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../src/core/building_blocks/builder_list.js  |  2 +
 .../src/core/building_blocks/builder_list.xml |  4 +-
 .../src/builder/plugins/form/form_option.xml  |  1 +
 .../website_builder/form_option.test.js       | 53 +++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/addons/html_builder/static/src/core/building_blocks/builder_list.js b/addons/html_builder/static/src/core/building_blocks/builder_list.js
index 0f12fcadf66a3..526ae63f475c7 100644
--- a/addons/html_builder/static/src/core/building_blocks/builder_list.js
+++ b/addons/html_builder/static/src/core/building_blocks/builder_list.js
@@ -36,6 +36,7 @@ export class BuilderList extends Component {
         records: { type: String, optional: true },
         defaultNewValue: { type: Object, optional: true },
         columnWidth: { optional: true },
+        forbidLastItemRemoval: { type: Boolean, optional: true },
     };
     static defaultProps = {
         addItemTitle: _t("Add"),
@@ -46,6 +47,7 @@ export class BuilderList extends Component {
         mode: "button",
         defaultNewValue: {},
         columnWidth: {},
+        forbidLastItemRemoval: false,
     };
     static components = { BuilderComponent, Dropdown };
 
diff --git a/addons/html_builder/static/src/core/building_blocks/builder_list.xml b/addons/html_builder/static/src/core/building_blocks/builder_list.xml
index f12bea7c5494a..151d6b0569a1a 100644
--- a/addons/html_builder/static/src/core/building_blocks/builder_list.xml
+++ b/addons/html_builder/static/src/core/building_blocks/builder_list.xml
@@ -7,7 +7,8 @@
             <t t-if="state.value?.length > 2">
                 <div class="o_we_table_wrapper">
                     <table t-ref="table">
-                        <t t-foreach="formatRawValue(state.value)" t-as="item" t-key="item._id">
+                        <t t-set="items" t-value="formatRawValue(state.value)"/>
+                        <t t-foreach="items" t-as="item" t-key="item._id">
                             <tr class="o_row_draggable" t-att-data-id="item._id">
                                 <td t-if="props.sortable" class="o_handle_cell">
                                     <button type="button" class="btn">
@@ -41,6 +42,7 @@
                                 </t>
                                 <td>
                                     <button type="button" class="btn text-danger builder_list_remove_item"
+                                            t-if="!(this.props.forbidLastItemRemoval and (items.length === 1))"
                                             t-on-click="() => this.deleteItem(item._id)">
                                         <i class="fa fa-fw fa-minus" aria-hidden="true"/>
                                         <span class="visually-hidden">Delete item</span>
diff --git a/addons/website/static/src/builder/plugins/form/form_option.xml b/addons/website/static/src/builder/plugins/form/form_option.xml
index 36165abb15613..676d3bfc5c7c1 100644
--- a/addons/website/static/src/builder/plugins/form/form_option.xml
+++ b/addons/website/static/src/builder/plugins/form/form_option.xml
@@ -225,6 +225,7 @@
                 itemShape="{ display_name: 'text', selected: state.valueList.checkType }"
                 default="{ display_name: state.valueList.defaultItemName, selected: false }"
                 defaultNewValue="{ id: state.valueList.defaultItemName }"
+                forbidLastItemRemoval="true"
                 records="state.valueList.availableRecords" />
         </div>
     </BuilderRow>
diff --git a/addons/website/static/tests/builder/website_builder/form_option.test.js b/addons/website/static/tests/builder/website_builder/form_option.test.js
index c1948f69991e7..ea0e996ea4de1 100644
--- a/addons/website/static/tests/builder/website_builder/form_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/form_option.test.js
@@ -388,3 +388,56 @@ test("Form using the Outgoing Mails model includes hidden email_to field", async
     expect(":iframe input[type='hidden'][name='email_to']").toHaveCount(1);
     expect(":iframe input[type='hidden'][name='email_to']").toHaveValue("info@yourcompany.example.com");
 });
+
+test("Last list entry cannot be removed", async () => {
+    onRpc("get_authorized_fields", () => ({}));
+    await setupWebsiteBuilder(`
+<section class="s_website_form" data-vcss="001" data-snippet="s_website_form" data-name="Form">
+    <form data-model_name="mail.mail">
+        <div class="s_website_form_rows">
+			<div data-name="Field" class="s_website_form_field mb-3 col-12 s_website_form_custom" data-type="one2many">
+			    <div class="row s_col_no_resize s_col_no_bgcolor">
+			        <label class="col-sm-auto s_website_form_label" style="width: 200px" for="ofwe8fyqws37">
+			            <span class="s_website_form_label_content">Custom Text</span>
+			        </label>
+			        <div class="col-sm">
+			            <div class="row s_col_no_resize s_col_no_bgcolor s_website_form_multiple" data-name="Custom Text" data-display="horizontal">
+			                <div class="checkbox col-12 col-lg-4 col-md-6">
+			                    <div class="form-check">
+			                        <input type="checkbox" class="s_website_form_input form-check-input" id="ofwe8fyqws370" name="Custom Text" value="Option 1" data-fill-with="undefined">
+			                        <label class="form-check-label s_website_form_check_label" for="ofwe8fyqws370">Option 1</label>
+			                    </div>
+			                </div>
+			                <div class="checkbox col-12 col-lg-4 col-md-6">
+			                    <div class="form-check">
+			                        <input type="checkbox" class="s_website_form_input form-check-input" id="ofwe8fyqws371" name="Custom Text" value="Option 2">
+			                        <label class="form-check-label s_website_form_check_label" for="ofwe8fyqws371">Option 2</label>
+			                    </div>
+			                </div>
+			                <div class="checkbox col-12 col-lg-4 col-md-6">
+			                    <div class="form-check">
+			                        <input type="checkbox" class="s_website_form_input form-check-input" id="ofwe8fyqws372" name="Custom Text" value="Option 3">
+			                        <label class="form-check-label s_website_form_check_label" for="ofwe8fyqws372">Option 3</label>
+			                    </div>
+			                </div>
+			            </div>
+			        </div>
+			    </div>
+            </div>
+	    </div>
+    </form>
+</section>
+        `);
+    await contains(":iframe .s_website_form_field").click();
+    expect(".options-container .builder_list_remove_item").toHaveCount(3);
+    await contains(
+        ".options-container .o_row_draggable:has(input[data-id='0']) .builder_list_remove_item"
+    ).click();
+    expect(".options-container .builder_list_remove_item").toHaveCount(2);
+    await contains(
+        ".options-container .o_row_draggable:has(input[data-id='1']) .builder_list_remove_item"
+    ).click();
+    expect(".options-container .builder_list_remove_item").toHaveCount(0);
+    await contains(".options-container .builder_list_add_item").click();
+    expect(".options-container .builder_list_remove_item").toHaveCount(2);
+});

From 5b4f5a2ee9b99834a223f1adf786e10dcefe9485 Mon Sep 17 00:00:00 2001
From: Jinane Maksoud <maji@odoo.com>
Date: Mon, 13 Oct 2025 12:39:15 +0000
Subject: [PATCH 056/673] [FIX] hr: move admin structure

The record for 'employee_admin' became forcecreate=0 and
the same data file tries to add the 'structure_type_id' field
to the employee and fails during upgrades if the record was
deleted.
This fix moves the structure field to the same record and moves
the record to be loaded after its related structure.

closes odoo/odoo#233856

X-original-commit: 8204a03eeed0b8d829397e0a4163105467d88d32
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Jinane Maksoud (maji) <maji@odoo.com>
---
 addons/hr/data/hr_data.xml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/addons/hr/data/hr_data.xml b/addons/hr/data/hr_data.xml
index 8f129339af303..1110176df818d 100644
--- a/addons/hr/data/hr_data.xml
+++ b/addons/hr/data/hr_data.xml
@@ -6,14 +6,6 @@
             <field name="name">Administration</field>
         </record>
 
-        <record id="employee_admin" model="hr.employee" forcecreate="0">
-            <field name="name" eval="obj(ref('base.partner_admin')).name" model="res.partner"/>
-            <field name="department_id" ref="dep_administration"/>
-            <field name="user_id" ref="base.user_admin"/>
-            <field name="address_id" ref="base.main_partner"/>
-            <field name="image_1920" eval="obj(ref('base.partner_admin')).image_1920" model="res.partner"/>
-        </record>
-
         <record id="onboarding_plan" model="mail.activity.plan">
             <field name="name">Onboarding</field>
             <field name="res_model">hr.employee</field>
@@ -198,6 +190,16 @@
             <field name="country_id" ref="base.be"/>
         </record>
 
+        <!-- Employee -->
+        <record id="employee_admin" model="hr.employee" forcecreate="0">
+            <field name="name" eval="obj(ref('base.partner_admin')).name" model="res.partner"/>
+            <field name="department_id" ref="dep_administration"/>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="address_id" ref="base.main_partner"/>
+            <field name="image_1920" eval="obj(ref('base.partner_admin')).image_1920" model="res.partner"/>
+            <field name="structure_type_id" ref="hr.structure_type_employee"/>
+        </record>
+
         <!-- Contract-related subtypes for messaging / Chatter -->
         <record id="mt_contract_pending" model="mail.message.subtype">
             <field name="name">To Renew</field>
@@ -221,10 +223,5 @@
             <field name="relation_field">department_id</field>
             <field name="description">Contract about to expire</field>
         </record>
-
-        <!-- Add default Structure to employee admin -->
-        <record id="employee_admin" model="hr.employee">
-            <field name="structure_type_id" ref="hr.structure_type_employee"/>
-        </record>
     </data>
 </odoo>

From d8fb676227ac98542f95d18acb95459c0c0486ff Mon Sep 17 00:00:00 2001
From: arkp-odoo <arkp@odoo.com>
Date: Mon, 6 Oct 2025 10:06:39 +0000
Subject: [PATCH 057/673] [FIX] hr_recruitment_skill: prevent ZeroDivisionError
 in job_total

Traceback :
```
File "/home/odoo/src/odoo/19.0/addons/hr_recruitment_skills/models/
hr_applicant.py", line 72, in _compute_matching_skill_ids
  matching_score = round(applicant_total / job_total * 100)
ZeroDivisionError: float division by zero
```

Steps to Reproduce:
- Install recruitment app.
- For any job position, select all expected skill level such that level_progress
  is 0 and no expected degree .

While calculating matching score for applicants here
https://github.com/odoo/odoo/blob/19.0/addons/hr_recruitment_skills/models/hr_applicant.py#L72
a ZeroDivisionError occurs if 'job_total' is zero.

This situation occured because in 19 version new feature to calculate applicants
matching score was introduced in
https://github.com/odoo/odoo/commit/164b55c324e63c45339088823e3d55dfe2147b61
and job_degree,applicant_degree, level_progress in skills for job and applicants
were not present in older versions making job_total as 0 causing above traceback

This commit adds a safety check to ensure the division only occurs
if 'job_total' is non-zero . and if job_total is 0 , there is no expectation
required for this position which makes matching score 100 .

closes odoo/odoo#233838

X-original-commit: 9b0e9661e684dd081e53bca87632710beba7d6e6
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_recruitment_skills/models/hr_applicant.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment_skills/models/hr_applicant.py b/addons/hr_recruitment_skills/models/hr_applicant.py
index c328fc6e5c78e..07390deec92b4 100644
--- a/addons/hr_recruitment_skills/models/hr_applicant.py
+++ b/addons/hr_recruitment_skills/models/hr_applicant.py
@@ -69,7 +69,7 @@ def _compute_matching_skill_ids(self):
 
             matching_skill_ids = matching_applicant_skills.mapped("skill_id")
             missing_skill_ids = job_skills.mapped("skill_id") - matching_applicant_skills.mapped("skill_id")
-            matching_score = round(applicant_total / job_total * 100)
+            matching_score = round(applicant_total / job_total * 100) if job_total else 100
 
             applicant.matching_skill_ids = matching_skill_ids
             applicant.missing_skill_ids = missing_skill_ids

From d4c68ab1191627495f394d3eeca0aa3a3b7991a5 Mon Sep 17 00:00:00 2001
From: "Louis (loco)" <loco@odoo.com>
Date: Thu, 30 Oct 2025 09:12:16 +0000
Subject: [PATCH 058/673] [FIX] website: correct wrong resources

Since [1], the `force_editable_selector` resource has been renamed into
`content_editable_selectors` and `force_not_editable_selector` into
`content_not_editable_selectors`. However, resources introduced by [2]
have not been converted by mistake. This commit fixes it.

[1]: https://github.com/odoo/odoo/commit/13565e0330bbc44eeecbb5d2ecd3acd7b4cdded4
[2]: https://github.com/odoo/odoo/commit/627c1a5a3a113014d1d586a5179ebfe88549f809

task-5222853

closes odoo/odoo#233864

X-original-commit: a9ca482e7bc41b7973bb41336b78a4781f9b8bfc
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
---
 .../src/builder/plugins/options/accordion_option_plugin.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js b/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
index 80f777a1bae52..f36298b047a22 100644
--- a/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
@@ -22,8 +22,8 @@ class accordionOptionPlugin extends Plugin {
             DefineCustomIconAction,
             CustomAccordionIconAction,
         },
-        force_not_editable_selector: [".accordion-button"],
-        force_editable_selector: [".accordion-button span"],
+        content_not_editable_selectors: [".accordion-button"],
+        content_editable_selectors: [".accordion-button span"],
     };
 }
 

From aa7b4c64f184385145f9feac5a3eb872e02e02b7 Mon Sep 17 00:00:00 2001
From: Antoine Dupuis <andu@odoo.com>
Date: Fri, 12 Sep 2025 11:01:46 +0000
Subject: [PATCH 059/673] [FIX] account_edi_ubl_cii: Fix BIS3 product price

At the moment, the UBL's Price/PriceAmount node is rounded to the same
number of decimals as the database's product price precision.

This causes a Peppol schematron validation error due to rule
PEPPOL-EN16931-R120 in the case where the user uses tax-included prices.

For example, if you have a tax-included unit price of 12.95, a quantity
of 8 and a 21% tax, then the tax-excluded subtotal is 85.62.

Divide 85.62 by 8 and you get a raw unit price of 10.7025. But if we
round to 2 decimal places, we get 10.7 but `10.7 * 8 = 85.6 != 85.62`.

Solution: We need to round the unit price to enough decimal places to
ensure that unit price * quantity ~= line subtotal
(with a tolerance of less than 0.02)

opw-5072134

closes odoo/odoo#233839

X-original-commit: eb63b08259db881540a63442f556984ad6058e88
Signed-off-by: Antoine Dupuis (andu) <andu@odoo.com>
Signed-off-by: Laurent Smet (las) <las@odoo.com>
---
 .../models/account_edi_xml_ubl_bis3.py        |   7 +-
 .../bis3/test_unit_price_precision.xml        | 144 ++++++++++++++++++
 .../tests/test_ubl_bis3.py                    |  32 ++++
 3 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 addons/account_edi_ubl_cii/tests/test_files/bis3/test_unit_price_precision.xml

diff --git a/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py b/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py
index 1a4569f710d83..6911c5b5b73f0 100644
--- a/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py
+++ b/addons/account_edi_ubl_cii/models/account_edi_xml_ubl_bis3.py
@@ -4,7 +4,7 @@
 
 from odoo import models, _
 from odoo.addons.account.tools import dict_to_xml
-from odoo.addons.account_edi_ubl_cii.models.account_edi_xml_ubl_20 import UBL_NAMESPACES
+from odoo.addons.account_edi_ubl_cii.models.account_edi_xml_ubl_20 import FloatFmt, UBL_NAMESPACES
 
 from stdnum.no import mva
 
@@ -290,8 +290,9 @@ def _add_document_line_tax_category_nodes(self, line_node, vals):
 
     def _add_document_line_price_nodes(self, line_node, vals):
         super()._add_document_line_price_nodes(line_node, vals)
-        if vals['base_line']['price_unit'] < 0.0:
-            line_node['cac:Price']['cbc:PriceAmount']['_text'] = -line_node['cac:Price']['cbc:PriceAmount']['_text']
+        currency_suffix = vals['currency_suffix']
+        sign = 1 if vals['base_line']['price_unit'] >= 0.0 else -1
+        line_node['cac:Price']['cbc:PriceAmount']['_text'] = FloatFmt(sign * vals[f'gross_price_unit{currency_suffix}'], 1, 8)
 
     # -------------------------------------------------------------------------
     # EXPORT: Constraints
diff --git a/addons/account_edi_ubl_cii/tests/test_files/bis3/test_unit_price_precision.xml b/addons/account_edi_ubl_cii/tests/test_files/bis3/test_unit_price_precision.xml
new file mode 100644
index 0000000000000..9dfc55704c681
--- /dev/null
+++ b/addons/account_edi_ubl_cii/tests/test_files/bis3/test_unit_price_precision.xml
@@ -0,0 +1,144 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2">
+  <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0</cbc:CustomizationID>
+  <cbc:ProfileID>urn:fdc:peppol.eu:2017:poacc:billing:01:1.0</cbc:ProfileID>
+  <cbc:ID>INV/2017/00001</cbc:ID>
+  <cbc:IssueDate>2017-01-01</cbc:IssueDate>
+  <cbc:DueDate>2017-01-01</cbc:DueDate>
+  <cbc:InvoiceTypeCode>380</cbc:InvoiceTypeCode>
+  <cbc:DocumentCurrencyCode>EUR</cbc:DocumentCurrencyCode>
+  <cac:OrderReference>
+    <cbc:ID>INV/2017/00001</cbc:ID>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>INV_2017_00001.pdf</cbc:ID>
+    <cac:Attachment>
+      <cbc:EmbeddedDocumentBinaryObject mimeCode="application/pdf" filename="INV_2017_00001.pdf">___ignore___</cbc:EmbeddedDocumentBinaryObject>
+    </cac:Attachment>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0208">0202239951</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>company_1_data</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Chaussée de Namur 40</cbc:StreetName>
+        <cbc:CityName>Ramillies</cbc:CityName>
+        <cbc:PostalZone>1367</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>company_1_data</cbc:RegistrationName>
+        <cbc:CompanyID>BE0202239951</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>company_1_data</cbc:Name>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cbc:EndpointID schemeID="0208">0477472701</cbc:EndpointID>
+      <cac:PartyName>
+        <cbc:Name>partner_a</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+        <cbc:CityName>Ramillies</cbc:CityName>
+        <cbc:PostalZone>1367</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>partner_a</cbc:RegistrationName>
+        <cbc:CompanyID>BE0477472701</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Name>partner_a</cbc:Name>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:Delivery>
+    <cac:DeliveryLocation>
+      <cac:Address>
+        <cbc:StreetName>Rue des Bourlottes 9</cbc:StreetName>
+        <cbc:CityName>Ramillies</cbc:CityName>
+        <cbc:PostalZone>1367</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>BE</cbc:IdentificationCode>
+        </cac:Country>
+      </cac:Address>
+    </cac:DeliveryLocation>
+    <cac:DeliveryParty>
+      <cac:PartyName>
+        <cbc:Name>partner_a</cbc:Name>
+      </cac:PartyName>
+    </cac:DeliveryParty>
+  </cac:Delivery>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentID>INV/2017/00001</cbc:PaymentID>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>BE15001559627230</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:PaymentTerms>
+    <cbc:Note>Payment terms: Immediate Payment</cbc:Note>
+  </cac:PaymentTerms>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="EUR">17.98</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="EUR">85.62</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="EUR">17.98</cbc:TaxAmount>
+      <cac:TaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>21.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="EUR">85.62</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="EUR">85.62</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="EUR">103.60</cbc:TaxInclusiveAmount>
+    <cbc:PrepaidAmount currencyID="EUR">0.00</cbc:PrepaidAmount>
+    <cbc:PayableAmount currencyID="EUR">103.60</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">8.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="EUR">85.62</cbc:LineExtensionAmount>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+      <cac:ClassifiedTaxCategory>
+        <cbc:ID>S</cbc:ID>
+        <cbc:Percent>21.0</cbc:Percent>
+        <cac:TaxScheme>
+          <cbc:ID>VAT</cbc:ID>
+        </cac:TaxScheme>
+      </cac:ClassifiedTaxCategory>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="EUR">10.7025</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/addons/account_edi_ubl_cii/tests/test_ubl_bis3.py b/addons/account_edi_ubl_cii/tests/test_ubl_bis3.py
index 0f13f82949a85..06ad2f8254ea0 100644
--- a/addons/account_edi_ubl_cii/tests/test_ubl_bis3.py
+++ b/addons/account_edi_ubl_cii/tests/test_ubl_bis3.py
@@ -641,6 +641,38 @@ def test_dispatch_base_lines_delta(self):
         self.env['account.move.send']._generate_and_send_invoices(invoice, sending_methods=['manual'])
         self._assert_invoice_ubl_file(invoice, 'bis3/test_dispatch_base_lines_delta')
 
+    def test_unit_price_precision(self):
+        """ Check that with large quantities, the precision of the rounding on the unit price
+            is adapted in order to pass the Peppol schematron's requirement that the line's
+            subtotal must be equal to unit price * quantity, to a tolerance of less than 0.02.
+
+            In this case, the line's tax-excluded subtotal is 85.62, there are 8 units, so the raw unit
+            price is 85.62 / 8 = 10.7025.
+            If we round the unit price to 2 decimals, we get 10.70, but 10.70 * 8 = 85.60 which has
+            a difference of 0.02 with the subtotal, so this would not pass the schematron.
+            So we need to round the unit price to 3 decimals, which gives 10.703.
+        """
+        self.setup_partner_as_be1(self.env.company.partner_id)
+        self.setup_partner_as_be2(self.partner_a)
+        tax_21 = self.percent_tax(21.0, price_include_override='tax_included')
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2017-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'quantity': 8,
+                    'price_unit': 12.95,
+                    'tax_ids': [Command.set(tax_21.ids)],
+                }),
+            ],
+        })
+        invoice.action_post()
+        self.env['account.move.send']._generate_and_send_invoices(invoice, sending_methods=['manual'])
+        self._assert_invoice_ubl_file(invoice, 'bis3/test_unit_price_precision')
+
     # -------------------------------------------------------------------------
     # SELF-BILLED INVOICE
     # -------------------------------------------------------------------------

From 21fe9a985b34c5dd8ef3ce5b7a5f11740ec723cb Mon Sep 17 00:00:00 2001
From: dtda-odoo <dtda@odoo.com>
Date: Tue, 27 May 2025 15:31:38 +0530
Subject: [PATCH 060/673] [IMP] website: add description input field in map
 snippet

Issue:
Users are unable to edit the description immediately after adding a map
snippet. They must first click elsewhere and then return to the
description field to make changes.

Fix:
Add an input field in options of map snippet.
This input field is visible when description checkbox is true.
Any Update in the field will update the description of the snippet.

It upgrades previously dropped snippets, ensuring compatibility of the
new options with older versions.

task-4604018

Part-of: odoo/odoo#203678
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../google_maps_option/google_maps_option.xml | 12 ++----
 .../google_maps_option_plugin.js              | 26 ++++++------
 .../builder/plugins/options/map_option.xml    | 12 +++++-
 .../plugins/options/map_option_plugin.js      | 42 ++++++++++++++-----
 .../website/views/snippets/s_google_map.xml   |  2 +-
 addons/website/views/snippets/s_map.xml       |  4 +-
 6 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml
index ae60b4c9f96cb..79127ef468a20 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 
-<t t-name="website.GoogleMapsDescription">
-    <div class="description">
-        <font>Visit us:</font>
-        <span>Our office is located in the northeast of Brussels. TEL (555) 432 2365</span>
-    </div>
-</t>
-
 <t t-name="website.GoogleMapsOption">
     <BuilderRow label.translate="Address" preview="false">
         <input
@@ -70,7 +63,10 @@
         <BuilderNumberInput dataAttributeAction="'mapZoom'" default="12" step="1" min="0" max="22"/>
     </BuilderRow>
     <BuilderRow label.translate="Description" preview="false">
-        <BuilderCheckbox action="'showDescription'"/>
+        <BuilderCheckbox id="'google_maps_description'" action="'mapDescription'"/>
+    </BuilderRow>
+    <BuilderRow label.translate="Description Text" level="1" t-if="isActiveItem('google_maps_description')">
+        <BuilderTextInput action="'mapDescriptionTextValue'"/>
     </BuilderRow>
 </t>
 
diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
index 0b8be68812b23..a3c2d37f2dfe0 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
@@ -1,6 +1,5 @@
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
-import { renderToElement } from "@web/core/utils/render";
 import { Plugin } from "@html_editor/plugin";
 import { GoogleMapsApiKeyDialog } from "./google_maps_api_key_dialog";
 import { GoogleMapsOption } from "./google_maps_option";
@@ -53,7 +52,6 @@ export class GoogleMapsOptionPlugin extends Plugin {
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
         builder_actions: {
             ResetMapColorAction,
-            ShowDescriptionAction,
         },
         // TODO remove when the snippet will have a "Height" option.
         keep_overlay_options: (el) => el.matches(".s_google_map"),
@@ -70,6 +68,18 @@ export class GoogleMapsOptionPlugin extends Plugin {
 
         /** @type {Map<HTMLElement, Deferred} */
         this.recentlyDroppedSnippetDeferredInit = new Map();
+        this.upgradeSnippets();
+    }
+
+    // TODO: Remove this method when data-vxml is reintroduced.
+    upgradeSnippets() {
+        // This is for pages which already existed before the plugin was created.
+        this.document
+            .querySelectorAll(".s_google_map")
+            .forEach((mapSnippetEl) => {
+                mapSnippetEl.classList.add("o_not_editable");
+                mapSnippetEl.dataset.vxml = "001";
+            });
     }
 
     async onSnippetDropped({ snippetEl }) {
@@ -293,17 +303,5 @@ export class ResetMapColorAction extends BuilderAction {
         editingElement.dataset.mapColor = "";
     }
 }
-export class ShowDescriptionAction extends BuilderAction {
-    static id = "showDescription";
-    isApplied({ editingElement }) {
-        return !!editingElement.querySelector(".description");
-    }
-    apply({ editingElement }) {
-        editingElement.append(renderToElement("html_builder.GoogleMapsDescription"));
-    }
-    clean({ editingElement }) {
-        editingElement.querySelector(".description").remove();
-    }
-}
 
 registry.category("website-plugins").add(GoogleMapsOptionPlugin.id, GoogleMapsOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/map_option.xml b/addons/website/static/src/builder/plugins/options/map_option.xml
index 97619d275d157..3e01c9b3f681a 100644
--- a/addons/website/static/src/builder/plugins/options/map_option.xml
+++ b/addons/website/static/src/builder/plugins/options/map_option.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
+
+<t t-name="website.MapsDescription">
+    <div class="description">
+        Visit us: Our office is located in the northeast of Brussels. TEL (555) 432 2365
+    </div>
+</t>
+
 <t t-name="website.mapOption">
     <BuilderRow label.translate="Address" action="'mapUpdateSrc'" preview="false">
         <BuilderTextInput
@@ -63,7 +70,10 @@
         />
     </BuilderRow>
     <BuilderRow label.translate="Description">
-        <BuilderCheckbox action="'mapDescription'"/>
+        <BuilderCheckbox id="'map_description'" action="'mapDescription'"/>
+    </BuilderRow>
+    <BuilderRow label.translate="Description Text" level="1" t-if="isActiveItem('map_description')">
+        <BuilderTextInput action="'mapDescriptionTextValue'"/>
     </BuilderRow>
 </t>
 </templates>
diff --git a/addons/website/static/src/builder/plugins/options/map_option_plugin.js b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
index bd64f58fa142a..ba13f1232d95e 100644
--- a/addons/website/static/src/builder/plugins/options/map_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
@@ -1,8 +1,8 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { generateGMapLink } from "@website/js/utils";
+import { renderToElement } from "@web/core/utils/render";
 
 class MapOptionPlugin extends Plugin {
     static id = "mapOption";
@@ -17,10 +17,27 @@ class MapOptionPlugin extends Plugin {
         builder_actions: {
             MapUpdateSrcAction,
             MapDescriptionAction,
+            MapDescriptionTextAction,
         },
         // TODO remove when the snippet will have a "Height" option.
         keep_overlay_options: (el) => el.matches(".s_map"),
     };
+
+    setup() {
+        this.upgradeSnippets();
+    }
+
+    // TODO: Remove this method when data-vxml is reintroduced.
+    upgradeSnippets() {
+        // Ensure that all map snippets have the correct editable/not-editable classes
+        // This is for pages which already existed before the plugin was created.
+        const mapSnippetEls = this.document.querySelectorAll(".s_map");
+        mapSnippetEls.forEach((mapSnippetEl) => {
+            mapSnippetEl.classList.add("o_not_editable");
+            mapSnippetEl.dataset.vxml = "001";
+            mapSnippetEl.querySelector(".map_container").classList.remove("o_not_editable");
+        });
+    }
 }
 
 export class MapUpdateSrcAction extends BuilderAction {
@@ -45,21 +62,26 @@ export class MapUpdateSrcAction extends BuilderAction {
 export class MapDescriptionAction extends BuilderAction {
     static id = "mapDescription";
     isApplied({ editingElement }) {
-        return editingElement.querySelector(".description") !== null;
+        return !!editingElement.querySelector(".description");
     }
     apply({ editingElement }) {
-        editingElement.appendChild(
-            document.createRange().createContextualFragment(
-                `<div class="description">
-                    <strong>${_t("Visit us:")}</strong>
-                    ${_t("Our office is open Monday – Friday 8:30 a.m. – 4:00 p.m.")}
-                </div>`
-            )
-        );
+        editingElement.append(renderToElement("website.MapsDescription"));
     }
     clean({ editingElement }) {
         editingElement.querySelector(".description").remove();
     }
 }
+class MapDescriptionTextAction extends BuilderAction {
+    static id = "mapDescriptionTextValue";
+    getValue({ editingElement }) {
+        return editingElement
+            .querySelector(".description")
+            ?.textContent.trim()
+            .replace(/\s+/g, " ") || "";
+    }
+    apply({ editingElement, value }) {
+        return editingElement.querySelector(".description").textContent = value;
+    }
+}
 
 registry.category("website-plugins").add(MapOptionPlugin.id, MapOptionPlugin);
diff --git a/addons/website/views/snippets/s_google_map.xml b/addons/website/views/snippets/s_google_map.xml
index f237784d31815..8f383eab30e03 100644
--- a/addons/website/views/snippets/s_google_map.xml
+++ b/addons/website/views/snippets/s_google_map.xml
@@ -2,7 +2,7 @@
 <odoo>
 
 <template name="Google Map" id="s_google_map">
-    <section class="s_google_map pt256 pb256" data-map-type="ROADMAP" data-map-color="" data-map-zoom="12" data-map-gps="(50.854975,4.3753899)" data-pin-style="flat">
+    <section class="s_google_map pt256 pb256 o_not_editable" data-map-type="ROADMAP" data-map-color="" data-map-zoom="12" data-map-gps="(50.854975,4.3753899)" data-pin-style="flat" data-vxml="001">
         <div class="map_container"/>
     </section>
 </template>
diff --git a/addons/website/views/snippets/s_map.xml b/addons/website/views/snippets/s_map.xml
index d247ca35dd3ed..399dcbe107665 100644
--- a/addons/website/views/snippets/s_map.xml
+++ b/addons/website/views/snippets/s_map.xml
@@ -2,8 +2,8 @@
 <odoo>
 
 <template name="Map" id="s_map">
-    <section class="s_map pb56 pt56 rounded-3" data-map-type="m" data-map-zoom="12" t-att-data-map-address="' '.join(filter(None, (user_id.company_id.street, user_id.company_id.city, user_id.company_id.state_id.display_name, user_id.company_id.country_id.display_name)))">
-        <div class="map_container o_not_editable">
+    <section class="s_map pb56 pt56 rounded-3 o_not_editable" data-map-type="m" data-map-zoom="12" t-att-data-map-address="' '.join(filter(None, (user_id.company_id.street, user_id.company_id.city, user_id.company_id.state_id.display_name, user_id.company_id.country_id.display_name)))" data-vxml="001">
+        <div class="map_container">
             <div class="css_non_editable_mode_hidden">
                 <div class="missing_option_warning alert alert-info rounded-0 fade show d-none d-print-none">
                     An address must be specified for a map to be embedded

From 8f97cbac83afbade595f76389012e34acb205df6 Mon Sep 17 00:00:00 2001
From: dtda-odoo <dtda@odoo.com>
Date: Fri, 28 Mar 2025 17:19:38 +0530
Subject: [PATCH 061/673] [FIX] website: fix get a google map Api key option

Issue:
Api enabling issue on error on console.cloud.google.com. when clicking
the option to get Custom Api key option next to Google Maps on theme
page.
Navigation:  Website > Edit > Theme Tab > Custom Key (Google Map) >
'Create a Google Project and Get a Key'

Fix:
Fix faulty or legacy Api ids with new Api ids in URL to
console.cloud.google.com when clicking 'Create a Google Project and
Get a Key'.

[Static API](https://developers.google.com/maps/documentation/maps-static/cloud-setup#gcloud-services-enable:~:text=%22static%2Dmaps%2Dbackend.googleapis.com%22)
[Maps JavaScript API](https://developers.google.com/maps/documentation/javascript/cloud-setup#enabling-apis:~:text=%22maps%2Dbackend.googleapis.com%22)
[Places API](https://developers.google.com/maps/documentation/places/web-service/cloud-setup#enabling-apis:~:text=%22places.googleapis.com%22)

task-4604018

Part-of: odoo/odoo#203678
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../options/google_maps_option/google_maps_api_key_dialog.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_api_key_dialog.xml b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_api_key_dialog.xml
index 38651c72849c7..0345409a8415d 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_api_key_dialog.xml
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_api_key_dialog.xml
@@ -17,7 +17,7 @@
                 <div class="small form-text text-muted">
                     Hint: How to use Google Map on your website (Contact Us page and as a snippet)
                     <br/>
-                    <a target="_blank" href="https://console.developers.google.com/flows/enableapi?apiid=maps_backend,static_maps_backend&amp;keyType=CLIENT_SIDE&amp;reusekey=true">
+                    <a target="_blank" href="https://console.developers.google.com/flows/enableapi?apiid=maps-backend.googleapis.com,static-maps-backend.googleapis.com,places-backend.googleapis.com&amp;keyType=CLIENT_SIDE&amp;reusekey=true">
                         <i class="oi oi-arrow-right"/>
                         Create a Google Project and Get a Key
                     </a>

From c2100d01def64f003b65d1dde90e00c5aaa0fb7c Mon Sep 17 00:00:00 2001
From: dtda-odoo <dtda@odoo.com>
Date: Thu, 29 May 2025 18:17:34 +0530
Subject: [PATCH 062/673] [IMP] website: adds color options in description of
 map snippet

In the default behaviour of the map description, there was no option to
customize the background or text color of the attached description.

This commit introduces customization options for both text and
background colors in the map snippet description. These options will be
available when the description option is enabled in the map snippet.

task-4604018

Part-of: odoo/odoo#203678
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../google_maps_option/google_maps_option.xml |  7 +------
 .../builder/plugins/options/map_option.xml    | 20 ++++++++++++++++---
 .../static/src/snippets/s_google_map/000.scss |  8 --------
 .../static/src/snippets/s_map/000.scss        |  8 --------
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml
index 79127ef468a20..7e68a750c0692 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.xml
@@ -62,12 +62,7 @@
     <BuilderRow label.translate="Zoom" preview="false">
         <BuilderNumberInput dataAttributeAction="'mapZoom'" default="12" step="1" min="0" max="22"/>
     </BuilderRow>
-    <BuilderRow label.translate="Description" preview="false">
-        <BuilderCheckbox id="'google_maps_description'" action="'mapDescription'"/>
-    </BuilderRow>
-    <BuilderRow label.translate="Description Text" level="1" t-if="isActiveItem('google_maps_description')">
-        <BuilderTextInput action="'mapDescriptionTextValue'"/>
-    </BuilderRow>
+    <t t-call="website.MapDescriptionOption"/>
 </t>
 
 </templates>
diff --git a/addons/website/static/src/builder/plugins/options/map_option.xml b/addons/website/static/src/builder/plugins/options/map_option.xml
index 3e01c9b3f681a..e9d256766ecaa 100644
--- a/addons/website/static/src/builder/plugins/options/map_option.xml
+++ b/addons/website/static/src/builder/plugins/options/map_option.xml
@@ -69,11 +69,25 @@
             max="5"
         />
     </BuilderRow>
+    <t t-call="website.MapDescriptionOption"/>
+</t>
+
+<t t-name="website.MapDescriptionOption">
     <BuilderRow label.translate="Description">
         <BuilderCheckbox id="'map_description'" action="'mapDescription'"/>
     </BuilderRow>
-    <BuilderRow label.translate="Description Text" level="1" t-if="isActiveItem('map_description')">
-        <BuilderTextInput action="'mapDescriptionTextValue'"/>
-    </BuilderRow>
+    <t t-if="isActiveItem('map_description')">
+        <BuilderRow label.translate="Description Text" level="1">
+            <BuilderTextInput action="'mapDescriptionTextValue'"/>
+        </BuilderRow>
+        <BuilderContext applyTo="'.description'">
+            <BuilderRow label.translate="Text Color" level="1">
+                <BuilderColorPicker enabledTabs="['custom']" styleAction="'color'"/>
+            </BuilderRow>
+            <BuilderRow label.translate="Background Color" level="1">
+                <BuilderColorPicker enabledTabs="['custom', 'gradient']" styleAction="'background-color'"/>
+            </BuilderRow>
+        </BuilderContext>
+    </t>
 </t>
 </templates>
diff --git a/addons/website/static/src/snippets/s_google_map/000.scss b/addons/website/static/src/snippets/s_google_map/000.scss
index 2cd6d360c24da..3aff02411d581 100644
--- a/addons/website/static/src/snippets/s_google_map/000.scss
+++ b/addons/website/static/src/snippets/s_google_map/000.scss
@@ -1,8 +1,6 @@
 
 $s-google-map-desc-bg: map-get($theme-colors, 'primary') !default;
 $s-google-map-desc-alpha: 0.80 !default;
-$s-google-map-desc-hover-bg: map-get($theme-colors, 'primary') !default;
-$s-google-map-desc-hover-alpha: 0.55 !default;
 
 .s_google_map {
     position: relative;
@@ -17,7 +15,6 @@ $s-google-map-desc-hover-alpha: 0.55 !default;
         padding: 0 1em;
         background: rgba($s-google-map-desc-bg, $s-google-map-desc-alpha);
         color: color-contrast(rgba($s-google-map-desc-bg, $s-google-map-desc-alpha));
-        transition: background-color 250ms ease;
 
         font {
             float: left;
@@ -34,9 +31,4 @@ $s-google-map-desc-hover-alpha: 0.55 !default;
             margin-left: 10px;
         }
     }
-    &:hover .description {
-        background: $s-google-map-desc-hover-bg;
-        background: rgba($s-google-map-desc-hover-bg, $s-google-map-desc-hover-alpha);
-        color: color-contrast(rgba($s-google-map-desc-hover-bg, $s-google-map-desc-hover-alpha));
-    }
 }
diff --git a/addons/website/static/src/snippets/s_map/000.scss b/addons/website/static/src/snippets/s_map/000.scss
index 25ca541477edc..95b3664181e90 100644
--- a/addons/website/static/src/snippets/s_map/000.scss
+++ b/addons/website/static/src/snippets/s_map/000.scss
@@ -1,8 +1,6 @@
 
 $s-map-desc-bg: map-get($theme-colors, 'primary') !default;
 $s-map-desc-alpha: 0.80 !default;
-$s-map-desc-hover-bg: map-get($theme-colors, 'primary') !default;
-$s-map-desc-hover-alpha: 0.55 !default;
 
 .s_map {
     position: relative;
@@ -21,7 +19,6 @@ $s-map-desc-hover-alpha: 0.55 !default;
         padding: 0 1em;
         background: rgba($s-map-desc-bg, $s-map-desc-alpha);
         color: color-contrast(rgba($s-map-desc-bg, $s-map-desc-alpha));
-        transition: background-color 250ms ease;
 
         font {
             float: left;
@@ -38,11 +35,6 @@ $s-map-desc-hover-alpha: 0.55 !default;
             margin-left: 10px;
         }
     }
-    &:hover .description {
-        background: $s-map-desc-hover-bg;
-        background: rgba($s-map-desc-hover-bg, $s-map-desc-hover-alpha);
-        color: color-contrast(rgba($s-map-desc-hover-bg, $s-map-desc-hover-alpha));
-    }
     .s_map_color_filter {
         @include o-position-absolute(0, 0, 0, 0);
         position: absolute !important;

From 65bd1c8753885827ffaa33b9cc11b7c398f23a4f Mon Sep 17 00:00:00 2001
From: dtda-odoo <dtda@odoo.com>
Date: Thu, 16 Oct 2025 18:08:03 +0530
Subject: [PATCH 063/673] [IMP] website: add Hoot test for description in map
 snippet

This commit adds a hoot test for description in the map snippet.

task-4604018

closes odoo/odoo#203678

Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../website_builder/map_option.test.js        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 addons/website/static/tests/builder/website_builder/map_option.test.js

diff --git a/addons/website/static/tests/builder/website_builder/map_option.test.js b/addons/website/static/tests/builder/website_builder/map_option.test.js
new file mode 100644
index 0000000000000..8b29dec19ad21
--- /dev/null
+++ b/addons/website/static/tests/builder/website_builder/map_option.test.js
@@ -0,0 +1,35 @@
+import { expect, test } from "@odoo/hoot";
+import { contains } from "@web/../tests/web_test_helpers";
+import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+
+defineWebsiteModels();
+
+test("test description option", async () => {
+    await setupWebsiteBuilderWithSnippet("s_map");
+    await contains(":iframe .s_map").click();
+
+    // toggle description
+    await contains("[data-action-id='mapDescription'] input").click();
+    expect(":iframe .s_map .description").toBeVisible();
+
+    // Change Description Text
+    await contains("[data-action-id='mapDescriptionTextValue'] input").edit("New description");
+    expect(":iframe .s_map .description").toHaveText("New description");
+
+    // Check Gradient tab background color
+    await contains("div[data-label='Background Color'] .o_we_color_preview").click();
+    await contains(".o_popover .o_font_color_selector .btn-tab:contains('Gradient')").click();
+    await contains(".o_colorpicker_sections .o_color_button[data-color='linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)']").click();
+    expect(":iframe .s_map .description").toHaveStyle({ "background-image": "linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)" });
+
+    // Check Custom tab background color
+    await contains("div[data-label='Background Color'] .o_we_color_preview").click();
+    await contains(".o_popover .o_font_color_selector .btn-tab:contains('Custom')").click();
+    await contains(".o_popover .o_colorpicker_widget .o_hex_input").edit("#E4F641");
+    expect(":iframe .s_map .description").toHaveStyle({ "background-color": "rgb(228, 246, 65)" });
+
+    // Check text color
+    await contains("div[data-label='Text Color'] .o_we_color_preview").click();
+    await contains(".o_popover .o_colorpicker_widget .o_hex_input").edit("#EB28EB");
+    expect(":iframe .s_map .description").toHaveStyle({ "color": "rgb(235, 40, 235)" });
+});

From d46c437284ebdb71170163b86c19ff93dd39c7af Mon Sep 17 00:00:00 2001
From: "Lucas ESTEBAN (lues)" <lues@odoo.com>
Date: Fri, 26 Sep 2025 11:19:20 +0000
Subject: [PATCH 064/673] [FIX] hr_recruitment_skills: fix talent's skills
 disappearing when creating

application

Steps to reproduce:
- In recruitment, go to any talent pool
- Create a new talent and add skills
- Click on the "Create Applications" button
- The applicant will have the skills but the talent will lose them

Reason:
When the application is created from the talent, the transmitted skills were
treated as duplicates of the new ones and thus deleted to preserve the working
logic of skills.

How it was fixed:
By correcting the create function, the skills are not considered duplicates
anymore, allowing the talent to keep their skills.

Task ID: 5083085

closes odoo/odoo#233837

X-original-commit: ce150dc4a23b6aec3cebad7dd154b43b4c544673
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 .../models/hr_applicant.py                    |  3 +-
 .../tests/test_recruitment_skills.py          | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment_skills/models/hr_applicant.py b/addons/hr_recruitment_skills/models/hr_applicant.py
index 07390deec92b4..14852c293d677 100644
--- a/addons/hr_recruitment_skills/models/hr_applicant.py
+++ b/addons/hr_recruitment_skills/models/hr_applicant.py
@@ -149,8 +149,7 @@ def create(self, vals_list):
             # This is required for the talent pool mechanism to work. Duplicating an hr.applicant record without this
             # check will cause the skills to not be duplicated or disappear randomly.
             for vals in vals_list:
-                skills = vals.pop("current_applicant_skill_ids", []) + vals.get("applicant_skill_ids", [])
-                vals["applicant_skill_ids"] = self.env["hr.applicant.skill"]._get_transformed_commands(skills, self)
+                vals["applicant_skill_ids"] = vals.pop("current_applicant_skill_ids", []) + vals.get("applicant_skill_ids", [])
         return super().create(vals_list)
 
     def write(self, vals):
diff --git a/addons/hr_recruitment_skills/tests/test_recruitment_skills.py b/addons/hr_recruitment_skills/tests/test_recruitment_skills.py
index 262b1415d7d72..e43cccc098e92 100644
--- a/addons/hr_recruitment_skills/tests/test_recruitment_skills.py
+++ b/addons/hr_recruitment_skills/tests/test_recruitment_skills.py
@@ -599,3 +599,35 @@ def test_interviewer_skills_access(self):
         self.env.flush_all()
         matching_skill_ids = self.t_applicant.with_user(interviewer_user).matching_skill_ids
         self.assertEqual(matching_skill_ids, self.t_applicant.matching_skill_ids, "The interviewer should see the skills of the applicant")
+
+    def test_applicant_from_talent_preserve_skills(self):
+        """
+        Verify that when an applicant is created from a talent pool applicant, the new applicant
+        has the same skills as the talent and the talent retains all its skills.
+        """
+        talent = (
+            self.env["talent.pool.add.applicants"]
+            .create({"applicant_ids": self.t_applicant, "talent_pool_ids": self.t_talent_pool})
+            ._add_applicants_to_pool()
+        )
+        talent_form = Form(talent)
+        with talent_form.current_applicant_skill_ids.new() as skill:
+            skill.skill_type_id = self.t_skill_type
+            skill.skill_id = self.t_skill_1
+            skill.skill_level_id = self.t_skill_level_1
+        talent_form.save()
+
+        test_job = self.env["hr.job"].create({"name": "Test Job"})
+        applicant = (
+            self.env["job.add.applicants"]
+            .create({"applicant_ids": talent.ids, "job_ids": test_job})
+            ._add_applicants_to_job()
+        )
+
+        self.assertEqual(applicant.applicant_skill_ids.skill_type_id, self.t_skill_type)
+        self.assertEqual(applicant.applicant_skill_ids.skill_level_id, self.t_skill_level_1)
+        self.assertEqual(applicant.applicant_skill_ids.skill_id, self.t_skill_1)
+
+        self.assertEqual(talent.applicant_skill_ids.skill_type_id, applicant.applicant_skill_ids.skill_type_id)
+        self.assertEqual(talent.applicant_skill_ids.skill_level_id, applicant.applicant_skill_ids.skill_level_id)
+        self.assertEqual(talent.applicant_skill_ids.skill_id, applicant.applicant_skill_ids.skill_id)

From a9a237f9e6dbcf489975f41c693c37733b385192 Mon Sep 17 00:00:00 2001
From: Rahil Ghanchi <rahg@odoo.com>
Date: Thu, 16 Oct 2025 05:59:28 +0000
Subject: [PATCH 065/673] [FIX] html_editor: fix video url handling for
 facebook videos

This PR improves the changes made in PR #215204.

When embedding facebook videos, the url looks like
"//facebook.com/plugins/video.php?
href=https://www.facebook.com/username/videos/{video_id}/"
after embedding, so we need to check for "https:" and "http:"
with method'startsWith' instead of 'includes'.

closes odoo/odoo#232404

X-original-commit: 40b3fd8a69b166bd63ecfabbc980876589a6d09d
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Rahil Ghanchi (rahg) <rahg@odoo.com>
---
 .../static/src/main/media/media_dialog/video_selector.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
index 57333adcf2731..12f3fda05760d 100644
--- a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
+++ b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
@@ -157,7 +157,7 @@ export class VideoSelector extends Component {
                     "";
                 if (src) {
                     this.state.urlInput = src;
-                    if (!src.includes("https:") && !src.includes("http:")) {
+                    if (!src.startsWith("https:") && !src.startsWith("http:")) {
                         this.state.urlInput = "https:" + this.state.urlInput;
                     }
                     this.state.isVertical = !!closestElement(

From 6d37794b289dfa2008b33ee817faecd63904a003 Mon Sep 17 00:00:00 2001
From: djsh-odoo <djsh@odoo.com>
Date: Tue, 5 Aug 2025 12:02:11 +0000
Subject: [PATCH 066/673] [FIX] hr: fixed available hours on week bug

Issue / current behavior:
When you create an employee with version date = today and set him an occupation
starting in the past and then when we try to assign him a working schedule
24h/week it shows 0 working hours.

Required behavior:
It should display 24 working hours or whatever selected.

Solution:
Changed the field of available time of the week to 'contract_date_start' from
'date_start' in _get_expected_attendances function and also added the logic to
display working hours effectively. Also fixed the gantt view by adding
'contract_date_start' in _get_calendar_periods to display unavailability
accordingly.

task-4985887

closes odoo/odoo#233854

X-original-commit: 2ef4d8a9cb02329e9e6a16118ed2d02a9f5300ce
Related: odoo/enterprise#98504
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_employee.py     |  7 +++++--
 addons/hr/tests/test_attendances.py | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index a3ce4190cf7a6..47abf750bb025 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -1660,7 +1660,7 @@ def _get_calendar_periods(self, start, stop):
                 # if employee is under fully flexible contract, use timezone of the employee
                 calendar_tz = timezone(version.resource_calendar_id.tz) if version.resource_calendar_id else timezone(employee.resource_id.tz)
                 date_start = datetime.combine(
-                    version.date_start,
+                    version.contract_date_start,
                     time(0, 0, 0)
                 ).replace(tzinfo=calendar_tz).astimezone(utc)
                 if version.date_end:
@@ -1745,12 +1745,15 @@ def _get_expected_attendances(self, date_from, date_to):
                 domain=[('company_id', 'in', [False, self.company_id.id])])[self.resource_id.id]
             return calendar_intervals
         duration_data = Intervals()
+        version_prev = datetime.combine(valid_versions[0].date_start, time.min, employee_tz)
         for version in valid_versions:
             version_start = datetime.combine(version.date_start, time.min, employee_tz)
+            contract_start = datetime.combine(version.contract_date_start, time.min, employee_tz)
             version_end = datetime.combine(version.date_end or date.max, time.max, employee_tz)
             calendar = version.resource_calendar_id or version.company_id.resource_calendar_id
+            start_date = version_start if version_prev < version_start else contract_start
             version_intervals = calendar._work_intervals_batch(
-                                    max(date_from, version_start),
+                                    max(date_from, start_date),
                                     min(date_to, version_end),
                                     tz=employee_tz,
                                     resources=self.resource_id,
diff --git a/addons/hr/tests/test_attendances.py b/addons/hr/tests/test_attendances.py
index cd6df1a0cafb1..24c9e4cb3f703 100644
--- a/addons/hr/tests/test_attendances.py
+++ b/addons/hr/tests/test_attendances.py
@@ -49,10 +49,17 @@ def setUpClass(cls):
         cls.employee.create_version({
             'resource_calendar_id': resource_calendar_half_time.id,
             'contract_date_start': date(2024, 6, 1),
+            'contract_date_end': date(2024, 7, 31),
             'wage': 1,
             'date_version': date(2024, 7, 1),
         })
 
+        cls.employee.create_version({
+            'contract_date_start': date(2024, 8, 1),
+            'wage': 1,
+            'date_version': date(2024, 9, 1),
+        })
+
         cls.employee.resource_calendar_id = contract_now.resource_calendar_id
 
     def test_incoming_overlapping_contract(self):
@@ -66,3 +73,8 @@ def test_incoming_overlapping_contract(self):
         check_out_tz = datetime.combine(datetime(2024, 7, 31), datetime.max.time()).astimezone(tz)
         intervals = self.employee._employee_attendance_intervals(check_in_tz, check_out_tz, lunch=False)
         self.assertEqual(len(intervals), 25)
+
+        check_in_tz = datetime.combine(datetime(2024, 8, 1), datetime.min.time()).astimezone(tz)
+        check_out_tz = datetime.combine(datetime(2024, 8, 31), datetime.max.time()).astimezone(tz)
+        intervals = self.employee._employee_attendance_intervals(check_in_tz, check_out_tz, lunch=False)
+        self.assertEqual(len(intervals), 20)

From 19a0304a76f7b867e4ad362210fd7a975e80fa00 Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Fri, 17 Oct 2025 12:48:40 +0000
Subject: [PATCH 067/673] [IMP] iot_drivers: restart odoo from all protocols

In order to allow using the `iot_http` service to restart odoo,
we updated the action route to accept messages targeting the IoT Box
itself, the WebRTC to accept restart actions and the WebSocket to
confirm that the restart action was received.

odoo/enterprise#97525

closes odoo/odoo#233860

Task: 5169648
X-original-commit: 1eb0cdee048de0aed9335157fb03c459668a5cd7
Related: odoo/enterprise#98505
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 addons/iot_drivers/controllers/driver.py  | 17 ++++++++++++++---
 addons/iot_drivers/tools/communication.py |  8 ++++++--
 addons/iot_drivers/webrtc_client.py       |  5 +----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/addons/iot_drivers/controllers/driver.py b/addons/iot_drivers/controllers/driver.py
index 10f12d41cf0ba..bd57bf69c521d 100644
--- a/addons/iot_drivers/controllers/driver.py
+++ b/addons/iot_drivers/controllers/driver.py
@@ -13,6 +13,7 @@
 from odoo.addons.iot_drivers.event_manager import event_manager
 from odoo.addons.iot_drivers.main import iot_devices
 from odoo.addons.iot_drivers.tools import helpers, route
+from odoo.addons.iot_drivers.tools.system import IOT_IDENTIFIER
 
 _logger = logging.getLogger(__name__)
 
@@ -29,9 +30,19 @@ def action(self, session_id, device_identifier, data):
         We specify in data from which session_id that action is called
         And call the action of specific device
         """
-        if device_identifier == "test_protocol":
-            # Special case for testing if a protocol is working
-            return True
+        if device_identifier == IOT_IDENTIFIER:
+            match data.get('action'):
+                case "restart_odoo":
+                    event_manager.events.append({
+                        'time': time.time(),
+                        'device_identifier': device_identifier,
+                        'owner': session_id,
+                        'status': 'success',
+                    })
+                    return helpers.odoo_restart(2)
+                case _:
+                    # Special case for testing if longpolling protocol is working
+                    return True
 
         # If device_identifier is a type of device, we take the first device of this type
         # required for longpolling with community db
diff --git a/addons/iot_drivers/tools/communication.py b/addons/iot_drivers/tools/communication.py
index ffab736abfe13..ee68c7b126b71 100644
--- a/addons/iot_drivers/tools/communication.py
+++ b/addons/iot_drivers/tools/communication.py
@@ -18,7 +18,7 @@ def handle_message(message_type: str, **kwargs: dict) -> dict:
     :param kwargs: Additional parameters passed with the message.
     :return: A dictionary response based on the message type and processing.
     """
-    device_identifier = kwargs.get('device_identifier')
+    device_identifier = kwargs.get('device_identifier', IOT_IDENTIFIER)
     base_response = {
         'owner': kwargs.get('session_id', '0'),  # TODO: remove 'owner' in future versions
         'session_id': kwargs.get('session_id', '0'),
@@ -43,7 +43,11 @@ def handle_message(message_type: str, **kwargs: dict) -> dict:
             })
             helpers.get_odoo_server_url.cache_clear()
         case 'restart_odoo':
-            helpers.odoo_restart()
+            helpers.odoo_restart(1)
+            return {
+                **base_response,
+                'status': 'success',
+            }
         case 'remote_debug':
             if IS_WINDOWS:
                 return {}
diff --git a/addons/iot_drivers/webrtc_client.py b/addons/iot_drivers/webrtc_client.py
index 84de8d3cbaae6..26b195d572db1 100644
--- a/addons/iot_drivers/webrtc_client.py
+++ b/addons/iot_drivers/webrtc_client.py
@@ -52,12 +52,9 @@ async def on_message(message_str: str):
 
                 # Handle regular message
                 message = json.loads(message_str)
-                message["data"]["session_id"] = message["session_id"]
                 result = await self.event_loop.run_in_executor(
                     None,
-                    lambda: communication.handle_message(
-                        message["message_type"], device_identifier=message["device_identifier"], **message["data"]
-                    )
+                    lambda: communication.handle_message(**message)
                 )
                 if result:
                     self.send(result)

From 36f741745b927d7cbac9b32042bd53b47711da6f Mon Sep 17 00:00:00 2001
From: Nicolas Bayet <nby@odoo.com>
Date: Mon, 28 Jul 2025 14:56:12 +0200
Subject: [PATCH 068/673] [IMP] website,*: improve API of the builder option

The commit:
1. use static property to configure a builder option
2. introduce the concept of dependencies to access the plugin's shared
   in builder option
3. make a plugin context the same for Plugin, BuilderOption and
   BuilderAction to have the same API in each class.

Before this commit, to define an option, we had to define a javascript
object that would contain the information of the option within the
`builder_options` resource.

```js
class MyPlugin extends Plugin {
    resources: {
        builder_options: [
        {
            selector: "div.selector",
            template: "my.owlTemplate",
            cleanForSave() {}
            // ... other option props
        }
        ]
    }
}

// For a custom component
class MyPlugin extends Plugin {
    resources: {
        builder_options: [
        {
            selector: "div.selector",
            template: MyCustomComponent
            cleanForSave() {}
            // ... other option props
        }
        ]
    }
}

class MyCustomComponent extends BaseOptionComponent {
    // ...
}
```

When building anything for the builder, there is 3 classes that are
important: `Plugin`, `BaseOptionComponent`, `BuilderAction`.

In practice, the option object defined in builder_options feels
strange. On the other hand, making the configuration of the option as
a static property of the component somehow feels simpler as everything
related to that option is defined in the same class.

```js
class MyPlugin extends Plugin {
  resources: {
    builder_options: [MyCustomComponent]
  }
}

class MyCustomComponent extends BaseOptionComponent {
  static template = "my.owlTemplate";
  static selector = "div.selector";
  static cleanForSave(context) {}
  // ...
}
```

To have the same mental context in the 3 important class, they all
share the same API (`dependencies`, `dispatchTo`, `getResource`, ...)
(see `Editor.getPluginContext`)

To access a plugin shared method, it's now the same for `Plugin`,
`BuliderAction` and `BaseOptionComponent`:

```js
class MyCustomComponent extends BaseOptionComponent {
    static selector = "mySelector";
    static dependency = "myPlugin";
    myMethod() {
        this.dependencies.myPlugin.pluginMethod();
    }
}
```

To access a resource, dispatch, ...:

```js
class MyCustomComponent extends BaseOptionComponent {
    static selector = "mySelector";
    myMethod() {
        const resource = this.getResource('myResource');
    }
}
```

related-task-4367641

Part-of: odoo/odoo#233376
Related: odoo/enterprise#98236
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 addons/html_builder/static/src/builder.js     |   5 +-
 .../static/src/core/builder_action.js         |  35 +-
 .../static/src/core/builder_actions_plugin.js |  19 +-
 .../static/src/core/builder_options_plugin.js |  58 +-
 .../core/builder_options_plugin_translate.js  |  25 +-
 .../static/src/core/clone_plugin.js           |   2 +-
 .../src/core/disable_snippets_plugin.js       |   2 +-
 .../static/src/core/drag_and_drop_plugin.js   |   6 +-
 .../static/src/core/select_number_column.js   |   1 -
 addons/html_builder/static/src/core/utils.js  |  30 +-
 .../static/src/core/visibility_plugin.js      |   2 +-
 .../static/src/plugins/add_product_option.js  |   6 +-
 .../static/src/plugins/add_product_option.xml |   4 +-
 .../static/src/plugins/alert_option_plugin.js |  15 +-
 .../background_image_option.js                |  11 +-
 .../background_position_option.js             |   1 -
 .../background_shape_option.js                |   4 +-
 .../static/src/plugins/badge_option_plugin.js |  13 +-
 .../plugins/base_vertical_alignment_option.js |   7 +
 .../plugins/block_alignment_option_plugin.js  |  13 +-
 .../src/plugins/border_configurator_option.js |   3 +-
 .../src/plugins/cta_badge_option_plugin.js    |  16 +-
 .../src/plugins/image/image_format_option.js  |   4 +-
 .../src/plugins/image/image_shape_option.js   |   5 +-
 .../static/src/plugins/image/image_size.js    |   2 +-
 .../src/plugins/image/image_tool_option.js    |   4 +-
 .../plugins/image/image_tool_option_plugin.js |  35 +-
 .../src/plugins/image/replace_media_option.js |   5 +-
 .../src/plugins/layout_column_option.js       |   4 +-
 .../plugins/layout_column_option_plugin.js    |   9 +-
 .../static/src/plugins/many2one_option.js     |   4 +-
 .../src/plugins/many2one_option_plugin.js     |   8 +-
 .../src/plugins/rating_option_plugin.js       |  11 +-
 .../src/plugins/separator_option_plugin.js    |  17 +-
 .../plugins/text_alignment_option_plugin.js   |  13 +-
 .../src/plugins/vertical_alignment_option.js  |  18 +-
 .../src/plugins/vertical_alignment_option.xml |   4 +-
 .../vertical_alignment_option_plugin.js       |  13 +-
 .../plugins/vertical_justify_option_plugin.js |  16 +-
 .../static/src/plugins/width_option_plugin.js |  15 +-
 .../static/src/sidebar/customize_tab.js       |   2 +-
 .../static/src/sidebar/option_container.js    |  19 +-
 .../static/src/sidebar/option_container.xml   |   7 +-
 addons/html_builder/static/src/utils/utils.js |  40 +-
 .../static/tests/builder_action.test.js       |  86 +--
 .../static/tests/builder_option.test.js       | 101 +--
 .../tests/clean_for_save_options.test.js      |  69 +-
 .../static/tests/composite_action.test.js     |  49 +-
 .../static/tests/contenteditable.test.js      |  43 +-
 .../basic_many2many.test.js                   |  30 +-
 .../builder_components/builder_button.test.js | 339 +++++-----
 .../builder_button_group.test.js              | 111 ++--
 .../builder_checkbox.test.js                  |  41 +-
 .../builder_colorpicker.test.js               | 117 ++--
 .../builder_context.test.js                   |  13 +-
 .../builder_datetimepicker.test.js            | 101 +--
 .../builder_components/builder_list.test.js   |  79 ++-
 .../builder_many2many.test.js                 |  21 +-
 .../builder_many2one.test.js                  |  16 +-
 .../builder_number_input.test.js              | 371 ++++++-----
 .../builder_components/builder_range.test.js  |  31 +-
 .../builder_components/builder_row.test.js    | 217 ++++---
 .../builder_select_item.test.js               | 269 ++++----
 .../builder_text_input.test.js                |  21 +-
 .../model_many2many.test.js                   |  11 +-
 .../builder_shorthand_action.test.js          |  85 ++-
 .../static/tests/custom_tab/misc.test.js      | 600 ++++++++++--------
 addons/html_builder/static/tests/helpers.js   |  31 +-
 .../static/tests/operation.test.js            |  77 ++-
 .../static/tests/shadow_option.test.js        |  14 +-
 .../html_builder/static/tests/utils.test.js   |  16 +-
 addons/html_editor/static/src/editor.js       |  98 ++-
 addons/html_editor/static/src/plugin.js       | 104 +--
 .../html_editor/static/tests/toolbar.test.js  |   3 +-
 .../builder/plugins/alert_option_plugin.js    |  23 +-
 .../plugins/background_option_plugin.js       |  29 +-
 .../builder/plugins/border_option_plugin.js   |  53 +-
 .../plugins/colorpicker_option_plugin.js      |  34 +-
 .../src/builder/plugins/design_tab_plugin.js  |   8 +-
 .../plugins/image_tool_options_plugin.js      |  20 +-
 .../plugins/layout_column_option_plugin.js    |  16 +-
 .../plugins/masonry_block_option_plugin.js    |  10 +-
 .../builder/plugins/padding_option_plugin.js  |  31 +-
 .../plugins/pricelist_boxed_option_plugin.js  |  15 +-
 .../plugins/reviews_wall_option_plugin.js     |  22 +-
 .../builder/plugins/carousel_option_plugin.js |  43 +-
 .../plugins/content_width_option_plugin.js    |  21 +-
 .../plugins/customize_website_plugin.js       |   2 +-
 .../src/builder/plugins/dynamic_svg_option.js |   2 +-
 .../plugins/dynamic_svg_option_plugin.js      |   8 +-
 .../plugins/edit_interaction_plugin.js        |   2 +-
 .../floating_blocks_block_mobile_option.js    |   3 +-
 .../floating_blocks_block_option.js           |   2 +-
 .../floating_blocks_block_option_plugin.js    |  11 +-
 .../floating_blocks_option_plugin.js          |  13 +-
 .../plugins/font_awesome_option_plugin.js     |  12 +-
 .../plugins/form/form_action_fields_option.js |   5 +-
 .../builder/plugins/form/form_field_option.js |   8 +-
 .../plugins/form/form_field_option_redraw.js  |   2 +
 .../form/form_model_required_field_alert.js   |  11 +-
 .../src/builder/plugins/form/form_option.js   |  38 +-
 .../src/builder/plugins/form/form_option.xml  |   4 +-
 .../plugins/form/form_option_plugin.js        |  58 +-
 .../plugins/image/grid_image_option.js        |   2 +-
 .../plugins/image/grid_image_option_plugin.js |   7 +-
 .../plugins/image/image_hover_plugin.js       |   2 +
 .../layout_option/grid_column_option.js       |   2 +-
 .../grid_column_option_plugin.js              |   7 +-
 .../plugins/layout_option/layout_option.js    |   9 +-
 .../layout_option/layout_option_plugin.js     |  16 +-
 .../options/accordion_option_plugin.js        |  21 +-
 .../builder/plugins/options/animate_option.js |  27 +-
 .../plugins/options/animate_option_plugin.js  |  33 +-
 .../builder/plugins/options/animate_text.xml  |   2 +-
 .../announcement_scroll_option_plugin.js      |  13 +-
 .../plugins/options/background_option.js      |   8 +-
 .../options/bento_border_option_plugin.js     |  13 +-
 .../options/blockquote_option_plugin.js       |  40 +-
 .../plugins/options/border_option_plugin.js   |  21 +-
 .../plugins/options/card_image_option.js      |   1 -
 .../builder/plugins/options/card_option.js    |  20 +-
 .../plugins/options/card_option_plugin.js     |  65 +-
 .../options/carousel_cards_item_option.js     |   3 +-
 .../options/carousel_slides_option_plugin.js  |  15 +-
 .../builder/plugins/options/chart_option.js   |  32 +-
 .../builder/plugins/options/chart_option.xml  |   6 +-
 .../plugins/options/chart_option_plugin.js    |  33 +-
 ...oller_page_listing_layout_option_plugin.js |  19 +-
 .../plugins/options/cookies_bar_option.js     |  14 +-
 .../options/countdown_option_plugin.js        |  22 +-
 .../options/cover_properties_option.js        |   3 +-
 .../options/cover_properties_option_plugin.js |   8 +-
 .../dynamic_snippet_carousel_option.js        |   8 +-
 .../dynamic_snippet_carousel_option_plugin.js |  22 +-
 .../plugins/options/dynamic_snippet_option.js |   6 +-
 .../options/dynamic_snippet_option_plugin.js  |  17 +-
 ...ecomm_categories_showcase_option_plugin.js |  29 +-
 .../options/embed_code_option_plugin.js       |  13 +-
 .../plugins/options/facebook_option_plugin.js |  13 +-
 .../options/faq_horizontal_option_plugin.js   |  14 +-
 .../options/footer_copyright_option.js        |   4 +-
 .../options/footer_copyright_option_plugin.js |   9 +-
 .../plugins/options/footer_option_plugin.js   | 103 +--
 .../plugins/options/footer_template_option.js |   7 +-
 .../options/gallery_element_option_plugin.js  |  15 +-
 .../google_maps_option/google_maps_option.js  |  35 +-
 .../google_maps_option_plugin.js              |  15 +-
 .../header/basicHeaderOptionSettings.js       |   5 +
 .../options/header/header_box_option.js       |   6 +-
 .../header/header_box_option_plugin.js        |  46 +-
 .../options/header/header_elements_option.js  |   6 +-
 .../options/header/header_font_option.js      |   5 +-
 .../header/header_icon_background_option.js   |   5 +-
 .../header/header_navigation_option.js        |  35 +-
 .../header/header_navigation_option_plugin.js |  13 +-
 .../options/header/header_option_plugin.js    |  26 +-
 .../options/header/header_template_option.js  |   5 +-
 .../plugins/options/image_gallery_option.js   |   3 +-
 .../options/image_gallery_option_plugin.js    |  24 +-
 .../options/instagram_option_plugin.js        |  13 +-
 .../options/language_selector_option.js       |  19 +-
 .../plugins/options/map_option_plugin.js      |  13 +-
 .../plugins/options/media_list_item_option.js |   6 +-
 .../options/media_list_item_option.xml        |   2 +-
 .../options/media_list_option_plugin.js       |  18 +-
 .../plugins/options/mega_menu_option.js       |   8 +-
 .../options/mega_menu_option_plugin.js        |  10 +-
 .../options/navbar_logo_option_plugin.js      |  19 +-
 .../options/navtabs_style_option_plugin.js    |  25 +-
 .../plugins/options/parallax_option.js        |   1 -
 .../plugins/options/parallax_option_plugin.js |  12 +-
 .../plugins/options/popup_option_plugin.js    |  27 +-
 .../pricelist_boxed_option_plugin.js          |  47 +-
 .../pricelist_option/pricelist_cafe_plugin.js |  61 +-
 .../product_catalog_plugin.js                 |  47 +-
 .../plugins/options/process_steps_option.js   |   2 +-
 .../options/process_steps_option_plugin.js    |  29 +-
 .../options/progress_bar_option_plugin.js     |  33 +-
 .../plugins/options/scroll_button_option.js   |   4 +-
 .../options/scroll_button_option_plugin.js    |   9 +-
 .../plugins/options/searchbar_option.js       |  10 +-
 .../options/searchbar_option_plugin.js        |  12 +-
 .../plugins/options/social_media_links.js     |  16 +-
 .../options/social_media_option_plugin.js     |  43 +-
 .../options/table_of_content_option_plugin.js |  24 +-
 .../options/timeline_list_option_plugin.js    |  31 +-
 .../plugins/options/timeline_option_plugin.js |  32 +-
 .../src/builder/plugins/options/utils.js      |  11 +-
 .../plugins/options/visibility_option.js      |  10 +-
 .../plugins/options/visibility_option.xml     |   2 +-
 .../options/visibility_option_plugin.js       |  25 +-
 .../website_background_option_plugin.js       | 122 ++--
 .../options/website_info_option_plugin.js     |  19 +-
 .../options/website_page_config_option.js     |  14 +-
 .../options/website_page_config_option.xml    |   8 +-
 .../website_page_config_option_plugin.js      |  36 +-
 .../src/builder/plugins/size_option_plugin.js |  13 +-
 .../src/builder/plugins/switchable_views.js   |  10 +-
 .../plugins/switchable_views_plugin.js        |  15 +-
 .../plugins/theme/theme_advanced_option.js    |   9 +-
 .../plugins/theme/theme_advanced_option.xml   |   2 +-
 .../plugins/theme/theme_colors_option.js      |   1 -
 .../builder/plugins/theme/theme_tab_plugin.js |  60 +-
 .../plugins/timeline_images_option_plugin.js  |  32 +-
 .../customize_translation_tab_plugin.js       |  18 +-
 .../translate_webpage_option.js               |  11 +-
 .../translate_webpage_option.xml              |   2 +-
 .../vertical_alignment_option_plugin.js       |  21 +-
 .../plugins/website_visibility_plugin.js      |  10 +-
 .../static/src/builder/website_builder.js     |  10 +
 .../website_builder/background_option.test.js |  21 +-
 .../website_builder/carousel_item.test.js     |   2 +-
 .../website_builder/image_gallery.test.js     |   2 +-
 .../static/tests/builder/website_helpers.js   |  88 +--
 .../blog_page_option_plugin.js                |  23 +-
 .../blog_post_page_option_plugin.js           |  21 +-
 .../website_builder/blog_post_tags_option.js  |   3 +
 .../blog_post_tags_option_plugin.js           |  11 +-
 .../dynamic_snippet_blog_posts_option.js      |  12 +-
 ...ynamic_snippet_blog_posts_option_plugin.js |  16 +-
 .../partner_page_option_plugin.js             |  19 +-
 .../website_crm_partner_assign_option.js      |   5 +
 ...ebsite_crm_partner_assign_option_plugin.js |  12 +-
 .../website_builder/customer_filter_option.js |   5 +
 .../customer_filter_option_plugin.js          |   9 +-
 .../dynamic_snippet_events_option.js          |   9 +-
 .../dynamic_snippet_events_option_plugin.js   |  15 +-
 .../event_page_option_plugin.js               |  39 +-
 .../events_list_page_option_plugin.js         |  15 +-
 .../event_page_option_plugin.js               |  33 +-
 .../event_track_page_option_plugin.js         |  37 +-
 .../forum_page_option_plugin.js               |  17 +-
 .../website_hr_recruitment_option_plugin.js   |  19 +-
 .../mail_group_option_plugin.js               |  15 +-
 .../mailing_list_subscribe_option.js          |   7 +-
 .../mailing_list_subscribe_option_plugin.js   |  12 +-
 .../newsletter_layout_option_plugin.js        |  16 +-
 .../newsletter_subscribe_common_option.js     |  23 +-
 .../newsletter_subscribe_common_option.xml    |   6 +-
 ...wsletter_subscribe_common_option_plugin.js |  42 +-
 .../recaptcha_subscribe_option.js             |   9 +-
 .../recaptcha_subscribe_option.xml            |   2 +-
 .../website_builder/donation_option_plugin.js |  22 +-
 ...supported_payment_methods_option_plugin.js |  11 +-
 .../src/website_builder/add_to_card_option.js |   1 +
 .../add_to_cart_option_plugin.js              |   7 +-
 .../checkout_page_option_plugin.js            |  20 +-
 ...mic_snippet_category_item_option_plugin.js |  14 +-
 .../dynamic_snippet_category_option_plugin.js |  23 +-
 .../dynamic_snippet_products_option.js        |  12 +-
 .../dynamic_snippet_products_option_plugin.js |  18 +-
 .../product_attribute_option_plugin.js        |  15 +-
 .../product_header_category_option_plugin.js  |  22 +-
 .../product_header_shop_option_plugin.js      |  17 +-
 .../product_image_option_plugin.js            |  21 +-
 .../website_builder/product_page_option.js    |   6 +
 .../product_page_option_plugin.js             |  17 +-
 .../website_builder/product_ribbon_options.js |  10 +-
 .../product_ribbon_options.xml                |   2 +-
 .../product_ribbon_options_plugin.js          |  26 +-
 .../website_builder/products_item_option.js   |  17 +-
 .../products_item_option_plugin.js            |  26 +-
 .../products_list_page_option.js              |   6 +
 .../products_list_page_option_plugin.js       |  11 +-
 .../website_sale_show_empty_option_plugin.js  |  15 +-
 .../course_page_option_plugin.js              |  19 +-
 .../wishlist_page_option_plugin.js            |  17 +-
 .../courses_list_page_option_plugin.js        |  37 +-
 .../slides_forum_page_option_plugin.js        |  17 +-
 269 files changed, 3896 insertions(+), 3288 deletions(-)
 create mode 100644 addons/html_builder/static/src/plugins/base_vertical_alignment_option.js
 create mode 100644 addons/website/static/src/builder/plugins/options/header/basicHeaderOptionSettings.js

diff --git a/addons/html_builder/static/src/builder.js b/addons/html_builder/static/src/builder.js
index b5bc05570d1f4..7291ae50153a7 100644
--- a/addons/html_builder/static/src/builder.js
+++ b/addons/html_builder/static/src/builder.js
@@ -180,7 +180,6 @@ export class Builder extends Component {
                         wrapWithSaveSnippetHandlers
                     ),
                 snippetModel: this.snippetModel,
-                getShared: () => this.editor.shared,
                 updateInvisibleElementsPanel: () => this.updateInvisibleEls(),
                 allowCustomStyle: true,
                 allowTargetBlank: true,
@@ -292,11 +291,11 @@ export class Builder extends Component {
         if (tab === "theme" || tab === "blocks") {
             this.colorPresetToShow = presetId;
             this.activeTargetEl = this.activeTargetEl || this.getActiveTarget();
-            this.editor.shared["builderOptions"].deactivateContainers();
+            this.editor.shared.builderOptions.deactivateContainers();
         } else if (this.activeTargetEl) {
             if (isVisible(this.activeTargetEl)) {
                 // Reactivate the previously active element.
-                this.editor.shared["builderOptions"].updateContainers(this.activeTargetEl);
+                this.editor.shared.builderOptions.updateContainers(this.activeTargetEl);
             }
             this.activeTargetEl = null;
         }
diff --git a/addons/html_builder/static/src/core/builder_action.js b/addons/html_builder/static/src/core/builder_action.js
index 8834d03519915..5ebf8cc2c2f56 100644
--- a/addons/html_builder/static/src/core/builder_action.js
+++ b/addons/html_builder/static/src/core/builder_action.js
@@ -26,19 +26,34 @@
  * @property { Object[] } items
  */
 
+/**
+ * @typedef { import("../../../../html_editor/static/src/editor").EditorContext } EditorContext
+ */
+
 export class BuilderAction {
     /** @type { string[] } */
     static dependencies = [];
-    constructor(plugin, dependencies) {
-        this.window = plugin.window;
-        this.document = plugin.document;
-        this.editable = plugin.editable;
-        this.dependencies = dependencies;
-        this.services = plugin.services;
-        this.config = plugin.config;
-        this.getResource = plugin.getResource.bind(plugin);
-        this.dispatchTo = plugin.dispatchTo.bind(plugin);
-        this.delegateTo = plugin.delegateTo.bind(plugin);
+    /**
+     * @param { EditorContext } context
+     */
+    constructor(context) {
+        /** @type { EditorContext['document'] } **/
+        this.document = context.document;
+        this.window = context.document.defaultView;
+        /** @type { EditorContext['editable'] } **/
+        this.editable = context.editable;
+        /** @type { EditorContext['config'] } **/
+        this.config = context.config;
+        /** @type { EditorContext['services'] } **/
+        this.services = context.services;
+        /** @type { EditorContext['dependencies'] } **/
+        this.dependencies = context.dependencies;
+        /** @type { EditorContext['getResource'] } **/
+        this.getResource = context.getResource;
+        /** @type { EditorContext['dispatchTo'] } **/
+        this.dispatchTo = context.dispatchTo;
+        /** @type { EditorContext['delegateTo'] } **/
+        this.delegateTo = context.delegateTo;
 
         this.setup();
 
diff --git a/addons/html_builder/static/src/core/builder_actions_plugin.js b/addons/html_builder/static/src/core/builder_actions_plugin.js
index 9ddea98e434fe..e813bd0f326eb 100644
--- a/addons/html_builder/static/src/core/builder_actions_plugin.js
+++ b/addons/html_builder/static/src/core/builder_actions_plugin.js
@@ -1,29 +1,26 @@
 import { Plugin } from "@html_editor/plugin";
 
 /**
- * @typedef {Class} BuilderAction
- * @property {string} id
- * @property {Function} apply
- * @property {Function} [isApplied]
- * @property {Function} [clean]
- * @property {() => Promise<any>} [load]
+ * @typedef { import("./builder_action").BuilderAction } BuilderAction
+ * @typedef {} BuilderActionConstructor
  */
+
 export class BuilderActionsPlugin extends Plugin {
     static id = "builderActions";
     static shared = ["getAction", "applyAction"];
     static dependencies = ["operation", "history"];
     setup() {
+        /** @type { BuilderAction[] } */
         this.actions = {};
         for (const actions of this.getResource("builder_actions")) {
             for (const Action of Object.values(actions)) {
                 if (Action.id in this.actions) {
                     throw new Error(`Duplicate builder action id: ${Action.id}`);
                 }
-                const deps = {};
-                for (const depName of Action.dependencies) {
-                    deps[depName] = this.config.getShared()[depName];
-                }
-                this.actions[Action.id] = new Action(this, deps);
+                /** @type { BuilderAction } */
+                this.actions[Action.id] = new Action(
+                    this.__editor.getEditorContext(Action.dependencies)
+                );
             }
         }
         Object.freeze(this.actions);
diff --git a/addons/html_builder/static/src/core/builder_options_plugin.js b/addons/html_builder/static/src/core/builder_options_plugin.js
index baa5825a2bf05..fd513f8e87292 100644
--- a/addons/html_builder/static/src/core/builder_options_plugin.js
+++ b/addons/html_builder/static/src/core/builder_options_plugin.js
@@ -4,6 +4,7 @@ import { isRemovable } from "./remove_plugin";
 import { isClonable } from "./clone_plugin";
 import { getElementsWithOption, isElementInViewport } from "@html_builder/utils/utils";
 import { shouldEditableMediaBeEditable } from "@html_builder/utils/utils_css";
+import { OptionsContainer } from "@html_builder/sidebar/option_container";
 
 export class BuilderOptionsPlugin extends Plugin {
     static id = "builderOptions";
@@ -27,6 +28,7 @@ export class BuilderOptionsPlugin extends Plugin {
         "getCloneDisabledReason",
         "getReloadSelector",
         "setNextTarget",
+        "getBuilderOptionContext",
     ];
     resources = {
         before_add_step_handlers: this.onWillAddStep.bind(this),
@@ -54,10 +56,19 @@ export class BuilderOptionsPlugin extends Plugin {
     };
 
     setup() {
-        this.builderOptions = withIds(this.getResource("builder_options"));
+        this.builderOptions = this.getResource("builder_options");
+        this.builderOptionsContext = new Map();
+        this.builderOptionsDependencies = new Map();
+        const options = this.builderOptions.concat([OptionsContainer]);
+        for (const Option of options) {
+            this.getBuilderDependencies(Option);
+            this.getBuilderOptionContext(Option);
+        }
+
         this.elementsToOptionsTitleComponents = withIds(
             this.getResource("elements_to_options_title_components")
         );
+        // todo: remove that resource as we should be able to patch the class the normal way
         this.getResource("patch_builder_options").forEach((option) => {
             this.patchBuilderOptions(option);
         });
@@ -188,10 +199,10 @@ export class BuilderOptionsPlugin extends Plugin {
     }
 
     computeContainers(target) {
-        const mapElementsToOptions = (options) => {
+        const mapElementsToOptions = (Options) => {
             const map = new Map();
-            for (const option of options) {
-                const { selector, exclude, editableOnly } = option;
+            for (const Option of Options) {
+                const { selector, exclude, editableOnly } = Option;
                 let elements = getClosestElements(target, selector);
                 if (!elements.length) {
                     continue;
@@ -200,9 +211,9 @@ export class BuilderOptionsPlugin extends Plugin {
 
                 for (const element of elements) {
                     if (map.has(element)) {
-                        map.get(element).push(option);
+                        map.get(element).push(Option);
                     } else {
-                        map.set(element, [option]);
+                        map.set(element, [Option]);
                     }
                 }
             }
@@ -298,13 +309,13 @@ export class BuilderOptionsPlugin extends Plugin {
     }
 
     cleanForSave({ root }) {
-        for (const option of this.builderOptions) {
-            const { selector, exclude, cleanForSave } = option;
+        for (const Option of this.builderOptions) {
+            const { selector, exclude, cleanForSave } = Option;
             if (!cleanForSave) {
                 continue;
             }
             for (const el of getElementsWithOption(root, selector, exclude)) {
-                cleanForSave(el);
+                cleanForSave(el, this.getBuilderOptionContext(Option));
             }
         }
     }
@@ -453,6 +464,35 @@ export class BuilderOptionsPlugin extends Plugin {
 
         return { option: requestedOption, targetEl };
     }
+    /**
+     * Get all dependencies of an OptionComponent and all its descendants.
+     */
+    getBuilderDependencies(OptionComponent) {
+        const cachedDeps = this.builderOptionsDependencies.get(OptionComponent);
+        if (cachedDeps) {
+            return cachedDeps;
+        }
+        const deps = OptionComponent.dependencies || [];
+        this.builderOptionsDependencies.set(OptionComponent, deps);
+        const childDeps = Object.values(OptionComponent.components || {}).flatMap(
+            this.getBuilderDependencies.bind(this)
+        );
+        deps.push(...childDeps);
+        return deps;
+    }
+    /**
+     * Get all the methods (window, document, getResources, ...) that are available in plugins. Provide the OptionComponent to set the right dependencies.
+     */
+    getBuilderOptionContext(OptionComponent) {
+        const context = this.builderOptionsContext.get(OptionComponent);
+        if (!context) {
+            const deps = this.getBuilderDependencies(OptionComponent);
+            const context = this.__editor.getEditorContext(deps);
+            this.builderOptionsContext.set(OptionComponent, context);
+            return context;
+        }
+        return context;
+    }
 }
 
 function getClosestElements(element, selector) {
diff --git a/addons/html_builder/static/src/core/builder_options_plugin_translate.js b/addons/html_builder/static/src/core/builder_options_plugin_translate.js
index 9e9d00af1633e..5301eaf1e1acb 100644
--- a/addons/html_builder/static/src/core/builder_options_plugin_translate.js
+++ b/addons/html_builder/static/src/core/builder_options_plugin_translate.js
@@ -1,10 +1,28 @@
+import { OptionsContainer } from "@html_builder/sidebar/option_container";
 import { Plugin } from "@html_editor/plugin";
+import { BuilderOptionsPlugin } from "./builder_options_plugin";
 
 export class BuilderOptionsTranslationPlugin extends Plugin {
     static id = "builderOptions";
-    static shared = ["deactivateContainers", "getTarget", "updateContainers", "setNextTarget"];
+    static shared = [
+        "deactivateContainers",
+        "getTarget",
+        "updateContainers",
+        "setNextTarget",
+        "getBuilderOptionContext",
+    ];
     static dependencies = ["history"];
 
+    setup() {
+        this.builderOptions = this.getResource("translate_options");
+        this.builderOptionsContext = new Map();
+        this.builderOptionsDependencies = new Map();
+        const options = this.builderOptions.concat([OptionsContainer]);
+        for (const Option of options) {
+            this.getBuilderDependencies(Option);
+            this.getBuilderOptionContext(Option);
+        }
+    }
     deactivateContainers() {}
     getTarget() {}
     updateContainers() {}
@@ -13,3 +31,8 @@ export class BuilderOptionsTranslationPlugin extends Plugin {
         this.dependencies.history.setStepExtra("nextTarget", targetEl);
     }
 }
+
+BuilderOptionsTranslationPlugin.prototype.getBuilderDependencies =
+    BuilderOptionsPlugin.prototype.getBuilderDependencies;
+BuilderOptionsTranslationPlugin.prototype.getBuilderOptionContext =
+    BuilderOptionsPlugin.prototype.getBuilderOptionContext;
diff --git a/addons/html_builder/static/src/core/clone_plugin.js b/addons/html_builder/static/src/core/clone_plugin.js
index b0ade108f9741..ed67002b83249 100644
--- a/addons/html_builder/static/src/core/clone_plugin.js
+++ b/addons/html_builder/static/src/core/clone_plugin.js
@@ -49,7 +49,7 @@ export class ClonePlugin extends Plugin {
         }
         const buttons = [];
         this.overlayTarget = target;
-        const disabledReason = this.dependencies["builderOptions"].getCloneDisabledReason(target);
+        const disabledReason = this.dependencies.builderOptions.getCloneDisabledReason(target);
         buttons.push({
             class: "o_snippet_clone fa fa-clone",
             title: _t("Duplicate"),
diff --git a/addons/html_builder/static/src/core/disable_snippets_plugin.js b/addons/html_builder/static/src/core/disable_snippets_plugin.js
index 11dfbf5bdb436..54b5c560f906c 100644
--- a/addons/html_builder/static/src/core/disable_snippets_plugin.js
+++ b/addons/html_builder/static/src/core/disable_snippets_plugin.js
@@ -40,7 +40,7 @@ export class DisableSnippetsPlugin extends Plugin {
      * TODO: trigger the computation in the situation that needs it.
      */
     disableUndroppableSnippets() {
-        const editableAreaEls = this.dependencies["setup_editor_plugin"].getEditableAreas();
+        const editableAreaEls = this.dependencies.setup_editor_plugin.getEditableAreas();
         const rootEl = this.dependencies.dropzone.getDropRootElement();
         const dropAreasBySelector = this.getDropAreas(editableAreaEls, rootEl);
 
diff --git a/addons/html_builder/static/src/core/drag_and_drop_plugin.js b/addons/html_builder/static/src/core/drag_and_drop_plugin.js
index ce02193d9d8cc..15126b164d654 100644
--- a/addons/html_builder/static/src/core/drag_and_drop_plugin.js
+++ b/addons/html_builder/static/src/core/drag_and_drop_plugin.js
@@ -158,7 +158,7 @@ export class DragAndDropPlugin extends Plugin {
                     this.dragState.restoreCallbacks?.forEach((restore) => restore());
                     restoreDragSavePoint();
                     dragAndDropResolve();
-                    this.dependencies["builderOptions"].updateContainers(this.overlayTarget);
+                    this.dependencies.builderOptions.updateContainers(this.overlayTarget);
                 };
 
                 this.dragStarted = true;
@@ -232,7 +232,7 @@ export class DragAndDropPlugin extends Plugin {
 
                 // Remove the dragged element and deactivate the options.
                 this.overlayTarget.remove();
-                this.dependencies["builderOptions"].deactivateContainers();
+                this.dependencies.builderOptions.deactivateContainers();
 
                 // Add the dropzones.
                 dropzoneEls = this.dependencies.dropzone.activateDropzones(selectors, {
@@ -389,7 +389,7 @@ export class DragAndDropPlugin extends Plugin {
                 }
 
                 dragAndDropResolve();
-                this.dependencies["builderOptions"].updateContainers(this.overlayTarget);
+                this.dependencies.builderOptions.updateContainers(this.overlayTarget);
             },
         };
 
diff --git a/addons/html_builder/static/src/core/select_number_column.js b/addons/html_builder/static/src/core/select_number_column.js
index 8a1ac9bb24e9a..ef86e59516fc9 100644
--- a/addons/html_builder/static/src/core/select_number_column.js
+++ b/addons/html_builder/static/src/core/select_number_column.js
@@ -3,7 +3,6 @@ import { areColsCustomized } from "@html_builder/utils/column_layout_utils";
 
 export class SelectNumberColumn extends BaseOptionComponent {
     static template = "html_builder.SelectNumberColumn";
-    static props = {};
 
     setup() {
         super.setup();
diff --git a/addons/html_builder/static/src/core/utils.js b/addons/html_builder/static/src/core/utils.js
index c42f94b137892..c3cf740033f1a 100644
--- a/addons/html_builder/static/src/core/utils.js
+++ b/addons/html_builder/static/src/core/utils.js
@@ -18,6 +18,10 @@ import { useBus } from "@web/core/utils/hooks";
 import { effect } from "@web/core/utils/reactive";
 import { useDebounced } from "@web/core/utils/timing";
 
+/**
+ * @typedef { import("../../../../html_editor/static/src/editor").EditorContext } EditorContext
+ */
+
 function isConnectedElement(el) {
     return el && el.isConnected && !!el.ownerDocument.defaultView;
 }
@@ -616,7 +620,7 @@ function useOperationWithReload(callApply, reload) {
         await callApply(...args);
         env.editor.shared.history.addStep();
         await env.editor.shared.savePlugin.save();
-        const target = env.editor.shared["builderOptions"].getReloadSelector(editingElement);
+        const target = env.editor.shared.builderOptions.getReloadSelector(editingElement);
         const url = reload.getReloadUrl?.();
         await env.editor.config.reloadEditor({ target, url });
     };
@@ -990,15 +994,39 @@ export function convertParamToObject(param) {
     }
     return param;
 }
+
 export class BaseOptionComponent extends Component {
     static components = {};
     static props = {};
     static template = "";
 
     setup() {
+        /** @type {EditorContext} */
+        const context = this.env.editor.shared.builderOptions.getBuilderOptionContext(
+            this.constructor
+        );
+        /** @type { EditorContext['document'] } **/
+        this.document = context.document;
+        this.window = context.document.defaultView;
+        /** @type { EditorContext['editable'] } **/
+        this.editable = context.editable;
+        /** @type { EditorContext['config'] } **/
+        this.config = context.config;
+        /** @type { EditorContext['services'] } **/
+        this.services = context.services;
+        /** @type { EditorContext['dependencies'] } **/
+        this.dependencies = context.dependencies;
+        /** @type { EditorContext['getResource'] } **/
+        this.getResource = context.getResource;
+        /** @type { EditorContext['dispatchTo'] } **/
+        this.dispatchTo = context.dispatchTo;
+        /** @type { EditorContext['delegateTo'] } **/
+        this.delegateTo = context.delegateTo;
+
         this.isActiveItem = useIsActiveItem();
         const comp = useComponent();
         const editor = comp.env.editor;
+
         if (!comp.constructor.components) {
             comp.constructor.components = {};
         }
diff --git a/addons/html_builder/static/src/core/visibility_plugin.js b/addons/html_builder/static/src/core/visibility_plugin.js
index 8844c0531aa93..215693c524aeb 100644
--- a/addons/html_builder/static/src/core/visibility_plugin.js
+++ b/addons/html_builder/static/src/core/visibility_plugin.js
@@ -107,7 +107,7 @@ export class VisibilityPlugin extends Plugin {
             const show = !isTargetVisible(deviceInvisibleEl);
             const isShown = this.toggleVisibilityStatus(deviceInvisibleEl, show, true);
             if (!isShown && deviceInvisibleEl.contains(currentContainerTargetEl)) {
-                this.dependencies["builderOptions"].deactivateContainers();
+                this.dependencies.builderOptions.deactivateContainers();
             }
         }
     }
diff --git a/addons/html_builder/static/src/plugins/add_product_option.js b/addons/html_builder/static/src/plugins/add_product_option.js
index 83790b2545266..9dae7441bf47e 100644
--- a/addons/html_builder/static/src/plugins/add_product_option.js
+++ b/addons/html_builder/static/src/plugins/add_product_option.js
@@ -1,9 +1,5 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
-export class AddProductOption extends BaseOptionComponent {
+export class BaseAddProductOption extends BaseOptionComponent {
     static template = "html_builder.AddProductOption";
-    static props = {
-        applyTo: { type: String, optional: true },
-        productSelector: String,
-    };
 }
diff --git a/addons/html_builder/static/src/plugins/add_product_option.xml b/addons/html_builder/static/src/plugins/add_product_option.xml
index 1226b553f0040..910654f7a797f 100644
--- a/addons/html_builder/static/src/plugins/add_product_option.xml
+++ b/addons/html_builder/static/src/plugins/add_product_option.xml
@@ -6,9 +6,9 @@
         <BuilderButton
             type="'success'"
             action="'addItem'"
-            actionParam="`${props.productSelector}:last-of-type`"
+            actionParam="`${this.productSelector}:last-of-type`"
             preview="false"
-            applyTo="props.applyTo">
+            applyTo="this.buttonApplyTo">
             Add Product
         </BuilderButton>
     </BuilderRow>
diff --git a/addons/html_builder/static/src/plugins/alert_option_plugin.js b/addons/html_builder/static/src/plugins/alert_option_plugin.js
index bff067d42a547..0e56b04940d78 100644
--- a/addons/html_builder/static/src/plugins/alert_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/alert_option_plugin.js
@@ -4,6 +4,7 @@ import { fonts } from "@html_editor/utils/fonts";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class AlertOptionPlugin extends Plugin {
     static id = "alertOption";
@@ -11,17 +12,17 @@ class AlertOptionPlugin extends Plugin {
         builder_actions: {
             AlertIconAction,
         },
-        builder_options: [
-            withSequence(before(WIDTH), {
-                template: "html_builder.AlertOption",
-                selector: ".s_alert",
-                name: "alertTypeOption",
-            }),
-        ],
+        builder_options: [withSequence(before(WIDTH), AlertOption)],
         so_content_addition_selector: [".s_alert"],
     };
 }
 
+export class AlertOption extends BaseOptionComponent {
+    static template = "html_builder.AlertOption";
+    static selector = ".s_alert";
+    static name = "alertTypeOption";
+}
+
 export class AlertIconAction extends BuilderAction {
     static id = "alertIcon";
     apply({ editingElement, params: { mainParam: className } }) {
diff --git a/addons/html_builder/static/src/plugins/background_option/background_image_option.js b/addons/html_builder/static/src/plugins/background_option/background_image_option.js
index bbd2262134846..2aa148765a7b2 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_image_option.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_image_option.js
@@ -5,22 +5,19 @@ import { getHtmlStyle } from "@html_editor/utils/formatting";
 
 export class BackgroundImageOption extends BaseOptionComponent {
     static template = "html_builder.BackgroundImageOption";
-    static props = {};
+    static dependencies = ["history", "backgroundImageOption"];
     static components = { ImageSize };
     setup() {
         this.editingElement = this.env.getEditingElement();
+        super.setup();
         // done here because we have direct access to the editing element
         // (which we don't have in the normalize of the current plugin)
         this.toggleBgImageClasses();
-        super.setup();
     }
     toggleBgImageClasses() {
-        this.env.editor.shared.history.ignoreDOMMutations(() => {
+        this.dependencies.history.ignoreDOMMutations(() => {
             const backgroundURL = getBgImageURLFromEl(this.editingElement);
-            this.env.editor.shared.backgroundImageOption.setImageBackground(
-                this.editingElement,
-                backgroundURL
-            );
+            this.dependencies.backgroundImageOption.setImageBackground(this.editingElement, backgroundURL);
         });
     }
     showMainColorPicker() {
diff --git a/addons/html_builder/static/src/plugins/background_option/background_position_option.js b/addons/html_builder/static/src/plugins/background_option/background_position_option.js
index 02e9006301ecc..76c6bc912e2d1 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_position_option.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_position_option.js
@@ -2,5 +2,4 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class BackgroundPositionOption extends BaseOptionComponent {
     static template = "html_builder.BackgroundPositionOption";
-    static props = {};
 }
diff --git a/addons/html_builder/static/src/plugins/background_option/background_shape_option.js b/addons/html_builder/static/src/plugins/background_option/background_shape_option.js
index a27218342f498..cfb2c580a4bb8 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_shape_option.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_shape_option.js
@@ -5,10 +5,10 @@ import { _t } from "@web/core/l10n/translation";
 
 export class BackgroundShapeOption extends BaseOptionComponent {
     static template = "html_builder.BackgroundShapeOption";
-    static props = {};
+    static dependencies = ["backgroundShapeOption"];
     setup() {
         super.setup();
-        this.backgroundShapePlugin = this.env.editor.shared.backgroundShapeOption;
+        this.backgroundShapePlugin = this.dependencies.backgroundShapeOption;
         this.toRatio = toRatio;
         this.state = useDomState((editingElement) => {
             const shapeData = this.backgroundShapePlugin.getShapeData(editingElement);
diff --git a/addons/html_builder/static/src/plugins/badge_option_plugin.js b/addons/html_builder/static/src/plugins/badge_option_plugin.js
index a9f4ad2f2e8ec..6b6e87adebf96 100644
--- a/addons/html_builder/static/src/plugins/badge_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/badge_option_plugin.js
@@ -2,16 +2,17 @@ import { ANIMATE, before } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class BadgeOption extends BaseOptionComponent {
+    static template = "html_builder.BadgeOption";
+    static selector = ".s_badge";
+}
 
 class BadgeOptionPlugin extends Plugin {
     static id = "badgeOption";
     resources = {
-        builder_options: [
-            withSequence(before(ANIMATE), {
-                template: "html_builder.BadgeOption",
-                selector: ".s_badge",
-            }),
-        ],
+        builder_options: [withSequence(before(ANIMATE), BadgeOption)],
         so_content_addition_selector: [".s_badge"],
     };
 }
diff --git a/addons/html_builder/static/src/plugins/base_vertical_alignment_option.js b/addons/html_builder/static/src/plugins/base_vertical_alignment_option.js
new file mode 100644
index 0000000000000..a35042c774d4b
--- /dev/null
+++ b/addons/html_builder/static/src/plugins/base_vertical_alignment_option.js
@@ -0,0 +1,7 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class BaseVerticalAlignmentOption extends BaseOptionComponent {
+    static template = "html_builder.VerticalAlignmentOption";
+    level = 1;
+    justify = true;
+}
diff --git a/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js
index 5207a4926073c..9f0c7efe99b33 100644
--- a/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js
@@ -2,17 +2,18 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { BLOCK_ALIGN } from "@html_builder/utils/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class BlockAlignmentOptionPlugin extends Plugin {
     static id = "blockAlignmentOption";
     resources = {
-        builder_options: [
-            withSequence(BLOCK_ALIGN, {
-                template: "html_builder.BlockAlignmentOption",
-                selector: ".s_alert, .s_blockquote, .s_text_highlight",
-            }),
-        ],
+        builder_options: [withSequence(BLOCK_ALIGN, BlockAlignmentOption)],
     };
 }
 
+export class BlockAlignmentOption extends BaseOptionComponent {
+    static template = "html_builder.BlockAlignmentOption";
+    static selector = ".s_alert, .s_blockquote, .s_text_highlight";
+}
+
 registry.category("builder-plugins").add(BlockAlignmentOptionPlugin.id, BlockAlignmentOptionPlugin);
diff --git a/addons/html_builder/static/src/plugins/border_configurator_option.js b/addons/html_builder/static/src/plugins/border_configurator_option.js
index 63bcc64076a02..5529c520e4a90 100644
--- a/addons/html_builder/static/src/plugins/border_configurator_option.js
+++ b/addons/html_builder/static/src/plugins/border_configurator_option.js
@@ -2,6 +2,7 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 
 export class BorderConfigurator extends BaseOptionComponent {
     static template = "html_builder.BorderConfiguratorOption";
+    static dependencies = ["builderActions"];
     static props = {
         label: { type: String },
         direction: { type: String, optional: true },
@@ -30,7 +31,7 @@ export class BorderConfigurator extends BaseOptionComponent {
         return property;
     }
     hasBorder(editingElement) {
-        const getAction = this.env.editor.shared.builderActions.getAction;
+        const { getAction } = this.dependencies.builderActions;
         const styleActionValue = getAction("styleAction").getValue({
             editingElement,
             params: {
diff --git a/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js b/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js
index 2345034ac0c87..1cd4a26fb604f 100644
--- a/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js
@@ -1,15 +1,19 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { ShadowOption } from "@html_builder/plugins/shadow_option";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+export class CTABadgeOption extends BaseOptionComponent {
+    static template = "html_builder.CTABadgeOption";
+    static selector = ".s_cta_badge";
+    static components = { BorderConfigurator, ShadowOption };
+}
+
 class CTABadgeOptionPlugin extends Plugin {
     static id = "ctaBadgeOption";
     resources = {
-        builder_options: [
-            {
-                template: "html_builder.CTABadgeOption",
-                selector: ".s_cta_badge",
-            },
-        ],
+        builder_options: [CTABadgeOption],
         so_content_addition_selector: [".s_cta_badge"],
     };
 }
diff --git a/addons/html_builder/static/src/plugins/image/image_format_option.js b/addons/html_builder/static/src/plugins/image/image_format_option.js
index 5d8194266ac0f..9e56ceee364b1 100644
--- a/addons/html_builder/static/src/plugins/image/image_format_option.js
+++ b/addons/html_builder/static/src/plugins/image/image_format_option.js
@@ -4,6 +4,7 @@ import { clamp } from "@web/core/utils/numbers";
 
 export class ImageFormatOption extends BaseOptionComponent {
     static template = "html_builder.ImageFormat";
+    static dependencies = ["imageFormatOption"];
     static props = {
         level: { type: Number, optional: true },
         computeMaxDisplayWidth: { type: Function, optional: true },
@@ -14,8 +15,9 @@ export class ImageFormatOption extends BaseOptionComponent {
     MAX_SUGGESTED_WIDTH = 1920;
     setup() {
         super.setup();
+        const { computeAvailableFormats } = this.dependencies.imageFormatOption;
         this.state = useDomState(async (editingElement) => {
-            const formats = await this.env.editor.shared.imageFormatOption.computeAvailableFormats(
+            const formats = await computeAvailableFormats(
                 editingElement,
                 this.computeMaxDisplayWidth.bind(this)
             );
diff --git a/addons/html_builder/static/src/plugins/image/image_shape_option.js b/addons/html_builder/static/src/plugins/image/image_shape_option.js
index e15c497fa46f4..124953ae4cc02 100644
--- a/addons/html_builder/static/src/plugins/image/image_shape_option.js
+++ b/addons/html_builder/static/src/plugins/image/image_shape_option.js
@@ -6,6 +6,7 @@ import { deepCopy } from "@web/core/utils/objects";
 
 export class ImageShapeOption extends BaseOptionComponent {
     static template = "html_builder.ImageShapeOption";
+    static dependencies = ["customizeTab", "imageShapeOption"];
     static props = {
         withAnimatedShapes: { type: Boolean, optional: true },
     };
@@ -14,8 +15,8 @@ export class ImageShapeOption extends BaseOptionComponent {
     };
     setup() {
         super.setup();
-        this.customizeTabPlugin = this.env.editor.shared.customizeTab;
-        this.imageShapeOption = this.env.editor.shared.imageShapeOption;
+        this.customizeTabPlugin = this.dependencies.customizeTab;
+        this.imageShapeOption = this.dependencies.imageShapeOption;
         this.toRatio = toRatio;
         this.state = useDomState((editingElement) => {
             const shape = editingElement.dataset.shape;
diff --git a/addons/html_builder/static/src/plugins/image/image_size.js b/addons/html_builder/static/src/plugins/image/image_size.js
index 835b6d91080cf..66831c645d87c 100644
--- a/addons/html_builder/static/src/plugins/image/image_size.js
+++ b/addons/html_builder/static/src/plugins/image/image_size.js
@@ -6,7 +6,7 @@ const imageCacheSize = new Map();
 
 export class ImageSize extends BaseOptionComponent {
     static template = "html_builder.ImageSize";
-    static props = {};
+
     setup() {
         super.setup();
         this.imagePostProcess = this.env.editor.shared.imagePostProcess;
diff --git a/addons/html_builder/static/src/plugins/image/image_tool_option.js b/addons/html_builder/static/src/plugins/image/image_tool_option.js
index f7603e15d3707..f2b7371d3c4d3 100644
--- a/addons/html_builder/static/src/plugins/image/image_tool_option.js
+++ b/addons/html_builder/static/src/plugins/image/image_tool_option.js
@@ -12,7 +12,9 @@ export class ImageToolOption extends BaseOptionComponent {
         ImageFormatOption,
         ImageTransformOption,
     };
-    static props = {};
+    static selector = "img";
+    static exclude = "[data-oe-type='image'] > img";
+    static name = "imageToolOption";
     setup() {
         super.setup();
         this.state = useDomState((editingElement) => ({
diff --git a/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
index 898b9f62434c4..7a3dbea26916b 100644
--- a/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
@@ -15,11 +15,14 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { selectElements } from "@html_editor/utils/dom_traversal";
 import { isCSSColor } from "@web/core/utils/colors";
 import { getCSSVariableValue, getHtmlStyle } from "@html_editor/utils/formatting";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-export const REPLACE_MEDIA_SELECTOR = "img, .media_iframe_video, span.fa, i.fa";
-export const REPLACE_MEDIA_EXCLUDE =
-    "[data-oe-xpath], a[href^='/website/social/'] > i.fa, a[class*='s_share_'] > i.fa";
-
+export class ImageAndFaOption extends BaseOptionComponent {
+    static template = "html_builder.ImageAndFaOption";
+    static selector = "span.fa, i.fa, img";
+    static exclude = "[data-oe-type='image'] > img, [data-oe-xpath], .s_social_media i.fa, .s_share i.fa";
+    static name = "imageAndFaOption";
+}
 class ImageToolOptionPlugin extends Plugin {
     static id = "imageToolOption";
     static dependencies = [
@@ -33,25 +36,9 @@ class ImageToolOptionPlugin extends Plugin {
     static shared = ["getCSSColorValue"];
     resources = {
         builder_options: [
-            withSequence(REPLACE_MEDIA, {
-                OptionComponent: ReplaceMediaOption,
-                selector: REPLACE_MEDIA_SELECTOR,
-                exclude: REPLACE_MEDIA_EXCLUDE,
-                name: "replaceMediaOption",
-            }),
-            withSequence(IMAGE_TOOL, {
-                OptionComponent: ImageToolOption,
-                selector: "img",
-                exclude: "[data-oe-type='image'] > img",
-                name: "imageToolOption",
-            }),
-            withSequence(ALIGNMENT_STYLE_PADDING, {
-                template: "html_builder.ImageAndFaOption",
-                selector: "span.fa, i.fa, img",
-                exclude:
-                    "[data-oe-type='image'] > img, [data-oe-xpath], .s_social_media i.fa, .s_share i.fa",
-                name: "imageAndFaOption",
-            }),
+            withSequence(REPLACE_MEDIA, ReplaceMediaOption),
+            withSequence(IMAGE_TOOL, ImageToolOption),
+            withSequence(ALIGNMENT_STYLE_PADDING, ImageAndFaOption),
         ],
         builder_actions: {
             CropImageAction,
@@ -185,7 +172,7 @@ export class ReplaceMediaAction extends BuilderAction {
     static id = "replaceMedia";
     static dependencies = ["media_website"];
     async apply({ editingElement: mediaEl }) {
-        await this.dependencies["media_website"].replaceMedia(mediaEl);
+        await this.dependencies.media_website.replaceMedia(mediaEl);
     }
 }
 export class SetLinkAction extends BuilderAction {
diff --git a/addons/html_builder/static/src/plugins/image/replace_media_option.js b/addons/html_builder/static/src/plugins/image/replace_media_option.js
index b06a6c4d5d0f1..2ed6bcb8778f2 100644
--- a/addons/html_builder/static/src/plugins/image/replace_media_option.js
+++ b/addons/html_builder/static/src/plugins/image/replace_media_option.js
@@ -3,7 +3,10 @@ import { _t } from "@web/core/l10n/translation";
 
 export class ReplaceMediaOption extends BaseOptionComponent {
     static template = "html_builder.ReplaceMediaOption";
-    static props = {};
+    static selector = "img, .media_iframe_video, span.fa, i.fa";
+    static exclude =
+        "[data-oe-xpath], a[href^='/website/social/'] > i.fa, a[class*='s_share_'] > i.fa";
+    static name = "replaceMediaOption";
     setup() {
         super.setup();
         this.state = useDomState((editingElement) => ({
diff --git a/addons/html_builder/static/src/plugins/layout_column_option.js b/addons/html_builder/static/src/plugins/layout_column_option.js
index 4e1f34d1305c8..b859c9d9b5825 100644
--- a/addons/html_builder/static/src/plugins/layout_column_option.js
+++ b/addons/html_builder/static/src/plugins/layout_column_option.js
@@ -6,5 +6,7 @@ export class LayoutColumnOption extends BaseOptionComponent {
     static components = {
         SelectNumberColumn,
     };
-    static props = {};
+    static selector = "section.s_features_grid, section.s_process_steps";
+    static applyTo = ":scope > *:has(> .row), :scope > .s_allow_columns";
+    static name = "layoutColumnOption";
 }
diff --git a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
index e54a5b8827077..a6f3d17bb4cd8 100644
--- a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
@@ -10,14 +10,7 @@ class LayoutColumnOptionPlugin extends Plugin {
     static id = "LayoutColumnOption";
     static dependencies = ["clone", "selection"];
     resources = {
-        builder_options: [
-            withSequence(LAYOUT_COLUMN, {
-                OptionComponent: LayoutColumnOption,
-                selector: "section.s_features_grid, section.s_process_steps",
-                applyTo: ":scope > *:has(> .row), :scope > .s_allow_columns",
-                name: "layoutColumnOption",
-            }),
-        ],
+        builder_options: [withSequence(LAYOUT_COLUMN, LayoutColumnOption)],
         on_cloned_handlers: this.onCloned.bind(this),
         builder_actions: {
             ChangeColumnCountAction,
diff --git a/addons/html_builder/static/src/plugins/many2one_option.js b/addons/html_builder/static/src/plugins/many2one_option.js
index c6f03d3d15f47..aecfcfcfcb5c9 100644
--- a/addons/html_builder/static/src/plugins/many2one_option.js
+++ b/addons/html_builder/static/src/plugins/many2one_option.js
@@ -4,7 +4,9 @@ import { useService } from "@web/core/utils/hooks";
 
 export class Many2OneOption extends BaseOptionComponent {
     static template = "html_builder.Many2OneOption";
-    static props = [];
+    static selector = "[data-oe-many2one-model]:not([data-oe-readonly])";
+    static editableOnly = false;
+
     setup() {
         super.setup();
         this.orm = useService("orm");
diff --git a/addons/html_builder/static/src/plugins/many2one_option_plugin.js b/addons/html_builder/static/src/plugins/many2one_option_plugin.js
index 1e1188bc87d3f..65e8ba1d1e957 100644
--- a/addons/html_builder/static/src/plugins/many2one_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/many2one_option_plugin.js
@@ -6,13 +6,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 export class Many2OneOptionPlugin extends Plugin {
     static id = "many2OneOption";
     resources = {
-        builder_options: [
-            {
-                OptionComponent: Many2OneOption,
-                selector: "[data-oe-many2one-model]:not([data-oe-readonly])",
-                editableOnly: false,
-            },
-        ],
+        builder_options: [Many2OneOption],
         builder_actions: {
             Many2OneAction,
         },
diff --git a/addons/html_builder/static/src/plugins/rating_option_plugin.js b/addons/html_builder/static/src/plugins/rating_option_plugin.js
index 701edf21f3ecf..b873e186475f2 100644
--- a/addons/html_builder/static/src/plugins/rating_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/rating_option_plugin.js
@@ -1,16 +1,19 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+export class RatingOption extends BaseOptionComponent {
+    static template = "html_builder.RatingOption";
+    static selector = ".s_rating";
+}
+
 class RatingOptionPlugin extends Plugin {
     static id = "ratingOption";
     static dependencies = ["history", "media"];
     selector = ".s_rating";
     resources = {
-        builder_options: {
-            template: "html_builder.RatingOption",
-            selector: ".s_rating",
-        },
+        builder_options: RatingOption,
         so_content_addition_selector: [".s_rating"],
         builder_actions: {
             SetIconsAction,
diff --git a/addons/html_builder/static/src/plugins/separator_option_plugin.js b/addons/html_builder/static/src/plugins/separator_option_plugin.js
index 414dc13c19fe1..bd6de5feca86d 100644
--- a/addons/html_builder/static/src/plugins/separator_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/separator_option_plugin.js
@@ -1,16 +1,12 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
+import { BorderConfigurator } from "./border_configurator_option";
 
 class SeparatorOptionPlugin extends Plugin {
     static id = "separatorOption";
     resources = {
-        builder_options: [
-            {
-                template: "html_builder.SeparatorOption",
-                selector: ".s_hr",
-                applyTo: "hr",
-            },
-        ],
+        builder_options: [SeparatorOption],
         dropzone_selector: {
             selector: ".s_hr",
             dropNear: "p, h1, h2, h3, blockquote, .s_hr",
@@ -19,4 +15,11 @@ class SeparatorOptionPlugin extends Plugin {
         is_movable_selector: { selector: ".s_hr", direction: "vertical" },
     };
 }
+
+export class SeparatorOption extends BaseOptionComponent {
+    static template = "html_builder.SeparatorOption";
+    static selector = ".s_hr";
+    static applyTo = "hr";
+    static components = { BorderConfigurator };
+}
 registry.category("builder-plugins").add(SeparatorOptionPlugin.id, SeparatorOptionPlugin);
diff --git a/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js
index 191e1ba83cfdb..25d6931b0d455 100644
--- a/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js
@@ -2,17 +2,18 @@ import { TEXT_ALIGNMENT } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class TextAlignmentOptionPlugin extends Plugin {
     static id = "textAlignmentOption";
     resources = {
-        builder_options: [
-            withSequence(TEXT_ALIGNMENT, {
-                template: "html_builder.TextAlignmentOption",
-                selector: ".s_share, .s_text_highlight, .s_social_media",
-            }),
-        ],
+        builder_options: [withSequence(TEXT_ALIGNMENT, TextAlignmentOption)],
     };
 }
 
+export class TextAlignmentOption extends BaseOptionComponent {
+    static template = "html_builder.TextAlignmentOption";
+    static selector = ".s_share, .s_text_highlight, .s_social_media";
+}
+
 registry.category("builder-plugins").add(TextAlignmentOptionPlugin.id, TextAlignmentOptionPlugin);
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option.js b/addons/html_builder/static/src/plugins/vertical_alignment_option.js
index 0bd8835d56a3a..1c5d6d586567b 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option.js
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option.js
@@ -1,14 +1,8 @@
-import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BaseVerticalAlignmentOption } from "./base_vertical_alignment_option";
 
-export class VerticalAlignmentOption extends BaseOptionComponent {
-    static template = "html_builder.VerticalAlignmentOption";
-    static props = {
-        level: { type: Number, optional: true },
-        applyTo: { type: String, optional: true },
-        justify: { type: Boolean, optional: true },
-    };
-    static defaultProps = {
-        level: 0,
-        justify: true,
-    };
+export class VerticalAlignmentOption extends BaseVerticalAlignmentOption {
+    static selector =
+        ".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image, .s_reviews_wall";
+    static applyTo = ".row";
+    static name = "verticalAlignmentOption";
 }
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option.xml b/addons/html_builder/static/src/plugins/vertical_alignment_option.xml
index 22f8e0b56f918..e5995815f958b 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option.xml
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option.xml
@@ -4,12 +4,12 @@
 <t t-name="html_builder.VerticalAlignmentOption">
     <t t-if="!isActiveItem('grid_mode')">
         <!-- TODO add title tooltip row Vertical Alignment-->
-        <BuilderRow label.translate="Vert. Alignment" level="props.level">
+        <BuilderRow label.translate="Vert. Alignment" level="this.level">
             <BuilderButtonGroup action="'setVerticalAlignment'">
                 <BuilderButton actionParam="'align-items-start'" title.translate="Align Top" iconImg="'/html_builder/static/img/snippets_options/align_top.svg'"/>
                 <BuilderButton actionParam="'align-items-center'" title.translate="Align Middle" iconImg="'/html_builder/static/img/snippets_options/align_middle.svg'"/>
                 <BuilderButton actionParam="'align-items-end'" title.translate="Align Bottom" iconImg="'/html_builder/static/img/snippets_options/align_bottom.svg'"/>
-                <BuilderButton t-if="props.justify" actionParam="'align-items-stretch'" title.translate="Stretch to Equal Height" iconImg="'/html_builder/static/img/snippets_options/align_stretch.svg'"/>
+                <BuilderButton t-if="this.justify" actionParam="'align-items-stretch'" title.translate="Stretch to Equal Height" iconImg="'/html_builder/static/img/snippets_options/align_stretch.svg'"/>
             </BuilderButtonGroup>
         </BuilderRow>
     </t>
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
index cd965e2b99d3e..35f5e2f38eb99 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
@@ -8,18 +8,7 @@ import { VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
 export class VerticalAlignmentOptionPlugin extends Plugin {
     static id = "verticalAlignmentOption";
     resources = {
-        builder_options: [
-            withSequence(VERTICAL_ALIGNMENT, {
-                OptionComponent: VerticalAlignmentOption,
-                selector:
-                    ".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image, .s_reviews_wall",
-                applyTo: ".row",
-                props: {
-                    level: 1,
-                },
-                name: "verticalAlignmentOption",
-            }),
-        ],
+        builder_options: [withSequence(VERTICAL_ALIGNMENT, VerticalAlignmentOption)],
         builder_actions: {
             SetVerticalAlignmentAction,
         },
diff --git a/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js b/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js
index 1e5b0dd350519..a4eed9df3ddae 100644
--- a/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js
@@ -2,20 +2,22 @@ import { END } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class VerticalJustifyOptionPlugin extends Plugin {
     static id = "verticalJustifyOption";
     resources = {
-        builder_options: [
-            withSequence(END, {
-                template: "html_builder.VerticalJustifyOption",
-                selector: ".s_masonry_block .o_grid_item, .s_quadrant .o_grid_item, .s_banner_categories .o_grid_item",
-                exclude: ".o_grid_item_image",
-            }),
-        ],
+        builder_options: [withSequence(END, VerticalJustifyOption)],
     };
 }
 
+export class VerticalJustifyOption extends BaseOptionComponent {
+    static template = "html_builder.VerticalJustifyOption";
+    static selector =
+        ".s_masonry_block .o_grid_item, .s_quadrant .o_grid_item, .s_banner_categories .o_grid_item";
+    static exclude = ".o_grid_item_image";
+}
+
 registry
     .category("builder-plugins")
     .add(VerticalJustifyOptionPlugin.id, VerticalJustifyOptionPlugin);
diff --git a/addons/html_builder/static/src/plugins/width_option_plugin.js b/addons/html_builder/static/src/plugins/width_option_plugin.js
index 91b2ee058a168..46f026e314dea 100644
--- a/addons/html_builder/static/src/plugins/width_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/width_option_plugin.js
@@ -2,17 +2,18 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { WIDTH } from "@html_builder/utils/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class WidthOptionPlugin extends Plugin {
     static id = "widthOption";
     resources = {
-        builder_options: [
-            withSequence(WIDTH, {
-                template: "html_builder.WidthOption",
-                selector: ".s_alert, .s_blockquote, .s_text_highlight",
-                name: "widthOption",
-            }),
-        ],
+        builder_options: [withSequence(WIDTH, WidthOption)],
     };
 }
+
+export class WidthOption extends BaseOptionComponent {
+    static template = "html_builder.WidthOption";
+    static selector = ".s_alert, .s_blockquote, .s_text_highlight";
+    static name = "widthOption";
+}
 registry.category("builder-plugins").add(WidthOptionPlugin.id, WidthOptionPlugin);
diff --git a/addons/html_builder/static/src/sidebar/customize_tab.js b/addons/html_builder/static/src/sidebar/customize_tab.js
index aef5635b1c318..a873f1b54638b 100644
--- a/addons/html_builder/static/src/sidebar/customize_tab.js
+++ b/addons/html_builder/static/src/sidebar/customize_tab.js
@@ -39,7 +39,7 @@ export class CustomizeTab extends Component {
     getCurrentOptionsContainers() {
         const currentOptionsContainers = this.props.currentOptionsContainers;
         if (!currentOptionsContainers.length) {
-            return this.env.editor.shared["builderOptions"].getPageContainers();
+            return this.env.editor.shared.builderOptions.getPageContainers();
         }
         return currentOptionsContainers;
     }
diff --git a/addons/html_builder/static/src/sidebar/option_container.js b/addons/html_builder/static/src/sidebar/option_container.js
index a0e14825a3f04..349f3f1959dfa 100644
--- a/addons/html_builder/static/src/sidebar/option_container.js
+++ b/addons/html_builder/static/src/sidebar/option_container.js
@@ -14,6 +14,7 @@ import {
 
 export class OptionsContainer extends BaseOptionComponent {
     static template = "html_builder.OptionsContainer";
+    static dependencies = ["builderOptions", "overlayButtons", "builderOverlay", "remove", "clone"];
     static components = {
         BorderConfigurator,
         ShadowOption,
@@ -78,6 +79,10 @@ export class OptionsContainer extends BaseOptionComponent {
     get title() {
         let title;
         for (const option of this.props.options) {
+            if (option.getSnippetTitle) {
+                title = option.getSnippetTitle.call(this);
+                continue;
+            }
             title = option.title || title;
         }
         const titleExtraInfo = this.props.containerTitle.getTitleExtraInfo
@@ -88,16 +93,16 @@ export class OptionsContainer extends BaseOptionComponent {
     }
 
     selectElement() {
-        this.env.editor.shared["builderOptions"].updateContainers(this.props.editingElement);
+        this.dependencies.builderOptions.updateContainers(this.props.editingElement);
     }
 
     toggleOverlayPreview(el, show) {
         if (show) {
-            this.env.editor.shared.overlayButtons.hideOverlayButtons();
-            this.env.editor.shared.builderOverlay.showOverlayPreview(el);
+            this.dependencies.overlayButtons.hideOverlayButtons();
+            this.dependencies.builderOverlay.showOverlayPreview(el);
         } else {
-            this.env.editor.shared.overlayButtons.showOverlayButtons();
-            this.env.editor.shared.builderOverlay.hideOverlayPreview(el);
+            this.dependencies.overlayButtons.showOverlayButtons();
+            this.dependencies.builderOverlay.hideOverlayPreview(el);
         }
     }
 
@@ -112,13 +117,13 @@ export class OptionsContainer extends BaseOptionComponent {
     // Actions of the buttons in the title bar.
     removeElement() {
         this.callOperation(() => {
-            this.env.editor.shared.remove.removeElement(this.props.editingElement);
+            this.dependencies.remove.removeElement(this.props.editingElement);
         });
     }
 
     cloneElement() {
         this.callOperation(async () => {
-            await this.env.editor.shared.clone.cloneElement(this.props.editingElement, {
+            await this.dependencies.clone.cloneElement(this.props.editingElement, {
                 activateClone: false,
             });
         });
diff --git a/addons/html_builder/static/src/sidebar/option_container.xml b/addons/html_builder/static/src/sidebar/option_container.xml
index 16a7889cda9a0..5024a9405212c 100644
--- a/addons/html_builder/static/src/sidebar/option_container.xml
+++ b/addons/html_builder/static/src/sidebar/option_container.xml
@@ -60,10 +60,9 @@
             </div>
         </div>
         <div class="we-bg-options-container pb-3" t-ref="content">
-            <t t-foreach="props.options" t-as="option" t-key="option.id">
-                <BuilderContext applyTo="option.applyTo" t-if="hasAccess(option.groups)">
-                    <t t-if="option.OptionComponent" t-component="option.OptionComponent" t-props="option.props || {}"></t>
-                    <t t-else="" t-call="{{option.template}}"/>
+            <t t-foreach="props.options" t-as="OptionClass" t-key="OptionClass.name + '-' + OptionClass.template">
+                <BuilderContext applyTo="OptionClass.applyTo" t-if="hasAccess(OptionClass.groups)">
+                    <t t-component="OptionClass"></t>
                 </BuilderContext>
             </t>
         </div>
diff --git a/addons/html_builder/static/src/utils/utils.js b/addons/html_builder/static/src/utils/utils.js
index 0f98f2ef4a2ac..686c99b38bb67 100644
--- a/addons/html_builder/static/src/utils/utils.js
+++ b/addons/html_builder/static/src/utils/utils.js
@@ -119,25 +119,31 @@ export function toRatio(value) {
 }
 
 /**
- * Returns the list of selector, exclude and applyTo on which an option is
- * applied.
- * @param {Array<Object>} builderOptions - All the builder options
- * @param {Class} optionClass - The applied option
+ * Filters an array of classes to only include those that extend a given class.
  */
-export function getSelectorParams(builderOptions, optionClass) {
-    const selectorParams = [];
-    const optionClassName = optionClass.name;
-    for (const builderOption of builderOptions) {
-        const { OptionComponent } = builderOption;
-        if (
-            OptionComponent &&
-            (OptionComponent.name === optionClassName ||
-                OptionComponent.prototype instanceof optionClass)
-        ) {
-            selectorParams.push(builderOption);
-        }
+export function filterExtends(arr, PotentialSuperClass) {
+    return arr.filter((PotentialSubClass) =>
+        doesExtendsClass(PotentialSubClass, PotentialSuperClass)
+    );
+}
+
+/**
+ * Checks if a `potentialSubClass` directly or indirectly extends a
+ * `potentialSuperClass`.
+ *
+ * The implementation leverages the fact that classes are functions and their
+ * prototype chain reflects the inheritance.
+ *
+ * @param {Function} PotentialSubClass The class that might be a subclass.
+ * @param {Function} PotentialSuperClass The class that might be a superclass.
+ * @returns {boolean} True if `potentialSubClass` extends `potentialSuperClass`,
+ * false otherwise.
+ */
+export function doesExtendsClass(PotentialSubClass, PotentialSuperClass) {
+    if (PotentialSubClass === PotentialSuperClass) {
+        return false;
     }
-    return selectorParams;
+    return PotentialSubClass.prototype instanceof PotentialSuperClass;
 }
 
 /**
diff --git a/addons/html_builder/static/tests/builder_action.test.js b/addons/html_builder/static/tests/builder_action.test.js
index 092c3e64ff055..8ab9b1a80e9a3 100644
--- a/addons/html_builder/static/tests/builder_action.test.js
+++ b/addons/html_builder/static/tests/builder_action.test.js
@@ -38,10 +38,12 @@ beforeEach(() => {
 });
 
 test("apply is called if clean is not defined", async () => {
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`<BuilderButton action="'testAction'">Click</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`<BuilderButton action="'testAction'">Click</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     await contains("[data-action-id='testAction']").click();
@@ -53,10 +55,12 @@ test("apply is called if clean is not defined", async () => {
 });
 
 test("custom action and shorthand action: clean actions are independent, apply is called on custom action if clean is not defined", async () => {
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`<BuilderButton action="'testAction'" classAction="'custom-class'">Click</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`<BuilderButton action="'testAction'" classAction="'custom-class'">Click</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     await contains("[data-action-id='testAction']").click();
@@ -72,6 +76,7 @@ test("Prepare is triggered on props updated", async () => {
     let prepareDeferred = new Promise((r) => r());
     class TestOption extends BaseOptionComponent {
         static template = xml`<BuilderCheckbox action="'customAction'" actionParam="state.param"/>`;
+        static selector = ".test-options-target";
         static props = {};
         setup() {
             super.setup();
@@ -92,10 +97,7 @@ test("Prepare is triggered on props updated", async () => {
     addBuilderAction({
         CustomAction,
     });
-    addBuilderOption({
-        Component: TestOption,
-        selector: ".test-options-target",
-    });
+    addBuilderOption(TestOption);
     await setupHTMLBuilder(`<section class="test-options-target">Homepage</section>`);
     await contains(":iframe .test-options-target").click();
     expect.verifySteps(["prepare"]);
@@ -110,10 +112,12 @@ test("Prepare is triggered on props updated", async () => {
 });
 
 test("Data Attribute action works with non string values", async () => {
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`<BuilderButton dataAttributeAction="'customerOrderIds'" dataAttributeActionValue="[100, 200]">Click</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`<BuilderButton dataAttributeAction="'customerOrderIds'" dataAttributeActionValue="[100, 200]">Click</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     await contains(".we-bg-options-container button:contains('Click')").click();
@@ -150,10 +154,12 @@ describe("isPreviewing is passed to action's apply and clean", () => {
     });
 
     test("useClickableBuilderComponent", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderButton action="'isPreviewing'" actionValue="true">Toggle</BuilderButton>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderButton action="'isPreviewing'" actionValue="true">Toggle</BuilderButton>`;
+            }
+        );
         await setupHTMLBuilder(`<section class="test-options-target">Homepage</section>`);
         await contains(":iframe .test-options-target").click();
 
@@ -170,10 +176,12 @@ describe("isPreviewing is passed to action's apply and clean", () => {
     });
 
     test("useInputBuilderComponent", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderTextInput action="'isPreviewing'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderTextInput action="'isPreviewing'"/>`;
+            }
+        );
         await setupHTMLBuilder(`<section class="test-options-target">Homepage</section>`);
         await contains(":iframe .test-options-target").click();
 
@@ -183,10 +191,12 @@ describe("isPreviewing is passed to action's apply and clean", () => {
     });
 
     test("useColorPickerBuilderComponent", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderColorPicker action="'isPreviewing'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderColorPicker action="'isPreviewing'"/>`;
+            }
+        );
         await setupHTMLBuilder(`<section class="test-options-target">Homepage</section>`);
         await contains(":iframe .test-options-target").click();
 
@@ -215,10 +225,12 @@ describe("isPreviewing is passed to action's apply and clean", () => {
 
         defineModels([Test]);
 
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderMany2One action="'isPreviewing'" model="'test'" limit="10" allowUnselect="true"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderMany2One action="'isPreviewing'" model="'test'" limit="10" allowUnselect="true"/>`;
+            }
+        );
         await setupHTMLBuilder(`<section class="test-options-target">Homepage</section>`);
         await contains(":iframe .test-options-target").click();
 
@@ -281,10 +293,12 @@ test("reload action: apply, clean save and reload are called in the right order
         },
     });
 
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'testReload'">Click</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'testReload'">Click</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="test-options-target">Test</section>`);
     await contains(":iframe .test-options-target").click();
 
diff --git a/addons/html_builder/static/tests/builder_option.test.js b/addons/html_builder/static/tests/builder_option.test.js
index 6f31cbd5dfba4..35bf83d7b3b1a 100644
--- a/addons/html_builder/static/tests/builder_option.test.js
+++ b/addons/html_builder/static/tests/builder_option.test.js
@@ -5,6 +5,7 @@ import {
     setupHTMLBuilder,
 } from "@html_builder/../tests/helpers";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { expect, test, describe } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
@@ -21,10 +22,12 @@ test("Undo/Redo correctly restores the stored container target", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'">Test</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'">Test</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div data-name="Target 1" class="test-options-target target1">
             Homepage
@@ -56,10 +59,12 @@ test("Undo/Redo multiple actions always restores the action container target", a
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'">Test</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'">Test</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div data-name="Target 1" class="test-options-target target1">
             Homepage
@@ -102,10 +107,12 @@ test("Undo/Redo an action that activates another target restores the old one on
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'">Test</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'">Test</BuilderButton>`;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`
         <div data-name="Target 1" class="test-options-target target1">
             Homepage
@@ -139,10 +146,12 @@ test("Undo/Redo an action that deactivates the containers restores the old one o
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'">Test</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'">Test</BuilderButton>`;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`
         <div data-name="Target 1" class="test-options-target target1">
             Homepage
@@ -178,14 +187,18 @@ test("Containers fallback to a valid ancestor if the target disappears and resto
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'targetAction'">Test</BuilderButton>`,
-    });
-    addBuilderOption({
-        selector: ".test-ancestor",
-        template: xml`<BuilderButton action="'ancestorAction'">Ancestor selected</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'targetAction'">Test</BuilderButton>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-ancestor";
+            static template = xml`<BuilderButton action="'ancestorAction'">Ancestor selected</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div data-name="Ancestor" class="test-ancestor">
             Hey I'm an ancestor
@@ -210,10 +223,12 @@ test("Containers fallback to a valid ancestor if the target disappears and resto
 });
 
 test("Do not activate/update containers if the element clicked is excluded", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton classAction="'test'">Test</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton classAction="'test'">Test</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div data-name="Target 1" class="test-options-target target1 o_we_no_overlay">
             Homepage
@@ -241,18 +256,24 @@ test("Do not show parent container for no_parent_containers targets", async () =
         };
     }
     addBuilderPlugin(TestPlugin);
-    addBuilderOption({
-        selector: ".test-parent-target",
-        template: xml`<BuilderButton classAction="'test'">Test</BuilderButton>`,
-    });
-    addBuilderOption({
-        selector: ".test-child-target",
-        template: xml`<BuilderButton classAction="'test'">Test</BuilderButton>`,
-    });
-    addBuilderOption({
-        selector: ".test-grand-child-target",
-        template: xml`<BuilderButton classAction="'test'">Test</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-parent-target";
+            static template = xml`<BuilderButton classAction="'test'">Test</BuilderButton>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-child-target";
+            static template = xml`<BuilderButton classAction="'test'">Test</BuilderButton>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-grand-child-target";
+            static template = xml`<BuilderButton classAction="'test'">Test</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div data-name="Parent" class="test-parent-target">
             Parent
diff --git a/addons/html_builder/static/tests/clean_for_save_options.test.js b/addons/html_builder/static/tests/clean_for_save_options.test.js
index da53aaa6ef11d..0c27a5470e66b 100644
--- a/addons/html_builder/static/tests/clean_for_save_options.test.js
+++ b/addons/html_builder/static/tests/clean_for_save_options.test.js
@@ -1,4 +1,5 @@
 import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
@@ -6,17 +7,19 @@ import { contains } from "@web/../tests/web_test_helpers";
 describe.current.tags("desktop");
 
 test("clean for save of option with selector that matches an element on the page", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                <BuilderButtonGroup>
-                    <BuilderButton classAction="'x'"/>
-                </BuilderButtonGroup>
-            `,
-        cleanForSave: (_) => {
-            expect.step("clean for save option");
-        },
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                    <BuilderButtonGroup>
+                        <BuilderButton classAction="'x'"/>
+                    </BuilderButtonGroup>
+                `;
+            static cleanForSave() {
+                expect.step("clean for save option");
+            }
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`<div class="test-options-target">a</div>`);
     const editor = getEditor();
     await contains(":iframe .test-options-target").click();
@@ -28,26 +31,30 @@ test("clean for save of option with selector that matches an element on the page
 });
 
 test("clean for save of option with selector and exclude that matches an element on the page", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                <BuilderButtonGroup>
-                    <BuilderButton classAction="'x'"/>
-                </BuilderButtonGroup>
-            `,
-        exclude: "div",
-        cleanForSave: (_) => {
-            expect.step("clean for save option");
-        },
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                <BuilderButtonGroup>
-                    <BuilderButton classAction="'y'"/>
-                </BuilderButtonGroup>
-            `,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                    <BuilderButtonGroup>
+                        <BuilderButton classAction="'x'"/>
+                    </BuilderButtonGroup>
+                `;
+            static exclude = "div";
+            cleanForSave = (_) => {
+                expect.step("clean for save option");
+            };
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                    <BuilderButtonGroup>
+                        <BuilderButton classAction="'y'"/>
+                    </BuilderButtonGroup>
+                `;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`<div class="test-options-target">a</div>`);
     const editor = getEditor();
     await contains(":iframe .test-options-target").click();
diff --git a/addons/html_builder/static/tests/composite_action.test.js b/addons/html_builder/static/tests/composite_action.test.js
index 17eb6d5694d65..ffd2f20256191 100644
--- a/addons/html_builder/static/tests/composite_action.test.js
+++ b/addons/html_builder/static/tests/composite_action.test.js
@@ -7,6 +7,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { describe, expect, test } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 // TODO: test composite with each spec: prepare, load, getValue
 // TODO: test reloadComposite
@@ -38,9 +39,10 @@ test("can call 2 separate actions with composite action", async () => {
         Action1,
         Action2,
     });
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`
             <BuilderButton
                     action="'composite'"
                     actionParam="[
@@ -48,8 +50,9 @@ test("can call 2 separate actions with composite action", async () => {
                         { action: 'action2', actionParam: { mainParam: 'class2' } },
                     ]">
                 Click
-            </BuilderButton>`,
-    });
+            </BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     await contains("[data-action-id='composite']").click();
@@ -78,9 +81,10 @@ test("can call the same action twice with composite action", async () => {
     addBuilderAction({
         Action1,
     });
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`
             <BuilderButton
                     action="'composite'"
                     actionParam="[
@@ -88,8 +92,9 @@ test("can call the same action twice with composite action", async () => {
                         { action: 'action1', actionParam: { mainParam: 'class2' } },
                     ]">
                 Click
-            </BuilderButton>`,
-    });
+            </BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     await contains("[data-action-id='composite']").click();
@@ -114,9 +119,10 @@ test("composite action's isApplied returns false if no action defined it", async
     addBuilderAction({
         Action1,
     });
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`
             <BuilderButton
                     action="'composite'"
                     actionParam="[
@@ -124,8 +130,9 @@ test("composite action's isApplied returns false if no action defined it", async
                         { action: 'action1', actionParam: { mainParam: 'class2' } },
                     ]">
                 Click
-            </BuilderButton>`,
-    });
+            </BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     expect("[data-action-id='composite']").not.toHaveClass("active");
@@ -157,9 +164,10 @@ test("composite action's isApplied returns true if at least one action defined i
         Action1,
         Action2,
     });
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`
             <BuilderButton
                     action="'composite'"
                     actionParam="[
@@ -167,8 +175,9 @@ test("composite action's isApplied returns true if at least one action defined i
                         { action: 'action2', actionParam: { mainParam: 'class2' } },
                     ]">
                 Click
-            </BuilderButton>`,
-    });
+            </BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<section class="s_test">Test</section>`);
     await contains(":iframe .s_test").click();
     expect("[data-action-id='composite']").not.toHaveClass("active");
diff --git a/addons/html_builder/static/tests/contenteditable.test.js b/addons/html_builder/static/tests/contenteditable.test.js
index 33adb7308d64e..2cdd9c3fb0265 100644
--- a/addons/html_builder/static/tests/contenteditable.test.js
+++ b/addons/html_builder/static/tests/contenteditable.test.js
@@ -9,9 +9,10 @@ import { Plugin } from "@html_editor/plugin";
 import { expect, test, describe } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
 import { contains, onRpc } from "@web/../tests/web_test_helpers";
+import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 describe.current.tags("desktop");
-import { BuilderAction } from "@html_builder/core/builder_action";
 
 test("Do not set contenteditable to true on elements inside o_not_editable", async () => {
     class TestPlugin extends Plugin {
@@ -58,14 +59,18 @@ test("Media should not be replaceable if not inside a savable zone", async () =>
 
 test("clone of editable media inside not editable area should be editable", async () => {
     onRpc("/html_editor/get_image_info", () => ({}));
-    addBuilderOption({
-        selector: "section",
-        template: xml`<BuilderButton classAction="'test'">Test</BuilderButton>`,
-    });
-    addBuilderOption({
-        selector: "img",
-        template: xml`<BuilderButton classAction="'test'">Test Image</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = "section";
+            static template = xml`<BuilderButton classAction="'test'">Test</BuilderButton>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = "img";
+            static template = xml`<BuilderButton classAction="'test'">Test Image</BuilderButton>`;
+        }
+    );
     const { waitSidebarUpdated } = await setupHTMLBuilder(`
         <section>
             <div class="o_not_editable">
@@ -89,14 +94,18 @@ const setupEditable = async (contentEl) => {
         };
     }
     addBuilderPlugin(TestPlugin);
-    addBuilderOption({
-        selector: ".parent",
-        template: xml`<BuilderButton action="'customAction'">Custom Action</BuilderButton>`,
-    });
-    addBuilderOption({
-        selector: ".parent",
-        template: xml`<BuilderButton classAction="'dummy'">Dummy action</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent";
+            static template = xml`<BuilderButton action="'customAction'">Custom Action</BuilderButton>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent";
+            static template = xml`<BuilderButton classAction="'dummy'">Dummy action</BuilderButton>`;
+        }
+    );
     addBuilderAction({
         customAction: class extends BuilderAction {
             static id = "customAction";
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js
index e0f1a5841feeb..e9bda1f520d81 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js
@@ -26,27 +26,19 @@ test("basic many2many: find tag, select tag, unselect tag", async () => {
         [2, "Second"],
         [3, "Third"],
     ]);
+    const selection = reactive([]);
     class TestComponent extends BaseOptionComponent {
-        static template = xml`<BasicMany2Many selection="props.selection" model="'test'" setSelection="props.setSelection.bind(this)"/>`;
-        static props = {
-            selection: Array,
-            setSelection: Function,
-        };
+        static selector = ".test-options-target";
+        static template = xml`<BasicMany2Many selection="this.selection" model="'test'" setSelection="this.setSelection.bind(this)"/>`;
+        selection = selection;
+        setSelection(newSelection) {
+            selection.length = 0;
+            for (const item of newSelection) {
+                selection.push(item);
+            }
+        }
     }
-    const selection = reactive([]);
-    addBuilderOption({
-        selector: ".test-options-target",
-        Component: TestComponent,
-        props: {
-            selection: selection,
-            setSelection(newSelection) {
-                selection.length = 0;
-                for (const item of newSelection) {
-                    selection.push(item);
-                }
-            },
-        },
-    });
+    addBuilderOption(TestComponent);
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
 
     await contains(":iframe .test-options-target").click();
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_button.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_button.test.js
index 802ca81504f00..dc71eb81811ee 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_button.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_button.test.js
@@ -24,10 +24,12 @@ test("call a specific action with some params and value", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'" actionParam="'myParam'" actionValue="'myValue'">MyAction</BuilderButton>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'" actionParam="'myParam'" actionValue="'myValue'">MyAction</BuilderButton>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -38,10 +40,12 @@ test("call a specific action with some params and value", async () => {
     expect.verifySteps(["customAction myParam myValue", "customAction myParam myValue"]);
 });
 test("call a shorthand action", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton classAction="'my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton classAction="'my-custom-class'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -59,10 +63,12 @@ test("call a shorthand action and a specific action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'" classAction="'my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'" classAction="'my-custom-class'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -83,10 +89,12 @@ test("preview a shorthand action and a specific action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'" classAction="'my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'" classAction="'my-custom-class'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -107,10 +115,12 @@ test("prevent preview of a specific action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'" preview="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'" preview="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -133,10 +143,12 @@ test("prevent preview of a specific action (2)", async () => {
     addBuilderAction({
         CustomAction,
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -146,10 +158,12 @@ test("prevent preview of a specific action (2)", async () => {
     expect.verifySteps(["customAction"]);
 });
 test("should toggle when not in a BuilderButtonGroup", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton classAction="'c1'" preview="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton classAction="'c1'" preview="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains("[data-class-action='c1']").click();
@@ -166,10 +180,12 @@ test("should call apply when the button is active and none of its actions have a
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'" preview="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'" preview="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains("[data-action-id='customAction']").click();
@@ -179,13 +195,15 @@ test("should call apply when the button is active and none of its actions have a
 });
 
 test("should not toggle when in a BuilderButtonGroup", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderButtonGroup>
-            <BuilderButton classAction="'c1'" preview="false"/>
-        </BuilderButtonGroup>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderButtonGroup>
+                    <BuilderButton classAction="'c1'" preview="false"/>
+                </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains("[data-class-action='c1']").click();
@@ -194,14 +212,16 @@ test("should not toggle when in a BuilderButtonGroup", async () => {
     expect(":iframe .test-options-target").toHaveClass("test-options-target c1");
 });
 test("clean another action", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
                     <BuilderButtonGroup>
                         <BuilderButton classAction="'my-custom-class1'"/>
                         <BuilderButton classAction="'my-custom-class2'"/>
-                    </BuilderButtonGroup>`,
-    });
+                    </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -232,14 +252,16 @@ test("clean should provide the next action value", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
                     <BuilderButtonGroup>
                         <BuilderButton classAction="'c1'" action="'customAction'"/>
                         <BuilderButton classAction="'c2'" action="'customAction'" actionParam="'param2'" actionValue="'value2'"/>
-                    </BuilderButtonGroup>`,
-    });
+                    </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -274,15 +296,17 @@ test("clean should only be called on the currently selected item", async () => {
         customAction2: makeAction(2).action,
         customAction3: makeAction(3).action,
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
             <BuilderButtonGroup>
                 <BuilderButton action="'customAction1'" classAction="'c1'" />
                 <BuilderButton action="'customAction2'" classAction="'c2'" />
                 <BuilderButton action="'customAction3'" classAction="'c3'" />
-            </BuilderButtonGroup>`,
-    });
+            </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await click("[data-action-id='customAction1']");
@@ -321,14 +345,16 @@ test("clean should be async", async () => {
         customAction1: action1.action,
         customAction2: makeAction(2).action,
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-            <BuilderButtonGroup preview="false">
-                <BuilderButton action="'customAction1'" classAction="'c1'"/>
-                <BuilderButton action="'customAction2'" />
-            </BuilderButtonGroup>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderButtonGroup preview="false">
+                    <BuilderButton action="'customAction1'" classAction="'c1'"/>
+                    <BuilderButton action="'customAction2'" />
+            </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await click("[data-action-id='customAction1']");
@@ -345,28 +371,32 @@ test("clean should be async", async () => {
     ]);
 });
 test("add the active class if the condition is met", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                        <BuilderButton classAction="'my-custom-class1'"/>
-                        <BuilderButton classAction="'my-custom-class2'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderButton classAction="'my-custom-class1'"/>
+                <BuilderButton classAction="'my-custom-class2'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target my-custom-class1">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect("[data-class-action='my-custom-class1']").toHaveClass("active");
     expect("[data-class-action='my-custom-class2']").not.toHaveClass("active");
 });
 test("add classActive to class when active", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                        <BuilderButton classAction="'my-custom-class1'"
-                                       className="'base-class btn1'"
-                                       classActive="'active-class'"/>
-                        <BuilderButton classAction="'my-custom-class2'"
-                                       className="'base-class btn2'"
-                                       classActive="'active-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+            <BuilderButton classAction="'my-custom-class1'"
+                           className="'base-class btn1'"
+                           classActive="'active-class'"/>
+            <BuilderButton classAction="'my-custom-class2'"
+                            className="'base-class btn2'"
+                            classActive="'active-class'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target my-custom-class1">b</div>`);
     await contains(":iframe .test-options-target").click();
     const permanentClass = "base-class";
@@ -383,10 +413,12 @@ test("add classActive to class when active", async () => {
     expect(".btn2").not.toHaveClass(activeClass);
 });
 test("apply classAction on multi elements", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton applyTo="'.target-apply'" classAction="'my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton applyTo="'.target-apply'" classAction="'my-custom-class'"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(`
             <div class="test-options-target">
                 <p class="target-apply">a</p>
@@ -408,18 +440,24 @@ test("apply classAction on multi elements", async () => {
             </div>`);
 });
 test("hide/display base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'my label'">
-                <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-            </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'my label'">
-                <BuilderButton applyTo="'.my-custom-class'" classAction="'test'"/>
-            </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
+                <BuilderRow label="'my label'">
+                    <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+                </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
+                <BuilderRow label="'my label'">
+                    <BuilderButton applyTo="'.my-custom-class'" classAction="'test'"/>
+                </BuilderRow>`;
+        }
+    );
 
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="parent-target"><div class="child-target">b</div></div>`
@@ -473,16 +511,18 @@ describe("inherited actions", () => {
             customAction2: makeAction(2).action,
             customAction3: makeAction(3, { isApplied: falsy }).action,
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                 <BuilderButtonGroup>
                     <BuilderButton action="'customAction1'" actionParam="'myParam1'" actionValue="'myValue1'"  classAction="'class1'" id="'c1'">MyAction1</BuilderButton>
                     <BuilderButton action="'customAction2'" actionParam="'myParam2'" actionValue="'myValue2'">MyAction2</BuilderButton>
                 </BuilderButtonGroup>
                 <BuilderButton action="'customAction3'" actionParam="'myParam3'" actionValue="'myValue3'" inheritedActions="['c1']" >MyAction2</BuilderButton>
-            `,
-        });
+            `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target class1">a</div>`);
         await contains(":iframe .test-options-target").click();
         await contains("[data-action-id='customAction3']").hover();
@@ -504,17 +544,19 @@ describe("inherited actions", () => {
             customAction3: action3.action,
             customAction4: action4.action,
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                 <BuilderButtonGroup>
                     <BuilderButton action="'customAction1'" actionParam="'myParam1'" actionValue="'myValue1'"  classAction="'class1'" id="'c1'">MyAction1</BuilderButton>
                     <BuilderButton action="'customAction2'" actionParam="'myParam2'" actionValue="'myValue2'">MyAction2</BuilderButton>
                 </BuilderButtonGroup>
                 <BuilderButton action="'customAction3'" actionParam="'myParam3'" actionValue="'myValue3'"  id="'c3'">MyAction1</BuilderButton>
                 <BuilderButton action="'customAction4'" actionParam="'myParam4'" actionValue="'myValue4'" inheritedActions="['c1', 'c3']" >MyAction2</BuilderButton>
-            `,
-        });
+            `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target class1">a</div>`);
         await contains(":iframe .test-options-target").click();
 
@@ -541,18 +583,19 @@ describe("inherited actions", () => {
             customAction2: makeAction(2).action,
             customAction3: makeAction(3, { isApplied: falsy }).action,
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButtonGroup>
-                    <BuilderButton action="'customAction1'" actionParam="'myParam1'" actionValue="'myValue1'"  classAction="'class1'" id="'c1'">MyAction1</BuilderButton>
-                    <BuilderButton action="'customAction2'" actionParam="'myParam2'" actionValue="'myValue2'">MyAction2</BuilderButton>
-                </BuilderButtonGroup>
-                <BuilderContext inheritedActions="['c1']">
-                    <BuilderButton action="'customAction3'" actionParam="'myParam3'" actionValue="'myValue3'">MyAction2</BuilderButton>
-                </BuilderContext>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButtonGroup>
+                        <BuilderButton action="'customAction1'" actionParam="'myParam1'" actionValue="'myValue1'"  classAction="'class1'" id="'c1'">MyAction1</BuilderButton>
+                        <BuilderButton action="'customAction2'" actionParam="'myParam2'" actionValue="'myValue2'">MyAction2</BuilderButton>
+                    </BuilderButtonGroup>
+                    <BuilderContext inheritedActions="['c1']">
+                        <BuilderButton action="'customAction3'" actionParam="'myParam3'" actionValue="'myValue3'">MyAction2</BuilderButton>
+                    </BuilderContext>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target class1">a</div>`);
         await contains(":iframe .test-options-target").click();
         await contains("[data-action-id='customAction3']").hover();
@@ -604,16 +647,18 @@ describe("Operation", () => {
         makeActionItem("action1");
         makeActionItem("action2");
 
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderRow label="'my label'">
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderRow label="'my label'">
                 <BuilderButton action="'asyncAction1'"/>
                 <BuilderButton action="'asyncAction2'"/>
                 <BuilderButton action="'asyncAction3'"/>
                 <BuilderButton action="'action1'"/>
                 <BuilderButton action="'action2'"/>
-            </BuilderRow>`,
-        });
+            </BuilderRow>`;
+            }
+        );
 
         await setupHTMLBuilder(`<div class="test-options-target">a</div>`);
         await contains(":iframe .test-options-target").click();
@@ -654,16 +699,18 @@ describe("Operation", () => {
         makeActionItem("action1");
         makeActionItem("action2");
 
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderRow label="'my label'">
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderRow label="'my label'">
                 <BuilderButton action="'asyncAction1'"/>
                 <BuilderButton action="'asyncAction2'"/>
                 <BuilderButton action="'asyncAction3'"/>
                 <BuilderButton action="'action1'"/>
                 <BuilderButton action="'action2'"/>
-            </BuilderRow>`,
-        });
+            </BuilderRow>`;
+            }
+        );
 
         await setupHTMLBuilder(`<div class="test-options-target">a</div>`);
         await contains(":iframe .test-options-target").click();
@@ -704,10 +751,12 @@ describe("Operation", () => {
 });
 
 test("click on BuilderButton with inverseAction", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton classAction="'my-custom-class'" inverseAction="true"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton classAction="'my-custom-class'" inverseAction="true"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(":iframe .test-options-target").not.toHaveClass("my-custom-class");
@@ -737,10 +786,12 @@ test("do not load when an operation is cleaned", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButton action="'customAction'" preview="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButton action="'customAction'" preview="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains("[data-action-id='customAction']").click();
@@ -762,13 +813,15 @@ test("click on BuilderButton with async action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
                 <BuilderButton action="'customAction'" preview="false"/>
                 <BuilderButton classAction="'test'" preview="false"/>
-            `,
-    });
+            `;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     const editor = getEditor();
     await contains(":iframe .test-options-target").click();
@@ -797,7 +850,6 @@ class SubTestOption extends BaseOptionComponent {
             <BuilderButton classAction="'actionClass'">actionClass</BuilderButton>
         </BuilderContext>
     `;
-    static props = {};
     setup() {
         super.setup();
         this.domState = useDomState((el) => ({
@@ -807,13 +859,13 @@ class SubTestOption extends BaseOptionComponent {
 }
 
 class TestOption extends BaseOptionComponent {
+    static selector = ".selector";
     static template = xml`
         <BuilderButton classAction="'secondCase'">secondCase</BuilderButton>
         <BuilderContext applyTo="this.domState.applyTo">
             <SubTestOption/>
         </BuilderContext>
     `;
-    static props = {};
     static components = {
         SubTestOption,
     };
@@ -826,10 +878,7 @@ class TestOption extends BaseOptionComponent {
 }
 
 test("consecutive dynamic applyTo", async () => {
-    addBuilderOption({
-        selector: ".selector",
-        Component: TestOption,
-    });
+    addBuilderOption(TestOption);
     await setupHTMLBuilder(`
         <div class="selector">
             <div class="first">
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_button_group.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_button_group.test.js
index 16f9fe7c1f526..556822f988a29 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_button_group.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_button_group.test.js
@@ -8,6 +8,7 @@ import { describe, expect, test } from "@odoo/hoot";
 import { hover } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 describe.current.tags("desktop");
 
@@ -21,13 +22,15 @@ test("change the editingElement of sub widget through `applyTo` prop", async ()
     addBuilderAction({
         CustomAction,
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
                     <BuilderButtonGroup applyTo="'.a'">
                         <BuilderButton action="'customAction'"/>
-                    </BuilderButtonGroup>`,
-    });
+                    </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`
                 <div class="test-options-target">
                     <div class="a">b</div>
@@ -48,13 +51,15 @@ test("should propagate actionParam in the context", async () => {
     addBuilderAction({
         CustomAction,
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
                     <BuilderButtonGroup actionParam="'myParam'">
                         <BuilderButton action="'customAction'"/>
-                    </BuilderButtonGroup>`,
-    });
+                    </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`
                 <div class="test-options-target">
                     <div class="a">b</div>
@@ -66,9 +71,10 @@ test("should propagate actionParam in the context", async () => {
     expect.verifySteps(["customAction myParam"]);
 });
 test("prevent preview of all buttons", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
                     <BuilderButtonGroup preview="false">
                         <BuilderButton action="'customAction1'"/>
                         <BuilderButton action="'customAction2'" preview="true"/>
@@ -78,8 +84,9 @@ test("prevent preview of all buttons", async () => {
                     </BuilderButtonGroup>
                     <BuilderButtonGroup>
                         <BuilderButton action="'customAction4'"/>
-                    </BuilderButtonGroup>`,
-    });
+                    </BuilderButtonGroup>`;
+        }
+    );
     class CustomAction1 extends BuilderAction {
         static id = "customAction1";
         apply() {
@@ -127,18 +134,22 @@ test("prevent preview of all buttons", async () => {
     expect.verifySteps(["customAction4"]);
 });
 test("hide/display base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
 
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
                 <BuilderButtonGroup applyTo="'.my-custom-class'">
                     <BuilderButton classAction="'test'">Test</BuilderButton>
-                </BuilderButtonGroup>`,
-    });
+                </BuilderButtonGroup>`;
+        }
+    );
 
     await setupHTMLBuilder(`<div class="parent-target"><div class="child-target">b</div></div>`);
     await contains(":iframe .parent-target").click();
@@ -149,18 +160,22 @@ test("hide/display base on applyTo", async () => {
 });
 
 test("hide/display base on applyTo - 2", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
 
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
                 <BuilderButtonGroup>
                     <BuilderButton applyTo="'.my-custom-class'" classAction="'test'">Test</BuilderButton>
-                </BuilderButtonGroup>`,
-    });
+                </BuilderButtonGroup>`;
+        }
+    );
 
     await setupHTMLBuilder(`<div class="parent-target"><div class="child-target">b</div></div>`);
     await contains(":iframe .parent-target").click();
@@ -171,13 +186,15 @@ test("hide/display base on applyTo - 2", async () => {
 });
 
 test("click on BuilderButton with empty value should remove styleAction", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButtonGroup>
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButtonGroup>
             <BuilderButton styleAction="'width'" styleActionValue="''"/>
             <BuilderButton styleAction="'width'" styleActionValue="'25%'"/>
-        </BuilderButtonGroup>`,
-    });
+        </BuilderButtonGroup>`;
+        }
+    );
     const { contentEl } = await setupHTMLBuilder(`<p class="test-options-target">b</p>`);
     await contains(":iframe .test-options-target").click();
     await contains("[data-style-action='width'][data-style-action-value='25%']").click();
@@ -190,14 +207,16 @@ test("click on BuilderButton with empty value should remove styleAction", async
 });
 
 test("button that matches with the highest priority should be active", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderButtonGroup>
-            <BuilderButton classAction="'a'" >a</BuilderButton>
-            <BuilderButton classAction="'a b'">a b</BuilderButton>
-            <BuilderButton classAction="'a b c'">a b c</BuilderButton>
-        </BuilderButtonGroup>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderButtonGroup>
+                <BuilderButton classAction="'a'" >a</BuilderButton>
+                <BuilderButton classAction="'a b'">a b</BuilderButton>
+                <BuilderButton classAction="'a b c'">a b c</BuilderButton>
+        </BuilderButtonGroup>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target a b">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect("[data-class-action='a']").not.toHaveClass("active");
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_checkbox.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_checkbox.test.js
index f4acfe569fbd9..5701da1839c1f 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_checkbox.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_checkbox.test.js
@@ -1,4 +1,5 @@
 import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
@@ -6,10 +7,12 @@ import { contains } from "@web/../tests/web_test_helpers";
 describe.current.tags("desktop");
 
 test("Click on checkbox", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderCheckbox classAction="'checkbox-action'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderCheckbox classAction="'checkbox-action'"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(`<p class="test-options-target">b</p>`);
     const editableContent = getEditableContent();
 
@@ -27,14 +30,18 @@ test("Click on checkbox", async () => {
     expect(editableContent).toHaveInnerHTML(`<p class="test-options-target">b</p>`);
 });
 test("hide/display base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderCheckbox classAction="'checkbox-action'" applyTo="'.my-custom-class'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderCheckbox classAction="'checkbox-action'" applyTo="'.my-custom-class'"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="parent-target"><p class="child-target b">b</p></div>`
     );
@@ -56,10 +63,12 @@ test("hide/display base on applyTo", async () => {
 });
 
 test("click on BuilderCheckbox with inverseAction", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderCheckbox classAction="'my-custom-class'" inverseAction="true"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderCheckbox classAction="'my-custom-class'" inverseAction="true"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(":iframe .test-options-target").not.toHaveClass("my-custom-class");
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_colorpicker.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_colorpicker.test.js
index d1829ea93a831..19befd5fc62c8 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_colorpicker.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_colorpicker.test.js
@@ -4,6 +4,7 @@ import {
     setupHTMLBuilder,
 } from "@html_builder/../tests/helpers";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { undo } from "@html_editor/../tests/_helpers/user_actions";
 import { before, describe, expect, test } from "@odoo/hoot";
 import { animationFrame, click, Deferred, hover, press, tick, waitFor } from "@odoo/hoot-dom";
@@ -13,10 +14,12 @@ import { contains } from "@web/../tests/web_test_helpers";
 describe.current.tags("desktop");
 
 test("should apply backgroundColor to the editing element", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'background-color'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'background-color'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -27,10 +30,12 @@ test("should apply backgroundColor to the editing element", async () => {
 });
 
 test("should apply color to the editing element", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'color'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'color'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -41,14 +46,18 @@ test("should apply color to the editing element", async () => {
 });
 
 test("hide/display base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderColorPicker applyTo="'.my-custom-class'" styleAction="'background-color'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderColorPicker applyTo="'.my-custom-class'" styleAction="'background-color'"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="parent-target"><p class="child-target b">b</p></div>`
     );
@@ -69,10 +78,12 @@ test("hide/display base on applyTo", async () => {
 });
 
 test("apply color to a different style than color or backgroundColor", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'border-top-color'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'border-top-color'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -101,10 +112,12 @@ test("apply custom action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'${styleName}'" action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'${styleName}'" action="'customAction'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".we-bg-options-container .o_we_color_preview").click();
@@ -127,13 +140,15 @@ test("apply custom async action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-            <BuilderColorPicker action="'customAction'" enabledTabs="['solid']"/>
-            <BuilderButton classAction="'test'" preview="false"/>
-            `,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderColorPicker action="'customAction'" enabledTabs="['solid']"/>
+                <BuilderButton classAction="'test'" preview="false"/>
+            `;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     const editor = getEditor();
     await contains(":iframe .test-options-target").click();
@@ -158,10 +173,12 @@ test("apply custom async action", async () => {
 });
 
 test("should revert preview on escape", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'background-color'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker enabledTabs="['solid']" styleAction="'background-color'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(":iframe .test-options-target").toHaveStyle({ "background-color": "rgba(0, 0, 0, 0)" });
@@ -187,10 +204,12 @@ test("should apply transparent color if no color is defined", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker action="'customAction'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeDisplayed();
@@ -221,10 +240,12 @@ describe("Custom colorpicker: preview and commit", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderColorPicker action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderColorPicker action="'customAction'"/>`;
+            }
+        );
     });
 
     /****************************************
@@ -331,10 +352,12 @@ describe("Custom colorpicker: preview and commit", () => {
 });
 
 test("should open the last used tab", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderColorPicker styleAction="'background-color'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderColorPicker styleAction="'background-color'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`, {
         styleContent: ":root { --900: #212527; }",
     });
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_context.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_context.test.js
index 57149870d8ad5..942f26b72fb41 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_context.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_context.test.js
@@ -4,6 +4,7 @@ import {
     setupHTMLBuilder,
 } from "@html_builder/../tests/helpers";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
@@ -19,14 +20,16 @@ test("should pass the context", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
             <BuilderContext action="'customAction'" actionParam="'myParam'">
                 <BuilderButton actionValue="'myValue'">MyAction</BuilderButton>
             </BuilderContext>
-        `,
-    });
+        `;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".we-bg-options-container button").click();
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_datetimepicker.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_datetimepicker.test.js
index ff2b3e65c823e..3f84ef4e4a873 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_datetimepicker.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_datetimepicker.test.js
@@ -1,4 +1,5 @@
 import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
 import { queryOne } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
@@ -22,10 +23,12 @@ function isExpectedDateTime({
 }
 
 test("opens DateTimePicker on focus, closes on blur", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -36,14 +39,18 @@ test("opens DateTimePicker on focus, closes on blur", async () => {
 });
 
 test("defaults to now if undefined", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`,
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderCheckbox classAction="'checkbox-action'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderCheckbox classAction="'checkbox-action'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -56,10 +63,12 @@ test("defaults to now if undefined", async () => {
 });
 
 test("defaults to last one when invalid date provided", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target" data-date="1554219400">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".we-bg-options-container input").toHaveValue("04/02/2019 16:36:40");
@@ -75,10 +84,12 @@ test("defaults to last one when invalid date provided", async () => {
 });
 
 test("defaults to last one when invalid date provided (date)", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker type="'date'" dataAttributeAction="'date'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker type="'date'" dataAttributeAction="'date'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target" data-date="1554219400">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".we-bg-options-container input").toHaveValue("04/02/2019");
@@ -94,10 +105,12 @@ test("defaults to last one when invalid date provided (date)", async () => {
 });
 
 test("defaults to now when no date is selected", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".we-bg-options-container input").edit("04/01/2019 10:00:00");
@@ -109,10 +122,12 @@ test("defaults to now when no date is selected", async () => {
 });
 
 test("defaults to now when clicking on clear button", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".we-bg-options-container input").edit("04/01/2019 10:00:00");
@@ -128,10 +143,12 @@ test("defaults to now when clicking on clear button", async () => {
 });
 
 test("selects a date and properly applies it", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -149,10 +166,12 @@ test("selects a date and properly applies it", async () => {
 });
 
 test("selects a date and synchronize the input field, while still in preview", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'" acceptEmptyDate="false"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".we-bg-options-container input").click();
@@ -168,10 +187,12 @@ test("selects a date and synchronize the input field, while still in preview", a
 });
 
 test("edit a date with the datetime picker should correctly apply the mutation", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderDateTimePicker dataAttributeAction="'date'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderDateTimePicker dataAttributeAction="'date'"/>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div class="test-options-target" data-date="1554219400">b</div>
         <div class="another-target">c</div>`);
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js
index 1e57f5fe36264..509750f26aa49 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js
@@ -1,5 +1,6 @@
 import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers";
 import { BuilderList } from "@html_builder/core/building_blocks/builder_list";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
 import { Component, onError, xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
@@ -16,14 +17,16 @@ function defaultValueWithIds(ids) {
 }
 
 test("writes a list of numbers to a data attribute", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderList
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderList
                           dataAttributeAction="'list'"
                           itemShape="{ value: 'number', title: 'text' }"
                           default="${defaultValueStr}"
-                      />`,
-    });
+                      />`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -47,14 +50,16 @@ test("writes a list of numbers to a data attribute", async () => {
 });
 
 test("supports arbitrary number of text and number inputs on entries", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderList
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderList
                           dataAttributeAction="'list'"
                           itemShape="{ a: 'number', b: 'text', c: 'text', d: 'number' }"
                           default="{ a: '4', b: '3', c: '2', d: '1' }"
-                      />`,
-    });
+                      />`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".we-bg-options-container .builder_list_add_item").click();
@@ -75,14 +80,16 @@ test("supports arbitrary number of text and number inputs on entries", async ()
 });
 
 test("delete an item", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderList
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderList
                           dataAttributeAction="'list'"
                           itemShape="{ value: 'number', title: 'text' }"
                           default="${defaultValueStr}"
-                      />`,
-    });
+                      />`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -96,14 +103,16 @@ test("delete an item", async () => {
 });
 
 test("reorder items", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderList
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderList
                           dataAttributeAction="'list'"
                           itemShape="{ value: 'number', title: 'text' }"
                           default="${defaultValueStr}"
-                      />`,
-    });
+                      />`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -151,10 +160,11 @@ async function testBuilderListFaultyProps(template) {
             });
         }
     }
-    addBuilderOption({
-        selector: ".test-options-target",
-        Component: Test,
-    });
+    addBuilderOption(
+        class extends Test {
+            static selector = ".test-options-target";
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect.verifySteps(["threw"]);
@@ -209,15 +219,17 @@ test("throws error if itemShape contains reserved key '_id'", async () => {
 });
 
 test("hides hiddenProperties from options", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderList
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderList
                           dataAttributeAction="'list'"
                           itemShape="{ a: 'number', b: 'text', c: 'number', d: 'text' }"
                           default="{ a: '4', b: 'three', c: '2', d: 'one' }"
                           hiddenProperties="['b', 'c']"
-                      />`,
-    });
+                      />`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
@@ -267,10 +279,11 @@ test("do not lose id when adjusting 'selected'", async () => {
             ]);
         }
     }
-    addBuilderOption({
-        selector: ".test-options-target",
-        Component: Test,
-    });
+    addBuilderOption(
+        class extends Test {
+            static selector = ".test-options-target";
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
 
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js
index a0ba9905cefbf..e5cb05187d68c 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js
@@ -9,6 +9,7 @@ import { animationFrame, Deferred } from "@odoo/hoot-mock";
 import { xml } from "@odoo/owl";
 import { contains, defineModels, fields, models, onRpc } from "@web/../tests/web_test_helpers";
 import { delay } from "@web/core/utils/concurrency";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class Test extends models.Model {
     _name = "test";
@@ -29,10 +30,12 @@ test("many2many: find tag, select tag, unselect tag", async () => {
         [2, "Second"],
         [3, "Third"],
     ]);
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderMany2Many dataAttributeAction="'test'" model="'test'" limit="10"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderMany2Many dataAttributeAction="'test'" model="'test'" limit="10"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="test-options-target">b</div>`
     );
@@ -98,10 +101,12 @@ test("many2many: async load", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderMany2Many action="'testAction'" model="'test'" limit="10"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderMany2Many action="'testAction'" model="'test'" limit="10"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="test-options-target">b</div>`
     );
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2one.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2one.test.js
index dfd7a690b97e7..9fc3c06437ec7 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2one.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2one.test.js
@@ -51,10 +51,12 @@ test("many2one: async load", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderMany2One action="'testAction'" model="'test'" limit="10"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderMany2One action="'testAction'" model="'test'" limit="10"/>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="test-options-target">b</div>`
     );
@@ -95,6 +97,7 @@ test("dependency definition should not be outdated", async () => {
         },
     });
     class TestMany2One extends BaseOptionComponent {
+        static selector = ".test-options-target";
         static template = xml`
             <BuilderMany2One action="'testAction'" model="'test'" limit="10" id="'test_many2one_opt'"/>
             <BuilderRow t-if="getItemValueJSON('test_many2one_opt')?.id === 2"><span>Dependant</span></BuilderRow>
@@ -108,10 +111,7 @@ test("dependency definition should not be outdated", async () => {
             return value && JSON.parse(value);
         }
     }
-    addBuilderOption({
-        selector: ".test-options-target",
-        Component: TestMany2One,
-    });
+    addBuilderOption(TestMany2One);
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
 
     await contains(":iframe .test-options-target").click();
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_number_input.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_number_input.test.js
index b033ac005859b..3b703cf29fe51 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_number_input.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_number_input.test.js
@@ -18,6 +18,7 @@ import { Deferred } from "@odoo/hoot-mock";
 import { xml } from "@odoo/owl";
 import { contains, defineModels, models } from "@web/../tests/web_test_helpers";
 import { delay } from "@web/core/utils/concurrency";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 describe.current.tags("desktop");
 
@@ -33,10 +34,12 @@ test("should get the initial value of the input", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderNumberInput action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+        }
+    );
     await setupHTMLBuilder(`
                 <div class="test-options-target">10</div>
             `);
@@ -46,14 +49,18 @@ test("should get the initial value of the input", async () => {
     expect(input).toHaveValue("10");
 });
 test("hide/display base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderNumberInput applyTo="'.my-custom-class'" action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderNumberInput applyTo="'.my-custom-class'" action="'customAction'"/>`;
+        }
+    );
     addBuilderAction({
         customAction: class extends BuilderAction {
             static id = "customAction";
@@ -83,10 +90,12 @@ test("hide/display base on applyTo", async () => {
     expect("[data-action-id='customAction'] input").toHaveValue("10");
 });
 test("input with classAction and styleAction", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderNumberInput classAction="'testAction'" styleAction="'--custom-property'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderNumberInput classAction="'testAction'" styleAction="'--custom-property'"/>`;
+        }
+    );
     await setupHTMLBuilder(`
                 <div class="test-options-target">10</div>
             `);
@@ -111,10 +120,12 @@ test("input kept on async action", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderNumberInput action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target" data-test="1">Hello</div>`);
     await contains(":iframe .test-options-target").click();
     await contains(".options-container input").edit("2");
@@ -139,14 +150,18 @@ test("input should remove invalid char", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderNumberInput action="'customAction'"/>`,
-    });
-    addBuilderOption({
-        selector: ".test-options-target-composable",
-        template: xml`<BuilderNumberInput action="'customAction'" composable="true"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target-composable";
+            static template = xml`<BuilderNumberInput action="'customAction'" composable="true"/>`;
+        }
+    );
     await setupHTMLBuilder(
         `<div class="test-options-target" data-test="1">Hello</div><div class="test-options-target-composable" data-test="2">World</div>`
     );
@@ -195,10 +210,12 @@ describe("default value", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" default="20"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" default="20"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10</div>
         `);
@@ -224,10 +241,12 @@ describe("default value", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" />`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" />`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -254,10 +273,12 @@ describe("default value", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" default="1"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" default="1"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -285,10 +306,12 @@ describe("default value", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" default="null"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" default="null"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -320,10 +343,12 @@ describe("operations", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -349,10 +374,12 @@ describe("operations", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -381,10 +408,12 @@ describe("operations", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -417,10 +446,12 @@ describe("operations", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" preview="false"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" preview="false"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">10</div>
                 `);
@@ -447,10 +478,12 @@ describe("keyboard triggers", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" step="2"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" step="2"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10</div>
         `);
@@ -481,10 +514,12 @@ describe("keyboard triggers", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" composable="true"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" composable="true"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10 4 0</div>
         `);
@@ -515,10 +550,12 @@ describe("keyboard triggers", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" />`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" />`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">Non empty div.</div>`);
         await contains(":iframe .test-options-target").click();
         await click("[data-action-id='customAction'] input");
@@ -541,10 +578,12 @@ describe("keyboard triggers", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" />`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" />`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">Non empty div.</div>`);
         await contains(":iframe .test-options-target").click();
         await click("[data-action-id='customAction'] input");
@@ -570,10 +609,12 @@ describe("keyboard triggers", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10</div>
         `);
@@ -608,10 +649,12 @@ describe("unit & saveUnit", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" unit="'px'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" unit="'px'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">5px</div>
                 `);
@@ -637,10 +680,12 @@ describe("unit & saveUnit", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" unit="'s'" saveUnit="'ms'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" unit="'s'" saveUnit="'ms'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">5000ms</div>
                 `);
@@ -662,10 +707,12 @@ describe("unit & saveUnit", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" unit="'s'" saveUnit="'ms'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" unit="'s'" saveUnit="'ms'"/>`;
+            }
+        );
         // note that 5000 has no unit of measure
         await setupHTMLBuilder(`
                     <div class="test-options-target">5000</div>
@@ -689,10 +736,12 @@ describe("unit & saveUnit", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" unit="'px'" saveUnit="''"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" unit="'px'" saveUnit="''"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">5</div>
                 `);
@@ -718,10 +767,12 @@ describe("unit & saveUnit", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" unit="'s'" saveUnit="'ms'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" unit="'s'" saveUnit="'ms'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
                     <div class="test-options-target">5s</div>
                 `);
@@ -748,10 +799,12 @@ describe("sanitized values", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10</div>
         `);
@@ -772,10 +825,12 @@ describe("sanitized values", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" min="0"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" min="0"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10</div>
         `);
@@ -796,10 +851,12 @@ describe("sanitized values", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" max="10"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" max="10"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">3</div>
         `);
@@ -821,10 +878,12 @@ describe("sanitized values", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput action="'customAction'" composable="true"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput action="'customAction'" composable="true"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target">10</div>
         `);
@@ -834,10 +893,12 @@ describe("sanitized values", () => {
         expect(".options-container input").toHaveValue("3 4 5");
     });
     test("after input, displayed value is cleaned to match only numbers", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -847,10 +908,12 @@ describe("sanitized values", () => {
         expect(":iframe .test-options-target").toHaveAttribute("data-number", "0");
     });
     test("after input, displayed value is cleaned to match only numbers (default=null)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'" default="null"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'" default="null"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -860,10 +923,12 @@ describe("sanitized values", () => {
         expect(":iframe .test-options-target").not.toHaveAttribute("data-number");
     });
     test("after copy / pasting, displayed value is cleaned to match only numbers", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -873,10 +938,12 @@ describe("sanitized values", () => {
         expect(":iframe .test-options-target").toHaveAttribute("data-number", "-3");
     });
     test("accept decimal numbers", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -886,10 +953,12 @@ describe("sanitized values", () => {
         expect(":iframe .test-options-target").toHaveAttribute("data-number", "3.3");
     });
     test("BuilderNumberInput transforms , into .", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -899,10 +968,12 @@ describe("sanitized values", () => {
         expect(":iframe .test-options-target").toHaveAttribute("data-number", "3.3");
     });
     test("displays the correct value (no floating point precision error)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'" step="0.1"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'" step="0.1"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -918,10 +989,12 @@ describe("sanitized values", () => {
         expect(".options-container input").toHaveValue("0.2");
     });
     test("rounds the number to 3 decimals", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'"/>`;
+            }
+        );
         await setupHTMLBuilder(`
             <div class="test-options-target" data-number="10">Test</div>
         `);
@@ -940,10 +1013,12 @@ describe("sanitized values", () => {
             make_scss_customization() {}
         }
         defineModels([WebEditorAssets]);
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderNumberInput dataAttributeAction="'number'" unit="'px'" saveUnit="'rem'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderNumberInput dataAttributeAction="'number'" unit="'px'" saveUnit="'rem'"/>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">Test</div>`);
         await contains(":iframe .test-options-target").click();
         await contains(".options-container input").edit("19");
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_range.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_range.test.js
index 6ea4f3cc9ae0c..d786ac2730d03 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_range.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_range.test.js
@@ -10,6 +10,7 @@ import { advanceTime, animationFrame, click, freezeTime, waitFor } from "@odoo/h
 import { xml } from "@odoo/owl";
 import { contains, patchWithCleanup } from "@web/../tests/web_test_helpers";
 import { delay } from "@web/core/utils/concurrency";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 describe.current.tags("desktop");
 
@@ -26,10 +27,12 @@ test("should commit changes", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderRange action="'customAction'" displayRangeValue="true"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderRange action="'customAction'" displayRangeValue="true"/>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div class="test-options-target">10</div>
     `);
@@ -63,10 +66,12 @@ test("range input should step up or down with arrow keys", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderRange action="'customAction'" step="2" displayRangeValue="true"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderRange action="'customAction'" step="2" displayRangeValue="true"/>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div class="test-options-target">10</div>
     `);
@@ -116,10 +121,12 @@ test("keeping an arrow key pressed should commit only once", async () => {
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderRange action="'customAction'" step="2" displayRangeValue="true"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderRange action="'customAction'" step="2" displayRangeValue="true"/>`;
+        }
+    );
     freezeTime();
     await setupHTMLBuilder(`
         <div class="test-options-target">10</div>
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_row.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_row.test.js
index be07df5985ee3..cc6c272984380 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_row.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_row.test.js
@@ -1,4 +1,5 @@
 import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { describe, expect, test } from "@odoo/hoot";
 import {
     advanceTime,
@@ -23,20 +24,24 @@ function reapplyCollapseTransition() {
 describe.current.tags("desktop");
 
 test("show row title", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderRow label="'my label'">row text</BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderRow label="'my label'">row text</BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
     expect(".hb-row .text-nowrap").toHaveText("my label");
 });
 test("show row tooltip", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderRow label="'my label'" tooltip="'my tooltip'">row text</BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderRow label="'my label'" tooltip="'my tooltip'">row text</BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -50,24 +55,30 @@ test("show row tooltip", async () => {
     expect(".o-tooltip").not.toHaveCount();
 });
 test("hide empty row and display row with content", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-                    <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-                </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 2'">
-                    <BuilderButton applyTo="':not(.my-custom-class)'" classAction="'test'"/>
-                </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 3'">
-                    <BuilderButton applyTo="'.my-custom-class'" classAction="'test'"/>
-                </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                        <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+                    </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 2'">
+                        <BuilderButton applyTo="':not(.my-custom-class)'" classAction="'test'"/>
+                    </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 3'">
+                        <BuilderButton applyTo="'.my-custom-class'" classAction="'test'"/>
+                    </BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="parent-target"><div class="child-target">b</div></div>`);
     const selectorRowLabel = ".options-container .hb-row:not(.d-none) .hb-row-label";
     await contains(":iframe .parent-target").click();
@@ -98,10 +109,12 @@ const collapseOptionTemplate = ({
 
 describe("BuilderRow with collapse content", () => {
     test("expand=false is collapsed by default", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate(),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate();
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -109,10 +122,12 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("expand=true is expanded by default", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate({ dependency: false, expand: true }),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate({ dependency: false, expand: true });
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -121,13 +136,15 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("Toggler button is not visible if no dependency is active", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate({
-                dependency: true,
-                observeCollapseContent: true,
-            }),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate({
+                    dependency: true,
+                    observeCollapseContent: true,
+                });
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -135,10 +152,12 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("expand=true works when a dependency becomes active", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate({ dependency: true, expand: true }),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate({ dependency: true, expand: true });
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -150,24 +169,26 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("Collapse works with several dependencies", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderRow label="'Test Collapse'" expand="true">
-                    <BuilderSelect>
-                        <BuilderSelectItem classAction="'a'" id="'test_opt'">A</BuilderSelectItem>
-                        <BuilderSelectItem classAction="'c'" id="'random_opt'">C</BuilderSelectItem>
-                    </BuilderSelect>
-                    <t t-set-slot="collapse">
-                        <BuilderRow level="1" t-if="isActiveItem('test_opt')" label="'B'">
-                            <BuilderButton classAction="'b'">B</BuilderButton>
-                        </BuilderRow>
-                        <BuilderRow level="1" t-if="isActiveItem('random_opt')" label="'D'">
-                            <BuilderButton classAction="'d'">D</BuilderButton>
-                        </BuilderRow>
-                    </t>
-                </BuilderRow>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderRow label="'Test Collapse'" expand="true">
+                        <BuilderSelect>
+                            <BuilderSelectItem classAction="'a'" id="'test_opt'">A</BuilderSelectItem>
+                            <BuilderSelectItem classAction="'c'" id="'random_opt'">C</BuilderSelectItem>
+                        </BuilderSelect>
+                        <t t-set-slot="collapse">
+                            <BuilderRow level="1" t-if="isActiveItem('test_opt')" label="'B'">
+                                <BuilderButton classAction="'b'">B</BuilderButton>
+                            </BuilderRow>
+                            <BuilderRow level="1" t-if="isActiveItem('random_opt')" label="'D'">
+                                <BuilderButton classAction="'d'">D</BuilderButton>
+                            </BuilderRow>
+                        </t>
+                    </BuilderRow>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -188,10 +209,12 @@ describe("BuilderRow with collapse content", () => {
 
     test("Click on toggler collapses / expands the BuilderRow", async () => {
         reapplyCollapseTransition();
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate(),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate();
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -208,10 +231,12 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("Click on toggler collapses / expands the BuilderRow (with observeCollapseContent)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate({ observeCollapseContent: true }),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate({ observeCollapseContent: true });
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -229,10 +254,12 @@ describe("BuilderRow with collapse content", () => {
 
     test("Click header row's label collapses / expands the BuilderRow", async () => {
         reapplyCollapseTransition();
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate(),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate();
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -249,10 +276,12 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("Click header row's label collapses / expands the BuilderRow (with observeCollapseContent)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate({ observeCollapseContent: true }),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate({ observeCollapseContent: true });
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -269,14 +298,18 @@ describe("BuilderRow with collapse content", () => {
     });
 
     test("Two BuilderRows with collapse content on the same option are toggled independently", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate({ dependency: true, expand: true }),
-        });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: collapseOptionTemplate(),
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate({ dependency: true, expand: true });
+            }
+        );
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = collapseOptionTemplate();
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -299,10 +332,12 @@ describe("BuilderRow with collapse content", () => {
 describe.tags("desktop");
 describe("HTML builder tests", () => {
     test("add tooltip when label is too long", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderRow label="'Supercalifragilisticexpalidocious'">Palais chatouille</BuilderRow>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderRow label="'Supercalifragilisticexpalidocious'">Palais chatouille</BuilderRow>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         await hover("[data-label='Supercalifragilisticexpalidocious'] .text-truncate");
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_select_item.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_select_item.test.js
index e4daf993a63c7..db90a917a8c4e 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_select_item.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_select_item.test.js
@@ -17,6 +17,7 @@ import {
 } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 describe.current.tags("desktop");
 
@@ -29,13 +30,15 @@ test("call a specific action with some params and value (BuilderSelectItem)", as
             }
         },
     });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                    <BuilderSelect>
-                        <BuilderSelectItem action="'customAction'" actionParam="'myParam'" actionValue="'myValue'">MyAction</BuilderSelectItem>
-                    </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderSelect>
+                    <BuilderSelectItem action="'customAction'" actionParam="'myParam'" actionValue="'myValue'">MyAction</BuilderSelectItem>
+                </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -48,15 +51,17 @@ test("call a specific action with some params and value (BuilderSelectItem)", as
     expect.verifySteps(["customAction myParam myValue", "customAction myParam myValue"]);
 });
 test("set the label of the select from the active select item and be updated on undo/redo", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                    <BuilderSelect attributeAction="'customAttribute'">
-                        <BuilderSelectItem attributeActionValue="null">None</BuilderSelectItem>
-                        <BuilderSelectItem attributeActionValue="'a'">A</BuilderSelectItem>
-                        <BuilderSelectItem attributeActionValue="'b'">B</BuilderSelectItem>
-                    </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderSelect attributeAction="'customAttribute'">
+                    <BuilderSelectItem attributeActionValue="null">None</BuilderSelectItem>
+                    <BuilderSelectItem attributeActionValue="'a'">A</BuilderSelectItem>
+                    <BuilderSelectItem attributeActionValue="'b'">B</BuilderSelectItem>
+                </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target" customAttribute="a">x</div>`);
     setSelection({
         anchorNode: queryFirst(":iframe .test-options-target").childNodes[0],
@@ -76,15 +81,17 @@ test("set the label of the select from the active select item and be updated on
     expect(".we-bg-options-container .dropdown").toHaveText("B");
 });
 test("consider the priority of the select item", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-                    <BuilderSelect>
-                        <BuilderSelectItem classAction="''">None</BuilderSelectItem>
-                        <BuilderSelectItem classAction="'a'">A</BuilderSelectItem>
-                        <BuilderSelectItem classAction="'a b'">A B</BuilderSelectItem>
-                    </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderSelect>
+                    <BuilderSelectItem classAction="''">None</BuilderSelectItem>
+                    <BuilderSelectItem classAction="'a'">A</BuilderSelectItem>
+                    <BuilderSelectItem classAction="'a b'">A B</BuilderSelectItem>
+                </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target a">x</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -100,18 +107,22 @@ test("consider the priority of the select item", async () => {
     expect(".we-bg-options-container .dropdown").toHaveText("A B");
 });
 test("hide/display BuilderSelect based on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`
-                <BuilderSelect applyTo="'.my-custom-class'">
-                    <BuilderSelectItem classAction="'a'">A</BuilderSelectItem>
-                    <BuilderSelectItem classAction="'b'">B</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
+                    <BuilderSelect applyTo="'.my-custom-class'">
+                        <BuilderSelectItem classAction="'a'">A</BuilderSelectItem>
+                        <BuilderSelectItem classAction="'b'">B</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="parent-target"><div class="child-target b">b</div></div>`
     );
@@ -134,19 +145,23 @@ test("hide/display BuilderSelect based on applyTo", async () => {
 });
 
 test("hide/display BuilderSelectItem base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`
-                <BuilderSelect>
-                    <BuilderSelectItem classAction="'a'">A</BuilderSelectItem>
-                    <BuilderSelectItem applyTo="'.my-custom-class'" classAction="'b'">B</BuilderSelectItem>
-                    <BuilderSelectItem classAction="'c'">C</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
+                    <BuilderSelect>
+                        <BuilderSelectItem classAction="'a'">A</BuilderSelectItem>
+                        <BuilderSelectItem applyTo="'.my-custom-class'" classAction="'b'">B</BuilderSelectItem>
+                        <BuilderSelectItem classAction="'c'">C</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(
         `<div class="parent-target"><div class="child-target">b</div></div>`
     );
@@ -170,17 +185,21 @@ test("hide/display BuilderSelectItem base on applyTo", async () => {
 });
 
 test("hide/display BuilderSelect base on applyTo in BuilderSelectItem", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`
-                <BuilderSelect>
-                    <BuilderSelectItem applyTo="'.my-custom-class'" classAction="'a'">A</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
+                    <BuilderSelect>
+                        <BuilderSelectItem applyTo="'.my-custom-class'" classAction="'a'">A</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="parent-target"><div class="child-target b">b</div></div>`);
     await contains(":iframe .parent-target").click();
     expect(".options-container button.dropdown-toggle").not.toBeVisible();
@@ -190,15 +209,17 @@ test("hide/display BuilderSelect base on applyTo in BuilderSelectItem", async ()
 });
 
 test("use BuilderSelect with styleAction", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`
-                <BuilderSelect styleAction="'border-style'">
-                    <BuilderSelectItem styleActionValue="'dotted'">dotted</BuilderSelectItem>
-                    <BuilderSelectItem styleActionValue="'inset'">inset</BuilderSelectItem>
-                    <BuilderSelectItem styleActionValue="'none'">none</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`
+                    <BuilderSelect styleAction="'border-style'">
+                        <BuilderSelectItem styleActionValue="'dotted'">dotted</BuilderSelectItem>
+                        <BuilderSelectItem styleActionValue="'inset'">inset</BuilderSelectItem>
+                        <BuilderSelectItem styleActionValue="'none'">none</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     const { getEditableContent } = await setupHTMLBuilder(`<div class="parent-target">b</div>`);
     const editableContent = getEditableContent();
     await contains(":iframe .parent-target").click();
@@ -218,14 +239,16 @@ test("use BuilderSelect with styleAction", async () => {
     expect(".we-bg-options-container .dropdown").toHaveText("dotted");
 });
 test("do not put inline style on an element which already has this style through css stylesheets", async () => {
-    addBuilderOption({
-        selector: ".test",
-        template: xml`
-                <BuilderSelect applyTo="'hr'" styleAction="'border-top-style'">
-                    <BuilderSelectItem styleActionValue="'dotted'">dotted</BuilderSelectItem>
-                    <BuilderSelectItem styleActionValue="'inset'">inset</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test";
+            static template = xml`
+                    <BuilderSelect applyTo="'hr'" styleAction="'border-top-style'">
+                        <BuilderSelectItem styleActionValue="'dotted'">dotted</BuilderSelectItem>
+                        <BuilderSelectItem styleActionValue="'inset'">inset</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`
             <div class="test">
                 <hr class="w-100">
@@ -241,14 +264,16 @@ test("do not put inline style on an element which already has this style through
     expect(":iframe hr").not.toHaveStyle("border-top-style", { inline: true });
 });
 test("revert a preview when cancelling a BuilderSelect by clicking outside of it", async () => {
-    addBuilderOption({
-        selector: ".test",
-        template: xml`
-                <BuilderSelect dataAttributeAction="'choice'">
-                    <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
-                    <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test";
+            static template = xml`
+                    <BuilderSelect dataAttributeAction="'choice'">
+                        <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
+                        <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test">Test</div>`);
     await contains(":iframe .test").click();
     expect(":iframe .test").not.toHaveAttribute("data-choice");
@@ -259,14 +284,16 @@ test("revert a preview when cancelling a BuilderSelect by clicking outside of it
     expect(":iframe .test").not.toHaveAttribute("data-choice");
 });
 test("revert a preview when cancelling a BuilderSelect with escape", async () => {
-    addBuilderOption({
-        selector: ".test",
-        template: xml`
-                <BuilderSelect dataAttributeAction="'choice'">
-                    <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
-                    <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test";
+            static template = xml`
+                    <BuilderSelect dataAttributeAction="'choice'">
+                        <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
+                        <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test">Test</div>`);
     await contains(":iframe .test").click();
     expect(":iframe .test").not.toHaveAttribute("data-choice");
@@ -277,14 +304,16 @@ test("revert a preview when cancelling a BuilderSelect with escape", async () =>
     expect(":iframe .test").not.toHaveAttribute("data-choice");
 });
 test("preview when cycling through options with the keyboard", async () => {
-    addBuilderOption({
-        selector: ".test",
-        template: xml`
-                <BuilderSelect dataAttributeAction="'choice'">
-                    <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
-                    <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test";
+            static template = xml`
+                    <BuilderSelect dataAttributeAction="'choice'">
+                        <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
+                        <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test">Test</div>`);
     await contains(":iframe .test").click();
     expect(":iframe .test").not.toHaveAttribute("data-choice");
@@ -293,14 +322,16 @@ test("preview when cycling through options with the keyboard", async () => {
     expect(":iframe .test").toHaveAttribute("data-choice", "0");
 });
 test("revert a preview selected with the keyboard when cancelling with escape", async () => {
-    addBuilderOption({
-        selector: ".test",
-        template: xml`
-                <BuilderSelect dataAttributeAction="'choice'">
-                    <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
-                    <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test";
+            static template = xml`
+                    <BuilderSelect dataAttributeAction="'choice'">
+                        <BuilderSelectItem dataAttributeActionValue="'0'">0</BuilderSelectItem>
+                        <BuilderSelectItem dataAttributeActionValue="'1'">1</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test">Test</div>`);
     await contains(":iframe .test").click();
     expect(":iframe .test").not.toHaveAttribute("data-choice");
@@ -321,14 +352,16 @@ test("isApplied shouldn't be called when the element is removed from the DOM", a
             }
         },
     });
-    addBuilderOption({
-        selector: ".test",
-        template: xml`
-                <BuilderSelect action="'customAction'">
-                    <BuilderSelectItem actionParam="'0'">0</BuilderSelectItem>
-                    <BuilderSelectItem actionParam="'1'">1</BuilderSelectItem>
-                </BuilderSelect>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test";
+            static template = xml`
+                    <BuilderSelect action="'customAction'">
+                        <BuilderSelectItem actionParam="'0'">0</BuilderSelectItem>
+                        <BuilderSelectItem actionParam="'1'">1</BuilderSelectItem>
+                    </BuilderSelect>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test">Test</div>`);
     await contains(":iframe .test").click();
     await contains(".fa-trash ").click();
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js
index 3e9b395c32b14..bf2e7e7862b95 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_text_input.test.js
@@ -4,6 +4,7 @@ import {
     setupHTMLBuilder,
 } from "@html_builder/../tests/helpers";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
@@ -11,14 +12,18 @@ import { contains } from "@web/../tests/web_test_helpers";
 describe.current.tags("desktop");
 
 test("hide/display base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderTextInput applyTo="'.my-custom-class'" action="'customAction'"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderTextInput applyTo="'.my-custom-class'" action="'customAction'"/>`;
+        }
+    );
     addBuilderAction({
         customAction: class extends BuilderAction {
             static id = "customAction";
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js
index ce81589bf418c..7fbb1f41e924b 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js
@@ -4,6 +4,7 @@ import { animationFrame } from "@odoo/hoot-mock";
 import { xml } from "@odoo/owl";
 import { contains, defineModels, fields, models, onRpc } from "@web/../tests/web_test_helpers";
 import { delay } from "@web/core/utils/concurrency";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class Test extends models.Model {
     _name = "test";
@@ -37,10 +38,12 @@ test("model many2many: find tag, select tag, unselect tag", async () => {
         [2, "Second"],
         [3, "Third"],
     ]);
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<ModelMany2Many baseModel="'test.base'" m2oField="'rel'" recordId="1"/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<ModelMany2Many baseModel="'test.base'" m2oField="'rel'" recordId="1"/>`;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(
         `<div class="test-options-target" data-res-model="test.base" data-res-id="1">b</div>`
     );
diff --git a/addons/html_builder/static/tests/custom_tab/builder_shorthand_action.test.js b/addons/html_builder/static/tests/custom_tab/builder_shorthand_action.test.js
index e93e8903632be..c9dc518dd48c6 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_shorthand_action.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_shorthand_action.test.js
@@ -1,4 +1,5 @@
 import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpers";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { describe, expect, test } from "@odoo/hoot";
 import { fill } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
@@ -8,15 +9,17 @@ describe.current.tags("desktop");
 
 describe("classAction", () => {
     test("should reset when cliking on an empty classAction", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderButtonGroup>
                         <BuilderButton classAction="''"/>
                         <BuilderButton classAction="'x'"/>
                     </BuilderButtonGroup>
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target x">a</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeDisplayed();
@@ -27,15 +30,17 @@ describe("classAction", () => {
         expect(":iframe .test-options-target").not.toHaveClass("x");
     });
     test("set multiples classes", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderButtonGroup>
                         <BuilderButton classAction="'x'"/>
                         <BuilderButton classAction="'x y z'"/>
                     </BuilderButtonGroup>
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target x">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeDisplayed();
@@ -55,15 +60,17 @@ describe("classAction", () => {
         expect("[data-class-action='x y z']").not.toHaveClass("active");
     });
     test("toggle class when not inside a BuilderButtonGroup", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderButton classAction="'x'"/>
                     <BuilderButtonGroup>
                         <BuilderButton classAction="'y'"/>
                     </BuilderButtonGroup>
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">a</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeDisplayed();
@@ -81,13 +88,15 @@ describe("classAction", () => {
 
 describe("styleAction", () => {
     test("should set a plain style", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderNumberInput styleAction="'width'" unit="'px'"
                     />
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target" style="width: 10px;">a</div>`);
         await contains(":iframe .test-options-target").click();
         expect("input").toHaveValue("10");
@@ -105,13 +114,15 @@ describe("styleAction", () => {
         expect(":iframe .test-options-target").toHaveAttribute("style", "width: 0px;");
     });
     test("should set a style with its associated class", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderNumberInput styleAction="{ mainParam: 'border-width', extraClass: 'border' }" unit="'px'" min="0" composable="true"
                     />
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target border">a</div>`, {
             styleContent: ".border { border: solid; border-width: 1px !important; }",
         });
@@ -138,13 +149,15 @@ describe("styleAction", () => {
         expect(":iframe .test-options-target").toHaveClass("border");
     });
     test("should set a composite style with its associated class", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderNumberInput styleAction="{ mainParam: 'border-width', extraClass: 'border' }" unit="'px'" min="0" composable="true"
                     />
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">a</div>`, {
             styleContent: ".border { border: solid; border-width: 1px !important; }",
         });
@@ -211,15 +224,17 @@ describe("styleAction", () => {
     });
 
     test("button isApplied is properly computed with percentage width values", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
                     <BuilderButtonGroup styleAction="'width'">
                         <BuilderButton styleActionValue="''">Default</BuilderButton>
                         <BuilderButton styleActionValue="'50%'">50%</BuilderButton>
                     </BuilderButtonGroup>
-                `,
-        });
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target x">a</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeDisplayed();
diff --git a/addons/html_builder/static/tests/custom_tab/misc.test.js b/addons/html_builder/static/tests/custom_tab/misc.test.js
index 2c9093597285c..545a1877599af 100644
--- a/addons/html_builder/static/tests/custom_tab/misc.test.js
+++ b/addons/html_builder/static/tests/custom_tab/misc.test.js
@@ -8,6 +8,7 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { OptionsContainer } from "@html_builder/sidebar/option_container";
 import { setContent, setSelection } from "@html_editor/../tests/_helpers/selection";
 import { redo, undo } from "@html_editor/../tests/_helpers/user_actions";
+import { withSequence } from "@html_editor/utils/resource";
 import { describe, expect, test } from "@odoo/hoot";
 import { animationFrame, queryAllTexts, queryFirst } from "@odoo/hoot-dom";
 import { Component, onWillStart, xml } from "@odoo/owl";
@@ -16,13 +17,15 @@ import { contains, patchWithCleanup } from "@web/../tests/web_test_helpers";
 describe.current.tags("desktop");
 
 test("Open custom tab with template option", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderRow label="'Row 1'">
-            Test
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderRow label="'Row 1'">
+                    Test
+                </BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target" data-name="Yop">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -31,16 +34,13 @@ test("Open custom tab with template option", async () => {
 
 test("Open custom tab with Component option", async () => {
     class TestOption extends BaseOptionComponent {
+        static selector = ".test-options-target";
         static template = xml`
             <BuilderRow label="'Row 1'">
                 Test
             </BuilderRow>`;
-        static props = {};
     }
-    addBuilderOption({
-        selector: ".test-options-target",
-        Component: TestOption,
-    });
+    addBuilderOption(TestOption);
     await setupHTMLBuilder(`<div class="test-options-target" data-name="Yop">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -48,14 +48,16 @@ test("Open custom tab with Component option", async () => {
 });
 
 test("OptionContainer should display custom title", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderRow label="'Row 1'">
-            Test
-        </BuilderRow>`,
-        title: "My custom title",
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+                <BuilderRow label="'Row 1'">
+                    Test
+                </BuilderRow>`;
+            static title = "My custom title";
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target" data-name="Yop">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -63,22 +65,28 @@ test("OptionContainer should display custom title", async () => {
 });
 
 test("Don't display option base on exclude", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        exclude: ".test-exclude",
-        template: xml`<BuilderRow label="'Row 1'">a</BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        exclude: ".test-exclude-2",
-        template: xml`<BuilderRow label="'Row 2'">b</BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<BuilderRow label="'Row 3'">
-            <BuilderButton classAction="'test-exclude-2'">c</BuilderButton>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static exclude = ".test-exclude";
+            static template = xml`<BuilderRow label="'Row 1'">a</BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static exclude = ".test-exclude-2";
+            static template = xml`<BuilderRow label="'Row 2'">b</BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<BuilderRow label="'Row 3'">
+                <BuilderButton classAction="'test-exclude-2'">c</BuilderButton>
+            </BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target test-exclude">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(queryAllTexts(".options-container .hb-row")).toEqual(["Row 2\nb", "Row 3\nc"]);
@@ -88,18 +96,22 @@ test("Don't display option base on exclude", async () => {
 });
 
 test("Don't display option base on applyTo", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        applyTo: ".test-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton classAction="'test-target-2'">a</BuilderButton>
-        </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        applyTo: ".test-target-2",
-        template: xml`<BuilderRow label="'Row 2'">b</BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static applyTo = ".test-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton classAction="'test-target-2'">a</BuilderButton>
+            </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static applyTo = ".test-target-2";
+            static template = xml`<BuilderRow label="'Row 2'">b</BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`
         <div class="test-options-target">
             <div class="test-target">b</div>
@@ -113,21 +125,27 @@ test("Don't display option base on applyTo", async () => {
 });
 
 test("basic multi options containers", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderRow label="'Row 1'">A</BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".a",
-        template: xml`
-        <BuilderRow label="'Row 2'">B</BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".main",
-        template: xml`
-        <BuilderRow label="'Row 3'">C</BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`
+            <BuilderRow label="'Row 1'">A</BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".a";
+            static template = xml`
+            <BuilderRow label="'Row 2'">B</BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".main";
+            static template = xml`
+            <BuilderRow label="'Row 3'">C</BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(`<div class="main"><p class="test-options-target a">b</p></div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toHaveCount(2);
@@ -141,12 +159,14 @@ test("basic multi options containers", async () => {
 });
 
 test("option that matches several elements", async () => {
-    addBuilderOption({
-        selector: ".a",
-        template: xml`<BuilderRow label="'Row'">
-            <BuilderButton classAction="'my-custom-class'">Test</BuilderButton>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".a";
+            static template = xml`<BuilderRow label="'Row'">
+                <BuilderButton classAction="'my-custom-class'">Test</BuilderButton>
+            </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(`<div class="a"><div class="a test-target">b</div></div>`);
     await contains(":iframe .test-target").click();
@@ -158,30 +178,42 @@ test("option that matches several elements", async () => {
 });
 
 test("Snippets options respect sequencing", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderRow label="'Row 2'">
-            Test
-        </BuilderRow>`,
-        sequence: 2,
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderRow label="'Row 1'">
-            Test
-        </BuilderRow>`,
-        sequence: 1,
-    });
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`
-        <BuilderRow label="'Row 3'">
-            Test
-        </BuilderRow>`,
-        sequence: 3,
-    });
+    addBuilderOption(
+        withSequence(
+            2,
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                <BuilderRow label="'Row 2'">
+                    Test
+                </BuilderRow>`;
+            }
+        )
+    );
+    addBuilderOption(
+        withSequence(
+            1,
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                <BuilderRow label="'Row 1'">
+                    Test
+                </BuilderRow>`;
+            }
+        )
+    );
+    addBuilderOption(
+        withSequence(
+            3,
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                <BuilderRow label="'Row 3'">
+                    Test
+                </BuilderRow>`;
+            }
+        )
+    );
     await setupHTMLBuilder(`<div class="test-options-target" data-name="Yop">b</div>`);
     await contains(":iframe .test-options-target").click();
     expect(".options-container").toBeVisible();
@@ -196,18 +228,22 @@ test("Snippets options respect sequencing", async () => {
 });
 
 test("hide empty OptionContainer and display OptionContainer with content", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".parent-target > div",
-        template: xml`<BuilderRow label="'Row 3'">
-            <BuilderButton applyTo="'.my-custom-class'" classAction="'test'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target > div";
+            static template = xml`<BuilderRow label="'Row 3'">
+                <BuilderButton applyTo="'.my-custom-class'" classAction="'test'"/>
+            </BuilderRow>`;
+        }
+    );
     await setupHTMLBuilder(
         `<div class="parent-target"><div><div class="child-target">b</div></div></div>`
     );
@@ -220,22 +256,26 @@ test("hide empty OptionContainer and display OptionContainer with content", asyn
 });
 
 test("hide empty OptionContainer and display OptionContainer with content (with BuilderButtonGroup)", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
 
-    addBuilderOption({
-        selector: ".parent-target > div",
-        template: xml`
-            <BuilderRow label="'Row 2'">
-                <BuilderButtonGroup>
-                    <BuilderButton applyTo="'.my-custom-class'" classAction="'test'">Test</BuilderButton>
-                </BuilderButtonGroup>
-            </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target > div";
+            static template = xml`
+                <BuilderRow label="'Row 2'">
+                    <BuilderButtonGroup>
+                        <BuilderButton applyTo="'.my-custom-class'" classAction="'test'">Test</BuilderButton>
+                    </BuilderButtonGroup>
+                </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(
         `<div class="parent-target"><div><div class="child-target">b</div></div></div>`
@@ -249,22 +289,26 @@ test("hide empty OptionContainer and display OptionContainer with content (with
 });
 
 test("hide empty OptionContainer and display OptionContainer with content (with BuilderButtonGroup) - 2", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
 
-    addBuilderOption({
-        selector: ".parent-target > div",
-        template: xml`
-            <BuilderRow label="'Row 2'">
-                <BuilderButtonGroup applyTo="'.my-custom-class'">
-                    <BuilderButton  classAction="'test'">Test</BuilderButton>
-                </BuilderButtonGroup>
-            </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target > div";
+            static template = xml`
+                <BuilderRow label="'Row 2'">
+                    <BuilderButtonGroup applyTo="'.my-custom-class'">
+                        <BuilderButton  classAction="'test'">Test</BuilderButton>
+                    </BuilderButtonGroup>
+                </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(
         `<div class="parent-target"><div><div class="child-target">b</div></div></div>`
@@ -284,12 +328,14 @@ test("fallback on the 'Blocks' tab if no option match the selected element", asy
 });
 
 test("display empty message if no option container is visible", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton applyTo="'.invalid'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton applyTo="'.invalid'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(`<div class="parent-target"><div class="child-target">b</div></div>`);
     await contains(":iframe .parent-target > div").click();
@@ -297,18 +343,22 @@ test("display empty message if no option container is visible", async () => {
     expect(".o_customize_tab").toHaveText("Select a block on your page to style it.");
 });
 test("hide/display option base on selector", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".my-custom-class",
-        template: xml`<BuilderRow label="'Row 2'">
-            <BuilderButton classAction="'test'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".my-custom-class";
+            static template = xml`<BuilderRow label="'Row 2'">
+                <BuilderButton classAction="'test'"/>
+            </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(`<div class="parent-target"><div class="child-target">b</div></div>`);
     await contains(":iframe .parent-target").click();
@@ -319,25 +369,31 @@ test("hide/display option base on selector", async () => {
 });
 
 test("hide/display option container base on selector", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
-    addBuilderOption({
-        selector: ".my-custom-class",
-        template: xml`<BuilderRow label="'Row 2'">
-            <BuilderButton classAction="'test'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".my-custom-class";
+            static template = xml`<BuilderRow label="'Row 2'">
+                <BuilderButton classAction="'test'"/>
+            </BuilderRow>`;
+        }
+    );
 
-    addBuilderOption({
-        selector: ".sub-child-target",
-        template: xml`<BuilderRow label="'Row 3'">
-            <BuilderButton classAction="'another-custom-class'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".sub-child-target";
+            static template = xml`<BuilderRow label="'Row 3'">
+                <BuilderButton classAction="'another-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(`
         <div class="parent-target">
@@ -356,12 +412,14 @@ test("hide/display option container base on selector", async () => {
 });
 
 test("don't rerender the OptionsContainer every time you click on the same element", async () => {
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'">
-            <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'">
+                <BuilderButton applyTo="'.child-target'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
 
     patchWithCleanup(OptionsContainer.prototype, {
         setup() {
@@ -395,16 +453,18 @@ test("no need to define 'isApplied' method for custom action if the widget alrea
             }
         },
     });
-    addBuilderOption({
-        selector: ".s_test",
-        template: xml`
-        <BuilderRow label.translate="Type">
-            <BuilderSelect>
-                <BuilderSelectItem classAction="'A-class'" action="'customAction'" actionParam="'A'">A</BuilderSelectItem>
-            </BuilderSelect>
-        </BuilderRow>
-    `,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".s_test";
+            static template = xml`
+            <BuilderRow label.translate="Type">
+                <BuilderSelect>
+                    <BuilderSelectItem classAction="'A-class'" action="'customAction'" actionParam="'A'">A</BuilderSelectItem>
+                </BuilderSelect>
+            </BuilderRow>
+        `;
+        }
+    );
 
     await setupHTMLBuilder(`
         <div class="s_test A-class">
@@ -419,6 +479,8 @@ test("useDomState callback shouldn't be called when the editingElement is remove
     let count = 0;
     class TestOption extends Component {
         static template = xml`<div class="test_option">test</div>`;
+        static selector = ".s_test";
+        static editableOnly = false;
         static props = {};
 
         setup() {
@@ -430,15 +492,13 @@ test("useDomState callback shouldn't be called when the editingElement is remove
             });
         }
     }
-    addBuilderOption({
-        selector: ".s_test",
-        editableOnly: false,
-        Component: TestOption,
-    });
-    addBuilderOption({
-        selector: "*",
-        template: xml`<BuilderButton action="'addTestSnippet'">Add</BuilderButton>`,
-    });
+    addBuilderOption(TestOption);
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = "*";
+            static template = xml`<BuilderButton action="'addTestSnippet'">Add</BuilderButton>`;
+        }
+    );
     addBuilderAction({
         addTestSnippet: class extends BuilderAction {
             static id = "addTestSnippet";
@@ -447,7 +507,7 @@ test("useDomState callback shouldn't be called when the editingElement is remove
                 testEl.classList.add("s_test", "alert-info");
                 testEl.textContent = "test";
                 editingElement.after(testEl);
-                editor.shared["builderOptions"].setNextTarget(testEl);
+                editor.shared.builderOptions.setNextTarget(testEl);
             }
         },
     });
@@ -481,13 +541,15 @@ test("Update editing elements at dom change with multiple levels of applyTo", as
             }
         },
     });
-    addBuilderOption({
-        selector: ".parent-target",
-        template: xml`<BuilderRow label="'Row 1'" applyTo="'.child-target'">
-            <BuilderButton action="'customAction'" />
-            <BuilderButton applyTo="'.sub-child-target'" classAction="'my-custom-class'"/>
-        </BuilderRow>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".parent-target";
+            static template = xml`<BuilderRow label="'Row 1'" applyTo="'.child-target'">
+                <BuilderButton action="'customAction'" />
+                <BuilderButton applyTo="'.sub-child-target'" classAction="'my-custom-class'"/>
+            </BuilderRow>`;
+        }
+    );
 
     await setupHTMLBuilder(`
         <div class="parent-target">
@@ -502,19 +564,23 @@ test("Update editing elements at dom change with multiple levels of applyTo", as
 });
 
 test("An option should only appear if its target is inside an editable area, unless specified otherwise", async () => {
-    addBuilderOption({
-        selector: ".test-target",
-        template: xml`
-            <BuilderButton classAction="'dummy-class-a'">Option A</BuilderButton>
-        `,
-    });
-    addBuilderOption({
-        selector: ".test-target",
-        editableOnly: false,
-        template: xml`
-            <BuilderButton classAction="'dummy-class-b'">Option B</BuilderButton>
-        `,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-target";
+            static template = xml`
+                <BuilderButton classAction="'dummy-class-a'">Option A</BuilderButton>
+            `;
+        }
+    );
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-target";
+            static editableOnly = false;
+            static template = xml`
+                <BuilderButton classAction="'dummy-class-b'">Option B</BuilderButton>
+            `;
+        }
+    );
     const { getEditor } = await setupHTMLBuilder(`<div></div>`);
     const editor = getEditor();
     setContent(
@@ -540,15 +606,17 @@ test("An option should only appear if its target is inside an editable area, unl
 
 describe("isActiveItem", () => {
     test("a button should not be visible if its dependency isn't (with undo)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'x'" id="'id1'">b1</BuilderButton>
-                <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'y'"  id="'id2'">b2</BuilderButton>
-                <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'1'" t-if="this.isActiveItem('id1')">b3</BuilderButton>
-                <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'2'" t-if="this.isActiveItem('id2')">b4</BuilderButton>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'x'" id="'id1'">b1</BuilderButton>
+                    <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'y'"  id="'id2'">b2</BuilderButton>
+                    <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'1'" t-if="this.isActiveItem('id1')">b3</BuilderButton>
+                    <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'2'" t-if="this.isActiveItem('id2')">b4</BuilderButton>
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         setSelection({
             anchorNode: queryFirst(":iframe .test-options-target").childNodes[0],
@@ -599,17 +667,19 @@ describe("isActiveItem", () => {
         ).not.toHaveCount();
     });
     test("a button should not be visible if its dependency isn't (in a BuilderSelect with priority)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderSelect>
-                    <BuilderSelectItem classAction="'a'" id="'x'">x</BuilderSelectItem>
-                    <BuilderSelectItem classAction="'a b'" id="'y'">y</BuilderSelectItem>
-                </BuilderSelect>
-                <BuilderButton classAction="'b1'" t-if="this.isActiveItem('x')">b1</BuilderButton>
-                <BuilderButton classAction="'b2'" t-if="this.isActiveItem('y')">b2</BuilderButton>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderSelect>
+                        <BuilderSelectItem classAction="'a'" id="'x'">x</BuilderSelectItem>
+                        <BuilderSelectItem classAction="'a b'" id="'y'">y</BuilderSelectItem>
+                    </BuilderSelect>
+                    <BuilderButton classAction="'b1'" t-if="this.isActiveItem('x')">b1</BuilderButton>
+                    <BuilderButton classAction="'b2'" t-if="this.isActiveItem('y')">b2</BuilderButton>
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target a">a</div>`);
         setSelection({
             anchorNode: queryFirst(":iframe .test-options-target").childNodes[0],
@@ -630,13 +700,15 @@ describe("isActiveItem", () => {
         expect("[data-class-action='b2']").toBeVisible();
     });
     test("a button should not be visible if the dependency is active", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'x'" id="'id1'">b1</BuilderButton>
-                <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'1'" t-if="!this.isActiveItem('id1')">b3</BuilderButton>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'x'" id="'id1'">b1</BuilderButton>
+                    <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'1'" t-if="!this.isActiveItem('id1')">b3</BuilderButton>
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -652,16 +724,18 @@ describe("isActiveItem", () => {
         ).not.toHaveCount();
     });
     test("a button should not be visible if the dependency is active (when a dependency is added after a dependent)", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'1'" t-if="this.isActiveItem('id')">b1</BuilderButton>
-                <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'2'" t-if="!this.isActiveItem('id')">b2</BuilderButton>
-                <BuilderRow label="'dependency'">
-                    <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'x'" id="'id'">b3</BuilderButton>
-                </BuilderRow>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'1'" t-if="this.isActiveItem('id')">b1</BuilderButton>
+                    <BuilderButton attributeAction="'my-attribute2'" attributeActionValue="'2'" t-if="!this.isActiveItem('id')">b2</BuilderButton>
+                    <BuilderRow label="'dependency'">
+                        <BuilderButton attributeAction="'my-attribute1'" attributeActionValue="'x'" id="'id'">b3</BuilderButton>
+                    </BuilderRow>
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         expect(".options-container").toBeVisible();
@@ -682,14 +756,16 @@ describe("isActiveItem", () => {
         ).not.toHaveCount();
     });
     test("a button should not be visible if its dependency is removed from the DOM", async () => {
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButton classAction="'my-class1'" id="'id1'">b1</BuilderButton>
-                <BuilderButton classAction="'my-class2'" id="'id2'" t-if="this.isActiveItem('id1')">b2</BuilderButton>
-                <BuilderButton classAction="'my-class3'" t-if="this.isActiveItem('id2')">b3</BuilderButton>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButton classAction="'my-class1'" id="'id1'">b1</BuilderButton>
+                    <BuilderButton classAction="'my-class2'" id="'id2'" t-if="this.isActiveItem('id1')">b2</BuilderButton>
+                    <BuilderButton classAction="'my-class3'" t-if="this.isActiveItem('id2')">b3</BuilderButton>
+                `;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target my-class1 my-class2">b</div>`);
         await contains(":iframe .test-options-target").click();
         await contains("[data-class-action='my-class1']").click();
diff --git a/addons/html_builder/static/tests/helpers.js b/addons/html_builder/static/tests/helpers.js
index fd32bb6c7b2b4..c0c325b873942 100644
--- a/addons/html_builder/static/tests/helpers.js
+++ b/addons/html_builder/static/tests/helpers.js
@@ -7,7 +7,6 @@ import { setContent } from "@html_editor/../tests/_helpers/selection";
 import { insertText } from "@html_editor/../tests/_helpers/user_actions";
 import { LocalOverlayContainer } from "@html_editor/local_overlay_container";
 import { Plugin } from "@html_editor/plugin";
-import { withSequence } from "@html_editor/utils/resource";
 import { defineMailModels } from "@mail/../tests/mail_test_helpers";
 import { after } from "@odoo/hoot";
 import { animationFrame, waitForNone, queryOne, waitFor, advanceTime, tick } from "@odoo/hoot-dom";
@@ -324,40 +323,14 @@ export function addBuilderPlugin(Plugin) {
     });
 }
 
-export function addBuilderOption({
-    selector,
-    exclude,
-    applyTo,
-    template,
-    Component,
-    sequence,
-    cleanForSave,
-    props,
-    editableOnly,
-    title,
-    reloadTarget,
-}) {
+export function addBuilderOption(Option) {
     const pluginId = uniqueId("test-option");
-    const option = {
-        pluginId,
-        OptionComponent: Component,
-        template,
-        selector,
-        exclude,
-        applyTo,
-        sequence,
-        cleanForSave,
-        props,
-        editableOnly,
-        title,
-        reloadTarget,
-    };
 
     const P = {
         [pluginId]: class extends Plugin {
             static id = pluginId;
             resources = {
-                builder_options: sequence ? withSequence(sequence, option) : option,
+                builder_options: Option,
             };
         },
     }[pluginId];
diff --git a/addons/html_builder/static/tests/operation.test.js b/addons/html_builder/static/tests/operation.test.js
index 2285019c6340b..357f8ce6a0b83 100644
--- a/addons/html_builder/static/tests/operation.test.js
+++ b/addons/html_builder/static/tests/operation.test.js
@@ -5,6 +5,7 @@ import {
 } from "@html_builder/../tests/helpers";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { Operation } from "@html_builder/core/operation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { HistoryPlugin } from "@html_editor/core/history_plugin";
 import { beforeEach, describe, expect, test } from "@odoo/hoot";
 import { advanceTime, Deferred, delay, hover, press, tick } from "@odoo/hoot-dom";
@@ -98,10 +99,12 @@ describe("Block editable", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderButton action="'customAction'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderButton action="'customAction'"/>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">TEST</div>`, {
             loadIframeBundles: true,
         });
@@ -154,17 +157,19 @@ describe("Async operations", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderRow label.translate="Type">
-                    <BuilderSelect>
-                        <BuilderSelectItem action="'customAction'" actionValue="'first'">first</BuilderSelectItem>
-                        <BuilderSelectItem action="'customAction2'" actionValue="'second'">second</BuilderSelectItem>
-                    </BuilderSelect>
-                </BuilderRow>
-            `,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderRow label.translate="Type">
+                        <BuilderSelect>
+                            <BuilderSelectItem action="'customAction'" actionValue="'first'">first</BuilderSelectItem>
+                            <BuilderSelectItem action="'customAction2'" actionValue="'second'">second</BuilderSelectItem>
+                        </BuilderSelect>
+                    </BuilderRow>
+                `;
+            }
+        );
 
         await setupHTMLBuilder(`<div class="test-options-target">TEST</div>`);
         await contains(":iframe .test-options-target").click();
@@ -200,12 +205,14 @@ describe("Async operations", () => {
                 }
             },
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`<BuilderRow>
-                <BuilderColorPicker enabledTabs="['solid']" styleAction="'background-color'" action="'customAction'"/>
-            </BuilderRow>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`<BuilderRow>
+                    <BuilderColorPicker enabledTabs="['solid']" styleAction="'background-color'" action="'customAction'"/>
+                </BuilderRow>`;
+            }
+        );
 
         await setupHTMLBuilder(`<div class="test-options-target">TEST</div>`);
         await contains(":iframe .test-options-target").click();
@@ -237,12 +244,14 @@ describe("Operation that will fail", () => {
         addBuilderAction({
             TestAction,
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButton action="'testAction'"/>
-                <BuilderButton classAction="'test'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButton action="'testAction'"/>
+                    <BuilderButton classAction="'test'"/>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         await contains("[data-action-id='testAction']").hover();
@@ -265,12 +274,14 @@ describe("Operation that will fail", () => {
         addBuilderAction({
             TestAction,
         });
-        addBuilderOption({
-            selector: ".test-options-target",
-            template: xml`
-                <BuilderButton action="'testAction'"/>
-                <BuilderButton classAction="'test'"/>`,
-        });
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
+                static template = xml`
+                    <BuilderButton action="'testAction'"/>
+                    <BuilderButton classAction="'test'"/>`;
+            }
+        );
         await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
         await contains(":iframe .test-options-target").click();
         await contains("[data-action-id='testAction']").click();
diff --git a/addons/html_builder/static/tests/shadow_option.test.js b/addons/html_builder/static/tests/shadow_option.test.js
index 7ce76ba6454a2..b20b7da15c1e9 100644
--- a/addons/html_builder/static/tests/shadow_option.test.js
+++ b/addons/html_builder/static/tests/shadow_option.test.js
@@ -4,13 +4,19 @@ import { queryAllTexts, queryAllValues, waitFor } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
 
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { ShadowOption } from "@html_builder/plugins/shadow_option";
+
 describe.current.tags("desktop");
 
 test("edit box-shadow with ShadowOption", async () => {
-    addBuilderOption({
-        selector: ".test-options-target",
-        template: xml`<ShadowOption/>`,
-    });
+    addBuilderOption(
+        class extends BaseOptionComponent {
+            static selector = ".test-options-target";
+            static template = xml`<ShadowOption/>`;
+            static components = { ShadowOption };
+        }
+    );
     await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
     await contains(":iframe .test-options-target").click();
     await waitFor(".hb-row");
diff --git a/addons/html_builder/static/tests/utils.test.js b/addons/html_builder/static/tests/utils.test.js
index 8693b12393203..b18424b95299d 100644
--- a/addons/html_builder/static/tests/utils.test.js
+++ b/addons/html_builder/static/tests/utils.test.js
@@ -15,9 +15,9 @@ describe.current.tags("desktop");
 describe("useDomState", () => {
     test("Should not update the state of an async useDomState if a new step has been made", async () => {
         let currentResolve;
-        addBuilderOption({
-            selector: ".test-options-target",
-            Component: class extends BaseOptionComponent {
+        addBuilderOption(
+            class extends BaseOptionComponent {
+                static selector = ".test-options-target";
                 static template = xml`<div t-att-data-letter="getLetter()"/>`;
                 setup() {
                     super.setup(...arguments);
@@ -34,8 +34,8 @@ describe("useDomState", () => {
                     expect.step(`state: ${this.state.delay}`);
                     return this.state.delay;
                 }
-            },
-        });
+            }
+        );
         const { getEditor } = await setupHTMLBuilder(`<div class="test-options-target">a</div>`);
         await animationFrame();
         await contains(":iframe .test-options-target").click();
@@ -92,6 +92,7 @@ describe("waitSidebarUpdated", () => {
             }
         }
         class TestOptionComponent extends BaseOptionComponent {
+            static selector = "div.test";
             static template = xml`
                 <div class="test-value-parent">
                     <t t-out="state.value"/>
@@ -116,10 +117,7 @@ describe("waitSidebarUpdated", () => {
                 });
             }
         }
-        addBuilderOption({
-            selector: "div.test",
-            Component: TestOptionComponent,
-        });
+        addBuilderOption(TestOptionComponent);
         const { waitSidebarUpdated } = await setupHTMLBuilder(
             `<div class="test" data-value="a">a</div>`
         );
diff --git a/addons/html_editor/static/src/editor.js b/addons/html_editor/static/src/editor.js
index 52308d0b203f8..6e085a5f27c8b 100644
--- a/addons/html_editor/static/src/editor.js
+++ b/addons/html_editor/static/src/editor.js
@@ -36,6 +36,16 @@ import { setElementContent } from "@web/core/utils/html";
  * @property { boolean } [dropImageAsAttachment]
  * @property { CollaborationConfig } [collaboration]
  * @property { Function } getRecordInfo
+ *
+ * @typedef { Object } EditorContext
+ * @property { Document } document
+ * @property { HTMLElement } editable
+ * @property { SharedMethods } dependencies
+ * @property { import("./editor").EditorConfig } config
+ * @property { * } services
+ * @property { Editor['getResource'] } getResource
+ * @property { Editor['dispatchTo'] } dispatchTo
+ * @property { Editor['delegateTo'] } delegateTo
  */
 
 function sortPlugins(plugins) {
@@ -136,27 +146,17 @@ export class Editor {
     preparePlugins() {
         const Plugins = sortPlugins(this.config.Plugins || MAIN_PLUGINS);
         this.config = Object.assign({}, ...Plugins.map((P) => P.defaultConfig), this.config);
-        const plugins = new Map();
+        this.pluginsMap = new Map();
         for (const P of Plugins) {
             if (P.id === "") {
                 throw new Error(`Missing plugin id (class ${P.name})`);
             }
-            if (plugins.has(P.id)) {
+            if (this.pluginsMap.has(P.id)) {
                 throw new Error(`Duplicate plugin id: ${P.id}`);
             }
-            const imports = {};
-            for (const dep of P.dependencies) {
-                if (plugins.has(dep)) {
-                    imports[dep] = {};
-                    for (const h of plugins.get(dep).shared) {
-                        imports[dep][h] = this.shared[dep][h];
-                    }
-                } else {
-                    throw new Error(`Missing dependency for plugin ${P.id}: ${dep}`);
-                }
-            }
-            plugins.set(P.id, P);
-            const plugin = new P(this.document, this.editable, imports, this.config, this.services);
+            this.pluginsMap.set(P.id, P);
+            const plugin = new P(this.getEditorContext(P.dependencies));
+            plugin.__editor = this;
             this.plugins.push(plugin);
             const exports = {};
             for (const h of P.shared) {
@@ -182,6 +182,17 @@ export class Editor {
         this.resources["start_edition_handlers"].forEach((cb) => cb());
     }
 
+    getDependencies(dependencies) {
+        const deps = {};
+        for (const depName of dependencies) {
+            if (!(depName in this.shared)) {
+                throw new Error(`Missing dependency: ${depName}`);
+            }
+            deps[depName] = this.shared[depName];
+        }
+        return deps;
+    }
+
     createResources() {
         const resources = {};
 
@@ -220,6 +231,22 @@ export class Editor {
         return Object.freeze(resources);
     }
 
+    /**
+     * @return { EditorContext }
+     */
+    getEditorContext(dependencies = []) {
+        return {
+            document: this.document,
+            editable: this.editable,
+            dependencies: this.getDependencies(dependencies),
+            config: this.config,
+            services: this.services,
+            getResource: this.getResource.bind(this),
+            dispatchTo: this.dispatchTo.bind(this),
+            delegateTo: this.delegateTo.bind(this),
+        };
+    }
+
     /**
      * @param {string} resourceId
      * @returns {Array}
@@ -229,15 +256,52 @@ export class Editor {
     }
 
     /**
-     * Executes the functions registered under resourceId with the given
+     * Execute the functions registered under resourceId with the given
      * arguments.
      *
+     * This function is meant to enhance code readability by clearly expressing
+     * its intent.
+     *
+     * This function can be thought as an event dispatcher, calling the handlers
+     * with `args` as the payload.
+     *
+     * Example:
+     * ```js
+     * this.dispatchTo("my_event_handlers", arg1, arg2);
+     * ```
+     *
      * @param {string} resourceId
-     * @param  {...any} args The arguments to pass to the handlers
+     * @param  {...any} args The arguments to pass to the handlers.
      */
     dispatchTo(resourceId, ...args) {
         this.getResource(resourceId).forEach((handler) => handler(...args));
     }
+    /**
+     * Execute a series of functions until one of them returns a truthy value.
+     *
+     * This function is meant to enhance code readability by clearly expressing
+     * its intent.
+     *
+     * A command "delegates" its execution to one of the overriding functions,
+     * which return a truthy value to signal it has been handled.
+     *
+     * It is the the caller's responsability to stop the execution when this
+     * function returns true.
+     *
+     * Example:
+     * ```js
+     * if (this.delegateTo("my_command_overrides", arg1, arg2)) {
+     *   return;
+     * }
+     * ```
+     *
+     * @param {string} resourceId
+     * @param  {...any} args The arguments to pass to the overrides.
+     * @returns {boolean} Whether one of the overrides returned a truthy value.
+     */
+    delegateTo(resourceId, ...args) {
+        return this.getResource(resourceId).some((fn) => fn(...args));
+    }
 
     getContent() {
         return this.getElContent().innerHTML;
diff --git a/addons/html_editor/static/src/plugin.js b/addons/html_editor/static/src/plugin.js
index a584603eb75d7..e5175537fbfd4 100644
--- a/addons/html_editor/static/src/plugin.js
+++ b/addons/html_editor/static/src/plugin.js
@@ -5,6 +5,7 @@ export const isValidTargetForDomListener = (target) =>
 
 /**
  * @typedef { import("./editor").Editor } Editor
+ * @typedef { import("./editor").EditorContext } EditorContext
  * @typedef { import("./plugin_sets").SharedMethods } SharedMethods
  */
 
@@ -15,29 +16,28 @@ export class Plugin {
     static defaultConfig = {};
 
     /**
-     * @param {Editor['document']} document
-     * @param {Editor['editable']} editable
-     * @param {SharedMethods} dependencies
-     * @param {import("./editor").EditorConfig} config
-     * @param {*} services
+     * @param { EditorContext } context
      */
-    constructor(document, editable, dependencies, config, services) {
-        /** @type { Document } **/
-        this.document = document;
-        /** @type { Window } */
-        this.window = document.defaultView;
-        /** @type { HTMLElement } **/
-        this.editable = editable;
-        /** @type { EditorConfig } **/
-        this.config = config;
-        this.services = services;
-        /** @type { SharedMethods } **/
-        this.dependencies = dependencies;
+    constructor(context) {
+        /** @type { EditorContext['document'] } **/
+        this.document = context.document;
+        this.window = context.document.defaultView;
+        /** @type { EditorContext['editable'] } **/
+        this.editable = context.editable;
+        /** @type { EditorContext['config'] } **/
+        this.config = context.config;
+        /** @type { EditorContext['services'] } **/
+        this.services = context.services;
+        /** @type { EditorContext['dependencies'] } **/
+        this.dependencies = context.dependencies;
+        /** @type { EditorContext['getResource'] } **/
+        this.getResource = context.getResource;
+        /** @type { EditorContext['dispatchTo'] } **/
+        this.dispatchTo = context.dispatchTo;
+        /** @type { EditorContext['delegateTo'] } **/
+        this.delegateTo = context.delegateTo;
+
         this._cleanups = [];
-        /**
-         * The resources aggregated from all the plugins by the editor.
-         */
-        this._resources = null; // set before start
         this.isDestroyed = false;
     }
 
@@ -82,68 +82,6 @@ export class Plugin {
         this.addDomListener(this.document, eventName, fn, capture, true);
     }
 
-    /**
-     * @param {string} resourceId
-     * @returns {Array}
-     */
-    getResource(resourceId) {
-        return this._resources[resourceId] || [];
-    }
-
-    /**
-     * Execute all the callbacks registered under resourceId (which ends with
-     * "_handlers" by convention) with the given arguments.
-     *
-     * This function can be thought as an event dispatcher, calling the handlers
-     * with `args` as the payload.
-     *
-     * Example:
-     * ```js
-     * this.dispatchTo("my_event_handlers", arg1, arg2);
-     * ```
-     *
-     * @param {string} resourceId
-     * @param  {...any} args The arguments to pass to the handlers.
-     */
-    dispatchTo(resourceId, ...args) {
-        this.getResource(resourceId).forEach((handler) => handler(...args));
-    }
-
-    /**
-     * Execute a series of callbacks registered under resourceId (which ends
-     * with "_overrides" by convention) until one of them returns a truthy
-     * value, and returns whether this happened.
-     *
-     * Warning: not all callbacks will necessarily be run. Consider using
-     * {@link dispatchTo} instead if all callbacks must be executed.
-     *
-     * Semantically, this function indicates that, even though there's code to
-     * handle an operation the default way, it can be **delegated** to a
-     * callback that handles a specific case, in which case it **overrides**
-     * that default behavior.
-     *
-     * The registered "_overrides" callbacks must return a truthy value to
-     * signal the operation has been handled.
-     *
-     * It is the caller's responsibility to stop the execution when this
-     * function returns true.
-     *
-     * Example:
-     * ```js
-     * if (this.delegateTo("some_operation_overrides", arg1, arg2)) {
-     *   return;
-     * }
-     * // code that does some operation the default way - executed unless overridden
-     * ```
-     *
-     * @param {string} resourceId
-     * @param  {...any} args The arguments to pass to the overrides.
-     * @returns {boolean} Whether one of the overrides returned a truthy value.
-     */
-    delegateTo(resourceId, ...args) {
-        return this.getResource(resourceId).some((fn) => fn(...args));
-    }
-
     destroy() {
         for (const cleanup of this._cleanups) {
             cleanup();
diff --git a/addons/html_editor/static/tests/toolbar.test.js b/addons/html_editor/static/tests/toolbar.test.js
index 5c53fc8d944ce..8d4cacd011806 100644
--- a/addons/html_editor/static/tests/toolbar.test.js
+++ b/addons/html_editor/static/tests/toolbar.test.js
@@ -51,6 +51,7 @@ import { nodeSize } from "@html_editor/utils/position";
 import { expectElementCount } from "./_helpers/ui_expectations";
 import { ToolbarPlugin } from "@html_editor/main/toolbar/toolbar_plugin";
 import { ImageCrop } from "@html_editor/main/media/image_crop";
+import { Editor } from "@html_editor/editor";
 
 test.tags("desktop");
 test("toolbar is only visible when selection is not collapsed in desktop", async () => {
@@ -959,7 +960,7 @@ describe("compact toolbar", () => {
     });
 
     const patchToUseOnlyTestButtons = () =>
-        patchWithCleanup(ToolbarPlugin.prototype, {
+        patchWithCleanup(Editor.prototype, {
             getResource(resourceName) {
                 const result = super.getResource(resourceName);
                 if (resourceName === "toolbar_groups") {
diff --git a/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js
index 5c4f7b9b9c6a3..918de23e5e965 100644
--- a/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js
@@ -1,20 +1,27 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { after, WIDTH } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class AlertOption extends BaseOptionComponent {
+    static template = "mass_mailing.AlertOption";
+    static selector = ".s_mail_alert .s_alert";
+}
+
+export class BorderOption extends BaseOptionComponent {
+    static template = "mass_mailing.BorderOption";
+    static selector = ".s_mail_alert .s_alert";
+    static components = {BorderConfigurator}
+}
+
 class AlertOptionPlugin extends Plugin {
     static id = "mass_mailing.AlertOption";
     resources = {
         builder_options: [
-            withSequence(after(WIDTH), {
-                selector: ".s_mail_alert .s_alert",
-                template: "mass_mailing.AlertOption",
-            }),
-            withSequence(after(WIDTH), {
-                selector: ".s_mail_alert .s_alert",
-                template: "mass_mailing.BorderOption",
-            }),
+            withSequence(after(WIDTH), AlertOption),
+            withSequence(after(WIDTH), BorderOption),
         ],
         patch_builder_options: [
             {
diff --git a/addons/mass_mailing/static/src/builder/plugins/background_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/background_option_plugin.js
index c304b881271d0..d75bf986b66df 100644
--- a/addons/mass_mailing/static/src/builder/plugins/background_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/background_option_plugin.js
@@ -2,21 +2,26 @@ import { BackgroundOption } from "@html_builder/plugins/background_option/backgr
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+export class MailingBackgroundOption extends BackgroundOption {
+    static selector =
+        ".s_masonry_block > .container > .row > div:not(:has(.row)), .s_cover > .container > .row > div, .s_reviews_wall";
+    static props = {
+        ...BackgroundOption.props,
+        withColors: { type: Boolean, optional: true },
+        withImages: { type: Boolean, optional: true },
+        withColorCombinations: { type: Boolean, optional: true },
+    };
+    static defaultProps = {
+        withImages: true,
+        withColors: false,
+        withColorCombinations: false,
+    };
+}
+
 class BackgroundOptionPlugin extends Plugin {
     static id = "mass_mailing.BackgroundOption";
     resources = {
-        builder_options: [
-            {
-                selector:
-                    ".s_masonry_block > .container > .row > div:not(:has(.row)), .s_cover > .container > .row > div, .s_reviews_wall",
-                OptionComponent: BackgroundOption,
-                props: {
-                    withImages: true,
-                    withColors: false,
-                    withColorCombinations: false,
-                },
-            },
-        ],
+        builder_options: MailingBackgroundOption,
     };
 }
 
diff --git a/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js
index 1abc5e43e7d4f..b1fd196a5ae6b 100644
--- a/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js
@@ -1,32 +1,45 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { before, VERTICAL_ALIGNMENT, WIDTH } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class BorderOption1 extends BaseOptionComponent {
+    static template = "mass_mailing.BorderOption";
+    static selector = ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div";
+    static applyTo = ".card";
+    static components = { BorderConfigurator };
+}
+
+export class BorderOption2 extends BaseOptionComponent {
+    static template = "mass_mailing.BorderOption";
+    static selector = ".s_text_block";
+    static components = { BorderConfigurator };
+}
+
+export class BorderOption3 extends BaseOptionComponent {
+    static template = "mass_mailing.BorderOption";
+    static selector = ".o_mail_block_discount2";
+    static applyTo = "table";
+    static components = { BorderConfigurator };
+}
+
+export class BorderOption4 extends BaseOptionComponent {
+    static template = "mass_mailing.BorderOption";
+    static selector = ".row > div";
+    static exclude = ".o_mail_wrapper_td, .s_image_gallery .row > div";
+    static components = { BorderConfigurator };
+}
+
 export class BorderOptionPlugin extends Plugin {
     static id = "mass_mailing.BorderOption";
     resources = {
         builder_options: [
-            withSequence(before(WIDTH), {
-                template: "mass_mailing.BorderOption",
-                selector:
-                    ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div",
-                applyTo: ".card",
-            }),
-            withSequence(before(WIDTH), {
-                template: "mass_mailing.BorderOption",
-                selector: ".s_text_block",
-            }),
-            withSequence(before(WIDTH), {
-                template: "mass_mailing.BorderOption",
-                selector: ".o_mail_block_discount2",
-                applyTo: "table",
-            }),
-            withSequence(VERTICAL_ALIGNMENT, {
-                template: "mass_mailing.BorderOption",
-                selector: ".row > div",
-                exclude: ".o_mail_wrapper_td, .s_image_gallery .row > div",
-            }),
+            withSequence(before(WIDTH), BorderOption1),
+            withSequence(before(WIDTH), BorderOption2),
+            withSequence(before(WIDTH), BorderOption3),
+            withSequence(VERTICAL_ALIGNMENT, BorderOption4),
         ],
     };
 }
diff --git a/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js
index 98b9ecbfdb7ad..7e25701dc5588 100644
--- a/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js
@@ -1,29 +1,33 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { before, VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
-class ColorPickerOptionPlugin extends Plugin {
-    static id = "mass_mailing.ColorPicker";
-    colorPickerSelector = `.note-editable .oe_structure > div:not(:has(> .o_mail_snippet_general)),
+export class ColorPickerOption extends BaseOptionComponent {
+    static template = "mass_mailing.ColorPickerOption";
+    // This selector targets all direct children of .oe_structure except nested structures
+    static selector = `.note-editable .oe_structure > div:not(:has(> .o_mail_snippet_general)),
         .note-editable .oe_structure > .o_mail_snippet_general,
         .note-editable .oe_structure > .o_mail_snippet_general .o_cc,
         .s_mail_color_blocks_2 .row > div`;
+    static exclude = ".o_mail_no_colorpicker, .o_mail_no_options, .s_mail_color_blocks_2";
+}
+
+export class ColorPickerOption2 extends BaseOptionComponent {
+    static template = "mass_mailing.ColorPickerOption";
+    static selector = ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div";
+    static applyTo = ".card-body";
+}
+
+class ColorPickerOptionPlugin extends Plugin {
+    static id = "mass_mailing.ColorPicker";
+    colorPickerSelector = ColorPickerOption.selector;
 
     resources = {
         builder_options: [
-            withSequence(before(VERTICAL_ALIGNMENT), {
-                // Generic option
-                template: "mass_mailing.ColorPickerOption",
-                selector: this.colorPickerSelector,
-                exclude: ".o_mail_no_colorpicker, .o_mail_no_options, .s_mail_color_blocks_2",
-            }),
-            {
-                template: "mass_mailing.ColorPickerOption",
-                selector:
-                    ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div",
-                applyTo: ".card-body",
-            },
+            withSequence(before(VERTICAL_ALIGNMENT), ColorPickerOption),
+            ColorPickerOption2,
         ],
     };
 }
diff --git a/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js b/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js
index d377a4aade74c..bb5ad45c72d15 100644
--- a/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js
@@ -3,6 +3,7 @@ import { withSequence } from "@html_editor/utils/resource";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { FontFamilyPicker } from "../fontfamily_picker";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const OPTION_POSITIONS = {
     BODY: 10,
@@ -68,7 +69,10 @@ class DesignTabPlugin extends Plugin {
     };
 
     getDesignOptionBlock(id, options) {
-        options.selector = "*";
+        const Option = class extends BaseOptionComponent {
+            static selector = "*";
+        }
+        Object.assign(Option, options);
 
         return {
             id: id,
@@ -77,7 +81,7 @@ class DesignTabPlugin extends Plugin {
             headerMiddleButton: false,
             isClonable: false,
             isRemovable: false,
-            options: [options],
+            options: [Option],
             optionsContainerTopButtons: [],
             snippetModel: {},
         };
diff --git a/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js b/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js
index a50bb19f17042..56b67aa49f371 100644
--- a/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js
@@ -1,4 +1,6 @@
-import { CropImageAction } from "@html_builder/plugins/image/image_tool_option_plugin";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { CropImageAction, ImageAndFaOption } from "@html_builder/plugins/image/image_tool_option_plugin";
 import { IMAGE_TOOL } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { closestElement } from "@html_editor/utils/dom_traversal";
@@ -7,6 +9,15 @@ import { MassMailingImageToolOption } from "@mass_mailing/builder/options/image_
 import { registry } from "@web/core/registry";
 import { patch } from "@web/core/utils/patch";
 
+export class FontAwesomeOption extends BaseOptionComponent {
+    static template = "mass_mailing.FontAwesomeOption";
+    static selector = "span.fa, i.fa";
+}
+
+patch(ImageAndFaOption, {
+    components: {...ImageAndFaOption.components, BorderConfigurator},
+})
+
 class ImageToolOptionPlugin extends Plugin {
     static id = "mass_mailing.ImageToolOption";
     resources = {
@@ -29,12 +40,7 @@ class ImageToolOptionPlugin extends Plugin {
                 value: MassMailingImageToolOption,
             },
         ],
-        builder_options: [
-            withSequence(IMAGE_TOOL, {
-                template: "mass_mailing.FontAwesomeOption",
-                selector: "span.fa, i.fa",
-            }),
-        ],
+        builder_options: [withSequence(IMAGE_TOOL, FontAwesomeOption)],
     };
 }
 
diff --git a/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js
index ece9ed83d2c9c..6a5baa6c99db7 100644
--- a/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js
@@ -6,18 +6,18 @@ import { registry } from "@web/core/registry";
 import { isEmptyBlock } from "@html_editor/utils/dom_info";
 import { closestElement } from "@html_editor/utils/dom_traversal";
 
+export class MassMailingLayoutColumnOption extends LayoutColumnOption {
+    static selector = ".o_mail_snippet_general";
+    static exclude = ".s_reviews_wall";
+    static applyTo =
+        ":scope > *:has(> .row:not(.s_nb_column_fixed)), * > .s_allow_columns";
+}
+
 class MassMailingLayoutColumnPlugin extends Plugin {
     static id = "mass_mailing.LayoutColumnPlugin";
     resources = {
         mark_color_level_selector_params: [{ selector: ".o_mail_snippet_general" }],
-        builder_options: [
-            withSequence(before(WIDTH), {
-                OptionComponent: LayoutColumnOption,
-                selector: ".o_mail_snippet_general",
-                exclude: ".s_reviews_wall",
-                applyTo: ":scope > *:has(> .row:not(.s_nb_column_fixed)), * > .s_allow_columns",
-            }),
-        ],
+        builder_options: [withSequence(before(WIDTH), MassMailingLayoutColumnOption)],
         normalize_handlers: this.normalize.bind(this),
     };
 
diff --git a/addons/mass_mailing/static/src/builder/plugins/masonry_block_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/masonry_block_option_plugin.js
index 9debfbbbbbe52..01c7106ef0c54 100644
--- a/addons/mass_mailing/static/src/builder/plugins/masonry_block_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/masonry_block_option_plugin.js
@@ -7,13 +7,7 @@ import { renderToElement } from "@web/core/utils/render";
 class MasonryBlockTemplateOptionPlugin extends Plugin {
     static id = "mass_mailing.MasonryBlock";
     resources = {
-        builder_options: [
-            {
-                groups: ["base.group_user"],
-                OptionComponent: MasonryBlockTemplateOption,
-                selector: ".s_masonry_block",
-            },
-        ],
+        builder_options: [MasonryBlockTemplateOption],
         builder_actions: {
             ChangeMasonryTemplate,
         },
@@ -22,6 +16,8 @@ class MasonryBlockTemplateOptionPlugin extends Plugin {
 
 class MasonryBlockTemplateOption extends BaseOptionComponent {
     static template = "mass_mailing.MasonryBlockTemplateOption";
+    static selector = ".s_masonry_block";
+    static groups = ["base.group_user"];
 }
 
 class ChangeMasonryTemplate extends BuilderAction {
diff --git a/addons/mass_mailing/static/src/builder/plugins/padding_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/padding_option_plugin.js
index 23e888144e4a9..1784a3ca37dbd 100644
--- a/addons/mass_mailing/static/src/builder/plugins/padding_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/padding_option_plugin.js
@@ -1,25 +1,30 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { after, VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class HorizontalPaddingOption extends BaseOptionComponent {
+    static template = "mass_mailing.HorizontalPaddingOption";
+    static selector =
+        "[class*='col-md-'], .s_discount2, .s_text_block, .s_media_list, .s_picture, .s_rating, .s_title, .o_mail_block_footer_social, .s_header_logo, .s_header_social";
+    static exclude = ".s_col_no_resize.row > div, .s_col_no_resize, img";
+}
+
+export class VerticalPaddingOption extends BaseOptionComponent {
+    static template = "mass_mailing.VerticalPaddingOption";
+    static selector = ".o_mail_block_footer_social, .s_header_logo, .s_header_social";
+    static exclude = ".s_col_no_resize.row > div, .s_col_no_resize";
+}
+
 class PaddingOptionPlugin extends Plugin {
     static id = "horizontalPaddingOption";
-    selector =
-        "[class*='col-md-'], .s_discount2, .s_text_block, .s_media_list, .s_picture, .s_rating, .s_title, .o_mail_block_footer_social, .s_header_logo, .s_header_social";
+    selector = HorizontalPaddingOption.selector;
     resources = {
-        mark_color_level_selector_params: [{ selector: this.selector }],
+        mark_color_level_selector_params: [{ selector: HorizontalPaddingOption.selector }],
         builder_options: [
-            withSequence(after(VERTICAL_ALIGNMENT), {
-                template: "mass_mailing.HorizontalPaddingOption",
-                selector: this.selector,
-                exclude: ".s_col_no_resize.row > div, .s_col_no_resize, img",
-            }),
-            withSequence(after(VERTICAL_ALIGNMENT), {
-                template: "mass_mailing.VerticalPaddingOption",
-                selector: ".o_mail_block_footer_social, .s_header_logo, .s_header_social",
-                exclude: ".s_col_no_resize.row > div, .s_col_no_resize",
-            }),
+            withSequence(after(VERTICAL_ALIGNMENT), HorizontalPaddingOption),
+            withSequence(after(VERTICAL_ALIGNMENT), VerticalPaddingOption),
         ],
     };
 }
diff --git a/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js
index a62a3f4138575..6611ab7d583f1 100644
--- a/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js
@@ -1,20 +1,19 @@
-import { AddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseAddProductOption } from "@html_builder/plugins/add_product_option";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { BEGIN } from "@html_builder/utils/option_sequence";
 import { registry } from "@web/core/registry";
 
+export class MassMailingAddProductOption extends BaseAddProductOption {
+    static selector = ".s_pricelist_boxed_section:has(> .container)";
+    productSelector = ".container";
+}
+
 export class PricelistBoxedOptionPlugin extends Plugin {
     static id = "mass_mailing.PricelistBoxedOptionPlugin";
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                selector: ".s_pricelist_boxed_section:has(> .container)",
-                OptionComponent: AddProductOption,
-                props: {
-                    productSelector: ".container",
-                },
-            }),
+            withSequence(BEGIN, MassMailingAddProductOption),
         ],
     };
 }
diff --git a/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js
index 221b9a0923ac8..8b710f6a7db87 100644
--- a/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js
@@ -1,20 +1,24 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { LayoutColumnOption } from "@html_builder/plugins/layout_column_option";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+export class CustomerTestimonialsBlockquote extends BaseOptionComponent {
+    static template = "mass_mailing.CustomerTestimonialsBlockquote";
+    static selector = ".s_reviews_wall .s_mail_blockquote";
+}
+
+export class MassMailingLayoutColumnOption extends LayoutColumnOption {
+    static selector = ".s_reviews_wall .container";
+    static applyTo = ":scope > .row:has(> .s_mail_blockquote), :scope > .row > .s_allow_columns";
+}
+
 class ReviewsWallOptionPlugin extends Plugin {
     static id = "mass_mailing.ReviewsWallOptionPlugin";
     resources = {
         builder_options: [
-            {
-                selector: ".s_reviews_wall .s_mail_blockquote",
-                template: "mass_mailing.CustomerTestimonialsBlockquote",
-            },
-            {
-                selector: ".s_reviews_wall",
-                applyTo: ":scope .container:has(> .row .s_mail_blockquote)",
-                OptionComponent: LayoutColumnOption,
-            },
+            CustomerTestimonialsBlockquote,
+            MassMailingLayoutColumnOption,
         ],
     };
 }
diff --git a/addons/website/static/src/builder/plugins/carousel_option_plugin.js b/addons/website/static/src/builder/plugins/carousel_option_plugin.js
index c0915c20b520d..952f15b723f73 100644
--- a/addons/website/static/src/builder/plugins/carousel_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/carousel_option_plugin.js
@@ -8,6 +8,7 @@ import { withSequence } from "@html_editor/utils/resource";
 import { between } from "@html_builder/utils/option_sequence";
 import { WEBSITE_BACKGROUND_OPTIONS, BOX_BORDER_SHADOW } from "@website/builder/option_sequence";
 import { selectElements } from "@html_editor/utils/dom_traversal";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const CAROUSEL_CARDS_SEQUENCE = between(WEBSITE_BACKGROUND_OPTIONS, BOX_BORDER_SHADOW);
 
@@ -18,6 +19,26 @@ const carouselControlsSelector =
 
 const carouselItemOptionSelector = ".s_carousel .carousel-item, .s_quotes_carousel .carousel-item, .s_carousel_intro .carousel-item, .s_carousel_cards .carousel-item";
 
+export class CarouselOption extends BaseOptionComponent {
+    static template = "website.CarouselOption";
+    static selector = "section";
+    static exclude =
+        ".s_carousel_intro_wrapper, .s_carousel_cards_wrapper, .s_quotes_carousel_wrapper:has(>.s_quotes_carousel_compact)";
+    static applyTo = ":scope > .carousel";
+}
+
+export class CarouselBottomControllersOption extends BaseOptionComponent {
+    static template = "website.CarouselBottomControllersOption";
+    static selector = "section";
+    static applyTo = ".s_carousel_intro, .s_quotes_carousel_compact";
+}
+
+export class CarouselCardsOption extends BaseOptionComponent {
+    static template = "website.CarouselCardsOption";
+    static selector = "section";
+    static applyTo = ".s_carousel_cards";
+}
+
 export class CarouselOptionPlugin extends Plugin {
     static id = "carouselOption";
     static dependencies = ["clone", "builderOptions", "builderActions"];
@@ -25,23 +46,9 @@ export class CarouselOptionPlugin extends Plugin {
 
     resources = {
         builder_options: [
-            {
-                template: "website.CarouselOption",
-                selector: "section",
-                exclude:
-                    ".s_carousel_intro_wrapper, .s_carousel_cards_wrapper, .s_quotes_carousel_wrapper:has(>.s_quotes_carousel_compact)",
-                applyTo: ":scope > .carousel",
-            },
-            {
-                template: "website.CarouselBottomControllersOption",
-                selector: "section",
-                applyTo: ".s_carousel_intro, .s_quotes_carousel_compact",
-            },
-            withSequence(CAROUSEL_CARDS_SEQUENCE, {
-                template: "website.CarouselCardsOption",
-                selector: "section",
-                applyTo: ".s_carousel_cards",
-            }),
+            CarouselOption,
+            CarouselBottomControllersOption,
+            withSequence(CAROUSEL_CARDS_SEQUENCE, CarouselCardsOption),
         ],
         builder_header_middle_buttons: {
             Component: CarouselItemHeaderMiddleButtons,
@@ -300,7 +307,7 @@ export class CarouselOptionPlugin extends Plugin {
             updateCarouselIndicators(carouselEl, newPosition);
 
             // Activate the active slide.
-            this.dependencies["builderOptions"].setNextTarget(activeItemEl);
+            this.dependencies.builderOptions.setNextTarget(activeItemEl);
         }
     }
 }
diff --git a/addons/website/static/src/builder/plugins/content_width_option_plugin.js b/addons/website/static/src/builder/plugins/content_width_option_plugin.js
index 2c4fce83b4b5d..21ddf9b966d67 100644
--- a/addons/website/static/src/builder/plugins/content_width_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/content_width_option_plugin.js
@@ -3,21 +3,20 @@ import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { CONTAINER_WIDTH } from "@website/builder/option_sequence";
 import { ClassAction } from "@html_builder/core/core_builder_action_plugin";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class ContentWidthOption extends BaseOptionComponent {
+    static template = "website.ContentWidthOption";
+    static selector = "section, .s_carousel .carousel-item, .s_carousel_intro_item";
+    static exclude =
+        "[data-snippet] :not(.oe_structure) > [data-snippet],#footer > *,#o_wblog_post_content *, .s_bento_banner section[data-name='Card'],.s_floating_blocks .s_floating_blocks_block, .s_bento_block_card";
+    static applyTo = ":scope > .container, :scope > .container-fluid, :scope > .o_container_small";
+}
 
 class ContentWidthOptionPlugin extends Plugin {
     static id = "contentWidthOption";
-    static dependencies = ["builderActions"];
     resources = {
-        builder_options: [
-            withSequence(CONTAINER_WIDTH, {
-                template: "website.ContentWidthOption",
-                selector: "section, .s_carousel .carousel-item, .s_carousel_intro_item",
-                exclude:
-                    "[data-snippet] :not(.oe_structure) > [data-snippet],#footer > *,#o_wblog_post_content *, .s_bento_banner section[data-name='Card'],.s_floating_blocks .s_floating_blocks_block, .s_bento_block_card",
-                applyTo:
-                    ":scope > .container, :scope > .container-fluid, :scope > .o_container_small",
-            }),
-        ],
+        builder_options: [withSequence(CONTAINER_WIDTH, ContentWidthOption)],
         builder_actions: {
             SetContainerWidthAction,
         },
diff --git a/addons/website/static/src/builder/plugins/customize_website_plugin.js b/addons/website/static/src/builder/plugins/customize_website_plugin.js
index 847d62925a483..37b31e5cc5f2c 100644
--- a/addons/website/static/src/builder/plugins/customize_website_plugin.js
+++ b/addons/website/static/src/builder/plugins/customize_website_plugin.js
@@ -384,7 +384,7 @@ export class CustomizeWebsitePlugin extends Plugin {
 
 export class SwitchThemeAction extends BuilderAction {
     static id = "switchTheme";
-    static dependencies = ["savePlugin", "action"];
+    static dependencies = ["savePlugin"];
     setup() {
         this.preview = false;
     }
diff --git a/addons/website/static/src/builder/plugins/dynamic_svg_option.js b/addons/website/static/src/builder/plugins/dynamic_svg_option.js
index 59e468b07643b..29fc455b6dacb 100644
--- a/addons/website/static/src/builder/plugins/dynamic_svg_option.js
+++ b/addons/website/static/src/builder/plugins/dynamic_svg_option.js
@@ -3,7 +3,7 @@ import { _t } from "@web/core/l10n/translation";
 
 export class DynamicSvgOption extends BaseOptionComponent {
     static template = "website.DynamicSvgOption";
-    static props = {};
+    static selector = "img[src^='/html_editor/shape/'], img[src^='/web_editor/shape/']";
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js b/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js
index 5414dcb83cd99..5bcd2e2376211 100644
--- a/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js
@@ -11,13 +11,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 class DynamicSvgOptionPlugin extends Plugin {
     static id = "DynamicSvgOption";
     resources = {
-        builder_options: [
-            withSequence(DYNAMIC_SVG, {
-                OptionComponent: DynamicSvgOption,
-                props: {},
-                selector: "img[src^='/html_editor/shape/'], img[src^='/web_editor/shape/']",
-            }),
-        ],
+        builder_options: [withSequence(DYNAMIC_SVG, DynamicSvgOption)],
         builder_actions: {
             SvgColorAction,
         },
diff --git a/addons/website/static/src/builder/plugins/edit_interaction_plugin.js b/addons/website/static/src/builder/plugins/edit_interaction_plugin.js
index 045231e93a6fc..99d0b693e467d 100644
--- a/addons/website/static/src/builder/plugins/edit_interaction_plugin.js
+++ b/addons/website/static/src/builder/plugins/edit_interaction_plugin.js
@@ -31,7 +31,7 @@ export class EditInteractionPlugin extends Plugin {
             { once: true }
         );
         const event = new CustomEvent("edit_interaction_plugin_loaded");
-        event.shared = this.config.getShared();
+        event.shared = this.__editor.shared;
         window.parent.document.dispatchEvent(event);
     }
     destroy() {
diff --git a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_mobile_option.js b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_mobile_option.js
index 59c9bb7f0eea9..614346d7bb37d 100644
--- a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_mobile_option.js
+++ b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_mobile_option.js
@@ -2,7 +2,8 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 
 export class FloatingBlocksBlockMobileOption extends BaseOptionComponent {
     static template = "website.FloatingBlocksBlockMobileOption";
-    static props = {};
+    static selector = ".s_floating_blocks .s_floating_blocks_block";
+    static applyTo = ".container-fluid";
     setup() {
         super.setup();
         this.state = useDomState((editingElement) => ({
diff --git a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option.js b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option.js
index 9f946a1328a91..577aead08607b 100644
--- a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option.js
+++ b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option.js
@@ -8,5 +8,5 @@ export class FloatingBlocksBlockOption extends BaseOptionComponent {
         BorderConfigurator,
         AddElementOption,
     };
-    static props = {};
+    static selector = ".s_floating_blocks .s_floating_blocks_block";
 }
diff --git a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js
index 852027455a0d8..f0dd4c501f8fb 100644
--- a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js
@@ -10,15 +10,8 @@ class FloatingBlocksBlockOptionPlugin extends Plugin {
     static id = "floatingBlocksBlockOptionPlugin";
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                OptionComponent: FloatingBlocksBlockMobileOption,
-                selector: ".s_floating_blocks .s_floating_blocks_block",
-                applyTo: ".container-fluid",
-            }),
-            withSequence(LAYOUT_GRID, {
-                OptionComponent: FloatingBlocksBlockOption,
-                selector: ".s_floating_blocks .s_floating_blocks_block",
-            }),
+            withSequence(BEGIN, FloatingBlocksBlockMobileOption),
+            withSequence(LAYOUT_GRID, FloatingBlocksBlockOption),
         ],
         dropzone_selector: [
             // Lock grid-items within their grid
diff --git a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js
index 74e7ef3b8b75c..6034d5c43cf32 100644
--- a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js
@@ -5,16 +5,17 @@ import { after } from "@html_builder/utils/option_sequence";
 import { DEVICE_VISIBILITY } from "@website/builder/option_sequence";
 import { renderToElement } from "@web/core/utils/render";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class FloatingBlocksOption extends BaseOptionComponent {
+    static template = "website.FloatingBlocksOption";
+    static selector = ".s_floating_blocks";
+}
 
 export class FloatingBlocksOptionPlugin extends Plugin {
     static id = "floatingBlocksOptionPlugin";
     resources = {
-        builder_options: [
-            withSequence(after(DEVICE_VISIBILITY), {
-                template: "website.FloatingBlocksOption",
-                selector: ".s_floating_blocks",
-            }),
-        ],
+        builder_options: [withSequence(after(DEVICE_VISIBILITY), FloatingBlocksOption)],
         builder_actions: {
             FloatingBlocksRoundnessAction,
             AddFloatingBlockCardAction,
diff --git a/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js b/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js
index dd627f8a4973f..d18a1a6aa649a 100644
--- a/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js
@@ -9,15 +9,7 @@ import { BorderConfigurator } from "@html_builder/plugins/border_configurator_op
 class FontAwesomeOptionPlugin extends Plugin {
     static id = "fontAwesomeOptionPlugin";
     resources = {
-        builder_options: [
-            withSequence(FONT_AWESOME, {
-                // converted to option component to handle rendering of
-                // options based on the context(social media and share icons).
-                OptionComponent: FontAwesomeOptionComponent,
-                selector: "span.fa, i.fa",
-                exclude: "[data-oe-xpath]",
-            }),
-        ],
+        builder_options: [withSequence(FONT_AWESOME, FontAwesomeOptionComponent)],
         builder_actions: {
             FaResizeAction,
         },
@@ -34,6 +26,8 @@ export class FaResizeAction extends ClassAction {
 }
 export class FontAwesomeOptionComponent extends BaseOptionComponent {
     static template = "website.FontAwesomeOption";
+    static selector = "span.fa, i.fa";
+    static exclude = "[data-oe-xpath]";
     static components = { BorderConfigurator };
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/form/form_action_fields_option.js b/addons/website/static/src/builder/plugins/form/form_action_fields_option.js
index 5888efa1b775f..6f44dfd5cff49 100644
--- a/addons/website/static/src/builder/plugins/form/form_action_fields_option.js
+++ b/addons/website/static/src/builder/plugins/form/form_action_fields_option.js
@@ -3,13 +3,14 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class FormActionFieldsOption extends BaseOptionComponent {
     static template = "website.s_website_form_form_action_fields_option";
+    static dependencies = ["websiteFormOption"];
     static props = {
         activeForm: { type: Object, optional: true },
-        prepareFormModel: Function,
     };
 
     setup() {
         super.setup();
+        this.prepareFormModel = this.dependencies.websiteFormOption.prepareFormModel;
         this.state = useState({
             formInfo: {
                 fields: [],
@@ -20,7 +21,7 @@ export class FormActionFieldsOption extends BaseOptionComponent {
     }
     async getFormInfo(props = this.props) {
         const el = this.env.getEditingElement();
-        const formInfo = await props.prepareFormModel(el, props.activeForm);
+        const formInfo = await this.prepareFormModel(el, props.activeForm);
         Object.assign(
             this.state.formInfo,
             {
diff --git a/addons/website/static/src/builder/plugins/form/form_field_option.js b/addons/website/static/src/builder/plugins/form/form_field_option.js
index 3078ad4176409..9ee8bd8e5f16b 100644
--- a/addons/website/static/src/builder/plugins/form/form_field_option.js
+++ b/addons/website/static/src/builder/plugins/form/form_field_option.js
@@ -15,15 +15,15 @@ const { DateTime } = luxon;
 
 export class FormFieldOption extends BaseOptionComponent {
     static template = "website.s_website_form_field_option";
+    static dependencies = ["websiteFormOption"];
     static props = {
-        fetchModels: Function,
-        loadFieldOptionData: Function,
         redrawSequence: { type: Number, optional: true },
     };
     static components = { FormActionFieldsOption, FormModelRequiredFieldAlert };
 
     setup() {
         super.setup();
+        const { loadFieldOptionData } = this.dependencies.websiteFormOption;
         this.state = useState({
             availableFields: [],
             conditionInputs: [],
@@ -98,7 +98,7 @@ export class FormFieldOption extends BaseOptionComponent {
 
         onWillStart(async () => {
             const el = this.env.getEditingElement();
-            const fieldOptionData = await this.props.loadFieldOptionData(el);
+            const fieldOptionData = await loadFieldOptionData(el);
             this.state.availableFields.push(...fieldOptionData.availableFields);
             this.state.conditionInputs.push(...fieldOptionData.conditionInputs);
             this.state.valueList = fieldOptionData.valueList;
@@ -106,7 +106,7 @@ export class FormFieldOption extends BaseOptionComponent {
         });
         onWillUpdateProps(async (props) => {
             const el = this.env.getEditingElement();
-            const fieldOptionData = await props.loadFieldOptionData(el);
+            const fieldOptionData = await loadFieldOptionData(el);
             this.state.availableFields.length = 0;
             this.state.availableFields.push(...fieldOptionData.availableFields);
             this.state.conditionInputs.length = 0;
diff --git a/addons/website/static/src/builder/plugins/form/form_field_option_redraw.js b/addons/website/static/src/builder/plugins/form/form_field_option_redraw.js
index fceadd7d10858..7715253d34e4d 100644
--- a/addons/website/static/src/builder/plugins/form/form_field_option_redraw.js
+++ b/addons/website/static/src/builder/plugins/form/form_field_option_redraw.js
@@ -4,6 +4,8 @@ import { FormFieldOption } from "./form_field_option";
 export class FormFieldOptionRedraw extends BaseOptionComponent {
     static template = "website.s_website_form_field_option_redraw";
     static props = FormFieldOption.props;
+    static selector = ".s_website_form_field";
+    static exclude = ".s_website_form_dnone";
     static components = { FormFieldOption };
 
     setup() {
diff --git a/addons/website/static/src/builder/plugins/form/form_model_required_field_alert.js b/addons/website/static/src/builder/plugins/form/form_model_required_field_alert.js
index ecd0a39b39c0a..2ca09880b0db2 100644
--- a/addons/website/static/src/builder/plugins/form/form_model_required_field_alert.js
+++ b/addons/website/static/src/builder/plugins/form/form_model_required_field_alert.js
@@ -1,25 +1,28 @@
-import { Component, onWillStart, onWillUpdateProps, useState } from "@odoo/owl";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { onWillStart, onWillUpdateProps, useState } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
 
-export class FormModelRequiredFieldAlert extends Component {
+export class FormModelRequiredFieldAlert extends BaseOptionComponent {
     static template = "website.s_website_form_model_required_field_alert";
+    static dependencies = ["websiteFormOption"];
     static props = {
         fieldName: String,
         modelName: String,
-        fetchModels: Function,
     };
 
     setup() {
+        super.setup();
         this.state = useState({
             message: undefined,
         });
+        this.fetchModels = this.dependencies.websiteFormOption.fetchModels;
         onWillStart(async () => this.handleProps(this.props));
         onWillUpdateProps(async (props) => this.handleProps(props));
     }
     async handleProps(props) {
         // Get list of website_form compatible models, needed for alert message.
         const el = this.env.getEditingElement();
-        const models = await props.fetchModels(el);
+        const models = await this.fetchModels(el);
         const model = models.find((model) => model.model === props.modelName);
         const actionName = model?.website_form_label || props.modelName;
         this.state.message = _t("The field “%(field)s” is mandatory for the action “%(action)s”.", {
diff --git a/addons/website/static/src/builder/plugins/form/form_option.js b/addons/website/static/src/builder/plugins/form/form_option.js
index b433faaa49067..ae9f19e92ab42 100644
--- a/addons/website/static/src/builder/plugins/form/form_option.js
+++ b/addons/website/static/src/builder/plugins/form/form_option.js
@@ -2,19 +2,39 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { getModelName, getParsedDataFor } from "./utils";
 import { FormActionFieldsOption } from "./form_action_fields_option";
 import { session } from "@web/session";
+import { selectElements } from "@html_editor/utils/dom_traversal";
 
 export class FormOption extends BaseOptionComponent {
     static template = "website.s_website_form_form_option";
-    static props = {
-        fetchModels: Function,
-        prepareFormModel: Function,
-        fetchFieldRecords: Function,
-        applyFormModel: Function,
-    };
+    static dependencies = ["websiteFormOption"];
+    static selector = ".s_website_form";
+    static applyTo = "form";
     static components = { FormActionFieldsOption };
+    static cleanForSave(el, { services }) {
+        for (const sigEl of el.querySelectorAll("input[name=website_form_signature]")) {
+            sigEl.remove();
+        }
+
+        for (const formEl of selectElements(el, ".s_website_form form[data-model_name]")) {
+            const model = formEl.dataset.model_name;
+            const fields = [
+                ...formEl.querySelectorAll(
+                    ".s_website_form_field:not(.s_website_form_custom) .s_website_form_input"
+                ),
+            ].map((el) => el.name);
+            if (fields.length) {
+                services.orm.call("ir.model.fields", "formbuilder_whitelist", [
+                    model,
+                    [...new Set(fields)],
+                ]);
+            }
+        }
+    }
 
     setup() {
         super.setup();
+        const { prepareFormModel, applyFormModel, fetchModels } =
+            this.dependencies.websiteFormOption;
         this.hasRecaptchaKey = !!session.recaptcha_public_key;
 
         // Get potential message
@@ -37,14 +57,14 @@ export class FormOption extends BaseOptionComponent {
             this.modelCantChange = !!el.getAttribute("hide-change-model");
 
             // Get list of website_form compatible models.
-            const models = await this.props.fetchModels(el);
+            const models = await fetchModels(el);
             const activeForm = models.find((m) => m.model === modelName);
 
             // If the form has no model it means a new snippet has been dropped.
             // Apply the default model selected in willStart on it.
             if (!el.dataset.model_name) {
-                const formInfo = await this.props.prepareFormModel(el, activeForm);
-                this.props.applyFormModel(el, activeForm, activeForm.id, formInfo);
+                const formInfo = await prepareFormModel(el, activeForm);
+                applyFormModel(el, activeForm, activeForm.id, formInfo);
             }
             return {
                 models,
diff --git a/addons/website/static/src/builder/plugins/form/form_option.xml b/addons/website/static/src/builder/plugins/form/form_option.xml
index 676d3bfc5c7c1..c8aa71ed54034 100644
--- a/addons/website/static/src/builder/plugins/form/form_option.xml
+++ b/addons/website/static/src/builder/plugins/form/form_option.xml
@@ -10,7 +10,7 @@
             </t>
         </BuilderSelect>
     </BuilderRow>
-    <FormActionFieldsOption activeForm="state.activeForm" prepareFormModel="props.prepareFormModel"/>
+    <FormActionFieldsOption activeForm="state.activeForm"/>
     <BuilderRow label.translate="Marked Fields">
         <BuilderSelect id="'field_mark_select'" action="'updateLabelsMark'">
             <BuilderSelectItem classAction="''">None</BuilderSelectItem>
@@ -88,7 +88,7 @@
 
 <t t-name="website.s_website_form_field_option">
     <t t-if="domState.elClassList.includes('s_website_form_model_required')">
-        <FormModelRequiredFieldAlert fieldName="domState.fieldName" modelName="domState.modelName" fetchModels="props.fetchModels"/>
+        <FormModelRequiredFieldAlert fieldName="domState.fieldName" modelName="domState.modelName" />
     </t>
     <BuilderRow label.translate="Type">
         <BuilderSelect t-if="!domState.elClassList.includes('s_website_form_model_required')"
diff --git a/addons/website/static/src/builder/plugins/form/form_option_plugin.js b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
index 5d4e9ce3952d4..21815bb30d515 100644
--- a/addons/website/static/src/builder/plugins/form/form_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
@@ -43,9 +43,16 @@ import { FormOption } from "./form_option";
 import { isSmallInteger } from "@html_builder/utils/utils";
 import { localization } from "@web/core/l10n/localization";
 import { formatDate } from "@web/core/l10n/dates";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 const { DateTime } = luxon;
 
+export class WebsiteFormSubmitOption extends BaseOptionComponent {
+    static template = "website.s_website_form_submit_option";
+    static selector = ".s_website_form_submit";
+    static exclude = ".s_website_form_no_submit_options";
+}
+
 const DEFAULT_EMAIL_TO_VALUE = "info@yourcompany.example.com";
 export class FormOptionPlugin extends Plugin {
     static id = "websiteFormOption";
@@ -63,6 +70,7 @@ export class FormOptionPlugin extends Plugin {
         "setLabelsMark",
         "clearValidationDataset",
         "defaultMessage",
+        "fetchModels",
     ];
     resources = {
         builder_header_middle_buttons: [
@@ -108,34 +116,7 @@ export class FormOptionPlugin extends Plugin {
                 reasons.push(_t("You can't remove the submit button of the form"));
             }
         },
-        builder_options: [
-            {
-                OptionComponent: FormOption,
-                props: {
-                    fetchModels: this.fetchModels.bind(this),
-                    prepareFormModel: this.prepareFormModel.bind(this),
-                    fetchFieldRecords: this.fetchFieldRecords.bind(this),
-                    applyFormModel: this.applyFormModel.bind(this),
-                },
-                selector: ".s_website_form",
-                applyTo: "form",
-                cleanForSave: this.whitelistForms.bind(this),
-            },
-            {
-                OptionComponent: FormFieldOptionRedraw,
-                props: {
-                    fetchModels: this.fetchModels.bind(this),
-                    loadFieldOptionData: this.loadFieldOptionData.bind(this),
-                },
-                selector: ".s_website_form_field",
-                exclude: ".s_website_form_dnone",
-            },
-            {
-                template: "website.s_website_form_submit_option",
-                selector: ".s_website_form_submit",
-                exclude: ".s_website_form_no_submit_options",
-            },
-        ],
+        builder_options: [FormOption, FormFieldOptionRedraw, WebsiteFormSubmitOption],
         builder_actions: {
             // Form actions
             // Components that use this action MUST await fetchModels before they start.
@@ -431,26 +412,7 @@ export class FormOptionPlugin extends Plugin {
             limit: 1000, // Safeguard to not crash DBs
         });
     }
-    async whitelistForms(el) {
-        for (const sigEl of el.querySelectorAll("input[name=website_form_signature]")) {
-            sigEl.remove();
-        }
 
-        for (const formEl of selectElements(el, ".s_website_form form[data-model_name]")) {
-            const model = formEl.dataset.model_name;
-            const fields = [
-                ...formEl.querySelectorAll(
-                    ".s_website_form_field:not(.s_website_form_custom) .s_website_form_input"
-                ),
-            ].map((el) => el.name);
-            if (fields.length) {
-                this.services.orm.call("ir.model.fields", "formbuilder_whitelist", [
-                    model,
-                    [...new Set(fields)],
-                ]);
-            }
-        }
-    }
     /**
      * Set the correct mark on all fields.
      */
@@ -499,7 +461,7 @@ export class FormOptionPlugin extends Plugin {
         field.formatInfo.mark = getMark(formEl);
         const newFieldEl = renderField(field);
         fieldEl.insertAdjacentElement("afterend", newFieldEl);
-        this.dependencies["builderOptions"].setNextTarget(newFieldEl);
+        this.dependencies.builderOptions.setNextTarget(newFieldEl);
     }
     /**
      * To be used in load for any action that uses getActiveField or
diff --git a/addons/website/static/src/builder/plugins/image/grid_image_option.js b/addons/website/static/src/builder/plugins/image/grid_image_option.js
index e6f37eab726a7..87c350c627554 100644
--- a/addons/website/static/src/builder/plugins/image/grid_image_option.js
+++ b/addons/website/static/src/builder/plugins/image/grid_image_option.js
@@ -2,7 +2,7 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 
 export class GridImageOption extends BaseOptionComponent {
     static template = "website.GridImageOption";
-    static props = {};
+    static selector = "img";
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js b/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js
index cd42791f184af..498b5d0d4ff65 100644
--- a/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js
@@ -9,12 +9,7 @@ class GridImageOptionPlugin extends Plugin {
     static id = "gridImageOption";
 
     resources = {
-        builder_options: [
-            withSequence(GRID_IMAGE, {
-                OptionComponent: GridImageOption,
-                selector: "img",
-            }),
-        ],
+        builder_options: [withSequence(GRID_IMAGE, GridImageOption)],
         builder_actions: {
             SetGridImageModeAction,
         },
diff --git a/addons/website/static/src/builder/plugins/image/image_hover_plugin.js b/addons/website/static/src/builder/plugins/image/image_hover_plugin.js
index 1e9c641da780e..3bb332e755e13 100644
--- a/addons/website/static/src/builder/plugins/image/image_hover_plugin.js
+++ b/addons/website/static/src/builder/plugins/image/image_hover_plugin.js
@@ -132,6 +132,8 @@ export class ImageHoverPlugin extends Plugin {
                 }
             }
         },
+        remove_hover_effect_handlers: this.removeHoverEffect.bind(this),
+        set_hover_effect_handlers: this.setHoverEffect.bind(this),
     };
 
     defaultHoverEffectIntensity = 20;
diff --git a/addons/website/static/src/builder/plugins/layout_option/grid_column_option.js b/addons/website/static/src/builder/plugins/layout_option/grid_column_option.js
index 0ce50d9fc9f2d..79b30833871d7 100644
--- a/addons/website/static/src/builder/plugins/layout_option/grid_column_option.js
+++ b/addons/website/static/src/builder/plugins/layout_option/grid_column_option.js
@@ -2,7 +2,7 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 
 export class GridColumnsOption extends BaseOptionComponent {
     static template = "website.GridColumnsOption";
-    static props = {};
+    static selector = ".row:not(.s_col_no_resize) > div";
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js b/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js
index 2beb59295ceed..16068718b4732 100644
--- a/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js
@@ -8,12 +8,7 @@ import { StyleAction } from "@html_builder/core/core_builder_action_plugin";
 export class GridColumnsOptionPlugin extends Plugin {
     static id = "GridColumnsOption";
     resources = {
-        builder_options: [
-            withSequence(GRID_COLUMNS, {
-                OptionComponent: GridColumnsOption,
-                selector: ".row:not(.s_col_no_resize) > div",
-            }),
-        ],
+        builder_options: [withSequence(GRID_COLUMNS, GridColumnsOption)],
         builder_actions: {
             SetGridColumnsPaddingAction,
         },
diff --git a/addons/website/static/src/builder/plugins/layout_option/layout_option.js b/addons/website/static/src/builder/plugins/layout_option/layout_option.js
index 319a643c19f8f..5476ae200c74f 100644
--- a/addons/website/static/src/builder/plugins/layout_option/layout_option.js
+++ b/addons/website/static/src/builder/plugins/layout_option/layout_option.js
@@ -5,19 +5,24 @@ import { SpacingOption } from "./spacing_option";
 
 export class LayoutOption extends BaseOptionComponent {
     static template = "website.LayoutOption";
+    static selector = "section, section.s_carousel_wrapper .carousel-item, .s_carousel_intro_item";
+    static exclude =
+        ".s_dynamic, .s_dynamic_snippet_content, .s_dynamic_snippet_title, .s_masonry_block, .s_framed_intro, .s_features_grid, .s_media_list, .s_table_of_content, .s_process_steps, .s_image_gallery, .s_pricelist_boxed, .s_quadrant, .s_pricelist_cafe, .s_faq_horizontal, .s_image_frame, .s_card_offset, .s_contact_info, .s_tabs, .s_tabs_images, .s_floating_blocks .s_floating_blocks_block, .s_banner_categories";
+    static applyTo = ":scope > *:has(> .row), :scope > .s_allow_columns";
     static components = {
         SelectNumberColumn,
         SpacingOption,
         AddElementOption,
     };
-    static props = {};
 }
 
 export class LayoutGridOption extends BaseOptionComponent {
     static template = "website.LayoutGridOption";
+    static selector =
+        "section.s_masonry_block, section.s_quadrant, section.s_image_frame, section.s_card_offset, section.s_contact_info, section.s_framed_intro, section.s_banner_categories";
+    static applyTo = ":scope > *:has(> .row)";
     static components = {
         SpacingOption,
         AddElementOption,
     };
-    static props = {};
 }
diff --git a/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js b/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js
index 38005ee602a88..1edb11f32d3be 100644
--- a/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js
@@ -16,20 +16,8 @@ class LayoutOptionPlugin extends Plugin {
     static dependencies = ["clone", "selection"];
     resources = {
         builder_options: [
-            withSequence(LAYOUT, {
-                OptionComponent: LayoutOption,
-                selector:
-                    "section, section.s_carousel_wrapper .carousel-item, .s_carousel_intro_item",
-                exclude:
-                    ".s_dynamic, .s_dynamic_snippet_content, .s_dynamic_snippet_title, .s_masonry_block, .s_framed_intro, .s_features_grid, .s_media_list, .s_table_of_content, .s_process_steps, .s_image_gallery, .s_pricelist_boxed, .s_quadrant, .s_pricelist_cafe, .s_faq_horizontal, .s_image_frame, .s_card_offset, .s_contact_info, .s_tabs, .s_tabs_images, .s_floating_blocks .s_floating_blocks_block, .s_banner_categories",
-                applyTo: ":scope > *:has(> .row), :scope > .s_allow_columns",
-            }),
-            withSequence(LAYOUT_GRID, {
-                OptionComponent: LayoutGridOption,
-                selector:
-                    "section.s_masonry_block, section.s_quadrant, section.s_image_frame, section.s_card_offset, section.s_contact_info, section.s_framed_intro, section.s_banner_categories",
-                applyTo: ":scope > *:has(> .row)",
-            }),
+            withSequence(LAYOUT, LayoutOption),
+            withSequence(LAYOUT_GRID, LayoutGridOption),
         ],
         on_cloned_handlers: this.onCloned.bind(this),
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js b/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
index f36298b047a22..2d08dc965851b 100644
--- a/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
@@ -3,19 +3,24 @@ import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC } from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class AccordionOption extends BaseOptionComponent {
+    static template = "website.AccordionOption";
+    static selector = ".s_accordion";
+}
+
+export class AccordionItemOption extends BaseOptionComponent {
+    static template = "website.AccordionItemOption";
+    static selector = ".s_accordion .accordion-item";
+}
 
 class accordionOptionPlugin extends Plugin {
     static id = "accordionOptionPlugin";
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website.AccordionOption",
-                selector: ".s_accordion",
-            }),
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website.AccordionItemOption",
-                selector: ".s_accordion .accordion-item",
-            }),
+            withSequence(SNIPPET_SPECIFIC, AccordionOption),
+            withSequence(SNIPPET_SPECIFIC, AccordionItemOption),
         ],
         so_content_addition_selector: [".s_accordion"],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/animate_option.js b/addons/website/static/src/builder/plugins/options/animate_option.js
index 20aee480e0d1b..8ee47834e2e95 100644
--- a/addons/website/static/src/builder/plugins/options/animate_option.js
+++ b/addons/website/static/src/builder/plugins/options/animate_option.js
@@ -3,10 +3,11 @@ import { isImageSupportedForStyle } from "@html_builder/plugins/image/replace_me
 
 export class AnimateOption extends BaseOptionComponent {
     static template = "website.AnimateOption";
+    static dependencies = ["animateOption"];
+    static selector = ".o_animable, section .row > div, img, .fa, .btn";
+    static exclude =
+        "[data-oe-xpath], .o_not-animable, .s_col_no_resize.row > div, .s_col_no_resize, .s_social_media i.fa, .s_share i.fa";
     static props = {
-        getDirectionsItems: Function,
-        getEffectsItems: Function,
-        canHaveHoverEffect: Function,
         requireAnimation: { type: Boolean, optional: true },
         slots: { type: Object, optional: true },
     };
@@ -16,19 +17,21 @@ export class AnimateOption extends BaseOptionComponent {
         super.setup();
         this.state = useDomState(async (editingElement) => {
             const hasAnimateClass = editingElement.classList.contains("o_animate");
+            this.getDirectionsItems = this.dependencies.animateOption.getDirectionsItems;
+            const { getEffectsItems } = this.dependencies.animateOption;
 
             return {
                 isOptionActive: this.isOptionActive(editingElement),
                 hasAnimateClass: hasAnimateClass,
-                canHover: await this.props.canHaveHoverEffect(editingElement),
+                canHover: await this.canHaveHoverEffect(editingElement),
                 isLimitedEffect: this.limitedEffects.some((className) =>
                     editingElement.classList.contains(className)
                 ),
                 showIntensity: this.shouldShowIntensity(editingElement, hasAnimateClass),
-                effectItems: this.props.getEffectsItems(this.isActiveItem),
-                directionItems: this.props
-                    .getDirectionsItems(editingElement)
-                    .filter((i) => !i.check || i.check(editingElement)),
+                effectItems: getEffectsItems(this.isActiveItem),
+                directionItems: this.getDirectionsItems(editingElement).filter(
+                    (i) => !i.check || i.check(editingElement)
+                ),
                 isInDropdown: editingElement.closest(".dropdown"),
             };
         });
@@ -61,8 +64,7 @@ export class AnimateOption extends BaseOptionComponent {
             return true;
         }
 
-        const possibleDirections = this.props
-            .getDirectionsItems()
+        const possibleDirections = this.getDirectionsItems()
             .map((i) => i.className)
             .filter(Boolean);
         const hasDirection = possibleDirections.some((direction) =>
@@ -71,4 +73,9 @@ export class AnimateOption extends BaseOptionComponent {
 
         return hasDirection;
     }
+    async canHaveHoverEffect(el) {
+        const proms = this.getResource("hover_effect_allowed_predicates").map((p) => p(el));
+        const settledProms = await Promise.all(proms);
+        return settledProms.length && settledProms.every(Boolean);
+    }
 }
diff --git a/addons/website/static/src/builder/plugins/options/animate_option_plugin.js b/addons/website/static/src/builder/plugins/options/animate_option_plugin.js
index 9413e59ef1d31..953c7cd49c33b 100644
--- a/addons/website/static/src/builder/plugins/options/animate_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/animate_option_plugin.js
@@ -16,27 +16,8 @@ export class AnimateOptionPlugin extends Plugin {
     static id = "animateOption";
     static dependencies = ["history", "selection", "split"];
     static shared = ["forceAnimation", "getDirectionsItems", "getEffectsItems"];
-    animateOptionProps = {
-        getDirectionsItems: this.getDirectionsItems.bind(this),
-        getEffectsItems: this.getEffectsItems.bind(this),
-        canHaveHoverEffect: async (el) => {
-            const proms = this.getResource("hover_effect_allowed_predicates").map((p) => p(el));
-            const settledProms = await Promise.all(proms);
-            return settledProms.length && settledProms.every(Boolean);
-        },
-    };
     resources = {
-        builder_options: [
-            withSequence(ANIMATE, {
-                OptionComponent: AnimateOption,
-                selector: ".o_animable, section .row > div, img, .fa, .btn",
-                exclude:
-                    "[data-oe-xpath], .o_not-animable, .s_col_no_resize.row > div, .s_col_no_resize, .s_social_media i.fa, .s_share i.fa",
-                props: this.animateOptionProps,
-                // todo: to implement
-                // textSelector: ".o_animated_text",
-            }),
-        ],
+        builder_options: [withSequence(ANIMATE, AnimateOption)],
         toolbar_items: [
             {
                 id: "animateText",
@@ -353,7 +334,7 @@ export class AnimateOptionPlugin extends Plugin {
 
 export class SetAnimationModeAction extends BuilderAction {
     static id = "setAnimationMode";
-    static dependencies = ["animateOption", "imageHover"];
+    static dependencies = ["animateOption"];
     setup() {
         this.animationWithFadein = ["onAppearance", "onScroll"];
         this.scrollingElement = getScrollingElement(this.document);
@@ -381,7 +362,10 @@ export class SetAnimationModeAction extends BuilderAction {
             delete editingElement.dataset.scrollZoneEnd;
         }
         if (effectName === "onHover") {
-            await this.dependencies.imageHover.removeHoverEffect(editingElement);
+            // Use getResource instead of this.dependencies as imageHover is not
+            // included in translation. This implementation is a hack and could
+            // be improved.
+            await this.getResource("remove_hover_effect_handlers")[0](editingElement);
         }
 
         const isNextAnimationFadein = this.animationWithFadein.includes(nextAction.value);
@@ -402,7 +386,10 @@ export class SetAnimationModeAction extends BuilderAction {
             editingElement.dataset.scrollZoneEnd = 100;
         }
         if (effectName === "onHover") {
-            await this.dependencies.imageHover.setHoverEffect(editingElement);
+            // Use getResource instead of this.dependencies as imageHover is not
+            // included in translation. This implementation is a hack and could
+            // be improved.
+            await this.getResource("set_hover_effect_handlers")[0](editingElement);
         }
         if (forceAnimation) {
             this.dependencies.animateOption.forceAnimation(editingElement);
diff --git a/addons/website/static/src/builder/plugins/options/animate_text.xml b/addons/website/static/src/builder/plugins/options/animate_text.xml
index 20148dbfc3b44..3a31d3d6fa310 100644
--- a/addons/website/static/src/builder/plugins/options/animate_text.xml
+++ b/addons/website/static/src/builder/plugins/options/animate_text.xml
@@ -7,7 +7,7 @@
 
     <t t-name="website_builder.AnimateTextPopover">
         <div class="o_animate_text_popover p-2" data-prevent-closing-overlay="true" t-ref="content">
-            <AnimateOption t-props="props.animateOptionProps">
+            <AnimateOption requireAnimation="true">
                 <t t-set-slot="animationRowTrailing">
                     <button class="btn btn-sm btn-light fa fa-trash" title="Reset" t-on-click="props.onReset"/>
                 </t>
diff --git a/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js b/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
index 614eb406d40c2..a82b686ff5c93 100644
--- a/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
@@ -4,6 +4,7 @@ import { withSequence } from "@html_editor/utils/resource";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { after } from "@html_builder/utils/option_sequence";
 import { WEBSITE_BACKGROUND_OPTIONS } from "@website/builder/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class SetItemTextAction extends BuilderAction {
     static id = "setItemTextAction";
@@ -17,15 +18,17 @@ class SetItemTextAction extends BuilderAction {
     }
 }
 
+export class AnnouncementScrollOption extends BaseOptionComponent {
+    static template = "website.AnnouncementScrollOption";
+    static selector = "section.s_announcement_scroll";
+}
+
 export class AnnouncementScrollOptionPlugin extends Plugin {
     static id = "announcementScrollOptionPlugin";
-    selector = "section.s_announcement_scroll";
+    selector = AnnouncementScrollOption.selector;
     resources = {
         builder_options: [
-            withSequence(after(WEBSITE_BACKGROUND_OPTIONS), {
-                template: "website.AnnouncementScrollOption",
-                selector: this.selector,
-            }),
+            withSequence(after(WEBSITE_BACKGROUND_OPTIONS), AnnouncementScrollOption),
         ],
         builder_actions: {
             SetItemTextAction,
diff --git a/addons/website/static/src/builder/plugins/options/background_option.js b/addons/website/static/src/builder/plugins/options/background_option.js
index 8358e647b815b..794be349afed4 100644
--- a/addons/website/static/src/builder/plugins/options/background_option.js
+++ b/addons/website/static/src/builder/plugins/options/background_option.js
@@ -3,7 +3,7 @@ import { BackgroundOption } from "@html_builder/plugins/background_option/backgr
 import { ParallaxOption } from "./parallax_option";
 import { useBackgroundOption } from "@html_builder/plugins/background_option/background_hook";
 
-export class WebsiteBackgroundOption extends BaseOptionComponent {
+export class BaseWebsiteBackgroundOption extends BaseOptionComponent {
     static template = "website.WebsiteBackgroundOption";
     static components = {
         ...BackgroundOption.components,
@@ -11,10 +11,16 @@ export class WebsiteBackgroundOption extends BaseOptionComponent {
     };
     static props = {
         ...BackgroundOption.props,
+        withColors: { type: Boolean, optional: true },
+        withImages: { type: Boolean, optional: true },
+        withColorCombinations: { type: Boolean, optional: true },
         withVideos: { type: Boolean, optional: true },
     };
     static defaultProps = {
         ...BackgroundOption.defaultProps,
+        withColors: true,
+        withImages: true,
+        withColorCombinations: true,
         withVideos: false,
     };
     setup() {
diff --git a/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js b/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
index 50ba67414719e..20a7a1ab7906a 100644
--- a/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
@@ -3,16 +3,17 @@ import { WEBSITE_BACKGROUND_OPTIONS } from "@website/builder/option_sequence";
 import { withSequence } from "@html_editor/utils/resource";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class BentoBorderOption extends BaseOptionComponent {
+    static template = "html_builder.BentoBorderOption";
+    static selector = ".s_bento_banner section[data-name='Card'], .s_bento_block_card";
+}
 
 class BentoBorderOptionPlugin extends Plugin {
     static id = "BentoBorderOption";
     resources = {
-        builder_options: [
-            withSequence(after(WEBSITE_BACKGROUND_OPTIONS), {
-                template: "html_builder.BentoBorderOption",
-                selector: ".s_bento_banner section[data-name='Card'], .s_bento_block_card",
-            }),
-        ],
+        builder_options: [withSequence(after(WEBSITE_BACKGROUND_OPTIONS), BentoBorderOption)],
     };
 }
 registry.category("website-plugins").add(BentoBorderOptionPlugin.id, BentoBorderOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js b/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js
index f0c067c113072..1f734a8cc80b7 100644
--- a/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js
@@ -2,28 +2,34 @@ import { after, ANIMATE, END } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
-import { WebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
+import { BaseWebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { ShadowOption } from "@html_builder/plugins/shadow_option";
+
+export class BlockquoteOption extends BaseOptionComponent {
+    static template = "website.BlockquoteOption";
+    static selector = ".s_blockquote";
+    static components = { BorderConfigurator, ShadowOption };
+}
+
+export class WebsiteBackgroundBlockquoteOption extends BaseWebsiteBackgroundOption {
+    static selector = ".s_blockquote";
+    static defaultProps = {
+        withColors: true,
+        withImages: true,
+        withShapes: true,
+        withColorCombinations: true,
+    };
+}
 
 class BlockquoteOptionPlugin extends Plugin {
     static id = "blockquoteOption";
-    selector = ".s_blockquote";
     resources = {
-        mark_color_level_selector_params: [{ selector: this.selector }],
+        mark_color_level_selector_params: [{ selector: ".s_blockquote" }],
         builder_options: [
-            withSequence(after(ANIMATE), {
-                selector: this.selector,
-                OptionComponent: WebsiteBackgroundOption,
-                props: {
-                    withColors: true,
-                    withImages: true,
-                    withShapes: true,
-                    withColorCombinations: true,
-                },
-            }),
-            withSequence(END, {
-                template: "website.BlockquoteOption",
-                selector: this.selector,
-            }),
+            withSequence(after(ANIMATE), WebsiteBackgroundBlockquoteOption),
+            withSequence(END, BlockquoteOption),
         ],
     };
 }
diff --git a/addons/website/static/src/builder/plugins/options/border_option_plugin.js b/addons/website/static/src/builder/plugins/options/border_option_plugin.js
index 6b165c430616c..69c9ff83de74a 100644
--- a/addons/website/static/src/builder/plugins/options/border_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/border_option_plugin.js
@@ -3,17 +3,24 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { BOX_BORDER_SHADOW } from "@website/builder/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { ShadowOption } from "@html_builder/plugins/shadow_option";
+
+export class BorderOption extends BaseOptionComponent {
+    static template = "website.BorderOption";
+    static selector = "section .row > div, section:has(.s_carousel_cards)";
+    static exclude = `.s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_image_gallery .row > div, .s_masonry_block .s_col_no_resize, .s_text_cover .row > .o_not_editable, ${CARD_PARENT_HANDLERS}`;
+    static components = {
+        BorderConfigurator,
+        ShadowOption,
+    };
+}
 
 class BorderOptionPlugin extends Plugin {
     static id = "borderOption";
     resources = {
-        builder_options: [
-            withSequence(BOX_BORDER_SHADOW, {
-                template: "website.BorderOption",
-                selector: "section .row > div, section:has(.s_carousel_cards)",
-                exclude: `.s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_image_gallery .row > div, .s_masonry_block .s_col_no_resize, .s_text_cover .row > .o_not_editable, ${CARD_PARENT_HANDLERS}`,
-            }),
-        ],
+        builder_options: [withSequence(BOX_BORDER_SHADOW, BorderOption)],
     };
 }
 registry.category("website-plugins").add(BorderOptionPlugin.id, BorderOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/card_image_option.js b/addons/website/static/src/builder/plugins/options/card_image_option.js
index dafc6a7cd3852..94d35d755b49b 100644
--- a/addons/website/static/src/builder/plugins/options/card_image_option.js
+++ b/addons/website/static/src/builder/plugins/options/card_image_option.js
@@ -3,7 +3,6 @@ import { CardImageAlignmentOption } from "./card_image_alignment_option";
 
 export class CardImageOption extends BaseOptionComponent {
     static template = "website.CardImageOption";
-    static props = {};
     static components = { CardImageAlignmentOption };
 
     setup() {
diff --git a/addons/website/static/src/builder/plugins/options/card_option.js b/addons/website/static/src/builder/plugins/options/card_option.js
index 931049ade2214..3db5c54df1025 100644
--- a/addons/website/static/src/builder/plugins/options/card_option.js
+++ b/addons/website/static/src/builder/plugins/options/card_option.js
@@ -1,14 +1,15 @@
 import { BaseOptionComponent, useGetItemValue } from "@html_builder/core/utils";
-import { WebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
+import { BaseWebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
 import { CardImageOption } from "./card_image_option";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { ShadowOption } from "@html_builder/plugins/shadow_option";
+import { CARD_DISABLE_WIDTH_APPLY_TO, CARD_PARENT_HANDLERS } from "./utils";
 
-export class CardOption extends BaseOptionComponent {
+export class BaseCardOption extends BaseOptionComponent {
     static template = "website.CardOption";
     static components = {
         CardImageOption,
-        WebsiteBackgroundOption,
+        WebsiteBackgroundOption: BaseWebsiteBackgroundOption,
         BorderConfigurator,
         ShadowOption,
     };
@@ -23,3 +24,16 @@ export class CardOption extends BaseOptionComponent {
         this.getItemValue = useGetItemValue();
     }
 }
+
+export class CardOption extends BaseCardOption {
+    static selector = ".s_card";
+    static exclude = `div:is(${CARD_PARENT_HANDLERS}) > .s_card`;
+}
+
+export class CardWithoutWidthOption extends BaseCardOption {
+    static selector = CARD_PARENT_HANDLERS;
+    static applyTo = CARD_DISABLE_WIDTH_APPLY_TO;
+    static defaultProps = {
+        disableWidth: true,
+    };
+}
diff --git a/addons/website/static/src/builder/plugins/options/card_option_plugin.js b/addons/website/static/src/builder/plugins/options/card_option_plugin.js
index e1588c80819bc..16378e4e0c7c6 100644
--- a/addons/website/static/src/builder/plugins/options/card_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/card_option_plugin.js
@@ -1,52 +1,39 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
-import { CardOption } from "./card_option";
-import { CARD_PARENT_HANDLERS } from "@website/builder/plugins/options/utils";
-import { WebsiteBackgroundOption } from "./background_option";
+import {
+    CARD_DISABLE_WIDTH_APPLY_TO,
+    CARD_PARENT_HANDLERS,
+    WEBSITE_BG_APPLY_TO,
+} from "@website/builder/plugins/options/utils";
+import { BaseWebsiteBackgroundOption } from "./background_option";
 import { CarouselCardsItemOption } from "./carousel_cards_item_option";
+import { CardOption, CardWithoutWidthOption } from "./card_option";
+
+export class WebsiteBackgroundCardOption extends BaseWebsiteBackgroundOption {
+    static selector = CARD_PARENT_HANDLERS;
+    static applyTo = WEBSITE_BG_APPLY_TO;
+    static defaultProps = {
+        withColors: true,
+        withImages: true,
+        withShapes: true,
+        withColorCombinations: true,
+    };
+}
 
 class CardOptionPlugin extends Plugin {
     static id = "cardOption";
-    cardSelector = ".s_card";
-    cardExclude = `div:is(${CARD_PARENT_HANDLERS}) > .s_card`;
-    cardDisableWidthApplyTo = ":scope > .s_card:not(.s_carousel_cards_card)";
-    websiteBgApplyTo = ":scope > .s_carousel_cards_card";
+
     resources = {
         builder_options: [
-            {
-                OptionComponent: CardOption,
-                selector: this.cardSelector,
-                exclude: this.cardExclude,
-            },
-            {
-                OptionComponent: CardOption,
-                selector: CARD_PARENT_HANDLERS,
-                applyTo: this.cardDisableWidthApplyTo,
-                props: {
-                    disableWidth: true,
-                },
-            },
-            {
-                OptionComponent: WebsiteBackgroundOption,
-                selector: CARD_PARENT_HANDLERS,
-                applyTo: this.websiteBgApplyTo,
-                props: {
-                    withColors: true,
-                    withImages: true,
-                    withShapes: true,
-                    withColorCombinations: true,
-                },
-            },
-            {
-                OptionComponent: CarouselCardsItemOption,
-                selector: ".s_carousel_cards_item",
-                applyTo: ":scope > .s_carousel_cards_card",
-            },
+            CardOption,
+            CardWithoutWidthOption,
+            WebsiteBackgroundCardOption,
+            CarouselCardsItemOption,
         ],
         mark_color_level_selector_params: [
-            { selector: this.cardSelector, exclude: this.cardExclude },
-            { selector: CARD_PARENT_HANDLERS, applyTo: this.cardDisableWidthApplyTo },
-            { selector: CARD_PARENT_HANDLERS, applyTo: this.websiteBgApplyTo },
+            { selector: CardOption.selector, exclude: CardOption.exclude },
+            { selector: CARD_PARENT_HANDLERS, applyTo: CARD_DISABLE_WIDTH_APPLY_TO },
+            { selector: CARD_PARENT_HANDLERS, applyTo: WEBSITE_BG_APPLY_TO },
         ],
     };
 }
diff --git a/addons/website/static/src/builder/plugins/options/carousel_cards_item_option.js b/addons/website/static/src/builder/plugins/options/carousel_cards_item_option.js
index a39fb8c7392a3..1928a34a418bd 100644
--- a/addons/website/static/src/builder/plugins/options/carousel_cards_item_option.js
+++ b/addons/website/static/src/builder/plugins/options/carousel_cards_item_option.js
@@ -3,8 +3,9 @@ import { CardImageAlignmentOption } from "./card_image_alignment_option";
 
 export class CarouselCardsItemOption extends BaseOptionComponent {
     static template = "website.CarouselCardsItemOption";
+    static selector = ".s_carousel_cards_item";
+    static applyTo = ":scope > .s_carousel_cards_card";
     static components = {
         CardImageAlignmentOption,
     };
-    static props = {};
 }
diff --git a/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js b/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js
index e92f2d2bf957f..22c79fe556d36 100644
--- a/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js
@@ -1,19 +1,20 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class CarouselSlidesOption extends BaseOptionComponent {
+    static template = "website.CarouselSlidesOption";
+    static selector = ".carousel .carousel-item";
+    static exclude = ".s_image_gallery .carousel-item";
+}
+
 export class CarouselSlidesOptionPlugin extends Plugin {
     static id = "carouselSlidesOption";
     resources = {
-        builder_options: [
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.CarouselSlidesOption",
-                selector: ".carousel .carousel-item",
-                exclude: ".s_image_gallery .carousel-item",
-            }),
-        ],
+        builder_options: [withSequence(SNIPPET_SPECIFIC_END, CarouselSlidesOption)],
         builder_actions: {
             MakeSlideClickableAction,
             SetSlideAnchorUrlAction,
diff --git a/addons/website/static/src/builder/plugins/options/chart_option.js b/addons/website/static/src/builder/plugins/options/chart_option.js
index ee5c58a834dca..6a472ec669b87 100644
--- a/addons/website/static/src/builder/plugins/options/chart_option.js
+++ b/addons/website/static/src/builder/plugins/options/chart_option.js
@@ -1,15 +1,24 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
+import { getCSSVariableValue } from "@html_editor/utils/formatting";
 import { useState } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
+import { isCSSColor } from "@web/core/utils/colors";
 
 export const DATASET_KEY_PREFIX = "chart_dataset_";
 
+export function getColor(color, win, doc) {
+    if (!color) {
+        return "";
+    }
+    return isCSSColor(color)
+        ? color
+        : getCSSVariableValue(color, win.getComputedStyle(doc.documentElement));
+}
+
 export class ChartOption extends BaseOptionComponent {
     static template = "website.ChartOption";
-    static props = {
-        isPieChart: Function,
-        getColor: Function,
-    };
+    static selector = ".s_chart";
+    static dependencies = ["chartOptionPlugin"];
 
     setup() {
         super.setup();
@@ -68,7 +77,7 @@ export class ChartOption extends BaseOptionComponent {
         return data;
     }
     isPieChart(editingElement) {
-        const isPieChart = this.props.isPieChart(editingElement);
+        const isPieChart = this.dependencies.chartOptionPlugin.isPieChart(editingElement);
         if (!this.domState || this.domState.isPieChart !== isPieChart) {
             // Pie charts set color on a data cell basis, whereas the
             // other ones set it on a dataset basis
@@ -82,6 +91,9 @@ export class ChartOption extends BaseOptionComponent {
         const borderLabel = isPieChart ? _t("Data Border") : _t("Dataset Border");
         return { backgroundLabel, borderLabel };
     }
+    getColor(color) {
+        return getColor(color, this.window, this.document);
+    }
     /**
      * Retrieve the colors already in use in the chart.
      *
@@ -93,13 +105,11 @@ export class ChartOption extends BaseOptionComponent {
         const colorSet = new Set();
         for (const dataset of data.datasets) {
             if (this.isPieChart(editingElement)) {
-                dataset.backgroundColor.forEach((color) =>
-                    colorSet.add(this.props.getColor(color))
-                );
-                dataset.borderColor.forEach((color) => colorSet.add(this.props.getColor(color)));
+                dataset.backgroundColor.forEach((color) => colorSet.add(this.getColor(color)));
+                dataset.borderColor.forEach((color) => colorSet.add(this.getColor(color)));
             } else {
-                colorSet.add(this.props.getColor(dataset.backgroundColor));
-                colorSet.add(this.props.getColor(dataset.borderColor));
+                colorSet.add(this.getColor(dataset.backgroundColor));
+                colorSet.add(this.getColor(dataset.borderColor));
             }
         }
         colorSet.delete(""); // No color, remove to avoid bugs.
diff --git a/addons/website/static/src/builder/plugins/options/chart_option.xml b/addons/website/static/src/builder/plugins/options/chart_option.xml
index c377583b3a860..5124123447781 100644
--- a/addons/website/static/src/builder/plugins/options/chart_option.xml
+++ b/addons/website/static/src/builder/plugins/options/chart_option.xml
@@ -45,7 +45,7 @@
                         <BuilderTextInput
                             action="'updateDatasetLabel'"
                             actionParam="dataset.key"
-                            style="domState.isPieChart ? '' : ('border: 2px solid ' + (props.getColor(dataset.backgroundColor) || props.getColor(dataset.borderColor)))"/>
+                            style="domState.isPieChart ? '' : ('border: 2px solid ' + (getColor(dataset.backgroundColor) || getColor(dataset.borderColor)))"/>
                     </th>
                 </t>
 
@@ -66,8 +66,8 @@
                 </th>
 
                 <t t-foreach="domState.data.datasets" t-as="dataset" t-key="dataset.key">
-                    <t t-set="backgroundColor" t-value="props.getColor(dataset.backgroundColor[label_index])"/>
-                    <t t-set="borderColor" t-value="props.getColor(dataset.borderColor[label_index])"/>
+                    <t t-set="backgroundColor" t-value="getColor(dataset.backgroundColor[label_index])"/>
+                    <t t-set="borderColor" t-value="getColor(dataset.borderColor[label_index])"/>
                     <td>
                         <BuilderNumberInput
                             action="'updateDatasetValue'"
diff --git a/addons/website/static/src/builder/plugins/options/chart_option_plugin.js b/addons/website/static/src/builder/plugins/options/chart_option_plugin.js
index c814f104a9ee1..c0db34368956d 100644
--- a/addons/website/static/src/builder/plugins/options/chart_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/chart_option_plugin.js
@@ -1,24 +1,15 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
-import { ChartOption, DATASET_KEY_PREFIX } from "./chart_option";
+import { ChartOption, DATASET_KEY_PREFIX, getColor } from "./chart_option";
 import { Plugin } from "@html_editor/plugin";
-import { getCSSVariableValue } from "@html_editor/utils/formatting";
 import { registry } from "@web/core/registry";
-import { isCSSColor } from "@web/core/utils/colors";
 
 class ChartOptionPlugin extends Plugin {
     static id = "chartOptionPlugin";
     static dependencies = ["history"];
+    static shared = ["isPieChart"];
+
     resources = {
-        builder_options: [
-            {
-                OptionComponent: ChartOption,
-                selector: ".s_chart",
-                props: {
-                    isPieChart,
-                    getColor: (color) => getColor(color, this.window, this.document),
-                },
-            },
-        ],
+        builder_options: [ChartOption],
         so_content_addition_selector: [".s_chart"],
         builder_actions: {
             SetChartTypeAction,
@@ -33,21 +24,15 @@ class ChartOptionPlugin extends Plugin {
             ColorChangeAction,
         },
     };
-}
 
-function isPieChart(editingElement) {
-    return ["pie", "doughnut"].includes(editingElement.dataset.type);
-}
-function getColor(color, win, doc) {
-    if (!color) {
-        return "";
+    isPieChart(editingElement) {
+        return ["pie", "doughnut"].includes(editingElement.dataset.type);
     }
-    return isCSSColor(color)
-        ? color
-        : getCSSVariableValue(color, win.getComputedStyle(doc.documentElement));
 }
+
 export class BaseChartAction extends BuilderAction {
     static id = "baseChart";
+    static dependencies = ["chartOptionPlugin"];
     updateDOMData(editingElement, data) {
         editingElement.dataset.data = JSON.stringify(data);
     }
@@ -71,7 +56,7 @@ export class BaseChartAction extends BuilderAction {
     }
 
     isPieChart(editingElement) {
-        return isPieChart(editingElement);
+        return this.dependencies.chartOptionPlugin.isPieChart(editingElement);
     }
 
     getColor(color) {
diff --git a/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js b/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js
index 563e3b21d5d84..c9625adf41aad 100644
--- a/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js
@@ -3,22 +3,23 @@ import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
 import { rpc } from "@web/core/network/rpc";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 const mainObjectRe = /website\.controller\.page\(((\d+,?)*)\)/;
 
+export class ControllerPageListingLayoutOption extends BaseOptionComponent {
+    static template = "website.ControllerPageListingLayoutOption";
+    static selector = ".listing_layout_switcher";
+    static editableOnly = false;
+    static title = _t("Layout");
+    static groups = ["website.group_website_designer"];
+}
+
 class ControllerPageListingLayoutOptionPlugin extends Plugin {
     static id = "controllerPageListingLayoutOption";
     static dependencies = ["builderActions"];
     resources = {
-        builder_options: [
-            {
-                template: "website.ControllerPageListingLayoutOption",
-                selector: ".listing_layout_switcher",
-                editableOnly: false,
-                title: _t("Layout"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [ControllerPageListingLayoutOption],
         builder_actions: {
             ListingLayoutAction,
         },
diff --git a/addons/website/static/src/builder/plugins/options/cookies_bar_option.js b/addons/website/static/src/builder/plugins/options/cookies_bar_option.js
index 3c28e98b83ff3..9b84730054fd8 100644
--- a/addons/website/static/src/builder/plugins/options/cookies_bar_option.js
+++ b/addons/website/static/src/builder/plugins/options/cookies_bar_option.js
@@ -1,19 +1,19 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { renderToElement } from "@web/core/utils/render";
 
+export class CookiesBarOption extends BaseOptionComponent {
+    static template = "website.CookiesBarOption";
+    static selector = "#website_cookies_bar";
+    static applyTo = ".modal";
+}
 class CookiesBarOptionPlugin extends Plugin {
     static id = "CookiesBarOptionPlugin";
     static shared = ["getSavedSelectors"];
     resources = {
-        builder_options: [
-            {
-                template: "website.CookiesBarOption",
-                selector: "#website_cookies_bar",
-                applyTo: ".modal",
-            },
-        ],
+        builder_options: [CookiesBarOption],
         builder_actions: {
             SelectLayoutAction,
         },
diff --git a/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js b/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js
index f63b82dd4112b..9e7172477563f 100644
--- a/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js
@@ -1,4 +1,5 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { before, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { getElementsWithOption } from "@html_builder/utils/utils";
 import { Plugin } from "@html_editor/plugin";
@@ -6,16 +7,18 @@ import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { renderToElement } from "@web/core/utils/render";
 
+export class CountdownOption extends BaseOptionComponent {
+    static template = "website.CountdownOption";
+    static selector = ".s_countdown";
+    static cleanForSave = (editingEl) => {
+        editingEl.classList.remove("s_countdown_enable_preview");
+    };
+}
+
 class CountdownOptionPlugin extends Plugin {
     static id = "CountdownOption";
     resources = {
-        builder_options: [
-            withSequence(before(SNIPPET_SPECIFIC_END), {
-                template: "website.CountdownOption",
-                selector: ".s_countdown",
-                cleanForSave,
-            }),
-        ],
+        builder_options: [withSequence(before(SNIPPET_SPECIFIC_END), CountdownOption)],
         so_content_addition_selector: [".s_countdown"],
         builder_actions: {
             // TODO AGAU: update after merging generalized restart interactions
@@ -34,9 +37,6 @@ class CountdownOptionPlugin extends Plugin {
     };
 }
 
-function cleanForSave(editingEl) {
-    editingEl.classList.remove("s_countdown_enable_preview");
-}
 export class BaseCountdownAction extends BuilderAction {
     static id = "baseCountdown";
     /**
@@ -49,7 +49,7 @@ export class BaseCountdownAction extends BuilderAction {
     editingElEndMessages = new WeakMap();
 
     cleanForSave(editingEl) {
-        return cleanForSave(editingEl);
+        return CountdownOption.cleanForSave(editingEl);
     }
 
     setEndAction({ editingElement, value }) {
diff --git a/addons/website/static/src/builder/plugins/options/cover_properties_option.js b/addons/website/static/src/builder/plugins/options/cover_properties_option.js
index c30e577837222..0128e50fff6fd 100644
--- a/addons/website/static/src/builder/plugins/options/cover_properties_option.js
+++ b/addons/website/static/src/builder/plugins/options/cover_properties_option.js
@@ -3,7 +3,8 @@ import { _t } from "@web/core/l10n/translation";
 
 export class CoverPropertiesOption extends BaseOptionComponent {
     static template = "website.CoverPropertiesOption";
-    static props = {};
+    static selector = ".o_record_cover_container";
+    static editableOnly = false;
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js b/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js
index 04ff4882a6f48..956ebfe9fb462 100644
--- a/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js
@@ -11,13 +11,7 @@ class CoverPropertiesOptionPlugin extends Plugin {
     static id = "coverPropertiesOption";
     static dependencies = ["builderActions", "media", "imagePostProcess"];
     resources = {
-        builder_options: [
-            withSequence(COVER_PROPERTIES, {
-                OptionComponent: CoverPropertiesOption,
-                selector: ".o_record_cover_container",
-                editableOnly: false,
-            }),
-        ],
+        builder_options: [withSequence(COVER_PROPERTIES, CoverPropertiesOption)],
         builder_actions: {
             SetCoverBackgroundAction,
             MarkCoverPropertiesToBeSavedAction,
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option.js
index be1eb3b2f8334..91e9ade29e6b9 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option.js
@@ -1,12 +1,14 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { useDynamicSnippetOption } from "./dynamic_snippet_hook";
-import { DynamicSnippetOption } from "./dynamic_snippet_option";
 
 export class DynamicSnippetCarouselOption extends BaseOptionComponent {
     static template = "website.DynamicSnippetCarouselOption";
-    static props = { ...DynamicSnippetOption.props };
+    static dependencies = ["dynamicSnippetCarouselOption"];
+    static selector = ".s_dynamic_snippet_carousel";
+
     setup() {
         super.setup();
-        this.dynamicOptionParams = useDynamicSnippetOption(this.props.modelNameFilter);
+        const { getModelNameFilter } = this.dependencies.dynamicSnippetCarouselOption;
+        this.dynamicOptionParams = useDynamicSnippetOption(getModelNameFilter());
     }
 }
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js
index 528dcd97a698c..4448c4107fcdf 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js
@@ -9,26 +9,26 @@ export const DYNAMIC_SNIPPET_CAROUSEL = DYNAMIC_SNIPPET;
 
 class DynamicSnippetCarouselOptionPlugin extends Plugin {
     static id = "dynamicSnippetCarouselOption";
-    static shared = ["setOptionsDefaultValues", "updateTemplateSnippetCarousel"];
+    static shared = [
+        "setOptionsDefaultValues",
+        "updateTemplateSnippetCarousel",
+        "getModelNameFilter",
+    ];
     static dependencies = ["dynamicSnippetOption"];
-    selector = ".s_dynamic_snippet_carousel";
     modelNameFilter = "";
     resources = {
         builder_actions: {
             SetCarouselSliderSpeedAction,
         },
-        builder_options: withSequence(DYNAMIC_SNIPPET_CAROUSEL, {
-            OptionComponent: DynamicSnippetCarouselOption,
-            props: {
-                modelNameFilter: this.modelNameFilter,
-            },
-            selector: this.selector,
-        }),
+        builder_options: withSequence(DYNAMIC_SNIPPET_CAROUSEL, DynamicSnippetCarouselOption),
         dynamic_snippet_template_updated: this.onTemplateUpdated.bind(this),
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
     };
+    getModelNameFilter() {
+        return this.modelNameFilter;
+    }
     onTemplateUpdated({ el, template }) {
-        if (el.matches(this.selector)) {
+        if (el.matches(DynamicSnippetCarouselOption.selector)) {
             this.updateTemplateSnippetCarousel(el, template);
         }
     }
@@ -45,7 +45,7 @@ class DynamicSnippetCarouselOptionPlugin extends Plugin {
         }
     }
     async onSnippetDropped({ snippetEl }) {
-        if (snippetEl.matches(this.selector)) {
+        if (snippetEl.matches(DynamicSnippetCarouselOption.selector)) {
             await this.setOptionsDefaultValues(snippetEl, this.modelNameFilter);
         }
     }
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option.js
index 738ff76cf65bd..bedb8acd75c16 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option.js
@@ -3,16 +3,18 @@ import { useDynamicSnippetOption } from "./dynamic_snippet_hook";
 
 export class DynamicSnippetOption extends BaseOptionComponent {
     static template = "website.DynamicSnippetOption";
+    static dependencies = ["dynamicSnippetOption"];
+    static selector = ".s_dynamic_snippet";
     static props = {
         slots: { type: Object, optional: true },
-        modelNameFilter: { type: String },
     };
 
     setup() {
         super.setup();
+        const { getModelNameFilter } = this.dependencies.dynamicSnippetOption;
         // Specify model name in subclasses to filter the list of available
         // model record filters. Indicates that some current options are a
         // default selection.
-        this.dynamicOptionParams = useDynamicSnippetOption(this.props.modelNameFilter);
+        this.dynamicOptionParams = useDynamicSnippetOption(getModelNameFilter());
     }
 }
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
index 9c44ae9c3eccf..d2eb06d4999fa 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
@@ -25,21 +25,13 @@ class DynamicSnippetOptionPlugin extends Plugin {
         "isSingleModeSnippetTemplate",
         "setOptionsDefaultValues",
         "updateTemplate",
+        "getModelNameFilter",
     ];
-    selector = ".s_dynamic_snippet";
     modelNameFilter = "";
     fetchedDynamicFilters = [];
     fetchedDynamicFilterTemplates = [];
     resources = {
-        builder_options: [
-            withSequence(DYNAMIC_SNIPPET, {
-                OptionComponent: DynamicSnippetOption,
-                props: {
-                    modelNameFilter: this.modelNameFilter,
-                },
-                selector: this.selector,
-            }),
-        ],
+        builder_options: [withSequence(DYNAMIC_SNIPPET, DynamicSnippetOption)],
         builder_actions: {
             DynamicFilterAction,
             DynamicSnippetTemplateAction,
@@ -63,8 +55,11 @@ class DynamicSnippetOptionPlugin extends Plugin {
         this.dynamicFiltersCache.invalidate();
         this.dynamicFilterTemplatesCache.invalidate();
     }
+    getModelNameFilter() {
+        return this.modelNameFilter;
+    }
     async onSnippetDropped({ snippetEl }) {
-        if (snippetEl.matches(this.selector)) {
+        if (snippetEl.matches(DynamicSnippetOption.selector)) {
             await this.setOptionsDefaultValues(snippetEl, this.modelNameFilter);
         }
     }
diff --git a/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js b/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
index 00bb88bc73cea..4274067f000ce 100644
--- a/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
@@ -3,6 +3,20 @@ import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC_BEFORE, END, VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class EcommCategoriesShowcaseOption extends BaseOptionComponent {
+    static template = "website.EcommCategoriesShowcaseOption";
+    static selector = ".s_ecomm_categories_showcase";
+}
+export class EcommCategoriesShowcaseBlockDesign extends BaseOptionComponent {
+    static template = "website.EcommCategoriesShowcaseBlockDesign";
+    static selector = ".s_ecomm_categories_showcase_block";
+}
+export class EcommCategoriesShowcaseBlocksDesign extends BaseOptionComponent {
+    static template = "website.EcommCategoriesShowcaseBlocksDesign";
+    static selector = ".s_ecomm_categories_showcase";
+}
 
 class EcommCategoriesShowcaseOptionPlugin extends Plugin {
     static id = "ecommCategoriesShowcaseOption";
@@ -17,18 +31,9 @@ class EcommCategoriesShowcaseOptionPlugin extends Plugin {
 
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC_BEFORE, {
-                template: "website.EcommCategoriesShowcaseOption",
-                selector: ".s_ecomm_categories_showcase",
-            }),
-            withSequence(VERTICAL_ALIGNMENT, {
-                template: "website.EcommCategoriesShowcaseBlockDesign",
-                selector: ".s_ecomm_categories_showcase_block",
-            }),
-            withSequence(END, {
-                template: "website.EcommCategoriesShowcaseBlocksDesign",
-                selector: ".s_ecomm_categories_showcase",
-            }),
+            withSequence(SNIPPET_SPECIFIC_BEFORE, EcommCategoriesShowcaseOption),
+            withSequence(VERTICAL_ALIGNMENT, EcommCategoriesShowcaseBlockDesign),
+            withSequence(END, EcommCategoriesShowcaseBlocksDesign),
         ],
         builder_actions: {
             BlockCountAction,
diff --git a/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js b/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js
index 6ceccbba927c9..3e487db064c13 100644
--- a/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js
@@ -6,17 +6,18 @@ import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { cloneContentEls } from "@website/js/utils";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class EmbedCodeOption extends BaseOptionComponent {
+    static template = "website.EmbedCodeOption";
+    static selector = ".s_embed_code";
+}
 
 class EmbedCodeOptionPlugin extends Plugin {
     static id = "embedCodeOption";
 
     resources = {
-        builder_options: [
-            withSequence(BEGIN, {
-                template: "website.EmbedCodeOption",
-                selector: ".s_embed_code",
-            }),
-        ],
+        builder_options: [withSequence(BEGIN, EmbedCodeOption)],
         so_content_addition_selector: [".s_embed_code"],
         builder_actions: {
             EditCodeAction,
diff --git a/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js b/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
index 59de8cff92cfa..077f513e4b757 100644
--- a/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
@@ -3,17 +3,18 @@ import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
 import { getCommonAncestor, selectElements } from "@html_editor/utils/dom_traversal";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class FacebookOption extends BaseOptionComponent {
+    static template = "website.FacebookOption";
+    static selector = ".o_facebook_page";
+}
 
 class FacebookOptionPlugin extends Plugin {
     static id = "facebookOption";
     static dependencies = ["history"];
     resources = {
-        builder_options: [
-            {
-                template: "website.FacebookOption",
-                selector: ".o_facebook_page",
-            },
-        ],
+        builder_options: [FacebookOption],
         so_content_addition_selector: [".o_facebook_page"],
         builder_actions: {
             DataAttributeListAction,
diff --git a/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js b/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js
index aad415544ad11..8747b0da35c70 100644
--- a/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js
@@ -1,18 +1,18 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BEGIN } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class FaqHorizontalOption extends BaseOptionComponent {
+    static template = "website.FaqHorizontalOption";
+    static selector = ".s_faq_horizontal";
+}
+
 class FaqHorizontalOptionPlugin extends Plugin {
     static id = "faqHorizontalOption";
-    static dependencies = ["clone"];
     resources = {
-        builder_options: [
-            withSequence(BEGIN, {
-                template: "website.FaqHorizontalOption",
-                selector: ".s_faq_horizontal",
-            }),
-        ],
+        builder_options: [withSequence(BEGIN, FaqHorizontalOption)],
     };
 }
 registry.category("website-plugins").add(FaqHorizontalOptionPlugin.id, FaqHorizontalOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/footer_copyright_option.js b/addons/website/static/src/builder/plugins/options/footer_copyright_option.js
index 385c2a1f505ce..882787653ae82 100644
--- a/addons/website/static/src/builder/plugins/options/footer_copyright_option.js
+++ b/addons/website/static/src/builder/plugins/options/footer_copyright_option.js
@@ -4,7 +4,9 @@ import { rpc } from "@web/core/network/rpc";
 
 export class FooterCopyrightOption extends BaseOptionComponent {
     static template = "website.FooterCopyrightOption";
-    static props = {};
+    static selector = ".o_footer_copyright";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js b/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js
index 50f1b457897a4..8d8e394e66d30 100644
--- a/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js
@@ -6,14 +6,7 @@ class FooterCopyrightOptionPlugin extends Plugin {
     static id = "footerCopyrightOption";
 
     resources = {
-        builder_options: [
-            {
-                OptionComponent: FooterCopyrightOption,
-                selector: ".o_footer_copyright",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [FooterCopyrightOption],
     };
 }
 
diff --git a/addons/website/static/src/builder/plugins/options/footer_option_plugin.js b/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
index 4f347abf8dd52..9de2403c2cbf4 100644
--- a/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
@@ -7,6 +7,9 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { FooterTemplateChoice, FooterTemplateOption } from "./footer_template_option";
 import { reactive } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { ShadowOption } from "@html_builder/plugins/shadow_option";
 
 const [
     FOOTER_TEMPLATE,
@@ -32,58 +35,66 @@ export {
     FOOTER_BORDER,
 }
 
+export class FooterWidthOption extends BaseOptionComponent {
+    static template = "website.FooterWidthOption";
+    static selector = "#wrapwrap > footer";
+    static applyTo =
+        ":is(:scope > #footer > section, .o_footer_copyright) > :is(.container, .container-fluid, .o_container_small)";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+}
+
+export class FooterColorsOption extends BaseOptionComponent {
+    static template = "website.FooterColorsOption";
+    static selector = "#wrapwrap > footer";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+}
+
+export class FooterSlideoutOption extends BaseOptionComponent {
+    static template = "website.FooterSlideoutOption";
+    static selector = "#wrapwrap > footer";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+}
+
+export class ToggleFooterCopyrightOption extends BaseOptionComponent {
+    static template = "website.ToggleFooterCopyrightOption";
+    static selector = "#wrapwrap > footer";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+}
+
+export class FooterBorder extends BaseOptionComponent {
+    static template = "website.FooterBorder";
+    static selector = "#wrapwrap > footer";
+    static applyTo = "#footer";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+    static components = { BorderConfigurator, ShadowOption };
+}
+
+export class FooterScrollToTopOption extends BaseOptionComponent {
+    static template = "website.FooterScrollToTopOption";
+    static selector = "#wrapwrap > footer";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+}
+
 class FooterOptionPlugin extends Plugin {
     static id = "footerOption";
     static dependencies = ["customizeWebsite", "builderActions"];
+    static shared = ["getFooterTemplates"];
 
     resources = {
         builder_options: [
-            withSequence(FOOTER_TEMPLATE, {
-                OptionComponent: FooterTemplateOption,
-                props: { getTemplates: this.getFooterTemplates.bind(this) },
-                selector: "#wrapwrap > footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(FOOTER_WIDTH, {
-                template: "website.FooterWidthOption",
-                selector: "#wrapwrap > footer",
-                applyTo:
-                    ":is(:scope > #footer > section, .o_footer_copyright) > :is(.container, .container-fluid, .o_container_small)",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(FOOTER_COLORS, {
-                template: "website.FooterColorsOption",
-                selector: "#wrapwrap > footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(FOOTER_SLIDEOUT, {
-                template: "website.FooterSlideoutOption",
-                selector: "#wrapwrap > footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(FOOTER_COPYRIGHT, {
-                template: "website.ToggleFooterCopyrightOption",
-                selector: "#wrapwrap > footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(FOOTER_BORDER, {
-                template: "website.FooterBorder",
-                selector: "#wrapwrap > footer",
-                applyTo: "#footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(FOOTER_SCROLL_TO, {
-                template: "website.FooterScrollToTopOption",
-                selector: "#wrapwrap > footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(FOOTER_TEMPLATE, FooterTemplateOption),
+            withSequence(FOOTER_WIDTH, FooterWidthOption),
+            withSequence(FOOTER_COLORS, FooterColorsOption),
+            withSequence(FOOTER_SLIDEOUT, FooterSlideoutOption),
+            withSequence(FOOTER_COPYRIGHT, ToggleFooterCopyrightOption),
+            withSequence(FOOTER_BORDER, FooterBorder),
+            withSequence(FOOTER_SCROLL_TO, FooterScrollToTopOption),
         ],
         builder_actions: {
             WebsiteConfigFooterAction,
diff --git a/addons/website/static/src/builder/plugins/options/footer_template_option.js b/addons/website/static/src/builder/plugins/options/footer_template_option.js
index 8f832292926e1..872919d8af9ab 100644
--- a/addons/website/static/src/builder/plugins/options/footer_template_option.js
+++ b/addons/website/static/src/builder/plugins/options/footer_template_option.js
@@ -3,11 +3,14 @@ import { useState } from "@odoo/owl";
 
 export class FooterTemplateOption extends BaseOptionComponent {
     static template = "website.FooterTemplateOption";
-    static props = { getTemplates: Function };
+    static dependencies = ["footerOption"];
+    static selector = "#wrapwrap > footer";
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
 
     setup() {
         super.setup();
-        this.footerTemplates = useState(this.props.getTemplates());
+        this.footerTemplates = useState(this.dependencies.footerOption.getFooterTemplates());
     }
 }
 
diff --git a/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js b/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js
index 0ed645cb7fb3e..3ae10a1790f77 100644
--- a/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js
@@ -3,18 +3,19 @@ import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC } from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class GalleryElementOption extends BaseOptionComponent {
+    static template = "website.GalleryElementOption";
+    static selector =
+        ".s_image_gallery img, .s_carousel .carousel-item, .s_quotes_carousel .carousel-item, .s_carousel_intro .carousel-item, .s_carousel_cards .carousel-item";
+}
 
 export class GalleryElementOptionPlugin extends Plugin {
     static id = "galleryElementOption";
 
     resources = {
-        builder_options: [
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website.GalleryElementOption",
-                selector:
-                    ".s_image_gallery img, .s_carousel .carousel-item, .s_quotes_carousel .carousel-item, .s_carousel_intro .carousel-item, .s_carousel_cards .carousel-item",
-            }),
-        ],
+        builder_options: [withSequence(SNIPPET_SPECIFIC, GalleryElementOption)],
         builder_actions: {
             SetGalleryElementPositionAction,
         },
diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.js b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.js
index e53d3d97710a1..c8c57f4f7ace8 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.js
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option.js
@@ -2,28 +2,21 @@ import { useRef, onMounted, useState, useEffect, onWillDestroy } from "@odoo/owl
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
 /** @import { Coordinates, Place } from './google_maps_option_plugin.js' */
-/**
- * @typedef {Object} Props
- * @property {function():object} getMapsAPI
- * @property {function(Element, Coordinates):Promise<Place | undefined>} getPlace
- * @property {function(Element, Place):void} onPlaceChanged
- */
 
 export class GoogleMapsOption extends BaseOptionComponent {
     static template = "website.GoogleMapsOption";
-    /** @type {Props} */
-    static props = {
-        getMapsAPI: { type: Function },
-        getPlace: { type: Function },
-        onPlaceChanged: { type: Function },
-    };
+    static dependencies = ["googleMapsOption"];
+    static selector = ".s_google_map";
 
     async setup() {
         super.setup();
-        /** @type {Props} */
-        this.props;
-        /** @type {{ getEditingElement: function():Element }} */
-        this.env;
+
+        this.getMapsAPI = this.dependencies.googleMapsOption.getMapsAPI;
+        /** @type {function(Element, Coordinates):Promise<Place | undefined>} */
+        this.getPlace = this.dependencies.googleMapsOption.getPlace;
+        /** @type {function(Element, Place):void} */
+        this.commitPlace = this.dependencies.googleMapsOption.commitPlace;
+
         this.inputRef = useRef("inputRef");
         /** @type {{ formattedAddress: string }} */
         this.state = useState({
@@ -40,7 +33,7 @@ export class GoogleMapsOption extends BaseOptionComponent {
         });
         onWillDestroy(() => {
             if (this.autocompleteListener) {
-                this.props.getMapsAPI().event.removeListener(this.autocompleteListener);
+                this.getMapsAPI().event.removeListener(this.autocompleteListener);
             }
             // Without this, the Google library injects elements inside the
             // DOM but does not remove them once the option is closed.
@@ -56,8 +49,8 @@ export class GoogleMapsOption extends BaseOptionComponent {
      * @param {Element} inputEl
      */
     initializeAutocomplete(inputEl) {
-        if (!this.googleMapsAutocomplete && this.props.getMapsAPI()) {
-            const mapsAPI = this.props.getMapsAPI();
+        if (!this.googleMapsAutocomplete && this.getMapsAPI()) {
+            const mapsAPI = this.getMapsAPI();
             this.googleMapsAutocomplete = new mapsAPI.places.Autocomplete(inputEl, {
                 types: ["geocode"],
             });
@@ -70,7 +63,7 @@ export class GoogleMapsOption extends BaseOptionComponent {
                 const editingElement = this.env.getEditingElement();
                 /** @type {Coordinates} */
                 const coordinates = editingElement.dataset.mapGps;
-                this.props.getPlace(editingElement, coordinates).then((place) => {
+                this.getPlace(editingElement, coordinates).then((place) => {
                     if (place?.formatted_address) {
                         this.state.formattedAddress = place.formatted_address;
                     }
@@ -87,7 +80,7 @@ export class GoogleMapsOption extends BaseOptionComponent {
     onPlaceChanged() {
         /** @type {Place | undefined} */
         const place = this.googleMapsAutocomplete.getPlace();
-        this.props.onPlaceChanged(this.env.getEditingElement(), place);
+        this.onPlaceChanged(this.env.getEditingElement(), place);
         this.state.formattedAddress = place?.formatted_address || "";
     }
 }
diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
index a3c2d37f2dfe0..405fe8f9c4580 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
@@ -35,19 +35,12 @@ export class GoogleMapsOptionPlugin extends Plugin {
         "failedToInitializeGoogleMaps",
         "shouldRefetchApiKey",
         "shouldNotRefetchApiKey",
+        "commitPlace",
+        "getPlace",
+        "getMapsAPI",
     ];
     resources = {
-        builder_options: [
-            {
-                OptionComponent: GoogleMapsOption,
-                selector: ".s_google_map",
-                props: {
-                    getMapsAPI: this.getMapsAPI.bind(this),
-                    getPlace: this.getPlace.bind(this),
-                    onPlaceChanged: this.commitPlace.bind(this),
-                },
-            },
-        ],
+        builder_options: [GoogleMapsOption],
         so_content_addition_selector: [".s_google_map"],
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/header/basicHeaderOptionSettings.js b/addons/website/static/src/builder/plugins/options/header/basicHeaderOptionSettings.js
new file mode 100644
index 0000000000000..fc075e50a89ff
--- /dev/null
+++ b/addons/website/static/src/builder/plugins/options/header/basicHeaderOptionSettings.js
@@ -0,0 +1,5 @@
+export const basicHeaderOptionSettings = {
+    editableOnly: false,
+    selector: "#wrapwrap > header",
+    groups: ["website.group_website_designer"],
+};
diff --git a/addons/website/static/src/builder/plugins/options/header/header_box_option.js b/addons/website/static/src/builder/plugins/options/header/header_box_option.js
index 34f310adb32b7..999772d49fc17 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_box_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_box_option.js
@@ -1,10 +1,12 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { ShadowOption } from "@html_builder/plugins/shadow_option";
+import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderBoxOption extends BaseOptionComponent {
     static template = "website.HeaderBoxOption";
-    static props = {};
+    static applyTo = ".navbar:not(.d-none)";
+
     static components = { BorderConfigurator, ShadowOption };
 
     setup() {
@@ -14,3 +16,5 @@ export class HeaderBoxOption extends BaseOptionComponent {
         }));
     }
 }
+
+Object.assign(HeaderBoxOption, basicHeaderOptionSettings);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
index 570a945378cfe..cf8fe934c1569 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
@@ -10,20 +10,50 @@ import { registry } from "@web/core/registry";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { HeaderBoxOption } from "./header_box_option";
-import { HEADER_BOX, basicHeaderOptionSettings } from "./header_option_plugin";
+import { HEADER_BOX } from "./header_option_plugin";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class HeaderTemplateOption extends BaseOptionComponent {
+    static template = "website.headerTemplateOption";
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class HeaderContentWidthOption extends BaseOptionComponent {
+    static template = "website.headerContentWidthOption";
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class HeaderSidebarWidthOption extends BaseOptionComponent {
+    static template = "website.headerSidebarWidthOption";
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class HeaderBackgroundOption extends BaseOptionComponent {
+    static template = "website.headerBackgroundOption";
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class HeaderScrollEffectOption extends BaseOptionComponent {
+    static template = "website.headerScrollEffectOption";
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
 
 class HeaderBoxOptionPlugin extends Plugin {
     static id = "HeaderBoxOptionPlugin";
     static dependencies = ["customizeWebsite"];
 
     resources = {
-        builder_options: [
-            withSequence(HEADER_BOX, {
-                ...basicHeaderOptionSettings,
-                applyTo: ".navbar:not(.d-none)",
-                OptionComponent: HeaderBoxOption,
-            }),
-        ],
+        builder_options: [withSequence(HEADER_BOX, HeaderBoxOption)],
         builder_actions: {
             StyleActionHeaderAction,
             SetShadowModeHeaderAction,
diff --git a/addons/website/static/src/builder/plugins/options/header/header_elements_option.js b/addons/website/static/src/builder/plugins/options/header/header_elements_option.js
index 72b70a5b208a9..333b3b16fc81f 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_elements_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_elements_option.js
@@ -2,10 +2,14 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class HeaderElementsOption extends BaseOptionComponent {
     static template = "website.HeaderElementsOption";
+    static dependencies = ["customizeWebsite"];
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
 
     setup() {
         super.setup();
-        this.customizeWebsite = this.env.editor.shared.customizeWebsite;
+        this.customizeWebsite = this.dependencies.customizeWebsite;
         const views = ["website.option_header_brand_logo", "website.option_header_brand_name"];
         this.customizeWebsite.loadConfigKey({ views });
     }
diff --git a/addons/website/static/src/builder/plugins/options/header/header_font_option.js b/addons/website/static/src/builder/plugins/options/header/header_font_option.js
index 181c8e59ef504..af5ac192ccb4e 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_font_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_font_option.js
@@ -1,6 +1,9 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderFontOption extends BaseOptionComponent {
     static template = "website.HeaderFontOption";
-    static props = {};
+    static editableOnly = basicHeaderOptionSettings.editableOnly;
+    static selector = basicHeaderOptionSettings.selector;
+    static groups = basicHeaderOptionSettings.groups;
 }
diff --git a/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js b/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js
index 832f196756611..fd79a4af68488 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js
@@ -1,6 +1,9 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderIconBackgroundOption extends BaseOptionComponent {
     static template = "website.HeaderIconBackgroundOption";
-    static props = {};
+    static editableOnly = basicHeaderOptionSettings.editableOnly;
+    static selector = basicHeaderOptionSettings.selector;
+    static groups = basicHeaderOptionSettings.groups;
 }
diff --git a/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js b/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js
index 46f2ec2b248ed..da2e0adfd1d2b 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js
@@ -1,16 +1,32 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { onWillStart } from "@odoo/owl";
+import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderNavigationOption extends BaseOptionComponent {
     static template = "website.HeaderNavigationOption";
-    static props = {
-        getCurrentActiveViews: Function,
-    };
+    static dependencies = ["customizeWebsite"];
+    static reloadTarget = true;
+
     setup() {
         super.setup();
+
+        this.keys = [
+            "website.template_header_default",
+            "website.template_header_hamburger",
+            "website.template_header_boxed",
+            "website.template_header_stretch",
+            "website.template_header_vertical",
+            "website.template_header_search",
+            "website.template_header_sales_one",
+            "website.template_header_sales_two",
+            "website.template_header_sales_three",
+            "website.template_header_sales_four",
+            "website.template_header_sidebar",
+        ];
+
         this.currentActiveViews = {};
         onWillStart(async () => {
-            this.currentActiveViews = await this.props.getCurrentActiveViews();
+            this.currentActiveViews = await this.getCurrentActiveViews();
         });
     }
 
@@ -22,4 +38,15 @@ export class HeaderNavigationOption extends BaseOptionComponent {
         }
         return false;
     }
+    async getCurrentActiveViews() {
+        const actionParams = { views: this.keys };
+        await this.dependencies.customizeWebsite.loadConfigKey(actionParams);
+        const currentActiveViews = {};
+        for (const key of this.keys) {
+            const isActive = this.dependencies.customizeWebsite.getConfigKey(key);
+            currentActiveViews[key] = isActive;
+        }
+        return currentActiveViews;
+    }
 }
+Object.assign(HeaderNavigationOption, basicHeaderOptionSettings);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
index 24a5be851ce47..aa46bc99e967a 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
@@ -1,24 +1,13 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { HeaderNavigationOption } from "./header_navigation_option";
-import { HEADER_NAVIGATION, basicHeaderOptionSettings } from "./header_option_plugin";
-import { withSequence } from "@html_editor/utils/resource";
 
 class HeaderNavigationOptionPlugin extends Plugin {
     static id = "HeaderNavigationOptionPlugin";
     static dependencies = ["customizeWebsite"];
 
     resources = {
-        builder_options: [
-            withSequence(HEADER_NAVIGATION, {
-                ...basicHeaderOptionSettings,
-                OptionComponent: HeaderNavigationOption,
-                props: {
-                    getCurrentActiveViews: this.getCurrentActiveViews.bind(this),
-                },
-                reloadTarget: true,
-            }),
-        ],
+        builder_options: [HeaderNavigationOption],
     };
 
     setup() {
diff --git a/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
index 8c96273c226de..ae7834692dad1 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
@@ -36,12 +36,6 @@ export {
     HEADER_END,
 };
 
-export const basicHeaderOptionSettings = {
-    editableOnly: false,
-    selector: "#wrapwrap > header",
-    groups: ["website.group_website_designer"],
-}
-
 class HeaderOptionPlugin extends Plugin {
     static id = "headerOption";
     static dependencies = ["customizeWebsite", "menuDataPlugin"];
@@ -58,22 +52,10 @@ class HeaderOptionPlugin extends Plugin {
             },
         ],
         builder_options: [
-            withSequence(HEADER_TEMPLATE, {
-                ...basicHeaderOptionSettings,
-                OptionComponent: HeaderTemplateOption,
-            }),
-            withSequence(HEADER_FONT, {
-                ...basicHeaderOptionSettings,
-                OptionComponent: HeaderFontOption,
-            }),
-            withSequence(HEADER_ELEMENTS, {
-                ...basicHeaderOptionSettings,
-                OptionComponent: HeaderElementsOption,
-            }),
-            withSequence(HEADER_ICON_BACKGROUND, {
-                ...basicHeaderOptionSettings,
-                OptionComponent: HeaderIconBackgroundOption,
-            }),
+            withSequence(HEADER_TEMPLATE, HeaderTemplateOption),
+            withSequence(HEADER_FONT, HeaderFontOption),
+            withSequence(HEADER_ELEMENTS, HeaderElementsOption),
+            withSequence(HEADER_ICON_BACKGROUND, HeaderIconBackgroundOption),
         ],
     };
 };
diff --git a/addons/website/static/src/builder/plugins/options/header/header_template_option.js b/addons/website/static/src/builder/plugins/options/header/header_template_option.js
index 53eb8fef62ea3..6936709a65658 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_template_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_template_option.js
@@ -1,8 +1,11 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderTemplateOption extends BaseOptionComponent {
     static template = "website.HeaderTemplateOption";
-    static props = {};
+    static editableOnly = basicHeaderOptionSettings.editableOnly;
+    static selector = basicHeaderOptionSettings.selector;
+    static groups = basicHeaderOptionSettings.groups;
 
     hasSomeOptions(opts) {
         return opts.some((opt) => this.isActiveItem(opt));
diff --git a/addons/website/static/src/builder/plugins/options/image_gallery_option.js b/addons/website/static/src/builder/plugins/options/image_gallery_option.js
index 9613ede0e1cef..7eddd1ca59b29 100644
--- a/addons/website/static/src/builder/plugins/options/image_gallery_option.js
+++ b/addons/website/static/src/builder/plugins/options/image_gallery_option.js
@@ -3,8 +3,9 @@ import { BorderConfigurator } from "@html_builder/plugins/border_configurator_op
 
 export class ImageGalleryComponent extends BaseOptionComponent {
     static template = "website.ImageGalleryOption";
+    static selector = ".s_image_gallery";
+
     static components = { BorderConfigurator };
-    static props = {};
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js b/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
index 7a8140cb81cc2..ffc67338e1a93 100644
--- a/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
@@ -8,6 +8,12 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { uniqueId } from "@web/core/utils/functions";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class ImageGalleryImagesOption extends BaseOptionComponent {
+    static template = "website.ImageGalleryImagesOption";
+    static selector = ".s_image_gallery";
+}
 
 class ImageGalleryOption extends Plugin {
     static id = "imageGalleryOption";
@@ -23,14 +29,8 @@ class ImageGalleryOption extends Plugin {
     static shared = ["processImages", "getMode", "setImages", "restoreSelection", "getColumns"];
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website.ImageGalleryImagesOption",
-                selector: ".s_image_gallery",
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                OptionComponent: ImageGalleryComponent,
-                selector: ".s_image_gallery",
-            }),
+            withSequence(SNIPPET_SPECIFIC, ImageGalleryImagesOption),
+            withSequence(SNIPPET_SPECIFIC_END, ImageGalleryComponent),
         ],
         builder_actions: {
             AddImageAction,
@@ -80,7 +80,7 @@ class ImageGalleryOption extends Plugin {
     restoreSelection(imageToSelect, isPreviewing) {
         if (imageToSelect && !isPreviewing) {
             // Activate the containers of the equivalent cloned image.
-            this.dependencies["builderOptions"].setNextTarget(imageToSelect);
+            this.dependencies.builderOptions.setNextTarget(imageToSelect);
         }
     }
 
@@ -129,7 +129,7 @@ class ImageGalleryOption extends Plugin {
 
                 // Activate the active image.
                 const activeImageEl = galleryEl.querySelector(".carousel-item.active img");
-                this.dependencies["builderOptions"].setNextTarget(activeImageEl);
+                this.dependencies.builderOptions.setNextTarget(activeImageEl);
             }
         }
     }
@@ -287,7 +287,7 @@ class ImageGalleryOption extends Plugin {
     onCarouselSlid(ev) {
         // When the carousel slides, update the builder options to select the active image
         const activeImageEl = ev.target.querySelector(".carousel-item.active img");
-        this.dependencies["builderOptions"].updateContainers(activeImageEl);
+        this.dependencies.builderOptions.updateContainers(activeImageEl);
     }
 
     async processImages(editingElement, newImages = []) {
@@ -340,7 +340,7 @@ class ImageGalleryOption extends Plugin {
         const clonedImgs = [];
         const imgLoaded = [];
         let imageToSelect;
-        const currentContainers = this.dependencies["builderOptions"].getContainers();
+        const currentContainers = this.dependencies.builderOptions.getContainers();
         for (const image of imagesHolder) {
             // Only on Chrome: appended images are sometimes invisible
             // and not correctly loaded from cache, we use a clone of the
diff --git a/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js b/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js
index 2ed8e7ec80007..767cfea2029cf 100644
--- a/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js
@@ -5,6 +5,12 @@ import { _t } from "@web/core/l10n/translation";
 import { getCommonAncestor, selectElements } from "@html_editor/utils/dom_traversal";
 import { withSequence } from "@html_editor/utils/resource";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class InstagramOption extends BaseOptionComponent {
+    static template = "website.InstagramOption";
+    static selector = ".s_instagram_page";
+}
 
 class InstagramOptionPlugin extends Plugin {
     static id = "instagramOption";
@@ -12,12 +18,7 @@ class InstagramOptionPlugin extends Plugin {
     static shared = ["instagramPageNameFromUrl"];
 
     resources = {
-        builder_options: [
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.InstagramOption",
-                selector: ".s_instagram_page",
-            }),
-        ],
+        builder_options: [withSequence(SNIPPET_SPECIFIC_END, InstagramOption)],
         builder_actions: {
             InstagramPageAction,
         },
diff --git a/addons/website/static/src/builder/plugins/options/language_selector_option.js b/addons/website/static/src/builder/plugins/options/language_selector_option.js
index f39e4029185a4..0981d5329772a 100644
--- a/addons/website/static/src/builder/plugins/options/language_selector_option.js
+++ b/addons/website/static/src/builder/plugins/options/language_selector_option.js
@@ -3,21 +3,22 @@ import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { after } from "@html_builder/utils/option_sequence";
 import { HEADER_BOX } from "./header/header_option_plugin";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class LanguageSelectorOption extends BaseOptionComponent {
+    static template = "website.LanguageSelectorOption";
+    static selector = "#wrapwrap > header nav.navbar .o_header_language_selector";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+    static reloadTarget = true;
+}
 
 const LANGUAGE_SELECTOR = after(HEADER_BOX);
 class LanguageSelectorOptionPlugin extends Plugin {
     static id = "languageSelectorOption";
     static dependencies = ["builderActions"];
     resources = {
-        builder_options: [
-            withSequence(LANGUAGE_SELECTOR, {
-                template: "website.LanguageSelectorOption",
-                editableOnly: false,
-                selector: "#wrapwrap > header nav.navbar .o_header_language_selector",
-                groups: ["website.group_website_designer"],
-                reloadTarget: true,
-            }),
-        ],
+        builder_options: [withSequence(LANGUAGE_SELECTOR, LanguageSelectorOption)],
     };
 }
 
diff --git a/addons/website/static/src/builder/plugins/options/map_option_plugin.js b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
index ba13f1232d95e..5bd720560adc7 100644
--- a/addons/website/static/src/builder/plugins/options/map_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
@@ -1,18 +1,19 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { generateGMapLink } from "@website/js/utils";
 import { renderToElement } from "@web/core/utils/render";
 
+export class MapOption extends BaseOptionComponent {
+    static template = "website.mapOption";
+    static selector = ".s_map";
+}
+
 class MapOptionPlugin extends Plugin {
     static id = "mapOption";
     resources = {
-        builder_options: [
-            {
-                template: "website.mapOption",
-                selector: ".s_map",
-            },
-        ],
+        builder_options: [MapOption],
         so_content_addition_selector: [".s_map"],
         builder_actions: {
             MapUpdateSrcAction,
diff --git a/addons/website/static/src/builder/plugins/options/media_list_item_option.js b/addons/website/static/src/builder/plugins/options/media_list_item_option.js
index 8e7534faf9d6f..d344931289c5f 100644
--- a/addons/website/static/src/builder/plugins/options/media_list_item_option.js
+++ b/addons/website/static/src/builder/plugins/options/media_list_item_option.js
@@ -1,15 +1,15 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { ShadowOption } from "@html_builder/plugins/shadow_option";
-import { WebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
+import { BaseWebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
 
 // TODO: BorderConfigurator and ShadowOption directly in BaseOptionComponent ?
 export class MediaListItemOption extends BaseOptionComponent {
     static template = "website.MediaListItemOption";
+    static selector = ".s_media_list_item";
     static components = {
         BorderConfigurator,
         ShadowOption,
-        WebsiteBackgroundOption,
+        BaseWebsiteBackgroundOption,
     };
-    static props = {};
 }
diff --git a/addons/website/static/src/builder/plugins/options/media_list_item_option.xml b/addons/website/static/src/builder/plugins/options/media_list_item_option.xml
index 58829ef0ab78f..21383514514a3 100644
--- a/addons/website/static/src/builder/plugins/options/media_list_item_option.xml
+++ b/addons/website/static/src/builder/plugins/options/media_list_item_option.xml
@@ -3,7 +3,7 @@
 
 <t t-name="website.MediaListItemOption">
     <BuilderContext applyTo="':scope > .row'">
-        <WebsiteBackgroundOption
+        <BaseWebsiteBackgroundOption
             withColors="true"
             withImages="false"
             withColorCombinations="true"
diff --git a/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js b/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js
index 2c84c323f46a1..df98448b8655f 100644
--- a/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js
@@ -4,26 +4,26 @@ import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { MediaListItemOption } from "./media_list_item_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class MediaListOption extends BaseOptionComponent {
+    static template = "website.MediaListOption";
+    static selector = ".s_media_list";
+}
 
 class MediaListOptionPlugin extends Plugin {
     static id = "mediaListOption";
     mediaListItemOptionSelector = ".s_media_list_item";
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                template: "website.MediaListOption",
-                selector: ".s_media_list",
-            }),
-            withSequence(END, {
-                OptionComponent: MediaListItemOption,
-                selector: this.mediaListItemOptionSelector,
-            }),
+            withSequence(BEGIN, MediaListOption),
+            withSequence(END, MediaListItemOption),
         ],
         builder_actions: {
             SetMediaLayoutAction,
         },
         mark_color_level_selector_params: [
-            { selector: this.mediaListItemOptionSelector, applyTo: ":scope > .row" },
+            { selector: MediaListItemOption.selector, applyTo: ":scope > .row" },
         ],
     };
 }
diff --git a/addons/website/static/src/builder/plugins/options/mega_menu_option.js b/addons/website/static/src/builder/plugins/options/mega_menu_option.js
index be6702c4f5f59..b8f8096a9f4b4 100644
--- a/addons/website/static/src/builder/plugins/options/mega_menu_option.js
+++ b/addons/website/static/src/builder/plugins/options/mega_menu_option.js
@@ -3,14 +3,14 @@ import { getCSSVariableValue, getHtmlStyle } from "@html_editor/utils/formatting
 
 export class MegaMenuOption extends BaseOptionComponent {
     static template = "website.MegaMenuOption";
-    static props = {
-        getTemplatePrefix: Function,
-    };
+    static dependencies = ["megaMenuOptionPlugin"];
+    static selector = ".o_mega_menu";
 
     setup() {
         super.setup();
+        const { getTemplatePrefix } = this.dependencies.megaMenuOptionPlugin;
         this.state = useDomState((el) => ({
-            templatePrefix: this.props.getTemplatePrefix(el),
+            templatePrefix: getTemplatePrefix(el),
         }));
     }
 
diff --git a/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js b/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js
index 249d3d01ea162..784f92487013c 100644
--- a/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js
@@ -10,15 +10,7 @@ export class MegaMenuOptionPlugin extends Plugin {
     static shared = ["getTemplatePrefix"];
 
     resources = {
-        builder_options: [
-            withSequence(SNIPPET_SPECIFIC_NEXT, {
-                OptionComponent: MegaMenuOption,
-                selector: ".o_mega_menu",
-                props: {
-                    getTemplatePrefix: this.getTemplatePrefix.bind(this),
-                },
-            }),
-        ],
+        builder_options: [withSequence(SNIPPET_SPECIFIC_NEXT, MegaMenuOption)],
         dropzone_selector: {
             selector: ".o_mega_menu .nav > .nav-link",
             dropIn: ".o_mega_menu nav",
diff --git a/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js b/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js
index 2cca2c599ba3f..2c5b47b7e7100 100644
--- a/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js
@@ -3,19 +3,20 @@ import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC_NEXT } from "@html_builder/utils/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class NavbarLogoOption extends BaseOptionComponent {
+    static template = "website.NavbarLogoOption";
+    static selector = "#wrapwrap > header nav.navbar .navbar-brand";
+    static title = _t("Navbar Logo");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
 
 class NavbarLogoOptionPlugin extends Plugin {
     static id = "navbarLogoOptionPlugin";
     resources = {
-        builder_options: [
-            withSequence(SNIPPET_SPECIFIC_NEXT, {
-                template: "website.NavbarLogoOption",
-                selector: "#wrapwrap > header nav.navbar .navbar-brand",
-                title: _t("Navbar Logo"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-        ],
+        builder_options: [withSequence(SNIPPET_SPECIFIC_NEXT, NavbarLogoOption)],
     };
 }
 
diff --git a/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js b/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
index 95dc84903e1a8..681c426e11b1e 100644
--- a/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
@@ -5,22 +5,27 @@ import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
 import { localization } from "@web/core/l10n/localization";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class NavTabsStyleOption extends BaseOptionComponent {
+    static template = "website.NavTabsStyleOption";
+    static selector = ".s_tabs";
+    static applyTo = ".s_tabs_main";
+}
+
+export class NavTabsImagesStyleOption extends BaseOptionComponent {
+    static template = "website.NavTabsImagesStyleOption";
+    static selector = ".s_tabs_images";
+    static applyTo = ".s_tabs_main";
+}
 
 class NavTabsStyleOptionPlugin extends Plugin {
     static id = "navTabsOptionStyle";
     static shared = ["isNavItem", "getActiveOverlayButtons", "moveNavItem"];
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.NavTabsStyleOption",
-                selector: ".s_tabs",
-                applyTo: ".s_tabs_main",
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.NavTabsImagesStyleOption",
-                selector: ".s_tabs_images",
-                applyTo: ".s_tabs_main",
-            }),
+            withSequence(SNIPPET_SPECIFIC_END, NavTabsStyleOption),
+            withSequence(SNIPPET_SPECIFIC_END, NavTabsImagesStyleOption),
         ],
         builder_actions: {
             SetStyleAction,
diff --git a/addons/website/static/src/builder/plugins/options/parallax_option.js b/addons/website/static/src/builder/plugins/options/parallax_option.js
index 259388022b78c..46bc89c7d612a 100644
--- a/addons/website/static/src/builder/plugins/options/parallax_option.js
+++ b/addons/website/static/src/builder/plugins/options/parallax_option.js
@@ -1,5 +1,4 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 export class ParallaxOption extends BaseOptionComponent {
     static template = "website.ParallaxOption";
-    static props = {};
 }
diff --git a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
index 6694bf3e37453..cf8d82a613a29 100644
--- a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
@@ -1,8 +1,8 @@
 import { applyFunDependOnSelectorAndExclude } from "@html_builder/plugins/utils";
-import { getSelectorParams } from "@html_builder/utils/utils";
+import { filterExtends } from "@html_builder/utils/utils";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
-import { WebsiteBackgroundOption } from "./background_option";
+import { BaseWebsiteBackgroundOption } from "./background_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { withSequence } from "@html_editor/utils/resource";
 class WebsiteParallaxPlugin extends Plugin {
@@ -18,9 +18,9 @@ class WebsiteParallaxPlugin extends Plugin {
         get_target_element_providers: withSequence(1, this.getTargetElement),
     };
     setup() {
-        this.backgroundOptionSelectorParams = getSelectorParams(
+        this.backgroundOptionClasses = filterExtends(
             this.getResource("builder_options"),
-            WebsiteBackgroundOption
+            BaseWebsiteBackgroundOption
         );
     }
     applyParallaxType({ editingElement, value }) {
@@ -76,11 +76,11 @@ class WebsiteParallaxPlugin extends Plugin {
         }
     }
     onBgImageHide(rootEl) {
-        for (const backgroundOptionSelector of this.backgroundOptionSelectorParams) {
+        for (const backgroundClass of this.backgroundOptionClasses) {
             applyFunDependOnSelectorAndExclude(
                 this.removeParallax.bind(this),
                 rootEl,
-                backgroundOptionSelector
+                backgroundClass
             );
         }
     }
diff --git a/addons/website/static/src/builder/plugins/options/popup_option_plugin.js b/addons/website/static/src/builder/plugins/options/popup_option_plugin.js
index 6881130264421..3086ea473dcb7 100644
--- a/addons/website/static/src/builder/plugins/options/popup_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/popup_option_plugin.js
@@ -3,27 +3,32 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const POPUP = SNIPPET_SPECIFIC;
 export const COOKIES_BAR = SNIPPET_SPECIFIC_END;
 
+export class PopupOption extends BaseOptionComponent {
+    static template = "website.PopupOption";
+    static selector = ".s_popup";
+    static exclude = "#website_cookies_bar";
+    static applyTo = ".modal";
+}
+
+export class PopupCookiesOption extends BaseOptionComponent {
+    static template = "website.PopupCookiesOption";
+    static selector = ".s_popup#website_cookies_bar";
+    static applyTo = ".modal";
+}
+
 class PopupOptionPlugin extends Plugin {
     static id = "PopupOption";
     static dependencies = ["anchor", "visibility", "history", "popupVisibilityPlugin"];
 
     resources = {
         builder_options: [
-            withSequence(POPUP, {
-                template: "website.PopupOption",
-                selector: ".s_popup",
-                exclude: "#website_cookies_bar",
-                applyTo: ".modal",
-            }),
-            withSequence(COOKIES_BAR, {
-                template: "website.PopupCookiesOption",
-                selector: ".s_popup#website_cookies_bar",
-                applyTo: ".modal",
-            }),
+            withSequence(POPUP, PopupOption),
+            withSequence(COOKIES_BAR, PopupCookiesOption),
         ],
         dropzone_selector: {
             selector: ".s_popup",
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js
index 091d5c68b0519..9c91f925e287b 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js
@@ -3,33 +3,36 @@ import { Plugin } from "@html_editor/plugin";
 import { isElement } from "@html_editor/utils/dom_info";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
-import { AddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseAddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+
+export class PriceListBoxedDescriptionOption extends BaseOptionComponent {
+    static template = "website.PriceListBoxedDescriptionOption";
+    static selector = ".s_pricelist_boxed";
+    static components = { BorderConfigurator };
+}
+
+export class AddProductPricelistBoxedOption extends BaseAddProductOption {
+    static selector = ".s_pricelist_boxed";
+    buttonApplyTo =
+        ":scope > :has(.s_pricelist_boxed_item):not(:has(.row > div .s_pricelist_boxed_item))";
+    productSelector = ".s_pricelist_boxed_item";
+}
+
+export class AddProductPricelistBoxedSectionOption extends BaseAddProductOption {
+    static selector = ".s_pricelist_boxed_section";
+    buttonApplyTo = ":scope > :has(.s_pricelist_boxed_item)";
+    productSelector = ".s_pricelist_boxed_item";
+}
 
 class PriceListBoxedOptionPlugin extends Plugin {
     static id = "priceListBoxedOption";
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                selector: ".s_pricelist_boxed",
-                OptionComponent: AddProductOption,
-                props: {
-                    applyTo:
-                        ":scope > :has(.s_pricelist_boxed_item):not(:has(.row > div .s_pricelist_boxed_item))",
-                    productSelector: ".s_pricelist_boxed_item",
-                },
-            }),
-            withSequence(BEGIN, {
-                selector: ".s_pricelist_boxed_section",
-                OptionComponent: AddProductOption,
-                props: {
-                    applyTo: ":scope > :has(.s_pricelist_boxed_item)",
-                    productSelector: ".s_pricelist_boxed_item",
-                },
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.PriceListBoxedDescriptionOption",
-                selector: ".s_pricelist_boxed",
-            }),
+            withSequence(BEGIN, AddProductPricelistBoxedOption),
+            withSequence(BEGIN, AddProductPricelistBoxedSectionOption),
+            withSequence(SNIPPET_SPECIFIC_END, PriceListBoxedDescriptionOption),
         ],
         dropzone_selector: {
             selector: ".s_pricelist_boxed_item",
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js
index 08c345b3e1928..38da2c1475b18 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js
@@ -1,41 +1,46 @@
-import { VerticalAlignmentOption } from "@html_builder/plugins/vertical_alignment_option";
 import { BEGIN, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { isElement } from "@html_editor/utils/dom_info";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
-import { AddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseAddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BaseVerticalAlignmentOption } from "@html_builder/plugins/base_vertical_alignment_option";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+
+export class PriceListCafeDescriptionOption extends BaseOptionComponent {
+    static template = "website.PriceListCafeDescriptionOption";
+    static selector = ".s_pricelist_cafe";
+    static components = { BorderConfigurator };
+}
+
+export class PricelistCafeVerticalAlignmentOption extends BaseVerticalAlignmentOption {
+    static selector = ".s_pricelist_cafe";
+    static applyTo = ".row:has(.s_pricelist_cafe_col)";
+    level = 0;
+}
+
+export class AddProductPricelistCafeOption extends BaseAddProductOption {
+    static selector = ".s_pricelist_cafe";
+    buttonApplyTo =
+        ":scope > :has(.s_pricelist_cafe_item):not(:has(.row > div .s_pricelist_cafe_item))";
+    productSelector = ".s_pricelist_cafe_item";
+}
+
+export class AddProductPricelistCafeRowOption extends BaseAddProductOption {
+    static selector = ".s_pricelist_cafe .row > div";
+    buttonApplyTo = ":scope > :has(.s_pricelist_cafe_item)";
+    productSelector = ".s_pricelist_cafe_item";
+}
 
 class PriceListCafePlugin extends Plugin {
     static id = "priceList";
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                selector: ".s_pricelist_cafe",
-                OptionComponent: AddProductOption,
-                props: {
-                    applyTo:
-                        ":scope > :has(.s_pricelist_cafe_item):not(:has(.row > div .s_pricelist_cafe_item))",
-                    productSelector: ".s_pricelist_cafe_item",
-                },
-            }),
-            withSequence(BEGIN, {
-                selector: ".s_pricelist_cafe",
-                OptionComponent: VerticalAlignmentOption,
-                applyTo: ".row:has(.s_pricelist_cafe_col)",
-            }),
-            withSequence(BEGIN, {
-                selector: ".s_pricelist_cafe .row > div",
-                OptionComponent: AddProductOption,
-                props: {
-                    applyTo: ":scope > :has(.s_pricelist_cafe_item)",
-                    productSelector: ".s_pricelist_cafe_item",
-                },
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.PriceListCafeDescriptionOption",
-                selector: ".s_pricelist_cafe",
-            }),
+            withSequence(BEGIN, AddProductPricelistCafeOption),
+            withSequence(BEGIN, PricelistCafeVerticalAlignmentOption),
+            withSequence(BEGIN, AddProductPricelistCafeRowOption),
+            withSequence(SNIPPET_SPECIFIC_END, PriceListCafeDescriptionOption),
         ],
         dropzone_selector: {
             selector: ".s_pricelist_cafe_item",
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js
index 0e175e6658f9f..0a27c6d6287fe 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js
@@ -3,33 +3,36 @@ import { Plugin } from "@html_editor/plugin";
 import { isElement } from "@html_editor/utils/dom_info";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
-import { AddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseAddProductOption } from "@html_builder/plugins/add_product_option";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+
+export class ProductCatalogDescriptionOption extends BaseOptionComponent {
+    static template = "website.ProductCatalogDescriptionOption";
+    static selector = ".s_product_catalog";
+    static components = { BorderConfigurator };
+}
+
+export class AddProductCatalogOption extends BaseAddProductOption {
+    static selector = ".s_product_catalog";
+    buttonApplyTo =
+        ":scope > :has(.s_product_catalog_dish):not(:has(.row > div .s_product_catalog_dish))";
+    productSelector = ".s_product_catalog_dish";
+}
+
+export class AddProductCatalogSectionOption extends BaseAddProductOption {
+    static selector = ".s_product_catalog .row > div";
+    buttonApplyTo = ":scope > :has(.s_product_catalog_dish)";
+    productSelector = ".s_product_catalog_dish";
+}
 
 class ProductCatalogOptionPlugin extends Plugin {
     static id = "productCatalogOptionPlugin";
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                selector: ".s_product_catalog",
-                OptionComponent: AddProductOption,
-                props: {
-                    applyTo:
-                        ":scope > :has(.s_product_catalog_dish):not(:has(.row > div .s_product_catalog_dish))",
-                    productSelector: ".s_product_catalog_dish",
-                },
-            }),
-            withSequence(BEGIN, {
-                selector: ".s_product_catalog .row > div",
-                OptionComponent: AddProductOption,
-                props: {
-                    applyTo: ":scope > :has(.s_product_catalog_dish)",
-                    productSelector: ".s_product_catalog_dish",
-                },
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.ProductCatalogDescriptionOption",
-                selector: ".s_product_catalog",
-            }),
+            withSequence(BEGIN, AddProductCatalogOption),
+            withSequence(BEGIN, AddProductCatalogSectionOption),
+            withSequence(SNIPPET_SPECIFIC_END, ProductCatalogDescriptionOption),
         ],
         dropzone_selector: {
             selector: ".s_product_catalog_dish",
diff --git a/addons/website/static/src/builder/plugins/options/process_steps_option.js b/addons/website/static/src/builder/plugins/options/process_steps_option.js
index 95f282fd6fcb3..b6dd08549c940 100644
--- a/addons/website/static/src/builder/plugins/options/process_steps_option.js
+++ b/addons/website/static/src/builder/plugins/options/process_steps_option.js
@@ -9,7 +9,7 @@ export const connectorOptionParams = [
 
 export class ProcessStepsOption extends BaseOptionComponent {
     static template = "website.ProcessStepsOption";
-    static props = {};
+    static selector = ".s_process_steps";
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js b/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js
index 70f62e2fa185e..a867b1072523d 100644
--- a/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js
@@ -7,26 +7,23 @@ import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { CONTAINER_WIDTH } from "@website/builder/option_sequence";
 import { connectorOptionParams, ProcessStepsOption } from "./process_steps_option";
-import { WebsiteBackgroundOption } from "./background_option";
+import { BaseWebsiteBackgroundOption } from "./background_option";
+
+export class WebsiteBackgroundProcessStepOption extends BaseWebsiteBackgroundOption {
+    static selector = ".s_process_step .s_process_step_number";
+    static defaultProps = {
+        withColors: true,
+        withImages: false,
+        withColorCombinations: false,
+    };
+}
 
 class ProcessStepsOptionPlugin extends Plugin {
     static id = "processStepsOption";
-    selector = ".s_process_steps";
     resources = {
         builder_options: [
-            withSequence(after(CONTAINER_WIDTH), {
-                OptionComponent: ProcessStepsOption,
-                selector: this.selector,
-            }),
-            {
-                OptionComponent: WebsiteBackgroundOption,
-                selector: ".s_process_step .s_process_step_number",
-                props: {
-                    withColors: true,
-                    withImages: false,
-                    withColorCombinations: false,
-                },
-            },
+            withSequence(after(CONTAINER_WIDTH), ProcessStepsOption),
+            WebsiteBackgroundProcessStepOption,
         ],
         builder_actions: {
             ChangeConnectorAction,
@@ -39,7 +36,7 @@ class ProcessStepsOptionPlugin extends Plugin {
         // snippet is being resized).
         content_updated_handlers: (rootEl) =>
             applyFunDependOnSelectorAndExclude(reloadConnectors, rootEl, {
-                selector: this.selector,
+                selector: ProcessStepsOption.selector,
             }),
         dropzone_selector: {
             selector: ".s_process_step",
diff --git a/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js b/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js
index d334c2d77623f..b46f41c807fdd 100644
--- a/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js
@@ -2,24 +2,13 @@ import { registry } from "@web/core/registry";
 import { Plugin } from "@html_editor/plugin";
 import { clamp } from "@web/core/utils/numbers";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-class ProgressBarOptionPlugin extends Plugin {
-    static id = "progressBarOption";
-    selector = ".s_progress_bar";
-    resources = {
-        builder_options: {
-            template: "website.ProgressBarOption",
-            selector: this.selector,
-            cleanForSave: this.cleanForSave.bind(this),
-        },
-        builder_actions: {
-            DisplayAction,
-            ProgressBarValueAction,
-        },
-        so_content_addition_selector: [".s_progress_bar"],
-    };
+export class ProgressBarOption extends BaseOptionComponent {
+    static template = "website.ProgressBarOption";
+    static selector = ".s_progress_bar";
 
-    cleanForSave(editingEl) {
+    static cleanForSave(editingEl) {
         const progressBar = editingEl.querySelector(".progress-bar");
         const progressLabel = editingEl.querySelector(".s_progress_bar_text");
 
@@ -33,6 +22,18 @@ class ProgressBarOptionPlugin extends Plugin {
     }
 }
 
+class ProgressBarOptionPlugin extends Plugin {
+    static id = "progressBarOption";
+    resources = {
+        builder_options: ProgressBarOption,
+        builder_actions: {
+            DisplayAction,
+            ProgressBarValueAction,
+        },
+        so_content_addition_selector: [".s_progress_bar"],
+    };
+}
+
 export class DisplayAction extends BuilderAction {
     static id = "display";
     apply({ editingElement, params: { mainParam: position } }) {
diff --git a/addons/website/static/src/builder/plugins/options/scroll_button_option.js b/addons/website/static/src/builder/plugins/options/scroll_button_option.js
index 3f881a209680e..a16ee62ee4153 100644
--- a/addons/website/static/src/builder/plugins/options/scroll_button_option.js
+++ b/addons/website/static/src/builder/plugins/options/scroll_button_option.js
@@ -3,7 +3,9 @@ import { _t } from "@web/core/l10n/translation";
 
 export class ScrollButtonOption extends BaseOptionComponent {
     static template = "website.ScrollButtonOption";
-    static props = {};
+    static selector = "section";
+    static exclude =
+        "[data-snippet] :not(.oe_structure) > [data-snippet], .s_instagram_page, .o_facebook_page, .o_mega_menu > section, .s_appointments .s_dynamic_snippet_content, .s_bento_banner section[data-name='Card'], .s_floating_blocks, .s_floating_blocks .s_floating_blocks_block, .s_bento_block_card, .s_dynamic_category, .s_dynamic_category .s_dynamic_snippet_title, .s_announcement_scroll";
 
     setup() {
         super.setup();
diff --git a/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js b/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js
index 2a549f75b1063..8f1a7ffa10063 100644
--- a/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js
@@ -10,14 +10,7 @@ import { SCROLL_BUTTON } from "@website/builder/option_sequence";
 class ScrollButtonOptionPlugin extends Plugin {
     static id = "scrollButtonOption";
     resources = {
-        builder_options: [
-            withSequence(SCROLL_BUTTON, {
-                OptionComponent: ScrollButtonOption,
-                selector: "section",
-                exclude:
-                    "[data-snippet] :not(.oe_structure) > [data-snippet], .s_instagram_page, .o_facebook_page, .o_mega_menu > section, .s_appointments .s_dynamic_snippet_content, .s_bento_banner section[data-name='Card'], .s_floating_blocks, .s_floating_blocks .s_floating_blocks_block, .s_bento_block_card, .s_dynamic_category, .s_dynamic_category .s_dynamic_snippet_title, .s_announcement_scroll",
-            }),
-        ],
+        builder_options: [withSequence(SCROLL_BUTTON, ScrollButtonOption)],
         builder_actions: {
             AddScrollButtonAction,
             ScrollButtonSectionHeightClassAction,
diff --git a/addons/website/static/src/builder/plugins/options/searchbar_option.js b/addons/website/static/src/builder/plugins/options/searchbar_option.js
index 4a978084dee2e..ea14e1ecdad18 100644
--- a/addons/website/static/src/builder/plugins/options/searchbar_option.js
+++ b/addons/website/static/src/builder/plugins/options/searchbar_option.js
@@ -2,16 +2,14 @@ import { BaseOptionComponent, useGetItemValue } from "@html_builder/core/utils";
 
 export class SearchbarOption extends BaseOptionComponent {
     static template = "website.SearchbarOption";
-    static props = {
-        getOrderByItems: Function,
-        getDisplayItems: Function,
-    };
+    static selector = ".s_searchbar_input";
+    static applyTo = ".search-query";
 
     setup() {
         super.setup();
         this.getItemValue = useGetItemValue();
 
-        this.orderByItems = this.props.getOrderByItems();
-        this.displayItems = this.props.getDisplayItems();
+        this.orderByItems = this.getResource("searchbar_option_order_by_items");
+        this.displayItems = this.getResource("searchbar_option_display_items");
     }
 }
diff --git a/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js b/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
index 8ebb79d33cead..489fc02d5a3e9 100644
--- a/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
@@ -7,17 +7,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 class SearchbarOptionPlugin extends Plugin {
     static id = "searchbarOption";
     resources = {
-        builder_options: [
-            {
-                OptionComponent: SearchbarOption,
-                selector: ".s_searchbar_input",
-                applyTo: ".search-query",
-                props: {
-                    getOrderByItems: () => this.getResource("searchbar_option_order_by_items"),
-                    getDisplayItems: () => this.getResource("searchbar_option_display_items"),
-                },
-            },
-        ],
+        builder_options: [SearchbarOption],
         builder_actions: {
             SetSearchTypeAction,
             SetOrderByAction,
diff --git a/addons/website/static/src/builder/plugins/options/social_media_links.js b/addons/website/static/src/builder/plugins/options/social_media_links.js
index 6f295398d5d28..d328dd566254d 100644
--- a/addons/website/static/src/builder/plugins/options/social_media_links.js
+++ b/addons/website/static/src/builder/plugins/options/social_media_links.js
@@ -4,15 +4,17 @@ import { useSortable } from "@web/core/utils/sortable_owl";
 
 export class SocialMediaLinks extends BaseOptionComponent {
     static template = "website.SocialMediaLinks";
-    static props = {
-        getRecordedSocialMediaNames: { type: Function },
-        reorderSocialMediaLink: { type: Function },
-    };
+    static dependencies = ["socialMediaOptionPlugin", "history"];
+    static selector = ".s_social_media";
 
     setup() {
         super.setup();
+
+        const { getRecordedSocialMediaNames, reorderSocialMediaLink } =
+            this.dependencies.socialMediaOptionPlugin;
+
         onWillStart(async () => {
-            this.recordedSocialMediaNames = await this.props.getRecordedSocialMediaNames();
+            this.recordedSocialMediaNames = await getRecordedSocialMediaNames();
         });
         this.rootRef = useRef("root");
         this.domState = useDomState((editingElement) => ({
@@ -62,12 +64,12 @@ export class SocialMediaLinks extends BaseOptionComponent {
                     .find((i) => this.idsElMap.get(i)?.isConnected);
 
                 if (this.idsElMap.get(elId)?.isConnected && oldNext !== newNext) {
-                    this.props.reorderSocialMediaLink({
+                    reorderSocialMediaLink({
                         editingElement: this.env.getEditingElement(),
                         element: this.idsElMap.get(elId),
                         elementAfter: this.idsElMap.get(newNext),
                     });
-                    this.env.editor.shared.history.addStep();
+                    this.dependencies.history.addStep();
                 }
 
                 // hack to trigger the rebuild
diff --git a/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js b/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
index e88818b8ffa32..a346eb95b721b 100644
--- a/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
@@ -10,6 +10,7 @@ import { selectElements } from "@html_editor/utils/dom_traversal";
 import { SNIPPET_SPECIFIC, TITLE_LAYOUT_SIZE, ANIMATE } from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { AnimateOption } from "./animate_option";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 /**
  * @typedef { Object } SocialMediaInfo
@@ -107,6 +108,16 @@ const socialMediaInfo = new Map(
 
 const defaultAriaLabel = _t("Other social network");
 
+export class SocialMediaOption extends BaseOptionComponent {
+    static template = "website.SocialMediaOption";
+    static selector = ".s_share, .s_social_media";
+}
+
+export class SocialMediaAnimateOption extends AnimateOption {
+    static selector = ".s_social_media, .s_share";
+    static applyTo = ".s_social_media i.fa, .s_share i.fa";
+}
+
 class SocialMediaOptionPlugin extends Plugin {
     static id = "socialMediaOptionPlugin";
     static dependencies = ["history", "animateOption"];
@@ -118,36 +129,14 @@ class SocialMediaOptionPlugin extends Plugin {
         "getAssociatedSocialMedia",
         "removeSocialMediaClasses",
         "removeIconClasses",
+        "getRecordedSocialMediaNames",
+        "reorderSocialMediaLink",
     ];
-    animateOptionProps = {
-        getDirectionsItems: this.dependencies.animateOption.getDirectionsItems.bind(this),
-        getEffectsItems: this.dependencies.animateOption.getEffectsItems.bind(this),
-        canHaveHoverEffect: async (el) => {
-            const proms = this.getResource("hover_effect_allowed_predicates").map((p) => p(el));
-            const allowed = (await Promise.all(proms)).filter((allowed) => allowed != null);
-            return allowed.length && allowed.every(Boolean);
-        },
-    };
     resources = {
         builder_options: [
-            withSequence(TITLE_LAYOUT_SIZE, {
-                template: "website.SocialMediaOption",
-                selector: ".s_share, .s_social_media",
-            }),
-            withSequence(SNIPPET_SPECIFIC, {
-                OptionComponent: SocialMediaLinks,
-                props: {
-                    getRecordedSocialMediaNames: this.getRecordedSocialMediaNames.bind(this),
-                    reorderSocialMediaLink: this.reorderSocialMediaLink.bind(this),
-                },
-                selector: ".s_social_media",
-            }),
-            withSequence(ANIMATE, {
-                OptionComponent: AnimateOption,
-                selector: ".s_social_media, .s_share",
-                applyTo: ".s_social_media i.fa, .s_share i.fa",
-                props: this.animateOptionProps,
-            }),
+            withSequence(TITLE_LAYOUT_SIZE, SocialMediaOption),
+            withSequence(SNIPPET_SPECIFIC, SocialMediaLinks),
+            withSequence(ANIMATE, SocialMediaAnimateOption),
         ],
         so_content_addition_selector: [".s_share", ".s_social_media"],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
index 63d6421323733..a3b2392df7c63 100644
--- a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
@@ -2,6 +2,7 @@ import { applyFunDependOnSelectorAndExclude } from "@html_builder/plugins/utils"
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 /**
  * Returns the TOC id and the heading id from a header element.
@@ -19,20 +20,21 @@ function getTocAndHeadingId(headingEl) {
     return { tocId: 0, headingId: 0 };
 }
 
+export class TableOfContentOption extends BaseOptionComponent {
+    static template = "website.TableOfContentOption";
+    static selector = ".s_table_of_content";
+}
+
+export class TableOfContentNavbarOption extends BaseOptionComponent {
+    static template = "website.TableOfContentNavbarOption";
+    static selector = ".s_table_of_content_navbar_wrap";
+}
+
 class TableOfContentOptionPlugin extends Plugin {
     static id = "tableOfContentOption";
-    static dependencies = ["clone", "remove"];
+    static dependencies = ["remove"];
     resources = {
-        builder_options: [
-            {
-                template: "website.TableOfContentOption",
-                selector: ".s_table_of_content",
-            },
-            {
-                template: "website.TableOfContentNavbarOption",
-                selector: ".s_table_of_content_navbar_wrap",
-            },
-        ],
+        builder_options: [TableOfContentOption, TableOfContentNavbarOption],
         builder_actions: {
             NavbarPositionAction,
         },
diff --git a/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js b/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js
index 36bb192972a69..990721f1e8914 100644
--- a/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js
@@ -1,25 +1,32 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BEGIN, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class TimelineListOption extends BaseOptionComponent {
+    static template = "website.TimelineListOption";
+    static selector = ".s_timeline_list";
+}
+
+export class DotLinesColorOption extends BaseOptionComponent {
+    static template = "website.DotLinesColorOption";
+    static selector = ".s_timeline_list";
+}
+
+export class DotColorOption extends BaseOptionComponent {
+    static template = "website.DotColorOption";
+    static selector = ".s_timeline_list .s_timeline_list_row";
+}
+
 class TimelineListOptionPlugin extends Plugin {
     static id = "timelineListOption";
     resources = {
         builder_options: [
             // TODO AGAU: alignment option sequence doesn't match master, must split template
-            withSequence(BEGIN, {
-                template: "website.TimelineListOption",
-                selector: ".s_timeline_list",
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.DotLinesColorOption",
-                selector: ".s_timeline_list",
-            }),
-            withSequence(BEGIN, {
-                template: "website.DotColorOption",
-                selector: ".s_timeline_list .s_timeline_list_row",
-            }),
+            withSequence(BEGIN, TimelineListOption),
+            withSequence(SNIPPET_SPECIFIC_END, DotLinesColorOption),
+            withSequence(BEGIN, DotColorOption),
         ],
         dropzone_selector: {
             selector: ".s_timeline_list_row",
diff --git a/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js b/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js
index d02bce690463e..678dc7f5825a2 100644
--- a/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js
@@ -5,6 +5,7 @@ import { localization } from "@web/core/l10n/localization";
 import { registry } from "@web/core/registry";
 import { after, before, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { WEBSITE_BACKGROUND_OPTIONS } from "@website/builder/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const TIMELINE = before(WEBSITE_BACKGROUND_OPTIONS);
 export const DOT_LINES_COLOR = SNIPPET_SPECIFIC_END;
@@ -14,23 +15,28 @@ function isTimelineCard(el) {
     return el.matches(".s_timeline_card");
 }
 
+export class TimelineOption extends BaseOptionComponent {
+    static template = "website.TimelineOption";
+    static selector = ".s_timeline";
+}
+
+export class DotLinesColorOption extends BaseOptionComponent {
+    static template = "website.DotLinesColorOption";
+    static selector = ".s_timeline";
+}
+
+export class DotColorOption extends BaseOptionComponent {
+    static template = "website.DotColorOption";
+    static selector = ".s_timeline .s_timeline_row";
+}
+
 class TimelineOptionPlugin extends Plugin {
     static id = "timelineOption";
-    static dependencies = ["history"];
     resources = {
         builder_options: [
-            withSequence(TIMELINE, {
-                template: "website.TimelineOption",
-                selector: ".s_timeline",
-            }),
-            withSequence(DOT_LINES_COLOR, {
-                template: "website.DotLinesColorOption",
-                selector: ".s_timeline",
-            }),
-            withSequence(DOT_COLOR, {
-                template: "website.DotColorOption",
-                selector: ".s_timeline .s_timeline_row",
-            }),
+            withSequence(TIMELINE, TimelineOption),
+            withSequence(DOT_LINES_COLOR, DotLinesColorOption),
+            withSequence(DOT_COLOR, DotColorOption),
         ],
         dropzone_selector: {
             selector: ".s_timeline_row",
diff --git a/addons/website/static/src/builder/plugins/options/utils.js b/addons/website/static/src/builder/plugins/options/utils.js
index 570447fad283a..ac4201e7aaad7 100644
--- a/addons/website/static/src/builder/plugins/options/utils.js
+++ b/addons/website/static/src/builder/plugins/options/utils.js
@@ -1,14 +1,11 @@
 export const CARD_PARENT_HANDLERS =
     ".s_three_columns .row > div, .s_comparisons .row > div, .s_cards_grid .row > div, .s_cards_soft .row > div, .s_product_list .row > div, .s_newsletter_centered .row > div, .s_company_team_spotlight .row > div, .s_comparisons_horizontal .row > div, .s_company_team_grid .row > div, .s_company_team_card .row > div, .s_carousel_cards_item";
 
-export const ONLY_BG_COLOR_SELECTOR =
-    "section .row > div, .s_text_highlight, .s_mega_menu_thumbnails_footer, .s_hr, .s_cta_badge";
-export const ONLY_BG_COLOR_EXCLUDE = `.s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .s_image_gallery .row > div, .s_text_cover .row > .o_not_editable, [data-snippet] :not(.oe_structure) > .s_hr, ${CARD_PARENT_HANDLERS}, .s_website_form_cover .row > .o_not_editable, .s_bento_grid .row > div, .s_banner_categories .row > div`;
-
-export const BASE_ONLY_BG_IMAGE_SELECTOR = ".s_tabs .oe_structure > *, footer .oe_structure > *:not(.o_footer_bottom_part)";
-export const ONLY_BG_IMAGE_SELECTOR = BASE_ONLY_BG_IMAGE_SELECTOR;
-export const ONLY_BG_IMAGE_EXLUDE = "";
+export const BASE_ONLY_BG_IMAGE_SELECTOR = `.s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .s_image_gallery .row > div, .s_text_cover .row > .o_not_editable, [data-snippet] :not(.oe_structure) > .s_hr, ${CARD_PARENT_HANDLERS}, .s_website_form_cover .row > .o_not_editable, .s_bento_grid .row > div`;
 
 export const BOTH_BG_COLOR_IMAGE_SELECTOR =
     "section, .carousel-item, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .parallax, .s_text_cover .row > .o_not_editable, .s_website_form_cover .row > .o_not_editable, .s_split_intro .row > .o_not_editable, .s_bento_grid .row > div, .s_banner_categories .row > div, .s_ecomm_categories_showcase_block";
 export const BOTH_BG_COLOR_IMAGE_EXCLUDE = `${BASE_ONLY_BG_IMAGE_SELECTOR}, .s_carousel_wrapper, .s_image_gallery .carousel-item, .s_google_map, .s_map, [data-snippet] :not(.oe_structure) > [data-snippet], .s_masonry_block .s_col_no_resize, .s_quotes_carousel_wrapper, .s_carousel_intro_wrapper, .s_carousel_cards_item, .s_dynamic_snippet_category .s_dynamic_snippet_title`;
+
+export const CARD_DISABLE_WIDTH_APPLY_TO = ":scope > .s_card:not(.s_carousel_cards_card)";
+export const WEBSITE_BG_APPLY_TO = ":scope > .s_carousel_cards_card";
diff --git a/addons/website/static/src/builder/plugins/options/visibility_option.js b/addons/website/static/src/builder/plugins/options/visibility_option.js
index 79fd7ac1c7770..a432d30b00be2 100644
--- a/addons/website/static/src/builder/plugins/options/visibility_option.js
+++ b/addons/website/static/src/builder/plugins/options/visibility_option.js
@@ -2,7 +2,11 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class VisibilityOption extends BaseOptionComponent {
     static template = "website.VisibilityOption";
-    static props = {
-        websiteSession: true,
-    };
+    static dependencies = ["visibility", "websiteSession"];
+    static selector = "section, .s_hr";
+
+    setup() {
+        super.setup();
+        this.websiteSession = this.dependencies.websiteSession.getSession();
+    }
 }
diff --git a/addons/website/static/src/builder/plugins/options/visibility_option.xml b/addons/website/static/src/builder/plugins/options/visibility_option.xml
index c3fadaf603ff7..717dc62d73d24 100644
--- a/addons/website/static/src/builder/plugins/options/visibility_option.xml
+++ b/addons/website/static/src/builder/plugins/options/visibility_option.xml
@@ -38,7 +38,7 @@
 <t t-name="website.VisibilityOption">
     <t t-set="language_ids" t-value="env.services.website.currentWebsite.language_ids || []"/>
 
-    <t t-set="geoip_country_code" t-value="this.props.websiteSession.geoip_country_code"/>
+    <t t-set="geoip_country_code" t-value="this.websiteSession.geoip_country_code"/>
     <BuilderRow label.translate="Visibility" expand="true" observeCollapseContent="true">
         <t t-call="website.DeviceVisibility"></t>
         <BuilderSelect dataAttributeAction="'visibility'" action="'forceVisible'" preview="false">
diff --git a/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js b/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js
index 7201eaf2a58fb..8c7fdef5c7599 100644
--- a/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js
@@ -6,27 +6,24 @@ import { VisibilityOption } from "./visibility_option";
 import { withSequence } from "@html_editor/utils/resource";
 import { CONDITIONAL_VISIBILITY, DEVICE_VISIBILITY } from "@website/builder/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-export const VISIBILITY_OPTION_SELECTOR = "section, .s_hr";
 export const DEVICE_VISIBILITY_OPTION_SELECTOR = "section .row > div";
 
+export class DeviceVisibilityOption extends BaseOptionComponent {
+    static template = "website.DeviceVisibilityOption";
+    static dependencies = ["visibility"];
+    static selector = DEVICE_VISIBILITY_OPTION_SELECTOR;
+    static exclude = ".s_col_no_resize.row > div, .s_masonry_block .s_col_no_resize";
+}
+
 class VisibilityOptionPlugin extends Plugin {
     static id = "visibilityOption";
     static dependencies = ["visibility", "websiteSession"];
     resources = {
         builder_options: [
-            withSequence(CONDITIONAL_VISIBILITY, {
-                OptionComponent: VisibilityOption,
-                props: {
-                    websiteSession: this.dependencies.websiteSession.getSession(),
-                },
-                selector: VISIBILITY_OPTION_SELECTOR,
-            }),
-            withSequence(DEVICE_VISIBILITY, {
-                template: "website.DeviceVisibilityOption",
-                selector: DEVICE_VISIBILITY_OPTION_SELECTOR,
-                exclude: ".s_col_no_resize.row > div, .s_masonry_block .s_col_no_resize",
-            }),
+            withSequence(CONDITIONAL_VISIBILITY, VisibilityOption),
+            withSequence(DEVICE_VISIBILITY, DeviceVisibilityOption),
         ],
         builder_actions: {
             ForceVisibleAction,
@@ -72,7 +69,7 @@ class VisibilityOptionPlugin extends Plugin {
     }
 
     normalizeCSSSelectors(rootEl) {
-        for (const el of selectElements(rootEl, VISIBILITY_OPTION_SELECTOR)) {
+        for (const el of selectElements(rootEl, VisibilityOption.selector)) {
             this.updateCSSSelectors(el);
         }
     }
diff --git a/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
index 8dea04cb264b0..3746b14d340d9 100644
--- a/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
@@ -1,75 +1,79 @@
-import { WebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
+import { BaseWebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
-import {
-    BOTH_BG_COLOR_IMAGE_EXCLUDE,
-    BOTH_BG_COLOR_IMAGE_SELECTOR,
-    ONLY_BG_COLOR_EXCLUDE,
-    ONLY_BG_COLOR_SELECTOR,
-    ONLY_BG_IMAGE_EXLUDE,
-    ONLY_BG_IMAGE_SELECTOR,
-} from "./utils";
+import { BASE_ONLY_BG_IMAGE_SELECTOR, CARD_PARENT_HANDLERS } from "./utils";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC_BEFORE } from "@html_builder/utils/option_sequence";
 import { WEBSITE_BACKGROUND_OPTIONS } from "@website/builder/option_sequence";
 
+export class WebsiteBackgroundCarouselOption extends BaseWebsiteBackgroundOption {
+    static selector = "section";
+    static applyTo = ":scope > .carousel:not(.s_carousel_cards)";
+    static defaultProps = {
+        withColors: true,
+        withImages: true,
+        withVideos: true,
+        withShapes: true,
+        withColorCombinations: true,
+    };
+}
+
+export class WebsiteBackgroundBGColorImageOption extends BaseWebsiteBackgroundOption {
+    static selector =
+        "section, .carousel-item, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .parallax, .s_text_cover .row > .o_not_editable, .s_website_form_cover .row > .o_not_editable, .s_split_intro .row > .o_not_editable, .s_bento_grid .row > div";
+    static exclude = `${BASE_ONLY_BG_IMAGE_SELECTOR}, .s_carousel_wrapper, .s_image_gallery .carousel-item, .s_google_map, .s_map, [data-snippet] :not(.oe_structure) > [data-snippet], .s_masonry_block .s_col_no_resize, .s_quotes_carousel_wrapper, .s_carousel_intro_wrapper, .s_carousel_cards_item`;
+    static defaultProps = {
+        withColors: true,
+        withImages: true,
+        withVideos: true,
+        withShapes: true,
+        withColorCombinations: true,
+    };
+}
+export class WebsiteBackgroundBGColorOption extends BaseWebsiteBackgroundOption {
+    static selector =
+        "section .row > div, .s_text_highlight, .s_mega_menu_thumbnails_footer, .s_hr, .s_cta_badge";
+    static exclude = `.s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .s_image_gallery .row > div, .s_text_cover .row > .o_not_editable, [data-snippet] :not(.oe_structure) > .s_hr, ${CARD_PARENT_HANDLERS}, .s_website_form_cover .row > .o_not_editable, .s_bento_grid .row > div, .s_banner_categories .row > div`;
+    static defaultProps = {
+        withColors: true,
+        withImages: false,
+        withColorCombinations: true,
+    };
+}
+export class WebsiteBackgroundOnlyBGImageOption extends BaseWebsiteBackgroundOption {
+    static selector = BASE_ONLY_BG_IMAGE_SELECTOR;
+    static defaultProps = {
+        withColors: false,
+        withImages: true,
+        withVideos: true,
+        withShapes: true,
+        withColorCombinations: false,
+    };
+}
+
 class WebsiteBackgroundOptionPlugin extends Plugin {
     static id = "websiteOption";
-    sectionSelector = "section";
     carouselApplyTo = ":scope > .carousel:not(.s_carousel_cards)";
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC_BEFORE, {
-                OptionComponent: WebsiteBackgroundOption,
-                selector: this.sectionSelector,
-                applyTo: this.carouselApplyTo,
-                props: {
-                    withColors: true,
-                    withImages: true,
-                    withVideos: true,
-                    withShapes: true,
-                    withColorCombinations: true,
-                },
-            }),
-            withSequence(WEBSITE_BACKGROUND_OPTIONS, {
-                OptionComponent: WebsiteBackgroundOption,
-                selector: BOTH_BG_COLOR_IMAGE_SELECTOR,
-                exclude: BOTH_BG_COLOR_IMAGE_EXCLUDE,
-                props: {
-                    withColors: true,
-                    withImages: true,
-                    withVideos: true,
-                    withShapes: true,
-                    withColorCombinations: true,
-                },
-            }),
-            withSequence(WEBSITE_BACKGROUND_OPTIONS, {
-                OptionComponent: WebsiteBackgroundOption,
-                selector: ONLY_BG_COLOR_SELECTOR,
-                exclude: ONLY_BG_COLOR_EXCLUDE,
-                props: {
-                    withColors: true,
-                    withImages: false,
-                    withColorCombinations: true,
-                },
-            }),
-            withSequence(WEBSITE_BACKGROUND_OPTIONS, {
-                OptionComponent: WebsiteBackgroundOption,
-                selector: ONLY_BG_IMAGE_SELECTOR,
-                exclude: ONLY_BG_IMAGE_EXLUDE,
-                props: {
-                    withColors: false,
-                    withImages: true,
-                    withVideos: true,
-                    withShapes: true,
-                    withColorCombinations: false,
-                },
-            }),
+            withSequence(SNIPPET_SPECIFIC_BEFORE, WebsiteBackgroundCarouselOption),
+            withSequence(WEBSITE_BACKGROUND_OPTIONS, WebsiteBackgroundBGColorImageOption),
+            withSequence(WEBSITE_BACKGROUND_OPTIONS, WebsiteBackgroundBGColorOption),
+            withSequence(WEBSITE_BACKGROUND_OPTIONS, WebsiteBackgroundOnlyBGImageOption),
         ],
         mark_color_level_selector_params: [
-            { selector: this.sectionSelector, applyTo: this.carouselApplyTo },
-            { selector: BOTH_BG_COLOR_IMAGE_SELECTOR, exclude: BOTH_BG_COLOR_IMAGE_EXCLUDE },
-            { selector: ONLY_BG_COLOR_SELECTOR, exclude: ONLY_BG_COLOR_EXCLUDE },
+            {
+                selector: WebsiteBackgroundCarouselOption.selector,
+                applyTo: WebsiteBackgroundCarouselOption.applyTo,
+            },
+            {
+                selector: WebsiteBackgroundBGColorImageOption.selector,
+                exclude: WebsiteBackgroundBGColorImageOption.exclude,
+            },
+            {
+                selector: WebsiteBackgroundBGColorOption.selector,
+                exclude: WebsiteBackgroundBGColorOption.exclude,
+            },
         ],
     };
 }
diff --git a/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js
index 4c1e992f2dc66..ca62b31402190 100644
--- a/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js
@@ -1,19 +1,20 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
+export class InfoPageOption extends BaseOptionComponent {
+    static template = "website.InfoPageOption";
+    static selector = "main:has(.o_website_info)";
+    static title = _t("Info Page");
+    static editableOnly = false;
+    static groups = ["website.group_website_designer"];
+}
+
 class WebsiteInfoPageOption extends Plugin {
     static id = "websiteInfoPageOption";
     resources = {
-        builder_options: [
-            {
-                template: "website.InfoPageOption",
-                selector: "main:has(.o_website_info)",
-                title: _t("Info Page"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [InfoPageOption],
     };
 }
 
diff --git a/addons/website/static/src/builder/plugins/options/website_page_config_option.js b/addons/website/static/src/builder/plugins/options/website_page_config_option.js
index 6695589eb0d14..c1a5376c7f310 100644
--- a/addons/website/static/src/builder/plugins/options/website_page_config_option.js
+++ b/addons/website/static/src/builder/plugins/options/website_page_config_option.js
@@ -2,7 +2,15 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class TopMenuVisibilityOption extends BaseOptionComponent {
     static template = "website.TopMenuVisibilityOption";
-    static props = {
-        doesPageOptionExist: Function,
-    };
+    static dependencies = ["websitePageConfigOptionPlugin"];
+    static selector =
+        "[data-main-object]:has(input.o_page_option_data[name='header_visible']) #wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+
+    setup() {
+        super.setup();
+        this.doesPageOptionExist =
+            this.dependencies.websitePageConfigOptionPlugin.doesPageOptionExist;
+    }
 }
diff --git a/addons/website/static/src/builder/plugins/options/website_page_config_option.xml b/addons/website/static/src/builder/plugins/options/website_page_config_option.xml
index 3df0d59a568b1..2de96ebd65a04 100644
--- a/addons/website/static/src/builder/plugins/options/website_page_config_option.xml
+++ b/addons/website/static/src/builder/plugins/options/website_page_config_option.xml
@@ -4,16 +4,16 @@
 <t t-name="website.TopMenuVisibilityOption">
     <BuilderRow label.translate="Header Position" tooltip.translate="Change the Header Position on this page" t-if="!this.isActiveItem('header_sidebar_opt')">
         <BuilderSelect action="'setWebsiteHeaderVisibility'">
-            <BuilderSelectItem actionValue="'overTheContent'" id="'overTheContent'" t-if="props.doesPageOptionExist('header_overlay')">Over The Content</BuilderSelectItem>
+            <BuilderSelectItem actionValue="'overTheContent'" id="'overTheContent'" t-if="doesPageOptionExist('header_overlay')">Over The Content</BuilderSelectItem>
             <BuilderSelectItem actionValue="'regular'">Regular</BuilderSelectItem>
             <BuilderSelectItem actionValue="'hidden'">Hidden</BuilderSelectItem>
         </BuilderSelect>
-    </BuilderRow>    
+    </BuilderRow>
     <t t-if="isActiveItem('overTheContent')">
-        <BuilderRow label.translate="Background" level="1" t-if="props.doesPageOptionExist('header_color')">
+        <BuilderRow label.translate="Background" level="1" t-if="doesPageOptionExist('header_color')">
             <BuilderColorPicker action="'setPageWebsiteDirty'" styleAction="'background-color'" enabledTabs="['custom']"/>
         </BuilderRow>
-        <BuilderRow label.translate="Text Color" level="1" t-if="props.doesPageOptionExist('header_text_color')">
+        <BuilderRow label.translate="Text Color" level="1" t-if="doesPageOptionExist('header_text_color')">
             <BuilderColorPicker action="'setPageWebsiteDirty'" styleAction="'color'" enabledTabs="['solid', 'custom']"/>
         </BuilderRow>
     </t>
diff --git a/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js
index 044e9e7d80259..ee405d34f9a09 100644
--- a/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js
@@ -7,14 +7,29 @@ import { FOOTER_COPYRIGHT } from "./footer_option_plugin";
 import { HEADER_TEMPLATE } from "./header/header_option_plugin";
 import { TopMenuVisibilityOption } from "./website_page_config_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const TOP_MENU_VISIBILITY = after(HEADER_TEMPLATE);
 export const HIDE_FOOTER = after(FOOTER_COPYRIGHT);
 
+export class HideFooterOption extends BaseOptionComponent {
+    static template = "website.HideFooterOption";
+    static selector =
+        "[data-main-object]:has(input.o_page_option_data[name='footer_visible']) #wrapwrap > footer";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class WebsitePageConfigOptionPlugin extends Plugin {
     static id = "websitePageConfigOptionPlugin";
     static dependencies = ["history", "visibility", "builderActions"];
-    static shared = ["setDirty", "setFooterVisible", "getVisibilityItem", "getFooterVisibility"];
+    static shared = [
+        "setDirty",
+        "setFooterVisible",
+        "getVisibilityItem",
+        "getFooterVisibility",
+        "doesPageOptionExist",
+    ];
     resources = {
         builder_actions: {
             SetWebsiteHeaderVisibilityAction,
@@ -22,23 +37,8 @@ class WebsitePageConfigOptionPlugin extends Plugin {
             SetPageWebsiteDirtyAction,
         },
         builder_options: [
-            withSequence(TOP_MENU_VISIBILITY, {
-                OptionComponent: TopMenuVisibilityOption,
-                selector:
-                    "[data-main-object]:has(input.o_page_option_data[name='header_visible']) #wrapwrap > header",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-                props: {
-                    doesPageOptionExist: this.doesPageOptionExist.bind(this),
-                },
-            }),
-            withSequence(HIDE_FOOTER, {
-                template: "website.HideFooterOption",
-                selector:
-                    "[data-main-object]:has(input.o_page_option_data[name='footer_visible']) #wrapwrap > footer",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(TOP_MENU_VISIBILITY, TopMenuVisibilityOption),
+            withSequence(HIDE_FOOTER, HideFooterOption),
         ],
         target_show: this.onTargetVisibilityToggle.bind(this, true),
         target_hide: this.onTargetVisibilityToggle.bind(this, false),
diff --git a/addons/website/static/src/builder/plugins/size_option_plugin.js b/addons/website/static/src/builder/plugins/size_option_plugin.js
index 74a97eb37a675..03c8a1c36df47 100644
--- a/addons/website/static/src/builder/plugins/size_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/size_option_plugin.js
@@ -2,16 +2,17 @@ import { after, BLOCK_ALIGN } from "@html_builder/utils/option_sequence";
 import { withSequence } from "@html_editor/utils/resource";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class SizeOption extends BaseOptionComponent {
+    static template = "website.SizeOption";
+    static selector = ".s_alert";
+}
 
 class SizeOptionPlugin extends Plugin {
     static id = "sizeOption";
     resources = {
-        builder_options: [
-            withSequence(after(BLOCK_ALIGN), {
-                template: "website.SizeOption",
-                selector: ".s_alert",
-            }),
-        ],
+        builder_options: [withSequence(after(BLOCK_ALIGN), SizeOption)],
     };
 }
 registry.category("website-plugins").add(SizeOptionPlugin.id, SizeOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/switchable_views.js b/addons/website/static/src/builder/plugins/switchable_views.js
index c0db64ad32fba..7068a8a589ffb 100644
--- a/addons/website/static/src/builder/plugins/switchable_views.js
+++ b/addons/website/static/src/builder/plugins/switchable_views.js
@@ -3,14 +3,16 @@ import { onWillStart } from "@odoo/owl";
 
 export class SwitchableViews extends BaseOptionComponent {
     static template = "website.SwitchableViews";
-    static props = {
-        getSwitchableRelatedViews: Function,
-    };
+    static dependencies = ["switchableViews"];
+    static selector = ".o_portal_wrap";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
 
     setup() {
         super.setup();
+        const { getSwitchableRelatedViews } = this.dependencies.switchableViews;
         onWillStart(async () => {
-            this.switchableRelatedViews = await this.props.getSwitchableRelatedViews();
+            this.switchableRelatedViews = await getSwitchableRelatedViews();
         });
     }
 }
diff --git a/addons/website/static/src/builder/plugins/switchable_views_plugin.js b/addons/website/static/src/builder/plugins/switchable_views_plugin.js
index 31be1a1b62d5d..e4d82f50b8c14 100644
--- a/addons/website/static/src/builder/plugins/switchable_views_plugin.js
+++ b/addons/website/static/src/builder/plugins/switchable_views_plugin.js
@@ -6,23 +6,12 @@ import { SwitchableViews } from "./switchable_views";
 export class SwitchableViewsPlugin extends Plugin {
     static id = "switchableViews";
     static dependencies = ["customizeWebsite"];
+    static shared = ["getSwitchableRelatedViews"];
 
     resources = {
-        builder_options: {
-            OptionComponent: SwitchableViews,
-            selector: ".o_portal_wrap",
-            props: {
-                getSwitchableRelatedViews: this.getSwitchableRelatedViews.bind(this),
-            },
-            groups: ["website.group_website_designer"],
-            editableOnly: false,
-        },
+        builder_options: [SwitchableViews],
     };
 
-    setup() {
-        this.prom = null;
-    }
-
     getSwitchableRelatedViews() {
         if (!this.prom) {
             const viewKey = this.document.querySelector("html").dataset.viewXmlid;
diff --git a/addons/website/static/src/builder/plugins/theme/theme_advanced_option.js b/addons/website/static/src/builder/plugins/theme/theme_advanced_option.js
index b6e31b2ccb561..7083b3f37eb91 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_advanced_option.js
+++ b/addons/website/static/src/builder/plugins/theme/theme_advanced_option.js
@@ -1,11 +1,14 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { useState } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
 
 export class ThemeAdvancedOption extends BaseOptionComponent {
     static template = "website.ThemeAdvancedOption";
-    static props = {
-        grays: Object,
-    };
+    static dependencies = ["themeTab"];
+    setup() {
+        super.setup();
+        this.grays = useState(this.dependencies.themeTab.getGrays());
+    }
 
     getGrayTitle(grayCode) {
         return _t("Gray %(grayCode)s", { grayCode });
diff --git a/addons/website/static/src/builder/plugins/theme/theme_advanced_option.xml b/addons/website/static/src/builder/plugins/theme/theme_advanced_option.xml
index 445cd1b3ed6b6..d85cd817b39b6 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_advanced_option.xml
+++ b/addons/website/static/src/builder/plugins/theme/theme_advanced_option.xml
@@ -49,7 +49,7 @@
 	                <span t-att-title="getGrayTitle(grayCode)"
 	                      t-attf-variable="#{grayCode}"
 	                      t-attf-class="o_we_user_value_widget o_we_gray_preview bg-#{grayCode}"
-	                      t-attf-style="background-color: {{props.grays[grayCode]}} !important"
+	                      t-attf-style="background-color: {{grays[grayCode]}} !important"
 	                />
 	            </t>
             </div>
diff --git a/addons/website/static/src/builder/plugins/theme/theme_colors_option.js b/addons/website/static/src/builder/plugins/theme/theme_colors_option.js
index 9f70a763c8445..dc8d18a33452b 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_colors_option.js
+++ b/addons/website/static/src/builder/plugins/theme/theme_colors_option.js
@@ -4,7 +4,6 @@ import { getCSSVariableValue } from "@html_editor/utils/formatting";
 
 export class ThemeColorsOption extends BaseOptionComponent {
     static template = "website.ThemeColorsOption";
-    static props = {};
     setup() {
         super.setup();
         this.palettes = this.getPalettes();
diff --git a/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js b/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js
index 3524e942d07e2..6372284ac2aa4 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js
+++ b/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js
@@ -19,6 +19,7 @@ import { reactive } from "@odoo/owl";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { CustomizeWebsiteVariableAction } from "../customize_website_plugin";
 import { EditHeadBodyDialog } from "@website/components/edit_head_body_dialog/edit_head_body_dialog";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const GRAY_PARAMS = {
     EXTRA_SATURATION: "gray-extra-saturation",
@@ -52,54 +53,59 @@ export class ThemeTabPlugin extends Plugin {
         theme_options: [
             withSequence(
                 OPTION_POSITIONS.COLORS,
-                this.getThemeOptionBlock("theme-colors", _t("Colors"), {
-                    OptionComponent: ThemeColorsOption,
-                })
+                this.getThemeOptionBlock("theme-colors", _t("Colors"), ThemeColorsOption)
             ),
             withSequence(
                 OPTION_POSITIONS.SETTINGS,
-                this.getThemeOptionBlock("website-settings", _t("Website"), {
-                    template: "website.ThemeWebsiteSettingsOption",
-                })
+                this.getThemeOptionBlock(
+                    "website-settings",
+                    _t("Website"),
+                    class ThemeWebsiteSettingsOption extends BaseOptionComponent {
+                        static template = "website.ThemeWebsiteSettingsOption";
+                    }
+                )
             ),
             withSequence(
                 OPTION_POSITIONS.PARAGRAPH,
-                this.getThemeOptionBlock("theme-paragraph", _t("Paragraph"), {
-                    template: "website.ThemeParagraphOption",
-                })
+                this.getThemeOptionBlock(
+                    "theme-paragraph",
+                    _t("Paragraph"),
+                    class ThemeParagraphOption extends BaseOptionComponent {
+                        static template = "website.ThemeParagraphOption";
+                    }
+                )
             ),
             withSequence(
                 OPTION_POSITIONS.HEADINGS,
-                this.getThemeOptionBlock("theme-headings", _t("Headings"), {
-                    OptionComponent: ThemeHeadingsOption,
-                })
+                this.getThemeOptionBlock("theme-headings", _t("Headings"), ThemeHeadingsOption)
             ),
             withSequence(
                 OPTION_POSITIONS.BUTTON,
-                this.getThemeOptionBlock("theme-button", _t("Button"), {
-                    OptionComponent: ThemeButtonOption,
-                })
+                this.getThemeOptionBlock("theme-button", _t("Button"), ThemeButtonOption)
             ),
             withSequence(
                 OPTION_POSITIONS.LINK,
-                this.getThemeOptionBlock("theme-link", _t("Link"), {
-                    template: "website.ThemeLinkOption",
-                })
+                this.getThemeOptionBlock(
+                    "theme-link",
+                    _t("Link"),
+                    class ThemeLinkOption extends BaseOptionComponent {
+                        static template = "website.ThemeLinkOption";
+                    }
+                )
             ),
             withSequence(
                 OPTION_POSITIONS.INPUT,
-                this.getThemeOptionBlock("theme-input", _t("Input Fields"), {
-                    template: "website.ThemeInputOption",
-                })
+                this.getThemeOptionBlock(
+                    "theme-input",
+                    _t("Input Fields"),
+                    class ThemeInputOption extends BaseOptionComponent {
+                        static template = "website.ThemeInputOption";
+                    }
+                )
             ),
             withSequence(
                 OPTION_POSITIONS.ADVANCED,
-                this.getThemeOptionBlock("theme-advanced", _t("Advanced"), {
-                    OptionComponent: ThemeAdvancedOption,
-                    props: {
-                        grays: this.grays,
-                    },
-                })
+                this.getThemeOptionBlock("theme-advanced", _t("Advanced"), ThemeAdvancedOption)
             ),
         ],
     };
diff --git a/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js b/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js
index 2f44a049d1411..5de21d8e1ab17 100644
--- a/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js
@@ -1,25 +1,31 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BEGIN, SNIPPET_SPECIFIC, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class TimelineImagesOption extends BaseOptionComponent {
+    static template = "website.TimelineImagesOption";
+    static selector = ".s_timeline_images";
+}
+
+export class DotLinesColorOption extends BaseOptionComponent {
+    static template = "website.DotLinesColorOption";
+    static selector = ".s_timeline_images";
+}
+
+export class DotColorOption extends BaseOptionComponent {
+    static template = "website.DotColorOption";
+    static selector = ".s_timeline_images .s_timeline_images_row";
+}
+
 class TimelineImagesOptionPlugin extends Plugin {
     static id = "timelineImagesOption";
-    static dependencies = ["history"];
     resources = {
         builder_options: [
-            withSequence(BEGIN, {
-                template: "website.TimelineImagesOption",
-                selector: ".s_timeline_images",
-            }),
-            withSequence(SNIPPET_SPECIFIC_END, {
-                template: "website.DotLinesColorOption",
-                selector: ".s_timeline_images",
-            }),
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website.DotColorOption",
-                selector: ".s_timeline_images .s_timeline_images_row",
-            }),
+            withSequence(BEGIN, TimelineImagesOption),
+            withSequence(SNIPPET_SPECIFIC_END, DotLinesColorOption),
+            withSequence(SNIPPET_SPECIFIC, DotColorOption),
         ],
         dropzone_selector: {
             selector: ".s_timeline_images_row",
diff --git a/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js b/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
index 764969942cffe..8d164e7b64a83 100644
--- a/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
+++ b/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
@@ -245,12 +245,11 @@ export class CustomizeTranslationTabPlugin extends Plugin {
         translate_options: [
             withSequence(
                 1,
-                this.getTranslationOptionBlock("translate-webpage", _t("Translation"), {
-                    OptionComponent: TranslateWebpageOption,
-                    props: {
-                        translationState: this.translationState,
-                    },
-                })
+                this.getTranslationOptionBlock(
+                    "translate-webpage",
+                    _t("Translation"),
+                    TranslateWebpageOption
+                )
             ),
         ],
     };
@@ -264,19 +263,18 @@ export class CustomizeTranslationTabPlugin extends Plugin {
      *
      * @param {string} id - Unique identifier for the block
      * @param {string} name - Display name for the block
-     * @param {Object} options - Configuration options for the block
+     * @param {Object} Option - Option component
      */
-    getTranslationOptionBlock(id, name, options) {
+    getTranslationOptionBlock(id, name, Option) {
         const el = this.document.createElement("div");
         el.dataset.name = name;
         this.document.body.appendChild(el);
 
-        options.selector = "*";
         return {
             id: id,
             snippetModel: {},
             element: el,
-            options: [options],
+            options: [Option],
             isRemovable: false,
             isClonable: false,
             containerTopButtons: [],
diff --git a/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.js b/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.js
index 6471c86c8a8c4..50819f7be1499 100644
--- a/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.js
+++ b/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.js
@@ -1,8 +1,13 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { useState } from "@odoo/owl";
 
 export class TranslateWebpageOption extends BaseOptionComponent {
     static template = "website.TranslateWebpageOption";
-    static props = {
-        translationState: Object,
-    };
+    static selector = "*";
+    setup() {
+        super.setup();
+        this.translationState = useState(
+            this.env.editor.shared.customizeTranslationTab.getTranslationState()
+        );
+    }
 }
diff --git a/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.xml b/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.xml
index c333219a9b396..088bf79e1e184 100644
--- a/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.xml
+++ b/addons/website/static/src/builder/plugins/translation_tab/translate_webpage_option.xml
@@ -6,7 +6,7 @@
         <BuilderRow label.translate="Translate to"
             tooltip.translate="Translate the whole content with AI">
             <BuilderButton action="'translateWebpageAI'" type="'success'">
-                <t t-if="props.translationState.isTranslating">
+                <t t-if="this.translationState.isTranslating">
                     <i class="fa fa-circle-o-notch fa-spin lh-1"/> Translating...
                 </t>
                 <t t-else="" t-out="env.services.website.currentWebsite.metadata.langName"/>
diff --git a/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js b/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js
index fc8ec39e7048e..a6f59274ef3df 100644
--- a/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js
@@ -1,23 +1,20 @@
-import { VerticalAlignmentOption } from "@html_builder/plugins/vertical_alignment_option";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { BOX_BORDER_SHADOW } from "../option_sequence";
 import { registry } from "@web/core/registry";
+import { BaseVerticalAlignmentOption } from "@html_builder/plugins/base_vertical_alignment_option";
+
+export class WebsiteVerticalAlignmentOption extends BaseVerticalAlignmentOption {
+    static selector = ".s_attributes_vertical_col";
+    static applyTo = ":scope > .row";
+    level = 0;
+    justify = false;
+}
 
 class VerticalAlignmentOptionPlugin extends Plugin {
     static id = "websiteVerticalAlignmentOption";
     resources = {
-        builder_options: [
-            withSequence(BOX_BORDER_SHADOW, {
-                OptionComponent: VerticalAlignmentOption,
-                selector: ".s_attributes_horizontal_col",
-                applyTo: ":scope > .row",
-                props: {
-                    level: 0,
-                    justify: false,
-                },
-            }),
-        ],
+        builder_options: [withSequence(BOX_BORDER_SHADOW, WebsiteVerticalAlignmentOption)],
     };
 }
 registry
diff --git a/addons/website/static/src/builder/plugins/website_visibility_plugin.js b/addons/website/static/src/builder/plugins/website_visibility_plugin.js
index 3a3546f9e4e5a..7dad888382ab4 100644
--- a/addons/website/static/src/builder/plugins/website_visibility_plugin.js
+++ b/addons/website/static/src/builder/plugins/website_visibility_plugin.js
@@ -1,9 +1,7 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
-import {
-    DEVICE_VISIBILITY_OPTION_SELECTOR,
-    VISIBILITY_OPTION_SELECTOR,
-} from "./options/visibility_option_plugin";
+import { DEVICE_VISIBILITY_OPTION_SELECTOR } from "./options/visibility_option_plugin";
+import { VisibilityOption } from "./options/visibility_option";
 
 export class WebsiteVisibilityPlugin extends Plugin {
     static id = "websiteVisibilityPlugin";
@@ -17,7 +15,7 @@ export class WebsiteVisibilityPlugin extends Plugin {
     onTargetHide(editingEl) {
         if (
             editingEl.matches(DEVICE_VISIBILITY_OPTION_SELECTOR) ||
-            editingEl.matches(VISIBILITY_OPTION_SELECTOR)
+            editingEl.matches(VisibilityOption.selector)
         ) {
             editingEl.classList.remove("o_snippet_override_invisible");
 
@@ -31,7 +29,7 @@ export class WebsiteVisibilityPlugin extends Plugin {
     onTargetShow(editingEl) {
         if (
             editingEl.matches(DEVICE_VISIBILITY_OPTION_SELECTOR) ||
-            editingEl.matches(VISIBILITY_OPTION_SELECTOR)
+            editingEl.matches(VisibilityOption.selector)
         ) {
             const isMobilePreview = this.config.isMobileView(editingEl);
             const isMobileHidden = editingEl.classList.contains("o_snippet_mobile_invisible");
diff --git a/addons/website/static/src/builder/website_builder.js b/addons/website/static/src/builder/website_builder.js
index ce4e28d2aad73..b61f811080e94 100644
--- a/addons/website/static/src/builder/website_builder.js
+++ b/addons/website/static/src/builder/website_builder.js
@@ -43,6 +43,7 @@ import { Many2OneOptionPlugin } from "@html_builder/plugins/many2one_option_plug
 import { CustomizeTranslationTab } from "@website/builder/plugins/translation_tab/customize_translation_tab";
 import { CustomizeTranslationTabPlugin } from "./plugins/translation_tab/customize_translation_tab_plugin";
 import { WebsiteSavePlugin } from "@website/builder/plugins/website_save_plugin";
+import { Plugin } from "@html_editor/plugin";
 
 const TRANSLATION_PLUGINS = [
     BuilderOptionsTranslationPlugin,
@@ -73,6 +74,15 @@ const TRANSLATION_PLUGINS = [
     Many2OneOptionPlugin,
     CustomizeTranslationTabPlugin,
     WebsiteSavePlugin,
+    // Those plugin are depended by other Plugin but not used in translation
+    // mode.
+    // Todo: find a better way to handle that.
+    class FakeRemovePlugin extends Plugin {
+        static id = "remove";
+    },
+    class FakeClonePlugin extends Plugin {
+        static id = "clone";
+    },
 ];
 
 export class WebsiteBuilder extends Component {
diff --git a/addons/website/static/tests/builder/website_builder/background_option.test.js b/addons/website/static/tests/builder/website_builder/background_option.test.js
index aa16ed40f3c24..f3e67b7519c97 100644
--- a/addons/website/static/tests/builder/website_builder/background_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/background_option.test.js
@@ -24,13 +24,20 @@ test("change the background shape of elements", async () => {
     addOption({
         selector: ".selector",
         applyTo: ".applyTo",
-        Component: BackgroundOption,
-        props: {
-            withColors: true,
-            withImages: true,
-            // todo: handle with_videos
-            withShapes: true,
-            withColorCombinations: false,
+        Component: class TestBackgroundOption extends BackgroundOption {
+            static props = {
+                ...BackgroundOption.props,
+                withColors: { type: Boolean, optional: true },
+                withImages: { type: Boolean, optional: true },
+                withColorCombinations: { type: Boolean, optional: true },
+            };
+            static defaultProps = {
+                withColors: true,
+                withImages: true,
+                // todo: handle with_videos
+                withShapes: true,
+                withColorCombinations: false,
+            };
         },
     });
     await setupWebsiteBuilder(`
diff --git a/addons/website/static/tests/builder/website_builder/carousel_item.test.js b/addons/website/static/tests/builder/website_builder/carousel_item.test.js
index 485e636aa907e..8b2b0e029ad5e 100644
--- a/addons/website/static/tests/builder/website_builder/carousel_item.test.js
+++ b/addons/website/static/tests/builder/website_builder/carousel_item.test.js
@@ -13,7 +13,7 @@ test("Reordering a carousel item should update the container title", async () =>
     firstItemEl.classList.add("first-slide");
 
     const editor = getEditor();
-    const builderOptions = editor.shared["builderOptions"];
+    const builderOptions = editor.shared.builderOptions;
     const expectOptionContainerToInclude = (elem) => {
         expect(builderOptions.getContainers().map((container) => container.element)).toInclude(
             elem
diff --git a/addons/website/static/tests/builder/website_builder/image_gallery.test.js b/addons/website/static/tests/builder/website_builder/image_gallery.test.js
index a810faa29213e..450ecbf286dcf 100644
--- a/addons/website/static/tests/builder/website_builder/image_gallery.test.js
+++ b/addons/website/static/tests/builder/website_builder/image_gallery.test.js
@@ -159,7 +159,7 @@ test("Change gallery restore the container to the cloned equivalent image", asyn
         `
     );
     const editor = getEditor();
-    const builderOptions = editor.shared["builderOptions"];
+    const builderOptions = editor.shared.builderOptions;
     const expectOptionContainerToInclude = (elem) => {
         expect(builderOptions.getContainers().map((container) => container.element)).toInclude(
             elem
diff --git a/addons/website/static/tests/builder/website_helpers.js b/addons/website/static/tests/builder/website_helpers.js
index bc512339a3b70..a592730c02405 100644
--- a/addons/website/static/tests/builder/website_helpers.js
+++ b/addons/website/static/tests/builder/website_helpers.js
@@ -10,7 +10,7 @@ import { SetupEditorPlugin } from "@html_builder/core/setup_editor_plugin";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { defineMailModels, startServer } from "@mail/../tests/mail_test_helpers";
-import { describe } from "@odoo/hoot";
+import { after, describe } from "@odoo/hoot";
 import { advanceTime, animationFrame, click, queryOne, tick, waitFor } from "@odoo/hoot-dom";
 import {
     contains,
@@ -34,7 +34,8 @@ import { WebsiteBuilderClientAction } from "@website/client_actions/website_prev
 import { WebsiteSystrayItem } from "@website/client_actions/website_preview/website_systray_item";
 import { mockImageRequests } from "./image_test_helpers";
 import { getWebsiteSnippets } from "./snippets_getter.hoot";
-import { WebsiteBuilder } from "@website/builder/website_builder";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 
 class Website extends models.Model {
     _name = "website";
@@ -284,83 +285,34 @@ async function openBuilderSidebar(editAssetsLoaded) {
     await animationFrame();
 }
 
-export function addPlugin(...Plugin) {
-    patchWithCleanup(WebsiteBuilder.prototype, {
-        get builderProps() {
-            const props = super.builderProps;
-            props.Plugins.push(...Plugin);
-            return props;
-        },
+export function addPlugin(Plugin) {
+    registry.category("website-plugins").add(Plugin.id, Plugin);
+    after(() => {
+        registry.category("website-plugins").remove(Plugin.id);
     });
 }
 
-export function addOption({
-    selector,
-    exclude,
-    applyTo,
-    template,
-    Component,
-    sequence,
-    cleanForSave,
-    props,
-    editableOnly,
-    title,
-    reloadTarget,
-}) {
+export function addOption(option) {
     const pluginId = uniqueId("test-option");
-    const Class = makeOptionPlugin({
-        pluginId,
-        OptionComponent: Component,
-        template,
-        selector,
-        exclude,
-        applyTo,
-        sequence,
-        cleanForSave,
-        props,
-        editableOnly,
-        title,
-        reloadTarget,
-    });
-    addPlugin(Class);
-}
-function makeOptionPlugin({
-    pluginId,
-    template,
-    selector,
-    exclude,
-    applyTo,
-    sequence,
-    OptionComponent,
-    cleanForSave,
-    props,
-    editableOnly,
-    title,
-    reloadTarget,
-}) {
-    const option = {
-        OptionComponent,
-        template,
-        selector,
-        exclude,
-        applyTo,
-        cleanForSave,
-        props,
-        editableOnly,
-        title,
-        reloadTarget,
-    };
+    const BaseComponent = option.Component || BaseOptionComponent;
+    class Option extends BaseComponent {
+        static components = { ...BaseComponent.components, BorderConfigurator };
+    }
+    const staticProps = { ...option };
+    const sequence = staticProps.sequence;
+    delete staticProps.Component;
+    delete staticProps.sequence;
+    Object.assign(Option, staticProps);
 
-    const Class = {
+    const P = {
         [pluginId]: class extends Plugin {
             static id = pluginId;
             resources = {
-                builder_options: sequence ? withSequence(sequence, option) : option,
+                builder_options: sequence ? withSequence(sequence, Option) : Option,
             };
         },
     }[pluginId];
-
-    return Class;
+    addPlugin(P);
 }
 
 export function addActionOption(actions = {}) {
diff --git a/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js
index 439e35b08befb..50ce4b181a3c1 100644
--- a/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js
@@ -1,20 +1,21 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
-class BlogPageOption extends Plugin {
+export class BlogPageOption extends BaseOptionComponent {
+    static template = "website_blog.BlogPageOption";
+    static selector = "main:has(#o_wblog_post_main)";
+    static title = _t("Blog Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class BlogPageOptionPlugin extends Plugin {
     static id = "blogPageOption";
     resources = {
-        builder_options: [
-            {
-                template: "website_blog.BlogPageOption",
-                selector: "main:has(#o_wblog_post_main)",
-                editableOnly: false,
-                title: _t("Blog Page"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [BlogPageOption],
     };
 }
 
-registry.category("website-plugins").add(BlogPageOption.id, BlogPageOption);
+registry.category("website-plugins").add(BlogPageOptionPlugin.id, BlogPageOptionPlugin);
diff --git a/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js
index 7f14ad7801151..2ca464313a24a 100644
--- a/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js
@@ -1,19 +1,20 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-class BlogPostPageOptionPlugin extends Plugin {
+export class BlogPostPageOption extends BaseOptionComponent {
+    static template = "website_blog.blogPostPageOption";
+    static selector = "main:has(#o_wblog_index_content)";
+    static title = _t("Blogs Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class BlogPostPageOptionPlugin extends Plugin {
     static id = "blogPostPageOption";
     resources = {
-        builder_options: [
-            {
-                template: "website_blog.blogPostPageOption",
-                selector: "main:has(#o_wblog_index_content)",
-                editableOnly: false,
-                title: _t("Blogs Page"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [BlogPostPageOption],
     };
 }
 
diff --git a/addons/website_blog/static/src/website_builder/blog_post_tags_option.js b/addons/website_blog/static/src/website_builder/blog_post_tags_option.js
index fe891e9f7b823..f0e447cef6a80 100644
--- a/addons/website_blog/static/src/website_builder/blog_post_tags_option.js
+++ b/addons/website_blog/static/src/website_builder/blog_post_tags_option.js
@@ -2,6 +2,9 @@ import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 
 export class BlogPostTagsOption extends BaseOptionComponent {
     static template = "website_blog.BlogPostTagsOption";
+    static selector = ".o_wblog_post_page_cover[data-res-model='blog.post']";
+    static editableOnly = false;
+
     setup() {
         super.setup();
         this.domState = useDomState((el) => ({
diff --git a/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js
index 94eef13103266..0a8f19ee764f3 100644
--- a/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js
@@ -4,17 +4,8 @@ import { BlogPostTagsOption } from "./blog_post_tags_option";
 
 class BlogPostTagsOptionPlugin extends Plugin {
     static id = "blogPostTagsOption";
-    static dependencies = ["cachedModel"];
     resources = {
-        builder_options: {
-            selector: ".o_wblog_post_page_cover[data-res-model='blog.post']",
-            OptionComponent: BlogPostTagsOption,
-            cleanForSave: () => {
-                // keep track of temporary edited value
-                // clean up temporary edited value
-            },
-            editableOnly: false,
-        },
+        builder_options: [BlogPostTagsOption],
     };
 }
 
diff --git a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option.js b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option.js
index 5c74b6e06734b..0ae6fdc2e08a6 100644
--- a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option.js
+++ b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option.js
@@ -1,22 +1,20 @@
 import { onWillStart, useState } from "@odoo/owl";
-import { DynamicSnippetOption } from "@website/builder/plugins/options/dynamic_snippet_option";
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { useDynamicSnippetOption } from "@website/builder/plugins/options/dynamic_snippet_hook";
 
 export class DynamicSnippetBlogPostsOption extends BaseOptionComponent {
     static template = "website_blog.DynamicSnippetBlogPostsOption";
-    static props = {
-        ...DynamicSnippetOption.props,
-        fetchBlogs: Function,
-    };
+    static dependencies = ["dynamicSnippetBlogPostsOption"];
+    static selector = ".s_dynamic_snippet_blog_posts";
     setup() {
         super.setup();
-        this.dynamicOptionParams = useDynamicSnippetOption(this.props.modelNameFilter);
+        const { fetchBlogs, getModelNameFilter } = this.dependencies.dynamicSnippetBlogPostsOption;
+        this.dynamicOptionParams = useDynamicSnippetOption(getModelNameFilter());
         this.blogState = useState({
             blogs: [],
         });
         onWillStart(async () => {
-            this.blogState.blogs.push(...(await this.props.fetchBlogs()));
+            this.blogState.blogs.push(...(await fetchBlogs()));
         });
         this.templateKeyState = useDomState((el) => ({
             templateKey: el.dataset.templateKey,
diff --git a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
index c252691e87423..a25b936bf0a75 100644
--- a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
@@ -10,24 +10,20 @@ import { DynamicSnippetBlogPostsOption } from "./dynamic_snippet_blog_posts_opti
 class DynamicSnippetBlogPostsOptionPlugin extends Plugin {
     static id = "dynamicSnippetBlogPostsOption";
     static dependencies = ["dynamicSnippetOption"];
+    static shared = ["fetchBlogs","getModelNameFilter"];
     modelNameFilter = "blog.post";
-    selector = ".s_dynamic_snippet_blog_posts";
     resources = {
-        builder_options: withSequence(DYNAMIC_SNIPPET, {
-            OptionComponent: DynamicSnippetBlogPostsOption,
-            props: {
-                modelNameFilter: this.modelNameFilter,
-                fetchBlogs: this.fetchBlogs.bind(this),
-            },
-            selector: this.selector,
-        }),
+        builder_options: withSequence(DYNAMIC_SNIPPET, DynamicSnippetBlogPostsOption),
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
     };
     setup() {
         this.blogs = undefined;
     }
+    getModelNameFilter() {
+        return this.modelNameFilter;
+    }
     async onSnippetDropped({ snippetEl }) {
-        if (snippetEl.matches(this.selector)) {
+        if (snippetEl.matches(DynamicSnippetBlogPostsOption.selector)) {
             setDatasetIfUndefined(snippetEl, "filterByBlogId", -1);
             await this.dependencies.dynamicSnippetOption.setOptionsDefaultValues(
                 snippetEl,
diff --git a/addons/website_crm_partner_assign/static/src/website_builder/partner_page_option_plugin.js b/addons/website_crm_partner_assign/static/src/website_builder/partner_page_option_plugin.js
index 67b33d71a01d9..9dcc5a1fc7615 100644
--- a/addons/website_crm_partner_assign/static/src/website_builder/partner_page_option_plugin.js
+++ b/addons/website_crm_partner_assign/static/src/website_builder/partner_page_option_plugin.js
@@ -1,20 +1,21 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
+export class PartnerPageOption extends BaseOptionComponent {
+    static template = "website_crm_partner_assign.PartnerPageOption";
+    static selector = "main:has(#oe_structure_website_crm_partner_assign_layout_1):not(:has(.o_wcrm_filters_top))";
+    static title = _t("Partner Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class WebsiteCRMPartnerPageOption extends Plugin {
     static id = "websiteCRMPartnerPageOption";
 
     resources = {
-        builder_options: [
-            {
-                template: "website_crm_partner_assign.PartnerPageOption",
-                selector: "main:has(#oe_structure_website_crm_partner_assign_layout_1):not(:has(.o_wcrm_filters_top))",
-                title: _t("Partner Page"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [PartnerPageOption],
     };
 }
 
diff --git a/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option.js b/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option.js
index 61503a1b56d7d..3acc13356a365 100644
--- a/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option.js
+++ b/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option.js
@@ -1,9 +1,14 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { useState, onWillStart } from "@odoo/owl";
+import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
 
 export class WebsiteCRMPartnersPage extends BaseOptionComponent {
     static template = "website_crm_partner_assign.PartnersPageOption";
+    static selector = "main:has(#oe_structure_website_crm_partner_assign_layout_1):has(.o_wcrm_filters_top)";
+    static title = _t("Partners Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
 
     setup() {
         super.setup();
diff --git a/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option_plugin.js b/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option_plugin.js
index 4a795a207fca9..7b1568f31c37b 100644
--- a/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option_plugin.js
+++ b/addons/website_crm_partner_assign/static/src/website_builder/website_crm_partner_assign_option_plugin.js
@@ -1,21 +1,11 @@
 import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { WebsiteCRMPartnersPage } from "./website_crm_partner_assign_option";
 
 class WebsiteCRMPartnersPageOption extends Plugin {
     static id = "websiteCRMPartnersPageOption";
-
     resources = {
-        builder_options: [
-            {
-                OptionComponent: WebsiteCRMPartnersPage,
-                selector: "main:has(#oe_structure_website_crm_partner_assign_layout_1):has(.o_wcrm_filters_top)",
-                title: _t("Partners Page"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [WebsiteCRMPartnersPage],
     };
 }
 
diff --git a/addons/website_customer/static/src/website_builder/customer_filter_option.js b/addons/website_customer/static/src/website_builder/customer_filter_option.js
index 6020bb4b7e759..244556f427143 100644
--- a/addons/website_customer/static/src/website_builder/customer_filter_option.js
+++ b/addons/website_customer/static/src/website_builder/customer_filter_option.js
@@ -1,9 +1,14 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { onWillStart } from "@odoo/owl";
+import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
 
 export class CustomerFilterOption extends BaseOptionComponent {
     static template = "website_customer.CustomerFilterOption";
+    static selector = "main:not(:has(#oe_structure_website_crm_partner_assign_layout_1)):has(.o_wcrm_filters_top)";
+    static groups = ["website.group_website_designer"];
+    static title = _t("Customers Page");
+    static editableOnly = false;
 
     setup() {
         super.setup();
diff --git a/addons/website_customer/static/src/website_builder/customer_filter_option_plugin.js b/addons/website_customer/static/src/website_builder/customer_filter_option_plugin.js
index c4cde2249e40f..ee0633cc771cd 100644
--- a/addons/website_customer/static/src/website_builder/customer_filter_option_plugin.js
+++ b/addons/website_customer/static/src/website_builder/customer_filter_option_plugin.js
@@ -1,5 +1,4 @@
 import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { CustomerFilterOption } from "./customer_filter_option";
 
@@ -7,13 +6,7 @@ export class CustomerFilterOptionPlugin extends Plugin {
     static id = "customerFilterOption";
 
     resources = {
-        builder_options: {
-            OptionComponent: CustomerFilterOption,
-            selector: "main:not(:has(#oe_structure_website_crm_partner_assign_layout_1)):has(.o_wcrm_filters_top)",
-            title: _t("Customers Page"),
-            groups: ["website.group_website_designer"],
-            editableOnly: false,
-        },
+        builder_options: CustomerFilterOption,
     };
 }
 
diff --git a/addons/website_event/static/src/website_builder/dynamic_snippet_events_option.js b/addons/website_event/static/src/website_builder/dynamic_snippet_events_option.js
index c4c390723b814..03fa891bd9425 100644
--- a/addons/website_event/static/src/website_builder/dynamic_snippet_events_option.js
+++ b/addons/website_event/static/src/website_builder/dynamic_snippet_events_option.js
@@ -1,14 +1,13 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { useDynamicSnippetOption } from "@website/builder/plugins/options/dynamic_snippet_hook";
-import { DynamicSnippetOption } from "@website/builder/plugins/options/dynamic_snippet_option";
 
 export class DynamicSnippetEventsOption extends BaseOptionComponent {
     static template = "website_event.DynamicSnippetEventsOption";
-    static props = {
-        ...DynamicSnippetOption.props,
-    };
+    static dependencies = ["dynamicSnippetEventsOption"];
+    static selector = ".s_event_upcoming_snippet";
     setup() {
         super.setup();
-        this.dynamicOptionParams = useDynamicSnippetOption(this.props.modelNameFilter);
+        const { getModelNameFilter } = this.dependencies.dynamicSnippetEventsOption;
+        this.dynamicOptionParams = useDynamicSnippetOption(getModelNameFilter());
     }
 }
diff --git a/addons/website_event/static/src/website_builder/dynamic_snippet_events_option_plugin.js b/addons/website_event/static/src/website_builder/dynamic_snippet_events_option_plugin.js
index af0ade3503161..fd0ea9df87cf3 100644
--- a/addons/website_event/static/src/website_builder/dynamic_snippet_events_option_plugin.js
+++ b/addons/website_event/static/src/website_builder/dynamic_snippet_events_option_plugin.js
@@ -10,20 +10,17 @@ import { DynamicSnippetEventsOption } from "./dynamic_snippet_events_option";
 class DynamicSnippetEventsOptionPlugin extends Plugin {
     static id = "dynamicSnippetEventsOption";
     static dependencies = ["dynamicSnippetOption"];
+    static shared = ["getModelNameFilter"];
     modelNameFilter = "event.event";
-    selector = ".s_event_upcoming_snippet";
     resources = {
-        builder_options: withSequence(DYNAMIC_SNIPPET, {
-            OptionComponent: DynamicSnippetEventsOption,
-            props: {
-                modelNameFilter: this.modelNameFilter,
-            },
-            selector: this.selector,
-        }),
+        builder_options: withSequence(DYNAMIC_SNIPPET, DynamicSnippetEventsOption),
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
     };
+    getModelNameFilter() {
+        return this.modelNameFilter;
+    }
     async onSnippetDropped({ snippetEl }) {
-        if (snippetEl.matches(this.selector)) {
+        if (snippetEl.matches(DynamicSnippetEventsOption.selector)) {
             setDatasetIfUndefined(snippetEl, "numberOfRecords", 3);
             await this.dependencies.dynamicSnippetOption.setOptionsDefaultValues(
                 snippetEl,
diff --git a/addons/website_event/static/src/website_builder/event_page_option_plugin.js b/addons/website_event/static/src/website_builder/event_page_option_plugin.js
index 1a1069689c8e1..8f6b4dd8c17d3 100644
--- a/addons/website_event/static/src/website_builder/event_page_option_plugin.js
+++ b/addons/website_event/static/src/website_builder/event_page_option_plugin.js
@@ -4,27 +4,30 @@ import { withSequence } from "@html_editor/utils/resource";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-export const eventPageSelector = "main:has(.o_wevent_event)";
+export class EventPageOption extends BaseOptionComponent {
+    static template = "website_event.EventPageOption";
+    static selector = "main:has(.o_wevent_event)";
+    static title = _t("Event Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class EventMainPageOption extends BaseOptionComponent {
+    static template = "website_event.EventMainPageOption";
+    static selector = "main:has(#o_wevent_event_main)";
+    static title = _t("Event Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
 
-export class EventPageOption extends Plugin {
+export class EventPageOptionPlugin extends Plugin {
     static id = "eventPageOption";
     resources = {
         builder_options: [
-            withSequence(EVENT_PAGE, {
-                template: "website_event.EventPageOption",
-                selector: eventPageSelector,
-                editableOnly: false,
-                title: _t("Event Page"),
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(EVENT_PAGE_MAIN, {
-                template: "website_event.EventMainPageOption",
-                selector: "main:has(#o_wevent_event_main)",
-                editableOnly: false,
-                title: _t("Event Page"),
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(EVENT_PAGE, EventPageOption),
+            withSequence(EVENT_PAGE_MAIN, EventMainPageOption),
         ],
         builder_actions: {
             DisplaySubMenuAction,
@@ -57,7 +60,7 @@ export class DisplaySubMenuAction extends BuilderAction {
     }
 
     getEventObjectId() {
-        const isEventPage = this.editable.querySelector(eventPageSelector);
+        const isEventPage = this.editable.querySelector(EventPageOption.selector);
         if (!isEventPage) {
             return 0;
         }
@@ -83,4 +86,4 @@ export class DisplaySubMenuAction extends BuilderAction {
     }
 }
 
-registry.category("website-plugins").add(EventPageOption.id, EventPageOption);
+registry.category("website-plugins").add(EventPageOptionPlugin.id, EventPageOptionPlugin);
diff --git a/addons/website_event/static/src/website_builder/events_list_page_option_plugin.js b/addons/website_event/static/src/website_builder/events_list_page_option_plugin.js
index 756ed91a1c4da..213453d8a6fa0 100644
--- a/addons/website_event/static/src/website_builder/events_list_page_option_plugin.js
+++ b/addons/website_event/static/src/website_builder/events_list_page_option_plugin.js
@@ -1,18 +1,21 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { DEFAULT } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+export class EventsListPageOption extends BaseOptionComponent {
+    static template = "website_event.EventsListPageOption";
+    static selector = "main:has(.o_wevent_events_list)";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class EventsListPageOptionPlugin extends Plugin {
     static id = "eventsListPageOption";
     resources = {
         builder_options: [
-            withSequence(DEFAULT, {
-                template: "website_event.EventsListPageOption",
-                selector: "main:has(.o_wevent_events_list)",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(DEFAULT, EventsListPageOption),
         ],
     };
 }
diff --git a/addons/website_event_exhibitor/static/src/website_builder/event_page_option_plugin.js b/addons/website_event_exhibitor/static/src/website_builder/event_page_option_plugin.js
index 07824aafa3f12..012f7df46baa6 100644
--- a/addons/website_event_exhibitor/static/src/website_builder/event_page_option_plugin.js
+++ b/addons/website_event_exhibitor/static/src/website_builder/event_page_option_plugin.js
@@ -2,25 +2,30 @@ import { EXHIBITOR_FILTER, SPONSOR } from "@website_event/website_builder/option
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-class EventPageOption extends Plugin {
+export class EventPageFilterOption extends BaseOptionComponent {
+    static template = "website_event_exhibitor.EventPageFilterOption";
+    static selector = "main:has(.o_wevent_event_tags_form)";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class EventPageOption extends BaseOptionComponent {
+    static template = "website_event_exhibitor.EventPageOption";
+    static selector = "main:has(.o_wevent_event)";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+class EventPageOptionPlugin extends Plugin {
     static id = "eventExhibitorPageOption";
     resources = {
         builder_options: [
-            withSequence(EXHIBITOR_FILTER, {
-                template: "website_event_exhibitor.EventPageFilterOption",
-                selector: "main:has(.o_wevent_event_tags_form)",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(SPONSOR, {
-                template: "website_event_exhibitor.EventPageOption",
-                selector: "main:has(.o_wevent_event)",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(EXHIBITOR_FILTER, EventPageFilterOption),
+            withSequence(SPONSOR, EventPageOption),
         ],
     };
 }
 
-registry.category("website-plugins").add(EventPageOption.id, EventPageOption);
+registry.category("website-plugins").add(EventPageOptionPlugin.id, EventPageOptionPlugin);
diff --git a/addons/website_event_track/static/src/website_builder/event_track_page_option_plugin.js b/addons/website_event_track/static/src/website_builder/event_track_page_option_plugin.js
index 60179f863cd99..7206cd506422c 100644
--- a/addons/website_event_track/static/src/website_builder/event_track_page_option_plugin.js
+++ b/addons/website_event_track/static/src/website_builder/event_track_page_option_plugin.js
@@ -3,27 +3,32 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-class EventTrackPageOption extends Plugin {
+export class EventTrackPageOptionTopbar extends BaseOptionComponent {
+    static template = "website_event_track.eventTrackPageOptionTopbar";
+    static selector = "main:has(.o_weagenda_topbar_filters)";
+    static title = _t("Event Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class EventTrackPageOption extends BaseOptionComponent {
+    static template = "website_event_track.EventTrackPageOption";
+    static selector = "main:has(.o_wesession_index)";
+    static title = _t("Event Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+class EventTrackPageOptionPlugin extends Plugin {
     static id = "eventTrackPageOption";
     resources = {
         builder_options: [
-            withSequence(TRACK, {
-                template: "website_event_track.eventTrackPageOptionTopbar",
-                selector: "main:has(.o_weagenda_topbar_filters)",
-                title: _t("Event Page"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(TRACK, {
-                template: "website_event_track.EventTrackPageOption",
-                selector: "main:has(.o_wesession_index)",
-                title: _t("Event Page"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(TRACK, EventTrackPageOptionTopbar),
+            withSequence(TRACK, EventTrackPageOption),
         ],
     };
 }
 
-registry.category("website-plugins").add(EventTrackPageOption.id, EventTrackPageOption);
+registry.category("website-plugins").add(EventTrackPageOptionPlugin.id, EventTrackPageOptionPlugin);
diff --git a/addons/website_forum/static/src/website_builder/forum_page_option_plugin.js b/addons/website_forum/static/src/website_builder/forum_page_option_plugin.js
index 1d7fff59e8a90..7a171b2c7ac50 100644
--- a/addons/website_forum/static/src/website_builder/forum_page_option_plugin.js
+++ b/addons/website_forum/static/src/website_builder/forum_page_option_plugin.js
@@ -3,20 +3,23 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export const FORUMS_INDEX = DEFAULT;
 
+export class ForumPageOption extends BaseOptionComponent {
+    static template = "website_forum.forumPageOption";
+    static selector = "main:has(#o_wforum_forums_index_list)";
+    static title = _t("Forum Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class ForumPageOptionPlugin extends Plugin {
     static id = "forumPageOption";
     resources = {
         builder_options: [
-            withSequence(FORUMS_INDEX, {
-                template: "website_forum.forumPageOption",
-                selector: "main:has(#o_wforum_forums_index_list)",
-                editableOnly: false,
-                title: _t("Forum Page"),
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(FORUMS_INDEX, ForumPageOption),
         ],
     };
 }
diff --git a/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_option_plugin.js b/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_option_plugin.js
index 80a4fe06e15b4..7a0f51c1f39d5 100644
--- a/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_option_plugin.js
+++ b/addons/website_hr_recruitment/static/src/website_builder/website_hr_recruitment_option_plugin.js
@@ -1,19 +1,20 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
+export class JobsPageOption extends BaseOptionComponent {
+    static template = "website_hr_recruitment.JobsPageOption";
+    static selector = "main:has(.o_website_hr_recruitment_jobs_list)";
+    static title = _t("Jobs Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class WebsiteHrRecruitmentPageOption extends Plugin {
     static id = "websiteHrRecruitmentPageOption";
     resources = {
-        builder_options: [
-            {
-                template: "website_hr_recruitment.JobsPageOption",
-                selector: "main:has(.o_website_hr_recruitment_jobs_list)",
-                title: _t("Jobs Page"),
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [JobsPageOption],
     };
 }
 
diff --git a/addons/website_mail_group/static/src/website_builder/mail_group_option_plugin.js b/addons/website_mail_group/static/src/website_builder/mail_group_option_plugin.js
index 844b534867893..756733a7eef1c 100644
--- a/addons/website_mail_group/static/src/website_builder/mail_group_option_plugin.js
+++ b/addons/website_mail_group/static/src/website_builder/mail_group_option_plugin.js
@@ -1,20 +1,21 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { InputConfirmationDialog } from "@html_builder/snippets/input_confirmation_dialog";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
+export class MailGroupOption extends BaseOptionComponent {
+    static template = "website_mail_group.MailGroupOption";
+    static selector = ".s_group";
+}
+
 class MailGroupOptionPlugin extends Plugin {
     static id = "mailGroupOption";
     static dependencies = ["builderActions"];
     static shared = ["createGroup"];
     resources = {
-        builder_options: [
-            {
-                template: "website_mail_group.MailGroupOption",
-                selector: ".s_group",
-            },
-        ],
+        builder_options: [MailGroupOption],
         dropzone_selector: {
             selector: ".s_group",
             dropNear: "p, h1, h2, h3, blockquote, .card",
@@ -94,7 +95,7 @@ export class MailGroupAction extends BuilderAction {
 export class CreateMailGroupAction extends BuilderAction {
     static id = "createMailGroup";
     static dependencies = ["builderActions", "mailGroupOption"];
-    load({ editingElement, value }) {
+    load({ value }) {
         return this.dependencies.mailGroupOption.createGroup(value);
     }
     apply({ editingElement, loadResult: id }) {
diff --git a/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option.js b/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option.js
index f4e002d61360d..8c47792a007ff 100644
--- a/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option.js
+++ b/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option.js
@@ -3,15 +3,14 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class MailingListSubscribeOption extends BaseOptionComponent {
     static template = "website_mass_mailing.MailingListSubscribeOption";
-    static props = {
-        fetchMailingLists: Function,
-    };
+    static dependencies = ["mailingListSubscribeOption"];
 
     setup() {
         super.setup();
         this.mailingLists = [];
+        const { fetchMailingLists } = this.dependencies.mailingListSubscribeOption;
         onWillStart(async () => {
-            this.mailingLists = await this.props.fetchMailingLists();
+            this.mailingLists = await fetchMailingLists();
         });
     }
 }
diff --git a/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js b/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js
index a74afb7bf2b80..b2af932ce73d6 100644
--- a/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js
+++ b/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js
@@ -3,8 +3,8 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { user } from "@web/core/user";
 import { _t } from "@web/core/l10n/translation";
-import { NewsletterSubscribeCommonOption } from "./newsletter_subscribe_common_option";
-import { getElementsWithOption, getSelectorParams } from "@html_builder/utils/utils";
+import {  NewsletterSubscribeCommonOptionBase } from "./newsletter_subscribe_common_option";
+import { getElementsWithOption, filterExtends } from "@html_builder/utils/utils";
 import { BuilderAction } from "@html_builder/core/builder_action";
 
 class MailingListSubscribeOptionPlugin extends Plugin {
@@ -20,15 +20,15 @@ class MailingListSubscribeOptionPlugin extends Plugin {
     };
 
     setup() {
-        this.selectorParams = getSelectorParams(
+        this.newsletterOptions = filterExtends(
             this.getResource("builder_options"),
-            NewsletterSubscribeCommonOption
+            NewsletterSubscribeCommonOptionBase,
         );
     }
 
     async onSnippetDropped({ snippetEl }) {
         const newsLetterEls = [];
-        for (const { selector, exclude, applyTo } of this.selectorParams) {
+        for (const { selector, exclude, applyTo } of this.newsletterOptions) {
             newsLetterEls.push(...getElementsWithOption(snippetEl, selector, exclude, applyTo));
         }
         if (!newsLetterEls.length) {
@@ -86,7 +86,7 @@ class MailingListSubscribeOptionPlugin extends Plugin {
 
     cleanForSave({ root }) {
         const newsLetterEls = [];
-        for (const { selector, exclude, applyTo } of this.selectorParams) {
+        for (const { selector, exclude, applyTo } of this.newsletterOptions) {
             newsLetterEls.push(...getElementsWithOption(root, selector, exclude, applyTo));
         }
         for (const newsLetterEl of newsLetterEls) {
diff --git a/addons/website_mass_mailing/static/src/website_builder/newsletter_layout_option_plugin.js b/addons/website_mass_mailing/static/src/website_builder/newsletter_layout_option_plugin.js
index e45fe362ac093..beb9a23c1ec59 100644
--- a/addons/website_mass_mailing/static/src/website_builder/newsletter_layout_option_plugin.js
+++ b/addons/website_mass_mailing/static/src/website_builder/newsletter_layout_option_plugin.js
@@ -4,20 +4,20 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class NewsletterLayoutOption extends BaseOptionComponent {
+    static template = "website_mass_mailing.NewsletterLayoutOption";
+    static selector = ".s_newsletter_block";
+    static applyTo = ":scope > .container, :scope > .container-fluid, :scope > .o_container_small";
+}
 
 export class NewsletterLayoutOptionPlugin extends Plugin {
     static id = "newsletterLayoutOptionPlugin";
     static dependencies = ["builderActions"];
 
     resources = {
-        builder_options: [
-            withSequence(before(NEWSLETTER_SELECT), {
-                template: "website_mass_mailing.NewsletterLayoutOption",
-                selector: ".s_newsletter_block",
-                applyTo:
-                    ":scope > .container, :scope > .container-fluid, :scope > .o_container_small",
-            }),
-        ],
+        builder_options: [withSequence(before(NEWSLETTER_SELECT),NewsletterLayoutOption)],
         builder_actions: {
             SelectNewsletterTemplateAction
         },
diff --git a/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.js b/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.js
index 6b37bf80fc6a2..cd56874677939 100644
--- a/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.js
+++ b/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.js
@@ -2,14 +2,27 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 import { MailingListSubscribeOption } from "./mailing_list_subscribe_option";
 import { RecaptchaSubscribeOption } from "./recaptcha_subscribe_option";
 
-export class NewsletterSubscribeCommonOption extends BaseOptionComponent {
+export class NewsletterSubscribeCommonOptionBase extends BaseOptionComponent {
     static template = "website_mass_mailing.NewsletterSubscribeCommonOption";
     static components = {
         MailingListSubscribeOption,
         RecaptchaSubscribeOption,
     };
-    static props = {
-        fetchMailingLists: Function,
-        hasRecaptcha: Function,
-    };
+}
+
+export class NewsletterSubscribeCommonOption extends NewsletterSubscribeCommonOptionBase {
+    static selector = ".s_newsletter_list";
+    static exclude = [
+        ".s_newsletter_block .s_newsletter_list",
+        ".o_newsletter_popup .s_newsletter_list",
+        ".s_newsletter_box .s_newsletter_list",
+        ".s_newsletter_centered .s_newsletter_list",
+        ".s_newsletter_grid .s_newsletter_list",
+        ".s_newsletter_aside .s_newsletter_list",
+    ].join(", ");
+}
+
+export class NewsletterSubscribeCommonPopupOption extends NewsletterSubscribeCommonOptionBase {
+    static selector = ".o_newsletter_popup";
+    static applyTo = ".s_newsletter_list";
 }
diff --git a/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.xml b/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.xml
index 65dbf122025b7..6c51137ef574a 100644
--- a/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.xml
+++ b/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option.xml
@@ -2,10 +2,8 @@
 <templates xml:space="preserve">
 
 <t t-name="website_mass_mailing.NewsletterSubscribeCommonOption">
-
-    <MailingListSubscribeOption fetchMailingLists="props.fetchMailingLists"/>
-    <RecaptchaSubscribeOption hasRecaptcha="props.hasRecaptcha"/>
-
+    <MailingListSubscribeOption/>
+    <RecaptchaSubscribeOption/>
 </t>
 
 <t t-name="website_mass_mailing.NewsletterMailingListsCheckboxes">
diff --git a/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option_plugin.js b/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option_plugin.js
index f29c8ab50de61..1cbf6169d0c5f 100644
--- a/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option_plugin.js
+++ b/addons/website_mass_mailing/static/src/website_builder/newsletter_subscribe_common_option_plugin.js
@@ -3,39 +3,24 @@ import { POPUP } from "@website/builder/plugins/options/popup_option_plugin";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
+import { NewsletterSubscribeCommonOption, NewsletterSubscribeCommonPopupOption } from "./newsletter_subscribe_common_option";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { renderToFragment } from "@web/core/utils/render";
-import { NewsletterSubscribeCommonOption } from "./newsletter_subscribe_common_option";
 
 export const NEWSLETTER_SELECT = before(POPUP);
 
+export class MailingListSubscribeFormOption extends BaseOptionComponent {
+    static template = "website_mass_mailing.MailingListSubscribeFormOption";
+    static selector = ".s_newsletter_subscribe_form";
+}
+
 class NewsletterSubscribeCommonOptionPlugin extends Plugin {
     static id = "newsletterSubscribeCommonOption";
-    static dependencies = ["mailingListSubscribeOption", "recaptchaSubscribeOption"];
     resources = {
         builder_options: [
-            withSequence(NEWSLETTER_SELECT, {
-                OptionComponent: NewsletterSubscribeCommonOption,
-                props: this.getProps(),
-                selector: ".s_newsletter_list",
-                exclude: [
-                    ".s_newsletter_block .s_newsletter_list",
-                    ".o_newsletter_popup .s_newsletter_list",
-                    ".s_newsletter_box .s_newsletter_list",
-                    ".s_newsletter_centered .s_newsletter_list",
-                    ".s_newsletter_grid .s_newsletter_list",
-                    ".s_newsletter_aside .s_newsletter_list",
-                ].join(", "),
-            }),
-            withSequence(NEWSLETTER_SELECT, {
-                OptionComponent: NewsletterSubscribeCommonOption,
-                props: this.getProps(),
-                selector: ".o_newsletter_popup",
-                applyTo: ".s_newsletter_list",
-            }),
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website_mass_mailing.MailingListSubscribeFormOption",
-                selector: ".s_newsletter_subscribe_form",
-            }),
+            withSequence(NEWSLETTER_SELECT, NewsletterSubscribeCommonOption),
+            withSequence(NEWSLETTER_SELECT, NewsletterSubscribeCommonPopupOption),
+            withSequence(SNIPPET_SPECIFIC, MailingListSubscribeFormOption),
         ],
         dropzone_selector: [
             {
@@ -47,13 +32,6 @@ class NewsletterSubscribeCommonOptionPlugin extends Plugin {
         on_snippet_dropped_handlers: withSequence(-1, (args) => this.onSnippetDropped(args)),
     };
 
-    getProps() {
-        return {
-            fetchMailingLists: this.dependencies.mailingListSubscribeOption.fetchMailingLists,
-            hasRecaptcha: this.dependencies.recaptchaSubscribeOption.hasRecaptcha,
-        };
-    }
-
     async onSnippetDropped({ snippetEl }) {
         if (snippetEl.matches(".s_newsletter_aside")) {
             const sampleEl = snippetEl.querySelector("#checkbox_sample");
diff --git a/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.js b/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.js
index 43bac954c2701..7ea62374aacfa 100644
--- a/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.js
+++ b/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.js
@@ -2,7 +2,10 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 export class RecaptchaSubscribeOption extends BaseOptionComponent {
     static template = "website_mass_mailing.RecaptchaSubscribeOption";
-    static props = {
-        hasRecaptcha: Function,
-    };
+    static dependencies = ["recaptchaSubscribeOption"];
+
+    setup(){
+        super.setup();
+        this.hasRecaptcha = this.dependencies.recaptchaSubscribeOption.hasRecaptcha;
+    }
 }
diff --git a/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.xml b/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.xml
index 48cdd1339989a..3be451744309b 100644
--- a/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.xml
+++ b/addons/website_mass_mailing/static/src/website_builder/recaptcha_subscribe_option.xml
@@ -3,7 +3,7 @@
 
 <t t-name="website_mass_mailing.RecaptchaSubscribeOption">
 
-    <BuilderRow label.translate="Show reCaptcha Policy" t-if="this.props.hasRecaptcha()">
+    <BuilderRow label.translate="Show reCaptcha Policy" t-if="this.hasRecaptcha()">
         <BuilderCheckbox dataAttributeAction="'toggleRecaptchaLegal'" dataAttributeActionValue="'true'" action="'toggleRecaptchaLegal'"/>
     </BuilderRow>
 
diff --git a/addons/website_payment/static/src/website_builder/donation_option_plugin.js b/addons/website_payment/static/src/website_builder/donation_option_plugin.js
index 5ec6cc040949a..3c2754e994ee1 100644
--- a/addons/website_payment/static/src/website_builder/donation_option_plugin.js
+++ b/addons/website_payment/static/src/website_builder/donation_option_plugin.js
@@ -1,4 +1,5 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { SNIPPET_SPECIFIC } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
@@ -6,17 +7,21 @@ import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { renderToElement, renderToFragment } from "@web/core/utils/render";
 
+export class DonationOption extends BaseOptionComponent {
+    static template = "website_payment.DonationOption";
+    static selector = ".s_donation";
+    // TODO AGAU: remove when merging https://github.com/odoo-dev/odoo/pull/4240
+    static cleanForSave(editingElement) {
+        delete editingElement.dataset.prefilledOptionsList;
+    }
+}
+
 export class DonationOptionPlugin extends Plugin {
     static id = "donationOption";
 
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC, {
-                template: "website_payment.DonationOption",
-                selector: ".s_donation",
-                // TODO AGAU: remove when merging https://github.com/odoo-dev/odoo/pull/4240
-                cleanForSave: this.cleanForSave.bind(this),
-            }),
+            withSequence(SNIPPET_SPECIFIC, DonationOption),
         ],
         builder_actions: {
             ToggleDisplayOptionsAction,
@@ -29,11 +34,6 @@ export class DonationOptionPlugin extends Plugin {
             SetSliderStepAction,
         },
     };
-
-    // TODO AGAU: remove when merging https://github.com/odoo-dev/odoo/pull/4240
-    cleanForSave(editingElement) {
-        delete editingElement.dataset.prefilledOptionsList;
-    }
 }
 
 export class BaseDonationAction extends BuilderAction {
diff --git a/addons/website_payment/static/src/website_builder/supported_payment_methods_option_plugin.js b/addons/website_payment/static/src/website_builder/supported_payment_methods_option_plugin.js
index 2f898679e1122..2c5e981a5a4fc 100644
--- a/addons/website_payment/static/src/website_builder/supported_payment_methods_option_plugin.js
+++ b/addons/website_payment/static/src/website_builder/supported_payment_methods_option_plugin.js
@@ -1,4 +1,5 @@
 import { BuilderAction } from '@html_builder/core/builder_action';
+import { BaseOptionComponent } from '@html_builder/core/utils';
 import { SNIPPET_SPECIFIC } from '@html_builder/utils/option_sequence';
 import { Plugin } from '@html_editor/plugin';
 import { withSequence } from '@html_editor/utils/resource';
@@ -6,16 +7,18 @@ import { _t } from '@web/core/l10n/translation';
 import { registry } from '@web/core/registry';
 
 
+export class SupportedPaymentMethodsOption extends BaseOptionComponent {
+    static template = 'website_payment.SupportedPaymentMethodsOption';
+    static selector = '.s_supported_payment_methods';
+}
+
 class SupportedPaymentMethodsOptionPlugin extends Plugin {
     static id = 'supportedPaymentMethodsOption';
     static dependencies = ['edit_interaction'];
     resources = {
         so_content_addition_selector: ['.s_supported_payment_methods'],
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC, {
-                template: 'website_payment.SupportedPaymentMethodsOption',
-                selector: '.s_supported_payment_methods',
-            }),
+            withSequence(SNIPPET_SPECIFIC, SupportedPaymentMethodsOption),
         ],
         builder_actions: { SupportedPaymentMethodsLimit, SupportedPaymentMethodsHeight },
         get_options_container_top_buttons: withSequence(0, this.getOptionButtons.bind(this)),
diff --git a/addons/website_sale/static/src/website_builder/add_to_card_option.js b/addons/website_sale/static/src/website_builder/add_to_card_option.js
index f616d2cae22f7..89fe7e2ef6e10 100644
--- a/addons/website_sale/static/src/website_builder/add_to_card_option.js
+++ b/addons/website_sale/static/src/website_builder/add_to_card_option.js
@@ -8,6 +8,7 @@ export const addToCartValues = {
 
 export class AddToCartOption extends BaseOptionComponent {
     static template = "website_sale.AddToCartOption";
+    static selector = ".s_add_to_cart";
     static props = [];
     setup() {
         super.setup();
diff --git a/addons/website_sale/static/src/website_builder/add_to_cart_option_plugin.js b/addons/website_sale/static/src/website_builder/add_to_cart_option_plugin.js
index 4f074c5bed318..a9fb3d23ee245 100644
--- a/addons/website_sale/static/src/website_builder/add_to_cart_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/add_to_cart_option_plugin.js
@@ -7,12 +7,7 @@ class AddToCartOptionPlugin extends Plugin {
     static id = "addToCartOption";
     static dependencies = ["builderActions"];
     resources = {
-        builder_options: [
-            {
-                OptionComponent: AddToCartOption,
-                selector: ".s_add_to_cart",
-            },
-        ],
+        builder_options: [AddToCartOption],
         so_content_addition_selector: [".s_add_to_cart"],
         builder_actions: {
             ProductToCartAction,
diff --git a/addons/website_sale/static/src/website_builder/checkout_page_option_plugin.js b/addons/website_sale/static/src/website_builder/checkout_page_option_plugin.js
index bf076ddf48643..8b35d3abaffcc 100644
--- a/addons/website_sale/static/src/website_builder/checkout_page_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/checkout_page_option_plugin.js
@@ -1,22 +1,22 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { WebsiteConfigAction } from "@website/builder/plugins/customize_website_plugin";
 
+export class CheckoutPageOption extends BaseOptionComponent {
+    static template = "website_sale.checkoutPageOption";
+    static selector = "main:has(.oe_website_sale .o_wizard)";
+    static title = _t("Checkout Pages");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class CheckoutPageOptionPlugin extends Plugin {
     static id = "checkoutPageOption";
-    static dependencies = ["builderActions"];
     resources = {
-        builder_options: [
-            {
-                template: "website_sale.checkoutPageOption",
-                selector: "main:has(.oe_website_sale .o_wizard)",
-                editableOnly: false,
-                title: _t("Checkout Pages"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [CheckoutPageOption],
         builder_actions: {
             SetExtraStepAction,
         },
diff --git a/addons/website_sale/static/src/website_builder/dynamic_snippet_category_item_option_plugin.js b/addons/website_sale/static/src/website_builder/dynamic_snippet_category_item_option_plugin.js
index f18397807368d..8f50a708c98a2 100644
--- a/addons/website_sale/static/src/website_builder/dynamic_snippet_category_item_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/dynamic_snippet_category_item_option_plugin.js
@@ -1,19 +1,21 @@
 import { BuilderAction } from '@html_builder/core/builder_action';
+import { BaseOptionComponent } from '@html_builder/core/utils';
 import { Plugin } from '@html_editor/plugin';
 import { _t } from '@web/core/l10n/translation';
 import { rpc } from '@web/core/network/rpc';
 import { registry } from '@web/core/registry';
 
+export class DynamicSnippetCategoryItemOptions extends BaseOptionComponent {
+    static template = 'website_sale.dynamicSnippetCategoryItemOptions';
+    static selector = '.s_dynamic_category_item, .all_products';
+    static title = _t("Category");
+    static editableOnly = false;
+}
 
 export class DynamicSnippetCategoryItemOptionPlugin extends Plugin {
     static id = 'dynamicSnippetCategoryItemOptionPlugin';
     resources = {
-        builder_options: {
-            template: 'website_sale.dynamicSnippetCategoryItemOptions',
-            selector: '.s_dynamic_category_item, .all_products',
-            editableOnly: false,
-            title: _t("Category"),
-        },
+        builder_options: DynamicSnippetCategoryItemOptions,
         builder_actions: { SetCategoryImageAction },
     }
 }
diff --git a/addons/website_sale/static/src/website_builder/dynamic_snippet_category_option_plugin.js b/addons/website_sale/static/src/website_builder/dynamic_snippet_category_option_plugin.js
index c56d4237845da..fe02cda0575ca 100644
--- a/addons/website_sale/static/src/website_builder/dynamic_snippet_category_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/dynamic_snippet_category_option_plugin.js
@@ -13,21 +13,24 @@ const TEMPLATE_OPTIONS = {
     'default': 'website_sale.dynamic_filter_template_product_public_category_default',
 }
 
+const modelNameFilter = 'product.public.category';
+
+export class DynamicSnippetCategoryOption2 extends DynamicSnippetCategoryOption {
+    static selector = 'section.s_dynamic_snippet_category';
+    static defaultProps = {
+        modelNameFilter,
+    };
+    static groups = ['website.group_website_designer'];
+}
+
 export class DynamicSnippetCategoryOptionPlugin extends Plugin {
     static id = 'dynamicSnippetCategoryOptionPlugin';
     static dependencies = ['dynamicSnippetOption'];
-    selector = 'section.s_dynamic_snippet_category';
-    modelNameFilter = 'product.public.category';
+    selector = DynamicSnippetCategoryOption2.selector;
+    modelNameFilter = modelNameFilter;
     resources = {
         builder_options: [
-            withSequence(DEVICE_VISIBILITY, {
-                OptionComponent: DynamicSnippetCategoryOption,
-                props: {
-                    modelNameFilter: this.modelNameFilter,
-                },
-                selector: this.selector,
-                groups: ['website.group_website_designer'],
-            }),
+            withSequence(DEVICE_VISIBILITY, DynamicSnippetCategoryOption2),
         ],
         builder_actions: { ToggleClickableAction },
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
diff --git a/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option.js b/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option.js
index 43ad74859ddf5..42dd494637053 100644
--- a/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option.js
+++ b/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option.js
@@ -1,19 +1,17 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
-import { DynamicSnippetCarouselOption } from "@website/builder/plugins/options/dynamic_snippet_carousel_option";
 import { useDynamicSnippetOption } from "@website/builder/plugins/options/dynamic_snippet_hook";
 import { onWillStart, useState } from "@odoo/owl";
 
 export class DynamicSnippetProductsOption extends BaseOptionComponent {
     static template = "website_sale.DynamicSnippetProductsOption";
-    static props = {
-        ...DynamicSnippetCarouselOption.props,
-        fetchCategories: Function,
-    };
+    static dependencies = ["dynamicSnippetProductsOption"];
+    static selector = ".s_dynamic_snippet_products";
     setup() {
         super.setup();
+        const { fetchCategories, getModelNameFilter } = this.dependencies.dynamicSnippetProductsOption;
         const contextualFilterDomain = getContextualFilterDomain(this.env.editor.editable);
         this.dynamicOptionParams = useDynamicSnippetOption(
-            this.props.modelNameFilter,
+            getModelNameFilter(),
             contextualFilterDomain
         );
         this.state = useState({
@@ -26,7 +24,7 @@ export class DynamicSnippetProductsOption extends BaseOptionComponent {
             Object.values(this.dynamicOptionParams.dynamicFilters).length > 1 &&
             !this.domState.isAlternative;
         onWillStart(async () => {
-            this.state.categories.push(...(await this.props.fetchCategories()));
+            this.state.categories.push(...(await fetchCategories()));
         });
     }
 }
diff --git a/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option_plugin.js b/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option_plugin.js
index edcf4c1f07c4a..ae53e272f0524 100644
--- a/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/dynamic_snippet_products_option_plugin.js
@@ -11,17 +11,10 @@ import {
 class DynamicSnippetProductsOptionPlugin extends Plugin {
     static id = "dynamicSnippetProductsOption";
     static dependencies = ["dynamicSnippetCarouselOption"];
-    selector = ".s_dynamic_snippet_products";
+    static shared = ["fetchCategories", "getModelNameFilter"];
     modelNameFilter = "product.product";
     resources = {
-        builder_options: withSequence(DYNAMIC_SNIPPET_CAROUSEL, {
-            OptionComponent: DynamicSnippetProductsOption,
-            props: {
-                modelNameFilter: this.modelNameFilter,
-                fetchCategories: this.fetchCategories.bind(this),
-            },
-            selector: this.selector,
-        }),
+        builder_options: withSequence(DYNAMIC_SNIPPET_CAROUSEL, DynamicSnippetProductsOption),
         dynamic_snippet_template_updated: this.onTemplateUpdated.bind(this),
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
     };
@@ -33,7 +26,7 @@ class DynamicSnippetProductsOptionPlugin extends Plugin {
         this.categories = undefined;
     }
     async onSnippetDropped({ snippetEl }) {
-        if (snippetEl.matches(this.selector)) {
+        if (snippetEl.matches(DynamicSnippetProductsOption.selector)) {
             for (const [optionName, value] of [
                 ["productCategoryId", "all"],
                 ["showVariants", true],
@@ -47,8 +40,11 @@ class DynamicSnippetProductsOptionPlugin extends Plugin {
             );
         }
     }
+    getModelNameFilter() {
+        return this.modelNameFilter;
+    }
     onTemplateUpdated({ el, template }) {
-        if (el.matches(this.selector)) {
+        if (el.matches(DynamicSnippetProductsOption.selector)) {
             this.dependencies.dynamicSnippetCarouselOption.updateTemplateSnippetCarousel(
                 el,
                 template
diff --git a/addons/website_sale/static/src/website_builder/product_attribute_option_plugin.js b/addons/website_sale/static/src/website_builder/product_attribute_option_plugin.js
index 8b65228485e50..caa690c07cb4e 100644
--- a/addons/website_sale/static/src/website_builder/product_attribute_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/product_attribute_option_plugin.js
@@ -2,16 +2,19 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { rpc } from "@web/core/network/rpc";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class ProductAttributeOption extends BaseOptionComponent {
+    static template = "website_sale.ProductAttributeOption";
+    static selector = "#product_detail .o_wsale_product_attribute";
+    static editableOnly = false;
+    static reloadTarget = true;
+}
 
 class ProductAttributeOptionPlugin extends Plugin {
     static id = "productAttributeOption";
     resources = {
-        builder_options: {
-            template: "website_sale.ProductAttributeOption",
-            selector: "#product_detail .o_wsale_product_attribute",
-            editableOnly: false,
-            reloadTarget: true,
-        },
+        builder_options: ProductAttributeOption,
         builder_actions: {
             ProductAttributeDisplayAction,
         },
diff --git a/addons/website_sale/static/src/website_builder/product_header_category_option_plugin.js b/addons/website_sale/static/src/website_builder/product_header_category_option_plugin.js
index c7e5660889838..a6dae7a2ce310 100644
--- a/addons/website_sale/static/src/website_builder/product_header_category_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/product_header_category_option_plugin.js
@@ -3,20 +3,24 @@ import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { _t } from "@web/core/l10n/translation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class ProductHeaderCategoryOption extends BaseOptionComponent {
+    static template = "website_sale.ProductHeaderCategoryOption";
+    static selector = "#products_grid:has(header.o_wsale_products_header_is_category)";
+    static editableOnly = false;
+    static reloadTarget = true;
+    static getSnippetTitle() {
+        return _t((this.editable.querySelector("#o_wsale_products_header")?.dataset.categoryName || "Category") + ' Header');
+    };
+    static groups = ["website.group_website_restricted_editor"];
+}
 
 class ProductHeaderCategoryOptionPlugin extends Plugin {
     static id = "ProductHeaderCategoryOptionPlugin";
 
     resources = {
-        builder_options: {
-            template: "website_sale.ProductHeaderCategoryOption",
-            selector: "#products_grid:has(header.o_wsale_products_header_is_category)",
-            editableOnly: false,
-            reloadTarget: true,
-            title: _t((this.editable.querySelector("#o_wsale_products_header")?.dataset.categoryName || "Category") + ' Header'),
-            groups: ["website.group_website_restricted_editor"],
-        },
-
+        builder_options: ProductHeaderCategoryOption,
         builder_actions: {
             ToggleCategoryShowTitleAction,
             ToggleCategoryShowDescriptionAction,
diff --git a/addons/website_sale/static/src/website_builder/product_header_shop_option_plugin.js b/addons/website_sale/static/src/website_builder/product_header_shop_option_plugin.js
index e07344da35268..12dfe5dd7e1da 100644
--- a/addons/website_sale/static/src/website_builder/product_header_shop_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/product_header_shop_option_plugin.js
@@ -1,18 +1,21 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class ProductHeaderShopOption extends BaseOptionComponent {
+    static template = "website_sale.ProductHeaderShopOption";
+    static selector = "#products_grid:has(header.o_wsale_products_header_is_shop)";
+    static editableOnly = false;
+    static reloadTarget = true;
+    static title = _t("Shop Header");
+}
 
 class ProductHeaderShopOptionPlugin extends Plugin {
     static id = "ProductHeaderShopOptionPlugin";
 
     resources = {
-        builder_options: {
-            template: "website_sale.ProductHeaderShopOption",
-            selector: "#products_grid:has(header.o_wsale_products_header_is_shop)",
-            editableOnly: false,
-            reloadTarget: true,
-            title: _t("Shop Header"),
-        },
+        builder_options: ProductHeaderShopOption,
     };
 }
 
diff --git a/addons/website_sale/static/src/website_builder/product_image_option_plugin.js b/addons/website_sale/static/src/website_builder/product_image_option_plugin.js
index 4fa1eaa88665c..6cfee4ae1a130 100644
--- a/addons/website_sale/static/src/website_builder/product_image_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/product_image_option_plugin.js
@@ -1,25 +1,26 @@
 import { REPLACE_MEDIA } from "@html_builder/utils/option_sequence";
 import {
-    REPLACE_MEDIA_SELECTOR,
-    REPLACE_MEDIA_EXCLUDE,
-} from "@html_builder/plugins/image/image_tool_option_plugin";
+    ReplaceMediaOption,
+} from "@html_builder/plugins/image/replace_media_option";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { BuilderAction } from "@html_builder/core/builder_action";
+import { BaseOptionComponent } from "@html_builder/core/utils";
 
-const PRODUCT_IMAGE_OPTION_SELECTOR = `.o_wsale_product_images :is(${REPLACE_MEDIA_SELECTOR})`;
+
+export class ProductImageOption extends BaseOptionComponent {
+    static template = "website_sale.ProductImageOption";
+    static selector =  `.o_wsale_product_images :is(${ReplaceMediaOption.selector})`;
+    static exclude = ReplaceMediaOption.exclude;
+}
 
 export class ProductImageOptionPlugin extends Plugin {
     static id = "productImageOption";
     resources = {
         builder_options: [
-            withSequence(REPLACE_MEDIA, {
-                template: "website_sale.ProductImageOption",
-                selector: PRODUCT_IMAGE_OPTION_SELECTOR,
-                exclude: REPLACE_MEDIA_EXCLUDE,
-            }),
+            withSequence(REPLACE_MEDIA, ProductImageOption),
         ],
         builder_actions: {
             /*
@@ -36,7 +37,7 @@ export class ProductImageOptionPlugin extends Plugin {
                 target_name: "replaceMediaOption",
                 target_element: "exclude",
                 method: "add",
-                value: PRODUCT_IMAGE_OPTION_SELECTOR,
+                value: ProductImageOption.selector,
             },
         ],
     };
diff --git a/addons/website_sale/static/src/website_builder/product_page_option.js b/addons/website_sale/static/src/website_builder/product_page_option.js
index f35d5c635b85f..cbd64c512846d 100644
--- a/addons/website_sale/static/src/website_builder/product_page_option.js
+++ b/addons/website_sale/static/src/website_builder/product_page_option.js
@@ -1,7 +1,13 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
+import { _t } from "@web/core/l10n/translation";
 
 export class ProductPageOption extends BaseOptionComponent {
     static template = "website_sale.ProductPageOption";
+    static dependencies = ["productPageOption"];
+    static selector = "main:has(.o_wsale_product_page)";
+    static title = _t("Product Page");
+    static editableOnly = false;
+
     setup() {
         super.setup();
         this.domState = useDomState((el) => {
diff --git a/addons/website_sale/static/src/website_builder/product_page_option_plugin.js b/addons/website_sale/static/src/website_builder/product_page_option_plugin.js
index 14de66e5b1ca3..c5a1a8d3743d4 100644
--- a/addons/website_sale/static/src/website_builder/product_page_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/product_page_option_plugin.js
@@ -1,6 +1,5 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
-import { _t } from "@web/core/l10n/translation";
 import { ProductPageOption } from "./product_page_option";
 import { rpc } from "@web/core/network/rpc";
 import { isImageCorsProtected } from "@html_editor/utils/image";
@@ -9,18 +8,12 @@ import { WebsiteConfigAction, PreviewableWebsiteConfigAction } from "@website/bu
 import { BuilderAction } from "@html_builder/core/builder_action";
 import wSaleUtils from "@website_sale/js/website_sale_utils";
 
-export const productPageSelector = "main:has(.o_wsale_product_page)";
 class ProductPageOptionPlugin extends Plugin {
     static id = "productPageOption";
     static dependencies = ["builderActions", "media", "customizeWebsite"];
     static shared = ["forceCarouselRedraw"];
     resources = {
-        builder_options: {
-            OptionComponent: ProductPageOption,
-            selector: productPageSelector,
-            editableOnly: false,
-            title: _t("Product Page"),
-        },
+        builder_options: ProductPageOption,
         builder_actions: {
             ProductPageContainerWidthAction,
             ProductPageContainerOrderAction,
@@ -51,7 +44,7 @@ class ProductPageOptionPlugin extends Plugin {
                 el.textContent = el.getAttribute("placeholder");
             }
 
-            const mainEl = el.querySelector(productPageSelector);
+            const mainEl = el.querySelector(ProductPageOption.selector);
             if (!mainEl) {
                 return;
             }
@@ -80,13 +73,13 @@ class ProductPageOptionPlugin extends Plugin {
                 target_name: 'ProductsRibbonOption',
                 target_element: 'selector',
                 method: 'add',
-                value: productPageSelector,
+                value: ProductPageOption.selector,
             },
         ],
     };
 
     setup() {
-        const mainEl = this.document.querySelector(productPageSelector);
+        const mainEl = this.document.querySelector(ProductPageOption.selector);
         if (mainEl) {
             const productProduct = mainEl.querySelector('[data-oe-model="product.product"]');
             const productTemplate = mainEl.querySelector('[data-oe-model="product.template"]');
@@ -191,7 +184,7 @@ export class BaseProductPageAction extends BuilderAction {
     static id = "baseProductPage";
     setup() {
         this.reload = {};
-        const mainEl = this.document.querySelector(productPageSelector);
+        const mainEl = this.document.querySelector(ProductPageOption.selector);
         if (mainEl) {
             const productProduct = mainEl.querySelector('[data-oe-model="product.product"]');
             const productTemplate = mainEl.querySelector('[data-oe-model="product.template"]');
diff --git a/addons/website_sale/static/src/website_builder/product_ribbon_options.js b/addons/website_sale/static/src/website_builder/product_ribbon_options.js
index d07e13b3a21cc..e679f093820a8 100644
--- a/addons/website_sale/static/src/website_builder/product_ribbon_options.js
+++ b/addons/website_sale/static/src/website_builder/product_ribbon_options.js
@@ -3,21 +3,21 @@ import { onWillStart, useState } from "@odoo/owl";
 
 export class ProductsRibbonOption extends BaseOptionComponent {
     static template = 'website_sale.ProductsRibbonOptionPlugin';
-    static props = {
-        loadInfo: Function,
-        count: Object,
-    };
+    static dependencies = ['productsRibbonOptionPlugin'];
 
     setup() {
         super.setup();
 
+        const {loadInfo, getCount} = this.dependencies.productsRibbonOptionPlugin;
+        this.count = useState(getCount());
+
         this.state = useState({
             ribbons: [],
             ribbonEditMode: false,
         });
 
         onWillStart(async () => {
-            this.state.ribbons = await this.props.loadInfo();
+            this.state.ribbons = await loadInfo();
         });
     }
 }
diff --git a/addons/website_sale/static/src/website_builder/product_ribbon_options.xml b/addons/website_sale/static/src/website_builder/product_ribbon_options.xml
index 71d6ad33a830c..f88e17064703b 100644
--- a/addons/website_sale/static/src/website_builder/product_ribbon_options.xml
+++ b/addons/website_sale/static/src/website_builder/product_ribbon_options.xml
@@ -4,7 +4,7 @@
         <BuilderRow label.translate="Ribbon">
             <BuilderSelect
                 action="'setRibbon'"
-                t-key="props.count.value"
+                t-key="this.count.value"
                 className="'o_wsale_ribbon_select'"
                 t-on-click="() => state.ribbonEditMode = false"
             >
diff --git a/addons/website_sale/static/src/website_builder/product_ribbon_options_plugin.js b/addons/website_sale/static/src/website_builder/product_ribbon_options_plugin.js
index 5ab9ab76f88f7..a69f5878640de 100644
--- a/addons/website_sale/static/src/website_builder/product_ribbon_options_plugin.js
+++ b/addons/website_sale/static/src/website_builder/product_ribbon_options_plugin.js
@@ -8,6 +8,13 @@ import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { ProductsRibbonOption } from "./product_ribbon_options";
 
+export class ProductHeaderShopOption2 extends ProductsRibbonOption {
+    static name = 'ProductsRibbonOption';
+    static selector = "#products_grid .oe_product";
+    static editableOnly = false;
+    static groups = ['website.group_website_designer'];
+}
+
 class ProductsRibbonOptionPlugin extends Plugin {
     static id = 'productsRibbonOptionPlugin';
     static dependencies = ['history'];
@@ -21,23 +28,15 @@ class ProductsRibbonOptionPlugin extends Plugin {
         '_setRibbon',
         'setProductTemplateID',
         'getProductTemplateID',
-        'addProductTemplatesRibbons'
+        'addProductTemplatesRibbons',
+        'loadInfo',
+        'getCount',
     ];
     count = reactive({ value: 0 });
 
     resources = {
         builder_options: [
-            withSequence(SNIPPET_SPECIFIC_NEXT, {
-                OptionComponent: ProductsRibbonOption,
-                name: 'ProductsRibbonOption',
-                props: {
-                    loadInfo: this.loadInfo.bind(this),
-                    count: this.count,
-                },
-                selector: "#products_grid .oe_product",
-                editableOnly: false,
-                groups: ['website.group_website_designer'],
-            }),
+            withSequence(SNIPPET_SPECIFIC_NEXT, ProductHeaderShopOption2),
         ],
         builder_actions: {
             SetRibbonAction,
@@ -53,6 +52,9 @@ class ProductsRibbonOptionPlugin extends Plugin {
         this.productTemplatesRibbons = [];
         this.editMode = false;
     }
+    getCount() {
+        return this.count;
+    }
 
     async loadInfo() {
         if (!this.ribbons) {
diff --git a/addons/website_sale/static/src/website_builder/products_item_option.js b/addons/website_sale/static/src/website_builder/products_item_option.js
index 08696e8033d31..c5823f2f2962f 100644
--- a/addons/website_sale/static/src/website_builder/products_item_option.js
+++ b/addons/website_sale/static/src/website_builder/products_item_option.js
@@ -1,21 +1,26 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { onWillStart, onMounted, useState, useRef } from "@odoo/owl";
+import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
 
 export class ProductsItemOption extends BaseOptionComponent {
     static template = "website_sale.ProductsItemOptionPlugin";
-    static props = {
-        loadInfo: Function,
-        itemSize: Object,
-    };
+    static dependencies = ["productsItemOptionPlugin"];
+    static selector = "#products_grid .oe_product";
+    static title = _t("Product");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
 
     setup() {
         super.setup();
         this.orm = useService("orm");
         this.tableRef = useRef("table");
 
+        const { loadInfo, getItemSize, getCount } = this.dependencies.productsItemOptionPlugin;
+
         this.state = useState({
-            itemSize: this.props.itemSize,
+            itemSize: getItemSize(),
+            count: getCount(),
         });
 
         this.productsGridTableEl = this.env.getEditingElement().closest(".o_wsale_products_grid_table");
@@ -35,7 +40,7 @@ export class ProductsItemOption extends BaseOptionComponent {
         });
 
         onWillStart(async () => {
-            this.defaultSort = await this.props.loadInfo();
+            this.defaultSort = await loadInfo();
 
             // need to display "re-order" option only if shop_default_sort is 'website_sequence asc'
             this.displayReOrder = this.defaultSort[0].shop_default_sort === "website_sequence asc";
diff --git a/addons/website_sale/static/src/website_builder/products_item_option_plugin.js b/addons/website_sale/static/src/website_builder/products_item_option_plugin.js
index 60a98b9843535..4cf430cdecd97 100644
--- a/addons/website_sale/static/src/website_builder/products_item_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/products_item_option_plugin.js
@@ -1,5 +1,4 @@
 import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { rpc } from "@web/core/network/rpc";
 import { ProductsItemOption } from "./products_item_option";
@@ -12,24 +11,14 @@ class ProductsItemOptionPlugin extends Plugin {
         "setItemSize",
         "setProductTemplateID",
         "getProductTemplateID",
+        "loadInfo",
+        "getItemSize",
+        "getCount",
     ];
     itemSize = reactive({ x: 1, y: 1 });
 
     resources = {
-        builder_options: [
-            {
-                OptionComponent: ProductsItemOption,
-                props: {
-                    loadInfo: this.loadInfo.bind(this),
-                    itemSize: this.itemSize,
-                },
-                selector: "#products_grid .oe_product",
-                editableOnly: false,
-                title: _t("Product"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
-
+        builder_options: [ProductsItemOption],
         builder_actions: {
             SetItemSizeAction,
             ChangeSequenceAction,
@@ -46,6 +35,13 @@ class ProductsItemOptionPlugin extends Plugin {
         return this.defaultSort;
     }
 
+    getItemSize() {
+        return this.itemSize;
+    }
+    getCount() {
+        return this.count;
+    }
+
     async getDefaultSort() {
         return (
             this.defaultSort ||
diff --git a/addons/website_sale/static/src/website_builder/products_list_page_option.js b/addons/website_sale/static/src/website_builder/products_list_page_option.js
index 130bc45a61254..41a4b14643e2c 100644
--- a/addons/website_sale/static/src/website_builder/products_list_page_option.js
+++ b/addons/website_sale/static/src/website_builder/products_list_page_option.js
@@ -1,8 +1,14 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { _t } from "@web/core/l10n/translation";
 import { products_sort_mapping } from "@website_sale/website_builder/shared";
 
 export class ProductsListPageOption extends BaseOptionComponent {
     static template = "website_sale.ProductsListPageOption";
+    static selector = "#o_wsale_container";
+    static applyTo = "#o_wsale_container";
+    static title = _t("Products Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
 
     setup() {
         super.setup();
diff --git a/addons/website_sale/static/src/website_builder/products_list_page_option_plugin.js b/addons/website_sale/static/src/website_builder/products_list_page_option_plugin.js
index 933dbda68887e..0c75c00d8e4ba 100644
--- a/addons/website_sale/static/src/website_builder/products_list_page_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/products_list_page_option_plugin.js
@@ -1,7 +1,6 @@
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { PreviewableWebsiteConfigAction } from "@website/builder/plugins/customize_website_plugin";
 import { Plugin } from "@html_editor/plugin";
-import { _t } from "@web/core/l10n/translation";
 import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { ProductsListPageOption } from "@website_sale/website_builder/products_list_page_option";
@@ -10,15 +9,7 @@ class ProductsListPageOptionPlugin extends Plugin {
     static id = "productsListPageOptionPlugin";
 
     resources = {
-        builder_options: [
-            {
-                OptionComponent: ProductsListPageOption,
-                selector: "#o_wsale_container",
-                editableOnly: false,
-                title: _t("Products Page"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [ProductsListPageOption],
         builder_actions: {
             SetShopContainerAction,
             SetPpgAction,
diff --git a/addons/website_sale/static/src/website_builder/website_sale_show_empty_option_plugin.js b/addons/website_sale/static/src/website_builder/website_sale_show_empty_option_plugin.js
index 9401765134749..fdcfac1bb7fdc 100644
--- a/addons/website_sale/static/src/website_builder/website_sale_show_empty_option_plugin.js
+++ b/addons/website_sale/static/src/website_builder/website_sale_show_empty_option_plugin.js
@@ -3,17 +3,20 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { after } from "@html_builder/utils/option_sequence";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class ShowEmptyOption extends BaseOptionComponent {
+    static template = "website_sale.ShowEmptyOption";
+    static selector = "#wrapwrap > header";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
 
 class WebsiteSaleShowEmptyOptionPlugin extends Plugin {
     static id = "showEmptyOption";
     resources = {
         builder_options: [
-            withSequence(after(HEADER_ELEMENTS), {
-                template: "website_sale.ShowEmptyOption",
-                selector: "#wrapwrap > header",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(after(HEADER_ELEMENTS), ShowEmptyOption),
         ],
     };
 }
diff --git a/addons/website_sale_slides/static/src/website_builder/course_page_option_plugin.js b/addons/website_sale_slides/static/src/website_builder/course_page_option_plugin.js
index 952c93e2c7dd8..6cc436eaf2b99 100644
--- a/addons/website_sale_slides/static/src/website_builder/course_page_option_plugin.js
+++ b/addons/website_sale_slides/static/src/website_builder/course_page_option_plugin.js
@@ -1,19 +1,20 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
+export class CoursePageOption extends BaseOptionComponent {
+    static template = "website_sales_slides.CoursePageOption";
+    static selector = "main:has(.o_wslides_course_header)";
+    static title = _t("Course Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
 class CoursePageOptionPlugin extends Plugin {
     static id = "coursePageOption";
     resources = {
-        builder_options: [
-            {
-                template: "website_sales_slides.CoursePageOption",
-                selector: "main:has(.o_wslides_course_header)",
-                editableOnly: false,
-                title: _t("Course Page"),
-                groups: ["website.group_website_designer"],
-            },
-        ],
+        builder_options: [CoursePageOption],
     };
 }
 
diff --git a/addons/website_sale_wishlist/static/src/website_builder/wishlist_page_option_plugin.js b/addons/website_sale_wishlist/static/src/website_builder/wishlist_page_option_plugin.js
index cb9c35f83336b..35b649252d229 100644
--- a/addons/website_sale_wishlist/static/src/website_builder/wishlist_page_option_plugin.js
+++ b/addons/website_sale_wishlist/static/src/website_builder/wishlist_page_option_plugin.js
@@ -4,17 +4,20 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { rpc } from "@web/core/network/rpc";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class WishlistPageOption extends BaseOptionComponent {
+    static template = "website_sale_wishlist.WishlistPageOption";
+    static selector = ".o_wishlist_table"
+    static editableOnly = false;
+    static title = _t("Wishlist Page");
+    static groups = ["website.group_website_designer"];
+}
 
 class WishlistPageOptionPlugin extends Plugin {
     static id = "wishlistPageOption";
     resources = {
-        builder_options: {
-            template: "website_sale_wishlist.WishlistPageOption",
-            selector: ".o_wishlist_table",
-            editableOnly: false,
-            title: _t("Wishlist Page"),
-            groups: ["website.group_website_designer"],
-        },
+        builder_options: WishlistPageOption,
         builder_actions: {
             WishlistGridColumnsAction,
             WishlistMobileColumnsAction,
diff --git a/addons/website_slides/static/src/website_builder/courses_list_page_option_plugin.js b/addons/website_slides/static/src/website_builder/courses_list_page_option_plugin.js
index 10ede7446baca..db2f1e8e65ec6 100644
--- a/addons/website_slides/static/src/website_builder/courses_list_page_option_plugin.js
+++ b/addons/website_slides/static/src/website_builder/courses_list_page_option_plugin.js
@@ -1,3 +1,4 @@
+import { BaseOptionComponent } from "@html_builder/core/utils";
 import { after, DEFAULT } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
@@ -6,25 +7,31 @@ import { registry } from "@web/core/registry";
 
 const COURSES_LIST_PAGE = DEFAULT;
 
-class CoursesListPageOption extends Plugin {
+export class CoursesListPageOption extends BaseOptionComponent {
+    static template = "website_slides.CoursesListPageOption";
+    static selector = "main:has(.o_wslides_home_main)";
+    static title = _t("Courses Page");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class CoursesListAsidePageOption extends BaseOptionComponent {
+    static template = "website_slides.CoursesListAsidePageOption";
+    static selector = "main:has(.o_wslides_home_aside_loggedin)";
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
+
+export class CoursesListPageOptionPlugin extends Plugin {
     static id = "coursesListPageOption";
     resources = {
         builder_options: [
-            withSequence(COURSES_LIST_PAGE, {
-                template: "website_slides.CoursesListPageOption",
-                selector: "main:has(.o_wslides_home_main)",
-                editableOnly: false,
-                title: _t("Courses Page"),
-                groups: ["website.group_website_designer"],
-            }),
-            withSequence(after(COURSES_LIST_PAGE), {
-                template: "website_slides.CoursesListAsidePageOption",
-                selector: "main:has(.o_wslides_home_aside_loggedin)",
-                editableOnly: false,
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(COURSES_LIST_PAGE, CoursesListPageOption),
+            withSequence(after(COURSES_LIST_PAGE), CoursesListAsidePageOption),
         ],
     };
 }
 
-registry.category("website-plugins").add(CoursesListPageOption.id, CoursesListPageOption);
+registry
+    .category("website-plugins")
+    .add(CoursesListPageOptionPlugin.id, CoursesListPageOptionPlugin);
diff --git a/addons/website_slides_forum/static/src/website_builder/slides_forum_page_option_plugin.js b/addons/website_slides_forum/static/src/website_builder/slides_forum_page_option_plugin.js
index b344adbeac0e1..a68749031c542 100644
--- a/addons/website_slides_forum/static/src/website_builder/slides_forum_page_option_plugin.js
+++ b/addons/website_slides_forum/static/src/website_builder/slides_forum_page_option_plugin.js
@@ -4,18 +4,21 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export class SlidesForumOption extends BaseOptionComponent {
+    static template = "website_slides_forum.slidesForumOption";
+    static selector = "main:has(#o_wforum_forums_index_list)";
+    static title = _t("Slides Forum Snippet Options");
+    static groups = ["website.group_website_designer"];
+    static editableOnly = false;
+}
 
 class SlidesForumOptionPlugin extends Plugin {
     static id = "slidesForumOption";
     resources = {
         builder_options: [
-            withSequence(after(FORUMS_INDEX), {
-                template: "website_slides_forum.slidesForumOption",
-                selector: "main:has(#o_wforum_forums_index_list)",
-                editableOnly: false,
-                title: _t("Slides Forum Snippet Options"),
-                groups: ["website.group_website_designer"],
-            }),
+            withSequence(after(FORUMS_INDEX), SlidesForumOption),
         ],
     };
 }

From 320bda12e3ef22548e1b4bb4ca2886c437c3567a Mon Sep 17 00:00:00 2001
From: romo <romo@odoo.com>
Date: Wed, 29 Oct 2025 09:30:22 +0100
Subject: [PATCH 069/673] [FIX] website: restore header options in sidebar

After PR[1] was merged, the header options were not displayed correctly
in the sidebar.

In 19.0, there were many changes in the header options files (PR[2])
PR[1] was not adapted properly in the forward port, which led to
duplicated classes and sequence issues.

This commit restores the options order.
It also fixes an incorrect tooltip.

-----------------------------------------------------------------------

PR[1]: https://github.com/odoo/odoo/pull/230283

PR[2]: https://github.com/odoo/odoo/pull/221703

Part-of: odoo/odoo#233376
Related: odoo/enterprise#98236
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../header/header_box_option_plugin.js        | 36 -------------------
 .../options/header/header_elements_option.js  |  6 ++--
 .../options/header/header_font_option.js      |  5 ++-
 .../options/header/header_font_option.xml     |  2 +-
 .../header/header_icon_background_option.js   |  5 ++-
 .../header/header_navigation_option.js        |  1 +
 .../header/header_navigation_option_plugin.js |  4 ++-
 .../options/header/header_template_option.js  |  5 ++-
 8 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
index cf8fe934c1569..34675243853d5 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
@@ -11,42 +11,6 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { HeaderBoxOption } from "./header_box_option";
 import { HEADER_BOX } from "./header_option_plugin";
-import { BaseOptionComponent } from "@html_builder/core/utils";
-
-export class HeaderTemplateOption extends BaseOptionComponent {
-    static template = "website.headerTemplateOption";
-    static selector = "#wrapwrap > header";
-    static groups = ["website.group_website_designer"];
-    static editableOnly = false;
-}
-
-export class HeaderContentWidthOption extends BaseOptionComponent {
-    static template = "website.headerContentWidthOption";
-    static selector = "#wrapwrap > header";
-    static groups = ["website.group_website_designer"];
-    static editableOnly = false;
-}
-
-export class HeaderSidebarWidthOption extends BaseOptionComponent {
-    static template = "website.headerSidebarWidthOption";
-    static selector = "#wrapwrap > header";
-    static groups = ["website.group_website_designer"];
-    static editableOnly = false;
-}
-
-export class HeaderBackgroundOption extends BaseOptionComponent {
-    static template = "website.headerBackgroundOption";
-    static selector = "#wrapwrap > header";
-    static groups = ["website.group_website_designer"];
-    static editableOnly = false;
-}
-
-export class HeaderScrollEffectOption extends BaseOptionComponent {
-    static template = "website.headerScrollEffectOption";
-    static selector = "#wrapwrap > header";
-    static groups = ["website.group_website_designer"];
-    static editableOnly = false;
-}
 
 class HeaderBoxOptionPlugin extends Plugin {
     static id = "HeaderBoxOptionPlugin";
diff --git a/addons/website/static/src/builder/plugins/options/header/header_elements_option.js b/addons/website/static/src/builder/plugins/options/header/header_elements_option.js
index 333b3b16fc81f..e84564c2851c3 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_elements_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_elements_option.js
@@ -1,11 +1,9 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderElementsOption extends BaseOptionComponent {
     static template = "website.HeaderElementsOption";
     static dependencies = ["customizeWebsite"];
-    static selector = "#wrapwrap > header";
-    static groups = ["website.group_website_designer"];
-    static editableOnly = false;
 
     setup() {
         super.setup();
@@ -24,3 +22,5 @@ export class HeaderElementsOption extends BaseOptionComponent {
         };
     }
 }
+
+Object.assign(HeaderElementsOption, basicHeaderOptionSettings);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_font_option.js b/addons/website/static/src/builder/plugins/options/header/header_font_option.js
index af5ac192ccb4e..813d20b1f0ca1 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_font_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_font_option.js
@@ -3,7 +3,6 @@ import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderFontOption extends BaseOptionComponent {
     static template = "website.HeaderFontOption";
-    static editableOnly = basicHeaderOptionSettings.editableOnly;
-    static selector = basicHeaderOptionSettings.selector;
-    static groups = basicHeaderOptionSettings.groups;
 }
+
+Object.assign(HeaderFontOption, basicHeaderOptionSettings);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_font_option.xml b/addons/website/static/src/builder/plugins/options/header/header_font_option.xml
index 157d02404d38d..221df0702e60a 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_font_option.xml
+++ b/addons/website/static/src/builder/plugins/options/header/header_font_option.xml
@@ -27,7 +27,7 @@
         />
     </BuilderRow>
 
-    <BuilderRow label.translate="Format" tooltip.translate="Default Text Color">
+    <BuilderRow label.translate="Format" tooltip.translate="Default Text Size and Color">
         <BuilderNumberInput 
             action="'customizeWebsiteVariable'"
             actionParam="'header-font-size'" 
diff --git a/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js b/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js
index fd79a4af68488..bf401ea367bc5 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_icon_background_option.js
@@ -3,7 +3,6 @@ import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderIconBackgroundOption extends BaseOptionComponent {
     static template = "website.HeaderIconBackgroundOption";
-    static editableOnly = basicHeaderOptionSettings.editableOnly;
-    static selector = basicHeaderOptionSettings.selector;
-    static groups = basicHeaderOptionSettings.groups;
 }
+
+Object.assign(HeaderIconBackgroundOption, basicHeaderOptionSettings);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js b/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js
index da2e0adfd1d2b..23416bea4d2fa 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_navigation_option.js
@@ -49,4 +49,5 @@ export class HeaderNavigationOption extends BaseOptionComponent {
         return currentActiveViews;
     }
 }
+
 Object.assign(HeaderNavigationOption, basicHeaderOptionSettings);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
index aa46bc99e967a..e999fa1042aad 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
@@ -1,13 +1,15 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { HeaderNavigationOption } from "./header_navigation_option";
+import { withSequence } from "@html_editor/utils/resource";
+import { HEADER_NAVIGATION } from "./header_option_plugin";
 
 class HeaderNavigationOptionPlugin extends Plugin {
     static id = "HeaderNavigationOptionPlugin";
     static dependencies = ["customizeWebsite"];
 
     resources = {
-        builder_options: [HeaderNavigationOption],
+        builder_options: [withSequence(HEADER_NAVIGATION, HeaderNavigationOption)],
     };
 
     setup() {
diff --git a/addons/website/static/src/builder/plugins/options/header/header_template_option.js b/addons/website/static/src/builder/plugins/options/header/header_template_option.js
index 6936709a65658..60bd323d96496 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_template_option.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_template_option.js
@@ -3,11 +3,10 @@ import { basicHeaderOptionSettings } from "./basicHeaderOptionSettings";
 
 export class HeaderTemplateOption extends BaseOptionComponent {
     static template = "website.HeaderTemplateOption";
-    static editableOnly = basicHeaderOptionSettings.editableOnly;
-    static selector = basicHeaderOptionSettings.selector;
-    static groups = basicHeaderOptionSettings.groups;
 
     hasSomeOptions(opts) {
         return opts.some((opt) => this.isActiveItem(opt));
     }
 }
+
+Object.assign(HeaderTemplateOption, basicHeaderOptionSettings);

From 168fc83a215a21466350fe1315916af0ce8f35da Mon Sep 17 00:00:00 2001
From: FrancoisGe <fge@odoo.com>
Date: Wed, 29 Oct 2025 10:19:01 +0100
Subject: [PATCH 070/673] [FIX] website_sale: remove bad applyTo

In PR https://github.com/odoo/odoo/pull/230283, an unnecessary applyTo was added to ProductsListPageOption
Because of this, the option is never visible.
In this commit, we will therefore remove this applyT

closes odoo/odoo#233376

Related: odoo/enterprise#98236
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../static/src/website_builder/products_list_page_option.js      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_sale/static/src/website_builder/products_list_page_option.js b/addons/website_sale/static/src/website_builder/products_list_page_option.js
index 41a4b14643e2c..4e0807f16ab4b 100644
--- a/addons/website_sale/static/src/website_builder/products_list_page_option.js
+++ b/addons/website_sale/static/src/website_builder/products_list_page_option.js
@@ -5,7 +5,6 @@ import { products_sort_mapping } from "@website_sale/website_builder/shared";
 export class ProductsListPageOption extends BaseOptionComponent {
     static template = "website_sale.ProductsListPageOption";
     static selector = "#o_wsale_container";
-    static applyTo = "#o_wsale_container";
     static title = _t("Products Page");
     static groups = ["website.group_website_designer"];
     static editableOnly = false;

From 8f7735e8d490a324bbe878772968f599d16c79d9 Mon Sep 17 00:00:00 2001
From: "Thomas Becquevort (thbe)" <thbe@odoo.com>
Date: Wed, 27 Aug 2025 10:19:06 +0100
Subject: [PATCH 071/673] [FIX] hr_holidays: Test failing with dynamic dates

test_calendar_event_create_access_rights uses today as the base for the dates
of an holiday request which breaks starting from 17.0 when it generates dates
overlapping a weekend.

This commit makes the test use a static date instead

task-5136270
---
 addons/hr_holidays/tests/test_leave_requests.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/tests/test_leave_requests.py b/addons/hr_holidays/tests/test_leave_requests.py
index 5e4467d0741e6..2686aee510a9c 100644
--- a/addons/hr_holidays/tests/test_leave_requests.py
+++ b/addons/hr_holidays/tests/test_leave_requests.py
@@ -1997,14 +1997,15 @@ def test_calendar_event_create_access_rights(self):
         self.employee_emp.user_id = user_portal
 
         # As a manager, create a leave request for the employee linked to a portal user
-        leave = self.env['hr.leave'].with_user(self.user_hrmanager_id).create({
-            'name': 'Holiday Request',
-            'employee_id': self.employee_emp_id,
-            'holiday_status_id': self.holidays_type_1.id,
-            'date_from': (datetime.today() - relativedelta(days=1)),
-            'date_to': datetime.today(),
-            'number_of_days': 1,
-        })
+        with freeze_time('2025, 1, 8'):
+            leave = self.env['hr.leave'].with_user(self.user_hrmanager_id).create({
+                'name': 'Holiday Request',
+                'employee_id': self.employee_emp_id,
+                'holiday_status_id': self.holidays_type_1.id,
+                'request_date_from': (datetime.today() - relativedelta(days=7)),
+                'request_date_to': datetime.today(),
+                'number_of_days': 1,
+            })
 
         # Assert the employee cannot approve his own leave request
         with self.assertRaises(AccessError):

From 9e3b9bd085483ba0e0e956762fc0ad7d759eec73 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 31 Oct 2025 12:59:34 +0100
Subject: [PATCH 072/673] [FIX] mail: prevent crash when showing result of
 unknown poll

When a poll result of an unknown poll is displayed, an error
occurs. It happens because the poll ended text relies on the
poll start message author which is not sent when closing a poll.

As a result, when the start message of the poll has not been loaded,
the author is not available.

This commit updates the poll ended UI to use the `create_uid` of the
poll instead and by ensuring the relying partner is always sent.

closes odoo/odoo#233897

Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/mail/models/mail_poll.py                 |  9 ++++-----
 .../static/src/core/common/mail_poll_model.js   |  2 +-
 .../mail/static/tests/tours/mail_poll_tour.js   | 17 ++++++++++++++++-
 addons/mail/tests/test_mail_poll.py             | 17 ++++++++++++++++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/addons/mail/models/mail_poll.py b/addons/mail/models/mail_poll.py
index 9b5a89ee988e0..aa685d554954c 100644
--- a/addons/mail/models/mail_poll.py
+++ b/addons/mail/models/mail_poll.py
@@ -58,14 +58,13 @@ def _end_and_notify(self):
             poll.end_message_id = thread.message_post(
                 body="", message_type="mail_poll", subtype_xmlid="mail.mt_comment"
             )
-            Store(**thread._get_store_target()).add(poll).bus_send()
+            Store(**thread._get_store_target()).add(poll, extra_fields=[Store.One("start_message_id")]).bus_send()
 
     @api.model
     def _end_expired_polls(self):
-        self.env["mail.poll"].search_fetch([
-            ("poll_end_dt", "<=", "now"),
-            ("end_message_id", "=", None),
-        ])._end_and_notify()
+        self.env["mail.poll"].search_fetch(
+            [("poll_end_dt", "<=", "now"), ("end_message_id", "=", None)],
+        )._end_and_notify()
 
     @api.ondelete(at_uninstall=False)
     def _poll_on_delete(self):
diff --git a/addons/mail/static/src/core/common/mail_poll_model.js b/addons/mail/static/src/core/common/mail_poll_model.js
index 07bb6859cd9e6..787378ce6ddff 100644
--- a/addons/mail/static/src/core/common/mail_poll_model.js
+++ b/addons/mail/static/src/core/common/mail_poll_model.js
@@ -36,7 +36,7 @@ export class MailPollModel extends Record {
         return _t(
             '%(author)s\'s poll %(strong_tag_start)s"%(question)s"%(strong_tag_end)s has closed.',
             {
-                author: this.start_message_id.author_id.name,
+                author: this.start_message_id.authorName,
                 question: this.poll_question,
                 strong_tag_start: markup`<strong>`,
                 strong_tag_end: markup`</strong>`,
diff --git a/addons/mail/static/tests/tours/mail_poll_tour.js b/addons/mail/static/tests/tours/mail_poll_tour.js
index 39aaf1a600d9b..d0c3a8feca682 100644
--- a/addons/mail/static/tests/tours/mail_poll_tour.js
+++ b/addons/mail/static/tests/tours/mail_poll_tour.js
@@ -1,5 +1,7 @@
+import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 
+const pollId = new URL(window.location.href).searchParams.get("test_poll_id");
 registry.category("web_tour.tours").add("mail_poll_tour.js", {
     steps: () => [
         { trigger: ".o-mail-Composer [title='More Actions']", run: "click" },
@@ -44,12 +46,25 @@ registry.category("web_tour.tours").add("mail_poll_tour.js", {
         { trigger: "button:contains('End Poll')", run: "click" },
         { trigger: ".o-mail-PollResult:contains(Blue)" },
         { trigger: ".o-mail-PollResult:contains('Winning Answer∙100%')" },
-        { trigger: ".o-mail-Message:has(.o-mail-Poll)", run: "hover && click [title='Expand']" },
+        {
+            trigger: ".o-mail-Message:has(.o-mail-Poll)",
+            run: "hover && click .o-mail-Message:has(.o-mail-Poll) [title='Expand']",
+        },
         { trigger: "button:contains('Delete')", run: "click" },
         { trigger: ".modal .btn:contains(Delete)", run: "click" },
         {
             trigger:
                 ".o-mail-Message:contains('This message has been removed'):not(:has(.o-mail-Poll))",
         },
+        // End a poll that was not loaded to ensure all the information required by the end poll UI
+        // is provided by the `_end_and_notify` method.
+        {
+            trigger: "body",
+            run: () => rpc("/mail/poll/end", { poll_id: pollId }),
+        },
+        {
+            trigger:
+                '.o-mail-PollResult:contains(internal user (base.group_user)\'s poll "???" has ended.)',
+        },
     ],
 });
diff --git a/addons/mail/tests/test_mail_poll.py b/addons/mail/tests/test_mail_poll.py
index ddc34444d23d4..6ded86040b60b 100644
--- a/addons/mail/tests/test_mail_poll.py
+++ b/addons/mail/tests/test_mail_poll.py
@@ -130,9 +130,24 @@ def test_vote_percentage_computation(self):
                     )
 
     def test_poll_ui(self):
+        self.authenticate(self.internal.login, self.internal.login)
         channel = self.env["discuss.channel"].create({"name": "General"})
+        poll_id = self.make_jsonrpc_request(
+            "/mail/poll/create",
+            {
+                "duration": 1,
+                "option_labels": ["foo", "bar", "baz"],
+                "question": "???",
+                "thread_id": channel.id,
+                "thread_model": "discuss.channel",
+            },
+        )
+        # Posting enough message so that the poll message isn't loaded when
+        # opening the channel.
+        for i in range(50):
+            channel.message_post(body=f"message_{i}", message_type="comment")
         self.start_tour(
-            f"/odoo/discuss?active_id={channel.id}",
+            f"/odoo/discuss?active_id={channel.id}&test_poll_id={poll_id}",
             "mail_poll_tour.js",
             login=self.internal.login,
         )

From e75c5e01494ddc307f154f1dcc9e77c883ec53f4 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Fri, 31 Oct 2025 10:14:40 +0100
Subject: [PATCH 073/673] [FIX] hr_timesheet: add freeze_time to assume
 timesheets created in working day

Before this commit, `test_multi_create_timesheets_from_calendar` test
fails during the weekend because the first timesheet created inside that
test assumes it is created during working date but if the current date
is a weekend it is not the case.

This commit adds freeze_time on that test to make sure the current date
is a working day.

runbot-error-233318

closes odoo/odoo#233913

Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/hr_timesheet/tests/test_timesheet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/tests/test_timesheet.py b/addons/hr_timesheet/tests/test_timesheet.py
index 4c9243aeb46c1..05c3c6aeb1066 100644
--- a/addons/hr_timesheet/tests/test_timesheet.py
+++ b/addons/hr_timesheet/tests/test_timesheet.py
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from lxml import etree
+from freezegun import freeze_time
 
 from odoo import fields
 from odoo.fields import Command
@@ -866,6 +865,7 @@ def test_calendar_display_name(self):
         timesheet.invalidate_recordset(['calendar_display_name'])
         self.assertEqual(timesheet.calendar_display_name, f"{self.project_customer.name} (1.5d)")
 
+    @freeze_time("2025-10-31 08:00:00")
     def test_multi_create_timesheets_from_calendar(self):
         """
         Simulate creating timesheets using the multi-create feature in the calendar view

From b92876d9498a3f27d125fb1ff569619b66ed373a Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 31 Oct 2025 14:09:53 +0100
Subject: [PATCH 074/673] [FIX] mail: fix use foward refs to parent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `useForwardRefsToParent` hook forwards child refs to
a parent component. To do so, it relies on `useEffect` and
it cleanup. However, the cleanup function is not returned
which prevent children that unmount from being removed.
This commit fixes this typo.

closes odoo/odoo#233957

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/utils/common/hooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/utils/common/hooks.js b/addons/mail/static/src/utils/common/hooks.js
index 872eba02d8c14..b3a377875a1bb 100644
--- a/addons/mail/static/src/utils/common/hooks.js
+++ b/addons/mail/static/src/utils/common/hooks.js
@@ -679,7 +679,7 @@ export class UseForwardRefsToParent {
         useEffect(
             (map, key) => {
                 this.registerRef(map, key);
-                () => this.removeRef(map, key);
+                return () => this.removeRef(map, key);
             },
             () => [component.props[propName], getRefIdFn(component.props)]
         );

From 18b1a0324e65afdc7f58c32508f26cb74f00b2de Mon Sep 17 00:00:00 2001
From: "Martin (mlef)" <mlef@odoo.com>
Date: Thu, 21 Aug 2025 16:25:33 +0200
Subject: [PATCH 075/673] [FIX] hr_holidays: Add back a well-formatted "Extra
 Hours" section in the Time Off dashboard

Any card on the Time Off dashboard that had on hourly value did not have
the correct format (e.g.: 9.5 instead of 9:30).
This commit fixes that so that there is no more confusion about the
hour (e.g.: thinking 9.17 is 9 hours and 17 minutes).

To add the possibility to show the Extra Hours section on the dashboard,
I had to change the filtering logic of leave_types in the API to make
it only depend on:
- Hide in dashboard
- max_leaves

Some leave types, that are deductible and do not require allocation were
not displayed on the dashboard when we wanted it to. Since the filter of
leave types for the dashboard was done inside `get_allocation_data()`, it
was difficult to get what we wanted (here, the *extra hours*) on the
dashboard.

I thus had to move that filtering logic out of that function, in
`get_allocation_data_request()`, so that overriding and adding the
overtime in `get_allocation_data()` is possible.

task-5026228

closes odoo/odoo#224278

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_holidays/models/hr_employee.py      | 21 +++++-
 addons/hr_holidays/models/hr_leave_type.py    | 34 ++++++----
 .../static/src/dashboard/time_off_card.js     | 18 +++++
 .../static/src/dashboard/time_off_card.xml    |  2 +-
 .../tests/dashboard_card_hour_format.test.js  | 67 +++++++++++++++++++
 .../models/hr_leave_type.py                   |  5 +-
 6 files changed, 130 insertions(+), 17 deletions(-)
 create mode 100644 addons/hr_holidays/static/tests/dashboard_card_hour_format.test.js

diff --git a/addons/hr_holidays/models/hr_employee.py b/addons/hr_holidays/models/hr_employee.py
index eed8051818ad1..ebb98e32614f1 100644
--- a/addons/hr_holidays/models/hr_employee.py
+++ b/addons/hr_holidays/models/hr_employee.py
@@ -502,6 +502,23 @@ def _get_consumed_leaves(self, leave_types, target_date=False, ignore_future=Fal
 
         for employee in employees:
             for leave_type in leave_types:
+                if not leave_type.requires_allocation:
+                    # Ensure that leave types that do not require allocation are
+                    # still stored in the consumed allocation leaves.
+                    # False is the special key used for this type of leave
+                    allocations_leaves_consumed[employee][
+                        leave_type
+                    ][False].update(
+                        {
+                            "max_leaves": 0,
+                            "accrual_bonus": 0,
+                            "virtual_remaining_leaves": 0,
+                            "remaining_leaves": 0,
+                            "leaves_taken": 0,
+                            "virtual_leaves_taken": 0,
+                        }
+                    )
+
                 allocations_with_date_to = self.env['hr.leave.allocation']
                 allocations_without_date_to = self.env['hr.leave.allocation']
                 for leave_allocation in allocations_per_employee_type[employee][leave_type]:
@@ -578,9 +595,9 @@ def _get_consumed_leaves(self, leave_types, target_date=False, ignore_future=Fal
                         else:
                             allocated_time = leave.number_of_days
                         leave_type_data[False]['virtual_leaves_taken'] += allocated_time
-                        leave_type_data[False]['virtual_remaining_leaves'] = 0
-                        leave_type_data[False]['remaining_leaves'] = 0
+                        leave_type_data[False]['virtual_remaining_leaves'] -= allocated_time
                         if leave.state == 'validate':
+                            leave_type_data[False]['remaining_leaves'] -= allocated_time
                             leave_type_data[False]['leaves_taken'] += allocated_time
         for employee in to_recheck_leaves_per_leave_type:
             for leave_type in to_recheck_leaves_per_leave_type[employee]:
diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py
index dd65558ae9c06..2db25f7f1b5f9 100644
--- a/addons/hr_holidays/models/hr_leave_type.py
+++ b/addons/hr_holidays/models/hr_leave_type.py
@@ -85,7 +85,7 @@ def _model_sorting_key(self, leave_type):
         ('hr', 'By Time Off Officer'),
         ('manager', "By Employee's Approver"),
         ('both', "By Employee's Approver and Time Off Officer")], default='hr', string='Time Off Validation')
-    requires_allocation = fields.Boolean(default=True, required=True, string='Requires allocation')
+    requires_allocation = fields.Boolean(default=True, required=True, string='Requires Allocation')
     employee_requests = fields.Boolean(default=False, required=True, string="Allow Employee Requests",
         help="""Extra Days Requests Allowed: User can request an allocation for himself.\n
         Not Allowed: User cannot request an allocation.""")
@@ -476,6 +476,9 @@ def has_accrual_allocation(self):
 
     @api.model
     def get_allocation_data_request(self, target_date=None, hidden_allocations=True):
+        employee = self.env["hr.employee"]._get_contextual_employee()
+        if not employee:
+            return defaultdict(list)
         domain = [
             '|',
             ('company_id', 'in', self.env.context.get('allowed_company_ids')),
@@ -484,10 +487,18 @@ def get_allocation_data_request(self, target_date=None, hidden_allocations=True)
         if not hidden_allocations:
             domain.append(('hide_on_dashboard', '=', False))
         leave_types = self.search(domain, order='id')
-        employee = self.env['hr.employee']._get_contextual_employee()
-        if employee:
-            return leave_types.get_allocation_data(employee, target_date)[employee]
-        return []
+        employee_leave_type_infos = leave_types.get_allocation_data(employee, target_date)[
+            employee
+        ]
+        # We only need to filter allocation_data for the dashboard
+        if not self.env.context.get("from_dashboard", False):
+            return employee_leave_type_infos
+        filtered_employee_leave_type_infos = [
+            leave_type_info
+            for leave_type_info in employee_leave_type_infos
+            if leave_type_info[1]["max_leaves"]
+        ]
+        return filtered_employee_leave_type_infos
 
     def get_allocation_data(self, employees, target_date=None):
         allocation_data = defaultdict(list)
@@ -501,10 +512,9 @@ def get_allocation_data(self, employees, target_date=None):
         allocations_leaves_consumed, extra_data = employees.with_context(
             ignored_leave_ids=self.env.context.get('ignored_leave_ids')
         )._get_consumed_leaves(self, target_date)
-        leave_type_requires_allocation = self.filtered(lambda lt: lt.requires_allocation)
 
         for employee in employees:
-            for leave_type in leave_type_requires_allocation:
+            for leave_type in self:
                 if len(allocations_leaves_consumed[employee][leave_type]) == 0:
                     continue
                 lt_info = (
@@ -614,13 +624,11 @@ def get_allocation_data(self, employees, target_date=None):
                     'closest_allocation_duration': closest_allocation_duration,
                     'holds_changes': holds_changes,
                 })
-                if not self.env.context.get('from_dashboard', False) or lt_info[1]['max_leaves']:
-                    allocation_data[employee].append(lt_info)
-        for employee in allocation_data:
-            for leave_type_data in allocation_data[employee]:
-                for key, value in leave_type_data[1].items():
+                # format all float fields
+                for key, value in lt_info[1].items():
                     if isinstance(value, float):
-                        leave_type_data[1][key] = round(value, 2)
+                        lt_info[1][key] = round(value, 2)
+                allocation_data[employee].append(lt_info)
         return allocation_data
 
     def _get_closest_expiring_leaves_date_and_count(self, allocations, remaining_leaves, target_date):
diff --git a/addons/hr_holidays/static/src/dashboard/time_off_card.js b/addons/hr_holidays/static/src/dashboard/time_off_card.js
index e7e1a17d42d6b..88cffbf92a8a4 100644
--- a/addons/hr_holidays/static/src/dashboard/time_off_card.js
+++ b/addons/hr_holidays/static/src/dashboard/time_off_card.js
@@ -108,6 +108,24 @@ export class TimeOffCard extends Component {
         onWillRender(this.updateWarning);
     }
 
+
+    // e.g.: Input: 9.5 Output: 9:30
+    formatHour(hoursFloat) {
+        const hours = Math.floor(hoursFloat);
+        const minutes = Math.round((hoursFloat - hours) * 60);
+        // Pad minutes with leading zero if needed
+        const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
+        return `${hours}:${formattedMinutes}`;
+    }
+
+    formatDuration(duration) {
+        if (this.props.data.request_unit === 'hour') {
+            return this.formatHour(duration);
+        }
+        return formatNumber(this.lang, duration);
+    }
+
+
     updateWarning() {
         const { data } = this.props;
         const errorLeavesSignificant = data.allows_negative
diff --git a/addons/hr_holidays/static/src/dashboard/time_off_card.xml b/addons/hr_holidays/static/src/dashboard/time_off_card.xml
index d8a4fe036cac0..a36c4f33bb7fe 100644
--- a/addons/hr_holidays/static/src/dashboard/time_off_card.xml
+++ b/addons/hr_holidays/static/src/dashboard/time_off_card.xml
@@ -3,7 +3,7 @@
     <div t-name="hr_holidays.TimeOffCard" class="o_timeoff_card py-3 text-primary">
         <t t-set="data" t-value="props.data"/>
         <t t-set="duration" t-value="props.requires_allocation ? data.virtual_remaining_leaves : data.virtual_leaves_taken"/>
-        <t t-set="parsed_duration" t-value="formatNumber(this.lang, duration)"/>
+        <t t-set="parsed_duration" t-value="formatDuration(duration)"/>
         <t t-set="show_popover" t-value="true"/>
 
         <strong class="o_timeoff_name cursor-pointer btn-link" t-on-click="navigateTimeOffType"><t t-esc="props.name"/></strong>
diff --git a/addons/hr_holidays/static/tests/dashboard_card_hour_format.test.js b/addons/hr_holidays/static/tests/dashboard_card_hour_format.test.js
new file mode 100644
index 0000000000000..cb07b8a4c8da3
--- /dev/null
+++ b/addons/hr_holidays/static/tests/dashboard_card_hour_format.test.js
@@ -0,0 +1,67 @@
+import { expect, test, describe } from "@odoo/hoot";
+import { animationFrame } from "@odoo/hoot-mock";
+import { mountWithCleanup } from "@web/../tests/web_test_helpers"
+import { TimeOffCard } from "@hr_holidays/dashboard/time_off_card"
+import { defineHrHolidaysModels } from "./hr_holidays_test_helpers";
+
+function getHourProps(floatHour) {
+	return {
+		name: "Extra Hours",
+		data: {
+			accrual_bonus: 0,
+			allows_negative: false,
+			closest_allocation_duration: false,
+			closest_allocation_expire: false,
+			closest_allocation_remaining: 0,
+			employee_company: 1,
+			exceeding_duration: 0,
+			holds_changes: false,
+			icon: "/hr_holidays/static/src/img/icons/Compensatory_Time_Off.svg",
+			leaves_approved: 0,
+			leaves_requested: 0,
+			leaves_taken: 0,
+			max_allowed_negative: 0,
+			overtime_deductible: true,
+			request_unit: "hour",
+			total_virtual_excess: 0,
+			virtual_excess_data: {},
+			max_leaves: floatHour,
+			remaining_leaves: floatHour,
+			virtual_remaining_leaves: floatHour,
+			virtual_leaves_taken: floatHour,
+		},
+		requires_allocation: false,
+		holidayStatusId: 6,
+		employeeId: null,
+	}
+}
+
+defineHrHolidaysModels();
+
+describe('Test if card of "hour" unit is well formatted in TimeOffCard', () => {
+	test("Basic hour format", async () => {
+		// floatHour can be between 0 and +infinity
+		const floatHour = 13 + 56 / 60;
+		const props = getHourProps(floatHour)
+		await mountWithCleanup(TimeOffCard, { props });
+		await animationFrame();
+		expect("span.o_timeoff_duration span").toHaveText("13:56");
+	});
+
+	test("Hour with need of zero padding", async () => {
+		const floatHour = 1 + 5 / 60;
+		const props = getHourProps(floatHour)
+		await mountWithCleanup(TimeOffCard, { props });
+		await animationFrame();
+		// no need for zeroes for hour since the hour can be any positive number
+		expect("span.o_timeoff_duration span").toHaveText("1:05");
+	});
+
+	test("Hour of value 0", async () => {
+		const floatHour = 0 + 0 / 60;
+		const props = getHourProps(floatHour)
+		await mountWithCleanup(TimeOffCard, { props });
+		await animationFrame();
+		expect("span.o_timeoff_duration span").toHaveText("0:00");
+	});
+});
diff --git a/addons/hr_holidays_attendance/models/hr_leave_type.py b/addons/hr_holidays_attendance/models/hr_leave_type.py
index 5d2f36f486dff..9fdf8c90c669b 100644
--- a/addons/hr_holidays_attendance/models/hr_leave_type.py
+++ b/addons/hr_holidays_attendance/models/hr_leave_type.py
@@ -39,9 +39,12 @@ def get_allocation_data(self, employees, target_date=None):
             ('requires_allocation', '=', False)])
         leave_type_names = deductible_time_off_types.mapped('name')
         for employee in res:
+            total_overtime = employee.sudo().total_overtime
             for leave_data in res[employee]:
                 if leave_data[0] in leave_type_names:
-                    leave_data[1]['virtual_remaining_leaves'] = employee.sudo().total_overtime
+                    leave_data[1]['virtual_remaining_leaves'] = total_overtime
+                    leave_data[1]['max_leaves'] += total_overtime
+                    leave_data[1]['remaining_leaves'] += total_overtime
                     leave_data[1]['overtime_deductible'] = True
                 else:
                     leave_data[1]['overtime_deductible'] = False

From 773b222445792d9586bc6d9533880e9de44e3589 Mon Sep 17 00:00:00 2001
From: David Monnom <moda@odoo.com>
Date: Wed, 22 Oct 2025 12:17:47 +0000
Subject: [PATCH 076/673] [FIX] pos_self_order: fix table sharing between
 devices

Before this commit orders were always shared between multiple devices
using the same QR code. This could lead to issues when multiple
customers were using self-ordering at the same table, as they could
see and modify each other's orders.

When multiple devices are used for self-ordering with the same QR code,
there is now two mode possible:

- Pay after each: orders are not shared, and the table isn't linked to
  the order when synchronizing. Instead the table number is in the
  floating order name.

- Pay after meal: orders are shared, and the table is linked to the
  order when synchronizing. That's means that multiple devices can add
  products to the same order.

closes odoo/odoo#233288

Taskid: 5187089
X-original-commit: 6be947718c69b15f20c6680dd35e2fed5d636d28
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 addons/pos_self_order/controllers/orders.py   | 24 +++++----
 .../tests/tours/self_order_mobile_tour.js     | 26 ++++++++++
 .../tests/test_self_order_mobile.py           | 49 +++++++++++++++++++
 3 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/addons/pos_self_order/controllers/orders.py b/addons/pos_self_order/controllers/orders.py
index 8b8098e043718..011240395785d 100644
--- a/addons/pos_self_order/controllers/orders.py
+++ b/addons/pos_self_order/controllers/orders.py
@@ -158,32 +158,30 @@ def remove_order(self, access_token, order_id, order_access_token):
     @http.route('/pos-self-order/get-user-data', auth='public', type='jsonrpc', website=True)
     def get_orders_by_access_token(self, access_token, order_access_tokens, table_identifier=None):
         pos_config = self._verify_pos_config(access_token)
-        session = pos_config.current_session_id
         table = pos_config.env["restaurant.table"].search([('identifier', '=', table_identifier)], limit=1)
+        domain = False
 
-        if not table_identifier:
-            domain = Domain.FALSE
+        if not table_identifier or pos_config.self_ordering_pay_after == 'each':
+            domain = [(False, '=', True)]
         else:
-            domain = Domain([
+            domain = ['&', '&',
                 ('table_id', '=', table.id),
                 ('state', '=', 'draft'),
                 ('access_token', 'not in', [data.get('access_token') for data in order_access_tokens])
-            ])
+            ]
 
         for data in order_access_tokens:
-            domain |= Domain([
-                ('access_token', '=', data.get('access_token')),
+            domain = Domain.OR([domain, ['&',
+                ('access_token', '=', data['access_token']),
                 '|',
                 ('write_date', '>', data.get('write_date')),
-                ('state', '!=', data.get('state'))
-            ])
-            domain |= Domain('access_token', '=', data.get('access_token')) \
-                & Domain('write_date', '>', data.get('write_date'))
+                ('state', '!=', data.get('state')),
+            ]])
 
-        orders = session.order_ids.filtered_domain(domain)
+        # Do not use session.order_ids, it may fail if there is shared sessions
+        orders = pos_config.env['pos.order'].search(domain)
         if not orders:
             return {}
-
         return self._generate_return_values(orders, pos_config)
 
     @http.route('/kiosk/payment/<int:pos_config_id>/<device_type>', auth='public', type='jsonrpc', website=True)
diff --git a/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js b/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
index c491b29c64220..9d18f9ebc0786 100644
--- a/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
+++ b/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
@@ -397,3 +397,29 @@ registry.category("web_tour.tours").add("test_mobile_self_order_preparation_chan
             Utils.clickBtn("Ok"),
         ].flat(),
 });
+
+registry.category("web_tour.tours").add("test_self_order_table_sharing-each_mode", {
+    steps: () =>
+        [
+            Utils.checkIsNoBtn("My Order"),
+            Utils.clickBtn("Order Now"),
+            ProductPage.clickProduct("Coca-Cola"),
+            ProductPage.clickProduct("Fanta"),
+            Utils.clickBtn("Checkout"),
+            CartPage.checkProduct("Fanta", "2.53", "1"),
+            CartPage.checkProduct("Coca-Cola", "2.53", "1"),
+            Utils.clickBtn("Order"),
+            ConfirmationPage.isShown(),
+            Utils.clickBtn("Ok"),
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("test_self_order_table_sharing-meal_mode", {
+    steps: () =>
+        [
+            Utils.checkIsNoBtn("My Order"),
+            Utils.clickBtn("Order Now"),
+            Utils.clickBtn("Checkout"),
+            CartPage.checkProduct("Coca-Cola", "2.20", "1"),
+        ].flat(),
+});
diff --git a/addons/pos_self_order/tests/test_self_order_mobile.py b/addons/pos_self_order/tests/test_self_order_mobile.py
index 05d5bfbb63229..3c17f76066cae 100644
--- a/addons/pos_self_order/tests/test_self_order_mobile.py
+++ b/addons/pos_self_order/tests/test_self_order_mobile.py
@@ -248,3 +248,52 @@ def test_mobile_self_order_preparation_changes(self):
 
         # Check self-order in pos-terminal are not prompted for Send-for-Preparation
         self.start_tour('/pos/ui?config_id=%d' % self.pos_config.id, 'test_pos_self_order_preparation_changes', login='pos_user')
+
+    def test_self_order_table_sharing(self):
+        """
+        - MEAL MODE: table is assigned to order via table_id field when scanning QR code
+            all phones scanning the same table QR code share the same order
+        - EACH MODE: table is assigned to order via floating_order_name field when scanning QR code
+            each phone scanning the same table QR code has its own order
+        """
+        self.pos_config.write({
+            'self_ordering_mode': 'mobile',
+            'self_ordering_pay_after': 'each',
+            'self_ordering_service_mode': 'table',
+            'use_presets': False,
+        })
+
+        self.pos_config.with_user(self.pos_user).open_ui()
+        self.pos_config.current_session_id.set_opening_control(0, "")
+        table = self.pos_config.floor_ids.table_ids[0]
+        table_identifier = table.identifier
+        self_route = self.pos_config._get_self_order_route(table_id=table.id)
+
+        # Just needs to create an order, values do not matter
+        self.env['pos.order'].create({
+            'session_id': self.pos_config.current_session_id.id,
+            'table_id': table.id,
+            'amount_total': 10.0,
+            'amount_tax': 0.0,
+            'amount_return': 0.0,
+            'amount_paid': 0.0,
+            'floating_order_name': f'Self-Order {table_identifier}',
+            'lines': [(0, 0, {
+                'qty': 1,
+                'product_id': self.cola.id,
+                'price_unit': self.cola.lst_price,
+                'price_subtotal': self.cola.lst_price,
+                'price_subtotal_incl': self.cola.lst_price,
+            })],
+        })
+
+        self.start_tour(self_route, "test_self_order_table_sharing-each_mode")
+        last_order = self.pos_config.current_session_id.order_ids[0]
+        self.assertEqual(last_order.floating_order_name, f"Self-Order T {table.table_number}")
+        self.assertFalse(last_order.table_id)
+
+        self.pos_config.write({
+            'self_ordering_pay_after': 'meal',
+        })
+
+        self.start_tour(self_route, "test_self_order_table_sharing-meal_mode")

From f1f7c9dd1872409701713d7a35861b798baacdf3 Mon Sep 17 00:00:00 2001
From: Vitor29Narciso <vean1999@gmail.com>
Date: Tue, 28 Oct 2025 11:49:23 +0000
Subject: [PATCH 077/673] [CLA] signature for Vitor29Narciso

closes odoo/odoo#233945

X-original-commit: f498b0089c873ed781e240d173bf1c69ec5a47db
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
 doc/cla/individual/vitor29narciso.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/cla/individual/vitor29narciso.md

diff --git a/doc/cla/individual/vitor29narciso.md b/doc/cla/individual/vitor29narciso.md
new file mode 100644
index 0000000000000..8a9e78e96cc1f
--- /dev/null
+++ b/doc/cla/individual/vitor29narciso.md
@@ -0,0 +1,11 @@
+Portugal, 2025-10-28
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Vítor Narciso vean1999@gmail.com https://github.com/Vitor29Narciso
\ No newline at end of file

From 1ad63fc8a3736ddba76aeca06fb3bd79f8876110 Mon Sep 17 00:00:00 2001
From: nmak-odoo <nmak@odoo.com>
Date: Fri, 31 Oct 2025 05:59:32 +0000
Subject: [PATCH 078/673] [FIX] mail: prevent error when disabling blur
 background in CallPreview
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, disabling blur background right after enabling it would
crash because the notification service was not initialized in the CallPreview
component.

This commit adds the missing notification service to fix the crash.

Task-5223992

closes odoo/odoo#233949

X-original-commit: 7e270f35245eb1539d8f5ea24a83365d5fae47bb
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/static/src/discuss/call/common/call_preview.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/discuss/call/common/call_preview.js b/addons/mail/static/src/discuss/call/common/call_preview.js
index 495937051d368..ee2190e3280ba 100644
--- a/addons/mail/static/src/discuss/call/common/call_preview.js
+++ b/addons/mail/static/src/discuss/call/common/call_preview.js
@@ -28,6 +28,7 @@ export class CallPreview extends Component {
 
     setup() {
         this.dialog = useService("dialog");
+        this.notification = useService("notification");
         this.rtc = useService("discuss.rtc");
         this.store = useService("mail.store");
         this.state = useState({ audioStream: null, blurManager: null, videoStream: null });

From 58af74f9bb8c31d2ce0573d466ecffd1bf1acae3 Mon Sep 17 00:00:00 2001
From: "Victor Piryns (pivi)" <pivi@odoo.com>
Date: Fri, 24 Oct 2025 16:44:00 +0000
Subject: [PATCH 079/673] [PERF] hr: Speed-up `voip_hr` record rule.

Description
-----------
The rule `voip_call_hr_access_rule` is added with an `OR` to
`voip_call_rule_user`, but with the presence of the `One2many`
`employee_ids` in the domain, the final query leads to a bad plan
where Postgres does a full Seq.Scan on `voip_call` to then
post-filter based on `user_id`.

To simplify the final query, we inline the ids that are being
resolved from searching on `res.users.employee_id` (which is just a
proxy for `res.users.employee_ids`). We also re-write the `ir.rule`
to use this new inlining via `employee_id` and avoid using
`employee_ids` which is resolved as a generic One2many from the ORM.

This leads to a few more queries, but each is fast and trivial to
process.

Benchmark
---------
On a database with over 10M `voip.call` and `res.users`, for a Hr
Officer, to open the Phone's app default list view with no default
filter (the default setup), took:

| Before | After | Speed-up |
|--------|-------|----------|
| 13.3s  | 80ms  | 162x     |

closes odoo/odoo#233947

X-original-commit: 0ab249b35e653aa61fc357b278cc0f2de518f073
Related: odoo/enterprise#98562
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
Signed-off-by: Piryns Victor (pivi) <pivi@odoo.com>
---
 addons/hr/models/res_users.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/hr/models/res_users.py b/addons/hr/models/res_users.py
index ef9e2f926a941..b83cc4d5b456a 100644
--- a/addons/hr/models/res_users.py
+++ b/addons/hr/models/res_users.py
@@ -271,7 +271,18 @@ def _compute_company_employee(self):
             user.employee_id = employee_per_user.get(user)
 
     def _search_company_employee(self, operator, value):
-        return [('employee_ids', operator, value)]
+        # Equivalent to `[('employee_ids', operator, value)]`,
+        # but we inline the ids directly to simplify final queries and improve performance,
+        # as it's part of a few ir.rules.
+        # If we're going to inject too many `ids`, we fall back on the default behavior
+        # to avoid a performance regression.
+        IN_MAX = 10_000
+        domain = [('employee_ids', operator, value)]
+        user_ids = self.env['res.users'].with_context(active_test=False)._search(domain, limit=IN_MAX).get_result_ids()
+        if len(user_ids) < IN_MAX:
+            return [('id', 'in', user_ids)]
+
+        return domain
 
     def action_create_employee(self):
         self.ensure_one()

From 1db938fd92ab4f8149c94a84d7289c4791f6e29d Mon Sep 17 00:00:00 2001
From: Ayush Modi <aamo@odoo.com>
Date: Tue, 14 Oct 2025 12:50:02 +0000
Subject: [PATCH 080/673] [FIX] purchase: prevent deletion of UoM when it is in
 use

When a user deletes the UoM used in a purchase order line and then tries to
confirm the purchase order.

Steps to reproduce:
- Install 'purchase' module(without demo)
- Enable 'Units & Packagings' and Create a New UoM
- Create a New PO > Add a product in Line (with UoM=Units)
- Now go to selected product > 'Purchase' page -> Select 'Vendor' and set UoM
  to newly created UoM
- Now in PO order line change UoM to newly created UoM
- Now remove 'Vendor' and delete newly created UoM
- Orders > Requests for Quotation > Open PO > 'Confirm Order'

Traceback:
ValueError: Expected singleton: uom.uom()
ZeroDivisionError: float division by zero

This error occurs because, after the UoM is deleted, the 'product_uom_id' field
becomes empty, which leads to an error.

Solution:
This commit resolves the error by restricting the deletion of a UoM when it is
still in use.

sentry-6746792383

closes odoo/odoo#233953

X-original-commit: 25a025313eb0e44918d3934741b903efb88b3eae
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
Signed-off-by: Aayush Modi (aamo) <aamo@odoo.com>
---
 addons/purchase/models/purchase_order_line.py |  2 +-
 addons/purchase/tests/test_purchase.py        | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/models/purchase_order_line.py b/addons/purchase/models/purchase_order_line.py
index 3dd978a5be0b4..018c5654f4124 100644
--- a/addons/purchase/models/purchase_order_line.py
+++ b/addons/purchase/models/purchase_order_line.py
@@ -30,7 +30,7 @@ class PurchaseOrderLine(models.Model):
         store=True, readonly=False)
     tax_ids = fields.Many2many('account.tax', string='Taxes', context={'active_test': False, 'hide_original_tax_ids': True})
     allowed_uom_ids = fields.Many2many('uom.uom', compute='_compute_allowed_uom_ids')
-    product_uom_id = fields.Many2one('uom.uom', string='Unit', domain="[('id', 'in', allowed_uom_ids)]")
+    product_uom_id = fields.Many2one('uom.uom', string='Unit', domain="[('id', 'in', allowed_uom_ids)]", ondelete='restrict')
     product_id = fields.Many2one('product.product', string='Product', domain=[('purchase_ok', '=', True)], change_default=True, index='btree_not_null', ondelete='restrict')
     product_type = fields.Selection(related='product_id.type', readonly=True)
     price_unit = fields.Float(
diff --git a/addons/purchase/tests/test_purchase.py b/addons/purchase/tests/test_purchase.py
index 88172acc775eb..f7f4e415bba2c 100644
--- a/addons/purchase/tests/test_purchase.py
+++ b/addons/purchase/tests/test_purchase.py
@@ -4,10 +4,12 @@
 from odoo.tests import tagged, Form
 from odoo import Command, fields
 from odoo.exceptions import UserError
+from odoo.tools import mute_logger
 
 
 from datetime import timedelta
 from freezegun import freeze_time
+from psycopg2.errors import ForeignKeyViolation
 import pytz
 
 
@@ -1107,3 +1109,24 @@ def test_prevent_recompute_price_on_manual_set(self):
             line.price_unit = 100.0
         po.order_line.product_qty = 10
         self.assertEqual(po.order_line.price_unit, 100.0, "Price should remain 100.0 after changing the quantity")
+
+    def test_purchase_order_line_without_uom(self):
+        uom_test = self.env['uom.uom'].create({
+            'name': 'Test Uom',
+            'rounding': 1.0,
+        })
+
+        po = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'order_line': [
+                (0, 0, {
+                    'product_id': self.product_a.id,
+                    'product_qty': 1.0,
+                    'product_uom_id': uom_test.id,
+                })],
+        })
+
+        with (self.assertRaises(ForeignKeyViolation), self.cr.savepoint(), mute_logger("odoo.sql_db")):
+            uom_test.unlink()
+
+        self.assertEqual(po.order_line[0].product_uom_id, uom_test)

From fb8f3976fa6f968fda4fb68402ec4494b0345b5c Mon Sep 17 00:00:00 2001
From: mano-odoo <mano@odoo.com>
Date: Wed, 29 Oct 2025 10:47:03 +0000
Subject: [PATCH 081/673] [FIX] web: review datetime_picker hover and darkmode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `DateTimePicker` lacks hover and focus states. In darkmode the
calendar doesn't have the proper elevation background color and the
input border on `TimePicker`is not visible. Also improves weekdays
readability.

task-4900904

closes odoo/odoo#233948

X-original-commit: 053282823437866b1a5ae55484e40737caa668b4
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 .../src/core/datetime/datetime_picker.scss    | 29 ++++++++++++++-----
 .../src/core/datetime/datetime_picker.xml     |  6 ++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/core/datetime/datetime_picker.scss b/addons/web/static/src/core/datetime/datetime_picker.scss
index 3ab4302f99f88..3f7ec1ffad8b3 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.scss
+++ b/addons/web/static/src/core/datetime/datetime_picker.scss
@@ -56,13 +56,9 @@
     // Utilities
 
     .o_date_item_picker .o_datetime_button {
-        &.o_selected,
-        &:hover,
-        &.o_today:not(.o_selected):hover {
-            &:not(.o_select_start):not(.o_select_end) {
-                background: $o-component-active-bg;
-                color: $o-component-active-color;
-            }
+        &.o_selected:not(.o_select_start, .o_select_end) {
+            background: $o-component-active-bg;
+            color: $o-component-active-color;
         }
     }
 
@@ -73,5 +69,24 @@
 
     .o_date_item_cell {
         aspect-ratio: 1;
+        position: relative;
+
+        &:hover, &:focus {
+            --DateTimePicker__date-cell-border-color-hover: #{$o-component-active-border};
+        }
+
+        &:not([disabled])::before {
+            @include o-position-absolute(0,0,0,0);
+
+            content: '';
+            aspect-ratio: 1;
+            border: $border-width solid var(--DateTimePicker__date-cell-border-color-hover);
+            border-radius: $border-radius-pill;
+            pointer-events: none;
+        }
+    }
+
+    .o_week_number_cell {
+        font-variant: tabular-nums;
     }
 }
diff --git a/addons/web/static/src/core/datetime/datetime_picker.xml b/addons/web/static/src/core/datetime/datetime_picker.xml
index f4bf755d22c50..fef537face8e9 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.xml
+++ b/addons/web/static/src/core/datetime/datetime_picker.xml
@@ -4,7 +4,7 @@
         <div class="d-flex gap-3">
             <t t-foreach="items" t-as="month" t-key="month.id">
                 <div
-                    class="o_date_picker d-grid flex-grow-1 bg-view rounded overflow-auto"
+                    class="o_date_picker d-grid flex-grow-1 rounded overflow-auto"
                     t-on-pointerleave="() => (state.hoveredDate = null)"
                 >
                     <t t-foreach="month.daysOfWeek" t-as="dayOfWeek" t-key="dayOfWeek[0]">
@@ -18,7 +18,7 @@
                     <t t-foreach="month.weeks" t-as="week" t-key="week.number">
                         <t t-if="props.showWeekNumbers">
                             <div
-                                class="o_week_number_cell d-flex align-items-center ps-2 fw-bolder"
+                                class="o_week_number_cell d-flex justify-content-end align-items-center pe-3 fw-bolder"
                                 t-esc="week.number"
                             />
                         </t>
@@ -58,6 +58,7 @@
                     onChange="(newTime) => this.onTimeChange(0, newTime)"
                     minutesRounding="props.rounding"
                     showSeconds="props.rounding === 0"
+                    inputCssClass="'o_input'"
                 />
                 <i t-if="state.timeValues[0] and state.timeValues[1]" class="fa fa-long-arrow-right"/>
                 <TimePicker
@@ -66,6 +67,7 @@
                     onChange="(newTime) => this.onTimeChange(1, newTime)"
                     minutesRounding="props.rounding"
                     showSeconds="props.rounding === 0"
+                    inputCssClass="'o_input'"
                 />
             </div>
             <t t-slot="buttons" />

From 2a64c2910bde53b6638f049accf681484e6534f2 Mon Sep 17 00:00:00 2001
From: anko-odoo <anko@odoo.com>
Date: Fri, 24 Oct 2025 13:33:36 +0000
Subject: [PATCH 082/673] [FIX] sale_gelato: truncate too long address fields

Additional check to ensure all address fields required by Gelato is added.
Address fields are trimmed to fit the Gelato character limit for shipping
address fields.

opw-5207430

closes odoo/odoo#233952

X-original-commit: da7618b1630e328fd48c74df0b8f96bde09d9471
Signed-off-by: anko-odoo <anko@odoo.com>
---
 addons/sale_gelato/models/delivery_carrier.py | 28 ++-----------------
 addons/sale_gelato/models/res_partner.py      | 16 +++++++----
 addons/sale_gelato/models/sale_order.py       | 24 +++++++++++++++-
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/addons/sale_gelato/models/delivery_carrier.py b/addons/sale_gelato/models/delivery_carrier.py
index fc449daae1e17..8fa9eb969a0ca 100644
--- a/addons/sale_gelato/models/delivery_carrier.py
+++ b/addons/sale_gelato/models/delivery_carrier.py
@@ -1,9 +1,9 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import _, api, fields, models
+from odoo import _, fields, models
 from odoo.exceptions import UserError
 
-from odoo.addons.sale_gelato import const, utils
+from odoo.addons.sale_gelato import utils
 
 
 class ProviderGelato(models.Model):
@@ -67,7 +67,7 @@ def gelato_rate_shipment(self, order):
         :return: The shipment rate request results.
         :rtype: dict
         """
-        if error_message := self._ensure_partner_address_is_complete(order.partner_id):
+        if error_message := order._ensure_partner_address_is_complete():
             return {
                 'success': False,
                 'price': 0,
@@ -114,25 +114,3 @@ def gelato_rate_shipment(self, order):
             'success': True,
             'price': total_delivery_price,
         }
-
-    @api.model
-    def _ensure_partner_address_is_complete(self, partner):
-        """ Ensure that all partner address fields required by Gelato are set.
-
-        :param res.partner partner: The partner address to check.
-        :return: An error message if the address is incomplete, None otherwise.
-        :rtype: str | None
-        """
-        required_address_fields = ['city', 'country_id', 'street']
-        if partner.country_id.code not in const.COUNTRIES_WITHOUT_ZIPCODE:
-            required_address_fields.append('zip')
-        missing_fields = [
-            partner._fields[field_name]
-            for field_name in required_address_fields if not partner[field_name]
-        ]
-        if missing_fields:
-            translated_field_names = [f._description_string(self.env) for f in missing_fields]
-            return _(
-                "The following required address fields are missing: %s",
-                ", ".join(translated_field_names),
-            )
diff --git a/addons/sale_gelato/models/res_partner.py b/addons/sale_gelato/models/res_partner.py
index fd58af241d9fe..32a9fab0f3eab 100644
--- a/addons/sale_gelato/models/res_partner.py
+++ b/addons/sale_gelato/models/res_partner.py
@@ -9,15 +9,19 @@ class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     def _gelato_prepare_address_payload(self):
+        """Trim address fields according to maximum length allowed by Gelato."""
         first_name, last_name = payment_utils.split_partner_name(self.name)
+        address_2 = self.street2 or ''
+        if remaining_address := self.street[35:]:
+            address_2 = remaining_address + ' ' + address_2
         return {
-            'companyName': self.commercial_company_name or '',
-            'firstName': first_name or last_name,  # Gelato require a first name.
-            'lastName': last_name,
-            'addressLine1': self.street,
-            'addressLine2': self.street2 or '',
+            'companyName': (self.commercial_company_name or '')[:60],
+            'firstName': (first_name or last_name)[:25],  # Gelato require a first name.
+            'lastName': last_name[:25],
+            'addressLine1': self.street[:35],
+            'addressLine2': address_2[:35],
             'state': self.state_id.code,
-            'city': self.city,
+            'city': self.city[:30],
             'postCode': self.zip,
             'country': self.country_id.code,
             'email': self.email,
diff --git a/addons/sale_gelato/models/sale_order.py b/addons/sale_gelato/models/sale_order.py
index bf74d4891b5ff..0e7aade294b0a 100644
--- a/addons/sale_gelato/models/sale_order.py
+++ b/addons/sale_gelato/models/sale_order.py
@@ -7,7 +7,7 @@
 from odoo import _, models
 from odoo.exceptions import UserError, ValidationError
 
-from odoo.addons.sale_gelato import utils
+from odoo.addons.sale_gelato import const, utils
 
 
 _logger = logging.getLogger(__name__)
@@ -71,11 +71,33 @@ def action_confirm(self):
         for order in self.filtered(
             lambda o: any(o.order_line.product_id.mapped('gelato_product_uid'))
         ):
+            if message := order._ensure_partner_address_is_complete():
+                raise ValidationError(message)
             order._create_order_on_gelato()
         return res
 
     # === BUSINESS METHODS === #
 
+    def _ensure_partner_address_is_complete(self):
+        """Ensure that all order's partner address fields required by Gelato are set.
+
+        :return: An error message if the address is incomplete, None otherwise.
+        :rtype: str | None
+        """
+        required_address_fields = ['city', 'country_id', 'email', 'name', 'street']
+        if self.partner_id.country_id.code not in const.COUNTRIES_WITHOUT_ZIPCODE:
+            required_address_fields.append('zip')
+        missing_fields = [
+            self.partner_id._fields[field_name]
+            for field_name in required_address_fields if not self.partner_id[field_name]
+        ]
+        if missing_fields:
+            translated_field_names = [f._description_string(self.env) for f in missing_fields]
+            return _(
+                "The following required address fields are missing: %s",
+                ", ".join(translated_field_names),
+            )
+
     def _create_order_on_gelato(self):
         """ Send the order creation request to Gelato and log the request result on the chatter.
 

From ad7c7bade68ee963274e3e9b4b117c040ce55cd0 Mon Sep 17 00:00:00 2001
From: Mazen <mamr@odoo.com>
Date: Thu, 30 Oct 2025 14:09:09 +0000
Subject: [PATCH 083/673] [FIX] website_sale: fix rtl product list card

Versions
--------
- 19.0+

Steps
-----
1. Enable Arabic (or any RTL language) for the website.
2. Navigate to the shop page.
3. Edit "Product Design" to be "Cards" list.

Issue
-----
The rights corners of the product images are not rounded,
and are sticking out of the container, while the left
corners are rounded, when they should be straight.

Cause
-----
The rounded corners of the image are applied the same
way regardless of the direction of the whole page, while
the rest of the elements, including the container for
the image, are flipped.

Solution
--------
Add a CSS rule to handle specifically the RTL case.

opw-5173879

closes odoo/odoo#233951

X-original-commit: 9a649a7182275170b9856a6d22b085b0f882bbd5
Signed-off-by: Valentin Chevalier <vcr@odoo.com>
Signed-off-by: Mazen Mahmoud (mamr) <mamr@odoo.com>
---
 addons/website_sale/static/src/scss/product_tile.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website_sale/static/src/scss/product_tile.scss b/addons/website_sale/static/src/scss/product_tile.scss
index 755762419383f..6cbf962897ffa 100644
--- a/addons/website_sale/static/src/scss/product_tile.scss
+++ b/addons/website_sale/static/src/scss/product_tile.scss
@@ -589,6 +589,9 @@
         --o-wsale-card-thumb-min-heigh: 100%;
         --o-wsale-card-thumb-size: min(13rem, 30vw);
         --o-wsale-card-thumb-border-radius: #{$-br-top} 0 0 #{$-br-top};
+        /* rtl:raw:
+          --o-wsale-card-thumb-border-radius: 0 #{$-br-top} #{$-br-top} 0;
+        */
         --o-wsale-card-thumb-position: center;
         --o-wsale-card-sub-display: contents;
         --o-wsale-card-info-margin: 0px;

From b3fa87c0eb10d914cf341f509114653095197b6e Mon Sep 17 00:00:00 2001
From: Akash Parmar <akap@odoo.com>
Date: Fri, 31 Oct 2025 07:24:40 +0000
Subject: [PATCH 084/673] [IMP] mail: reduce call permission dialog size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Purpose of this commit:

Reduce the size of the call permission dialog to eliminate extra empty space
on the right side.

task-5091767

closes odoo/odoo#233981

X-original-commit: e29c29f43c46aa6d288acd8b9c9931fd2fda43a3
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/discuss/call/common/call_permission_dialog.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/discuss/call/common/call_permission_dialog.xml b/addons/mail/static/src/discuss/call/common/call_permission_dialog.xml
index 734361e0ff2f4..025c1b7d45a0c 100644
--- a/addons/mail/static/src/discuss/call/common/call_permission_dialog.xml
+++ b/addons/mail/static/src/discuss/call/common/call_permission_dialog.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="discuss.CallPermissionDialog">
-        <Dialog title="''">
+        <Dialog title="''" size="'md'">
             <h5 class="fw-medium fs-2 mb-2" t-out="permissionPrompt"/>
             <small class="text-muted" t-out="permissionNote"/>
             <t t-set-slot="footer">

From e38443956653ca769ea48b4dcce9a06e65ed4c4a Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Tue, 21 Oct 2025 09:04:42 +0000
Subject: [PATCH 085/673] [FIX] pos_online_payment: sync partner after adding
 online payment line

Before this commit, if a partner was selected after adding an online
payment line, the partner was not synced after completing the online
payment.

opw-5098127

closes odoo/odoo#233983

X-original-commit: c661242d76c4b93fa51547e1b02ef41915d579c4
Signed-off-by: David Monnom (moda) <moda@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 .../pos/tours/utils/payment_screen_util.js    |  2 +-
 addons/pos_online_payment/models/pos_order.py | 10 ++++++++++
 .../pos_online_payment/models/pos_payment.py  |  2 +-
 .../src/app/utils/order_payment_validation.js |  1 +
 .../static/tests/tours/online_payment_tour.js | 20 +++++++++++++++++++
 .../pos_online_payment/tests/test_frontend.py |  9 +++++++++
 6 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
index 11769c53c618c..16b0aede1742c 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
@@ -373,7 +373,7 @@ export function clickPartnerButton() {
         },
         {
             content: "partner screen is shown",
-            trigger: `.modal ${PartnerList.clickPartner().trigger}`,
+            trigger: `${PartnerList.clickPartner().trigger}`,
         },
     ];
 }
diff --git a/addons/pos_online_payment/models/pos_order.py b/addons/pos_online_payment/models/pos_order.py
index caedcb4dc142c..f47aed575a332 100644
--- a/addons/pos_online_payment/models/pos_order.py
+++ b/addons/pos_online_payment/models/pos_order.py
@@ -66,3 +66,13 @@ def _get_checked_next_online_payment_amount(self):
         self.ensure_one()
         amount = self.next_online_payment_amount
         return amount if self._check_next_online_payment_amount(amount) else False
+
+    @api.model
+    def _process_order(self, order, existing_order):
+        draft = order.get('state') == 'draft'
+        pos_session = self.env['pos.session'].browse(order['session_id'])
+        online_payment_methods = pos_session.config_id.payment_method_ids.filtered('is_online_payment')
+        if draft and online_payment_methods:
+            # online payment lines should not be created in draft orders
+            order['payment_ids'] = [payment for payment in order.get('payment_ids', []) if payment[0] not in [0, 1] or (payment[2].get('payment_method_id') not in online_payment_methods.ids)]
+        return super()._process_order(order, existing_order)
diff --git a/addons/pos_online_payment/models/pos_payment.py b/addons/pos_online_payment/models/pos_payment.py
index fac04eb99e3eb..c4c76dd8176b5 100644
--- a/addons/pos_online_payment/models/pos_payment.py
+++ b/addons/pos_online_payment/models/pos_payment.py
@@ -20,7 +20,7 @@ def create(self, vals_list):
             pm_id = vals['payment_method_id']
             if pm_id not in online_account_payments_by_pm:
                 online_account_payments_by_pm[pm_id] = set()
-            online_account_payments_by_pm[pm_id].add(vals.get('online_account_payment_id'))
+            online_account_payments_by_pm[pm_id].add(vals.get('online_account_payment_id') or None)
 
         opms_read_id = self.env['pos.payment.method'].search_read(['&', ('id', 'in', list(online_account_payments_by_pm.keys())), ('is_online_payment', '=', True)], ["id"])
         opms_id = {opm_read_id['id'] for opm_read_id in opms_read_id}
diff --git a/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js b/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
index d112dd018e089..7350238fb4294 100644
--- a/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
+++ b/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
@@ -105,6 +105,7 @@ patch(OrderPaymentValidation.prototype, {
                         return false;
                     }
 
+                    await this.pos.syncAllOrders({ orders: [this.order] });
                     onlinePaymentLine.setPaymentStatus("waiting");
                     this.order.selectPaymentline(onlinePaymentLine);
                     const onlinePaymentData = {
diff --git a/addons/pos_online_payment/static/tests/tours/online_payment_tour.js b/addons/pos_online_payment/static/tests/tours/online_payment_tour.js
index 6d5c34d832d56..45d49e4766d5c 100644
--- a/addons/pos_online_payment/static/tests/tours/online_payment_tour.js
+++ b/addons/pos_online_payment/static/tests/tours/online_payment_tour.js
@@ -58,3 +58,23 @@ registry.category("web_tour.tours").add("OnlinePaymentErrorsTour", {
             Dialog.confirm(),
         ].flat(),
 });
+
+registry.category("web_tour.tours").add("test_selected_customer_after_adding_payment_sync", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            ProductScreen.addOrderline("Letter Tray", "10"),
+            ProductScreen.selectedOrderlineHas("Letter Tray", "10.0"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.totalIs("48.0"),
+            PaymentScreen.emptyPaymentlines("48.0"),
+            PaymentScreen.clickPaymentMethod("Online payment"),
+            PaymentScreen.selectedPaymentlineHas("Online payment", "48.0"),
+            PaymentScreen.clickPartnerButton(),
+            PaymentScreen.clickCustomer("A simple PoS man!"),
+            PaymentScreen.validateButtonIsHighlighted(true),
+            PaymentScreen.clickValidate(),
+            Dialog.is("Scan to Pay"),
+        ].flat(),
+});
diff --git a/addons/pos_online_payment/tests/test_frontend.py b/addons/pos_online_payment/tests/test_frontend.py
index 833b7a1f678ba..e992a52690d2c 100644
--- a/addons/pos_online_payment/tests/test_frontend.py
+++ b/addons/pos_online_payment/tests/test_frontend.py
@@ -328,6 +328,15 @@ def test_refuse_online_payment_without_accounting_payment(self):
             session.action_pos_session_close()
             self.assertEqual(session.state, 'closed')
 
+    def test_selected_customer_after_adding_payment_sync(self):
+        """ Test that the selected customer is kept after adding an online payment."""
+        self.pos_config.with_user(self.pos_admin).open_ui()
+        self.start_pos_tour('test_selected_customer_after_adding_payment_sync', login="pos_admin")
+        order = self.pos_config.current_session_id.order_ids.sorted(lambda o: o.id, reverse=True)[0]
+        self.assertEqual(order.partner_id.name, "A simple PoS man!", "The selected customer was not kept after adding an online payment.")
+        self.assertEqual(order.state, "draft", "The order should still be in draft state.")
+        self.assertEqual(len(order.payment_ids), 0, "There should be no payment line in the order.")
+
     @classmethod
     def tearDownClass(cls):
         # Restore company values after the tests

From d6364f5413e12fce01da31a5b0d1f9d109e085d4 Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Thu, 23 Oct 2025 11:08:07 +0000
Subject: [PATCH 086/673] [FIX] point_of_sale: allow searching product with
 dynamic attribute

Before this commit, it was not possible to search a product that had a
dynamic attribute configured on its template, since no product variant
was created yet.

opw-5188725

closes odoo/odoo#233987

X-original-commit: 05920709a26b4d78e0476b8ebd57d7b02ed21247
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 .../static/src/app/models/product_template.js             | 8 ++++++++
 addons/point_of_sale/static/src/app/services/pos_store.js | 8 ++++++--
 .../static/tests/pos/tours/product_configurator_tour.js   | 5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/app/models/product_template.js b/addons/point_of_sale/static/src/app/models/product_template.js
index 779c1340a865e..34e23c0e5f408 100644
--- a/addons/point_of_sale/static/src/app/models/product_template.js
+++ b/addons/point_of_sale/static/src/app/models/product_template.js
@@ -127,5 +127,13 @@ export class ProductTemplate extends ProductTemplateAccounting {
     get canBeDisplayed() {
         return this.active && this.available_in_pos;
     }
+
+    get searchString() {
+        const fields = ["name", "default_code", "barcode"];
+        return fields
+            .map((field) => this[field] || "")
+            .filter(Boolean)
+            .join(" ");
+    }
 }
 registry.category("pos_available_models").add(ProductTemplate.pythonModel, ProductTemplate);
diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index 97945edc8d73f..026f9c2c4cf7a 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -2622,8 +2622,12 @@ export class PosStore extends WithLazyGetterTrap {
 
     getProductsBySearchWord(searchWord, products) {
         const words = normalize(searchWord);
-        const matches = products.filter((p) =>
-            p.product_variant_ids.some((variant) => normalize(variant.searchString).includes(words))
+        const matches = products.filter(
+            (p) =>
+                normalize(p.searchString).includes(words) ||
+                p.product_variant_ids.some((variant) =>
+                    normalize(variant.searchString).includes(words)
+                )
         );
 
         return this.sortByWordIndex(matches, words);
diff --git a/addons/point_of_sale/static/tests/pos/tours/product_configurator_tour.js b/addons/point_of_sale/static/tests/pos/tours/product_configurator_tour.js
index c051c7e009c81..0d4b842c63f39 100644
--- a/addons/point_of_sale/static/tests/pos/tours/product_configurator_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/product_configurator_tour.js
@@ -6,6 +6,7 @@ import * as combo from "@point_of_sale/../tests/pos/tours/utils/combo_popup_util
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
 import { inLeftSide } from "@point_of_sale/../tests/pos/tours/utils/common";
 import { registry } from "@web/core/registry";
+import { negateStep } from "@point_of_sale/../tests/generic_helpers/utils";
 
 registry.category("web_tour.tours").add("ProductConfiguratorTour", {
     steps: () =>
@@ -107,6 +108,10 @@ registry.category("web_tour.tours").add("PosProductWithDynamicAttributes", {
         [
             Chrome.startPoS(),
             Dialog.confirm("Open Register"),
+            ProductScreen.searchProduct("Non Existing Product"),
+            ProductScreen.productIsDisplayed("Dynamic Product").map(negateStep),
+            ProductScreen.searchProduct("Dynamic Product"),
+            ProductScreen.productIsDisplayed("Dynamic Product"),
             ProductScreen.clickDisplayedProduct("Dynamic Product"),
             ProductConfigurator.pickRadio("Test 1"),
             Dialog.confirm(),

From 501f0cc8a06942bb665fc402d079baae6a672e82 Mon Sep 17 00:00:00 2001
From: Khumam Alzagim <alkh@odoo.com>
Date: Fri, 24 Oct 2025 07:14:11 +0000
Subject: [PATCH 087/673] [FIX] l10n_tr_nilvera_einvoice: refresh BytesIO for
 file resubmission

Resubmitting a Nilvera document reused the same XML stream, leading to
an empty file on retries. The issue occurs because `requests.Session.
request()` reads the BytesIO buffer, moving its cursor to the end of
the file. As a result, subsequent reads return empty content. This fix
wraps the XML content in a new BytesIO buffer before each submission
to ensure safe recursive resubmissions and prevent 400 errors caused
by empty payloads.

task-5163253

closes odoo/odoo#233979

X-original-commit: 7202ac8c256130a1b9d69ca138a3bf2d91b0ed0a
Signed-off-by: Ali Alfie (alal) <alal@odoo.com>
---
 addons/l10n_tr_nilvera_einvoice/models/account_move.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_tr_nilvera_einvoice/models/account_move.py b/addons/l10n_tr_nilvera_einvoice/models/account_move.py
index 7c2f44de162e2..d0fd297411822 100644
--- a/addons/l10n_tr_nilvera_einvoice/models/account_move.py
+++ b/addons/l10n_tr_nilvera_einvoice/models/account_move.py
@@ -135,6 +135,7 @@ def _l10n_tr_nilvera_submit_document(self, xml_file, endpoint, post_series=True)
                 # If the sequence/series is not found on Nilvera, add it then retry.
                 if 3009 in error_codes and post_series:
                     self._l10n_tr_nilvera_post_series(endpoint, client)
+                    xml_file.seek(0)    # reset stream before retry, as previous POST moved the buffer to the EOF
                     return self._l10n_tr_nilvera_submit_document(xml_file, endpoint, post_series=False)
                 raise UserError(error_message)
             elif response.status_code == 500:

From 8606e8fe54acffcdb263c680fb83ff1bd68346ff Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <huvw@odoo.com>
Date: Thu, 2 Oct 2025 12:37:25 +0000
Subject: [PATCH 088/673] [FIX] base_import: reset start line after test import

Steps to reproduce
==================

- Go to contacts
- Click on the cog menu > Import records
- Upload a csv file
- Limit the batch limit to a value lower than the total number of
  records in the csv file
- Click on the test button
- Click on the Import button

=> Only the last batch is imported

Cause of the issue
==================

The start line is not reset after the test import, which can be confusing

Solution
========

When the test import fully succeeds, we reset the start line

opw-4916102

closes odoo/odoo#233984

X-original-commit: 61e829d11e146b65e99620dfb68f4af769da7cba
Signed-off-by: Luca Vitali (luvi) <luvi@odoo.com>
Signed-off-by: Hubert Van De Walle <huvw@odoo.com>
---
 addons/base_import/static/src/import_model.js |  3 +-
 .../static/tests/import_action.test.js        | 42 +++++++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/addons/base_import/static/src/import_model.js b/addons/base_import/static/src/import_model.js
index 49d91bc706276..c879d9eb70de1 100644
--- a/addons/base_import/static/src/import_model.js
+++ b/addons/base_import/static/src/import_model.js
@@ -290,7 +290,7 @@ export class BaseImportModel {
         }
 
         if (!importRes.hasError) {
-            if (importRes.nextrow) {
+            if (!isTest && importRes.nextrow) {
                 this._addMessage("warning", [
                     _t(
                         "Click 'Resume' to proceed with the import, resuming at line %s.",
@@ -301,6 +301,7 @@ export class BaseImportModel {
             }
             if (isTest) {
                 this._addMessage("info", [_t("Everything seems valid.")]);
+                this.setOption("skip", 0);
             }
         } else {
             importRes.nextrow = startRow;
diff --git a/addons/base_import/static/tests/import_action.test.js b/addons/base_import/static/tests/import_action.test.js
index d2c43323a50ef..95a1d5dd48f94 100644
--- a/addons/base_import/static/tests/import_action.test.js
+++ b/addons/base_import/static/tests/import_action.test.js
@@ -65,6 +65,8 @@ class Partner extends models.Model {
     };
 }
 
+onRpc("has_group", () => true);
+
 defineModels([Partner]);
 
 defineActions([
@@ -108,7 +110,7 @@ async function executeImport(data, shouldWait = false) {
             },
         ];
     }
-    if (data[3].skip + 1 < totalRows) {
+    if (data[3].limit + data[3].skip < totalRows) {
         res.nextrow = data[3].skip + data[3].limit;
     } else {
         res.nextrow = 0;
@@ -707,6 +709,7 @@ describe("Import view", () => {
             },
         });
 
+        redirect("/odoo/action-2")
         await mountWebClient();
         onRpc("base_import.import", "parse_preview", ({ route }) => {
             expect.step(route);
@@ -1182,6 +1185,38 @@ describe("Import view", () => {
         });
     });
 
+    test("test in batches then reset starting row", async () => {
+        patchWithCleanup(ImportAction.prototype, {
+            get isBatched() {
+                // make sure the UI displays the batched import options
+                return true;
+            },
+        });
+
+        await mountWebClient();
+        onRpc("base_import.import", "execute_import", ({ args }) => executeImport(args, true));
+        await getService("action").doAction(1);
+
+        // Set and trigger the change of a file for the input
+        const file = new File(["fake_file"], "fake_file.xls", { type: "text/plain" });
+        await contains(".o_control_panel_main_buttons .o_import_file").click();
+        await setInputFiles([file]);
+        await animationFrame();
+        await contains("input#o_import_batch_limit").edit(1);
+        await contains(".o_control_panel_main_buttons button:first").click();
+
+        await animationFrame();
+        expect("input#o_import_row_start").toHaveValue("2");
+        await animationFrame();
+        expect("input#o_import_row_start").toHaveValue("3");
+
+        await animationFrame();
+        expect(".o_import_data_content .alert-info").toHaveText("Everything seems valid.");
+        expect("input#o_import_row_start").toHaveValue("1", {
+            message: "the actual import will resume at line 1",
+        });
+    });
+
     test("relational fields correctly mapped on preview", async () => {
         await mountWebClient();
         onRpc("base_import.import", "parse_preview", ({ args }) =>
@@ -1413,6 +1448,7 @@ describe("Import view", () => {
 
     test("date format should be converted to strftime", async () => {
         let parseCount = 0;
+        redirect("/odoo/action-2")
         await mountWebClient();
         onRpc("base_import.import", "parse_preview", async ({ args }) => {
             parseCount++;
@@ -1450,9 +1486,7 @@ describe("Import view", () => {
             await contains(".o_control_panel_main_buttons button:contains(Import):eq(0)").click();
         }
         expect.verifySteps(["parse_preview", "parse_preview", "execute_import"]);
-        expect(".o_import_date_format").toHaveValue("YYYYMMDD", {
-            message: "UI displays the human formatted date",
-        });
+        await waitFor(".o_list_view");
     });
 });
 

From 782a0fc028719e0f4a401985e4848ada33cc3573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Wed, 29 Oct 2025 12:29:51 +0100
Subject: [PATCH 089/673] [IMP] mail: add favorite channels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allows user to mark channels as favorite to easily access them.

task-4113458

closes odoo/odoo#232398

Related: odoo/enterprise#97695
Related: odoo/upgrade#8667
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../discuss_app_category_model_patch.js       | 11 ---
 addons/mail/controllers/discuss/channel.py    |  6 ++
 addons/mail/data/discuss_channel_data.xml     | 14 ++-
 .../mail/demo/discuss/public_channel_demo.xml |  2 +
 .../models/discuss/discuss_channel_member.py  |  2 +
 .../core/common/channel_member_model.js       |  2 +
 .../src/discuss/core/common/thread_actions.js | 51 +++++++++++
 .../discuss_app/discuss_app_category_model.js | 12 +--
 .../discuss_app/discuss_app_model_patch.js    | 12 +++
 .../core/public_web/thread_model_patch.js     | 16 ++--
 .../tests/chat_window/chat_window.test.js     |  3 +-
 .../static/tests/discuss_app/sidebar.test.js  | 90 +++++++++++++++++++
 .../tests/mock_server/mail_mock_server.js     | 23 +++++
 .../mock_models/discuss_channel_member.js     |  8 +-
 .../tests/test_performance.py                 | 12 +++
 15 files changed, 239 insertions(+), 25 deletions(-)

diff --git a/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js b/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js
index 9bb1f72d52e3b..bd57acdff0f6e 100644
--- a/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js
@@ -1,7 +1,6 @@
 import { patch } from "@web/core/utils/patch";
 import { DiscussAppCategory } from "@mail/discuss/core/public_web/discuss_app/discuss_app_category_model";
 import { fields } from "@mail/core/common/record";
-import { compareDatetime } from "@mail/utils/common/misc";
 
 patch(DiscussAppCategory.prototype, {
     setup() {
@@ -13,14 +12,4 @@ patch(DiscussAppCategory.prototype, {
             },
         });
     },
-    /**
-     * @param {import("models").Thread} t1
-     * @param {import("models").Thread} t2
-     */
-    sortThreads(t1, t2) {
-        if (this.livechat_channel_id || this.eq(this.app?.defaultLivechatCategory)) {
-            return compareDatetime(t2.lastInterestDt, t1.lastInterestDt) || t2.id - t1.id;
-        }
-        return super.sortThreads(t1, t2);
-    },
 });
diff --git a/addons/mail/controllers/discuss/channel.py b/addons/mail/controllers/discuss/channel.py
index 99a38151d219e..1cab8034a18bb 100644
--- a/addons/mail/controllers/discuss/channel.py
+++ b/addons/mail/controllers/discuss/channel.py
@@ -24,6 +24,7 @@ def _process_request_loop(self, store: Store, fetch_params):
         channels = request.env.context["channels"]
         if channels:
             store.add(channels)
+            store.add(channels.self_member_id, ["is_favorite"])
         if request.env.context["add_channels_last_message"]:
             # fetch channels data before messages to benefit from prefetching (channel info might
             # prefetch a lot of data that message format could use)
@@ -46,6 +47,11 @@ def _process_request_for_all(self, store: Store, name, params):
         if name == "discuss.channel":
             channels = request.env["discuss.channel"].search([("id", "in", params)])
             request.update_context(channels=request.env.context["channels"] | channels)
+        if name == "/discuss/channel/favorite":
+            if member := request.env["discuss.channel.member"].search(
+                [("channel_id", "=", params["channel_id"]), ("is_self", "=", True)],
+            ):
+                member.is_favorite = params["is_favorite"]
         if name == "/discuss/get_or_create_chat":
             channel = request.env["discuss.channel"]._get_or_create_chat(
                 params["partners_to"], params.get("pin", True)
diff --git a/addons/mail/data/discuss_channel_data.xml b/addons/mail/data/discuss_channel_data.xml
index 97af6f6ada422..1a3a0c4a51f51 100644
--- a/addons/mail/data/discuss_channel_data.xml
+++ b/addons/mail/data/discuss_channel_data.xml
@@ -11,7 +11,6 @@
             <field name="name">Administrators</field>
             <field name="description">General channel for administrators.</field>
             <field name="group_public_id" ref="base.group_system"/>
-            <field name="group_ids" eval="[Command.link(ref('base.group_system'))]"/>
         </record>
 
         <!-- notify all employees of module installation -->
@@ -29,11 +28,24 @@
             <field name="partner_id" ref="base.partner_admin"/>
             <field name="channel_id" ref="mail.channel_all_employees"/>
             <field name="fetched_message_id" ref="mail.module_install_notification"/>
+            <field name="is_favorite" eval="True"/>
             <field name="seen_message_id" ref="mail.module_install_notification"/>
         </record>
 
+        <!-- link group after creating the members to avoid autosubscribe too early -->
         <record model="discuss.channel" id="mail.channel_all_employees">
             <field name="group_ids" eval="[Command.link(ref('base.group_user'))]"/>
         </record>
+
+        <record model="discuss.channel.member" id="channel_member_channel_admin_partner_admin">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="mail.channel_admin"/>
+            <field name="is_favorite" eval="True"/>
+        </record>
+
+        <!-- link group after creating the members to avoid autosubscribe too early -->
+        <record model="discuss.channel" id="mail.channel_admin">
+            <field name="group_ids" eval="[Command.link(ref('base.group_system'))]"/>
+        </record>
     </data>
 </odoo>
diff --git a/addons/mail/demo/discuss/public_channel_demo.xml b/addons/mail/demo/discuss/public_channel_demo.xml
index a366d1e3f96f4..e3dc03c7f2e5b 100644
--- a/addons/mail/demo/discuss/public_channel_demo.xml
+++ b/addons/mail/demo/discuss/public_channel_demo.xml
@@ -72,6 +72,7 @@
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="channel_id" ref="mail.channel_public_community_demo"/>
             <field name="fetched_message_id" ref="mail.channel_public_community_message_2_demo"/>
+            <field name="is_favorite" eval="True"/>
             <field name="seen_message_id" ref="mail.channel_public_community_message_2_demo"/>
             <field name="new_message_separator" eval="ref('mail.channel_public_community_message_2_demo') + 1"/>
         </record>
@@ -79,6 +80,7 @@
             <field name="guest_id" ref="mail.guest_alex_demo"/>
             <field name="channel_id" ref="mail.channel_public_community_demo"/>
             <field name="fetched_message_id" ref="mail.channel_public_community_message_1_demo"/>
+            <field name="is_favorite" eval="True"/>
             <field name="seen_message_id" ref="mail.channel_public_community_message_1_demo"/>
             <field name="new_message_separator" eval="ref('mail.channel_public_community_message_1_demo') + 1"/>
         </record>
diff --git a/addons/mail/models/discuss/discuss_channel_member.py b/addons/mail/models/discuss/discuss_channel_member.py
index b0e9448e0c78b..7b071f519dfdc 100644
--- a/addons/mail/models/discuss/discuss_channel_member.py
+++ b/addons/mail/models/discuss/discuss_channel_member.py
@@ -35,6 +35,7 @@ class DiscussChannelMember(models.Model):
     # state
     custom_channel_name = fields.Char('Custom channel name')
     fetched_message_id = fields.Many2one('mail.message', string='Last Fetched', index="btree_not_null")
+    is_favorite = fields.Boolean("Favorite")
     seen_message_id = fields.Many2one('mail.message', string='Last Seen', index="btree_not_null")
     new_message_separator = fields.Integer(help="Message id before which the separator should be displayed", default=0, required=True)
     message_unread_counter = fields.Integer('Unread Messages Counter', compute='_compute_message_unread', compute_sudo=True)
@@ -276,6 +277,7 @@ def _sync_field_names(self):
         return [
             "custom_channel_name",
             "custom_notifications",
+            "is_favorite",
             "last_interest_dt",
             "message_unread_counter",
             "mute_until_dt",
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_model.js b/addons/mail/static/src/discuss/core/common/channel_member_model.js
index a89aaedd70f4e..d8f2f00ca191a 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_model.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_model.js
@@ -23,6 +23,8 @@ export class ChannelMember extends Record {
     custom_notifications;
     /** @type {number} */
     id;
+    /** @type {boolean} */
+    is_favorite;
     is_pinned = fields.Attr(undefined, {
         compute() {
             return (
diff --git a/addons/mail/static/src/discuss/core/common/thread_actions.js b/addons/mail/static/src/discuss/core/common/thread_actions.js
index 163c76f53e65c..b8c66f1df1f98 100644
--- a/addons/mail/static/src/discuss/core/common/thread_actions.js
+++ b/addons/mail/static/src/discuss/core/common/thread_actions.js
@@ -22,6 +22,57 @@ class ChannelActionDialog extends Component {
     `;
 }
 
+registerThreadAction("set-favorite", {
+    /**
+     * @param {Object} param0
+     * @param {import("models").DiscussChannel} param0.channel
+     */
+    condition: ({ channel, owner }) =>
+        channel &&
+        channel.self_member_id &&
+        !channel.self_member_id.is_favorite &&
+        !owner.isDiscussContent,
+    icon: "fa fa-fw fa-star",
+    name: _t("Set favorite"),
+    /**
+     * @param {Object} param0
+     * @param {import("models").DiscussChannel} param0.channel
+     * @param {import("models").Store} param0.store
+     */
+    onSelected: async ({ channel, store }) => {
+        store.fetchStoreData(
+            "/discuss/channel/favorite",
+            { channel_id: channel.id, is_favorite: true },
+            { readonly: false, silent: false }
+        );
+    },
+    sequence: 5, // before notification-settings
+    sequenceGroup: 30,
+});
+registerThreadAction("unset-favorite", {
+    /**
+     * @param {Object} param0
+     * @param {import("models").DiscussChannel} param0.channel
+     */
+    condition: ({ channel, owner }) =>
+        channel?.self_member_id?.is_favorite && !owner.isDiscussContent,
+    icon: "fa fa-fw fa-star-o",
+    name: _t("Unset favorite"),
+    /**
+     * @param {Object} param0
+     * @param {import("models").DiscussChannel} param0.channel
+     * @param {import("models").Store} param0.store
+     */
+    onSelected: async ({ channel, store }) => {
+        store.fetchStoreData(
+            "/discuss/channel/favorite",
+            { channel_id: channel.id, is_favorite: false },
+            { readonly: false, silent: false }
+        );
+    },
+    sequence: 5, // before notification-settings
+    sequenceGroup: 30,
+});
 registerThreadAction("notification-settings", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: NotificationSettings,
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js
index f0af70cd33183..471c3259b4658 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js
@@ -30,12 +30,14 @@ export class DiscussAppCategory extends Record {
      * @param {import("models").Thread} t2
      */
     sortThreads(t1, t2) {
-        if (this.id === "channels") {
-            return String.prototype.localeCompare.call(t1.name, t2.name);
-        }
-        if (this.id === "chats") {
-            return compareDatetime(t2.lastInterestDt, t1.lastInterestDt) || t2.id - t1.id;
+        if (["channels", "favorites"].includes(this.id) || this.discussCategoryAsAppCategory) {
+            return (
+                (t1.displayName &&
+                    String.prototype.localeCompare.call(t1.displayName, t2.displayName)) ||
+                t2.id - t1.id
+            );
         }
+        return compareDatetime(t2.lastInterestDt, t1.lastInterestDt) || t2.id - t1.id;
     }
 
     get isVisible() {
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
index 9630055467530..ebba0db2d2e3c 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
@@ -34,6 +34,18 @@ const discussAppPatch = {
             },
             eager: true,
         });
+        this.favoriteCategory = fields.One("DiscussAppCategory", {
+            compute() {
+                return {
+                    extraClass: "o-mail-DiscussSidebarCategory-favorite",
+                    hideWhenEmpty: true,
+                    icon: "fa fa-star",
+                    id: "favorites",
+                    name: _t("Favorites"),
+                    sequence: 5,
+                };
+            },
+        });
         this.unreadChannels = fields.Many("mail.thread", { inverse: "appAsUnreadChannels" });
     },
     computeChatCategory() {
diff --git a/addons/mail/static/src/discuss/core/public_web/thread_model_patch.js b/addons/mail/static/src/discuss/core/public_web/thread_model_patch.js
index 2a23a95b9af9e..6cfb4f5ea9c63 100644
--- a/addons/mail/static/src/discuss/core/public_web/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/public_web/thread_model_patch.js
@@ -24,6 +24,16 @@ const threadPatch = {
         });
         this.discussAppCategory = fields.One("DiscussAppCategory", {
             compute() {
+                if (this.channel?.self_member_id?.is_favorite) {
+                    return this.store.discuss.favoriteCategory;
+                }
+                if (this.channel?.parent_channel_id) {
+                    return;
+                }
+                if (this.channel?.discuss_category_id) {
+                    return this.channel.discuss_category_id.appCategory;
+                }
+                // channel_type based categorization (including overrides) comes last
                 return this._computeDiscussAppCategory();
             },
         });
@@ -55,12 +65,6 @@ const threadPatch = {
         return !this.parent_channel_id && super.canLeave;
     },
     _computeDiscussAppCategory() {
-        if (this.parent_channel_id) {
-            return;
-        }
-        if (this.channel?.discuss_category_id) {
-            return this.channel.discuss_category_id.appCategory;
-        }
         if (["group", "chat"].includes(this.channel?.channel_type)) {
             return this.store.discuss.chatCategory;
         }
diff --git a/addons/mail/static/tests/chat_window/chat_window.test.js b/addons/mail/static/tests/chat_window/chat_window.test.js
index 8ebe39afc3684..361257a0fa217 100644
--- a/addons/mail/static/tests/chat_window/chat_window.test.js
+++ b/addons/mail/static/tests/chat_window/chat_window.test.js
@@ -117,7 +117,7 @@ test("chat window: basic rendering", async () => {
     // dropdown requires an extra delay before click (because handler is registered in useEffect)
     await contains("[title='Open Actions Menu']");
     await click("[title='Open Actions Menu']");
-    await contains(".o-dropdown-item", { count: 11 });
+    await contains(".o-dropdown-item", { count: 12 });
     await contains(".o-dropdown-item", { text: "Open in Discuss" });
     await contains(".o-dropdown-item", { text: "Attachments" });
     await contains(".o-dropdown-item", { text: "Pinned Messages" });
@@ -127,6 +127,7 @@ test("chat window: basic rendering", async () => {
     await contains(".o-dropdown-item", { text: "Search Messages" });
     await contains(".o-dropdown-item", { text: "Rename Thread" });
     await contains(".o-dropdown-item", { text: "Notification Settings" });
+    await contains(".o-dropdown-item", { text: "Set favorite" });
     await contains(".o-dropdown-item", { text: "Call Settings" });
     await contains(".o-dropdown-item", { text: "Leave Channel" });
 });
diff --git a/addons/mail/static/tests/discuss_app/sidebar.test.js b/addons/mail/static/tests/discuss_app/sidebar.test.js
index 07e858b83d104..c1e4e5326b4b0 100644
--- a/addons/mail/static/tests/discuss_app/sidebar.test.js
+++ b/addons/mail/static/tests/discuss_app/sidebar.test.js
@@ -591,6 +591,76 @@ test("chat - counter: should have correct value of unread threads if category is
     });
 });
 
+test("favorite channels should be ordered case insensitive alphabetically", async () => {
+    const pyEnv = await startServer();
+    pyEnv["discuss.channel"].create([
+        {
+            name: "Xyz",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+        {
+            name: "abc",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+        {
+            name: "Abc",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+        {
+            name: "Est",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+        {
+            name: "Xyz",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+        {
+            name: "Équipe",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+        {
+            name: "époque",
+            channel_member_ids: [
+                Command.create({ is_favorite: true, partner_id: serverState.partnerId }),
+            ],
+        },
+    ]);
+    await start();
+    await openDiscuss();
+    await contains(".o-mail-DiscussSidebarChannel", {
+        text: "abc",
+        before: [".o-mail-DiscussSidebarChannel", { text: "Abc" }],
+    });
+    await contains(".o-mail-DiscussSidebarChannel", {
+        text: "Abc",
+        before: [".o-mail-DiscussSidebarChannel", { text: "époque" }],
+    });
+    await contains(".o-mail-DiscussSidebarChannel", {
+        text: "époque",
+        before: [".o-mail-DiscussSidebarChannel", { text: "Équipe" }],
+    });
+    await contains(".o-mail-DiscussSidebarChannel", {
+        text: "Équipe",
+        before: [".o-mail-DiscussSidebarChannel", { text: "Est" }],
+    });
+    await contains(".o-mail-DiscussSidebarChannel", {
+        text: "Est",
+        before: [".o-mail-DiscussSidebarChannel", { text: "Xyz", count: 2 }],
+    });
+});
+
 test("sidebar channels should be ordered case insensitive alphabetically", async () => {
     const pyEnv = await startServer();
     pyEnv["discuss.channel"].create([
@@ -1082,3 +1152,23 @@ test("Sidebar channels show correct notification counter based on settings", asy
     await contains(".o-mail-DiscussSidebarChannel:contains(Mentions) .badge", { count: 0 });
     await contains(".o-mail-DiscussSidebarChannel:contains(Regular) .badge", { count: 0 });
 });
+
+test("add and remove channel from favorites updates sidebar", async () => {
+    const pyEnv = await startServer();
+    pyEnv["discuss.channel"].create({
+        name: "General",
+        channel_type: "channel",
+    });
+    const channelContainerSelector =
+        ".o-mail-DiscussSidebarCategory-channel + .o-mail-DiscussSidebarChannel-container";
+    const favoriteContainerSelector =
+        ".o-mail-DiscussSidebarCategory-favorite + .o-mail-DiscussSidebarChannel-container";
+    const generalChannelSelector = ".o-mail-DiscussSidebarChannel:has(:contains(/^General$/))";
+    await start();
+    await openDiscuss();
+    await click(`${channelContainerSelector} ${generalChannelSelector} button .oi-ellipsis-h`);
+    await click(".o-dropdown-item:contains('Set favorite')");
+    await click(`${favoriteContainerSelector} ${generalChannelSelector} button .oi-ellipsis-h`);
+    await click(".o-dropdown-item:contains('Unset favorite')");
+    await contains(`${channelContainerSelector} ${generalChannelSelector}`);
+});
diff --git a/addons/mail/static/tests/mock_server/mail_mock_server.js b/addons/mail/static/tests/mock_server/mail_mock_server.js
index f105c37db16d5..45c1218dd89cb 100644
--- a/addons/mail/static/tests/mock_server/mail_mock_server.js
+++ b/addons/mail/static/tests/mock_server/mail_mock_server.js
@@ -1082,6 +1082,20 @@ function _process_request_for_all(store, name, params, context = {}) {
             makeKwArgs({ for_current_user: true })
         );
         store.add(channels);
+        store.add(
+            DiscussChannelMember.browse(
+                channels
+                    .map(
+                        (channel) =>
+                            DiscussChannelMember._filter([
+                                ["channel_id", "=", channel.id],
+                                ["is_self", "=", true],
+                            ])[0]
+                    )
+                    .map((channelMember) => channelMember.id)
+            ),
+            ["is_favorite"]
+        );
     }
     if (name === "mail.thread") {
         store.add(
@@ -1099,6 +1113,15 @@ function _process_request_for_all(store, name, params, context = {}) {
             store.add(channel, makeKwArgs({ delete: true }));
         }
     }
+    if (name === "/discuss/channel/favorite") {
+        const memberIds = DiscussChannelMember.search([
+            ["channel_id", "=", params.channel_id],
+            ["is_self", "=", true],
+        ]);
+        if (memberIds.length) {
+            DiscussChannelMember.write(memberIds, { is_favorite: params.is_favorite });
+        }
+    }
     if (name === "/discuss/get_or_create_chat") {
         const channelId = DiscussChannel._get_or_create_chat(params.partners_to);
         store.add(channelId).resolve_data_request({
diff --git a/addons/mail/static/tests/mock_server/mock_models/discuss_channel_member.js b/addons/mail/static/tests/mock_server/mock_models/discuss_channel_member.js
index 59c01b36f4601..bded87f3a3dd3 100644
--- a/addons/mail/static/tests/mock_server/mock_models/discuss_channel_member.js
+++ b/addons/mail/static/tests/mock_server/mock_models/discuss_channel_member.js
@@ -74,7 +74,13 @@ export class DiscussChannelMember extends models.ServerModel {
     }
 
     _sync_field_names() {
-        return ["last_interest_dt", "message_unread_counter", "new_message_separator", "unpin_dt"];
+        return [
+            "is_favorite",
+            "last_interest_dt",
+            "message_unread_counter",
+            "new_message_separator",
+            "unpin_dt",
+        ];
     }
 
     /**
diff --git a/addons/test_discuss_full/tests/test_performance.py b/addons/test_discuss_full/tests/test_performance.py
index dabde07147770..08f7312da6ac8 100644
--- a/addons/test_discuss_full/tests/test_performance.py
+++ b/addons/test_discuss_full/tests/test_performance.py
@@ -926,6 +926,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 1,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -945,6 +946,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": last_message.id,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -964,6 +966,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": last_message.id,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -983,6 +986,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": last_message_of_partner_0.id,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1008,6 +1012,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": last_message.id,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1027,6 +1032,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1056,6 +1062,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1085,6 +1092,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1114,6 +1122,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1143,6 +1152,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
                 "message_unread_counter_bus_id": bus_last_id,
@@ -1172,6 +1182,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "livechat_member_type": "agent",
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 0,
@@ -1203,6 +1214,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
                 "custom_notifications": False,
                 "fetched_message_id": False,
                 "id": member_0.id,
+                "is_favorite": False,
                 "livechat_member_type": "agent",
                 "last_interest_dt": member_0_last_interest_dt,
                 "message_unread_counter": 1,

From bb1d1b29c8b860065671edbcf8a788559b304838 Mon Sep 17 00:00:00 2001
From: nees-odoo <nees@odoo.com>
Date: Fri, 10 Oct 2025 05:58:49 +0000
Subject: [PATCH 090/673] [FIX] mail: prevent traceback on adding reaction from
 pinned message panel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Purpose of this Commit:
Prevent traceback occurs on pinned panel

Steps to reproduce:
- Send any message to the channel
- Add a reaction
- Pin that message
- Go to the pinned message panel
- Try adding a reaction again

Before this commit, when a user tries to add a reaction from the pinned panel,
it throws an error because `env.getCurrentThread` is not defined in that
environment and is called unconditionally.

This commit ensures `env.getCurrentThread` is only accessed if it is defined,
preventing the error in contexts where the thread environment is not available.

task-5153215

closes odoo/odoo#234043

X-original-commit: 0deaf92e9a2f8607bd5e286c51a1e89b78bcaccc
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../src/core/common/quick_reaction_menu.js    |  2 +-
 .../message_pin/pinned_messages.test.js       | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/core/common/quick_reaction_menu.js b/addons/mail/static/src/core/common/quick_reaction_menu.js
index a0b3b3ba24313..ad4dec07a7233 100644
--- a/addons/mail/static/src/core/common/quick_reaction_menu.js
+++ b/addons/mail/static/src/core/common/quick_reaction_menu.js
@@ -37,7 +37,7 @@ export class QuickReactionMenu extends Component {
         this.dropdown = useState(
             useDropdownState({
                 onClose: () => {
-                    const currentThread = this.env.getCurrentThread();
+                    const currentThread = this.env.getCurrentThread?.();
                     if (!currentThread || currentThread.notEq(this.props.message.thread)) {
                         return;
                     }
diff --git a/addons/mail/static/tests/discuss/message_pin/pinned_messages.test.js b/addons/mail/static/tests/discuss/message_pin/pinned_messages.test.js
index 36b2a84963564..938d93b45d4d1 100644
--- a/addons/mail/static/tests/discuss/message_pin/pinned_messages.test.js
+++ b/addons/mail/static/tests/discuss/message_pin/pinned_messages.test.js
@@ -123,3 +123,23 @@ test("Jump to message from notification", async () => {
     await click(".o_mail_notification a", { text: "message" });
     await contains(".o-mail-Thread", { count: 0, scroll: "bottom" });
 });
+
+test("can add reactions from pinned panel", async () => {
+    const pyEnv = await startServer();
+    const channelId = pyEnv["discuss.channel"].create({ name: "General" });
+    pyEnv["mail.message"].create({
+        body: "Hello world!",
+        model: "discuss.channel",
+        res_id: channelId,
+        pinned_at: "2025-10-09 11:15:04",
+    });
+    await start();
+    await openDiscuss(channelId);
+    await click(".o-mail-Message-actions [title='Add a Reaction']");
+    await click(".o-mail-QuickReactionMenu button", { text: "👍" });
+    await contains(".o-mail-MessageReaction", { text: "👍1" });
+    await click(".o-mail-DiscussContent-header button[title='Pinned Messages']");
+    await click(".o-discuss-PinnedMessagesPanel .o-mail-Message [title='Add a Reaction']");
+    await click(".o-mail-QuickReactionMenu button", { text: "👍" });
+    await contains(".o-mail-MessageReaction", { count: 0 });
+});

From b620b2093965f0d22ced4492801a19ab87034f4a Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Mon, 27 Oct 2025 16:06:35 +0000
Subject: [PATCH 091/673] [FIX] point_of_sale: Auto-trigger IndexedDB upgrade
 for missing tables

Currently, new IndexedDB object stores are only created during the
'onupgradeneeded' event. This event only fires if the database version
is manually incremented in the code.

If a new module (e.g., restaurant) adds a new object store to the
PoS database schema but the `dbVersion` is not bumped, the store is
never created. This causes the PoS session to fail when it tries to
access the missing store.

This commit modifies the `databaseEventListener` to add a check
inside the `onsuccess` handler. After the database opens, it compares
the list of required stores (`this.dbStores`) with the list of
existing stores (`this.db.objectStoreNames`).

If a mismatch is detected:
1. The current database connection is closed.
2. The `dbVersion` is incremented.
3. The database connection process is re-run.

This forces the `onupgradeneeded` event to trigger, which then
correctly creates the missing object stores, ensuring the database
schema is always up-to-date.

opw-5166049

closes odoo/odoo#234049

X-original-commit: b6e8f442cb8e7f35f2d38423fb342d6b5893d012
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 .../static/src/app/models/utils/indexed_db.js | 40 ++++++++++++++++++-
 .../static/src/app/services/data_service.js   |  3 +-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/static/src/app/models/utils/indexed_db.js b/addons/point_of_sale/static/src/app/models/utils/indexed_db.js
index a9a69f4235d05..6d55028371924 100644
--- a/addons/point_of_sale/static/src/app/models/utils/indexed_db.js
+++ b/addons/point_of_sale/static/src/app/models/utils/indexed_db.js
@@ -29,7 +29,12 @@ export default class IndexedDB {
         }
 
         this.dbInstance = indexedDB;
-        const dbInstance = indexedDB.open(this.dbName, this.dbVersion);
+        let dbInstance;
+        if (this.dbVersion) {
+            dbInstance = indexedDB.open(this.dbName, this.dbVersion);
+        } else {
+            dbInstance = indexedDB.open(this.dbName);
+        }
         dbInstance.onerror = (event) => {
             logPosMessage(
                 "IndexedDB",
@@ -40,6 +45,39 @@ export default class IndexedDB {
         };
         dbInstance.onsuccess = (event) => {
             this.db = event.target.result;
+
+            const actualStoreNames = this.db.objectStoreNames;
+            let needsUpgrade = false;
+
+            for (const [, storeName] of this.dbStores) {
+                if (!actualStoreNames.contains(storeName)) {
+                    logPosMessage(
+                        "IndexedDB",
+                        "onsuccess",
+                        `Schema mismatch: Store '${storeName}' is missing. Triggering upgrade.`,
+                        CONSOLE_COLOR
+                    );
+                    needsUpgrade = true;
+                    break;
+                }
+            }
+
+            if (needsUpgrade) {
+                const newVersion = this.db.version + 1;
+                this.db.close();
+                this.dbVersion = newVersion;
+
+                logPosMessage(
+                    "IndexedDB",
+                    "onsuccess",
+                    `Upgrading from v${newVersion - 1} to v${newVersion}...`,
+                    CONSOLE_COLOR
+                );
+
+                this.databaseEventListener(whenReady);
+                return;
+            }
+
             logPosMessage(
                 "IndexedDB",
                 "databaseEventListener",
diff --git a/addons/point_of_sale/static/src/app/services/data_service.js b/addons/point_of_sale/static/src/app/services/data_service.js
index 261f858ef2581..65871ae4d2f6f 100644
--- a/addons/point_of_sale/static/src/app/services/data_service.js
+++ b/addons/point_of_sale/static/src/app/services/data_service.js
@@ -14,7 +14,6 @@ import DeviceIdentifierSequence from "../utils/devices_identifier_sequence";
 import { logPosMessage } from "../utils/pretty_console_log";
 
 const { DateTime } = luxon;
-const INDEXED_DB_VERSION = 1;
 const CONSOLE_COLOR = "#28ffeb";
 
 export class PosData extends Reactive {
@@ -150,7 +149,7 @@ export class PosData extends Reactive {
         });
 
         return new Promise((resolve) => {
-            this.indexedDB = new IndexedDB(this.databaseName, INDEXED_DB_VERSION, models, resolve);
+            this.indexedDB = new IndexedDB(this.databaseName, false, models, resolve);
         });
     }
 

From 760082c02d9fb1f57a2c616e6140b2245d14f71d Mon Sep 17 00:00:00 2001
From: Andrew Gavgavian <andg@odoo.com>
Date: Fri, 31 Oct 2025 11:18:28 -0700
Subject: [PATCH 092/673] [FIX] pos{,_restaurant}_stripe: fix tip after payment

Since [^1], tip after payment has been broken for stripe as
_update_payment_line_for_tip is no longer called anywhere. This means
that all payments were put in as uncaptured and no future tipping would
work.

This PR fixes it by using the "new" sendPaymentAdjust method like
ayden to guarantee the payments are properly handled.
opw-5121568

[^1]: 9c37f42ef4e23372f5e2bdbb956b625b3a47d8e1

closes odoo/odoo#234037

X-original-commit: 4495be9d7ac2f2fe330dbcddb5abd20afa1726e0
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Andrew Gavgavian (andg) <andg@odoo.com>
---
 addons/pos_restaurant_stripe/__init__.py                  | 1 -
 .../static/src/overrides/models/payment_stripe.js         | 8 ++++++++
 addons/pos_stripe/models/pos_payment_method.py            | 4 +++-
 addons/pos_stripe/static/src/app/payment_stripe.js        | 8 ++++++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/pos_restaurant_stripe/__init__.py b/addons/pos_restaurant_stripe/__init__.py
index 67dee8c60dbf8..a449448a63f7d 100644
--- a/addons/pos_restaurant_stripe/__init__.py
+++ b/addons/pos_restaurant_stripe/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
diff --git a/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js b/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js
index 52aa0d36cba03..540f4ab26ab61 100644
--- a/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js
+++ b/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js
@@ -10,6 +10,14 @@ patch(PaymentStripe.prototype, {
         }
     },
 
+    async sendPaymentAdjust(uuid) {
+        var order = this.pos.getOrder();
+        var line = order.getPaymentlineByUuid(uuid);
+        this.capturePayment(line.transaction_id, line.amount, {
+            stripe_currency_rounding: line.currency_id.rounding,
+        });
+    },
+
     canBeAdjusted(uuid) {
         var order = this.pos.getOrder();
         var line = order.getPaymentlineByUuid(uuid);
diff --git a/addons/pos_stripe/models/pos_payment_method.py b/addons/pos_stripe/models/pos_payment_method.py
index d3971dd4c3dc2..981ab0665ef66 100644
--- a/addons/pos_stripe/models/pos_payment_method.py
+++ b/addons/pos_stripe/models/pos_payment_method.py
@@ -109,8 +109,10 @@ def stripe_capture_payment(self, paymentIntentId, amount=None):
 
         data = None
         if amount is not None:
+            # No rounding values stored in a model method
+            rounding = self.env.context.get('stripe_currency_rounding', 0.01)
             data = {
-                "amount_to_capture": self._stripe_calculate_amount(amount),
+                "amount_to_capture": round(amount / rounding),
             }
 
         return self.sudo()._get_stripe_payment_provider()._send_api_request('POST', endpoint, data=data)
diff --git a/addons/pos_stripe/static/src/app/payment_stripe.js b/addons/pos_stripe/static/src/app/payment_stripe.js
index f7ddc9e22e568..8b144b439f97e 100644
--- a/addons/pos_stripe/static/src/app/payment_stripe.js
+++ b/addons/pos_stripe/static/src/app/payment_stripe.js
@@ -253,12 +253,16 @@ export class PaymentStripe extends PaymentInterface {
         line.transaction_id = capturePayment.id;
     }
 
-    async capturePayment(paymentIntentId) {
+    async capturePayment(paymentIntentId, amount = null, context = {}) {
         try {
             const data = await this.pos.data.silentCall(
                 "pos.payment.method",
                 "stripe_capture_payment",
-                [paymentIntentId]
+                [paymentIntentId],
+                {
+                    amount,
+                    context,
+                }
             );
             if (data.error) {
                 throw data.error;

From 659655a230c0fb012ce1e75e339b54841918ea4a Mon Sep 17 00:00:00 2001
From: "K Theja (kthe@odoo.com)" <kthe@odoo.com>
Date: Fri, 31 Oct 2025 12:26:14 +0000
Subject: [PATCH 093/673] [FIX] project: hide slider options in project sharing
 view

Steps to reproduce:

- Open any shared project from portal account.
- Open any task

Issue:

- Visible slider with Show Sub Tasks button.

Reason:

- Unwantedly added ControlPanel into FormView of Project Sharing View.
- Issue from https://github.com/odoo/odoo/pull/224203.

Fix:

- Remove the ControlPanel in Form View and extend web Control in
xml to acheive the button.

closes odoo/odoo#234052

X-original-commit: 3b0bf9dfdd5d0f2688068156a8b27b94b84b714c
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
Signed-off-by: K Theja (kthe) <kthe@odoo.com>
---
 .../search/control_panel/control_panel.xml           | 12 +++++++++++-
 .../views/form/project_sharing_form_view.js          |  2 --
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/project/static/src/project_sharing/search/control_panel/control_panel.xml b/addons/project/static/src/project_sharing/search/control_panel/control_panel.xml
index 601d8b1374f2f..6435bb3102be3 100644
--- a/addons/project/static/src/project_sharing/search/control_panel/control_panel.xml
+++ b/addons/project/static/src/project_sharing/search/control_panel/control_panel.xml
@@ -3,8 +3,18 @@
 
     <t t-inherit="project.ProjectTaskControlPanel" t-inherit-mode="extension">
         <xpath expr="//div[hasclass('o_control_panel_main_buttons')]" position="before">
-            <a class="btn btn-link" href="/my/projects" title="Go back to 'My Projects'"><i class="fa fa-arrow-left"/></a>
+            <t t-call="project.ProjectSharingControlPanelNavigationButton" />
         </xpath>
     </t>
 
+    <t t-inherit="web.ControlPanel" t-inherit-mode="extension">
+        <xpath expr="//div[hasclass('o_control_panel_main_buttons')]" position="before">
+            <t t-call="project.ProjectSharingControlPanelNavigationButton" />
+        </xpath>
+    </t>
+
+    <t t-name="project.ProjectSharingControlPanelNavigationButton">
+        <a class="btn btn-link" href="/my/projects" title="Go back to 'My Projects'"><i class="fa fa-arrow-left"/></a>
+    </t>
+
 </templates>
diff --git a/addons/project/static/src/project_sharing/views/form/project_sharing_form_view.js b/addons/project/static/src/project_sharing/views/form/project_sharing_form_view.js
index c7dbe970d31fd..29d2094ed76be 100644
--- a/addons/project/static/src/project_sharing/views/form/project_sharing_form_view.js
+++ b/addons/project/static/src/project_sharing/views/form/project_sharing_form_view.js
@@ -1,8 +1,6 @@
 import { formView } from '@web/views/form/form_view';
-import { ProjectTaskControlPanel } from "@project/views/project_task_control_panel/project_task_control_panel";
 import { ProjectSharingFormController } from './project_sharing_form_controller';
 import { ProjectSharingFormRenderer } from './project_sharing_form_renderer';
 
 formView.Controller = ProjectSharingFormController;
-formView.ControlPanel = ProjectTaskControlPanel;
 formView.Renderer = ProjectSharingFormRenderer;

From 3434845c3f41c33bc27937c8cbb76c572c4288bc Mon Sep 17 00:00:00 2001
From: bve-odoo <bve@odoo.com>
Date: Tue, 28 Oct 2025 15:50:53 +0000
Subject: [PATCH 094/673] [FIX] purchase: get currency of current order
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On the tax computation, when trying to compute the
total tax, customer was having an error
" Expected singleton: res.currency(1, 69) "

As Odoo is trying to get the currency of all the
records instead of the one in the current order

opw-5177551

closes odoo/odoo#234051

X-original-commit: a2cb6136f465e3391e3a67a9d7550d4993fdc8d7
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
Signed-off-by: Baptiste Vergote (bve) <bve@odoo.com>
---
 addons/purchase/models/purchase_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/models/purchase_order.py b/addons/purchase/models/purchase_order.py
index 2a331981cd053..17b28edaede18 100644
--- a/addons/purchase/models/purchase_order.py
+++ b/addons/purchase/models/purchase_order.py
@@ -269,7 +269,7 @@ def _compute_tax_totals(self):
                 company=order.company_id,
             )
             if order.currency_id != order.company_currency_id:
-                order.tax_totals['amount_total_cc'] = f"({formatLang(self.env, order.amount_total_cc, currency_obj=self.company_currency_id)})"
+                order.tax_totals['amount_total_cc'] = f"({formatLang(self.env, order.amount_total_cc, currency_obj=order.company_currency_id)})"
 
     @api.depends('company_id.account_fiscal_country_id', 'fiscal_position_id.country_id', 'fiscal_position_id.foreign_vat')
     def _compute_tax_country_id(self):

From ca6096e0d699835190a5e1ea3c5d5b89cacc205d Mon Sep 17 00:00:00 2001
From: "Chrysanthe (chgo)" <chgo@odoo.com>
Date: Wed, 29 Oct 2025 13:38:08 +0000
Subject: [PATCH 095/673] [FIX] mail: replace `new meeting` icon with an SVG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit replaces the `new meeting` icon (previously `oi-user-plus`)
with an SVG depicting a video call. This aims to clarify the action
performed when clicking the button, making its behavior more predictable.

task-5216140

closes odoo/odoo#233982

X-original-commit: 22160ce73b6f5346cf78c302fccf8f7a2c014e5f
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Chrysanthe Gomrée (chgo) <chgo@odoo.com>
---
 addons/mail/static/src/core/public_web/discuss_search.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/core/public_web/discuss_search.xml b/addons/mail/static/src/core/public_web/discuss_search.xml
index 21c7652024f88..e26f5407b1b50 100644
--- a/addons/mail/static/src/core/public_web/discuss_search.xml
+++ b/addons/mail/static/src/core/public_web/discuss_search.xml
@@ -42,7 +42,11 @@
         'p-2': ui.isSmall,
         'o-px-1_5 py-2': !ui.isSmall and store.discuss.isSidebarCompact,
         'o-p-1_5': !ui.isSmall and !store.discuss.isSidebarCompact,
-    }"><i class="oi fa-fw oi-user-plus"/></button>
+    }">
+        <svg width="17" height="13" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+            <path fill-rule="evenodd" clip-rule="evenodd" d="M11 0a2 2 0 0 1 2 2v4l4-4v9l-4-3v3a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h9ZM6 6H3v1h3v3h1V7h3V6H7V3H6v3Z" fill="currentColor"/>
+        </svg>
+    </button>
 </t>
 
 </templates>

From cc5919ca9bf85fa33ed56f9ddd3316e2d8879bad Mon Sep 17 00:00:00 2001
From: Orrin Zhong <orzh@odoo.com>
Date: Tue, 14 Oct 2025 22:12:31 +0000
Subject: [PATCH 096/673] [FIX] account: exclude archived res_partner_bank
 records when computing duplicate_bank_partner_ids
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a res_partner_bank record shares an acc_number with other res_partner_bank records, even archived ones, the field duplicate_bank_partner_ids still includes partners from those archived records.

As a result, the contact page shows a banner indicating other partners use the same bank account, even though those res_partner_bank records have been archived.

Steps to reproduce the issue:

1. Create a new bank account which has the same bank account number as another bank account already associated to a partner
2. Assign this new bank account to another partner
3. Archive this new bank account
4. Go to the contact page of the partner (from step 1) which has a bank account with the same bank account number as the new bank account just created
5. A banner will pop up at the top of the contact saying that this partner uses the same bank account as the partner you set on the bank account in step 2

Solution:

Add a condition to the JOIN clause that checks “other.active = TRUE” to ensure that other res_partner_bank records to search for that have the same account number are active.

Also add a condition to the WHERE clause that checks “this.active = TRUE” to ensure that the current res_partner_bank record doing the search is active itself.

opw-4967083

closes odoo/odoo#234042

X-original-commit: d49b9003ede7fc900be9d2d4c38d29bf34f14466
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/models/res_partner_bank.py               | 2 ++
 addons/account/tests/test_duplicate_res_partner_bank.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/account/models/res_partner_bank.py b/addons/account/models/res_partner_bank.py
index 87007fdb316e2..8e9506d78d7c2 100644
--- a/addons/account/models/res_partner_bank.py
+++ b/addons/account/models/res_partner_bank.py
@@ -74,8 +74,10 @@ def _compute_duplicate_bank_partner_ids(self):
                   FROM res_partner_bank this
              LEFT JOIN res_partner_bank other ON this.acc_number = other.acc_number
                                              AND this.id != other.id
+                                             AND other.active = TRUE
                  WHERE this.id = ANY(%(ids)s)
                  AND other.partner_id IS NOT NULL
+                   AND this.active = TRUE
                    AND (
                         ((this.company_id = other.company_id) OR (this.company_id IS NULL AND other.company_id IS NULL))
                         OR
diff --git a/addons/account/tests/test_duplicate_res_partner_bank.py b/addons/account/tests/test_duplicate_res_partner_bank.py
index 08cbfe0420df6..a2d0a8f91e41b 100644
--- a/addons/account/tests/test_duplicate_res_partner_bank.py
+++ b/addons/account/tests/test_duplicate_res_partner_bank.py
@@ -52,3 +52,7 @@ def test_remove_bank_account_from_partner(self):
             partner_form.bank_ids.remove(0)
 
         self.assertEqual(len(partner.bank_ids), 0)
+
+    def test_duplicate_acc_number_inactive_bank_account(self):
+        self.partner_bank_b.active = False
+        self.assertFalse(self.partner_bank_a.duplicate_bank_partner_ids)

From b7fc1eca2e6932091594a8f1a13e71b4c3572fa6 Mon Sep 17 00:00:00 2001
From: pajo <pajo@odoo.com>
Date: Tue, 7 Oct 2025 09:47:10 +0000
Subject: [PATCH 097/673] [FIX] mass_mailing: add mail contact to mail list
 through wizard

Steps to reproduce:
-------------------------
1. Install Email Marketing Module
2. Create a new Mail List
3. Go to Mailing List Contacts
4. Select multiple contacts from list and click on Add to List button
5. From wizard select the newly created list and click on Add button
6. Open one of the contact added in step 4

Observation:
-------------------------
In the Mailing Lists tab of the contact, the newly added list does not show a
Subscription Date. However, if we add the same through Add a line, the
subscription date is shown correctly.

Issue:
-------------------------
When adding contacts to a mailing list through the wizard, the code
https://github.com/odoo/odoo/blob/1e6ba783fcd898875dadb47924147688685707cf/addons/mass_mailing/wizard/mailing_contact_to_list.py#L34-L39
adds the contact using a direct database operation. This bypasses the ORM record
creation for `mailing.subscription`, so the `create_date` (subscription date) is
never set.

Solution:
-------------------------
Use Command.create on the subscription_ids field to properly create the
`mailing.subscription` records and ensure the Subscription Date is set.

opw-5055372

closes odoo/odoo#234074

X-original-commit: eb38f237c6f86137cddd876153b45eb9e64d1deb
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Joyal Patel (pajo) <pajo@odoo.com>
---
 addons/mass_mailing/tests/test_mailing_list.py   |  8 ++++++--
 .../wizard/mailing_contact_to_list.py            | 16 +++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/addons/mass_mailing/tests/test_mailing_list.py b/addons/mass_mailing/tests/test_mailing_list.py
index 064df1a34cf37..62295c3324f89 100644
--- a/addons/mass_mailing/tests/test_mailing_list.py
+++ b/addons/mass_mailing/tests/test_mailing_list.py
@@ -68,8 +68,12 @@ def test_mailing_contact_to_list(self):
         # set mailing list and add contacts
         wizard_form.mailing_list_id = mailing
         wizard = wizard_form.save()
-        action = wizard.action_add_contacts()
-        self.assertEqual(contacts.list_ids, mailing)
+        frozen_time = datetime(2025, 1, 1, 0, 0)
+        with self.mock_datetime_and_now(frozen_time):
+            action = wizard.action_add_contacts()
+            self.assertEqual(contacts.list_ids, mailing)
+            create_dates = contacts.subscription_ids.mapped('create_date')
+            self.assertTrue(all(date == frozen_time for date in create_dates), "All create dates should be equal to frozen datetime")
         self.assertEqual(action["type"], "ir.actions.client")
         self.assertTrue(action.get("params", {}).get("next"), "Should return a notification with a next action")
         subaction = action["params"]["next"]
diff --git a/addons/mass_mailing/wizard/mailing_contact_to_list.py b/addons/mass_mailing/wizard/mailing_contact_to_list.py
index ba13f4ba92ce7..c986d07197b07 100644
--- a/addons/mass_mailing/wizard/mailing_contact_to_list.py
+++ b/addons/mass_mailing/wizard/mailing_contact_to_list.py
@@ -31,13 +31,15 @@ def action_add_contacts_and_send_mailing(self):
     def _add_contacts_to_mailing_list(self, action):
         self.ensure_one()
 
-        previous_count = len(self.mailing_list_id.contact_ids)
+        contacts_to_add = self.contact_ids.filtered(lambda c: c not in self.mailing_list_id.contact_ids)
         self.mailing_list_id.write({
-            'contact_ids': [
-                (4, contact.id)
-                for contact in self.contact_ids
-                if contact not in self.mailing_list_id.contact_ids]
-            })
+            'subscription_ids': [
+                (0, 0, {
+                    'contact_id': contact.id,
+                    'list_id': self.mailing_list_id.id,
+                }) for contact in contacts_to_add
+            ]
+        })
 
         return {
             'type': 'ir.actions.client',
@@ -45,7 +47,7 @@ def _add_contacts_to_mailing_list(self, action):
             'params': {
                 'type': 'info',
                 'message': _("%s Mailing Contacts have been added. ",
-                             len(self.mailing_list_id.contact_ids) - previous_count
+                             len(contacts_to_add)
                             ),
                 'sticky': False,
                 'next': action,

From 06545b4e51fb5b71ca23abccba3e45e26d5f5962 Mon Sep 17 00:00:00 2001
From: kcv-odoo <kcv@odoo.com>
Date: Thu, 30 Oct 2025 07:00:11 +0000
Subject: [PATCH 098/673] [FIX] account: fix tax string computation issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps:
- Install account app.
- Create a branch company under the main company.
- Create a tax for the branch company.
- Add a main company tax on a product.
- Switch to branch company.

Issue:
- Tax string is not displaying on the product form even though its setting tax
from parent company on invoice line and SO line so its displaying wrong sale
price on product form.

Cause:
- After [PR] taxes are only consider from current company even though company is
branch company but in [17.0 PR] we share taxed and other accounting related data
b/w main and branch company so if branch does not it's specific tax applied on
product then it should take tax from its parent company.

Fix:
- Compute tax_string in product the way we compute tax on invoice line, SOL etc
using `_filter_taxes_by_company` method this way it'll give proper tax which will
be applied on related documents.

[PR]: https://github.com/odoo/odoo/pull/194881
[17.0 PR]: https://github.com/odoo/odoo/pull/125642

opw-5042833

closes odoo/odoo#234084

X-original-commit: 2cbebea46ca2808cf9e795cd8cd8851fb3caa6c0
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/models/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/product.py b/addons/account/models/product.py
index 6d26394f9db91..f724dd399be9c 100644
--- a/addons/account/models/product.py
+++ b/addons/account/models/product.py
@@ -96,7 +96,7 @@ def _compute_tax_string(self):
 
     def _construct_tax_string(self, price):
         currency = self.currency_id
-        res = self.taxes_id.filtered(lambda t: t.company_id == self.env.company).compute_all(
+        res = self.taxes_id._filter_taxes_by_company(self.env.company).compute_all(
             price, product=self, partner=self.env['res.partner']
         )
         joined = []

From 5f226edae0385f0df6a6c12cbd40dbbae04f0a39 Mon Sep 17 00:00:00 2001
From: Rahul Prajapati <rapr@odoo.com>
Date: Sat, 6 Sep 2025 10:58:50 +0000
Subject: [PATCH 099/673] [IMP] im_livechat: add line break when author changes
 in session history
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When converting a livechat session history into a description (e.g., for leads),
messages from different authors were shown consecutively without separation,
making it difficult to follow the conversation flow.

This commit inserts a line break whenever the message author changes,
making the transcript easier to read and providing clearer context shifts.

Task-5217172

closes odoo/odoo#234025

X-original-commit: 7dd03472e39aa9b31f25076a9109069472554f26
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Rahul Prajapati (rapr) <rapr@odoo.com>
---
 addons/im_livechat/models/discuss_channel.py  | 28 +++++++++----------
 .../im_livechat/tests/test_discuss_channel.py |  7 +++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/im_livechat/models/discuss_channel.py b/addons/im_livechat/models/discuss_channel.py
index cbae615e1afcc..cf27e7fe32b61 100644
--- a/addons/im_livechat/models/discuss_channel.py
+++ b/addons/im_livechat/models/discuss_channel.py
@@ -596,24 +596,24 @@ def _get_channel_history(self):
         """
         self.ensure_one()
         parts = []
-        # sudo: res.partner: accessing chat bot partner is acceptable to build channel history.
-        chatbot_op = self.sudo().chatbot_message_ids[
-            :1
-        ].script_step_id.chatbot_script_id.operator_partner_id
-        last_msg_from_chatbot = False
+        previous_message_author = None
         # sudo - mail.message: getting empty messages to exclude them is allowed.
         for message in (self.message_ids - self.message_ids.sudo()._filter_empty()).sorted("id"):
-            is_author_chatbot = message.author_id == chatbot_op
-            if is_author_chatbot and not last_msg_from_chatbot:
-                parts.append(Markup("<br/>"))
+            # sudo - res.partner: accessing livechat username or name is allowed to visitor
+            message_author = message.author_id.sudo() or message.author_guest_id
+            if previous_message_author != message_author:
+                parts.append(
+                    Markup("<br/><strong>%s:</strong><br/>")
+                    % (
+                        (message_author.user_livechat_username if message_author._name == "res.partner" else None)
+                        or message_author.name
+                    ),
+                )
             if not tools.is_html_empty(message.body):
-                if is_author_chatbot:
-                    parts.append(Markup("<strong>%s</strong><br/>") % html2plaintext(message.body))
-                else:
-                    parts.append(Markup("%s<br/>") % html2plaintext(message.body))
-                last_msg_from_chatbot = is_author_chatbot
+                parts.append(Markup("%s<br/>") % html2plaintext(message.body))
+                previous_message_author = message_author
             for attachment in message.attachment_ids:
-                last_msg_from_chatbot = is_author_chatbot
+                previous_message_author = message_author
                 # sudo - ir.attachment: public user can read attachment metadata
                 parts.append(Markup("%s<br/>") % self._attachment_to_html(attachment.sudo()))
         return Markup("").join(parts)
diff --git a/addons/im_livechat/tests/test_discuss_channel.py b/addons/im_livechat/tests/test_discuss_channel.py
index f77e7707d358c..c465b3b4f4ed3 100644
--- a/addons/im_livechat/tests/test_discuss_channel.py
+++ b/addons/im_livechat/tests/test_discuss_channel.py
@@ -4,7 +4,7 @@
 from markupsafe import Markup
 
 from odoo import Command, fields
-from odoo.tests import new_test_user
+from odoo.tests import new_test_user, users
 from odoo.addons.im_livechat.tests.common import TestImLivechatCommon, TestGetOperatorCommon
 from odoo.addons.mail.tests.common import MailCase
 
@@ -202,6 +202,7 @@ def test_join_livechat_needing_help(self):
         self.assertFalse(has_joined)
         self.assertNotIn(jane.partner_id, chat.channel_member_ids.partner_id)
 
+    @users("michel")
     def test_livechat_conversation_history(self):
         """Test livechat conversation history formatting"""
         def _convert_attachment_to_html(attachment):
@@ -218,7 +219,6 @@ def _convert_attachment_to_html(attachment):
                 "<div data-embedded='file' data-oe-protected='true' contenteditable='false' data-embedded-props='%s'/>",
             ) % json.dumps({"fileData": attachment_data})
 
-        self.authenticate(self.operators[0].login, self.password)
         channel = self.env["discuss.channel"].create(
             {
                 "name": "test",
@@ -239,7 +239,8 @@ def _convert_attachment_to_html(attachment):
         channel_history = channel.with_user(self.visitor_user)._get_channel_history()
         self.assertEqual(
             channel_history,
-            "Operator Here<br/>%(attachment_1)s<br/>Visitor Here<br/>%(attachment_2)s<br/>"
+            "<br/><strong>Michel Operator:</strong><br/>Operator Here<br/>%(attachment_1)s<br/>"
+            "<br/><strong>Rajesh:</strong><br/>Visitor Here<br/>%(attachment_2)s<br/>"
             % {
                 "attachment_1": _convert_attachment_to_html(attachment1),
                 "attachment_2": _convert_attachment_to_html(attachment2),

From f65d9a8c87b44558679bf5c6351e439f6ec2e990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Dieudonn=C3=A9?= <adr@odoo.com>
Date: Mon, 27 Oct 2025 15:29:59 +0100
Subject: [PATCH 100/673] [IMP] web: datetime_picker: new way to toggle range

Before this commit, we had only one button to toggle the date picker
mode, but the icon representing it wasn't very clear for people,
even with a title attribute.

Now we have two distinct buttons. The disadvantage of this change
is that we have to handle text length depending on the translation.
That's why we've reduced the month name to its abbreviated version.

task-5208130

closes odoo/odoo#233972

Signed-off-by: Romain Estievenart (res) <res@odoo.com>
---
 .../src/core/datetime/datetime_picker.js      |  2 +-
 .../src/core/datetime/datetime_picker.xml     | 35 ++++++++++------
 .../datetime/datetime_input.test.js           |  4 +-
 .../datetime/datetime_picker.test.js          | 40 +++++++++----------
 .../calendar/calendar_date_picker.test.js     |  2 +-
 .../tests/views/fields/date_field.test.js     |  4 +-
 .../views/fields/daterange_field.test.js      |  2 +-
 7 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/addons/web/static/src/core/datetime/datetime_picker.js b/addons/web/static/src/core/datetime/datetime_picker.js
index d67e4cbf53df0..584615ac9fa25 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.js
+++ b/addons/web/static/src/core/datetime/datetime_picker.js
@@ -143,7 +143,7 @@ const PRECISION_LEVELS = new Map()
         nextTitle: _t("Next month"),
         prevTitle: _t("Previous month"),
         step: { month: 1 },
-        getTitle: (date) => `${date.monthLong} ${date.year}`,
+        getTitle: (date) => `${date.monthShort} ${date.year}`,
         getItems: (date, { maxDate, minDate, showWeekNumbers, isDateValid, dayCellClass }) => {
             const startDates = [date];
 
diff --git a/addons/web/static/src/core/datetime/datetime_picker.xml b/addons/web/static/src/core/datetime/datetime_picker.xml
index fef537face8e9..04fa270826e7f 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.xml
+++ b/addons/web/static/src/core/datetime/datetime_picker.xml
@@ -9,7 +9,7 @@
                 >
                     <t t-foreach="month.daysOfWeek" t-as="dayOfWeek" t-key="dayOfWeek[0]">
                         <div
-                            class="o_day_of_week_cell fw-bolder d-flex align-items-center justify-content-center"
+                            class="o_day_of_week_cell bg-100 fw-bolder d-flex align-items-center justify-content-center"
                             t-att-title="dayOfWeek[1]"
                         >
                             <div class="text-nowrap overflow-hidden" t-esc="props.daysOfWeekFormat === 'narrow' ? dayOfWeek[2] : dayOfWeek[0]"/>
@@ -18,7 +18,7 @@
                     <t t-foreach="month.weeks" t-as="week" t-key="week.number">
                         <t t-if="props.showWeekNumbers">
                             <div
-                                class="o_week_number_cell d-flex justify-content-end align-items-center pe-3 fw-bolder"
+                                class="o_week_number_cell d-flex justify-content-end align-items-center pe-3 bg-100 fw-bolder"
                                 t-esc="week.number"
                             />
                         </t>
@@ -131,16 +131,27 @@
                         />
                     </t>
                 </button>
-                <button
-                    t-if="props.showRangeToggler"
-                    class="o_toggle_range btn btn-secondary btn-sm ms-auto"
-                    tabindex="-1"
-                    title="Toggle date range mode"
-                    t-on-click="props.onToggleRange"
-                    t-att-class="{'active': props.range}"
-                >
-                    <i class="fa fa-calendar-plus-o" />
-                </button>
+                <div t-if="props.showRangeToggler" class="btn-group ms-auto">
+                    <button
+                        class="o_toggle_range btn btn-secondary btn-sm"
+                        tabindex="-1"
+                        title="Single date"
+                        t-on-click="props.onToggleRange"
+                        t-att-class="{'active': !props.range}"
+                    >
+                        Date
+                    </button>
+                    <button
+                        class="o_toggle_range btn btn-secondary btn-sm"
+                        tabindex="-1"
+                        title="Date range"
+                        t-on-click="props.onToggleRange"
+                        t-att-class="{'active': props.range}"
+                    >
+                        Range
+                    </button>
+                </div>
+
             </nav>
             <t t-if="state.precision === 'days'">
                 <t t-call="web.DateTimePicker.Days" />
diff --git a/addons/web/static/tests/core/components/datetime/datetime_input.test.js b/addons/web/static/tests/core/components/datetime/datetime_input.test.js
index 3c4a5a0a95875..cbc1a09ebbdbe 100644
--- a/addons/web/static/tests/core/components/datetime/datetime_input.test.js
+++ b/addons/web/static/tests/core/components/datetime/datetime_input.test.js
@@ -56,7 +56,7 @@ describe("DateTimeInput (date)", () => {
         await animationFrame();
 
         assertDateTimePicker({
-            title: "January 1997",
+            title: "Jan 1997",
             date: [
                 {
                     cells: [
@@ -269,7 +269,7 @@ describe("DateTimeInput (datetime)", () => {
         await contains(".o_datetime_input").click();
 
         assertDateTimePicker({
-            title: "January 1997",
+            title: "Jan 1997",
             date: [
                 {
                     cells: [
diff --git a/addons/web/static/tests/core/components/datetime/datetime_picker.test.js b/addons/web/static/tests/core/components/datetime/datetime_picker.test.js
index b5e9ed416b27e..24262f1bc61d1 100644
--- a/addons/web/static/tests/core/components/datetime/datetime_picker.test.js
+++ b/addons/web/static/tests/core/components/datetime/datetime_picker.test.js
@@ -54,7 +54,7 @@ test("default params", async () => {
     await mountWithCleanup(DateTimePicker);
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -92,7 +92,7 @@ test("minDate: correct days/month/year/decades are disabled", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -175,7 +175,7 @@ test("minDate: correct days/month/year/decades are disabled", async () => {
     await animationFrame();
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -202,7 +202,7 @@ test("maxDate: correct days/month/year/decades are disabled", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -298,7 +298,7 @@ test("maxDate: correct days/month/year/decades are disabled", async () => {
     await animationFrame();
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -330,7 +330,7 @@ test("min+max date: correct days/month/year/decades are disabled", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -420,7 +420,7 @@ test("min+max date: correct days/month/year/decades are disabled", async () => {
     await animationFrame();
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -474,7 +474,7 @@ test("twelve-hour clock", async () => {
     await mountWithCleanup(DateTimePicker);
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -513,7 +513,7 @@ test("hide time picker", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -566,7 +566,7 @@ test("next month and previous month", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -587,7 +587,7 @@ test("next month and previous month", async () => {
     await animationFrame();
 
     assertDateTimePicker({
-        title: "March 2023",
+        title: "Mar 2023",
         date: [
             {
                 cells: [
@@ -608,7 +608,7 @@ test("next month and previous month", async () => {
     await animationFrame();
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -660,7 +660,7 @@ test("range value", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -705,7 +705,7 @@ test("range value on small device", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -746,7 +746,7 @@ test("range value, previous month", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -768,7 +768,7 @@ test("range value, previous month", async () => {
     await animationFrame();
 
     assertDateTimePicker({
-        title: "March 2023",
+        title: "Mar 2023",
         date: [
             {
                 cells: [
@@ -795,7 +795,7 @@ test("days of week narrow format", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -975,7 +975,7 @@ test("custom invalidity function", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -1184,7 +1184,7 @@ test("focus proper month when changing props out of current month", async () =>
     const parent = await mountWithCleanup(Parent);
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
@@ -1229,7 +1229,7 @@ test("disable show week numbers", async () => {
     });
 
     assertDateTimePicker({
-        title: "April 2023",
+        title: "Apr 2023",
         date: [
             {
                 cells: [
diff --git a/addons/web/static/tests/views/calendar/calendar_date_picker.test.js b/addons/web/static/tests/views/calendar/calendar_date_picker.test.js
index a16e68356f7ac..1e93416b91b5f 100644
--- a/addons/web/static/tests/views/calendar/calendar_date_picker.test.js
+++ b/addons/web/static/tests/views/calendar/calendar_date_picker.test.js
@@ -40,7 +40,7 @@ test(`Mount a CalendarDatePicker`, async () => {
     expect(`.o_datetime_picker`).toHaveCount(1);
     expect(`.o_datetime_picker .o_selected`).toHaveCount(1);
     expect(`.o_datetime_picker .o_selected`).toHaveText("14");
-    expect(`.o_datetime_picker_header .o_datetime_button`).toHaveText("August 2021");
+    expect(`.o_datetime_picker_header .o_datetime_button`).toHaveText("Aug 2021");
     expect(queryAllTexts`.o_datetime_picker .o_day_of_week_cell`).toEqual([
         "S",
         "M",
diff --git a/addons/web/static/tests/views/fields/date_field.test.js b/addons/web/static/tests/views/fields/date_field.test.js
index 1cce76103c359..016a1e063f4b6 100644
--- a/addons/web/static/tests/views/fields/date_field.test.js
+++ b/addons/web/static/tests/views/fields/date_field.test.js
@@ -91,7 +91,7 @@ test("open datepicker on Control+Enter", async () => {
     await press(["ctrl", "enter"]);
     await animationFrame();
     assertDateTimePicker({
-        title: "January 1997",
+        title: "Jan 1997",
         date: [
             {
                 cells: [
@@ -395,7 +395,7 @@ test("date field supports internationalization", async () => {
     expect(".o_field_date").toHaveText("3. feb. 2017");
     await contains(".o_field_date button").click();
     expect(".o_field_date input").toHaveValue("02/03/2017");
-    expect(".o_zoom_out strong").toHaveText("februar 2017");
+    expect(".o_zoom_out strong").toHaveText("feb 2017");
 
     await contains(getPickerCell("22")).click();
     await clickSave();
diff --git a/addons/web/static/tests/views/fields/daterange_field.test.js b/addons/web/static/tests/views/fields/daterange_field.test.js
index 1b11066ab80df..8f0f209d19293 100644
--- a/addons/web/static/tests/views/fields/daterange_field.test.js
+++ b/addons/web/static/tests/views/fields/daterange_field.test.js
@@ -445,7 +445,7 @@ test("Render with initial empty value and optional start date", async () => {
 
     await contains("input[data-field=datetime_end]").click();
     expect(".o_datetime_picker").toHaveCount(1);
-    expect(".o_toggle_range").toHaveCount(1);
+    expect(".o_toggle_range").toHaveCount(2);
 
     // Select a value (today)
     await contains(".o_today").click();

From 5f3fe82050e19d15f439438cfc0b39cc659a3331 Mon Sep 17 00:00:00 2001
From: dtda-odoo <dtda@odoo.com>
Date: Mon, 25 Aug 2025 07:06:57 +0000
Subject: [PATCH 101/673] [FIX] website: fix countdown boxes background color
 removal issue

Steps to Reproduce:
1. Add a Countdown snippet.
2. Change the layout to Boxes.
3. Apply a background color to the layout.
4. Hover over the delete button in the color picker.
5. A traceback error occurs.

Issue:
A traceback error occurs because the snippet does not have a default
background color value assigned. This is necessary for the snippet to
preview correctly when no additional color is applied.

Fix:
Assign a default value to ensure that the hover behavior works
properly, even when no color is set.

The issue was produced here: https://github.com/odoo/odoo/commit/03c552690b15#diff-a0262b81bb090b8c62afbd342b2a30f054cf353a35f9fc0ceeb0f86b7b9cd645

task-4752497

closes odoo/odoo#233955

X-original-commit: c35ebea2ba85bf63629250dd1e4db8bad3b2aeed
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Darpan Tiku Daswani (dtda) <dtda@odoo.com>
---
 addons/website/static/src/snippets/s_countdown/countdown.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/snippets/s_countdown/countdown.js b/addons/website/static/src/snippets/s_countdown/countdown.js
index 18d07101cfb43..66fe6af8c1ec1 100644
--- a/addons/website/static/src/snippets/s_countdown/countdown.js
+++ b/addons/website/static/src/snippets/s_countdown/countdown.js
@@ -40,6 +40,7 @@ export class Countdown extends Interaction {
             this.el.dataset.display = this.display;
         }
 
+        this.defaultColor = "rgba(0, 0, 0, 0)";
         this.layout = this.el.dataset.layout;
         this.layoutBackground = this.el.dataset.layoutBackground;
         this.progressBarStyle = this.el.dataset.progressBarStyle;
@@ -78,7 +79,7 @@ export class Countdown extends Interaction {
         if (isCSSColor(color)) {
             return color;
         }
-        return getCSSVariableValue(color, getHtmlStyle(document)) || "";
+        return getCSSVariableValue(color, getHtmlStyle(document)) || this.defaultColor;
     }
 
     /**

From 703eb2c969aa85cc3deafdf4538600b987dec5ec Mon Sep 17 00:00:00 2001
From: assh-odoo <assh@odoo.com>
Date: Fri, 17 Oct 2025 06:55:31 +0000
Subject: [PATCH 102/673] [FIX] sale_project: prevent error when creating sale
 order for project

Currently, an error occurs when creating a sale order for a project.

Steps to Reproduce:
 - Install the sale_project module.
 - Go to Project and, in the list view, create a project and set a customer.
 - Click the Sales Order button in the header.
 - Save the sale order without adding any product or by adding a non-service
   product.

AttributeError: 'bool' object has no attribute 'order_id'

This error occurs, when user creating a sale order for a project without
adding a service product, then service sol becomes empty [1], which
raises an error here [2] when trying to access the sale order.

This commit ensures that if there is no service sol, an empty sol
is taken in the service sol.

[1]: https://github.com/odoo/odoo/blob/3121577430cdfa485af4d69792745a6f9c2ffe2f/addons/sale_project/models/sale_order.py#L272

[2]: https://github.com/odoo/odoo/blob/3121577430cdfa485af4d69792745a6f9c2ffe2f/addons/sale_project/models/sale_order.py#L276

sentry-6948584510

closes odoo/odoo#234024

X-original-commit: 78e2e114bab3bdf5a18679855633c4501657c049
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/sale_project/models/sale_order.py      |  2 +-
 .../sale_project/tests/test_sale_project.py   | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/addons/sale_project/models/sale_order.py b/addons/sale_project/models/sale_order.py
index 1e98d1b8d104f..8fe8bb96d1e9f 100644
--- a/addons/sale_project/models/sale_order.py
+++ b/addons/sale_project/models/sale_order.py
@@ -269,7 +269,7 @@ def create(self, vals_list):
         project = self.env['project.project'].browse(self.env.context.get('create_for_project_id'))
         task = self.env['project.task'].browse(self.env.context.get('create_for_task_id'))
         if project or task:
-            service_sol = next((sol for sol in created_records.order_line if sol.is_service), False)
+            service_sol = next((sol for sol in created_records.order_line if sol.is_service), self.env['sale.order.line'])
             if project and not project.sale_line_id:
                 project.sale_line_id = service_sol
                 if not project.reinvoiced_sale_order_id:
diff --git a/addons/sale_project/tests/test_sale_project.py b/addons/sale_project/tests/test_sale_project.py
index 201aa260204cb..5e674c17fce38 100644
--- a/addons/sale_project/tests/test_sale_project.py
+++ b/addons/sale_project/tests/test_sale_project.py
@@ -1904,3 +1904,25 @@ def test_sale_order_lines_associated_sale_orders_of_parent_and_child_partners(se
         evaluated_domain = safe_eval(str(domain), {'partner_id': self.project_global.partner_id.id})
         sale_order_lines = self.env['sale.order.line'].search(evaluated_domain)
         self.assertIn(sale_order_1.order_line, sale_order_lines, "Expected sale order lines of parent partner")
+
+    def test_sale_order_creation_without_service_product_for_project(self):
+        """Test that a sale order is created for a project using a non-service product"""
+        self.project_global.partner_id = self.partner
+        action_dict = self.project_global.with_context(
+            create_for_project_id=self.project_global.id,
+            default_project_id=self.project_global.id,
+            default_partner_id=self.partner.id
+        ).action_view_sos()
+
+        self.product_milestone.type = 'consu'
+        sale_order = self.env['sale.order'].with_context(action_dict['context']).create({
+            'order_line': [Command.create({
+                'product_id': self.product_milestone.id,
+                'product_uom_qty': 1,
+            })],
+        })
+
+        self.assertEqual(sale_order.project_id, self.project_global)
+        self.assertEqual(sale_order.partner_id, self.partner)
+        self.assertFalse(self.project_global.sale_line_id)
+        self.assertEqual(self.project_global.reinvoiced_sale_order_id, sale_order)

From 224c4ba0c945f3c0acb6bac762129b37b3f4ba4e Mon Sep 17 00:00:00 2001
From: jeevanism <jeevanism@gmail.com>
Date: Sun, 26 Oct 2025 16:27:17 +0000
Subject: [PATCH 103/673] [FIX] web_editor: Make modify_image controller robust
 to missing data

When modifying an existing image attachment (e.g., via the editor's image tools) that is sourced from a server URL, the client-side JavaScript correctly omits the image data payload.

However, the Python `modify_image` controller implicitly assumed the `data` parameter would always be present, causing a server error.

This fix ensures the controller retrieves the existing image content using `attachment.datas` if the `data` parameter is not provided by the client, allowing modification requests to proceed correctly.

X-original-commit: c6a423033d3f8cfd25fd1b5a5bec06223832cadd
Part-of: odoo/odoo#234045
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 addons/html_editor/controllers/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/html_editor/controllers/main.py b/addons/html_editor/controllers/main.py
index b361ddd3e2fc4..02f710723c930 100644
--- a/addons/html_editor/controllers/main.py
+++ b/addons/html_editor/controllers/main.py
@@ -398,6 +398,8 @@ def modify_image(self, attachment, res_model=None, res_id=None, name=None, data=
         """
         self._clean_context()
         attachment = request.env['ir.attachment'].browse(attachment.id)
+        if not data and attachment.datas:
+            data = attachment.datas
 
         fields = {
             'original_id': attachment.id,

From b0996aacf94fbb7a4e25cd860e0d12dac0c69515 Mon Sep 17 00:00:00 2001
From: jeevanism <jeevanism@gmail.com>
Date: Sun, 26 Oct 2025 20:18:42 +0000
Subject: [PATCH 104/673] [FIX] html_editor: Add test for modify_image without
 data

This commit introduces a new test case to ensure the `modify_image` controller in the `html_editor` module is robust against missing image data.
The test simulates a scenario where an existing image attachment is modified without providing the `data` parameter in the request. This verifies the fix that prevents a server error in such cases by ensuring the controller falls back to the attachment's existing data.

closes odoo/odoo#234045

X-original-commit: f08cb45cf7f379e9b3295b4d90a9a57a8b4df5d7
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 addons/html_editor/tests/__init__.py          |  1 +
 .../tests/test_modify_image_no_data.py        | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 addons/html_editor/tests/test_modify_image_no_data.py

diff --git a/addons/html_editor/tests/__init__.py b/addons/html_editor/tests/__init__.py
index 54aeea11b63cf..2b79d43561371 100644
--- a/addons/html_editor/tests/__init__.py
+++ b/addons/html_editor/tests/__init__.py
@@ -3,3 +3,4 @@
 from . import test_tools
 from . import test_views
 from . import test_diff_utils
+from . import test_modify_image_no_data
diff --git a/addons/html_editor/tests/test_modify_image_no_data.py b/addons/html_editor/tests/test_modify_image_no_data.py
new file mode 100644
index 0000000000000..23e733829cc8b
--- /dev/null
+++ b/addons/html_editor/tests/test_modify_image_no_data.py
@@ -0,0 +1,45 @@
+
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import odoo.tests
+from odoo.tests.common import HttpCase
+from odoo.tools.json import scriptsafe as json_safe
+
+
+@odoo.tests.tagged('-at_install', 'post_install')
+class TestModifyImageNoData(HttpCase):
+
+    def setUp(self):
+        super().setUp()
+        self.authenticate('admin', 'admin')
+        self.pixel = 'R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs='
+
+    def test_modify_image_no_data(self):
+        # Create an attachment
+        attachment = self.env['ir.attachment'].create({
+            'name': 'test_image.gif',
+            'datas': self.pixel,
+            'res_model': 'ir.ui.view',
+            'res_id': 0,
+        })
+
+        # Call the modify_image controller without the 'data' parameter
+        response = self.url_open(
+            f'/html_editor/modify_image/{attachment.id}',
+            headers={'Content-Type': 'application/json'},
+            data=json_safe.dumps({'params': {
+                'res_model': 'ir.ui.view',
+                'res_id': 0,
+                'name': 'modified_image.gif',
+            }})
+        )
+        self.assertEqual(response.status_code, 200)
+        response_data = response.json()
+        self.assertNotIn('error', response_data)
+        self.assertIn('result', response_data)
+
+        modified_attachment = self.env['ir.attachment'].search([
+            ('name', '=', 'modified_image.gif'),
+            ('original_id', '=', attachment.id),
+        ])
+        self.assertEqual(len(modified_attachment), 1)

From 98becce07181b1ac657b99151dfcae2721a4fbf2 Mon Sep 17 00:00:00 2001
From: Gorash <chm@odoo.com>
Date: Thu, 2 Oct 2025 15:18:26 +0200
Subject: [PATCH 105/673] [IMP] base,all: remove deprecated 't-raw' ir.qweb
 directive
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

task-4461090

closes odoo/odoo#229846

Related: odoo/enterprise#96230
Related: odoo/documentation#14770
Related: odoo/upgrade#8543
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 odoo/addons/base/models/ir_qweb.py    | 32 ++---------------
 odoo/addons/base/models/ir_ui_view.py | 51 +++++++++++++--------------
 2 files changed, 27 insertions(+), 56 deletions(-)

diff --git a/odoo/addons/base/models/ir_qweb.py b/odoo/addons/base/models/ir_qweb.py
index 4f76a6e6b089f..f45a95ca743f5 100644
--- a/odoo/addons/base/models/ir_qweb.py
+++ b/odoo/addons/base/models/ir_qweb.py
@@ -299,10 +299,6 @@
 the value. The rendering model is chosen according to the type of field. The
 rendering model can be modified via the ``t-options-widget``.
 
-``t-raw``
-~~~~~~~~~
-Deprecated, please use ``t-out``
-
 ``t-set``
 ~~~~~~~~~
 **Values**: key name
@@ -1613,7 +1609,7 @@ def _directives_eval_order(self):
             'options',
             'call',
             'att',
-            'field', 'raw', 'out',
+            'field', 'out',
             'tag-open',
             'set',
             'inner-content',
@@ -1673,7 +1669,7 @@ def _compile_node(self, el, compile_context, level):
             if el_tag not in VOID_ELEMENTS:
                 el.set('t-tag-close', el_tag)
 
-        if not ({'t-out', 't-raw', 't-field'} & set(el.attrib)):
+        if not {'t-out', 't-field'}.intersection(el.attrib):
             el.set('t-inner-content', 'True')
 
         return body + self._compile_directives(el, compile_context, level)
@@ -1920,7 +1916,7 @@ def _compile_directive_att(self, el, compile_context, level):
 
         if (not el.nsmap and el.tag == 't') or (el.nsmap and etree.QName(el.tag).localname == 't'):
             # if it's an invisible element <t>
-            if not el.get('t-out') and not el.get('t-esc') and not el.get('t-raw') and el.getparent() is not None:
+            if not el.get('t-out') and el.getparent() is not None:
                 # if this invisible doesn't generate content, attributes will never be consumed
                 return []
             if el.attrib.get('t-consumed-options') != 'True':
@@ -2334,10 +2330,6 @@ def _compile_directive_out(self, el, compile_context, level):
         if expr is None:
             ttype = 't-field'
             expr = el.attrib.pop('t-field', None)
-            if expr is None:
-                # deprecated use.
-                ttype = 't-raw'
-                expr = el.attrib.pop('t-raw')
 
         flush = self._flush_text(compile_context, level)
 
@@ -2397,13 +2389,6 @@ def _compile_directive_out(self, el, compile_context, level):
             else:
                 force_display_dependent = False
 
-            if ttype == 't-raw':
-                # deprecated use.
-                code.append(indent_code("""
-                    if content is not None and content is not False:
-                        content = Markup(content)
-                """, level))
-
         level_tag = level + (0 if is_slot else 1)
         tag_open = (
             self._compile_directive(el, compile_context, 'tag-open', level_tag) +
@@ -2467,17 +2452,6 @@ def _compile_directive_out(self, el, compile_context, level):
 
         return code
 
-    def _compile_directive_raw(self, el, compile_context, level):
-        # deprecated use.
-        _logger.warning(
-            "Found deprecated directive @t-raw=%r in template %r. Replace by "
-            "@t-out, and explicitely wrap content in `Markup` if "
-            "necessary (which likely is not the case)",
-            el.get('t-raw'),
-            compile_context.get('ref', '<unknown>'),
-        )
-        return self._compile_directive_out(el, compile_context, level)
-
     def _compile_directive_field(self, el, compile_context, level):
         """Compile ``t-field`` expressions into a python code as a list of
         strings.
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py
index 5e4a3b3624cd2..0f10135bd65b7 100644
--- a/odoo/addons/base/models/ir_ui_view.py
+++ b/odoo/addons/base/models/ir_ui_view.py
@@ -2277,7 +2277,7 @@ def _validate_fa_class_accessibility(self, node, description):
         valid_aria_attrs = {
             *att_names('title'), *att_names('aria-label'), *att_names('aria-labelledby'),
         }
-        valid_t_attrs = {'t-value', 't-raw', 't-field', 't-out'}
+        valid_t_attrs = {'t-value', 't-field', 't-out'}
 
         ## Following or preceding text
         if (node.tail or '').strip() or (node.getparent().text or '').strip():
@@ -2292,7 +2292,7 @@ def has_text(elem):
                 return True
             if elem.tag in ['field', 'label'] and elem.get('string'):
                 return True
-            return elem.tag == 't' and (elem.get('t-out') or elem.get('t-raw'))
+            return elem.tag == 't' and elem.get('t-out')
 
         if has_text(node.getnext()) or has_text(node.getprevious()):
             return
@@ -2424,7 +2424,7 @@ def _get_view_etrees(self):
 
     def _contains_branded(self, node):
         return node.tag == 't'\
-            or 't-raw' in node.attrib\
+            or node.get('t-out') == '0'\
             or 't-call' in node.attrib\
             or any(self.is_node_branded(child) for child in node.iterdescendants())
 
@@ -2470,37 +2470,34 @@ def distribute_branding(self, e, branding=None, parent_xpath='',
         if not e.get('data-oe-model'):
             return
 
-        if {'t-raw', 't-out'}.intersection(e.attrib):
+        if e.get('t-out'):
             # nodes which fully generate their content and have no reason to
             # be branded because they can not sensibly be edited
             self._pop_view_branding(e)
         elif self._contains_branded(e):
             # if a branded element contains branded elements distribute own
-            # branding to children unless it's t-raw, then just remove branding
-            # on current element
+            # branding to children, then just remove branding on current element
             distributed_branding = self._pop_view_branding(e)
 
-            if 't-raw' not in e.attrib:
-                # TODO: collections.Counter if remove p2.6 compat
-                # running index by tag type, for XPath query generation
-                indexes = collections.defaultdict(lambda: 0)
-                for child in e.iterchildren(etree.Element, etree.ProcessingInstruction):
-                    if child.get('data-oe-xpath'):
-                        # injected by view inheritance, skip otherwise
-                        # generated xpath is incorrect
-                        self.distribute_branding(child)
-                    elif child.tag is etree.ProcessingInstruction:
-                        # If a node is known to have been replaced during
-                        # applying an inheritance, increment its index to
-                        # compute an accurate xpath for subsequent nodes
-                        if child.target == 'apply-inheritance-specs-node-removal':
-                            indexes[child.text] += 1
-                            e.remove(child)
-                    else:
-                        indexes[child.tag] += 1
-                        self.distribute_branding(
-                            child, distributed_branding,
-                            parent_xpath=node_path, index_map=indexes)
+            # running index by tag type, for XPath query generation
+            indexes = collections.Counter()
+            for child in e.iterchildren(etree.Element, etree.ProcessingInstruction):
+                if child.get('data-oe-xpath'):
+                    # injected by view inheritance, skip otherwise
+                    # generated xpath is incorrect
+                    self.distribute_branding(child)
+                elif child.tag is etree.ProcessingInstruction:
+                    # If a node is known to have been replaced during
+                    # applying an inheritance, increment its index to
+                    # compute an accurate xpath for subsequent nodes
+                    if child.target == 'apply-inheritance-specs-node-removal':
+                        indexes[child.text] += 1
+                        e.remove(child)
+                else:
+                    indexes[child.tag] += 1
+                    self.distribute_branding(
+                        child, distributed_branding,
+                        parent_xpath=node_path, index_map=indexes)
 
     def is_node_branded(self, node):
         """ Finds out whether a node is branded or qweb-active (bears a

From b936796c3a7449609ebabd6f92d658dc7eea3dab Mon Sep 17 00:00:00 2001
From: Sanjay Sharma <shsa@odoo.com>
Date: Tue, 23 Sep 2025 12:49:00 +0530
Subject: [PATCH 106/673] [IMP] html_builder, website: enable vertical
 alignment in snippets

Added vertical alignment options to `s_key_images`, `s_cards_soft`,
and `s_cards_grid` snippets, allowing better layout control.

Key changes:
- Added tooltip "Vertical Alignment" for snippet option.
- Added test cases to cover new options and prevent regressions.
- Fixed stretch alignment for `s_cards_soft`, and `s_cards_grid`:
  * `s_cards_grid`: updated `.col-lg-6` containers with `d-flex
    flex-column` and `object-fit-cover` to card images ensuring proper
    scaling.
  * `s_cards_soft`: Applied `h-100` to cards for consistent height.
- Added backward compatibility through `upgradeContainers` on setup for
  already dropped snippets to maintain expected behavior.
- Added data attribute `data-vxml="001"` to modified snippets for
  version tracking.

These changes improve flexibility and visual consistency of card-based
snippets, ensuring equal height behavior and proper image rendering
regardless of content length.

task-4432821

closes odoo/odoo#192844

Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../src/plugins/vertical_alignment_option.js  |  2 +-
 .../src/plugins/vertical_alignment_option.xml |  2 +-
 .../vertical_alignment_option_plugin.js       | 42 +++++++++++++++++++
 .../website_builder/snippet_layout.test.js    | 26 ++++++++++++
 .../website/views/snippets/s_cards_grid.xml   | 26 ++++++------
 .../website/views/snippets/s_cards_soft.xml   |  8 ++--
 6 files changed, 87 insertions(+), 19 deletions(-)
 create mode 100644 addons/website/static/tests/builder/website_builder/snippet_layout.test.js

diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option.js b/addons/html_builder/static/src/plugins/vertical_alignment_option.js
index 1c5d6d586567b..47069e6014c96 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option.js
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option.js
@@ -2,7 +2,7 @@ import { BaseVerticalAlignmentOption } from "./base_vertical_alignment_option";
 
 export class VerticalAlignmentOption extends BaseVerticalAlignmentOption {
     static selector =
-        ".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image, .s_reviews_wall";
+        ".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image, .s_reviews_wall, .s_key_images, .s_cards_soft, .s_cards_grid";
     static applyTo = ".row";
     static name = "verticalAlignmentOption";
 }
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option.xml b/addons/html_builder/static/src/plugins/vertical_alignment_option.xml
index e5995815f958b..56bd150741a8d 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option.xml
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option.xml
@@ -4,7 +4,7 @@
 <t t-name="html_builder.VerticalAlignmentOption">
     <t t-if="!isActiveItem('grid_mode')">
         <!-- TODO add title tooltip row Vertical Alignment-->
-        <BuilderRow label.translate="Vert. Alignment" level="this.level">
+        <BuilderRow label.translate="Vert. Alignment" tooltip.translate="Vertical Alignment" level="this.level">
             <BuilderButtonGroup action="'setVerticalAlignment'">
                 <BuilderButton actionParam="'align-items-start'" title.translate="Align Top" iconImg="'/html_builder/static/img/snippets_options/align_top.svg'"/>
                 <BuilderButton actionParam="'align-items-center'" title.translate="Align Middle" iconImg="'/html_builder/static/img/snippets_options/align_middle.svg'"/>
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
index 35f5e2f38eb99..7afd60db5e754 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
@@ -13,6 +13,48 @@ export class VerticalAlignmentOptionPlugin extends Plugin {
             SetVerticalAlignmentAction,
         },
     };
+
+    setup() {
+        this.upgradeContainers();
+    }
+
+    // TODO: Remove once data-vxml="number" snippet comparison is restored.
+    upgradeContainers() {
+        // Upgrade legacy card snippets for visual consistency on new versions.
+        const snippetEls = this.document.querySelectorAll(
+            ".s_cards_soft:not([data-vxml]), .s_cards_grid:not([data-vxml])"
+        );
+
+        for (const snippetEl of snippetEls) {
+            // Handle all cards inside the section
+            for (const cardEl of snippetEl.querySelectorAll(".s_card")) {
+                const rowEl = cardEl.closest(".row");
+                // Preserve top alignment for cards that originally lacked h-100
+                if (!rowEl?.classList.contains("align-items-start")) {
+                    rowEl.classList.add("align-items-start");
+                }
+
+                // Ensure each card stretches fully
+                cardEl.classList.add("h-100");
+
+                // Additional handling for .s_cards_grid
+                if (snippetEl.classList.contains("s_cards_grid")) {
+                    const colAncestor = cardEl.closest("[class*='col-']");
+                    if (colAncestor) {
+                        colAncestor.classList.add("d-flex", "flex-column");
+                    }
+
+                    const cardImg = cardEl.querySelector(".o_card_img, img");
+                    if (cardImg) {
+                        cardImg.classList.add("object-fit-cover");
+                    }
+                }
+            }
+
+            // Once all cards in this section are updated, mark it as vxml 001
+            snippetEl.dataset.vxml = "001";
+        }
+    }
 }
 
 export class SetVerticalAlignmentAction extends ClassAction {
diff --git a/addons/website/static/tests/builder/website_builder/snippet_layout.test.js b/addons/website/static/tests/builder/website_builder/snippet_layout.test.js
new file mode 100644
index 0000000000000..39a084a797291
--- /dev/null
+++ b/addons/website/static/tests/builder/website_builder/snippet_layout.test.js
@@ -0,0 +1,26 @@
+import { expect, test } from "@odoo/hoot";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
+import { contains } from "@web/../tests/web_test_helpers";
+import { queryOne } from "@odoo/hoot-dom";
+
+defineWebsiteModels();
+
+test("snippet vertical alignment", async () => {
+    const snippets = ["s_key_images", "s_cards_soft", "s_cards_grid"];
+    await setupWebsiteBuilderWithSnippet(["s_cards_soft", "s_key_images", "s_cards_grid"]);
+    for (const snippet of snippets) {
+        await contains(`:iframe .${snippet}`).click();
+        const snippetRow = queryOne(`:iframe .${snippet} .row`);
+        await contains("[data-action-param='align-items-start']").click();
+        expect(snippetRow).toHaveClass("align-items-start");
+        await contains("[data-action-param='align-items-center']").click();
+        expect(snippetRow).toHaveClass("align-items-center");
+        await contains("[data-action-param='align-items-end']").click();
+        expect(snippetRow).toHaveClass("align-items-end");
+        await contains("[data-action-param='align-items-stretch']").click();
+        expect(snippetRow).toHaveClass("align-items-stretch");
+    }
+});
diff --git a/addons/website/views/snippets/s_cards_grid.xml b/addons/website/views/snippets/s_cards_grid.xml
index 4ae8ccf050d52..0c9b345802776 100644
--- a/addons/website/views/snippets/s_cards_grid.xml
+++ b/addons/website/views/snippets/s_cards_grid.xml
@@ -2,14 +2,14 @@
 <odoo>
 
 <template id="s_cards_grid" name="Cards Grid">
-    <section class="s_cards_grid o_colored_level o_cc o_cc2 pt64 pb64">
+    <section class="s_cards_grid o_colored_level o_cc o_cc2 pt64 pb64" data-vxml="001">
         <div class="container">
             <h2 class="h3-fs">Features that set us apart</h2>
             <div class="row">
-                <div data-name="Card" class="col-lg-6">
-                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
+                <div data-name="Card" class="col-lg-6 d-flex flex-column">
+                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
                         <figure class="o_card_img_wrapper ratio ratio-1x1 mb-0">
-                            <img class="o_card_img rounded-start" src="/web/image/website.s_key_images_default_image_1" alt=""/>
+                            <img class="o_card_img rounded-start object-fit-cover" src="/web/image/website.s_key_images_default_image_1" alt=""/>
                         </figure>
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Quality and Excellence</h3>
@@ -17,10 +17,10 @@
                         </div>
                     </div>
                 </div>
-                <div data-name="Card" class="col-lg-6">
-                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
+                <div data-name="Card" class="col-lg-6 d-flex flex-column">
+                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
                         <figure class="o_card_img_wrapper ratio ratio-1x1 mb-0">
-                            <img class="o_card_img rounded-start" src="/web/image/website.s_key_images_default_image_2" alt=""/>
+                            <img class="o_card_img rounded-start object-fit-cover" src="/web/image/website.s_key_images_default_image_2" alt=""/>
                         </figure>
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Expertise and Knowledge</h3>
@@ -28,10 +28,10 @@
                         </div>
                     </div>
                 </div>
-                <div data-name="Card" class="col-lg-6">
-                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
+                <div data-name="Card" class="col-lg-6 d-flex flex-column">
+                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
                         <figure class="o_card_img_wrapper ratio ratio-1x1 mb-0">
-                            <img class="o_card_img rounded-start" src="/web/image/website.s_key_images_default_image_3" alt=""/>
+                            <img class="o_card_img rounded-start object-fit-cover" src="/web/image/website.s_key_images_default_image_3" alt=""/>
                         </figure>
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Eco-Friendly Solutions</h3>
@@ -39,10 +39,10 @@
                         </div>
                     </div>
                 </div>
-                <div data-name="Card" class="col-lg-6">
-                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
+                <div data-name="Card" class="col-lg-6 d-flex flex-column">
+                    <div class="s_card o_card_img_horizontal o_cc o_cc1 card flex-lg-row h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="--card-img-size-h: 25%;">
                         <figure class="o_card_img_wrapper ratio ratio-1x1 mb-0">
-                            <img class="o_card_img rounded-start" src="/web/image/website.s_key_images_default_image_4" alt=""/>
+                            <img class="o_card_img rounded-start object-fit-cover" src="/web/image/website.s_key_images_default_image_4" alt=""/>
                         </figure>
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Tailored Solutions</h3>
diff --git a/addons/website/views/snippets/s_cards_soft.xml b/addons/website/views/snippets/s_cards_soft.xml
index 2483c6ba56cc0..5360388b6c8c0 100644
--- a/addons/website/views/snippets/s_cards_soft.xml
+++ b/addons/website/views/snippets/s_cards_soft.xml
@@ -2,13 +2,13 @@
 <odoo>
 
 <template id="s_cards_soft" name="Cards Soft">
-    <section class="s_cards_soft o_cc o_cc1 pt48 pb32">
+    <section class="s_cards_soft o_cc o_cc1 pt48 pb32" data-vxml="001">
         <div class="container">
             <h2 style="text-align: center;">Your Journey Begins Here</h2>
             <p class="lead" style="text-align: center;">We make every moment count with solutions designed just for you.</p>
             <div class="row">
                 <div data-name="Card" class="col-lg-4 pt16 pb16">
-                    <div class="s_card card o_cc o_cc2" data-vxml="001" data-snippet="s_card" data-name="Card" style="border-width: 0px !important;">
+                    <div class="s_card card o_cc o_cc2 h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="border-width: 0px !important;">
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Innovative Ideas</h3>
                             <p class="card-text">Our creativity is at the forefront of everything we do, delivering innovative solutions that make your project stand out while maintaining a balance between originality and functionality.</p>
@@ -17,7 +17,7 @@
                     </div>
                 </div>
                 <div data-name="Card" class="col-lg-4 pt16 pb16">
-                    <div class="s_card card o_cc o_cc2" data-vxml="001" data-snippet="s_card" data-name="Card" style="border-width: 0px !important;">
+                    <div class="s_card card o_cc o_cc2 h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="border-width: 0px !important;">
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Comprehensive Support</h3>
                             <p class="card-text">From the initial stages to completion, we offer support every step of the way, ensuring you feel confident in your choices and that your project is a success.</p>
@@ -26,7 +26,7 @@
                     </div>
                 </div>
                 <div data-name="Card" class="col-lg-4 pt16 pb16">
-                    <div class="s_card card o_cc o_cc2" data-vxml="001" data-snippet="s_card" data-name="Card" style="border-width: 0px !important;">
+                    <div class="s_card card o_cc o_cc2 h-100" data-vxml="001" data-snippet="s_card" data-name="Card" style="border-width: 0px !important;">
                         <div class="card-body">
                             <h3 class="card-title h5-fs">Timeless Quality</h3>
                             <p class="card-text">Our services are built to last, ensuring that every solution we provide is of the highest quality, bringing lasting value to your investment and ultimate customer satisfaction.</p>

From f4fdfb76db634fe417fd8389faf075410740478b Mon Sep 17 00:00:00 2001
From: Zelong Lin <zel@odoo.com>
Date: Thu, 30 Oct 2025 16:26:26 +0000
Subject: [PATCH 107/673] [FIX] mail: id in mail_composer_plugin

The id used for the mail_composer_plugin had dots, which leads to issues
that it cannot be used as a dependency or shared in other plugins.

Updated the static id format in mail_composer_plugin.js to use
underscores instead of dots.

closes odoo/odoo#233882

X-original-commit: 304acd112dee6a2e1fdc49d60e8e870ba445336a
Signed-off-by: Zelong Lin (zel) <zel@odoo.com>
---
 .../static/src/core/common/plugin/mail_composer_plugin.js   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js b/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js
index 95ae0a08a68f2..901fafe25589c 100644
--- a/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js
+++ b/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js
@@ -4,8 +4,12 @@ import { isEmptyBlock } from "@html_editor/utils/dom_info";
 import { childNodes } from "@html_editor/utils/dom_traversal";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * This plugin works with the composer used in Discuss, ChatWindow and Chatter.
+ * For the full composer, it is using HtmlComposerMessageField.
+ */
 export class MailComposerPlugin extends Plugin {
-    static id = "mail.composer";
+    static id = "mail_composer";
     static dependencies = ["clipboard", "hint", "input", "selection"];
     resources = {
         before_paste_handlers: this.config.composerPluginDependencies.onBeforePaste.bind(this),

From 25560d6bc92615efcae9c695325065f5c04fa4f8 Mon Sep 17 00:00:00 2001
From: mojem <mojem@odoo.com>
Date: Thu, 9 Oct 2025 13:19:30 +0000
Subject: [PATCH 108/673] [FIX] account: Recompute narration language on
 partner language change.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue:
Previously, when changing the customer’s language during invoice creation, the terms & services were not retranslated — unlike when creating a new partner in a different language.

Repro Steps:

-Create an invoice with terms link or plain enabled.
-Change the partner's language from the invoice creation view.
-Terms is not translated.

Cause:
The translation compute was only triggered on partner change, not language change.

Fix:
Added dependency for partner_id.lang to the narration compute to ensure it updates when the language changes.

opw-5031933

closes odoo/odoo#232812

X-original-commit: 2c177dc7584e7fe6f0ec71d865d3817b37c865f5
Signed-off-by: Ali Alfie (alal) <alal@odoo.com>
Signed-off-by: Mohamed Jemai (mojem) <mojem@odoo.com>
---
 addons/account/models/account_move.py         |  2 +-
 .../tests/test_account_move_out_invoice.py    | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 4578d70769438..9860031d25091 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1925,7 +1925,7 @@ def _compute_access_url(self):
         for move in self.filtered(lambda move: move.is_invoice()):
             move.access_url = '/my/invoices/%s' % (move.id)
 
-    @api.depends('move_type', 'partner_id', 'company_id')
+    @api.depends('move_type', 'partner_id', 'partner_id.lang', 'company_id')
     def _compute_narration(self):
         use_invoice_terms = self.env['ir.config_parameter'].sudo().get_bool('account.use_invoice_terms')
         invoice_to_update_terms = self.filtered(lambda m: use_invoice_terms and m.is_sale_document(include_receipts=True))
diff --git a/addons/account/tests/test_account_move_out_invoice.py b/addons/account/tests/test_account_move_out_invoice.py
index 5783784df9607..5eab77ef8d193 100644
--- a/addons/account/tests/test_account_move_out_invoice.py
+++ b/addons/account/tests/test_account_move_out_invoice.py
@@ -4733,6 +4733,32 @@ def test_narration_preserved_when_use_invoice_terms_disabled(self):
             "Narration should be preserved after partner change when invoice terms are disabled"
         )
 
+    def test_narration_translation_on_partner_language_change(self):
+        """Ensure narration translates when partner.lang changes (HTML terms link)."""
+        self.env['ir.config_parameter'].sudo().set_bool('account.use_invoice_terms', True)
+        self.env['res.lang']._activate_lang('fr_FR')
+
+        self.env.company.terms_type = 'html'
+
+        # Baseline: en_US user/partner
+        self.partner_a.lang = 'en_US'
+
+        # Create invoice
+        invoice = self.init_invoice(move_type='out_invoice', partner=self.partner_a)
+
+        baseurl = self.env.company.get_base_url() + '/terms'
+
+        # Check the initial narration is in English
+        expected_en = f"<p>Terms &amp; Conditions: {baseurl}</p>"
+        self.assertEqual(invoice.narration, expected_en)
+
+        # Switch to fr_FR
+        self.partner_a.lang = 'fr_FR'
+
+        # Check the narration is in French
+        expected_fr = f"<p>Conditions générales : {baseurl}</p>"
+        self.assertEqual(invoice.narration, expected_fr)
+
     def test_multiple_currency_change(self):
         """
         Test amount currency and balance are correctly recomputed when switching currency multiple times

From 69590e8c45ca092304a2e4e11870a63ab48d4ad7 Mon Sep 17 00:00:00 2001
From: David Monnom <moda@odoo.com>
Date: Fri, 12 Sep 2025 09:13:01 +0000
Subject: [PATCH 109/673] [FIX] point_of_sale, pos_*: ensure local records are
 kept when syncing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: point_of_sale, pos_loyalty, pos_online_payment, pos_sale,
pos_self_order

Before this commit, when syncing records from the server, local
records that were not yet synced (isSynced=false) could be lost
if they were not present in the server response. This could happen
for example when a record was created locally and the server
response did not include it.

This commit fixes this issue by ensuring that local records are
always kept when syncing, even if they are not present in the
server response. This is done by merging the local records with
the server records based on their keys.

---

This commit also replace all checks of the form `typeof id === "number"`
with `isSynced` checks. This is because the `id` of a record can be a
temporary string id before it is synced with the server.

closes odoo/odoo#228645

X-original-commit: 1d349697c055c9bf4ae5a8411c68288b1dc40755
Related: odoo/enterprise#95566
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../src/app/models/data_service_options.js    |  7 ++-
 .../static/src/app/models/pos_order.js        |  6 +--
 .../src/app/models/related_models/base.js     |  6 ++-
 .../src/app/models/related_models/index.js    | 29 +++++++---
 .../models/related_models/serialization.js    |  8 +--
 .../screens/receipt_screen/receipt_screen.js  |  2 +-
 .../invoice_button/invoice_button.js          | 11 +---
 .../screens/ticket_screen/ticket_screen.js    | 22 ++------
 .../static/src/app/services/data_service.js   | 52 +++++++++++-------
 .../static/src/app/services/pos_store.js      | 54 ++++---------------
 .../app/utils/devices_identifier_sequence.js  |  2 +-
 .../src/app/utils/devices_synchronisation.js  |  4 +-
 .../pos/tours/utils/payment_screen_util.js    |  2 +-
 .../static/tests/unit/data/pos_order.data.js  |  3 +-
 .../related_models/orm_serialization.test.js  |  4 +-
 .../related_models/related_models.test.js     |  6 +--
 .../unit/tools/server_synchronization.test.js | 54 +++++++++++++++++++
 .../event_configurator_popup.js               |  2 +-
 .../src/app/models/data_service_options.js    |  2 +-
 .../order_summary/order_summary.js            |  3 --
 .../static/src/app/models/pos_order.js        |  5 +-
 .../static/src/app/services/pos_store.js      |  6 +++
 .../src/app/utils/order_payment_validation.js |  2 +-
 .../payment_screen/payment_screen.js          |  2 +-
 .../src/app/models/data_service_options.js    |  3 +-
 .../src/app/models/restaurant_order_course.js |  3 --
 .../screens/ticket_screen/ticket_screen.js    |  2 +-
 .../src/app/screens/tip_screen/tip_screen.js  |  2 +-
 .../static/src/app/services/pos_store.js      |  2 +-
 .../src/app/utils/devices_synchronisation.js  |  4 +-
 .../models/restaurant_order_course.test.js    |  4 +-
 .../src/app/utils/order_payment_validation.js |  1 -
 .../static/src/app/models/pos_order.js        |  2 +-
 .../src/app/pages/cart_page/cart_page.js      |  2 +-
 .../confirmation_page/confirmation_page.js    |  2 +-
 .../src/app/services/self_order_service.js    |  2 +-
 .../static/src/overrides/models/pos_store.js  |  2 +-
 37 files changed, 179 insertions(+), 146 deletions(-)
 create mode 100644 addons/point_of_sale/static/tests/unit/tools/server_synchronization.test.js

diff --git a/addons/point_of_sale/static/src/app/models/data_service_options.js b/addons/point_of_sale/static/src/app/models/data_service_options.js
index 94dd491fd4e61..7567e7112e476 100644
--- a/addons/point_of_sale/static/src/app/models/data_service_options.js
+++ b/addons/point_of_sale/static/src/app/models/data_service_options.js
@@ -7,18 +7,17 @@ export class DataServiceOptions {
                 key: "uuid",
                 condition: (record) =>
                     record.finalized &&
-                    typeof record.id === "number" &&
+                    record.isSynced &&
                     record.pos_session_id !== parseInt(odoo.pos_session_id),
             },
             "pos.order.line": {
                 key: "uuid",
-                condition: (record) =>
-                    record.order_id?.finalized && typeof record.order_id.id === "number",
+                condition: (record) => record.order_id?.finalized && record.order_id.isSynced,
             },
             "pos.payment": {
                 key: "uuid",
                 condition: (record) =>
-                    record.pos_order_id?.finalized && typeof record.pos_order_id.id === "number",
+                    record.pos_order_id?.finalized && record.pos_order_id.isSynced,
             },
             "product.attribute.custom.value": {
                 key: "id",
diff --git a/addons/point_of_sale/static/src/app/models/pos_order.js b/addons/point_of_sale/static/src/app/models/pos_order.js
index 6551acb5f5136..0b9a62092a619 100644
--- a/addons/point_of_sale/static/src/app/models/pos_order.js
+++ b/addons/point_of_sale/static/src/app/models/pos_order.js
@@ -14,7 +14,7 @@ export class PosOrder extends PosOrderAccounting {
     setup(vals) {
         super.setup(vals);
 
-        if (!this.session_id?.id && (!this.finalized || typeof this.id !== "number")) {
+        if (!this.session_id?.id && (!this.finalized || !this.isSynced)) {
             this.session_id = this.session;
 
             if (this.state === "draft" && this.lines.length == 0 && this.payment_ids.length == 0) {
@@ -108,7 +108,7 @@ export class PosOrder extends PosOrderAccounting {
     }
 
     get isUnsyncedPaid() {
-        return this.finalized && typeof this.id === "string";
+        return this.finalized && !this.isSynced;
     }
 
     get originalSplittedOrder() {
@@ -200,7 +200,7 @@ export class PosOrder extends PosOrderAccounting {
     }
 
     get isBooked() {
-        return Boolean(this.uiState.booked || !this.isEmpty() || typeof this.id === "number");
+        return Boolean(this.uiState.booked || !this.isEmpty() || this.isSynced);
     }
 
     get hasChange() {
diff --git a/addons/point_of_sale/static/src/app/models/related_models/base.js b/addons/point_of_sale/static/src/app/models/related_models/base.js
index 0fa2be1ad68cd..d302ca254c5fe 100644
--- a/addons/point_of_sale/static/src/app/models/related_models/base.js
+++ b/addons/point_of_sale/static/src/app/models/related_models/base.js
@@ -20,6 +20,10 @@ export class Base extends WithLazyGetterTrap {
         return this[RAW_SYMBOL].id;
     }
 
+    get isSynced() {
+        return typeof this.id === "number";
+    }
+
     get raw() {
         return deepImmutable(clone(this[RAW_SYMBOL]), "Raw data cannot be modified");
     }
@@ -30,7 +34,7 @@ export class Base extends WithLazyGetterTrap {
      * @param {*} _vals
      */
     setup(_vals) {
-        this._dirty = typeof this.id !== "number";
+        this._dirty = !this.isSynced;
     }
 
     /**
diff --git a/addons/point_of_sale/static/src/app/models/related_models/index.js b/addons/point_of_sale/static/src/app/models/related_models/index.js
index fee8bafff7d7b..01925183e9741 100644
--- a/addons/point_of_sale/static/src/app/models/related_models/index.js
+++ b/addons/point_of_sale/static/src/app/models/related_models/index.js
@@ -233,7 +233,7 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
         }
 
         _sanitizeRawData(vals, options = {}) {
-            const { connectRecords = true, serverData = false } = options;
+            const { connectRecords = true, serverData = false, existingRecord = false } = options;
             let dataToConnect;
             if (!vals.uuid && database[this.name]?.key === "uuid") {
                 vals.uuid = uuidv4();
@@ -259,6 +259,12 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
                     }
                     const isX2Many = X2MANY_TYPES.has(field.type);
                     const rawValue = isX2Many ? new Set(value) : value;
+                    const data = existingRecord?.[field.name];
+                    let localIds = [];
+                    if (isX2Many && existingRecord && opts.databaseTable[field.relation]?.key) {
+                        localIds = data.filter((r) => r.isSynced === false)?.map((r) => r.id) || [];
+                    }
+
                     if (connectRecords) {
                         if (!dataToConnect) {
                             dataToConnect = {
@@ -267,14 +273,24 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
                             };
                         }
                         dataToConnect.updateFields[field.name] = value;
-                        if (serverData) {
+                        if (serverData && !isX2Many) {
                             dataToConnect.rawValues[field.name] = rawValue;
+                        } else if (serverData) {
+                            dataToConnect.rawValues[field.name] = new Set([
+                                ...localIds,
+                                ...rawValue,
+                            ]);
                         }
+
                         if (isX2Many) {
                             rawData[field.name] = new Set(); //Default value
                         }
                     } else {
-                        rawData[field.name] = rawValue;
+                        if (isX2Many) {
+                            rawData[field.name] = new Set([...localIds, ...rawValue]);
+                        } else {
+                            rawData[field.name] = rawValue;
+                        }
                     }
                 } else {
                     rawData[fieldName] = DATE_TIME_TYPE.has(field.type)
@@ -459,7 +475,7 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
             const id = record.id;
             const ownFields = getFields(this.name);
             const handleCommand = (inverse, field, record, backend = false) => {
-                if (inverse && !inverse.dummy && typeof id === "number") {
+                if (inverse && !inverse.dummy && record.isSynced) {
                     const modelCommands = commands[field.relation];
                     const map = backend ? modelCommands.delete : modelCommands.unlink;
                     const oldVal = map.get(inverse.name);
@@ -593,8 +609,6 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
                             uiState,
                             isUpdate = false;
                         if (existingRecord) {
-                            // Remove olds references (id string -> id number)
-                            recordStore.remove(existingRecord);
                             const {
                                 rawData,
                                 uiState: newUiState,
@@ -602,8 +616,11 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
                             } = modelInstance._sanitizeRawData(vals, {
                                 connectRecords,
                                 serverData,
+                                existingRecord,
                             });
 
+                            // Remove olds references (id string -> id number)
+                            recordStore.remove(existingRecord);
                             existingRecord[RAW_SYMBOL] = rawData;
                             recordStore.add(existingRecord);
                             if (dataToConnect) {
diff --git a/addons/point_of_sale/static/src/app/models/related_models/serialization.js b/addons/point_of_sale/static/src/app/models/related_models/serialization.js
index 2701ba38134e4..1598e0c225ca6 100644
--- a/addons/point_of_sale/static/src/app/models/related_models/serialization.js
+++ b/addons/point_of_sale/static/src/app/models/related_models/serialization.js
@@ -53,13 +53,13 @@ const deepSerialization = (
                         continue;
                     }
 
-                    if (typeof childRecord.id === "number" && childRecord._dirty) {
+                    if (childRecord.isSynced && childRecord._dirty) {
                         toUpdate.push(childRecord);
 
                         if (!opts.keepCommands) {
                             childRecord._dirty = false;
                         }
-                    } else if (typeof childRecord.id !== "number") {
+                    } else if (!childRecord.isSynced) {
                         toCreate.push(childRecord);
                     }
                     serialized[relatedModel][childRecord.uuid] = childRecord.uuid;
@@ -87,7 +87,7 @@ const deepSerialization = (
                 result[fieldName] = record[fieldName]
                     .filter((childRecord) => childRecord.id)
                     .map((childRecord) => {
-                        if (typeof childRecord.id !== "number") {
+                        if (!childRecord.isSynced) {
                             throw new Error(
                                 `Trying to create a non serializable record '${relatedModel}'`
                             );
@@ -142,7 +142,7 @@ const deepSerialization = (
                     record.uuid &&
                     serialized[relatedModel][record[fieldName].uuid]
                 ) {
-                    if (typeof recordId !== "number") {
+                    if (!record[fieldName].isSynced) {
                         //  mapping is only needed for newly created records
                         uuidMapping[targetModel][record.uuid] ??= {};
                         uuidMapping[targetModel][record.uuid][fieldName] = record[fieldName].uuid;
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
index 789b8889f2ff3..6a2d417571d02 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
@@ -88,7 +88,7 @@ export class ReceiptScreen extends Component {
         );
     async _sendReceiptToCustomer({ action, destination }) {
         const order = this.currentOrder;
-        if (typeof order.id !== "number") {
+        if (!order.isSynced) {
             this.dialog.add(ConfirmationDialog, {
                 title: _t("Unsynced order"),
                 body: _t(
diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/invoice_button/invoice_button.js b/addons/point_of_sale/static/src/app/screens/ticket_screen/invoice_button/invoice_button.js
index cd98ec7c226f7..7e33c550e2bff 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/invoice_button/invoice_button.js
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/invoice_button/invoice_button.js
@@ -34,15 +34,8 @@ export class InvoiceButton extends Component {
     }
     async _downloadInvoice(orderId) {
         try {
-            const result = await this.pos.data.callRelated(
-                "pos.order",
-                "read_pos_orders",
-                [[["id", "=", orderId]]],
-                {},
-                false,
-                true
-            );
-            const order = result["pos.order"][0];
+            const orders = await this.pos.data.loadServerOrders([["id", "=", orderId]]);
+            const order = orders[0];
             const accountMoveId = order.raw.account_move;
             if (accountMoveId) {
                 await this.invoiceService.downloadPdf(accountMoveId);
diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
index b29f36ae23428..43b6693916307 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
@@ -156,15 +156,8 @@ export class TicketScreen extends Component {
     async onClickScanOrder(qrcode) {
         if (qrcode) {
             const uuid = new URL(qrcode).searchParams.get("order_uuid");
-            const results = await this.pos.data.callRelated(
-                "pos.order",
-                "read_pos_orders",
-                [[["uuid", "=", uuid]]],
-                {},
-                false,
-                true
-            );
-            const order = results["pos.order"][0];
+            const orders = await this.pos.data.loadServerOrders([["uuid", "=", uuid]]);
+            const order = orders[0];
             if (order) {
                 this.state.filter = "SYNCED";
                 this.setSelectedOrder(order);
@@ -835,14 +828,9 @@ export class TicketScreen extends Component {
             .map((info) => info[0]);
 
         if (idsNotInCacheOrOutdated.length > 0) {
-            await this.pos.data.callRelated(
-                "pos.order",
-                "read_pos_orders",
-                [[["id", "in", Array.from(new Set(idsNotInCacheOrOutdated))]]],
-                {},
-                false,
-                true
-            );
+            await this.pos.data.loadServerOrders([
+                ["id", "in", Array.from(new Set(idsNotInCacheOrOutdated))],
+            ]);
         }
     }
     //#endregion
diff --git a/addons/point_of_sale/static/src/app/services/data_service.js b/addons/point_of_sale/static/src/app/services/data_service.js
index 65871ae4d2f6f..98b127ce637eb 100644
--- a/addons/point_of_sale/static/src/app/services/data_service.js
+++ b/addons/point_of_sale/static/src/app/services/data_service.js
@@ -451,10 +451,16 @@ export class PosData extends Reactive {
     }
 
     initListeners() {
-        this.models["pos.order"].addEventListener(
-            "update",
-            this.debouncedSynchronizeLocalDataInIndexedDB.bind(this)
-        );
+        for (const dynamicModel of this.opts.dynamicModels) {
+            if (!this.models[dynamicModel]) {
+                continue;
+            }
+
+            this.models[dynamicModel].addEventListener(
+                "update",
+                this.debouncedSynchronizeLocalDataInIndexedDB.bind(this)
+            );
+        }
 
         const ignore = Object.keys(this.opts.databaseTable);
         for (const model of Object.keys(this.relations)) {
@@ -776,23 +782,33 @@ export class PosData extends Reactive {
         this.syncInProgress = false;
     }
 
+    async loadServerOrders(domain) {
+        const result = await this.callRelated(
+            "pos.order",
+            "read_pos_orders",
+            [domain],
+            {},
+            false,
+            true
+        );
+        const config = this.models["pos.config"].get(odoo.pos_config_id);
+        const session = this.models["pos.session"].get(odoo.pos_session_id);
+        const orders = result["pos.order"] || [];
+        for (const order of orders) {
+            // Clear commands
+            order.serializeForORM();
+            order.config_id = config;
+            order.session_id = session;
+        }
+        return orders;
+    }
+
     async checkAndDeleteMissingOrders(results) {
         if (results && results["pos.order"]) {
-            const ids = new Set(
-                results["pos.order"].map((o) => o.id).filter((id) => typeof id === "number")
-            );
-
+            const ids = new Set(results["pos.order"].filter((o) => o.isSynced).map((o) => o.id));
             if (ids.size) {
-                const result = await this.callRelated(
-                    "pos.order",
-                    "read_pos_orders",
-                    [[["id", "in", [...ids]]]],
-                    {},
-                    false,
-                    true
-                );
-
-                const serverIds = result["pos.order"].map((r) => r.id);
+                const orders = await this.loadServerOrders([["id", "in", [...ids]]]);
+                const serverIds = orders.map((r) => r.id);
                 for (const id of [...ids]) {
                     if (!serverIds.includes(id)) {
                         this.localDeleteCascade(this.models["pos.order"].get(id));
diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index 026f9c2c4cf7a..e88c05b4081bd 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -340,7 +340,7 @@ export class PosStore extends WithLazyGetterTrap {
 
         try {
             const paidOrderNotSynced = this.models["pos.order"].filter(
-                (order) => order.state === "paid" && typeof order.id !== "number"
+                (order) => order.state === "paid" && !order.isSynced
             );
             this.addPendingOrder(paidOrderNotSynced.map((o) => o.id));
             await this.syncAllOrders({ throw: true });
@@ -359,7 +359,7 @@ export class PosStore extends WithLazyGetterTrap {
         } finally {
             // All orders saved on the server should be cancelled by the device that closes
             // the session. If some orders are not cancelled, we need to cancel them here.
-            const orders = this.models["pos.order"].filter((o) => typeof o.id === "number");
+            const orders = this.models["pos.order"].filter((o) => o.isSynced);
             for (const order of orders) {
                 if (!order.finalized) {
                     order.state = "cancel";
@@ -536,7 +536,7 @@ export class PosStore extends WithLazyGetterTrap {
             if (order && (await this._onBeforeDeleteOrder(order))) {
                 if (
                     !ignoreChange &&
-                    typeof order.id === "number" &&
+                    order.isSynced &&
                     Object.keys(order.last_order_preparation_change).length > 0
                 ) {
                     const orderPresetDate = DateTime.fromISO(order.preset_time);
@@ -553,7 +553,7 @@ export class PosStore extends WithLazyGetterTrap {
                 this.removePendingOrder(order);
                 if (!cancelled) {
                     return false;
-                } else if (typeof order.id === "number") {
+                } else if (order.isSynced) {
                     ids.add(order.id);
                 }
             } else {
@@ -610,14 +610,7 @@ export class PosStore extends WithLazyGetterTrap {
         const orderPathUuid = this.router.state.params.orderUuid;
         const order = this.models["pos.order"].find((order) => order.uuid === orderPathUuid);
         if (orderPathUuid && !order) {
-            await this.data.callRelated(
-                "pos.order",
-                "read_pos_orders",
-                [[["uuid", "=", orderPathUuid]]],
-                {},
-                false,
-                true
-            );
+            await this.data.loadServerOrders([["uuid", "=", orderPathUuid]]);
             const order = this.models["pos.order"].find((order) => order.uuid === orderPathUuid);
             if (order) {
                 this.setOrder(order);
@@ -1189,13 +1182,13 @@ export class PosStore extends WithLazyGetterTrap {
      */
     removeOrder(order, removeFromServer = true) {
         if (this.config.isShareable || removeFromServer) {
-            if (typeof order.id === "number" && !order.finalized) {
+            if (order.isSynced && !order.finalized) {
                 this.addPendingOrder([order.id], true);
                 this.syncAllOrdersDebounced();
             }
         }
 
-        if (typeof order.id === "string" && order.finalized) {
+        if (!order.isSynced && order.finalized) {
             this.addPendingOrder([order.id]);
             return;
         }
@@ -1274,8 +1267,6 @@ export class PosStore extends WithLazyGetterTrap {
 
         order.pos_reference = posReference;
         order.tracking_number = deviceIdentifier + `${parseInt(number) % 1000}`.padStart(3, "0");
-
-        this.data.debouncedSynchronizeLocalDataInIndexedDB();
     }
 
     selectNextOrder() {
@@ -1523,27 +1514,11 @@ export class PosStore extends WithLazyGetterTrap {
     }
     async getServerOrders() {
         await this.syncAllOrders();
-        return await this.loadServerOrders([
+        return await this.data.loadServerOrders([
             ["config_id", "in", [...this.config.raw.trusted_config_ids, this.config.id]],
             ["state", "=", "draft"],
         ]);
     }
-    async loadServerOrders(domain) {
-        const result = await this.data.callRelated(
-            "pos.order",
-            "read_pos_orders",
-            [domain],
-            {},
-            false,
-            true
-        );
-        const orders = result["pos.order"] || [];
-        for (const order of orders) {
-            order.config_id = this.config;
-            order.session_id = this.session;
-        }
-        return orders;
-    }
     async getProductInfo(productTemplate, quantity, priceExtra = 0, productProduct = false) {
         const order = this.getOrder();
         // check back-end method `get_product_info_pos` to see what it returns
@@ -1739,7 +1714,7 @@ export class PosStore extends WithLazyGetterTrap {
         if (!printBillActionTriggered) {
             if (result) {
                 const count = order.nb_print ? order.nb_print + 1 : 1;
-                if (typeof order.id === "number") {
+                if (order.isSynced) {
                     const wasDirty = order.isDirty();
                     await this.data.write("pos.order", [order.id], { nb_print: count });
                     if (!wasDirty) {
@@ -1767,7 +1742,7 @@ export class PosStore extends WithLazyGetterTrap {
         return changesToOrder(order, skipped, orderPreparationCategories, cancelled);
     }
     async checkPreparationStateAndSentOrderInPreparation(order, opts = {}) {
-        if (typeof order.id !== "number") {
+        if (!order.isSynced) {
             return this.sendOrderInPreparation(order, opts);
         }
 
@@ -2093,14 +2068,7 @@ export class PosStore extends WithLazyGetterTrap {
             resModel: "pos.order",
             resId: order.id,
             onRecordSaved: async (record) => {
-                await this.data.callRelated(
-                    "pos.order",
-                    "read_pos_orders",
-                    [[["id", "=", record.evalContext.id]]],
-                    {},
-                    false,
-                    true
-                );
+                await this.data.loadServerOrders([["id", "=", record.evalContext.id]]);
                 this.action.doAction({
                     type: "ir.actions.act_window_close",
                 });
diff --git a/addons/point_of_sale/static/src/app/utils/devices_identifier_sequence.js b/addons/point_of_sale/static/src/app/utils/devices_identifier_sequence.js
index 08ff916af5b01..680b935e5d6c6 100644
--- a/addons/point_of_sale/static/src/app/utils/devices_identifier_sequence.js
+++ b/addons/point_of_sale/static/src/app/utils/devices_identifier_sequence.js
@@ -99,7 +99,7 @@ export default class DeviceIdentifierSequence {
             return;
         }
         const numbers = orders
-            .filter((o) => typeof o.id === "string")
+            .filter((o) => !o.isSynced)
             .map((o) => this.extractNumberFromReference(o.pos_reference));
         const unsyncedNumberStack = new Set([...data.unsynced_number_stack, ...numbers]);
 
diff --git a/addons/point_of_sale/static/src/app/utils/devices_synchronisation.js b/addons/point_of_sale/static/src/app/utils/devices_synchronisation.js
index 9f288817b2644..976038ee3de05 100644
--- a/addons/point_of_sale/static/src/app/utils/devices_synchronisation.js
+++ b/addons/point_of_sale/static/src/app/utils/devices_synchronisation.js
@@ -90,7 +90,7 @@ export default class DevicesSynchronisation {
      * and synchronize the records with other devices.
      */
     async readDataFromServer() {
-        const serverOpenOrders = this.pos.getOpenOrders().filter((o) => typeof o.id === "number");
+        const serverOpenOrders = this.pos.getOpenOrders().filter((o) => o.isSynced);
         const { domain, recordIds } = this.constructOrdersDomain(serverOpenOrders);
         let response = {};
         try {
@@ -178,7 +178,7 @@ export default class DevicesSynchronisation {
 
         const recordIdsByModel = {};
         const domainByModel = Object.entries(recordsToCheck).reduce((acc, [model, records]) => {
-            const serverRecs = records.filter((r) => typeof r.id === "number");
+            const serverRecs = records.filter((r) => r.isSynced);
             const ids = serverRecs.map((r) => r.id);
             const config = this.pos.config;
             const domains = [];
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
index 16b0aede1742c..1086ca92042b2 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/payment_screen_util.js
@@ -400,7 +400,7 @@ export function syncCurrentOrder() {
                 const currentOrder = posmodel.getOrder();
                 const order = await posmodel.syncAllOrders({ orders: [currentOrder] });
 
-                if (typeof order[0].id !== "number") {
+                if (!order[0].isSynced) {
                     throw new Error("Order ID is not a number after sync.");
                 }
             },
diff --git a/addons/point_of_sale/static/tests/unit/data/pos_order.data.js b/addons/point_of_sale/static/tests/unit/data/pos_order.data.js
index 48c0ecec96100..48b07d1fd7292 100644
--- a/addons/point_of_sale/static/tests/unit/data/pos_order.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/pos_order.data.js
@@ -13,8 +13,7 @@ export class PosOrder extends models.ServerModel {
 
     read_pos_orders(domain) {
         const results = this.search(domain, this._load_pos_data_fields(), false);
-        const ids = results.filter((record) => record.state === "draft").map((record) => record.id);
-        return this.read_pos_data(ids);
+        return this.read_pos_data(results);
     }
 
     _load_pos_data_fields() {
diff --git a/addons/point_of_sale/static/tests/unit/related_models/orm_serialization.test.js b/addons/point_of_sale/static/tests/unit/related_models/orm_serialization.test.js
index 3e58b90464e65..0a25d7e69ee8a 100644
--- a/addons/point_of_sale/static/tests/unit/related_models/orm_serialization.test.js
+++ b/addons/point_of_sale/static/tests/unit/related_models/orm_serialization.test.js
@@ -388,7 +388,7 @@ test("recursive relationship with group of lines", async () => {
         const result = models.serializeForORM(order);
         expect(keepCommandResult).toEqual(result);
 
-        expect(result.lines.length).toBe(1);
+        expect(result.lines.length).toBe(2);
         expect(result.lines[0][0]).toBe(3);
         expect(result.lines[0][1]).toBe(111);
         expect(result.relations_uuid_mapping).toBe(undefined);
@@ -399,7 +399,7 @@ test("recursive relationship with group of lines", async () => {
         const keepCommandResult = models.serializeForORM(order, { keepCommands: true });
         const result = models.serializeForORM(order);
         expect(keepCommandResult).toEqual(result);
-        expect(result.lines).toBeEmpty();
+        expect(result.lines).toHaveLength(1);
     }
 });
 
diff --git a/addons/point_of_sale/static/tests/unit/related_models/related_models.test.js b/addons/point_of_sale/static/tests/unit/related_models/related_models.test.js
index 39d648fbd8aac..51f7c574f497a 100644
--- a/addons/point_of_sale/static/tests/unit/related_models/related_models.test.js
+++ b/addons/point_of_sale/static/tests/unit/related_models/related_models.test.js
@@ -20,7 +20,7 @@ describe("Related Model", () => {
 
         // Id and uuid are generated
         expect(order.id).not.toBeEmpty();
-        expect(typeof order.id).toBe("string");
+        expect(order.isSynced).toBe(false);
         expect(order.uuid).not.toBeEmpty();
 
         // The generated id and uuid must be the same
@@ -593,7 +593,7 @@ describe("Related Model", () => {
 
         expect(order.lines.length).toBe(1);
         const oldLineId = order.lines[0].id;
-        expect(typeof oldOrderId).toBe("string");
+        expect(order.isSynced).toBe(false);
         expect(models["pos.order"].get(oldOrderId)).not.toBeEmpty();
 
         models.connectNewData({
@@ -630,7 +630,7 @@ describe("Related Model", () => {
         await makeMockServer();
         const models = getRelatedModelsInstance(false);
         const order = models["pos.order"].create({ total: 30 });
-        expect(typeof order.id).toBe("string");
+        expect(order.isSynced).toBe(false);
         expect(models["pos.order"].get(order.id)).toBe(order);
         expect(models["pos.order"].getBy("uuid", order.uuid)).toBe(order);
 
diff --git a/addons/point_of_sale/static/tests/unit/tools/server_synchronization.test.js b/addons/point_of_sale/static/tests/unit/tools/server_synchronization.test.js
new file mode 100644
index 0000000000000..fe520bbee47ec
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/tools/server_synchronization.test.js
@@ -0,0 +1,54 @@
+import { describe, expect, test } from "@odoo/hoot";
+import { getFilledOrder, setupPosEnv } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+
+definePosModels();
+
+describe("server_synchronization.test.js", () => {
+    test("Related models must keep local records", async () => {
+        const store = await setupPosEnv();
+        const order = await getFilledOrder(store);
+        const product = store.models["product.template"].get(8);
+        expect(order.isSynced).toBe(false);
+        expect(order.lines.every((l) => l.isSynced === true)).toBe(false);
+        await store.syncAllOrders();
+        expect(order.isSynced).toBe(true);
+        expect(order.lines.every((l) => l.isSynced === true)).toBe(true);
+        await store.addLineToOrder(
+            {
+                product_tmpl_id: product,
+                qty: 1,
+            },
+            order
+        );
+        expect(order.lines.every((l) => l.isSynced === true)).toBe(false);
+
+        // Download the same order from server, the local unsynced line must be kept
+        await store.data.loadServerOrders([["id", "=", order.id]]);
+        expect(order.lines.every((l) => l.isSynced === true)).toBe(false);
+    });
+
+    test("Check behavior when deleting records", async () => {
+        const store = await setupPosEnv();
+        const order = await getFilledOrder(store);
+        expect(order.isSynced).toBe(false);
+        expect(order.lines.every((l) => l.isSynced === true)).toBe(false);
+        await store.syncAllOrders();
+        expect(order.isSynced).toBe(true);
+        expect(order.lines.every((l) => l.isSynced === true)).toBe(true);
+        order.removeOrderline(order.lines[0]);
+        expect(order.lines).toHaveLength(1);
+
+        // At this point if we download the same order from server,
+        // we must not lose the local deletion
+        await store.data.loadServerOrders([["id", "=", order.id]]);
+        expect(order.lines).toHaveLength(2);
+
+        // But if we sync before downloading, the deletion must be kept
+        order.removeOrderline(order.lines[0]);
+        expect(order.lines).toHaveLength(1);
+        await store.syncAllOrders({ orders: [order] });
+        await store.data.loadServerOrders([["id", "=", order.id]]);
+        expect(order.lines).toHaveLength(1);
+    });
+});
diff --git a/addons/pos_event/static/src/app/components/popup/event_configurator_popup/event_configurator_popup.js b/addons/pos_event/static/src/app/components/popup/event_configurator_popup/event_configurator_popup.js
index 7c57c69b11dc6..89a1aa379cef3 100644
--- a/addons/pos_event/static/src/app/components/popup/event_configurator_popup/event_configurator_popup.js
+++ b/addons/pos_event/static/src/app/components/popup/event_configurator_popup/event_configurator_popup.js
@@ -48,7 +48,7 @@ export class EventConfiguratorPopup extends Component {
         }
         const ticketAvailability = this.props.availabilityPerTicket[ticket.id][this.slotId];
         const existingUnsyncRegistration = this.pos.models["event.registration"].filter(
-            (r) => typeof r.id === "string" && r.event_slot_id.id === this.slotId
+            (r) => !r.isSynced && r.event_slot_id.id === this.slotId
         );
         if (ticketAvailability === "unlimited") {
             return ticket.event_id.seats_limited ? ticket.event_id.seats_available : "unlimited";
diff --git a/addons/pos_loyalty/static/src/app/models/data_service_options.js b/addons/pos_loyalty/static/src/app/models/data_service_options.js
index de29cdfcc217f..79dc15896f9fb 100644
--- a/addons/pos_loyalty/static/src/app/models/data_service_options.js
+++ b/addons/pos_loyalty/static/src/app/models/data_service_options.js
@@ -10,7 +10,7 @@ patch(DataServiceOptions.prototype, {
                 condition: (record) =>
                     record
                         .backLink("<-pos.order.line.coupon_id")
-                        .find((l) => !(l.order_id?.finalized && typeof l.order_id.id === "number")),
+                        .find((l) => !(l.order_id?.finalized && l.order_id.isSynced)),
             },
         };
     },
diff --git a/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.js b/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.js
index 4945b8d4884dd..0b2d2650b64fe 100644
--- a/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.js
+++ b/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.js
@@ -175,9 +175,6 @@ patch(OrderSummary.prototype, {
 
                 await this._updateGiftCardOrderline(code, points);
                 this.currentOrder.processGiftCard(code, points, expirationDate);
-
-                // update indexedDB
-                this.pos.data.debouncedSynchronizeLocalDataInIndexedDB();
             },
         });
     },
diff --git a/addons/pos_online_payment/static/src/app/models/pos_order.js b/addons/pos_online_payment/static/src/app/models/pos_order.js
index 65a185865f166..9e4ae77a1b49b 100644
--- a/addons/pos_online_payment/static/src/app/models/pos_order.js
+++ b/addons/pos_online_payment/static/src/app/models/pos_order.js
@@ -6,10 +6,7 @@ patch(PosOrder.prototype, {
     serializeForORM(opts) {
         // Avoid serializing online payments, as their creation is not allowed in the backend without "online_account_payment_id"
         const onlinePaymentUUIDs = this.payment_ids
-            .filter(
-                (payment) =>
-                    typeof payment.id !== "number" && payment.payment_method_id?.is_online_payment
-            )
+            .filter((payment) => !payment.isSynced && payment.payment_method_id?.is_online_payment)
             .map((payment) => payment.uuid);
 
         const serialized = super.serializeForORM(opts);
diff --git a/addons/pos_online_payment/static/src/app/services/pos_store.js b/addons/pos_online_payment/static/src/app/services/pos_store.js
index eb5e6c69ba55d..314917c4937aa 100644
--- a/addons/pos_online_payment/static/src/app/services/pos_store.js
+++ b/addons/pos_online_payment/static/src/app/services/pos_store.js
@@ -10,6 +10,12 @@ patch(PosStore.prototype, {
             // Therefore, no sensitive information is sent through it, only a
             // notification to invite the local browser to do a safe RPC to
             // the server to check the new state of the order.
+            const order = this.models["pos.order"].find((o) => o.id == id);
+            const orders = await this.data.loadServerOrders([["id", "=", id]]);
+            const updatedOrder = orders[0];
+            if (updatedOrder) {
+                order.state = updatedOrder.state;
+            }
             if (this.getOrder()?.id === id) {
                 this.updateOnlinePaymentsDataWithServer(this.getOrder(), false);
             }
diff --git a/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js b/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
index 7350238fb4294..4bc7dd2138e65 100644
--- a/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
+++ b/addons/pos_online_payment/static/src/app/utils/order_payment_validation.js
@@ -153,7 +153,7 @@ patch(OrderPaymentValidation.prototype, {
 
             await this.afterPaidOrderSavedOnServer(lastOrderServerOPData.paid_order);
             return false; // Cancel normal flow because the current order is already saved on the server.
-        } else if (typeof this.order.id === "number") {
+        } else if (this.order.isSynced) {
             const orderServerOPData = await this.pos.updateOnlinePaymentsDataWithServer(
                 this.order,
                 0
diff --git a/addons/pos_online_payment/static/src/overrides/pos_overrides/components/payment_screen/payment_screen.js b/addons/pos_online_payment/static/src/overrides/pos_overrides/components/payment_screen/payment_screen.js
index b531edff944e2..d65f36992f97f 100644
--- a/addons/pos_online_payment/static/src/overrides/pos_overrides/components/payment_screen/payment_screen.js
+++ b/addons/pos_online_payment/static/src/overrides/pos_overrides/components/payment_screen/payment_screen.js
@@ -4,7 +4,7 @@ import { serializeDateTime } from "@web/core/l10n/dates";
 
 patch(PaymentScreen.prototype, {
     async addNewPaymentLine(paymentMethod) {
-        if (paymentMethod.is_online_payment && typeof this.currentOrder.id === "string") {
+        if (paymentMethod.is_online_payment && !this.currentOrder.isSynced) {
             this.currentOrder.date_order = serializeDateTime(luxon.DateTime.now());
             this.pos.addPendingOrder([this.currentOrder.id]);
             await this.pos.syncAllOrders();
diff --git a/addons/pos_restaurant/static/src/app/models/data_service_options.js b/addons/pos_restaurant/static/src/app/models/data_service_options.js
index 1302981ce4eba..7452643addc87 100644
--- a/addons/pos_restaurant/static/src/app/models/data_service_options.js
+++ b/addons/pos_restaurant/static/src/app/models/data_service_options.js
@@ -7,8 +7,7 @@ patch(DataServiceOptions.prototype, {
             ...super.databaseTable,
             "restaurant.order.course": {
                 key: "uuid",
-                condition: (record) =>
-                    record.order_id?.finalized && typeof record.order_id.id === "number",
+                condition: (record) => record.order_id?.finalized && record.order_id.isSynced,
             },
         };
     },
diff --git a/addons/pos_restaurant/static/src/app/models/restaurant_order_course.js b/addons/pos_restaurant/static/src/app/models/restaurant_order_course.js
index 4bdaf8a6dc1b6..c844de4a1ee42 100644
--- a/addons/pos_restaurant/static/src/app/models/restaurant_order_course.js
+++ b/addons/pos_restaurant/static/src/app/models/restaurant_order_course.js
@@ -16,9 +16,6 @@ export class RestaurantOrderCourse extends Base {
     isReadyToFire() {
         return !this.fired && !this.isEmpty();
     }
-    isNew() {
-        return typeof this.id === "string";
-    }
 }
 
 registry
diff --git a/addons/pos_restaurant/static/src/app/screens/ticket_screen/ticket_screen.js b/addons/pos_restaurant/static/src/app/screens/ticket_screen/ticket_screen.js
index be8694a7e3d10..6bcba8478838e 100644
--- a/addons/pos_restaurant/static/src/app/screens/ticket_screen/ticket_screen.js
+++ b/addons/pos_restaurant/static/src/app/screens/ticket_screen/ticket_screen.js
@@ -51,7 +51,7 @@ patch(TicketScreen.prototype, {
         for (const order of this.getFilteredOrderList()) {
             const amount = this.env.utils.parseValidFloat(order.uiState.TipScreen.inputTipAmount);
 
-            if (typeof order.id === "string") {
+            if (!order.isSynced) {
                 logPosMessage(
                     "TicketScreen",
                     "settleTips",
diff --git a/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js b/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
index dc7b5ffcfdb56..0b67231a113f2 100644
--- a/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
+++ b/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
@@ -49,7 +49,7 @@ export class TipScreen extends Component {
     async validateTip() {
         const amount = this.env.utils.parseValidFloat(this.state.inputTipAmount);
         const order = this.pos.getOrder();
-        const serverId = typeof order.id === "number" && order.id;
+        const serverId = order.isSynced && order.id;
 
         if (!serverId) {
             this.dialog.add(AlertDialog, {
diff --git a/addons/pos_restaurant/static/src/app/services/pos_store.js b/addons/pos_restaurant/static/src/app/services/pos_store.js
index 431b957113270..f7c82173e010b 100644
--- a/addons/pos_restaurant/static/src/app/services/pos_store.js
+++ b/addons/pos_restaurant/static/src/app/services/pos_store.js
@@ -627,7 +627,7 @@ patch(PosStore.prototype, {
             startingValue: order.floating_order_name || "",
         });
         if (payload) {
-            if (typeof order.id == "number") {
+            if (order.isSynced) {
                 this.data.write("pos.order", [order.id], {
                     floating_order_name: payload,
                 });
diff --git a/addons/pos_restaurant/static/src/app/utils/devices_synchronisation.js b/addons/pos_restaurant/static/src/app/utils/devices_synchronisation.js
index dadc5c658996e..9e509d9b7d0f9 100644
--- a/addons/pos_restaurant/static/src/app/utils/devices_synchronisation.js
+++ b/addons/pos_restaurant/static/src/app/utils/devices_synchronisation.js
@@ -21,9 +21,9 @@ patch(DevicesSynchronisation.prototype, {
             if (orders.length > 1) {
                 // The only way to get here is if there is several waiters on the same table.
                 // In this case we take orderline of the local order and we add it to the synced order.
-                const localOrders = orders.filter((order) => typeof order.id !== "number");
+                const localOrders = orders.filter((order) => !order.isSynced);
                 const syncedOrder = orders
-                    .filter((order) => typeof order.id === "number")
+                    .filter((order) => order.isSynced)
                     .sort((a, b) => a.id - b.id);
 
                 if (
diff --git a/addons/pos_restaurant/static/tests/unit/models/restaurant_order_course.test.js b/addons/pos_restaurant/static/tests/unit/models/restaurant_order_course.test.js
index a4eee491d870f..42ee4c890c1c1 100644
--- a/addons/pos_restaurant/static/tests/unit/models/restaurant_order_course.test.js
+++ b/addons/pos_restaurant/static/tests/unit/models/restaurant_order_course.test.js
@@ -37,9 +37,9 @@ test("isReadyToFire", async () => {
     expect(course.isReadyToFire()).toBe(true);
 });
 
-test("isNew", async () => {
+test("isSynced", async () => {
     const store = await setupPosEnv();
     store.addNewOrder();
     const course = store.addCourse();
-    expect(course.isNew()).toBe(true);
+    expect(course.isSynced).toBe(false);
 });
diff --git a/addons/pos_sale/static/src/app/utils/order_payment_validation.js b/addons/pos_sale/static/src/app/utils/order_payment_validation.js
index adc801b2e5da1..d7b4b67234c77 100644
--- a/addons/pos_sale/static/src/app/utils/order_payment_validation.js
+++ b/addons/pos_sale/static/src/app/utils/order_payment_validation.js
@@ -12,7 +12,6 @@ patch(OrderPaymentValidation.prototype, {
                 "sale.order.line",
                 orders.flatMap((o) => o.order_line).map((ol) => ol.id)
             );
-            this.pos.data.debouncedSynchronizeLocalDataInIndexedDB(this.pos.data.records);
         }
         await super.afterOrderValidation();
     },
diff --git a/addons/pos_self_order/static/src/app/models/pos_order.js b/addons/pos_self_order/static/src/app/models/pos_order.js
index 4a9104ee70b9c..639219db63dd6 100644
--- a/addons/pos_self_order/static/src/app/models/pos_order.js
+++ b/addons/pos_self_order/static/src/app/models/pos_order.js
@@ -41,7 +41,7 @@ patch(PosOrder.prototype, {
     recomputeChanges() {
         const lines = this.lines;
         for (const line of lines) {
-            if (typeof line.id === "string") {
+            if (!line.isSynced) {
                 continue;
             }
 
diff --git a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
index 0fbc9836a1aae..f59feabe0fc49 100644
--- a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
+++ b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
@@ -34,7 +34,7 @@ export class CartPage extends Component {
         return (
             this.selfOrder.config.self_ordering_mode === "mobile" &&
             this.selfOrder.config.self_ordering_pay_after === "each" &&
-            typeof this.selfOrder.currentOrder.id === "number"
+            this.selfOrder.currentOrder.isSynced
         );
     }
 
diff --git a/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js b/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js
index eec4857751cea..28c081b683cc1 100644
--- a/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js
+++ b/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js
@@ -108,7 +108,7 @@ export class ConfirmationPage extends Component {
                     this.updateHasPaper(true);
                 }
                 order.nb_print = 1;
-                if (typeof order.id === "number" && result) {
+                if (order.isSynced && result) {
                     await rpc("/pos_self_order/kiosk/increment_nb_print/", {
                         access_token: this.selfOrder.access_token,
                         order_id: order.id,
diff --git a/addons/pos_self_order/static/src/app/services/self_order_service.js b/addons/pos_self_order/static/src/app/services/self_order_service.js
index f1b9fed6f0920..def6d78a9634d 100644
--- a/addons/pos_self_order/static/src/app/services/self_order_service.js
+++ b/addons/pos_self_order/static/src/app/services/self_order_service.js
@@ -649,7 +649,7 @@ export class SelfOrder extends Reactive {
     async getUserDataFromServer(tokens = []) {
         const tableIdentifier = this.router.getTableIdentifier([]);
         const dbAccessToken = this.models["pos.order"]
-            .filter((o) => o.state === "draft" && typeof o.id === "number")
+            .filter((o) => o.state === "draft" && o.isSynced)
             .map((order) => ({
                 access_token: order.access_token,
                 state: order.state,
diff --git a/addons/pos_self_order/static/src/overrides/models/pos_store.js b/addons/pos_self_order/static/src/overrides/models/pos_store.js
index e093643404681..375f97dd4670e 100644
--- a/addons/pos_self_order/static/src/overrides/models/pos_store.js
+++ b/addons/pos_self_order/static/src/overrides/models/pos_store.js
@@ -4,7 +4,7 @@ import { patch } from "@web/core/utils/patch";
 patch(PosStore.prototype, {
     async getServerOrders() {
         if (this.session._self_ordering) {
-            await this.loadServerOrders([
+            await this.data.loadServerOrders([
                 ["company_id", "=", this.config.company_id.id],
                 ["state", "=", "draft"],
                 ["source", "in", ["kiosk", "mobile"]],

From ce3eb4f7834d8327fd2c6e78d3e450d60a531343 Mon Sep 17 00:00:00 2001
From: "Thomas Josse (THJO)" <thjo@odoo.com>
Date: Wed, 8 Oct 2025 12:26:01 +0000
Subject: [PATCH 110/673] [IMP] mass_mailing: handle visual assets in builder

This commit adds a new bundle for stylesheets that are linked only to the visual
aspect inside the builder.
These assets aren't applied to the sent mail as they are only visual clues for
the user when editing the mailing.

task-4599334

X-original-commit: 47ccb45937965402eb881cd432e92ec8563039cd
Part-of: odoo/odoo#233760
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 addons/mass_mailing/__manifest__.py           |  7 ++-
 .../html_field/mass_mailing_html_field.js     | 14 ++---
 .../static/src/iframe/mass_mailing_iframe.js  | 51 ++++++++++++++----
 .../tests/mass_mailing_html_field.test.js     | 53 ++++++++++++++++++-
 4 files changed, 106 insertions(+), 19 deletions(-)

diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 80747e868c3f7..62a00dc95e278 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -115,11 +115,16 @@
             'web/static/src/scss/mimetypes.scss',
             'web/static/src/scss/ui.scss',
 
-            ('include', 'html_builder.assets_inside_builder_iframe'),
             ('include', 'mass_mailing.assets_mail_themes'),
             'mass_mailing/static/src/scss/mass_mailing_mail.scss',
             'mass_mailing/static/src/iframe_assets/**/*',
         ],
+        # style assets used to view the mail content in Odoo, but not used
+        # during html conversion, specific to the builder
+        'mass_mailing.assets_inside_builder_iframe': [
+            ('include', 'html_builder.assets_inside_builder_iframe'),
+            'mass_mailing/static/src/builder/**/*.inside.scss'
+        ],
         'mass_mailing.iframe_add_dialog': [
             'mass_mailing/static/src/builder/snippet_viewer/*.scss',
         ],
diff --git a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
index 9fe8aa65edc8f..f0d90800481e2 100644
--- a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
@@ -128,14 +128,10 @@ export class MassMailingHtmlField extends HtmlField {
         this.iframeLoaded = new Deferred();
     }
 
-    /**
-     * @returns {Boolean} whether the current iframe finished loading and is
-     *          still currently in use.
-     */
     async ensureIframeLoaded() {
         const iframeLoaded = this.iframeLoaded;
-        await iframeLoaded;
-        return iframeLoaded === this.iframeLoaded;
+        const iframeInfo = await iframeLoaded;
+        return iframeLoaded === this.iframeLoaded ? iframeInfo : undefined;
     }
 
     onIframeLoad(iframeLoaded) {
@@ -304,9 +300,11 @@ export class MassMailingHtmlField extends HtmlField {
      * @override
      */
     async updateValue(value) {
-        if (!(await this.ensureIframeLoaded())) {
+        const iframeInfo = await this.ensureIframeLoaded();
+        if (!iframeInfo) {
             return;
         }
+        const { bundleControls } = iframeInfo;
         this.lastValue = normalizeHTML(value, this.clearElementToCompare.bind(this));
         this.isDirty = false;
         const shouldRestoreDisplayNone = this.iframeRef.el.classList.contains("d-none");
@@ -318,11 +316,13 @@ export class MassMailingHtmlField extends HtmlField {
         const processingContainer = this.iframeRef.el.contentDocument.querySelector(
             ".o_mass_mailing_processing_container"
         );
+        bundleControls["mass_mailing.assets_inside_builder_iframe"]?.toggle(false);
         processingContainer.append(processingEl);
         const cssRules = getCSSRules(this.iframeRef.el.contentDocument);
         await toInline(processingEl, cssRules);
         const inlineValue = processingEl.innerHTML;
         processingEl.remove();
+        bundleControls["mass_mailing.assets_inside_builder_iframe"]?.toggle(true);
         this.iframeRef.el.style.width = "";
         if (shouldRestoreDisplayNone) {
             this.iframeRef.el.classList.add("d-none");
diff --git a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
index 7f1b38c112d05..0ee41d30de328 100644
--- a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
+++ b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
@@ -23,6 +23,10 @@ import { localization } from "@web/core/l10n/localization";
 import { isBrowserSafari } from "@web/core/browser/feature_detection";
 
 const IFRAME_VALUE_SELECTOR = ".o_mass_mailing_value";
+const MASS_MAILING_IFRAME_ASSETS = [
+    "mass_mailing.assets_iframe_style",
+    "mass_mailing.assets_inside_builder_iframe",
+];
 
 export class MassMailingIframe extends Component {
     static template = "mass_mailing.MassMailingIframe";
@@ -199,7 +203,7 @@ export class MassMailingIframe extends Component {
 
     async setupIframe() {
         this.iframeRef.el?.contentDocument.head.appendChild(this.renderHeadContent());
-        await this.loadIframeAssets();
+        this.bundleControls = await this.loadIframeAssets();
         if (status(this) === "destroyed") {
             return;
         }
@@ -225,7 +229,10 @@ export class MassMailingIframe extends Component {
         this.iframeRef.el.contentWindow.addEventListener("beforeUnload", () => {
             this.iframeRef.el.removeAttribute("is-ready");
         });
-        this.iframeLoaded.resolve(this.iframeRef.el);
+        this.iframeLoaded.resolve({
+            iframe: this.iframeRef.el,
+            bundleControls: this.bundleControls,
+        });
         this.props.onIframeLoad?.(this.iframeLoaded);
         this.state.ready = true;
     }
@@ -267,14 +274,38 @@ export class MassMailingIframe extends Component {
         );
     }
 
+    /**
+     * @returns {Object} bundleControls { bundleName: activatorObject }
+     */
     async loadIframeAssets() {
-        await Promise.all([
-            loadBundle("mass_mailing.assets_iframe_style", {
-                targetDoc: this.iframeRef.el.contentDocument,
-                css: true,
-                js: false,
-            }),
-        ]);
+        const bundleEntryPromises = MASS_MAILING_IFRAME_ASSETS.map(async (bundle) => {
+            const targets = (
+                await loadBundle(bundle, {
+                    targetDoc: this.iframeRef.el.contentDocument,
+                    css: true,
+                    js: false,
+                })
+            ).map((bundleEvent) => bundleEvent.target);
+            const iframe = this.iframeRef.el;
+            return [
+                bundle,
+                {
+                    toggle(enable = false) {
+                        if (!iframe?.isConnected) {
+                            return;
+                        }
+                        for (const target of targets) {
+                            if (enable && !iframe.contentDocument.head.contains(target)) {
+                                iframe.contentDocument.head.appendChild(target);
+                            } else if (!enable && iframe.contentDocument.head.contains(target)) {
+                                target.remove();
+                            }
+                        }
+                    },
+                },
+            ];
+        });
+        return Object.fromEntries(await Promise.all(bundleEntryPromises));
     }
 
     onBlur(ev) {
@@ -294,7 +325,7 @@ export class MassMailingIframe extends Component {
     getBuilderProps() {
         return {
             overlayRef: this.overlayRef,
-            iframeLoaded: this.iframeLoaded,
+            iframeLoaded: this.iframeLoaded.then((iframeInfo) => iframeInfo.iframe),
             snippetsName: "mass_mailing.email_designer_snippets",
             config: this.props.config,
             isMobile: this.state.isMobile,
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
index f3975f0366b5b..ea662f09f3ea9 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
@@ -111,12 +111,30 @@ const readonlyMailViewArch = `
 </form>
 `;
 
+/**
+ * @type {MassMailingHtmlField}
+ */
+let htmlField;
 describe.current.tags("desktop");
+beforeEach(() => {
+    patchWithCleanup(MassMailingHtmlField.prototype, {
+        setup() {
+            super.setup();
+            htmlField = this;
+        },
+    });
+});
 describe("field HTML", () => {
     beforeEach(() => {
         patchWithCleanup(MassMailingIframe.prototype, {
             // Css assets are not needed for these tests.
-            loadIframeAssets() {},
+            loadIframeAssets() {
+                return {
+                    "mass_mailing.assets_inside_builder_iframe": {
+                        toggle: () => {},
+                    },
+                };
+            },
         });
     });
     test("save arch and html", async () => {
@@ -198,3 +216,36 @@ describe("field HTML", () => {
         await waitFor(overlayOptionsSelect + ":not(:has(button[title='Move up']))");
     });
 });
+describe("field HTML: with loaded assets", () => {
+    test("Ensure style bundles loaded in the `MassMailingIframe` can be toggled On or Off", async () => {
+        await mountView({
+            type: "form",
+            resModel: "mailing.mailing",
+            resId: 1,
+            arch: mailViewArch,
+        });
+        await click(waitFor(".o_mailing_template_preview_wrapper a[data-name='default']"));
+        await waitFor(".o_mass_mailing_iframe_wrapper iframe:not(.d-none)");
+        const { bundleControls } = await htmlField.ensureIframeLoaded();
+
+        expect(
+            htmlField.iframeRef.el.contentDocument.head.querySelectorAll(
+                '[href*="mass_mailing.assets_inside_builder_iframe"]'
+            )
+        ).toHaveLength(1);
+
+        bundleControls["mass_mailing.assets_inside_builder_iframe"].toggle(false);
+        expect(
+            htmlField.iframeRef.el.contentDocument.head.querySelectorAll(
+                '[href*="mass_mailing.assets_inside_builder_iframe"]'
+            )
+        ).toHaveLength(0);
+
+        bundleControls["mass_mailing.assets_inside_builder_iframe"].toggle(true);
+        expect(
+            htmlField.iframeRef.el.contentDocument.head.querySelectorAll(
+                '[href*="mass_mailing.assets_inside_builder_iframe"]'
+            )
+        ).toHaveLength(1);
+    });
+});

From 438ec1aafd3120483a3166084e71a8069f65b497 Mon Sep 17 00:00:00 2001
From: "Thomas Josse (THJO)" <thjo@odoo.com>
Date: Thu, 2 Oct 2025 09:47:34 +0000
Subject: [PATCH 111/673] [IMP] mass_mailing, web: add conditional visibility
 on snippets

This commit adds an option in the new Mail Builder to enable users to only show
elements based on a domain on the recipients.

This option uses the DomainSelectorDialog so that the user has an easier time
working on it. The resModel is the model chosen by the user for the whole
mailing limiting the choice of fields to a limited list. The option populates a
data attribute: `data-filter-domain` that is supposed to contain a valid domain
notation. When processing the htmlField to be inlined, we process each elements
that contains the data attribute and set the `t-if` attribute accordingly.

If the domain stored isn't valid, the attribute is set to `false`. We prefer to
not show elements that could be reserved to a subset of a recipients.

If the domain is valid, then the attribute is set to
`object.filtered_domain([data-filter-domain])`. This enables us to easily create
QWeb conditions on the mailing that will be interpreted by the render mixin on
each recipients.

The resulting processed body is then returned to be fed to the rest of the
sending process.

task-4599334

closes odoo/odoo#233760

X-original-commit: 15a3e15fe9c1bcb2f069bac7c8a1608ec27dd03f
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../snippet_visibility_option.inside.scss     | 14 ++++
 .../options/snippet_visibility_option.js      | 79 +++++++++++++++++++
 .../options/snippet_visibility_option.xml     | 27 +++++++
 .../snippet_visibility_option_plugin.js       | 41 ++++++++++
 .../html_field/mass_mailing_html_field.js     | 21 +++++
 .../tests/mass_mailing_html_field.test.js     | 45 ++++++++++-
 .../src/core/tree_editor/tree_processor.js    | 28 +++++--
 7 files changed, 247 insertions(+), 8 deletions(-)
 create mode 100644 addons/mass_mailing/static/src/builder/options/snippet_visibility_option.inside.scss
 create mode 100644 addons/mass_mailing/static/src/builder/options/snippet_visibility_option.js
 create mode 100644 addons/mass_mailing/static/src/builder/options/snippet_visibility_option.xml
 create mode 100644 addons/mass_mailing/static/src/builder/plugins/snippet_visibility_option_plugin.js

diff --git a/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.inside.scss b/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.inside.scss
new file mode 100644
index 0000000000000..c04d475824435
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.inside.scss
@@ -0,0 +1,14 @@
+section[data-filter-domain]:not([data-filter-domain="[]"]) {
+    position: relative;
+    & > *:first-child::before {
+        right: 20px; // See Website for indicator values.
+        top: 0;
+        pointer-events: none;
+        opacity: 50%;
+        position: absolute;
+        font-family: "FontAwesome";
+        content: "\f070";
+        font-size: xx-large;
+        color: $o-we-color-accent;
+    }
+}
diff --git a/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.js b/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.js
new file mode 100644
index 0000000000000..5fa7661557711
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.js
@@ -0,0 +1,79 @@
+import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
+import { Domain } from "@web/core/domain";
+import { DomainSelectorDialog } from "@web/core/domain_selector_dialog/domain_selector_dialog";
+import { useService } from "@web/core/utils/hooks";
+
+/**
+ * Option Component to enable the user to filter some snippets to a specific subset of ids following
+ * a domain.
+ */
+export class SnippetVisibilityOption extends BaseOptionComponent {
+    static template = "mass_mailing.VisibilityOption";
+    static selector = "section";
+    static dependencies = ["mass_mailing.SnippetVisibility"];
+
+    setup() {
+        super.setup();
+        this.getModel = this.dependencies["mass_mailing.SnippetVisibility"].getModel;
+        this.treeProcessor = useService("tree_processor");
+        this.dialog = useService("dialog");
+        this.historyPlugin = this.env.editor.shared.history;
+        this.overlayButtonsPlugin = this.env.editor.shared.overlayButtons;
+
+        this.state = useDomState((editingElement) => {
+            const currentDomain = new Domain(
+                JSON.parse(editingElement.dataset.filterDomain || "[]")
+            );
+            this.parseTree(currentDomain);
+            return {
+                domain: currentDomain,
+            };
+        });
+    }
+
+    get stringifiedDomain() {
+        return JSON.stringify(this.state.domain.toJson());
+    }
+
+    /**
+     *
+     * @param {import("@web/core/tree_editor/condition_tree").Tree} tree
+     */
+    async parseTree(domain) {
+        const resModel = this.getModel();
+        const tree = await this.treeProcessor.treeFromDomain(resModel, domain, !this.env.debug);
+        // Extract subtrees connected by an `&`, Odoo Standard for domain facets
+        const trees = !tree.negate && tree.value === "&" ? tree.children : [tree];
+        this.state.facets = await Promise.all(
+            trees.map((tree) =>
+                this.treeProcessor.getDomainTreeDescription(resModel, tree, false, 2, 1)
+            )
+        );
+    }
+
+    onClickEditDomain() {
+        this.overlayButtonsPlugin.hideOverlayButtonsUi();
+        this.dialog.add(
+            DomainSelectorDialog,
+            {
+                resModel: this.getModel(),
+                domain: this.state.domain.toString(),
+                isDebugMode: !!this.env.debug,
+                onConfirm: (domain) => {
+                    const newDomain = new Domain(domain);
+                    this.state.domain = newDomain;
+                    this.env.getEditingElement().dataset.filterDomain = JSON.stringify(
+                        this.state.domain.toJson()
+                    );
+                    this.parseTree(newDomain);
+                    this.historyPlugin.addStep();
+                },
+            },
+            {
+                onClose: () => {
+                    this.overlayButtonsPlugin.showOverlayButtonsUi();
+                },
+            }
+        );
+    }
+}
diff --git a/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.xml b/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.xml
new file mode 100644
index 0000000000000..5410f17999932
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/options/snippet_visibility_option.xml
@@ -0,0 +1,27 @@
+<templates>
+    <t t-name="mass_mailing.VisibilityOption">
+        <BuilderRow label.translate="Visibility">
+            <BuilderSelect dataAttributeAction="'filterDomain'">
+                <BuilderSelectItem dataAttributeActionValue="''">Always Visible</BuilderSelectItem>
+                <BuilderSelectItem dataAttributeActionValue="this.stringifiedDomain" id="'show_domain_selector'">Conditionally</BuilderSelectItem>
+            </BuilderSelect>
+        </BuilderRow>
+        <BuilderContext t-if="this.isActiveItem('show_domain_selector')">
+            <BuilderRow level="1" label.translate="Domain" extraLabelClass="'align-self-end'">
+                <div class="d-flex flex-column">
+                    <div class="d-inline-flex align-items-center pt-1" t-foreach="this.state.facets || []" t-as="facet" t-key="facet_index">
+                        <span class="fa fa-filter pe-1"/>
+                        <span t-out="facet"/>
+                    </div>
+                </div>
+            </BuilderRow>
+            <!-- Trick to have the content of two rows on the same level -->
+            <BuilderRow label.translate=" ">
+                <button class="btn btn-secondary me-auto mt-1" t-on-click="this.onClickEditDomain">
+                    <t t-if="this.state.facets?.length">Add Conditions</t>
+                    <t t-else="">Edit Conditions</t>
+                </button>
+            </BuilderRow>
+        </BuilderContext>
+    </t>
+</templates>
diff --git a/addons/mass_mailing/static/src/builder/plugins/snippet_visibility_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/snippet_visibility_option_plugin.js
new file mode 100644
index 0000000000000..a2aea0146710d
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/plugins/snippet_visibility_option_plugin.js
@@ -0,0 +1,41 @@
+import { Plugin } from "@html_editor/plugin";
+import { registry } from "@web/core/registry";
+import { SnippetVisibilityOption } from "../options/snippet_visibility_option";
+import { withSequence } from "@html_editor/utils/resource";
+import { effect } from "@web/core/utils/reactive";
+
+class SnippetVisibilityPlugin extends Plugin {
+    static id = "mass_mailing.SnippetVisibility";
+    static shared = ["getModel"];
+
+    resources = {
+        builder_options: [withSequence(Infinity, SnippetVisibilityOption)],
+    };
+    setup() {
+        this.mailingModelId = this.config.record.data.mailing_model_id.id;
+        effect(
+            (record) => {
+                if (this.isDestroyed) {
+                    return;
+                }
+                if (record.data.mailing_model_id.id !== this.mailingModelId) {
+                    this.mailingModelId = record.data.mailing_model_id.id;
+                    this.resetFilterDomains();
+                }
+            },
+            [this.config.record]
+        );
+    }
+
+    getModel() {
+        return this.config.record.data.mailing_model_real;
+    }
+
+    resetFilterDomains() {
+        const filteredElements = this.editable.querySelectorAll("[data-filter-domain]");
+        filteredElements.forEach((el) => el.removeAttribute("data-filter-domain"));
+        this.dispatchTo("trigger_dom_updated");
+    }
+}
+
+registry.category("mass_mailing-plugins").add(SnippetVisibilityPlugin.id, SnippetVisibilityPlugin);
diff --git a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
index f0d90800481e2..927b379845b5e 100644
--- a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
@@ -12,6 +12,7 @@ import { registry } from "@web/core/registry";
 import { Deferred } from "@web/core/utils/concurrency";
 import { effect } from "@web/core/utils/reactive";
 import { useChildRef, useService } from "@web/core/utils/hooks";
+import { Domain } from "@web/core/domain";
 
 export class MassMailingHtmlField extends HtmlField {
     static template = "mass_mailing.HtmlField";
@@ -220,6 +221,7 @@ export class MassMailingHtmlField extends HtmlField {
         delete config.Plugins;
         return {
             ...config,
+            record: this.props.record,
             mobileBreakpoint: "md",
             defaultImageMimetype: "image/jpeg",
             onEditorReady: () => this.commitChanges(),
@@ -318,6 +320,7 @@ export class MassMailingHtmlField extends HtmlField {
         );
         bundleControls["mass_mailing.assets_inside_builder_iframe"]?.toggle(false);
         processingContainer.append(processingEl);
+        this.preprocessFilterDomains(processingEl);
         const cssRules = getCSSRules(this.iframeRef.el.contentDocument);
         await toInline(processingEl, cssRules);
         const inlineValue = processingEl.innerHTML;
@@ -335,6 +338,24 @@ export class MassMailingHtmlField extends HtmlField {
             .catch(() => (this.isDirty = true));
         this.props.record.model.bus.trigger("FIELD_IS_DIRTY", this.isDirty);
     }
+    /**
+     * Processes the data-filter-domain to be converted to a t-if that will be interpreted on send
+     * by QWeb.
+     * TODO EGGMAIL: move in a convert_inline plugin when they are implemented.
+     * @param {HTMLElement} htmlEl
+     */
+    preprocessFilterDomains(htmlEl) {
+        htmlEl.querySelectorAll("[data-filter-domain]").forEach((el) => {
+            let domain;
+            try {
+                domain = new Domain(JSON.parse(el.dataset.filterDomain));
+            } catch {
+                el.setAttribute("t-if", "false");
+                return;
+            }
+            el.setAttribute("t-if", `object.filtered_domain(${domain.toString()})`);
+        });
+    }
 }
 
 export const massMailingHtmlField = {
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
index ea662f09f3ea9..a111c68bc5a7a 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
@@ -9,10 +9,12 @@ import {
     patchWithCleanup,
     contains,
 } from "@web/../tests/web_test_helpers";
-import { click, queryOne, waitFor } from "@odoo/hoot-dom";
+import { click, queryAny, queryOne, waitFor } from "@odoo/hoot-dom";
+import { runAllTimers } from "@odoo/hoot-mock";
 import { defineMailModels } from "@mail/../tests/mail_test_helpers";
 import { unmockedOrm } from "@web/../tests/_framework/module_set.hoot";
 import { MassMailingIframe } from "../src/iframe/mass_mailing_iframe";
+import { MassMailingHtmlField } from "../src/fields/html_field/mass_mailing_html_field";
 
 class Mailing extends models.Model {
     _name = "mailing.mailing";
@@ -22,8 +24,20 @@ class Mailing extends models.Model {
     body_arch = fields.Html();
     body_html = fields.Html();
     mailing_model_id = fields.Many2one({ relation: "ir.model", string: "Recipients" });
+    mailing_model_real = fields.Char({
+        string: "Recipients Model Name (real)",
+        compute: "compute_model_real",
+    });
     mailing_model_name = fields.Char({ string: "Recipients Model Name" });
 
+    compute_model_real() {
+        for (const record of this) {
+            record.mailing_model_real = this.env["ir.model"].browse([
+                record.mailing_model_id,
+            ])[0].model;
+        }
+    }
+
     action_fetch_favorites() {
         return [];
     }
@@ -92,7 +106,8 @@ const mailViewArch = `
 <form>
     <field name="mailing_model_name" invisible="1"/>
     <field name="mailing_model_id" invisible="1"/>
-    <field name="body_html" invisible="1"/>
+    <field name="mailing_model_real" invisible="1"/>
+    <field name="body_html" class="o_mail_body_inline"/>
     <field name="body_arch" class="o_mail_body_mailing" widget="mass_mailing_html"
         options="{ 'inline_field': 'body_html' }"/>
 </form>
@@ -215,6 +230,32 @@ describe("field HTML", () => {
         await contains(".o_dialog :iframe img").click();
         await waitFor(overlayOptionsSelect + ":not(:has(button[title='Move up']))");
     });
+    test("preprocess some domain", async () => {
+        await mountView({
+            type: "form",
+            resModel: "mailing.mailing",
+            resId: 1,
+            arch: mailViewArch,
+        });
+        await click(waitFor(".o_mailing_template_preview_wrapper a[data-name='default']"));
+        await waitFor(".o_mass_mailing_iframe_wrapper iframe:not(.d-none)");
+        expect(await waitFor(":iframe .o_layout", { timeout: 3000 })).toHaveClass(
+            "o_default_theme"
+        );
+        await runAllTimers();
+        const section = queryAny(":iframe section");
+        section.dataset.filterDomain = JSON.stringify([["id", "=", 1]]);
+        htmlField.editor.shared["history"].addStep();
+        await click(section);
+        await waitFor(".hb-row .hb-row-label span:contains(Domain)");
+        expect(queryOne(".hb-row span.fa-filter + span").textContent.toLowerCase()).toBe("id = 1");
+        await clickSave();
+        await waitFor("table[t-if]");
+        expect(queryOne("table[t-if]")).toHaveAttribute(
+            "t-if",
+            'object.filtered_domain([("id", "=", 1)])'
+        );
+    });
 });
 describe("field HTML: with loaded assets", () => {
     test("Ensure style bundles loaded in the `MassMailingIframe` can be toggled On or Off", async () => {
diff --git a/addons/web/static/src/core/tree_editor/tree_processor.js b/addons/web/static/src/core/tree_editor/tree_processor.js
index 9d60bb8494768..928dc85333e08 100644
--- a/addons/web/static/src/core/tree_editor/tree_processor.js
+++ b/addons/web/static/src/core/tree_editor/tree_processor.js
@@ -174,14 +174,19 @@ export const treeProcessorService = {
             return Object.fromEntries(zip(resModels, await Promise.all(proms)));
         }
 
-        async function makeGetPathDescriptions(resModel, tree) {
+        async function makeGetPathDescriptions(resModel, tree, limit) {
             const paths = getPathsInTree(tree);
             const promises = [];
             const pathDescriptions = new Map();
             for (const path of paths) {
                 promises.push(
                     fieldService.loadPathDescription(resModel, path).then(({ displayNames }) => {
-                        pathDescriptions.set(path, displayNames.join(" \u2794 "));
+                        pathDescriptions.set(
+                            path,
+                            `${displayNames.slice(0, limit).join(" \u2794 ")}${
+                                displayNames.length > limit ? "..." : ""
+                            }`
+                        );
                     })
                 );
             }
@@ -189,11 +194,11 @@ export const treeProcessorService = {
             return (path) => pathDescriptions.get(path);
         }
 
-        async function makeGetConditionDescription(resModel, tree, limit) {
+        async function makeGetConditionDescription(resModel, tree, limit, pathLimit) {
             tree = simplifyTree(tree);
             const [getFieldDef, getPathDescription] = await Promise.all([
                 makeGetFieldDef(resModel, tree),
-                makeGetPathDescriptions(resModel, tree),
+                makeGetPathDescriptions(resModel, tree, pathLimit),
             ]);
             const displayNames = await getDisplayNames(tree, getFieldDef);
             return (node) =>
@@ -289,7 +294,13 @@ export const treeProcessorService = {
             return description;
         }
 
-        async function getDomainTreeDescription(resModel, tree, isSubExpression = false) {
+        async function getDomainTreeDescription(
+            resModel,
+            tree,
+            isSubExpression = false,
+            limit = undefined,
+            pathLimit = undefined
+        ) {
             tree = simplifyTree(tree);
             if (tree.type === "connector") {
                 // we assume that the domain tree is normalized (--> there is at least two children)
@@ -308,7 +319,12 @@ export const treeProcessorService = {
                 return description;
             }
             const getFieldDef = await makeGetFieldDef(resModel, tree);
-            const getConditionDescription = await makeGetConditionDescription(resModel, tree);
+            const getConditionDescription = await makeGetConditionDescription(
+                resModel,
+                tree,
+                limit,
+                pathLimit
+            );
             const { pathDescription, operatorDescription, valueDescription } =
                 getConditionDescription(tree);
             const stringDescription = [pathDescription, operatorDescription];

From 51a183c429d764a5f4dc3fc455de894ef125274e Mon Sep 17 00:00:00 2001
From: std-odoo <std@odoo.com>
Date: Fri, 31 Oct 2025 09:06:05 +0100
Subject: [PATCH 112/673] [FIX] crm: we don't have `/crm` in the URL anymore

Bug
===
Since b422372df8274db923aff53d624b83dcfdbc6605 , the action has been
refactored, but we forgot to set the `path` field on the action.

Task-5225750

closes odoo/odoo#233901

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/views/crm_lead_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index fcde3cf1856ef..859de2db2240f 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -1201,6 +1201,7 @@
 
         <record model="ir.actions.act_window" id="crm_lead_action_pipeline">
             <field name="name">Pipeline</field>
+            <field name="path">crm</field>
             <field name="res_model">crm.lead</field>
             <field name="view_mode">kanban,list,graph,pivot,form,calendar,activity</field>
             <field name="domain">[('type','=','opportunity')]</field>

From 07e34e7cdbf159fe5674098a4501afcd65c6294f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Belpaire?= <beje@odoo.com>
Date: Mon, 22 Sep 2025 17:11:35 +0200
Subject: [PATCH 113/673] [IMP] mail: enable filtering by activities done_date

Previously it was difficult for a user to filter views based on the
done_dat of an activity. This was because when activities are marked
as done, they are archived.

The solution is to allow archived activities when a user explicitly
searches for done_date in his filter. This improves user experience
both for searching in the 'my activities' view as in views that are
related to activities.

Note: also changed all the tests to post_install as this is the new
default.

Task-5072433

closes odoo/odoo#229091

Signed-off-by: Florian Charlier (flch) <flch@odoo.com>
---
 addons/mail/models/mail_activity.py           | 26 +++++-
 .../tests/test_mail_activity_mixin.py         | 85 ++++++++++++++++++-
 2 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index a62699cd61f60..75b3c5df5e986 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -10,6 +10,7 @@
 
 from odoo import api, fields, models, _
 from odoo.exceptions import AccessError
+from odoo.fields import Domain
 from odoo.tools import is_html_empty
 from odoo.tools.misc import clean_context, get_lang, groupby
 from odoo.addons.mail.tools.discuss import Store
@@ -364,11 +365,28 @@ def unlink(self):
 
     @api.model
     def _search(self, domain, offset=0, limit=None, order=None, *, bypass_access=False, **kwargs):
-        """ Override that adds specific access rights of mail.activity, to remove
-        ids uid could not see according to our custom rules. Please refer to
-        :meth:`_check_access` for more details about those rules.
+        """Implement custom access rules and `active_test` behavior.
 
-        The method is inspired by what has been done on mail.message. """
+        This method enhances the standard search in two ways:
+
+        1.  **Archived Records Search**: If the search domain includes a filter on
+            the 'Done Date' (`date_done`) field, the search automatically includes
+            archived records (`active_test=False`). This allows users to find
+            past activities that have been completed and subsequently archived.
+
+        2.  **Custom Access Rights**: It filters search results to only include
+            activities the current user is allowed to see. An activity is
+            accessible if the user is the assignee (`user_id`), or if they have
+            read access to the related document (`res_model`, `res_id`). This
+            logic is detailed in :meth:`~._check_access`.
+            Superusers bypass this and perform a standard search.
+        """
+
+        if any(
+            condition.field_expr == 'date_done' and condition.value
+            for condition in Domain(domain).iter_conditions()
+        ):
+            kwargs['active_test'] = False
 
         # Rules do not apply to administrator
         if self.env.is_superuser() or bypass_access:
diff --git a/addons/test_mail/tests/test_mail_activity_mixin.py b/addons/test_mail/tests/test_mail_activity_mixin.py
index 8a3b877b532e4..d7d9c857f8dbb 100644
--- a/addons/test_mail/tests/test_mail_activity_mixin.py
+++ b/addons/test_mail/tests/test_mail_activity_mixin.py
@@ -15,7 +15,6 @@
 
 
 @tagged('mail_activity', 'mail_activity_mixin')
-@tagged('at_install', '-post_install')  # LEGACY at_install
 class TestActivityMixin(TestActivityCommon):
 
     @classmethod
@@ -533,6 +532,89 @@ def test_mail_activity_mixin_search_state_different_day_but_close_time(self):
             result = self.env['mail.test.activity'].search([('activity_state', '=', 'today')])
             self.assertNotIn(origin_1, result, 'The activity state miss calculated during the search')
 
+    @freeze_time("2025-09-15 10:00:00")
+    def test_mail_activity_mixin_search_done_and_archived(self):
+        """Test both directly and through related records"""
+
+        archived_record = self.env['mail.test.activity'].create({'name': 'Archived Test Record', 'active': False})
+        common_values = {
+                'res_model_id': self.env['ir.model']._get_id('mail.test.activity'),
+                'user_id': self.user_employee.id,
+                'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
+                'date_deadline': '2025-09-03',
+                }
+
+        active_activity, done_activity, done_activity_on_archived_record = self.env['mail.activity'].create([
+            common_values | {'summary': summary, 'res_id': res_id}
+            for summary, res_id in [
+                ("Active To-Do", self.test_record.id),
+                ("Done To-Do", self.test_record.id),
+                ("Done To-Do on Archived Record", archived_record.id),
+            ]
+        ])
+        (done_activity + done_activity_on_archived_record).action_done()
+
+        all_activities = active_activity + done_activity + done_activity_on_archived_record
+        all_records = self.test_record + archived_record
+
+        activity_test_cases = [
+            (
+                "Default search finds the only active activity",
+                [('id', 'in', all_activities.ids)],
+                active_activity,
+            ),
+            (
+                "Search on 'date_done' finds archived (done) activities",
+                [('id', 'in', all_activities.ids), ('date_done', '=', '2025-09-15')],
+                done_activity + done_activity_on_archived_record,
+            ),
+        ]
+
+        for case, domain, expected in activity_test_cases:
+            with self.subTest(model='mail.activity', domain=domain):
+                found = self.env['mail.activity'].search(domain)
+                self.assertEqual(found, expected, case)
+
+        record_test_cases = [
+            (
+                "Search on related active activity finds parent record",
+                [('id', 'in', all_records.ids), ('activity_ids', '=', active_activity.id)],
+                self.test_record,
+                {},
+            ),
+            (
+                "Search on related archived (done) activities finds active parent record",
+                [('id', 'in', all_records.ids), ('activity_ids.date_done', '=', '2025-09-15')],
+                self.test_record,
+                {},
+            ),
+            (
+                "Search with context on related archived (done) activities finds active and archived parent records",
+                [('id', 'in', all_records.ids), ('activity_ids.date_done', '=', '2025-09-15')],
+                self.test_record + archived_record,
+                {'active_test': False},
+            ),
+            (
+                "Complex search on related archived (done) activities finds active parent record",
+                [
+                    ('id', 'in', all_records.ids),
+                    ('activity_ids', 'any', [
+                        '&', '&',
+                        ('date_done', '=', '2025-09-15'),
+                        ('date_deadline', '>=', '2025-09-01'),
+                        ('date_deadline', '<', '2025-09-05'),
+                    ]),
+                ],
+                self.test_record,
+                {},
+            ),
+        ]
+
+        for msg, domain, expected, context in record_test_cases:
+            with self.subTest(model='mail.test.activity', domain=domain, context=context):
+                found = self.env['mail.test.activity'].with_context(**context).search(domain)
+                self.assertEqual(found, expected, msg=msg)
+
     @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_activity_plans_ids_search_semantics_single(self):
         """
@@ -670,7 +752,6 @@ def test_record_unlinked_orphan_activities(self):
 
 
 @tests.tagged('mail_activity', 'mail_activity_mixin')
-@tagged('at_install', '-post_install')  # LEGACY at_install
 class TestORM(TestActivityCommon):
     """Test for read_progress_bar"""
 

From e825d038dda8197f37e6594ca7e0f94582337406 Mon Sep 17 00:00:00 2001
From: "Nicolas Viseur (vin)" <vin@odoo.com>
Date: Fri, 24 Oct 2025 07:47:51 +0000
Subject: [PATCH 114/673] [FIX] l10n_kh: fix duplicated tax names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes an issue where some taxes in the Cambodian package have the same
name, leading to errors when manually installing the chart template.
Interestingly enough, the constraints does not trigger on the demo data
company.

task-5194444

closes odoo/odoo#234098

X-original-commit: 5be6ef1ae3958a25e680f5fa30824fec57d63efe
Signed-off-by: William André (wan) <wan@odoo.com>
Signed-off-by: Nicolas Viseur (vin) <vin@odoo.com>
---
 addons/l10n_kh/data/template/account.tax-kh.csv | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_kh/data/template/account.tax-kh.csv b/addons/l10n_kh/data/template/account.tax-kh.csv
index 47602efaefcb6..a0c2a80f59b48 100644
--- a/addons/l10n_kh/data/template/account.tax-kh.csv
+++ b/addons/l10n_kh/data/template/account.tax-kh.csv
@@ -115,23 +115,23 @@
 "","","","","","","","","","","","100","tax","invoice","l10n_kh_account_20904","WT 003 NR 05 D","","","","","",""
 "","","","","","","","","","","","","base","refund","","WT 003 NR 05 B","","","","","",""
 "","","","","","","","","","","","100","tax","refund","l10n_kh_account_20904","WT 003 NR 05 D","","","","","",""
-"l10n_kh_tax_purchase_10_wht_dta_01","10% WHT DTA","","Tax imposed on Double Tax Agreements - Payment of interest","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 01 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការបង់ការប្រាក់ឱ្យអ្នកជាប់ពន្ធ)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
+"l10n_kh_tax_purchase_10_wht_dta_01","10% WHT DTA I","","Tax imposed on Double Tax Agreements - Payment of interest","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 01 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការបង់ការប្រាក់ឱ្យអ្នកជាប់ពន្ធ)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
 "","","","","","","","","","","","100","tax","invoice","l10n_kh_account_20904","WT 003 NR 01 D","","","","","",""
 "","","","","","","","","","","","","base","refund","","WT 003 NR 01 B","","","","","",""
 "","","","","","","","","","","","100","tax","refund","l10n_kh_account_20904","WT 003 NR 01 D","","","","","",""
-"l10n_kh_tax_purchase_10_wht_dta_02","10% WHT DTA","","Tax imposed on Double Tax Agreements - Payment of royalty, rental/leasing, and income related to the use of property","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 02 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការបង់សួយសារ ថ្លៃឈ្នួល)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
+"l10n_kh_tax_purchase_10_wht_dta_02","10% WHT DTA R","","Tax imposed on Double Tax Agreements - Payment of royalty, rental/leasing, and income related to the use of property","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 02 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការបង់សួយសារ ថ្លៃឈ្នួល)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
 "","","","","","","","","","","","100","tax","invoice","l10n_kh_account_20904","WT 003 NR 02 D","","","","","",""
 "","","","","","","","","","","","","base","refund","","WT 003 NR 02 B","","","","","",""
 "","","","","","","","","","","","100","tax","refund","l10n_kh_account_20904","WT 003 NR 02 D","","","","","",""
-"l10n_kh_tax_purchase_10_wht_dta_03","10% WHT DTA","","Tax imposed on Double Tax Agreements - Payment of management fee and technical services","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 03 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការទូទាត់ថ្លៃសេវាគ្រប់គ្រង និងសេវាបច្ចេកទេសនានា)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
+"l10n_kh_tax_purchase_10_wht_dta_03","10% WHT DTA T","","Tax imposed on Double Tax Agreements - Payment of management fee and technical services","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 03 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការទូទាត់ថ្លៃសេវាគ្រប់គ្រង និងសេវាបច្ចេកទេសនានា)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
 "","","","","","","","","","","","100","tax","invoice","l10n_kh_account_20904","WT 003 NR 03 D","","","","","",""
 "","","","","","","","","","","","","base","refund","","WT 003 NR 03 B","","","","","",""
 "","","","","","","","","","","","100","tax","refund","l10n_kh_account_20904","WT 003 NR 03 D","","","","","",""
-"l10n_kh_tax_purchase_10_wht_dta_04","10% WHT DTA","","Tax imposed on Double Tax Agreements - Payment of dividend","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 04 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការបង់ភាគលាភ)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
+"l10n_kh_tax_purchase_10_wht_dta_04","10% WHT DTA DIV","","Tax imposed on Double Tax Agreements - Payment of dividend","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 04 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - ការបង់ភាគលាភ)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
 "","","","","","","","","","","","100","tax","invoice","l10n_kh_account_20904","WT 003 NR 04 D","","","","","",""
 "","","","","","","","","","","","","base","refund","","WT 003 NR 04 B","","","","","",""
 "","","","","","","","","","","","100","tax","refund","l10n_kh_account_20904","WT 003 NR 04 D","","","","","",""
-"l10n_kh_tax_purchase_10_wht_dta_05","10% WHT DTA","","Tax imposed on Double Tax Agreements - Payment of royalty, rental/leasing, and income related to the use of property","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 05 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - សេវាកម្ម)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
+"l10n_kh_tax_purchase_10_wht_dta_05","10% WHT DTA S","","Tax imposed on Double Tax Agreements - Payment of royalty, rental/leasing, and income related to the use of property","10% WHT","purchase","","percent","-10","l10n_kh_tax_group_wht_10","True","","base","invoice","","WT 003 NR 05 B","False","10% ពន្ធកាត់ទុក (ការចៀសវាងការយកពន្ធត្រួតគ្នា - សេវាកម្ម)","","base.kh","l10n_kh_fiscal_position_taxable_person",""
 "","","","","","","","","","","","100","tax","invoice","l10n_kh_account_20904","WT 003 NR 05 D","","","","","",""
 "","","","","","","","","","","","","base","refund","","WT 003 NR 05 B","","","","","",""
 "","","","","","","","","","","","100","tax","refund","l10n_kh_account_20904","WT 003 NR 05 D","","","","","",""

From 31ebcbf661569cf912e42062efea1cdd88f377e9 Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Mon, 27 Oct 2025 11:00:04 +0000
Subject: [PATCH 115/673] [FIX] point_of_sale, pos_hr: prevent gaps in session
 names

Before this commit, if an issue occurred while posting the cash
details, the session sequence would still increment even though
the operation failed, leading to gaps in session names.

With this commit, the sequence only increments when the operation
succeeds, ensuring continuous session naming without gaps.

opw-5180712

closes odoo/odoo#234071

X-original-commit: 0fae57c16c943915d24f949957baf899357105b2
Related: odoo/enterprise#98639
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 addons/point_of_sale/models/pos_session.py    | 20 +++++++++++--
 addons/pos_hr/models/pos_session.py           |  4 +--
 addons/pos_hr/tests/__init__.py               |  1 +
 .../pos_hr/tests/test_point_of_sale_flow.py   | 30 +++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 addons/pos_hr/tests/test_point_of_sale_flow.py

diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py
index 34fac11d8c9bd..c2d8612c040cc 100644
--- a/addons/point_of_sale/models/pos_session.py
+++ b/addons/point_of_sale/models/pos_session.py
@@ -1667,9 +1667,11 @@ def open_frontend_cb(self):
             return {}
         return self.config_id.open_ui()
 
-    def set_opening_control(self, cashbox_value: int, notes: str):
-        if self.state != 'opening_control':
-            return
+    def _set_opening_control_data(self, cashbox_value: int, notes: str):
+        """
+        Internal logic for opening the session.
+        Inherit this method to add custom logic before the sequence is assigned.
+        """
         self.state = 'opened'
         self.start_at = fields.Datetime.now()
         cash_payment_method_ids = self.config_id.payment_method_ids.filtered(lambda pm: pm.is_cash_count)
@@ -1683,6 +1685,18 @@ def set_opening_control(self, cashbox_value: int, notes: str):
             message += notes
             self.message_post(body=plaintext2html(message))
 
+    def set_opening_control(self, cashbox_value: int, notes: str):
+        """
+        Public method to open the session.
+        This calls the internal logic and, if successful, assigns the sequence name.
+
+        DO NOT INHERIT THIS METHOD. Inherit _set_opening_control_data instead.
+        """
+        if self.state != 'opening_control':
+            return
+
+        self._set_opening_control_data(cashbox_value, notes)
+
         sequence = self.env['ir.sequence'].with_context(
             company_id=self.config_id.company_id.id
         ).search([('code', '=', 'pos.session'), ('company_id', 'in', [self.config_id.company_id.id, False])], order='company_id', limit=1)
diff --git a/addons/pos_hr/models/pos_session.py b/addons/pos_hr/models/pos_session.py
index f702193c521b2..fd4768e7768f2 100644
--- a/addons/pos_hr/models/pos_session.py
+++ b/addons/pos_hr/models/pos_session.py
@@ -20,8 +20,8 @@ def _load_pos_data_models(self, config):
             data += ['hr.employee']
         return data
 
-    def set_opening_control(self, cashbox_value: int, notes: str):
-        super().set_opening_control(cashbox_value, notes)
+    def _set_opening_control_data(self, cashbox_value: int, notes: str):
+        super()._set_opening_control_data(cashbox_value, notes)
         if author_id := self._get_message_author():
             self.message_post(body=plaintext2html(_('Opened register')), author_id=author_id.id)
 
diff --git a/addons/pos_hr/tests/__init__.py b/addons/pos_hr/tests/__init__.py
index 6f4bae0c7a26d..591cdb69b575b 100644
--- a/addons/pos_hr/tests/__init__.py
+++ b/addons/pos_hr/tests/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import test_frontend
+from . import test_point_of_sale_flow
diff --git a/addons/pos_hr/tests/test_point_of_sale_flow.py b/addons/pos_hr/tests/test_point_of_sale_flow.py
new file mode 100644
index 0000000000000..e6c56f6f6e8a0
--- /dev/null
+++ b/addons/pos_hr/tests/test_point_of_sale_flow.py
@@ -0,0 +1,30 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from unittest.mock import patch
+
+import odoo
+from odoo.addons.point_of_sale.tests.common import CommonPosTest
+from odoo.exceptions import UserError
+
+
+@odoo.tests.tagged('post_install', '-at_install')
+class TestPointOfSaleFlow(CommonPosTest):
+    def test_pos_hr_session_name_gap(self):
+        self.pos_config_usd.open_ui()
+        session = self.pos_config_usd.current_session_id
+        session.set_opening_control(0, None)
+        current_session_name = session.name
+        session.action_pos_session_closing_control()
+
+        self.pos_config_usd.open_ui()
+        session = self.pos_config_usd.current_session_id
+
+        def _message_post_patch(*_args, **_kwargs):
+            raise UserError('Test Error')
+
+        with patch.object(self.env.registry.models['pos.session'], "message_post", _message_post_patch):
+            with self.assertRaises(UserError):
+                session.set_opening_control(0, None)
+
+        session.set_opening_control(0, None)
+        self.assertEqual(int(session.name.split('/')[1]), int(current_session_name.split('/')[1]) + 1)

From 3b99af04e87a193825f1946a2e8d99660672f84a Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Wed, 22 Oct 2025 12:28:34 +0000
Subject: [PATCH 116/673] [FIX] html_builder, website: no o_editable on
 non-translatable nodes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Scenario:

- install second language on website
- add mega menu item to menu
- translate full span (from first to last letter)
- save

Result: nothing is saved

Cause:

The mega menu is in a node with [data-oe-model] attribute that receives
the o_editable class from SetupEditorPlugin. Its content is in a
`section > .container` that receives contenteditable="true" from
BuilderContentEditablePlugin.

Because the container zone is contenteditable, the editor allows to
select outside of <span data-oe-translation-…/> elements and when we
replace the whole content, the node is removed because it is an empty
SPAN and we lose the translation reference, so the translation are lost
when saved.

Fix:

There is already a code that disable wrapping editable since
d4f8aebea8cc7eba1517575302e072e0d5e2e406. This was not taking this case
where the content is not in '.o_editable' but in '.o_editable section >
.container'.

With this fix, we only add o_editable class to nodes that matches
[data-oe-model][data-oe-translation-source-sha].

opw-5045798
opw-5159026

closes odoo/odoo#233887

X-original-commit: 616110e4b9d00ee4e70ca2d003fdfdc5214aa02e
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
---
 addons/html_builder/static/src/core/core_plugins.js |  2 ++
 .../static/src/core/core_setup_editor_plugin.js     |  8 ++++++++
 .../static/src/core/setup_editor_plugin.js          |  1 -
 .../plugins/translate_setup_editor_plugin.js        |  8 ++++++++
 .../website/static/src/builder/website_builder.js   |  2 ++
 .../static/tests/builder/translation.test.js        | 13 +++++++++++++
 6 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 addons/html_builder/static/src/core/core_setup_editor_plugin.js
 create mode 100644 addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js

diff --git a/addons/html_builder/static/src/core/core_plugins.js b/addons/html_builder/static/src/core/core_plugins.js
index fcfe952027e25..4160cfda3d9b1 100644
--- a/addons/html_builder/static/src/core/core_plugins.js
+++ b/addons/html_builder/static/src/core/core_plugins.js
@@ -27,6 +27,7 @@ import { RemovePlugin } from "./remove_plugin";
 import { SavePlugin } from "./save_plugin";
 import { SaveSnippetPlugin } from "./save_snippet_plugin";
 import { SetupEditorPlugin } from "./setup_editor_plugin";
+import { CoreSetupEditorPlugin } from "./core_setup_editor_plugin";
 import { VisibilityPlugin } from "./visibility_plugin";
 import { FieldChangeReplicationPlugin } from "./field_change_replication_plugin";
 import { BuilderContentEditablePlugin } from "./builder_content_editable_plugin";
@@ -73,6 +74,7 @@ export const CORE_PLUGINS = [
     DisableSnippetsPlugin,
     MediaWebsitePlugin,
     SetupEditorPlugin,
+    CoreSetupEditorPlugin,
     SavePlugin,
     VisibilityPlugin,
     DropZoneSelectorPlugin,
diff --git a/addons/html_builder/static/src/core/core_setup_editor_plugin.js b/addons/html_builder/static/src/core/core_setup_editor_plugin.js
new file mode 100644
index 0000000000000..900036f23cd81
--- /dev/null
+++ b/addons/html_builder/static/src/core/core_setup_editor_plugin.js
@@ -0,0 +1,8 @@
+import { Plugin } from "@html_editor/plugin";
+
+export class CoreSetupEditorPlugin extends Plugin {
+    static id = "core_setup_editor_plugin";
+    resources = {
+        o_editable_selectors: "[data-oe-model]",
+    };
+}
diff --git a/addons/html_builder/static/src/core/setup_editor_plugin.js b/addons/html_builder/static/src/core/setup_editor_plugin.js
index 29c4fde517658..c3046edd9c7e6 100644
--- a/addons/html_builder/static/src/core/setup_editor_plugin.js
+++ b/addons/html_builder/static/src/core/setup_editor_plugin.js
@@ -8,7 +8,6 @@ export class SetupEditorPlugin extends Plugin {
     resources = {
         clean_for_save_handlers: this.cleanForSave.bind(this),
         closest_savable_providers: withSequence(10, (el) => el.closest(".o_editable")),
-        o_editable_selectors: "[data-oe-model]",
         unremovable_node_predicates: (node) => node.classList?.contains("o_editable"),
     };
 
diff --git a/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js b/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js
new file mode 100644
index 0000000000000..2bd9449f60bb3
--- /dev/null
+++ b/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js
@@ -0,0 +1,8 @@
+import { Plugin } from "@html_editor/plugin";
+
+export class TranslateSetupEditorPlugin extends Plugin {
+    static id = "translate_setup_editor_plugin";
+    resources = {
+        o_editable_selectors: "[data-oe-model][data-oe-translation-source-sha]",
+    };
+}
diff --git a/addons/website/static/src/builder/website_builder.js b/addons/website/static/src/builder/website_builder.js
index b61f811080e94..820d25087342a 100644
--- a/addons/website/static/src/builder/website_builder.js
+++ b/addons/website/static/src/builder/website_builder.js
@@ -5,6 +5,7 @@ import { DisableSnippetsPlugin } from "@html_builder/core/disable_snippets_plugi
 import { OperationPlugin } from "@html_builder/core/operation_plugin";
 import { SavePlugin } from "@html_builder/core/save_plugin";
 import { SetupEditorPlugin } from "@html_builder/core/setup_editor_plugin";
+import { TranslateSetupEditorPlugin } from "./plugins/translate_setup_editor_plugin";
 import { VisibilityPlugin } from "@html_builder/core/visibility_plugin";
 import { removePlugins } from "@html_builder/utils/utils";
 import { closestElement } from "@html_editor/utils/dom_traversal";
@@ -53,6 +54,7 @@ const TRANSLATION_PLUGINS = [
     DisableSnippetsPlugin,
     SavePlugin,
     SetupEditorPlugin,
+    TranslateSetupEditorPlugin,
     WebsiteSetupEditorPlugin,
     VisibilityPlugin,
     PopupVisibilityPlugin,
diff --git a/addons/website/static/tests/builder/translation.test.js b/addons/website/static/tests/builder/translation.test.js
index d0642d9328f8b..1a01bb9833d09 100644
--- a/addons/website/static/tests/builder/translation.test.js
+++ b/addons/website/static/tests/builder/translation.test.js
@@ -127,6 +127,19 @@ test("only have translation editors on deepest nodes", async () => {
     expect(":iframe .o_editable .o_editable").toHaveAttribute("contenteditable", "true");
 });
 
+test("only [data-oe-model] not o_editable in translation", async () => {
+    await setupSidebarBuilderForTranslation({
+        websiteContent: `
+            <div data-oe-model="test"><section>${getTranslateEditable({
+                inWrap: "Hello",
+            })}</section></div>
+        `,
+    });
+    expect(":iframe [data-oe-model='test']").not.toHaveClass("o_editable");
+    expect(":iframe .container").not.toHaveAttribute("contenteditable");
+    expect(":iframe .container span.o_editable").toHaveAttribute("contenteditable", "true");
+});
+
 test("404 page in translate mode", async () => {
     patchWithCleanup(EditWebsiteSystrayItem.prototype, {
         setup() {

From f92ea73453bda9c23ce4e4e327022c1e477c594f Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 31 Oct 2025 06:21:36 +0000
Subject: [PATCH 117/673] [FIX] mail: fix sub-channel search tour
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `test_discuss_sub_channel_search` tour ensures that
lazy loading of threads works correctly with the search
feature.

Technically, the component uses the `useVisible` hook
which waits for a trigger to be visible before loading
more threads.

However, under high CPU load, the `IntersectionObserver`
might not detect the change. For example, clearing the
search input will make the element disappear, but scrolling
afterward may make it reappear. As a result, the component
might not detect that it should load more threads. In
practice, this should never happen. The test now waits
for the state to update before scrolling.

fixes runbot-181951

closes odoo/odoo#233915

X-original-commit: 7705c768efbd377f0a285d0e8274a6e91f56d6b8
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../core/public_web/sub_channel_list.js       |  2 +-
 .../tours/discuss_sub_channel_search_tour.js  | 37 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/discuss/core/public_web/sub_channel_list.js b/addons/mail/static/src/discuss/core/public_web/sub_channel_list.js
index b0563214d620b..c3087ee6df9d4 100644
--- a/addons/mail/static/src/discuss/core/public_web/sub_channel_list.js
+++ b/addons/mail/static/src/discuss/core/public_web/sub_channel_list.js
@@ -32,7 +32,7 @@ export class SubChannelList extends Component {
         this.searchRef = useRef("search");
         this.sequential = useSequential();
         useAutofocus({ refName: "search" });
-        useVisible("load-more", (isVisible) => {
+        this.loadMoreState = useVisible("load-more", (isVisible) => {
             if (isVisible) {
                 this.props.thread.loadMoreSubChannels({
                     searchTerm: this.state.searching ? this.state.searchTerm : undefined,
diff --git a/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js b/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js
index c01032382a899..b64e5b97096b4 100644
--- a/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js
+++ b/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js
@@ -1,8 +1,37 @@
-import { contains, dragenterFiles, dropFiles, scroll } from "@web/../tests/utils";
+import { SubChannelList } from "@mail/discuss/core/public_web/sub_channel_list";
+
+import { status } from "@odoo/owl";
+
 import { registry } from "@web/core/registry";
+import { Deferred } from "@web/core/utils/concurrency";
+import { patch } from "@web/core/utils/patch";
+import { effect } from "@web/core/utils/reactive";
+import { contains, dragenterFiles, dropFiles, scroll } from "@web/../tests/utils";
 
+let waitForLoadMoreToDisappearDef;
 registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
     steps: () => [
+        {
+            trigger: "body",
+            run() {
+                patch(SubChannelList.prototype, {
+                    setup() {
+                        super.setup(...arguments);
+                        effect(
+                            (state) => {
+                                if (status(this) === "destroyed") {
+                                    return;
+                                }
+                                if (!state.isVisible) {
+                                    waitForLoadMoreToDisappearDef?.resolve();
+                                }
+                            },
+                            [this.loadMoreState]
+                        );
+                    },
+                });
+            },
+        },
         {
             trigger: "button[title='Threads']",
             run: "click",
@@ -32,6 +61,7 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             trigger: ".o-mail-SubChannelPreview:contains(Sub Channel 10)",
             async run() {
                 await contains(".o-mail-SubChannelPreview", { count: 1 });
+                waitForLoadMoreToDisappearDef = new Deferred();
             },
         },
         {
@@ -51,6 +81,8 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
                 }
                 await contains(".o-mail-SubChannelPreview", { text: `Sub Channel 10` });
                 // Ensure lazy loading is still working after a search.
+                await waitForLoadMoreToDisappearDef;
+                waitForLoadMoreToDisappearDef = new Deferred();
                 await scroll(".o-mail-ActionPanel:has(.o-mail-SubChannelList)", "bottom");
             },
         },
@@ -63,6 +95,8 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
                         text: `Sub Channel ${i}`,
                     });
                 }
+                await waitForLoadMoreToDisappearDef;
+                waitForLoadMoreToDisappearDef = new Deferred();
                 await scroll(".o-mail-ActionPanel:has(.o-mail-SubChannelList)", "bottom");
             },
         },
@@ -75,6 +109,7 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
                         text: `Sub Channel ${i}`,
                     });
                 }
+                await waitForLoadMoreToDisappearDef;
                 await scroll(".o-mail-ActionPanel:has(.o-mail-SubChannelList)", "bottom");
             },
         },

From b9b16c74580f75e81838024472aafefc3387ca47 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Mon, 3 Nov 2025 11:12:40 +0100
Subject: [PATCH 118/673] [FIX] mail: prevent crash when scrolling to poll

Before this PR, clicking "View Poll" from a poll result could
sometimes cause a crash. This occurred because the highlight
message function expects a thread to be passed, but we were
passing the `start_message_id` thread, which might be undefined.

Similar to [1], the poll ended UI requires the start message to
be passed. This commit ensures that the necessary data are sent
along with the end message.

[1]: https://github.com/odoo/odoo/pull/233897

closes odoo/odoo#234099

Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/mail/models/mail_message.py |  7 ++++++-
 addons/mail/models/mail_poll.py    | 10 ++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index 6fbda6def9aff..d1fba151a08f5 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -1088,7 +1088,12 @@ def _to_store_defaults(self, target: Store.Target):
             "record_name",  # keep for iOS app
             "res_id",  # keep for iOS app
             # sudo - mail.poll: reading poll of accessible message is allowed.
-            Store.Many("started_poll_ids", predicate=lambda m: m.message_type == "mail_poll", sudo=True),
+            Store.Many(
+                "started_poll_ids",
+                fields=self.env["mail.poll"]._to_store_defaults(target, with_start_message_id=False),
+                predicate=lambda m: m.message_type == "mail_poll",
+                sudo=True,
+            ),
             Store.Many("ended_poll_ids", predicate=lambda m: m.message_type == "mail_poll", sudo=True),
             "subject",
             # sudo: mail.message.subtype - reading subtype on accessible message is allowed
diff --git a/addons/mail/models/mail_poll.py b/addons/mail/models/mail_poll.py
index aa685d554954c..9579ccfda0f92 100644
--- a/addons/mail/models/mail_poll.py
+++ b/addons/mail/models/mail_poll.py
@@ -38,8 +38,8 @@ def _compute_winning_option_ids(self):
             ]
             poll.winning_option_id = winners[0] if len(winners) == 1 else None
 
-    def _to_store_defaults(self, target):
-        return [
+    def _to_store_defaults(self, target, *, with_start_message_id=True):
+        fields = [
             "allow_multiple_options",
             "create_date",
             "create_uid",
@@ -47,9 +47,11 @@ def _to_store_defaults(self, target):
             Store.Many("option_ids"),
             "poll_end_dt",
             "poll_question",
-            "start_message_id",
             "winning_option_id",
         ]
+        if with_start_message_id:
+            fields.append(Store.One("start_message_id"))
+        return fields
 
     def _end_and_notify(self):
         thread_by_message = self.start_message_id._record_by_message()
@@ -58,7 +60,7 @@ def _end_and_notify(self):
             poll.end_message_id = thread.message_post(
                 body="", message_type="mail_poll", subtype_xmlid="mail.mt_comment"
             )
-            Store(**thread._get_store_target()).add(poll, extra_fields=[Store.One("start_message_id")]).bus_send()
+            Store(**thread._get_store_target()).add(poll).bus_send()
 
     @api.model
     def _end_expired_polls(self):

From 3012395b79d31f355352fdeaa1740c89755a185a Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 29 Oct 2025 12:59:04 +0100
Subject: [PATCH 119/673] [FIX] im_livechat: fix race condition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Attempt to fix runbot error 233689 by refactoring `_onClose` across
patches.
The problem occurs because of the async nature and the many side effects
that occur.
`_onClose` is not supposed to be async.
The override in ai is deleting the channel via rpc, which creates a bus
even to delete the channel in the JS store. The following code will be executed
after that point (as we have await), with the bus sometimes being
received before, sometimes not

The fix is to ensure all the stack of onClose is executed
immediately (as it should have been), so the bus notif is always
received after.

This commit also simplifies leaveChannel.

closes odoo/odoo#233597

Related: odoo/enterprise#98368
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../core/public_web/chat_window_model_patch.js  | 13 ++++---------
 .../src/core/public_web/thread_model_patch.js   |  5 ++---
 .../src/core/web/chat_window_model_patch.js     |  6 ++----
 .../src/discuss/core/common/@types/models.d.ts  |  2 +-
 .../discuss/core/common/thread_model_patch.js   | 17 +++++++----------
 5 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js b/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js
index be2f5cf8e9335..df82fc2bb4cae 100644
--- a/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/chat_window_model_patch.js
@@ -5,16 +5,11 @@ patch(ChatWindow.prototype, {
     _onClose(options = {}) {
         if (
             this.channel.channel_type === "livechat" &&
-            this.channel.livechatVisitorMember?.persona?.notEq(this.store.self)
+            this.channel.livechatVisitorMember?.persona?.notEq(this.store.self) &&
+            options.notifyState
         ) {
-            const channel = this.channel; // save ref before delete
-            super._onClose(...arguments);
-            this.delete();
-            if (options.notifyState) {
-                channel.leaveChannel({ force: true });
-            }
-        } else {
-            super._onClose(...arguments);
+            this.channel.leaveChannelRpc();
         }
+        super._onClose(...arguments);
     },
 });
diff --git a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
index 911cf5b6a9b87..6c61635643742 100644
--- a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
@@ -69,12 +69,11 @@ patch(Thread.prototype, {
             this.store.discuss.activeTab = "livechat";
         }
     },
-    async leaveChannel({ force = false } = {}) {
+    async leaveChannel() {
         if (
             this.channel?.channel_type === "livechat" &&
             this.channel?.channel_member_ids.length <= 2 &&
-            !this.livechat_end_dt &&
-            !force
+            !this.livechat_end_dt
         ) {
             await this.askLeaveConfirmation(
                 _t("Leaving will end the live chat. Do you want to proceed?")
diff --git a/addons/mail/static/src/core/web/chat_window_model_patch.js b/addons/mail/static/src/core/web/chat_window_model_patch.js
index 7890a1c5a0325..c0a8b15b1a434 100644
--- a/addons/mail/static/src/core/web/chat_window_model_patch.js
+++ b/addons/mail/static/src/core/web/chat_window_model_patch.js
@@ -3,7 +3,7 @@ import { ChatWindow } from "@mail/core/common/chat_window_model";
 import { patch } from "@web/core/utils/patch";
 
 patch(ChatWindow.prototype, {
-    async _onClose(options) {
+    _onClose(options) {
         if (
             this.store.env.services.ui.isSmall &&
             !this.store.discuss.isActive &&
@@ -14,9 +14,7 @@ patch(ChatWindow.prototype, {
             // case it should be re-opened to simulate it was always
             // there in the background.
             document.querySelector(".o_menu_systray i[aria-label='Messages']")?.click();
-            // ensure messaging menu is opened before chat window is closed
-            await Promise.resolve();
         }
-        await super._onClose(...arguments);
+        super._onClose(...arguments);
     },
 });
diff --git a/addons/mail/static/src/discuss/core/common/@types/models.d.ts b/addons/mail/static/src/discuss/core/common/@types/models.d.ts
index 5b67534e701dd..ca54b4d1af838 100644
--- a/addons/mail/static/src/discuss/core/common/@types/models.d.ts
+++ b/addons/mail/static/src/discuss/core/common/@types/models.d.ts
@@ -71,7 +71,7 @@ declare module "models" {
         lastInterestDt: import("luxon").DateTime;
         lastMessageSeenByAllId: undefined|number;
         lastSelfMessageSeenByEveryone: Message;
-        leaveChannel: (param0: { force: boolean }) => Promise<void>;
+        leaveChannel: () => Promise<void>;
         markAsFetched: () => Promise<void>;
         markedAsUnread: boolean;
         markingAsRead: boolean;
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index a137d52318b67..d11f9082f9933 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -519,17 +519,13 @@ const threadPatch = {
             { description }
         );
     },
-    async leaveChannel({ force = false } = {}) {
-        if (
-            this.channel?.channel_type !== "group" &&
-            this.create_uid?.eq(this.store.self_user) &&
-            !force
-        ) {
+    async leaveChannel() {
+        if (this.channel?.channel_type !== "group" && this.create_uid?.eq(this.store.self_user)) {
             await this.askLeaveConfirmation(
                 _t("You are the administrator of this channel. Are you sure you want to leave?")
             );
         }
-        if (this.channel?.channel_type === "group" && !force) {
+        if (this.channel?.channel_type === "group") {
             await this.askLeaveConfirmation(
                 _t(
                     "You are about to leave this group conversation and will no longer have access to it unless you are invited again. Are you sure you want to continue?"
@@ -537,9 +533,10 @@ const threadPatch = {
             );
         }
         await this.closeChatWindow();
-        await this.store.env.services.orm.silent.call("discuss.channel", "action_unfollow", [
-            this.id,
-        ]);
+        this.leaveChannelRpc();
+    },
+    leaveChannelRpc() {
+        this.store.env.services.orm.silent.call("discuss.channel", "action_unfollow", [this.id]);
     },
     /** @param {string} name */
     async rename(name) {

From 9a091730fa548bac2e1cfb35b273928f34d17fea Mon Sep 17 00:00:00 2001
From: Ruben Gomes <rugo@odoo.com>
Date: Wed, 15 Oct 2025 10:48:43 +0200
Subject: [PATCH 120/673] [REF] test_translation_import: rename into
 test_translation

Part-of: odoo/odoo#231381
Signed-off-by: Krzysztof Magusiak (krma) <krma@odoo.com>
---
 odoo/addons/base/i18n/af.po                   |   4 +-
 odoo/addons/base/i18n/am.po                   |   4 +-
 odoo/addons/base/i18n/ar.po                   |   4 +-
 odoo/addons/base/i18n/az.po                   |   4 +-
 odoo/addons/base/i18n/base.pot                |   4 +-
 odoo/addons/base/i18n/bg.po                   |   4 +-
 odoo/addons/base/i18n/bs.po                   |   4 +-
 odoo/addons/base/i18n/ca.po                   |   4 +-
 odoo/addons/base/i18n/cs.po                   |   4 +-
 odoo/addons/base/i18n/da.po                   |   4 +-
 odoo/addons/base/i18n/de.po                   |   4 +-
 odoo/addons/base/i18n/el.po                   |   4 +-
 odoo/addons/base/i18n/es.po                   |   4 +-
 odoo/addons/base/i18n/es_CL.po                |   4 +-
 odoo/addons/base/i18n/et.po                   |   4 +-
 odoo/addons/base/i18n/eu.po                   |   4 +-
 odoo/addons/base/i18n/fa.po                   |   4 +-
 odoo/addons/base/i18n/fi.po                   |   4 +-
 odoo/addons/base/i18n/fo.po                   |   4 +-
 odoo/addons/base/i18n/fr.po                   |   4 +-
 odoo/addons/base/i18n/fr_BE.po                |   4 +-
 odoo/addons/base/i18n/fr_CA.po                |   4 +-
 odoo/addons/base/i18n/gl.po                   |   4 +-
 odoo/addons/base/i18n/gu.po                   |   4 +-
 odoo/addons/base/i18n/he.po                   |   4 +-
 odoo/addons/base/i18n/hr.po                   |   4 +-
 odoo/addons/base/i18n/hu.po                   |   4 +-
 odoo/addons/base/i18n/id.po                   |   4 +-
 odoo/addons/base/i18n/is.po                   |   4 +-
 odoo/addons/base/i18n/it.po                   |   4 +-
 odoo/addons/base/i18n/ja.po                   |   4 +-
 odoo/addons/base/i18n/ka.po                   |   4 +-
 odoo/addons/base/i18n/kab.po                  |   4 +-
 odoo/addons/base/i18n/km.po                   |   4 +-
 odoo/addons/base/i18n/ko.po                   |   4 +-
 odoo/addons/base/i18n/lb.po                   |   4 +-
 odoo/addons/base/i18n/lo.po                   |   4 +-
 odoo/addons/base/i18n/lt.po                   |   4 +-
 odoo/addons/base/i18n/lv.po                   |   4 +-
 odoo/addons/base/i18n/mk.po                   |   4 +-
 odoo/addons/base/i18n/mn.po                   |   4 +-
 odoo/addons/base/i18n/nb.po                   |   4 +-
 odoo/addons/base/i18n/nl.po                   |   4 +-
 odoo/addons/base/i18n/pl.po                   |   4 +-
 odoo/addons/base/i18n/pt.po                   |   4 +-
 odoo/addons/base/i18n/pt_BR.po                |   4 +-
 odoo/addons/base/i18n/ro.po                   |   4 +-
 odoo/addons/base/i18n/ru.po                   |   4 +-
 odoo/addons/base/i18n/sk.po                   |   4 +-
 odoo/addons/base/i18n/sq.po                   |   4 +-
 odoo/addons/base/i18n/sr@latin.po             |   4 +-
 odoo/addons/base/i18n/sv.po                   |   4 +-
 odoo/addons/base/i18n/th.po                   |   4 +-
 odoo/addons/base/i18n/tr.po                   |   4 +-
 odoo/addons/base/i18n/uk.po                   |   4 +-
 odoo/addons/base/i18n/vi.po                   |   4 +-
 odoo/addons/base/i18n/zh_CN.po                |   4 +-
 odoo/addons/base/i18n/zh_TW.po                |   4 +-
 .../models => test_translation}/__init__.py   |   0
 odoo/addons/test_translation/__manifest__.py  |  22 +
 .../files/test_spreadsheet_dashboard.json     |   0
 .../files/test_spreadsheet_v16_dashboard.json |   0
 .../test.translation.model1-translated.csv    |   2 +
 .../data/test.translation.model1.csv          |   2 +
 .../data/test_translation_data.xml}           |   8 +-
 odoo/addons/test_translation/i18n/dot.csv     |   5 +
 odoo/addons/test_translation/i18n/fr.po       | 622 ++++++++++++++++++
 odoo/addons/test_translation/i18n/fr_BE.po    | 615 +++++++++++++++++
 odoo/addons/test_translation/i18n/fr_CA.po    | 615 +++++++++++++++++
 .../i18n/test_translation.pot                 | 608 +++++++++++++++++
 odoo/addons/test_translation/i18n/tlh.po      | 615 +++++++++++++++++
 .../test_translation/models/__init__.py       |   1 +
 .../models/models.py                          |  13 +-
 .../security/ir.model.access.csv              |   3 +
 .../static/src/js/js_codefile.js              |   0
 .../static/src/xml/js_templates.xml           |   0
 .../tests/__init__.py                         |   2 -
 .../tests/test_export_wizard.py               |   0
 .../tests/test_term_count.py                  |  86 +--
 odoo/addons/test_translation/view.xml         |  19 +
 .../test_translation_import/__init__.py       |   2 -
 .../test_translation_import/__manifest__.py   |  23 -
 ...t.translation.import.model1-translated.csv |   2 -
 .../data/test.translation.import.model1.csv   |   2 -
 .../test_translation_import/i18n/dot.csv      |   5 -
 .../addons/test_translation_import/i18n/fr.po | 622 ------------------
 .../test_translation_import/i18n/fr_BE.po     | 615 -----------------
 .../test_translation_import/i18n/fr_CA.po     | 615 -----------------
 .../i18n/test_translation_import.pot          | 608 -----------------
 .../test_translation_import/i18n/tlh.po       | 615 -----------------
 .../security/ir.model.access.csv              |   3 -
 odoo/addons/test_translation_import/view.xml  |  19 -
 92 files changed, 3298 insertions(+), 3303 deletions(-)
 rename odoo/addons/{test_translation_import/models => test_translation}/__init__.py (100%)
 create mode 100644 odoo/addons/test_translation/__manifest__.py
 rename odoo/addons/{test_translation_import => test_translation}/data/files/test_spreadsheet_dashboard.json (100%)
 rename odoo/addons/{test_translation_import => test_translation}/data/files/test_spreadsheet_v16_dashboard.json (100%)
 create mode 100644 odoo/addons/test_translation/data/test.translation.model1-translated.csv
 create mode 100644 odoo/addons/test_translation/data/test.translation.model1.csv
 rename odoo/addons/{test_translation_import/data/test_translation_import_data.xml => test_translation/data/test_translation_data.xml} (51%)
 create mode 100644 odoo/addons/test_translation/i18n/dot.csv
 create mode 100644 odoo/addons/test_translation/i18n/fr.po
 create mode 100644 odoo/addons/test_translation/i18n/fr_BE.po
 create mode 100644 odoo/addons/test_translation/i18n/fr_CA.po
 create mode 100644 odoo/addons/test_translation/i18n/test_translation.pot
 create mode 100644 odoo/addons/test_translation/i18n/tlh.po
 create mode 100644 odoo/addons/test_translation/models/__init__.py
 rename odoo/addons/{test_translation_import => test_translation}/models/models.py (88%)
 create mode 100644 odoo/addons/test_translation/security/ir.model.access.csv
 rename odoo/addons/{test_translation_import => test_translation}/static/src/js/js_codefile.js (100%)
 rename odoo/addons/{test_translation_import => test_translation}/static/src/xml/js_templates.xml (100%)
 rename odoo/addons/{test_translation_import => test_translation}/tests/__init__.py (71%)
 rename odoo/addons/{test_translation_import => test_translation}/tests/test_export_wizard.py (100%)
 rename odoo/addons/{test_translation_import => test_translation}/tests/test_term_count.py (85%)
 create mode 100644 odoo/addons/test_translation/view.xml
 delete mode 100644 odoo/addons/test_translation_import/__init__.py
 delete mode 100644 odoo/addons/test_translation_import/__manifest__.py
 delete mode 100644 odoo/addons/test_translation_import/data/test.translation.import.model1-translated.csv
 delete mode 100644 odoo/addons/test_translation_import/data/test.translation.import.model1.csv
 delete mode 100644 odoo/addons/test_translation_import/i18n/dot.csv
 delete mode 100644 odoo/addons/test_translation_import/i18n/fr.po
 delete mode 100644 odoo/addons/test_translation_import/i18n/fr_BE.po
 delete mode 100644 odoo/addons/test_translation_import/i18n/fr_CA.po
 delete mode 100644 odoo/addons/test_translation_import/i18n/test_translation_import.pot
 delete mode 100644 odoo/addons/test_translation_import/i18n/tlh.po
 delete mode 100644 odoo/addons/test_translation_import/security/ir.model.access.csv
 delete mode 100644 odoo/addons/test_translation_import/view.xml

diff --git a/odoo/addons/base/i18n/af.po b/odoo/addons/base/i18n/af.po
index be5b2baa7f208..0b201c3cbb85e 100644
--- a/odoo/addons/base/i18n/af.po
+++ b/odoo/addons/base/i18n/af.po
@@ -8607,7 +8607,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30865,7 +30865,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/am.po b/odoo/addons/base/i18n/am.po
index fb7d5e70adfe1..76e767dcc5537 100644
--- a/odoo/addons/base/i18n/am.po
+++ b/odoo/addons/base/i18n/am.po
@@ -8603,7 +8603,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30861,7 +30861,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/ar.po b/odoo/addons/base/i18n/ar.po
index 479c73a8df1ed..a5f94f8c428c8 100644
--- a/odoo/addons/base/i18n/ar.po
+++ b/odoo/addons/base/i18n/ar.po
@@ -12355,7 +12355,7 @@ msgid "A module to test the uninstall feature."
 msgstr "تطبيق لاختبار خاصية إلغاء التثبيت. "
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "تطبيق لاختبار عملية استيراد الترجمة. "
 
@@ -36214,7 +36214,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/az.po b/odoo/addons/base/i18n/az.po
index cf4fe22482d6f..b43136446ed66 100644
--- a/odoo/addons/base/i18n/az.po
+++ b/odoo/addons/base/i18n/az.po
@@ -10260,7 +10260,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Quraşdırılmamış xüsusiyyətləri test etmək üçün modul."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "İdxalın yerdəyişməsini test etmək üçün modul."
 
@@ -32841,7 +32841,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-tərcümə-idxal"
 
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index d1c24f55489fe..3c77415b2c572 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -9784,7 +9784,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -41643,7 +41643,7 @@ msgid "test-lint"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/bg.po b/odoo/addons/base/i18n/bg.po
index a26c9614bc0f1..a55eaf446f40c 100644
--- a/odoo/addons/base/i18n/bg.po
+++ b/odoo/addons/base/i18n/bg.po
@@ -9809,7 +9809,7 @@ msgid "A module to test the uninstall feature."
 msgstr "A module to test the uninstall feature."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "A module to test translation import."
 
@@ -32276,7 +32276,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/bs.po b/odoo/addons/base/i18n/bs.po
index 187313a4c1c39..bee1eff70e5b3 100644
--- a/odoo/addons/base/i18n/bs.po
+++ b/odoo/addons/base/i18n/bs.po
@@ -8619,7 +8619,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30905,7 +30905,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/ca.po b/odoo/addons/base/i18n/ca.po
index 13a14d546d676..a9e8131056179 100644
--- a/odoo/addons/base/i18n/ca.po
+++ b/odoo/addons/base/i18n/ca.po
@@ -10793,7 +10793,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Un mòdul per a provar la funció de des-instal·lació. "
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Un mòdul per provar la importació de traduccions."
 
@@ -36736,7 +36736,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/cs.po b/odoo/addons/base/i18n/cs.po
index e522c27b7eaa5..4eb2c91184de1 100644
--- a/odoo/addons/base/i18n/cs.po
+++ b/odoo/addons/base/i18n/cs.po
@@ -10947,7 +10947,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Modul pro testování funkce odinstalování."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Modul pro testování importu překladu."
 
@@ -33640,7 +33640,7 @@ msgid "test-populate"
 msgstr "naplnit test"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/da.po b/odoo/addons/base/i18n/da.po
index ceaccaa23c8df..f81ce83e106f3 100644
--- a/odoo/addons/base/i18n/da.po
+++ b/odoo/addons/base/i18n/da.po
@@ -11181,7 +11181,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Et modul til at teste afinstallationsfunktionen."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Et modul til at teste import af oversættelse."
 
@@ -34010,7 +34010,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/de.po b/odoo/addons/base/i18n/de.po
index 414aefa4c261c..6b78852fb90e5 100644
--- a/odoo/addons/base/i18n/de.po
+++ b/odoo/addons/base/i18n/de.po
@@ -12160,7 +12160,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Ein Modul um das Deinstallationsfeature zu testen."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Ein Modul um importierte Übersetzungen zu testen."
 
@@ -35987,7 +35987,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "Test-Übersetzung-Import"
 
diff --git a/odoo/addons/base/i18n/el.po b/odoo/addons/base/i18n/el.po
index 20e5ce0b7a331..f82522c76a347 100644
--- a/odoo/addons/base/i18n/el.po
+++ b/odoo/addons/base/i18n/el.po
@@ -8902,7 +8902,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Ένα άρθρωμα για να δοκιμάσετε την λειτουργία απεγκατάστασης"
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31187,7 +31187,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/es.po b/odoo/addons/base/i18n/es.po
index 7536e69fa9c8d..e7e084244e969 100644
--- a/odoo/addons/base/i18n/es.po
+++ b/odoo/addons/base/i18n/es.po
@@ -11553,7 +11553,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Un módulo para probar la función de desinstalación."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Un módulo para probar la importación de traducción."
 
@@ -35332,7 +35332,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/es_CL.po b/odoo/addons/base/i18n/es_CL.po
index 9f66db9542456..23b10bbfdec6a 100644
--- a/odoo/addons/base/i18n/es_CL.po
+++ b/odoo/addons/base/i18n/es_CL.po
@@ -8607,7 +8607,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30865,7 +30865,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/et.po b/odoo/addons/base/i18n/et.po
index bcbd000919058..ce12b91c6e024 100644
--- a/odoo/addons/base/i18n/et.po
+++ b/odoo/addons/base/i18n/et.po
@@ -10630,7 +10630,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Moodul deinstalleerimise testimiseks."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Moodul tõlke impordi testimiseks."
 
@@ -33211,7 +33211,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/eu.po b/odoo/addons/base/i18n/eu.po
index 2da976f207198..e9860226bf1d6 100644
--- a/odoo/addons/base/i18n/eu.po
+++ b/odoo/addons/base/i18n/eu.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/fa.po b/odoo/addons/base/i18n/fa.po
index d292e90a8bc9a..2826a3ec2a868 100644
--- a/odoo/addons/base/i18n/fa.po
+++ b/odoo/addons/base/i18n/fa.po
@@ -8829,7 +8829,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31139,7 +31139,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "تست-ترجمه-ورودی"
 
diff --git a/odoo/addons/base/i18n/fi.po b/odoo/addons/base/i18n/fi.po
index 528cb7fd8f017..25410bac312e8 100644
--- a/odoo/addons/base/i18n/fi.po
+++ b/odoo/addons/base/i18n/fi.po
@@ -10120,7 +10120,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Moduuli asennuksen poiston testaamiseen"
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -33079,7 +33079,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/fo.po b/odoo/addons/base/i18n/fo.po
index 3c4e0c6ee79c6..a18d7cc584524 100644
--- a/odoo/addons/base/i18n/fo.po
+++ b/odoo/addons/base/i18n/fo.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/fr.po b/odoo/addons/base/i18n/fr.po
index 6411854733151..0d5bc6d3e80b4 100644
--- a/odoo/addons/base/i18n/fr.po
+++ b/odoo/addons/base/i18n/fr.po
@@ -12214,7 +12214,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Module de test pour la désinstallation."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Un module pour tester l'import de traduction."
 
@@ -36079,7 +36079,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/fr_BE.po b/odoo/addons/base/i18n/fr_BE.po
index 975fca5a351e4..3638ce131adfd 100644
--- a/odoo/addons/base/i18n/fr_BE.po
+++ b/odoo/addons/base/i18n/fr_BE.po
@@ -8604,7 +8604,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30862,7 +30862,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/fr_CA.po b/odoo/addons/base/i18n/fr_CA.po
index 29da4cd28c861..c6e96f7358ec3 100644
--- a/odoo/addons/base/i18n/fr_CA.po
+++ b/odoo/addons/base/i18n/fr_CA.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/gl.po b/odoo/addons/base/i18n/gl.po
index ed7d539763bd5..613f4420887e3 100644
--- a/odoo/addons/base/i18n/gl.po
+++ b/odoo/addons/base/i18n/gl.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/gu.po b/odoo/addons/base/i18n/gu.po
index 5951ec6b04dd8..76210d3f0bf02 100644
--- a/odoo/addons/base/i18n/gu.po
+++ b/odoo/addons/base/i18n/gu.po
@@ -8614,7 +8614,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30874,7 +30874,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/he.po b/odoo/addons/base/i18n/he.po
index 36c5aff89771b..5f5665a14dac1 100644
--- a/odoo/addons/base/i18n/he.po
+++ b/odoo/addons/base/i18n/he.po
@@ -9703,7 +9703,7 @@ msgid "A module to test the uninstall feature."
 msgstr "מודול כדי לבדוק את תכונת הסרת ההתקנה."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "מודול לבדיקת ייבוא תרגום."
 
@@ -32225,7 +32225,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/hr.po b/odoo/addons/base/i18n/hr.po
index 2b9e93b4f16af..a6435d13c59fe 100644
--- a/odoo/addons/base/i18n/hr.po
+++ b/odoo/addons/base/i18n/hr.po
@@ -9137,7 +9137,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Module za testiranje deinstalacije svojstva."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31478,7 +31478,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/hu.po b/odoo/addons/base/i18n/hu.po
index 7f319080c4deb..f058ff4151a2d 100644
--- a/odoo/addons/base/i18n/hu.po
+++ b/odoo/addons/base/i18n/hu.po
@@ -9403,7 +9403,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Modul az eltávolító teszteléséhez."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31803,7 +31803,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/id.po b/odoo/addons/base/i18n/id.po
index 12246aac28a1b..4fbc5574a5f89 100644
--- a/odoo/addons/base/i18n/id.po
+++ b/odoo/addons/base/i18n/id.po
@@ -11265,7 +11265,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -34874,7 +34874,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/is.po b/odoo/addons/base/i18n/is.po
index 7e7637ebab2d6..0477bd243b393 100644
--- a/odoo/addons/base/i18n/is.po
+++ b/odoo/addons/base/i18n/is.po
@@ -9303,7 +9303,7 @@ msgid "A module to test the uninstall feature."
 msgstr "A module to test the uninstall feature."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31700,7 +31700,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/it.po b/odoo/addons/base/i18n/it.po
index 3c3efd64d1d06..a016028338a1a 100644
--- a/odoo/addons/base/i18n/it.po
+++ b/odoo/addons/base/i18n/it.po
@@ -10870,7 +10870,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Un modulo per effettuare test di disinstallazione."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Un modulo per effettuare prove di importazione della traduzione."
 
@@ -33797,7 +33797,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/ja.po b/odoo/addons/base/i18n/ja.po
index 70d76362289a3..87ae92cea1073 100644
--- a/odoo/addons/base/i18n/ja.po
+++ b/odoo/addons/base/i18n/ja.po
@@ -10684,7 +10684,7 @@ msgid "A module to test the uninstall feature."
 msgstr "アンインストール機能テスト用モジュール"
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "翻訳のインポートをテストするモジュール。"
 
@@ -33281,7 +33281,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/ka.po b/odoo/addons/base/i18n/ka.po
index 97b9646d25d29..3e1411e4da060 100644
--- a/odoo/addons/base/i18n/ka.po
+++ b/odoo/addons/base/i18n/ka.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/kab.po b/odoo/addons/base/i18n/kab.po
index 9368cd11d65de..75a82683734ed 100644
--- a/odoo/addons/base/i18n/kab.po
+++ b/odoo/addons/base/i18n/kab.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/km.po b/odoo/addons/base/i18n/km.po
index c94212cf73562..9a8e238cc95a5 100644
--- a/odoo/addons/base/i18n/km.po
+++ b/odoo/addons/base/i18n/km.po
@@ -8611,7 +8611,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30869,7 +30869,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/ko.po b/odoo/addons/base/i18n/ko.po
index 98a04decba7a0..54822ce99e35d 100644
--- a/odoo/addons/base/i18n/ko.po
+++ b/odoo/addons/base/i18n/ko.po
@@ -12014,7 +12014,7 @@ msgid "A module to test the uninstall feature."
 msgstr "제거 기능을 시험하는 모듈입니다."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "번역 가져오기를 시험하는 모듈입니다."
 
@@ -35429,7 +35429,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/lb.po b/odoo/addons/base/i18n/lb.po
index 94472c3e6a25b..bf0460f32f6ba 100644
--- a/odoo/addons/base/i18n/lb.po
+++ b/odoo/addons/base/i18n/lb.po
@@ -8607,7 +8607,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30865,7 +30865,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/lo.po b/odoo/addons/base/i18n/lo.po
index b7b3abd53b321..44c210890e5e0 100644
--- a/odoo/addons/base/i18n/lo.po
+++ b/odoo/addons/base/i18n/lo.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/lt.po b/odoo/addons/base/i18n/lt.po
index 165f34134a716..14d3a4e9bb8f4 100644
--- a/odoo/addons/base/i18n/lt.po
+++ b/odoo/addons/base/i18n/lt.po
@@ -8896,7 +8896,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Modulis išdiegimo savybės testavimui."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31204,7 +31204,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/lv.po b/odoo/addons/base/i18n/lv.po
index 32a93452644a3..32f3de1c4afb8 100644
--- a/odoo/addons/base/i18n/lv.po
+++ b/odoo/addons/base/i18n/lv.po
@@ -9166,7 +9166,7 @@ msgid "A module to test the uninstall feature."
 msgstr "A module to test the uninstall feature."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31589,7 +31589,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/mk.po b/odoo/addons/base/i18n/mk.po
index 796b74896c7ad..84c117f553491 100644
--- a/odoo/addons/base/i18n/mk.po
+++ b/odoo/addons/base/i18n/mk.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/mn.po b/odoo/addons/base/i18n/mn.po
index 5dc6dec2591e0..ba7b2fd915b5a 100644
--- a/odoo/addons/base/i18n/mn.po
+++ b/odoo/addons/base/i18n/mn.po
@@ -9365,7 +9365,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Суулгацыг устгах боломжийг шалгах модуль."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31767,7 +31767,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "тест_орчуулгын_импорт"
 
diff --git a/odoo/addons/base/i18n/nb.po b/odoo/addons/base/i18n/nb.po
index 796d336ee481f..6c47021af23cd 100644
--- a/odoo/addons/base/i18n/nb.po
+++ b/odoo/addons/base/i18n/nb.po
@@ -8708,7 +8708,7 @@ msgid "A module to test the uninstall feature."
 msgstr "En modul for å teste avinstallering."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30987,7 +30987,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/nl.po b/odoo/addons/base/i18n/nl.po
index 2d82de6647863..0b09c861ab011 100644
--- a/odoo/addons/base/i18n/nl.po
+++ b/odoo/addons/base/i18n/nl.po
@@ -12233,7 +12233,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Een module om het de-installeren te testen"
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Een module om de vertaling import te testen."
 
@@ -36077,7 +36077,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/pl.po b/odoo/addons/base/i18n/pl.po
index 6bd7419027280..a62fb308dd118 100644
--- a/odoo/addons/base/i18n/pl.po
+++ b/odoo/addons/base/i18n/pl.po
@@ -10038,7 +10038,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Moduł do testowania funkcji deinstalacji."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Moduł do testowania importu tłumaczeń."
 
@@ -32468,7 +32468,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/pt.po b/odoo/addons/base/i18n/pt.po
index 579a05b5d1a2d..fdc5d040235ee 100644
--- a/odoo/addons/base/i18n/pt.po
+++ b/odoo/addons/base/i18n/pt.po
@@ -8843,7 +8843,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Um módulo para testar a funcionalidade de desinstalação."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -31150,7 +31150,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/pt_BR.po b/odoo/addons/base/i18n/pt_BR.po
index ea1172deeaeaa..0c70c2f10d023 100644
--- a/odoo/addons/base/i18n/pt_BR.po
+++ b/odoo/addons/base/i18n/pt_BR.po
@@ -11380,7 +11380,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Um módulo para testar a função de desinstalar."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Um módulo para testar a importação de tradução."
 
@@ -34365,7 +34365,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/ro.po b/odoo/addons/base/i18n/ro.po
index 9eef069725c98..656562bda6c7d 100644
--- a/odoo/addons/base/i18n/ro.po
+++ b/odoo/addons/base/i18n/ro.po
@@ -9892,7 +9892,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Un modul pentru a testa caracteristica de dezinstalare."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Un modul pentru testarea importului de traduceri."
 
@@ -32566,7 +32566,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/ru.po b/odoo/addons/base/i18n/ru.po
index 7068d8ef18679..6d4f032191641 100644
--- a/odoo/addons/base/i18n/ru.po
+++ b/odoo/addons/base/i18n/ru.po
@@ -12767,7 +12767,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Модуль для тестирования функции удаления."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Модуль для проверки импорта/экспорта."
 
@@ -37749,7 +37749,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "модуль для проверки импорта/экспорта"
 
diff --git a/odoo/addons/base/i18n/sk.po b/odoo/addons/base/i18n/sk.po
index cc69374e4b72d..de81bf398623f 100644
--- a/odoo/addons/base/i18n/sk.po
+++ b/odoo/addons/base/i18n/sk.po
@@ -9801,7 +9801,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Modul na testovanie funkcie odinštalovania."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Modul na testovanie importu prekladu."
 
@@ -32190,7 +32190,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "testovací import prekladu"
 
diff --git a/odoo/addons/base/i18n/sq.po b/odoo/addons/base/i18n/sq.po
index d499871c62786..7de53f6e0988d 100644
--- a/odoo/addons/base/i18n/sq.po
+++ b/odoo/addons/base/i18n/sq.po
@@ -8606,7 +8606,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -30864,7 +30864,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/sr@latin.po b/odoo/addons/base/i18n/sr@latin.po
index 6a5b04eb40af7..9ef8fa78ad4d1 100644
--- a/odoo/addons/base/i18n/sr@latin.po
+++ b/odoo/addons/base/i18n/sr@latin.po
@@ -9374,7 +9374,7 @@ msgid "A module to test the uninstall feature."
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr ""
 
@@ -33594,7 +33594,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr ""
 
diff --git a/odoo/addons/base/i18n/sv.po b/odoo/addons/base/i18n/sv.po
index 66d8c59f4644c..38c9db584aa5f 100644
--- a/odoo/addons/base/i18n/sv.po
+++ b/odoo/addons/base/i18n/sv.po
@@ -11626,7 +11626,7 @@ msgid "A module to test the uninstall feature."
 msgstr "En modul för att testa avinstallationsfunktionen."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "En modul för att testa översättningsimport."
 
@@ -35446,7 +35446,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/th.po b/odoo/addons/base/i18n/th.po
index 89283ff2f9d76..dfd5997d910a3 100644
--- a/odoo/addons/base/i18n/th.po
+++ b/odoo/addons/base/i18n/th.po
@@ -9128,7 +9128,7 @@ msgid "A module to test the uninstall feature."
 msgstr "A module to test the uninstall feature."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "A module to test import/export."
 
@@ -31465,7 +31465,7 @@ msgid "test-populate"
 msgstr ""
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "นำเข้าการแปล"
 
diff --git a/odoo/addons/base/i18n/tr.po b/odoo/addons/base/i18n/tr.po
index 6f3070cbe4046..2827c2f016331 100644
--- a/odoo/addons/base/i18n/tr.po
+++ b/odoo/addons/base/i18n/tr.po
@@ -11944,7 +11944,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Kaldırma özelliği test etmek için bir modül."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Çeviri içeri aktarımını test etmek için bir modül."
 
@@ -35610,7 +35610,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/uk.po b/odoo/addons/base/i18n/uk.po
index e2a06c357f231..47b043f8095fd 100644
--- a/odoo/addons/base/i18n/uk.po
+++ b/odoo/addons/base/i18n/uk.po
@@ -12390,7 +12390,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Модуль для тестування де-інсталяції."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Модуль для перевірки імпорту перекладу."
 
@@ -36246,7 +36246,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/vi.po b/odoo/addons/base/i18n/vi.po
index 3af673a00b327..c33212741fec8 100644
--- a/odoo/addons/base/i18n/vi.po
+++ b/odoo/addons/base/i18n/vi.po
@@ -12281,7 +12281,7 @@ msgid "A module to test the uninstall feature."
 msgstr "Module để kiểm thử tính năng gỡ cài đặt."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "Module để kiểm thử thao tác nhập bản dịch."
 
@@ -36134,7 +36134,7 @@ msgid "test-populate"
 msgstr "test-populate"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/zh_CN.po b/odoo/addons/base/i18n/zh_CN.po
index fa05acfeb921c..348081b831d4b 100644
--- a/odoo/addons/base/i18n/zh_CN.po
+++ b/odoo/addons/base/i18n/zh_CN.po
@@ -12250,7 +12250,7 @@ msgid "A module to test the uninstall feature."
 msgstr "测试卸载功能的模块."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "测试翻译导入的模块."
 
@@ -36212,7 +36212,7 @@ msgid "test-populate"
 msgstr "测试填充"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/base/i18n/zh_TW.po b/odoo/addons/base/i18n/zh_TW.po
index 8231230e57d74..78efd23ef2567 100644
--- a/odoo/addons/base/i18n/zh_TW.po
+++ b/odoo/addons/base/i18n/zh_TW.po
@@ -14456,7 +14456,7 @@ msgid "A module to test the uninstall feature."
 msgstr "測試卸載功能的模組."
 
 #. module: base
-#: model:ir.module.module,description:base.module_test_translation_import
+#: model:ir.module.module,description:base.module_test_translation
 msgid "A module to test translation import."
 msgstr "測試翻譯匯入的模組."
 
@@ -46878,7 +46878,7 @@ msgid "test-lint"
 msgstr "test-lint"
 
 #. module: base
-#: model:ir.module.module,shortdesc:base.module_test_translation_import
+#: model:ir.module.module,shortdesc:base.module_test_translation
 msgid "test-translation-import"
 msgstr "test-translation-import"
 
diff --git a/odoo/addons/test_translation_import/models/__init__.py b/odoo/addons/test_translation/__init__.py
similarity index 100%
rename from odoo/addons/test_translation_import/models/__init__.py
rename to odoo/addons/test_translation/__init__.py
diff --git a/odoo/addons/test_translation/__manifest__.py b/odoo/addons/test_translation/__manifest__.py
new file mode 100644
index 0000000000000..d354b5059ce93
--- /dev/null
+++ b/odoo/addons/test_translation/__manifest__.py
@@ -0,0 +1,22 @@
+{
+    'name': 'Test Translation',
+    'version': '0.1',
+    'category': 'Hidden/Tests',
+    'description': """A module to test translation.""",
+    'depends': ['base'],
+    'data': [
+        'security/ir.model.access.csv',
+        'view.xml',
+        'data/test_translation_data.xml',
+        'data/test.translation.model1.csv',
+        'data/test.translation.model1-translated.csv',
+    ],
+    'installable': True,
+    'assets': {
+        'web.assets_backend': [
+            'test_translation/static/src/xml/js_templates.xml',
+        ],
+    },
+    'author': 'Odoo S.A.',
+    'license': 'LGPL-3',
+}
diff --git a/odoo/addons/test_translation_import/data/files/test_spreadsheet_dashboard.json b/odoo/addons/test_translation/data/files/test_spreadsheet_dashboard.json
similarity index 100%
rename from odoo/addons/test_translation_import/data/files/test_spreadsheet_dashboard.json
rename to odoo/addons/test_translation/data/files/test_spreadsheet_dashboard.json
diff --git a/odoo/addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json b/odoo/addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json
similarity index 100%
rename from odoo/addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json
rename to odoo/addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json
diff --git a/odoo/addons/test_translation/data/test.translation.model1-translated.csv b/odoo/addons/test_translation/data/test.translation.model1-translated.csv
new file mode 100644
index 0000000000000..5474a197ef0a4
--- /dev/null
+++ b/odoo/addons/test_translation/data/test.translation.model1-translated.csv
@@ -0,0 +1,2 @@
+id,name,name@fr_FR
+test_translation_model1_record4,"Test Translation CSV from data","Test de traduction CSV depuis les données"
diff --git a/odoo/addons/test_translation/data/test.translation.model1.csv b/odoo/addons/test_translation/data/test.translation.model1.csv
new file mode 100644
index 0000000000000..00c93f6e196e3
--- /dev/null
+++ b/odoo/addons/test_translation/data/test.translation.model1.csv
@@ -0,0 +1,2 @@
+id,name
+test_translation_model1_record3,"Test Translation CSV from PO"
diff --git a/odoo/addons/test_translation_import/data/test_translation_import_data.xml b/odoo/addons/test_translation/data/test_translation_data.xml
similarity index 51%
rename from odoo/addons/test_translation_import/data/test_translation_import_data.xml
rename to odoo/addons/test_translation/data/test_translation_data.xml
index 0bd005c89a766..dbc87487b8eb0 100644
--- a/odoo/addons/test_translation_import/data/test_translation_import_data.xml
+++ b/odoo/addons/test_translation/data/test_translation_data.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record model="test.translation.import.model1" id="test_translation_import_model1_record1">
+    <record model="test.translation.model1" id="test_translation_model1_record1">
         <field name="name">Tableware</field>
         <field name="xml" type="xml"><form string="Fork"><div>Knife</div><div>Spoon</div></form></field>
     </record>
-    <record model="test.translation.import.model1" id="test_translation_import_model1_record2">
+    <record model="test.translation.model1" id="test_translation_model1_record2">
         <field name="name">Furniture</field>  <!-- this shoulnd't appear in the .pot because it is translated in this file-->
         <field name="name@fr_FR">Meuble</field>
     </record>
-    <record model="test.translation.import.model2" id="test_translation_import_model2_record1">
-        <field name="model1_id" ref="test_translation_import.test_translation_import_model1_record1"/>
+    <record model="test.translation.model2" id="test_translation_model2_record1">
+        <field name="model1_id" ref="test_translation.test_translation_model1_record1"/>
     </record>
 </odoo>
diff --git a/odoo/addons/test_translation/i18n/dot.csv b/odoo/addons/test_translation/i18n/dot.csv
new file mode 100644
index 0000000000000..0e42ccb1dd5a3
--- /dev/null
+++ b/odoo/addons/test_translation/i18n/dot.csv
@@ -0,0 +1,5 @@
+module,type,name,res_id,src,value,comments
+test_translation,model,"test.translation.model1,name",test_translation.test_translation_model1_record1,Tableware,"Tableware, Dot"
+test_translation,model_term,"test.translation.model1,html",test_translation.test_translation_model1_record1,Fork,"Fork, Dot"
+test_translation,model_term,"test.translation.model1,html",test_translation.test_translation_model1_record1,Spoon,"Spoon, Dot"
+test_translation,model_term,"test.translation.model1,html",test_translation.test_translation_model1_record1,Knife,"Kinfe, Dot"
diff --git a/odoo/addons/test_translation/i18n/fr.po b/odoo/addons/test_translation/i18n/fr.po
new file mode 100644
index 0000000000000..6ee959032ec29
--- /dev/null
+++ b/odoo/addons/test_translation/i18n/fr.po
@@ -0,0 +1,622 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* test_translation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-10 17:44+0000\n"
+"PO-Revision-Date: 2022-11-10 17:44+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Bar chart title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code Lazy, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %(num)s, %(symbol)s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, English"
+msgstr "Code, Français"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Fork"
+msgstr "Fourchette"
+
+#. module: test_translation
+#: model:ir.model.fields,help:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,help:test_translation.field_test_translation_model2__name
+msgid "Help, English"
+msgstr "Aider, Français"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
+msgid "ID"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 26"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 27"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Knife"
+msgstr "Couteau"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__model1_id
+msgid "Model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__name
+msgid "Name"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Opportunities"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 26 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 27 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 28"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline Analysis"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard chart"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard description"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Scorecard title"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__bar
+msgid "Selection Bar"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__foo
+msgid "Selection Foo"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Spoon"
+msgstr "Cuillère"
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record1
+msgid "Tableware"
+msgstr "Vaisselle"
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record3
+msgid "Test Translation CSV from PO"
+msgstr "Test de traduction CSV depuis PO"
+
+#. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
+#: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
+msgid "Test translation import model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.ui.menu,name:test_translation.menu_test_translation
+msgid "Test translation model1"
+msgstr "Test translation import in french"
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model1
+msgid "Translation Test 1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model2
+msgid "Translation Test 2"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__xml
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__xml
+msgid "XML"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "aa (\\\"inside\\\") bb"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "do export"
+msgstr "exporter"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 1"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 3"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "hello \\\"world\\\""
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "link label"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot"
+msgstr "emplacement"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot 2"
+msgstr "emplacement 2"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "text node"
+msgstr "nœud de texte"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "with spaces"
+msgstr ""
diff --git a/odoo/addons/test_translation/i18n/fr_BE.po b/odoo/addons/test_translation/i18n/fr_BE.po
new file mode 100644
index 0000000000000..cb5aa48bb5e28
--- /dev/null
+++ b/odoo/addons/test_translation/i18n/fr_BE.po
@@ -0,0 +1,615 @@
+# This is a test PO file, not a complete one. It is manually maintained
+# to test the import translation behavior of Odoo.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-10 17:44+0000\n"
+"PO-Revision-Date: 2022-11-10 17:44+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Bar chart title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code Lazy, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %(num)s, %(symbol)s, English"
+msgstr "Code, %(num)s, %(symbol)s, Français, Belgium"
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %s, English"
+msgstr "Code, %s, Français, Belgium"
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, English"
+msgstr "Code, Français, Belgium"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Fork"
+msgstr "Fourchette, Belgium"
+
+#. module: test_translation
+#: model:ir.model.fields,help:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,help:test_translation.field_test_translation_model2__name
+msgid "Help, English"
+msgstr "Aider, Français, Belgium"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
+msgid "ID"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 26"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 27"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Knife"
+msgstr "Couteau, Belgium"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__model1_id
+msgid "Model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__name
+msgid "Name"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Opportunities"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 26 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 27 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 28"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline Analysis"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard chart"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard description"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Scorecard title"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__bar
+msgid "Selection Bar"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__foo
+msgid "Selection Foo"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Spoon"
+msgstr "Cuillère, Belgium"
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record1
+msgid "Tableware"
+msgstr "Vaisselle, Belgium"
+
+#. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
+#: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
+msgid "Test translation import model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.ui.menu,name:test_translation.menu_test_translation
+msgid "Test translation model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model1
+msgid "Translation Test 1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model2
+msgid "Translation Test 2"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__xml
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__xml
+msgid "XML"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "aa (\\\"inside\\\") bb"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "do export"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 1"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 3"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "hello \\\"world\\\""
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "link label"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "text node"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "with spaces"
+msgstr ""
diff --git a/odoo/addons/test_translation/i18n/fr_CA.po b/odoo/addons/test_translation/i18n/fr_CA.po
new file mode 100644
index 0000000000000..a6e660ddd3b4b
--- /dev/null
+++ b/odoo/addons/test_translation/i18n/fr_CA.po
@@ -0,0 +1,615 @@
+# This is a test PO file, not a complete one. It is manually maintained
+# to test the import translation behavior of Odoo.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-10 17:44+0000\n"
+"PO-Revision-Date: 2022-11-10 17:44+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Bar chart title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code Lazy, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %(num)s, %(symbol)s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, English"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Fork"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,help:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,help:test_translation.field_test_translation_model2__name
+msgid "Help, English"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
+msgid "ID"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 26"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 27"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Knife"
+msgstr "Couteau, Canada"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__model1_id
+msgid "Model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__name
+msgid "Name"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Opportunities"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 26 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 27 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 28"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline Analysis"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard chart"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard description"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Scorecard title"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__bar
+msgid "Selection Bar"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__foo
+msgid "Selection Foo"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Spoon"
+msgstr ""
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record1
+msgid "Tableware"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
+#: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
+msgid "Test translation import model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.ui.menu,name:test_translation.menu_test_translation
+msgid "Test translation model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model1
+msgid "Translation Test 1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model2
+msgid "Translation Test 2"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__xml
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__xml
+msgid "XML"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "aa (\\\"inside\\\") bb"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "do export"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 1"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 3"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "hello \\\"world\\\""
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "link label"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "text node"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "with spaces"
+msgstr ""
diff --git a/odoo/addons/test_translation/i18n/test_translation.pot b/odoo/addons/test_translation/i18n/test_translation.pot
new file mode 100644
index 0000000000000..70ec3950c040a
--- /dev/null
+++ b/odoo/addons/test_translation/i18n/test_translation.pot
@@ -0,0 +1,608 @@
+# This is a test POT file, not a true template. It is manually maintained
+# to test the import translation behavior of Odoo.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-10 17:44+0000\n"
+"PO-Revision-Date: 2022-11-10 17:44+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Bar chart title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code Lazy, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %(num)s, %(symbol)s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, English"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Fork"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,help:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,help:test_translation.field_test_translation_model2__name
+msgid "Help, English"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
+msgid "ID"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 26"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 27"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Knife"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__model1_id
+msgid "Model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__name
+msgid "Name"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Opportunities"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 26 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 27 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 28"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard chart"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard description"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Scorecard title"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__bar
+msgid "Selection Bar"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__foo
+msgid "Selection Foo"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Spoon"
+msgstr ""
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record1
+msgid "Tableware"
+msgstr ""
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record3
+msgid "Test Translation CSV from PO"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
+#: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
+msgid "Test translation import model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.ui.menu,name:test_translation.menu_test_translation
+msgid "Test translation model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model1
+msgid "Translation Test 1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model2
+msgid "Translation Test 2"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__xml
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__xml
+msgid "XML"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "aa (\\\"inside\\\") bb"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "do export"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 1"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 3"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "hello \\\"world\\\""
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "link label"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "text node"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "with spaces"
+msgstr ""
diff --git a/odoo/addons/test_translation/i18n/tlh.po b/odoo/addons/test_translation/i18n/tlh.po
new file mode 100644
index 0000000000000..cfb3cd758f77d
--- /dev/null
+++ b/odoo/addons/test_translation/i18n/tlh.po
@@ -0,0 +1,615 @@
+# This is a test PO file, not a complete one. It is manually maintained
+# to test the import translation behavior of Odoo.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-11-10 17:44+0000\n"
+"PO-Revision-Date: 2022-11-10 17:44+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Bar chart title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code Lazy, English"
+msgstr "Code Lazy, Klingon"
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %(num)s, %(symbol)s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, %s, English"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "Code, English"
+msgstr "Code, Klingon"
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Fork"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,help:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,help:test_translation.field_test_translation_model2__name
+msgid "Help, English"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
+msgid "ID"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 26"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/js/js_codefile.js:0
+msgid "JS Export 27"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Knife"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__model1_id
+msgid "Model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__name
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__name
+msgid "Name"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart horizontal axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Odoo Chart vertical axis title"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Opportunities"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 01 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 02 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 03 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 04 (Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 05 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 06 (Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 07 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 08 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 09 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 10 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 11 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 12 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 13 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 14 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 15 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 16 (Double Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 17 %(named)s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 18 (Double Nested Named)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 19 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 20 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 21 (Base Nested)"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 22 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 23"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 24 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 25"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 26 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 27 %s"
+msgstr ""
+
+#. module: test_translation
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+msgid "PY Export 28"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Pipeline Analysis"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard chart"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "Scorecard description"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json:0
+msgid "Scorecard title"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__bar
+msgid "Selection Bar"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields.selection,name:test_translation.selection__test_translation_model1__selection__foo
+msgid "Selection Foo"
+msgstr ""
+
+#. module: test_translation
+#: model_terms:test.translation.model1,xml:test_translation.test_translation_model1_record1
+msgid "Spoon"
+msgstr ""
+
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record1
+msgid "Tableware"
+msgstr "Tableware, Klingon"
+
+#. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
+#: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
+msgid "Test translation import model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.ui.menu,name:test_translation.menu_test_translation
+msgid "Test translation model1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model1
+msgid "Translation Test 1"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_model2
+msgid "Translation Test 2"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__xml
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__xml
+msgid "XML"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "aa (\\\"inside\\\") bb"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "do export"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 1"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "exported 3"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "hello \\\"world\\\""
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "link label"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#. odoo-python
+#: code:addons/test_translation/models/models.py:0
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "slot 2"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/static/src/xml/js_templates.xml:0
+msgid "text node"
+msgstr ""
+
+#. module: test_translation
+#. odoo-javascript
+#: code:addons/test_translation/data/files/test_spreadsheet_dashboard.json:0
+msgid "with spaces"
+msgstr ""
diff --git a/odoo/addons/test_translation/models/__init__.py b/odoo/addons/test_translation/models/__init__.py
new file mode 100644
index 0000000000000..0650744f6bc69
--- /dev/null
+++ b/odoo/addons/test_translation/models/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/odoo/addons/test_translation_import/models/models.py b/odoo/addons/test_translation/models/models.py
similarity index 88%
rename from odoo/addons/test_translation_import/models/models.py
rename to odoo/addons/test_translation/models/models.py
index d1141ef96e748..8c320999830e6 100644
--- a/odoo/addons/test_translation_import/models/models.py
+++ b/odoo/addons/test_translation/models/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from odoo import fields, models
 from odoo.tools.translate import _, xml_translate, LazyTranslate
 
@@ -10,8 +9,8 @@ def dummy_function(self, term):
         return term
 
 
-class TestTranslationImportModel1(models.Model):
-    _name = 'test.translation.import.model1'
+class TestTranslationModel1(models.Model):
+    _name = 'test.translation.model1'
     _description = 'Translation Test 1'
 
     name = fields.Char('Name', translate=True, help='Help, English')
@@ -80,9 +79,9 @@ def dummy_function(term):
         _(dummy_function("NO - PY Export 08"))
 
 
-class TestTranslationImportModel2(models.Model):
-    _name = 'test.translation.import.model2'
-    _inherits = {'test.translation.import.model1': 'model1_id'}
+class TestTranslationModel2(models.Model):
+    _name = 'test.translation.model2'
+    _inherits = {'test.translation.model1': 'model1_id'}
     _description = 'Translation Test 2'
 
-    model1_id = fields.Many2one('test.translation.import.model1', required=True, ondelete='cascade')
+    model1_id = fields.Many2one('test.translation.model1', required=True, ondelete='cascade')
diff --git a/odoo/addons/test_translation/security/ir.model.access.csv b/odoo/addons/test_translation/security/ir.model.access.csv
new file mode 100644
index 0000000000000..6d8eb5a4da0b6
--- /dev/null
+++ b/odoo/addons/test_translation/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_test_translation_model1","access.test.translation.model1","model_test_translation_model1",,0,0,0,0
+"access_test_translation_model2","access.test.translation.model2","model_test_translation_model2",,0,0,0,0
diff --git a/odoo/addons/test_translation_import/static/src/js/js_codefile.js b/odoo/addons/test_translation/static/src/js/js_codefile.js
similarity index 100%
rename from odoo/addons/test_translation_import/static/src/js/js_codefile.js
rename to odoo/addons/test_translation/static/src/js/js_codefile.js
diff --git a/odoo/addons/test_translation_import/static/src/xml/js_templates.xml b/odoo/addons/test_translation/static/src/xml/js_templates.xml
similarity index 100%
rename from odoo/addons/test_translation_import/static/src/xml/js_templates.xml
rename to odoo/addons/test_translation/static/src/xml/js_templates.xml
diff --git a/odoo/addons/test_translation_import/tests/__init__.py b/odoo/addons/test_translation/tests/__init__.py
similarity index 71%
rename from odoo/addons/test_translation_import/tests/__init__.py
rename to odoo/addons/test_translation/tests/__init__.py
index d23a2fa0076d4..e8f5edb34338e 100644
--- a/odoo/addons/test_translation_import/tests/__init__.py
+++ b/odoo/addons/test_translation/tests/__init__.py
@@ -1,4 +1,2 @@
-# -*- coding: utf-8 -*-
-
 from . import test_export_wizard
 from . import test_term_count
diff --git a/odoo/addons/test_translation_import/tests/test_export_wizard.py b/odoo/addons/test_translation/tests/test_export_wizard.py
similarity index 100%
rename from odoo/addons/test_translation_import/tests/test_export_wizard.py
rename to odoo/addons/test_translation/tests/test_export_wizard.py
diff --git a/odoo/addons/test_translation_import/tests/test_term_count.py b/odoo/addons/test_translation/tests/test_term_count.py
similarity index 85%
rename from odoo/addons/test_translation_import/tests/test_term_count.py
rename to odoo/addons/test_translation/tests/test_term_count.py
index 98ead48049f36..1ebd79a3d47f7 100644
--- a/odoo/addons/test_translation_import/tests/test_term_count.py
+++ b/odoo/addons/test_translation/tests/test_term_count.py
@@ -16,7 +16,7 @@ def test_import_code_translation(self):
         self.env['res.lang']._activate_lang('fr_FR')
 
         # Tip: code translations don't need to be imported explicitly
-        model = self.env['test.translation.import.model1']
+        model = self.env['test.translation.model1']
         self.assertEqual(
             model.with_context(lang='fr_FR').get_code_translation(),
             'Code, Français'
@@ -24,24 +24,24 @@ def test_import_code_translation(self):
 
     def test_import_model_translation(self):
         self.env['res.lang']._activate_lang('fr_FR')
-        self.env['ir.module.module']._load_module_terms(['test_translation_import'], ['fr_FR'])
+        self.env['ir.module.module']._load_module_terms(['test_translation'], ['fr_FR'])
 
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record1')
+        record = self.env.ref('test_translation.test_translation_model1_record1')
         self.assertEqual(
             record.with_context(lang='fr_FR').name,
             'Vaisselle'
         )
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record2')
+        record = self.env.ref('test_translation.test_translation_model1_record2')
         self.assertEqual(
             record.with_context(lang='fr_FR').name,
             'Meuble'
         )
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record3')
+        record = self.env.ref('test_translation.test_translation_model1_record3')
         self.assertEqual(
             record.with_context(lang='fr_FR').name,
             'Test de traduction CSV depuis PO'
         )
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record4')
+        record = self.env.ref('test_translation.test_translation_model1_record4')
         self.assertEqual(
             record.with_context(lang='fr_FR').name,
             'Test de traduction CSV depuis les données'
@@ -49,9 +49,9 @@ def test_import_model_translation(self):
 
     def test_import_model_term_translation(self):
         self.env['res.lang']._activate_lang('fr_FR')
-        self.env['ir.module.module']._load_module_terms(['test_translation_import'], ['fr_FR'])
+        self.env['ir.module.module']._load_module_terms(['test_translation'], ['fr_FR'])
 
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record1')
+        record = self.env.ref('test_translation.test_translation_model1_record1')
         self.assertEqual(
             record.with_context(lang='fr_FR').xml,
             '<form string="Fourchette"><div>Couteau</div><div>Cuillère</div></form>'
@@ -61,15 +61,15 @@ def test_noupdate(self):
         """
         Make sure no update do not overwrite translations
         """
-        menu = self.env.ref('test_translation_import.menu_test_translation_import')
+        menu = self.env.ref('test_translation.menu_test_translation')
         self.assertEqual(menu.name, 'Test translation model1')
         # install french and change translation content
         self.env['res.lang']._activate_lang('fr_FR')
-        self.env['ir.module.module']._load_module_terms(['test_translation_import'], ['fr_FR'])
+        self.env['ir.module.module']._load_module_terms(['test_translation'], ['fr_FR'])
         self.assertEqual(menu.with_context(lang='fr_FR').name, "Test translation import in french")
         menu.with_context(lang='fr_FR').name = "Nouveau nom"
         # reload with overwrite
-        self.env['ir.module.module']._load_module_terms(['test_translation_import'], ['fr_FR'], overwrite=True)
+        self.env['ir.module.module']._load_module_terms(['test_translation'], ['fr_FR'], overwrite=True)
 
         self.assertEqual(menu.name, "Test translation model1")
         self.assertEqual(menu.with_context(lang='fr_FR').name, "Nouveau nom")
@@ -77,10 +77,10 @@ def test_noupdate(self):
     def test_lang_with_base(self):
         self.env['res.lang']._activate_lang('fr_BE')
         self.env['res.lang']._activate_lang('fr_CA')
-        self.env['ir.module.module']._load_module_terms(['test_translation_import'], ['fr_BE', 'fr_CA'], overwrite=True)
+        self.env['ir.module.module']._load_module_terms(['test_translation'], ['fr_BE', 'fr_CA'], overwrite=True)
 
         # language override base language
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record1')
+        record = self.env.ref('test_translation.test_translation_model1_record1')
         self.assertEqual(
             record.with_context(lang='fr_BE').get_code_translation(),
             'Code, Français, Belgium'
@@ -110,7 +110,7 @@ def test_lang_with_base(self):
 
     def test_import_from_po_file(self):
         """Test the import from a single po file works"""
-        with file_open('test_translation_import/i18n/tlh.po', 'rb') as f:
+        with file_open('test_translation/i18n/tlh.po', 'rb') as f:
             po_file = base64.encodebytes(f.read())
 
         import_tlh = self.env["base.language.import"].create({
@@ -125,7 +125,7 @@ def test_import_from_po_file(self):
         tlh_lang = self.env['res.lang']._lang_get('tlh')
         self.assertTrue(tlh_lang, "The imported language was not creates")
 
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record1')
+        record = self.env.ref('test_translation.test_translation_model1_record1')
         self.assertEqual(
             record.with_context(lang='tlh').get_code_translation(),
             'Code, Klingon'
@@ -137,7 +137,7 @@ def test_import_from_po_file(self):
 
     def test_lazy_translation(self):
         """Test the import from a single po file works"""
-        with file_open('test_translation_import/i18n/tlh.po', 'rb') as f:
+        with file_open('test_translation/i18n/tlh.po', 'rb') as f:
             po_file = base64.encodebytes(f.read())
 
         import_tlh = self.env["base.language.import"].create({
@@ -149,7 +149,7 @@ def test_lazy_translation(self):
         with mute_logger('odoo.addons.base.models.res_lang'):
             import_tlh.import_lang()
 
-        model = self.env['test.translation.import.model1']
+        model = self.env['test.translation.model1']
         TRANSLATED_TERM = model.get_code_lazy_translation()
 
         self.assertEqual(
@@ -180,7 +180,7 @@ def test_lazy_translation(self):
 
     def test_import_from_csv_file(self):
         """Test the import from a single CSV file works"""
-        with file_open('test_translation_import/i18n/dot.csv', 'rb') as f:
+        with file_open('test_translation/i18n/dot.csv', 'rb') as f:
             po_file = base64.encodebytes(f.read())
 
         import_tlh = self.env["base.language.import"].create({
@@ -196,7 +196,7 @@ def test_import_from_csv_file(self):
         self.assertTrue(dot_lang, "The imported language was not creates")
 
         # code translation cannot be changed or imported, it only depends on the po file in the module directory
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record1')
+        record = self.env.ref('test_translation.test_translation_model1_record1')
         self.assertEqual(
             record.with_context(lang='dot').get_code_translation(),
             'Code, English'
@@ -210,7 +210,7 @@ def test_translation_placeholder(self):
         """Verify placeholder use in _()"""
         self.env['res.lang']._activate_lang('fr_BE')
 
-        model_fr_BE = self.env['test.translation.import.model1'].with_context(lang='fr_BE')
+        model_fr_BE = self.env['test.translation.model1'].with_context(lang='fr_BE')
 
         # correctly translate
         self.assertEqual(
@@ -253,7 +253,7 @@ def test_translation_placeholder(self):
 
         # source error: wrong arguments
         with self.assertRaises(KeyError):
-            model_fr_BE.get_code_named_placeholder_translation(symbol="🧀"),
+            model_fr_BE.get_code_named_placeholder_translation(symbol="🧀")
 
         # correctly translate markup
         self.assertEqual(
@@ -267,7 +267,7 @@ def test_translation_placeholder(self):
 class TestTranslationFlow(common.TransactionCase):
 
     def test_export_pot(self):
-        module_name = 'test_translation_import'
+        module_name = 'test_translation'
         module = self.env.ref('base.module_' + module_name)
         export = self.env["base.language.export"].create({
             'format': 'po',
@@ -289,7 +289,7 @@ def test_export_import(self):
             'lang_ids': [(6, 0, [self.env.ref('base.lang_fr').id])],
         }).lang_install()
 
-        module = self.env.ref('base.module_test_translation_import')
+        module = self.env.ref('base.module_test_translation')
         export = self.env["base.language.export"].create({
             'lang': 'fr_FR',
             'format': 'po',
@@ -307,12 +307,12 @@ def test_export_import(self):
 
             def filter_func_for_python(row):
                 return row.get('value') and PYTHON_TRANSLATION_COMMENT in row['comments']
-            new_code_translations.python_translations[('test_translation_import', 'fr_FR')] = \
+            new_code_translations.python_translations['test_translation', 'fr_FR'] = \
                 CodeTranslations._read_code_translations_file(po_file, filter_func_for_python)
 
             def filter_func_for_javascript(row):
                 return row.get('value') and JAVASCRIPT_TRANSLATION_COMMENT in row['comments']
-            new_code_translations.web_translations[('test_translation_import', 'fr_FR')] = {
+            new_code_translations.web_translations['test_translation', 'fr_FR'] = {
                 "messages": tuple(
                     {"id": src, "string": value}
                     for src, value in CodeTranslations._read_code_translations_file(
@@ -320,12 +320,12 @@ def filter_func_for_javascript(row):
                 )
             }
 
-        old_python = code_translations.get_python_translations('test_translation_import', 'fr_FR')
-        new_python = new_code_translations.get_python_translations('test_translation_import', 'fr_FR')
+        old_python = code_translations.get_python_translations('test_translation', 'fr_FR')
+        new_python = new_code_translations.get_python_translations('test_translation', 'fr_FR')
         self.assertEqual(old_python, new_python, 'python code translations are not exported/imported correctly')
 
-        old_web = code_translations.get_web_translations('test_translation_import', 'fr_FR')
-        new_web = new_code_translations.get_web_translations('test_translation_import', 'fr_FR')
+        old_web = code_translations.get_web_translations('test_translation', 'fr_FR')
+        new_web = new_code_translations.get_web_translations('test_translation', 'fr_FR')
         self.assertEqual(old_web, new_web, 'web client code translations are not exported/imported correctly')
 
         self.assertNotIn('text node', new_python, 'web client only translations should not be stored as python translations')
@@ -337,7 +337,7 @@ def filter_func_for_javascript(row):
         )
 
         # test model and model terms translations
-        record = self.env.ref('test_translation_import.test_translation_import_model1_record1')
+        record = self.env.ref('test_translation.test_translation_model1_record1')
         record.invalidate_recordset()
         self.assertEqual(
             record.with_context(lang='fr_FR').name,
@@ -385,7 +385,7 @@ def test_export_import_csv(self):
         """ Ensure can reimport exported csv """
         self.env.ref("base.lang_fr").active = True
 
-        module = self.env.ref('base.module_test_translation_import')
+        module = self.env.ref('base.module_test_translation')
         export = self.env["base.language.export"].create({
             'lang': 'fr_FR',
             'format': 'csv',
@@ -407,10 +407,10 @@ def test_export_import_csv(self):
 
     def test_export_static_templates(self):
         trans_static = []
-        po_reader = TranslationModuleReader(self.env.cr, ['test_translation_import'])
+        po_reader = TranslationModuleReader(self.env.cr, ['test_translation'])
         for line in po_reader:
-            module, ttype, name, res_id, source, value, comments = line
-            if name == "addons/test_translation_import/static/src/xml/js_templates.xml":
+            _module, _ttype, name, _res_id, source, _value, _comments = line
+            if name == "addons/test_translation/static/src/xml/js_templates.xml":
                 trans_static.append(source)
 
         self.assertNotIn('no export', trans_static)
@@ -421,10 +421,10 @@ def test_export_static_templates(self):
 
     def test_export_spreadsheet(self):
         terms = []
-        po_reader = TranslationModuleReader(self.env.cr, ['test_translation_import'])
+        po_reader = TranslationModuleReader(self.env.cr, ['test_translation'])
         for line in po_reader:
             _module, _ttype, name, _res_id, source, _value, _comments = line
-            if name == "addons/test_translation_import/data/files/test_spreadsheet_dashboard.json":
+            if name == "addons/test_translation/data/files/test_spreadsheet_dashboard.json":
                 terms.append(source)
         self.assertEqual(set(terms), {
             'exported 1',
@@ -442,10 +442,10 @@ def test_export_spreadsheet(self):
 
     def test_export_spreadsheet_new_dataset(self):
         terms = []
-        po_reader = TranslationModuleReader(self.env.cr, ['test_translation_import'])
+        po_reader = TranslationModuleReader(self.env.cr, ['test_translation'])
         for line in po_reader:
             _module, _ttype, name, _res_id, source, _value, _comments = line
-            if name == 'addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json':
+            if name == 'addons/test_translation/data/files/test_spreadsheet_v16_dashboard.json':
                 terms.append(source)
         self.assertEqual(set(terms), {
             'Bar chart title',
@@ -464,10 +464,10 @@ def test_export_records(self):
         }).lang_install()
 
         model1_ids = [
-            self.env.ref('test_translation_import.test_translation_import_model1_record1').id,
-            self.env.ref('test_translation_import.test_translation_import_model1_record2').id,
+            self.env.ref('test_translation.test_translation_model1_record1').id,
+            self.env.ref('test_translation.test_translation_model1_record2').id,
         ]
-        po_reader = TranslationRecordReader(self.env.cr, 'test.translation.import.model1', model1_ids, lang='fr_FR')
+        po_reader = TranslationRecordReader(self.env.cr, 'test.translation.model1', model1_ids, lang='fr_FR')
         translations = {line[4]: line[5] for line in po_reader}
         self.assertDictEqual(
             translations,
@@ -480,8 +480,8 @@ def test_export_records(self):
             }
         )
 
-        model2_ids = self.env.ref('test_translation_import.test_translation_import_model2_record1').ids
-        po_reader = TranslationRecordReader(self.env.cr, 'test.translation.import.model2', model2_ids, lang='fr_FR')
+        model2_ids = self.env.ref('test_translation.test_translation_model2_record1').ids
+        po_reader = TranslationRecordReader(self.env.cr, 'test.translation.model2', model2_ids, lang='fr_FR')
         translations = {line[4]: line[5] for line in po_reader}
         self.assertDictEqual(
             translations,
diff --git a/odoo/addons/test_translation/view.xml b/odoo/addons/test_translation/view.xml
new file mode 100644
index 0000000000000..23b22990d8e25
--- /dev/null
+++ b/odoo/addons/test_translation/view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="action_test_translation_model1" model="ir.actions.act_window">
+            <field name="name">Test translation import model1</field>
+            <field name="res_model">test.translation.model1</field>
+            <field name="view_mode">list,form</field>
+            <field name="target">current</field>
+        </record>
+
+        <menuitem id="menu_test_translation" name="Test translation model1" sequence="650"/>
+
+        <menuitem id="menu_test_translation_model1"
+            name="Test translation import model1"
+            action="action_test_translation_model1"
+            parent="menu_test_translation"/>
+    </data>
+</odoo>
diff --git a/odoo/addons/test_translation_import/__init__.py b/odoo/addons/test_translation_import/__init__.py
deleted file mode 100644
index a0fdc10fe11b9..0000000000000
--- a/odoo/addons/test_translation_import/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import models
diff --git a/odoo/addons/test_translation_import/__manifest__.py b/odoo/addons/test_translation_import/__manifest__.py
deleted file mode 100644
index 3f5a1f921a92b..0000000000000
--- a/odoo/addons/test_translation_import/__manifest__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': 'test-translation-import',
-    'version': '0.1',
-    'category': 'Hidden/Tests',
-    'description': """A module to test translation import.""",
-    'depends': ['base'],
-    'data': [
-        'security/ir.model.access.csv',
-        'view.xml',
-        'data/test_translation_import_data.xml',
-        'data/test.translation.import.model1.csv',
-        'data/test.translation.import.model1-translated.csv',
-    ],
-    'installable': True,
-    'assets': {
-        'web.assets_backend': [
-            'test_translation_import/static/src/xml/js_templates.xml',
-        ],
-    },
-    'author': 'Odoo S.A.',
-    'license': 'LGPL-3',
-}
diff --git a/odoo/addons/test_translation_import/data/test.translation.import.model1-translated.csv b/odoo/addons/test_translation_import/data/test.translation.import.model1-translated.csv
deleted file mode 100644
index 4699d82e43b62..0000000000000
--- a/odoo/addons/test_translation_import/data/test.translation.import.model1-translated.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,name@fr_FR
-test_translation_import_model1_record4,"Test Translation CSV from data","Test de traduction CSV depuis les données"
diff --git a/odoo/addons/test_translation_import/data/test.translation.import.model1.csv b/odoo/addons/test_translation_import/data/test.translation.import.model1.csv
deleted file mode 100644
index 3685402f3e988..0000000000000
--- a/odoo/addons/test_translation_import/data/test.translation.import.model1.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name
-test_translation_import_model1_record3,"Test Translation CSV from PO"
diff --git a/odoo/addons/test_translation_import/i18n/dot.csv b/odoo/addons/test_translation_import/i18n/dot.csv
deleted file mode 100644
index f39f2e152e8a7..0000000000000
--- a/odoo/addons/test_translation_import/i18n/dot.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-module,type,name,res_id,src,value,comments
-test_translation_import,model,"test.translation.import.model1,name",test_translation_import.test_translation_import_model1_record1,Tableware,"Tableware, Dot"
-test_translation_import,model_term,"test.translation.import.model1,html",test_translation_import.test_translation_import_model1_record1,Fork,"Fork, Dot"
-test_translation_import,model_term,"test.translation.import.model1,html",test_translation_import.test_translation_import_model1_record1,Spoon,"Spoon, Dot"
-test_translation_import,model_term,"test.translation.import.model1,html",test_translation_import.test_translation_import_model1_record1,Knife,"Kinfe, Dot"
diff --git a/odoo/addons/test_translation_import/i18n/fr.po b/odoo/addons/test_translation_import/i18n/fr.po
deleted file mode 100644
index c8d5544b8e555..0000000000000
--- a/odoo/addons/test_translation_import/i18n/fr.po
+++ /dev/null
@@ -1,622 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* test_translation_import
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-10 17:44+0000\n"
-"PO-Revision-Date: 2022-11-10 17:44+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Bar chart title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code Lazy, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %(num)s, %(symbol)s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, English"
-msgstr "Code, Français"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_date
-msgid "Created on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__display_name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Fork"
-msgstr "Fourchette"
-
-#. module: test_translation_import
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model2__name
-msgid "Help, English"
-msgstr "Aider, Français"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__id
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__id
-msgid "ID"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 26"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 27"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Knife"
-msgstr "Couteau"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__model1_id
-msgid "Model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__name
-msgid "Name"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Opportunities"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 26 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 27 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 28"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline Analysis"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard chart"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard description"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Scorecard title"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__bar
-msgid "Selection Bar"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__foo
-msgid "Selection Foo"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Spoon"
-msgstr "Cuillère"
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record1
-msgid "Tableware"
-msgstr "Vaisselle"
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record3
-msgid "Test Translation CSV from PO"
-msgstr "Test de traduction CSV depuis PO"
-
-#. module: test_translation_import
-#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import_model1
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import_model1
-msgid "Test translation import model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import
-msgid "Test translation model1"
-msgstr "Test translation import in french"
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model1
-msgid "Translation Test 1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model2
-msgid "Translation Test 2"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__xml
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__xml
-msgid "XML"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "aa (\\\"inside\\\") bb"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "do export"
-msgstr "exporter"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 1"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 3"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "hello \\\"world\\\""
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "link label"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot"
-msgstr "emplacement"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot 2"
-msgstr "emplacement 2"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "text node"
-msgstr "nœud de texte"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "with spaces"
-msgstr ""
diff --git a/odoo/addons/test_translation_import/i18n/fr_BE.po b/odoo/addons/test_translation_import/i18n/fr_BE.po
deleted file mode 100644
index 3336387463c19..0000000000000
--- a/odoo/addons/test_translation_import/i18n/fr_BE.po
+++ /dev/null
@@ -1,615 +0,0 @@
-# This is a test PO file, not a complete one. It is manually maintained
-# to test the import translation behavior of Odoo.
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-10 17:44+0000\n"
-"PO-Revision-Date: 2022-11-10 17:44+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Bar chart title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code Lazy, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %(num)s, %(symbol)s, English"
-msgstr "Code, %(num)s, %(symbol)s, Français, Belgium"
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %s, English"
-msgstr "Code, %s, Français, Belgium"
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, English"
-msgstr "Code, Français, Belgium"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_date
-msgid "Created on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__display_name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Fork"
-msgstr "Fourchette, Belgium"
-
-#. module: test_translation_import
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model2__name
-msgid "Help, English"
-msgstr "Aider, Français, Belgium"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__id
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__id
-msgid "ID"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 26"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 27"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Knife"
-msgstr "Couteau, Belgium"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__model1_id
-msgid "Model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__name
-msgid "Name"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Opportunities"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 26 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 27 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 28"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline Analysis"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard chart"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard description"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Scorecard title"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__bar
-msgid "Selection Bar"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__foo
-msgid "Selection Foo"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Spoon"
-msgstr "Cuillère, Belgium"
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record1
-msgid "Tableware"
-msgstr "Vaisselle, Belgium"
-
-#. module: test_translation_import
-#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import_model1
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import_model1
-msgid "Test translation import model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import
-msgid "Test translation model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model1
-msgid "Translation Test 1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model2
-msgid "Translation Test 2"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__xml
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__xml
-msgid "XML"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "aa (\\\"inside\\\") bb"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "do export"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 1"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 3"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "hello \\\"world\\\""
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "link label"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "text node"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "with spaces"
-msgstr ""
diff --git a/odoo/addons/test_translation_import/i18n/fr_CA.po b/odoo/addons/test_translation_import/i18n/fr_CA.po
deleted file mode 100644
index d55aebd468855..0000000000000
--- a/odoo/addons/test_translation_import/i18n/fr_CA.po
+++ /dev/null
@@ -1,615 +0,0 @@
-# This is a test PO file, not a complete one. It is manually maintained
-# to test the import translation behavior of Odoo.
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-10 17:44+0000\n"
-"PO-Revision-Date: 2022-11-10 17:44+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Bar chart title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code Lazy, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %(num)s, %(symbol)s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, English"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_date
-msgid "Created on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__display_name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Fork"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model2__name
-msgid "Help, English"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__id
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__id
-msgid "ID"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 26"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 27"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Knife"
-msgstr "Couteau, Canada"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__model1_id
-msgid "Model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__name
-msgid "Name"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Opportunities"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 26 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 27 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 28"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline Analysis"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard chart"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard description"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Scorecard title"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__bar
-msgid "Selection Bar"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__foo
-msgid "Selection Foo"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Spoon"
-msgstr ""
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record1
-msgid "Tableware"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import_model1
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import_model1
-msgid "Test translation import model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import
-msgid "Test translation model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model1
-msgid "Translation Test 1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model2
-msgid "Translation Test 2"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__xml
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__xml
-msgid "XML"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "aa (\\\"inside\\\") bb"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "do export"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 1"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 3"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "hello \\\"world\\\""
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "link label"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "text node"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "with spaces"
-msgstr ""
diff --git a/odoo/addons/test_translation_import/i18n/test_translation_import.pot b/odoo/addons/test_translation_import/i18n/test_translation_import.pot
deleted file mode 100644
index c5ad9e8d72e80..0000000000000
--- a/odoo/addons/test_translation_import/i18n/test_translation_import.pot
+++ /dev/null
@@ -1,608 +0,0 @@
-# This is a test POT file, not a true template. It is manually maintained
-# to test the import translation behavior of Odoo.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-10 17:44+0000\n"
-"PO-Revision-Date: 2022-11-10 17:44+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Bar chart title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code Lazy, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %(num)s, %(symbol)s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, English"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_date
-msgid "Created on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__display_name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Fork"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model2__name
-msgid "Help, English"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__id
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__id
-msgid "ID"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 26"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 27"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Knife"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__model1_id
-msgid "Model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__name
-msgid "Name"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Opportunities"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 26 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 27 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 28"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard chart"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard description"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Scorecard title"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__bar
-msgid "Selection Bar"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__foo
-msgid "Selection Foo"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Spoon"
-msgstr ""
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record1
-msgid "Tableware"
-msgstr ""
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record3
-msgid "Test Translation CSV from PO"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import_model1
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import_model1
-msgid "Test translation import model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import
-msgid "Test translation model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model1
-msgid "Translation Test 1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model2
-msgid "Translation Test 2"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__xml
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__xml
-msgid "XML"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "aa (\\\"inside\\\") bb"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "do export"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 1"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 3"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "hello \\\"world\\\""
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "link label"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "text node"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "with spaces"
-msgstr ""
diff --git a/odoo/addons/test_translation_import/i18n/tlh.po b/odoo/addons/test_translation_import/i18n/tlh.po
deleted file mode 100644
index d70de2cee4cd7..0000000000000
--- a/odoo/addons/test_translation_import/i18n/tlh.po
+++ /dev/null
@@ -1,615 +0,0 @@
-# This is a test PO file, not a complete one. It is manually maintained
-# to test the import translation behavior of Odoo.
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 16.0+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-10 17:44+0000\n"
-"PO-Revision-Date: 2022-11-10 17:44+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Bar chart title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code Lazy, English"
-msgstr "Code Lazy, Klingon"
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %(num)s, %(symbol)s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, %s, English"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "Code, English"
-msgstr "Code, Klingon"
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__create_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__create_date
-msgid "Created on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__display_name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Fork"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,help:test_translation_import.field_test_translation_import_model2__name
-msgid "Help, English"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__id
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__id
-msgid "ID"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 26"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/js/js_codefile.js:0
-msgid "JS Export 27"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Knife"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_uid
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__write_date
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__model1_id
-msgid "Model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__name
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__name
-msgid "Name"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart horizontal axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Odoo Chart vertical axis title"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Opportunities"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 01 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 02 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 03 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 04 (Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 05 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 06 (Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 07 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 08 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 09 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 10 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 11 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 12 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 13 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 14 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 15 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 16 (Double Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 17 %(named)s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 18 (Double Nested Named)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 19 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 20 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 21 (Base Nested)"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 22 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 23"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 24 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 25"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 26 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 27 %s"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-msgid "PY Export 28"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Pipeline Analysis"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard chart"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "Scorecard description"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_v16_dashboard.json:0
-msgid "Scorecard title"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__bar
-msgid "Selection Bar"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields.selection,name:test_translation_import.selection__test_translation_import_model1__selection__foo
-msgid "Selection Foo"
-msgstr ""
-
-#. module: test_translation_import
-#: model_terms:test.translation.import.model1,xml:test_translation_import.test_translation_import_model1_record1
-msgid "Spoon"
-msgstr ""
-
-#. module: test_translation_import
-#: model:test.translation.import.model1,name:test_translation_import.test_translation_import_model1_record1
-msgid "Tableware"
-msgstr "Tableware, Klingon"
-
-#. module: test_translation_import
-#: model:ir.actions.act_window,name:test_translation_import.action_test_translation_import_model1
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import_model1
-msgid "Test translation import model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.ui.menu,name:test_translation_import.menu_test_translation_import
-msgid "Test translation model1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model1
-msgid "Translation Test 1"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model,name:test_translation_import.model_test_translation_import_model2
-msgid "Translation Test 2"
-msgstr ""
-
-#. module: test_translation_import
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model1__xml
-#: model:ir.model.fields,field_description:test_translation_import.field_test_translation_import_model2__xml
-msgid "XML"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "aa (\\\"inside\\\") bb"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "do export"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 1"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "exported 3"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "hello \\\"world\\\""
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "link label"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#. odoo-python
-#: code:addons/test_translation_import/models/models.py:0
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "slot 2"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/static/src/xml/js_templates.xml:0
-msgid "text node"
-msgstr ""
-
-#. module: test_translation_import
-#. odoo-javascript
-#: code:addons/test_translation_import/data/files/test_spreadsheet_dashboard.json:0
-msgid "with spaces"
-msgstr ""
diff --git a/odoo/addons/test_translation_import/security/ir.model.access.csv b/odoo/addons/test_translation_import/security/ir.model.access.csv
deleted file mode 100644
index 1a6694da293f9..0000000000000
--- a/odoo/addons/test_translation_import/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_test_translation_import_model1","access.test.translation.import.model1","model_test_translation_import_model1",,0,0,0,0
-"access_test_translation_import_model2","access.test.translation.import.model2","model_test_translation_import_model2",,0,0,0,0
diff --git a/odoo/addons/test_translation_import/view.xml b/odoo/addons/test_translation_import/view.xml
deleted file mode 100644
index b73256f4d3d95..0000000000000
--- a/odoo/addons/test_translation_import/view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-        <record id="action_test_translation_import_model1" model="ir.actions.act_window">
-            <field name="name">Test translation import model1</field>
-            <field name="res_model">test.translation.import.model1</field>
-            <field name="view_mode">list,form</field>
-            <field name="target">current</field>
-        </record>
-
-        <menuitem id="menu_test_translation_import" name="Test translation model1" sequence="650"/>
-
-        <menuitem id="menu_test_translation_import_model1"
-            name="Test translation import model1"
-            action="action_test_translation_import_model1"
-            parent="menu_test_translation_import"/>
-    </data>
-</odoo>

From a098f7ed45918d3b9fe9521596c367d5aad635bb Mon Sep 17 00:00:00 2001
From: Ruben Gomes <rugo@odoo.com>
Date: Mon, 20 Oct 2025 11:46:58 +0200
Subject: [PATCH 121/673] [MOV] test_orm: constraint.js to test_translation

Part-of: odoo/odoo#231381
Signed-off-by: Krzysztof Magusiak (krma) <krma@odoo.com>
---
 odoo/addons/test_orm/__manifest__.py          |  1 -
 odoo/addons/test_orm/i18n/fr.po               | 22 ------------
 odoo/addons/test_orm/i18n/test_orm.pot        | 21 -----------
 .../test_orm/static/tests/tours/constraint.js | 36 -------------------
 odoo/addons/test_orm/tests/test_ui.py         | 21 -----------
 odoo/addons/test_translation/__manifest__.py  |  3 +-
 .../data/test_translation_data.xml            |  6 ++++
 odoo/addons/test_translation/i18n/fr.po       | 31 ++++++++++++++++
 odoo/addons/test_translation/i18n/fr_BE.po    | 30 ++++++++++++++++
 odoo/addons/test_translation/i18n/fr_CA.po    | 36 +++++++++++++++++++
 .../i18n/test_translation.pot                 | 26 ++++++++++++++
 odoo/addons/test_translation/i18n/tlh.po      | 36 +++++++++++++++++++
 odoo/addons/test_translation/models/models.py | 12 +++++++
 .../security/ir.model.access.csv              |  1 +
 .../static/tests/tours/constraint.js          | 32 +++++++++++++++++
 .../addons/test_translation/tests/__init__.py |  1 +
 odoo/addons/test_translation/tests/test_ui.py | 21 +++++++++++
 17 files changed, 234 insertions(+), 102 deletions(-)
 delete mode 100644 odoo/addons/test_orm/i18n/fr.po
 delete mode 100644 odoo/addons/test_orm/i18n/test_orm.pot
 delete mode 100644 odoo/addons/test_orm/static/tests/tours/constraint.js
 create mode 100644 odoo/addons/test_translation/static/tests/tours/constraint.js
 create mode 100644 odoo/addons/test_translation/tests/test_ui.py

diff --git a/odoo/addons/test_orm/__manifest__.py b/odoo/addons/test_orm/__manifest__.py
index 12fd906869341..7bdc6da46b690 100644
--- a/odoo/addons/test_orm/__manifest__.py
+++ b/odoo/addons/test_orm/__manifest__.py
@@ -18,7 +18,6 @@
     ],
     'assets': {
         'web.assets_tests': [
-            'test_orm/static/tests/tours/constraint.js',
             'test_orm/static/tests/tours/x2many.js',
         ],
     },
diff --git a/odoo/addons/test_orm/i18n/fr.po b/odoo/addons/test_orm/i18n/fr.po
deleted file mode 100644
index 1cfa9777070ef..0000000000000
--- a/odoo/addons/test_orm/i18n/fr.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* test_orm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 13.0alpha1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-08 06:43+0000\n"
-"PO-Revision-Date: 2019-07-08 06:43+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_orm
-#: model:ir.model.constraint,message:test_orm.constraint_test_orm_category_positive_color
-msgid "The color code must be positive !"
-msgstr "La couleur doit être une valeur positive !"
diff --git a/odoo/addons/test_orm/i18n/test_orm.pot b/odoo/addons/test_orm/i18n/test_orm.pot
deleted file mode 100644
index 9534d8d41aa64..0000000000000
--- a/odoo/addons/test_orm/i18n/test_orm.pot
+++ /dev/null
@@ -1,21 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* test_orm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 13.0alpha1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-08 06:43+0000\n"
-"PO-Revision-Date: 2019-07-08 06:43+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: test_orm
-#: model:ir.model.constraint,message:test_orm.constraint_test_orm_category_positive_color
-msgid "The color code must be positive !"
-msgstr ""
diff --git a/odoo/addons/test_orm/static/tests/tours/constraint.js b/odoo/addons/test_orm/static/tests/tours/constraint.js
deleted file mode 100644
index cbd2395df8975..0000000000000
--- a/odoo/addons/test_orm/static/tests/tours/constraint.js
+++ /dev/null
@@ -1,36 +0,0 @@
-    import { registry } from "@web/core/registry";
-    import { stepUtils } from "@web_tour/tour_utils";
-
-    registry.category("web_tour.tours").add('sql_constaint', {
-        url: '/odoo/action-test_orm.action_categories?debug=1',
-        steps: () => [
-    {
-        content: "wait web client",
-        trigger: '.o_breadcrumb:contains(Categories)',
-        run: "click",
-    }, { // create test category
-        content: "create new category",
-        trigger: 'button.o_list_button_add',
-        run: "click",
-    }, {
-        content: "insert content",
-        trigger: '.o_required_modifier input',
-        run: "edit Test Category",
-    }, { // try to insert a value that will raise the SQL constraint
-        content: "insert invalid value",
-        trigger: '.o_field_widget[name="color"] input',
-        run: "edit -1",
-    }, { // save
-        content: "save category",
-        trigger: 'button.o_form_button_save',
-        run: "click",
-    }, { // check popup content
-        content: "check notification box",
-        trigger: '.o_error_dialog:contains(The color code must be positive!)',
-    }, {
-        content: "close notification box",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
-    },
-    ...stepUtils.discardForm(),
-    ]});
diff --git a/odoo/addons/test_orm/tests/test_ui.py b/odoo/addons/test_orm/tests/test_ui.py
index 008e1b1dbe8e7..d0da92b904d95 100644
--- a/odoo/addons/test_orm/tests/test_ui.py
+++ b/odoo/addons/test_orm/tests/test_ui.py
@@ -1,5 +1,4 @@
 import odoo.tests
-from odoo.tools import mute_logger
 
 from odoo.addons.base.tests.common import HttpCaseWithUserDemo
 
@@ -17,23 +16,3 @@ def test_01_admin_widget_x2many(self):
         # too small or there are too many items preceding it in the tests menu
         self.start_tour("/odoo/action-test_orm.action_discussions",
             'widget_x2many', login="admin", timeout=120)
-
-
-@odoo.tests.tagged('-at_install', 'post_install')
-class TestUiTranslation(odoo.tests.HttpCase):
-
-    @mute_logger('odoo.sql_db', 'odoo.http')
-    def test_01_sql_constraints(self):
-        # Raise an SQL constraint and test the message
-        self.env['res.lang']._activate_lang('fr_FR')
-        self.env.ref('base.module_test_orm')._update_translations(['fr_FR'])
-        constraint = self.env.ref('test_orm.constraint_test_orm_category_positive_color')
-        message = constraint.with_context(lang='fr_FR').message
-        self.assertEqual(message, "La couleur doit être une valeur positive !")
-
-        # TODO: make the test work with French translations. As the transaction
-        # is rollbacked at insert and a new cursor is opened, can not test that
-        # the message is translated (_load_module_terms is also) rollbacked.
-        # Test individually the external id and loading of translation.
-        self.start_tour("/odoo/action-test_orm.action_categories",
-            'sql_constaint', login="admin")
diff --git a/odoo/addons/test_translation/__manifest__.py b/odoo/addons/test_translation/__manifest__.py
index d354b5059ce93..2f2ac8fe2c0ac 100644
--- a/odoo/addons/test_translation/__manifest__.py
+++ b/odoo/addons/test_translation/__manifest__.py
@@ -3,7 +3,7 @@
     'version': '0.1',
     'category': 'Hidden/Tests',
     'description': """A module to test translation.""",
-    'depends': ['base'],
+    'depends': ['base', 'web_tour'],
     'data': [
         'security/ir.model.access.csv',
         'view.xml',
@@ -14,6 +14,7 @@
     'installable': True,
     'assets': {
         'web.assets_backend': [
+            'test_translation/static/tests/tours/constraint.js',
             'test_translation/static/src/xml/js_templates.xml',
         ],
     },
diff --git a/odoo/addons/test_translation/data/test_translation_data.xml b/odoo/addons/test_translation/data/test_translation_data.xml
index dbc87487b8eb0..e588affc2bdea 100644
--- a/odoo/addons/test_translation/data/test_translation_data.xml
+++ b/odoo/addons/test_translation/data/test_translation_data.xml
@@ -11,4 +11,10 @@
     <record model="test.translation.model2" id="test_translation_model2_record1">
         <field name="model1_id" ref="test_translation.test_translation_model1_record1"/>
     </record>
+
+    <record id="action_constraint" model="ir.actions.act_window">
+        <field name="name">Constraint translation</field>
+        <field name="res_model">test.translation.constraint</field>
+        <field name="view_mode">list,form</field>
+    </record>
 </odoo>
diff --git a/odoo/addons/test_translation/i18n/fr.po b/odoo/addons/test_translation/i18n/fr.po
index 6ee959032ec29..770464ab915a4 100644
--- a/odoo/addons/test_translation/i18n/fr.po
+++ b/odoo/addons/test_translation/i18n/fr.po
@@ -35,6 +35,11 @@ msgstr ""
 msgid "Chart vertical axis title"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__code
+msgid "Code"
+msgstr ""
+
 #. module: test_translation
 #. odoo-python
 #: code:addons/test_translation/models/models.py:0
@@ -60,18 +65,26 @@ msgid "Code, English"
 msgstr "Code, Français"
 
 #. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_constraint
+msgid "Constraint translation"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
 msgid "Display Name"
@@ -89,6 +102,7 @@ msgid "Help, English"
 msgstr "Aider, Français"
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
 msgid "ID"
@@ -262,12 +276,14 @@ msgid "Knife"
 msgstr "Couteau"
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
 msgid "Last Updated on"
@@ -537,6 +553,16 @@ msgstr ""
 msgid "Test translation model1"
 msgstr "Test translation import in french"
 
+#. module: test_translation
+#: model:ir.model.constraint,message:test_translation.constraint_test_translation_constraint_positive_code
+msgid "The code must be positive !"
+msgstr "Le code doit être une valeur positive !"
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "Translation Constraint Test"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.model,name:test_translation.model_test_translation_model1
 msgid "Translation Test 1"
@@ -609,6 +635,11 @@ msgstr "emplacement"
 msgid "slot 2"
 msgstr "emplacement 2"
 
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "test.translation.constraint"
+msgstr ""
+
 #. module: test_translation
 #. odoo-javascript
 #: code:addons/test_translation/static/src/xml/js_templates.xml:0
diff --git a/odoo/addons/test_translation/i18n/fr_BE.po b/odoo/addons/test_translation/i18n/fr_BE.po
index cb5aa48bb5e28..9f7e21909770e 100644
--- a/odoo/addons/test_translation/i18n/fr_BE.po
+++ b/odoo/addons/test_translation/i18n/fr_BE.po
@@ -33,6 +33,11 @@ msgstr ""
 msgid "Chart vertical axis title"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__code
+msgid "Code"
+msgstr ""
+
 #. module: test_translation
 #. odoo-python
 #: code:addons/test_translation/models/models.py:0
@@ -57,19 +62,26 @@ msgstr "Code, %s, Français, Belgium"
 msgid "Code, English"
 msgstr "Code, Français, Belgium"
 
+#: model:ir.actions.act_window,name:test_translation.action_constraint
+msgid "Constraint translation"
+msgstr ""
+
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
 msgid "Display Name"
@@ -87,6 +99,7 @@ msgid "Help, English"
 msgstr "Aider, Français, Belgium"
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
 msgid "ID"
@@ -260,12 +273,14 @@ msgid "Knife"
 msgstr "Couteau, Belgium"
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
 msgid "Last Updated on"
@@ -530,6 +545,16 @@ msgstr ""
 msgid "Test translation model1"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.constraint,message:test_translation.constraint_test_translation_constraint_positive_code
+msgid "The code must be positive !"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "Translation Constraint Test"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.model,name:test_translation.model_test_translation_model1
 msgid "Translation Test 1"
@@ -602,6 +627,11 @@ msgstr ""
 msgid "slot 2"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "test.translation.constraint"
+msgstr ""
+
 #. module: test_translation
 #. odoo-javascript
 #: code:addons/test_translation/static/src/xml/js_templates.xml:0
diff --git a/odoo/addons/test_translation/i18n/fr_CA.po b/odoo/addons/test_translation/i18n/fr_CA.po
index a6e660ddd3b4b..a873160280546 100644
--- a/odoo/addons/test_translation/i18n/fr_CA.po
+++ b/odoo/addons/test_translation/i18n/fr_CA.po
@@ -33,6 +33,11 @@ msgstr ""
 msgid "Chart vertical axis title"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__code
+msgid "Code"
+msgstr ""
+
 #. module: test_translation
 #. odoo-python
 #: code:addons/test_translation/models/models.py:0
@@ -58,18 +63,26 @@ msgid "Code, English"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_constraint
+msgid "Constraint translation"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
 msgid "Display Name"
@@ -87,6 +100,7 @@ msgid "Help, English"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
 msgid "ID"
@@ -260,12 +274,14 @@ msgid "Knife"
 msgstr "Couteau, Canada"
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
 msgid "Last Updated on"
@@ -519,6 +535,11 @@ msgstr ""
 msgid "Tableware"
 msgstr ""
 
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record3
+msgid "Test Translation CSV from PO"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
 #: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
@@ -530,6 +551,16 @@ msgstr ""
 msgid "Test translation model1"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.constraint,message:test_translation.constraint_test_translation_constraint_positive_code
+msgid "The code must be positive !"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "Translation Constraint Test"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.model,name:test_translation.model_test_translation_model1
 msgid "Translation Test 1"
@@ -602,6 +633,11 @@ msgstr ""
 msgid "slot 2"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "test.translation.constraint"
+msgstr ""
+
 #. module: test_translation
 #. odoo-javascript
 #: code:addons/test_translation/static/src/xml/js_templates.xml:0
diff --git a/odoo/addons/test_translation/i18n/test_translation.pot b/odoo/addons/test_translation/i18n/test_translation.pot
index 70ec3950c040a..6e5b1755de54f 100644
--- a/odoo/addons/test_translation/i18n/test_translation.pot
+++ b/odoo/addons/test_translation/i18n/test_translation.pot
@@ -33,6 +33,11 @@ msgstr ""
 msgid "Chart vertical axis title"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__code
+msgid "Code"
+msgstr ""
+
 #. module: test_translation
 #. odoo-python
 #: code:addons/test_translation/models/models.py:0
@@ -58,18 +63,26 @@ msgid "Code, English"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_constraint
+msgid "Constraint translation"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
 msgid "Display Name"
@@ -87,6 +100,7 @@ msgid "Help, English"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
 msgid "ID"
@@ -260,12 +274,14 @@ msgid "Knife"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
 msgid "Last Updated on"
@@ -523,6 +539,16 @@ msgstr ""
 msgid "Test translation model1"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.constraint,message:test_translation.constraint_test_translation_constraint_positive_code
+msgid "The code must be positive !"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "Translation Constraint Test"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.model,name:test_translation.model_test_translation_model1
 msgid "Translation Test 1"
diff --git a/odoo/addons/test_translation/i18n/tlh.po b/odoo/addons/test_translation/i18n/tlh.po
index cfb3cd758f77d..e769a6af147bc 100644
--- a/odoo/addons/test_translation/i18n/tlh.po
+++ b/odoo/addons/test_translation/i18n/tlh.po
@@ -33,6 +33,11 @@ msgstr ""
 msgid "Chart vertical axis title"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__code
+msgid "Code"
+msgstr ""
+
 #. module: test_translation
 #. odoo-python
 #: code:addons/test_translation/models/models.py:0
@@ -58,18 +63,26 @@ msgid "Code, English"
 msgstr "Code, Klingon"
 
 #. module: test_translation
+#: model:ir.actions.act_window,name:test_translation.action_constraint
+msgid "Constraint translation"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__create_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__display_name
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__display_name
 msgid "Display Name"
@@ -87,6 +100,7 @@ msgid "Help, English"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__id
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__id
 msgid "ID"
@@ -260,12 +274,14 @@ msgid "Knife"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_uid
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: test_translation
+#: model:ir.model.fields,field_description:test_translation.field_test_translation_constraint__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model1__write_date
 #: model:ir.model.fields,field_description:test_translation.field_test_translation_model2__write_date
 msgid "Last Updated on"
@@ -519,6 +535,11 @@ msgstr ""
 msgid "Tableware"
 msgstr "Tableware, Klingon"
 
+#. module: test_translation
+#: model:test.translation.model1,name:test_translation.test_translation_model1_record3
+msgid "Test Translation CSV from PO"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.actions.act_window,name:test_translation.action_test_translation_model1
 #: model:ir.ui.menu,name:test_translation.menu_test_translation_model1
@@ -530,6 +551,16 @@ msgstr ""
 msgid "Test translation model1"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model.constraint,message:test_translation.constraint_test_translation_constraint_positive_code
+msgid "The code must be positive !"
+msgstr ""
+
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "Translation Constraint Test"
+msgstr ""
+
 #. module: test_translation
 #: model:ir.model,name:test_translation.model_test_translation_model1
 msgid "Translation Test 1"
@@ -602,6 +633,11 @@ msgstr ""
 msgid "slot 2"
 msgstr ""
 
+#. module: test_translation
+#: model:ir.model,name:test_translation.model_test_translation_constraint
+msgid "test.translation.constraint"
+msgstr ""
+
 #. module: test_translation
 #. odoo-javascript
 #: code:addons/test_translation/static/src/xml/js_templates.xml:0
diff --git a/odoo/addons/test_translation/models/models.py b/odoo/addons/test_translation/models/models.py
index 8c320999830e6..ae52ccf0f8f1d 100644
--- a/odoo/addons/test_translation/models/models.py
+++ b/odoo/addons/test_translation/models/models.py
@@ -85,3 +85,15 @@ class TestTranslationModel2(models.Model):
     _description = 'Translation Test 2'
 
     model1_id = fields.Many2one('test.translation.model1', required=True, ondelete='cascade')
+
+
+class TestTranslationConstraint(models.Model):
+    _name = 'test.translation.constraint'
+    _description = "Translation Constraint Test"
+
+    code = fields.Integer('Code')
+
+    _positive_code = models.Constraint(
+        'CHECK(code >= 0)',
+        "The code must be positive !",
+    )
diff --git a/odoo/addons/test_translation/security/ir.model.access.csv b/odoo/addons/test_translation/security/ir.model.access.csv
index 6d8eb5a4da0b6..b952467cb38d6 100644
--- a/odoo/addons/test_translation/security/ir.model.access.csv
+++ b/odoo/addons/test_translation/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_test_translation_model1","access.test.translation.model1","model_test_translation_model1",,0,0,0,0
 "access_test_translation_model2","access.test.translation.model2","model_test_translation_model2",,0,0,0,0
+"access_test_translation_constraint","access.test.translation.constraint","model_test_translation_constraint",base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/odoo/addons/test_translation/static/tests/tours/constraint.js b/odoo/addons/test_translation/static/tests/tours/constraint.js
new file mode 100644
index 0000000000000..eb6804368789e
--- /dev/null
+++ b/odoo/addons/test_translation/static/tests/tours/constraint.js
@@ -0,0 +1,32 @@
+    import { registry } from "@web/core/registry";
+    import { stepUtils } from "@web_tour/tour_utils";
+
+    registry.category("web_tour.tours").add('sql_constraint', {
+        url: '/odoo/action-test_translation.action_constraint?debug=1',
+        steps: () => [
+    {
+        content: "wait web client",
+        trigger: '.o_breadcrumb:contains(Constraint translation)',
+        run: "click",
+    }, {
+        content: "create new code",
+        trigger: 'button.o_list_button_add',
+        run: "click",
+    }, {
+        content: "insert invalid code value",
+        trigger: '.o_field_widget[name="code"] input',
+        run: "edit -1",
+    }, {
+        content: "save code",
+        trigger: 'button.o_form_button_save',
+        run: "click",
+    }, {
+        content: "check notification box",
+        trigger: '.o_error_dialog:contains(The code must be positive !)',
+    }, {
+        content: "close notification box",
+        trigger: '.modal-footer .btn-primary',
+        run: "click",
+    },
+    ...stepUtils.discardForm(),
+    ]});
diff --git a/odoo/addons/test_translation/tests/__init__.py b/odoo/addons/test_translation/tests/__init__.py
index e8f5edb34338e..f9296d500001b 100644
--- a/odoo/addons/test_translation/tests/__init__.py
+++ b/odoo/addons/test_translation/tests/__init__.py
@@ -1,2 +1,3 @@
 from . import test_export_wizard
 from . import test_term_count
+from . import test_ui
diff --git a/odoo/addons/test_translation/tests/test_ui.py b/odoo/addons/test_translation/tests/test_ui.py
new file mode 100644
index 0000000000000..aba461f3f246c
--- /dev/null
+++ b/odoo/addons/test_translation/tests/test_ui.py
@@ -0,0 +1,21 @@
+import odoo.tests
+from odoo.tools import mute_logger
+
+
+@odoo.tests.tagged('-at_install', 'post_install')
+class TestUiTranslation(odoo.tests.HttpCase):
+
+    @mute_logger('odoo.sql_db', 'odoo.http')
+    def test_01_sql_constraints(self):
+        # Raise an SQL constraint and test the message
+        self.env['res.lang']._activate_lang('fr_FR')
+        self.env.ref('base.module_test_translation')._update_translations(['fr_FR'])
+        constraint = self.env.ref('test_translation.constraint_test_translation_constraint_positive_code')
+        message = constraint.with_context(lang='fr_FR').message
+        self.assertEqual(message, "Le code doit être une valeur positive !")
+
+        # TODO: make the test work with French translations. As the transaction
+        # is rollbacked at insert and a new cursor is opened, can not test that
+        # the message is translated (_load_module_terms is also) rollbacked.
+        # Test individually the external id and loading of translation.
+        self.start_tour("/odoo/action-test_translation.action_constraint", 'sql_constraint', login="admin")

From 3c41766baba7c25b7b26fbdb80b40e0f833156f3 Mon Sep 17 00:00:00 2001
From: Ruben Gomes <rugo@odoo.com>
Date: Mon, 20 Oct 2025 12:44:21 +0200
Subject: [PATCH 122/673] [MOV] test_orm: x2many.js to test_web

Part-of: odoo/odoo#231381
Signed-off-by: Krzysztof Magusiak (krma) <krma@odoo.com>
---
 odoo/addons/test_orm/__manifest__.py                       | 7 +------
 odoo/addons/test_orm/tests/__init__.py                     | 1 -
 odoo/addons/test_web/__manifest__.py                       | 7 +++++++
 .../{test_orm => test_web}/static/tests/tours/x2many.js    | 0
 odoo/addons/test_web/tests/__init__.py                     | 1 +
 .../tests/test_ui.py => test_web/tests/test_x2many.py}     | 7 ++++++-
 6 files changed, 15 insertions(+), 8 deletions(-)
 rename odoo/addons/{test_orm => test_web}/static/tests/tours/x2many.js (100%)
 rename odoo/addons/{test_orm/tests/test_ui.py => test_web/tests/test_x2many.py} (67%)

diff --git a/odoo/addons/test_orm/__manifest__.py b/odoo/addons/test_orm/__manifest__.py
index 7bdc6da46b690..1b50ca82c55da 100644
--- a/odoo/addons/test_orm/__manifest__.py
+++ b/odoo/addons/test_orm/__manifest__.py
@@ -3,7 +3,7 @@
     'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """A module to test the ORM.""",
-    'depends': ['base', 'web', 'web_tour'],
+    'depends': ['base', 'web'],
     'installable': True,
     'data': [
         'data/test_access_rights_data.xml',
@@ -16,11 +16,6 @@
         'security/test_orm_security.xml',
         'views/test_orm_views.xml',
     ],
-    'assets': {
-        'web.assets_tests': [
-            'test_orm/static/tests/tours/x2many.js',
-        ],
-    },
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_orm/tests/__init__.py b/odoo/addons/test_orm/tests/__init__.py
index f740816467242..8285e8f22401b 100644
--- a/odoo/addons/test_orm/tests/__init__.py
+++ b/odoo/addons/test_orm/tests/__init__.py
@@ -32,6 +32,5 @@
     test_search,
     test_sort,
     test_timeit,
-    test_ui,
     test_views,
 )
diff --git a/odoo/addons/test_web/__manifest__.py b/odoo/addons/test_web/__manifest__.py
index 49aaabdd7691b..22febacf10932 100644
--- a/odoo/addons/test_web/__manifest__.py
+++ b/odoo/addons/test_web/__manifest__.py
@@ -8,6 +8,13 @@
     'depends': ['web', 'test_orm'],
 
     'data': ['ir.model.access.csv'],
+
+    'assets': {
+        'web.assets_tests': [
+            'test_web/static/tests/tours/x2many.js',
+        ],
+    },
+
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_orm/static/tests/tours/x2many.js b/odoo/addons/test_web/static/tests/tours/x2many.js
similarity index 100%
rename from odoo/addons/test_orm/static/tests/tours/x2many.js
rename to odoo/addons/test_web/static/tests/tours/x2many.js
diff --git a/odoo/addons/test_web/tests/__init__.py b/odoo/addons/test_web/tests/__init__.py
index 667567307f469..de8974acffeae 100644
--- a/odoo/addons/test_web/tests/__init__.py
+++ b/odoo/addons/test_web/tests/__init__.py
@@ -6,3 +6,4 @@
 from . import test_web_read
 from . import test_web_read_group
 from . import test_web_save
+from . import test_x2many
diff --git a/odoo/addons/test_orm/tests/test_ui.py b/odoo/addons/test_web/tests/test_x2many.py
similarity index 67%
rename from odoo/addons/test_orm/tests/test_ui.py
rename to odoo/addons/test_web/tests/test_x2many.py
index d0da92b904d95..9edf95825abcf 100644
--- a/odoo/addons/test_orm/tests/test_ui.py
+++ b/odoo/addons/test_web/tests/test_x2many.py
@@ -4,9 +4,14 @@
 
 
 @odoo.tests.common.tagged('post_install', '-at_install')
-class TestUi(HttpCaseWithUserDemo):
+class TestX2Many(HttpCaseWithUserDemo):
 
     def test_01_admin_widget_x2many(self):
+        # /!\This test depends on `web_tour` but since `web_tour` is auto installed
+        # and this test is `post_install`, we don't want to wait for `web_tour` to install
+        # before running all the tests at_install in this module. That is why that dependency
+        # is not clearly written in the manifest.
+
         # FIXME: breaks if too many children of base.menu_tests
 
         # This tour turns out to be quite sensible to the number of items in

From 89d451939035de1ae5a25f61d222b6d6eca201c3 Mon Sep 17 00:00:00 2001
From: Ruben Gomes <rugo@odoo.com>
Date: Mon, 20 Oct 2025 13:42:42 +0200
Subject: [PATCH 123/673] [REM] test_orm: remove `web` dependency

closes odoo/odoo#231381

Signed-off-by: Krzysztof Magusiak (krma) <krma@odoo.com>
---
 odoo/addons/test_orm/__manifest__.py          |    2 +-
 odoo/addons/test_orm/tests/__init__.py        |    2 -
 .../test_orm/tests/test_action_bindings.py    |    1 -
 odoo/addons/test_orm/tests/test_fields.py     |   40 +-
 odoo/addons/test_orm/tests/test_properties.py | 1300 +---------------
 .../test_orm/tests/test_read_grouping_sets.py |  421 +-----
 odoo/addons/test_orm/tests/test_search.py     |    6 +-
 odoo/addons/test_orm/tests/test_views.py      |  136 +-
 odoo/addons/test_web/tests/__init__.py        |    6 +
 odoo/addons/test_web/tests/test_fields.py     |   41 +
 .../tests/test_onchange.py                    |    0
 odoo/addons/test_web/tests/test_properties.py | 1305 +++++++++++++++++
 .../tests/test_read_group_formatted.py        |    0
 .../test_web/tests/test_read_grouping_sets.py |  421 ++++++
 odoo/addons/test_web/tests/test_views.py      |  145 ++
 .../test_web/tests/test_web_read_group.py     |    6 +
 16 files changed, 1933 insertions(+), 1899 deletions(-)
 create mode 100644 odoo/addons/test_web/tests/test_fields.py
 rename odoo/addons/{test_orm => test_web}/tests/test_onchange.py (100%)
 create mode 100644 odoo/addons/test_web/tests/test_properties.py
 rename odoo/addons/{test_orm => test_web}/tests/test_read_group_formatted.py (100%)
 create mode 100644 odoo/addons/test_web/tests/test_read_grouping_sets.py
 create mode 100644 odoo/addons/test_web/tests/test_views.py

diff --git a/odoo/addons/test_orm/__manifest__.py b/odoo/addons/test_orm/__manifest__.py
index 1b50ca82c55da..a016f31ad257f 100644
--- a/odoo/addons/test_orm/__manifest__.py
+++ b/odoo/addons/test_orm/__manifest__.py
@@ -3,7 +3,7 @@
     'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """A module to test the ORM.""",
-    'depends': ['base', 'web'],
+    'depends': ['base'],
     'installable': True,
     'data': [
         'data/test_access_rights_data.xml',
diff --git a/odoo/addons/test_orm/tests/__init__.py b/odoo/addons/test_orm/tests/__init__.py
index 8285e8f22401b..2a6984eb4ad72 100644
--- a/odoo/addons/test_orm/tests/__init__.py
+++ b/odoo/addons/test_orm/tests/__init__.py
@@ -18,12 +18,10 @@
     test_ir_rules,
     test_json_field,
     test_many2many,
-    test_onchange,
     test_one2many,
     test_performance,
     test_properties,
     test_qweb_float,
-    test_read_group_formatted,
     test_read_group_override,
     test_read_group_private,
     test_read_grouping_sets,
diff --git a/odoo/addons/test_orm/tests/test_action_bindings.py b/odoo/addons/test_orm/tests/test_action_bindings.py
index 377202406d228..7dc7731db5767 100644
--- a/odoo/addons/test_orm/tests/test_action_bindings.py
+++ b/odoo/addons/test_orm/tests/test_action_bindings.py
@@ -10,7 +10,6 @@ def test_bindings(self):
 
         # first make sure there is no bound action
         self.env.ref('base.action_partner_merge').unlink()
-        self.env.ref('web.download_contact').unlink()
         bindings = Actions.get_bindings('res.partner')
         self.assertFalse(bindings.get('action'))
         self.assertFalse(bindings.get('report'))
diff --git a/odoo/addons/test_orm/tests/test_fields.py b/odoo/addons/test_orm/tests/test_fields.py
index 9d910953e6909..dc9ebffdf4c2a 100644
--- a/odoo/addons/test_orm/tests/test_fields.py
+++ b/odoo/addons/test_orm/tests/test_fields.py
@@ -11,7 +11,7 @@
 from odoo import Command, fields, models
 from odoo.exceptions import AccessError, MissingError, UserError, ValidationError
 from odoo.fields import Domain
-from odoo.tests import Form, TransactionCase, tagged, users
+from odoo.tests import TransactionCase, tagged, users
 from odoo.tools import float_repr, mute_logger
 from odoo.tools.image import image_data_uri
 
@@ -4834,44 +4834,6 @@ def test_compute_sudo_depends_context_uid(self):
         self.assertEqual(record.with_user(self.user_demo).name_for_uid, self.user_demo.name)
 
 
-@tagged('at_install', '-post_install')  # LEGACY at_install
-class test_shared_cache(TransactionCaseWithUserDemo):
-    def test_shared_cache_computed_field(self):
-        # Test case: Check that the shared cache is not used if a compute_sudo stored field
-        # is computed IF there is an ir.rule defined on this specific model.
-
-        # Real life example:
-        # A user can only see its own timesheets on a task, but the field "Planned Hours",
-        # which is stored-compute_sudo, should take all the timesheet lines into account
-        # However, when adding a new line and then recomputing the value, no existing line
-        # from another user is binded on self, then the value is erased and saved on the
-        # database.
-
-        task = self.env['test_orm.model_shared_cache_compute_parent'].create({
-            'name': 'Shared Task'})
-        self.env['test_orm.model_shared_cache_compute_line'].create({
-            'user_id': self.env.ref('base.user_admin').id,
-            'parent_id': task.id,
-            'amount': 1,
-        })
-        self.assertEqual(task.total_amount, 1)
-
-        self.env.flush_all()
-        self.env.invalidate_all()  # Start fresh, as it would be the case on 2 different sessions.
-
-        task = task.with_user(self.user_demo)
-        with Form(task) as task_form:
-            # Use demo has no access to the already existing line
-            self.assertEqual(len(task_form.line_ids), 0)
-            # But see the real total_amount
-            self.assertEqual(task_form.total_amount, 1)
-            # Now let's add a new line (and retrigger the compute method)
-            with task_form.line_ids.new() as line:
-                line.amount = 2
-            # The new value for total_amount, should be 3, not 2.
-            self.assertEqual(task_form.total_amount, 2)
-
-
 @tagged('unlink_constraints')
 @tagged('at_install', '-post_install')  # LEGACY at_install
 class TestUnlinkConstraints(TransactionCase):
diff --git a/odoo/addons/test_orm/tests/test_properties.py b/odoo/addons/test_orm/tests/test_properties.py
index 90ed3d0f454d5..f16e7b66b2d44 100644
--- a/odoo/addons/test_orm/tests/test_properties.py
+++ b/odoo/addons/test_orm/tests/test_properties.py
@@ -1,17 +1,14 @@
-import datetime
 import json
 import psycopg2
 import unittest
 from collections import abc
 from unittest.mock import patch
 
-import babel.dates
-
 from odoo.addons.base.tests.test_expression import TransactionExpressionCase
 from odoo.exceptions import AccessError, UserError, ValidationError
-from odoo.fields import Command, Domain
-from odoo.tests import tagged, Form, TransactionCase, users
-from odoo.tools import get_lang, mute_logger
+from odoo.fields import Command
+from odoo.tests import tagged, TransactionCase, users
+from odoo.tools import mute_logger
 
 
 class TestPropertiesMixin(TransactionCase):
@@ -220,72 +217,6 @@ def test_properties_field(self):
             # missing 'type'
             self.message_1.attributes = [{'name': 'name', 'definition_changed': True}]
 
-    def test_properties_web_read(self):
-        """Test the web_read method when reading properties field."""
-        self.message_1.write({
-            'attributes': [{
-                'name': 'discussion_color_code',
-                'string': 'Test color code',
-                'type': 'char',
-                'default': 'blue',
-                'value': 'purple',
-                'definition_changed': True,
-            }, {
-                'name': 'selection',
-                'string': 'Selection',
-                'type': 'selection',
-                'selection': [['a', 'A'], ['b', 'B']],
-                'value': 'b',
-                'definition_changed': True,
-            }, {
-                'name': 'moderator_partner_id',
-                'string': 'Partner',
-                'type': 'many2one',
-                'comodel': 'test_orm.partner',
-                'value': [self.partner.id, 'Bob'],
-                'definition_changed': True,
-            }, {
-                'name': 'moderator_partner_ids',
-                'string': 'Partners',
-                'type': 'many2many',
-                'comodel': 'test_orm.partner',
-                'value': [[self.partner.id, 'Bob'], [self.partner_2.id, "Alice"]],
-                'definition_changed': True,
-            }],
-        })
-
-        result = self.message_1.web_read({
-            'attributes': {
-                'fields': {
-                    'moderator_partner_id': {'fields': {'name': {}}},
-                    'moderator_partner_ids': {'fields': {'name': {}}},
-                    'selection': {},
-                },
-            },
-        })
-        self.assertEqual(result[0]['attributes'], [{
-            'name': 'moderator_partner_id',
-            'string': 'Partner',
-            'type': 'many2one',
-            'comodel': 'test_orm.partner',
-            'value': [{'id': self.partner.id, 'name': 'Test Partner Properties'}],
-        }, {
-            'name': 'moderator_partner_ids',
-            'string': 'Partners',
-            'type': 'many2many',
-            'comodel': 'test_orm.partner',
-            'value': [
-                {'id': self.partner.id, 'name': 'Test Partner Properties'},
-                {'id': self.partner_2.id, 'name': 'Test Partner Properties 2'},
-            ],
-        }, {
-            'name': 'selection',
-            'string': 'Selection',
-            'type': 'selection',
-            'selection': [['a', 'A'], ['b', 'B']],
-            'value': 'b',
-        }])
-
     def test_properties_field_parameters_raised(self):
         # check that the keys not valid for the given type are raised
         with self.assertRaises(ValueError):
@@ -828,77 +759,6 @@ def test_properties_field_read(self):
             msg='Definition must be present when reading child')
         self.assertEqual(many2one_property['value'], (self.partner.id, self.partner.display_name))
 
-    def test_properties_field_html(self):
-        """Test that the HTML values are sanitized."""
-        xss_payload = "<img src='x' onerror='alert(1)'/>"
-        expected = '<img src="x">'
-        self.message_2.attributes = [
-            {
-                "name": "test_html",
-                "type": "html",
-                "string": "HTML",
-                "default": xss_payload,
-                "value": xss_payload,
-                "definition_changed": True,
-            },
-        ]
-
-        sql_values = self._get_sql_properties(self.message_2)
-        self.assertEqual(sql_values.get("test_html"), expected)
-
-        self.assertEqual(dict(self.message_2.attributes)['test_html'], expected)
-        self.assertEqual(self.message_2.attributes['test_html'], expected)
-
-        with self.assertRaises(UserError):
-            self.env['test_orm.message']._read_group([], ['attributes.test_html'])
-
-        with self.assertRaises(UserError):
-            self.env['test_orm.message'].web_read_group([], ['attributes.test_html'])
-
-        properties = self.message_2.read(['attributes'])[0]['attributes']
-        self.assertEqual(properties[0]['value'], expected)
-        self.assertEqual(properties[0]['default'], expected)
-
-        definition = self.message_2.discussion.attributes_definition
-        self.assertEqual(definition[0]['default'], expected)
-
-        definition = self.message_2.discussion.read(['attributes_definition'])[0]['attributes_definition']
-        self.assertEqual(definition[0]['default'], expected)
-
-        # write a dict on the record
-        self.message_2.attributes = {'test_html': xss_payload}
-        self.assertEqual(self.message_2.attributes['test_html'], expected)
-        properties = self.message_2.read(['attributes'])[0]['attributes']
-        self.assertEqual(properties[0]['value'], expected)
-
-        with self.assertRaises(ValueError):
-            self.message_2.attributes = [
-                {
-                    "name": "text_html",
-                    "type": "text",
-                    "string": "HTML",
-                    "default": xss_payload,
-                    "value": xss_payload,
-                    "definition_changed": True,
-                },
-            ]
-
-        with self.assertRaises(ValueError):
-            self.message_2.discussion.attributes_definition = [
-                {
-                    "name": "text_html",
-                    "type": "text",
-                    "string": "HTML",
-                    "default": xss_payload,
-                    "definition_changed": True,
-                },
-            ]
-
-        message = self.env['test_orm.message'].with_context(default_attributes_test_html=xss_payload).create({'discussion': self.discussion_1.id})
-        self.assertEqual(message.attributes['test_html'], expected)
-        sql_values = self._get_sql_properties(message)
-        self.assertEqual(sql_values.get("test_html"), expected)
-
     def test_properties_field_many2one_basic(self):
         """Test the basic (read, write...) of the many2one property."""
         self.message_2.attributes = [
@@ -1620,169 +1480,6 @@ def test_properties_field_change_definition(self):
                 {'name': 'state', 'type': 'datetime'},
             ]
 
-    @mute_logger('odoo.fields')
-    def test_properties_field_onchange2(self):
-        """If we change the definition record, the onchange of the properties field must be triggered."""
-        message_form = Form(self.env['test_orm.message'])
-
-        with self.assertQueryCount(8):
-            message_form.discussion = self.discussion_1
-            message_form.author = self.user
-
-            self.assertEqual(
-                message_form.attributes,
-                [{
-                    'name': 'discussion_color_code',
-                    'string': 'Color Code',
-                    'type': 'char',
-                    'default': 'blue',
-                    'value': 'blue',
-                }, {
-                    'name': 'moderator_partner_id',
-                    'string': 'Partner',
-                    'type': 'many2one',
-                    'comodel': 'test_orm.partner',
-                }],
-                msg='Should take the new definition when changing the definition record',
-            )
-
-            # change the discussion field
-            message_form.discussion = self.discussion_2
-
-            properties = message_form.attributes
-
-            self.assertEqual(len(properties), 1)
-            self.assertEqual(
-                properties[0]['name'],
-                'state',
-                msg='Should take the values of the new definition record',
-            )
-
-        with self.assertQueryCount(6):
-            message = message_form.save()
-
-        self.assertEqual(message.attributes, {'state': 'draft'})
-
-        # check cached value
-        cached_value = self.env.cache.get(message, message._fields['attributes'])
-        self.assertEqual(cached_value, {'state': 'draft'})
-
-        # change the definition record, change the definition and add default values
-        self.assertEqual(message.discussion, self.discussion_2)
-
-        with self.assertQueryCount(4):
-            message.discussion = self.discussion_1
-        self.assertEqual(
-            self.discussion_1.attributes_definition,
-            [{
-                'name': 'discussion_color_code',
-                'type': 'char',
-                'string': 'Color Code',
-                'default': 'blue',
-                }, {
-                    'name': 'moderator_partner_id',
-                    'type': 'many2one',
-                    'string': 'Partner',
-                    'comodel': 'test_orm.partner',
-                }],
-            )
-        self.assertEqual(
-            message.read()[0]['attributes'],
-            [{
-                'name': 'discussion_color_code',
-                'type': 'char',
-                'string': 'Color Code',
-                'default': 'blue',
-                'value': 'blue',
-            }, {
-                'name': 'moderator_partner_id',
-                'type': 'many2one',
-                'string': 'Partner',
-                'comodel': 'test_orm.partner',
-            }],
-        )
-
-        self.discussion_1.attributes_definition = False
-        self.discussion_2.attributes_definition = [{
-            'name': 'test',
-            'type': 'char',
-            'default': 'Default',
-        }]
-
-        # change the message discussion to remove the properties
-        # discussion 1 -> discussion 2
-        message.discussion = self.discussion_2
-        message.attributes = [{'name': 'test', 'value': 'Test'}]
-        fields_spec = message._get_fields_spec()
-        self.assertIn('discussion', fields_spec)
-        self.assertIn('attributes', fields_spec)
-        values = {
-            'discussion': self.discussion_1.id,
-            'attributes': [{
-                'name': 'test',
-                'type': 'char',
-                'default': 'Default',
-                'value': 'Test',
-            }],
-        }
-        result = message.onchange(values, ['discussion'], fields_spec)
-        self.assertIn('attributes', result['value'], 'Should have detected the definition record change')
-        self.assertEqual(result['value']['attributes'], [], 'Should have reset the properties definition')
-
-        # change the message discussion to add new properties
-        # discussion 2 -> discussion 1
-        message.discussion = self.discussion_1
-        values = {
-            'discussion': self.discussion_2.id,
-            'attributes': [],
-        }
-        result = message.onchange(values, ['discussion'], fields_spec)
-        self.assertIn('attributes', result['value'], 'Should have detected the definition record change')
-        self.assertEqual(
-            result['value']['attributes'],
-            [{'name': 'test', 'type': 'char', 'default': 'Default', 'value': 'Default'}],
-            'Should have reset the properties definition to the discussion 1 definition',
-        )
-
-        # change the definition record and the definition at the same time
-        message_form = Form(message)
-        message_form.discussion = self.discussion_2
-        message_form.attributes = [{
-            'name': 'new_property',
-            'type': 'char',
-            'value': 'test value',
-            'definition_changed': True,
-        }]
-        message = message_form.save()
-        self.assertEqual(
-            self.discussion_2.attributes_definition,
-            [{'name': 'new_property', 'type': 'char'}])
-        self.assertEqual(
-            message.attributes,
-            {'new_property': 'test value'})
-
-        # re-write the same parent again and check that value are not reset
-        message.discussion = message.discussion
-        self.assertEqual(
-            message.attributes,
-            {'new_property': 'test value'})
-
-        # trigger a other onchange after setting the properties
-        # and check that it does not impact the properties
-        message.discussion.attributes_definition = []
-        message_form = Form(message)
-        message.attributes = [{
-            'name': 'new_property',
-            'type': 'char',
-            'value': 'test value',
-            'definition_changed': True,
-        }]
-        message_form.body = "a" * 42
-        message = message_form.save()
-        self.assertEqual(
-            message.attributes,
-            {'new_property': 'test value'})
-
     @mute_logger('odoo.fields')
     def test_properties_field_definition_update(self):
         """Test the definition update from the child."""
@@ -2431,994 +2128,3 @@ def test_properties_field_search_read_false(self):
 
         message_values = Model.search_read([('id', '=', message.id)])
         self.assertNotIn('value', message_values[0]['attributes'][0], 'Value should not be set')
-
-
-@tagged('at_install', '-post_install')  # LEGACY at_install
-class PropertiesGroupByCase(TestPropertiesMixin):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.message_4 = cls.env['test_orm.message'].create({
-            'name': 'Test Message',
-            'discussion': cls.discussion_1.id,
-            'author': cls.user.id,
-        })
-
-        cls.messages = cls.message_1 | cls.message_2 | cls.message_3 | cls.message_4
-        cls.env['test_orm.message'].search([('id', 'not in', cls.messages.ids)]).unlink()
-
-        cls.wrong_discussion_id = cls.env['test_orm.discussion'].search(
-            [], order="id DESC", limit=1).id + 1000
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_basic(self):
-        Model = self.env['test_orm.message']
-
-        self.messages.discussion = self.discussion_1
-        # search on text properties
-        self.message_1.attributes = [{
-            'name': 'mychar',
-            'type': 'char',
-            'value': 'qsd',
-            'definition_changed': True,
-        }, {
-            'name': 'myinteger',
-            'type': 'integer',
-            'value': 1337,
-            'definition_changed': True,
-        }]
-        self.message_2.attributes = {'mychar': 'qsd', 'myinteger': 5}
-        self.message_3.attributes = {'mychar': 'boum', 'myinteger': 1337}
-
-        # group by the char property
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.mychar'],
-            )
-
-        self.assertEqual(len(result), 3)
-
-        # check counts
-        count_by_values = {
-            value['attributes.mychar']: value['__count']
-            for value in result
-        }
-        self.assertEqual(count_by_values['boum'], 1)
-        self.assertEqual(count_by_values['qsd'], 2)
-        self.assertEqual(count_by_values[False], 1)
-
-        # check domains
-        domain_by_values = {
-            value['attributes.mychar']: value['__extra_domain']
-            for value in result
-        }
-        self.assertEqual(domain_by_values['boum'], [('attributes.mychar', '=', 'boum')])
-        self.assertEqual(domain_by_values['qsd'], [('attributes.mychar', '=', 'qsd')])
-        self._check_domains_count(result)
-
-        # group by the integer property
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.myinteger'],
-            )
-
-        self.assertEqual(len(result), 3)
-        count_by_values = {
-            value['attributes.myinteger']: value['__count']
-            for value in result
-        }
-
-        self.assertEqual(count_by_values[5], 1)
-        self.assertEqual(count_by_values[1337], 2)
-        self.assertEqual(count_by_values[False], 1)
-
-        # falsy properties
-        self.message_3.attributes = {'mychar': False, 'myinteger': False}
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.myinteger'],
-            )
-
-        self.assertEqual(result[-1]['__count'], 2)
-        self.assertEqual(result[-1]['__extra_domain'], [('attributes.myinteger', '=', False)])
-        self._check_domains_count(result)
-
-        # non existing keys in the dict values should be grouped with False value
-        self.env.cr.execute(
-            """
-            UPDATE test_orm_message
-               SET attributes = '{}'
-             WHERE id = %s
-            """,
-            [self.message_2.id],
-        )
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.myinteger'],
-            )
-
-        self.assertEqual(result[-1]['__count'], 3)
-        self.assertEqual(result[-1]['__extra_domain'], [('attributes.myinteger', '=', False)])
-        result = Model.search(result[-1]['__extra_domain'])  # check the domain is correct for the search
-        self.assertEqual(result, self.message_2 | self.message_3 | self.message_4)
-
-        # test the order by
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.myinteger'],
-            order='attributes.myinteger ASC',
-        )
-        self.assertEqual(len(result), 2)
-        self.assertEqual(result[0]['attributes.myinteger'], 1337)
-        self.assertEqual(result[1]['attributes.myinteger'], False)
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.myinteger'],
-            order='attributes.myinteger DESC',
-        )
-        self.assertEqual(len(result), 2)
-        self.assertEqual(result[0]['attributes.myinteger'], False)
-        self.assertEqual(result[1]['attributes.myinteger'], 1337)
-        self._check_domains_count(result)
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.myinteger', 'name'],
-            order='attributes.myinteger DESC',
-        )
-        self.assertEqual(
-            result[0]['__extra_domain'],
-            ['&', ('attributes.myinteger', '=', False), ('name', '=', self.message_1.name)],
-        )
-        self._check_domains_count(result)
-
-    def test_properties_field_web_read_group(self):
-        self.messages.discussion = self.discussion_1
-        # search on text properties
-        self.message_1.attributes = [{
-            'name': 'mychar',
-            'type': 'char',
-            'value': 'qsd',
-            'definition_changed': True,
-        }]
-        self.message_2.attributes = {'mychar': 'qsd'}
-        self.message_3.attributes = {'mychar': 'boum'}
-
-        Model = self.env['test_orm.message']
-        with self.assertQueryCount(6):  # 3 for formatted_read_group + 1 query by group opened
-            result = Model.web_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.mychar'],
-                auto_unfold=True,
-                unfold_read_specification={'id': {}},
-            )
-        groups = result['groups']
-
-        self.assertEqual(len(groups), 3)
-
-        # check counts
-        count_by_values = {
-            value['attributes.mychar']: value['__count']
-            for value in groups
-        }
-        self.assertEqual(count_by_values['boum'], 1)
-        self.assertEqual(count_by_values['qsd'], 2)
-        self.assertEqual(count_by_values[False], 1)
-
-        # check domains
-        domain_by_values = {
-            value['attributes.mychar']: value['__extra_domain']
-            for value in groups
-        }
-        self.assertEqual(domain_by_values['boum'], [('attributes.mychar', '=', 'boum')])
-        self.assertEqual(domain_by_values['qsd'], [('attributes.mychar', '=', 'qsd')])
-        self._check_domains_count(groups)
-
-        # group boum
-        self.assertEqual(groups[0]['__records'], [{'id': self.message_3.id}])
-        # group qsd
-        self.assertEqual(groups[1]['__records'], [{'id': self.message_1.id}, {'id': self.message_2.id}])
-        # group False
-        self.assertEqual(groups[2]['__records'], [{'id': self.message_4.id}])
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_progress_bar(self):
-        """Test "_read_progress_bar" with a properties field."""
-        Model = self.env['test_orm.message']
-
-        self.messages.discussion = self.discussion_1
-        self.message_1.attributes = [{
-            'name': 'myinteger',
-            'type': 'integer',
-            'value': 1337,
-            'definition_changed': True,
-        }]
-        self.message_2.attributes = {'myinteger': 5}
-        self.message_3.attributes = {'myinteger': 1337}
-
-        result = Model.read_progress_bar(
-            domain=[],
-            group_by='attributes.myinteger',
-            progress_bar={'field': 'priority', 'colors': [0]},
-        )
-        self.assertEqual(result, {'1337': {0: 2}, '5': {0: 1}, 'False': {0: 1}})
-
-    def _properties_field_read_group_date_prepare(self, date_type='date'):
-        # Format in database: 2023-03-29 09:30:16
-        self.messages.discussion = self.discussion_1
-        self.discussion_1.attributes_definition = [{
-            'type': date_type,
-            'name': 'mydate',
-        }]
-        hour = ' 13:05:34' if date_type == 'datetime' else ''
-        # message 5 has a different year
-        # message 6 has a False value
-        # message 7 is in a different discussion
-        self.message_5, self.message_6, self.message_7 = self.env['test_orm.message'].create([
-                {'discussion': self.discussion_1.id, 'attributes': {'mydate': f'2077-05-02{hour}'}},
-                {'discussion': self.discussion_1.id, 'attributes': {'mydate': False}},
-                {'discussion': self.discussion_2.id},
-        ])
-        self.message_1.attributes = {'mydate': f'2023-01-02{hour}'}
-        self.message_2.attributes = {'mydate': f'2023-02-03{hour}'}
-        self.message_3.attributes = {'mydate': f'2023-01-02{hour}'}
-        self.message_4.attributes = {'mydate': f'2023-02-05{hour}'}
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_date_day(self, date_type='date'):
-        self._properties_field_read_group_date_prepare(date_type)
-        Model = self.env['test_orm.message']
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:day'],
-            order='attributes.mydate:day DESC',
-        )
-
-        self.assertEqual(len(result), 5)
-        # check values and count
-        self.assertEqual(result[0]['__count'], 2)
-        self.assertEqual(result[0]['attributes.mydate:day'], False)
-        self.assertEqual(result[1]['__count'], 1)
-        self.assertEqual(result[1]['attributes.mydate:day'][1], '02 May 2077')
-        self.assertEqual(result[2]['__count'], 1)
-        self.assertEqual(result[2]['attributes.mydate:day'][1], '05 Feb 2023')
-        self.assertEqual(result[3]['__count'], 1)
-        self.assertEqual(result[3]['attributes.mydate:day'][1], '03 Feb 2023')
-        self.assertEqual(result[4]['__count'], 2)
-        self.assertEqual(result[4]['attributes.mydate:day'][1], '02 Jan 2023')
-        # check domain
-        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
-        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
-        self.assertEqual(Model.search(result[2]['__extra_domain']), self.message_4)
-        self.assertEqual(Model.search(result[3]['__extra_domain']), self.message_2)
-        self.assertEqual(Model.search(result[4]['__extra_domain']), self.message_1 | self.message_3)
-        self._check_domains_count(result)
-
-        # when the order is not specified, the ORM will generate one
-        # based on "attributes.mydate ASC", make sure it works
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:year'],
-        )
-        self.assertEqual(len(result), 3)
-        self.assertEqual(result[0]['attributes.mydate:year'][1], '2023')
-        self.assertEqual(result[1]['attributes.mydate:year'][1], '2077')
-        self.assertEqual(result[2]['attributes.mydate:year'], False)
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_date_quarter(self, date_type='date'):
-        self._properties_field_read_group_date_prepare(date_type)
-        Model = self.env['test_orm.message']
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:quarter'],
-            order='attributes.mydate:quarter DESC',
-        )
-
-        self.assertEqual(len(result), 3)
-        # check values and count
-        self.assertEqual(result[0]['__count'], 2)
-        self.assertEqual(result[0]['attributes.mydate:quarter'], False)
-        self.assertEqual(result[1]['__count'], 1)
-        self.assertEqual(result[1]['attributes.mydate:quarter'][1], 'Q2 2077')
-        self.assertEqual(result[2]['__count'], 4)
-        self.assertEqual(result[2]['attributes.mydate:quarter'][1], 'Q1 2023')
-        # check domain
-        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
-        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
-        self.assertEqual(
-            Model.search(result[2]['__extra_domain']),
-            self.message_1 | self.message_2 | self.message_3 | self.message_4)
-        self._check_domains_count(result)
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_date_month(self, date_type='date'):
-        self._properties_field_read_group_date_prepare()
-        Model = self.env['test_orm.message']
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:month'],
-            order='attributes.mydate:month DESC',
-        )
-
-        self.assertEqual(len(result), 4)
-        # check values and count
-        self.assertEqual(result[0]['__count'], 2)
-        self.assertEqual(result[0]['attributes.mydate:month'], False)
-        self.assertEqual(result[1]['__count'], 1)
-        self.assertEqual(result[1]['attributes.mydate:month'][1], 'May 2077')
-        self.assertEqual(result[2]['__count'], 2)
-        self.assertEqual(result[2]['attributes.mydate:month'][1], 'February 2023')
-        self.assertEqual(result[3]['__count'], 2)
-        self.assertEqual(result[3]['attributes.mydate:month'][1], 'January 2023')
-        # check domain
-        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
-        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
-        self.assertEqual(Model.search(result[2]['__extra_domain']), self.message_2 | self.message_4)
-        self.assertEqual(Model.search(result[3]['__extra_domain']), self.message_1 | self.message_3)
-        self._check_domains_count(result)
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_date_week(self, date_type='date'):
-        first_week_day = int(get_lang(self.env).week_start) - 1
-        self.assertEqual(first_week_day, 6, "First day of the week must be Sunday")
-
-        self._properties_field_read_group_date_prepare()
-        Model = self.env['test_orm.message']
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:week'],
-            order='attributes.mydate:week DESC',
-        )
-
-        self.assertEqual(len(result), 5)
-        # check values and count
-        self.assertEqual(result[0]['__count'], 2)
-        self.assertEqual(result[0]['attributes.mydate:week'], False)
-        self.assertEqual(result[1]['__count'], 1)
-        self.assertEqual(result[1]['attributes.mydate:week'][1], 'W19 2077')
-        self.assertEqual(result[2]['__count'], 1)
-        self.assertEqual(result[2]['attributes.mydate:week'][1], 'W6 2023')
-        self.assertEqual(result[3]['__count'], 1)
-        self.assertEqual(result[3]['attributes.mydate:week'][1], 'W5 2023')
-        self.assertEqual(result[4]['__count'], 2)
-        # Babel issue mitigation
-        # https://github.com/python-babel/babel/pull/621 -- introduced a new bug
-        # https://github.com/python-babel/babel/pull/887 -- proposed a fix but finally closed
-        # https://sources.debian.org/patches/python-babel/2.10.3-1/ -- Debian reverted 621
-        # so this ugly fix is made to have the test working in patched and non patched versions of Babel
-        babel_year = babel.dates.format_date(datetime.datetime(2023, 1, 1), "YYYY", "en_US")  # non patched: '2022' patched: '2023'
-        if babel_year == '2022':  # Broken unpatched babel
-            self.assertEqual(result[4]['attributes.mydate:week'][1], 'W1 2022')
-        else:  # Patched babel
-            self.assertEqual(result[4]['attributes.mydate:week'][1], 'W1 2023')
-        # check domain
-        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
-        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
-        self.assertEqual(Model.search(result[2]['__extra_domain']), self.message_4)
-        self.assertEqual(Model.search(result[3]['__extra_domain']), self.message_2)
-        self.assertEqual(Model.search(result[4]['__extra_domain']), self.message_1 | self.message_3)
-        self._check_domains_count(result)
-
-        # test that the first day of the week in the domain care about the local
-        # (based on the lang, the first day of the week might change)
-        for line in result[1:]:
-            self.assertEqual(line['__extra_domain'][1][1], ">=")
-            self.assertEqual(line['__extra_domain'][2][1], "<")
-            start = datetime.datetime.strptime(line['__extra_domain'][1][2], "%Y-%m-%d")
-            end = datetime.datetime.strptime(line['__extra_domain'][2][2], "%Y-%m-%d")
-            self.assertEqual(start.weekday(), first_week_day)
-            self.assertEqual(end.weekday(), first_week_day)
-
-        # now, first day of the week is "Wednesday"
-        lang = self.env['res.lang'].with_context(active_test=False).search([('code', '=', 'fr_FR')])
-        self.assertEqual(len(lang), 1)
-        lang.write({'active': True, 'week_start': '3'})
-        result = Model.with_context(lang='fr_FR').formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:week'],
-            order='attributes.mydate:week DESC',
-        )
-        for line in result[1:]:
-            self.assertEqual(line['__extra_domain'][1][1], ">=")
-            self.assertEqual(line['__extra_domain'][2][1], "<")
-            start = datetime.datetime.strptime(line['__extra_domain'][1][2], "%Y-%m-%d")
-            end = datetime.datetime.strptime(line['__extra_domain'][2][2], "%Y-%m-%d")
-            self.assertEqual(start.weekday(), 2, "First day of the week must be Wednesday")
-            self.assertEqual(end.weekday(), 2, "First day of the week must be Wednesday")
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_date_year(self, date_type='date'):
-        self._properties_field_read_group_date_prepare()
-        Model = self.env['test_orm.message']
-
-        result = Model.formatted_read_group(
-            domain=[],
-            aggregates=['__count'],
-            groupby=['attributes.mydate:year'],
-            order='attributes.mydate:year DESC',
-        )
-
-        self.assertEqual(len(result), 3)
-        # check values and count
-        self.assertEqual(result[0]['__count'], 2)
-        self.assertEqual(result[0]['attributes.mydate:year'], False)
-        self.assertEqual(result[1]['__count'], 1)
-        self.assertEqual(result[1]['attributes.mydate:year'][1], '2077')
-        self.assertEqual(result[2]['__count'], 4)
-        self.assertEqual(result[2]['attributes.mydate:year'][1], '2023')
-        # check domain
-        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
-        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
-        self.assertEqual(
-            Model.search(result[2]['__extra_domain']),
-            self.message_1 | self.message_2 | self.message_3 | self.message_4)
-        self._check_domains_count(result)
-
-    def test_properties_field_read_group_datetime_day(self):
-        self.test_properties_field_read_group_date_day('datetime')
-
-    def test_properties_field_read_group_datetime_quarter(self):
-        self.test_properties_field_read_group_date_quarter('datetime')
-
-    def test_properties_field_read_group_datetime_month(self):
-        self.test_properties_field_read_group_date_month('datetime')
-
-    def test_properties_field_read_group_datetime_week(self):
-        self.test_properties_field_read_group_date_week('datetime')
-
-    def test_properties_field_read_group_datetime_year(self):
-        self.test_properties_field_read_group_date_year('datetime')
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_injection(self):
-        Model = self.env['test_orm.message']
-        self.message_1.attributes = [{
-            'name': 'myinteger',
-            'type': 'integer',
-            'value': 1337,
-            'definition_changed': True,
-        }]
-
-        with self.assertRaises(ValueError), self.assertQueryCount(0):
-            Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.myinteger'],
-                order='attributes.myinteger OR 1=1 DESC',
-            )
-
-        with self.assertRaises(ValueError), self.assertQueryCount(0):
-            Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.myinteger OR 1=1'],
-                order='attributes.myinteger DESC',
-            )
-
-        with self.assertRaises(ValueError), self.assertQueryCount(0):
-            Model.formatted_read_group(
-                domain=[],
-                aggregates=['__count'],
-                groupby=['attributes.myinteger:wrongfunction'],
-                order='attributes.myinteger DESC',
-            )
-
-        with self.assertRaises(ValueError), self.assertQueryCount(0):
-            Model.formatted_read_group(
-                domain=[],
-                aggregates=['attributes.myinteger:sum'],  # Aggregate is not supported
-            )
-
-    @mute_logger('odoo.fields', 'odoo.models.unlink')
-    def test_properties_field_read_group_many2many(self):
-        Model = self.env['test_orm.message']
-
-        partners = self.env['test_orm.partner'].create([
-            {'name': f'Partner {i}'}
-            for i in range(10)
-        ])
-
-        self.discussion_1.attributes_definition = [{
-            'name': 'mypartners',
-            'string': 'Partners',
-            'type': 'many2many',
-            'comodel': 'test_orm.partner',
-        }]
-
-        self.messages.discussion = self.discussion_1
-
-        self.message_1.attributes = {'mypartners': partners[:5].ids}
-        self.message_2.attributes = {'mypartners': partners[3:8].ids}
-        self.message_3.attributes = {'mypartners': partners[8:].ids}
-
-        (partners[4] | partners[7] | partners[9]).unlink()
-
-        with self.assertQueryCount(4):
-            result = Model.formatted_read_group(
-                domain=[('discussion', '!=', self.wrong_discussion_id)],
-                aggregates=['__count'],
-                groupby=['attributes.mypartners'],
-            )
-
-        self.assertEqual(len(result), 8)
-        existing_partners = partners.exists()
-        self.assertEqual(len(existing_partners), 7)
-        for partner, line in zip(existing_partners, result):
-            self.assertEqual(partner.id, line['attributes.mypartners'][0])
-            self.assertEqual(partner.display_name, line['attributes.mypartners'][1])
-            self.assertEqual(
-                line['__extra_domain'],
-                [('attributes.mypartners', 'in', partner.id)],
-            )
-            # only the fourth partner is in 2 messages
-            self.assertEqual(line['__count'], 2 if partner == partners[3] else 1)
-
-        # message 4 is in a different discussion, so it's value is False
-        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_4)
-        self._check_many_falsy_group('mypartners', result)
-        self._check_domains_count(result)
-
-        # now message 1 and 2 will also be in the falsy group
-        partners[:8].unlink()
-        with self.assertQueryCount(4):
-            result = Model.formatted_read_group(
-                domain=[('discussion', '!=', self.wrong_discussion_id)],
-                aggregates=['__count'],
-                groupby=['attributes.mypartners'],
-            )
-
-        self.assertEqual(len(result), 2)
-        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_1 | self.message_2 | self.message_4)
-        self._check_many_falsy_group('mypartners', result)
-        self._check_domains_count(result)
-
-        # special case, no partner exists
-        existing_partners.unlink()
-        result = Model.formatted_read_group(
-            domain=[('discussion', '!=', self.wrong_discussion_id)],
-            aggregates=['__count'],
-            groupby=['attributes.mypartners'],
-        )
-        self.assertEqual(len(result), 1)
-        self.assertFalse(result[0]['attributes.mypartners'])
-        self.assertEqual(result[0]['__count'], 4)
-        self._check_domains_count(result)
-
-        # test an invalid model name (e.g. if we uninstalled the module of the model)
-        for invalid_model_name in ("invalid_model_name", "test_orm.transient_model"):
-            self.env.cr.execute(
-                """
-                UPDATE test_orm_discussion
-                   SET attributes_definition
-                       = jsonb_set(attributes_definition, '{0,comodel}', %s)
-                 WHERE id = %s
-                """,
-                [json.dumps(invalid_model_name), self.discussion_1.id],
-            )  # bypass the ORM to set an invalid model name
-            definition = self._get_sql_definition(self.discussion_1)
-            self.assertEqual(definition[0]['comodel'], invalid_model_name)
-            error_message = f"You cannot use “Partners” because the linked “{invalid_model_name}” model doesn't exist or is invalid"
-            with self.assertRaisesRegex(UserError, error_message):
-                result = Model.formatted_read_group(
-                    domain=[('discussion', '!=', self.wrong_discussion_id)],
-                    aggregates=['__count'],
-                    groupby=['attributes.mypartners'],
-                )
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_many2one(self):
-        Model = self.env['test_orm.message']
-
-        # group by many2one property
-        self.message_1.attributes = [{
-            'name': 'mypartner',
-            'string': 'My Partner',
-            'type': 'many2one',
-            'value': self.partner_2.id,
-            'comodel': 'test_orm.partner',
-            'definition_changed': True,
-        }]
-        self.message_2.attributes = {'mypartner': self.partner.id}
-        self.message_4.attributes = {'mypartner': False}  # explicit False value
-
-        # this partner id doesn't exist
-        unexisting_record_id = self.env['test_orm.partner'].search(
-            [], order="id DESC", limit=1).id + 1
-        self.env.cr.execute(
-            """
-            UPDATE test_orm_message
-               SET attributes = '{"mypartner": %s}'
-             WHERE id = %s
-            """,
-            [unexisting_record_id, self.message_3.id],
-        )
-
-        self.env.invalidate_all()
-        with self.assertQueryCount(4):
-            result = Model.formatted_read_group(
-                domain=[],
-                groupby=['attributes.mypartner'],
-                aggregates=['__count'],
-            )
-
-        self.assertEqual(len(result), 3, 'Should ignore the partner that has been removed')
-
-        self.assertEqual(result[0]['__count'], 1)
-        self.assertEqual(result[0]['attributes.mypartner'][0], self.partner.id)
-        self.assertEqual(result[0]['attributes.mypartner'][1], self.partner.display_name)
-        self.assertEqual(result[0]['__extra_domain'], [('attributes.mypartner', '=', self.partner.id)])
-
-        self.assertEqual(result[1]['__count'], 1)
-        self.assertEqual(result[1]['attributes.mypartner'][0], self.partner_2.id)
-        self.assertEqual(result[1]['attributes.mypartner'][1], self.partner_2.display_name)
-        self.assertEqual(result[1]['__extra_domain'], [('attributes.mypartner', '=', self.partner_2.id)])
-
-        # falsy domain, automatically generated, contains the false value
-        # and the ids of the records that doesn't exist in the database
-        self.assertEqual(result[2]['__count'], 2)
-        self.assertEqual(result[2]['attributes.mypartner'], False)
-        self.assertEqual(
-            result[2]['__extra_domain'],
-            [
-                '|',
-                ('attributes.mypartner', '=', False),
-                ('attributes.mypartner', 'not in', [self.partner.id, self.partner_2.id]),
-            ],
-        )
-
-        # when there's no "('property', '=', False)" domain, it should be created
-        self.message_4.attributes = {'mypartner': self.partner.id}
-        result = Model.formatted_read_group(
-            domain=[],
-            groupby=['attributes.mypartner'],
-            aggregates=['__count'],
-        )
-        self.assertEqual(result[2]['__count'], 1)
-        self.assertEqual(
-            result[2]['__extra_domain'],
-            [
-                '|',
-                ('attributes.mypartner', '=', False),
-                ('attributes.mypartner', 'not in', [self.partner.id, self.partner_2.id]),
-            ],
-        )
-
-        # test an invalid model name (e.g. if we uninstalled the module of the model)
-        # should have only one group with the value "False", and all records
-        for invalid_model_name in ("invalid_model_name", "test_orm.transient_model"):
-            self.env.cr.execute(
-                """
-                UPDATE test_orm_discussion
-                   SET attributes_definition
-                       = jsonb_set(attributes_definition, '{0,comodel}', %s::jsonb)
-                 WHERE id = %s
-                """,
-                [json.dumps(invalid_model_name), self.discussion_1.id],
-            )  # bypass the ORM to set an invalid model name
-            definition = self._get_sql_definition(self.discussion_1)
-            self.assertEqual(definition[0]['comodel'], invalid_model_name)
-            error_message = f"You cannot use “My Partner” because the linked “{invalid_model_name}” model doesn't exist or is invalid"
-            with self.assertRaisesRegex(UserError, error_message):
-                result = Model.formatted_read_group(
-                    domain=[('discussion', '!=', self.wrong_discussion_id)],
-                    aggregates=['__count'],
-                    groupby=['attributes.mypartner'],
-                )
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_selection(self):
-        Model = self.env['test_orm.message']
-
-        # group by selection property
-        self.message_1.attributes = [{
-            'name': 'myselection',
-            'type': 'selection',
-            'value': 'optionA',
-            'selection': [['optionA', 'A'], ['optionB', 'B']],
-            'definition_changed': True,
-        }, {
-            'name': 'mychar2',
-            'type': 'char',
-            'value': 'qsd',
-            'definition_changed': True,
-        }]
-        self.message_2.attributes = {'myselection': False}
-
-        self.env.cr.execute(
-            """
-            UPDATE test_orm_message
-               SET attributes = '{"myselection": "invalid_option"}'
-             WHERE id = %s
-            """,
-            [self.message_3.id],
-        )
-
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[('discussion', '!=', self.wrong_discussion_id)],
-                groupby=['attributes.myselection'],
-                aggregates=['__count'],
-            )
-
-        self.assertEqual(len(result), 2)
-        self.assertEqual(result[0]['__count'], 1)
-        self.assertEqual(
-            result[0]['__extra_domain'],
-            [('attributes.myselection', '=', 'optionA')],
-        )
-        self.assertEqual(result[0]['attributes.myselection'], 'optionA')
-
-        # check that the option that is not valid is included in the "False" domain
-        # the count should be updated as well
-        self.assertEqual(result[1]['__count'], 3)
-        self.assertEqual(
-            result[1]['__extra_domain'],
-            [
-                '|',
-                ('attributes.myselection', '=', False),
-                ('attributes.myselection', 'not in', ['optionA', 'optionB']),
-            ],
-        )
-        self.assertEqual(result[1]['attributes.myselection'], False)
-        # double check that the returned domain filter the right record
-        self.assertEqual(
-            self.env['test_orm.message'].search(result[1]['__extra_domain']),
-            self.message_2 | self.message_3 | self.message_4,
-        )
-
-        # special case, there's no option
-        self.message_1.attributes = [{
-            'name': 'myselection',
-            'type': 'selection',
-            'value': 'optionA',
-            'selection': [],
-            'definition_changed': True,
-        }]
-        result = Model.formatted_read_group(
-            domain=[],
-            groupby=['attributes.myselection'],
-            aggregates=['__count'],
-        )
-        self.assertEqual(len(result), 1)
-        self.assertEqual(result[0]['__count'], 4)
-        self._check_domains_count(result)
-
-    @mute_logger('odoo.fields')
-    def test_properties_field_read_group_tags(self):
-        Model = self.env['test_orm.message']
-
-        (self.message_1 | self.message_2 | self.message_3).discussion = self.discussion_1
-
-        # group by tags property
-        self.message_1.attributes = [{
-            'name': 'mytags',
-            'type': 'tags',
-            'value': ['a', 'c', 'g'],
-            'tags': [[x.lower(), x, i] for i, x in enumerate('ABCDEFG')],
-            'definition_changed': True,
-        }]
-        self.message_2.attributes = {'mytags': ['a', 'e', 'g']}
-        self.env.cr.execute(
-            """
-            UPDATE test_orm_message
-               SET attributes = '{"mytags": ["a", "d", "invalid", "e"]}'
-             WHERE id = %s
-            """,
-            [self.message_3.id],
-        )
-        self.env.invalidate_all()
-
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[('discussion', '!=', self.wrong_discussion_id)],
-                aggregates=['__count'],
-                groupby=['attributes.mytags'],
-            )
-
-        self.assertNotIn('invalid', str(result))
-        self.assertEqual(len(result), 6)
-
-        all_tags = self.message_1.read(['attributes'])[0]['attributes'][0]['tags']
-        all_tags = {tag[0]: tag for tag in all_tags}
-
-        for group, (tag, count) in zip(result, (('a', 3), ('c', 1), ('d', 1), ('e', 2), ('g', 2))):
-            self.assertEqual(group['attributes.mytags'], all_tags[tag])
-            self.assertEqual(group['__count'], count)
-            self.assertEqual(
-                group['__extra_domain'],
-                [('attributes.mytags', 'in', tag)],
-            )
-            # check that the value when we read the record match the value of the group
-            property_values = [
-                next(pro['value'] for pro in values['attributes'])
-                for values in Model.search(group['__extra_domain']).read(['attributes'])
-            ]
-            self.assertTrue(all(tag in property_value for property_value in property_values))
-
-        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_4)
-        self._check_many_falsy_group('mytags', result)
-        self._check_domains_count(result)
-
-        # now message 3 has *only* invalid tags, so it should be in the falsy group
-        self.env.cr.execute(
-            """
-            UPDATE test_orm_message
-               SET attributes = '{"mytags": ["invalid 1", "invalid 2", "invalid 3"]}'
-             WHERE id = %s
-            """,
-            [self.message_3.id],
-        )
-        self.env.invalidate_all()
-
-        with self.assertQueryCount(3):
-            result = Model.formatted_read_group(
-                domain=[('discussion', '!=', self.wrong_discussion_id)],
-                aggregates=['__count'],
-                groupby=['attributes.mytags'],
-            )
-        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_3 | self.message_4)
-        self._check_many_falsy_group('mytags', result)
-        self._check_domains_count(result)
-
-        # special case, there's no tag
-        for tags in ([], False, None):
-            self.message_1.attributes = [{
-                'name': 'mytags',
-                'type': 'tags',
-                'value': tags,
-                'tags': tags,
-                'definition_changed': True,
-            }]
-            result = Model.formatted_read_group(
-                domain=[('discussion', '!=', self.wrong_discussion_id)],
-                aggregates=['__count'],
-                groupby=['attributes.mytags'],
-            )
-            self.assertEqual(len(result), 1)
-            self.assertFalse(result[0]['attributes.mytags'])
-            self.assertEqual(result[0]['__count'], 4)
-            self._check_domains_count(result)
-
-    def _check_domains_count(self, result):
-        """Check that the domains in the result match the __count key."""
-        for line in result:
-            records = self.env['test_orm.message'].search(line['__extra_domain'])
-            count_key = next(key for key in line if "_count" in key)
-            self.assertEqual(len(records), line[count_key])
-
-    def _check_many_falsy_group(self, property_name, result):
-        """Check the falsy group from the many2many and tags read group result.
-
-        - if a record is in the falsy group, it can't be in a other group
-          (that sentence is not true for non-falsy group, a record
-          with a non-falsy value can be in many other groups)
-        - read the value of all records and check if they belongs to the correct group
-        """
-        Model = self.env['test_orm.message']
-        falsy_group = result[-1]
-        self.assertFalse(falsy_group[f'attributes.{property_name}'])
-        falsy_records = Model.search(falsy_group['__extra_domain'])
-        nonfalsy_records = Model.search(Domain.OR(line['__extra_domain'] for line in result[:-1]))
-        self.assertEqual(Model.search_count([]), len(falsy_records) + len(nonfalsy_records))
-        for falsy_record in falsy_records:
-            self.assertNotIn(falsy_record, nonfalsy_records)
-
-        def _get_records_values(records):
-            return [
-                next(
-                    (pro.get('value') for pro in properties['attributes']
-                     if pro['name'] == property_name),
-                )
-                for properties in records.read(['attributes'])
-            ]
-
-        self.assertTrue(not any(_get_records_values(falsy_records)))
-        self.assertTrue(all(_get_records_values(nonfalsy_records)))
-
-    def subtest_properties_field_web_read_group_date_like(self, date_type='date'):
-        self._properties_field_read_group_date_prepare(date_type)
-        Model = self.env['test_orm.message']
-
-        hour_min = " 00:00:00" if date_type == "datetime" else ""
-        hour_max = " 00:00:59" if date_type == "datetime" else ""
-
-        # Initial web_read_group everything folded (list view)
-        self.assertEqual(
-            Model.web_read_group(
-                domain=[],
-                groupby=["attributes.mydate:year"],
-                aggregates=[],
-            ),
-            {
-                "groups": [
-                    {
-                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2023-01-01{hour_min}'), ('attributes.mydate', '<', f'2024-01-01{hour_max}')],
-                        "attributes.mydate:year": (f'2023-01-01{hour_min}', "2023"),
-                        "__count": 4,
-                    },
-                    {
-                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2077-01-01{hour_min}'), ('attributes.mydate', '<', f'2078-01-01{hour_max}')],
-                        "attributes.mydate:year": (f'2077-01-01{hour_min}', "2077"),
-                        "__count": 1,
-                    },
-                    {
-                        "__extra_domain": [('attributes.mydate', '=', False)],
-                        "attributes.mydate:year": False,
-                        "__count": 2,
-                    },
-                ],
-                "length": 3,
-            },
-        )
-        # Second web_read_group year 2077 unfolded
-        self.assertEqual(
-            Model.web_read_group(
-                domain=[],
-                groupby=["attributes.mydate:year"],
-                aggregates=[],
-                opening_info=[
-                    {
-                        "value": f'2077-01-01{hour_min}',
-                        "folded": False,
-                        "limit": 80,
-                        "offset": 0,
-                        "progressbar_domain": False,
-                        "groups": [],
-                    },
-                    {"value": f"2023-01-01{hour_min}", "folded": True},
-                    {"value": False, "folded": True},
-                ],
-                unfold_read_specification={'id': {}},
-            ),
-            {
-                "groups": [
-                    {
-                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2023-01-01{hour_min}'), ('attributes.mydate', '<', f'2024-01-01{hour_max}')],
-                        "attributes.mydate:year": (f'2023-01-01{hour_min}', "2023"),
-                        "__count": 4,
-                    },
-                    {
-                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2077-01-01{hour_min}'), ('attributes.mydate', '<', f'2078-01-01{hour_max}')],
-                        "attributes.mydate:year": (f'2077-01-01{hour_min}', "2077"),
-                        '__records': [{'id': self.message_5.id}],
-                        "__count": 1,
-                    },
-                    {
-                        "__extra_domain": [('attributes.mydate', '=', False)],
-                        "attributes.mydate:year": False,
-                        "__count": 2,
-                    },
-                ],
-                "length": 3,
-            },
-        )
-
-    def test_properties_field_read_group_date(self):
-        self.subtest_properties_field_web_read_group_date_like('date')
-
-    def test_properties_field_read_group_datetime(self):
-        self.subtest_properties_field_web_read_group_date_like('datetime')
diff --git a/odoo/addons/test_orm/tests/test_read_grouping_sets.py b/odoo/addons/test_orm/tests/test_read_grouping_sets.py
index 145591fbbf311..6fab2bac82b16 100644
--- a/odoo/addons/test_orm/tests/test_read_grouping_sets.py
+++ b/odoo/addons/test_orm/tests/test_read_grouping_sets.py
@@ -1,5 +1,5 @@
 from odoo import Command
-from odoo.tests import tagged, common, new_test_user
+from odoo.tests import tagged, common
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
@@ -291,422 +291,3 @@ def test_many2many_read_grouping_sets(self):
             with self.subTest(f"Case {i} - {grouping_sets!r} - {aggregates!r}"), self.assertQueryCount(nb_queries):
                 result = tasks._read_grouping_sets(domain, grouping_sets, aggregates, order=complete_order)
                 self.assertEqual(result, expected_result)
-
-
-@tagged('at_install', '-post_install')  # LEGACY at_install
-class TestFormattedReadGroupingSets(common.TransactionCase):
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.base_user = new_test_user(cls.env, login='Base User', groups='base.group_user')
-
-    def test_simple_formatted_read_grouping_sets(self):
-        Model = self.env['test_read_group.aggregate']
-        Partner = self.env['res.partner']
-        partner_1 = Partner.create({'name': 'z_one'})
-        partner_2 = Partner.create({'name': 'a_two'})
-        Model.create({'key': 1, 'partner_id': partner_1.id, 'value': 1})
-        Model.create({'key': 1, 'partner_id': partner_1.id, 'value': 2})
-        Model.create({'key': 1, 'partner_id': partner_2.id, 'value': 3})
-        Model.create({'key': 2, 'partner_id': partner_2.id, 'value': 4})
-        Model.create({'key': 2, 'partner_id': partner_2.id})
-        Model.create({'key': 2, 'value': 5})
-        Model.create({'partner_id': partner_2.id, 'value': 5})
-        Model.create({'value': 6})
-        Model.create({})
-
-        grouping_sets = [['partner_id', 'key'], ['key'], ['partner_id'], []]
-        expected_result = [
-            Model.formatted_read_group([], grouping_set, aggregates=['value:sum'])
-            for grouping_set in grouping_sets
-        ]
-
-        with self.assertQueries(["""
-            SELECT
-                GROUPING(
-                    "test_read_group_aggregate"."partner_id",
-                    "test_read_group_aggregate"."key"
-                ),
-                "test_read_group_aggregate"."partner_id",
-                "test_read_group_aggregate"."key",
-                SUM("test_read_group_aggregate"."value")
-            FROM
-                "test_read_group_aggregate"
-                LEFT JOIN "res_partner" AS "test_read_group_aggregate__partner_id" ON (
-                    "test_read_group_aggregate"."partner_id" = "test_read_group_aggregate__partner_id"."id"
-                )
-            GROUP BY
-                GROUPING SETS (
-                    (
-                        "test_read_group_aggregate"."partner_id",
-                        "test_read_group_aggregate__partner_id"."complete_name",
-                        "test_read_group_aggregate__partner_id"."id",
-                        "test_read_group_aggregate"."key"
-                    ),
-                    ("test_read_group_aggregate"."key"),
-                    (
-                        "test_read_group_aggregate"."partner_id",
-                        "test_read_group_aggregate__partner_id"."complete_name",
-                        "test_read_group_aggregate__partner_id"."id"
-                    ),
-                    ()
-                )
-            ORDER BY
-                "test_read_group_aggregate__partner_id"."complete_name" ASC,
-                "test_read_group_aggregate__partner_id"."id" DESC,
-                "test_read_group_aggregate"."key" ASC
-        """]):
-            self.assertEqual(
-                Model.formatted_read_grouping_sets([], grouping_sets, aggregates=['value:sum']),
-                expected_result,
-            )
-
-    def test_many2many_formatted_read_grouping_sets(self):
-        User = self.env['test_read_group.user']
-        mario, luigi = User.create([{'name': 'Mario'}, {'name': 'Luigi'}])
-        tasks = self.env['test_read_group.task'].create([
-            {   # both users
-                'name': "Super Mario Bros.",
-                'user_ids': [Command.set((mario + luigi).ids)],
-                'integer': 1,
-            },
-            {   # mario only
-                'name': "Paper Mario",
-                'user_ids': [Command.set(mario.ids)],
-                'customer_ids': [Command.set(luigi.ids)],
-                'integer': 2,
-            },
-            {   # luigi only
-                'name': "Luigi's Mansion",
-                'user_ids': [Command.set(luigi.ids)],
-                'customer_ids': [Command.set(mario.ids)],
-                'integer': 3,
-            },
-            {   # no user
-                'name': 'Donkey Kong',
-                'customer_ids': [Command.set((mario + luigi).ids)],
-            },
-        ])
-
-        domain = [('id', 'in', tasks.ids)]
-        grouping_sets = [['user_ids', 'key'], ['key'], ['user_ids'], []]
-        aggregates = ['name:array_agg', '__count', 'integer:sum']
-        expected_result = [
-            tasks.formatted_read_group(domain, groupby, aggregates)
-            for groupby in grouping_sets
-        ]
-
-        self.assertEqual(
-            tasks.formatted_read_grouping_sets(domain, grouping_sets, aggregates),
-            expected_result,
-        )
-
-        complete_order = "user_ids DESC, key"
-        grouping_sets = [['user_ids', 'key'], ['key'], ['user_ids'], []]
-        orders = ["user_ids DESC, key", "key", "user_ids DESC", '']
-        aggregates = ['name:array_agg', '__count', 'integer:sum']
-        expected_result = [
-            tasks.formatted_read_group(domain, groupby, aggregates, order=order)
-            for groupby, order in zip(grouping_sets, orders)
-        ]
-
-        self.assertEqual(
-            tasks.formatted_read_grouping_sets(domain, grouping_sets, aggregates, order=complete_order),
-            expected_result,
-        )
-
-        cases = [
-            {
-                # Test 2 many2manys
-                'grouping_sets': [
-                    ['user_ids', 'customer_ids'], ['key'], ['user_ids'], ['customer_ids'], ['key', 'customer_ids'], []
-                ],
-                'aggregates': ['__count', 'integer:sum'],
-                # 1 for ('user_ids', 'customer_ids') + 1 for ('user_ids',) + 1 for ('customer_ids',) + 1 for remaining (key, [])
-                'nb_queries': 4,
-            },
-            {
-                # Test that __count doesn't make a extra query
-                'grouping_sets': [['user_ids', 'key'], ['key'], ['user_ids'], []],
-                'aggregates': ['__count'],
-                'nb_queries': 1,
-            },
-            {
-                # Test that __count as order
-                'grouping_sets': [['user_ids', 'customer_ids'], ['key'], ['user_ids'], []],
-                'read_group_orders': [
-                    "__count, user_ids, customer_ids",
-                    "__count, key",
-                    "__count, user_ids",
-                    "__count",
-                ],
-                'complete_order': "__count, user_ids, customer_ids, key",
-                'aggregates': ['__count', 'integer:min', 'integer:max', 'integer:count_distinct'],
-                'nb_queries': 1,
-            },
-            {
-                # Everything
-                'grouping_sets': [
-                    ['user_ids', 'customer_ids'],
-                    ['key'],
-                    ['integer'],
-                    [],
-                    ['customer_ids'],
-                    ['key', 'customer_ids'],
-                    ['integer', 'customer_ids'],
-                ],
-                'read_group_orders': [
-                    "__count DESC, customer_ids DESC, user_ids",
-                    "key, __count DESC",
-                    "__count DESC, integer",
-                    "__count DESC",
-                    "__count DESC, customer_ids DESC",
-                    "key, __count DESC, customer_ids DESC",
-                    "__count DESC, customer_ids DESC, integer",
-                ],
-                'complete_order': "key, __count DESC, customer_ids DESC, integer, user_ids",
-                'aggregates': ['integer:sum', '__count'],
-                # 1 for ('user_ids', 'customer_ids') + 1 for ('customer_ids',) + 1 for remainings grouping set
-                'nb_queries': 3,
-            },
-        ]
-
-        for i, case in enumerate(cases):
-            nb_queries = case['nb_queries']
-            aggregates = case['aggregates']
-            grouping_sets = case['grouping_sets']
-            read_group_orders = case.get('read_group_orders', [""] * len(grouping_sets))
-            complete_order = case.get('complete_order')
-
-            expected_result = [
-                tasks.formatted_read_group(domain, groupby, aggregates, order=order)
-                for groupby, order in zip(grouping_sets, read_group_orders)
-            ]
-            with self.subTest(f"Case {i} - {grouping_sets!r} - {aggregates!r}"), self.assertQueryCount(nb_queries):
-                result = tasks.formatted_read_grouping_sets(domain, grouping_sets, aggregates, order=complete_order)
-                self.assertEqual(result, expected_result)
-
-    def test_related(self):
-        RelatedBar = self.env['test_read_group.related_bar']
-        RelatedFoo = self.env['test_read_group.related_foo']
-        RelatedBase = self.env['test_read_group.related_base']
-
-        bars = RelatedBar.create(
-            [
-                {'name': 'bar_a'},
-                {'name': False},
-            ],
-        )
-
-        foos = RelatedFoo.create(
-            [
-                {'name': 'foo_a_bar_a', 'bar_id': bars[0].id},
-                {'name': 'foo_b_bar_false', 'bar_id': bars[1].id},
-                {'name': False, 'bar_id': bars[0].id},
-                {'name': False},
-            ],
-        )
-
-        RelatedBase.create(
-            [
-                {'name': 'base_foo_a_1', 'foo_id': foos[0].id},
-                {'name': 'base_foo_a_2', 'foo_id': foos[0].id},
-                {'name': 'base_foo_b_bar_false', 'foo_id': foos[1].id},
-                {'name': 'base_false_foo_bar_a', 'foo_id': foos[2].id},
-                {'name': 'base_false_foo', 'foo_id': foos[3].id},
-            ],
-        )
-
-        # env.su => false
-        RelatedBase = RelatedBase.with_user(self.base_user)
-
-        grouping_sets = [
-            ['foo_id_name_sudo', 'foo_id_bar_id_name', 'name'],
-            ['foo_id_name_sudo', 'foo_id_bar_id_name'],
-            ['name'],
-            [],
-        ]
-        self.assertEqual(
-            RelatedBase.formatted_read_grouping_sets([], grouping_sets, ['__count', 'name:array_agg']),
-            [
-                RelatedBase.formatted_read_group([], groupby, ['__count', 'name:array_agg'])
-                for groupby in grouping_sets
-            ],
-        )
-
-        # Cannot groupby on foo_names_sudo because it traverse One2many
-        with self.assertRaises(ValueError):
-            RelatedBar.formatted_read_grouping_sets([], [['foo_names_sudo']], ['__count'])
-
-    def test_groupby_chain_fnames(self):
-        RelatedBar = self.env['test_read_group.related_bar']
-        RelatedFoo = self.env['test_read_group.related_foo']
-        RelatedBase = self.env['test_read_group.related_base']
-
-        bars = RelatedBar.create([
-            {'name': 'bar_a'},
-            {'name': False},
-        ])
-
-        foos = RelatedFoo.create([
-            {'name': 'foo_a_bar_a', 'bar_id': bars[0].id},
-            {'name': 'foo_b_bar_false', 'bar_id': bars[1].id},
-            {'name': False, 'bar_id': bars[0].id},
-            {'name': False},
-        ])
-
-        RelatedBase.create([
-            {'name': 'base_foo_a_1', 'foo_id': foos[0].id},
-            {'name': 'base_foo_a_2', 'foo_id': foos[0].id},
-            {'name': 'base_foo_b_bar_false', 'foo_id': foos[1].id},
-            {'name': 'base_false_foo_bar_a', 'foo_id': foos[2].id},
-            {'name': 'base_false_foo', 'foo_id': foos[3].id},
-        ])
-
-        grouping_sets = [
-            ['foo_id.bar_id.name', 'foo_id.bar_id', 'foo_id', 'name'],
-            ['foo_id.bar_id.name', 'foo_id.bar_id'],
-            ['name'],
-            [],
-        ]
-
-        self.assertEqual(
-            RelatedBase.formatted_read_grouping_sets([], grouping_sets, ['__count', 'name:array_agg']),
-            [
-                RelatedBase.formatted_read_group([], groupby, ['__count', 'name:array_agg'])
-                for groupby in grouping_sets
-            ],
-        )
-
-    def test_chain_inherited_fname(self):
-        RelatedBase = self.env['test_read_group.related_base']
-        RelatedInherits = self.env['test_read_group.related_inherits']
-        ChainInherits = self.env['test_read_group.chain_inherits']
-
-        bases = RelatedBase.create([
-            {'name': 'a', 'value': 1},
-            {'name': 'a', 'value': 2},
-            {'name': 'b', 'value': 3},
-            {'name': False, 'value': 4},
-        ])
-        inherits_records = RelatedInherits.create([
-            {'base_id': bases[0].id},
-            {'base_id': bases[0].id},
-            {'base_id': bases[1].id},
-            {'base_id': bases[2].id},
-            {'base_id': bases[3].id},
-        ])
-
-        ChainInherits.create([
-            {'inherited_id': inherits_records[0].id},
-            {'inherited_id': inherits_records[1].id},
-            {'inherited_id': inherits_records[2].id},
-            {'inherited_id': inherits_records[3].id},
-            {'inherited_id': inherits_records[3].id},
-        ])
-
-        # env.su => false
-        ChainInherits = ChainInherits.with_user(self.base_user)
-
-        inherits_model = self.env['ir.model']._get(RelatedInherits._name)
-        self.env['ir.rule'].create({
-            'name': "AAAAAAA",
-            'model_id': inherits_model.id,
-            'domain_force': [('id', 'in', inherits_records[1:].ids)],
-        })
-
-        grouping_sets = [['inherited_id.value'], ['inherited_id.base_id.name'], ['inherited_id.foo_id.name'], []]
-        expected_result = [
-            ChainInherits.formatted_read_group([], groupby, ['__count'])
-            for groupby in grouping_sets
-        ]
-        self.assertEqual(
-            ChainInherits.formatted_read_grouping_sets([], grouping_sets, ['__count']),
-            expected_result,
-        )
-
-    def test_chain_many2many(self):
-        RelatedBase = self.env['test_read_group.related_base']
-        RelatedBar = self.env['test_read_group.related_bar']
-        RelatedFoo = self.env['test_read_group.related_foo']
-
-        bases = RelatedBase.create(
-            [
-                {'name': 'A'},
-                {'name': 'B'},
-                {'name': 'C'},
-                {'name': 'D'},
-            ],
-        )
-        bars = RelatedBar.create(
-            [
-                {'base_ids': [Command.link(bases[0].id)]},
-                {'base_ids': [Command.link(bases[0].id), Command.link(bases[1].id)]},
-                {'base_ids': [Command.link(bases[2].id)]},
-                {'base_ids': []},
-            ],
-        )
-        foos = RelatedFoo.create(
-            [
-                {'bar_id': bars[0].id},
-                {'bar_id': bars[0].id},
-                {'bar_id': bars[1].id},
-                {'bar_id': bars[2].id},
-                {'bar_id': bars[3].id},
-            ],
-        )
-
-        aggregates_sets = [['__count'], ['__count', 'id:sum'], ['id:max']]
-        grouping_sets = [['bar_id.base_ids'], ['bar_id'], []]
-
-        for aggregates in aggregates_sets:
-            expected_result = [
-                RelatedFoo.formatted_read_group([], groupby, aggregates)
-                for groupby in grouping_sets
-            ]
-            self.assertEqual(
-                RelatedFoo.formatted_read_grouping_sets([], grouping_sets, aggregates),
-                expected_result,
-            )
-
-        bases[0].foo_id = foos[0].id
-        (bases[1] + bases[2]).foo_id = foos[1].id
-
-        grouping_sets = [['foo_id.bar_id.base_ids'], ['foo_id.bar_name'], ['value'], []]
-        for aggregates in aggregates_sets:
-            expected_result = [
-                RelatedBase.formatted_read_group([], groupby, aggregates)
-                for groupby in grouping_sets
-            ]
-            self.assertEqual(
-                RelatedBase.formatted_read_grouping_sets([], grouping_sets, aggregates),
-                expected_result,
-            )
-
-        # Targeting the same source field but with different path
-        grouping_sets = [
-            [],
-            # Targeting the same many2many
-            ['foo_id.bar_id.base_ids'],
-            ['foo_id.bar_base_ids'],
-            # All targeting foo_id.name
-            ['foo_id.name'],
-            ['foo_id.name'],
-            ['foo_id_name'],
-            ['foo_id_name_sudo'],
-            ['foo_id_name_sudo', 'value'],
-            # All targeting foo_id.bar_id.name
-            ['foo_id.bar_id.name'],
-            ['foo_id_bar_id_name'],
-            ['foo_id_bar_name'],
-        ]
-        for aggregates in aggregates_sets:
-            expected_result = [
-                RelatedBase.formatted_read_group([], groupby, aggregates)
-                for groupby in grouping_sets
-            ]
-            self.assertEqual(
-                RelatedBase.formatted_read_grouping_sets([], grouping_sets, aggregates),
-                expected_result,
-            )
diff --git a/odoo/addons/test_orm/tests/test_search.py b/odoo/addons/test_orm/tests/test_search.py
index b277785e5f3a5..01cd12eede430 100644
--- a/odoo/addons/test_orm/tests/test_search.py
+++ b/odoo/addons/test_orm/tests/test_search.py
@@ -1888,7 +1888,5 @@ def test_query_non_int(self):
         self.assertEqual(records.name, 'test')
 
     def test_query_non_int_read_group(self):
-        result = self.env['test_orm.view.str.id'].formatted_read_group([], ['name'], ['__count'])
-        self.assertEqual(result, [{'name': 'test', '__count': 1, '__extra_domain': [('name', '=', 'test')]}])
-        result = self.env['test_orm.view.str.id'].formatted_read_group([], [], ['name:count'])
-        self.assertEqual(result, [{'name:count': 1, '__extra_domain': [(1, '=', 1)]}])
+        result = self.env['test_orm.view.str.id']._read_group([], ['name'], ['__count'])
+        self.assertEqual(result, [('test', 1)])
diff --git a/odoo/addons/test_orm/tests/test_views.py b/odoo/addons/test_orm/tests/test_views.py
index 8aa2aa0a09e3e..2da449b09e426 100644
--- a/odoo/addons/test_orm/tests/test_views.py
+++ b/odoo/addons/test_orm/tests/test_views.py
@@ -1,8 +1,6 @@
 from lxml import etree
 
-from odoo.exceptions import ValidationError
-from odoo.tests import tagged, Form, common
-
+from odoo.tests import tagged, common
 from odoo.addons.base.tests.test_views import ViewCase
 
 
@@ -38,110 +36,6 @@ def test_default_calender_view(self):
 
 @common.tagged('at_install', '-post_install', 'groups')
 class TestViewGroups(ViewCase):
-    def test_attrs_groups(self):
-        """ Checks that attrs/modifiers with groups work
-        """
-        self.env.user.group_ids = [(6, 0, [self.env.ref('base.group_system').id])]
-        f = Form(self.env['test_orm.model.some_access'], view='test_orm.view_model_some_access')
-        f.a = 1
-        f.b = 2
-        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'c'"):
-            f.c = 3
-        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'e'"):
-            f.e = 3
-        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'f'"):
-            f.f = 3
-
-        # other access
-
-        self.env.user.group_ids = [(6, 0, [self.env.ref('base.group_public').id])]
-        f = Form(self.env['test_orm.model.some_access'], view='test_orm.view_model_some_access')
-        f.a = 1
-        with self.assertRaisesRegex(AssertionError, "'b' was not found in the view"):
-            f.b = 2
-        with self.assertRaisesRegex(AssertionError, "'c' was not found in the view"):
-            f.c = 3
-        with self.assertRaisesRegex(AssertionError, "'e' was not found in the view"):
-            # field added automatically but removed from used groups (base.group_erp_manager,base.group_portal on field 'd' and 'f')
-            f.e = 3
-        with self.assertRaisesRegex(AssertionError, "'f' was not found in the view"):
-            f.f = 3
-        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'k'"):
-            # field add automatically
-            f.k = 3
-
-        # create must warn because 'a' and the model has no 'base.group_portal'
-        self.assertWarning("""
-                <form>
-                    <field name="a" readonly="j"/>
-                </form>
-            """,
-            expected_message="- field “j” is accessible for groups: Only super user has access<br/>"
-                """- element “&lt;field name=&#34;a&#34; readonly=&#34;j&#34;/&gt;” is shown in the view for groups: &#39;base.group_system&#39; | &#39;base.group_public&#39;""",
-            model='test_orm.model.some_access')
-
-        # a: base.group_public,base.group_system > -
-        # d: base.group_public,base.group_system > base.group_erp_manager
-        self.assertWarning("""
-                <form>
-                    <field name="a" readonly="d"/>
-                </form>
-            """,
-            expected_message="- field “d” is accessible for groups: &#39;base.group_system&#39;<br/>"
-                """- element “&lt;field name=&#34;a&#34; readonly=&#34;d&#34;/&gt;” is shown in the view for groups: &#39;base.group_system&#39; | &#39;base.group_public&#39;""",
-            model='test_orm.model.some_access')
-
-        # e: base.group_public,base.group_system > base.group_erp_manager,base.group_portal
-        # d: base.group_public,base.group_system > base.group_erp_manager
-        self.assertWarning("""
-                <form>
-                    <field name="d"/>
-                    <field name="e" readonly="d"/>
-                </form>
-            """,
-            expected_message="- field “d” is accessible for groups: &#39;base.group_system&#39;<br/>"
-                """- element “&lt;field name=&#34;e&#34; readonly=&#34;d&#34;/&gt;” is shown in the view for groups: &#39;base.group_system&#39; | (&#39;base.group_multi_company&#39; &amp; &#39;base.group_public&#39;)""",
-            model='test_orm.model.some_access')
-
-        # i: base.group_public,base.group_system > !base.group_portal
-        # h: base.group_public,base.group_system > base.group_erp_manager,!base.group_portal
-        self.assertWarning("""
-                <form>
-                    <field name="i" readonly="h"/>
-                </form>
-            """,
-            model='test_orm.model.some_access')
-
-        # i: base.group_public,base.group_system > !base.group_portal
-        # j: base.group_public,base.group_system > base.group_portal
-        self.assertWarning("""
-                <form>
-                    <field name="i" readonly="j"/>
-                </form>
-            """,
-            model='test_orm.model.some_access')
-
-        # i: public,portal,user,system > !base.group_portal
-        # h: public,portal,user,system > base.group_portal
-        self.assertWarning("""
-                <form>
-                    <field name="ab" readonly="cd"/>
-                </form>
-            """,
-            model='test_orm.model.all_access')
-
-        # must raise for does not exists error
-        with self.assertRaisesRegex(ValidationError, 'Field "ab" does not exist in model "test_orm.model.some_access"'):
-            self.env['ir.ui.view'].create({
-                'name': 'stuff',
-                'model': 'test_orm.model.some_access',
-                'arch': """
-                    <form>
-                        <field name="ab" readonly="cd"/>
-                    </form>
-                """,
-            })
-
     def test_model_access(self):
         user = self.env['res.users'].create({
             'name': 'A User',
@@ -189,34 +83,6 @@ def test_related_field_and_groups(self):
             """,
         })
 
-    def test_computed_invisible_modifier(self):
-        self.env['ir.ui.view'].create({
-                'name': 'stuff',
-                'model': 'test_orm.computed.modifier',
-                'arch': """
-                    <form>
-                        <field name="foo"/>
-                        <field name="bar"/>
-                        <field name="name" readonly="sub_foo or sub_bar"/>
-                    </form>
-                """,
-            })
-
-        with Form(self.env['test_orm.computed.modifier']) as form:
-            form.name = 'toto'
-            self.assertEqual(form._view['onchange']['foo'], '1')
-            self.assertEqual(form._view['onchange']['bar'], '1')
-
-        with Form(self.env['test_orm.computed.modifier']) as form:
-            form.foo = 1  # should make 'name' readonly by recomputing sub_foo
-            with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'name'"):
-                form.name = 'toto'
-
-        with Form(self.env['test_orm.computed.modifier']) as form:
-            form.bar = 1  # should make 'name' readonly by onchange modifying sub_bar
-            with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'name'"):
-                form.name = 'toto'
-
     def test_add_properties_definition_field(self):
         view = self.env['ir.ui.view'].create({
             'name': 'stuff',
diff --git a/odoo/addons/test_web/tests/__init__.py b/odoo/addons/test_web/tests/__init__.py
index de8974acffeae..db852f7ec4193 100644
--- a/odoo/addons/test_web/tests/__init__.py
+++ b/odoo/addons/test_web/tests/__init__.py
@@ -1,6 +1,12 @@
+from . import test_fields
+from . import test_onchange
+from . import test_properties
+from . import test_read_group_formatted
+from . import test_read_grouping_sets
 from . import test_read_progress_bar
 from . import test_search_panel_select_multi_range
 from . import test_search_panel_select_range
+from . import test_views
 from . import test_web_fill_temporal
 from . import test_web_group_expand
 from . import test_web_read
diff --git a/odoo/addons/test_web/tests/test_fields.py b/odoo/addons/test_web/tests/test_fields.py
new file mode 100644
index 0000000000000..8affe61acc273
--- /dev/null
+++ b/odoo/addons/test_web/tests/test_fields.py
@@ -0,0 +1,41 @@
+from odoo.tests import Form, tagged
+
+from odoo.addons.base.tests.common import TransactionCaseWithUserDemo
+
+
+@tagged('at_install', '-post_install')  # LEGACY at_install
+class test_shared_cache(TransactionCaseWithUserDemo):
+    def test_shared_cache_computed_field(self):
+        # Test case: Check that the shared cache is not used if a compute_sudo stored field
+        # is computed IF there is an ir.rule defined on this specific model.
+
+        # Real life example:
+        # A user can only see its own timesheets on a task, but the field "Planned Hours",
+        # which is stored-compute_sudo, should take all the timesheet lines into account
+        # However, when adding a new line and then recomputing the value, no existing line
+        # from another user is binded on self, then the value is erased and saved on the
+        # database.
+
+        task = self.env['test_orm.model_shared_cache_compute_parent'].create({
+            'name': 'Shared Task'})
+        self.env['test_orm.model_shared_cache_compute_line'].create({
+            'user_id': self.env.ref('base.user_admin').id,
+            'parent_id': task.id,
+            'amount': 1,
+        })
+        self.assertEqual(task.total_amount, 1)
+
+        self.env.flush_all()
+        self.env.invalidate_all()  # Start fresh, as it would be the case on 2 different sessions.
+
+        task = task.with_user(self.user_demo)
+        with Form(task) as task_form:
+            # Use demo has no access to the already existing line
+            self.assertEqual(len(task_form.line_ids), 0)
+            # But see the real total_amount
+            self.assertEqual(task_form.total_amount, 1)
+            # Now let's add a new line (and retrigger the compute method)
+            with task_form.line_ids.new() as line:
+                line.amount = 2
+            # The new value for total_amount, should be 3, not 2.
+            self.assertEqual(task_form.total_amount, 2)
diff --git a/odoo/addons/test_orm/tests/test_onchange.py b/odoo/addons/test_web/tests/test_onchange.py
similarity index 100%
rename from odoo/addons/test_orm/tests/test_onchange.py
rename to odoo/addons/test_web/tests/test_onchange.py
diff --git a/odoo/addons/test_web/tests/test_properties.py b/odoo/addons/test_web/tests/test_properties.py
new file mode 100644
index 0000000000000..15d3404d8d36a
--- /dev/null
+++ b/odoo/addons/test_web/tests/test_properties.py
@@ -0,0 +1,1305 @@
+import datetime
+import json
+
+
+import babel.dates
+
+from odoo.addons.test_orm.tests.test_properties import TestPropertiesMixin
+from odoo.exceptions import UserError
+from odoo.fields import Domain
+from odoo.tests import tagged, Form
+from odoo.tools import get_lang, mute_logger
+
+
+@tagged('at_install', '-post_install')  # LEGACY at_install
+class PropertiesCase(TestPropertiesMixin):
+    def test_properties_web_read(self):
+        """Test the web_read method when reading properties field."""
+        self.message_1.write({
+            'attributes': [{
+                'name': 'discussion_color_code',
+                'string': 'Test color code',
+                'type': 'char',
+                'default': 'blue',
+                'value': 'purple',
+                'definition_changed': True,
+            }, {
+                'name': 'selection',
+                'string': 'Selection',
+                'type': 'selection',
+                'selection': [['a', 'A'], ['b', 'B']],
+                'value': 'b',
+                'definition_changed': True,
+            }, {
+                'name': 'moderator_partner_id',
+                'string': 'Partner',
+                'type': 'many2one',
+                'comodel': 'test_orm.partner',
+                'value': [self.partner.id, 'Bob'],
+                'definition_changed': True,
+            }, {
+                'name': 'moderator_partner_ids',
+                'string': 'Partners',
+                'type': 'many2many',
+                'comodel': 'test_orm.partner',
+                'value': [[self.partner.id, 'Bob'], [self.partner_2.id, "Alice"]],
+                'definition_changed': True,
+            }],
+        })
+
+        result = self.message_1.web_read({
+            'attributes': {
+                'fields': {
+                    'moderator_partner_id': {'fields': {'name': {}}},
+                    'moderator_partner_ids': {'fields': {'name': {}}},
+                    'selection': {},
+                },
+            },
+        })
+        self.assertEqual(result[0]['attributes'], [{
+            'name': 'moderator_partner_id',
+            'string': 'Partner',
+            'type': 'many2one',
+            'comodel': 'test_orm.partner',
+            'value': [{'id': self.partner.id, 'name': 'Test Partner Properties'}],
+        }, {
+            'name': 'moderator_partner_ids',
+            'string': 'Partners',
+            'type': 'many2many',
+            'comodel': 'test_orm.partner',
+            'value': [
+                {'id': self.partner.id, 'name': 'Test Partner Properties'},
+                {'id': self.partner_2.id, 'name': 'Test Partner Properties 2'},
+            ],
+        }, {
+            'name': 'selection',
+            'string': 'Selection',
+            'type': 'selection',
+            'selection': [['a', 'A'], ['b', 'B']],
+            'value': 'b',
+        }])
+
+    def test_properties_field_html(self):
+        """Test that the HTML values are sanitized."""
+        xss_payload = "<img src='x' onerror='alert(1)'/>"
+        expected = '<img src="x">'
+        self.message_2.attributes = [
+            {
+                "name": "test_html",
+                "type": "html",
+                "string": "HTML",
+                "default": xss_payload,
+                "value": xss_payload,
+                "definition_changed": True,
+            },
+        ]
+
+        sql_values = self._get_sql_properties(self.message_2)
+        self.assertEqual(sql_values.get("test_html"), expected)
+
+        self.assertEqual(dict(self.message_2.attributes)['test_html'], expected)
+        self.assertEqual(self.message_2.attributes['test_html'], expected)
+
+        with self.assertRaises(UserError):
+            self.env['test_orm.message']._read_group([], ['attributes.test_html'])
+
+        with self.assertRaises(UserError):
+            self.env['test_orm.message'].web_read_group([], ['attributes.test_html'])
+
+        properties = self.message_2.read(['attributes'])[0]['attributes']
+        self.assertEqual(properties[0]['value'], expected)
+        self.assertEqual(properties[0]['default'], expected)
+
+        definition = self.message_2.discussion.attributes_definition
+        self.assertEqual(definition[0]['default'], expected)
+
+        definition = self.message_2.discussion.read(['attributes_definition'])[0]['attributes_definition']
+        self.assertEqual(definition[0]['default'], expected)
+
+        # write a dict on the record
+        self.message_2.attributes = {'test_html': xss_payload}
+        self.assertEqual(self.message_2.attributes['test_html'], expected)
+        properties = self.message_2.read(['attributes'])[0]['attributes']
+        self.assertEqual(properties[0]['value'], expected)
+
+        with self.assertRaises(ValueError):
+            self.message_2.attributes = [
+                {
+                    "name": "text_html",
+                    "type": "text",
+                    "string": "HTML",
+                    "default": xss_payload,
+                    "value": xss_payload,
+                    "definition_changed": True,
+                },
+            ]
+
+        with self.assertRaises(ValueError):
+            self.message_2.discussion.attributes_definition = [
+                {
+                    "name": "text_html",
+                    "type": "text",
+                    "string": "HTML",
+                    "default": xss_payload,
+                    "definition_changed": True,
+                },
+            ]
+
+        message = self.env['test_orm.message'].with_context(default_attributes_test_html=xss_payload).create({'discussion': self.discussion_1.id})
+        self.assertEqual(message.attributes['test_html'], expected)
+        sql_values = self._get_sql_properties(message)
+        self.assertEqual(sql_values.get("test_html"), expected)
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_onchange2(self):
+        """If we change the definition record, the onchange of the properties field must be triggered."""
+        message_form = Form(self.env['test_orm.message'])
+
+        with self.assertQueryCount(8):
+            message_form.discussion = self.discussion_1
+            message_form.author = self.user
+
+            self.assertEqual(
+                message_form.attributes,
+                [{
+                    'name': 'discussion_color_code',
+                    'string': 'Color Code',
+                    'type': 'char',
+                    'default': 'blue',
+                    'value': 'blue',
+                }, {
+                    'name': 'moderator_partner_id',
+                    'string': 'Partner',
+                    'type': 'many2one',
+                    'comodel': 'test_orm.partner',
+                }],
+                msg='Should take the new definition when changing the definition record',
+            )
+
+            # change the discussion field
+            message_form.discussion = self.discussion_2
+
+            properties = message_form.attributes
+
+            self.assertEqual(len(properties), 1)
+            self.assertEqual(
+                properties[0]['name'],
+                'state',
+                msg='Should take the values of the new definition record',
+            )
+
+        with self.assertQueryCount(6):
+            message = message_form.save()
+
+        self.assertEqual(message.attributes, {'state': 'draft'})
+
+        # check cached value
+        cached_value = self.env.cache.get(message, message._fields['attributes'])
+        self.assertEqual(cached_value, {'state': 'draft'})
+
+        # change the definition record, change the definition and add default values
+        self.assertEqual(message.discussion, self.discussion_2)
+
+        with self.assertQueryCount(4):
+            message.discussion = self.discussion_1
+        self.assertEqual(
+            self.discussion_1.attributes_definition,
+            [{
+                'name': 'discussion_color_code',
+                'type': 'char',
+                'string': 'Color Code',
+                'default': 'blue',
+                }, {
+                    'name': 'moderator_partner_id',
+                    'type': 'many2one',
+                    'string': 'Partner',
+                    'comodel': 'test_orm.partner',
+                }],
+            )
+        self.assertEqual(
+            message.read()[0]['attributes'],
+            [{
+                'name': 'discussion_color_code',
+                'type': 'char',
+                'string': 'Color Code',
+                'default': 'blue',
+                'value': 'blue',
+            }, {
+                'name': 'moderator_partner_id',
+                'type': 'many2one',
+                'string': 'Partner',
+                'comodel': 'test_orm.partner',
+            }],
+        )
+
+        self.discussion_1.attributes_definition = False
+        self.discussion_2.attributes_definition = [{
+            'name': 'test',
+            'type': 'char',
+            'default': 'Default',
+        }]
+
+        # change the message discussion to remove the properties
+        # discussion 1 -> discussion 2
+        message.discussion = self.discussion_2
+        message.attributes = [{'name': 'test', 'value': 'Test'}]
+        fields_spec = message._get_fields_spec()
+        self.assertIn('discussion', fields_spec)
+        self.assertIn('attributes', fields_spec)
+        values = {
+            'discussion': self.discussion_1.id,
+            'attributes': [{
+                'name': 'test',
+                'type': 'char',
+                'default': 'Default',
+                'value': 'Test',
+            }],
+        }
+        result = message.onchange(values, ['discussion'], fields_spec)
+        self.assertIn('attributes', result['value'], 'Should have detected the definition record change')
+        self.assertEqual(result['value']['attributes'], [], 'Should have reset the properties definition')
+
+        # change the message discussion to add new properties
+        # discussion 2 -> discussion 1
+        message.discussion = self.discussion_1
+        values = {
+            'discussion': self.discussion_2.id,
+            'attributes': [],
+        }
+        result = message.onchange(values, ['discussion'], fields_spec)
+        self.assertIn('attributes', result['value'], 'Should have detected the definition record change')
+        self.assertEqual(
+            result['value']['attributes'],
+            [{'name': 'test', 'type': 'char', 'default': 'Default', 'value': 'Default'}],
+            'Should have reset the properties definition to the discussion 1 definition',
+        )
+
+        # change the definition record and the definition at the same time
+        message_form = Form(message)
+        message_form.discussion = self.discussion_2
+        message_form.attributes = [{
+            'name': 'new_property',
+            'type': 'char',
+            'value': 'test value',
+            'definition_changed': True,
+        }]
+        message = message_form.save()
+        self.assertEqual(
+            self.discussion_2.attributes_definition,
+            [{'name': 'new_property', 'type': 'char'}])
+        self.assertEqual(
+            message.attributes,
+            {'new_property': 'test value'})
+
+        # re-write the same parent again and check that value are not reset
+        message.discussion = message.discussion
+        self.assertEqual(
+            message.attributes,
+            {'new_property': 'test value'})
+
+        # trigger a other onchange after setting the properties
+        # and check that it does not impact the properties
+        message.discussion.attributes_definition = []
+        message_form = Form(message)
+        message.attributes = [{
+            'name': 'new_property',
+            'type': 'char',
+            'value': 'test value',
+            'definition_changed': True,
+        }]
+        message_form.body = "a" * 42
+        message = message_form.save()
+        self.assertEqual(
+            message.attributes,
+            {'new_property': 'test value'})
+
+
+@tagged('at_install', '-post_install')  # LEGACY at_install
+class PropertiesGroupByCase(TestPropertiesMixin):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.message_4 = cls.env['test_orm.message'].create({
+            'name': 'Test Message',
+            'discussion': cls.discussion_1.id,
+            'author': cls.user.id,
+        })
+
+        cls.messages = cls.message_1 | cls.message_2 | cls.message_3 | cls.message_4
+        cls.env['test_orm.message'].search([('id', 'not in', cls.messages.ids)]).unlink()
+
+        cls.wrong_discussion_id = cls.env['test_orm.discussion'].search(
+            [], order="id DESC", limit=1).id + 1000
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_basic(self):
+        Model = self.env['test_orm.message']
+
+        self.messages.discussion = self.discussion_1
+        # search on text properties
+        self.message_1.attributes = [{
+            'name': 'mychar',
+            'type': 'char',
+            'value': 'qsd',
+            'definition_changed': True,
+        }, {
+            'name': 'myinteger',
+            'type': 'integer',
+            'value': 1337,
+            'definition_changed': True,
+        }]
+        self.message_2.attributes = {'mychar': 'qsd', 'myinteger': 5}
+        self.message_3.attributes = {'mychar': 'boum', 'myinteger': 1337}
+
+        # group by the char property
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.mychar'],
+            )
+
+        self.assertEqual(len(result), 3)
+
+        # check counts
+        count_by_values = {
+            value['attributes.mychar']: value['__count']
+            for value in result
+        }
+        self.assertEqual(count_by_values['boum'], 1)
+        self.assertEqual(count_by_values['qsd'], 2)
+        self.assertEqual(count_by_values[False], 1)
+
+        # check domains
+        domain_by_values = {
+            value['attributes.mychar']: value['__extra_domain']
+            for value in result
+        }
+        self.assertEqual(domain_by_values['boum'], [('attributes.mychar', '=', 'boum')])
+        self.assertEqual(domain_by_values['qsd'], [('attributes.mychar', '=', 'qsd')])
+        self._check_domains_count(result)
+
+        # group by the integer property
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.myinteger'],
+            )
+
+        self.assertEqual(len(result), 3)
+        count_by_values = {
+            value['attributes.myinteger']: value['__count']
+            for value in result
+        }
+
+        self.assertEqual(count_by_values[5], 1)
+        self.assertEqual(count_by_values[1337], 2)
+        self.assertEqual(count_by_values[False], 1)
+
+        # falsy properties
+        self.message_3.attributes = {'mychar': False, 'myinteger': False}
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.myinteger'],
+            )
+
+        self.assertEqual(result[-1]['__count'], 2)
+        self.assertEqual(result[-1]['__extra_domain'], [('attributes.myinteger', '=', False)])
+        self._check_domains_count(result)
+
+        # non existing keys in the dict values should be grouped with False value
+        self.env.cr.execute(
+            """
+            UPDATE test_orm_message
+               SET attributes = '{}'
+             WHERE id = %s
+            """,
+            [self.message_2.id],
+        )
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.myinteger'],
+            )
+
+        self.assertEqual(result[-1]['__count'], 3)
+        self.assertEqual(result[-1]['__extra_domain'], [('attributes.myinteger', '=', False)])
+        result = Model.search(result[-1]['__extra_domain'])  # check the domain is correct for the search
+        self.assertEqual(result, self.message_2 | self.message_3 | self.message_4)
+
+        # test the order by
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.myinteger'],
+            order='attributes.myinteger ASC',
+        )
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result[0]['attributes.myinteger'], 1337)
+        self.assertEqual(result[1]['attributes.myinteger'], False)
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.myinteger'],
+            order='attributes.myinteger DESC',
+        )
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result[0]['attributes.myinteger'], False)
+        self.assertEqual(result[1]['attributes.myinteger'], 1337)
+        self._check_domains_count(result)
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.myinteger', 'name'],
+            order='attributes.myinteger DESC',
+        )
+        self.assertEqual(
+            result[0]['__extra_domain'],
+            ['&', ('attributes.myinteger', '=', False), ('name', '=', self.message_1.name)],
+        )
+        self._check_domains_count(result)
+
+    def test_properties_field_web_read_group(self):
+        self.messages.discussion = self.discussion_1
+        # search on text properties
+        self.message_1.attributes = [{
+            'name': 'mychar',
+            'type': 'char',
+            'value': 'qsd',
+            'definition_changed': True,
+        }]
+        self.message_2.attributes = {'mychar': 'qsd'}
+        self.message_3.attributes = {'mychar': 'boum'}
+
+        Model = self.env['test_orm.message']
+        with self.assertQueryCount(6):  # 3 for formatted_read_group + 1 query by group opened
+            result = Model.web_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.mychar'],
+                auto_unfold=True,
+                unfold_read_specification={'id': {}},
+            )
+        groups = result['groups']
+
+        self.assertEqual(len(groups), 3)
+
+        # check counts
+        count_by_values = {
+            value['attributes.mychar']: value['__count']
+            for value in groups
+        }
+        self.assertEqual(count_by_values['boum'], 1)
+        self.assertEqual(count_by_values['qsd'], 2)
+        self.assertEqual(count_by_values[False], 1)
+
+        # check domains
+        domain_by_values = {
+            value['attributes.mychar']: value['__extra_domain']
+            for value in groups
+        }
+        self.assertEqual(domain_by_values['boum'], [('attributes.mychar', '=', 'boum')])
+        self.assertEqual(domain_by_values['qsd'], [('attributes.mychar', '=', 'qsd')])
+        self._check_domains_count(groups)
+
+        # group boum
+        self.assertEqual(groups[0]['__records'], [{'id': self.message_3.id}])
+        # group qsd
+        self.assertEqual(groups[1]['__records'], [{'id': self.message_1.id}, {'id': self.message_2.id}])
+        # group False
+        self.assertEqual(groups[2]['__records'], [{'id': self.message_4.id}])
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_progress_bar(self):
+        """Test "_read_progress_bar" with a properties field."""
+        Model = self.env['test_orm.message']
+
+        self.messages.discussion = self.discussion_1
+        self.message_1.attributes = [{
+            'name': 'myinteger',
+            'type': 'integer',
+            'value': 1337,
+            'definition_changed': True,
+        }]
+        self.message_2.attributes = {'myinteger': 5}
+        self.message_3.attributes = {'myinteger': 1337}
+
+        result = Model.read_progress_bar(
+            domain=[],
+            group_by='attributes.myinteger',
+            progress_bar={'field': 'priority', 'colors': [0]},
+        )
+        self.assertEqual(result, {'1337': {0: 2}, '5': {0: 1}, 'False': {0: 1}})
+
+    def _properties_field_read_group_date_prepare(self, date_type='date'):
+        # Format in database: 2023-03-29 09:30:16
+        self.messages.discussion = self.discussion_1
+        self.discussion_1.attributes_definition = [{
+            'type': date_type,
+            'name': 'mydate',
+        }]
+        hour = ' 13:05:34' if date_type == 'datetime' else ''
+        # message 5 has a different year
+        # message 6 has a False value
+        # message 7 is in a different discussion
+        self.message_5, self.message_6, self.message_7 = self.env['test_orm.message'].create([
+                {'discussion': self.discussion_1.id, 'attributes': {'mydate': f'2077-05-02{hour}'}},
+                {'discussion': self.discussion_1.id, 'attributes': {'mydate': False}},
+                {'discussion': self.discussion_2.id},
+        ])
+        self.message_1.attributes = {'mydate': f'2023-01-02{hour}'}
+        self.message_2.attributes = {'mydate': f'2023-02-03{hour}'}
+        self.message_3.attributes = {'mydate': f'2023-01-02{hour}'}
+        self.message_4.attributes = {'mydate': f'2023-02-05{hour}'}
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_date_day(self, date_type='date'):
+        self._properties_field_read_group_date_prepare(date_type)
+        Model = self.env['test_orm.message']
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:day'],
+            order='attributes.mydate:day DESC',
+        )
+
+        self.assertEqual(len(result), 5)
+        # check values and count
+        self.assertEqual(result[0]['__count'], 2)
+        self.assertEqual(result[0]['attributes.mydate:day'], False)
+        self.assertEqual(result[1]['__count'], 1)
+        self.assertEqual(result[1]['attributes.mydate:day'][1], '02 May 2077')
+        self.assertEqual(result[2]['__count'], 1)
+        self.assertEqual(result[2]['attributes.mydate:day'][1], '05 Feb 2023')
+        self.assertEqual(result[3]['__count'], 1)
+        self.assertEqual(result[3]['attributes.mydate:day'][1], '03 Feb 2023')
+        self.assertEqual(result[4]['__count'], 2)
+        self.assertEqual(result[4]['attributes.mydate:day'][1], '02 Jan 2023')
+        # check domain
+        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
+        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
+        self.assertEqual(Model.search(result[2]['__extra_domain']), self.message_4)
+        self.assertEqual(Model.search(result[3]['__extra_domain']), self.message_2)
+        self.assertEqual(Model.search(result[4]['__extra_domain']), self.message_1 | self.message_3)
+        self._check_domains_count(result)
+
+        # when the order is not specified, the ORM will generate one
+        # based on "attributes.mydate ASC", make sure it works
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:year'],
+        )
+        self.assertEqual(len(result), 3)
+        self.assertEqual(result[0]['attributes.mydate:year'][1], '2023')
+        self.assertEqual(result[1]['attributes.mydate:year'][1], '2077')
+        self.assertEqual(result[2]['attributes.mydate:year'], False)
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_date_quarter(self, date_type='date'):
+        self._properties_field_read_group_date_prepare(date_type)
+        Model = self.env['test_orm.message']
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:quarter'],
+            order='attributes.mydate:quarter DESC',
+        )
+
+        self.assertEqual(len(result), 3)
+        # check values and count
+        self.assertEqual(result[0]['__count'], 2)
+        self.assertEqual(result[0]['attributes.mydate:quarter'], False)
+        self.assertEqual(result[1]['__count'], 1)
+        self.assertEqual(result[1]['attributes.mydate:quarter'][1], 'Q2 2077')
+        self.assertEqual(result[2]['__count'], 4)
+        self.assertEqual(result[2]['attributes.mydate:quarter'][1], 'Q1 2023')
+        # check domain
+        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
+        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
+        self.assertEqual(
+            Model.search(result[2]['__extra_domain']),
+            self.message_1 | self.message_2 | self.message_3 | self.message_4)
+        self._check_domains_count(result)
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_date_month(self, date_type='date'):
+        self._properties_field_read_group_date_prepare()
+        Model = self.env['test_orm.message']
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:month'],
+            order='attributes.mydate:month DESC',
+        )
+
+        self.assertEqual(len(result), 4)
+        # check values and count
+        self.assertEqual(result[0]['__count'], 2)
+        self.assertEqual(result[0]['attributes.mydate:month'], False)
+        self.assertEqual(result[1]['__count'], 1)
+        self.assertEqual(result[1]['attributes.mydate:month'][1], 'May 2077')
+        self.assertEqual(result[2]['__count'], 2)
+        self.assertEqual(result[2]['attributes.mydate:month'][1], 'February 2023')
+        self.assertEqual(result[3]['__count'], 2)
+        self.assertEqual(result[3]['attributes.mydate:month'][1], 'January 2023')
+        # check domain
+        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
+        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
+        self.assertEqual(Model.search(result[2]['__extra_domain']), self.message_2 | self.message_4)
+        self.assertEqual(Model.search(result[3]['__extra_domain']), self.message_1 | self.message_3)
+        self._check_domains_count(result)
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_date_week(self, date_type='date'):
+        first_week_day = int(get_lang(self.env).week_start) - 1
+        self.assertEqual(first_week_day, 6, "First day of the week must be Sunday")
+
+        self._properties_field_read_group_date_prepare()
+        Model = self.env['test_orm.message']
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:week'],
+            order='attributes.mydate:week DESC',
+        )
+
+        self.assertEqual(len(result), 5)
+        # check values and count
+        self.assertEqual(result[0]['__count'], 2)
+        self.assertEqual(result[0]['attributes.mydate:week'], False)
+        self.assertEqual(result[1]['__count'], 1)
+        self.assertEqual(result[1]['attributes.mydate:week'][1], 'W19 2077')
+        self.assertEqual(result[2]['__count'], 1)
+        self.assertEqual(result[2]['attributes.mydate:week'][1], 'W6 2023')
+        self.assertEqual(result[3]['__count'], 1)
+        self.assertEqual(result[3]['attributes.mydate:week'][1], 'W5 2023')
+        self.assertEqual(result[4]['__count'], 2)
+        # Babel issue mitigation
+        # https://github.com/python-babel/babel/pull/621 -- introduced a new bug
+        # https://github.com/python-babel/babel/pull/887 -- proposed a fix but finally closed
+        # https://sources.debian.org/patches/python-babel/2.10.3-1/ -- Debian reverted 621
+        # so this ugly fix is made to have the test working in patched and non patched versions of Babel
+        babel_year = babel.dates.format_date(datetime.datetime(2023, 1, 1), "YYYY", "en_US")  # non patched: '2022' patched: '2023'
+        if babel_year == '2022':  # Broken unpatched babel
+            self.assertEqual(result[4]['attributes.mydate:week'][1], 'W1 2022')
+        else:  # Patched babel
+            self.assertEqual(result[4]['attributes.mydate:week'][1], 'W1 2023')
+        # check domain
+        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
+        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
+        self.assertEqual(Model.search(result[2]['__extra_domain']), self.message_4)
+        self.assertEqual(Model.search(result[3]['__extra_domain']), self.message_2)
+        self.assertEqual(Model.search(result[4]['__extra_domain']), self.message_1 | self.message_3)
+        self._check_domains_count(result)
+
+        # test that the first day of the week in the domain care about the local
+        # (based on the lang, the first day of the week might change)
+        for line in result[1:]:
+            self.assertEqual(line['__extra_domain'][1][1], ">=")
+            self.assertEqual(line['__extra_domain'][2][1], "<")
+            start = datetime.datetime.strptime(line['__extra_domain'][1][2], "%Y-%m-%d")
+            end = datetime.datetime.strptime(line['__extra_domain'][2][2], "%Y-%m-%d")
+            self.assertEqual(start.weekday(), first_week_day)
+            self.assertEqual(end.weekday(), first_week_day)
+
+        # now, first day of the week is "Wednesday"
+        lang = self.env['res.lang'].with_context(active_test=False).search([('code', '=', 'fr_FR')])
+        self.assertEqual(len(lang), 1)
+        lang.write({'active': True, 'week_start': '3'})
+        result = Model.with_context(lang='fr_FR').formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:week'],
+            order='attributes.mydate:week DESC',
+        )
+        for line in result[1:]:
+            self.assertEqual(line['__extra_domain'][1][1], ">=")
+            self.assertEqual(line['__extra_domain'][2][1], "<")
+            start = datetime.datetime.strptime(line['__extra_domain'][1][2], "%Y-%m-%d")
+            end = datetime.datetime.strptime(line['__extra_domain'][2][2], "%Y-%m-%d")
+            self.assertEqual(start.weekday(), 2, "First day of the week must be Wednesday")
+            self.assertEqual(end.weekday(), 2, "First day of the week must be Wednesday")
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_date_year(self, date_type='date'):
+        self._properties_field_read_group_date_prepare()
+        Model = self.env['test_orm.message']
+
+        result = Model.formatted_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.mydate:year'],
+            order='attributes.mydate:year DESC',
+        )
+
+        self.assertEqual(len(result), 3)
+        # check values and count
+        self.assertEqual(result[0]['__count'], 2)
+        self.assertEqual(result[0]['attributes.mydate:year'], False)
+        self.assertEqual(result[1]['__count'], 1)
+        self.assertEqual(result[1]['attributes.mydate:year'][1], '2077')
+        self.assertEqual(result[2]['__count'], 4)
+        self.assertEqual(result[2]['attributes.mydate:year'][1], '2023')
+        # check domain
+        self.assertEqual(Model.search(result[0]['__extra_domain']), self.message_6 | self.message_7)
+        self.assertEqual(Model.search(result[1]['__extra_domain']), self.message_5)
+        self.assertEqual(
+            Model.search(result[2]['__extra_domain']),
+            self.message_1 | self.message_2 | self.message_3 | self.message_4)
+        self._check_domains_count(result)
+
+    def test_properties_field_read_group_datetime_day(self):
+        self.test_properties_field_read_group_date_day('datetime')
+
+    def test_properties_field_read_group_datetime_quarter(self):
+        self.test_properties_field_read_group_date_quarter('datetime')
+
+    def test_properties_field_read_group_datetime_month(self):
+        self.test_properties_field_read_group_date_month('datetime')
+
+    def test_properties_field_read_group_datetime_week(self):
+        self.test_properties_field_read_group_date_week('datetime')
+
+    def test_properties_field_read_group_datetime_year(self):
+        self.test_properties_field_read_group_date_year('datetime')
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_injection(self):
+        Model = self.env['test_orm.message']
+        self.message_1.attributes = [{
+            'name': 'myinteger',
+            'type': 'integer',
+            'value': 1337,
+            'definition_changed': True,
+        }]
+
+        with self.assertRaises(ValueError), self.assertQueryCount(0):
+            Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.myinteger'],
+                order='attributes.myinteger OR 1=1 DESC',
+            )
+
+        with self.assertRaises(ValueError), self.assertQueryCount(0):
+            Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.myinteger OR 1=1'],
+                order='attributes.myinteger DESC',
+            )
+
+        with self.assertRaises(ValueError), self.assertQueryCount(0):
+            Model.formatted_read_group(
+                domain=[],
+                aggregates=['__count'],
+                groupby=['attributes.myinteger:wrongfunction'],
+                order='attributes.myinteger DESC',
+            )
+
+        with self.assertRaises(ValueError), self.assertQueryCount(0):
+            Model.formatted_read_group(
+                domain=[],
+                aggregates=['attributes.myinteger:sum'],  # Aggregate is not supported
+            )
+
+    @mute_logger('odoo.fields', 'odoo.models.unlink')
+    def test_properties_field_read_group_many2many(self):
+        Model = self.env['test_orm.message']
+
+        partners = self.env['test_orm.partner'].create([
+            {'name': f'Partner {i}'}
+            for i in range(10)
+        ])
+
+        self.discussion_1.attributes_definition = [{
+            'name': 'mypartners',
+            'string': 'Partners',
+            'type': 'many2many',
+            'comodel': 'test_orm.partner',
+        }]
+
+        self.messages.discussion = self.discussion_1
+
+        self.message_1.attributes = {'mypartners': partners[:5].ids}
+        self.message_2.attributes = {'mypartners': partners[3:8].ids}
+        self.message_3.attributes = {'mypartners': partners[8:].ids}
+
+        (partners[4] | partners[7] | partners[9]).unlink()
+
+        with self.assertQueryCount(4):
+            result = Model.formatted_read_group(
+                domain=[('discussion', '!=', self.wrong_discussion_id)],
+                aggregates=['__count'],
+                groupby=['attributes.mypartners'],
+            )
+
+        self.assertEqual(len(result), 8)
+        existing_partners = partners.exists()
+        self.assertEqual(len(existing_partners), 7)
+        for partner, line in zip(existing_partners, result):
+            self.assertEqual(partner.id, line['attributes.mypartners'][0])
+            self.assertEqual(partner.display_name, line['attributes.mypartners'][1])
+            self.assertEqual(
+                line['__extra_domain'],
+                [('attributes.mypartners', 'in', partner.id)],
+            )
+            # only the fourth partner is in 2 messages
+            self.assertEqual(line['__count'], 2 if partner == partners[3] else 1)
+
+        # message 4 is in a different discussion, so it's value is False
+        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_4)
+        self._check_many_falsy_group('mypartners', result)
+        self._check_domains_count(result)
+
+        # now message 1 and 2 will also be in the falsy group
+        partners[:8].unlink()
+        with self.assertQueryCount(4):
+            result = Model.formatted_read_group(
+                domain=[('discussion', '!=', self.wrong_discussion_id)],
+                aggregates=['__count'],
+                groupby=['attributes.mypartners'],
+            )
+
+        self.assertEqual(len(result), 2)
+        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_1 | self.message_2 | self.message_4)
+        self._check_many_falsy_group('mypartners', result)
+        self._check_domains_count(result)
+
+        # special case, no partner exists
+        existing_partners.unlink()
+        result = Model.formatted_read_group(
+            domain=[('discussion', '!=', self.wrong_discussion_id)],
+            aggregates=['__count'],
+            groupby=['attributes.mypartners'],
+        )
+        self.assertEqual(len(result), 1)
+        self.assertFalse(result[0]['attributes.mypartners'])
+        self.assertEqual(result[0]['__count'], 4)
+        self._check_domains_count(result)
+
+        # test an invalid model name (e.g. if we uninstalled the module of the model)
+        for invalid_model_name in ("invalid_model_name", "test_orm.transient_model"):
+            self.env.cr.execute(
+                """
+                UPDATE test_orm_discussion
+                   SET attributes_definition
+                       = jsonb_set(attributes_definition, '{0,comodel}', %s)
+                 WHERE id = %s
+                """,
+                [json.dumps(invalid_model_name), self.discussion_1.id],
+            )  # bypass the ORM to set an invalid model name
+            definition = self._get_sql_definition(self.discussion_1)
+            self.assertEqual(definition[0]['comodel'], invalid_model_name)
+            error_message = f"You cannot use “Partners” because the linked “{invalid_model_name}” model doesn't exist or is invalid"
+            with self.assertRaisesRegex(UserError, error_message):
+                result = Model.formatted_read_group(
+                    domain=[('discussion', '!=', self.wrong_discussion_id)],
+                    aggregates=['__count'],
+                    groupby=['attributes.mypartners'],
+                )
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_many2one(self):
+        Model = self.env['test_orm.message']
+
+        # group by many2one property
+        self.message_1.attributes = [{
+            'name': 'mypartner',
+            'string': 'My Partner',
+            'type': 'many2one',
+            'value': self.partner_2.id,
+            'comodel': 'test_orm.partner',
+            'definition_changed': True,
+        }]
+        self.message_2.attributes = {'mypartner': self.partner.id}
+        self.message_4.attributes = {'mypartner': False}  # explicit False value
+
+        # this partner id doesn't exist
+        unexisting_record_id = self.env['test_orm.partner'].search(
+            [], order="id DESC", limit=1).id + 1
+        self.env.cr.execute(
+            """
+            UPDATE test_orm_message
+               SET attributes = '{"mypartner": %s}'
+             WHERE id = %s
+            """,
+            [unexisting_record_id, self.message_3.id],
+        )
+
+        self.env.invalidate_all()
+        with self.assertQueryCount(4):
+            result = Model.formatted_read_group(
+                domain=[],
+                groupby=['attributes.mypartner'],
+                aggregates=['__count'],
+            )
+
+        self.assertEqual(len(result), 3, 'Should ignore the partner that has been removed')
+
+        self.assertEqual(result[0]['__count'], 1)
+        self.assertEqual(result[0]['attributes.mypartner'][0], self.partner.id)
+        self.assertEqual(result[0]['attributes.mypartner'][1], self.partner.display_name)
+        self.assertEqual(result[0]['__extra_domain'], [('attributes.mypartner', '=', self.partner.id)])
+
+        self.assertEqual(result[1]['__count'], 1)
+        self.assertEqual(result[1]['attributes.mypartner'][0], self.partner_2.id)
+        self.assertEqual(result[1]['attributes.mypartner'][1], self.partner_2.display_name)
+        self.assertEqual(result[1]['__extra_domain'], [('attributes.mypartner', '=', self.partner_2.id)])
+
+        # falsy domain, automatically generated, contains the false value
+        # and the ids of the records that doesn't exist in the database
+        self.assertEqual(result[2]['__count'], 2)
+        self.assertEqual(result[2]['attributes.mypartner'], False)
+        self.assertEqual(
+            result[2]['__extra_domain'],
+            [
+                '|',
+                ('attributes.mypartner', '=', False),
+                ('attributes.mypartner', 'not in', [self.partner.id, self.partner_2.id]),
+            ],
+        )
+
+        # when there's no "('property', '=', False)" domain, it should be created
+        self.message_4.attributes = {'mypartner': self.partner.id}
+        result = Model.formatted_read_group(
+            domain=[],
+            groupby=['attributes.mypartner'],
+            aggregates=['__count'],
+        )
+        self.assertEqual(result[2]['__count'], 1)
+        self.assertEqual(
+            result[2]['__extra_domain'],
+            [
+                '|',
+                ('attributes.mypartner', '=', False),
+                ('attributes.mypartner', 'not in', [self.partner.id, self.partner_2.id]),
+            ],
+        )
+
+        # test an invalid model name (e.g. if we uninstalled the module of the model)
+        # should have only one group with the value "False", and all records
+        for invalid_model_name in ("invalid_model_name", "test_orm.transient_model"):
+            self.env.cr.execute(
+                """
+                UPDATE test_orm_discussion
+                   SET attributes_definition
+                       = jsonb_set(attributes_definition, '{0,comodel}', %s::jsonb)
+                 WHERE id = %s
+                """,
+                [json.dumps(invalid_model_name), self.discussion_1.id],
+            )  # bypass the ORM to set an invalid model name
+            definition = self._get_sql_definition(self.discussion_1)
+            self.assertEqual(definition[0]['comodel'], invalid_model_name)
+            error_message = f"You cannot use “My Partner” because the linked “{invalid_model_name}” model doesn't exist or is invalid"
+            with self.assertRaisesRegex(UserError, error_message):
+                result = Model.formatted_read_group(
+                    domain=[('discussion', '!=', self.wrong_discussion_id)],
+                    aggregates=['__count'],
+                    groupby=['attributes.mypartner'],
+                )
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_selection(self):
+        Model = self.env['test_orm.message']
+
+        # group by selection property
+        self.message_1.attributes = [{
+            'name': 'myselection',
+            'type': 'selection',
+            'value': 'optionA',
+            'selection': [['optionA', 'A'], ['optionB', 'B']],
+            'definition_changed': True,
+        }, {
+            'name': 'mychar2',
+            'type': 'char',
+            'value': 'qsd',
+            'definition_changed': True,
+        }]
+        self.message_2.attributes = {'myselection': False}
+
+        self.env.cr.execute(
+            """
+            UPDATE test_orm_message
+               SET attributes = '{"myselection": "invalid_option"}'
+             WHERE id = %s
+            """,
+            [self.message_3.id],
+        )
+
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[('discussion', '!=', self.wrong_discussion_id)],
+                groupby=['attributes.myselection'],
+                aggregates=['__count'],
+            )
+
+        self.assertEqual(len(result), 2)
+        self.assertEqual(result[0]['__count'], 1)
+        self.assertEqual(
+            result[0]['__extra_domain'],
+            [('attributes.myselection', '=', 'optionA')],
+        )
+        self.assertEqual(result[0]['attributes.myselection'], 'optionA')
+
+        # check that the option that is not valid is included in the "False" domain
+        # the count should be updated as well
+        self.assertEqual(result[1]['__count'], 3)
+        self.assertEqual(
+            result[1]['__extra_domain'],
+            [
+                '|',
+                ('attributes.myselection', '=', False),
+                ('attributes.myselection', 'not in', ['optionA', 'optionB']),
+            ],
+        )
+        self.assertEqual(result[1]['attributes.myselection'], False)
+        # double check that the returned domain filter the right record
+        self.assertEqual(
+            self.env['test_orm.message'].search(result[1]['__extra_domain']),
+            self.message_2 | self.message_3 | self.message_4,
+        )
+
+        # special case, there's no option
+        self.message_1.attributes = [{
+            'name': 'myselection',
+            'type': 'selection',
+            'value': 'optionA',
+            'selection': [],
+            'definition_changed': True,
+        }]
+        result = Model.formatted_read_group(
+            domain=[],
+            groupby=['attributes.myselection'],
+            aggregates=['__count'],
+        )
+        self.assertEqual(len(result), 1)
+        self.assertEqual(result[0]['__count'], 4)
+        self._check_domains_count(result)
+
+    @mute_logger('odoo.fields')
+    def test_properties_field_read_group_tags(self):
+        Model = self.env['test_orm.message']
+
+        (self.message_1 | self.message_2 | self.message_3).discussion = self.discussion_1
+
+        # group by tags property
+        self.message_1.attributes = [{
+            'name': 'mytags',
+            'type': 'tags',
+            'value': ['a', 'c', 'g'],
+            'tags': [[x.lower(), x, i] for i, x in enumerate('ABCDEFG')],
+            'definition_changed': True,
+        }]
+        self.message_2.attributes = {'mytags': ['a', 'e', 'g']}
+        self.env.cr.execute(
+            """
+            UPDATE test_orm_message
+               SET attributes = '{"mytags": ["a", "d", "invalid", "e"]}'
+             WHERE id = %s
+            """,
+            [self.message_3.id],
+        )
+        self.env.invalidate_all()
+
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[('discussion', '!=', self.wrong_discussion_id)],
+                aggregates=['__count'],
+                groupby=['attributes.mytags'],
+            )
+
+        self.assertNotIn('invalid', str(result))
+        self.assertEqual(len(result), 6)
+
+        all_tags = self.message_1.read(['attributes'])[0]['attributes'][0]['tags']
+        all_tags = {tag[0]: tag for tag in all_tags}
+
+        for group, (tag, count) in zip(result, (('a', 3), ('c', 1), ('d', 1), ('e', 2), ('g', 2))):
+            self.assertEqual(group['attributes.mytags'], all_tags[tag])
+            self.assertEqual(group['__count'], count)
+            self.assertEqual(
+                group['__extra_domain'],
+                [('attributes.mytags', 'in', tag)],
+            )
+            # check that the value when we read the record match the value of the group
+            property_values = [
+                next(pro['value'] for pro in values['attributes'])
+                for values in Model.search(group['__extra_domain']).read(['attributes'])
+            ]
+            self.assertTrue(all(tag in property_value for property_value in property_values))
+
+        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_4)
+        self._check_many_falsy_group('mytags', result)
+        self._check_domains_count(result)
+
+        # now message 3 has *only* invalid tags, so it should be in the falsy group
+        self.env.cr.execute(
+            """
+            UPDATE test_orm_message
+               SET attributes = '{"mytags": ["invalid 1", "invalid 2", "invalid 3"]}'
+             WHERE id = %s
+            """,
+            [self.message_3.id],
+        )
+        self.env.invalidate_all()
+
+        with self.assertQueryCount(3):
+            result = Model.formatted_read_group(
+                domain=[('discussion', '!=', self.wrong_discussion_id)],
+                aggregates=['__count'],
+                groupby=['attributes.mytags'],
+            )
+        self.assertEqual(Model.search(result[-1]['__extra_domain']), self.message_3 | self.message_4)
+        self._check_many_falsy_group('mytags', result)
+        self._check_domains_count(result)
+
+        # special case, there's no tag
+        for tags in ([], False, None):
+            self.message_1.attributes = [{
+                'name': 'mytags',
+                'type': 'tags',
+                'value': tags,
+                'tags': tags,
+                'definition_changed': True,
+            }]
+            result = Model.formatted_read_group(
+                domain=[('discussion', '!=', self.wrong_discussion_id)],
+                aggregates=['__count'],
+                groupby=['attributes.mytags'],
+            )
+            self.assertEqual(len(result), 1)
+            self.assertFalse(result[0]['attributes.mytags'])
+            self.assertEqual(result[0]['__count'], 4)
+            self._check_domains_count(result)
+
+    def _check_domains_count(self, result):
+        """Check that the domains in the result match the __count key."""
+        for line in result:
+            records = self.env['test_orm.message'].search(line['__extra_domain'])
+            count_key = next(key for key in line if "_count" in key)
+            self.assertEqual(len(records), line[count_key])
+
+    def _check_many_falsy_group(self, property_name, result):
+        """Check the falsy group from the many2many and tags read group result.
+
+        - if a record is in the falsy group, it can't be in a other group
+          (that sentence is not true for non-falsy group, a record
+          with a non-falsy value can be in many other groups)
+        - read the value of all records and check if they belongs to the correct group
+        """
+        Model = self.env['test_orm.message']
+        falsy_group = result[-1]
+        self.assertFalse(falsy_group[f'attributes.{property_name}'])
+        falsy_records = Model.search(falsy_group['__extra_domain'])
+        nonfalsy_records = Model.search(Domain.OR(line['__extra_domain'] for line in result[:-1]))
+        self.assertEqual(Model.search_count([]), len(falsy_records) + len(nonfalsy_records))
+        for falsy_record in falsy_records:
+            self.assertNotIn(falsy_record, nonfalsy_records)
+
+        def _get_records_values(records):
+            return [
+                next(
+                    (pro.get('value') for pro in properties['attributes']
+                     if pro['name'] == property_name),
+                )
+                for properties in records.read(['attributes'])
+            ]
+
+        self.assertTrue(not any(_get_records_values(falsy_records)))
+        self.assertTrue(all(_get_records_values(nonfalsy_records)))
+
+    def subtest_properties_field_web_read_group_date_like(self, date_type='date'):
+        self._properties_field_read_group_date_prepare(date_type)
+        Model = self.env['test_orm.message']
+
+        hour_min = " 00:00:00" if date_type == "datetime" else ""
+        hour_max = " 00:00:59" if date_type == "datetime" else ""
+
+        # Initial web_read_group everything folded (list view)
+        self.assertEqual(
+            Model.web_read_group(
+                domain=[],
+                groupby=["attributes.mydate:year"],
+                aggregates=[],
+            ),
+            {
+                "groups": [
+                    {
+                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2023-01-01{hour_min}'), ('attributes.mydate', '<', f'2024-01-01{hour_max}')],
+                        "attributes.mydate:year": (f'2023-01-01{hour_min}', "2023"),
+                        "__count": 4,
+                    },
+                    {
+                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2077-01-01{hour_min}'), ('attributes.mydate', '<', f'2078-01-01{hour_max}')],
+                        "attributes.mydate:year": (f'2077-01-01{hour_min}', "2077"),
+                        "__count": 1,
+                    },
+                    {
+                        "__extra_domain": [('attributes.mydate', '=', False)],
+                        "attributes.mydate:year": False,
+                        "__count": 2,
+                    },
+                ],
+                "length": 3,
+            },
+        )
+        # Second web_read_group year 2077 unfolded
+        self.assertEqual(
+            Model.web_read_group(
+                domain=[],
+                groupby=["attributes.mydate:year"],
+                aggregates=[],
+                opening_info=[
+                    {
+                        "value": f'2077-01-01{hour_min}',
+                        "folded": False,
+                        "limit": 80,
+                        "offset": 0,
+                        "progressbar_domain": False,
+                        "groups": [],
+                    },
+                    {"value": f"2023-01-01{hour_min}", "folded": True},
+                    {"value": False, "folded": True},
+                ],
+                unfold_read_specification={'id': {}},
+            ),
+            {
+                "groups": [
+                    {
+                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2023-01-01{hour_min}'), ('attributes.mydate', '<', f'2024-01-01{hour_max}')],
+                        "attributes.mydate:year": (f'2023-01-01{hour_min}', "2023"),
+                        "__count": 4,
+                    },
+                    {
+                        "__extra_domain": ['&', ('attributes.mydate', '>=', f'2077-01-01{hour_min}'), ('attributes.mydate', '<', f'2078-01-01{hour_max}')],
+                        "attributes.mydate:year": (f'2077-01-01{hour_min}', "2077"),
+                        '__records': [{'id': self.message_5.id}],
+                        "__count": 1,
+                    },
+                    {
+                        "__extra_domain": [('attributes.mydate', '=', False)],
+                        "attributes.mydate:year": False,
+                        "__count": 2,
+                    },
+                ],
+                "length": 3,
+            },
+        )
+
+    def test_properties_field_read_group_date(self):
+        self.subtest_properties_field_web_read_group_date_like('date')
+
+    def test_properties_field_read_group_datetime(self):
+        self.subtest_properties_field_web_read_group_date_like('datetime')
diff --git a/odoo/addons/test_orm/tests/test_read_group_formatted.py b/odoo/addons/test_web/tests/test_read_group_formatted.py
similarity index 100%
rename from odoo/addons/test_orm/tests/test_read_group_formatted.py
rename to odoo/addons/test_web/tests/test_read_group_formatted.py
diff --git a/odoo/addons/test_web/tests/test_read_grouping_sets.py b/odoo/addons/test_web/tests/test_read_grouping_sets.py
new file mode 100644
index 0000000000000..bdea28d23732e
--- /dev/null
+++ b/odoo/addons/test_web/tests/test_read_grouping_sets.py
@@ -0,0 +1,421 @@
+from odoo import Command
+from odoo.tests import common, new_test_user, tagged
+
+
+@tagged('at_install', '-post_install')  # LEGACY at_install
+class TestFormattedReadGroupingSets(common.TransactionCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.base_user = new_test_user(cls.env, login='Base User', groups='base.group_user')
+
+    def test_simple_formatted_read_grouping_sets(self):
+        Model = self.env['test_read_group.aggregate']
+        Partner = self.env['res.partner']
+        partner_1 = Partner.create({'name': 'z_one'})
+        partner_2 = Partner.create({'name': 'a_two'})
+        Model.create({'key': 1, 'partner_id': partner_1.id, 'value': 1})
+        Model.create({'key': 1, 'partner_id': partner_1.id, 'value': 2})
+        Model.create({'key': 1, 'partner_id': partner_2.id, 'value': 3})
+        Model.create({'key': 2, 'partner_id': partner_2.id, 'value': 4})
+        Model.create({'key': 2, 'partner_id': partner_2.id})
+        Model.create({'key': 2, 'value': 5})
+        Model.create({'partner_id': partner_2.id, 'value': 5})
+        Model.create({'value': 6})
+        Model.create({})
+
+        grouping_sets = [['partner_id', 'key'], ['key'], ['partner_id'], []]
+        expected_result = [
+            Model.formatted_read_group([], grouping_set, aggregates=['value:sum'])
+            for grouping_set in grouping_sets
+        ]
+
+        with self.assertQueries(["""
+            SELECT
+                GROUPING(
+                    "test_read_group_aggregate"."partner_id",
+                    "test_read_group_aggregate"."key"
+                ),
+                "test_read_group_aggregate"."partner_id",
+                "test_read_group_aggregate"."key",
+                SUM("test_read_group_aggregate"."value")
+            FROM
+                "test_read_group_aggregate"
+                LEFT JOIN "res_partner" AS "test_read_group_aggregate__partner_id" ON (
+                    "test_read_group_aggregate"."partner_id" = "test_read_group_aggregate__partner_id"."id"
+                )
+            GROUP BY
+                GROUPING SETS (
+                    (
+                        "test_read_group_aggregate"."partner_id",
+                        "test_read_group_aggregate__partner_id"."complete_name",
+                        "test_read_group_aggregate__partner_id"."id",
+                        "test_read_group_aggregate"."key"
+                    ),
+                    ("test_read_group_aggregate"."key"),
+                    (
+                        "test_read_group_aggregate"."partner_id",
+                        "test_read_group_aggregate__partner_id"."complete_name",
+                        "test_read_group_aggregate__partner_id"."id"
+                    ),
+                    ()
+                )
+            ORDER BY
+                "test_read_group_aggregate__partner_id"."complete_name" ASC,
+                "test_read_group_aggregate__partner_id"."id" DESC,
+                "test_read_group_aggregate"."key" ASC
+        """]):
+            self.assertEqual(
+                Model.formatted_read_grouping_sets([], grouping_sets, aggregates=['value:sum']),
+                expected_result,
+            )
+
+    def test_many2many_formatted_read_grouping_sets(self):
+        User = self.env['test_read_group.user']
+        mario, luigi = User.create([{'name': 'Mario'}, {'name': 'Luigi'}])
+        tasks = self.env['test_read_group.task'].create([
+            {   # both users
+                'name': "Super Mario Bros.",
+                'user_ids': [Command.set((mario + luigi).ids)],
+                'integer': 1,
+            },
+            {   # mario only
+                'name': "Paper Mario",
+                'user_ids': [Command.set(mario.ids)],
+                'customer_ids': [Command.set(luigi.ids)],
+                'integer': 2,
+            },
+            {   # luigi only
+                'name': "Luigi's Mansion",
+                'user_ids': [Command.set(luigi.ids)],
+                'customer_ids': [Command.set(mario.ids)],
+                'integer': 3,
+            },
+            {   # no user
+                'name': 'Donkey Kong',
+                'customer_ids': [Command.set((mario + luigi).ids)],
+            },
+        ])
+
+        domain = [('id', 'in', tasks.ids)]
+        grouping_sets = [['user_ids', 'key'], ['key'], ['user_ids'], []]
+        aggregates = ['name:array_agg', '__count', 'integer:sum']
+        expected_result = [
+            tasks.formatted_read_group(domain, groupby, aggregates)
+            for groupby in grouping_sets
+        ]
+
+        self.assertEqual(
+            tasks.formatted_read_grouping_sets(domain, grouping_sets, aggregates),
+            expected_result,
+        )
+
+        complete_order = "user_ids DESC, key"
+        grouping_sets = [['user_ids', 'key'], ['key'], ['user_ids'], []]
+        orders = ["user_ids DESC, key", "key", "user_ids DESC", '']
+        aggregates = ['name:array_agg', '__count', 'integer:sum']
+        expected_result = [
+            tasks.formatted_read_group(domain, groupby, aggregates, order=order)
+            for groupby, order in zip(grouping_sets, orders)
+        ]
+
+        self.assertEqual(
+            tasks.formatted_read_grouping_sets(domain, grouping_sets, aggregates, order=complete_order),
+            expected_result,
+        )
+
+        cases = [
+            {
+                # Test 2 many2manys
+                'grouping_sets': [
+                    ['user_ids', 'customer_ids'], ['key'], ['user_ids'], ['customer_ids'], ['key', 'customer_ids'], []
+                ],
+                'aggregates': ['__count', 'integer:sum'],
+                # 1 for ('user_ids', 'customer_ids') + 1 for ('user_ids',) + 1 for ('customer_ids',) + 1 for remaining (key, [])
+                'nb_queries': 4,
+            },
+            {
+                # Test that __count doesn't make a extra query
+                'grouping_sets': [['user_ids', 'key'], ['key'], ['user_ids'], []],
+                'aggregates': ['__count'],
+                'nb_queries': 1,
+            },
+            {
+                # Test that __count as order
+                'grouping_sets': [['user_ids', 'customer_ids'], ['key'], ['user_ids'], []],
+                'read_group_orders': [
+                    "__count, user_ids, customer_ids",
+                    "__count, key",
+                    "__count, user_ids",
+                    "__count",
+                ],
+                'complete_order': "__count, user_ids, customer_ids, key",
+                'aggregates': ['__count', 'integer:min', 'integer:max', 'integer:count_distinct'],
+                'nb_queries': 1,
+            },
+            {
+                # Everything
+                'grouping_sets': [
+                    ['user_ids', 'customer_ids'],
+                    ['key'],
+                    ['integer'],
+                    [],
+                    ['customer_ids'],
+                    ['key', 'customer_ids'],
+                    ['integer', 'customer_ids'],
+                ],
+                'read_group_orders': [
+                    "__count DESC, customer_ids DESC, user_ids",
+                    "key, __count DESC",
+                    "__count DESC, integer",
+                    "__count DESC",
+                    "__count DESC, customer_ids DESC",
+                    "key, __count DESC, customer_ids DESC",
+                    "__count DESC, customer_ids DESC, integer",
+                ],
+                'complete_order': "key, __count DESC, customer_ids DESC, integer, user_ids",
+                'aggregates': ['integer:sum', '__count'],
+                # 1 for ('user_ids', 'customer_ids') + 1 for ('customer_ids',) + 1 for remainings grouping set
+                'nb_queries': 3,
+            },
+        ]
+
+        for i, case in enumerate(cases):
+            nb_queries = case['nb_queries']
+            aggregates = case['aggregates']
+            grouping_sets = case['grouping_sets']
+            read_group_orders = case.get('read_group_orders', [""] * len(grouping_sets))
+            complete_order = case.get('complete_order')
+
+            expected_result = [
+                tasks.formatted_read_group(domain, groupby, aggregates, order=order)
+                for groupby, order in zip(grouping_sets, read_group_orders)
+            ]
+            with self.subTest(f"Case {i} - {grouping_sets!r} - {aggregates!r}"), self.assertQueryCount(nb_queries):
+                result = tasks.formatted_read_grouping_sets(domain, grouping_sets, aggregates, order=complete_order)
+                self.assertEqual(result, expected_result)
+
+    def test_related(self):
+        RelatedBar = self.env['test_read_group.related_bar']
+        RelatedFoo = self.env['test_read_group.related_foo']
+        RelatedBase = self.env['test_read_group.related_base']
+
+        bars = RelatedBar.create(
+            [
+                {'name': 'bar_a'},
+                {'name': False},
+            ],
+        )
+
+        foos = RelatedFoo.create(
+            [
+                {'name': 'foo_a_bar_a', 'bar_id': bars[0].id},
+                {'name': 'foo_b_bar_false', 'bar_id': bars[1].id},
+                {'name': False, 'bar_id': bars[0].id},
+                {'name': False},
+            ],
+        )
+
+        RelatedBase.create(
+            [
+                {'name': 'base_foo_a_1', 'foo_id': foos[0].id},
+                {'name': 'base_foo_a_2', 'foo_id': foos[0].id},
+                {'name': 'base_foo_b_bar_false', 'foo_id': foos[1].id},
+                {'name': 'base_false_foo_bar_a', 'foo_id': foos[2].id},
+                {'name': 'base_false_foo', 'foo_id': foos[3].id},
+            ],
+        )
+
+        # env.su => false
+        RelatedBase = RelatedBase.with_user(self.base_user)
+
+        grouping_sets = [
+            ['foo_id_name_sudo', 'foo_id_bar_id_name', 'name'],
+            ['foo_id_name_sudo', 'foo_id_bar_id_name'],
+            ['name'],
+            [],
+        ]
+        self.assertEqual(
+            RelatedBase.formatted_read_grouping_sets([], grouping_sets, ['__count', 'name:array_agg']),
+            [
+                RelatedBase.formatted_read_group([], groupby, ['__count', 'name:array_agg'])
+                for groupby in grouping_sets
+            ],
+        )
+
+        # Cannot groupby on foo_names_sudo because it traverse One2many
+        with self.assertRaises(ValueError):
+            RelatedBar.formatted_read_grouping_sets([], [['foo_names_sudo']], ['__count'])
+
+    def test_groupby_chain_fnames(self):
+        RelatedBar = self.env['test_read_group.related_bar']
+        RelatedFoo = self.env['test_read_group.related_foo']
+        RelatedBase = self.env['test_read_group.related_base']
+
+        bars = RelatedBar.create([
+            {'name': 'bar_a'},
+            {'name': False},
+        ])
+
+        foos = RelatedFoo.create([
+            {'name': 'foo_a_bar_a', 'bar_id': bars[0].id},
+            {'name': 'foo_b_bar_false', 'bar_id': bars[1].id},
+            {'name': False, 'bar_id': bars[0].id},
+            {'name': False},
+        ])
+
+        RelatedBase.create([
+            {'name': 'base_foo_a_1', 'foo_id': foos[0].id},
+            {'name': 'base_foo_a_2', 'foo_id': foos[0].id},
+            {'name': 'base_foo_b_bar_false', 'foo_id': foos[1].id},
+            {'name': 'base_false_foo_bar_a', 'foo_id': foos[2].id},
+            {'name': 'base_false_foo', 'foo_id': foos[3].id},
+        ])
+
+        grouping_sets = [
+            ['foo_id.bar_id.name', 'foo_id.bar_id', 'foo_id', 'name'],
+            ['foo_id.bar_id.name', 'foo_id.bar_id'],
+            ['name'],
+            [],
+        ]
+
+        self.assertEqual(
+            RelatedBase.formatted_read_grouping_sets([], grouping_sets, ['__count', 'name:array_agg']),
+            [
+                RelatedBase.formatted_read_group([], groupby, ['__count', 'name:array_agg'])
+                for groupby in grouping_sets
+            ],
+        )
+
+    def test_chain_inherited_fname(self):
+        RelatedBase = self.env['test_read_group.related_base']
+        RelatedInherits = self.env['test_read_group.related_inherits']
+        ChainInherits = self.env['test_read_group.chain_inherits']
+
+        bases = RelatedBase.create([
+            {'name': 'a', 'value': 1},
+            {'name': 'a', 'value': 2},
+            {'name': 'b', 'value': 3},
+            {'name': False, 'value': 4},
+        ])
+        inherits_records = RelatedInherits.create([
+            {'base_id': bases[0].id},
+            {'base_id': bases[0].id},
+            {'base_id': bases[1].id},
+            {'base_id': bases[2].id},
+            {'base_id': bases[3].id},
+        ])
+
+        ChainInherits.create([
+            {'inherited_id': inherits_records[0].id},
+            {'inherited_id': inherits_records[1].id},
+            {'inherited_id': inherits_records[2].id},
+            {'inherited_id': inherits_records[3].id},
+            {'inherited_id': inherits_records[3].id},
+        ])
+
+        # env.su => false
+        ChainInherits = ChainInherits.with_user(self.base_user)
+
+        inherits_model = self.env['ir.model']._get(RelatedInherits._name)
+        self.env['ir.rule'].create({
+            'name': "AAAAAAA",
+            'model_id': inherits_model.id,
+            'domain_force': [('id', 'in', inherits_records[1:].ids)],
+        })
+
+        grouping_sets = [['inherited_id.value'], ['inherited_id.base_id.name'], ['inherited_id.foo_id.name'], []]
+        expected_result = [
+            ChainInherits.formatted_read_group([], groupby, ['__count'])
+            for groupby in grouping_sets
+        ]
+        self.assertEqual(
+            ChainInherits.formatted_read_grouping_sets([], grouping_sets, ['__count']),
+            expected_result,
+        )
+
+    def test_chain_many2many(self):
+        RelatedBase = self.env['test_read_group.related_base']
+        RelatedBar = self.env['test_read_group.related_bar']
+        RelatedFoo = self.env['test_read_group.related_foo']
+
+        bases = RelatedBase.create(
+            [
+                {'name': 'A'},
+                {'name': 'B'},
+                {'name': 'C'},
+                {'name': 'D'},
+            ],
+        )
+        bars = RelatedBar.create(
+            [
+                {'base_ids': [Command.link(bases[0].id)]},
+                {'base_ids': [Command.link(bases[0].id), Command.link(bases[1].id)]},
+                {'base_ids': [Command.link(bases[2].id)]},
+                {'base_ids': []},
+            ],
+        )
+        foos = RelatedFoo.create(
+            [
+                {'bar_id': bars[0].id},
+                {'bar_id': bars[0].id},
+                {'bar_id': bars[1].id},
+                {'bar_id': bars[2].id},
+                {'bar_id': bars[3].id},
+            ],
+        )
+
+        aggregates_sets = [['__count'], ['__count', 'id:sum'], ['id:max']]
+        grouping_sets = [['bar_id.base_ids'], ['bar_id'], []]
+
+        for aggregates in aggregates_sets:
+            expected_result = [
+                RelatedFoo.formatted_read_group([], groupby, aggregates)
+                for groupby in grouping_sets
+            ]
+            self.assertEqual(
+                RelatedFoo.formatted_read_grouping_sets([], grouping_sets, aggregates),
+                expected_result,
+            )
+
+        bases[0].foo_id = foos[0].id
+        (bases[1] + bases[2]).foo_id = foos[1].id
+
+        grouping_sets = [['foo_id.bar_id.base_ids'], ['foo_id.bar_name'], ['value'], []]
+        for aggregates in aggregates_sets:
+            expected_result = [
+                RelatedBase.formatted_read_group([], groupby, aggregates)
+                for groupby in grouping_sets
+            ]
+            self.assertEqual(
+                RelatedBase.formatted_read_grouping_sets([], grouping_sets, aggregates),
+                expected_result,
+            )
+
+        # Targeting the same source field but with different path
+        grouping_sets = [
+            [],
+            # Targeting the same many2many
+            ['foo_id.bar_id.base_ids'],
+            ['foo_id.bar_base_ids'],
+            # All targeting foo_id.name
+            ['foo_id.name'],
+            ['foo_id.name'],
+            ['foo_id_name'],
+            ['foo_id_name_sudo'],
+            ['foo_id_name_sudo', 'value'],
+            # All targeting foo_id.bar_id.name
+            ['foo_id.bar_id.name'],
+            ['foo_id_bar_id_name'],
+            ['foo_id_bar_name'],
+        ]
+        for aggregates in aggregates_sets:
+            expected_result = [
+                RelatedBase.formatted_read_group([], groupby, aggregates)
+                for groupby in grouping_sets
+            ]
+            self.assertEqual(
+                RelatedBase.formatted_read_grouping_sets([], grouping_sets, aggregates),
+                expected_result,
+            )
diff --git a/odoo/addons/test_web/tests/test_views.py b/odoo/addons/test_web/tests/test_views.py
new file mode 100644
index 0000000000000..25a67c11110e0
--- /dev/null
+++ b/odoo/addons/test_web/tests/test_views.py
@@ -0,0 +1,145 @@
+from odoo.tests import Form, common
+
+from odoo.exceptions import ValidationError
+from odoo.addons.base.tests.test_views import ViewCase
+
+
+@common.tagged('at_install', '-post_install', 'groups')
+class TestViewGroups(ViewCase):
+    def test_attrs_groups(self):
+        """ Checks that attrs/modifiers with groups work
+        """
+        self.env.user.group_ids = [(6, 0, [self.env.ref('base.group_system').id])]
+        f = Form(self.env['test_orm.model.some_access'], view='test_orm.view_model_some_access')
+        f.a = 1
+        f.b = 2
+        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'c'"):
+            f.c = 3
+        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'e'"):
+            f.e = 3
+        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'f'"):
+            f.f = 3
+
+        # other access
+
+        self.env.user.group_ids = [(6, 0, [self.env.ref('base.group_public').id])]
+        f = Form(self.env['test_orm.model.some_access'], view='test_orm.view_model_some_access')
+        f.a = 1
+        with self.assertRaisesRegex(AssertionError, "'b' was not found in the view"):
+            f.b = 2
+        with self.assertRaisesRegex(AssertionError, "'c' was not found in the view"):
+            f.c = 3
+        with self.assertRaisesRegex(AssertionError, "'e' was not found in the view"):
+            # field added automatically but removed from used groups (base.group_erp_manager,base.group_portal on field 'd' and 'f')
+            f.e = 3
+        with self.assertRaisesRegex(AssertionError, "'f' was not found in the view"):
+            f.f = 3
+        with self.assertRaisesRegex(AssertionError, "can't write on readonly field 'k'"):
+            # field add automatically
+            f.k = 3
+
+        # create must warn because 'a' and the model has no 'base.group_portal'
+        self.assertWarning("""
+                <form>
+                    <field name="a" readonly="j"/>
+                </form>
+            """,
+            expected_message="- field “j” is accessible for groups: Only super user has access<br/>"
+                """- element “&lt;field name=&#34;a&#34; readonly=&#34;j&#34;/&gt;” is shown in the view for groups: &#39;base.group_system&#39; | &#39;base.group_public&#39;""",
+            model='test_orm.model.some_access')
+
+        # a: base.group_public,base.group_system > -
+        # d: base.group_public,base.group_system > base.group_erp_manager
+        self.assertWarning("""
+                <form>
+                    <field name="a" readonly="d"/>
+                </form>
+            """,
+            expected_message="- field “d” is accessible for groups: &#39;base.group_system&#39;<br/>"
+                """- element “&lt;field name=&#34;a&#34; readonly=&#34;d&#34;/&gt;” is shown in the view for groups: &#39;base.group_system&#39; | &#39;base.group_public&#39;""",
+            model='test_orm.model.some_access')
+
+        # e: base.group_public,base.group_system > base.group_erp_manager,base.group_portal
+        # d: base.group_public,base.group_system > base.group_erp_manager
+        self.assertWarning("""
+                <form>
+                    <field name="d"/>
+                    <field name="e" readonly="d"/>
+                </form>
+            """,
+            expected_message="- field “d” is accessible for groups: &#39;base.group_system&#39;<br/>"
+                """- element “&lt;field name=&#34;e&#34; readonly=&#34;d&#34;/&gt;” is shown in the view for groups: &#39;base.group_system&#39; | (&#39;base.group_multi_company&#39; &amp; &#39;base.group_public&#39;)""",
+            model='test_orm.model.some_access')
+
+        # i: base.group_public,base.group_system > !base.group_portal
+        # h: base.group_public,base.group_system > base.group_erp_manager,!base.group_portal
+        self.assertWarning("""
+                <form>
+                    <field name="i" readonly="h"/>
+                </form>
+            """,
+            model='test_orm.model.some_access')
+
+        # i: base.group_public,base.group_system > !base.group_portal
+        # j: base.group_public,base.group_system > base.group_portal
+        self.assertWarning("""
+                <form>
+                    <field name="i" readonly="j"/>
+                </form>
+            """,
+            model='test_orm.model.some_access')
+
+        # i: public,portal,user,system > !base.group_portal
+        # h: public,portal,user,system > base.group_portal
+        self.assertWarning("""
+                <form>
+                    <field name="ab" readonly="cd"/>
+                </form>
+            """,
+            model='test_orm.model.all_access')
+
+        # must raise for does not exists error
+        with self.assertRaisesRegex(ValidationError, 'Field "ab" does not exist in model "test_orm.model.some_access"'):
+            self.env['ir.ui.view'].create({
+                'name': 'stuff',
+                'model': 'test_orm.model.some_access',
+                'arch': """
+                    <form>
+                        <field name="ab" readonly="cd"/>
+                    </form>
+                """,
+            })
+
+    def test_computed_invisible_modifier(self):
+        self.env["ir.ui.view"].create(
+            {
+                "name": "stuff",
+                "model": "test_orm.computed.modifier",
+                "arch": """
+                    <form>
+                        <field name="foo"/>
+                        <field name="bar"/>
+                        <field name="name" readonly="sub_foo or sub_bar"/>
+                    </form>
+                """,
+            }
+        )
+
+        with Form(self.env["test_orm.computed.modifier"]) as form:
+            form.name = "toto"
+            self.assertEqual(form._view["onchange"]["foo"], "1")
+            self.assertEqual(form._view["onchange"]["bar"], "1")
+
+        with Form(self.env["test_orm.computed.modifier"]) as form:
+            form.foo = 1  # should make 'name' readonly by recomputing sub_foo
+            with self.assertRaisesRegex(
+                AssertionError, "can't write on readonly field 'name'"
+            ):
+                form.name = "toto"
+
+        with Form(self.env["test_orm.computed.modifier"]) as form:
+            form.bar = 1  # should make 'name' readonly by onchange modifying sub_bar
+            with self.assertRaisesRegex(
+                AssertionError, "can't write on readonly field 'name'"
+            ):
+                form.name = "toto"
diff --git a/odoo/addons/test_web/tests/test_web_read_group.py b/odoo/addons/test_web/tests/test_web_read_group.py
index 042690674c8e7..58311d3439f79 100644
--- a/odoo/addons/test_web/tests/test_web_read_group.py
+++ b/odoo/addons/test_web/tests/test_web_read_group.py
@@ -1246,3 +1246,9 @@ def test_read_extra_info_groupby_value(self):
             )
 
             self.assertEqual(spy_web_read.call_count, 1)
+
+    def test_query_non_int_read_group(self):
+        result = self.env["test_orm.view.str.id"].formatted_read_group([], ["name"], ["__count"])
+        self.assertEqual(result, [{"name": "test", "__count": 1, "__extra_domain": [("name", "=", "test")]}])
+        result = self.env["test_orm.view.str.id"].formatted_read_group([], [], ["name:count"])
+        self.assertEqual(result, [{"name:count": 1, "__extra_domain": [(1, "=", 1)]}])

From 6ac6e67e2410eaa18c0e0a6826f3bc622492d3db Mon Sep 17 00:00:00 2001
From: nees-odoo <nees@odoo.com>
Date: Thu, 10 Jul 2025 18:01:58 +0530
Subject: [PATCH 124/673] [IMP] im_livechat: add live chat channels
 configuration menu

Purpose of this Commit:
Add Live Chat Channels Configuration Menu

- Admin users can now access channels configuration
through the dedicated 'Live Chat Channels' menu.
- Visible only to users with 'Live Chat > Admin' access rights
- Displays a list view with columns: Name, Operators, Sessions, and Rating
- Adds a  kanban view.
- Adds a custom search view with quick items: Name and Operators
- Enables sample data and action helper

task-4916202

closes odoo/odoo#218528

Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/im_livechat/__manifest__.py            |  1 +
 .../im_livechat_channel_config_views.xml      | 56 +++++++++++++++++++
 .../views/im_livechat_channel_views.xml       | 18 +++++-
 3 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 addons/im_livechat/views/im_livechat_channel_config_views.xml

diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index c205cab9a7c40..8a8d4bb1b3e55 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -32,6 +32,7 @@
         "views/im_livechat_channel_views.xml",
         "views/im_livechat_channel_templates.xml",
         "views/im_livechat_chatbot_templates.xml",
+        "views/im_livechat_channel_config_views.xml",
         "views/im_livechat_expertise_views.xml",
         "views/im_livechat_channel_member_history_views.xml",
         "views/res_users_views.xml",
diff --git a/addons/im_livechat/views/im_livechat_channel_config_views.xml b/addons/im_livechat/views/im_livechat_channel_config_views.xml
new file mode 100644
index 0000000000000..c2dc3aadf33b6
--- /dev/null
+++ b/addons/im_livechat/views/im_livechat_channel_config_views.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="im_livechat_channel_config_view_kanban" model="ir.ui.view">
+            <field name="name">im_livechat.channel.kanban</field>
+            <field name="model">im_livechat.channel</field>
+            <field name="inherit_id" ref="im_livechat.im_livechat_channel_view_kanban"/>
+            <field name="mode">primary</field>
+            <field name="arch" type="xml">
+                <xpath expr="//kanban" position="attributes">
+                    <attribute name="action"/>
+                </xpath>
+                <xpath expr="//t[@t-name='menu']" position="replace"/>
+            </field>
+        </record>
+
+        <record id="im_livechat_channel_config_action" model="ir.actions.act_window">
+            <field name="name">Live Chat Channels</field>
+            <field name="res_model">im_livechat.channel</field>
+            <field name="view_mode">list,kanban,form</field>
+            <field name="view_id" ref="im_livechat_channel_config_view_kanban"/>
+            <field name="help" type="html">
+              <p class="o_view_nocontent_smiling_face">
+                Define a new website live chat channel
+              </p><p>
+                You can create channels for each website on which you want
+                to integrate the website live chat widget, allowing your website
+                visitors to talk in real time with your operators.
+              </p>
+            </field>
+        </record>
+
+        <record id="im_livechat_channel_config_action_list" model="ir.actions.act_window.view">
+            <field name="sequence">1</field>
+            <field name="view_mode">list</field>
+            <field name="view_id" ref="im_livechat_channel_view_list"/>
+            <field name="act_window_id" ref="im_livechat_channel_config_action"/>
+        </record>
+
+        <record id="im_livechat_channel_config_action_kanban" model="ir.actions.act_window.view">
+            <field name="sequence">2</field>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="im_livechat_channel_config_view_kanban"/>
+            <field name="act_window_id" ref="im_livechat_channel_config_action"/>
+        </record>
+
+        <menuitem
+            id="livechat_channels_config"
+            name="Live Chat Channels"
+            parent="livechat_config"
+            action="im_livechat_channel_config_action"
+            groups="im_livechat_group_manager"
+            sequence="10"
+        />
+    </data>
+</odoo>
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index 4d49eef5cee00..1dfc63a6559ed 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -18,11 +18,24 @@
             </field>
         </record>
 
+        <record id="im_livechat_channel_view_list" model="ir.ui.view">
+            <field name="name">im_livechat.channel.list</field>
+            <field name="model">im_livechat.channel</field>
+            <field name="arch" type="xml">
+                <list string="Live Chat Channels" sample="1">
+                    <field name="name" string="Name"/>
+                    <field name="user_ids" string="Operators" widget="many2many_avatar_user"/>
+                    <field name="nbr_channel" string="Sessions"/>
+                    <field name="rating_percentage_satisfaction" string="Rating (%)"/>
+                </list>
+            </field>
+        </record>
+
         <record id="im_livechat_channel_view_kanban" model="ir.ui.view">
             <field name="name">im_livechat.channel.kanban</field>
             <field name="model">im_livechat.channel</field>
             <field name="arch" type="xml">
-                <kanban js_class="im_livechat.livechat_channel_kanban" action="im_livechat.discuss_channel_action_from_livechat_channel" type="action">
+                <kanban sample="1" js_class="im_livechat.livechat_channel_kanban" action="im_livechat.discuss_channel_action_from_livechat_channel" type="action">
                     <field name="are_you_inside"/>
                     <field name="rating_count"/>
                     <templates>
@@ -234,7 +247,8 @@
             <field name="model">im_livechat.channel</field>
             <field name="arch" type="xml">
                 <search string="LiveChat Channel Search">
-                    <field name="name" string="Channel"/>
+                    <field name="name" string="Channel Name"/>
+                    <field name="user_ids" string="Operators"/>
                 </search>
             </field>
         </record>

From 4cc6a74894e9aa42676b3c7f1b16e24c56540dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 3 Nov 2025 11:43:58 +0100
Subject: [PATCH 125/673] [REF] mail, *: replace core/common/record imports by
 model/export
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Imports of `@mail/src/model` should be made through
`@mail/model/export`. In the past the source code of JS models was
also in `@mail/core/common` but was moved in its `model/` folder.
`@mail/core/common/record` was kept for backward compatibility.

closes odoo/odoo#234123

Related: odoo/enterprise#98667
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/crm/static/src/core/common/crm_lead_model.js             | 2 +-
 addons/crm/static/src/core/common/res_partner_model_patch.js    | 2 +-
 addons/hr/static/src/core/common/hr_department_model.js         | 2 +-
 addons/hr/static/src/core/common/hr_employee_model.js           | 2 +-
 addons/hr/static/src/core/common/hr_work_location_model.js      | 2 +-
 addons/hr_recruitment/static/src/js/hr_applicant_model.js       | 2 +-
 addons/hr_recruitment/static/src/js/res_partner_model_patch.js  | 2 +-
 addons/im_livechat/static/src/core/common/chatbot_model.js      | 2 +-
 .../im_livechat/static/src/core/common/chatbot_script_model.js  | 2 +-
 .../static/src/core/common/chatbot_script_step_answer_model.js  | 2 +-
 .../static/src/core/common/chatbot_script_step_model.js         | 2 +-
 addons/im_livechat/static/src/core/common/chatbot_step_model.js | 2 +-
 .../static/src/core/common/livechat_channel_model.js            | 2 +-
 .../static/src/core/common/livechat_channel_model_patch.js      | 2 +-
 .../static/src/core/common/livechat_expertise_model.js          | 2 +-
 .../im_livechat/static/src/core/common/message_model_patch.js   | 2 +-
 addons/im_livechat/static/src/core/common/thread_model_patch.js | 2 +-
 .../public_web/discuss_app/discuss_app_category_model_patch.js  | 2 +-
 .../src/core/public_web/discuss_app/discuss_app_model_patch.js  | 2 +-
 .../static/src/core/public_web/livechat_channel_model_patch.js  | 2 +-
 .../static/src/core/public_web/thread_model_patch.js            | 2 +-
 .../im_livechat/static/src/embed/common/thread_model_patch.js   | 2 +-
 addons/mail/static/src/chatter/web/scheduled_message_model.js   | 2 +-
 addons/mail/static/src/chatter/web/thread_model_patch.js        | 2 +-
 addons/mail/static/src/core/common/activity_model.js            | 2 +-
 addons/mail/static/src/core/common/attachment_model.js          | 2 +-
 addons/mail/static/src/core/common/canned_response_model.js     | 2 +-
 addons/mail/static/src/core/common/chat_hub_model.js            | 2 +-
 addons/mail/static/src/core/common/chat_window_model.js         | 2 +-
 addons/mail/static/src/core/common/composer_model.js            | 2 +-
 addons/mail/static/src/core/common/country_model.js             | 2 +-
 addons/mail/static/src/core/common/data_response_model.js       | 2 +-
 .../mail/static/src/core/common/discuss_call_history_model.js   | 2 +-
 addons/mail/static/src/core/common/failure_model.js             | 2 +-
 addons/mail/static/src/core/common/follower_model.js            | 2 +-
 addons/mail/static/src/core/common/link_preview_model.js        | 2 +-
 addons/mail/static/src/core/common/mail_activity_type_model.js  | 2 +-
 addons/mail/static/src/core/common/mail_guest_model.js          | 2 +-
 .../mail/static/src/core/common/message_link_preview_model.js   | 2 +-
 addons/mail/static/src/core/common/message_model.js             | 2 +-
 addons/mail/static/src/core/common/message_reactions_model.js   | 2 +-
 addons/mail/static/src/core/common/notification_model.js        | 2 +-
 addons/mail/static/src/core/common/record.js                    | 1 -
 addons/mail/static/src/core/common/res_company_model.js         | 2 +-
 addons/mail/static/src/core/common/res_groups_model.js          | 2 +-
 .../mail/static/src/core/common/res_groups_privilege_model.js   | 2 +-
 addons/mail/static/src/core/common/res_lang_model.js            | 2 +-
 addons/mail/static/src/core/common/res_partner_model.js         | 2 +-
 addons/mail/static/src/core/common/res_role_model.js            | 2 +-
 addons/mail/static/src/core/common/res_users_model.js           | 2 +-
 addons/mail/static/src/core/common/settings_model.js            | 2 +-
 addons/mail/static/src/core/common/store_service.js             | 2 +-
 addons/mail/static/src/core/common/thread.js                    | 2 +-
 addons/mail/static/src/core/common/thread_model.js              | 2 +-
 addons/mail/static/src/core/common/volume_model.js              | 2 +-
 .../static/src/core/public_web/discuss_app/discuss_app_model.js | 2 +-
 addons/mail/static/src/core/public_web/store_service_patch.js   | 2 +-
 addons/mail/static/src/core/web/store_service_patch.js          | 2 +-
 addons/mail/static/src/core/web/thread_model_patch.js           | 2 +-
 .../mail/static/src/discuss/call/common/channel_member_patch.js | 2 +-
 addons/mail/static/src/discuss/call/common/rtc_service.js       | 2 +-
 addons/mail/static/src/discuss/call/common/rtc_session_model.js | 2 +-
 .../mail/static/src/discuss/call/common/store_service_patch.js  | 2 +-
 .../mail/static/src/discuss/call/common/thread_model_patch.js   | 2 +-
 .../mail/static/src/discuss/core/common/channel_member_model.js | 2 +-
 .../static/src/discuss/core/common/discuss_channel_model.js     | 2 +-
 .../static/src/discuss/core/common/mail_guest_model_patch.js    | 2 +-
 .../mail/static/src/discuss/core/common/message_model_patch.js  | 2 +-
 .../static/src/discuss/core/common/res_partner_model_patch.js   | 2 +-
 .../mail/static/src/discuss/core/common/thread_model_patch.js   | 2 +-
 .../core/public_web/discuss_app/discuss_app_category_model.js   | 2 +-
 .../core/public_web/discuss_app/discuss_app_model_patch.js      | 2 +-
 .../src/discuss/core/public_web/discuss_category_model.js       | 2 +-
 .../src/discuss/message_pin/common/message_model_patch.js       | 2 +-
 .../static/src/discuss/message_pin/common/thread_model_patch.js | 2 +-
 .../src/discuss/voice_message/common/attachment_model_patch.js  | 2 +-
 addons/mail/static/tests/core/record.test.js                    | 2 +-
 addons/rating/static/src/core/common/message_model_patch.js     | 2 +-
 addons/rating/static/src/core/common/rating_model.js            | 2 +-
 addons/website/static/src/common/website_model.js               | 2 +-
 addons/website/static/src/common/website_visitor_model.js       | 2 +-
 addons/website_livechat/static/src/common/thread_model_patch.js | 2 +-
 .../static/src/web/website_visitor_model_patch.js               | 2 +-
 83 files changed, 82 insertions(+), 83 deletions(-)
 delete mode 100644 addons/mail/static/src/core/common/record.js

diff --git a/addons/crm/static/src/core/common/crm_lead_model.js b/addons/crm/static/src/core/common/crm_lead_model.js
index 1660c36aedf35..b5728de39baad 100644
--- a/addons/crm/static/src/core/common/crm_lead_model.js
+++ b/addons/crm/static/src/core/common/crm_lead_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { router } from "@web/core/browser/router";
 
 export class CrmLead extends Record {
diff --git a/addons/crm/static/src/core/common/res_partner_model_patch.js b/addons/crm/static/src/core/common/res_partner_model_patch.js
index b190a901d54c0..d835aa7314ec1 100644
--- a/addons/crm/static/src/core/common/res_partner_model_patch.js
+++ b/addons/crm/static/src/core/common/res_partner_model_patch.js
@@ -1,5 +1,5 @@
 import { ResPartner } from "@mail/core/common/res_partner_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/hr/static/src/core/common/hr_department_model.js b/addons/hr/static/src/core/common/hr_department_model.js
index db9550e2b7cd3..8b0bb4c19e634 100644
--- a/addons/hr/static/src/core/common/hr_department_model.js
+++ b/addons/hr/static/src/core/common/hr_department_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class HrDepartment extends Record {
     static _name = "hr.department";
diff --git a/addons/hr/static/src/core/common/hr_employee_model.js b/addons/hr/static/src/core/common/hr_employee_model.js
index 308a7275697cb..fc505ff486a49 100644
--- a/addons/hr/static/src/core/common/hr_employee_model.js
+++ b/addons/hr/static/src/core/common/hr_employee_model.js
@@ -1,4 +1,4 @@
-import { Record, fields } from "@mail/core/common/record";
+import { Record, fields } from "@mail/model/export";
 
 export class HrEmployee extends Record {
     static _name = "hr.employee";
diff --git a/addons/hr/static/src/core/common/hr_work_location_model.js b/addons/hr/static/src/core/common/hr_work_location_model.js
index 168174dc5d21f..6ae26afbca095 100644
--- a/addons/hr/static/src/core/common/hr_work_location_model.js
+++ b/addons/hr/static/src/core/common/hr_work_location_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class HrWorkLocation extends Record {
     static _name = "hr.work.location";
diff --git a/addons/hr_recruitment/static/src/js/hr_applicant_model.js b/addons/hr_recruitment/static/src/js/hr_applicant_model.js
index d776842754fe2..dae18f4b5f5b7 100644
--- a/addons/hr_recruitment/static/src/js/hr_applicant_model.js
+++ b/addons/hr_recruitment/static/src/js/hr_applicant_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class HrApplicant extends Record {
     static _name = "hr.applicant";
diff --git a/addons/hr_recruitment/static/src/js/res_partner_model_patch.js b/addons/hr_recruitment/static/src/js/res_partner_model_patch.js
index d0dfe358cdce1..da8883bdbfecd 100644
--- a/addons/hr_recruitment/static/src/js/res_partner_model_patch.js
+++ b/addons/hr_recruitment/static/src/js/res_partner_model_patch.js
@@ -1,5 +1,5 @@
 import { ResPartner } from "@mail/core/common/res_partner_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/im_livechat/static/src/core/common/chatbot_model.js b/addons/im_livechat/static/src/core/common/chatbot_model.js
index 9f1dd1531b9c5..ed4c921139c21 100644
--- a/addons/im_livechat/static/src/core/common/chatbot_model.js
+++ b/addons/im_livechat/static/src/core/common/chatbot_model.js
@@ -1,4 +1,4 @@
-import { AND, fields, Record } from "@mail/core/common/record";
+import { AND, fields, Record } from "@mail/model/export";
 import { rpc } from "@web/core/network/rpc";
 import { browser } from "@web/core/browser/browser";
 import { debounce } from "@web/core/utils/timing";
diff --git a/addons/im_livechat/static/src/core/common/chatbot_script_model.js b/addons/im_livechat/static/src/core/common/chatbot_script_model.js
index a0fac8222ee35..142e38d68739c 100644
--- a/addons/im_livechat/static/src/core/common/chatbot_script_model.js
+++ b/addons/im_livechat/static/src/core/common/chatbot_script_model.js
@@ -1,4 +1,4 @@
-import { Record, fields } from "@mail/core/common/record";
+import { Record, fields } from "@mail/model/export";
 
 export class ChatbotScript extends Record {
     static _name = "chatbot.script";
diff --git a/addons/im_livechat/static/src/core/common/chatbot_script_step_answer_model.js b/addons/im_livechat/static/src/core/common/chatbot_script_step_answer_model.js
index 357597d33c9af..3f8c450d14d87 100644
--- a/addons/im_livechat/static/src/core/common/chatbot_script_step_answer_model.js
+++ b/addons/im_livechat/static/src/core/common/chatbot_script_step_answer_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class ChatbotScriptStepAnswer extends Record {
     static id = "id";
diff --git a/addons/im_livechat/static/src/core/common/chatbot_script_step_model.js b/addons/im_livechat/static/src/core/common/chatbot_script_step_model.js
index 545a70d251b57..cd0b11071d67d 100644
--- a/addons/im_livechat/static/src/core/common/chatbot_script_step_model.js
+++ b/addons/im_livechat/static/src/core/common/chatbot_script_step_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class ChatbotScriptStep extends Record {
     static id = "id";
diff --git a/addons/im_livechat/static/src/core/common/chatbot_step_model.js b/addons/im_livechat/static/src/core/common/chatbot_step_model.js
index 1f3c68e668fef..517bf01f73662 100644
--- a/addons/im_livechat/static/src/core/common/chatbot_step_model.js
+++ b/addons/im_livechat/static/src/core/common/chatbot_step_model.js
@@ -1,4 +1,4 @@
-import { AND, fields, Record } from "@mail/core/common/record";
+import { AND, fields, Record } from "@mail/model/export";
 import { createDocumentFragmentFromContent } from "@web/core/utils/html";
 
 export class ChatbotStep extends Record {
diff --git a/addons/im_livechat/static/src/core/common/livechat_channel_model.js b/addons/im_livechat/static/src/core/common/livechat_channel_model.js
index 10048c7118952..0f1b533e00cdc 100644
--- a/addons/im_livechat/static/src/core/common/livechat_channel_model.js
+++ b/addons/im_livechat/static/src/core/common/livechat_channel_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class LivechatChannel extends Record {
     static _name = "im_livechat.channel";
diff --git a/addons/im_livechat/static/src/core/common/livechat_channel_model_patch.js b/addons/im_livechat/static/src/core/common/livechat_channel_model_patch.js
index 2a52a39fe01e3..2f7977fb07d2e 100644
--- a/addons/im_livechat/static/src/core/common/livechat_channel_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/livechat_channel_model_patch.js
@@ -1,6 +1,6 @@
 import { LivechatChannel } from "@im_livechat/core/common/livechat_channel_model";
 
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/im_livechat/static/src/core/common/livechat_expertise_model.js b/addons/im_livechat/static/src/core/common/livechat_expertise_model.js
index 2aaaa2ef2838c..fa42941a72031 100644
--- a/addons/im_livechat/static/src/core/common/livechat_expertise_model.js
+++ b/addons/im_livechat/static/src/core/common/livechat_expertise_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class LivechatExpertise extends Record {
     static id = "id";
diff --git a/addons/im_livechat/static/src/core/common/message_model_patch.js b/addons/im_livechat/static/src/core/common/message_model_patch.js
index dbe0745114732..b609672fdd916 100644
--- a/addons/im_livechat/static/src/core/common/message_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/message_model_patch.js
@@ -1,5 +1,5 @@
 import { Message } from "@mail/core/common/message_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/im_livechat/static/src/core/common/thread_model_patch.js b/addons/im_livechat/static/src/core/common/thread_model_patch.js
index b23e96091c0bf..243b4707c19c9 100644
--- a/addons/im_livechat/static/src/core/common/thread_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 
 import { patch } from "@web/core/utils/patch";
diff --git a/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js b/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js
index bd57acdff0f6e..f3fd93e3134e8 100644
--- a/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_category_model_patch.js
@@ -1,6 +1,6 @@
 import { patch } from "@web/core/utils/patch";
 import { DiscussAppCategory } from "@mail/discuss/core/public_web/discuss_app/discuss_app_category_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 patch(DiscussAppCategory.prototype, {
     setup() {
diff --git a/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_model_patch.js b/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_model_patch.js
index bc0bc6bb2a3e5..2408c3df35745 100644
--- a/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/discuss_app/discuss_app_model_patch.js
@@ -1,5 +1,5 @@
 import { DiscussApp } from "@mail/core/public_web/discuss_app/discuss_app_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { _t } from "@web/core/l10n/translation";
 import { patch } from "@web/core/utils/patch";
diff --git a/addons/im_livechat/static/src/core/public_web/livechat_channel_model_patch.js b/addons/im_livechat/static/src/core/public_web/livechat_channel_model_patch.js
index d44581a90e225..5e4b0fafc8e80 100644
--- a/addons/im_livechat/static/src/core/public_web/livechat_channel_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/livechat_channel_model_patch.js
@@ -1,5 +1,5 @@
 import { LivechatChannel } from "@im_livechat/core/common/livechat_channel_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
index 6c61635643742..2667674c66023 100644
--- a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 import { _t } from "@web/core/l10n/translation";
 
diff --git a/addons/im_livechat/static/src/embed/common/thread_model_patch.js b/addons/im_livechat/static/src/embed/common/thread_model_patch.js
index 6af1c26b12276..ec8a5f7c4b78f 100644
--- a/addons/im_livechat/static/src/embed/common/thread_model_patch.js
+++ b/addons/im_livechat/static/src/embed/common/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 import "@mail/discuss/core/common/thread_model_patch";
 import { generateEmojisOnHtml } from "@mail/utils/common/format";
diff --git a/addons/mail/static/src/chatter/web/scheduled_message_model.js b/addons/mail/static/src/chatter/web/scheduled_message_model.js
index a81c6671fa088..ef76b83c20d4a 100644
--- a/addons/mail/static/src/chatter/web/scheduled_message_model.js
+++ b/addons/mail/static/src/chatter/web/scheduled_message_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { htmlToTextContentInline } from "@mail/utils/common/format";
 import { _t } from "@web/core/l10n/translation";
 
diff --git a/addons/mail/static/src/chatter/web/thread_model_patch.js b/addons/mail/static/src/chatter/web/thread_model_patch.js
index 97360416bcec3..e78c91fd14f08 100644
--- a/addons/mail/static/src/chatter/web/thread_model_patch.js
+++ b/addons/mail/static/src/chatter/web/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 import "@mail/chatter/web_portal/thread_model_patch";
 
diff --git a/addons/mail/static/src/core/common/activity_model.js b/addons/mail/static/src/core/common/activity_model.js
index bb10e8c25ce3a..49553f6cd5fd0 100644
--- a/addons/mail/static/src/core/common/activity_model.js
+++ b/addons/mail/static/src/core/common/activity_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { assignDefined } from "@mail/utils/common/misc";
 
 export class Activity extends Record {
diff --git a/addons/mail/static/src/core/common/attachment_model.js b/addons/mail/static/src/core/common/attachment_model.js
index 5a8969515e533..94df116316da2 100644
--- a/addons/mail/static/src/core/common/attachment_model.js
+++ b/addons/mail/static/src/core/common/attachment_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { assignDefined } from "@mail/utils/common/misc";
 import { generatePdfThumbnail } from "@mail/utils/common/pdf_thumbnail";
 
diff --git a/addons/mail/static/src/core/common/canned_response_model.js b/addons/mail/static/src/core/common/canned_response_model.js
index 42f2639851520..15a8e39f2138e 100644
--- a/addons/mail/static/src/core/common/canned_response_model.js
+++ b/addons/mail/static/src/core/common/canned_response_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class CannedResponse extends Record {
     static _name = "mail.canned.response";
diff --git a/addons/mail/static/src/core/common/chat_hub_model.js b/addons/mail/static/src/core/common/chat_hub_model.js
index c26814e1bf616..90874d0ae377a 100644
--- a/addons/mail/static/src/core/common/chat_hub_model.js
+++ b/addons/mail/static/src/core/common/chat_hub_model.js
@@ -1,5 +1,5 @@
 import { browser } from "@web/core/browser/browser";
-import { fields, Record } from "./record";
+import { fields, Record } from "@mail/model/export";
 
 import { Deferred, Mutex } from "@web/core/utils/concurrency";
 
diff --git a/addons/mail/static/src/core/common/chat_window_model.js b/addons/mail/static/src/core/common/chat_window_model.js
index 5226f70fc664a..8654f11f2e492 100644
--- a/addons/mail/static/src/core/common/chat_window_model.js
+++ b/addons/mail/static/src/core/common/chat_window_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 /** @typedef {{ thread?: import("models").Thread }} ChatWindowData */
 
diff --git a/addons/mail/static/src/core/common/composer_model.js b/addons/mail/static/src/core/common/composer_model.js
index 924fb00bede1a..f864655c5a74f 100644
--- a/addons/mail/static/src/core/common/composer_model.js
+++ b/addons/mail/static/src/core/common/composer_model.js
@@ -1,4 +1,4 @@
-import { fields, OR, Record } from "@mail/core/common/record";
+import { fields, OR, Record } from "@mail/model/export";
 import {
     convertBrToLineBreak,
     getNonEditableMentions,
diff --git a/addons/mail/static/src/core/common/country_model.js b/addons/mail/static/src/core/common/country_model.js
index 6646ecea8ee3a..e82295aa18caa 100644
--- a/addons/mail/static/src/core/common/country_model.js
+++ b/addons/mail/static/src/core/common/country_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class Country extends Record {
     static id = "id";
diff --git a/addons/mail/static/src/core/common/data_response_model.js b/addons/mail/static/src/core/common/data_response_model.js
index bd8655f1a6dba..a84309231f934 100644
--- a/addons/mail/static/src/core/common/data_response_model.js
+++ b/addons/mail/static/src/core/common/data_response_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 import { Deferred } from "@web/core/utils/concurrency";
 
diff --git a/addons/mail/static/src/core/common/discuss_call_history_model.js b/addons/mail/static/src/core/common/discuss_call_history_model.js
index 9e086883710d7..34187c0464f75 100644
--- a/addons/mail/static/src/core/common/discuss_call_history_model.js
+++ b/addons/mail/static/src/core/common/discuss_call_history_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class DiscussCallHistory extends Record {
     static id = "id";
diff --git a/addons/mail/static/src/core/common/failure_model.js b/addons/mail/static/src/core/common/failure_model.js
index 7bd0ce82db2ee..d0493a2f81efc 100644
--- a/addons/mail/static/src/core/common/failure_model.js
+++ b/addons/mail/static/src/core/common/failure_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { markRaw } from "@odoo/owl";
 
 import { _t } from "@web/core/l10n/translation";
diff --git a/addons/mail/static/src/core/common/follower_model.js b/addons/mail/static/src/core/common/follower_model.js
index ea48423945019..5807e4efd37de 100644
--- a/addons/mail/static/src/core/common/follower_model.js
+++ b/addons/mail/static/src/core/common/follower_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { rpc } from "@web/core/network/rpc";
 
 export class Follower extends Record {
diff --git a/addons/mail/static/src/core/common/link_preview_model.js b/addons/mail/static/src/core/common/link_preview_model.js
index 7aff1a8cefcfc..37e84d17816d8 100644
--- a/addons/mail/static/src/core/common/link_preview_model.js
+++ b/addons/mail/static/src/core/common/link_preview_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { convertToEmbedURL } from "@mail/utils/common/misc";
 
 const VIDEO_EXTENSIONS = new Set(["mp4", "mov", "avi", "mkv", "webm", "mpeg", "mpg", "ogv", "3gp"]);
diff --git a/addons/mail/static/src/core/common/mail_activity_type_model.js b/addons/mail/static/src/core/common/mail_activity_type_model.js
index 8fbf10d47d6c2..230974bdd1dd9 100644
--- a/addons/mail/static/src/core/common/mail_activity_type_model.js
+++ b/addons/mail/static/src/core/common/mail_activity_type_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class MailActivityType extends Record {
     static _name = "mail.activity.type";
diff --git a/addons/mail/static/src/core/common/mail_guest_model.js b/addons/mail/static/src/core/common/mail_guest_model.js
index 4b11362a12574..a547e32204558 100644
--- a/addons/mail/static/src/core/common/mail_guest_model.js
+++ b/addons/mail/static/src/core/common/mail_guest_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { imageUrl } from "@web/core/utils/urls";
 import { rpc } from "@web/core/network/rpc";
 import { debounce } from "@web/core/utils/timing";
diff --git a/addons/mail/static/src/core/common/message_link_preview_model.js b/addons/mail/static/src/core/common/message_link_preview_model.js
index 7f36ecfdc261d..a519e094a77bb 100644
--- a/addons/mail/static/src/core/common/message_link_preview_model.js
+++ b/addons/mail/static/src/core/common/message_link_preview_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 import { rpc } from "@web/core/network/rpc";
 
diff --git a/addons/mail/static/src/core/common/message_model.js b/addons/mail/static/src/core/common/message_model.js
index 7ad7dd3626d67..a6b2d039723f2 100644
--- a/addons/mail/static/src/core/common/message_model.js
+++ b/addons/mail/static/src/core/common/message_model.js
@@ -1,6 +1,6 @@
 import { isEmptyBlock } from "@html_editor/utils/dom_info";
 
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import {
     EMOJI_REGEX,
     convertBrToLineBreak,
diff --git a/addons/mail/static/src/core/common/message_reactions_model.js b/addons/mail/static/src/core/common/message_reactions_model.js
index c75db88754111..a0108cc5c0446 100644
--- a/addons/mail/static/src/core/common/message_reactions_model.js
+++ b/addons/mail/static/src/core/common/message_reactions_model.js
@@ -1,4 +1,4 @@
-import { AND, fields, Record } from "@mail/core/common/record";
+import { AND, fields, Record } from "@mail/model/export";
 import { rpc } from "@web/core/network/rpc";
 
 export class MessageReactions extends Record {
diff --git a/addons/mail/static/src/core/common/notification_model.js b/addons/mail/static/src/core/common/notification_model.js
index 096966afb74eb..dca60611e1ff9 100644
--- a/addons/mail/static/src/core/common/notification_model.js
+++ b/addons/mail/static/src/core/common/notification_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 import { _t } from "@web/core/l10n/translation";
 
diff --git a/addons/mail/static/src/core/common/record.js b/addons/mail/static/src/core/common/record.js
deleted file mode 100644
index cd6e36369ca95..0000000000000
--- a/addons/mail/static/src/core/common/record.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from "@mail/model/export";
diff --git a/addons/mail/static/src/core/common/res_company_model.js b/addons/mail/static/src/core/common/res_company_model.js
index 369ef7340a41c..d501bb97b4211 100644
--- a/addons/mail/static/src/core/common/res_company_model.js
+++ b/addons/mail/static/src/core/common/res_company_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class ResCompany extends Record {
     static _name = "res.company";
diff --git a/addons/mail/static/src/core/common/res_groups_model.js b/addons/mail/static/src/core/common/res_groups_model.js
index 91f6939af2e31..4fe4dcd8fad6f 100644
--- a/addons/mail/static/src/core/common/res_groups_model.js
+++ b/addons/mail/static/src/core/common/res_groups_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class ResGroups extends Record {
     static _name = "res.groups";
diff --git a/addons/mail/static/src/core/common/res_groups_privilege_model.js b/addons/mail/static/src/core/common/res_groups_privilege_model.js
index d6dc0b1d34348..b995c82d8a838 100644
--- a/addons/mail/static/src/core/common/res_groups_privilege_model.js
+++ b/addons/mail/static/src/core/common/res_groups_privilege_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class ResGroupsPrivilege extends Record {
     static _name = "res.groups.privilege";
diff --git a/addons/mail/static/src/core/common/res_lang_model.js b/addons/mail/static/src/core/common/res_lang_model.js
index ea071fe94a5ad..8dc2d7d905e0e 100644
--- a/addons/mail/static/src/core/common/res_lang_model.js
+++ b/addons/mail/static/src/core/common/res_lang_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class ResLang extends Record {
     static id = "id";
diff --git a/addons/mail/static/src/core/common/res_partner_model.js b/addons/mail/static/src/core/common/res_partner_model.js
index df62412a08772..0907d6227d1a3 100644
--- a/addons/mail/static/src/core/common/res_partner_model.js
+++ b/addons/mail/static/src/core/common/res_partner_model.js
@@ -1,5 +1,5 @@
 import { Store } from "@mail/core/common/store_service";
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { imageUrl } from "@web/core/utils/urls";
 import { debounce } from "@web/core/utils/timing";
 
diff --git a/addons/mail/static/src/core/common/res_role_model.js b/addons/mail/static/src/core/common/res_role_model.js
index 1f762f94b8177..b542cde2e26c6 100644
--- a/addons/mail/static/src/core/common/res_role_model.js
+++ b/addons/mail/static/src/core/common/res_role_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class ResRole extends Record {
     static id = "id";
diff --git a/addons/mail/static/src/core/common/res_users_model.js b/addons/mail/static/src/core/common/res_users_model.js
index ca5aff3d85c1c..f11b4dafbbd0e 100644
--- a/addons/mail/static/src/core/common/res_users_model.js
+++ b/addons/mail/static/src/core/common/res_users_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class ResUsers extends Record {
     static _name = "res.users";
diff --git a/addons/mail/static/src/core/common/settings_model.js b/addons/mail/static/src/core/common/settings_model.js
index c202e6dd66d38..6d447a7f398a8 100644
--- a/addons/mail/static/src/core/common/settings_model.js
+++ b/addons/mail/static/src/core/common/settings_model.js
@@ -1,7 +1,7 @@
 import { hasHardwareAcceleration } from "@mail/utils/common/misc";
 import { _t } from "@web/core/l10n/translation";
 import { browser } from "@web/core/browser/browser";
-import { fields, Record } from "./record";
+import { fields, Record } from "@mail/model/export";
 import { debounce } from "@web/core/utils/timing";
 import { rpc } from "@web/core/network/rpc";
 
diff --git a/addons/mail/static/src/core/common/store_service.js b/addons/mail/static/src/core/common/store_service.js
index 0f27a196dd1e3..122885f42a08c 100644
--- a/addons/mail/static/src/core/common/store_service.js
+++ b/addons/mail/static/src/core/common/store_service.js
@@ -1,4 +1,4 @@
-import { Store as BaseStore, fields, makeStore } from "@mail/core/common/record";
+import { Store as BaseStore, fields, makeStore } from "@mail/model/export";
 import { threadCompareRegistry } from "@mail/core/common/thread_compare";
 import { cleanTerm, generateEmojisOnHtml, prettifyMessageText } from "@mail/utils/common/format";
 
diff --git a/addons/mail/static/src/core/common/thread.js b/addons/mail/static/src/core/common/thread.js
index a18840c303f1c..a302157d51703 100644
--- a/addons/mail/static/src/core/common/thread.js
+++ b/addons/mail/static/src/core/common/thread.js
@@ -1,7 +1,7 @@
 import { DateSection } from "@mail/core/common/date_section";
 import { Message } from "@mail/core/common/message";
 import { NotificationMessage } from "./notification_message";
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 import { useChildRefs, useVisible } from "@mail/utils/common/hooks";
 
 import {
diff --git a/addons/mail/static/src/core/common/thread_model.js b/addons/mail/static/src/core/common/thread_model.js
index 9faf94b4e0fc6..3a46c38661259 100644
--- a/addons/mail/static/src/core/common/thread_model.js
+++ b/addons/mail/static/src/core/common/thread_model.js
@@ -1,4 +1,4 @@
-import { AND, fields, Record } from "@mail/core/common/record";
+import { AND, fields, Record } from "@mail/model/export";
 import { generateEmojisOnHtml } from "@mail/utils/common/format";
 import { rpc } from "@web/core/network/rpc";
 
diff --git a/addons/mail/static/src/core/common/volume_model.js b/addons/mail/static/src/core/common/volume_model.js
index a63a4f55cd96f..9278a66d771d3 100644
--- a/addons/mail/static/src/core/common/volume_model.js
+++ b/addons/mail/static/src/core/common/volume_model.js
@@ -1,4 +1,4 @@
-import { OR, fields, Record } from "./record";
+import { OR, fields, Record } from "@mail/model/export";
 
 export class Volume extends Record {
     static id = OR("partner_id", "guest_id");
diff --git a/addons/mail/static/src/core/public_web/discuss_app/discuss_app_model.js b/addons/mail/static/src/core/public_web/discuss_app/discuss_app_model.js
index b1486cc45610e..637fa17329106 100644
--- a/addons/mail/static/src/core/public_web/discuss_app/discuss_app_model.js
+++ b/addons/mail/static/src/core/public_web/discuss_app/discuss_app_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { browser } from "@web/core/browser/browser";
 
 const NO_MEMBERS_DEFAULT_OPEN_LS = "mail.user_setting.no_members_default_open";
diff --git a/addons/mail/static/src/core/public_web/store_service_patch.js b/addons/mail/static/src/core/public_web/store_service_patch.js
index 089422d59c0b8..bde8dbc5997d8 100644
--- a/addons/mail/static/src/core/public_web/store_service_patch.js
+++ b/addons/mail/static/src/core/public_web/store_service_patch.js
@@ -1,5 +1,5 @@
 import { Store, storeService } from "@mail/core/common/store_service";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { router } from "@web/core/browser/router";
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/mail/static/src/core/web/store_service_patch.js b/addons/mail/static/src/core/web/store_service_patch.js
index fdc19a57e891a..7c61ebc71ac3c 100644
--- a/addons/mail/static/src/core/web/store_service_patch.js
+++ b/addons/mail/static/src/core/web/store_service_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Store } from "@mail/core/common/store_service";
 import { browser } from "@web/core/browser/browser";
 import { _t } from "@web/core/l10n/translation";
diff --git a/addons/mail/static/src/core/web/thread_model_patch.js b/addons/mail/static/src/core/web/thread_model_patch.js
index 390ca6b962e5c..2b27ff7c446e1 100644
--- a/addons/mail/static/src/core/web/thread_model_patch.js
+++ b/addons/mail/static/src/core/web/thread_model_patch.js
@@ -1,7 +1,7 @@
 import { Thread } from "@mail/core/common/thread_model";
 
 import { patch } from "@web/core/utils/patch";
-import { fields } from "../common/record";
+import { fields } from "@mail/model/export";
 import { compareDatetime } from "@mail/utils/common/misc";
 import { rpc } from "@web/core/network/rpc";
 
diff --git a/addons/mail/static/src/discuss/call/common/channel_member_patch.js b/addons/mail/static/src/discuss/call/common/channel_member_patch.js
index 6e6f73b2d1681..0e18d2a773947 100644
--- a/addons/mail/static/src/discuss/call/common/channel_member_patch.js
+++ b/addons/mail/static/src/discuss/call/common/channel_member_patch.js
@@ -1,5 +1,5 @@
 import { ChannelMember } from "@mail/discuss/core/common/channel_member_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { browser } from "@web/core/browser/browser";
 import { patch } from "@web/core/utils/patch";
diff --git a/addons/mail/static/src/discuss/call/common/rtc_service.js b/addons/mail/static/src/discuss/call/common/rtc_service.js
index 02de911d4e47e..5023423bec047 100644
--- a/addons/mail/static/src/discuss/call/common/rtc_service.js
+++ b/addons/mail/static/src/discuss/call/common/rtc_service.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { BlurManager } from "@mail/discuss/call/common/blur_manager";
 import { CallPermissionDialog } from "@mail/discuss/call/common/call_permission_dialog";
 import { monitorAudio } from "@mail/utils/common/media_monitoring";
diff --git a/addons/mail/static/src/discuss/call/common/rtc_session_model.js b/addons/mail/static/src/discuss/call/common/rtc_session_model.js
index 5b8b3da9d0a36..2e3a38b882609 100644
--- a/addons/mail/static/src/discuss/call/common/rtc_session_model.js
+++ b/addons/mail/static/src/discuss/call/common/rtc_session_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { Deferred } from "@web/core/utils/concurrency";
 
 /**
diff --git a/addons/mail/static/src/discuss/call/common/store_service_patch.js b/addons/mail/static/src/discuss/call/common/store_service_patch.js
index c32e9dd2810f4..21bbe7071200b 100644
--- a/addons/mail/static/src/discuss/call/common/store_service_patch.js
+++ b/addons/mail/static/src/discuss/call/common/store_service_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Store } from "@mail/core/common/store_service";
 import { router } from "@web/core/browser/router";
 
diff --git a/addons/mail/static/src/discuss/call/common/thread_model_patch.js b/addons/mail/static/src/discuss/call/common/thread_model_patch.js
index 73234a57adaf8..496faa3d806e0 100644
--- a/addons/mail/static/src/discuss/call/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/call/common/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 
 import { patch } from "@web/core/utils/patch";
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_model.js b/addons/mail/static/src/discuss/core/common/channel_member_model.js
index d8f2f00ca191a..72a2e79b81e6d 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_model.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_model.js
@@ -1,5 +1,5 @@
 import { Store } from "@mail/core/common/store_service";
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 import { browser } from "@web/core/browser/browser";
 import { deserializeDateTime } from "@web/core/l10n/dates";
diff --git a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
index ae3e1f06aa84a..f59ccbfa23ea5 100644
--- a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
+++ b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { Deferred } from "@web/core/utils/concurrency";
 
 export class DiscussChannel extends Record {
diff --git a/addons/mail/static/src/discuss/core/common/mail_guest_model_patch.js b/addons/mail/static/src/discuss/core/common/mail_guest_model_patch.js
index 31cc5be24e784..528374cecdfc3 100644
--- a/addons/mail/static/src/discuss/core/common/mail_guest_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/mail_guest_model_patch.js
@@ -1,5 +1,5 @@
 import { MailGuest } from "@mail/core/common/mail_guest_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/mail/static/src/discuss/core/common/message_model_patch.js b/addons/mail/static/src/discuss/core/common/message_model_patch.js
index ff1f84fa80f26..bc407432d69c4 100644
--- a/addons/mail/static/src/discuss/core/common/message_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/message_model_patch.js
@@ -1,5 +1,5 @@
 import { Message } from "@mail/core/common/message_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/mail/static/src/discuss/core/common/res_partner_model_patch.js b/addons/mail/static/src/discuss/core/common/res_partner_model_patch.js
index 43f9c00b3980f..cccfdc8ab9281 100644
--- a/addons/mail/static/src/discuss/core/common/res_partner_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/res_partner_model_patch.js
@@ -1,5 +1,5 @@
 import { ResPartner } from "@mail/core/common/res_partner_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index d11f9082f9933..2dd96d54e877e 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 import { useSequential } from "@mail/utils/common/hooks";
 import { compareDatetime, nearestGreaterThanOrEqual } from "@mail/utils/common/misc";
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js
index 471c3259b4658..eb7a2a6a2be43 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_category_model.js
@@ -1,5 +1,5 @@
 import { compareDatetime } from "@mail/utils/common/misc";
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 import { browser } from "@web/core/browser/browser";
 
 export const DISCUSS_SIDEBAR_CATEGORY_FOLDED_LS = "discuss_sidebar_category_folded_";
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
index ebba0db2d2e3c..53c60d256b5ea 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { DiscussApp } from "@mail/core/public_web/discuss_app/discuss_app_model";
 
 import { _t } from "@web/core/l10n/translation";
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js b/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js
index 1e660c73c842e..b588db4d652fb 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class DiscussCategory extends Record {
     static _name = "discuss.category";
diff --git a/addons/mail/static/src/discuss/message_pin/common/message_model_patch.js b/addons/mail/static/src/discuss/message_pin/common/message_model_patch.js
index c69693eb33855..8f1898f387420 100644
--- a/addons/mail/static/src/discuss/message_pin/common/message_model_patch.js
+++ b/addons/mail/static/src/discuss/message_pin/common/message_model_patch.js
@@ -1,6 +1,6 @@
 import { patch } from "@web/core/utils/patch";
 import { Message } from "@mail/core/common/message_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { _t } from "@web/core/l10n/translation";
 import { MessageConfirmDialog } from "@mail/core/common/message_confirm_dialog";
 import { Deferred } from "@web/core/utils/concurrency";
diff --git a/addons/mail/static/src/discuss/message_pin/common/thread_model_patch.js b/addons/mail/static/src/discuss/message_pin/common/thread_model_patch.js
index b594f62d6c7b9..429c61bc970c4 100644
--- a/addons/mail/static/src/discuss/message_pin/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/message_pin/common/thread_model_patch.js
@@ -1,5 +1,5 @@
 import { patch } from "@web/core/utils/patch";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 
 import { rpc } from "@web/core/network/rpc";
diff --git a/addons/mail/static/src/discuss/voice_message/common/attachment_model_patch.js b/addons/mail/static/src/discuss/voice_message/common/attachment_model_patch.js
index 8c2ebabb05814..d94d0d67d276a 100644
--- a/addons/mail/static/src/discuss/voice_message/common/attachment_model_patch.js
+++ b/addons/mail/static/src/discuss/voice_message/common/attachment_model_patch.js
@@ -1,5 +1,5 @@
 import { Attachment } from "@mail/core/common/attachment_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { patch } from "@web/core/utils/patch";
 
 /** @type {import("models").Attachment} */
diff --git a/addons/mail/static/tests/core/record.test.js b/addons/mail/static/tests/core/record.test.js
index a61da25e3c243..75619caef7782 100644
--- a/addons/mail/static/tests/core/record.test.js
+++ b/addons/mail/static/tests/core/record.test.js
@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, test } from "@odoo/hoot";
 import { markup, reactive, toRaw } from "@odoo/owl";
 import { mockService } from "@web/../tests/web_test_helpers";
 
-import { Record, Store, makeStore } from "@mail/core/common/record";
+import { Record, Store, makeStore } from "@mail/model/export";
 import { AND, fields } from "@mail/model/misc";
 import { serializeDateTime } from "@web/core/l10n/dates";
 import { registry } from "@web/core/registry";
diff --git a/addons/rating/static/src/core/common/message_model_patch.js b/addons/rating/static/src/core/common/message_model_patch.js
index 1789e4270c94f..bd60983f2c37c 100644
--- a/addons/rating/static/src/core/common/message_model_patch.js
+++ b/addons/rating/static/src/core/common/message_model_patch.js
@@ -1,5 +1,5 @@
 import { Message } from "@mail/core/common/message_model";
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/rating/static/src/core/common/rating_model.js b/addons/rating/static/src/core/common/rating_model.js
index b9c6a3c420a8c..99ad231085160 100644
--- a/addons/rating/static/src/core/common/rating_model.js
+++ b/addons/rating/static/src/core/common/rating_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class Rating extends Record {
     static _name = "rating.rating";
diff --git a/addons/website/static/src/common/website_model.js b/addons/website/static/src/common/website_model.js
index f932919998b3a..33222d56703c0 100644
--- a/addons/website/static/src/common/website_model.js
+++ b/addons/website/static/src/common/website_model.js
@@ -1,4 +1,4 @@
-import { Record } from "@mail/core/common/record";
+import { Record } from "@mail/model/export";
 
 export class Website extends Record {
     static id = "id";
diff --git a/addons/website/static/src/common/website_visitor_model.js b/addons/website/static/src/common/website_visitor_model.js
index 171d13465ec9c..527e248e29220 100644
--- a/addons/website/static/src/common/website_visitor_model.js
+++ b/addons/website/static/src/common/website_visitor_model.js
@@ -1,4 +1,4 @@
-import { fields, Record } from "@mail/core/common/record";
+import { fields, Record } from "@mail/model/export";
 
 export class WebsiteVisitor extends Record {
     static _name = "website.visitor";
diff --git a/addons/website_livechat/static/src/common/thread_model_patch.js b/addons/website_livechat/static/src/common/thread_model_patch.js
index f990daaaed530..3d127ff8fabf9 100644
--- a/addons/website_livechat/static/src/common/thread_model_patch.js
+++ b/addons/website_livechat/static/src/common/thread_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 import { patch } from "@web/core/utils/patch";
 
diff --git a/addons/website_livechat/static/src/web/website_visitor_model_patch.js b/addons/website_livechat/static/src/web/website_visitor_model_patch.js
index 91d3355366bd3..67565c34f1a5e 100644
--- a/addons/website_livechat/static/src/web/website_visitor_model_patch.js
+++ b/addons/website_livechat/static/src/web/website_visitor_model_patch.js
@@ -1,4 +1,4 @@
-import { fields } from "@mail/core/common/record";
+import { fields } from "@mail/model/export";
 
 import { deserializeDateTime } from "@web/core/l10n/dates";
 import { patch } from "@web/core/utils/patch";

From 0372b79748e51ebda83604e047f7dd9c8261e3e0 Mon Sep 17 00:00:00 2001
From: "Walid (wasa)" <wasa@odoo.com>
Date: Fri, 12 Sep 2025 14:14:19 +0000
Subject: [PATCH 126/673] [FIX] html_editor: fix `is_node_editable_predicates`
 check.

Problem:
When having the `o_file_box` in the selected nodes and applying a
color, the file box gets the color applied even though it has
`contenteditable=false`.

Solution:
Change the way `is_node_editable_predicates` works.
Previously, it returned `false` in case it did not know if the node
was editable or not.
Now, it returns `undefined` in those cases. When the predicate
returns `false`, it explicitly means the node is not editable.

Steps to reproduce:
1. Add a file.
2. Press CTRL+A and apply a font color.
3. The color style is applied to the node.

task-5080082

closes odoo/odoo#233861

X-original-commit: 0524316cc9b757957302a6b2de67721afa606344
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Walid Sahli (wasa) <wasa@odoo.com>
---
 .../static/src/core/selection_plugin.js       |  9 ++++++--
 .../static/src/main/media/file_plugin.js      |  5 ++++
 .../static/src/main/media/media_plugin.js     |  4 +++-
 .../syntax_highlighting_plugin.js             |  6 ++++-
 .../html_editor/static/tests/editor.test.js   | 23 +++++++++++++++++++
 addons/html_editor/static/tests/file.test.js  | 23 +++++++++++++++++++
 6 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/addons/html_editor/static/src/core/selection_plugin.js b/addons/html_editor/static/src/core/selection_plugin.js
index b0a1bcba86f47..64665a8b884d4 100644
--- a/addons/html_editor/static/src/core/selection_plugin.js
+++ b/addons/html_editor/static/src/core/selection_plugin.js
@@ -200,7 +200,6 @@ export class SelectionPlugin extends Plugin {
     resources = {
         user_commands: { id: "selectAll", run: this.selectAll.bind(this) },
         shortcuts: [{ hotkey: "control+a", commandId: "selectAll" }],
-        is_node_editable_predicates: (node) => node.parentElement?.isContentEditable,
     };
 
     setup() {
@@ -1025,7 +1024,13 @@ export class SelectionPlugin extends Plugin {
     }
 
     isNodeEditable(node) {
-        return this.getResource("is_node_editable_predicates").some((p) => p(node));
+        const results = this.getResource("is_node_editable_predicates")
+            .map((p) => p(node))
+            .filter((r) => r !== undefined);
+        if (!results.length) {
+            return node.parentElement?.isContentEditable;
+        }
+        return results.every((r) => r);
     }
 
     focusEditable() {
diff --git a/addons/html_editor/static/src/main/media/file_plugin.js b/addons/html_editor/static/src/main/media/file_plugin.js
index 66e21cf4715da..88a5a6e5ef713 100644
--- a/addons/html_editor/static/src/main/media/file_plugin.js
+++ b/addons/html_editor/static/src/main/media/file_plugin.js
@@ -45,6 +45,11 @@ export class FilePlugin extends Plugin {
         selectors_for_feff_providers: () => ".o_file_box",
         functional_empty_node_predicates: (node) =>
             node?.nodeName === "SPAN" && node.classList.contains("o_file_box"),
+        is_node_editable_predicates: (node) => {
+            if (node?.nodeName === "SPAN" && node.classList.contains("o_file_box")) {
+                return false;
+            }
+        },
     };
 
     get recordInfo() {
diff --git a/addons/html_editor/static/src/main/media/media_plugin.js b/addons/html_editor/static/src/main/media/media_plugin.js
index 8fd5baff042fc..4dca47cf14934 100644
--- a/addons/html_editor/static/src/main/media/media_plugin.js
+++ b/addons/html_editor/static/src/main/media/media_plugin.js
@@ -110,7 +110,9 @@ export class MediaPlugin extends Plugin {
     }
 
     isEditableMediaElement(node) {
-        return isMediaElement(node) && node.classList.contains(EDITABLE_MEDIA_CLASS);
+        if (isMediaElement(node) && node.classList.contains(EDITABLE_MEDIA_CLASS)) {
+            return true;
+        }
     }
 
     replaceImage() {
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js
index 03151f3b99c8d..9e09a735827f2 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js
@@ -48,7 +48,11 @@ export class SyntaxHighlightingPlugin extends Plugin {
         post_redo_handlers: () => this.addCodeBlocks(this.editable, true),
         clean_for_save_handlers: withSequence(0, ({ root }) => this.cleanForSave(root)),
         // Ensure focus can be preserved within the textarea:
-        is_node_editable_predicates: (node) => node?.classList?.contains("o_prism_source"),
+        is_node_editable_predicates: (node) => {
+            if (node?.classList?.contains("o_prism_source")) {
+                return true;
+            }
+        },
     };
 
     setup() {
diff --git a/addons/html_editor/static/tests/editor.test.js b/addons/html_editor/static/tests/editor.test.js
index 52c994f9f313b..aa2e8a3031de5 100644
--- a/addons/html_editor/static/tests/editor.test.js
+++ b/addons/html_editor/static/tests/editor.test.js
@@ -82,6 +82,29 @@ test("Remove odoo-editor-editable class after every plugin is destroyed", async
     expect.verifySteps(["operation"]);
 });
 
+test("Element is not editable if any plugin marks it non-editable", async () => {
+    class TestPlugin extends Plugin {
+        static id = "test";
+        resources = {
+            is_node_editable_predicates: (node) => {
+                if (node.classList.contains("o-will-break-if-edited")) {
+                    return false;
+                }
+            },
+        };
+    }
+    const Plugins = [...MAIN_PLUGINS, TestPlugin];
+    const { el, plugins } = await setupEditor(
+        `<div>[<img class="o-editable-media o-will-break-if-edited">]</div>`,
+        {
+            config: { Plugins },
+        }
+    );
+    const img = el.querySelector(".o-editable-media");
+    const selectionPlugin = plugins.get("selection");
+    await expect(selectionPlugin.isNodeEditable(img)).toBe(false);
+});
+
 test("clean_for_save_listeners is done last", async () => {
     // This test uses custom elements tag `c-div` to make sure they won't fall into
     // a case where they won't be merged anyway.
diff --git a/addons/html_editor/static/tests/file.test.js b/addons/html_editor/static/tests/file.test.js
index db72fb585f4dc..601aff47a6645 100644
--- a/addons/html_editor/static/tests/file.test.js
+++ b/addons/html_editor/static/tests/file.test.js
@@ -12,6 +12,7 @@ import { setupEditor } from "./_helpers/editor";
 import { getContent } from "./_helpers/selection";
 import { insertText } from "./_helpers/user_actions";
 import { execCommand } from "./_helpers/userCommands";
+import { expandToolbar } from "./_helpers/toolbar";
 
 const configWithEmbeddedFile = {
     Plugins: [...MAIN_PLUGINS, ...EMBEDDED_COMPONENT_PLUGINS],
@@ -70,6 +71,28 @@ describe("file command", () => {
     });
 });
 
+test("Should not apply color to file box", async () => {
+    const { editor } = await setupEditor("<p>a[]b</p>", {
+        config: configWithEmbeddedFile,
+    });
+    const mockedUpload = patchUpload(editor);
+    await insertText(editor, "/file");
+    await animationFrame();
+    await press("Enter");
+    await animationFrame();
+    expect(".o_select_media_dialog").toHaveCount(0);
+    await mockedUpload;
+    await press(["Ctrl", "a"]);
+    await animationFrame();
+    await expandToolbar();
+    await click(".o-we-toolbar .o-select-color-foreground");
+    await animationFrame();
+    await click('.o_colorpicker_section [data-color="o-color-1"]');
+    await animationFrame();
+    const fileBox = queryOne(".o_file_box");
+    expect(fileBox).not.toHaveClass("text-o-color-1");
+});
+
 describe("document tab in media dialog", () => {
     onRpc("ir.attachment", "search_read", () => [
         {

From 86b8107be7024490b4289fe449dfabc679d7d5aa Mon Sep 17 00:00:00 2001
From: Ajit Singh <aksi@odoo.com>
Date: Fri, 10 Oct 2025 09:12:47 +0000
Subject: [PATCH 127/673] [FIX] website_sale: unescape placeholder for search

currently, we use t-out to set the placeholder, which escapes HTML
so `desk's lamp` becomes `desk&#39;s lamp`

Fix:
- replace `t-out` with `t-valuef.translate` to properly store placeholder.

opw-5136972

closes odoo/odoo#232301

X-original-commit: 275999676d57bb059dca6ed371eef0863f2df4e7
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
---
 addons/website_sale/templates/product_page_templates.xml | 2 +-
 addons/website_sale/templates/shop_page_templates.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/templates/product_page_templates.xml b/addons/website_sale/templates/product_page_templates.xml
index 9381926431c77..eeb2487613471 100644
--- a/addons/website_sale/templates/product_page_templates.xml
+++ b/addons/website_sale/templates/product_page_templates.xml
@@ -302,7 +302,7 @@
                                 <t t-set="_classes" t-valuef="input-group rounded o_cc o_cc1 mb-1"/>
                                 <t t-set="_input_classes" t-valuef="border-0 p-3"/>
                                 <t t-set="_submit_classes" t-valuef="px-4"/>
-                                <t t-if="category" t-set="placeholder">Search in <t t-out="category.name"/></t>
+                                <t t-if="category" t-set="placeholder" t-valuef.translate="Search in {{category.name}}"/>
                             </t>
                         </div>
                     </div>
diff --git a/addons/website_sale/templates/shop_page_templates.xml b/addons/website_sale/templates/shop_page_templates.xml
index 3e444a19ac79e..201f9684893dc 100644
--- a/addons/website_sale/templates/shop_page_templates.xml
+++ b/addons/website_sale/templates/shop_page_templates.xml
@@ -385,7 +385,7 @@
                                             <div
                                                 class="o_wsale_products_header_search_form_container d-none d-sm-inline-block flex-grow-1 mw-xxl-25 me-auto"
                                             >
-                                                <t t-if="category" t-set="placeholder">Search in <t t-out="category.name"/></t>
+                                                <t t-if="category" t-set="placeholder" t-valuef.translate="Search in {{category.name}}"/>
                                                 <t t-call="website_sale.search" placeholder="placeholder" search="original_search or search"/>
                                             </div>
                                             <!-- Mobile Search button -->
@@ -579,7 +579,7 @@
                                 <t t-set="_classes" t-valuef="input-group rounded o_cc o_cc1 mb-1"/>
                                 <t t-set="_input_classes" t-valuef="border-0 p-3"/>
                                 <t t-set="_submit_classes" t-valuef="px-4"/>
-                                <t t-if="category" t-set="placeholder">Search in <t t-out="category.name"/></t>
+                                <t t-if="category" t-set="placeholder" t-valuef.translate="Search in {{category.name}}"/>
                             </t>
                         </div>
                     </div>
@@ -998,7 +998,7 @@
                 class="offcanvas-body flex-grow-0 overflow-visible"
             >
                 <t t-call="website_sale.search">
-                    <t t-if="category" t-set="placeholder">Search in <t t-out="category.name"/></t>
+                    <t t-if="category" t-set="placeholder" t-valuef.translate="Search in {{category.name}}"/>
                     <t t-set="search" t-value="original_search or search"/>
                     <t t-set="_s_searchbar_autocomplete_classes" t-valuef="bg-primary"> </t>
                 </t>

From a7954509391530123135cc506770b0693578c78b Mon Sep 17 00:00:00 2001
From: "Jacob Was (jacw)" <jacw@odoo.com>
Date: Fri, 10 Oct 2025 19:14:25 +0000
Subject: [PATCH 128/673] [FIX] l10n_sa_edi: Check for misconfigured invoice if
 empty country

ZATCA invoice misconfigurations are only checked for if the company
has Saudi Arabia set as its country. However, ZATCA EDIs can be
generated without Saudi Arabia set as the country.

Thus, companies without a company set can create EDI documents for
misconfigured invoices. This may cause traceback errors which
prevent the "EDI : Perform web services operations" cron from
running at all.

This commit ensures that configuration checks are run on companies
without countries set (and adds a relevant unit test).

opw-5057792

closes odoo/odoo#234072

X-original-commit: bc4e1c99f485c1f10eef409adbffeaddf8e41475
Signed-off-by: Antoine Dupuis (andu) <andu@odoo.com>
Signed-off-by: Jacob Was (jacw) <jacw@odoo.com>
---
 .../l10n_sa_edi/models/account_edi_format.py  |  2 +-
 addons/l10n_sa_edi/tests/test_edi_zatca.py    | 34 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_sa_edi/models/account_edi_format.py b/addons/l10n_sa_edi/models/account_edi_format.py
index 25e6404024e74..1d4965066e880 100644
--- a/addons/l10n_sa_edi/models/account_edi_format.py
+++ b/addons/l10n_sa_edi/models/account_edi_format.py
@@ -386,7 +386,7 @@ def _check_move_configuration(self, invoice):
         company = invoice.company_id
 
         errors = super()._check_move_configuration(invoice)
-        if self.code != 'sa_zatca' or company.country_id.code != 'SA':
+        if self.code != 'sa_zatca' or company.country_id and company.country_id.code != 'SA':
             return errors
 
         if invoice.commercial_partner_id == invoice.company_id.partner_id.commercial_partner_id:
diff --git a/addons/l10n_sa_edi/tests/test_edi_zatca.py b/addons/l10n_sa_edi/tests/test_edi_zatca.py
index b9d1943e12f7c..35ca0bf2b50f6 100644
--- a/addons/l10n_sa_edi/tests/test_edi_zatca.py
+++ b/addons/l10n_sa_edi/tests/test_edi_zatca.py
@@ -7,7 +7,7 @@
 from pytz import timezone
 from odoo import Command
 
-from odoo.exceptions import ValidationError
+from odoo.exceptions import ValidationError, UserError
 from odoo.tests import tagged
 from odoo.tools import misc
 from odoo.addons.l10n_sa_edi.tests.common import TestSaEdiCommon
@@ -360,3 +360,35 @@ def testCompanyOnSimplifiedInvoiceQR(self):
         qr_company_name = decoded_qr[2:2 + length].decode()
 
         self.assertEqual(xml_company_name, qr_company_name, "Seller name on the xml does not match the seller name on the QR code")
+
+    def test_company_missing_country_on_standard_invoice(self):
+        """Test standard invoice generation when the company does not have a country set."""
+        # setup new company to prevent errors in other tests
+        vals = self._get_company_vals({"name": "SA Company (Minus Country)"})
+        new_company = self._create_company(**vals)
+
+        new_company_customer_invoice_journal = self.env['account.journal'].search([
+            ('company_id', '=', new_company.id),
+            ('type', '=', 'sale'),
+        ], limit=1)
+        new_company_customer_invoice_journal._l10n_sa_load_edi_demo_data()
+
+        new_company.country_id = False
+
+        # missing tax should always cause a user error, even if the country is blank
+        move_data = {
+            'name': 'INV/2022/00014',
+            'invoice_date': '2022-09-05',
+            'invoice_date_due': '2022-09-22',
+            'company_id': new_company,
+            'partner_id': self.partner_sa,
+            'invoice_line_ids': [{
+                'product_id': self.product_a.id,
+                'price_unit': self.product_a.standard_price,
+                'tax_ids': False,
+            }],
+        }
+
+        invoice = self._create_test_invoice(**move_data)
+        with self.assertRaises(UserError):
+            invoice.action_post()

From a947016c855d7e828cc37a8eb8cd1f62fc0cef7a Mon Sep 17 00:00:00 2001
From: mano-odoo <mano@odoo.com>
Date: Tue, 28 Oct 2025 10:34:13 +0100
Subject: [PATCH 129/673] [FIX] sale, web: adapt section on report and portal

In commit[1][2] the sections and subsections were adapted on reports and
portal. However in commit[3] we slightly changed the design, thus the
change needs to be replicated on reports and portal.

task-5216018
Followup of task-5125867

[1]: odoo/odoo@4e81bb2e2f99ef6e038534de05a4dbe48080c49e
[2]: odoo/odoo@21384e5c5ac2161e28ca13844675a507b50fcb54
[3]: odoo/odoo@91952f2e95a6050c7beb5e8120301c712c6e0a58

closes odoo/odoo#233370

Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/sale/static/src/scss/sale_portal.scss                | 4 ++++
 addons/sale/views/sale_portal_templates.xml                 | 2 +-
 .../static/src/webclient/actions/reports/report_tables.scss | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/sale/static/src/scss/sale_portal.scss b/addons/sale/static/src/scss/sale_portal.scss
index 0b1a9529b9e9d..89f6b58df4b72 100644
--- a/addons/sale/static/src/scss/sale_portal.scss
+++ b/addons/sale/static/src/scss/sale_portal.scss
@@ -26,6 +26,10 @@
     width: 100% !important;
 }
 
+.sale_tbody tr:has(+ .o_line_section) {
+    border-bottom: $border-width solid $dark;
+}
+
 .o_portal .sale_tbody .js_quantity_container {
 
     .js_quantity {
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index ed324286866da..9b37b72f065f9 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -772,7 +772,7 @@
                                     <tr
                                         t-if="is_section or is_subsection"
                                         name="tr_section"
-                                        t-attf-class="border-dark {{'fw-bold o_line_section bg-200' if is_section else 'fw-medium o_line_subsection bg-100'}}"
+                                        t-attf-class="{{'fw-bold o_line_section bg-200' if is_section else 'fw-medium o_line_subsection border-dark bg-100'}}"
                                     >
                                         <t t-set="show_section_total" t-value="is_section or not line.parent_id.collapse_prices"/>
                                         <t
diff --git a/addons/web/static/src/webclient/actions/reports/report_tables.scss b/addons/web/static/src/webclient/actions/reports/report_tables.scss
index ba26b16674c27..dd0c056620f7a 100644
--- a/addons/web/static/src/webclient/actions/reports/report_tables.scss
+++ b/addons/web/static/src/webclient/actions/reports/report_tables.scss
@@ -11,7 +11,11 @@ table.table {
         vertical-align: middle;
     }
 
-    .o_line_section, .o_line_subsection {
+    .o_line_section {
+        border-top: $border-width solid $o-gray-400;
+    }
+
+    .o_line_subsection {
         border-bottom: $border-width solid $o-gray-400;
     }
 

From c76746b8af8becaf4601687dcaa8df0fbaaf6a07 Mon Sep 17 00:00:00 2001
From: Traina Ludo <ltra@odoo.com>
Date: Tue, 21 Oct 2025 11:20:20 +0200
Subject: [PATCH 130/673] [IMP] point_of_sale: redesign dialogs for POS

Task: [#5153312](https://www.odoo.com/odoo/project/1737/tasks/5153312)

---

To make the dialogs more visually appealing and user-friendly, we redesigned their layout.
ConfirmationDialog and AlertDialog received an even more detailed improvements to enhance their visual design.

closes odoo/odoo#232459

Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../alert_dialog.scss => dialog/dialog.scss}  | 48 +++++++++++++------
 .../alert_dialog.xml => dialog/dialog.xml}    |  8 +++-
 2 files changed, 41 insertions(+), 15 deletions(-)
 rename addons/point_of_sale/static/src/app/components/{alert_dialog/alert_dialog.scss => dialog/dialog.scss} (59%)
 rename addons/point_of_sale/static/src/app/components/{alert_dialog/alert_dialog.xml => dialog/dialog.xml} (54%)

diff --git a/addons/point_of_sale/static/src/app/components/alert_dialog/alert_dialog.scss b/addons/point_of_sale/static/src/app/components/dialog/dialog.scss
similarity index 59%
rename from addons/point_of_sale/static/src/app/components/alert_dialog/alert_dialog.scss
rename to addons/point_of_sale/static/src/app/components/dialog/dialog.scss
index 4a3d61fb9208c..a661ac22afbf2 100644
--- a/addons/point_of_sale/static/src/app/components/alert_dialog/alert_dialog.scss
+++ b/addons/point_of_sale/static/src/app/components/dialog/dialog.scss
@@ -1,18 +1,11 @@
-.o_alert_dialog {
+.o_dialog .modal-content {
     --modal-footer-border-width: 0;
     --modal-header-border-width: 0;
-    --heading-color: var(--danger);
-    --modal-border-radius: 0.4rem;
-    padding: 0 0.75rem;
-    margin: 0.5rem;
 
     .modal-header {
-        .modal-title {
-            font-weight: bold;
-            font-size: 1.5rem;
-            letter-spacing: 0.25px;
+        &:has(.btn-close) {
+            margin-right: var(--modal-header-padding-y);
         }
-
         .btn-close {
             position: unset !important;
             margin: calc(-0.5 * var(--modal-header-padding-y)) calc(-0.5 * var(--modal-header-padding-x) * 2)
@@ -22,13 +15,40 @@
 
     .modal-body {
         --modal-padding: 0 16px;
-        p {
-            font-size: 1.05em;
+
+        > p:last-child {
             margin-bottom: 4px;
         }
     }
+}
+
+.o_dialog .modal-content.o_confirmation_dialog,
+.o_dialog .modal-content.o_alert_dialog {
+    --modal-border-radius: 0.4rem;
+    padding: 0 0.75rem;
+
+    .modal-header {
+        &:has(.btn-close) {
+            margin-right: 0;
+        }
+        .modal-title {
+            font-size: 1.1rem;
+        }
+    }
+}
 
-    .modal-footer {
-        justify-content: start !important;
+.o_dialog .modal-content.o_alert_dialog {
+    --heading-color: var(--danger);
+    .modal-header {
+        .modal-title {
+            font-weight: bold;
+            font-size: 1.5rem;
+            letter-spacing: 0.25px;
+        }
+    }
+    .modal-body {
+        p {
+            font-size: 1.05em;
+        }
     }
 }
diff --git a/addons/point_of_sale/static/src/app/components/alert_dialog/alert_dialog.xml b/addons/point_of_sale/static/src/app/components/dialog/dialog.xml
similarity index 54%
rename from addons/point_of_sale/static/src/app/components/alert_dialog/alert_dialog.xml
rename to addons/point_of_sale/static/src/app/components/dialog/dialog.xml
index bee8b2f71f927..e89858cd55783 100644
--- a/addons/point_of_sale/static/src/app/components/alert_dialog/alert_dialog.xml
+++ b/addons/point_of_sale/static/src/app/components/dialog/dialog.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
 
+  <t t-name="point_of_sale.Dialog" t-inherit="web.ConfirmationDialog" t-inherit-mode="extension">
+    <xpath expr="//Dialog" position="attributes">
+      <attribute name="contentClass">'o_confirmation_dialog ' + (props.contentClass || '')</attribute>
+    </xpath>
+  </t>
+
   <t t-name="point_of_sale.AlertDialog" t-inherit="web.AlertDialog" t-inherit-mode="extension">
     <xpath expr="//Dialog" position="attributes">
       <attribute name="size">'md'</attribute>
-      <attribute name="contentClass">'o_alert_dialog ' + (props.contentClass || [])</attribute>
+      <attribute name="contentClass">'o_alert_dialog ' + (props.contentClass || '')</attribute>
     </xpath>
   </t>
 

From d9ff73174ead315fe370818eaf49043aef3d306e Mon Sep 17 00:00:00 2001
From: Florian Malfroid <flmal@odoo.com>
Date: Thu, 9 Oct 2025 14:54:01 +0200
Subject: [PATCH 131/673] [IMP] product, website_sale(_comparison): Quick clean
 on attribute view

Purpose:
    The attribute form view was not as clean as it could have been now that we have several eCommerce fields.
    The goal was to move the eCommerce fields in a tab, change a bit their labels and clean the view to align it with other form views.

Specification:
    - Create a new tab 'eCommerce'
    - Move the eCommerce fields into this new tab
    - Rename some fields:
        - eCommerce filter   -> Filter
        - eCommerce category -> Category
    - Change the order of those fields to be:
        - Category
        - Filter
        - On Products Cards
        - Show Thumbnails
    - Change the attribute name field to have a big model title look
    - Change the type of the field 'Display Type' from radio to select

Task-5154273

closes odoo/odoo#230793

Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 .../product/views/product_attribute_views.xml |  9 ++--
 .../views/product_attribute_views.xml         | 52 ++++++++++---------
 .../models/product_attribute.py               |  2 +-
 .../views/product_attribute_views.xml         |  4 +-
 4 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/addons/product/views/product_attribute_views.xml b/addons/product/views/product_attribute_views.xml
index b7104db2f3ec4..449490f35b8e6 100644
--- a/addons/product/views/product_attribute_views.xml
+++ b/addons/product/views/product_attribute_views.xml
@@ -38,11 +38,14 @@
                         </div>
                     </button>
                 </div>
+                <div class="oe_title">
+                    <h1>
+                        <field name="name" placeholder="Attribute Name"/>
+                    </h1>
+                </div>
                 <group name="main_fields">
                     <group name="sale_main_fields">
-                        <label for="name" string="Attribute Name"/>
-                        <field name="name" nolabel="1"/>
-                        <field name="display_type" widget="radio" options="{'horizontal': True}"/>
+                        <field name="display_type"/>
                         <field name="create_variant"
                                widget="radio"
                                options="{'horizontal': True}"
diff --git a/addons/website_sale/views/product_attribute_views.xml b/addons/website_sale/views/product_attribute_views.xml
index 008ed46b3c734..8fc964c4376bd 100644
--- a/addons/website_sale/views/product_attribute_views.xml
+++ b/addons/website_sale/views/product_attribute_views.xml
@@ -6,30 +6,34 @@
         <field name="model">product.attribute</field>
         <field name="inherit_id" ref="product.product_attribute_view_form"/>
         <field name="arch" type="xml">
-            <group name="main_fields" position="inside">
-                <group name="ecommerce_main_fields">
-                    <field
-                        name="visibility"
-                        string="eCommerce Filter"
-                        widget="radio"
-                        options="{'horizontal': True}"
-                    />
-                    <field
-                        name="preview_variants"
-                        widget="radio"
-                        options="{'horizontal': True}"
-                        readonly="create_variant != 'always' or display_type == 'multi'"
-                        force_save="1"
-                    />
-                    <field
-                        name="is_thumbnail_visible"
-                        widget="boolean_toggle"
-                        readonly="create_variant != 'always' or display_type == 'multi'"
-                        invisible="preview_variants == 'hidden'"
-                        force_save="1"
-                    />
-                </group>
-            </group>
+            <page name="attribute_values" position="after">
+                <page name="ecommerce_attributes" string="eCommerce">
+                    <group>
+                        <group name="ecommerce_main_fields">
+                            <field
+                                name="visibility"
+                                string="Filter"
+                                widget="radio"
+                                options="{'horizontal': True}"
+                            />
+                            <field
+                                name="preview_variants"
+                                widget="radio"
+                                options="{'horizontal': True}"
+                                readonly="create_variant != 'always' or display_type == 'multi'"
+                                force_save="1"
+                            />
+                            <field
+                                name="is_thumbnail_visible"
+                                widget="boolean_toggle"
+                                readonly="create_variant != 'always' or display_type == 'multi'"
+                                invisible="preview_variants == 'hidden'"
+                                force_save="1"
+                            />
+                        </group>
+                    </group>
+                </page>
+            </page>
         </field>
     </record>
 
diff --git a/addons/website_sale_comparison/models/product_attribute.py b/addons/website_sale_comparison/models/product_attribute.py
index 31e9de071b61a..6b4e41c4c4960 100644
--- a/addons/website_sale_comparison/models/product_attribute.py
+++ b/addons/website_sale_comparison/models/product_attribute.py
@@ -8,7 +8,7 @@ class ProductAttribute(models.Model):
 
     category_id = fields.Many2one(
         comodel_name='product.attribute.category',
-        string="eCommerce Category",
+        string="Category",
         index=True,
         help="Set a category to regroup similar attributes under the same section in the Comparison"
              " page of eCommerce.",
diff --git a/addons/website_sale_comparison/views/product_attribute_views.xml b/addons/website_sale_comparison/views/product_attribute_views.xml
index 1198ffc1ca9f5..241bc732222d6 100644
--- a/addons/website_sale_comparison/views/product_attribute_views.xml
+++ b/addons/website_sale_comparison/views/product_attribute_views.xml
@@ -18,9 +18,9 @@
         <field name="inherit_id" ref="website_sale.product_attribute_view_form"/>
         <field name="priority" eval="8"/>
         <field name="arch" type="xml">
-            <group name="ecommerce_main_fields" position="inside">
+            <field name="visibility" position="before">
                 <field name="category_id"/>
-            </group>
+            </field>
         </field>
     </record>
 

From cc67c9a4bfd2d650b57c07eb4d032f11d12ab848 Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 22 Oct 2025 12:54:43 +0200
Subject: [PATCH 132/673] [IMP] mail: Typing use channel directly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#232637

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/static/src/core/common/chat_window.xml |  2 +-
 addons/mail/static/src/core/common/im_status.xml   |  2 +-
 .../discuss/core/common/channel_member_model.js    |  4 ++--
 .../discuss/core/common/discuss_channel_model.js   | 14 ++++++++++++++
 .../src/discuss/core/common/thread_model_patch.js  | 13 -------------
 .../src/discuss/typing/common/composer_patch.xml   |  2 +-
 .../discuss/typing/common/thread_icon_patch.xml    |  4 ++--
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/addons/mail/static/src/core/common/chat_window.xml b/addons/mail/static/src/core/common/chat_window.xml
index 0270b268ee021..85d8f95888f67 100644
--- a/addons/mail/static/src/core/common/chat_window.xml
+++ b/addons/mail/static/src/core/common/chat_window.xml
@@ -101,7 +101,7 @@
 <t t-name="mail.ChatWindow.memberTyping">
     <div t-if="channel.hasOtherMembersTyping" class="d-flex bg-inherit position-relative">
         <div class="o-mail-ChatWindow-typing d-flex px-3 position-absolute bottom-0 start-0 w-100 bg-inherit align-items-center">
-            <Typing channel="channel.thread" size="'medium'"/>
+            <Typing channel="channel" size="'medium'"/>
         </div>
     </div>
 </t>
diff --git a/addons/mail/static/src/core/common/im_status.xml b/addons/mail/static/src/core/common/im_status.xml
index 32ccabb82e801..74bd25d54a99d 100644
--- a/addons/mail/static/src/core/common/im_status.xml
+++ b/addons/mail/static/src/core/common/im_status.xml
@@ -24,7 +24,7 @@
                     </t>
                     <div t-if="props.member?.isTyping" class="rounded-pill" style="padding: 1px;" t-att-class="{ 'bg-300': env.inChatBubble, 'bg-inherit': !env.inChatBubble }">
                         <div class="bg-success rounded-pill" style="padding: 3px;">
-                            <Typing member="props.member" channel="props.member.threadAsTyping" size="['sm', 'smaller'].includes(props.size) ? 'sm' : 'md'" displayText="false" />
+                            <Typing member="props.member" size="['sm', 'smaller'].includes(props.size) ? 'sm' : 'md'" displayText="false" />
                         </div>
                     </div>
                 </t>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_model.js b/addons/mail/static/src/discuss/core/common/channel_member_model.js
index 72a2e79b81e6d..b5e3bdba7a997 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_model.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_model.js
@@ -101,9 +101,9 @@ export class ChannelMember extends Record {
             }
         },
     });
-    threadAsTyping = fields.One("mail.thread", {
+    channelAsTyping = fields.One("discuss.channel", {
         compute() {
-            return this.isTyping ? this.channel_id : undefined;
+            return this.isTyping ? this.channel_id.channel : undefined;
         },
         eager: true,
         onDelete() {
diff --git a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
index f59ccbfa23ea5..3330d417e30e2 100644
--- a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
+++ b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
@@ -50,6 +50,12 @@ export class DiscussChannel extends Record {
     chatWindow = fields.One("ChatWindow", {
         inverse: "channel",
     });
+    hasOtherMembersTyping = fields.Attr(false, {
+        /** @this {import("models").Thread} */
+        compute() {
+            return this.otherTypingMembers.length > 0;
+        },
+    });
     /** @type {number} */
     id = fields.Attr(undefined, {
         onUpdate() {
@@ -59,6 +65,12 @@ export class DiscussChannel extends Record {
             }
         },
     });
+    otherTypingMembers = fields.Many("discuss.channel.member", {
+        /** @this {import("models").Thread} */
+        compute() {
+            return this.typingMembers.filter((member) => !member.persona?.eq(this.store.self));
+        },
+    });
     thread = fields.One("mail.thread", {
         compute() {
             return { id: this.id, model: "discuss.channel" };
@@ -67,6 +79,8 @@ export class DiscussChannel extends Record {
         onDelete: (r) => r?.delete(),
     });
 
+    typingMembers = fields.Many("discuss.channel.member", { inverse: "channelAsTyping" });
+
     delete(options = { closeChatWindow: true }) {
         if (this.chatWindow?.exists() && options.closeChatWindow) {
             this.chatWindow.close();
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index 2dd96d54e877e..2a3fcdeef14d8 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -52,12 +52,6 @@ const threadPatch = {
         /** @type {"not_fetched"|"fetching"|"fetched"} */
         this.fetchChannelInfoState = "not_fetched";
         this.group_ids = fields.Many("res.groups");
-        this.hasOtherMembersTyping = fields.Attr(false, {
-            /** @this {import("models").Thread} */
-            compute() {
-                return this.otherTypingMembers.length > 0;
-            },
-        });
         this.hasSeenFeature = fields.Attr(false, {
             /** @this {import("models").Thread} */
             compute() {
@@ -162,12 +156,6 @@ const threadPatch = {
                 );
             },
         });
-        this.otherTypingMembers = fields.Many("discuss.channel.member", {
-            /** @this {import("models").Thread} */
-            compute() {
-                return this.typingMembers.filter((member) => !member.persona?.eq(this.store.self));
-            },
-        });
         this.self_member_id = fields.One("discuss.channel.member", {
             inverse: "threadAsSelf",
         });
@@ -185,7 +173,6 @@ const threadPatch = {
                 this.store.updateBusSubscription();
             },
         });
-        this.typingMembers = fields.Many("discuss.channel.member", { inverse: "threadAsTyping" });
     },
     /** @returns {import("models").ChannelMember[]} */
     _computeOfflineMembers() {
diff --git a/addons/mail/static/src/discuss/typing/common/composer_patch.xml b/addons/mail/static/src/discuss/typing/common/composer_patch.xml
index 0ac2a78db5a50..80fef5ee7f1a9 100644
--- a/addons/mail/static/src/discuss/typing/common/composer_patch.xml
+++ b/addons/mail/static/src/discuss/typing/common/composer_patch.xml
@@ -3,7 +3,7 @@
     <t t-inherit="mail.Composer" t-inherit-mode="extension">
         <xpath expr="//AttachmentList" position="after">
             <div t-if="thread?.model === 'discuss.channel' and !compact and !env.inMeetingView" class="o-discuss-Typing d-flex">
-                <Typing channel="thread" size="'medium'"/>
+                <Typing channel="thread.channel" size="'medium'"/>
             </div>
         </xpath>
     </t>
diff --git a/addons/mail/static/src/discuss/typing/common/thread_icon_patch.xml b/addons/mail/static/src/discuss/typing/common/thread_icon_patch.xml
index e2b041c6b3d98..bda31ddbf9fb1 100644
--- a/addons/mail/static/src/discuss/typing/common/thread_icon_patch.xml
+++ b/addons/mail/static/src/discuss/typing/common/thread_icon_patch.xml
@@ -2,9 +2,9 @@
 <templates xml:space="preserve">
     <t t-inherit="mail.ThreadIcon" t-inherit-mode="extension">
         <xpath expr="//t[@name='chat']" position="replace">
-            <div t-if="props.thread.hasOtherMembersTyping" class="bg-inherit rounded-pill" style="padding: 1px;">
+            <div t-if="props.thread.channel.hasOtherMembersTyping" class="bg-inherit rounded-pill" style="padding: 1px;">
                 <div class="bg-success rounded-pill" style="padding: 3px;">
-                    <Typing member="props.member" channel="props.thread" size="props.size" displayText="false" />
+                    <Typing channel="props.thread.channel" size="props.size" displayText="false" />
                 </div>
             </div>
             <t t-else="">$0</t>

From 0d4c18ffed277887cfdff8f10336adc24ac3398e Mon Sep 17 00:00:00 2001
From: chdh-odoo <chdh@odoo.com>
Date: Mon, 27 Oct 2025 16:31:55 +0530
Subject: [PATCH 133/673] [IMP] website: improve UI of HTML/CSS Editor warning
 modal

Enhance UI of warning modal displayed when using the "HTML/CSS Editor"
feature. Added cleaner layout and Linked directly to latest upgrade
documentation.

task-5190433

closes odoo/odoo#233166

Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../resource_editor_warning.xml               | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/website/static/src/components/resource_editor/resource_editor_warning.xml b/addons/website/static/src/components/resource_editor/resource_editor_warning.xml
index 9411a1f48eef7..e3e0b33bacc2b 100644
--- a/addons/website/static/src/components/resource_editor/resource_editor_warning.xml
+++ b/addons/website/static/src/components/resource_editor/resource_editor_warning.xml
@@ -4,19 +4,25 @@
 <t t-name="website.ResourceEditorWarningOverlay">
     <div t-if="state.visible" class="position-absolute top-0 start-0 bottom-0 end-0 d-flex align-items-center justify-content-center z-3 p-4 bg-light bg-opacity-75" role="alert">
         <div class="border shadow-sm p-4 bg-light text-dark rounded-2 bg-opacity-100">
-            <div class="d-flex flex-row gap-4">
-                <i class="fa fa-warning mb-4 fs-1 text-danger"/>
-                <div>
-                    <h1 class="fs-2 text-dark mb-4">Your changes might be lost during future Odoo upgrade.</h1>
-                    <p>If you need to add analytics or marketing tags, inject code in your &lt;head&gt; or &lt;body&gt; instead.</p>
-                    <em>Note: To embed code in this specific page, use the "Embed Code" building block</em>
-                    <div class="d-flex justify-content-between mt-5">
-                        <div class="d-flex gap-2">
-                            <button type="button" class="btn btn-primary" t-on-click="onInjectCode">Inject code in &lt;head&gt; or &lt;body&gt;</button>
-                            <button type="button" class="btn btn-secondary" t-on-click="onCloseEditor">Close editor</button>
-                        </div>
-                        <button type="button" class="btn btn-link" t-on-click="onHideWarning">Edit HTML anyway</button>
+            <div>
+                <h1 class="fs-2 text-dark mb-4">Your changes might be lost</h1>
+                <p class="mb-3">
+                    <i class="fa fa-info-circle"></i>
+                    Warning: Your changes may be overwritten after updates.
+                    To understand why,
+                    <a href="https://www.odoo.com/documentation/latest/administration/upgrade.html" target="_blank" class="link-primary">read more here</a>.
+                </p>
+                <p class="mb-3">To ensure you won’t lose your changes:</p>
+                <ul class="ps-4">
+                    <li>Add analytics or marketing tags? Inject code in &lt;head&gt; or &lt;body&gt;.</li>
+                    <li>Want to add code on this page? Use the “Embed Code” building block.</li>
+                </ul>
+                <div class="d-flex justify-content-between mt-5">
+                    <div class="d-flex gap-2">
+                        <button type="button" class="btn btn-primary" t-on-click="onInjectCode">Inject code in &lt;head&gt; or &lt;body&gt;</button>
+                        <button type="button" class="btn btn-secondary" t-on-click="onCloseEditor">Close</button>
                     </div>
+                    <button type="button" class="btn btn-link" t-on-click="onHideWarning">Edit code</button>
                 </div>
             </div>
         </div>

From 5be5896728c9c9fd02dce5002bed795ae9246818 Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Mon, 3 Nov 2025 14:23:18 +0100
Subject: [PATCH 134/673] [FIX] account: load CoA data from other modules with
 demo

Steps to reproduce:
* create a new database with a module inheriting a CoA and demo data
  activated (i.e. `-i l10n_co_edi --with-demo`)

The demo company won't load the additional data defined in the module,
in this case the data for the field `l10n_co_edi_type` with the call
from `<account.chart.template>._get_co_edi_account_tax`.
This is because during the recent refactor, the new flag `force_update`
had not been taken into account everywhere it should.

closes odoo/odoo#234157

See: 64f9dcb045231ea8cf2edb14de536decb8b9b508
Signed-off-by: John Laterre (jol) <jol@odoo.com>
---
 addons/account/models/chart_template.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index d52f8b81e117c..f3ebc0e47987a 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -409,10 +409,11 @@ def tax_template_changed(tax, template):
                             if rename_idx:
                                 tax_to_rename.name = f"[old{rename_idx - 1 if rename_idx > 1 else ''}] {tax_to_rename.name}"
                     else:
-                        fiscal_position_ids = values.get('fiscal_position_ids')
-                        original_tax_ids = values.get('original_tax_ids')
-                        repartition_lines = values.get('repartition_line_ids')
-                        values.clear()
+                        fiscal_position_ids = values.pop('fiscal_position_ids', None)
+                        original_tax_ids = values.pop('original_tax_ids', None)
+                        repartition_lines = values.pop('repartition_line_ids', None)
+                        if not force_update:
+                            values.clear()
                         # taxes will always be (re)linked to fiscal positions (unless the fp doesn't exist and won't be created)
                         if fiscal_position_ids:
                             link_commands = [

From bc1294d993783c7aa9654b1a41557f2120feb8c0 Mon Sep 17 00:00:00 2001
From: abhk-odoo <abhk@odoo.com>
Date: Mon, 27 Oct 2025 18:37:19 +0530
Subject: [PATCH 135/673] [IMP] pos_loyalty: show loyalty points on customer
 display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit:
=================
- The customer display did not show any information about loyalty points.
- Customers couldn’t see their earned or redeemed points during checkout.

After this commit:
=================
- Loyalty points are now displayed on the customer display screen.
- The display now shows the customer’s total balance, earned (won), and
spent points during checkout.

Task - 5184627

closes odoo/odoo#233367

Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../src/customer_display/customer_display.xml |  2 +-
 addons/pos_loyalty/__manifest__.py            |  7 +++
 .../customer_display_adapter.js               |  9 ++++
 .../customer_display.xml                      | 31 ++++++++++++
 .../tests/tours/customer_display_tour.js      | 48 +++++++++++++++++++
 addons/pos_loyalty/tests/test_frontend.py     |  3 ++
 6 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 addons/pos_loyalty/static/src/app/customer_display/customer_display_adapter.js
 create mode 100644 addons/pos_loyalty/static/src/overrides/customer_display_overrides/customer_display.xml
 create mode 100644 addons/pos_loyalty/static/tests/tours/customer_display_tour.js

diff --git a/addons/point_of_sale/static/src/customer_display/customer_display.xml b/addons/point_of_sale/static/src/customer_display/customer_display.xml
index 1e1cb1d6473d4..c4b00e210ecc3 100644
--- a/addons/point_of_sale/static/src/customer_display/customer_display.xml
+++ b/addons/point_of_sale/static/src/customer_display/customer_display.xml
@@ -102,7 +102,7 @@
                     </div>
                 </div>
 
-                <div t-if="order.amount and !order.finalized" class="py-3 px-4 bg-view border-top">
+                <div t-if="order.amount and !order.finalized" class="o_customer_display_total py-3 px-4 bg-view border-top">
                     <div class="d-flex flex-column justify-content-center gap-1 w-100 w-sm-50 ms-auto">
                         <div class="row fs-2 fw-bolder">
                             <div class="col text-end">Total</div>
diff --git a/addons/pos_loyalty/__manifest__.py b/addons/pos_loyalty/__manifest__.py
index cdb5dacb058a0..da906d4d4a6da 100644
--- a/addons/pos_loyalty/__manifest__.py
+++ b/addons/pos_loyalty/__manifest__.py
@@ -31,6 +31,13 @@
         'point_of_sale._assets_pos': [
             'pos_loyalty/static/src/**/*',
             ('remove', 'pos_loyalty/static/src/portal/*'),
+            ('remove', 'pos_loyalty/static/src/overrides/customer_display_overrides/customer_display.xml'),
+        ],
+        'point_of_sale.customer_display_assets': [
+            'pos_loyalty/static/src/overrides/customer_display_overrides/customer_display.xml',
+        ],
+        'point_of_sale.customer_display_assets_test': [
+            'pos_loyalty/static/tests/tours/customer_display_tour.js',
         ],
         'web.assets_tests': [
             'pos_loyalty/static/tests/tours/**/*',
diff --git a/addons/pos_loyalty/static/src/app/customer_display/customer_display_adapter.js b/addons/pos_loyalty/static/src/app/customer_display/customer_display_adapter.js
new file mode 100644
index 0000000000000..6c9a2b655f8e5
--- /dev/null
+++ b/addons/pos_loyalty/static/src/app/customer_display/customer_display_adapter.js
@@ -0,0 +1,9 @@
+import { patch } from "@web/core/utils/patch";
+import { CustomerDisplayPosAdapter } from "@point_of_sale/app/customer_display/customer_display_adapter";
+
+patch(CustomerDisplayPosAdapter.prototype, {
+    formatOrderData(order) {
+        super.formatOrderData(order);
+        this.data.loyaltyData = order?.getLoyaltyPoints() || [];
+    },
+});
diff --git a/addons/pos_loyalty/static/src/overrides/customer_display_overrides/customer_display.xml b/addons/pos_loyalty/static/src/overrides/customer_display_overrides/customer_display.xml
new file mode 100644
index 0000000000000..3695d75ce89de
--- /dev/null
+++ b/addons/pos_loyalty/static/src/overrides/customer_display_overrides/customer_display.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="pos_loyalty.CustomerDisplay" t-inherit="point_of_sale.CustomerDisplay" t-inherit-mode="extension">
+        <xpath expr="//div[hasclass('o_customer_display_total')]" position="after">
+            <t t-if="order and order.amount and !order.finalized and order.loyaltyData">
+                <div class="border-top px-4 py-2 bg-white">
+                    <t t-foreach="order.loyaltyData or []" t-as="_loyaltyStat" t-key="_loyaltyStat.couponId">
+                        <div
+                            t-if="_loyaltyStat.points.won or _loyaltyStat.points.spent"
+                            class="d-flex justify-content-between align-items-center py-1 flex-wrap"
+                        >
+                            <div class="loyalty-points-title fs-4 fw-semibold" t-out="_loyaltyStat.points.name"/>
+
+                            <div class="d-flex align-items-center gap-1 fw-bold fs-4 flex-nowrap text-end">
+                                <span t-if="_loyaltyStat.points.balance" class="loyalty-points-balance" t-out="_loyaltyStat.points.balance"/>
+                                <span t-if="_loyaltyStat.points.won" class="loyalty-points-won text-success">
+                                    + <t t-out="_loyaltyStat.points.won"/>
+                                </span>
+                                <span t-if="_loyaltyStat.points.spent" class="loyalty-points-spent text-danger">
+                                    - <t t-out="_loyaltyStat.points.spent"/>
+                                </span>
+                                <span class="text-muted mx-1">=</span>
+                                <span class="loyalty-points-total fw-bolder" t-out="_loyaltyStat.points.total"/>
+                            </div>
+                        </div>
+                    </t>
+                </div>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/addons/pos_loyalty/static/tests/tours/customer_display_tour.js b/addons/pos_loyalty/static/tests/tours/customer_display_tour.js
new file mode 100644
index 0000000000000..511a7a016c998
--- /dev/null
+++ b/addons/pos_loyalty/static/tests/tours/customer_display_tour.js
@@ -0,0 +1,48 @@
+import { registry } from "@web/core/registry";
+import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
+import * as CustomerDisplay from "@point_of_sale/../tests/customer_display/customer_display_utils";
+
+const ADD_PRODUCT = JSON.stringify({
+    ...JSON.parse(CustomerDisplay.ADD_PRODUCT),
+    loyaltyData: [
+        {
+            couponId: 101,
+            points: {
+                won: 25,
+                spent: 10,
+                total: 65,
+                balance: 50,
+                name: "Loyalty Points",
+            },
+        },
+    ],
+});
+
+registry.category("web_tour.tours").add("test_customer_display_loyalty_points", {
+    steps: () =>
+        [
+            CustomerDisplay.addProduct(ADD_PRODUCT, "add product"),
+            Order.hasLine({ productName: "Letter Tray", price: "2,972.75" }),
+            CustomerDisplay.amountIs("Total", "2,972.75"),
+            {
+                content: "Check that the title should be Loyalty Points",
+                trigger: ".loyalty-points-title:contains(Loyalty Points)",
+            },
+            {
+                content: "Check loyalty balance points are displayed correctly",
+                trigger: ".loyalty-points-balance:contains(50)",
+            },
+            {
+                content: "Check loyalty won points are displayed correctly in green",
+                trigger: ".loyalty-points-won.text-success:contains(+ 25)",
+            },
+            {
+                content: "Check loyalty spent points are displayed correctly in red",
+                trigger: ".loyalty-points-spent.text-danger:contains(- 10)",
+            },
+            {
+                content: "Check loyalty total points are displayed correctly",
+                trigger: ".loyalty-points-total.fw-bolder:contains(65)",
+            },
+        ].flat(),
+});
diff --git a/addons/pos_loyalty/tests/test_frontend.py b/addons/pos_loyalty/tests/test_frontend.py
index cdc33d443aee0..5265f0074ea2b 100644
--- a/addons/pos_loyalty/tests/test_frontend.py
+++ b/addons/pos_loyalty/tests/test_frontend.py
@@ -3435,3 +3435,6 @@ def test_min_qty_points_awarded(self):
             login="pos_user",
         )
         self.assertEqual(loyalty_card.points, 90)
+
+    def test_customer_display_loyalty_points(self):
+        self.start_tour(f"/pos_customer_display/{self.main_pos_config.id}/{self.main_pos_config.access_token}", 'test_customer_display_loyalty_points', login="pos_user")

From e7aa67125734a07d07b235da9f3fe683eee6c10c Mon Sep 17 00:00:00 2001
From: Zelong Lin <zel@odoo.com>
Date: Thu, 30 Oct 2025 11:17:39 +0100
Subject: [PATCH 136/673] [IMP] mail: introduce MentionPlugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit introduces a new MentionPlugin to handle user mentions
in the mail composer. The MentionPlugin is responsible for detecting and
validating mentions. It listens to selection changes and processes
mention elements accordingly.

This commit also moves part of the prepareMessageBody logic to the
MentionPlugin, so that we can finally get rid of the prepareMessageBody in the future
and get what you see is what you get in the composer.

task-5137057

closes odoo/odoo#232538

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/common/message.js | 11 +---
 .../src/core/common/plugin/mention_plugin.js  | 61 +++++++++++++++++++
 .../src/core/common/plugin/plugin_sets.js     |  2 +
 .../static/src/core/common/store_service.js   | 15 +++++
 .../tests/suggestion/suggestion.test.js       | 22 ++++++-
 5 files changed, 101 insertions(+), 10 deletions(-)
 create mode 100644 addons/mail/static/src/core/common/plugin/mention_plugin.js

diff --git a/addons/mail/static/src/core/common/message.js b/addons/mail/static/src/core/common/message.js
index 2b7b0c6316bab..1c5bb6b6706f2 100644
--- a/addons/mail/static/src/core/common/message.js
+++ b/addons/mail/static/src/core/common/message.js
@@ -434,15 +434,8 @@ export class Message extends Component {
         }
         const editedEl = bodyEl.querySelector(".o-mail-Message-edited");
         editedEl?.replaceChildren(renderToElement("mail.Message.edited"));
-        for (const linkEl of bodyEl.querySelectorAll(".o_channel_redirect")) {
-            const text = linkEl.textContent.substring(1); // remove '#' prefix
-            const icon = linkEl.classList.contains("o_channel_redirect_asThread")
-                ? "fa fa-comments-o"
-                : "fa fa-hashtag";
-            const iconEl = renderToElement("mail.Message.mentionedChannelIcon", { icon });
-            linkEl.replaceChildren(iconEl);
-            linkEl.insertAdjacentText("beforeend", ` ${text}`);
-        }
+        const channelLinks = bodyEl.querySelectorAll("a.o_channel_redirect");
+        this.store.handleValidChannelMention(Array.from(channelLinks));
         for (const el of bodyEl.querySelectorAll(".o_message_redirect")) {
             // only transform links targetting the same database
             if (el.getAttribute("href")?.startsWith(getOrigin())) {
diff --git a/addons/mail/static/src/core/common/plugin/mention_plugin.js b/addons/mail/static/src/core/common/plugin/mention_plugin.js
new file mode 100644
index 0000000000000..3547a4124ce90
--- /dev/null
+++ b/addons/mail/static/src/core/common/plugin/mention_plugin.js
@@ -0,0 +1,61 @@
+import { Plugin } from "@html_editor/plugin";
+import { generateThreadMentionElement } from "@mail/utils/common/format";
+
+export class MentionPlugin extends Plugin {
+    static id = "mention";
+    static dependencies = ["selection", "history"];
+    resources = {
+        selectionchange_handlers: this.detectMentions.bind(this),
+    };
+
+    setup() {
+        super.setup();
+        /** @type {import("models").Store} */
+        this.store = this.services["mail.store"];
+    }
+
+    get MENTION_SELECTORS() {
+        return [
+            {
+                selector: "a.o_channel_redirect",
+                checker: (el) => this.isValidChannelMentionElement(el),
+                validMentionsHandler: (channelLinks) => {
+                    this.store.handleValidChannelMention(channelLinks);
+                    this.dependencies.history.addStep();
+                },
+            },
+        ];
+    }
+
+    async detectMentions(ev) {
+        for (const { selector, checker, validMentionsHandler } of this.MENTION_SELECTORS) {
+            const mentionLinks = Array.from(this.editable.querySelectorAll(selector)) || [];
+            const validMentionLinks = (
+                await Promise.all(
+                    mentionLinks.map(async (el) => ({
+                        el,
+                        isValid: await checker(el),
+                    }))
+                )
+            )
+                .filter(({ isValid }) => isValid)
+                .map(({ el }) => el);
+            validMentionsHandler?.(validMentionLinks);
+        }
+    }
+
+    async isValidChannelMentionElement(el) {
+        if (el.dataset.oeModel !== "discuss.channel") {
+            return false;
+        }
+        const channel = await this.store["discuss.channel"].getOrFetch(Number(el.dataset.oeId));
+        if (!channel) {
+            return false;
+        }
+        const validChannelMention = generateThreadMentionElement(channel);
+        return (
+            validChannelMention.getAttribute("href") === el.getAttribute("href") &&
+            [...validChannelMention.classList].every((cls) => el.classList.contains(cls))
+        );
+    }
+}
diff --git a/addons/mail/static/src/core/common/plugin/plugin_sets.js b/addons/mail/static/src/core/common/plugin/plugin_sets.js
index a87f2359f8f54..1bdfe54359f37 100644
--- a/addons/mail/static/src/core/common/plugin/plugin_sets.js
+++ b/addons/mail/static/src/core/common/plugin/plugin_sets.js
@@ -10,6 +10,7 @@ import { TabulationPlugin } from "@html_editor/main/tabulation_plugin";
 import { ToolbarPlugin } from "@html_editor/main/toolbar/toolbar_plugin";
 
 import { MailComposerPlugin } from "@mail/core/common/plugin/mail_composer_plugin";
+import { MentionPlugin } from "@mail/core/common/plugin/mention_plugin";
 
 export const MAIL_CORE_PLUGINS = [
     ...CORE_PLUGINS,
@@ -20,6 +21,7 @@ export const MAIL_CORE_PLUGINS = [
     InlineCodePlugin,
     LinkPlugin,
     MailComposerPlugin,
+    MentionPlugin,
     ShortCutPlugin,
     TabulationPlugin,
 ];
diff --git a/addons/mail/static/src/core/common/store_service.js b/addons/mail/static/src/core/common/store_service.js
index 122885f42a08c..9562564d82164 100644
--- a/addons/mail/static/src/core/common/store_service.js
+++ b/addons/mail/static/src/core/common/store_service.js
@@ -9,6 +9,7 @@ import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { user } from "@web/core/user";
 import { Deferred, Mutex } from "@web/core/utils/concurrency";
+import { renderToElement } from "@web/core/utils/render";
 import { debounce } from "@web/core/utils/timing";
 import { session } from "@web/session";
 import { browser } from "@web/core/browser/browser";
@@ -489,6 +490,20 @@ export class Store extends BaseStore {
         );
     }
 
+    handleValidChannelMention(channelLinks) {
+        for (const linkEl of channelLinks.filter(
+            (el) => !el.querySelector(".fa-comments-o, .fa-hashtag")
+        )) {
+            const text = linkEl.textContent.substring(1); // remove '#' prefix
+            const icon = linkEl.classList.contains("o_channel_redirect_asThread")
+                ? "fa fa-comments-o"
+                : "fa fa-hashtag";
+            const iconEl = renderToElement("mail.Message.mentionedChannelIcon", { icon });
+            linkEl.replaceChildren(iconEl);
+            linkEl.insertAdjacentText("beforeend", ` ${text}`);
+        }
+    }
+
     getMentionsFromText(
         body,
         { mentionedChannels = [], mentionedPartners = [], mentionedRoles = [] } = {}
diff --git a/addons/mail/static/tests/suggestion/suggestion.test.js b/addons/mail/static/tests/suggestion/suggestion.test.js
index 902cbb9953995..b46ec69ccd297 100644
--- a/addons/mail/static/tests/suggestion/suggestion.test.js
+++ b/addons/mail/static/tests/suggestion/suggestion.test.js
@@ -586,8 +586,28 @@ test("mention a channel thread", async () => {
     await contains(".o-mail-Composer-suggestion:eq(1):has(i.fa-comments-o)", {
         text: "GeneralThreadOne",
     });
+    await click(".o-mail-Composer-suggestion:eq(0)");
+    await contains(
+        ".o-mail-Composer-html.odoo-editor-editable a.o_channel_redirect:has(i.fa-hashtag)",
+        { text: "General" }
+    );
+    await press("Enter");
+    await contains(".o-mail-Message a.o_channel_redirect", {
+        text: "General",
+    });
+    await contains(".o-mail-Composer-html.odoo-editor-editable", { text: "" });
+    await focus(".o-mail-Composer-html.odoo-editor-editable");
+    await htmlInsertText(editor, "#");
+    await contains(".o-mail-Composer-suggestion", { count: 2 });
+    await contains(".o-mail-Composer-suggestion:eq(0):has(i.fa-hashtag)", { text: "General" });
+    await contains(".o-mail-Composer-suggestion:eq(1):has(i.fa-comments-o)", {
+        text: "GeneralThreadOne",
+    });
     await click(".o-mail-Composer-suggestion:eq(1)");
-    await contains(".o-mail-Composer-html.odoo-editor-editable", { text: "#General > ThreadOne" });
+    await contains(
+        ".o-mail-Composer-html.odoo-editor-editable a.o_channel_redirect:has(i.fa-comments-o)",
+        { text: "General > ThreadOne" }
+    );
     await press("Enter");
     await contains(".o-mail-Message a.o_channel_redirect:has(i.fa-comments-o)", {
         text: "General > ThreadOne",

From 270e35b968f4bbf20cea80f063080dbb135dbb53 Mon Sep 17 00:00:00 2001
From: Bastien PIERRE <ipb@odoo.com>
Date: Tue, 28 Oct 2025 08:40:02 +0000
Subject: [PATCH 137/673] [FIX] base: fix date formats

closes odoo/odoo#233594

Task-id: 5194672
X-original-commit: 09f044c71d4f18ac79c0285a47c60af3c23d22f0
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
Signed-off-by: Bastien Pierre (ipb) <ipb@odoo.com>
---
 odoo/addons/base/data/res.lang.csv  | 70 ++++++++++++++---------------
 odoo/addons/base/models/res_lang.py |  3 ++
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/odoo/addons/base/data/res.lang.csv b/odoo/addons/base/data/res.lang.csv
index 0c767184fc966..dad2be058aae2 100644
--- a/odoo/addons/base/data/res.lang.csv
+++ b/odoo/addons/base/data/res.lang.csv
@@ -3,19 +3,19 @@
 "base.lang_am_ET","Amharic / አምሃርኛ","am_ET","am_ET","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
 "base.lang_ar","Arabic / الْعَرَبيّة","ar_001","ar","Right-to-Left","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","6"
 "base.lang_ar_SY","Arabic (Syria) / الْعَرَبيّة","ar_SY","ar_SY","Right-to-Left","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","6"
-"base.lang_az","Azerbaijani / Azərbaycanca","az_AZ","az","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_az","Azerbaijani / Azərbaycanca","az_AZ","az","Left-to-Right","[3,0]",","," ","%Y-%m-%d","%H:%M:%S","1"
 "base.lang_eu_ES","Basque / Euskara","eu_ES","eu_ES","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_be","Belarusian / Беларуская мова","be_BY","be","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_bn_IN","Bengali / বাংলা","bn_IN","bn_IN","Left-to-Right","[3,0]",",","","%d/%m/%Y","%I:%M:%S %p","1"
-"base.lang_bs_BA","Bosnian / Bosanski jezik","bs_BA","bs","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_bg","Bulgarian / български език","bg_BG","bg","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_bs_BA","Bosnian / bosanski jezik","bs_BA","bs","Left-to-Right","[3,0]",",",".","%Y-%m-%d","%H:%M:%S","1"
+"base.lang_bg","Bulgarian / български език","bg_BG","bg","Left-to-Right","[3,0]",",","","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_ca_ES","Catalan / Català","ca_ES","ca_ES","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_zh_CN","Chinese, Simplified / 简体中文","zh_CN","zh_CN","Left-to-Right","[3,0]",".",",","%Y-%m-%d","%H:%M:%S","7"
-"base.lang_zh_HK","Chinese, Traditional (HK) / 繁體中文 (香港)","zh_HK","zh_HK","Left-to-Right","[3,0]",".",",","%Y-%m-%d","%I:%M:%S %p","7"
+"base.lang_zh_CN","Chinese, Simplified / 简体中文","zh_CN","zh_CN","Left-to-Right","[3,0]",".",",","%Y/%m/%d","%H:%M:%S","7"
+"base.lang_zh_HK","Chinese, Traditional (HK) / 繁體中文 (香港)","zh_HK","zh_HK","Left-to-Right","[3,0]",".",",","%m/%d/%Y","%I:%M:%S %p","7"
 "base.lang_zh_TW","Chinese, Traditional (TW) / 繁體中文 (台灣)","zh_TW","zh_TW","Left-to-Right","[3,0]",".",",","%Y/%m/%d","%H:%M:%S","7"
-"base.lang_hr","Croatian / Hrvatski jezik","hr_HR","hr","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_cs_CZ","Czech / Čeština","cs_CZ","cs_CZ","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_da_DK","Danish / Dansk","da_DK","da_DK","Left-to-Right","[3,0]",",",".","%d-%m-%Y","%H:%M:%S","1"
+"base.lang_hr","Croatian / hrvatski jezik","hr_HR","hr","Left-to-Right","[3,0]",",",".","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_cs_CZ","Czech / Čeština","cs_CZ","cs_CZ","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_da_DK","Danish / Dansk","da_DK","da_DK","Left-to-Right","[3,0]",",",".","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_nl_BE","Dutch (BE) / Nederlands (BE)","nl_BE","nl_BE","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_nl","Dutch / Nederlands","nl_NL","nl","Left-to-Right","[3,0]",",",".","%d-%m-%Y","%H:%M:%S","1"
 "base.lang_en_AU","English (AU)","en_AU","en_AU","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
@@ -23,47 +23,47 @@
 "base.lang_en_GB","English (UK)","en_GB","en_GB","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_en_IN","English (IN)","en_IN","en_IN","Left-to-Right","[3,2,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
 "base.lang_en_NZ","English (NZ)","en_NZ","en_NZ","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
-"base.lang_et_EE","Estonian / Eesti keel","et_EE","et","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_fi","Finnish / Suomi","fi_FI","fi","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_et_EE","Estonian / Eesti keel","et_EE","et","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_fi","Finnish / Suomi","fi_FI","fi","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_fr_BE","French (BE) / Français (BE)","fr_BE","fr_BE","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_fr_CA","French (CA) / Français (CA)","fr_CA","fr_CA","Left-to-Right","[3,0]",","," ","%Y-%m-%d","%H:%M:%S","7"
-"base.lang_fr_CH","French (CH) / Français (CH)","fr_CH","fr_CH","Left-to-Right","[3,0]",".","'","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_fr_CH","French (CH) / Français (CH)","fr_CH","fr_CH","Left-to-Right","[3,0]",".","'","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_fr","French / Français","fr_FR","fr","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_gl_ES","Galician / Galego","gl_ES","gl","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_ka_GE","Georgian / ქართული ენა","ka_GE","ka","Left-to-Right","[3,0]",",",".","%m/%d/%Y","%H:%M:%S","1"
-"base.lang_de","German / Deutsch","de_DE","de","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_de_CH","German (CH) / Deutsch (CH)","de_CH","de_CH","Left-to-Right","[3,0]",".","'","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_ka_GE","Georgian / ქართული ენა","ka_GE","ka","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_de","German / Deutsch","de_DE","de","Left-to-Right","[3,0]",",",".","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_de_CH","German (CH) / Deutsch (CH)","de_CH","de_CH","Left-to-Right","[3,0]",".","'","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_el_GR","Greek / Ελληνικά","el_GR","el_GR","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%I:%M:%S %p","1"
 "base.lang_gu_IN","Gujarati / ગુજરાતી","gu_IN","gu","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
-"base.lang_he_IL","Hebrew / עברית","he_IL","he","Right-to-Left","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
+"base.lang_he_IL","Hebrew / עברית","he_IL","he","Right-to-Left","[3,0]",".",",","%d.%m.%Y","%H:%M:%S","7"
 "base.lang_hi_IN","Hindi / हिंदी","hi_IN","hi","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
-"base.lang_hu","Hungarian / Magyar","hu_HU","hu","Left-to-Right","[3,0]",",",".","%Y-%m-%d","%H:%M:%S","1"
+"base.lang_hu","Hungarian / Magyar","hu_HU","hu","Left-to-Right","[3,0]",",",".","%Y.%m.%d","%H:%M:%S","1"
 "base.lang_id","Indonesian / Bahasa Indonesia","id_ID","id","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_it","Italian / Italiano","it_IT","it","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_ja_JP","Japanese / 日本語","ja_JP","ja","Left-to-Right","[3,0]",".",",","%Y-%m-%d","%H:%M:%S","7"
+"base.lang_ja_JP","Japanese / 日本語","ja_JP","ja","Left-to-Right","[3,0]",".",",","%Y/%m/%d","%H:%M:%S","7"
 "base.lang_kab_DZ","Kabyle / Taqbaylit","kab_DZ","kab","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","6"
 "base.lang_km","Khmer / ភាសាខ្មែរ","km_KH","km","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
-"base.lang_ko_KP","Korean (KP) / 한국어 (KP)","ko_KP","ko_KP","Left-to-Right","[3,0]",".",",","%Y/%m/%d","%I:%M:%S %p","1"
-"base.lang_ko_KR","Korean (KR) / 한국어 (KR)","ko_KR","ko_KR","Left-to-Right","[3,0]",".",",","%Y/%m/%d","%H:%M:%S","7"
+"base.lang_ko_KP","Korean (KP) / 한국어 (KP)","ko_KP","ko_KP","Left-to-Right","[3,0]",".",",","%Y.%m.%d","%I:%M:%S %p","1"
+"base.lang_ko_KR","Korean (KR) / 한국어 (KR)","ko_KR","ko_KR","Left-to-Right","[3,0]",".",",","%Y.%m.%d","%H:%M:%S","7"
 "base.lang_lo_LA","Lao / ພາສາລາວ","lo_LA","lo","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
-"base.lang_lv","Latvian / Latviešu valoda","lv_LV","lv","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_lv","Latvian / latviešu valoda","lv_LV","lv","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_lt","Lithuanian / Lietuvių kalba","lt_LT","lt","Left-to-Right","[3,0]",",",".","%Y-%m-%d","%H:%M:%S","1"
 "base.lang_lb","Luxembourgish","lb_LU","lb","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_mk","Macedonian / Македонски јазик","mk_MK","mk","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_ml","Malayalam / മലയാളം","ml_IN","ml","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_mn","Mongolian / Монгол","mn_MN","mn","Left-to-Right","[3,0]",".","'","%Y-%m-%d","%H:%M:%S","7"
+"base.lang_mn","Mongolian / монгол","mn_MN","mn","Left-to-Right","[3,0]",".","'","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_ms","Malay / Bahasa Melayu","ms_MY","ms","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_my","Burmese / ဗမာစာ","my_MM","my","Left-to-Right","[3,0]",".",",","%Y-%m-%d","%I:%M:%S %p","7"
-"base.lang_nb_NO","Norwegian Bokmål / Norsk bokmål","nb_NO","nb_NO","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_my","Burmese / ဗမာစာ","my_MM","my","Left-to-Right","[3,0]",".",",","%m/%d/%Y","%I:%M:%S %p","7"
+"base.lang_nb_NO","Norwegian Bokmål / Norsk bokmål","nb_NO","nb_NO","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_fa_IR","Persian / فارسی","fa_IR","fa","Right-to-Left","[3,0]",".",",","%Y/%m/%d","%H:%M:%S","6"
-"base.lang_pl","Polish / Język polski","pl_PL","pl","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_pt_AO","Portuguese (AO) / Português (AO)","pt_AO","pt_AO","Left-to-Right","[3,0]",",","","%d-%m-%Y","%H:%M:%S","1"
+"base.lang_pl","Polish / Język polski","pl_PL","pl","Left-to-Right","[3,0]",",","","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_pt_AO","Portuguese (AO) / Português (AO)","pt_AO","pt_AO","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_pt_BR","Portuguese (BR) / Português (BR)","pt_BR","pt_BR","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","7"
-"base.lang_pt","Portuguese / Português","pt_PT","pt","Left-to-Right","[3,0]",",","","%d-%m-%Y","%H:%M:%S","1"
-"base.lang_ro","Romanian / Română","ro_RO","ro","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_ru","Russian / Русский язык","ru_RU","ru","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_sr@Cyrl","Serbian (Cyrillic) / Српски","sr@Cyrl","sr@Cyrl","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","7"
-"base.lang_sr@latin","Serbian (Latin) / Srpski","sr@latin","sr@latin","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
+"base.lang_pt","Portuguese / Português","pt_PT","pt","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_ro","Romanian / română","ro_RO","ro","Left-to-Right","[3,0]",",",".","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_ru","Russian / русский язык","ru_RU","ru","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_sr@Cyrl","Serbian (Cyrillic) / српски","sr@Cyrl","sr@Cyrl","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","7"
+"base.lang_sr@latin","Serbian (Latin) / srpski","sr@latin","sr@latin","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_sk","Slovak / Slovenský jazyk","sk_SK","sk","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_sl_SI","Slovenian / Slovenščina","sl_SI","sl","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_es_419","Spanish (Latin America) / Español (América Latina)","es_419","es_419","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
@@ -76,7 +76,7 @@
 "base.lang_es_EC","Spanish (EC) / Español (EC)","es_EC","es_EC","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_es_GT","Spanish (GT) / Español (GT)","es_GT","es_GT","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_es_MX","Spanish (MX) / Español (MX)","es_MX","es_MX","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
-"base.lang_es_PA","Spanish (PA) / Español (PA)","es_PA","es_PA","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
+"base.lang_es_PA","Spanish (PA) / Español (PA)","es_PA","es_PA","Left-to-Right","[3,0]",".",",","%m/%d/%Y","%H:%M:%S","7"
 "base.lang_es_PE","Spanish (PE) / Español (PE)","es_PE","es_PE","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_es_PY","Spanish (PY) / Español (PY)","es_PY","es_PY","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_es_UY","Spanish (UY) / Español (UY)","es_UY","es_UY","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
@@ -86,8 +86,8 @@
 "base.lang_sv_SE","Swedish / Svenska","sv_SE","sv","Left-to-Right","[3,0]",","," ","%Y-%m-%d","%H:%M:%S","1"
 "base.lang_th","Thai / ภาษาไทย","th_TH","th","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_tl","Tagalog / Filipino","tl_PH","tl","Left-to-Right","[3,0]",".",",","%m/%d/%Y","%H:%M:%S","1"
-"base.lang_tr","Turkish / Türkçe","tr_TR","tr","Left-to-Right","[3,0]",",",".","%d-%m-%Y","%H:%M:%S","1"
-"base.lang_uk_UA","Ukrainian / Українська","uk_UA","uk","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_tr","Turkish / Türkçe","tr_TR","tr","Left-to-Right","[3,0]",",",".","%d.%m.%Y","%H:%M:%S","1"
+"base.lang_uk_UA","Ukrainian / українська","uk_UA","uk","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","1"
 "base.lang_vi_VN","Vietnamese / Tiếng Việt","vi_VN","vi","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_sq_AL","Albanian / Shqip","sq_AL","sq","Left-to-Right","[3,0]",",",".","%Y-%m-%d","%H:%M:%S","1"
-"base.lang_te_IN","Telugu / తెలుగు","te_IN","te","Left-to-Right","[3,0]",".",",","%d-%m-%Y","%I:%M:%S %p","7"
+"base.lang_sq_AL","Albanian / Shqip","sq_AL","sq","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_te_IN","Telugu / తెలుగు","te_IN","te","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","7"
diff --git a/odoo/addons/base/models/res_lang.py b/odoo/addons/base/models/res_lang.py
index 63dc0c5337ec2..2cce910d6ce97 100644
--- a/odoo/addons/base/models/res_lang.py
+++ b/odoo/addons/base/models/res_lang.py
@@ -64,6 +64,9 @@ def _get_date_format_selection(self):
             ('%d-%m-%Y', '31-01-%s' % current_year),
             ('%m-%d-%Y', '01-31-%s' % current_year),
             ('%Y-%m-%d', '%s-01-31' % current_year),
+            ('%d.%m.%Y', '31.01.%s' % current_year),
+            ('%m.%d.%Y', '01.31.%s' % current_year),
+            ('%Y.%m.%d', '%s.01.31' % current_year),
         ]
 
     name = fields.Char(required=True)

From fb438b48b81fd18b2ba3666914bf2a9eb5f8eff2 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Tue, 28 Oct 2025 14:29:36 +0100
Subject: [PATCH 138/673] [FIX] mass_mailing: use overlay offset for basic
 editor

In this prior [fix], overlays spawned by the HtmlBuilder and its children have a
modified offset in order to prevent the `MassMailingIframe` from unloading its
content.

However the `MassMailingHtmlField` also handles a Simple Editor feature, which
does not use the Builder.
This feature still uses an iframe and also uses overlays (popover toolbars).

This commit moves the [fix] in `MassMailingIframe` so that it applies also for
the Simple Editor.

[fix]: https://github.com/odoo/odoo/commit/dd31e31f3cecd4d23dc90f9c88780bf3b969a294

task-5217595

Part-of: odoo/odoo#233950
Signed-off-by: Thomas Josse (thjo) <thjo@odoo.com>
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../src/builder/mass_mailing_builder.js       | 21 +----------
 .../static/src/iframe/mass_mailing_iframe.js  | 24 +++++++++++++
 .../tests/mass_mailing_html_field.test.js     | 36 ++++++++++---------
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/addons/mass_mailing/static/src/builder/mass_mailing_builder.js b/addons/mass_mailing/static/src/builder/mass_mailing_builder.js
index 978bffe95ebe8..688eb81ac90fd 100644
--- a/addons/mass_mailing/static/src/builder/mass_mailing_builder.js
+++ b/addons/mass_mailing/static/src/builder/mass_mailing_builder.js
@@ -1,4 +1,4 @@
-import { Component, useSubEnv } from "@odoo/owl";
+import { Component } from "@odoo/owl";
 import { Builder } from "@html_builder/builder";
 import { CORE_PLUGINS } from "@html_builder/core/core_plugins";
 import { removePlugins } from "@html_builder/utils/utils";
@@ -14,25 +14,6 @@ export class MassMailingBuilder extends Component {
         toggleFullScreen: { type: Function },
     };
 
-    setup() {
-        const originalOverlay = this.env.services.overlay;
-        const subServices = Object.create(this.env.services);
-        subServices.overlay = Object.create(originalOverlay);
-        subServices.overlay.add = (c, props, opts = {}) => {
-            // The builder will use this new overlay that will guarantee:
-            // 1. Internal ordering of its different overlays
-            // 2. To not messup with owl's reconciliation of foreach when adding/removing overlays
-            // This is a sub-optimal fix to the more general issue of owl displacing nodes that contain
-            // an iframe, in which the iframe effectively unloads.
-            opts = {
-                ...opts,
-                sequence: (opts.sequence ?? 50) + 1000,
-            }
-            return originalOverlay.add(c, props, opts);
-        }
-        useSubEnv({ services: subServices });
-    }
-
     get builderProps() {
         const builderProps = Object.assign({}, this.props.builderProps);
         const massMailingPlugins = [
diff --git a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
index 0ee41d30de328..3f851b9eede9c 100644
--- a/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
+++ b/addons/mass_mailing/static/src/iframe/mass_mailing_iframe.js
@@ -4,6 +4,7 @@ import {
     onWillDestroy,
     onWillUpdateProps,
     status,
+    useComponent,
     useEffect,
     useRef,
     useState,
@@ -28,6 +29,28 @@ const MASS_MAILING_IFRAME_ASSETS = [
     "mass_mailing.assets_inside_builder_iframe",
 ];
 
+/**
+ * The MassMailingIframe will use this modified overlay service that will guarantee:
+ * 1. Internal ordering of its different overlays
+ * 2. To not mess up with owl's reconciliation of foreach when adding/removing overlays
+ * This is a sub-optimal fix to the more general issue of owl displacing nodes that contain
+ * an iframe, in which the iframe effectively unloads.
+ */
+export function useOverlayServiceOffset() {
+    const comp = useComponent();
+    const originalOverlay = comp.env.services.overlay;
+    const subServices = Object.create(comp.env.services);
+    subServices.overlay = Object.create(originalOverlay);
+    subServices.overlay.add = (C, props, opts = {}) => {
+        opts = {
+            ...opts,
+            sequence: (opts.sequence ?? 50) + 1000,
+        };
+        return originalOverlay.add(C, props, opts);
+    };
+    useSubEnv({ services: subServices });
+}
+
 export class MassMailingIframe extends Component {
     static template = "mass_mailing.MassMailingIframe";
     static components = {
@@ -52,6 +75,7 @@ export class MassMailingIframe extends Component {
     };
 
     setup() {
+        useOverlayServiceOffset();
         this.overlayRef = useChildRef();
         this.iframeRef = useForwardRefToParent("iframeRef");
         this.sidebarRef = useRef("sidebarRef");
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
index a111c68bc5a7a..2cb450591bf31 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
@@ -194,25 +194,26 @@ describe("field HTML", () => {
         // When those popovers are killed, OWL tries to reconcile its element List
         // in OverlayContainer, displaces the node that contains the iframe
         // and the editor subsequently crashes
-        const base64Img = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=";
-        onRpc("/html_editor/get_image_info", () => {
-            return {
-                original: { image_src: base64Img },
-            };
-        });
+        const base64Img =
+            "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=";
+        onRpc("/html_editor/get_image_info", () => ({
+            original: { image_src: base64Img },
+        }));
         class SomeModel extends models.Model {
-            _name = "some.model"
-            mailing_ids = fields.One2many({relation: "mailing.mailing"});
+            _name = "some.model";
+            mailing_ids = fields.One2many({ relation: "mailing.mailing" });
 
-            _records = [{
-                id: 1,
-                mailing_ids: [1],
-            }]
+            _records = [
+                {
+                    id: 1,
+                    mailing_ids: [1],
+                },
+            ];
         }
 
         Mailing._views["form"] = mailViewArch;
         defineModels([SomeModel]);
-        const arch = `<form><field name="mailing_ids"> <list><field name="display_name" /></list> </field></form>`
+        const arch = `<form><field name="mailing_ids"> <list><field name="display_name" /></list> </field></form>`;
         await mountView({
             type: "form",
             resModel: "some.model",
@@ -223,9 +224,12 @@ describe("field HTML", () => {
         await waitFor(".o_dialog");
         await contains(".o_dialog [data-name='event']").click();
         await waitFor(".o_dialog .o_mass_mailing-builder_sidebar", { timeout: 1000 });
-        await contains(".o_dialog :iframe p", { timeout: 1000}).click();
-        await waitFor(".o_dialog .o_mass_mailing-builder_sidebar .options-container-header:contains(Text)");
-        const overlayOptionsSelect = ".o-main-components-container .o-overlay-container .o_overlay_options"
+        await contains(".o_dialog :iframe p", { timeout: 1000 }).click();
+        await waitFor(
+            ".o_dialog .o_mass_mailing-builder_sidebar .options-container-header:contains(Text)"
+        );
+        const overlayOptionsSelect =
+            ".o-main-components-container .o-overlay-container .o_overlay_options";
         await waitFor(overlayOptionsSelect + ":has(button[title='Move up'])");
         await contains(".o_dialog :iframe img").click();
         await waitFor(overlayOptionsSelect + ":not(:has(button[title='Move up']))");

From b2304815288029654b7fed7fd2997c4d82133637 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Tue, 28 Oct 2025 15:51:33 +0100
Subject: [PATCH 139/673] [FIX] mass_mailing: ensure correct editor instance on
 record switch

Issue:
When switching from one record to another using the Form view pager, the
`activeTheme` was set to the theme value of the previous record, resulting in
the wrong Editor instance in some cases.

How to reproduce:
- Open the list view in Email Marketing
- Ensure there are 2 records in the list view:
  - one editable with the builder (default theme)
  - one editable with the simple editor (basic theme)
- click on the record with the simple editor
- use the pager to switch to the next record

Issue:
- switching from simple -> builder, the builder is not instanced but it should
  have been
- switching from builder -> simple, the builder is instanced but it should not
  have been

Resolution:
Update the active theme based on the value of the nextRecord instead of the
record currently in `props`, because `this.props.record` is updated after
`updateActiveTheme` is called.

task-5217595

Part-of: odoo/odoo#233950
Signed-off-by: Thomas Josse (thjo) <thjo@odoo.com>
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../html_field/mass_mailing_html_field.js     |  82 ++++++-----
 .../tests/mass_mailing_html_field.test.js     | 135 ++++++++++++++++--
 2 files changed, 171 insertions(+), 46 deletions(-)

diff --git a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
index 927b379845b5e..dc79446b22c53 100644
--- a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
@@ -8,11 +8,12 @@ import { ThemeSelector } from "@mass_mailing/themes/theme_selector/theme_selecto
 import { getCSSRules, toInline } from "@mail/views/web/fields/html_mail_field/convert_inline";
 import { onWillUpdateProps, status, toRaw, useEffect, useRef } from "@odoo/owl";
 import { loadBundle } from "@web/core/assets";
+import { Domain } from "@web/core/domain";
 import { registry } from "@web/core/registry";
 import { Deferred } from "@web/core/utils/concurrency";
 import { effect } from "@web/core/utils/reactive";
 import { useChildRef, useService } from "@web/core/utils/hooks";
-import { Domain } from "@web/core/domain";
+import { batched } from "@web/core/utils/timing";
 
 export class MassMailingHtmlField extends HtmlField {
     static template = "mass_mailing.HtmlField";
@@ -29,6 +30,16 @@ export class MassMailingHtmlField extends HtmlField {
     };
 
     setup() {
+        // Keep track of the next props before other `onWillUpdateProps`
+        // callbacks in super can be executed, to be able to compute the next
+        // activeTheme and next themeSelector display status just before the
+        // Component is patched.
+        let props = this.props;
+        onWillUpdateProps((nextProps) => {
+            if (nextProps !== this.props) {
+                props = nextProps;
+            }
+        });
         super.setup();
         this.themeService = useService("mass_mailing.themes");
         this.ui = useService("ui");
@@ -68,9 +79,9 @@ export class MassMailingHtmlField extends HtmlField {
             }
         });
 
-        let currentKey;
+        let currentKey = this.state.key;
         effect(
-            (state) => {
+            batched((state) => {
                 if (status(this) === "destroyed") {
                     return;
                 }
@@ -78,34 +89,15 @@ export class MassMailingHtmlField extends HtmlField {
                     // html value may have been reset from the server:
                     // - await the new iframe
                     this.resetIframe();
-                    // - ensure that the activeTheme is up to date.
-                    this.updateActiveTheme();
+                    // - ensure that the activeTheme is up to date with the next
+                    //   record.
+                    this.updateActiveTheme(props.record);
+                    // - ensure that the themeSelector is displayed if necessary
+                    //   for the next props.
+                    this.updateThemeSelector(props);
                     currentKey = state.key;
                 }
-            },
-            [this.state]
-        );
-
-        // Evaluate if the themeSelector should be displayed
-        effect(
-            (state) => {
-                if (status(this) === "destroyed") {
-                    return;
-                }
-                const activeTheme = state.activeTheme;
-                const showThemeSelector = state.showThemeSelector;
-                if (!activeTheme && !showThemeSelector && !this.props.readonly) {
-                    // Show the ThemeSelector when the theme is unknown and the content can be
-                    // changed (invalid value).
-                    state.showThemeSelector = true;
-                } else if ((activeTheme && showThemeSelector) || this.props.readonly) {
-                    state.showThemeSelector = false;
-                }
-                if (showThemeSelector && toRaw(state.showCodeView)) {
-                    // Never show the CodeView with the ThemeSelector.
-                    state.showCodeView = false;
-                }
-            },
+            }),
             [this.state]
         );
 
@@ -139,9 +131,14 @@ export class MassMailingHtmlField extends HtmlField {
         this.iframeLoaded.resolve(iframeLoaded);
     }
 
-    updateActiveTheme() {
+    updateActiveTheme(record = this.props.record) {
+        // This function is called in an `effect` with a dependency on
+        // `state.key` which already guarantees that the Component will be
+        // re-rendered. All further reads on the state should not add
+        // dependencies to that effect, so it is used raw.
+        const state = toRaw(this.state);
         const getThemeName = () => {
-            const value = this.value;
+            const value = record.data[this.props.name];
             if (!value) {
                 return;
             }
@@ -153,8 +150,27 @@ export class MassMailingHtmlField extends HtmlField {
             return this.themeService.getThemeName(layout.classList);
         };
         const activeTheme = getThemeName();
-        if (toRaw(this.state).activeTheme !== activeTheme) {
-            this.state.activeTheme = activeTheme;
+        if (state.activeTheme !== activeTheme) {
+            state.activeTheme = activeTheme;
+        }
+    }
+
+    updateThemeSelector(props = this.props) {
+        // This function is called in an `effect` with a dependency on
+        // `state.key` which already guarantees that the Component will be
+        // re-rendered. All further reads on the state should not add
+        // dependencies to that effect, so it is used raw.
+        const state = toRaw(this.state);
+        if (!state.activeTheme && !state.showThemeSelector && !props.readonly) {
+            // Show the ThemeSelector when the theme is unknown and the content can be
+            // changed (invalid value).
+            state.showThemeSelector = true;
+        } else if ((state.activeTheme && state.showThemeSelector) || props.readonly) {
+            state.showThemeSelector = false;
+        }
+        if (state.showThemeSelector && state.showCodeView) {
+            // Never show the CodeView with the ThemeSelector.
+            state.showCodeView = false;
         }
     }
 
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
index 2cb450591bf31..bbfcfb74909de 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
@@ -1,4 +1,4 @@
-import { expect, test, describe, beforeEach } from "@odoo/hoot";
+import { expect, test, describe, beforeEach, getFixture } from "@odoo/hoot";
 import {
     defineModels,
     fields,
@@ -8,6 +8,8 @@ import {
     clickSave,
     patchWithCleanup,
     contains,
+    getPagerValue,
+    getPagerLimit,
 } from "@web/../tests/web_test_helpers";
 import { click, queryAny, queryOne, waitFor } from "@odoo/hoot-dom";
 import { runAllTimers } from "@odoo/hoot-mock";
@@ -29,6 +31,16 @@ class Mailing extends models.Model {
         compute: "compute_model_real",
     });
     mailing_model_name = fields.Char({ string: "Recipients Model Name" });
+    state = fields.Selection({
+        string: "Status",
+        default: "draft",
+        selection: [
+            ["draft", "Draft"],
+            ["in_queue", "In Queue"],
+            ["sending", "Sending"],
+            ["done", "Sent"],
+        ],
+    });
 
     compute_model_real() {
         for (const record of this) {
@@ -63,6 +75,62 @@ class Mailing extends models.Model {
                     </div>
                 </div>
             `,
+            state: "done",
+        },
+        {
+            id: 3,
+            display_name: "Readonly",
+            mailing_model_id: 1,
+            body_arch: `
+                <div data_name="Mailing" class="o_layout oe_unremovable oe_unmovable o_default_theme">
+                    <div class="container o_mail_wrapper o_mail_regular oe_unremovable">
+                        <div class="row mw-100 mx-0">
+                            <div class="col o_mail_no_options o_mail_wrapper_td bg-white oe_structure">
+                                <section class="s_text_block o_mail_snippet_general" data-snippet="s_text_block">
+                                    <div class="container">
+                                        <p>Readonly</p>
+                                    </div>
+                                </section>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `,
+            state: "done",
+        },
+        {
+            id: 4,
+            display_name: "Basic",
+            mailing_model_id: 1,
+            body_arch: `
+                <div data_name="Mailing" class="o_layout oe_unremovable oe_unmovable o_basic_theme">
+                    <div class="oe_structure">
+                        <div class="o_mail_no_options">
+                            <p>Basic</p>
+                        </div>
+                    </div>
+                </div>
+            `,
+        },
+        {
+            id: 5,
+            display_name: "Builder",
+            mailing_model_id: 1,
+            body_arch: `
+                <div data_name="Mailing" class="o_layout oe_unremovable oe_unmovable o_empty_theme">
+                    <div class="container o_mail_wrapper o_mail_regular oe_unremovable">
+                        <div class="row mw-100 mx-0">
+                            <div class="col o_mail_no_options o_mail_wrapper_td bg-white oe_structure">
+                                <section class="s_text_block o_mail_snippet_general" data-snippet="s_text_block">
+                                    <div class="container">
+                                        <p>Builder</p>
+                                    </div>
+                                </section>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            `,
         },
     ];
 }
@@ -107,22 +175,14 @@ const mailViewArch = `
     <field name="mailing_model_name" invisible="1"/>
     <field name="mailing_model_id" invisible="1"/>
     <field name="mailing_model_real" invisible="1"/>
+    <field name="state" invisible="1"/>
     <field name="body_html" class="o_mail_body_inline"/>
-    <field name="body_arch" class="o_mail_body_mailing" widget="mass_mailing_html"
-        options="{ 'inline_field': 'body_html' }"/>
-</form>
-`;
-
-const readonlyMailViewArch = `
-<form>
-    <field name="mailing_model_name" invisible="1"/>
-    <field name="mailing_model_id" invisible="1"/>
-    <field name="body_html" invisible="1"/>
     <field name="body_arch" class="o_mail_body_mailing" widget="mass_mailing_html"
         options="{
             'inline_field': 'body_html',
             'dynamic_placeholder': true,
-        }" readonly="true"/>
+            'dynamic_placeholder_model_reference_field': 'mailing_model_real'
+            }" readonly="state in ('sending', 'done')"/>
 </form>
 `;
 
@@ -176,7 +236,7 @@ describe("field HTML", () => {
             type: "form",
             resModel: "mailing.mailing",
             resId: 2,
-            arch: readonlyMailViewArch,
+            arch: mailViewArch,
         });
         await waitFor(".o_mass_mailing_iframe_wrapper iframe:not(.d-none)");
         const tElement = await waitFor(":iframe t", { timeout: 3000 });
@@ -260,6 +320,55 @@ describe("field HTML", () => {
             'object.filtered_domain([("id", "=", 1)])'
         );
     });
+    test(`Switching mailing records in the Form view properly switches between basic Editor, HtmlBuilder and readonly`, async () => {
+        const fixture = getFixture();
+        let htmlField;
+        patchWithCleanup(MassMailingHtmlField.prototype, {
+            setup() {
+                super.setup();
+                htmlField = this;
+            },
+        });
+        await mountView({
+            resModel: "mailing.mailing",
+            type: "form",
+            arch: mailViewArch,
+            resIds: [3, 4, 5],
+            resId: 3,
+        });
+        // readonly default
+        expect(await waitFor(":iframe .o_layout", { timeout: 3000 })).toHaveClass(
+            "o_default_theme"
+        );
+        expect(getPagerValue()).toEqual([1]);
+        expect(getPagerLimit()).toBe(3);
+        expect(htmlField.state.activeTheme).toBe("default");
+        expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(0);
+        // editable basic
+        await contains(`.o_pager_next`).click();
+        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_basic_theme", {
+            timeout: 3000,
+        });
+        expect(getPagerValue()).toEqual([2]);
+        expect(htmlField.state.activeTheme).toBe("basic");
+        expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(0);
+        // editable builder
+        await contains(`.o_pager_next`).click();
+        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_empty_theme", {
+            timeout: 3000,
+        });
+        expect(getPagerValue()).toEqual([3]);
+        expect(htmlField.state.activeTheme).toBe("empty");
+        expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(1);
+        // readonly default
+        await contains(`.o_pager_next`).click();
+        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_default_theme", {
+            timeout: 3000,
+        });
+        expect(getPagerValue()).toEqual([1]);
+        expect(htmlField.state.activeTheme).toBe("default");
+        expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(0);
+    });
 });
 describe("field HTML: with loaded assets", () => {
     test("Ensure style bundles loaded in the `MassMailingIframe` can be toggled On or Off", async () => {

From 80a887b73c4fbd0ac883815ed23dcebd5f73522e Mon Sep 17 00:00:00 2001
From: "Anita (anko)" <anko@odoo.com>
Date: Thu, 9 Oct 2025 11:45:08 +0000
Subject: [PATCH 140/673] [FIX] sale_gelato: remove 'upgrade_boolean' from
 Gelato setting

Remove the 'Enterprise' widget from Gelato setting, which prevented
community users from installing Gelato module from settings without
upgrading to enterprise.

closes odoo/odoo#234048

X-original-commit: a41e6abf5d6602744269a1f0625927ec8b6787d1
Signed-off-by: anko-odoo <anko@odoo.com>
---
 addons/sale/wizard/res_config_settings_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/wizard/res_config_settings_views.xml b/addons/sale/wizard/res_config_settings_views.xml
index 41030423520fe..8a92eb8b7579d 100644
--- a/addons/sale/wizard/res_config_settings_views.xml
+++ b/addons/sale/wizard/res_config_settings_views.xml
@@ -243,7 +243,7 @@
                             documentation="/applications/sales/sales/gelato.html"
                             help="Place orders through Gelato's print-on-demand service"
                         >
-                            <field name="module_sale_gelato" widget="upgrade_boolean"/>
+                            <field name="module_sale_gelato"/>
                             <div
                                 class="content-group"
                                 name="gelato_credentials"

From 7ce495bdfb47dfb8b2639f3c47fb75484234c141 Mon Sep 17 00:00:00 2001
From: "Julien Launois (jula)" <jula@odoo.com>
Date: Thu, 16 Oct 2025 09:23:15 +0000
Subject: [PATCH 141/673] [FIX] website: make menu appear active only if path
 matches exactly

__Current behavior before commit:__
A menu is shown as active if the unslug version of its URL matches the
current accessed URL.
The issue is that the unslug version of a menu linked to a page has no
real meaning. Such menu should only be shown as active if the request
URL path matches exactly.

__Description of the fix:__
Added a check to ensure that when a menu is linked to a page, it isn't
shown as active if its path doesn't exactly match the request path.

__Steps to reproduce:__
1. On the website, go to Site > Pages
2. Create a new page with title "iOS 26" and another page with title
"iPadOS 26"
3. Go to /ios-26
4. Both menus "iOS 26" and "iPadOS 26" are highlighted

task-5094899

closes odoo/odoo#234133

X-original-commit: 2706fe1a0c6b0594a6d8601e5017327e5472bdaa
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
Signed-off-by: Julien Launois (jula) <jula@odoo.com>
---
 addons/website/models/website_menu.py |  5 +++++
 addons/website/tests/test_menu.py     | 17 +++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py
index 6ff0c7965211a..20789b1ff70af 100644
--- a/addons/website/models/website_menu.py
+++ b/addons/website/models/website_menu.py
@@ -238,6 +238,11 @@ def _is_active(self):
             menu_url = url_parse(self._clean_url())
             unslug_url = self.env['ir.http']._unslug_url
             if unslug_url(menu_url.path) == unslug_url(request_url.path):
+                # By default we compare the unslug version of the current URL
+                # with the menu URL but if the menu is linked to a page we don't
+                # consider it active if the paths don't match exactly.
+                if self.page_id and menu_url.path != request_url.path:
+                    return False
                 if not (
                     set(menu_url.decode_query().items(multi=True))
                     <= set(request_url.decode_query().items(multi=True))
diff --git a/addons/website/tests/test_menu.py b/addons/website/tests/test_menu.py
index 74da66cc1ba47..385fcf8cbf53c 100644
--- a/addons/website/tests/test_menu.py
+++ b/addons/website/tests/test_menu.py
@@ -238,6 +238,23 @@ def test_full_case(a_menu):
         submenu.url = '/sub/slug-3'
         test_full_case(submenu)
 
+        #  Do the same test with a menu that is linked to a page
+        result = website_1.new_page(
+            name='/sub/page-3',
+            add_menu=True,
+        )
+        menu = Menu.browse(result['menu_id'])
+        page = self.env['website.page'].browse(result['page_id'])
+        self.assertEqual(menu.url, page.url, "Menu url should be the same than the page url")
+
+        test_full_case(menu.copy())
+
+        with MockRequest(self.env, website=website_1), \
+             patch('odoo.addons.website.models.website_menu.url_parse', new=url_parse_mock):
+
+            self.request_url_mock = 'http://localhost:8069/sub/slug-3'
+            self.assertFalse(menu._is_active(), "Page linked, same unslug, should not match")
+
     def test_menu_group_ids(self):
         Menu = self.env['website.menu']
         menu = Menu.create({

From 7e2292091e64613620123235622156619f35cad9 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Thu, 23 Oct 2025 11:46:52 +0000
Subject: [PATCH 142/673] [FIX] sale: product catalog price with discounts
 enabled

Catalog prices do not consider discounts when displayed separately
from the unit price on the order line (if any for a given product).

It was fixed for the /update_order_line_info route with
5d1837e47c20f04458472658c4f8ea71284fb6ca, but the issue still
remained when fetching the original catalog data on opening,
through the /order_lines_info route.

This only happened when the product was already added to the order,
because in this case we avoid recomputing the pricelist price and
use the existing sale order line price.

This commit makes sure that the sale order line discount field
is correctly considered in that case, and also adds tests to cover
the catalog more extensively.

Fixes #232219

closes odoo/odoo#234144

X-original-commit: 450315aa3d6ca329ed829a8fed93c93ff81c261b
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Co-authored-by: Mathias Peralta <mnp@adhoc.inc>
---
 addons/sale/models/sale_order.py          |   2 +-
 addons/sale/models/sale_order_line.py     |   6 +-
 addons/sale/tests/__init__.py             |   1 +
 addons/sale/tests/test_product_catalog.py | 236 ++++++++++++++++++++++
 4 files changed, 243 insertions(+), 2 deletions(-)
 create mode 100644 addons/sale/tests/test_product_catalog.py

diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py
index f166e18c42e63..3b34cf94c1cea 100644
--- a/addons/sale/models/sale_order.py
+++ b/addons/sale/models/sale_order.py
@@ -2190,7 +2190,7 @@ def _update_order_line_info(
                 'product_uom_qty': quantity,
                 'sequence': self._get_new_line_sequence(child_field, section_id),
             })
-        return sol.price_unit * (1-(sol.discount or 0.0)/100.0)
+        return sol._get_discounted_price()
 
     # === Product Documents === #
 
diff --git a/addons/sale/models/sale_order_line.py b/addons/sale/models/sale_order_line.py
index 0c0877151c988..6e4c217f27dad 100644
--- a/addons/sale/models/sale_order_line.py
+++ b/addons/sale/models/sale_order_line.py
@@ -1587,7 +1587,7 @@ def _get_product_catalog_lines_data(self, **kwargs):
         if len(self) == 1:
             return {
                 'quantity': self.product_uom_qty,
-                'price': self.price_unit,
+                'price': self._get_discounted_price(),
                 'readOnly': (
                     self.order_id._is_readonly()
                     or bool(self.combo_item_id)
@@ -1648,6 +1648,10 @@ def _convert_to_sol_currency(self, amount, currency):
             )
         return amount
 
+    def _get_discounted_price(self):
+        self.ensure_one()
+        return self.price_unit * (1 - (self.discount or 0.0) / 100.0)
+
     def has_valued_move_ids(self):
         return self.move_ids
 
diff --git a/addons/sale/tests/__init__.py b/addons/sale/tests/__init__.py
index 34bc0d43e97d8..ca68aaa72e91b 100644
--- a/addons/sale/tests/__init__.py
+++ b/addons/sale/tests/__init__.py
@@ -9,6 +9,7 @@
 from . import test_onchange
 from . import test_payment_flow
 from . import test_product_attribute_value
+from . import test_product_catalog
 from . import test_product_configurator_data
 from . import test_sale_combo_configurator
 from . import test_sale_flow
diff --git a/addons/sale/tests/test_product_catalog.py b/addons/sale/tests/test_product_catalog.py
new file mode 100644
index 0000000000000..73dbf8a3c4921
--- /dev/null
+++ b/addons/sale/tests/test_product_catalog.py
@@ -0,0 +1,236 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.fields import Command
+from odoo.tests import HttpCase, tagged
+
+from odoo.addons.sale.tests.common import SaleCommon
+
+
+@tagged('post_install', '-at_install')
+class TestProductCatalog(HttpCase, SaleCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.res_model = cls.empty_order._name
+        cls.res_id = cls.empty_order.id
+        cls.base_url = cls.base_url()
+        cls.products = cls.product + cls.service_product
+
+    def setUp(self):
+        super().setUp()
+
+        self.authenticate(self.sale_manager.login, self.sale_manager.login)
+
+    def request_get_order_lines_info(self, products, **kwargs):
+        response = self.opener.post(
+            url=self.base_url + '/product/catalog/order_lines_info',
+            json={
+                'params': {
+                    'res_model': self.res_model,
+                    'order_id': self.res_id,
+                    'product_ids': products.ids,
+                    **kwargs,
+                },
+            }
+        )
+        return response.json()['result']
+
+    def request_update_order_line_info(self, product, quantity=1.0, **kwargs):
+        response = self.opener.post(
+            url=self.base_url + '/product/catalog/update_order_line_info',
+            json={
+                'params': {
+                    'res_model': self.res_model,
+                    'order_id': self.res_id,
+                    'product_id': product.id,
+                    'quantity': quantity,
+                    **kwargs,
+                },
+            }
+        )
+        return response.json()['result']
+
+    def _get_default_catalog_data(self, product):
+        return {
+            'quantity': 0,
+            'readOnly': False,
+            'productType': product.type,
+            'price': product.lst_price,
+        }
+
+    def check_catalog_data(self, products, expected_data=None):
+        expected_data = expected_data or {}
+        catalog_data = self.request_get_order_lines_info(products=products)
+        for product in products:
+            self.assertIn(str(product.id), catalog_data)
+            product_expected_data = {
+                **self._get_default_catalog_data(product),
+                **expected_data.get(product.id, {}),
+            }
+            product_data = catalog_data[str(product.id)]
+            for key, value in product_expected_data.items():
+                self.assertEqual(
+                    product_data[key],
+                    value,
+                )
+
+    def _create_pricelist_discount_rules(self):
+        self.pricelist.item_ids = [
+            Command.create({
+                'min_quantity': 1.0,
+                'product_id': self.product.id,
+                'compute_price': 'percentage',
+                'percent_price': 50,
+            }),
+            Command.create({
+                'min_quantity': 2.0,
+                'product_id': self.service_product.id,
+                'compute_price': 'percentage',
+                'percent_price': 50,
+            })
+        ]
+
+    def test_catalog_context(self):
+        action_data = self.empty_order.action_add_from_catalog()
+        catalog_context = action_data['context']
+        self.assertEqual(catalog_context['product_catalog_order_id'], self.empty_order.id)
+        self.assertEqual(catalog_context['product_catalog_order_model'], self.res_model)
+        self.assertEqual(
+            catalog_context['product_catalog_currency_id'],
+            self.empty_order.currency_id.id,
+        )
+        self.assertEqual(
+            catalog_context['product_catalog_digits'],
+            (16, self.env['decimal.precision'].precision_get('Product Price')),
+        )
+
+    def test_empty_order_data(self):
+        self.check_catalog_data(self.products)
+
+    # TODO VFE in master, forbid updates when order is readonly
+    def test_readonly_order_data(self):
+        self.empty_order._action_cancel()
+
+        # Readonly order because in cancelled state
+        self.check_catalog_data(
+            self.service_product,
+            {
+                self.service_product.id: {'readOnly': True},
+            }
+        )
+
+    def test_data(self):
+        self.empty_order.order_line = [
+            Command.create({
+                'product_id': self.service_product.id,
+                'product_uom_qty': 1.0,
+            })
+        ]
+
+        self.check_catalog_data(
+            self.products,
+            {
+                self.service_product.id: {'quantity': 1.0},
+            }
+        )
+
+    def test_data_with_pricelist_rules(self):
+        self._create_pricelist_discount_rules()
+        self.assertEqual(self.empty_order.pricelist_id, self.pricelist)
+        self.check_catalog_data(
+            self.products,
+            {
+                self.product.id: {'price': self.product.lst_price / 2},
+            }
+        )
+
+    def test_data_with_discounted_lines(self):
+        self._create_pricelist_discount_rules()
+        self.env['res.config.settings'].create({
+            # Discounts included in price
+            'group_product_pricelist': True,
+            'group_discount_per_so_line': True,
+        }).execute()
+        self.empty_order.order_line = [
+            Command.create({
+                'product_id': self.product.id,
+            })
+        ]
+        sol = self.empty_order.order_line
+        self.assertEqual(sol.price_unit, self.product.lst_price)
+        self.assertEqual(sol.discount, 50)
+
+        self.check_catalog_data(
+            self.products,
+            {
+                self.product.id: {
+                    'quantity': 1.0,
+                    'price': self.product.lst_price / 2
+                },
+            }
+        )
+
+    def test_update(self):
+        self.assertFalse(self.empty_order.order_line)
+
+        # Add product to order
+        product = self.service_product
+        update_data = self.request_update_order_line_info(product=product)
+        sol = self.empty_order.order_line
+        self.assertEqual(sol.product_id, product)
+        self.assertEqual(sol.product_uom_qty, 1.0)
+        self.assertEqual(update_data, sol.price_unit)
+        self.assertEqual(update_data, product.lst_price)
+
+    def test_update_with_pricelist_rules(self):
+        self._create_pricelist_discount_rules()
+        self.env['res.config.settings'].create({
+            # Discounts included in price
+            'group_product_pricelist': True,
+            'group_discount_per_so_line': False,
+        }).execute()
+
+        # Add first item --> no discount
+        product = self.service_product
+        update_data = self.request_update_order_line_info(product=product)
+        sol = self.empty_order.order_line
+        self.assertRecordValues(
+            sol, [{
+                'product_id': product.id,
+                'product_uom_qty': 1.0,
+                'price_unit': product.lst_price,
+                'discount': 0.0,
+            }]
+        )
+        self.assertEqual(update_data, product.lst_price)
+
+        # Add a second item --> should trigger the pricelist discount
+        update_data = self.request_update_order_line_info(product=product, quantity=2.0)
+        self.assertRecordValues(
+            sol, [{
+                'product_id': product.id,
+                'product_uom_qty': 2.0,
+                'price_unit': product.lst_price / 2,
+                'discount': 0.0,
+            }]
+        )
+        self.assertEqual(update_data, product.lst_price / 2)
+
+        # Enable discounts, add item --> discount should be on discount field
+        self.env['res.config.settings'].create({
+            # Discounts included in price
+            'group_product_pricelist': True,
+            'group_discount_per_so_line': True,
+        }).execute()
+        update_data = self.request_update_order_line_info(product=product, quantity=3.0)
+        self.assertRecordValues(
+            sol, [{
+                'product_id': product.id,
+                'product_uom_qty': 3.0,
+                'price_unit': product.lst_price,
+                'discount': 50.0,
+            }]
+        )
+        self.assertEqual(update_data, product.lst_price / 2)

From 719529dfbdb24a431210241b013bcde33bedac12 Mon Sep 17 00:00:00 2001
From: "Louis (loco)" <loco@odoo.com>
Date: Wed, 15 Oct 2025 13:44:43 +0200
Subject: [PATCH 143/673] [IMP] web: whitelist website and website blog for the
 linter

The goal of this commit is to enable tooling (eslint, prettier) on the
website related files.

task-5110180

X-original-commit: https://github.com/odoo/odoo/commit/648ab3c31769d7dff9cb37aa3d89b2abcab786ce
Part-of: odoo/odoo#232498
Related: odoo/enterprise#97855
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
---
 addons/web/tooling/_eslintignore | 60 ++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/addons/web/tooling/_eslintignore b/addons/web/tooling/_eslintignore
index 20c9f598fb2ff..9ba478bfe1f8f 100644
--- a/addons/web/tooling/_eslintignore
+++ b/addons/web/tooling/_eslintignore
@@ -84,17 +84,57 @@ web_gantt/static/tests/legacy/**/*
 # blacklist html_editor libs
 addons/html_editor/static/lib/diff2html/*.js
 
-# Whitelist website builder
+# Whitelist website
 !addons/website
-!addons/website/static
-!addons/website/static/src
-!addons/website/static/src/builder
-!addons/website/static/src/builder/**/*
-!addons/website/static/src/client_actions/website_preview/
-!addons/website/static/src/client_actions/website_preview/**/*
-!addons/website/static/tests
-!addons/website/static/tests/builder
-!addons/website/static/tests/builder/**/*
+!addons/website/**/*
+
+# Whitelist website blog
+!addons/website_blog
+!addons/website_blog/**/*
+
+# Whitelist test_website
+!addons/test_website
+!addons/test_website/**/*
+
+# Whitelist test_website_modules
+!addons/test_website_modules
+!addons/test_website_modules/**/*
+
+# Whitelist website_customer
+!addons/website_customer
+!addons/website_customer/**/*
+
+# Whitelist website_google_map
+!addons/website_google_map
+!addons/website_google_map/**/*
+
+# Whitelist website_cf_turnstile
+!addons/website_cf_turnstile
+!addons/website_cf_turnstile/**/*
+
+# Whitelist website_project
+!addons/website_project
+!addons/website_project/**/*
+
+# Whitelist website_enterprise
+!website_enterprise
+!website_enterprise/**/*
+
+# Whitelist website_studio
+!website_studio
+!website_studio/**/*
+
+# Whitelist website_generator
+!website_generator
+!website_generator/**/*
+
+# Whitelist website_documents
+!website_documents
+!website_documents/**/*
+
+# Whitelist website_product_barecodelookup
+!website_product_barcodelookup
+!website_product_barcodelookup/**/*
 
 # Whitelist web_grid
 !web_grid

From 04b80d4922a473fd24bf85652141d1022e0b4e5d Mon Sep 17 00:00:00 2001
From: "Louis (loco)" <loco@odoo.com>
Date: Wed, 24 Sep 2025 13:45:04 +0200
Subject: [PATCH 144/673] [LINT] html_builder, *: lint website related files

*: html_editor, test_website , test_website_modules, website,
website_blog, website_cf_turnstile, website_customer,
website_google_map, website_project

The goal of this commit is to lint the website related js files.

task-5110180

closes odoo/odoo#232498

X-original-commit: https://github.com/odoo/odoo/commit/999d43221403244cfe71f0dd515f6a0018144ae1
Related: odoo/enterprise#97855
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
---
 .../core/building_blocks/builder_button.js    |    1 +
 ...patibility_inline_border_removal_plugin.js |   19 +-
 .../src/core/core_builder_action_plugin.js    |   10 +-
 .../static/src/core/move_plugin.js            |   12 +-
 .../background_image_option.js                |    5 +-
 .../src/plugins/border_configurator_option.js |    2 +-
 .../plugins/image/image_tool_option_plugin.js |    3 +-
 .../static/src/plugins/many2one_option.js     |    2 +-
 .../static/src/utils/grid_layout_utils.js     |    7 +-
 .../static/src/utils/utils_css.js             |    2 +-
 .../static/src/fields/html_field.js           |   22 +-
 .../static/src/main/link/link_popover.js      |    8 +-
 addons/html_editor/static/src/utils/url.js    |    8 +-
 .../static/src/interactions/test_error.js     |    6 +-
 .../static/tests/tours/custom_snippets.js     |  180 +-
 .../static/tests/tours/error_views.js         |  452 ++--
 .../test_website/static/tests/tours/form.js   |    2 +-
 .../static/tests/tours/image_link.js          |  168 +-
 .../tests/tours/image_upload_progress.js      |  456 ++--
 .../static/tests/tours/json_auth.js           |   39 +-
 .../static/tests/tours/page_manager.js        |  171 +-
 .../static/tests/tours/replace_media.js       |  326 +--
 .../static/tests/tours/reset_views.js         |    4 +-
 .../static/tests/tours/restricted_editor.js   |  269 +--
 .../tests/tours/snippet_background_video.js   |   12 +-
 .../static/tests/tours/systray.js             |  263 ++-
 .../static/tests/tours/translation.js         |  105 +-
 .../tests/tours/website_controller_page.js    |  120 +-
 .../tests/tours/website_page_properties.js    |   25 +-
 .../static/tests/tours/configurator_flow.js   |   14 +-
 .../builder/plugins/carousel_option_plugin.js |   61 +-
 .../src/builder/plugins/collapse_plugin.js    |    6 +-
 .../builder/plugins/form/form_field_option.js |   12 +-
 .../plugins/form/form_option_plugin.js        |   12 +-
 .../src/builder/plugins/menu_data_plugin.js   |    2 +-
 .../announcement_scroll_option_plugin.js      |    3 +-
 .../options/background_option_plugin.js       |    6 +-
 ...ecomm_categories_showcase_option_plugin.js |   66 +-
 .../plugins/options/footer_option_plugin.js   |    8 +-
 .../google_maps_option_plugin.js              |   10 +-
 .../options/header/header_option_plugin.js    |    2 +-
 .../options/header/header_top_options.js      |    1 -
 .../plugins/options/map_option_plugin.js      |   10 +-
 .../plugins/options/navtabs_header_buttons.js |    2 +-
 .../options/navtabs_style_option_plugin.js    |   12 +-
 .../plugins/options/parallax_option_plugin.js |   15 +-
 .../plugins/snippets_powerbox_plugin.js       |    5 +-
 .../plugins/theme/theme_colors_option.js      |    2 +-
 .../plugins/theme/theme_fontfamily_option.js  |   21 +-
 .../customize_translation_tab_plugin.js       |   24 +-
 .../static/src/builder/snippet_viewer.js      |    2 +-
 .../configurator/configurator.js              |  401 ++--
 .../website_preview/create_page_message.js    |    1 -
 .../edit_website_systray_item.js              |    6 +-
 .../new_content_systray_item.js               |   91 +-
 .../website_preview/website_builder_action.js |   45 +-
 .../website_builder_action_test_mode.js       |    6 +-
 .../website_preview/website_systray_item.js   |   13 +-
 .../url_autocomplete.js                       |    2 +-
 .../src/components/burger_menu/burger_menu.js |   22 +-
 .../src/components/dialog/add_page_dialog.js  |  113 +-
 .../static/src/components/dialog/dialog.js    |    6 +-
 .../static/src/components/dialog/edit_menu.js |  184 +-
 .../src/components/dialog/page_properties.js  |   77 +-
 .../static/src/components/dialog/seo.js       |  292 +--
 .../edit_head_body_dialog.js                  |    5 +-
 .../static/src/components/fields/fields.js    |   27 +-
 .../src/components/fields/publish_button.js   |    2 +-
 .../src/components/fields/redirect_field.js   |    3 +-
 .../src/components/fields/widget_iframe.js    |   12 +-
 .../fullscreen_indication.js                  |    4 +-
 .../components/media_dialog/image_selector.js |    6 +-
 .../static/src/components/navbar/navbar.js    |   36 +-
 .../resource_editor/resource_editor.js        |    9 +-
 .../src/components/resource_editor/utils.js   |   49 +-
 .../src/components/views/page_kanban.js       |    6 +-
 .../static/src/components/views/page_list.js  |   32 +-
 .../src/components/views/page_manager_hook.js |   11 +-
 .../src/components/views/page_search_model.js |    8 +-
 .../components/views/theme_preview_form.js    |   36 +-
 .../components/views/theme_preview_kanban.js  |    9 +-
 .../website_loader/website_loader.js          |  164 +-
 .../src/core/component_interaction_edit.js    |    2 +-
 .../static/src/core/website_edit_service.js   |    4 +-
 .../static/src/core/website_map_service.js    |   29 +-
 .../static/src/core/website_menus_service.js  |    6 +-
 .../static/src/core/website_page_service.js   |    2 +-
 .../static/src/interactions/anchor_slide.js   |    6 +-
 .../src/interactions/animate_overflow.js      |   21 +-
 .../static/src/interactions/animation.edit.js |   30 +-
 .../static/src/interactions/animation.js      |   66 +-
 .../src/interactions/bottom_fixed_element.js  |   31 +-
 .../carousel_bootstrap_upgrade_fix.edit.js    |   27 +-
 .../carousel_bootstrap_upgrade_fix.js         |    8 +-
 .../carousel/carousel_slider.edit.js          |   41 +-
 .../interactions/carousel/carousel_slider.js  |   45 +-
 .../interactions/cookies/cookies_approval.js  |   26 +-
 .../src/interactions/cookies/cookies_bar.js   |    8 +-
 .../interactions/cookies/cookies_toggle.js    |   16 +-
 .../interactions/cookies/cookies_warning.js   |    6 +-
 .../dropdown/hoverable_dropdown.edit.js       |   37 +-
 .../dropdown/hoverable_dropdown.js            |   17 +-
 .../dropdown/mega_menu_dropdown.edit.js       |   78 +-
 .../dropdown/mega_menu_dropdown.js            |   16 +-
 .../src/interactions/footer_slideout.js       |   12 +-
 .../interactions/full_screen_height.edit.js   |   23 +-
 .../src/interactions/full_screen_height.js    |   48 +-
 .../interactions/header/base_header.edit.js   |   19 +-
 .../src/interactions/header/base_header.js    |   43 +-
 .../header/base_header_special.js             |   43 +-
 .../interactions/header/header_disappears.js  |   12 +-
 .../interactions/header/header_fade_out.js    |   16 +-
 .../src/interactions/header/header_fixed.js   |   12 +-
 .../interactions/header/header_standard.js    |   32 +-
 .../src/interactions/header/header_top.js     |   19 +-
 .../src/interactions/image_gallery.edit.js    |    3 +-
 .../src/interactions/image_lazy_loading.js    |    4 +-
 .../interactions/image_shape_hover_effect.js  |  109 +-
 .../static/src/interactions/listing_layout.js |   20 +-
 .../src/interactions/multirange_input.js      |    4 +-
 .../src/interactions/parallax/parallax.js     |   23 +-
 .../static/src/interactions/plausible_push.js |    8 +-
 .../popup/no_backdrop_popup.edit.js           |   48 +-
 .../interactions/popup/no_backdrop_popup.js   |   14 +-
 .../static/src/interactions/popup/popup.js    |   35 +-
 .../interactions/popup/shared_popup.edit.js   |   21 +-
 .../src/interactions/popup/shared_popup.js    |    6 +-
 .../static/src/interactions/post_link.js      |    6 +-
 .../static/src/interactions/ripple_effect.js  |    6 +-
 .../static/src/interactions/scroll_button.js  |    4 +-
 .../src/interactions/search_modal.edit.js     |   23 +-
 .../static/src/interactions/search_modal.js   |    4 +-
 .../src/interactions/text_highlights.js       |   18 +-
 .../interactions/video/background_video.js    |   75 +-
 .../interactions/video/media_video.edit.js    |    8 +-
 .../src/interactions/video/media_video.js     |   33 +-
 .../zoomed_background_shape.edit.js           |   23 +-
 .../interactions/zoomed_background_shape.js   |    4 +-
 .../backend/view_hierarchy/view_hierarchy.js  |    6 +-
 .../static/src/js/content/adapt_content.js    |   10 +-
 .../static/src/js/content/auto_hide_menu.js   |  172 +-
 .../static/src/js/content/compatibility.js    |    7 +-
 .../static/src/js/content/cookie_watcher.js   |   32 +-
 .../static/src/js/content/inject_dom.js       |    2 +-
 .../website/static/src/js/content/redirect.js |   43 +-
 .../src/js/content/snippets.animation.js      |    2 +-
 .../static/src/js/content/website_root.js     |   84 +-
 .../src/js/content/website_root_instance.js   |    4 +-
 .../website/static/src/js/new_content_form.js |    6 +-
 .../website/static/src/js/send_mail_form.js   |  101 +-
 .../website/static/src/js/text_processing.js  |  386 ++--
 .../static/src/js/tours/configurator_tour.js  |   37 +-
 .../website/static/src/js/tours/homepage.js   |   32 +-
 .../website/static/src/js/tours/tour_utils.js |  266 ++-
 addons/website/static/src/js/utils.js         |  188 +-
 .../src/services/website_custom_menus.js      |  103 +-
 .../static/src/services/website_service.js    |  120 +-
 .../announcement_scroll.js                    |   35 +-
 .../static/src/snippets/s_chart/chart.edit.js |   33 +-
 .../static/src/snippets/s_chart/chart.js      |   10 +-
 .../snippets/s_countdown/countdown.edit.js    |   33 +-
 .../src/snippets/s_countdown/countdown.js     |   74 +-
 .../s_dynamic_snippet/dynamic_snippet.edit.js |   25 +-
 .../s_dynamic_snippet/dynamic_snippet.js      |   45 +-
 .../dynamic_snippet_carousel.js               |   17 +-
 .../snippets/s_embed_code/embed_code.edit.js  |   43 +-
 .../src/snippets/s_embed_code/embed_code.js   |    4 +-
 .../s_facebook_page/facebook_page.edit.js     |   23 +-
 .../snippets/s_facebook_page/facebook_page.js |   29 +-
 .../s_faq_horizontal/faq_horizontal.js        |   20 +-
 .../s_floating_blocks/floating_blocks.edit.js |    5 +-
 .../s_floating_blocks/floating_blocks.js      |   29 +-
 .../src/snippets/s_google_map/google_map.js   |   36 +-
 .../src/snippets/s_image_gallery/gallery.js   |   24 +-
 .../s_image_gallery/gallery_slider.edit.js    |   23 +-
 .../s_image_gallery/gallery_slider.js         |   29 +-
 .../s_instagram_page/instagram_page.edit.js   |   33 +-
 .../s_instagram_page/instagram_page.js        |    9 +-
 .../website/static/src/snippets/s_map/map.js  |    4 +-
 .../src/snippets/s_searchbar/search_bar.js    |   85 +-
 .../s_searchbar/search_bar_results.js         |   35 +-
 .../static/src/snippets/s_share/share.js      |   29 +-
 .../s_table_of_content/table_of_content.js    |   99 +-
 .../src/snippets/s_website_form/form.edit.js  |   20 +-
 .../src/snippets/s_website_form/form.js       |  243 ++-
 addons/website/static/src/utils/images.js     |    5 +-
 addons/website/static/src/utils/misc.js       |   12 +-
 addons/website/static/src/utils/videos.js     |   12 +-
 .../options/content_width_option.test.js      |    5 +-
 .../builder/options/countdown_option.test.js  |    5 +-
 .../options/floating_blocks_option.test.js    |    5 +-
 .../options/grid_column_option.test.js        |    5 +-
 .../builder/options/layout_option.test.js     |    5 +-
 .../options/pricelist_boxed_option.test.js    |    5 +-
 .../top_menu_visibility_option.test.js        |    5 +-
 .../tests/builder/snippets_menu.test.js       |   12 +-
 .../tests/builder/theme_tab/palette.test.js   |    5 +-
 .../static/tests/builder/videos.test.js       |   22 +-
 .../builder/website_builder/carousel.test.js  |    5 +-
 .../website_builder/carousel_item.test.js     |    5 +-
 .../website_builder/chart_option.test.js      |   21 +-
 .../cookies_bar_option.test.js                |    5 +-
 .../customize_website_color.test.js           |    6 +-
 .../dynamic_svg_option.test.js                |    5 +-
 .../website_builder/edition_bootstrap.test.js |    5 +-
 .../website_builder/form_option.test.js       |    4 +-
 .../website_builder/map_option.test.js        |   15 +-
 .../builder/website_builder/menu_data.test.js |   45 +-
 .../website_builder/steps_options.test.js     |    5 +-
 .../website_builder/timeline_option.test.js   |    5 +-
 .../tests/core/public_component_edit.test.js  |   15 +-
 addons/website/static/tests/helpers.js        |    8 +-
 .../interactions/animate_overflow.test.js     |    5 +-
 .../interactions/bottom_fixed_element.test.js |   17 +-
 .../interactions/carousel/carousel.test.js    |    2 +-
 .../interactions/footer_slideout.test.js      |    7 +-
 .../interactions/header/base_header.test.js   |    9 +-
 .../header/base_header_special.test.js        |    9 +-
 .../interactions/header/header_top.test.js    |    5 +-
 .../interactions/multirange_input.test.js     |    5 +-
 .../tests/interactions/parallax.test.js       |    9 +-
 .../tests/interactions/plausible_push.test.js |    7 +-
 .../tests/interactions/ripple_effect.test.js  |    5 +-
 .../snippets/countdown.edit.test.js           |    6 +-
 .../interactions/snippets/countdown.test.js   |   63 +-
 .../interactions/snippets/embed_code.test.js  |    5 +-
 .../tests/interactions/snippets/form.test.js  |   20 +-
 .../interactions/snippets/gallery.test.js     |    8 +-
 .../snippets/gallery_slider.test.js           |    5 +-
 .../snippets/media_dialog.edit.test.js        |   12 +-
 .../interactions/snippets/search_bar.test.js  |   37 +-
 .../tests/interactions/text_highlight.test.js |    5 +-
 .../zoomed_background_shape.test.js           |   13 +-
 .../mock_server/mock_models/website_page.js   |    1 -
 .../tests/new_content_systray_item.test.js    |    7 +-
 .../static/tests/redirect_field.test.js       |    4 +-
 .../tour_utils/lifecycle_dep_interaction.js   |   24 +-
 .../tour_utils/lifecycle_patch_wysiwyg.js     |    8 +-
 addons/website/static/tests/tours/carousel.js |   89 +-
 .../tours/client_action_iframe_fallback.js    |   36 +-
 .../tests/tours/client_action_redirect.js     |  135 +-
 .../website/static/tests/tours/colorpicker.js |   90 +-
 .../tests/tours/conditional_visibility.js     |  522 ++---
 .../tours/conditional_visibility_frontend.js  |   34 +-
 .../tests/tours/configurator_translation.js   |   59 +-
 .../static/tests/tours/create_missing_page.js |  365 ++--
 .../default_shape_gets_palette_colors.js      |   54 +-
 .../tours/drag_and_drop_on_non_editable.js    |   73 +-
 .../tests/tours/drop_404_ir_attachment_url.js |   93 +-
 .../dropdowns_and_header_hide_on_scroll.js    |   92 +-
 .../static/tests/tours/edit_link_popover.js   |  336 +--
 .../static/tests/tours/edit_megamenu.js       |  517 ++---
 .../website/static/tests/tours/edit_menus.js  |  910 ++++----
 .../tests/tours/edit_translated_page.js       |   64 +-
 .../tours/editable_root_as_custom_snippet.js  |   71 +-
 .../website/static/tests/tours/grid_layout.js |  181 +-
 .../website/static/tests/tours/html_editor.js |  188 +-
 .../tests/tours/interaction_lifecycle.js      |  122 +-
 .../static/tests/tours/media_dialog.js        |  448 ++--
 .../static/tests/tours/media_iframe_video.js  |    7 +-
 .../static/tests/tours/multi_edition.js       |   72 +-
 .../static/tests/tours/page_manager.js        |  160 +-
 addons/website/static/tests/tours/parallax.js |  111 +-
 .../tests/tours/popup_visibility_option.js    |    3 +-
 .../static/tests/tours/powerbox_snippet.js    |   94 +-
 .../static/tests/tours/reset_password.js      |   61 +-
 .../static/tests/tours/restricted_editor.js   |   17 +-
 addons/website/static/tests/tours/rte.js      |  668 +++---
 .../tests/tours/skip_website_configurator.js  |   71 +-
 .../tests/tours/snippet_background_edition.js |  610 +++---
 .../tours/snippet_cache_across_websites.js    |   59 +-
 .../static/tests/tours/snippet_countdown.js   |   88 +-
 .../tours/snippet_editor_panel_options.js     |  211 +-
 .../static/tests/tours/snippet_image.js       |   91 +-
 .../tests/tours/snippet_image_gallery.js      |  317 +--
 .../tests/tours/snippet_image_quality.js      |  100 +-
 .../static/tests/tours/snippet_images_wall.js |  198 +-
 .../tests/tours/snippet_popup_add_remove.js   |  148 +-
 .../tours/snippet_popup_and_animations.js     |  375 ++--
 .../tours/snippet_popup_and_scrollbar.js      |  292 +--
 .../tours/snippet_popup_display_on_click.js   |  202 +-
 .../tests/tours/snippet_popup_open_on_top.js  |  103 +-
 .../static/tests/tours/snippet_rating.js      |   54 +-
 .../tests/tours/snippet_social_media.js       |  405 ++--
 .../tests/tours/snippet_table_of_content.js   |  171 +-
 .../static/tests/tours/snippet_tabs.js        |   70 +-
 .../static/tests/tours/snippet_translation.js |  170 +-
 .../static/tests/tours/snippet_version.js     |   81 +-
 .../tests/tours/snippet_visibility_option.js  |  263 +--
 .../tests/tours/snippets_all_drag_and_drop.js |   59 +-
 .../tests/tours/specific_website_editor.js    |   36 +-
 .../tests/tours/start_cloned_snippet.js       |   67 +-
 .../static/tests/tours/text_highlights.js     |  195 +-
 .../static/tests/tours/translate_menu_name.js |   85 +-
 .../tests/tours/translate_text_options.js     |   11 +-
 .../static/tests/tours/unsplash_beacon.js     |   10 +-
 .../tours/website_backend_menus_redirect.js   |   63 +-
 .../static/tests/tours/website_click_tests.js |   75 +-
 .../static/tests/tours/website_form_editor.js | 1836 +++++++++--------
 .../tours/website_form_editor_frontend.js     |  385 ++--
 .../static/tests/tours/website_navbar_menu.js |   44 +-
 .../tests/tours/website_no_dirty_page.js      |  193 +-
 .../tests/tours/website_page_options.js       |  198 +-
 .../tests/tours/website_snippets_menu_tabs.js |   63 +-
 .../tests/tours/website_style_edition.js      |  220 +-
 .../tests/tours/website_text_edition.js       |  119 +-
 .../tests/tours/website_text_font_size.js     |  164 +-
 .../tours/website_update_column_count.js      |  393 ++--
 .../static/src/interactions/website_blog.js   |   39 +-
 .../src/js/systray_items/new_content.js       |    6 +-
 .../src/snippets/s_blog_posts/blog_posts.js   |   12 +-
 .../static/src/tours/website_blog.js          |  216 +-
 ...ynamic_snippet_blog_posts_option_plugin.js |    2 +-
 .../snippets/website_blog.test.js             |    2 +-
 .../tests/tours/blog_search_with_date.js      |   58 +-
 .../static/tests/tours/blog_tags_tour.js      |  143 +-
 .../static/tests/tours/blog_tags_with_date.js |  113 +-
 .../static/src/interactions/error_handler.js  |    6 +-
 .../static/src/interactions/turnstile.js      |    6 +-
 .../src/interactions/turnstile_captcha.js     |    5 +-
 .../static/tests/helpers.js                   |    1 -
 .../website_builder/customer_filter_option.js |    3 +-
 .../static/src/js/website_google_map.js       |  125 +-
 .../static/src/js/website_project_editor.js   |  110 +-
 324 files changed, 13080 insertions(+), 10952 deletions(-)

diff --git a/addons/html_builder/static/src/core/building_blocks/builder_button.js b/addons/html_builder/static/src/core/building_blocks/builder_button.js
index a898da1d439b4..5fae557d20830 100644
--- a/addons/html_builder/static/src/core/building_blocks/builder_button.js
+++ b/addons/html_builder/static/src/core/building_blocks/builder_button.js
@@ -65,5 +65,6 @@ export class BuilderButton extends Component {
         } else if (this.props.icon.startsWith("oi-")) {
             return `oi ${this.props.icon}`;
         }
+        return "";
     }
 }
diff --git a/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js b/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js
index ddfc4c9da2ec7..b517b5bb172cc 100644
--- a/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js
+++ b/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js
@@ -24,11 +24,11 @@ export class CompatibilityInlineBorderRemovalPlugin extends Plugin {
     // eventual border-width/radius styles must be removed because they would
     // otherwise take precedence.
     removeInlineBorderIfNecessary({ editingElement, params }) {
-        const newStyleBeingEdited = NEW_STYLES.find(style => {
-            return params.mainParam === style
-                || CSS_SHORTHANDS[style].includes(params.mainParam);
-        });
-        if (newStyleBeingEdited && OLD_STYLES.some(style => editingElement.style[style])) {
+        const newStyleBeingEdited = NEW_STYLES.find(
+            (style) =>
+                params.mainParam === style || CSS_SHORTHANDS[style].includes(params.mainParam)
+        );
+        if (newStyleBeingEdited && OLD_STYLES.some((style) => editingElement.style[style])) {
             // Remove all old inline styles related to border-width/radius as
             // the new CSS rules + variables rely on both being right, i.e. not
             // messed up by any inline style...
@@ -44,7 +44,11 @@ export class CompatibilityInlineBorderRemovalPlugin extends Plugin {
             // children with %o-we-background-layer classes too (note: the code
             // that handled adding inline style on child nodes only handled
             // those specific ones here after).
-            const compatLayerSelectors = [".o_we_bg_filter", ".o_bg_video_container", ".s_parallax_bg"];
+            const compatLayerSelectors = [
+                ".o_we_bg_filter",
+                ".o_bg_video_container",
+                ".s_parallax_bg",
+            ];
             const selector = `:scope > ${compatLayerSelectors.join(", :scope > ")}`;
             for (const childNode of editingElement.querySelectorAll(selector)) {
                 childNode.style.setProperty("border-radius", "");
@@ -54,5 +58,6 @@ export class CompatibilityInlineBorderRemovalPlugin extends Plugin {
     }
 }
 
-registry.category("builder-plugins")
+registry
+    .category("builder-plugins")
     .add(CompatibilityInlineBorderRemovalPlugin.id, CompatibilityInlineBorderRemovalPlugin);
diff --git a/addons/html_builder/static/src/core/core_builder_action_plugin.js b/addons/html_builder/static/src/core/core_builder_action_plugin.js
index 222fac91fb28c..1cb2420488c26 100644
--- a/addons/html_builder/static/src/core/core_builder_action_plugin.js
+++ b/addons/html_builder/static/src/core/core_builder_action_plugin.js
@@ -227,10 +227,12 @@ export class StyleAction extends BuilderAction {
     static id = "styleAction";
     static dependencies = ["color"];
     getValue({ editingElement: el, params: { mainParam: styleName } }) {
-        if (styleName === "--box-border-width"
-                || CSS_SHORTHANDS["--box-border-width"].includes(styleName)
-                || styleName === "--box-border-radius"
-                || CSS_SHORTHANDS["--box-border-radius"].includes(styleName)) {
+        if (
+            styleName === "--box-border-width" ||
+            CSS_SHORTHANDS["--box-border-width"].includes(styleName) ||
+            styleName === "--box-border-radius" ||
+            CSS_SHORTHANDS["--box-border-radius"].includes(styleName)
+        ) {
             // When reading a CSS variable, we need to get the computed value
             // of the actual property it controls, ideally. Not only because the
             // panel should reflect what the user actually sees but also because
diff --git a/addons/html_builder/static/src/core/move_plugin.js b/addons/html_builder/static/src/core/move_plugin.js
index b23a18445071c..82a3b6a8042bf 100644
--- a/addons/html_builder/static/src/core/move_plugin.js
+++ b/addons/html_builder/static/src/core/move_plugin.js
@@ -120,7 +120,11 @@ export class MovePlugin extends Plugin {
                 const direction = isVertical ? "up" : reverseButtons ? "right" : "left";
                 const button = {
                     class: `fa fa-fw fa-angle-${direction}`,
-                    title: isVertical ? _t("Move up") : this.isEditableRTL ? _t("Move right") : _t("Move left"),
+                    title: isVertical
+                        ? _t("Move up")
+                        : this.isEditableRTL
+                        ? _t("Move right")
+                        : _t("Move left"),
                     handler: this.onMoveClick.bind(this, "prev"),
                 };
                 buttons.push(button);
@@ -130,7 +134,11 @@ export class MovePlugin extends Plugin {
                 const direction = isVertical ? "down" : reverseButtons ? "left" : "right";
                 const button = {
                     class: `fa fa-fw fa-angle-${direction}`,
-                    title: isVertical ? _t("Move down") : this.isEditableRTL ? _t("Move left") : _t("Move right"),
+                    title: isVertical
+                        ? _t("Move down")
+                        : this.isEditableRTL
+                        ? _t("Move left")
+                        : _t("Move right"),
                     handler: this.onMoveClick.bind(this, "next"),
                 };
                 buttons.push(button);
diff --git a/addons/html_builder/static/src/plugins/background_option/background_image_option.js b/addons/html_builder/static/src/plugins/background_option/background_image_option.js
index 2aa148765a7b2..144202fd15567 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_image_option.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_image_option.js
@@ -17,7 +17,10 @@ export class BackgroundImageOption extends BaseOptionComponent {
     toggleBgImageClasses() {
         this.dependencies.history.ignoreDOMMutations(() => {
             const backgroundURL = getBgImageURLFromEl(this.editingElement);
-            this.dependencies.backgroundImageOption.setImageBackground(this.editingElement, backgroundURL);
+            this.dependencies.backgroundImageOption.setImageBackground(
+                this.editingElement,
+                backgroundURL
+            );
         });
     }
     showMainColorPicker() {
diff --git a/addons/html_builder/static/src/plugins/border_configurator_option.js b/addons/html_builder/static/src/plugins/border_configurator_option.js
index 5529c520e4a90..9f99c26aa2fe2 100644
--- a/addons/html_builder/static/src/plugins/border_configurator_option.js
+++ b/addons/html_builder/static/src/plugins/border_configurator_option.js
@@ -23,7 +23,7 @@ export class BorderConfigurator extends BaseOptionComponent {
         }));
     }
     getStyleActionParam(param) {
-        const property = `border-${this.props.direction ? (this.props.direction + "-") : ""}${param}`;
+        const property = `border-${this.props.direction ? this.props.direction + "-" : ""}${param}`;
         if (this.props.withBSClass && (param === "width" || param === "radius")) {
             // grep: --box-border-width, --box-border-radius
             return `--box-${property}`;
diff --git a/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
index 7a3dbea26916b..befccf3e769cb 100644
--- a/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
@@ -20,7 +20,8 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 export class ImageAndFaOption extends BaseOptionComponent {
     static template = "html_builder.ImageAndFaOption";
     static selector = "span.fa, i.fa, img";
-    static exclude = "[data-oe-type='image'] > img, [data-oe-xpath], .s_social_media i.fa, .s_share i.fa";
+    static exclude =
+        "[data-oe-type='image'] > img, [data-oe-xpath], .s_social_media i.fa, .s_share i.fa";
     static name = "imageAndFaOption";
 }
 class ImageToolOptionPlugin extends Plugin {
diff --git a/addons/html_builder/static/src/plugins/many2one_option.js b/addons/html_builder/static/src/plugins/many2one_option.js
index aecfcfcfcb5c9..92aa1530a8f39 100644
--- a/addons/html_builder/static/src/plugins/many2one_option.js
+++ b/addons/html_builder/static/src/plugins/many2one_option.js
@@ -15,7 +15,7 @@ export class Many2OneOption extends BaseOptionComponent {
             const contactOpts = JSON.parse(el.dataset.oeContactOptions || "{}");
             this.nullText = contactOpts.null_text;
             this.model = el.dataset.oeMany2oneModel;
-            this.domain = JSON.parse(el.dataset.oeMany2oneDomain|| "[]");
+            this.domain = JSON.parse(el.dataset.oeMany2oneDomain || "[]");
             const searchResult = await this.orm.searchRead(
                 "ir.model",
                 [["model", "=", this.model]],
diff --git a/addons/html_builder/static/src/utils/grid_layout_utils.js b/addons/html_builder/static/src/utils/grid_layout_utils.js
index 8a791944d23d0..c6fe150e5c734 100644
--- a/addons/html_builder/static/src/utils/grid_layout_utils.js
+++ b/addons/html_builder/static/src/utils/grid_layout_utils.js
@@ -200,9 +200,10 @@ function placeColumns(columnEls, rowSize, rowGap, columnSize, columnGap, mobileB
             isImageWithoutPadding && !borderLeft ? imageEl.offsetLeft : columnEl.offsetLeft;
         if (isRtl) {
             const parentWidth = columnEl.offsetParent.clientWidth;
-            columnLeft = isImageWithoutPadding && !borderLeft
-                ? parentWidth - imageEl.offsetLeft - imageEl.offsetWidth
-                : parentWidth - columnEl.offsetLeft - columnEl.offsetWidth;
+            columnLeft =
+                isImageWithoutPadding && !borderLeft
+                    ? parentWidth - imageEl.offsetLeft - imageEl.offsetWidth
+                    : parentWidth - columnEl.offsetLeft - columnEl.offsetWidth;
         }
         // Getting the width of the column.
         const paddingLeft = parseFloat(style.paddingLeft);
diff --git a/addons/html_builder/static/src/utils/utils_css.js b/addons/html_builder/static/src/utils/utils_css.js
index 1783bf4f89482..39a8268b66cef 100644
--- a/addons/html_builder/static/src/utils/utils_css.js
+++ b/addons/html_builder/static/src/utils/utils_css.js
@@ -120,7 +120,7 @@ export function areCssValuesEqual(value1, value2, cssProp, htmlStyle) {
     // to do this: should not we just list the right CSS property explicitly
     // if we want to do this? That would have avoided the CSS variable fix that
     // had to be made here (the '--' part).
-    if (cssProp && cssProp.endsWith('-size') && !cssProp.startsWith('--')) {
+    if (cssProp && cssProp.endsWith("-size") && !cssProp.startsWith("--")) {
         // Avoid re-splitting each part during their individual comparison.
         const pseudoPartProp = cssProp + "-part";
         const re = /-?[0-9.]+(?:e[+|-]?[0-9]+)?\s*[A-Za-z%-]+|auto/g;
diff --git a/addons/html_editor/static/src/fields/html_field.js b/addons/html_editor/static/src/fields/html_field.js
index 954b9e7248bed..ac41e35cbcf5e 100644
--- a/addons/html_editor/static/src/fields/html_field.js
+++ b/addons/html_editor/static/src/fields/html_field.js
@@ -169,17 +169,17 @@ export class HtmlField extends Component {
         // Update the actual editable if still in the DOM.
         if (this.editor.editable && oldSrcToNewSrcMap) {
             this.editor.editable
-                .querySelectorAll('.o_b64_image_to_save, .o_modified_image_to_save')
-              .forEach((unsavedImage) => {
-                const oldSrc = unsavedImage.getAttribute('src');
-                if (oldSrcToNewSrcMap.has(oldSrc)) {
-                  unsavedImage.setAttribute(
-                    'src',
-                    oldSrcToNewSrcMap.get(oldSrc)
-                  );
-                }
-                unsavedImage.classList.remove("o_b64_image_to_save", "o_modified_image_to_save");
-              });
+                .querySelectorAll(".o_b64_image_to_save, .o_modified_image_to_save")
+                .forEach((unsavedImage) => {
+                    const oldSrc = unsavedImage.getAttribute("src");
+                    if (oldSrcToNewSrcMap.has(oldSrc)) {
+                        unsavedImage.setAttribute("src", oldSrcToNewSrcMap.get(oldSrc));
+                    }
+                    unsavedImage.classList.remove(
+                        "o_b64_image_to_save",
+                        "o_modified_image_to_save"
+                    );
+                });
         }
         return content;
     }
diff --git a/addons/html_editor/static/src/main/link/link_popover.js b/addons/html_editor/static/src/main/link/link_popover.js
index ffc931da6f25e..36fbf869859a5 100644
--- a/addons/html_editor/static/src/main/link/link_popover.js
+++ b/addons/html_editor/static/src/main/link/link_popover.js
@@ -146,10 +146,12 @@ export class LinkPopover extends Component {
                 },
                 noopener: {
                     label: "noopener",
-                    description: _t("Prevents the new page from accessing the original window (security)"),
+                    description: _t(
+                        "Prevents the new page from accessing the original window (security)"
+                    ),
                     isChecked: currentRelValues.includes("noopener"),
                 },
-            }
+            },
         });
 
         const getTargetedElements = () => [this.props.linkElement];
@@ -288,7 +290,7 @@ export class LinkPopover extends Component {
             this.customStyles,
             this.state.linkTarget,
             this.state.attachmentId,
-            relValue,
+            relValue
         );
     }
     applyDeducedUrl() {
diff --git a/addons/html_editor/static/src/utils/url.js b/addons/html_editor/static/src/utils/url.js
index c98f30b0cb21e..aa027d1fd5307 100644
--- a/addons/html_editor/static/src/utils/url.js
+++ b/addons/html_editor/static/src/utils/url.js
@@ -81,7 +81,7 @@ export function isAbsoluteURLInCurrentDomain(url, env = null) {
     // further as we will always leave those untouched.
     let hasProtocol;
     try {
-        hasProtocol = !!(new URL(url).protocol);
+        hasProtocol = !!new URL(url).protocol;
     } catch {
         hasProtocol = false;
     }
@@ -90,12 +90,14 @@ export function isAbsoluteURLInCurrentDomain(url, env = null) {
     }
 
     const urlObj = new URL(url, window.location.origin);
-    return urlObj.origin === window.location.origin
+    return (
+        urlObj.origin === window.location.origin ||
         // Chosen heuristic to detect someone trying to enter a link using
         // its Odoo instance domain. We just suppose it should be a relative
         // URL (if unexpected behavior, the user can just not enter its Odoo
         // instance domain but its real domain, or opt-out from the domain
         // stripping). Mentioning an .odoo.com domain, especially its own
         // one, is always a bad practice anyway.
-        || ODOO_DOMAIN_REGEX.test(urlObj.origin);
+        ODOO_DOMAIN_REGEX.test(urlObj.origin)
+    );
 }
diff --git a/addons/test_website/static/src/interactions/test_error.js b/addons/test_website/static/src/interactions/test_error.js
index c55d2778164e6..2c35d7b77aff0 100644
--- a/addons/test_website/static/src/interactions/test_error.js
+++ b/addons/test_website/static/src/interactions/test_error.js
@@ -7,9 +7,7 @@ export class TestError extends Interaction {
     static selector = ".rpc_error a";
     dynamicContent = {
         _root: { "t-on-click.prevent": () => rpc(this.el.getAttribute("href")) },
-    }
+    };
 }
 
-registry
-    .category("public.interactions")
-    .add("test_website.test_error", TestError);
+registry.category("public.interactions").add("test_website.test_error", TestError);
diff --git a/addons/test_website/static/tests/tours/custom_snippets.js b/addons/test_website/static/tests/tours/custom_snippets.js
index 6df67fb572141..62e372af57072 100644
--- a/addons/test_website/static/tests/tours/custom_snippets.js
+++ b/addons/test_website/static/tests/tours/custom_snippets.js
@@ -19,89 +19,97 @@ import { insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tou
  * -> ensure it was deleted
  */
 
-registerWebsitePreviewTour('test_custom_snippet', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_banner',
-        name: 'Banner',
-        groupName: "Intro",
-    }),
-    {
-        content: "Customize snippet",
-        trigger: ":iframe #wrapwrap .s_banner h1",
-        run: "editor Test",
-    },
-    {
-        content: "Save custom snippet",
-        trigger: "div[data-container-title='Banner'] .oe_snippet_save",
-        run: "click",
-    },
-    {
-        content: "Confirm reload",
-        trigger: ".modal-dialog button:contains('Save')",
-        run: "click",
-    },
-    {
-        content: "Click on the block tab",
-        trigger: ".o-snippets-tabs button[data-name='blocks']",
-        run: "click",
-    },
-    {
-        content: "Click on the Custom category block",
-        trigger: ".o_block_tab:not(.o_we_ongoing_insertion) #snippet_groups .o_snippet[name='Custom'].o_draggable .o_snippet_thumbnail .o_snippet_thumbnail_area",
-        run: "click",
-    },
-    {
-        content: "Ensure custom snippet preview appeared in the dialog",
-        trigger: ":iframe .o_snippet_preview_wrap[data-snippet-id^='s_banner_'] section[data-name='Custom Banner']",
-    },
-    {
-        content: "Rename custom snippet",
-        trigger: ":iframe .o_custom_snippet_edit > button",
-        run: "click",
-    },
-    {
-        content: "Set name",
-        trigger: ".modal-dialog:not(.o_inactive_modal body) input[id='inputConfirmation']",
-        run: "edit Bruce Banner",
-    },
-    {
-        content: "Confirm rename",
-        trigger: ".modal-dialog:not(.o_inactive_modal body) footer .btn-primary",
-        run: "click",
-    },
-    {
-        content: "Click on the 'Bruce Banner' snippet",
-        trigger: ":iframe .o_snippet_preview_wrap[data-snippet-id^='s_banner_']:has(section[data-name='Bruce Banner'])",
-        run: "click",
-    },
-    {
-        content: "Ensure banner section exists",
-        trigger: ":iframe #wrap section[data-name='Banner']",
-    },
-    {
-        content: "Ensure custom banner section exists",
-        trigger: ":iframe #wrap section[data-name='Bruce Banner']",
-    },
-    {
-        content: "Click on the Custom category block",
-        trigger: ".o_block_tab:not(.o_we_ongoing_insertion) #snippet_groups .o_snippet[name='Custom'].o_draggable .o_snippet_thumbnail .o_snippet_thumbnail_area",
-        run: "click",
-    },
-    {
-        content: "Delete custom snippet",
-        trigger: ":iframe .o_custom_snippet_edit > button + button",
-        run: "click",
-    },
-    {
-        content: "Confirm delete",
-        trigger: ".modal-dialog button:contains('Yes')",
-        run: "click",
-    },
-    {
-        content: "Ensure custom snippet disappeared",
-        trigger: ":iframe .o_add_snippets_preview:not(:has(section[data-name='Bruce Banner']))",
-    },
-]);
+registerWebsitePreviewTour(
+    "test_custom_snippet",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_banner",
+            name: "Banner",
+            groupName: "Intro",
+        }),
+        {
+            content: "Customize snippet",
+            trigger: ":iframe #wrapwrap .s_banner h1",
+            run: "editor Test",
+        },
+        {
+            content: "Save custom snippet",
+            trigger: "div[data-container-title='Banner'] .oe_snippet_save",
+            run: "click",
+        },
+        {
+            content: "Confirm reload",
+            trigger: ".modal-dialog button:contains('Save')",
+            run: "click",
+        },
+        {
+            content: "Click on the block tab",
+            trigger: ".o-snippets-tabs button[data-name='blocks']",
+            run: "click",
+        },
+        {
+            content: "Click on the Custom category block",
+            trigger:
+                ".o_block_tab:not(.o_we_ongoing_insertion) #snippet_groups .o_snippet[name='Custom'].o_draggable .o_snippet_thumbnail .o_snippet_thumbnail_area",
+            run: "click",
+        },
+        {
+            content: "Ensure custom snippet preview appeared in the dialog",
+            trigger:
+                ":iframe .o_snippet_preview_wrap[data-snippet-id^='s_banner_'] section[data-name='Custom Banner']",
+        },
+        {
+            content: "Rename custom snippet",
+            trigger: ":iframe .o_custom_snippet_edit > button",
+            run: "click",
+        },
+        {
+            content: "Set name",
+            trigger: ".modal-dialog:not(.o_inactive_modal body) input[id='inputConfirmation']",
+            run: "edit Bruce Banner",
+        },
+        {
+            content: "Confirm rename",
+            trigger: ".modal-dialog:not(.o_inactive_modal body) footer .btn-primary",
+            run: "click",
+        },
+        {
+            content: "Click on the 'Bruce Banner' snippet",
+            trigger:
+                ":iframe .o_snippet_preview_wrap[data-snippet-id^='s_banner_']:has(section[data-name='Bruce Banner'])",
+            run: "click",
+        },
+        {
+            content: "Ensure banner section exists",
+            trigger: ":iframe #wrap section[data-name='Banner']",
+        },
+        {
+            content: "Ensure custom banner section exists",
+            trigger: ":iframe #wrap section[data-name='Bruce Banner']",
+        },
+        {
+            content: "Click on the Custom category block",
+            trigger:
+                ".o_block_tab:not(.o_we_ongoing_insertion) #snippet_groups .o_snippet[name='Custom'].o_draggable .o_snippet_thumbnail .o_snippet_thumbnail_area",
+            run: "click",
+        },
+        {
+            content: "Delete custom snippet",
+            trigger: ":iframe .o_custom_snippet_edit > button + button",
+            run: "click",
+        },
+        {
+            content: "Confirm delete",
+            trigger: ".modal-dialog button:contains('Yes')",
+            run: "click",
+        },
+        {
+            content: "Ensure custom snippet disappeared",
+            trigger: ":iframe .o_add_snippets_preview:not(:has(section[data-name='Bruce Banner']))",
+        },
+    ]
+);
diff --git a/addons/test_website/static/tests/tours/error_views.js b/addons/test_website/static/tests/tours/error_views.js
index a2930adc5ea86..53afbde9b3b91 100644
--- a/addons/test_website/static/tests/tours/error_views.js
+++ b/addons/test_website/static/tests/tours/error_views.js
@@ -1,222 +1,236 @@
 import { registry } from "@web/core/registry";
 
-registry.category("web_tour.tours").add('test_error_website', {
-    url: '/test_error_view',
+registry.category("web_tour.tours").add("test_error_website", {
+    url: "/test_error_view",
     steps: () => [
-    // RPC ERROR
-    {
-        content: "trigger rpc user error",
-        trigger: 'a[href="/test_user_error_json"]',
-        run: "click",
-    },
-    {
-        trigger: '.o_notification:contains("This is a user rpc test")',
-    },
-    {
-        content: "rpc user error modal has message",
-        trigger: 'button.o_notification_close',
-        run: "click",
-    }, {
-        content: "trigger rpc access error",
-        trigger: 'a[href="/test_access_error_json"]',
-        run: "click",
-    },
-    {
-        trigger: '.o_notification:contains("This is an access rpc test")',
-    },
-    {
-        content: "rpc access error modal has message",
-        trigger: 'button.o_notification_close',
-        run: "click",
-    }, {
-        content: "trigger validation rpc error",
-        trigger: 'a[href="/test_validation_error_json"]',
-        run: "click",
-    },
-    {
-        trigger: '.o_notification:contains("This is a validation rpc test")',
-    },
-    {
-        content: "rpc validation error modal has message",
-        trigger: 'button.o_notification_close',
-        run: "click",
-    }, {
-        content: "trigger rpc missing error",
-        trigger: 'a[href="/test_missing_error_json"]',
-        run: "click",
-    },
-    {
-        trigger: '.o_notification:contains("This is a missing rpc test")',
-    },
-    {
-        content: "rpc missing error modal has message",
-        trigger: 'button.o_notification_close',
-        run: "click",
-    }, {
-        content: "trigger rpc error 403",
-        trigger: 'a[href="/test_access_denied_json"]',
-        run: "click",
-    },
-    {
-        trigger: '.o_notification:contains("This is an access denied rpc test")',
-    },
-    {
-        content: "rpc error 403 modal has message",
-        trigger: 'button.o_notification_close',
-        run: "click",
-    }, {
-        content: "trigger rpc error 500",
-        trigger: 'a[href="/test_internal_error_json"]',
-        run: "click",
-    },
-    {
-        trigger: "div.o_error_dialog.modal-content",
-    },
-    {
-        content: "rpc error 500 modal is an ErrorDialog",
-        trigger: '.modal-footer button.btn.btn-primary',
-        run: "click",
-    },
-    // HTTP ERROR
-    {
-        content: "trigger http user error",
-        trigger: 'body',
-        run: function () {
-            window.location.href = window.location.origin + '/test_user_error_http?debug=0';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("Something went wrong.")',
-    },
-    {
-        content: "http user error page has title and message",
-        trigger: 'div.container pre:contains("This is a user http test")',
-        run: function () {
-                window.location.href = window.location.origin + '/test_user_error_http?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("Something went wrong.")',
-    },
-    {
-        content: "http user error page debug has title and message open",
-        trigger: 'div#error_main.collapse.show pre:contains("This is a user http test")',
-    }, {
-        content: "http user error page debug has traceback closed",
-        trigger: 'body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)',
-        run: function () {
-                window.location.href = window.location.origin + '/test_validation_error_http?debug=0';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("Something went wrong.")',
-    },
-    {
-        content: "http validation error page has title and message",
-        trigger: 'div.container pre:contains("This is a validation http test")',
-        run: function () {
-                window.location.href = window.location.origin + '/test_validation_error_http?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("Something went wrong.")',
-    },
-    {
-        content: "http validation error page debug has title and message open",
-        trigger: 'div#error_main.collapse.show pre:contains("This is a validation http test")',
-    }, {
-        content: "http validation error page debug has traceback closed",
-        trigger: 'body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)',
-        run: function () {
-                window.location.href = window.location.origin + '/test_access_error_http?debug=0';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("403: Forbidden")',
-    },
-    {
-        content: "http access error page has title and message",
-        trigger: 'div.container pre:contains("This is an access http test")',
-        run: function () {
-                window.location.href = window.location.origin + '/test_access_error_http?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("403: Forbidden")',
-    },
-    {
-        content: "http access error page debug has title and message open",
-        trigger: 'div#error_main.collapse.show pre:contains("This is an access http test")',
-    }, {
-        content: "http access error page debug has traceback closed",
-        trigger: 'body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)',
-        run: function () {
-                window.location.href = window.location.origin + '/test_view_access_error?debug=0';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("403: Forbidden")',
-    },
-    {
-        content: "http access error page has title and message",
-        trigger: 'div.container pre:contains("Uh-oh! Looks like you have stumbled upon some top-secret records.")',
-        run: function () {
-                window.location.href = window.location.origin + '/test_view_access_error?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("403: Forbidden")',
-    },
-    {
-        content: "http access error page debug has title and message open",
-        trigger: 'div#error_main.collapse.show pre:contains("Uh-oh! Looks like you have stumbled upon some top-secret records.")',
-    }, {
-        content: "http access error page debug has traceback closed",
-        trigger: 'body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)',
-        run: function () {
-                window.location.href = window.location.origin + '/test_missing_error_http?debug=0';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("Error 404")',
-        run: function () {
-                window.location.href = window.location.origin + '/test_missing_error_http?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("Error 404")',
-        run: function () {
-            window.location.href = window.location.origin + '/test_access_denied_http?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("403: Forbidden")',
-    },
-    {
-        content: "http error 403 page has title but no message",
-        // See http.py _transactionning, the exception is replaced so there is no message !
-        trigger: 'div#wrap:not(:has(pre:contains("Traceback"))',
-        run: function () {
-            window.location.href = window.location.origin + '/test_access_denied_http?debug=1';
-        },
-        expectUnloadPage: true,
-    },
-    {
-        trigger: 'h1:contains("403: Forbidden")',
-    },
-    {
-        content: "http 403 error page debug has title but no message",
-        trigger: 'div#wrap:not(:has(pre:contains("Traceback"))',
-    },
-]});
+        // RPC ERROR
+        {
+            content: "trigger rpc user error",
+            trigger: 'a[href="/test_user_error_json"]',
+            run: "click",
+        },
+        {
+            trigger: '.o_notification:contains("This is a user rpc test")',
+        },
+        {
+            content: "rpc user error modal has message",
+            trigger: "button.o_notification_close",
+            run: "click",
+        },
+        {
+            content: "trigger rpc access error",
+            trigger: 'a[href="/test_access_error_json"]',
+            run: "click",
+        },
+        {
+            trigger: '.o_notification:contains("This is an access rpc test")',
+        },
+        {
+            content: "rpc access error modal has message",
+            trigger: "button.o_notification_close",
+            run: "click",
+        },
+        {
+            content: "trigger validation rpc error",
+            trigger: 'a[href="/test_validation_error_json"]',
+            run: "click",
+        },
+        {
+            trigger: '.o_notification:contains("This is a validation rpc test")',
+        },
+        {
+            content: "rpc validation error modal has message",
+            trigger: "button.o_notification_close",
+            run: "click",
+        },
+        {
+            content: "trigger rpc missing error",
+            trigger: 'a[href="/test_missing_error_json"]',
+            run: "click",
+        },
+        {
+            trigger: '.o_notification:contains("This is a missing rpc test")',
+        },
+        {
+            content: "rpc missing error modal has message",
+            trigger: "button.o_notification_close",
+            run: "click",
+        },
+        {
+            content: "trigger rpc error 403",
+            trigger: 'a[href="/test_access_denied_json"]',
+            run: "click",
+        },
+        {
+            trigger: '.o_notification:contains("This is an access denied rpc test")',
+        },
+        {
+            content: "rpc error 403 modal has message",
+            trigger: "button.o_notification_close",
+            run: "click",
+        },
+        {
+            content: "trigger rpc error 500",
+            trigger: 'a[href="/test_internal_error_json"]',
+            run: "click",
+        },
+        {
+            trigger: "div.o_error_dialog.modal-content",
+        },
+        {
+            content: "rpc error 500 modal is an ErrorDialog",
+            trigger: ".modal-footer button.btn.btn-primary",
+            run: "click",
+        },
+        // HTTP ERROR
+        {
+            content: "trigger http user error",
+            trigger: "body",
+            run: function () {
+                window.location.href = window.location.origin + "/test_user_error_http?debug=0";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("Something went wrong.")',
+        },
+        {
+            content: "http user error page has title and message",
+            trigger: 'div.container pre:contains("This is a user http test")',
+            run: function () {
+                window.location.href = window.location.origin + "/test_user_error_http?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("Something went wrong.")',
+        },
+        {
+            content: "http user error page debug has title and message open",
+            trigger: 'div#error_main.collapse.show pre:contains("This is a user http test")',
+        },
+        {
+            content: "http user error page debug has traceback closed",
+            trigger: "body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)",
+            run: function () {
+                window.location.href =
+                    window.location.origin + "/test_validation_error_http?debug=0";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("Something went wrong.")',
+        },
+        {
+            content: "http validation error page has title and message",
+            trigger: 'div.container pre:contains("This is a validation http test")',
+            run: function () {
+                window.location.href =
+                    window.location.origin + "/test_validation_error_http?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("Something went wrong.")',
+        },
+        {
+            content: "http validation error page debug has title and message open",
+            trigger: 'div#error_main.collapse.show pre:contains("This is a validation http test")',
+        },
+        {
+            content: "http validation error page debug has traceback closed",
+            trigger: "body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)",
+            run: function () {
+                window.location.href = window.location.origin + "/test_access_error_http?debug=0";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("403: Forbidden")',
+        },
+        {
+            content: "http access error page has title and message",
+            trigger: 'div.container pre:contains("This is an access http test")',
+            run: function () {
+                window.location.href = window.location.origin + "/test_access_error_http?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("403: Forbidden")',
+        },
+        {
+            content: "http access error page debug has title and message open",
+            trigger: 'div#error_main.collapse.show pre:contains("This is an access http test")',
+        },
+        {
+            content: "http access error page debug has traceback closed",
+            trigger: "body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)",
+            run: function () {
+                window.location.href = window.location.origin + "/test_view_access_error?debug=0";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("403: Forbidden")',
+        },
+        {
+            content: "http access error page has title and message",
+            trigger:
+                'div.container pre:contains("Uh-oh! Looks like you have stumbled upon some top-secret records.")',
+            run: function () {
+                window.location.href = window.location.origin + "/test_view_access_error?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("403: Forbidden")',
+        },
+        {
+            content: "http access error page debug has title and message open",
+            trigger:
+                'div#error_main.collapse.show pre:contains("Uh-oh! Looks like you have stumbled upon some top-secret records.")',
+        },
+        {
+            content: "http access error page debug has traceback closed",
+            trigger: "body:has(div#error_traceback.collapse:not(.show) pre#exception_traceback)",
+            run: function () {
+                window.location.href = window.location.origin + "/test_missing_error_http?debug=0";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("Error 404")',
+            run: function () {
+                window.location.href = window.location.origin + "/test_missing_error_http?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("Error 404")',
+            run: function () {
+                window.location.href = window.location.origin + "/test_access_denied_http?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("403: Forbidden")',
+        },
+        {
+            content: "http error 403 page has title but no message",
+            // See http.py _transactionning, the exception is replaced so there is no message !
+            trigger: 'div#wrap:not(:has(pre:contains("Traceback"))',
+            run: function () {
+                window.location.href = window.location.origin + "/test_access_denied_http?debug=1";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: 'h1:contains("403: Forbidden")',
+        },
+        {
+            content: "http 403 error page debug has title but no message",
+            trigger: 'div#wrap:not(:has(pre:contains("Traceback"))',
+        },
+    ],
+});
diff --git a/addons/test_website/static/tests/tours/form.js b/addons/test_website/static/tests/tours/form.js
index 74ed708d1cc04..6ae080b281742 100644
--- a/addons/test_website/static/tests/tours/form.js
+++ b/addons/test_website/static/tests/tours/form.js
@@ -55,5 +55,5 @@ registerWebsitePreviewTour(
             content: "Name field is shown",
             trigger: ":iframe .s_website_form:has(.s_website_form_field_hidden_if:not(.d-none))",
         },
-    ],
+    ]
 );
diff --git a/addons/test_website/static/tests/tours/image_link.js b/addons/test_website/static/tests/tours/image_link.js
index f33c2bfacd22b..821148c17ad8a 100644
--- a/addons/test_website/static/tests/tours/image_link.js
+++ b/addons/test_website/static/tests/tours/image_link.js
@@ -1,86 +1,108 @@
-import { insertSnippet, registerWebsitePreviewTour } from '@website/js/tours/tour_utils';
+import { insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
 /**
  * The purpose of this tour is to check the link on image flow.
  */
 
-const selectImageSteps = [{
-    content: "select block",
-    trigger: ":iframe #wrapwrap .s_text_image",
-    async run(helpers) {
-        await helpers.click();
-        const el = this.anchor;
-        const sel = el.ownerDocument.getSelection();
-        sel.collapse(el, 0);
-        el.focus();
-    },
-}, {
-    content: "check link popover disappeared",
-    trigger: ":iframe body:not(:has(.o_edit_menu_popover))",
-}, {
-    content: "select image",
-    trigger: ":iframe #wrapwrap .s_text_image img",
-    run: "click",
-}];
-
-registerWebsitePreviewTour('test_image_link', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
-    ...selectImageSteps,
-    {
-        content: "enable link",
-        trigger: ".o_customize_tab [data-container-title='Image'] button[data-action-id='setLink']",
-        run: "click",
-    }, {
-        content: "enter site URL",
-        trigger: ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
-        run: "edit odoo.com && click body",
-    },
-    ...selectImageSteps,
+const selectImageSteps = [
     {
-        content: "check popover content has site URL",
-        trigger: ".o-we-linkpopover a.o_we_url_link[href='http://odoo.com']:contains(http://odoo.com)",
-    }, {
-        content: "remove URL",
-        trigger: ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
-        run: "clear && click body",
+        content: "select block",
+        trigger: ":iframe #wrapwrap .s_text_image",
+        async run(helpers) {
+            await helpers.click();
+            const el = this.anchor;
+            const sel = el.ownerDocument.getSelection();
+            sel.collapse(el, 0);
+            el.focus();
+        },
     },
-    ...selectImageSteps,
     {
-        content: "check popover content has no URL",
-        trigger: ".o-we-linkpopover .o_we_href_input_link:value()",
-    }, {
-        content: "enter email URL",
-        trigger: ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
-        run: "edit mailto:test@test.com && click body",
+        content: "check link popover disappeared",
+        trigger: ":iframe body:not(:has(.o_edit_menu_popover))",
     },
-    ...selectImageSteps,
     {
-        content: "check popover content has mail URL",
-        trigger: ".o-we-linkpopover:has(.fa-envelope-o) a.o_we_url_link[href='mailto:test@test.com']:contains(mailto:test@test.com)",
-    }, {
-        content: "enter phone URL",
-        trigger: ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
-        run: "edit tel:555-2368 && click body",
-    },
-    ...selectImageSteps,
-    {
-        content: "check popover content has phone URL",
-        trigger: ".o-we-linkpopover:has(.fa-phone) a.o_we_url_link[href='tel:555-2368']:contains(tel:555-2368)",
-    }, {
-        content: "remove URL",
-        trigger: ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
-        run: "clear && click body",
+        content: "select image",
+        trigger: ":iframe #wrapwrap .s_text_image img",
+        run: "click",
     },
-    ...selectImageSteps,
+];
+
+registerWebsitePreviewTour(
+    "test_image_link",
     {
-        content: "check popover content has no URL",
-        trigger: ".o-we-linkpopover .o_we_href_input_link:value()",
+        url: "/",
+        edition: true,
     },
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        ...selectImageSteps,
+        {
+            content: "enable link",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] button[data-action-id='setLink']",
+            run: "click",
+        },
+        {
+            content: "enter site URL",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
+            run: "edit odoo.com && click body",
+        },
+        ...selectImageSteps,
+        {
+            content: "check popover content has site URL",
+            trigger:
+                ".o-we-linkpopover a.o_we_url_link[href='http://odoo.com']:contains(http://odoo.com)",
+        },
+        {
+            content: "remove URL",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
+            run: "clear && click body",
+        },
+        ...selectImageSteps,
+        {
+            content: "check popover content has no URL",
+            trigger: ".o-we-linkpopover .o_we_href_input_link:value()",
+        },
+        {
+            content: "enter email URL",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
+            run: "edit mailto:test@test.com && click body",
+        },
+        ...selectImageSteps,
+        {
+            content: "check popover content has mail URL",
+            trigger:
+                ".o-we-linkpopover:has(.fa-envelope-o) a.o_we_url_link[href='mailto:test@test.com']:contains(mailto:test@test.com)",
+        },
+        {
+            content: "enter phone URL",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
+            run: "edit tel:555-2368 && click body",
+        },
+        ...selectImageSteps,
+        {
+            content: "check popover content has phone URL",
+            trigger:
+                ".o-we-linkpopover:has(.fa-phone) a.o_we_url_link[href='tel:555-2368']:contains(tel:555-2368)",
+        },
+        {
+            content: "remove URL",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] div[data-action-id='setUrl'] input",
+            run: "clear && click body",
+        },
+        ...selectImageSteps,
+        {
+            content: "check popover content has no URL",
+            trigger: ".o-we-linkpopover .o_we_href_input_link:value()",
+        },
+    ]
+);
diff --git a/addons/test_website/static/tests/tours/image_upload_progress.js b/addons/test_website/static/tests/tours/image_upload_progress.js
index f6e38cf827b93..ffdce811a4866 100644
--- a/addons/test_website/static/tests/tours/image_upload_progress.js
+++ b/addons/test_website/static/tests/tours/image_upload_progress.js
@@ -4,35 +4,52 @@ import { FileSelectorControlPanel } from "@html_editor/main/media/media_dialog/f
 import { patch } from "@web/core/utils/patch";
 
 let patchWithError = false;
-const patchMediaDialog = () => patch(FileSelectorControlPanel.prototype, {
-    async onChangeFileInput() {
-        const getFileFromB64 = (fileData) => {
-            const binary = atob(fileData[2]);
-            let len = binary.length;
-            const arr = new Uint8Array(len);
-            while (len--) {
-                arr[len] = binary.charCodeAt(len);
-            }
-            return new File([arr], fileData[1], {type: fileData[0]});
-        };
+const patchMediaDialog = () =>
+    patch(FileSelectorControlPanel.prototype, {
+        async onChangeFileInput() {
+            const getFileFromB64 = (fileData) => {
+                const binary = atob(fileData[2]);
+                let len = binary.length;
+                const arr = new Uint8Array(len);
+                while (len--) {
+                    arr[len] = binary.charCodeAt(len);
+                }
+                return new File([arr], fileData[1], { type: fileData[0] });
+            };
 
-        let files = [
-            getFileFromB64(['image/vnd.microsoft.icon', 'icon.ico', "AAABAAEAAQEAAAEAIAAwAAAAFgAAACgAAAABAAAAAgAAAAEAIAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAA=="]),
-            getFileFromB64(['image/webp', 'image.webp', "UklGRhwAAABXRUJQVlA4TBAAAAAvE8AEAAfQhuh//wMR0f8A"]),
-            getFileFromB64(['image/png', 'image.png', "iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAApElEQVR42u3RAQ0AAAjDMO5fNCCDkC5z0HTVrisFCBABASIgQAQEiIAAAQJEQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAQECBAgAgJEQIAIyPcGFY7HnV2aPXoAAAAASUVORK5CYII="]),
-            getFileFromB64(['image/jpeg', 'image.jpeg', "/9j/4AAQSkZJRgABAQAAAQABAAD//gAfQ29tcHJlc3NlZCBieSBqcGVnLXJlY29tcHJlc3P/2wCEAA0NDQ0ODQ4QEA4UFhMWFB4bGRkbHi0gIiAiIC1EKjIqKjIqRDxJOzc7STxsVUtLVWx9aWNpfZeHh5e+tb75+f8BDQ0NDQ4NDhAQDhQWExYUHhsZGRseLSAiICIgLUQqMioqMipEPEk7NztJPGxVS0tVbH1pY2l9l4eHl761vvn5///CABEIAEsASwMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAABv/aAAgBAQAAAACHAAAAAAAAAAAAAAAAH//EABUBAQEAAAAAAAAAAAAAAAAAAAAH/9oACAECEAAAAKYAAAB//8QAFQEBAQAAAAAAAAAAAAAAAAAAAAX/2gAIAQMQAAAAngAAAf/EABQQAQAAAAAAAAAAAAAAAAAAAGD/2gAIAQEAAT8ASf/EABQRAQAAAAAAAAAAAAAAAAAAAED/2gAIAQIBAT8AT//EABQRAQAAAAAAAAAAAAAAAAAAAED/2gAIAQMBAT8AT//Z"]),
-        ];
+            let files = [
+                getFileFromB64([
+                    "image/vnd.microsoft.icon",
+                    "icon.ico",
+                    "AAABAAEAAQEAAAEAIAAwAAAAFgAAACgAAAABAAAAAgAAAAEAIAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAA==",
+                ]),
+                getFileFromB64([
+                    "image/webp",
+                    "image.webp",
+                    "UklGRhwAAABXRUJQVlA4TBAAAAAvE8AEAAfQhuh//wMR0f8A",
+                ]),
+                getFileFromB64([
+                    "image/png",
+                    "image.png",
+                    "iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAApElEQVR42u3RAQ0AAAjDMO5fNCCDkC5z0HTVrisFCBABASIgQAQEiIAAAQJEQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAREQIAICBABASIgQAQECBAgAgJEQIAIyPcGFY7HnV2aPXoAAAAASUVORK5CYII=",
+                ]),
+                getFileFromB64([
+                    "image/jpeg",
+                    "image.jpeg",
+                    "/9j/4AAQSkZJRgABAQAAAQABAAD//gAfQ29tcHJlc3NlZCBieSBqcGVnLXJlY29tcHJlc3P/2wCEAA0NDQ0ODQ4QEA4UFhMWFB4bGRkbHi0gIiAiIC1EKjIqKjIqRDxJOzc7STxsVUtLVWx9aWNpfZeHh5e+tb75+f8BDQ0NDQ4NDhAQDhQWExYUHhsZGRseLSAiICIgLUQqMioqMipEPEk7NztJPGxVS0tVbH1pY2l9l4eHl761vvn5///CABEIAEsASwMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAABv/aAAgBAQAAAACHAAAAAAAAAAAAAAAAH//EABUBAQEAAAAAAAAAAAAAAAAAAAAH/9oACAECEAAAAKYAAAB//8QAFQEBAQAAAAAAAAAAAAAAAAAAAAX/2gAIAQMQAAAAngAAAf/EABQQAQAAAAAAAAAAAAAAAAAAAGD/2gAIAQEAAT8ASf/EABQRAQAAAAAAAAAAAAAAAAAAAED/2gAIAQIBAT8AT//EABQRAQAAAAAAAAAAAAAAAAAAAED/2gAIAQMBAT8AT//Z",
+                ]),
+            ];
 
-        if (!this.props.multiSelect) {
-            if (patchWithError) {
-                files = [files[0]];
-            } else {
-                files = [files[2]];
+            if (!this.props.multiSelect) {
+                if (patchWithError) {
+                    files = [files[0]];
+                } else {
+                    files = [files[2]];
+                }
             }
-        }
-        await this.props.uploadFiles(files);
-    }
-});
+            await this.props.uploadFiles(files);
+        },
+    });
 
 let unpatchMediaDialog = null;
 
@@ -54,185 +71,230 @@ const setupSteps = function () {
             id: "s_image_gallery",
             name: "Image Gallery",
             groupName: "Images",
-        })
+        }),
     ];
 };
 
-const formatErrorMsg = "format is not supported. Try with: .gif, .jpe, .jpeg, .jpg, .png, .svg, .webp";
+const formatErrorMsg =
+    "format is not supported. Try with: .gif, .jpe, .jpeg, .jpg, .png, .svg, .webp";
 
-registerWebsitePreviewTour('test_image_upload_progress', {
-    url: '/test_image_progress',
-    edition: true,
-}, () => [
-    ...setupSteps(),
-    // 1. Check multi image upload
+registerWebsitePreviewTour(
+    "test_image_upload_progress",
     {
-        content: "click on dropped snippet",
-        trigger: ":iframe #wrap .s_image_gallery .img",
-        run: "click",
-    }, {
-        content: "click on add images to open image dialog (in multi mode)",
-        trigger: "button[data-action-id='addImage']",
-        run: "click",
-    }, {
-        content: "manually trigger input change",
-        trigger: ".o_select_media_dialog .o_upload_media_button",
-        run() {
-            // This will trigger upload of dummy files for test purpose, as a
-            // test can't select local files to upload into the input.
-            document.body.querySelector('.o_select_media_dialog .o_file_input').dispatchEvent(new Event('change'));
-        },
-    }, {
-        content: "check upload progress bar is correctly shown (1)",
-        trigger: `.o_we_progressbar:contains('icon.ico'):contains('${formatErrorMsg}')`,
-    }, {
-        content: "check upload progress bar is correctly shown (2)",
-        trigger: ".o_we_progressbar:contains('image.webp'):contains('File has been uploaded')",
-    }, {
-        content: "check upload progress bar is correctly shown (3)",
-        trigger: ".o_we_progressbar:contains('image.png'):contains('File has been uploaded')",
-    }, {
-        content: "check upload progress bar is correctly shown (4)",
-        trigger: ".o_we_progressbar:contains('image.jpeg'):contains('File has been uploaded')",
+        url: "/test_image_progress",
+        edition: true,
     },
-    {
-        trigger: ".o_notification",
-    },
-    {
-        content: "there should only have one notification toaster",
-        trigger: "body",
-        run() {
-            const notificationCount = document.querySelectorAll(".o_notification").length;
-            if (notificationCount !== 1) {
-                throw new Error(`There should be one notification toaster opened, and only one, found ${notificationCount}.`);
-            }
-        }
-    }, {
-        content: "close notification",
-        trigger: '.o_notification_close',
-        run: "click",
-    }, {
-        content: "close media dialog",
-        trigger: '.modal-footer .btn-secondary',
-        run: "click",
-    },
-    // 2. Check success single image upload
-    {
-        content: "click on dropped snippet",
-        trigger: ":iframe #wrap .s_text_image .img",
-        run: "click",
-    }, {
-        content: "click on replace media to open image dialog",
-        trigger: "button[data-action-id='replaceMedia']",
-        run: "click",
-    }, {
-        content: "manually trigger input change",
-        trigger: ".o_select_media_dialog .o_upload_media_button",
-        run() {
-            // This will trigger upload of dummy files for test purpose, as a
-            // test can't select local files to upload into the input.
-            document.body.querySelector('.o_select_media_dialog .o_file_input').dispatchEvent(new Event('change'));
-        },
-    }, {
-        content: "check upload progress bar is correctly shown",
-        trigger: ".o_we_progressbar:contains('image.png')",
-    }, {
-        content: "there should only have one notification toaster",
-        trigger: ".o_notification",
-        run() {
-            const notificationCount = document.querySelectorAll(".o_notification").length;
-            if (notificationCount !== 1) {
-                throw new Error(`There should be one notification toaster opened, and only one, found ${notificationCount}.`);
-            }
-        }
-    }, {
-        content: "media dialog has closed after the upload",
-        trigger: 'body:not(:has(.o_select_media_dialog))',
-    }, {
-        content: "the upload progress toast was updated",
-        trigger: ".o_we_progressbar:contains('image.png'):contains('File has been uploaded')",
-    }, {
-        content: "toaster should disappear after a few seconds if the uploaded image is successful",
-        trigger: "body:not(:has(.o_we_progressbar))",
-    },
-    // 3. Check error single image upload
-    {
-        content: "click on dropped snippet",
-        trigger: ":iframe #wrap .s_text_image .img",
-        run: "click",
-    }, {
-        content: "click on replace media to open image dialog",
-        trigger: "button[data-action-id='replaceMedia']",
-        run: "click",
-    }, {
-        content: "manually trigger input change",
-        trigger: ".o_select_media_dialog .o_upload_media_button",
-        run() {
-            patchWithError = true;
-            // This will trigger upload of dummy files for test purpose, as a
-            // test can't select local files to upload into the input.
-            document.body.querySelector('.o_select_media_dialog .o_file_input').dispatchEvent(new Event('change'));
-
+    () => [
+        ...setupSteps(),
+        // 1. Check multi image upload
+        {
+            content: "click on dropped snippet",
+            trigger: ":iframe #wrap .s_image_gallery .img",
+            run: "click",
         },
-    }, {
-        content: "check upload progress bar is correctly shown",
-        trigger: `.o_we_progressbar:contains('icon.ico'):contains('${formatErrorMsg}')`,
-        run() {
-            patchWithError = false;
-        },
-    }, {
-        content: "there should only have one notification toaster",
-        trigger: ".o_notification",
-        run() {
-            const notificationCount = document.querySelectorAll(".o_notification").length;
-            if (notificationCount !== 1) {
-                throw new Error(`There should be one noficiation toaster opened, and only one, found ${notificationCount}.`);
-            }
-            unpatchMediaDialog();
-        }
-    },
-]);
-
+        {
+            content: "click on add images to open image dialog (in multi mode)",
+            trigger: "button[data-action-id='addImage']",
+            run: "click",
+        },
+        {
+            content: "manually trigger input change",
+            trigger: ".o_select_media_dialog .o_upload_media_button",
+            run() {
+                // This will trigger upload of dummy files for test purpose, as a
+                // test can't select local files to upload into the input.
+                document.body
+                    .querySelector(".o_select_media_dialog .o_file_input")
+                    .dispatchEvent(new Event("change"));
+            },
+        },
+        {
+            content: "check upload progress bar is correctly shown (1)",
+            trigger: `.o_we_progressbar:contains('icon.ico'):contains('${formatErrorMsg}')`,
+        },
+        {
+            content: "check upload progress bar is correctly shown (2)",
+            trigger: ".o_we_progressbar:contains('image.webp'):contains('File has been uploaded')",
+        },
+        {
+            content: "check upload progress bar is correctly shown (3)",
+            trigger: ".o_we_progressbar:contains('image.png'):contains('File has been uploaded')",
+        },
+        {
+            content: "check upload progress bar is correctly shown (4)",
+            trigger: ".o_we_progressbar:contains('image.jpeg'):contains('File has been uploaded')",
+        },
+        {
+            trigger: ".o_notification",
+        },
+        {
+            content: "there should only have one notification toaster",
+            trigger: "body",
+            run() {
+                const notificationCount = document.querySelectorAll(".o_notification").length;
+                if (notificationCount !== 1) {
+                    throw new Error(
+                        `There should be one notification toaster opened, and only one, found ${notificationCount}.`
+                    );
+                }
+            },
+        },
+        {
+            content: "close notification",
+            trigger: ".o_notification_close",
+            run: "click",
+        },
+        {
+            content: "close media dialog",
+            trigger: ".modal-footer .btn-secondary",
+            run: "click",
+        },
+        // 2. Check success single image upload
+        {
+            content: "click on dropped snippet",
+            trigger: ":iframe #wrap .s_text_image .img",
+            run: "click",
+        },
+        {
+            content: "click on replace media to open image dialog",
+            trigger: "button[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "manually trigger input change",
+            trigger: ".o_select_media_dialog .o_upload_media_button",
+            run() {
+                // This will trigger upload of dummy files for test purpose, as a
+                // test can't select local files to upload into the input.
+                document.body
+                    .querySelector(".o_select_media_dialog .o_file_input")
+                    .dispatchEvent(new Event("change"));
+            },
+        },
+        {
+            content: "check upload progress bar is correctly shown",
+            trigger: ".o_we_progressbar:contains('image.png')",
+        },
+        {
+            content: "there should only have one notification toaster",
+            trigger: ".o_notification",
+            run() {
+                const notificationCount = document.querySelectorAll(".o_notification").length;
+                if (notificationCount !== 1) {
+                    throw new Error(
+                        `There should be one notification toaster opened, and only one, found ${notificationCount}.`
+                    );
+                }
+            },
+        },
+        {
+            content: "media dialog has closed after the upload",
+            trigger: "body:not(:has(.o_select_media_dialog))",
+        },
+        {
+            content: "the upload progress toast was updated",
+            trigger: ".o_we_progressbar:contains('image.png'):contains('File has been uploaded')",
+        },
+        {
+            content:
+                "toaster should disappear after a few seconds if the uploaded image is successful",
+            trigger: "body:not(:has(.o_we_progressbar))",
+        },
+        // 3. Check error single image upload
+        {
+            content: "click on dropped snippet",
+            trigger: ":iframe #wrap .s_text_image .img",
+            run: "click",
+        },
+        {
+            content: "click on replace media to open image dialog",
+            trigger: "button[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "manually trigger input change",
+            trigger: ".o_select_media_dialog .o_upload_media_button",
+            run() {
+                patchWithError = true;
+                // This will trigger upload of dummy files for test purpose, as a
+                // test can't select local files to upload into the input.
+                document.body
+                    .querySelector(".o_select_media_dialog .o_file_input")
+                    .dispatchEvent(new Event("change"));
+            },
+        },
+        {
+            content: "check upload progress bar is correctly shown",
+            trigger: `.o_we_progressbar:contains('icon.ico'):contains('${formatErrorMsg}')`,
+            run() {
+                patchWithError = false;
+            },
+        },
+        {
+            content: "there should only have one notification toaster",
+            trigger: ".o_notification",
+            run() {
+                const notificationCount = document.querySelectorAll(".o_notification").length;
+                if (notificationCount !== 1) {
+                    throw new Error(
+                        `There should be one noficiation toaster opened, and only one, found ${notificationCount}.`
+                    );
+                }
+                unpatchMediaDialog();
+            },
+        },
+    ]
+);
 
-registerWebsitePreviewTour('test_image_upload_progress_unsplash', {
-    url: '/test_image_progress',
-    edition: true,
-}, () => [
-    ...setupSteps(),
-    // 1. Check multi image upload
+registerWebsitePreviewTour(
+    "test_image_upload_progress_unsplash",
     {
-        content: "click on dropped snippet",
-        trigger: ":iframe #wrap .s_image_gallery .img",
-        run: "click",
-    }, {
-        content: "click on replace media to open image dialog",
-        trigger: "button[data-action-id='replaceMedia']",
-        run: "click",
-    }, {
-        content: "search 'fox' images",
-        trigger: ".o_we_search",
-        run: "edit fox",
-    }, {
-        content: "click on unsplash result", // note that unsplash is mocked
-        trigger: ".o_we_media_dialog_img_wrapper:has(img[alt~=fox]) + .o_button_area",
-        run: "click",
+        url: "/test_image_progress",
+        edition: true,
     },
-    {
-        trigger: ".o_notification_close",
-    },
-    {
-        content: "check that the upload progress bar is correctly shown",
-        // ensure it is there so we are sure next step actually test something
-        trigger: ".o_we_progressbar:contains('fox'):contains('File has been uploaded')",
-    }, {
-        content: "notification should close after 3 seconds",
-        trigger: 'body:not(:has(.o_notification_close))',
-        run: "click",
-    }, {
-        content: "unsplash image (mocked to logo) should have been used",
-        trigger: ":iframe #wrap .s_image_gallery img[data-original-src^='/unsplash/HQqIOc8oYro/fox']",
-        run() {
-            unpatchMediaDialog();
+    () => [
+        ...setupSteps(),
+        // 1. Check multi image upload
+        {
+            content: "click on dropped snippet",
+            trigger: ":iframe #wrap .s_image_gallery .img",
+            run: "click",
         },
-    },
-]);
+        {
+            content: "click on replace media to open image dialog",
+            trigger: "button[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "search 'fox' images",
+            trigger: ".o_we_search",
+            run: "edit fox",
+        },
+        {
+            content: "click on unsplash result", // note that unsplash is mocked
+            trigger: ".o_we_media_dialog_img_wrapper:has(img[alt~=fox]) + .o_button_area",
+            run: "click",
+        },
+        {
+            trigger: ".o_notification_close",
+        },
+        {
+            content: "check that the upload progress bar is correctly shown",
+            // ensure it is there so we are sure next step actually test something
+            trigger: ".o_we_progressbar:contains('fox'):contains('File has been uploaded')",
+        },
+        {
+            content: "notification should close after 3 seconds",
+            trigger: "body:not(:has(.o_notification_close))",
+            run: "click",
+        },
+        {
+            content: "unsplash image (mocked to logo) should have been used",
+            trigger:
+                ":iframe #wrap .s_image_gallery img[data-original-src^='/unsplash/HQqIOc8oYro/fox']",
+            run() {
+                unpatchMediaDialog();
+            },
+        },
+    ]
+);
diff --git a/addons/test_website/static/tests/tours/json_auth.js b/addons/test_website/static/tests/tours/json_auth.js
index af1910275018e..e7628424f4e60 100644
--- a/addons/test_website/static/tests/tours/json_auth.js
+++ b/addons/test_website/static/tests/tours/json_auth.js
@@ -1,21 +1,24 @@
 import { registry } from "@web/core/registry";
 import { rpc } from "@web/core/network/rpc";
 
-registry.category("web_tour.tours").add('test_json_auth', {
-    steps: () => [{
-    trigger: 'body',
-    run: async function () {
-        await rpc('/test_get_dbname').then( function (result){
-            return rpc("/web/session/authenticate", {
-                db: result,
-                login: 'admin',
-                password: 'admin'
-            });
-        });
-        window.location.href = window.location.origin;
-    },
-    expectUnloadPage: true,
-}, {
-    trigger: 'span:contains(Mitchell Admin), span:contains(Administrator)',
-}
-]});
+registry.category("web_tour.tours").add("test_json_auth", {
+    steps: () => [
+        {
+            trigger: "body",
+            run: async function () {
+                await rpc("/test_get_dbname").then(function (result) {
+                    return rpc("/web/session/authenticate", {
+                        db: result,
+                        login: "admin",
+                        password: "admin",
+                    });
+                });
+                window.location.href = window.location.origin;
+            },
+            expectUnloadPage: true,
+        },
+        {
+            trigger: "span:contains(Mitchell Admin), span:contains(Administrator)",
+        },
+    ],
+});
diff --git a/addons/test_website/static/tests/tours/page_manager.js b/addons/test_website/static/tests/tours/page_manager.js
index f88f1833727d0..e4d84be67b45a 100644
--- a/addons/test_website/static/tests/tours/page_manager.js
+++ b/addons/test_website/static/tests/tours/page_manager.js
@@ -1,87 +1,104 @@
 import { registry } from "@web/core/registry";
 
-registry.category("web_tour.tours").add('test_website_page_manager', {
-    url: '/odoo/action-test_website.action_test_model_multi_website',
+registry.category("web_tour.tours").add("test_website_page_manager", {
+    url: "/odoo/action-test_website.action_test_model_multi_website",
     steps: () => [
-// Part 1: check that the website filter is working
-{
-    content: "Check that we see records from My Website",
-    trigger: ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Test Multi Model Website 1') " +
-             "~ .o_data_cell[name=website_id]:contains('My Website')",
-}, {
-    content: "Check that there is only 2 records in the pager",
-    trigger: ".o_pager .o_pager_value:contains('1-2')",
-}, {
-    content: "Click on the 'Select all records' checkbox",
-    trigger: "thead .o_list_record_selector",
-    run: "click",
-}, {
-    content: "Check that there is only 2 records selected",
-    trigger: ".o_selection_box:contains(2):contains(selected)",
-}, {
-    content: "Click on the 'Select all records' checkbox again to unselect all records and see the search bar",
-    trigger: "thead .o_list_record_selector",
-    run: "click",
-}, {
-	content: "Click on the search options",
-	trigger: ".o_searchview_dropdown_toggler",
-    run: "click",
-}, {
-    content: "Remove 'My Website' filter",
-    trigger: ".o_filter_menu .o-dropdown-item:contains('My Website')",
-    run: "click",
-}, {
-    content: "Select 'My Website 2' filter",
-    trigger: ".o_filter_menu .o-dropdown-item:contains('My Website 2')",
-    run: "click",
-}, {
-    // This step is just here to ensure there is more records than the 2
-    // available on website 1, to ensure the test is actually testing something.
-    content: "Check that we see records from My Website 2",
-    trigger: ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Test Model Multi Website 2') " +
-             "~ .o_data_cell[name=website_id]:contains('My Website 2')",
-},
-// Part 2: ensure Kanban View is working / not crashing
-{
-    content: "Click on Kanban View",
-    trigger: '.o_cp_switch_buttons .o_kanban',
-    run: "click",
-},
-{
-    trigger: ".o_kanban_renderer",
-},
-{
-    content: "Click on List View",
-    trigger: '.o_cp_switch_buttons .o_list',
-    run: "click",
-}, {
-    content: "Wait for List View to be loaded",
-    trigger: '.o_list_renderer',
-}]
+        // Part 1: check that the website filter is working
+        {
+            content: "Check that we see records from My Website",
+            trigger:
+                ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Test Multi Model Website 1') " +
+                "~ .o_data_cell[name=website_id]:contains('My Website')",
+        },
+        {
+            content: "Check that there is only 2 records in the pager",
+            trigger: ".o_pager .o_pager_value:contains('1-2')",
+        },
+        {
+            content: "Click on the 'Select all records' checkbox",
+            trigger: "thead .o_list_record_selector",
+            run: "click",
+        },
+        {
+            content: "Check that there is only 2 records selected",
+            trigger: ".o_selection_box:contains(2):contains(selected)",
+        },
+        {
+            content:
+                "Click on the 'Select all records' checkbox again to unselect all records and see the search bar",
+            trigger: "thead .o_list_record_selector",
+            run: "click",
+        },
+        {
+            content: "Click on the search options",
+            trigger: ".o_searchview_dropdown_toggler",
+            run: "click",
+        },
+        {
+            content: "Remove 'My Website' filter",
+            trigger: ".o_filter_menu .o-dropdown-item:contains('My Website')",
+            run: "click",
+        },
+        {
+            content: "Select 'My Website 2' filter",
+            trigger: ".o_filter_menu .o-dropdown-item:contains('My Website 2')",
+            run: "click",
+        },
+        {
+            // This step is just here to ensure there is more records than the 2
+            // available on website 1, to ensure the test is actually testing something.
+            content: "Check that we see records from My Website 2",
+            trigger:
+                ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Test Model Multi Website 2') " +
+                "~ .o_data_cell[name=website_id]:contains('My Website 2')",
+        },
+        // Part 2: ensure Kanban View is working / not crashing
+        {
+            content: "Click on Kanban View",
+            trigger: ".o_cp_switch_buttons .o_kanban",
+            run: "click",
+        },
+        {
+            trigger: ".o_kanban_renderer",
+        },
+        {
+            content: "Click on List View",
+            trigger: ".o_cp_switch_buttons .o_list",
+            run: "click",
+        },
+        {
+            content: "Wait for List View to be loaded",
+            trigger: ".o_list_renderer",
+        },
+    ],
 });
 
-registry.category("web_tour.tours").add('test_website_page_manager_js_class_bug', {
-    url: '/odoo/action-test_website.action_test_model_multi_website_js_class_bug',
+registry.category("web_tour.tours").add("test_website_page_manager_js_class_bug", {
+    url: "/odoo/action-test_website.action_test_model_multi_website_js_class_bug",
     steps: () => [
-{
-    content: "Click on Kanban View",
-    trigger: '.o_cp_switch_buttons .o_kanban',
-    run: "click",
-}, {
-    content: "Wait for Kanban View to be loaded",
-    trigger: '.o_kanban_renderer',
-}]
+        {
+            content: "Click on Kanban View",
+            trigger: ".o_cp_switch_buttons .o_kanban",
+            run: "click",
+        },
+        {
+            content: "Wait for Kanban View to be loaded",
+            trigger: ".o_kanban_renderer",
+        },
+    ],
 });
 
-registry.category("web_tour.tours").add('test_website_page_manager_no_website_id', {
-    url: '/odoo/action-test_website.action_test_model',
+registry.category("web_tour.tours").add("test_website_page_manager_no_website_id", {
+    url: "/odoo/action-test_website.action_test_model",
     steps: () => [
-{
-    content: "Click on Kanban View",
-    trigger: '.o_cp_switch_buttons .o_kanban',
-    run: "click",
-}, {
-    content: "Wait for Kanban View to be loaded",
-    trigger: '.o_kanban_renderer',
-}]
+        {
+            content: "Click on Kanban View",
+            trigger: ".o_cp_switch_buttons .o_kanban",
+            run: "click",
+        },
+        {
+            content: "Wait for Kanban View to be loaded",
+            trigger: ".o_kanban_renderer",
+        },
+    ],
 });
diff --git a/addons/test_website/static/tests/tours/replace_media.js b/addons/test_website/static/tests/tours/replace_media.js
index a960dafaf68d8..fafdbfdf4060e 100644
--- a/addons/test_website/static/tests/tours/replace_media.js
+++ b/addons/test_website/static/tests/tours/replace_media.js
@@ -4,168 +4,176 @@ import {
     changeOption,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-const VIDEO_URL = 'https://www.youtube.com/watch?v=Dpq87YCHmJc';
+const VIDEO_URL = "https://www.youtube.com/watch?v=Dpq87YCHmJc";
 
 /**
  * The purpose of this tour is to check the media replacement flow.
  */
-registerWebsitePreviewTour('test_replace_media', {
-    url: '/',
-    edition: true,
-}, () => [
-    {
-        trigger: "body",
-        run: function () {
-            // Patch the VideoDialog so that it does not do external calls
-            // during the test (note that we don't unpatch but as the patch
-            // is only done after the execution of a test_website test and
-            // specific to an URL only, it is acceptable).
-            // TODO if we ever give the possibility to upload its own videos,
-            // this won't be necessary anymore.
-            patch(VideoSelector.prototype, {
-                async _getVideoURLData(src, options) {
-                    if (src === VIDEO_URL || src === 'about:blank') {
-                        return {platform: 'youtube', embed_url: 'about:blank'};
-                    }
-                    return super._getVideoURLData(...arguments);
-                },
-            });
+registerWebsitePreviewTour(
+    "test_replace_media",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        {
+            trigger: "body",
+            run: function () {
+                // Patch the VideoDialog so that it does not do external calls
+                // during the test (note that we don't unpatch but as the patch
+                // is only done after the execution of a test_website test and
+                // specific to an URL only, it is acceptable).
+                // TODO if we ever give the possibility to upload its own videos,
+                // this won't be necessary anymore.
+                patch(VideoSelector.prototype, {
+                    async _getVideoURLData(src, options) {
+                        if (src === VIDEO_URL || src === "about:blank") {
+                            return { platform: "youtube", embed_url: "about:blank" };
+                        }
+                        return super._getVideoURLData(...arguments);
+                    },
+                });
+            },
         },
-    },
-    ...insertSnippet({
-        name: 'Title - Image',
-        id: 's_picture',
-        groupName: "Images",
-    }),
-    {
-        content: "select image",
-        trigger: ":iframe .s_picture figure img",
-        run: "click",
-    },
-    {
-        content: "ensure image size is displayed",
-        trigger: ".o_customize_tab [data-container-title='Image'] .options-container-header:contains('kb')",
-    },
-    changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
-    {
-        content: "Click on the first image shape",
-        trigger: "button[data-action-id='setImageShape']",
-        run: "click",
-    },
-    {
-        content: "Open MediaDialog from an image",
-        trigger: "button[data-action-id='replaceMedia']",
-        run: "click",
-    },
-    {
-        content: "select svg",
-        trigger: ".o_select_media_dialog .o_button_area[aria-label='sample.svg']",
-        run: "click",
-    },
-    {
-        content: "ensure the svg does have a shape",
-        trigger: ":iframe .s_picture figure img[data-shape]",
-    },
-    {
-        content: "ensure image size is displayed",
-        trigger: ".o_customize_tab [data-container-title='Image'] span[title='Size']",
-    },
-    {
-        content: "replace image",
-        trigger: "button[data-action-id='replaceMedia']",
-        run: "click",
-    },
-    {
-        content: "go to pictogram tab",
-        trigger: ".o_select_media_dialog .nav-link:contains('Icons')",
-        run: "click",
-    },
-    {
-        content: "select an icon",
-        trigger: ".o_select_media_dialog:has(.nav-link.active:contains('Icons')) .tab-content span.fa-heart",
-        run: "click",
-    },
-    {
-        content: "ensure icon block is displayed",
-        trigger: ".o_customize_tab [data-container-title='Icon']",
-    },
-    {
-        content: "select footer",
-        trigger: ":iframe footer",
-        run: "click",
-    },
-    {
-        content: "select icon",
-        trigger: ":iframe .s_picture figure span.fa-heart",
-        run: "click",
-    },
-    {
-        content: "ensure icon block is still displayed",
-        trigger: ".o_customize_tab [data-container-title='Icon']",
-    },
-    {
-        content: "replace icon",
-        trigger: "button[data-action-id='replaceMedia']",
-        run: "click",
-    },
-    {
-        content: "go to video tab",
-        trigger: ".o_select_media_dialog .nav-link:contains('Video')",
-        run: "click",
-    },
-    {
-        content: "enter a video URL",
-        trigger: ".o_select_media_dialog #o_video_text",
-        // Design your first web page.
-        run: `edit ${VIDEO_URL}`,
-    },
-    {
-        content: "wait for preview to appear",
-        // "about:blank" because the VideoWidget was patched at the start of this tour
-        trigger: ".o_select_media_dialog div.media_iframe_video [src='about:blank']:iframe body",
-    },
-    {
-        content: "confirm selection",
-        trigger: ".o_select_media_dialog .modal-footer .btn-primary",
-        run: "click",
-    },
-    {
-        content: "ensure video option block is displayed",
-        trigger: ".o_customize_tab [data-container-title='Video']",
-    },
-    {
-        content: "replace image",
-        trigger: ".btn-success[data-action-id='replaceMedia']",
-        run: "click",
-    },
-    {
-        content: "go to pictogram tab",
-        trigger: ".o_select_media_dialog .nav-link:contains('Icons')",
-        run: "click",
-    },
-    {
-        content: "select an icon",
-        trigger: ".o_select_media_dialog:has(.nav-link.active:contains('Icons')) .tab-content span.fa-heart",
-        run: "click",
-    },
-    {
-        content: "ensure icon block is displayed",
-        trigger: ".o_customize_tab [data-container-title='Icon']",
-    },
-    {
-        content: "select footer",
-        trigger: ":iframe footer",
-        run: "click",
-    },
-    {
-        content: "select icon",
-        trigger: ":iframe .s_picture figure span.fa-heart",
-        run: "click",
-    },
-    {
-        content: "ensure icon block is still displayed",
-        trigger: ".o_customize_tab [data-container-title='Icon']",
-    },
-]);
+        ...insertSnippet({
+            name: "Title - Image",
+            id: "s_picture",
+            groupName: "Images",
+        }),
+        {
+            content: "select image",
+            trigger: ":iframe .s_picture figure img",
+            run: "click",
+        },
+        {
+            content: "ensure image size is displayed",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] .options-container-header:contains('kb')",
+        },
+        changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
+        {
+            content: "Click on the first image shape",
+            trigger: "button[data-action-id='setImageShape']",
+            run: "click",
+        },
+        {
+            content: "Open MediaDialog from an image",
+            trigger: "button[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "select svg",
+            trigger: ".o_select_media_dialog .o_button_area[aria-label='sample.svg']",
+            run: "click",
+        },
+        {
+            content: "ensure the svg does have a shape",
+            trigger: ":iframe .s_picture figure img[data-shape]",
+        },
+        {
+            content: "ensure image size is displayed",
+            trigger: ".o_customize_tab [data-container-title='Image'] span[title='Size']",
+        },
+        {
+            content: "replace image",
+            trigger: "button[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "go to pictogram tab",
+            trigger: ".o_select_media_dialog .nav-link:contains('Icons')",
+            run: "click",
+        },
+        {
+            content: "select an icon",
+            trigger:
+                ".o_select_media_dialog:has(.nav-link.active:contains('Icons')) .tab-content span.fa-heart",
+            run: "click",
+        },
+        {
+            content: "ensure icon block is displayed",
+            trigger: ".o_customize_tab [data-container-title='Icon']",
+        },
+        {
+            content: "select footer",
+            trigger: ":iframe footer",
+            run: "click",
+        },
+        {
+            content: "select icon",
+            trigger: ":iframe .s_picture figure span.fa-heart",
+            run: "click",
+        },
+        {
+            content: "ensure icon block is still displayed",
+            trigger: ".o_customize_tab [data-container-title='Icon']",
+        },
+        {
+            content: "replace icon",
+            trigger: "button[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "go to video tab",
+            trigger: ".o_select_media_dialog .nav-link:contains('Video')",
+            run: "click",
+        },
+        {
+            content: "enter a video URL",
+            trigger: ".o_select_media_dialog #o_video_text",
+            // Design your first web page.
+            run: `edit ${VIDEO_URL}`,
+        },
+        {
+            content: "wait for preview to appear",
+            // "about:blank" because the VideoWidget was patched at the start of this tour
+            trigger:
+                ".o_select_media_dialog div.media_iframe_video [src='about:blank']:iframe body",
+        },
+        {
+            content: "confirm selection",
+            trigger: ".o_select_media_dialog .modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            content: "ensure video option block is displayed",
+            trigger: ".o_customize_tab [data-container-title='Video']",
+        },
+        {
+            content: "replace image",
+            trigger: ".btn-success[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "go to pictogram tab",
+            trigger: ".o_select_media_dialog .nav-link:contains('Icons')",
+            run: "click",
+        },
+        {
+            content: "select an icon",
+            trigger:
+                ".o_select_media_dialog:has(.nav-link.active:contains('Icons')) .tab-content span.fa-heart",
+            run: "click",
+        },
+        {
+            content: "ensure icon block is displayed",
+            trigger: ".o_customize_tab [data-container-title='Icon']",
+        },
+        {
+            content: "select footer",
+            trigger: ":iframe footer",
+            run: "click",
+        },
+        {
+            content: "select icon",
+            trigger: ":iframe .s_picture figure span.fa-heart",
+            run: "click",
+        },
+        {
+            content: "ensure icon block is still displayed",
+            trigger: ".o_customize_tab [data-container-title='Icon']",
+        },
+    ]
+);
diff --git a/addons/test_website/static/tests/tours/reset_views.js b/addons/test_website/static/tests/tours/reset_views.js
index 35f54b03f5877..786e72b588672 100644
--- a/addons/test_website/static/tests/tours/reset_views.js
+++ b/addons/test_website/static/tests/tours/reset_views.js
@@ -48,7 +48,7 @@ registerWebsitePreviewTour(
             run() {
                 ace.edit(document.querySelector("#resource-editor div"))
                     .getSession()
-                    .insert({row: 4, column: 1}, '<t t-field="not.exist"/>\n');
+                    .insert({ row: 4, column: 1 }, '<t t-field="not.exist"/>\n');
             },
         },
         {
@@ -104,7 +104,7 @@ registerWebsitePreviewTour(
             run() {
                 ace.edit(document.querySelector("#resource-editor div"))
                     .getSession()
-                    .insert({row: 4, column: 1}, '<t t-field="not.exist"/>\n');
+                    .insert({ row: 4, column: 1 }, '<t t-field="not.exist"/>\n');
             },
         },
         {
diff --git a/addons/test_website/static/tests/tours/restricted_editor.js b/addons/test_website/static/tests/tours/restricted_editor.js
index 29abac20c42f3..889b066715e9e 100644
--- a/addons/test_website/static/tests/tours/restricted_editor.js
+++ b/addons/test_website/static/tests/tours/restricted_editor.js
@@ -3,35 +3,43 @@ import {
     clickOnEditAndWaitEditMode,
     clickOnExtraMenuItem,
     registerWebsitePreviewTour,
-    insertSnippet
-} from '@website/js/tours/tour_utils';
+    insertSnippet,
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 
-const EDIT_BUTTON_SELECTOR = "body .o_menu_systray button.o-website-btn-custo-primary:contains(edit)";
+const EDIT_BUTTON_SELECTOR =
+    "body .o_menu_systray button.o-website-btn-custo-primary:contains(edit)";
 
 const checkNoTranslate = {
     content: "Check there is no translate button",
     trigger: `${EDIT_BUTTON_SELECTOR}:not(.o-dropdown-toggle-custo)`,
 };
-const translate = [{
-    content: "Open Edit menu",
-    trigger: `${EDIT_BUTTON_SELECTOR}.o-dropdown-toggle-custo`,
-    run: "click",
-}, {
-    content: "Click on translate button",
-    trigger: ".o_popover .o_translate_website_dropdown_item:contains(translate)",
-    run: "click",
-}];
-const closeErrorDialog = [{
-    content: "Check has error dialog",
-    trigger: ".modal:contains(error) .o_error_dialog.modal-content",
-}, {
-    content: "Close error dialog",
-    trigger: ".modal .modal-footer button.btn.btn-primary",
-    run: "click",
-}, {
-    trigger: "body:not(:has(.modal))",
-}];
+const translate = [
+    {
+        content: "Open Edit menu",
+        trigger: `${EDIT_BUTTON_SELECTOR}.o-dropdown-toggle-custo`,
+        run: "click",
+    },
+    {
+        content: "Click on translate button",
+        trigger: ".o_popover .o_translate_website_dropdown_item:contains(translate)",
+        run: "click",
+    },
+];
+const closeErrorDialog = [
+    {
+        content: "Check has error dialog",
+        trigger: ".modal:contains(error) .o_error_dialog.modal-content",
+    },
+    {
+        content: "Close error dialog",
+        trigger: ".modal .modal-footer button.btn.btn-primary",
+        run: "click",
+    },
+    {
+        trigger: "body:not(:has(.modal))",
+    },
+];
 const switchTo = (lang) => [
     {
         content: `Switch to ${lang}`,
@@ -58,117 +66,130 @@ const goToMenuItem = [
     stepUtils.waitIframeIsReady(),
 ];
 
-registerWebsitePreviewTour('test_restricted_editor_only', {
-    url: '/',
-}, () => [
-    // Home
-    checkNoTranslate,
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Check icons cannot be dragged",
-        trigger: "#snippet_groups .o_snippet[name='Intro'].o_disabled",
-        run: function () {
-            if (document.querySelector("button.o_snippet_thumbnail_area")) {
+registerWebsitePreviewTour(
+    "test_restricted_editor_only",
+    {
+        url: "/",
+    },
+    () => [
+        // Home
+        checkNoTranslate,
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check icons cannot be dragged",
+            trigger: "#snippet_groups .o_snippet[name='Intro'].o_disabled",
+            run: function () {
+                if (document.querySelector("button.o_snippet_thumbnail_area")) {
                     console.error(
                         "The button to open the add snippet dialog should not be display for restricted editor."
                     );
-            }
+                }
+            },
         },
-    },
-    ...clickOnSave(),
-    ...switchTo('fr'),
-    ...translate,
-    ...closeErrorDialog,
-    ...switchTo('en'),
-    // Model item
-    {
-        trigger: ":iframe body:contains(welcome to your)"
-    },
-    ...goToMenuItem,
-    checkNoTranslate,
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Check icons cannot be dragged",
-        trigger: "#snippet_groups .o_snippet[name='Intro'].o_disabled",
-        run: function () {
-            if (document.querySelector("button.o_snippet_thumbnail_area")) {
+        ...clickOnSave(),
+        ...switchTo("fr"),
+        ...translate,
+        ...closeErrorDialog,
+        ...switchTo("en"),
+        // Model item
+        {
+            trigger: ":iframe body:contains(welcome to your)",
+        },
+        ...goToMenuItem,
+        checkNoTranslate,
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check icons cannot be dragged",
+            trigger: "#snippet_groups .o_snippet[name='Intro'].o_disabled",
+            run: function () {
+                if (document.querySelector("button.o_snippet_thumbnail_area")) {
                     console.error(
                         "The button to open the add snippet dialog should not be display for restricted editor."
                     );
-            }
+                }
+            },
         },
-    },
-    ...clickOnSave(),
-    ...switchTo('fr'),
-    ...translate,
-    ...closeErrorDialog,
-]);
+        ...clickOnSave(),
+        ...switchTo("fr"),
+        ...translate,
+        ...closeErrorDialog,
+    ]
+);
 
-registerWebsitePreviewTour('test_restricted_editor_test_admin', {
-    url: '/',
-}, () => [
-    // Home
-    checkNoTranslate,
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Check icons cannot be dragged",
-        trigger: "#snippet_groups .o_snippet[name='Intro'].o_disabled",
-    },
-    ...clickOnSave(),
-    ...switchTo('fr'),
-    ...translate,
-    ...closeErrorDialog,
-    ...switchTo('en'),
-    // Model item
-    ...goToMenuItem,
-    checkNoTranslate,
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Check icons can be dragged",
-        trigger: "#snippet_groups .o_snippet[name='Intro']:not(.o_disabled)",
-    },
-    ...insertSnippet({ id: "s_banner", name: "Banner", groupName: "Intro" }),
-    {
-        content: "Change name",
-        trigger: ":iframe [data-oe-expression='record.name']",
-        run: "editor New value",
-    },
-    ...clickOnSave(),
-    ...switchTo('fr'),
-    ...translate,
-    {
-        content: "Close the dialog",
-        trigger: ".modal .modal-footer .btn-primary",
-        run: "click",
-    },
-    {
-        content: "Assure the modal is well closed",
-        trigger: "body:not(:has(.modal))",
-    },
-    {
-        content: "Check that html fields are not content editable when translating",
-        trigger: ":iframe [data-oe-expression='record.website_description']:not([contenteditable='true'])",
-    },
-    {
-        content: "Translate name",
-        trigger: ":iframe [data-oe-expression='record.name']",
-        run: "editor Nouvelle valeur",
-    },
-    {
-        content: "Translate some banner text",
-        trigger: ":iframe [data-oe-expression='record.website_description'] strong",
-        run: "editor potentiel.",
-    },
-    ...clickOnSave(),
-]);
+registerWebsitePreviewTour(
+    "test_restricted_editor_test_admin",
+    {
+        url: "/",
+    },
+    () => [
+        // Home
+        checkNoTranslate,
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check icons cannot be dragged",
+            trigger: "#snippet_groups .o_snippet[name='Intro'].o_disabled",
+        },
+        ...clickOnSave(),
+        ...switchTo("fr"),
+        ...translate,
+        ...closeErrorDialog,
+        ...switchTo("en"),
+        // Model item
+        ...goToMenuItem,
+        checkNoTranslate,
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check icons can be dragged",
+            trigger: "#snippet_groups .o_snippet[name='Intro']:not(.o_disabled)",
+        },
+        ...insertSnippet({ id: "s_banner", name: "Banner", groupName: "Intro" }),
+        {
+            content: "Change name",
+            trigger: ":iframe [data-oe-expression='record.name']",
+            run: "editor New value",
+        },
+        ...clickOnSave(),
+        ...switchTo("fr"),
+        ...translate,
+        {
+            content: "Close the dialog",
+            trigger: ".modal .modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            content: "Assure the modal is well closed",
+            trigger: "body:not(:has(.modal))",
+        },
+        {
+            content: "Check that html fields are not content editable when translating",
+            trigger:
+                ":iframe [data-oe-expression='record.website_description']:not([contenteditable='true'])",
+        },
+        {
+            content: "Translate name",
+            trigger: ":iframe [data-oe-expression='record.name']",
+            run: "editor Nouvelle valeur",
+        },
+        {
+            content: "Translate some banner text",
+            trigger: ":iframe [data-oe-expression='record.website_description'] strong",
+            run: "editor potentiel.",
+        },
+        ...clickOnSave(),
+    ]
+);
 
-registerWebsitePreviewTour('test_restricted_editor_tester', {
-    url: '/test_model/1',
-}, () => [
-    ...clickOnEditAndWaitEditMode(),
+registerWebsitePreviewTour(
+    "test_restricted_editor_tester",
     {
-        content: "Footer should not be be editable for restricted user",
-        trigger: ":iframe :has(.o_editable) footer:not(.o_editable):not(:has(.o_editable))",
+        url: "/test_model/1",
     },
-    ...clickOnSave(),
-]);
+    () => [
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Footer should not be be editable for restricted user",
+            trigger: ":iframe :has(.o_editable) footer:not(.o_editable):not(:has(.o_editable))",
+        },
+        ...clickOnSave(),
+    ]
+);
diff --git a/addons/test_website/static/tests/tours/snippet_background_video.js b/addons/test_website/static/tests/tours/snippet_background_video.js
index 1e0324cf92846..fafae366b2e3f 100644
--- a/addons/test_website/static/tests/tours/snippet_background_video.js
+++ b/addons/test_website/static/tests/tours/snippet_background_video.js
@@ -9,7 +9,8 @@ registerWebsitePreviewTour(
     {
         url: "/",
         edition: true,
-    }, () => [
+    },
+    () => [
         {
             trigger: "body",
             run: function () {
@@ -31,10 +32,10 @@ registerWebsitePreviewTour(
                         });
                     },
                     async _getVideoURLData(src, options) {
-                        if (src === '/hello/world.mp4') {
+                        if (src === "/hello/world.mp4") {
                             return {
-                                'platform': 'vimeo',
-                                'embed_url': 'about:blank',
+                                platform: "vimeo",
+                                embed_url: "about:blank",
                             };
                         }
                         return super._getVideoURLData(...arguments);
@@ -77,7 +78,8 @@ registerWebsitePreviewTour(
         },
         {
             content: "Check that the video container is not editable.",
-            trigger: ":iframe #wrap section.o_background_video > .o_bg_video_container[contenteditable=false]",
+            trigger:
+                ":iframe #wrap section.o_background_video > .o_bg_video_container[contenteditable=false]",
         },
     ]
 );
diff --git a/addons/test_website/static/tests/tours/systray.js b/addons/test_website/static/tests/tours/systray.js
index 67b7fc48456e3..358dbc3fe2697 100644
--- a/addons/test_website/static/tests/tours/systray.js
+++ b/addons/test_website/static/tests/tours/systray.js
@@ -3,7 +3,7 @@ import {
     clickOnEditAndWaitEditMode,
     clickOnSave,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 
 /**
@@ -16,106 +16,144 @@ import { stepUtils } from "@web_tour/tour_utils";
  * - as an unrelated user (neither "tester" nor restricted editor)
  */
 
-const canPublish = () => [{
-    content: "Publish",
-    trigger: '.o_menu_systray .o_menu_systray_item:contains("Unpublished")',
-    run: "click",
-}, {
-    content: "Wait for Publish",
-    trigger: '.o_menu_systray .o_menu_systray_item:contains("Published"):not([data-processing])',
-}, {
-    content: "Unpublish",
-    trigger: '.o_menu_systray .o_menu_systray_item:contains("Published")',
-    run: "click",
-}, {
-    content: "Wait for Unpublish",
-    trigger: '.o_menu_systray .o_menu_systray_item:contains("Unpublished"):not([data-processing])',
-}];
-
-const cannotPublish = () => [{
-    content: "Check has no Publish/Unpublish",
-    trigger: '.o_menu_systray:not(:has(.o_menu_systray_item:contains("ublished")))',
-}];
-
-const canToggleMobilePreview = () => [{
-    content: "Enable mobile preview",
-    trigger: '.o_menu_systray .o_menu_systray_item.o_mobile_preview:not(.o_mobile_preview_active) span',
-    run: "click",
-}, {
-    content: "Disable mobile preview",
-    trigger: '.o_menu_systray .o_menu_systray_item.o_mobile_preview.o_mobile_preview_active span',
-    run: "click",
-}];
-
-const cannotToggleMobilePreview = () => [{
-    content: 'Enable mobile preview',
-    trigger: '.o_menu_systray:not(:has(.o_menu_systray_item.o_mobile_preview))',
-}];
+const canPublish = () => [
+    {
+        content: "Publish",
+        trigger: '.o_menu_systray .o_menu_systray_item:contains("Unpublished")',
+        run: "click",
+    },
+    {
+        content: "Wait for Publish",
+        trigger:
+            '.o_menu_systray .o_menu_systray_item:contains("Published"):not([data-processing])',
+    },
+    {
+        content: "Unpublish",
+        trigger: '.o_menu_systray .o_menu_systray_item:contains("Published")',
+        run: "click",
+    },
+    {
+        content: "Wait for Unpublish",
+        trigger:
+            '.o_menu_systray .o_menu_systray_item:contains("Unpublished"):not([data-processing])',
+    },
+];
+
+const cannotPublish = () => [
+    {
+        content: "Check has no Publish/Unpublish",
+        trigger: '.o_menu_systray:not(:has(.o_menu_systray_item:contains("ublished")))',
+    },
+];
+
+const canToggleMobilePreview = () => [
+    {
+        content: "Enable mobile preview",
+        trigger:
+            ".o_menu_systray .o_menu_systray_item.o_mobile_preview:not(.o_mobile_preview_active) span",
+        run: "click",
+    },
+    {
+        content: "Disable mobile preview",
+        trigger:
+            ".o_menu_systray .o_menu_systray_item.o_mobile_preview.o_mobile_preview_active span",
+        run: "click",
+    },
+];
+
+const cannotToggleMobilePreview = () => [
+    {
+        content: "Enable mobile preview",
+        trigger: ".o_menu_systray:not(:has(.o_menu_systray_item.o_mobile_preview))",
+    },
+];
 
 // For non-website users, switching across website only works if the domains are
 // specified. Within the scope of test tours, this cannot be achieved.
-const canSwitchWebsiteNoCheck = () => [{
-    content: 'Open website switcher',
-    trigger: '.o_menu_systray .o_menu_systray_item.o_website_switcher_container .dropdown-toggle:contains("My Website"):not(:contains("My Website 2"))',
-    run: "click",
-}, {
-    content: 'Can switch to other website',
-    trigger: '.o-dropdown--menu .dropdown-item:contains("Other")',
-}];
-
-const canSwitchWebsite = () => [{
-    content: "Open website switcher",
-    trigger: '.o_menu_systray .o_menu_systray_item.o_website_switcher_container .dropdown-toggle:contains("My Website"):not(:contains("My Website 2"))',
-    run: "click",
-}, {
-    content: "Switch to other website",
-    trigger: '.o-dropdown--menu .dropdown-item:contains("Other")',
-    run: "click",
-}, {
-    content: "Wait for other website",
-    trigger: ':iframe  body:contains("Test Model") div:contains("Other")',
-}];
-
-const canAddNewContent = () => [{
-    content: "Open +New content",
-    trigger: '.o_menu_systray .o_menu_systray_item.o_new_content_container button',
-    run: "click",
-}, {
-    content: "Close +New content",
-    trigger: '.o_new_content_menu_choices',
-    run: "click",
-}];
-
-const cannotAddNewContent = () => [{
-    content: 'No +New content',
-    trigger: '.o_menu_systray:not(:has(.o_menu_systray_item.o_new_content_container))',
-}];
-
-const canEditInBackEnd = () => [{
-    content: "Edit in backend",
-    trigger: '.o_menu_systray .o_website_edit_in_backend a',
-    run: "click",
-}, {
-    content: "Check that the form is editable",
-    trigger: '.o_form_view_container .o_form_editable',
-}, {
-    content: "Return to website",
-    trigger: '.o-form-buttonbox .fa-globe',
-    run: "click",
-}];
-
-const canViewInBackEnd = () => [{
-    content: "Go to backend",
-    trigger: '.o_menu_systray .o_website_edit_in_backend a',
-    run: "click",
-}, {
-    content: "Check that the form is read-only",
-    trigger: '.o_form_view_container .o_form_readonly',
-}, {
-    content: "Return to website",
-    trigger: '.o-form-buttonbox .fa-globe',
-    run: "click",
-}];
+const canSwitchWebsiteNoCheck = () => [
+    {
+        content: "Open website switcher",
+        trigger:
+            '.o_menu_systray .o_menu_systray_item.o_website_switcher_container .dropdown-toggle:contains("My Website"):not(:contains("My Website 2"))',
+        run: "click",
+    },
+    {
+        content: "Can switch to other website",
+        trigger: '.o-dropdown--menu .dropdown-item:contains("Other")',
+    },
+];
+
+const canSwitchWebsite = () => [
+    {
+        content: "Open website switcher",
+        trigger:
+            '.o_menu_systray .o_menu_systray_item.o_website_switcher_container .dropdown-toggle:contains("My Website"):not(:contains("My Website 2"))',
+        run: "click",
+    },
+    {
+        content: "Switch to other website",
+        trigger: '.o-dropdown--menu .dropdown-item:contains("Other")',
+        run: "click",
+    },
+    {
+        content: "Wait for other website",
+        trigger: ':iframe  body:contains("Test Model") div:contains("Other")',
+    },
+];
+
+const canAddNewContent = () => [
+    {
+        content: "Open +New content",
+        trigger: ".o_menu_systray .o_menu_systray_item.o_new_content_container button",
+        run: "click",
+    },
+    {
+        content: "Close +New content",
+        trigger: ".o_new_content_menu_choices",
+        run: "click",
+    },
+];
+
+const cannotAddNewContent = () => [
+    {
+        content: "No +New content",
+        trigger: ".o_menu_systray:not(:has(.o_menu_systray_item.o_new_content_container))",
+    },
+];
+
+const canEditInBackEnd = () => [
+    {
+        content: "Edit in backend",
+        trigger: ".o_menu_systray .o_website_edit_in_backend a",
+        run: "click",
+    },
+    {
+        content: "Check that the form is editable",
+        trigger: ".o_form_view_container .o_form_editable",
+    },
+    {
+        content: "Return to website",
+        trigger: ".o-form-buttonbox .fa-globe",
+        run: "click",
+    },
+];
+
+const canViewInBackEnd = () => [
+    {
+        content: "Go to backend",
+        trigger: ".o_menu_systray .o_website_edit_in_backend a",
+        run: "click",
+    },
+    {
+        content: "Check that the form is read-only",
+        trigger: ".o_form_view_container .o_form_readonly",
+    },
+    {
+        content: "Return to website",
+        trigger: ".o-form-buttonbox .fa-globe",
+        run: "click",
+    },
+];
 
 const canEdit = () => [
     ...clickOnEditAndWaitEditMode(),
@@ -123,11 +161,13 @@ const canEdit = () => [
         content: "Click on name",
         trigger: ':iframe span[data-oe-expression="test_model.name"][contenteditable="true"]',
         run: "click",
-    }, {
+    },
+    {
         content: "Change name",
         trigger: ':iframe span[data-oe-expression="test_model.name"][contenteditable="true"]',
         run: "editor Better name",
-    }, {
+    },
+    {
         content: "Check that field becomes dirty",
         trigger: ':iframe span[data-oe-expression="test_model.name"].o_dirty',
     },
@@ -138,15 +178,18 @@ const canEdit = () => [
     },
 ];
 
-const cannotEdit = () => [stepUtils.waitIframeIsReady(), {
-    content: "Check Edit is not available",
-    trigger: '.o_menu_systray:not(:has(.o_edit_website_container))',
-}];
+const cannotEdit = () => [
+    stepUtils.waitIframeIsReady(),
+    {
+        content: "Check Edit is not available",
+        trigger: ".o_menu_systray:not(:has(.o_edit_website_container))",
+    },
+];
 
 const canEditButCannotChange = () => [
     ...clickOnEditAndWaitEditMode(),
     {
-        content: 'Cannot change name',
+        content: "Cannot change name",
         trigger: ':iframe main:not(:has([data-oe-expression])):contains("Test Model")',
     },
 ];
@@ -166,9 +209,13 @@ const ensureWebsiteSwitcherIsVisible = [
 ];
 
 const register = (title, steps) => {
-    registerWebsitePreviewTour(title, {
-        url: "/test_model/1",
-    }, steps);
+    registerWebsitePreviewTour(
+        title,
+        {
+            url: "/test_model/1",
+        },
+        steps
+    );
 };
 
 register("test_systray_admin", () => [
diff --git a/addons/test_website/static/tests/tours/translation.js b/addons/test_website/static/tests/tours/translation.js
index 2c98c78805e91..8ad72f5a9a9a6 100644
--- a/addons/test_website/static/tests/tours/translation.js
+++ b/addons/test_website/static/tests/tours/translation.js
@@ -121,9 +121,10 @@ function singleLanguage() {
             content: "Change text",
             trigger: 'div.ace_line .ace_xml:contains("oe_structure")',
             run() {
-                window.ace.edit(document.querySelector("#resource-editor div"))
+                window.ace
+                    .edit(document.querySelector("#resource-editor div"))
                     .getSession()
-                    .insert({row: 8, column: 1}, '<p>More text</p>\n');
+                    .insert({ row: 8, column: 1 }, "<p>More text</p>\n");
             },
         },
         ...saveHtmlEditor(),
@@ -153,9 +154,10 @@ function singleLanguage() {
             content: "Change text",
             trigger: 'div.ace_line .ace_xml:contains("test_website.test_view")',
             run() {
-                window.ace.edit(document.querySelector("#resource-editor div"))
-                   .getSession()
-                   .insert({row: 2, column: 36}, 'Further ');
+                window.ace
+                    .edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 2, column: 36 }, "Further ");
             },
         },
         ...saveHtmlEditor(),
@@ -191,11 +193,7 @@ registerWebsitePreviewTour(
     {
         url: "/",
     },
-    () => [
-        ensureFrUser,
-        ensureFrSite,
-        ...singleLanguage(),
-    ]
+    () => [ensureFrUser, ensureFrSite, ...singleLanguage()]
 );
 
 registerWebsitePreviewTour(
@@ -203,11 +201,7 @@ registerWebsitePreviewTour(
     {
         url: "/",
     },
-    () => [
-        ensureEnUser,
-        ensureFrSite,
-        ...singleLanguage(),
-    ]
+    () => [ensureEnUser, ensureFrSite, ...singleLanguage()]
 );
 
 registerWebsitePreviewTour(
@@ -215,32 +209,35 @@ registerWebsitePreviewTour(
     {
         url: "/",
     },
-    () => [
-        ensureFrUser,
-        ensureEnSite,
-        ...singleLanguage(),
-    ]
+    () => [ensureFrUser, ensureEnSite, ...singleLanguage()]
 );
 
 function switchLanguage(lang, timeout = 50000) {
     return [
         {
             content: "Ensure was in other language",
-            trigger: `:iframe .o_header_language_selector:contains(${lang !== "fr" ? "Français" : "English"})`,
+            trigger: `:iframe .o_header_language_selector:contains(${
+                lang !== "fr" ? "Français" : "English"
+            })`,
             timeout,
-        }, {
+        },
+        {
             content: "Open language dropdown",
             trigger: ":iframe .o_header_language_selector .dropdown-toggle",
             run: "click",
-        }, {
+        },
+        {
             content: "Select language",
             trigger: `:iframe .o_header_language_selector .js_change_lang[data-url_code=${lang}]`,
             run: "click",
-        }, {
+        },
+        {
             content: "Wait until target page is loaded",
-            trigger: `:iframe .o_header_language_selector:contains(${lang === "fr" ? "Français" : "English"})`,
+            trigger: `:iframe .o_header_language_selector:contains(${
+                lang === "fr" ? "Français" : "English"
+            })`,
             timeout,
-        }
+        },
     ];
 }
 
@@ -261,22 +258,26 @@ function openTranslate(timeout = 50000) {
             content: "Open edit dropdown",
             trigger: ".o_edit_website_container button",
             run: "click",
-        }, {
+        },
+        {
             content: "Enter translate mode",
             trigger: ".o_translate_website_dropdown_item",
             run: "click",
-        }, {
+        },
+        {
             content: "Effect's 200ms setTimeout passed",
             trigger: ".o_builder_open .o_main_navbar.d-none:not(:visible)",
-        }, {
+        },
+        {
             content: "Translatable text became highlighted",
             trigger: ":iframe [data-oe-translation-state=to_translate]",
             timeout,
-        }, {
+        },
+        {
             content: "Confirm popup",
             trigger: ".o_website_dialog .btn-secondary",
             run: "click",
-        }
+        },
     ];
 }
 
@@ -286,11 +287,13 @@ function saveTranslation(timeout = 50000) {
             content: "Save translation",
             trigger: ".o-website-builder_sidebar button[data-action=save]",
             run: "click",
-        }, {
+        },
+        {
             content: "Back to preview mode",
             trigger: ".o_edit_website_container button",
             timeout,
-        }, {
+        },
+        {
             trigger: "body:not(.o_builder_open)",
             noPrepend: true,
             timeout,
@@ -325,9 +328,10 @@ function multiLanguage(mainLanguage, secondLanguage) {
             content: "Change text",
             trigger: 'div.ace_line .ace_xml:contains("oe_structure")',
             run() {
-                window.ace.edit(document.querySelector("#resource-editor div"))
+                window.ace
+                    .edit(document.querySelector("#resource-editor div"))
                     .getSession()
-                    .insert({row: 6, column: 50}, "more text ");
+                    .insert({ row: 6, column: 50 }, "more text ");
             },
         },
         {
@@ -410,9 +414,10 @@ function multiLanguage(mainLanguage, secondLanguage) {
             content: "Change text",
             trigger: 'div.ace_line .ace_xml:contains("test_website.test_view")',
             run() {
-                window.ace.edit(document.querySelector("#resource-editor div"))
-                   .getSession()
-                   .insert({row: 2, column: 36}, 'Further ');
+                window.ace
+                    .edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 2, column: 36 }, "Further ");
             },
         },
         ...saveHtmlEditor(),
@@ -455,11 +460,7 @@ registerWebsitePreviewTour(
     {
         url: "/fr",
     },
-    () => [
-        ensureFrUser,
-        ensureFrSite,
-        ...multiLanguage("fr", "en"),
-    ]
+    () => [ensureFrUser, ensureFrSite, ...multiLanguage("fr", "en")]
 );
 
 registerWebsitePreviewTour(
@@ -467,11 +468,7 @@ registerWebsitePreviewTour(
     {
         url: "/en",
     },
-    () => [
-        ensureFrUser,
-        ensureEnSite,
-        ...multiLanguage("en", "fr"),
-    ]
+    () => [ensureFrUser, ensureEnSite, ...multiLanguage("en", "fr")]
 );
 
 registerWebsitePreviewTour(
@@ -479,11 +476,7 @@ registerWebsitePreviewTour(
     {
         url: "/fr",
     },
-    () => [
-        ensureEnUser,
-        ensureFrSite,
-        ...multiLanguage("fr", "en"),
-    ]
+    () => [ensureEnUser, ensureFrSite, ...multiLanguage("fr", "en")]
 );
 
 registerWebsitePreviewTour(
@@ -491,9 +484,5 @@ registerWebsitePreviewTour(
     {
         url: "/en",
     },
-    () => [
-        ensureEnUser,
-        ensureEnSite,
-        ...multiLanguage("en", "fr"),
-    ]
+    () => [ensureEnUser, ensureEnSite, ...multiLanguage("en", "fr")]
 );
diff --git a/addons/test_website/static/tests/tours/website_controller_page.js b/addons/test_website/static/tests/tours/website_controller_page.js
index 1e6593a1d4836..d9cb5bc3a0ece 100644
--- a/addons/test_website/static/tests/tours/website_controller_page.js
+++ b/addons/test_website/static/tests/tours/website_controller_page.js
@@ -10,57 +10,83 @@ function assertEqual(actual, expected) {
     }
 }
 
-registerWebsitePreviewTour('website_controller_page_listing_layout', {
-    url: '/model/exposed-model',
-    edition: true,
-}, () => [
+registerWebsitePreviewTour(
+    "website_controller_page_listing_layout",
     {
-        content: "website is in preview mode",
-        trigger: '.o_website_preview',
-        run: "click",
+        url: "/model/exposed-model",
+        edition: true,
     },
-    {
-        content: "records are listed in grid mode by default",
-        trigger: ':iframe .o_website_grid',
-        run() {
-            const iframeDocument = document.querySelector(".o_website_preview iframe").contentDocument;
-            // grid option is selected by default in the switch
-            assertEqual(iframeDocument.querySelector(".listing_layout_switcher #o_wstudio_apply_grid").checked, true);
-            assertEqual([...iframeDocument.querySelectorAll(".test_record_listing")].length, 2);
+    () => [
+        {
+            content: "website is in preview mode",
+            trigger: ".o_website_preview",
+            run: "click",
         },
-    },
-    {
-        content: "open customize tab",
-        trigger: ":iframe .listing_layout_switcher",
-        run: "click",
-    },
-    {
-        trigger: ".o-snippets-menu .o_customize_tab",
-    },
-    ...changeOptionInPopover("Layout", "Default Layout", "list"),
-    {
-        content: "records are now displayed in list mode",
-        trigger: ':iframe .o_website_list',
-        run() {
-            const iframeDocument = document.querySelector(".o_website_preview iframe").contentDocument;
-            // list option is now selected in the switch
-            assertEqual(iframeDocument.querySelector(".listing_layout_switcher #o_wstudio_apply_list").checked, true);
+        {
+            content: "records are listed in grid mode by default",
+            trigger: ":iframe .o_website_grid",
+            run() {
+                const iframeDocument = document.querySelector(
+                    ".o_website_preview iframe"
+                ).contentDocument;
+                // grid option is selected by default in the switch
+                assertEqual(
+                    iframeDocument.querySelector(".listing_layout_switcher #o_wstudio_apply_grid")
+                        .checked,
+                    true
+                );
+                assertEqual([...iframeDocument.querySelectorAll(".test_record_listing")].length, 2);
+            },
         },
-    },
-    ...clickOnSave(),
-]);
+        {
+            content: "open customize tab",
+            trigger: ":iframe .listing_layout_switcher",
+            run: "click",
+        },
+        {
+            trigger: ".o-snippets-menu .o_customize_tab",
+        },
+        ...changeOptionInPopover("Layout", "Default Layout", "list"),
+        {
+            content: "records are now displayed in list mode",
+            trigger: ":iframe .o_website_list",
+            run() {
+                const iframeDocument = document.querySelector(
+                    ".o_website_preview iframe"
+                ).contentDocument;
+                // list option is now selected in the switch
+                assertEqual(
+                    iframeDocument.querySelector(".listing_layout_switcher #o_wstudio_apply_list")
+                        .checked,
+                    true
+                );
+            },
+        },
+        ...clickOnSave(),
+    ]
+);
 
-registerWebsitePreviewTour('website_controller_page_default_page_check', {
-    url: '/model/exposed-model',
-}, () => [
+registerWebsitePreviewTour(
+    "website_controller_page_default_page_check",
     {
-        content: "records are listed in list mode by default",
-        trigger: ':iframe [is-ready=true] .o_website_list',
-        run() {
-            const iframeDocument = document.querySelector(".o_website_preview iframe").contentDocument;
-            // list option is selected by default in the switch
-            assertEqual(iframeDocument.querySelector(".listing_layout_switcher #o_wstudio_apply_list").checked, true);
-            assertEqual([...iframeDocument.querySelectorAll(".test_record_listing")].length, 2);
-        },
+        url: "/model/exposed-model",
     },
-]);
+    () => [
+        {
+            content: "records are listed in list mode by default",
+            trigger: ":iframe [is-ready=true] .o_website_list",
+            run() {
+                const iframeDocument = document.querySelector(
+                    ".o_website_preview iframe"
+                ).contentDocument;
+                // list option is selected by default in the switch
+                assertEqual(
+                    iframeDocument.querySelector(".listing_layout_switcher #o_wstudio_apply_list")
+                        .checked,
+                    true
+                );
+                assertEqual([...iframeDocument.querySelectorAll(".test_record_listing")].length, 2);
+            },
+        },
+    ]
+);
diff --git a/addons/test_website/static/tests/tours/website_page_properties.js b/addons/test_website/static/tests/tours/website_page_properties.js
index 13579e5937a81..151ccea72e6de 100644
--- a/addons/test_website/static/tests/tours/website_page_properties.js
+++ b/addons/test_website/static/tests/tours/website_page_properties.js
@@ -28,7 +28,7 @@ const clickOnSaveButtonStep = [
     {
         content: "Wait",
         trigger: "body:not(.modal-open)",
-    }
+    },
 ];
 
 const openCreatePageDialog = [
@@ -79,8 +79,7 @@ function checkIsTemplate(isTemplate, pageTitle = undefined) {
                       content: `Verify custom templates section is empty`,
                       trigger: `.o_website_page_templates_pane:not(:has(.o_page_template))`,
                   },
-              ]
-        ),
+              ]),
         {
             content: "Exit dialog",
             trigger: ".modal-header .btn-close",
@@ -90,7 +89,7 @@ function checkIsTemplate(isTemplate, pageTitle = undefined) {
             content: "Exit new content backdrop",
             trigger: "body",
             run: "press escape",
-        }
+        },
     ];
 }
 
@@ -215,12 +214,12 @@ function testWebsitePageProperties() {
         {
             content: "Open redirect type popup",
             trigger: "#redirect_type_0",
-            run: "click"
+            run: "click",
         },
         {
             content: "Set redirect type to temporary",
             trigger: ".o-dropdown-item[data-choice-index='1']",
-            run: "click"
+            run: "click",
         },
         {
             // TODO: this needs to be tested
@@ -253,7 +252,7 @@ function testWebsitePageProperties() {
             content: "Make it a template",
             trigger: "#is_new_page_template_0",
             run: "check",
-        },
+        }
     );
     steps.check.push(
         {
@@ -267,7 +266,7 @@ function testWebsitePageProperties() {
             content: "Verify no index",
             trigger: ':iframe head:hidden meta[name="robots"][content="noindex"]',
         },
-        ...checkIsTemplate(true, "Cool Page"),
+        ...checkIsTemplate(true, "Cool Page")
     );
     steps.teardown.unshift(
         {
@@ -309,7 +308,7 @@ function testWebsitePageProperties() {
             content: "Remove from templates",
             trigger: "#is_new_page_template_0",
             run: "uncheck",
-        },
+        }
     );
     steps.checkTorndown.push(
         {
@@ -323,7 +322,7 @@ function testWebsitePageProperties() {
             content: "Verify is indexed",
             trigger: ':iframe head:hidden:not(:has(meta[name="robots"][content="noindex"]))',
         },
-        ...checkIsTemplate(false),
+        ...checkIsTemplate(false)
     );
     return steps;
 }
@@ -333,7 +332,7 @@ registerWebsitePreviewTour(
     {
         url: "/test_view",
     },
-    () => [...testCommonProperties("/test_view", false).finalize()],
+    () => [...testCommonProperties("/test_view", false).finalize()]
 );
 
 registerWebsitePreviewTour(
@@ -341,7 +340,7 @@ registerWebsitePreviewTour(
     {
         url: "/test_website/model_item/1",
     },
-    () => [...testCommonProperties("/test_website/model_item/1", true).finalize()],
+    () => [...testCommonProperties("/test_website/model_item/1", true).finalize()]
 );
 
 registerWebsitePreviewTour(
@@ -378,5 +377,5 @@ registerWebsitePreviewTour(
         },
         ...clickOnSave(),
         ...testWebsitePageProperties().finalize(),
-    ],
+    ]
 );
diff --git a/addons/test_website_modules/static/tests/tours/configurator_flow.js b/addons/test_website_modules/static/tests/tours/configurator_flow.js
index 912aed2ae6f04..2295300cb3a57 100644
--- a/addons/test_website_modules/static/tests/tours/configurator_flow.js
+++ b/addons/test_website_modules/static/tests/tours/configurator_flow.js
@@ -24,7 +24,7 @@ registry.category("web_tour.tours").add("configurator_flow", {
             content: "click next",
             trigger: "button.o_configurator_show",
             run: "click",
-            timeout: 20000,  /* previous step create a new website, this could take a long time */
+            timeout: 20000 /* previous step create a new website, this could take a long time */,
         },
         // Description screen
         {
@@ -71,7 +71,7 @@ registry.category("web_tour.tours").add("configurator_flow", {
             trigger: '.card.card_installed:contains("eLearning")',
         },
         {
-            content:"News (Blog) should be selected (module already installed)",
+            content: "News (Blog) should be selected (module already installed)",
             trigger: '.card.card_installed:contains("News")',
         },
         {
@@ -109,12 +109,10 @@ registry.category("web_tour.tours").add("configurator_flow", {
             content: `Check footer menu ${menu} is there`,
             trigger: `:iframe footer a:contains(${menu})`,
         })),
-        ...["Home", "Events", "Courses", "Pricing Plan", "News"].map(
-            (menu) => ({
-                content: `Check menu ${menu} is there`,
-                trigger: `:iframe .top_menu a:contains(${menu}):not(:visible)`,
-            })
-        ),
+        ...["Home", "Events", "Courses", "Pricing Plan", "News"].map((menu) => ({
+            content: `Check menu ${menu} is there`,
+            trigger: `:iframe .top_menu a:contains(${menu}):not(:visible)`,
+        })),
         ...["/", "/event", "/slides", "/pricing", "/blog/"].map((url) => ({
             content: `Check url ${url} is there`,
             trigger: `:iframe .top_menu a[href^='${url}']:not(:visible)`,
diff --git a/addons/website/static/src/builder/plugins/carousel_option_plugin.js b/addons/website/static/src/builder/plugins/carousel_option_plugin.js
index 952f15b723f73..3415c1c1f9008 100644
--- a/addons/website/static/src/builder/plugins/carousel_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/carousel_option_plugin.js
@@ -17,7 +17,8 @@ const carouselWrapperSelector =
 const carouselControlsSelector =
     ".carousel-control-prev, .carousel-control-next, .carousel-indicators";
 
-const carouselItemOptionSelector = ".s_carousel .carousel-item, .s_quotes_carousel .carousel-item, .s_carousel_intro .carousel-item, .s_carousel_cards .carousel-item";
+const carouselItemOptionSelector =
+    ".s_carousel .carousel-item, .s_quotes_carousel .carousel-item, .s_carousel_intro .carousel-item, .s_carousel_cards .carousel-item";
 
 export class CarouselOption extends BaseOptionComponent {
     static template = "website.CarouselOption";
@@ -88,7 +89,7 @@ export class CarouselOptionPlugin extends Plugin {
      */
     restoreCarousels(rootEl = this.editable) {
         // Set the first slide as the active one.
-        for (const carouselEl of selectElements(rootEl,".carousel")) {
+        for (const carouselEl of selectElements(rootEl, ".carousel")) {
             carouselEl.querySelectorAll(".carousel-item").forEach((itemEl, i) => {
                 itemEl.classList.remove("next", "prev", "left", "right");
                 itemEl.classList.toggle("active", i === 0);
@@ -195,32 +196,36 @@ export class CarouselOptionPlugin extends Plugin {
         });
 
         return new Promise((resolve) => {
-            editingElement.addEventListener("slid.bs.carousel", () => {
-                // slid.bs.carousel is most of the time fired too soon by bootstrap
-                // since it emulates the transitionEnd with a setTimeout. We wait
-                // here an extra 20% of the time before retargeting edition, which
-                // should be enough...
-                const slideDuration = window.performance.now() - this.slideTimestamp;
-                setTimeout(() => {
-                    // Setting the active indicator manually, as Bootstrap could
-                    // not do it because the `data-bs-slide-to` attribute is not
-                    // here in edit mode anymore.
-                    const itemEls = editingElement.querySelectorAll(".carousel-item");
-                    const activeItemEl = editingElement.querySelector(".carousel-item.active");
-                    const activeIndex = [...itemEls].indexOf(activeItemEl);
-                    const indicatorEls = editingElement.querySelectorAll(
-                        ".carousel-indicators > *"
-                    );
-                    const activeIndicatorEl = [...indicatorEls][activeIndex];
-                    activeIndicatorEl.classList.add("active");
-                    activeIndicatorEl.setAttribute("aria-current", "true");
-
-                    // Activate the active item.
-                    this.dependencies["builderOptions"].setNextTarget(activeItemEl);
-
-                    resolve();
-                }, 0.2 * slideDuration);
-            }, { once: true });
+            editingElement.addEventListener(
+                "slid.bs.carousel",
+                () => {
+                    // slid.bs.carousel is most of the time fired too soon by
+                    // bootstrap since it emulates the transitionEnd with a
+                    // setTimeout. We wait here an extra 20% of the time before
+                    // retargeting edition, which should be enough...
+                    const slideDuration = window.performance.now() - this.slideTimestamp;
+                    setTimeout(() => {
+                        // Setting the active indicator manually, as Bootstrap
+                        // could not do it because the `data-bs-slide-to`
+                        // attribute is not here in edit mode anymore.
+                        const itemEls = editingElement.querySelectorAll(".carousel-item");
+                        const activeItemEl = editingElement.querySelector(".carousel-item.active");
+                        const activeIndex = [...itemEls].indexOf(activeItemEl);
+                        const indicatorEls = editingElement.querySelectorAll(
+                            ".carousel-indicators > *"
+                        );
+                        const activeIndicatorEl = [...indicatorEls][activeIndex];
+                        activeIndicatorEl.classList.add("active");
+                        activeIndicatorEl.setAttribute("aria-current", "true");
+
+                        // Activate the active item.
+                        this.dependencies["builderOptions"].setNextTarget(activeItemEl);
+
+                        resolve();
+                    }, 0.2 * slideDuration);
+                },
+                { once: true }
+            );
 
             const carouselInstance = window.Carousel.getOrCreateInstance(editingElement, {
                 ride: false,
diff --git a/addons/website/static/src/builder/plugins/collapse_plugin.js b/addons/website/static/src/builder/plugins/collapse_plugin.js
index 87acf48ceabbe..133d24f49f1d5 100644
--- a/addons/website/static/src/builder/plugins/collapse_plugin.js
+++ b/addons/website/static/src/builder/plugins/collapse_plugin.js
@@ -13,7 +13,11 @@ export class CollapsePlugin extends Plugin {
                 dropLockWithin: ".accordion",
             },
         ],
-        is_movable_selector: { selector: ".s_accordion .accordion-item", direction: "vertical", noScroll: true },
+        is_movable_selector: {
+            selector: ".s_accordion .accordion-item",
+            direction: "vertical",
+            noScroll: true,
+        },
     };
 
     setup() {
diff --git a/addons/website/static/src/builder/plugins/form/form_field_option.js b/addons/website/static/src/builder/plugins/form/form_field_option.js
index 9ee8bd8e5f16b..35a71e0f3bf0b 100644
--- a/addons/website/static/src/builder/plugins/form/form_field_option.js
+++ b/addons/website/static/src/builder/plugins/form/form_field_option.js
@@ -71,7 +71,7 @@ export class FormFieldOption extends BaseOptionComponent {
             };
         });
 
-        this.domStateCurrentFieldInput = useDomState(el => {
+        this.domStateCurrentFieldInput = useDomState((el) => {
             const currentFieldInputEl = getCurrentFieldInputEl(el);
             if (!currentFieldInputEl) {
                 return {
@@ -118,15 +118,7 @@ export class FormFieldOption extends BaseOptionComponent {
         // TODO select field's hack ?
     }
     get canHaveTextValidationCondition() {
-        return [
-            "text",
-            "email",
-            "tel",
-            "url",
-            "search",
-            "password",
-            "number",
-        ];
+        return ["text", "email", "tel", "url", "search", "password", "number"];
     }
     get isTextConditionValueVisible() {
         const el = this.env.getEditingElement();
diff --git a/addons/website/static/src/builder/plugins/form/form_option_plugin.js b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
index 21815bb30d515..e900d4f5db8fb 100644
--- a/addons/website/static/src/builder/plugins/form/form_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
@@ -367,7 +367,7 @@ export class FormOptionPlugin extends Plugin {
             // In some forms (e.g., contact forms), the "email_to" field must be included as hidden.
             // For example, this may force the 'email_to' value to a dummy/default one on the
             // contact us form just by interacting with it.
-            formInfo.fields?.forEach(field => {
+            formInfo.fields?.forEach((field) => {
                 if (field.defaultValue) {
                     this.addHiddenField(el, field.defaultValue, field.name);
                 }
@@ -441,9 +441,7 @@ export class FormOptionPlugin extends Plugin {
         const field = getCustomField("char", _t("Custom Text"));
         field.formatInfo = getDefaultFormat(formEl);
         const fieldEl = renderField(field);
-        let locationEl = formEl.querySelector(
-            ".s_website_form_submit, .s_website_form_recaptcha"
-        );
+        let locationEl = formEl.querySelector(".s_website_form_submit, .s_website_form_recaptcha");
         if (!locationEl) {
             locationEl = formEl.querySelector(".s_website_form_rows");
             locationEl.insertAdjacentElement("beforeend", fieldEl);
@@ -639,7 +637,11 @@ export class FormOptionPlugin extends Plugin {
                     for (const el of inputsInDependencyContainer) {
                         conditionValueList.push({
                             value: el.value,
-                            textContent: inputsInDependencyContainer.length === 1 ? el.value : dependencyContainerEl.querySelector(`label[for="${el.id}"]`).textContent,
+                            textContent:
+                                inputsInDependencyContainer.length === 1
+                                    ? el.value
+                                    : dependencyContainerEl.querySelector(`label[for="${el.id}"]`)
+                                          .textContent,
                         });
                     }
                     if (!inputContainerEl.dataset.visibilityCondition) {
diff --git a/addons/website/static/src/builder/plugins/menu_data_plugin.js b/addons/website/static/src/builder/plugins/menu_data_plugin.js
index 35ce1694d40ee..ec31aefc5276f 100644
--- a/addons/website/static/src/builder/plugins/menu_data_plugin.js
+++ b/addons/website/static/src/builder/plugins/menu_data_plugin.js
@@ -101,7 +101,7 @@ export class MenuDataPlugin extends Plugin {
         return (
             linkElement &&
             (linkElement.getAttribute("role") === "menuitem" ||
-            linkElement.classList.contains("nav-link")) &&
+                linkElement.classList.contains("nav-link")) &&
             !linkElement.dataset.bsToggle
         );
     }
diff --git a/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js b/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
index a82b686ff5c93..05d0b68a20fb8 100644
--- a/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
@@ -36,5 +36,6 @@ export class AnnouncementScrollOptionPlugin extends Plugin {
     };
 }
 
-registry.category("website-plugins")
+registry
+    .category("website-plugins")
     .add(AnnouncementScrollOptionPlugin.id, AnnouncementScrollOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/background_option_plugin.js b/addons/website/static/src/builder/plugins/options/background_option_plugin.js
index 8f3a54dfee8f5..382a60d5ea356 100644
--- a/addons/website/static/src/builder/plugins/options/background_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/background_option_plugin.js
@@ -12,8 +12,10 @@ function getBgVideoOrParallax(editingElement) {
     if (bgVideoEl) {
         return bgVideoEl;
     }
-    return editingElement.querySelector(":scope > .s_parallax_bg_wrap")
-        || editingElement.querySelector(":scope > .s_parallax_bg"); // Kept for compatibility.
+    return (
+        editingElement.querySelector(":scope > .s_parallax_bg_wrap") ||
+        editingElement.querySelector(":scope > .s_parallax_bg")
+    ); // Kept for compatibility.
 }
 
 class WebsiteBackgroundImageOptionPlugin extends Plugin {
diff --git a/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js b/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
index 4274067f000ce..3dd90520bc33b 100644
--- a/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
@@ -1,7 +1,11 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
-import { SNIPPET_SPECIFIC_BEFORE, END, VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
+import {
+    SNIPPET_SPECIFIC_BEFORE,
+    END,
+    VERTICAL_ALIGNMENT,
+} from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
@@ -24,10 +28,17 @@ class EcommCategoriesShowcaseOptionPlugin extends Plugin {
     static DEFAULT_BLOCK_COUNT = 3;
     static MIN_BLOCK_COUNT = 2;
     static MAX_BLOCK_COUNT = 4;
-    static GAP_CLASS = 'gap-4';
-    static DEFAULT_ROUNDNESS = 'rounded-2';
-    static NO_ROUNDNESS = 'rounded-0';
-    static ROUNDNESS_CLASSES = ['rounded-0', 'rounded-1', 'rounded-2', 'rounded-3', 'rounded-4', 'rounded-5'];
+    static GAP_CLASS = "gap-4";
+    static DEFAULT_ROUNDNESS = "rounded-2";
+    static NO_ROUNDNESS = "rounded-0";
+    static ROUNDNESS_CLASSES = [
+        "rounded-0",
+        "rounded-1",
+        "rounded-2",
+        "rounded-3",
+        "rounded-4",
+        "rounded-5",
+    ];
 
     resources = {
         builder_options: [
@@ -46,8 +57,8 @@ class EcommCategoriesShowcaseOptionPlugin extends Plugin {
     };
 
     static _updateBlocksRoundness(editingElement, roundnessClass) {
-        const blocks = editingElement.querySelectorAll('.s_ecomm_categories_showcase_block');
-        blocks.forEach(block => {
+        const blocks = editingElement.querySelectorAll(".s_ecomm_categories_showcase_block");
+        blocks.forEach((block) => {
             block.classList.remove(...EcommCategoriesShowcaseOptionPlugin.ROUNDNESS_CLASSES);
             block.classList.add(roundnessClass);
         });
@@ -58,47 +69,51 @@ class BlockCountAction extends BuilderAction {
     static id = "blockCount";
 
     getValue({ editingElement }) {
-        const wrapper = editingElement.querySelector('.s_ecomm_categories_showcase_wrapper');
+        const wrapper = editingElement.querySelector(".s_ecomm_categories_showcase_wrapper");
         if (!wrapper) {
             return EcommCategoriesShowcaseOptionPlugin.DEFAULT_BLOCK_COUNT.toString();
         }
-        return wrapper.querySelectorAll('.s_ecomm_categories_showcase_block').length.toString();
+        return wrapper.querySelectorAll(".s_ecomm_categories_showcase_block").length.toString();
     }
 
     apply({ editingElement, value }) {
-        const wrapper = editingElement.querySelector('.s_ecomm_categories_showcase_wrapper');
+        const wrapper = editingElement.querySelector(".s_ecomm_categories_showcase_wrapper");
         if (!wrapper) {
             return;
         }
 
         const count = parseInt(value, 10);
-        if (isNaN(count) || count < EcommCategoriesShowcaseOptionPlugin.MIN_BLOCK_COUNT || count > EcommCategoriesShowcaseOptionPlugin.MAX_BLOCK_COUNT) {
+        if (
+            isNaN(count) ||
+            count < EcommCategoriesShowcaseOptionPlugin.MIN_BLOCK_COUNT ||
+            count > EcommCategoriesShowcaseOptionPlugin.MAX_BLOCK_COUNT
+        ) {
             return;
         }
 
-        let blocks = wrapper.querySelectorAll('.s_ecomm_categories_showcase_block');
+        let blocks = wrapper.querySelectorAll(".s_ecomm_categories_showcase_block");
 
         // Remove blocks if needed
         while (blocks.length > count) {
             const blockToRemove = blocks[blocks.length - 1];
             blockToRemove.remove();
-            blocks = wrapper.querySelectorAll('.s_ecomm_categories_showcase_block');
+            blocks = wrapper.querySelectorAll(".s_ecomm_categories_showcase_block");
         }
 
         // Add blocks if needed
         while (blocks.length < count) {
             const newBlock = blocks[0].cloneNode(true);
             wrapper.appendChild(newBlock);
-            blocks = wrapper.querySelectorAll('.s_ecomm_categories_showcase_block');
+            blocks = wrapper.querySelectorAll(".s_ecomm_categories_showcase_block");
         }
     }
 
     isApplied({ editingElement, value }) {
-        const wrapper = editingElement.querySelector('.s_ecomm_categories_showcase_wrapper');
+        const wrapper = editingElement.querySelector(".s_ecomm_categories_showcase_wrapper");
         if (!wrapper) {
             return false;
         }
-        const currentCount = wrapper.querySelectorAll('.s_ecomm_categories_showcase_block').length;
+        const currentCount = wrapper.querySelectorAll(".s_ecomm_categories_showcase_block").length;
         const targetCount = parseInt(value, 10);
         return !isNaN(targetCount) && currentCount === targetCount;
     }
@@ -108,12 +123,12 @@ class SpacingToggleAction extends BuilderAction {
     static id = "spacingToggle";
 
     isApplied({ editingElement }) {
-        const wrapper = editingElement.querySelector('.s_ecomm_categories_showcase_wrapper');
+        const wrapper = editingElement.querySelector(".s_ecomm_categories_showcase_wrapper");
         return wrapper && wrapper.classList.contains(EcommCategoriesShowcaseOptionPlugin.GAP_CLASS);
     }
 
     apply({ editingElement }) {
-        const wrapper = editingElement.querySelector('.s_ecomm_categories_showcase_wrapper');
+        const wrapper = editingElement.querySelector(".s_ecomm_categories_showcase_wrapper");
         if (!wrapper) {
             return;
         }
@@ -122,17 +137,24 @@ class SpacingToggleAction extends BuilderAction {
         wrapper.classList.toggle(EcommCategoriesShowcaseOptionPlugin.GAP_CLASS);
 
         // Set roundness based on new state
-        const newRoundness = hasGap ? EcommCategoriesShowcaseOptionPlugin.NO_ROUNDNESS : EcommCategoriesShowcaseOptionPlugin.DEFAULT_ROUNDNESS;
+        const newRoundness = hasGap
+            ? EcommCategoriesShowcaseOptionPlugin.NO_ROUNDNESS
+            : EcommCategoriesShowcaseOptionPlugin.DEFAULT_ROUNDNESS;
         EcommCategoriesShowcaseOptionPlugin._updateBlocksRoundness(editingElement, newRoundness);
     }
 
     clean({ editingElement }) {
-        const wrapper = editingElement.querySelector('.s_ecomm_categories_showcase_wrapper');
+        const wrapper = editingElement.querySelector(".s_ecomm_categories_showcase_wrapper");
         if (wrapper) {
             wrapper.classList.remove(EcommCategoriesShowcaseOptionPlugin.GAP_CLASS);
-            EcommCategoriesShowcaseOptionPlugin._updateBlocksRoundness(editingElement, EcommCategoriesShowcaseOptionPlugin.NO_ROUNDNESS);
+            EcommCategoriesShowcaseOptionPlugin._updateBlocksRoundness(
+                editingElement,
+                EcommCategoriesShowcaseOptionPlugin.NO_ROUNDNESS
+            );
         }
     }
 }
 
-registry.category("website-plugins").add(EcommCategoriesShowcaseOptionPlugin.id, EcommCategoriesShowcaseOptionPlugin);
+registry
+    .category("website-plugins")
+    .add(EcommCategoriesShowcaseOptionPlugin.id, EcommCategoriesShowcaseOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/footer_option_plugin.js b/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
index 9de2403c2cbf4..0ab0af23e6ff7 100644
--- a/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
@@ -2,7 +2,11 @@ import { registry } from "@web/core/registry";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { rpc } from "@web/core/network/rpc";
-import { SNIPPET_SPECIFIC_END, SNIPPET_SPECIFIC_NEXT, splitBetween } from "@html_builder/utils/option_sequence";
+import {
+    SNIPPET_SPECIFIC_END,
+    SNIPPET_SPECIFIC_NEXT,
+    splitBetween,
+} from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { FooterTemplateChoice, FooterTemplateOption } from "./footer_template_option";
 import { reactive } from "@odoo/owl";
@@ -33,7 +37,7 @@ export {
     FOOTER_SCROLL_TO,
     FOOTER_COPYRIGHT,
     FOOTER_BORDER,
-}
+};
 
 export class FooterWidthOption extends BaseOptionComponent {
     static template = "website.FooterWidthOption";
diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
index 405fe8f9c4580..59a02c40fb796 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
@@ -67,12 +67,10 @@ export class GoogleMapsOptionPlugin extends Plugin {
     // TODO: Remove this method when data-vxml is reintroduced.
     upgradeSnippets() {
         // This is for pages which already existed before the plugin was created.
-        this.document
-            .querySelectorAll(".s_google_map")
-            .forEach((mapSnippetEl) => {
-                mapSnippetEl.classList.add("o_not_editable");
-                mapSnippetEl.dataset.vxml = "001";
-            });
+        this.document.querySelectorAll(".s_google_map").forEach((mapSnippetEl) => {
+            mapSnippetEl.classList.add("o_not_editable");
+            mapSnippetEl.dataset.vxml = "001";
+        });
     }
 
     async onSnippetDropped({ snippetEl }) {
diff --git a/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
index ae7834692dad1..6503390acad79 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
@@ -58,6 +58,6 @@ class HeaderOptionPlugin extends Plugin {
             withSequence(HEADER_ICON_BACKGROUND, HeaderIconBackgroundOption),
         ],
     };
-};
+}
 
 registry.category("website-plugins").add(HeaderOptionPlugin.id, HeaderOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/header/header_top_options.js b/addons/website/static/src/builder/plugins/options/header/header_top_options.js
index 8b3566302523e..ba4b4f8aecdfd 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_top_options.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_top_options.js
@@ -5,5 +5,4 @@ export class HeaderTopOptions extends Component {
     static props = {
         openEditMenu: Function,
     };
-
 }
diff --git a/addons/website/static/src/builder/plugins/options/map_option_plugin.js b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
index 5bd720560adc7..74d04e1741172 100644
--- a/addons/website/static/src/builder/plugins/options/map_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
@@ -75,13 +75,13 @@ export class MapDescriptionAction extends BuilderAction {
 class MapDescriptionTextAction extends BuilderAction {
     static id = "mapDescriptionTextValue";
     getValue({ editingElement }) {
-        return editingElement
-            .querySelector(".description")
-            ?.textContent.trim()
-            .replace(/\s+/g, " ") || "";
+        return (
+            editingElement.querySelector(".description")?.textContent.trim().replace(/\s+/g, " ") ||
+            ""
+        );
     }
     apply({ editingElement, value }) {
-        return editingElement.querySelector(".description").textContent = value;
+        return (editingElement.querySelector(".description").textContent = value);
     }
 }
 
diff --git a/addons/website/static/src/builder/plugins/options/navtabs_header_buttons.js b/addons/website/static/src/builder/plugins/options/navtabs_header_buttons.js
index 0bb80b9b38ab4..55736e04d16b5 100644
--- a/addons/website/static/src/builder/plugins/options/navtabs_header_buttons.js
+++ b/addons/website/static/src/builder/plugins/options/navtabs_header_buttons.js
@@ -14,7 +14,7 @@ export class NavTabsHeaderMiddleButtons extends Component {
             const navEl = editingElement.querySelector(".nav");
             return {
                 tabEls: navEl.querySelectorAll(".nav-item"),
-            }
+            };
         });
 
         this.callOperation = useOperation();
diff --git a/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js b/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
index 681c426e11b1e..9dfba409382b8 100644
--- a/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
@@ -66,7 +66,11 @@ class NavTabsStyleOptionPlugin extends Plugin {
             const direction = isVertical ? "up" : reverseButtons ? "right" : "left";
             buttons.push({
                 class: `fa fa-fw fa-angle-${direction}`,
-                title: isVertical ? _t("Move up") : this.isEditableRTL ? _t("Move right") : _t("Move left"),
+                title: isVertical
+                    ? _t("Move up")
+                    : this.isEditableRTL
+                    ? _t("Move right")
+                    : _t("Move left"),
                 handler: this.moveNavItem.bind(this, "prev"),
             });
         }
@@ -75,7 +79,11 @@ class NavTabsStyleOptionPlugin extends Plugin {
             const direction = isVertical ? "down" : reverseButtons ? "left" : "right";
             buttons.push({
                 class: `fa fa-fw fa-angle-${direction}`,
-                title: isVertical ? _t("Move down") : this.isEditableRTL ? _t("Move left") : _t("Move right"),
+                title: isVertical
+                    ? _t("Move down")
+                    : this.isEditableRTL
+                    ? _t("Move left")
+                    : _t("Move right"),
                 handler: this.moveNavItem.bind(this, "next"),
             });
         }
diff --git a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
index cf8d82a613a29..59054bf8ce383 100644
--- a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
@@ -49,8 +49,9 @@ class WebsiteParallaxPlugin extends Plugin {
             delete editingElement.dataset.parallaxType;
         }
 
-        let parallaxBgEl = editingElement
-            .querySelector(":scope > .s_parallax_bg, :scope > .s_parallax_bg_wrap .s_parallax_bg");
+        let parallaxBgEl = editingElement.querySelector(
+            ":scope > .s_parallax_bg, :scope > .s_parallax_bg_wrap .s_parallax_bg"
+        );
         const parallaxBgWrapEl = editingElement.querySelector(":scope > .s_parallax_bg_wrap");
         if (isParallax) {
             if (!parallaxBgEl) {
@@ -64,7 +65,10 @@ class WebsiteParallaxPlugin extends Plugin {
                 newWrapEl.classList.add("s_parallax_bg_wrap");
                 newWrapEl.appendChild(parallaxBgEl);
                 editingElement.prepend(newWrapEl);
-                this.dependencies.backgroundImageOption.changeEditingEl(editingElement, parallaxBgEl);
+                this.dependencies.backgroundImageOption.changeEditingEl(
+                    editingElement,
+                    parallaxBgEl
+                );
             }
         } else if (parallaxBgEl) {
             this.dependencies.backgroundImageOption.changeEditingEl(parallaxBgEl, editingElement);
@@ -86,8 +90,9 @@ class WebsiteParallaxPlugin extends Plugin {
     }
     removeParallax(editingEl) {
         // ":scope > .s_parallax_bg" is kept for compatibility
-        const parallaxEl = editingEl
-            .querySelector(":scope > .s_parallax_bg, :scope > .s_parallax_bg_wrap");
+        const parallaxEl = editingEl.querySelector(
+            ":scope > .s_parallax_bg, :scope > .s_parallax_bg_wrap"
+        );
         const bgImage = parallaxEl?.style.backgroundImage;
         if (
             !parallaxEl ||
diff --git a/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js b/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js
index 589adc9c50aa4..123251539fb71 100644
--- a/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js
+++ b/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js
@@ -139,10 +139,7 @@ class SnippetsPowerboxPlugin extends Plugin {
     };
 
     insertSnippet(name) {
-        const snippet = this.config.snippetModel.getSnippetByName(
-            "snippet_content",
-            name
-        );
+        const snippet = this.config.snippetModel.getSnippetByName("snippet_content", name);
         const content = snippet.content.cloneNode(true);
         this.dependencies.dom.insert(content);
         this.dependencies.history.addStep();
diff --git a/addons/website/static/src/builder/plugins/theme/theme_colors_option.js b/addons/website/static/src/builder/plugins/theme/theme_colors_option.js
index dc8d18a33452b..c111e8d67fe5b 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_colors_option.js
+++ b/addons/website/static/src/builder/plugins/theme/theme_colors_option.js
@@ -7,7 +7,7 @@ export class ThemeColorsOption extends BaseOptionComponent {
     setup() {
         super.setup();
         this.palettes = this.getPalettes();
-        this.colorPresetToShow = this.env.colorPresetToShow,
+        this.colorPresetToShow = this.env.colorPresetToShow;
         this.state = useDomState(() => ({
             presets: this.getPresets(),
         }));
diff --git a/addons/website/static/src/builder/plugins/theme/theme_fontfamily_option.js b/addons/website/static/src/builder/plugins/theme/theme_fontfamily_option.js
index a8b9bead6b428..503ac7a464903 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_fontfamily_option.js
+++ b/addons/website/static/src/builder/plugins/theme/theme_fontfamily_option.js
@@ -21,20 +21,15 @@ export class ThemeFontFamilyOption extends BaseOptionComponent {
             this.env.getEditingElement()
         );
         if (this.props.cssVariable === "headings-font") {
-            this.state = useDomState(() => {
-                return {
-                    isFontSpecified:
-                        getCSSVariableValue("headings-font", htmlStyle) !==
-                        getCSSVariableValue("default-headings-font", htmlStyle),
-                };
-            });
+            this.state = useDomState(() => ({
+                isFontSpecified:
+                    getCSSVariableValue("headings-font", htmlStyle) !==
+                    getCSSVariableValue("default-headings-font", htmlStyle),
+            }));
         } else {
-            this.state = useDomState(() => {
-                return {
-                    isFontSpecified: 
-                        !!getCSSVariableValue("set-" + this.props.cssVariable, htmlStyle),
-                };
-            });
+            this.state = useDomState(() => ({
+                isFontSpecified: !!getCSSVariableValue("set-" + this.props.cssVariable, htmlStyle),
+            }));
         }
     }
 }
diff --git a/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js b/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
index 8d164e7b64a83..9766f9999b21e 100644
--- a/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
+++ b/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
@@ -20,7 +20,9 @@ class TranslateToAction extends BuilderAction {
         try {
             translationState.isTranslating = true;
             const language = this.services.website.currentWebsite.metadata.langName;
-            const { translationChunks, translationMap } = this.generateTranslationChunks(this.editable);
+            const { translationChunks, translationMap } = this.generateTranslationChunks(
+                this.editable
+            );
             if (translationChunks) {
                 const responses = await this.runTranslationChunks(translationChunks, language);
                 const failedNodeCount = this.applyTranslationsToDOM(translationMap, responses);
@@ -73,13 +75,14 @@ class TranslateToAction extends BuilderAction {
     generateTranslationChunks(containerEl, limit = 2000) {
         const elements = Array.from(
             containerEl.querySelectorAll("[data-oe-translation-state='to_translate']")
-        ).filter(el => {
-            // TODO: fix `o_frontend_to_backend_buttons` to have no
-            // attribute `data-oe-translation-state`
-            return !el.closest(".o_not_editable, .o_frontend_to_backend_buttons")
+        ).filter(
+            (el) =>
+                // TODO: fix `o_frontend_to_backend_buttons` to have no
+                // attribute `data-oe-translation-state`
+                !el.closest(".o_not_editable, .o_frontend_to_backend_buttons") &&
                 // Skip attribute translations, will handle in task-5047714
-                && !el.classList.contains("o_translatable_attribute");
-        });
+                !el.classList.contains("o_translatable_attribute")
+        );
 
         const translationChunks = [];
         const translationMap = new Map();
@@ -154,8 +157,8 @@ class TranslateToAction extends BuilderAction {
             return rpc(
                 "/html_editor/generate_text",
                 {
-                    'prompt': prompt,
-                    'conversation_history': conversation,
+                    prompt: prompt,
+                    conversation_history: conversation,
                 },
                 { silent: true }
             );
@@ -282,5 +285,6 @@ export class CustomizeTranslationTabPlugin extends Plugin {
     }
 }
 
-registry.category("translation-plugins")
+registry
+    .category("translation-plugins")
     .add(CustomizeTranslationTabPlugin.id, CustomizeTranslationTabPlugin);
diff --git a/addons/website/static/src/builder/snippet_viewer.js b/addons/website/static/src/builder/snippet_viewer.js
index 2cfd295fbac61..51b8491e7afec 100644
--- a/addons/website/static/src/builder/snippet_viewer.js
+++ b/addons/website/static/src/builder/snippet_viewer.js
@@ -29,5 +29,5 @@ patch(SnippetViewer.prototype, {
             onWillPatch(stopPreview);
             onWillUnmount(stopPreview);
         }
-    }
+    },
 });
diff --git a/addons/website/static/src/client_actions/configurator/configurator.js b/addons/website/static/src/client_actions/configurator/configurator.js
index 22e936c294865..856fae9ce7cbb 100644
--- a/addons/website/static/src/client_actions/configurator/configurator.js
+++ b/addons/website/static/src/client_actions/configurator/configurator.js
@@ -11,7 +11,7 @@ import { escapeRegExp } from "@web/core/utils/strings";
 import { useAutofocus, useService } from "@web/core/utils/hooks";
 import { registry } from "@web/core/registry";
 import { rpc } from "@web/core/network/rpc";
-import { mixCssColors } from '@web/core/utils/colors';
+import { mixCssColors } from "@web/core/utils/colors";
 import { router } from "@web/core/browser/router";
 import {
     Component,
@@ -37,58 +37,58 @@ export const ROUTES = {
 };
 
 export const WEBSITE_TYPES = {
-    1: {id: 1, label: _t("a website"), name: 'business'},
-    2: {id: 2, label: _t("an eCommerce"), name: 'eCommerce'},
-    3: {id: 3, label: _t("a blog"), name: 'blog'},
-    4: {id: 4, label: _t("an event website"), name: 'event'},
-    5: {id: 5, label: _t("an elearning platform"), name: 'elearning'},
+    1: { id: 1, label: _t("a website"), name: "business" },
+    2: { id: 2, label: _t("an eCommerce"), name: "eCommerce" },
+    3: { id: 3, label: _t("a blog"), name: "blog" },
+    4: { id: 4, label: _t("an event website"), name: "event" },
+    5: { id: 5, label: _t("an elearning platform"), name: "elearning" },
 };
 
 export const WEBSITE_PURPOSES = {
-    1: {id: 1, label: _t("get leads"), name: 'get_leads'},
-    2: {id: 2, label: _t("develop the brand"), name: 'develop_brand'},
-    3: {id: 3, label: _t("sell more"), name: 'sell_more'},
-    4: {id: 4, label: _t("inform customers"), name: 'inform_customers'},
-    5: {id: 5, label: _t("schedule appointments"), name: 'schedule_appointments'},
+    1: { id: 1, label: _t("get leads"), name: "get_leads" },
+    2: { id: 2, label: _t("develop the brand"), name: "develop_brand" },
+    3: { id: 3, label: _t("sell more"), name: "sell_more" },
+    4: { id: 4, label: _t("inform customers"), name: "inform_customers" },
+    5: { id: 5, label: _t("schedule appointments"), name: "schedule_appointments" },
 };
 
 export const PALETTE_NAMES = [
-    'default-light-1',
-    'default-light-2',
-    'default-light-4',
-    'default-light-3',
-    'default-light-5',
-    'default-24',
-    'default-light-7',
-    'default-light-6',
-    'default-light-11',
-    'default-light-14',
-    'default-light-8',
-    'default-6',
-    'default-7',
-    'default-8',
-    'default-9',
-    'default-23',
-    'default-25',
-    'default-12',
-    'default-14',
-    'default-22',
-    'default-15',
-    'default-16',
-    'default-17',
-    'default-light-10',
-    'default-19',
-    'default-20',
-    'default-5',
-    'default-4',
-    'default-light-9',
-    'default-2',
-    'default-light-13',
-    'default-27',
-    'default-light-12',
-    'default-1',
-    'default-28',
-    'default-21',
+    "default-light-1",
+    "default-light-2",
+    "default-light-4",
+    "default-light-3",
+    "default-light-5",
+    "default-24",
+    "default-light-7",
+    "default-light-6",
+    "default-light-11",
+    "default-light-14",
+    "default-light-8",
+    "default-6",
+    "default-7",
+    "default-8",
+    "default-9",
+    "default-23",
+    "default-25",
+    "default-12",
+    "default-14",
+    "default-22",
+    "default-15",
+    "default-16",
+    "default-17",
+    "default-light-10",
+    "default-19",
+    "default-20",
+    "default-5",
+    "default-4",
+    "default-light-9",
+    "default-2",
+    "default-light-13",
+    "default-27",
+    "default-light-12",
+    "default-1",
+    "default-28",
+    "default-21",
 ];
 
 // Attributes for which background color should be retrieved
@@ -110,15 +110,11 @@ const MAX_NBR_DISPLAY_MAIN_THEMES = 3;
  * of the list is at most 'resultNbrMax'.
  */
 async function getRecommendedThemes(orm, state, resultNbrMax = MAX_NBR_DISPLAY_MAIN_THEMES) {
-    return orm.call("website",
-        "configurator_recommended_themes",
-        [],
-        {
-            "industry_id": state.selectedIndustry.id,
-            "palette": state.selectedPalette,
-            "result_nbr_max": resultNbrMax,
-        },
-    );
+    return orm.call("website", "configurator_recommended_themes", [], {
+        industry_id: state.selectedIndustry.id,
+        palette: state.selectedPalette,
+        result_nbr_max: resultNbrMax,
+    });
 }
 
 //------------------------------------------------------------------------------
@@ -149,24 +145,24 @@ export class WelcomeScreen extends Component {
 }
 
 export class DescriptionScreen extends Component {
-    static template = 'website.Configurator.DescriptionScreen';
+    static template = "website.Configurator.DescriptionScreen";
     static components = { SkipButton, AutoComplete };
     static props = {
         navigate: Function,
         skip: Function,
     };
     setup() {
-        this.industrySelection = useRef('industrySelection');
+        this.industrySelection = useRef("industrySelection");
         this.purposeSelectionRef = useRef("purposeSelection");
         this.state = useStore();
-        this.orm = useService('orm');
+        this.orm = useService("orm");
         useAutofocus();
 
         this.splitRegex = /[|\s,]+/;
 
         // Get all words from the industry names and synonyms
         this.dictionarySet = new Set();
-        for (let industry of this.state.industries) {
+        for (const industry of this.state.industries) {
             let industryWords = this._splitToSet(industry.label);
             if (industry.synonyms) {
                 industryWords = industryWords.union(this._splitToSet(industry.synonyms));
@@ -177,14 +173,17 @@ export class DescriptionScreen extends Component {
         onMounted(() => this.onMounted());
 
         // Autofocus the next field once the current one is confirmed.
-        useEffect((selectedType, selectedIndustry) => {
-            if (selectedType && !selectedIndustry) {
-                this.industrySelection.el.querySelector("input").focus();
-            }
-            if (selectedIndustry) {
-                this.purposeSelectionRef.el.focus();
-            }
-        }, () => [this.state.selectedType, this.state.selectedIndustry]);
+        useEffect(
+            (selectedType, selectedIndustry) => {
+                if (selectedType && !selectedIndustry) {
+                    this.industrySelection.el.querySelector("input").focus();
+                }
+                if (selectedIndustry) {
+                    this.purposeSelectionRef.el.focus();
+                }
+            },
+            () => [this.state.selectedType, this.state.selectedIndustry]
+        );
 
         this.safariHackFocusedOutDropdown = null;
     }
@@ -212,9 +211,7 @@ export class DescriptionScreen extends Component {
     get sources() {
         return [
             {
-                options: (request) => {
-                    return request.length < 1 ? [] : this._autocompleteSearch(request);
-                },
+                options: (request) => (request.length < 1 ? [] : this._autocompleteSearch(request)),
             },
         ];
     }
@@ -231,11 +228,11 @@ export class DescriptionScreen extends Component {
      */
     _autocompleteSearch(term) {
         this.state.selectedIndustry = undefined;
-        let termsSet = this._splitToSet(term);
+        const termsSet = this._splitToSet(term);
 
         //-------words correction--------
         // Check and correct all the terms
-        let correctedSet = new Set();
+        const correctedSet = new Set();
         for (const term of termsSet) {
             if (this.dictionarySet.has(term)) {
                 correctedSet.add(term);
@@ -248,25 +245,29 @@ export class DescriptionScreen extends Component {
         const limit = 30;
         // `this.state.industries` is already sorted by hit count (from IAP).
         // That order should be kept after manipulating the recordset.
-        let matches = this.state.industries.filter((val, index) => {
+        let matches = this.state.industries.filter((val, index) =>
             // To match, every term should be contained in the label
-            return terms.every(term => val.label.toLowerCase().includes(term));
-        });
+            terms.every((term) => val.label.toLowerCase().includes(term))
+        );
 
         matches = matches.sort((x, y) => x.hitCountOrder - y.hitCountOrder);
         if (matches.length > limit) {
             // Keep matches with the least number of words so that e.g.
             // "restaurant" remains available even if there are 30 specific
             // sub-types that have a higher hit count.
-            matches = matches.sort((x, y) => x.wordCount - y.wordCount)
-                             .slice(0, limit)
-                             .sort((x, y) => x.hitCountOrder - y.hitCountOrder);
+            matches = matches
+                .sort((x, y) => x.wordCount - y.wordCount)
+                .slice(0, limit)
+                .sort((x, y) => x.hitCountOrder - y.hitCountOrder);
         } else {
             let synonymMatches = this.state.industries.filter((val, index) => {
                 // To match, every term should be contained in the synonym
-                for (const candidate of [...(val.synonyms || '').split(this.splitRegex)]) {
+                for (const candidate of [...(val.synonyms || "").split(this.splitRegex)]) {
                     // Check if industry label has already matched
-                    if (terms.every(term => candidate.toLowerCase().includes(term)) && !matches.includes(val)) {
+                    if (
+                        terms.every((term) => candidate.toLowerCase().includes(term)) &&
+                        !matches.includes(val)
+                    ) {
                         return true;
                     }
                 }
@@ -301,8 +302,8 @@ export class DescriptionScreen extends Component {
      * - 'searchTermIndexes' keeps the indexes of the bits that matches with the 'terms'
      */
     _getMatchTermOrder(label, terms) {
-        let sortedTerms = terms.sort((a, b) => b.length - a.length);
-        let matchTermOrder = {
+        const sortedTerms = terms.sort((a, b) => b.length - a.length);
+        const matchTermOrder = {
             labelBits: [],
             searchTermIndexes: [],
         };
@@ -315,14 +316,14 @@ export class DescriptionScreen extends Component {
             let bitIndex = 0;
             while (bitIndex < matchTermOrder.labelBits.length) {
                 const currentBit = matchTermOrder.labelBits[bitIndex];
-                const splitBits = currentBit.split(new RegExp(`(${escapeRegExp(term)})`))
+                const splitBits = currentBit.split(new RegExp(`(${escapeRegExp(term)})`));
                 matchTermOrder.labelBits.splice(bitIndex, 1, ...splitBits);
                 bitIndex += splitBits.length;
             }
         }
         // Saves the indexes of the segments matching the terms
         const labelBits = [];
-        for (let i in matchTermOrder.labelBits) {
+        for (const i in matchTermOrder.labelBits) {
             labelBits.push({
                 bit: matchTermOrder.labelBits[i],
                 id: i,
@@ -346,13 +347,13 @@ export class DescriptionScreen extends Component {
     }
 
     checkDescriptionCompletion() {
-        const {selectedType, selectedPurpose, selectedIndustry} = this.state;
+        const { selectedType, selectedPurpose, selectedIndustry } = this.state;
         if (selectedType && selectedPurpose && selectedIndustry) {
             // If the industry name is not known by the server, send it to the
             // IAP server.
             if (selectedIndustry.id === -1) {
-                this.orm.call('website', 'configurator_missing_industry', [], {
-                    'unknown_industry': selectedIndustry.label,
+                this.orm.call("website", "configurator_missing_industry", [], {
+                    unknown_industry: selectedIndustry.label,
                 });
             }
             this.props.navigate(ROUTES.paletteSelectionScreen);
@@ -393,17 +394,17 @@ export class DescriptionScreen extends Component {
 }
 
 export class PaletteSelectionScreen extends Component {
-    static components = {SkipButton};
-    static template = 'website.Configurator.PaletteSelectionScreen';
+    static components = { SkipButton };
+    static template = "website.Configurator.PaletteSelectionScreen";
     static props = {
         navigate: Function,
         skip: Function,
     };
     setup() {
         this.state = useStore();
-        this.logoInputRef = useRef('logoSelectionInput');
+        this.logoInputRef = useRef("logoSelectionInput");
         this.notification = useService("notification");
-        this.orm = useService('orm');
+        this.orm = useService("orm");
 
         onMounted(() => {
             if (this.state.logo) {
@@ -449,10 +450,10 @@ export class PaletteSelectionScreen extends Component {
                 return;
             }
             const data = await getDataURLFromFile(file);
-            const attachment = await rpc('/web_editor/attachment/add_data', {
-                'name': 'logo',
-                'data': data.split(',')[1],
-                'is_image': true,
+            const attachment = await rpc("/web_editor/attachment/add_data", {
+                name: "logo",
+                data: data.split(",")[1],
+                is_image: true,
             });
             if (!attachment.error) {
                 if (previousLogoAttachmentId) {
@@ -461,29 +462,27 @@ export class PaletteSelectionScreen extends Component {
                 this.state.changeLogo(data, attachment.id);
                 this.updatePalettes();
             } else {
-                this.notification.add(
-                    attachment.error,
-                    {
-                        title: file.name,
-                    }
-                );
+                this.notification.add(attachment.error, {
+                    title: file.name,
+                });
             }
         }
     }
 
     async updatePalettes() {
         let img = this.state.logo;
-        if (img.startsWith('data:image/svg+xml')) {
+        if (img.startsWith("data:image/svg+xml")) {
             img = await svgToPNG(img);
         }
-        if (img.startsWith('data:image/webp')) {
+        if (img.startsWith("data:image/webp")) {
             img = await webpToPNG(img);
         }
-        img = img.split(',')[1];
-        const [color1, color2] = await this.orm.call('base.document.layout',
-            'extract_image_primary_secondary_colors',
+        img = img.split(",")[1];
+        const [color1, color2] = await this.orm.call(
+            "base.document.layout",
+            "extract_image_primary_secondary_colors",
             [img],
-            {mitigate: 255},
+            { mitigate: 255 }
         );
         this.state.setRecommendedPalette(color1, color2);
     }
@@ -508,7 +507,7 @@ export class ApplyConfiguratorScreen extends Component {
     static template = "";
     static props = ["*"];
     setup() {
-        this.websiteService = useService('website');
+        this.websiteService = useService("website");
     }
 
     async applyConfigurator(themeName) {
@@ -521,22 +520,22 @@ export class ApplyConfiguratorScreen extends Component {
 
         const attemptConfiguratorApply = async (data, retryCount = 0) => {
             try {
-                return await this.orm.silent.call('website',
-                    'configurator_apply', [], data
-                );
+                return await this.orm.silent.call("website", "configurator_apply", [], data);
             } catch (error) {
                 // Wait a bit before retrying or allowing manual retry.
                 await delay(5000);
                 if (retryCount < 3) {
                     return attemptConfiguratorApply(data, retryCount + 1);
                 }
-                document.querySelector('.o_website_loader_container').remove();
+                document.querySelector(".o_website_loader_container").remove();
                 throw error;
             }
         };
 
         if (themeName !== undefined) {
-            const selectedFeatures = Object.values(this.state.features).filter((feature) => feature.selected).map((feature) => feature.id);
+            const selectedFeatures = Object.values(this.state.features)
+                .filter((feature) => feature.selected)
+                .map((feature) => feature.id);
             this.websiteService.showLoader({
                 showTips: true,
                 selectedFeatures: selectedFeatures,
@@ -552,9 +551,9 @@ export class ApplyConfiguratorScreen extends Component {
                     this.state.selectedPalette.color5,
                 ];
             }
-            const resp = await attemptConfiguratorApply(this.getConfigurationData(
-                selectedFeatures, selectedPalette, themeName,
-            ));
+            const resp = await attemptConfiguratorApply(
+                this.getConfigurationData(selectedFeatures, selectedPalette, themeName)
+            );
 
             this.props.clearStorage();
 
@@ -562,29 +561,33 @@ export class ApplyConfiguratorScreen extends Component {
             // Here the website service goToWebsite method is not used because
             // the web client needs to be reloaded after the new modules have
             // been installed.
-            redirect(`/odoo/action-website.website_preview?website_id=${encodeURIComponent(resp.website_id)}`);
+            redirect(
+                `/odoo/action-website.website_preview?website_id=${encodeURIComponent(
+                    resp.website_id
+                )}`
+            );
         }
     }
 
     getConfigurationData(selectedFeatures, selectedPalette, themeName) {
         return {
-            'selected_features': selectedFeatures,
-            'industry_id': this.state.selectedIndustry.id,
-            'industry_name': this.state.selectedIndustry.label.toLowerCase(),
-            'selected_palette': selectedPalette,
-            'theme_name': themeName,
-            'website_purpose': WEBSITE_PURPOSES[
-                this.state.selectedPurpose || this.state.formerSelectedPurpose
-            ].name,
-            'website_type': WEBSITE_TYPES[this.state.selectedType].name,
-            'logo_attachment_id': this.state.logoAttachmentId,
+            selected_features: selectedFeatures,
+            industry_id: this.state.selectedIndustry.id,
+            industry_name: this.state.selectedIndustry.label.toLowerCase(),
+            selected_palette: selectedPalette,
+            theme_name: themeName,
+            website_purpose:
+                WEBSITE_PURPOSES[this.state.selectedPurpose || this.state.formerSelectedPurpose]
+                    .name,
+            website_type: WEBSITE_TYPES[this.state.selectedType].name,
+            logo_attachment_id: this.state.logoAttachmentId,
         };
     }
 }
 
 export class FeaturesSelectionScreen extends Component {
-    static components = {SkipButton};
-    static template = 'website.Configurator.FeatureSelection';
+    static components = { SkipButton };
+    static template = "website.Configurator.FeatureSelection";
     static props = {
         navigate: Function,
         skip: Function,
@@ -625,14 +628,18 @@ export class ThemeSelectionScreen extends ApplyConfiguratorScreen {
     setup() {
         super.setup();
 
-        this.uiService = useService('ui');
-        this.orm = useService('orm');
+        this.uiService = useService("ui");
+        this.orm = useService("orm");
         this.maxNbrDisplayExtraThemes = 100;
         const env = useEnv();
         env.store["extraThemesLoaded"] = false;
         env.store["extraThemes"] = [];
         this.state = useState(env.store);
-        this.themeSVGPreviews = [useRef('ThemePreview1'), useRef('ThemePreview2'), useRef('ThemePreview3')];
+        this.themeSVGPreviews = [
+            useRef("ThemePreview1"),
+            useRef("ThemePreview2"),
+            useRef("ThemePreview3"),
+        ];
         this.extraThemesButtonRef = useRef("extraThemesButton");
         this.extraThemeSVGPreviews = [];
         for (let i = 0; i < this.maxNbrDisplayExtraThemes; i++) {
@@ -641,7 +648,7 @@ export class ThemeSelectionScreen extends ApplyConfiguratorScreen {
         onWillStart(async () => {
             const themes = await getRecommendedThemes(this.orm, this.state);
             if (!themes.length) {
-                await this.applyConfigurator('theme_default');
+                await this.applyConfigurator("theme_default");
             } else {
                 this.state.updateRecommendedThemes(themes);
             }
@@ -652,7 +659,8 @@ export class ThemeSelectionScreen extends ApplyConfiguratorScreen {
         });
 
         useEffect(
-            () => this.blockUiDuringImageLoading(this.state.extraThemes, this.extraThemeSVGPreviews),
+            () =>
+                this.blockUiDuringImageLoading(this.state.extraThemes, this.extraThemeSVGPreviews),
             () => [this.state.extraThemes]
         );
     }
@@ -664,8 +672,10 @@ export class ThemeSelectionScreen extends ApplyConfiguratorScreen {
      * be displayed.
      */
     get showViewMoreThemesButton() {
-        return !this.state.extraThemesLoaded
-            && this.state.themes.length === MAX_NBR_DISPLAY_MAIN_THEMES;
+        return (
+            !this.state.extraThemesLoaded &&
+            this.state.themes.length === MAX_NBR_DISPLAY_MAIN_THEMES
+        );
     }
 
     /**
@@ -681,18 +691,31 @@ export class ThemeSelectionScreen extends ApplyConfiguratorScreen {
             return;
         }
         const proms = [];
-        this.uiService.block({delay: 700});
+        this.uiService.block({ delay: 700 });
         themes.forEach((theme, idx) => {
-            const svgEl = new DOMParser().parseFromString(theme.svg, "image/svg+xml").documentElement;
+            const svgEl = new DOMParser().parseFromString(
+                theme.svg,
+                "image/svg+xml"
+            ).documentElement;
             for (const imgEl of svgEl.querySelectorAll("image")) {
-                proms.push(new Promise((resolve, reject) => {
-                    imgEl.addEventListener("load", () => {
-                        resolve(imgEl);
-                    }, {once: true});
-                    imgEl.addEventListener("error", () => {
-                        reject(imgEl);
-                    }, {once: true});
-                }));
+                proms.push(
+                    new Promise((resolve, reject) => {
+                        imgEl.addEventListener(
+                            "load",
+                            () => {
+                                resolve(imgEl);
+                            },
+                            { once: true }
+                        );
+                        imgEl.addEventListener(
+                            "error",
+                            () => {
+                                reject(imgEl);
+                            },
+                            { once: true }
+                        );
+                    })
+                );
             }
             themeSVGPreviews[idx].el.appendChild(svgEl);
         });
@@ -717,7 +740,9 @@ export class ThemeSelectionScreen extends ApplyConfiguratorScreen {
         // Filter the extra themes to not propose a theme that is already
         // present in the main themes.
         const mainThemeNames = this.state.themes.map((theme) => theme.name);
-        this.state.extraThemes = themes.filter((extraTheme) => !mainThemeNames.includes(extraTheme.name));
+        this.state.extraThemes = themes.filter(
+            (extraTheme) => !mainThemeNames.includes(extraTheme.name)
+        );
         this.state.extraThemesLoaded = true;
         this.uiService.unblock();
     }
@@ -773,7 +798,7 @@ export class Store {
      */
     getSelectedPaletteName() {
         const palette = this.selectedPalette;
-        return palette ? (palette.name || 'recommendedPalette') : false;
+        return palette ? palette.name || "recommendedPalette" : false;
     }
 
     //-------------------------------------------------------------------------
@@ -781,9 +806,13 @@ export class Store {
     //-------------------------------------------------------------------------
 
     selectWebsiteType(id) {
-        Object.values(this.features).filter((feature) => feature.module_state !== 'installed').forEach((feature) => {
-            feature.selected = feature.website_config_preselection.includes(WEBSITE_TYPES[id].name);
-        });
+        Object.values(this.features)
+            .filter((feature) => feature.module_state !== "installed")
+            .forEach((feature) => {
+                feature.selected = feature.website_config_preselection.includes(
+                    WEBSITE_TYPES[id].name
+                );
+            });
         this.selectedType = id;
     }
 
@@ -794,10 +823,13 @@ export class Store {
         if (!id && this.selectedPurpose) {
             this.formerSelectedPurpose = this.selectedPurpose;
         }
-        Object.values(this.features).filter((feature) => feature.module_state !== 'installed').forEach((feature) => {
-            // need to check id, since we set to undefined in mount() to avoid the auto next screen on back button
-            feature.selected |= id && feature.website_config_preselection.includes(WEBSITE_PURPOSES[id].name);
-        });
+        Object.values(this.features)
+            .filter((feature) => feature.module_state !== "installed")
+            .forEach((feature) => {
+                // need to check id, since we set to undefined in mount() to avoid the auto next screen on back button
+                feature.selected |=
+                    id && feature.website_config_preselection.includes(WEBSITE_PURPOSES[id].name);
+            });
         this.selectedPurpose = id;
     }
 
@@ -815,7 +847,7 @@ export class Store {
     }
 
     selectPalette(paletteName) {
-        if (paletteName === 'recommendedPalette') {
+        if (paletteName === "recommendedPalette") {
             this.selectedPalette = this.recommendedPalette;
         } else {
             this.selectedPalette = this.palettes[paletteName];
@@ -824,21 +856,21 @@ export class Store {
 
     toggleFeature(featureId) {
         const feature = this.features[featureId];
-        const isModuleInstalled = feature.module_state === 'installed';
+        const isModuleInstalled = feature.module_state === "installed";
         feature.selected = !feature.selected || isModuleInstalled;
     }
 
     setRecommendedPalette(color1, color2) {
         if (color1 && color2) {
             if (color1 === color2) {
-                color2 = mixCssColors('#FFFFFF', color1, 0.2);
+                color2 = mixCssColors("#FFFFFF", color1, 0.2);
             }
             const recommendedPalette = {
                 color1: color1,
                 color2: color2,
-                color3: mixCssColors('#FFFFFF', color2, 0.9),
-                color4: '#FFFFFF',
-                color5: mixCssColors(color1, '#000000', 0.125),
+                color3: mixCssColors("#FFFFFF", color2, 0.9),
+                color4: "#FFFFFF",
+                color5: mixCssColors(color1, "#000000", 0.125),
             };
             CUSTOM_BG_COLOR_ATTRS.forEach((attr) => {
                 recommendedPalette[attr] = recommendedPalette[this.defaultColors[attr]];
@@ -868,12 +900,12 @@ export class Configurator extends Component {
         FeaturesSelectionScreen,
         ThemeSelectionScreen,
     };
-    static template = 'website.Configurator.Configurator';
+    static template = "website.Configurator.Configurator";
     static props = { ...standardActionServiceProps };
 
     setup() {
-        this.orm = useService('orm');
-        this.action = useService('action');
+        this.orm = useService("orm");
+        this.action = useService("action");
         this.website = useService("website");
 
         // Using the back button must update the router state.
@@ -896,7 +928,7 @@ export class Configurator extends Component {
         useSubEnv({ store });
 
         onWillStart(async () => {
-            this.websiteId = (await this.orm.call('website', 'get_current_website'))[0];
+            this.websiteId = (await this.orm.call("website", "get_current_website"))[0];
 
             await store.start(() => this.getInitialState());
             this.updateStorage(store);
@@ -917,7 +949,9 @@ export class Configurator extends Component {
     }
 
     get pathname() {
-        return `/website/configurator${this.state.currentStep ? `/${encodeURIComponent(this.state.currentStep)}` : ''}`;
+        return `/website/configurator${
+            this.state.currentStep ? `/${encodeURIComponent(this.state.currentStep)}` : ""
+        }`;
     }
 
     get storageItemName() {
@@ -925,7 +959,11 @@ export class Configurator extends Component {
     }
 
     updateBrowserUrl() {
-        history.pushState({ skipRouteChange: true, configuratorStep: this.state.currentStep }, '', this.pathname);
+        history.pushState(
+            { skipRouteChange: true, configuratorStep: this.state.currentStep },
+            "",
+            this.pathname
+        );
     }
 
     get currentComponent() {
@@ -967,10 +1005,10 @@ export class Configurator extends Component {
 
     async getInitialState() {
         // Load values from python and iap
-        var results = await this.orm.call('website', 'configurator_init');
+        var results = await this.orm.call("website", "configurator_init");
         const r = {
             industries: results.industries,
-            logo: results.logo ? 'data:image/png;base64,' + results.logo : false,
+            logo: results.logo ? "data:image/png;base64," + results.logo : false,
             configurator_done: results.configurator_done,
         };
         r.industries = r.industries.map((industry, index) => ({
@@ -985,10 +1023,13 @@ export class Configurator extends Component {
 
         PALETTE_NAMES.forEach((paletteName) => {
             const palette = {
-                name: paletteName
+                name: paletteName,
             };
             for (let j = 1; j <= 5; j += 1) {
-                palette[`color${j}`] = getCSSVariableValue(`o-palette-${paletteName}-o-color-${j}`, style);
+                palette[`color${j}`] = getCSSVariableValue(
+                    `o-palette-${paletteName}-o-color-${j}`,
+                    style
+                );
             }
             CUSTOM_BG_COLOR_ATTRS.forEach((attr) => {
                 palette[attr] = getCSSVariableValue(`o-palette-${paletteName}-${attr}-bg`, style);
@@ -1002,14 +1043,16 @@ export class Configurator extends Component {
             if (localState.selectedIndustry && localState.selectedPalette) {
                 themes = await getRecommendedThemes(this.orm, localState);
             }
-            return Object.assign(r, {...localState, palettes, themes});
+            return Object.assign(r, { ...localState, palettes, themes });
         }
 
         const features = {};
-        results.features.forEach(feature => {
-            features[feature.id] = Object.assign({}, feature, {selected: feature.module_state === 'installed'});
-            const wtp = features[feature.id]['website_config_preselection'];
-            features[feature.id]['website_config_preselection'] = wtp ? wtp.split(',') : [];
+        results.features.forEach((feature) => {
+            features[feature.id] = Object.assign({}, feature, {
+                selected: feature.module_state === "installed",
+            });
+            const wtp = features[feature.id]["website_config_preselection"];
+            features[feature.id]["website_config_preselection"] = wtp ? wtp.split(",") : [];
         });
 
         // Palette color used by default as background color for menu and footer.
@@ -1018,7 +1061,7 @@ export class Configurator extends Component {
         CUSTOM_BG_COLOR_ATTRS.forEach((attr) => {
             const color = getCSSVariableValue(`o-default-${attr}-bg`, style);
             const match = color.match(/o-color-(?<idx>[1-5])/);
-            const colorIdx = parseInt(match.groups['idx']);
+            const colorIdx = parseInt(match.groups["idx"]);
             defaultColors[attr] = `color${colorIdx}`;
         });
 
@@ -1064,4 +1107,4 @@ export class Configurator extends Component {
     }
 }
 
-registry.category('actions').add('website_configurator', Configurator);
+registry.category("actions").add("website_configurator", Configurator);
diff --git a/addons/website/static/src/client_actions/website_preview/create_page_message.js b/addons/website/static/src/client_actions/website_preview/create_page_message.js
index 38f7c93774611..c16c04840ac47 100644
--- a/addons/website/static/src/client_actions/website_preview/create_page_message.js
+++ b/addons/website/static/src/client_actions/website_preview/create_page_message.js
@@ -5,5 +5,4 @@ export class CreatePageMessage extends Component {
     static props = {
         createPage: { type: Function },
     };
-
 }
diff --git a/addons/website/static/src/client_actions/website_preview/edit_website_systray_item.js b/addons/website/static/src/client_actions/website_preview/edit_website_systray_item.js
index 7561c3b83a183..93246fe64c022 100644
--- a/addons/website/static/src/client_actions/website_preview/edit_website_systray_item.js
+++ b/addons/website/static/src/client_actions/website_preview/edit_website_systray_item.js
@@ -25,11 +25,7 @@ export class EditWebsiteSystrayItem extends Component {
         this.notification = useService("notification");
         this.websiteContext = useState(this.websiteService.context);
         // TODO: website service should share a reactive
-        useBus(
-            websiteSystrayRegistry,
-            "CONTENT-UPDATED",
-            () => this.checkPendingTranslations()
-        );
+        useBus(websiteSystrayRegistry, "CONTENT-UPDATED", () => this.checkPendingTranslations());
         this.isEnteringTranslateMode = false;
     }
 
diff --git a/addons/website/static/src/client_actions/website_preview/new_content_systray_item.js b/addons/website/static/src/client_actions/website_preview/new_content_systray_item.js
index d0a5faf7d1090..520bd8f3d5223 100644
--- a/addons/website/static/src/client_actions/website_preview/new_content_systray_item.js
+++ b/addons/website/static/src/client_actions/website_preview/new_content_systray_item.js
@@ -110,8 +110,8 @@ export class NewContentSystrayItem extends Component {
 
     get newPageAttrs() {
         return {
-            'aria-label': _t("New Page"),
-            'style': 'width: 300px',
+            "aria-label": _t("New Page"),
+            style: "width: 300px",
         };
     }
 
@@ -120,7 +120,10 @@ export class NewContentSystrayItem extends Component {
             return;
         }
         if (!element.description2) {
-            element.description2 = sprintf(_t('Install "%s"'), this.modulesInfo[element.moduleName].name);
+            element.description2 = sprintf(
+                _t('Install "%s"'),
+                this.modulesInfo[element.moduleName].name
+            );
         }
         const tmp = element.description;
         element.description = element.description2;
@@ -140,45 +143,51 @@ export class NewContentSystrayItem extends Component {
 
         const proms = [];
 
-        proms.push((async () => {
-            this.canInstall = user.isAdmin;
-            if (this.canInstall) {
-                const moduleNames = this.state.newContentElements
-                    .filter(({ status }) => status === MODULE_STATUS.NOT_INSTALLED)
-                    .map(({ moduleName }) => moduleName);
-                this.modulesInfo = {};
-                for (const record of await this.orm.cache().searchRead(
-                    "ir.module.module",
-                    [["name", "in", moduleNames]],
-                    ["id", "name", "shortdesc"]
-                )) {
-                    this.modulesInfo[record.name] = { id: record.id, name: record.shortdesc };
+        proms.push(
+            (async () => {
+                this.canInstall = user.isAdmin;
+                if (this.canInstall) {
+                    const moduleNames = this.state.newContentElements
+                        .filter(({ status }) => status === MODULE_STATUS.NOT_INSTALLED)
+                        .map(({ moduleName }) => moduleName);
+                    this.modulesInfo = {};
+                    for (const record of await this.orm
+                        .cache()
+                        .searchRead(
+                            "ir.module.module",
+                            [["name", "in", moduleNames]],
+                            ["id", "name", "shortdesc"]
+                        )) {
+                        this.modulesInfo[record.name] = { id: record.id, name: record.shortdesc };
+                    }
                 }
-            }
-        })());
+            })()
+        );
 
-        proms.push((async () => {
-            const modelsToCheck = [];
-            const elementsToUpdate = {};
-            for (const element of this.state.newContentElements) {
-                if (element.model) {
-                    modelsToCheck.push(element.model);
-                    elementsToUpdate[element.model] = element;
+        proms.push(
+            (async () => {
+                const modelsToCheck = [];
+                const elementsToUpdate = {};
+                for (const element of this.state.newContentElements) {
+                    if (element.model) {
+                        modelsToCheck.push(element.model);
+                        elementsToUpdate[element.model] = element;
+                    }
                 }
-            }
-            if (!modelsToCheck.length) {
-                return;
-            }
-            const accesses = await Promise.all(
-                modelsToCheck.map(async (model) => [
-                    model,
-                    await user.checkAccessRight(model, "create")
-                ])
-            );
-            for (const [model, access] of accesses) {
-                elementsToUpdate[model].isDisplayed = access;
-            }
-        })());
+                if (!modelsToCheck.length) {
+                    return;
+                }
+                const accesses = await Promise.all(
+                    modelsToCheck.map(async (model) => [
+                        model,
+                        await user.checkAccessRight(model, "create"),
+                    ])
+                );
+                for (const [model, access] of accesses) {
+                    elementsToUpdate[model].isDisplayed = access;
+                }
+            })()
+        );
 
         await Promise.all(proms);
         this.dropdown.open();
@@ -186,7 +195,7 @@ export class NewContentSystrayItem extends Component {
         // Preload the new page templates so they are ready as soon as possible
         rpc(
             "/website/get_new_page_templates",
-            { context: { 'website_id': this.website.currentWebsiteId } },
+            { context: { website_id: this.website.currentWebsiteId } },
             { cache: true, silent: true }
         );
     }
@@ -199,7 +208,7 @@ export class NewContentSystrayItem extends Component {
                     ({ status }) => status === MODULE_STATUS.NOT_INSTALLED
                 )
             )
-            .filter(el => ('isDisplayed' in el ? el.isDisplayed : user.isSystem));
+            .filter((el) => ("isDisplayed" in el ? el.isDisplayed : user.isSystem));
     }
 
     async installModule(id, redirectUrl) {
diff --git a/addons/website/static/src/client_actions/website_preview/website_builder_action.js b/addons/website/static/src/client_actions/website_preview/website_builder_action.js
index c262a0f7f323a..5ccbcc8841ae0 100644
--- a/addons/website/static/src/client_actions/website_preview/website_builder_action.js
+++ b/addons/website/static/src/client_actions/website_preview/website_builder_action.js
@@ -39,7 +39,13 @@ const websiteSystrayRegistry = registry.category("website_systray");
 
 export class WebsiteBuilderClientAction extends Component {
     static template = "website.WebsiteBuilderClientAction";
-    static components = { LazyComponent, LocalOverlayContainer, ResizablePanel, ResourceEditor, CreatePageMessage };
+    static components = {
+        LazyComponent,
+        LocalOverlayContainer,
+        ResizablePanel,
+        ResourceEditor,
+        CreatePageMessage,
+    };
     static props = {
         ...standardActionServiceProps,
         editTranslations: { type: Boolean, optional: true },
@@ -67,8 +73,8 @@ export class WebsiteBuilderClientAction extends Component {
         this.title = useService("title");
         this.hotkeyService = useService("hotkey");
         this.websiteService.websiteRootInstance = undefined;
-        this.iframeFallbackUrl = '/website/iframefallback';
-        this.iframefallback = useRef('iframefallback');
+        this.iframeFallbackUrl = "/website/iframefallback";
+        this.iframefallback = useRef("iframefallback");
 
         this.websiteContent = useRef("iframe");
         this.cleanups = [];
@@ -153,7 +159,7 @@ export class WebsiteBuilderClientAction extends Component {
             }
         });
         onWillUnmount(() => {
-            for (let fn of this.cleanups) {
+            for (const fn of this.cleanups) {
                 fn();
             }
         });
@@ -185,7 +191,9 @@ export class WebsiteBuilderClientAction extends Component {
                     this.navBarTimeout = setTimeout(() => {
                         websiteSystrayRegistry.remove("website.WebsiteSystrayItem");
                         websiteSystrayRegistry.trigger("EDIT-WEBSITE");
-                        document.querySelector(".o_builder_open .o_main_navbar").classList.add("d-none");
+                        document
+                            .querySelector(".o_builder_open .o_main_navbar")
+                            .classList.add("d-none");
                     }, 200);
                 } else {
                     document.querySelector(".o_main_navbar")?.classList.remove("d-none");
@@ -201,9 +209,9 @@ export class WebsiteBuilderClientAction extends Component {
     }
 
     get websiteBuilderProps() {
-        const iframeLoaded = this.iframeLoaded.then((el) => {
-            return this.waitForIframeReady().then(() => el);
-        });
+        const iframeLoaded = this.iframeLoaded.then((el) =>
+            this.waitForIframeReady().then(() => el)
+        );
         const builderProps = {
             closeEditor: this.reloadIframeAndCloseEditor.bind(this),
             editableSelector: "#wrapwrap",
@@ -498,7 +506,7 @@ export class WebsiteBuilderClientAction extends Component {
                         resolve();
                     }
                 });
-                observer.observe(doc.body, { attributes: true, attributeFilter: ['is-ready'] });
+                observer.observe(doc.body, { attributes: true, attributeFilter: ["is-ready"] });
             }
         });
     }
@@ -603,7 +611,10 @@ export class WebsiteBuilderClientAction extends Component {
         this.iframeLoaded = new Promise((resolve) => {
             this.resolveIframeLoaded = () => {
                 this.hotkeyService.registerIframe(this.websiteContent.el);
-                this.websiteContent.el.contentWindow.addEventListener('beforeunload', this.onPageUnload.bind(this));
+                this.websiteContent.el.contentWindow.addEventListener(
+                    "beforeunload",
+                    this.onPageUnload.bind(this)
+                );
 
                 this.addListeners(this.websiteContent.el.contentDocument);
                 resolve(this.websiteContent.el);
@@ -639,10 +650,12 @@ export class WebsiteBuilderClientAction extends Component {
 
     cleanIframeFallback() {
         // Remove autoplay in all iframes urls so videos are not
-        const iframesEl = this.iframefallback.el.contentDocument.querySelectorAll('iframe[src]:not([src=""])');
+        const iframesEl = this.iframefallback.el.contentDocument.querySelectorAll(
+            'iframe[src]:not([src=""])'
+        );
         for (const iframeEl of iframesEl) {
             const url = new URL(iframeEl.src);
-            url.searchParams.delete('autoplay');
+            url.searchParams.delete("autoplay");
             iframeEl.src = url.toString();
         }
     }
@@ -655,8 +668,10 @@ export class WebsiteBuilderClientAction extends Component {
 
     toggleIsMobile(isMobile) {
         this.websitePreviewRef.el.classList.toggle("o_is_mobile", isMobile);
-        this.websiteContent.el?.contentDocument.documentElement
-            .classList.toggle("o_is_mobile", isMobile);
+        this.websiteContent.el?.contentDocument.documentElement.classList.toggle(
+            "o_is_mobile",
+            isMobile
+        );
     }
 
     get aceEditorWidth() {
@@ -704,7 +719,7 @@ export class WebsiteBuilderClientAction extends Component {
      * @param {HTMLElement} target - document or iframe document
      */
     addListeners(target) {
-        const listener = ev => this.onKeydownRefresh(ev);
+        const listener = (ev) => this.onKeydownRefresh(ev);
         target.addEventListener("keydown", listener);
         this.cleanups.push(() => {
             target.removeEventListener("keydown", listener);
diff --git a/addons/website/static/src/client_actions/website_preview/website_builder_action_test_mode.js b/addons/website/static/src/client_actions/website_preview/website_builder_action_test_mode.js
index 0a4e4c47ea283..612f76a106294 100644
--- a/addons/website/static/src/client_actions/website_preview/website_builder_action_test_mode.js
+++ b/addons/website/static/src/client_actions/website_preview/website_builder_action_test_mode.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 import { patch } from "@web/core/utils/patch";
-import { WebsiteBuilderClientAction } from './website_builder_action';
+import { WebsiteBuilderClientAction } from "./website_builder_action";
 
 patch(WebsiteBuilderClientAction.prototype, {
     /**
@@ -8,5 +8,5 @@ patch(WebsiteBuilderClientAction.prototype, {
      */
     get testMode() {
         return true;
-    }
-});
\ No newline at end of file
+    },
+});
diff --git a/addons/website/static/src/client_actions/website_preview/website_systray_item.js b/addons/website/static/src/client_actions/website_preview/website_systray_item.js
index 62fe89b8ee065..6903fe6ca3508 100644
--- a/addons/website/static/src/client_actions/website_preview/website_systray_item.js
+++ b/addons/website/static/src/client_actions/website_preview/website_systray_item.js
@@ -44,7 +44,8 @@ export class WebsiteSystrayItem extends Component {
 
     get hasEditableRecordInBackend() {
         return (
-            this.website.currentWebsite && this.website.currentWebsite.metadata.editableInBackend
+            this.website.currentWebsite &&
+            this.website.currentWebsite.metadata.editableInBackend &&
             // TODO the functional desire is to have read access on all
             // "website" models for all internal users, but there are many
             // fields preventing that... to review in master (should views just
@@ -53,11 +54,11 @@ export class WebsiteSystrayItem extends Component {
             // known to lead to access rights lock. At least, list views are
             // accessible at the moment.
             // See WEBSITE_RECORDS_VIEWS_ACCESS_RIGHTS.
-            && (
-                !this.website.currentWebsite.metadata.mainObject
-                || !['event.event', 'hr.job'].includes(this.website.currentWebsite.metadata.mainObject.model)
-                || this.website.currentWebsite.metadata.canPublish
-            )
+            (!this.website.currentWebsite.metadata.mainObject ||
+                !["event.event", "hr.job"].includes(
+                    this.website.currentWebsite.metadata.mainObject.model
+                ) ||
+                this.website.currentWebsite.metadata.canPublish)
         );
     }
 
diff --git a/addons/website/static/src/components/autocomplete_with_pages/url_autocomplete.js b/addons/website/static/src/components/autocomplete_with_pages/url_autocomplete.js
index 0832f3842e64b..90d7f68a8a57c 100644
--- a/addons/website/static/src/components/autocomplete_with_pages/url_autocomplete.js
+++ b/addons/website/static/src/components/autocomplete_with_pages/url_autocomplete.js
@@ -23,7 +23,7 @@ export class UrlAutoComplete extends Component {
         for (const key in this.props.options?.classes) {
             classList.push(key, this.props.options.classes[key]);
         }
-        return classList.join(" ")
+        return classList.join(" ");
     }
 
     get dropdownOptions() {
diff --git a/addons/website/static/src/components/burger_menu/burger_menu.js b/addons/website/static/src/components/burger_menu/burger_menu.js
index f68e3848cfd3a..3225116eaca59 100644
--- a/addons/website/static/src/components/burger_menu/burger_menu.js
+++ b/addons/website/static/src/components/burger_menu/burger_menu.js
@@ -1,17 +1,21 @@
-import { BurgerMenu } from '@web/webclient/burger_menu/burger_menu';
-import { useService } from '@web/core/utils/hooks';
+import { BurgerMenu } from "@web/webclient/burger_menu/burger_menu";
+import { useService } from "@web/core/utils/hooks";
 import { registry } from "@web/core/registry";
 import { patch } from "@web/core/utils/patch";
 
-const websiteSystrayRegistry = registry.category('website_systray');
+const websiteSystrayRegistry = registry.category("website_systray");
 
 patch(BurgerMenu.prototype, {
     setup() {
         super.setup();
-        this.websiteCustomMenus = useService('website_custom_menus');
+        this.websiteCustomMenus = useService("website_custom_menus");
 
-        if (!websiteSystrayRegistry.contains('burger_menu')) {
-            websiteSystrayRegistry.add('burger_menu', registry.category('systray').get('burger_menu'), {sequence: 0});
+        if (!websiteSystrayRegistry.contains("burger_menu")) {
+            websiteSystrayRegistry.add(
+                "burger_menu",
+                registry.category("systray").get("burger_menu"),
+                { sequence: 0 }
+            );
         }
     },
 
@@ -20,8 +24,10 @@ patch(BurgerMenu.prototype, {
      */
     get currentAppSections() {
         const currentAppSections = super.currentAppSections;
-        if (this.currentApp && this.currentApp.xmlid === 'website.menu_website_configuration') {
-            return this.websiteCustomMenus.addCustomMenus(currentAppSections).filter(section => section.childrenTree.length);
+        if (this.currentApp && this.currentApp.xmlid === "website.menu_website_configuration") {
+            return this.websiteCustomMenus
+                .addCustomMenus(currentAppSections)
+                .filter((section) => section.childrenTree.length);
         }
         return currentAppSections;
     },
diff --git a/addons/website/static/src/components/dialog/add_page_dialog.js b/addons/website/static/src/components/dialog/add_page_dialog.js
index 7b5ee31c43f7c..dd894c0acef00 100644
--- a/addons/website/static/src/components/dialog/add_page_dialog.js
+++ b/addons/website/static/src/components/dialog/add_page_dialog.js
@@ -2,10 +2,10 @@ import { isBrowserFirefox } from "@web/core/browser/feature_detection";
 import { getActiveHotkey } from "@web/core/hotkeys/hotkey_service";
 import { rpc } from "@web/core/network/rpc";
 import { renderToElement } from "@web/core/utils/render";
-import { useAutofocus, useService } from '@web/core/utils/hooks';
+import { useAutofocus, useService } from "@web/core/utils/hooks";
 import { _t } from "@web/core/l10n/translation";
-import { WebsiteDialog } from '@website/components/dialog/dialog';
-import { Switch } from '@html_editor/components/switch/switch';
+import { WebsiteDialog } from "@website/components/dialog/dialog";
+import { Switch } from "@html_editor/components/switch/switch";
 import {
     applyTextHighlight,
     removeTextHighlight,
@@ -115,7 +115,7 @@ class AddPageTemplatePreview extends Component {
             if (isFirefox) {
                 // Make sure empty preview iframe is loaded.
                 // This event is never triggered on Chrome.
-                await new Promise(resolve => {
+                await new Promise((resolve) => {
                     iframeEl.contentDocument.body.onload = resolve;
                 });
             }
@@ -131,7 +131,7 @@ class AddPageTemplatePreview extends Component {
             // Adjust styles.
             const styleEl = document.createElement("style");
             // Does not work with fit-content in Firefox.
-            const carouselHeight = isFirefox ? '450px' : 'fit-content';
+            const carouselHeight = isFirefox ? "450px" : "fit-content";
             // Prevent successive resizes.
             const fullHeight = getComputedStyle(document.querySelector(".o_action_manager")).height;
             const halfHeight = `${Math.round(parseInt(fullHeight) / 2)}px`;
@@ -187,7 +187,10 @@ class AddPageTemplatePreview extends Component {
             wrapwrapEl.id = "wrapwrap";
             wrapwrapEl.appendChild(mainEl);
             iframeEl.contentDocument.body.appendChild(wrapwrapEl);
-            const templateDocument = new DOMParser().parseFromString(this.props.template.template, "text/html");
+            const templateDocument = new DOMParser().parseFromString(
+                this.props.template.template,
+                "text/html"
+            );
             const wrapEl = templateDocument.getElementById("wrap");
             mainEl.appendChild(wrapEl);
             // Make image loading eager.
@@ -227,7 +230,8 @@ class AddPageTemplatePreview extends Component {
             if (this.props.isCustom) {
                 this.adaptCustomTemplate(wrapEl);
             }
-            for (const textEl of iframeEl.contentDocument?.querySelectorAll(".o_text_highlight") || []) {
+            for (const textEl of iframeEl.contentDocument?.querySelectorAll(".o_text_highlight") ||
+                []) {
                 for (const elToObserve of getObservedEls(textEl)) {
                     this.resizeObserver.observe(elToObserve);
                 }
@@ -236,9 +240,11 @@ class AddPageTemplatePreview extends Component {
     }
 
     adaptCustomTemplate(wrapEl) {
-        for (const sectionEl of wrapEl.querySelectorAll("section:not(.o_snippet_desktop_invisible)")) {
+        for (const sectionEl of wrapEl.querySelectorAll(
+            "section:not(.o_snippet_desktop_invisible)"
+        )) {
             const style = window.getComputedStyle(sectionEl);
-            if (!style.height || style.display === 'none') {
+            if (!style.height || style.display === "none") {
                 const messageEl = renderToElement("website.AddPageTemplatePreviewDynamicMessage", {
                     message: _t(
                         "No preview for the %s block because it is dynamically rendered.",
@@ -256,7 +262,9 @@ class AddPageTemplatePreview extends Component {
         }
         const wrapEl = this.iframeRef.el.contentDocument.getElementById("wrap").cloneNode(true);
         const templateId = this.props.template.key;
-        for (const previewEl of wrapEl.querySelectorAll(".o_new_page_snippet_preview, .s_dialog_preview")) {
+        for (const previewEl of wrapEl.querySelectorAll(
+            ".o_new_page_snippet_preview, .s_dialog_preview"
+        )) {
             previewEl.remove();
         }
         this.resizeObserver.disconnect();
@@ -265,7 +273,11 @@ class AddPageTemplatePreview extends Component {
         for (const textHighlightEl of wrapEl.querySelectorAll(".o_text_highlight")) {
             removeTextHighlight(textHighlightEl);
         }
-        this.env.addPage(wrapEl.innerHTML, this.props.template.name && _t("Copy of %s", this.props.template.name), templateId);
+        this.env.addPage(
+            wrapEl.innerHTML,
+            this.props.template.name && _t("Copy of %s", this.props.template.name),
+            templateId
+        );
     }
 }
 
@@ -318,22 +330,24 @@ class AddPageTemplates extends Component {
         useAutofocus();
 
         this.state = useState({
-            pages: [{
-                Component: AddPageTemplatePreviews,
-                title: _t("Loading..."),
-                isPreloading: true,
-                props: {
-                    id: "basic",
-                    title: _t("Basic"),
-                    // Blank and 5 preloading boxes.
-                    templates: [{ isBlank: true }, {}, {}, {}, {}, {}],
+            pages: [
+                {
+                    Component: AddPageTemplatePreviews,
+                    title: _t("Loading..."),
+                    isPreloading: true,
+                    props: {
+                        id: "basic",
+                        title: _t("Basic"),
+                        // Blank and 5 preloading boxes.
+                        templates: [{ isBlank: true }, {}, {}, {}, {}, {}],
+                    },
                 },
-            }],
+            ],
         });
         this.pages = undefined;
 
         onWillStart(() => {
-            this.preparePages().then(pages => {
+            this.preparePages().then((pages) => {
                 this.state.pages = pages;
             });
         });
@@ -342,7 +356,11 @@ class AddPageTemplates extends Component {
     async preparePages() {
         // Fetch templates without client-side caching to reflect recent changes
         // to custom templates within the same session.
-        const loadTemplates = rpc("/website/get_new_page_templates", { context: { website_id: this.website.currentWebsiteId}}, { silent: true });
+        const loadTemplates = rpc(
+            "/website/get_new_page_templates",
+            { context: { website_id: this.website.currentWebsiteId } },
+            { silent: true }
+        );
 
         // Forces the correct website if needed before fetching the templates.
         // Displaying the correct images in the previews also relies on the
@@ -448,16 +466,17 @@ export class AddPageDialog extends Component {
 
         this.primaryTitle = _t("Create");
         this.switchLabel = _t("Add to menu");
-        this.website = useService('website');
+        this.website = useService("website");
         this.dialogs = useService("dialog");
-        this.http = useService('http');
-        this.action = useService('action');
+        this.http = useService("http");
+        this.action = useService("action");
 
         this.cssLinkEls = undefined;
         this.lastTabName = "";
 
         useSubEnv({
-            addPage: (sectionsArch, name, templateId) => this.addPage(sectionsArch, name, templateId),
+            addPage: (sectionsArch, name, templateId) =>
+                this.addPage(sectionsArch, name, templateId),
             getCssLinkEls: () => this.getCssLinkEls(),
         });
     }
@@ -488,23 +507,27 @@ export class AddPageDialog extends Component {
         const data = await this.http.post(`/website/add/${encodeURIComponent(pageName)}`, {
             // Needed to be passed as a (falsy) string because false would be
             // converted to 'false' with a POST.
-            'sections_arch': sectionsArch || '',
-            'add_menu': addMenu || '',
+            sections_arch: sectionsArch || "",
+            add_menu: addMenu || "",
 
-            'website_id': this.props.websiteId,
-            'csrf_token': odoo.csrf_token,
-            'page_title': pageTitle,
+            website_id: this.props.websiteId,
+            csrf_token: odoo.csrf_token,
+            page_title: pageTitle,
         });
         if (data.view_id) {
             this.action.doAction({
-                'res_model': 'ir.ui.view',
-                'res_id': data.view_id,
-                'views': [[false, 'form']],
-                'type': 'ir.actions.act_window',
-                'view_mode': 'form',
+                res_model: "ir.ui.view",
+                res_id: data.view_id,
+                views: [[false, "form"]],
+                type: "ir.actions.act_window",
+                view_mode: "form",
             });
         } else if (this.props.goToPage) {
-            this.website.goToWebsite({path: data.url, edition: true, websiteId: this.props.websiteId});
+            this.website.goToWebsite({
+                path: data.url,
+                edition: true,
+                websiteId: this.props.websiteId,
+            });
         }
         this.props.onAddPage();
         this.props.close();
@@ -514,16 +537,20 @@ export class AddPageDialog extends Component {
         if (!this.cssLinkEls) {
             this.cssLinkEls = new Promise((resolve) => {
                 const container = document.querySelector(".o_website_preview .o_iframe_container");
-                const iframe = container?.querySelector('iframe:not([src="/website/iframefallback"])');
+                const iframe = container?.querySelector(
+                    'iframe:not([src="/website/iframefallback"])'
+                );
                 if (iframe?.contentDocument.body.getAttribute("is-ready") === "true") {
                     // If there is a fully loaded website preview, use it.
                     resolve(iframe.contentDocument.head.querySelectorAll("link[type='text/css']"));
                 } else {
                     // If there is no website preview or it was not ready yet, fetch page.
-                    this.http.get(`/website/force/${this.props.websiteId}?path=/`, "text").then(html => {
-                        const doc = new DOMParser().parseFromString(html, "text/html");
-                        resolve(doc.head.querySelectorAll("link[type='text/css']"));
-                    });
+                    this.http
+                        .get(`/website/force/${this.props.websiteId}?path=/`, "text")
+                        .then((html) => {
+                            const doc = new DOMParser().parseFromString(html, "text/html");
+                            resolve(doc.head.querySelectorAll("link[type='text/css']"));
+                        });
                 }
             });
         }
diff --git a/addons/website/static/src/components/dialog/dialog.js b/addons/website/static/src/components/dialog/dialog.js
index 662152b10a92a..861572e2bea5c 100644
--- a/addons/website/static/src/components/dialog/dialog.js
+++ b/addons/website/static/src/components/dialog/dialog.js
@@ -1,4 +1,4 @@
-import { Dialog } from '@web/core/dialog/dialog';
+import { Dialog } from "@web/core/dialog/dialog";
 import { _t } from "@web/core/l10n/translation";
 import { useChildRef } from "@web/core/utils/hooks";
 import { useState, Component } from "@odoo/owl";
@@ -61,11 +61,11 @@ export class WebsiteDialog extends Component {
                 return this.props.close();
             }
             this.state.disabled = false;
-        }
+        };
     }
 
     get contentClasses() {
-        const websiteDialogClass = 'o_website_dialog';
+        const websiteDialogClass = "o_website_dialog";
         if (this.props.contentClass) {
             return `${websiteDialogClass} ${this.props.contentClass}`;
         }
diff --git a/addons/website/static/src/components/dialog/edit_menu.js b/addons/website/static/src/components/dialog/edit_menu.js
index 34c0fb3ce7853..cb07438224931 100644
--- a/addons/website/static/src/components/dialog/edit_menu.js
+++ b/addons/website/static/src/components/dialog/edit_menu.js
@@ -1,15 +1,8 @@
-import { useService, useAutofocus } from '@web/core/utils/hooks';
+import { useService, useAutofocus } from "@web/core/utils/hooks";
 import { useNestedSortable } from "@web/core/utils/nested_sortable";
-import wUtils from '@website/js/utils';
-import { WebsiteDialog } from './dialog';
-import {
-    Component,
-    useState,
-    useEffect,
-    onWillStart,
-    useRef,
-    onMounted,
-} from "@odoo/owl";
+import wUtils from "@website/js/utils";
+import { WebsiteDialog } from "./dialog";
+import { Component, useState, useEffect, onWillStart, useRef, onMounted } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
 import { rpc } from "@web/core/network/rpc";
 import { isEmail } from "@web/core/utils/strings";
@@ -41,17 +34,18 @@ const isPageNotFound = (url, allPages) => {
     // Ensure the URL starts with "/".
     relativeUrl = relativeUrl.startsWith("/") ? relativeUrl : "/" + relativeUrl;
     // Remove trailing slash if it's not the root "/".
-    relativeUrl = relativeUrl.endsWith("/") && relativeUrl !== "/" ? relativeUrl.slice(0, -1) : relativeUrl;
+    relativeUrl =
+        relativeUrl.endsWith("/") && relativeUrl !== "/" ? relativeUrl.slice(0, -1) : relativeUrl;
     // Check if the page exists.
     return !allPages.includes(relativeUrl);
-}
+};
 
 const toRelativeIfSameDomain = (url) => {
     // Remove domain from url to keep only the relative path if same domain.
     const urlObj = new URL(url);
     const isSameDomain = isAbsoluteURLInCurrentDomain(url, this.env);
     return isSameDomain ? url.replace(urlObj.origin, "") : url;
-}
+};
 
 const getAllPages = async () => {
     const res = await rpc("/website/get_suggested_links", {
@@ -59,9 +53,9 @@ const getAllPages = async () => {
         limit: "no_limit",
     });
     const allPages = res.matching_pages.map((page) => page.value);
-    allPages.push(...res.others.flatMap(o => o.values?.map(v => v.value) || []));
+    allPages.push(...res.others.flatMap((o) => o.values?.map((v) => v.value) || []));
     return allPages;
-}
+};
 
 export class MenuDialog extends Component {
     static template = "website.MenuDialog";
@@ -76,11 +70,11 @@ export class MenuDialog extends Component {
     };
 
     setup() {
-        this.website = useService('website');
+        this.website = useService("website");
         this.title = this.props.isMegaMenu ? _t("Mega menu item") : _t("Menu item");
         useAutofocus();
 
-        this.urlInputRef = useRef('url-input');
+        this.urlInputRef = useRef("url-input");
         this.urlInputEdited = !!this.props.url;
 
         this.state = useState({
@@ -93,37 +87,46 @@ export class MenuDialog extends Component {
 
         onWillStart(async () => {
             if (!this.props.isMegaMenu) {
-                this.allPages = this.props.allPages || await getAllPages();
+                this.allPages = this.props.allPages || (await getAllPages());
             }
         });
 
-        useEffect((input) => {
-            if (!input) {
-                return;
-            }
-            const options = {
-                body: this.website.pageDocument.body,
-                position: "bottom-fit",
-                classes: {
-                    'ui-autocomplete': 'o_edit_menu_autocomplete'
-                },
-                urlChosen: () => {
-                    this.state.url = input.value;
-                    this.state.pageNotFound = false;
-                },
-            };
-            const unmountAutocompleteWithPages = wUtils.autocompleteWithPages(input, options, this.env);
-            return () => unmountAutocompleteWithPages();
-        }, () => [this.urlInputRef.el]);
+        useEffect(
+            (input) => {
+                if (!input) {
+                    return;
+                }
+                const options = {
+                    body: this.website.pageDocument.body,
+                    position: "bottom-fit",
+                    classes: {
+                        "ui-autocomplete": "o_edit_menu_autocomplete",
+                    },
+                    urlChosen: () => {
+                        this.state.url = input.value;
+                        this.state.pageNotFound = false;
+                    },
+                };
+                const unmountAutocompleteWithPages = wUtils.autocompleteWithPages(
+                    input,
+                    options,
+                    this.env
+                );
+                return () => unmountAutocompleteWithPages();
+            },
+            () => [this.urlInputRef.el]
+        );
 
-        useEffect(() => {
-            this.state.pageNotFound = isPageNotFound(this.state.url, this.allPages);
-        }, () => [this.state.url]);
+        useEffect(
+            () => {
+                this.state.pageNotFound = isPageNotFound(this.state.url, this.allPages);
+            },
+            () => [this.state.url]
+        );
 
         onMounted(() => {
             if (!this.props.isMegaMenu) {
-                this.state.pageNotFound =
-                    isPageNotFound(this.urlInputRef.el.value, this.allPages);
+                this.state.pageNotFound = isPageNotFound(this.urlInputRef.el.value, this.allPages);
             }
         });
     }
@@ -177,11 +180,11 @@ class MenuRow extends Component {
     };
 
     edit() {
-        this.props.edit(this.props.menu.fields['id']);
+        this.props.edit(this.props.menu.fields["id"]);
     }
 
     delete() {
-        this.props.delete(this.props.menu.fields['id']);
+        this.props.delete(this.props.menu.fields["id"]);
     }
 
     createPage() {
@@ -198,19 +201,19 @@ export class EditMenuDialog extends Component {
     static props = ["rootID?", "close", "save?"];
 
     setup() {
-        this.orm = useService('orm');
-        this.website = useService('website');
-        this.dialogs = useService('dialog');
+        this.orm = useService("orm");
+        this.website = useService("website");
+        this.dialogs = useService("dialog");
 
-        this.menuEditor = useRef('menu-editor');
+        this.menuEditor = useRef("menu-editor");
 
         this.state = useState({ rootMenu: {} });
 
         onWillStart(async () => {
             this.allPages = await getAllPages();
             const menu = await this.orm.call(
-                'website.menu',
-                'get_tree',
+                "website.menu",
+                "get_tree",
                 [this.website.currentWebsite.id, this.props.rootID],
                 { context: { lang: this.website.currentWebsite.metadata.lang } }
             );
@@ -234,21 +237,19 @@ export class EditMenuDialog extends Component {
              * @param {DOMElement} parent - parent element of where the element was moved
              * @param {DOMElement} placeholder - hint element showing the current position
              */
-            onMove: ({element, placeholder, parent}) => {
+            onMove: ({ element, placeholder, parent }) => {
                 // Adapt the dragged menu item to match the width and position
                 // of the placeholder.
                 element.style.width = getComputedStyle(placeholder).width;
                 element.style.marginLeft =
-                    parent && (element.parentElement === this.menuEditor.el)
-                    ? "2rem"
-                    : "";
+                    parent && element.parentElement === this.menuEditor.el ? "2rem" : "";
             },
             preventDrag: (el) => el.querySelector(":scope > button"),
         });
     }
 
     populate(map, menu) {
-        map.set(menu.fields['id'], menu);
+        map.set(menu.fields["id"], menu);
         for (const submenu of menu.children) {
             this.populate(map, submenu);
         }
@@ -256,8 +257,7 @@ export class EditMenuDialog extends Component {
 
     markPageNotFound(menu) {
         for (const menuItem of menu.children) {
-            menuItem.page_not_found =
-                isPageNotFound(menuItem.fields["url"], this.allPages);
+            menuItem.page_not_found = isPageNotFound(menuItem.fields["url"], this.allPages);
             if (menuItem.children) {
                 this.markPageNotFound(menuItem);
             }
@@ -267,7 +267,11 @@ export class EditMenuDialog extends Component {
     _isAllowedMove(current, elementSelector) {
         const currentIsMegaMenu = current.element.dataset.isMegaMenu === "true";
         if (!currentIsMegaMenu) {
-            return current.placeHolder.parentNode.closest(`${elementSelector}[data-is-mega-menu="true"]`) === null;
+            return (
+                current.placeHolder.parentNode.closest(
+                    `${elementSelector}[data-is-mega-menu="true"]`
+                ) === null
+            );
         }
         const isDropOnRoot = current.placeHolder.parentNode.closest(elementSelector) === null;
         return currentIsMegaMenu && isDropOnRoot;
@@ -284,14 +288,16 @@ export class EditMenuDialog extends Component {
         const menu = this.map.get(menuId);
 
         // Remove element from parent's children (since we are moving it, this is the mandatory first step)
-        const parentId = menu.fields['parent_id'] || this.state.rootMenu.fields['id'];
+        const parentId = menu.fields["parent_id"] || this.state.rootMenu.fields["id"];
         let parentMenu = this.map.get(parentId);
-        parentMenu.children = parentMenu.children.filter((m) => m.fields['id'] !== menuId);
+        parentMenu.children = parentMenu.children.filter((m) => m.fields["id"] !== menuId);
 
         // Determine next parent
-        const menuParentId = parent ? this._getMenuIdForElement(parent.closest("li")) : this.state.rootMenu.fields['id'];
+        const menuParentId = parent
+            ? this._getMenuIdForElement(parent.closest("li"))
+            : this.state.rootMenu.fields["id"];
         parentMenu = this.map.get(menuParentId);
-        menu.fields['parent_id'] = parentMenu.fields['id'];
+        menu.fields["parent_id"] = parentMenu.fields["id"];
 
         // Determine at which position we should place the element
         if (previous) {
@@ -311,16 +317,16 @@ export class EditMenuDialog extends Component {
             save: (name, url, pageNotFound, isNewWindow) => {
                 const newMenu = {
                     fields: {
-                        id: `menu_${(new Date).toISOString()}`,
+                        id: `menu_${new Date().toISOString()}`,
                         name,
-                        url: isMegaMenu || !url ? '#' : url,
+                        url: isMegaMenu || !url ? "#" : url,
                         new_window: isNewWindow,
-                        'is_mega_menu': isMegaMenu,
+                        is_mega_menu: isMegaMenu,
                         sequence: 0,
-                        'parent_id': false,
+                        parent_id: false,
                     },
-                    'children': [],
-                    'page_not_found': pageNotFound,
+                    children: [],
+                    page_not_found: pageNotFound,
                 };
                 this.state.rootMenu.children.push(newMenu);
                 // this.state.rootMenu.children.at(-1) to forces a rerender
@@ -332,12 +338,12 @@ export class EditMenuDialog extends Component {
     editMenu(id) {
         const menuToEdit = this.map.get(id);
         this.dialogs.add(MenuDialog, {
-            name: menuToEdit.fields['name'],
-            url: menuToEdit.fields['url'],
-            isMegaMenu: menuToEdit.fields['is_mega_menu'],
+            name: menuToEdit.fields["name"],
+            url: menuToEdit.fields["url"],
+            isMegaMenu: menuToEdit.fields["is_mega_menu"],
             allPages: this.allPages,
             save: (name, url, pageNotFound) => {
-                menuToEdit.fields['name'] = name;
+                menuToEdit.fields["name"] = name;
                 menuToEdit.fields["url"] = url || "#";
                 menuToEdit.page_not_found = pageNotFound;
             },
@@ -352,9 +358,9 @@ export class EditMenuDialog extends Component {
             this.deleteMenu(child.fields.id);
         }
 
-        const parentId = menuToDelete.fields['parent_id'] || this.state.rootMenu.fields['id'];
+        const parentId = menuToDelete.fields["parent_id"] || this.state.rootMenu.fields["id"];
         const parent = this.map.get(parentId);
-        parent.children = parent.children.filter(menu => menu.fields['id'] !== id);
+        parent.children = parent.children.filter((menu) => menu.fields["id"] !== id);
         this.map.delete(id);
         if (parseInt(id)) {
             this.toDelete.push(id);
@@ -364,24 +370,30 @@ export class EditMenuDialog extends Component {
     async onClickSave(goToWebsite = true, url) {
         const data = [];
         this.map.forEach((menu, id) => {
-            if (this.state.rootMenu.fields['id'] !== id) {
+            if (this.state.rootMenu.fields["id"] !== id) {
                 const menuFields = menu.fields;
-                const parentId = menuFields.parent_id || this.state.rootMenu.fields['id'];
+                const parentId = menuFields.parent_id || this.state.rootMenu.fields["id"];
                 const parentMenu = this.map.get(parentId);
-                menuFields['sequence'] = parentMenu.children.findIndex(m => m.fields['id'] === id);
-                menuFields['parent_id'] = parentId;
+                menuFields["sequence"] = parentMenu.children.findIndex(
+                    (m) => m.fields["id"] === id
+                );
+                menuFields["parent_id"] = parentId;
                 data.push(menuFields);
             }
         });
 
-        await this.orm.call('website.menu', 'save', [
-            this.website.currentWebsite.id,
-            {
-                'data': data,
-                'to_delete': this.toDelete,
-            }
-        ],
-        { context: { lang: this.website.currentWebsite.metadata.lang } });
+        await this.orm.call(
+            "website.menu",
+            "save",
+            [
+                this.website.currentWebsite.id,
+                {
+                    data: data,
+                    to_delete: this.toDelete,
+                },
+            ],
+            { context: { lang: this.website.currentWebsite.metadata.lang } }
+        );
         if (this.props.save) {
             this.props.save(url);
         } else if (goToWebsite) {
diff --git a/addons/website/static/src/components/dialog/page_properties.js b/addons/website/static/src/components/dialog/page_properties.js
index 8ec329b63602c..a3a1e0b686d35 100644
--- a/addons/website/static/src/components/dialog/page_properties.js
+++ b/addons/website/static/src/components/dialog/page_properties.js
@@ -1,14 +1,14 @@
-import {CheckBox} from '@web/core/checkbox/checkbox';
+import { CheckBox } from "@web/core/checkbox/checkbox";
 import { _t } from "@web/core/l10n/translation";
-import {useService, useAutofocus} from "@web/core/utils/hooks";
-import {sprintf} from "@web/core/utils/strings";
-import {WebsiteDialog} from './dialog';
+import { useService, useAutofocus } from "@web/core/utils/hooks";
+import { sprintf } from "@web/core/utils/strings";
+import { WebsiteDialog } from "./dialog";
 import { standardFieldProps } from "@web/views/fields/standard_field_props";
-import {FormViewDialog} from "@web/views/view_dialogs/form_view_dialog";
-import { formView } from '@web/views/form/form_view';
+import { FormViewDialog } from "@web/views/view_dialogs/form_view_dialog";
+import { formView } from "@web/views/form/form_view";
 import { renderToFragment } from "@web/core/utils/render";
 import { Component, onWillDestroy, useEffect, useRef, useState, xml } from "@odoo/owl";
-import { FormController } from '@web/views/form/form_controller';
+import { FormController } from "@web/views/form/form_controller";
 import { registry } from "@web/core/registry";
 
 export class PageDependencies extends Component {
@@ -28,9 +28,9 @@ export class PageDependencies extends Component {
 
     setup() {
         super.setup();
-        this.orm = useService('orm');
+        this.orm = useService("orm");
 
-        this.action = useRef('action');
+        this.action = useRef("action");
         this.sprintf = sprintf;
 
         useEffect(
@@ -53,24 +53,22 @@ export class PageDependencies extends Component {
     }
 
     async fetchDependencies() {
-        this.state.dependencies = await this.orm.call(
-            'website',
-            'search_url_dependencies',
-            [this.props.resModel, await this.getResIds()],
-        );
+        this.state.dependencies = await this.orm.call("website", "search_url_dependencies", [
+            this.props.resModel,
+            await this.getResIds(),
+        ]);
     }
 
     showDependencies() {
         const popover = window.Popover.getOrCreateInstance(this.action.el, {
             title: _t("Dependencies"),
-            boundary: 'viewport',
-            placement: 'right',
-            trigger: 'focus',
-            content: () => {
-                return renderToFragment("website.PageDependencies.Tooltip", {
+            boundary: "viewport",
+            placement: "right",
+            trigger: "focus",
+            content: () =>
+                renderToFragment("website.PageDependencies.Tooltip", {
                     dependencies: this.state.dependencies,
-                });
-            },
+                }),
         });
         popover.toggle();
     }
@@ -106,7 +104,7 @@ export class FormPageDependencies extends PageDependencies {
         const records = await this.orm.read(
             this.props.record.resModel,
             [this.props.record.resId],
-            ["target_model_id"],
+            ["target_model_id"]
         );
         return records.map((record) => record.target_model_id[0]);
     }
@@ -142,7 +140,7 @@ export class DeletePageDialog extends Component {
     };
 
     setup() {
-        this.website = useService('website');
+        this.website = useService("website");
 
         this.state = useState({
             confirm: false,
@@ -169,12 +167,12 @@ export class DuplicatePageDialog extends Component {
     };
 
     setup() {
-        this.orm = useService('orm');
-        this.website = useService('website');
+        this.orm = useService("orm");
+        this.website = useService("website");
         useAutofocus();
 
         this.state = useState({
-            name: '',
+            name: "",
         });
     }
 
@@ -183,11 +181,12 @@ export class DuplicatePageDialog extends Component {
         if (this.state.name) {
             for (let count = 0; count < this.props.pageIds.length; count++) {
                 const name = this.state.name + (count ? ` ${count + 1}` : "");
-                duplicates.push(await this.orm.call(
-                    'website.page',
-                    'clone_page',
-                    [this.props.pageIds[count], name]
-                ));
+                duplicates.push(
+                    await this.orm.call("website.page", "clone_page", [
+                        this.props.pageIds[count],
+                        name,
+                    ])
+                );
             }
         }
         this.props.onDuplicate(duplicates);
@@ -223,9 +222,9 @@ export class PagePropertiesDialog extends FormViewDialog {
 
     setup() {
         super.setup();
-        this.dialog = useService('dialog');
-        this.orm = useService('orm');
-        this.website = useService('website');
+        this.dialog = useService("dialog");
+        this.orm = useService("orm");
+        this.website = useService("website");
 
         this.viewProps = {
             ...this.viewProps,
@@ -237,7 +236,7 @@ export class PagePropertiesDialog extends FormViewDialog {
                         ? "website.website_page_properties_view_form"
                         : "website.website_page_properties_base_view_form",
                 },
-                this.viewProps.context,
+                this.viewProps.context
             ),
             ...(this.isPage
                 ? {
@@ -285,13 +284,15 @@ export class PagePropertiesDialog extends FormViewDialog {
 
     async deletePage() {
         const pageIds = [this.targetId];
-        const newPageTemplateFields = await this.orm.read("website.page", pageIds, ["is_new_page_template"]);
+        const newPageTemplateFields = await this.orm.read("website.page", pageIds, [
+            "is_new_page_template",
+        ]);
         this.dialog.add(DeletePageDialog, {
             resIds: pageIds,
-            resModel: 'website.page',
+            resModel: "website.page",
             onDelete: async () => {
                 await this.orm.unlink("website.page", pageIds);
-                this.website.goToWebsite({path: '/'});
+                this.website.goToWebsite({ path: "/" });
                 this.props.close();
                 this.props.onClose();
             },
diff --git a/addons/website/static/src/components/dialog/seo.js b/addons/website/static/src/components/dialog/seo.js
index 5a1658369f7c3..f6c3b905ecdba 100644
--- a/addons/website/static/src/components/dialog/seo.js
+++ b/addons/website/static/src/components/dialog/seo.js
@@ -4,25 +4,34 @@ import { pyToJsLocale, jsToPyLocale } from "@web/core/l10n/utils";
 import { htmlToTextContentInline } from "@mail/utils/common/format";
 import { rpc } from "@web/core/network/rpc";
 import { escapeRegExp } from "@web/core/utils/strings";
-import { useService, useAutofocus } from '@web/core/utils/hooks';
+import { useService, useAutofocus } from "@web/core/utils/hooks";
 import { isVisible } from "@web/core/utils/ui";
-import { CheckBox } from '@web/core/checkbox/checkbox';
+import { CheckBox } from "@web/core/checkbox/checkbox";
 import { MediaDialog } from "@html_editor/main/media/media_dialog/media_dialog";
-import { WebsiteDialog } from './dialog';
-import { Component, onMounted, onWillStart, reactive, useEffect, useState, useRef } from "@odoo/owl";
+import { WebsiteDialog } from "./dialog";
+import {
+    Component,
+    onMounted,
+    onWillStart,
+    reactive,
+    useEffect,
+    useState,
+    useRef,
+} from "@odoo/owl";
 import wUtils from "@website/js/utils";
 
 // This replaces \b, because accents(e.g. à, é) are not seen as word boundaries.
 // Javascript \b is not unicode aware, and words beginning or ending by accents won't match \b
-const WORD_SEPARATORS_REGEX = '([\\u2000-\\u206F\\u2E00-\\u2E7F\'!"#\\$%&\\(\\)\\*\\+,\\-\\.\\/:;<=>\\?¿¡@\\[\\]\\^_`\\{\\|\\}~\\s]+|^|$)';
+const WORD_SEPARATORS_REGEX =
+    "([\\u2000-\\u206F\\u2E00-\\u2E7F'!\"#\\$%&\\(\\)\\*\\+,\\-\\.\\/:;<=>\\?¿¡@\\[\\]\\^_`\\{\\|\\}~\\s]+|^|$)";
 
 const seoContext = reactive({
-    description: '',
+    description: "",
     keywords: [],
-    title: '',
-    seoName: '',
-    metaImage: '',
-    defaultTitle: '',
+    title: "",
+    seoName: "",
+    metaImage: "",
+    defaultTitle: "",
     updatedAlts: [],
     brokenLinks: [],
 });
@@ -194,13 +203,15 @@ class ImageSelector extends Component {
     };
 
     setup() {
-        this.website = useService('website');
-        this.dialogs = useService('dialog');
+        this.website = useService("website");
+        this.dialogs = useService("dialog");
 
         this.seoContext = useState(seoContext);
 
-        const firstImageId = this.props.hasSocialDefaultImage ? 'social_default_image' : 'logo';
-        const firstImageSrc = `/web/image/website/${encodeURIComponent(this.website.currentWebsite.id)}/${firstImageId}`;
+        const firstImageId = this.props.hasSocialDefaultImage ? "social_default_image" : "logo";
+        const firstImageSrc = `/web/image/website/${encodeURIComponent(
+            this.website.currentWebsite.id
+        )}/${firstImageId}`;
         const firstImage = {
             src: firstImageSrc,
             active: this.areSameImages(firstImageSrc, this.seoContext.metaImage),
@@ -210,17 +221,20 @@ class ImageSelector extends Component {
         this.state = useState({
             images: [
                 firstImage,
-                ...this.props.pageImages.map((src) => {
-                    return {
-                        src,
-                        active: this.areSameImages(src, this.seoContext.metaImage),
-                        custom: false,
-                    };
-                }),
+                ...this.props.pageImages.map((src) => ({
+                    src,
+                    active: this.areSameImages(src, this.seoContext.metaImage),
+                    custom: false,
+                })),
             ],
         });
 
-        if (this.seoContext.metaImage && !this.state.images.map(({src}) => this.getImagePathname(src)).includes(this.getImagePathname(this.seoContext.metaImage))) {
+        if (
+            this.seoContext.metaImage &&
+            !this.state.images
+                .map(({ src }) => this.getImagePathname(src))
+                .includes(this.getImagePathname(this.seoContext.metaImage))
+        ) {
             this.state.images.push({
                 src: this.seoContext.metaImage,
                 active: true,
@@ -234,7 +248,7 @@ class ImageSelector extends Component {
     }
 
     get activeMetaImage() {
-        const activeImage = this.state.images.find(({active}) => active);
+        const activeImage = this.state.images.find(({ active }) => active);
         return activeImage && activeImage.src;
     }
 
@@ -247,7 +261,7 @@ class ImageSelector extends Component {
     }
 
     selectImage(src) {
-        this.state.images = this.state.images.map(img => {
+        this.state.images = this.state.images.map((img) => {
             img.active = img.src === src;
             return img;
         });
@@ -257,12 +271,12 @@ class ImageSelector extends Component {
     openMediaDialog() {
         this.dialogs.add(MediaDialog, {
             onlyImages: true,
-            resModel: 'ir.ui.view',
+            resModel: "ir.ui.view",
             useMediaLibrary: true,
-            save: image => {
+            save: (image) => {
                 let existingImage;
-                const src = image.getAttribute('src');
-                this.state.images = this.state.images.map(img => {
+                const src = image.getAttribute("src");
+                this.state.images = this.state.images.map((img) => {
                     img.active = false;
                     if (img.src === src) {
                         existingImage = img;
@@ -293,7 +307,7 @@ class Keyword extends Component {
     };
 
     setup() {
-        this.website = useService('website');
+        this.website = useService("website");
 
         this.seoContext = useState(seoContext);
 
@@ -325,7 +339,7 @@ class Keyword extends Component {
         };
 
         onMounted(async () => {
-            const suggestions = await rpc('/website/seo_suggest', {
+            const suggestions = await rpc("/website/seo_suggest", {
                 lang: jsToPyLocale(this.props.language),
                 keywords: this.props.keyword,
             });
@@ -334,7 +348,11 @@ class Keyword extends Component {
                 "gi"
             );
             this.state.suggestions = [
-                ...new Set(JSON.parse(suggestions).map((word) => word.replace(regex, "").trim()).filter(Boolean)),
+                ...new Set(
+                    JSON.parse(suggestions)
+                        .map((word) => word.replace(regex, "").trim())
+                        .filter(Boolean)
+                ),
             ];
         });
     }
@@ -347,11 +365,15 @@ class Keyword extends Component {
     }
 
     getGoogleTrendsURL() {
-        return `https://trends.google.com/trends/explore?q=${encodeURIComponent(this.props.keyword)}`;
+        return `https://trends.google.com/trends/explore?q=${encodeURIComponent(
+            this.props.keyword
+        )}`;
     }
 
     getHeaders(tag) {
-        return Array.from(this.website.pageDocument.documentElement.querySelectorAll(`#wrap ${tag}`)).map(header => header.textContent);
+        return Array.from(
+            this.website.pageDocument.documentElement.querySelectorAll(`#wrap ${tag}`)
+        ).map((header) => header.textContent);
     }
 
     getBodyText() {
@@ -359,11 +381,11 @@ class Keyword extends Component {
     }
 
     get usedInH1() {
-        return this.isKeywordIn(this.getHeaders('h1'));
+        return this.isKeywordIn(this.getHeaders("h1"));
     }
 
     get usedInH2() {
-        return this.isKeywordIn(this.getHeaders('h2'));
+        return this.isKeywordIn(this.getHeaders("h2"));
     }
 
     get usedInTitle() {
@@ -387,19 +409,19 @@ class MetaKeywords extends Component {
     static props = {};
 
     setup() {
-        this.website = useService('website');
+        this.website = useService("website");
 
         this.seoContext = useState(seoContext);
 
         this.state = useState({
-            language: '',
-            keyword: '',
+            language: "",
+            keyword: "",
         });
 
         this.maxKeywords = 10;
 
         onWillStart(async () => {
-            this.languages = await rpc('/website/get_languages');
+            this.languages = await rpc("/website/get_languages");
             this.state.language = this.getLanguage();
         });
     }
@@ -429,12 +451,12 @@ class MetaKeywords extends Component {
         keyword = keyword.replaceAll(/,\s*/gi, " ").trim();
         if (keyword && !this.isFull && !this.seoContext.keywords.includes(keyword)) {
             this.seoContext.keywords.push(keyword);
-            this.state.keyword = '';
+            this.state.keyword = "";
         }
     }
 
     removeKeyword(keyword) {
-        this.seoContext.keywords = this.seoContext.keywords.filter(kw => kw !== keyword);
+        this.seoContext.keywords = this.seoContext.keywords.filter((kw) => kw !== keyword);
     }
 }
 
@@ -510,9 +532,11 @@ class SEOPreview extends Component {
 
     get description() {
         if (this.props.description?.length > 160) {
-            return this.props.description.substring(0, 159) + '…';
+            return this.props.description.substring(0, 159) + "…";
         } else if (!this.props.description?.length) {
-            return _t("If you don't write one, the description will be generated by the search engines based on the content of your page.");
+            return _t(
+                "If you don't write one, the description will be generated by the search engines based on the content of your page."
+            );
         }
         return this.props.description || "";
     }
@@ -554,15 +578,21 @@ class TitleDescription extends Component {
         );
 
         // Update the title when its input value changes
-        useEffect(() => {
-            document.title = this.title;
-        }, () => [this.seoContext.title]);
+        useEffect(
+            () => {
+                document.title = this.title;
+            },
+            () => [this.seoContext.title]
+        );
 
         // Restore the original title when unmounting the component
-        useEffect(() => {
-            const initialTitle = document.title;
-            return () => document.title = initialTitle;
-        }, () => []);
+        useEffect(
+            () => {
+                const initialTitle = document.title;
+                return () => (document.title = initialTitle);
+            },
+            () => []
+        );
     }
 
     //--------------------------------------------------------------------------
@@ -647,29 +677,35 @@ export class BrokenLink extends Component {
     };
 
     setup() {
-        this.website = useService('website');
-        this.urlInputRef = useRef('url-input');
+        this.website = useService("website");
+        this.urlInputRef = useRef("url-input");
         this.link = this.props.link;
 
         this.state = useState({
             checkingLink: false,
         });
 
-        useEffect((input) => {
-            if (!input) {
-                return;
-            }
-            const options = {
-                body: this.website.pageDocument.body,
-                position: "bottom-fit",
-                urlChosen: () => {
-                    this.link.newLink = input.value;
-                },
-            };
-            const unmountAutocompleteWithPages =
-                wUtils.autocompleteWithPages(input, options, this.env);
-            return () => unmountAutocompleteWithPages();
-        }, () => [this.urlInputRef.el]);
+        useEffect(
+            (input) => {
+                if (!input) {
+                    return;
+                }
+                const options = {
+                    body: this.website.pageDocument.body,
+                    position: "bottom-fit",
+                    urlChosen: () => {
+                        this.link.newLink = input.value;
+                    },
+                };
+                const unmountAutocompleteWithPages = wUtils.autocompleteWithPages(
+                    input,
+                    options,
+                    this.env
+                );
+                return () => unmountAutocompleteWithPages();
+            },
+            () => [this.urlInputRef.el]
+        );
     }
 
     async modifyLink(link) {
@@ -704,10 +740,12 @@ export class BrokenLink extends Component {
     }
 
     checkButtonDisabled(link) {
-        return this.state.checkingLink
-                || !link.newLink.trim().length
-                || (link.newLink.trim() == link.oldLink)
-                || (link.validLink == link.newLink.trim());
+        return (
+            this.state.checkingLink ||
+            !link.newLink.trim().length ||
+            link.newLink.trim() == link.oldLink ||
+            link.validLink == link.newLink.trim()
+        );
     }
 }
 
@@ -745,7 +783,7 @@ export class SeoChecks extends Component {
 
     imgUpdated(img) {
         img.updated = true;
-        this.seoContext.updatedAlts = this.state.altAttributes.filter(img => img.updated);
+        this.seoContext.updatedAlts = this.state.altAttributes.filter((img) => img.updated);
     }
 
     async getAltAttributes() {
@@ -789,8 +827,9 @@ export class SeoChecks extends Component {
     async getBrokenLinks() {
         this.state.checkingLinks = true;
         this.state.counterLinks = 1;
-        const hrefEls =
-            this.website.pageDocument.documentElement.querySelectorAll("#wrapwrap a[href]:not(.oe_unremovable)");
+        const hrefEls = this.website.pageDocument.documentElement.querySelectorAll(
+            "#wrapwrap a[href]:not(.oe_unremovable)"
+        );
         let links = Array.from(hrefEls)
             .filter((a) => {
                 const href = a.href;
@@ -826,10 +865,11 @@ export class SeoChecks extends Component {
                 } else {
                     const imgLinkEl = el.querySelector("img");
                     if (imgLinkEl?.src) {
-                        label = imgLinkEl.src.split('/').pop();
+                        label = imgLinkEl.src.split("/").pop();
                         isImageLink = true;
                     } else if (el.querySelector(".fa")) {
-                        label = el.ariaLabel || el.title || el.href.split('/').filter(Boolean).pop();
+                        label =
+                            el.ariaLabel || el.title || el.href.split("/").filter(Boolean).pop();
                         isImageLink = true;
                     }
                 }
@@ -846,7 +886,9 @@ export class SeoChecks extends Component {
             .filter(Boolean);
         const seen = new Set();
         links = links.filter((item) => {
-            const key = `${item.link}::${item.res_model || ""}::${item.res_id || ""}::${item.field || ""}`;
+            const key = `${item.link}::${item.res_model || ""}::${item.res_id || ""}::${
+                item.field || ""
+            }`;
             if (seen.has(key)) {
                 return false;
             }
@@ -869,23 +911,19 @@ export class SeoChecks extends Component {
         this.state.checkingLinks = false;
         this.state.checkedLinks = true;
         // Keep links order in the DOM.
-        brokenLinks.sort((a, b) => {
-            return a.position - b.position;
-        });
-        this.seoContext.brokenLinks = brokenLinks.map((link) => {
-            return {
-                oldLink: link.link,
-                newLink: link.link,
-                broken: true,
-                remove: false,
-                res_model: link.res_model,
-                res_id: link.res_id,
-                field: link.field,
-                label: link.label,
-                isImageLink: link.isImageLink,
-                validLink: null,
-            };
-        });
+        brokenLinks.sort((a, b) => a.position - b.position);
+        this.seoContext.brokenLinks = brokenLinks.map((link) => ({
+            oldLink: link.link,
+            newLink: link.link,
+            broken: true,
+            remove: false,
+            res_model: link.res_model,
+            res_id: link.res_id,
+            field: link.field,
+            label: link.label,
+            isImageLink: link.isImageLink,
+            validLink: null,
+        }));
     }
 }
 
@@ -904,13 +942,13 @@ export class OptimizeSEODialog extends Component {
     };
 
     setup() {
-        this.website = useService('website');
-        this.dialogs = useService('dialog');
-        this.orm = useService('orm');
+        this.website = useService("website");
+        this.dialogs = useService("dialog");
+        this.orm = useService("orm");
 
         this.title = _t("Search Engine Optimization");
         this.saveButton = _t("Save");
-        this.size = 'lg';
+        this.size = "lg";
         this.contentClass = "oe_seo_configuration";
 
         onWillStart(async () => {
@@ -918,38 +956,45 @@ export class OptimizeSEODialog extends Component {
                 metadata: { mainObject, seoObject, path },
             } = this.website.currentWebsite;
             this.object = seoObject || mainObject;
-            this.data = await rpc('/website/get_seo_data', {
-                'res_id': this.object.id,
-                'res_model': this.object.model,
+            this.data = await rpc("/website/get_seo_data", {
+                res_id: this.object.id,
+                res_model: this.object.model,
             });
 
             this.canEditSeo = this.data.can_edit_seo;
-            this.canEditDescription = this.canEditSeo && 'website_meta_description' in this.data;
-            this.canEditTitle = this.canEditSeo && 'website_meta_title' in this.data;
-            this.canEditUrl = this.canEditSeo && 'seo_name' in this.data;
+            this.canEditDescription = this.canEditSeo && "website_meta_description" in this.data;
+            this.canEditTitle = this.canEditSeo && "website_meta_title" in this.data;
+            this.canEditUrl = this.canEditSeo && "seo_name" in this.data;
             seoContext.title = this.canEditTitle && this.data.website_meta_title;
 
             // If website.page, hide the google preview & tell user his page is currently unindexed
-            this.isIndexed = 'website_indexed' in this.data ? this.data.website_indexed : true;
-            this.seoNameHelp = _t("This value will be escaped to be compliant with all major browsers and used in url. Keep it empty to use the default name of the record.");
+            this.isIndexed = "website_indexed" in this.data ? this.data.website_indexed : true;
+            this.seoNameHelp = _t(
+                "This value will be escaped to be compliant with all major browsers and used in url. Keep it empty to use the default name of the record."
+            );
             this.previousSeoName = this.canEditUrl && this.data.seo_name;
             seoContext.seoName = this.previousSeoName;
             this.seoNameDefault = this.canEditUrl && this.data.seo_name_default;
 
-            seoContext.description = this.getMeta({ name: 'description' });
-            this.previewDescription = _t("Your page description should be between 50 and 160 characters long.");
+            seoContext.description = this.getMeta({ name: "description" });
+            this.previewDescription = _t(
+                "Your page description should be between 50 and 160 characters long."
+            );
             this.defaultTitle = this.getMeta({ name: "default_title" }) || "";
             seoContext.defaultTitle = this.defaultTitle;
             this.url = path;
 
-            seoContext.metaImage = this.data.website_meta_og_img || this.getMeta({ property: 'og:image' });
+            seoContext.metaImage =
+                this.data.website_meta_og_img || this.getMeta({ property: "og:image" });
 
             this.pageImages = this.getImages();
-            this.socialPreviewDescription = _t("The description will be generated by social media based on page content unless you specify one.");
+            this.socialPreviewDescription = _t(
+                "The description will be generated by social media based on page content unless you specify one."
+            );
             this.hasSocialDefaultImage = this.data.has_social_default_image;
 
-            this.canEditKeywords = 'website_meta_keywords' in this.data;
-            seoContext.keywords = this.getMeta({ name: 'keywords' });
+            this.canEditKeywords = "website_meta_keywords" in this.data;
+            seoContext.keywords = this.getMeta({ name: "keywords" });
         });
     }
 
@@ -958,15 +1003,18 @@ export class OptimizeSEODialog extends Component {
     }
 
     getImages() {
-        const imageEls = this.pageDocumentElement.querySelectorAll('#wrap img');
-        return [...new Set(Array.from(imageEls)
-            .filter(img => img.naturalHeight > 200 && img.naturalWidth > 200)
-            .map(img => img.getAttribute("src"))
-        )];
+        const imageEls = this.pageDocumentElement.querySelectorAll("#wrap img");
+        return [
+            ...new Set(
+                Array.from(imageEls)
+                    .filter((img) => img.naturalHeight > 200 && img.naturalWidth > 200)
+                    .map((img) => img.getAttribute("src"))
+            ),
+        ];
     }
 
     getMeta({ name, property }) {
-        let query = '';
+        let query = "";
         if (name) {
             query = `meta[name="${name}"]`;
         }
@@ -974,10 +1022,10 @@ export class OptimizeSEODialog extends Component {
             query = `meta[property="${property}"]`;
         }
         const el = this.pageDocumentElement.querySelector(query);
-        if (name === 'keywords') {
+        if (name === "keywords") {
             // Keywords might contain spaces which makes them fail the content
             // check. Trim the strings to prevent this from happening.
-            const parsed = el && el.content.split(',').map(kw => kw.trim());
+            const parsed = el && el.content.split(",").map((kw) => kw.trim());
             return parsed && parsed[0] ? [...new Set(parsed)] : [];
         }
         return el && el.content;
@@ -992,7 +1040,7 @@ export class OptimizeSEODialog extends Component {
             data.website_meta_description = seoContext.description;
         }
         if (this.canEditKeywords) {
-            data.website_meta_keywords = seoContext.keywords.join(',');
+            data.website_meta_keywords = seoContext.keywords.join(",");
         }
         if (this.canEditUrl) {
             if (seoContext.seoName !== this.previousSeoName) {
@@ -1003,7 +1051,7 @@ export class OptimizeSEODialog extends Component {
         await this.orm.write(this.object.model, [this.object.id], data, {
             context: {
                 lang: this.website.currentWebsite.metadata.lang,
-                'website_id': this.website.currentWebsite.id,
+                website_id: this.website.currentWebsite.id,
             },
         });
 
diff --git a/addons/website/static/src/components/edit_head_body_dialog/edit_head_body_dialog.js b/addons/website/static/src/components/edit_head_body_dialog/edit_head_body_dialog.js
index 137ec3c8863b6..c0ecad42cd156 100644
--- a/addons/website/static/src/components/edit_head_body_dialog/edit_head_body_dialog.js
+++ b/addons/website/static/src/components/edit_head_body_dialog/edit_head_body_dialog.js
@@ -25,9 +25,10 @@ export class EditHeadBodyDialog extends Component {
         });
 
         onWillStart(async () => {
-            const websites = await this.orm.read("website",
+            const websites = await this.orm.read(
+                "website",
                 [this.website.currentWebsite.id],
-                ["custom_code_head", "custom_code_footer"],
+                ["custom_code_head", "custom_code_footer"]
             );
             const website = websites[0];
             this.state.head = website.custom_code_head || "";
diff --git a/addons/website/static/src/components/fields/fields.js b/addons/website/static/src/components/fields/fields.js
index 6c28ad724e806..12d79f2e3de6b 100644
--- a/addons/website/static/src/components/fields/fields.js
+++ b/addons/website/static/src/components/fields/fields.js
@@ -1,8 +1,8 @@
-import {PageDependencies} from '@website/components/dialog/page_properties';
-import {standardFieldProps} from '@web/views/fields/standard_field_props';
+import { PageDependencies } from "@website/components/dialog/page_properties";
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
 import { UrlField, urlField } from "@web/views/fields/url/url_field";
-import {registry} from '@web/core/registry';
-import { _t } from '@web/core/l10n/translation';
+import { registry } from "@web/core/registry";
+import { _t } from "@web/core/l10n/translation";
 import { Component, useEffect, useRef } from "@odoo/owl";
 
 /**
@@ -39,7 +39,7 @@ class PageUrlField extends UrlField {
                     };
                 }
             },
-            () => [this.inputRef.el],
+            () => [this.inputRef.el]
         );
     }
 
@@ -78,11 +78,12 @@ export class ImageRadioField extends Component {
         const selection = this.props.record.fields[this.props.name].selection;
         // Check if value / label exists for each selection item and add the
         // corresponding image from field options.
-        this.values = selection.filter(item => {
-            return item[0] || item[1];
-        }).map((value, index) => {
-            return [...value, this.props.images && this.props.images[index] || ''];
-        });
+        this.values = selection
+            .filter((item) => item[0] || item[1])
+            .map((value, index) => [
+                ...value,
+                (this.props.images && this.props.images[index]) || "",
+            ]);
     }
 
     /**
@@ -100,10 +101,10 @@ export const imageRadioField = {
             label: _t("Images"),
             name: "images",
             type: "string",
-            help: _t("Use an array to list the images to use in the radio selection.")
-        }
+            help: _t("Use an array to list the images to use in the radio selection."),
+        },
     ],
-    supportedTypes: ['selection'],
+    supportedTypes: ["selection"],
     extractProps: ({ options }) => ({
         images: options.images,
     }),
diff --git a/addons/website/static/src/components/fields/publish_button.js b/addons/website/static/src/components/fields/publish_button.js
index 9b555dcc09614..9b7f8a6eb466d 100644
--- a/addons/website/static/src/components/fields/publish_button.js
+++ b/addons/website/static/src/components/fields/publish_button.js
@@ -4,7 +4,7 @@ import { standardFieldProps } from "@web/views/fields/standard_field_props";
 
 class PublishField extends Component {
     static template = "website.PublishField";
-    static props = {...standardFieldProps};
+    static props = { ...standardFieldProps };
 }
 
 registry.category("fields").add("website_publish_button", {
diff --git a/addons/website/static/src/components/fields/redirect_field.js b/addons/website/static/src/components/fields/redirect_field.js
index dbec2114e1101..4c64824419b0a 100644
--- a/addons/website/static/src/components/fields/redirect_field.js
+++ b/addons/website/static/src/components/fields/redirect_field.js
@@ -6,7 +6,7 @@ import { standardFieldProps } from "@web/views/fields/standard_field_props";
 
 class RedirectField extends Component {
     static template = "website.RedirectField";
-    static props = {...standardFieldProps};
+    static props = { ...standardFieldProps };
     get info() {
         return this.props.record.data[this.props.name] ? _t("Published") : _t("Unpublished");
     }
@@ -23,7 +23,6 @@ class RedirectField extends Component {
     }
 }
 
-
 registry.category("fields").add("website_redirect_button", {
     component: RedirectField,
 });
diff --git a/addons/website/static/src/components/fields/widget_iframe.js b/addons/website/static/src/components/fields/widget_iframe.js
index b58be79dbf0b3..299f47974ead0 100644
--- a/addons/website/static/src/components/fields/widget_iframe.js
+++ b/addons/website/static/src/components/fields/widget_iframe.js
@@ -1,16 +1,16 @@
-import { registry } from '@web/core/registry';
+import { registry } from "@web/core/registry";
 import { useBus } from "@web/core/utils/hooks";
 import { Component, useState } from "@odoo/owl";
-import { standardFieldProps } from '@web/views/fields/standard_field_props';
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
 
 class FieldIframePreview extends Component {
     static template = "website.iframeWidget";
-    static props = {...standardFieldProps};
+    static props = { ...standardFieldProps };
     setup() {
-        this.state = useState({isMobile: false});
+        this.state = useState({ isMobile: false });
 
-        useBus(this.env.bus, 'THEME_PREVIEW:SWITCH_MODE', (ev) => {
-            this.state.isMobile = ev.detail.mode === 'mobile';
+        useBus(this.env.bus, "THEME_PREVIEW:SWITCH_MODE", (ev) => {
+            this.state.isMobile = ev.detail.mode === "mobile";
         });
     }
 }
diff --git a/addons/website/static/src/components/fullscreen_indication/fullscreen_indication.js b/addons/website/static/src/components/fullscreen_indication/fullscreen_indication.js
index dbcb87eb85412..6edd6a84082da 100644
--- a/addons/website/static/src/components/fullscreen_indication/fullscreen_indication.js
+++ b/addons/website/static/src/components/fullscreen_indication/fullscreen_indication.js
@@ -15,8 +15,8 @@ export class FullscreenIndication extends Component {
     }
 
     show() {
-        setTimeout(() => this.state.isVisible = true);
-        this.autofade = setTimeout(() => this.state.isVisible = false, 2000);
+        setTimeout(() => (this.state.isVisible = true));
+        this.autofade = setTimeout(() => (this.state.isVisible = false), 2000);
     }
 
     hide() {
diff --git a/addons/website/static/src/components/media_dialog/image_selector.js b/addons/website/static/src/components/media_dialog/image_selector.js
index 539c0388c2778..9780253b35e65 100644
--- a/addons/website/static/src/components/media_dialog/image_selector.js
+++ b/addons/website/static/src/components/media_dialog/image_selector.js
@@ -4,8 +4,8 @@ import { ImageSelector as HtmlImageSelector } from "@html_editor/main/media/medi
 patch(HtmlImageSelector.prototype, {
     get attachmentsDomain() {
         const domain = super.attachmentsDomain;
-        domain.push('|', ['url', '=', false], '!', ['url', '=like', '/web/image/website.%']);
-        domain.push(['key', '=', false]);
+        domain.push("|", ["url", "=", false], "!", ["url", "=like", "/web/image/website.%"]);
+        domain.push(["key", "=", false]);
         return domain;
-    }
+    },
 });
diff --git a/addons/website/static/src/components/navbar/navbar.js b/addons/website/static/src/components/navbar/navbar.js
index f76bd7d9a72bd..a91b6827712b6 100644
--- a/addons/website/static/src/components/navbar/navbar.js
+++ b/addons/website/static/src/components/navbar/navbar.js
@@ -1,26 +1,30 @@
-import { NavBar } from '@web/webclient/navbar/navbar';
-import { useService, useBus } from '@web/core/utils/hooks';
+import { NavBar } from "@web/webclient/navbar/navbar";
+import { useService, useBus } from "@web/core/utils/hooks";
 import { registry } from "@web/core/registry";
 import { patch } from "@web/core/utils/patch";
 import { UserMenu } from "@web/webclient/user_menu/user_menu";
 import { useEffect } from "@odoo/owl";
 
-const websiteSystrayRegistry = registry.category('website_systray');
+const websiteSystrayRegistry = registry.category("website_systray");
 websiteSystrayRegistry.add("UserMenu", { Component: UserMenu }, { sequence: 14 });
 
 patch(NavBar.prototype, {
     setup() {
         super.setup();
-        this.websiteService = useService('website');
-        this.websiteCustomMenus = useService('website_custom_menus');
+        this.websiteService = useService("website");
+        this.websiteCustomMenus = useService("website_custom_menus");
 
         // The navbar is rerendered with an event, as it can not naturally be
         // with props/state (the WebsitePreview client action and the navbar
         // are not related).
-        useBus(websiteSystrayRegistry, 'EDIT-WEBSITE', () => this.render(true));
+        useBus(websiteSystrayRegistry, "EDIT-WEBSITE", () => this.render(true));
 
-        if (this.env.debug && !websiteSystrayRegistry.contains('web.debug_mode_menu')) {
-            websiteSystrayRegistry.add('web.debug_mode_menu', registry.category('systray').get('web.debug_mode_menu'), {sequence: 100});
+        if (this.env.debug && !websiteSystrayRegistry.contains("web.debug_mode_menu")) {
+            websiteSystrayRegistry.add(
+                "web.debug_mode_menu",
+                registry.category("systray").get("web.debug_mode_menu"),
+                { sequence: 100 }
+            );
         }
         // Similar to what is done in web/navbar. When the app menu or systray
         // is updated, we need to adapt the navbar so that the "more" menu
@@ -41,7 +45,7 @@ patch(NavBar.prototype, {
             () => [adaptCounter]
         );
 
-        useBus(websiteSystrayRegistry, 'CONTENT-UPDATED', renderAndAdapt);
+        useBus(websiteSystrayRegistry, "CONTENT-UPDATED", renderAndAdapt);
     },
 
     get shouldDisplayWebsiteSystray() {
@@ -59,11 +63,15 @@ patch(NavBar.prototype, {
             const websiteItems = websiteSystrayRegistry
                 .getEntries()
                 .map(([key, value], index) => ({ key, ...value, index }))
-                .filter((item) => ('isDisplayed' in item ? item.isDisplayed(this.env) : true))
+                .filter((item) => ("isDisplayed" in item ? item.isDisplayed(this.env) : true))
                 .reverse();
             // Do not override the regular Odoo navbar if the only visible
             // elements are the debug items.
-            if (!websiteItems.every((item) => ['burger_menu', 'web.debug_mode_menu'].includes(item.key))) {
+            if (
+                !websiteItems.every((item) =>
+                    ["burger_menu", "web.debug_mode_menu"].includes(item.key)
+                )
+            ) {
                 return websiteItems;
             }
         }
@@ -75,8 +83,10 @@ patch(NavBar.prototype, {
      */
     get currentAppSections() {
         const currentAppSections = super.currentAppSections;
-        if (this.currentApp && this.currentApp.xmlid === 'website.menu_website_configuration') {
-            return this.websiteCustomMenus.addCustomMenus(currentAppSections).filter(section => section.childrenTree.length);
+        if (this.currentApp && this.currentApp.xmlid === "website.menu_website_configuration") {
+            return this.websiteCustomMenus
+                .addCustomMenus(currentAppSections)
+                .filter((section) => section.childrenTree.length);
         }
         return currentAppSections;
     },
diff --git a/addons/website/static/src/components/resource_editor/resource_editor.js b/addons/website/static/src/components/resource_editor/resource_editor.js
index 69e26f4233a67..1921440d1e7a8 100644
--- a/addons/website/static/src/components/resource_editor/resource_editor.js
+++ b/addons/website/static/src/components/resource_editor/resource_editor.js
@@ -141,9 +141,10 @@ export class ResourceEditor extends Component {
             required: true,
         };
         if (this.state.type === "xml") {
-            const choices = this.state.sortedXML.map((view) => {
-                return { value: view.id, label: view.label };
-            });
+            const choices = this.state.sortedXML.map((view) => ({
+                value: view.id,
+                label: view.label,
+            }));
             const value = this.state.currentResource?.id;
             return { ...props, choices, value };
         } else {
@@ -382,7 +383,7 @@ export class ResourceEditor extends Component {
         await rpc("/website/save_xml", {
             view_id: id,
             arch: arch,
-        })
+        });
         delete resource.dirty;
     }
 
diff --git a/addons/website/static/src/components/resource_editor/utils.js b/addons/website/static/src/components/resource_editor/utils.js
index 039091e07eb83..0d89b2af0ae2d 100644
--- a/addons/website/static/src/components/resource_editor/utils.js
+++ b/addons/website/static/src/components/resource_editor/utils.js
@@ -1,19 +1,22 @@
 import { _t } from "@web/core/l10n/translation";
 
 const MAPPING = {
-    '{': '}', '}': '{',
-    '(': ')', ')': '(',
-    '[': ']', ']': '[',
+    "{": "}",
+    "}": "{",
+    "(": ")",
+    ")": "(",
+    "[": "]",
+    "]": "[",
 };
-const OPENINGS = ['{', '(', '['];
-const CLOSINGS = ['}', ')', ']'];
+const OPENINGS = ["{", "(", "["];
+const CLOSINGS = ["}", ")", "]"];
 
 /**
  * Checks the syntax validity of some SCSS.
-*
-* @param {string} scss
-* @returns {Object} object with keys "isValid" and "error" if not valid
-*/
+ *
+ * @param {string} scss
+ * @returns {Object} object with keys "isValid" and "error" if not valid
+ */
 export function checkSCSS(scss) {
     const stack = [];
     let line = 1;
@@ -26,11 +29,11 @@ export function checkSCSS(scss) {
                     isValid: false,
                     error: {
                         line,
-                        message: _t("Unexpected %(char)s", {char: scss[i]}),
+                        message: _t("Unexpected %(char)s", { char: scss[i] }),
                     },
                 };
             }
-        } else if (scss[i] === '\n') {
+        } else if (scss[i] === "\n") {
             line++;
         }
     }
@@ -39,7 +42,7 @@ export function checkSCSS(scss) {
             isValid: false,
             error: {
                 line,
-                message: _t("Expected %(char)s", {char: MAPPING[stack.pop()]}),
+                message: _t("Expected %(char)s", { char: MAPPING[stack.pop()] }),
             },
         };
     }
@@ -53,18 +56,18 @@ export function checkSCSS(scss) {
  * @returns {Object} object with keys "isValid" and "error" if not valid
  */
 export function checkXML(xml) {
-    const xmlDoc = (new window.DOMParser()).parseFromString(xml, 'text/xml');
-    const errorEls = xmlDoc.getElementsByTagName('parsererror');
+    const xmlDoc = new window.DOMParser().parseFromString(xml, "text/xml");
+    const errorEls = xmlDoc.getElementsByTagName("parsererror");
     if (errorEls.length > 0) {
         const errorEl = errorEls[0];
-        const sourceTextEls = errorEl.querySelectorAll('sourcetext');
+        const sourceTextEls = errorEl.querySelectorAll("sourcetext");
         let codeEls = null;
         if (sourceTextEls.length) {
-            codeEls = [...sourceTextEls].map(el => {
-                const codeEl = document.createElement('code');
+            codeEls = [...sourceTextEls].map((el) => {
+                const codeEl = document.createElement("code");
                 codeEl.textContent = el.textContent;
-                const brEl = document.createElement('br');
-                brEl.classList.add('o_we_source_text_origin');
+                const brEl = document.createElement("br");
+                brEl.classList.add("o_we_source_text_origin");
                 el.parentElement.insertBefore(brEl, el);
                 return codeEl;
             });
@@ -72,18 +75,18 @@ export function checkXML(xml) {
                 el.remove();
             }
         }
-        for (const el of [...errorEl.querySelectorAll(':not(code):not(pre):not(br)')]) {
-            const pEl = document.createElement('p');
+        for (const el of [...errorEl.querySelectorAll(":not(code):not(pre):not(br)")]) {
+            const pEl = document.createElement("p");
             for (const cEl of [...el.childNodes]) {
                 pEl.appendChild(cEl);
             }
             el.parentElement.insertBefore(pEl, el);
             el.remove();
         }
-        errorEl.querySelectorAll('.o_we_source_text_origin').forEach((el, i) => {
+        errorEl.querySelectorAll(".o_we_source_text_origin").forEach((el, i) => {
             el.after(codeEls[i]);
         });
-        return {    
+        return {
             isValid: false,
             error: {
                 line: parseInt(errorEl.innerHTML.match(/[Ll]ine[^\d]+(\d+)/)[1], 10),
diff --git a/addons/website/static/src/components/views/page_kanban.js b/addons/website/static/src/components/views/page_kanban.js
index ead01349d60ed..e04c58ddf0e5b 100644
--- a/addons/website/static/src/components/views/page_kanban.js
+++ b/addons/website/static/src/components/views/page_kanban.js
@@ -1,7 +1,7 @@
 import { usePageManager } from "./page_manager_hook";
-import {PageSearchModel} from "./page_search_model";
-import {registry} from '@web/core/registry';
-import {kanbanView} from "@web/views/kanban/kanban_view";
+import { PageSearchModel } from "./page_search_model";
+import { registry } from "@web/core/registry";
+import { kanbanView } from "@web/views/kanban/kanban_view";
 
 export class PageKanbanController extends kanbanView.Controller {
     static components = {
diff --git a/addons/website/static/src/components/views/page_list.js b/addons/website/static/src/components/views/page_list.js
index 492e87b4cc1c7..5797c38b9396d 100644
--- a/addons/website/static/src/components/views/page_list.js
+++ b/addons/website/static/src/components/views/page_list.js
@@ -1,13 +1,12 @@
 import { _t } from "@web/core/l10n/translation";
 import { usePageManager } from "./page_manager_hook";
-import {PageSearchModel} from "./page_search_model";
-import {registry} from '@web/core/registry';
-import {listView} from '@web/views/list/list_view';
-import {ConfirmationDialog} from "@web/core/confirmation_dialog/confirmation_dialog";
-import {DeletePageDialog, DuplicatePageDialog} from '@website/components/dialog/page_properties';
+import { PageSearchModel } from "./page_search_model";
+import { registry } from "@web/core/registry";
+import { listView } from "@web/views/list/list_view";
+import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
+import { DeletePageDialog, DuplicatePageDialog } from "@website/components/dialog/page_properties";
 import { useService } from "@web/core/utils/hooks";
 
-
 export class PageListController extends listView.Controller {
     static components = {
         ...listView.Controller.components,
@@ -43,7 +42,7 @@ export class PageListController extends listView.Controller {
      */
     getStaticActionMenuItems() {
         const menuItems = super.getStaticActionMenuItems();
-        if (this.props.fields.hasOwnProperty('is_published')) {
+        if (Object.prototype.hasOwnProperty.call(this.props.fields, "is_published")) {
             menuItems.publish = {
                 sequence: 15,
                 icon: "fa fa-globe",
@@ -51,7 +50,10 @@ export class PageListController extends listView.Controller {
                 callback: async () => {
                     this.dialogService.add(ConfirmationDialog, {
                         title: _t("Publish Website Content"),
-                        body: _t("%s record(s) selected, are you sure you want to publish them all?", this.model.root.selection.length),
+                        body: _t(
+                            "%s record(s) selected, are you sure you want to publish them all?",
+                            this.model.root.selection.length
+                        ),
                         confirm: () => this.togglePublished(true),
                     });
                 },
@@ -79,21 +81,25 @@ export class PageListController extends listView.Controller {
 
     async onDeleteSelectedRecords() {
         const pageIds = this.model.root.selection.map((record) => record.resId);
-        const newPageTemplateRecords = await this.orm.read("website.page", pageIds, ["is_new_page_template"]);
+        const newPageTemplateRecords = await this.orm.read("website.page", pageIds, [
+            "is_new_page_template",
+        ]);
         this.dialogService.add(DeletePageDialog, {
             resIds: pageIds,
             resModel: this.props.resModel,
             onDelete: () => {
                 this.model.root.deleteRecords();
             },
-            hasNewPageTemplate: newPageTemplateRecords.some(record => record.is_new_page_template),
+            hasNewPageTemplate: newPageTemplateRecords.some(
+                (record) => record.is_new_page_template
+            ),
         });
     }
 
     async togglePublished(publish) {
-        const resIds = this.model.root.selection.map(record => record.resId);
-        await this.orm.write(this.props.resModel, resIds, {is_published: publish});
-        this.actionService.switchView('list');
+        const resIds = this.model.root.selection.map((record) => record.resId);
+        await this.orm.write(this.props.resModel, resIds, { is_published: publish });
+        this.actionService.switchView("list");
     }
 }
 
diff --git a/addons/website/static/src/components/views/page_manager_hook.js b/addons/website/static/src/components/views/page_manager_hook.js
index 703fd053f8a6b..6689a88339f22 100644
--- a/addons/website/static/src/components/views/page_manager_hook.js
+++ b/addons/website/static/src/components/views/page_manager_hook.js
@@ -51,14 +51,13 @@ export function usePageManager({ resModel, createAction }) {
                             const path = params.computePath();
                             actionService.doAction({
                                 type: "ir.actions.act_window_close",
-                                infos: { path }
+                                infos: { path },
                             });
                         }
-                    }
-                }
+                    },
+                },
             });
         }
-
     }
 
     function selectWebsite(website) {
@@ -68,12 +67,12 @@ export function usePageManager({ resModel, createAction }) {
     return {
         get websites() {
             const activeId = state.activeWebsite.id;
-            return websiteSelection.map(website => {
+            return websiteSelection.map((website) => {
                 const isActive = website.id === activeId;
                 return { ...website, isActive };
             });
         },
         createWebsiteContent,
-        selectWebsite
+        selectWebsite,
     };
 }
diff --git a/addons/website/static/src/components/views/page_search_model.js b/addons/website/static/src/components/views/page_search_model.js
index 34e927922aa4c..54861b53d70a7 100644
--- a/addons/website/static/src/components/views/page_search_model.js
+++ b/addons/website/static/src/components/views/page_search_model.js
@@ -1,5 +1,5 @@
 import { useService } from "@web/core/utils/hooks";
-import { SearchModel } from '@web/search/search_model';
+import { SearchModel } from "@web/search/search_model";
 
 export class PageSearchModel extends SearchModel {
     /**
@@ -7,7 +7,7 @@ export class PageSearchModel extends SearchModel {
      */
     setup() {
         super.setup(...arguments);
-        this.website = useService('website');
+        this.website = useService("website");
     }
 
     /**
@@ -91,9 +91,9 @@ export class PageSearchModel extends SearchModel {
      * @returns {Object} The current website.
      */
     async getCurrentWebsite() {
-        const currentWebsite = await this.orm.call('website', 'get_current_website');
+        const currentWebsite = await this.orm.call("website", "get_current_website");
         if (currentWebsite) {
-            return this.website.websites.find(w => w.id === currentWebsite[0]);
+            return this.website.websites.find((w) => w.id === currentWebsite[0]);
         }
         return this.website.websites[0];
     }
diff --git a/addons/website/static/src/components/views/theme_preview_form.js b/addons/website/static/src/components/views/theme_preview_form.js
index ac868cb2a6df1..6292fe1a74ac4 100644
--- a/addons/website/static/src/components/views/theme_preview_form.js
+++ b/addons/website/static/src/components/views/theme_preview_form.js
@@ -7,30 +7,32 @@ import { ViewButton } from "@web/views/view_button/view_button";
 import { useSubEnv, onMounted, useEnv } from "@odoo/owl";
 
 /*
-* Common code for theme installation/update handler.
-* It overrides the onClickViewButton function that's present in the env.
-* That way, we display our own Loader and make a silent call to the ORM.
-*/
+ * Common code for theme installation/update handler.
+ * It overrides the onClickViewButton function that's present in the env.
+ * That way, we display our own Loader and make a silent call to the ORM.
+ */
 export function useLoaderOnClick() {
-    const website = useService('website');
-    const orm = useService('orm');
-    const action = useService('action');
+    const website = useService("website");
+    const orm = useService("orm");
+    const action = useService("action");
     const env = useEnv();
     const previousOnClickViewButton = env.onClickViewButton;
     useSubEnv({
         async onClickViewButton(params) {
             const name = params.clickParams.name;
-            if (['button_refresh_theme', 'button_choose_theme'].includes(name)) {
+            if (["button_refresh_theme", "button_choose_theme"].includes(name)) {
                 website.invalidateSnippetCache = true;
-                website.showLoader({ showTips: name !== 'button_refresh_theme' });
+                website.showLoader({ showTips: name !== "button_refresh_theme" });
                 try {
                     const resParams = params.getResParams();
-                    const callback = await orm.silent.call(resParams.resModel, name, [[resParams.resId]]);
+                    const callback = await orm.silent.call(resParams.resModel, name, [
+                        [resParams.resId],
+                    ]);
                     let keepLoader = false;
                     if (callback) {
-                        callback.target = 'main';
+                        callback.target = "main";
                         await action.doAction(callback);
-                        if (callback.tag === 'website_preview') {
+                        if (callback.tag === "website_preview") {
                             keepLoader = true;
                         }
                     }
@@ -44,7 +46,7 @@ export function useLoaderOnClick() {
             } else {
                 return previousOnClickViewButton(...arguments);
             }
-        }
+        },
     });
 }
 
@@ -70,7 +72,7 @@ class ThemePreviewFormController extends FormController {
      * @override
      */
     get className() {
-        return {...super.className, 'o_view_form_theme_preview_controller': true};
+        return { ...super.className, o_view_form_theme_preview_controller: true };
     }
     /**
      * Handler called when user click on 'Choose another theme' button.
@@ -87,13 +89,13 @@ class ThemePreviewFormControlPanel extends ControlPanel {
      * @see {FieldIframePreview} for the event handler.
      */
     onMobileClick() {
-        this.env.bus.trigger('THEME_PREVIEW:SWITCH_MODE', {mode: 'mobile'});
+        this.env.bus.trigger("THEME_PREVIEW:SWITCH_MODE", { mode: "mobile" });
     }
     /**
      * @see {onMobileClick}
      */
     onDesktopClick() {
-        this.env.bus.trigger('THEME_PREVIEW:SWITCH_MODE', {mode: 'desktop'});
+        this.env.bus.trigger("THEME_PREVIEW:SWITCH_MODE", { mode: "desktop" });
     }
     /**
      * Handler called when user click on Go Back button.
@@ -109,4 +111,4 @@ const ThemePreviewFormView = {
     ControlPanel: ThemePreviewFormControlPanel,
 };
 
-registry.category('views').add('theme_preview_form', ThemePreviewFormView);
+registry.category("views").add("theme_preview_form", ThemePreviewFormView);
diff --git a/addons/website/static/src/components/views/theme_preview_kanban.js b/addons/website/static/src/components/views/theme_preview_kanban.js
index d96971cfde25d..0dc6f3b33d7e1 100644
--- a/addons/website/static/src/components/views/theme_preview_kanban.js
+++ b/addons/website/static/src/components/views/theme_preview_kanban.js
@@ -3,7 +3,7 @@ import { kanbanView } from "@web/views/kanban/kanban_view";
 import { KanbanController } from "@web/views/kanban/kanban_controller";
 import { registry } from "@web/core/registry";
 import { useService } from "@web/core/utils/hooks";
-import { useLoaderOnClick } from './theme_preview_form';
+import { useLoaderOnClick } from "./theme_preview_form";
 import { KanbanRecord } from "@web/views/kanban/kanban_record";
 import { KanbanRenderer } from "@web/views/kanban/kanban_renderer";
 
@@ -21,14 +21,13 @@ class ThemePreviewControlPanel extends ControlPanel {
     static template = "website.ThemePreviewKanban.ControlPanel";
     setup() {
         super.setup();
-        this.website = useService('website');
+        this.website = useService("website");
     }
     close() {
         this.website.goToWebsite();
     }
 }
 class ThemePreviewKanbanrecord extends KanbanRecord {
-
     /** @override **/
     getRecordClasses() {
         return super.getRecordClasses() + " p-0 border-0 bg-transparent";
@@ -49,6 +48,4 @@ const ThemePreviewKanbanView = {
     Renderer: ThemePreviewKanbanRenderer,
 };
 
-
-
-registry.category('views').add('theme_preview_kanban', ThemePreviewKanbanView);
+registry.category("views").add("theme_preview_kanban", ThemePreviewKanbanView);
diff --git a/addons/website/static/src/components/website_loader/website_loader.js b/addons/website/static/src/components/website_loader/website_loader.js
index cb0090e34eb62..640e90e30851b 100644
--- a/addons/website/static/src/components/website_loader/website_loader.js
+++ b/addons/website/static/src/components/website_loader/website_loader.js
@@ -15,7 +15,7 @@ export class WebsiteLoader extends Component {
 
         const initialState = {
             isVisible: false,
-            title: '',
+            title: "",
             flag: false,
             showTips: false,
             selectedFeatures: [],
@@ -26,19 +26,23 @@ export class WebsiteLoader extends Component {
             showCloseButton: false,
         };
 
-        const defaultMessages = [{
-            title: _t("Building your website."),
-            description: _t("Applying your colors and design..."),
-            flag: "colors",
-        }, {
-            title: _t("Building your website."),
-            description: _t("Searching your images...."),
-            flag: "images",
-        }, {
-            title: _t("Building your website."),
-            description: _t("Generating inspiring text..."),
-            flag: "text",
-        }];
+        const defaultMessages = [
+            {
+                title: _t("Building your website."),
+                description: _t("Applying your colors and design..."),
+                flag: "colors",
+            },
+            {
+                title: _t("Building your website."),
+                description: _t("Searching your images...."),
+                flag: "images",
+            },
+            {
+                title: _t("Building your website."),
+                description: _t("Generating inspiring text..."),
+                flag: "text",
+            },
+        ];
 
         let messagesInterval;
 
@@ -52,13 +56,17 @@ export class WebsiteLoader extends Component {
         useEffect(
             (selectedFeatures) => {
                 if (this.state.showWaitingMessages) {
-                    let messagesToDisplay = [...defaultMessages]; // Start with defaultMessages
+                    const messagesToDisplay = [...defaultMessages]; // Start with defaultMessages
                     if (selectedFeatures.length > 0) {
                         // Merge defaultMessages with the relevant waitingMessages
                         messagesToDisplay.push(...this.getWaitingMessages(selectedFeatures));
                     }
 
-                    this.waitingMessages.splice(0, this.waitingMessages.length, ...messagesToDisplay);
+                    this.waitingMessages.splice(
+                        0,
+                        this.waitingMessages.length,
+                        ...messagesToDisplay
+                    );
 
                     // Request the number of modules/dependencies to install
                     // and already installed
@@ -173,11 +181,12 @@ export class WebsiteLoader extends Component {
         let currentProgress = 0;
         // This controls the speed of the progress bar.
         const progressStep = isSomethingToInstall ? 0.04 : 0.02;
-        let progressForAfterModules = isSomethingToInstall ? 30 : 100;
-        let progressForAllModules = 100 - progressForAfterModules;
+        const progressForAfterModules = isSomethingToInstall ? 30 : 100;
+        const progressForAllModules = 100 - progressForAfterModules;
         let lastTotalInstalled = 0;
-        let progressPerModule = isSomethingToInstall ?
-            progressForAllModules / nbModulesToInstall : 0;
+        const progressPerModule = isSomethingToInstall
+            ? progressForAllModules / nbModulesToInstall
+            : 0;
 
         this.updateProgressInterval = setInterval(() => {
             if (this.featuresInstallInfo.nbInstalled !== lastTotalInstalled) {
@@ -186,10 +195,13 @@ export class WebsiteLoader extends Component {
                 lastTotalInstalled = this.featuresInstallInfo.nbInstalled;
             }
             currentProgress += progressStep;
-            const limit = this.featuresInstallInfo.nbInstalled === nbModulesToInstall ?
-                progressForAfterModules : progressPerModule;
-            this.state.progressPercentage = (lastTotalInstalled * progressPerModule) +
-                Math.atan(currentProgress) / (Math.PI / 2) * limit;
+            const limit =
+                this.featuresInstallInfo.nbInstalled === nbModulesToInstall
+                    ? progressForAfterModules
+                    : progressPerModule;
+            this.state.progressPercentage =
+                lastTotalInstalled * progressPerModule +
+                (Math.atan(currentProgress) / (Math.PI / 2)) * limit;
         }, 100);
     }
     /**
@@ -203,13 +215,15 @@ export class WebsiteLoader extends Component {
         const installInfo = await rpc(
             "/website/track_installing_modules",
             {
-                'selected_features': selectedFeatures,
-                'total_features': this.featuresInstallInfo.total,
+                selected_features: selectedFeatures,
+                total_features: this.featuresInstallInfo.total,
             },
             { silent: true }
         );
-        if (!this.featuresInstallInfo.total
-            || this.featuresInstallInfo.nbInstalled !== installInfo.nbInstalled) {
+        if (
+            !this.featuresInstallInfo.total ||
+            this.featuresInstallInfo.nbInstalled !== installInfo.nbInstalled
+        ) {
             this.featuresInstallInfo = installInfo;
         }
         this.initProgressBar();
@@ -225,49 +239,57 @@ export class WebsiteLoader extends Component {
      * @returns {Object[]} - the messages filtered by the selected features
      */
     getWaitingMessages(selectedFeatures) {
-        const websiteFeaturesMessages = [{
-            id: 5,
-            title: _t("Adding features."),
-            name: _t("blog"),
-            description: _t("Enabling your %s."),
-            flag: "generic",
-        }, {
-            id: 7,
-            title: _t("Adding features."),
-            name: _t("recruitment platform"),
-            description: _t("Integrating your %s."),
-            flag: "generic",
-        }, {
-            id: 8,
-            title: _t("Adding features."),
-            name: _t("online store"),
-            description: _t("Activating your %s."),
-            flag: "generic",
-        }, {
-            id: 9,
-            title: _t("Adding features."),
-            name: _t("online appointment system"),
-            description: _t("Configuring your %s."),
-            flag: "generic",
-        }, {
-            id: 10,
-            title: _t("Adding features."),
-            name: _t("forum"),
-            description: _t("Setting up your %s."),
-            flag: "generic",
-        }, {
-            id: 12,
-            title: _t("Adding features."),
-            name: _t("e-learning platform"),
-            description: _t("Installing your %s."),
-            flag: "generic",
-        }, {
-            // Always the last message if there is at least 1 feature selected.
-            id: "last",
-            title: _t("Finalizing."),
-            description: _t("Activating the last features."),
-            flag: "generic",
-        }];
+        const websiteFeaturesMessages = [
+            {
+                id: 5,
+                title: _t("Adding features."),
+                name: _t("blog"),
+                description: _t("Enabling your %s."),
+                flag: "generic",
+            },
+            {
+                id: 7,
+                title: _t("Adding features."),
+                name: _t("recruitment platform"),
+                description: _t("Integrating your %s."),
+                flag: "generic",
+            },
+            {
+                id: 8,
+                title: _t("Adding features."),
+                name: _t("online store"),
+                description: _t("Activating your %s."),
+                flag: "generic",
+            },
+            {
+                id: 9,
+                title: _t("Adding features."),
+                name: _t("online appointment system"),
+                description: _t("Configuring your %s."),
+                flag: "generic",
+            },
+            {
+                id: 10,
+                title: _t("Adding features."),
+                name: _t("forum"),
+                description: _t("Setting up your %s."),
+                flag: "generic",
+            },
+            {
+                id: 12,
+                title: _t("Adding features."),
+                name: _t("e-learning platform"),
+                description: _t("Installing your %s."),
+                flag: "generic",
+            },
+            {
+                // Always the last message if there is at least 1 feature selected.
+                id: "last",
+                title: _t("Finalizing."),
+                description: _t("Activating the last features."),
+                flag: "generic",
+            },
+        ];
 
         const filteredIds = [...selectedFeatures, "last"];
         const messagesList = websiteFeaturesMessages.filter((msg) => {
diff --git a/addons/website/static/src/core/component_interaction_edit.js b/addons/website/static/src/core/component_interaction_edit.js
index 01ce99e93dc0e..a3f58148eed68 100644
--- a/addons/website/static/src/core/component_interaction_edit.js
+++ b/addons/website/static/src/core/component_interaction_edit.js
@@ -3,7 +3,7 @@ import { PublicComponentInteraction } from "@web/public/public_component_interac
 
 // We register an editable interaction here to add support for <owl-component/>
 // in edit mode. The idea is that <owl-components /> in edit mode are rendered,
-// but rendered inactive by setting the pointerEvents key to none. To have 
+// but rendered inactive by setting the pointerEvents key to none. To have
 // active components in edit mode, one has to register it in the public_components.edit
 // registry
 const PublicComponentInteractionEdit = (I) =>
diff --git a/addons/website/static/src/core/website_edit_service.js b/addons/website/static/src/core/website_edit_service.js
index 26f0d76bb14fe..2254a2cf01303 100644
--- a/addons/website/static/src/core/website_edit_service.js
+++ b/addons/website/static/src/core/website_edit_service.js
@@ -232,7 +232,9 @@ registry.category("services").add("website_edit", {
                 patch(publicInteractions.constructor.prototype, {
                     shouldStop(el, interaction) {
                         if (this.isRefreshing) {
-                            const mustBeRefreshed = super.shouldStop(el, interaction) || interaction.interaction.isImpactedBy(el);
+                            const mustBeRefreshed =
+                                super.shouldStop(el, interaction) ||
+                                interaction.interaction.isImpactedBy(el);
                             return mustBeRefreshed && interaction.interaction.shouldStop();
                         }
                         return super.shouldStop(el, interaction);
diff --git a/addons/website/static/src/core/website_map_service.js b/addons/website/static/src/core/website_map_service.js
index f6a446f7e3085..0f364ba28b2a0 100644
--- a/addons/website/static/src/core/website_map_service.js
+++ b/addons/website/static/src/core/website_map_service.js
@@ -15,23 +15,23 @@ registry.category("services").add("website_map", {
         const promiseKeys = {};
         const promiseKeysResolves = {};
         let lastKey;
-        window.odoo_gmap_api_post_load = (async function odoo_gmap_api_post_load() {
+        window.odoo_gmap_api_post_load = async function odoo_gmap_api_post_load() {
             for (const el of document.querySelectorAll("section.s_google_map")) {
                 publicInteractions.stopInteractions(el);
                 publicInteractions.startInteractions(el);
             }
             promiseKeysResolves[lastKey]?.();
-        }).bind(this);
+        }.bind(this);
         return {
             /**
              * @param {boolean} [refetch=false]
              */
             async getGMapAPIKey(refetch) {
                 if (refetch || !gmapAPIKeyProm) {
-                    gmapAPIKeyProm = new Promise(async resolve => {
-                        const data = await rpc('/website/google_maps_api_key');
-                        resolve(JSON.parse(data).google_maps_api_key || '');
-                    });
+                    gmapAPIKeyProm = (async () => {
+                        const data = await rpc("/website/google_maps_api_key");
+                        return JSON.parse(data).google_maps_api_key || "";
+                    })();
                 }
                 return gmapAPIKeyProm;
             },
@@ -44,8 +44,8 @@ registry.category("services").add("website_map", {
                 // library. If the library was loaded with a correct key and that the
                 // key changes meanwhile... it will not work but we can agree the user
                 // can bother to reload the page at that moment.
-                if (refetch || !gmapAPILoading) {
-                    gmapAPILoading = new Promise(async resolve => {
+                if (refetch || !(await gmapAPILoading)) {
+                    gmapAPILoading = (async () => {
                         const key = await this.getGMapAPIKey(refetch);
                         lastKey = key;
 
@@ -61,7 +61,7 @@ registry.category("services").add("website_map", {
                                 );
                             }
                             await promiseKeys[key];
-                            resolve(key);
+                            return key;
                         } else {
                             if (!editableMode && user.isAdmin) {
                                 const message = _t("Cannot load google map.");
@@ -71,13 +71,12 @@ registry.category("services").add("website_map", {
                                         <span>${message}</span><br/>
                                         <a href="/odoo/action-website.action_website_configuration">${urlTitle}</a>
                                     </div>`,
-                                    { type: 'warning', sticky: true }
+                                    { type: "warning", sticky: true }
                                 );
                             }
-                            resolve(false);
-                            gmapAPILoading = false;
+                            return false;
                         }
-                    });
+                    })();
                 }
                 return gmapAPILoading;
             },
@@ -136,6 +135,6 @@ registry.category("services").add("website_map", {
                     )}`
                 );
             },
-        }
-    }
+        };
+    },
 });
diff --git a/addons/website/static/src/core/website_menus_service.js b/addons/website/static/src/core/website_menus_service.js
index 8024b9a8d1649..6f5ad6196de5b 100644
--- a/addons/website/static/src/core/website_menus_service.js
+++ b/addons/website/static/src/core/website_menus_service.js
@@ -7,13 +7,13 @@ registry.category("services").add("website_menus", {
             updateCallbacks,
             registerCallback(fn) {
                 updateCallbacks.add(fn);
-                return () => updateCallbacks.delete(fn)
+                return () => updateCallbacks.delete(fn);
             },
             triggerCallbacks() {
                 for (const callback of updateCallbacks) {
                     callback();
                 }
             },
-        }
-    }
+        };
+    },
 });
diff --git a/addons/website/static/src/core/website_page_service.js b/addons/website/static/src/core/website_page_service.js
index 9f16a467073d1..54b668636fabe 100644
--- a/addons/website/static/src/core/website_page_service.js
+++ b/addons/website/static/src/core/website_page_service.js
@@ -17,7 +17,7 @@ registry.category("services").add("website_page", {
             },
             mainObject: {
                 model: match && match[1],
-                id: match && (match[2] | 0),
+                id: match && match[2] | 0,
             },
         };
     },
diff --git a/addons/website/static/src/interactions/anchor_slide.js b/addons/website/static/src/interactions/anchor_slide.js
index 67bb737c17db0..a4486c1cfa2dc 100644
--- a/addons/website/static/src/interactions/anchor_slide.js
+++ b/addons/website/static/src/interactions/anchor_slide.js
@@ -64,7 +64,7 @@ export class AnchorSlide extends Interaction {
                 "hidden.bs.offcanvas",
                 () => this.manageScroll(hash, anchorEl, scrollValue),
                 // the listener must be automatically removed when invoked
-                { once: true },
+                { once: true }
             );
         } else {
             ev.preventDefault();
@@ -92,6 +92,4 @@ export class AnchorSlide extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.anchor_slide", AnchorSlide);
+registry.category("public.interactions").add("website.anchor_slide", AnchorSlide);
diff --git a/addons/website/static/src/interactions/animate_overflow.js b/addons/website/static/src/interactions/animate_overflow.js
index bde4e19c7591c..b430a18fa7deb 100644
--- a/addons/website/static/src/interactions/animate_overflow.js
+++ b/addons/website/static/src/interactions/animate_overflow.js
@@ -11,7 +11,8 @@ export class AnimateOverflow extends Interaction {
     dynamicContent = {
         _scrollingElement: {
             "t-att-class": () => ({
-                "o_wanim_overflow_xy_hidden": this.forceOverflowXYHidden || this.hasAnimationInProgress,
+                o_wanim_overflow_xy_hidden:
+                    this.forceOverflowXYHidden || this.hasAnimationInProgress,
             }),
         },
         _root: {
@@ -31,9 +32,9 @@ export class AnimateOverflow extends Interaction {
         // (not only one) as the bug is not systematic and may depend on some
         // other conditions (for example: an animated image in a block which is
         // hidden on mobile would not have the issue).
-        this.forceOverflowXYHidden = [...animatedElements].some(el => {
-            return window.getComputedStyle(el).transform !== "none";
-        });
+        this.forceOverflowXYHidden = [...animatedElements].some(
+            (el) => window.getComputedStyle(el).transform !== "none"
+        );
     }
 
     get hasAnimationInProgress() {
@@ -41,12 +42,8 @@ export class AnimateOverflow extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.animate_overflow", AnimateOverflow);
+registry.category("public.interactions").add("website.animate_overflow", AnimateOverflow);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.animate_overflow", {
-        Interaction: AnimateOverflow,
-    });
+registry.category("public.interactions.edit").add("website.animate_overflow", {
+    Interaction: AnimateOverflow,
+});
diff --git a/addons/website/static/src/interactions/animation.edit.js b/addons/website/static/src/interactions/animation.edit.js
index e2a1bdea14057..28a68fecb9d8e 100644
--- a/addons/website/static/src/interactions/animation.edit.js
+++ b/addons/website/static/src/interactions/animation.edit.js
@@ -1,19 +1,19 @@
 import { Animation } from "./animation";
 import { registry } from "@web/core/registry";
 
-const AnimationEdit = I => class extends I {
-    destroy() {
-        // We remove the "o_animate_preview" class here because it is added when
-        // an animation is selected in the options, and the "Animation"
-        // interaction considers it as part of the initial state. We remove it
-        // here because otherwise it is added back when exiting edit mode.
-        this.el.classList.remove("o_animate_preview");
-    }
-};
+const AnimationEdit = (I) =>
+    class extends I {
+        destroy() {
+            // We remove the "o_animate_preview" class here because it is added
+            // when an animation is selected in the options, and the "Animation"
+            // interaction considers it as part of the initial state. We remove
+            // it here because otherwise it is added back when exiting edit
+            // mode.
+            this.el.classList.remove("o_animate_preview");
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.animation", {
-        Interaction: Animation,
-        mixin: AnimationEdit,
-    });
+registry.category("public.interactions.edit").add("website.animation", {
+    Interaction: Animation,
+    mixin: AnimationEdit,
+});
diff --git a/addons/website/static/src/interactions/animation.js b/addons/website/static/src/interactions/animation.js
index 9798c346858b8..6dfe18475655e 100644
--- a/addons/website/static/src/interactions/animation.js
+++ b/addons/website/static/src/interactions/animation.js
@@ -27,18 +27,19 @@ export class Animation extends Interaction {
         },
         _root: {
             "t-att-class": (el) => ({
-                "o_animating": this.isAnimating,
-                "o_animated": this.isAnimated,
-                "o_animate_in_dropdown": !!el.closest(".dropdown"),
-                "o_animate_preview": undefined,
+                o_animating: this.isAnimating,
+                o_animated: this.isAnimated,
+                o_animate_in_dropdown: !!el.closest(".dropdown"),
+                o_animate_preview: undefined,
             }),
             "t-att-style": (el) => {
                 const result = {
                     "animation-name": this.isResetting ? "dummy-none" : undefined,
-                    "animation-play-state": (this.isResetting || this.isAnimateOnScroll) ? undefined : this.playState,
+                    "animation-play-state":
+                        this.isResetting || this.isAnimateOnScroll ? undefined : this.playState,
                     // The ones which are invisible in state 0 (like fade_in for
                     // example) will stay invisible.
-                    "visibility": "visible",
+                    visibility: "visible",
                 };
                 // Avoid resetting animation-delay upon stop when it is not
                 // supposed to be modified at all.
@@ -57,7 +58,9 @@ export class Animation extends Interaction {
         this.wrapwrapEl = document.querySelector("#wrapwrap");
         this.windowUnlessDropdown = this.el.closest(".dropdown") ? [] : window;
         this.scrollingElement = this.findScrollingElement();
-        this.scrollingTarget = isScrollableY(this.scrollingElement) ? this.scrollingElement : this.scrollingElement.ownerDocument.defaultView;
+        this.scrollingTarget = isScrollableY(this.scrollingElement)
+            ? this.scrollingElement
+            : this.scrollingElement.ownerDocument.defaultView;
         this.isAnimating = false;
         this.isAnimated = false;
         this.isAnimateOnScroll = this.el.classList.contains("o_animate_on_scroll");
@@ -93,12 +96,22 @@ export class Animation extends Interaction {
         this.waitForTimeout(() => {
             this.isAnimating = true;
             this.playState = "running";
-            for (const eventName of ["webkitAnimationEnd", "oanimationend", "msAnimationEnd", "animationend"]) {
-                this.addListener(this.el, eventName, () => {
-                    this.isAnimating = false;
-                    this.isAnimated = true;
-                    window.dispatchEvent(new Event("resize"));
-                }, { once: true });
+            for (const eventName of [
+                "webkitAnimationEnd",
+                "oanimationend",
+                "msAnimationEnd",
+                "animationend",
+            ]) {
+                this.addListener(
+                    this.el,
+                    eventName,
+                    () => {
+                        this.isAnimating = false;
+                        this.isAnimated = true;
+                        window.dispatchEvent(new Event("resize"));
+                    },
+                    { once: true }
+                );
             }
         });
     }
@@ -141,7 +154,9 @@ export class Animation extends Interaction {
         }
         const windowsHeight = window.innerHeight;
         const elHeight = el.offsetHeight;
-        let elOffset = this.isAnimateOnScroll ? 0 : Math.max((elHeight * this.offsetRatio), this.offsetMin);
+        const elOffset = this.isAnimateOnScroll
+            ? 0
+            : Math.max(elHeight * this.offsetRatio, this.offsetMin);
 
         // We need to offset for the change in position from some animation.
         // So we get the top value by not taking CSS transforms into calculations.
@@ -151,9 +166,9 @@ export class Animation extends Interaction {
         const closestModal = el.closest(".modal");
         let scrollTop = this.scrollingElement.scrollTop;
         if (closestModal && isVisible(closestModal)) {
-            scrollTop = closestModal.classList.contains("s_popup_no_backdrop") ?
-                closestModal.querySelector(".modal-content").scrollTop :
-                closestModal.scrollTop;
+            scrollTop = closestModal.classList.contains("s_popup_no_backdrop")
+                ? closestModal.querySelector(".modal-content").scrollTop
+                : closestModal.scrollTop;
         }
         const elTop = this.getElementOffsetTop(el) - scrollTop;
         let visible;
@@ -176,11 +191,12 @@ export class Animation extends Interaction {
             if (visible) {
                 const start = 100 / (parseFloat(el.dataset.scrollZoneStart) || 1);
                 const end = 100 / (parseFloat(el.dataset.scrollZoneEnd) || 1);
-                const out = el.classList.contains('o_animate_out');
-                const ratio = (out ? elTop + elHeight : elTop) / (windowsHeight - (windowsHeight / start));
+                const out = el.classList.contains("o_animate_out");
+                const ratio =
+                    (out ? elTop + elHeight : elTop) / (windowsHeight - windowsHeight / start);
                 const duration = parseFloat(window.getComputedStyle(el).animationDuration);
                 const delay = (ratio - 1) * (duration * end);
-                this.delay = (out ? - duration - delay : delay) + "s";
+                this.delay = (out ? -duration - delay : delay) + "s";
                 this.isAnimating = true;
             } else if (el.classList.contains("o_animating")) {
                 this.isAnimating = false;
@@ -189,7 +205,11 @@ export class Animation extends Interaction {
             if (visible && this.playState === "paused") {
                 el.classList.add("o_visible");
                 this.startAnimation();
-            } else if (!visible && el.classList.contains("o_animate_both_scroll") && this.playState === "running") {
+            } else if (
+                !visible &&
+                el.classList.contains("o_animate_both_scroll") &&
+                this.playState === "running"
+            ) {
                 el.classList.remove("o_visible");
                 this.resetAnimation();
             }
@@ -202,6 +222,4 @@ export class Animation extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.animation", Animation);
+registry.category("public.interactions").add("website.animation", Animation);
diff --git a/addons/website/static/src/interactions/bottom_fixed_element.js b/addons/website/static/src/interactions/bottom_fixed_element.js
index 17d32a02f6521..26aa3713c20d2 100644
--- a/addons/website/static/src/interactions/bottom_fixed_element.js
+++ b/addons/website/static/src/interactions/bottom_fixed_element.js
@@ -10,7 +10,7 @@ export class BottomFixedElement extends Interaction {
             "t-on-resize": this.hideBottomFixedElements,
             "t-on-scroll": this.hideBottomFixedElements,
         },
-    }
+    };
 
     destroy() {
         this.restoreBottomFixedElements();
@@ -41,8 +41,11 @@ export class BottomFixedElement extends Interaction {
 
         this.restoreBottomFixedElements();
 
-        if (document.scrollingElement.offsetHeight + document.scrollingElement.scrollTop >= document.scrollingElement.scrollHeight - 2) {
-            const buttonEls = [...this.el.querySelectorAll('a, .btn')].filter(isVisible);
+        if (
+            document.scrollingElement.offsetHeight + document.scrollingElement.scrollTop >=
+            document.scrollingElement.scrollHeight - 2
+        ) {
+            const buttonEls = [...this.el.querySelectorAll("a, .btn")].filter(isVisible);
             for (const bottomFixedEl of bottomFixedEls) {
                 const bcr = bottomFixedEl.getBoundingClientRect();
                 const touchingButtonEl = touching(buttonEls, {
@@ -55,11 +58,15 @@ export class BottomFixedElement extends Interaction {
                     x: bcr.x,
                     y: bcr.y,
                 });
-                if (!!touchingButtonEl.length) {
+                if (touchingButtonEl.length) {
                     if (bottomFixedEl.classList.contains("o_bottom_fixed_element_move_up")) {
-                        bottomFixedEl.style.marginBottom = window.innerHeight - touchingButtonEl.getBoundingClientRect().top + 5 + 'px';
+                        bottomFixedEl.style.marginBottom =
+                            window.innerHeight -
+                            touchingButtonEl.getBoundingClientRect().top +
+                            5 +
+                            "px";
                     } else {
-                        bottomFixedEl.classList.add('o_bottom_fixed_element_hidden');
+                        bottomFixedEl.classList.add("o_bottom_fixed_element_hidden");
                     }
                 }
             }
@@ -77,12 +84,8 @@ export class BottomFixedElement extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.bottom_fixed_element", BottomFixedElement);
+registry.category("public.interactions").add("website.bottom_fixed_element", BottomFixedElement);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.bottom_fixed_element", {
-        Interaction: BottomFixedElement,
-    });
+registry.category("public.interactions.edit").add("website.bottom_fixed_element", {
+    Interaction: BottomFixedElement,
+});
diff --git a/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.edit.js b/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.edit.js
index 42491307b2828..20b48112bd6c6 100644
--- a/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.edit.js
+++ b/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.edit.js
@@ -2,19 +2,18 @@ import { CarouselBootstrapUpgradeFix } from "@website/interactions/carousel/caro
 import { registry } from "@web/core/registry";
 import { withHistory } from "@website/core/website_edit_service";
 
-const CarouselBootstrapUpgradeFixEdit = I => class extends I {
-    // Suspend ride in edit mode.
-    carouselOptions = { ride: false, pause: true, keyboard: false };
+const CarouselBootstrapUpgradeFixEdit = (I) =>
+    class extends I {
+        // Suspend ride in edit mode.
+        carouselOptions = { ride: false, pause: true, keyboard: false };
 
-    setup() {
-        super.setup();
-        this.dynamicContent = withHistory(this.dynamicContent);
-    }
-};
+        setup() {
+            super.setup();
+            this.dynamicContent = withHistory(this.dynamicContent);
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.carousel_bootstrap_upgrade_fix", {
-        Interaction: CarouselBootstrapUpgradeFix,
-        mixin: CarouselBootstrapUpgradeFixEdit,
-    });
+registry.category("public.interactions.edit").add("website.carousel_bootstrap_upgrade_fix", {
+    Interaction: CarouselBootstrapUpgradeFix,
+    mixin: CarouselBootstrapUpgradeFixEdit,
+});
diff --git a/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.js b/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.js
index 452201c45ba8f..21488f4214a7f 100644
--- a/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.js
+++ b/addons/website/static/src/interactions/carousel/carousel_bootstrap_upgrade_fix.js
@@ -23,10 +23,10 @@ export class CarouselBootstrapUpgradeFix extends Interaction {
     ].join(", ");
     dynamicContent = {
         _root: {
-            "t-on-slide.bs.carousel": () => this.sliding = true,
-            "t-on-slid.bs.carousel": () => this.sliding = false,
+            "t-on-slide.bs.carousel": () => (this.sliding = true),
+            "t-on-slid.bs.carousel": () => (this.sliding = false),
             "t-att-class": () => ({
-                "o_carousel_sliding": this.sliding,
+                o_carousel_sliding: this.sliding,
             }),
         },
     };
@@ -41,7 +41,7 @@ export class CarouselBootstrapUpgradeFix extends Interaction {
         if (this.hasInterval || this.el.dataset.bsRide) {
             // Wait for carousel to finish sliding.
             if (this.el.classList.contains("o_carousel_sliding")) {
-                await new Promise(resolve => {
+                await new Promise((resolve) => {
                     this.addListener(this.el, "slid.bs.carousel", () => resolve(), { once: true });
                 });
             }
diff --git a/addons/website/static/src/interactions/carousel/carousel_slider.edit.js b/addons/website/static/src/interactions/carousel/carousel_slider.edit.js
index d393b1cb64976..01c72354edc04 100644
--- a/addons/website/static/src/interactions/carousel/carousel_slider.edit.js
+++ b/addons/website/static/src/interactions/carousel/carousel_slider.edit.js
@@ -1,26 +1,25 @@
 import { CarouselSlider } from "@website/interactions/carousel/carousel_slider";
 import { registry } from "@web/core/registry";
 
-const CarouselSliderEdit = I => class extends I {
-    dynamicContent = {
-        ...this.dynamicContent,
-        _root: {
-            ...this.dynamicContent._root,
-            "t-on-content_changed": this.onContentChanged,
-        },
-    };
-    // Pause carousel in edit mode.
-    carouselOptions = { ride: false, pause: true, keyboard: false };
-    showClickableSlideLinks = false;
+const CarouselSliderEdit = (I) =>
+    class extends I {
+        dynamicContent = {
+            ...this.dynamicContent,
+            _root: {
+                ...this.dynamicContent._root,
+                "t-on-content_changed": this.onContentChanged,
+            },
+        };
+        // Pause carousel in edit mode.
+        carouselOptions = { ride: false, pause: true, keyboard: false };
+        showClickableSlideLinks = false;
 
-    onContentChanged() {
-        this.computeMaxHeight();
-    }
-};
+        onContentChanged() {
+            this.computeMaxHeight();
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.carousel_slider", {
-        Interaction: CarouselSlider,
-        mixin: CarouselSliderEdit,
-    });
+registry.category("public.interactions.edit").add("website.carousel_slider", {
+    Interaction: CarouselSlider,
+    mixin: CarouselSliderEdit,
+});
diff --git a/addons/website/static/src/interactions/carousel/carousel_slider.js b/addons/website/static/src/interactions/carousel/carousel_slider.js
index 27a4f8629708a..1e6f8d864f0a1 100644
--- a/addons/website/static/src/interactions/carousel/carousel_slider.js
+++ b/addons/website/static/src/interactions/carousel/carousel_slider.js
@@ -9,7 +9,7 @@ export class CarouselSlider extends Interaction {
             "t-on-slide.bs.carousel": this.onSlideCarousel,
             "t-on-slid.bs.carousel": this.onSlidCarousel,
         },
-        "img": {
+        img: {
             "t-on-load": this.computeMaxHeight,
         },
         _window: {
@@ -29,7 +29,7 @@ export class CarouselSlider extends Interaction {
         this.maxHeight = undefined;
         this.hasInterval = ![undefined, "false", "0"].includes(this.el.dataset.bsInterval);
         if (!["true", "carousel", "false"].includes(this.el.dataset.bsRide)) {
-            this.el.dataset.bsRide = this.hasInterval ? "carousel": "false";
+            this.el.dataset.bsRide = this.hasInterval ? "carousel" : "false";
         }
         if (this.el.dataset.bsRide === "false") {
             window.Carousel.getOrCreateInstance(this.el, { ride: false, pause: true });
@@ -46,16 +46,18 @@ export class CarouselSlider extends Interaction {
 
         this.carouselInnerEl = this.el.querySelector(".carousel-inner");
 
-        const itemWidth = getComputedStyle(this.el).getPropertyValue("--o-carousel-item-width-percentage");
+        const itemWidth = getComputedStyle(this.el).getPropertyValue(
+            "--o-carousel-item-width-percentage"
+        );
         const itemsPerSlide = itemWidth ? Math.round(100 / parseFloat(itemWidth)) : 1;
         this.options = {
-            scrollMode: this.el.classList.contains('o_carousel_multi_items') ? 'single' : 'all',
+            scrollMode: this.el.classList.contains("o_carousel_multi_items") ? "single" : "all",
             itemsPerSlide: itemsPerSlide,
         };
 
         // Preload first items only when carousel is on screen
-        const observer = new IntersectionObserver(entries => {
-            entries.forEach(entry => {
+        const observer = new IntersectionObserver((entries) => {
+            entries.forEach((entry) => {
                 if (entry.isIntersecting) {
                     this.loadItemsToAppear();
                     observer.unobserve(this.el);
@@ -89,7 +91,7 @@ export class CarouselSlider extends Interaction {
      */
     onSlideCarousel(ev) {
         const imageEls = [...this.carouselInnerEl.querySelectorAll("img")];
-        const isLoading = imageEls.some(el => el.loading !== "lazy" && !el.complete);
+        const isLoading = imageEls.some((el) => el.loading !== "lazy" && !el.complete);
         if (isLoading) {
             // If images are loading, prevent the slide transition. It will
             // slide once the next images are loaded.
@@ -127,7 +129,9 @@ export class CarouselSlider extends Interaction {
         // We need to keep the active element at the beginning of the carousel-items elements
         // This allows to have a smooth transition when the carousel is sliding
         if (ev.direction === "right") {
-            const carouselItemsEls = Array.from(this.carouselInnerEl.querySelectorAll(".carousel-item"));
+            const carouselItemsEls = Array.from(
+                this.carouselInnerEl.querySelectorAll(".carousel-item")
+            );
             this.carouselInnerEl.prepend(carouselItemsEls.pop());
         }
     }
@@ -160,12 +164,16 @@ export class CarouselSlider extends Interaction {
             return;
         }
         const itemEls = Array.from(this.carouselInnerEl.children);
-        const index = itemEls.findIndex(el => el.classList.contains("active"));
+        const index = itemEls.findIndex((el) => el.classList.contains("active"));
         const activeItemIndex = index >= 0 ? index : 0;
 
         // Load "Next" items: nbItemsToLoad items after the active element
-        const nbItemElsOnScreen = this.options.scrollMode === "single" ? this.options.itemsPerSlide + 1 : 1;
-        const nextEndIndex = Math.min(activeItemIndex + nbItemElsOnScreen + nbItemsToLoad + 1, itemEls.length);
+        const nbItemElsOnScreen =
+            this.options.scrollMode === "single" ? this.options.itemsPerSlide + 1 : 1;
+        const nextEndIndex = Math.min(
+            activeItemIndex + nbItemElsOnScreen + nbItemsToLoad + 1,
+            itemEls.length
+        );
         const nextItemElsToLoad = itemEls.slice(activeItemIndex, nextEndIndex);
 
         // load "Prev" items : nbItemsToLoad items before the active element (circular wrapping)
@@ -173,16 +181,21 @@ export class CarouselSlider extends Interaction {
         let prevItemElsToLoad = [];
         if (activeItemIndex - nbItemsToLoad < 0) {
             const wrapAmount = Math.abs(activeItemIndex - nbItemsToLoad);
-            prevItemElsToLoad = itemEls.slice(itemEls.length - wrapAmount, itemEls.length).reverse().concat(itemEls.slice(0, activeItemIndex).reverse());
+            prevItemElsToLoad = itemEls
+                .slice(itemEls.length - wrapAmount, itemEls.length)
+                .reverse()
+                .concat(itemEls.slice(0, activeItemIndex).reverse());
         } else {
-            prevItemElsToLoad = itemEls.slice(Math.max(0, activeItemIndex - nbItemsToLoad), activeItemIndex).reverse();
+            prevItemElsToLoad = itemEls
+                .slice(Math.max(0, activeItemIndex - nbItemsToLoad), activeItemIndex)
+                .reverse();
         }
 
         // Set the `loading` attribute of lazy-loaded images to `eager` for the
         // given carousel items. This forces the browser to load the images
         // immediately.
         const itemsToLoad = nextItemElsToLoad.concat(prevItemElsToLoad);
-        for (let carouselItemEl of itemsToLoad) {
+        for (const carouselItemEl of itemsToLoad) {
             const imageEls = carouselItemEl.querySelectorAll("img[loading='lazy']");
             for (const imageEl of imageEls) {
                 // Note that we remove the attribute with the goal of forcing it
@@ -195,6 +208,4 @@ export class CarouselSlider extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.carousel_slider", CarouselSlider);
+registry.category("public.interactions").add("website.carousel_slider", CarouselSlider);
diff --git a/addons/website/static/src/interactions/cookies/cookies_approval.js b/addons/website/static/src/interactions/cookies/cookies_approval.js
index 19b83dcee6c4f..6b155d0ff7af6 100644
--- a/addons/website/static/src/interactions/cookies/cookies_approval.js
+++ b/addons/website/static/src/interactions/cookies/cookies_approval.js
@@ -29,14 +29,20 @@ export class CookiesApproval extends Interaction {
     }
 
     addOptionalCookiesWarning() {
-        this.renderAt("website.cookiesWarning", {
-            extraStyle: this.iframeEl.parentElement.classList.contains("media_iframe_video")
-                ? `aspect-ratio: 16/9; max-width: ${MEDIAS_BREAKPOINTS[SIZES.SM].maxWidth}px;`
-                : "",
-            extraClasses: getComputedStyle(this.iframeEl.parentElement).position === "absolute"
-                ? ""
-                : "my-3",
-        }, this.iframeEl, "afterend");
+        this.renderAt(
+            "website.cookiesWarning",
+            {
+                extraStyle: this.iframeEl.parentElement.classList.contains("media_iframe_video")
+                    ? `aspect-ratio: 16/9; max-width: ${MEDIAS_BREAKPOINTS[SIZES.SM].maxWidth}px;`
+                    : "",
+                extraClasses:
+                    getComputedStyle(this.iframeEl.parentElement).position === "absolute"
+                        ? ""
+                        : "my-3",
+            },
+            this.iframeEl,
+            "afterend"
+        );
     }
 
     onOptionalCookiesAccepted() {
@@ -48,6 +54,4 @@ export class CookiesApproval extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.cookies_approval", CookiesApproval);
+registry.category("public.interactions").add("website.cookies_approval", CookiesApproval);
diff --git a/addons/website/static/src/interactions/cookies/cookies_bar.js b/addons/website/static/src/interactions/cookies/cookies_bar.js
index da522b5a99172..ab3f8f511d08f 100644
--- a/addons/website/static/src/interactions/cookies/cookies_bar.js
+++ b/addons/website/static/src/interactions/cookies/cookies_bar.js
@@ -24,7 +24,7 @@ export class CookiesBar extends Popup {
         },
         "#cookies-consent-essential, #cookies-consent-all": { "t-on-click": this.onAcceptClick },
         // Override to avoid side effects on hide.
-        ".js_close_popup": { "t-on-click": () => { } },
+        ".js_close_popup": { "t-on-click": () => {} },
     };
 
     setup() {
@@ -94,7 +94,7 @@ export class CookiesBar extends Popup {
      */
     onShowCookiesBar() {
         const currCookie = cookie.get(this.el.id);
-        if (currCookie && JSON.parse(currCookie).optional || !this.popupAlreadyShown) {
+        if ((currCookie && JSON.parse(currCookie).optional) || !this.popupAlreadyShown) {
             return;
         }
         this.bsModal.show();
@@ -110,6 +110,4 @@ export class CookiesBar extends Popup {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.cookies_bar", CookiesBar);
+registry.category("public.interactions").add("website.cookies_bar", CookiesBar);
diff --git a/addons/website/static/src/interactions/cookies/cookies_toggle.js b/addons/website/static/src/interactions/cookies/cookies_toggle.js
index 20b06cac27d81..2d24ef0439421 100644
--- a/addons/website/static/src/interactions/cookies/cookies_toggle.js
+++ b/addons/website/static/src/interactions/cookies/cookies_toggle.js
@@ -53,17 +53,19 @@ export class CookiesToggle extends Interaction {
             const toggleMargin = 8;
             // Avoid having the toggle over another button, but if the cookies
             // bar is too tall, place it at the bottom anyway.
-            const bottom = document.body.offsetHeight > popupHeight + this.el.offsetHeight + toggleMargin
-                ? `calc(
-                    ${getComputedStyle(this.cookiesModalEl.querySelector(".modal-dialog")).paddingBottom}
+            const bottom =
+                document.body.offsetHeight > popupHeight + this.el.offsetHeight + toggleMargin
+                    ? `calc(
+                    ${
+                        getComputedStyle(this.cookiesModalEl.querySelector(".modal-dialog"))
+                            .paddingBottom
+                    }
                     + ${popupHeight + toggleMargin}px
                 )`
-                : "";
+                    : "";
             this.el.style.setProperty("--cookies-bar-toggle-inset-block-end", bottom);
         }
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.cookies_toggle", CookiesToggle);
+registry.category("public.interactions").add("website.cookies_toggle", CookiesToggle);
diff --git a/addons/website/static/src/interactions/cookies/cookies_warning.js b/addons/website/static/src/interactions/cookies/cookies_warning.js
index 04468c06c4f62..8c31a36202054 100644
--- a/addons/website/static/src/interactions/cookies/cookies_warning.js
+++ b/addons/website/static/src/interactions/cookies/cookies_warning.js
@@ -5,7 +5,7 @@ export class CookiesWarning extends Interaction {
     static selector = ".o_no_optional_cookie";
     dynamicSelectors = {
         ...this.dynamicSelectors,
-        _iframe: () => this.keptIframeEl ??= this.el.previousElementSibling,
+        _iframe: () => (this.keptIframeEl ??= this.el.previousElementSibling),
     };
     dynamicContent = {
         _root: { "t-on-click": () => this.services.website_cookies.bus.trigger("cookiesBar.show") },
@@ -25,6 +25,4 @@ export class CookiesWarning extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.cookies_warning", CookiesWarning);
+registry.category("public.interactions").add("website.cookies_warning", CookiesWarning);
diff --git a/addons/website/static/src/interactions/dropdown/hoverable_dropdown.edit.js b/addons/website/static/src/interactions/dropdown/hoverable_dropdown.edit.js
index e7b8ae0c66380..a0930d7d790a1 100644
--- a/addons/website/static/src/interactions/dropdown/hoverable_dropdown.edit.js
+++ b/addons/website/static/src/interactions/dropdown/hoverable_dropdown.edit.js
@@ -1,25 +1,24 @@
 import { HoverableDropdown } from "@website/interactions/dropdown/hoverable_dropdown";
 import { registry } from "@web/core/registry";
 
-const HoverableDropdownEdit = I => class extends I {
-    /**
-     * @param {MouseEvent} ev
-     * @param {HTMLElement} currentTargetEl
-     */
-    onMouseEnter(ev, currentTargetEl) {
-        if (this.el.querySelector(".dropdown-toggle.show")) {
-            return;
-        } else {
-            super.onMouseEnter(ev, currentTargetEl);
+const HoverableDropdownEdit = (I) =>
+    class extends I {
+        /**
+         * @param {MouseEvent} ev
+         * @param {HTMLElement} currentTargetEl
+         */
+        onMouseEnter(ev, currentTargetEl) {
+            if (this.el.querySelector(".dropdown-toggle.show")) {
+                return;
+            } else {
+                super.onMouseEnter(ev, currentTargetEl);
+            }
         }
-    }
 
-    onMouseLeave() { }
-};
+        onMouseLeave() {}
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.hoverable_dropdown", {
-        Interaction: HoverableDropdown,
-        mixin: HoverableDropdownEdit,
-    });
+registry.category("public.interactions.edit").add("website.hoverable_dropdown", {
+    Interaction: HoverableDropdown,
+    mixin: HoverableDropdownEdit,
+});
diff --git a/addons/website/static/src/interactions/dropdown/hoverable_dropdown.js b/addons/website/static/src/interactions/dropdown/hoverable_dropdown.js
index 246a545773561..33c617dcb393d 100644
--- a/addons/website/static/src/interactions/dropdown/hoverable_dropdown.js
+++ b/addons/website/static/src/interactions/dropdown/hoverable_dropdown.js
@@ -13,7 +13,7 @@ export class HoverableDropdown extends Interaction {
         ".nav:not(.o_mega_menu_is_offcanvas) .o_mega_menu": {
             "t-att-style": () => ({
                 "margin-top": this.isSmall() ? "" : "0 !important",
-                "top": this.isSmall() ? "" : "unset",
+                top: this.isSmall() ? "" : "unset",
             }),
         },
         _window: {
@@ -40,11 +40,7 @@ export class HoverableDropdown extends Interaction {
      */
     updateDropdownVisibility(dropdownEl, show) {
         const dropdownToggleEl = dropdownEl.querySelector(".dropdown-toggle");
-        if (
-            this.isSmall()
-            || !dropdownToggleEl
-            || dropdownEl.closest(".o_extra_menu_items")
-        ) {
+        if (this.isSmall() || !dropdownToggleEl || dropdownEl.closest(".o_extra_menu_items")) {
             return;
         }
         const dropdown = Dropdown.getOrCreateInstance(dropdownToggleEl);
@@ -56,8 +52,9 @@ export class HoverableDropdown extends Interaction {
      * @param {HTMLElement} currentTargetEl
      */
     onMouseEnter(ev, currentTargetEl) {
-        const focusedEl = this.el.ownerDocument.querySelector(":focus")
-            || window.frameElement?.ownerDocument.querySelector(":focus");
+        const focusedEl =
+            this.el.ownerDocument.querySelector(":focus") ||
+            window.frameElement?.ownerDocument.querySelector(":focus");
 
         // The user must click on the dropdown if he is on mobile (no way to
         // hover) or if the dropdown is the (or in the) extra menu ('+').
@@ -90,6 +87,4 @@ export class HoverableDropdown extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.hoverable_dropdown", HoverableDropdown);
+registry.category("public.interactions").add("website.hoverable_dropdown", HoverableDropdown);
diff --git a/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.edit.js b/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.edit.js
index 742a2f040baf6..fd49eaed61e0e 100644
--- a/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.edit.js
+++ b/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.edit.js
@@ -1,43 +1,49 @@
 import { registry } from "@web/core/registry";
 import { MegaMenuDropdown } from "./mega_menu_dropdown";
 
-const MegaMenuDropdownEdit = (I) => class extends I {
-    dynamicContent = {
-        ...this.dynamicContent,
-        ".o_mega_menu_toggle": {
-            ...this.dynamicContent[".o_mega_menu_toggle"],
-            "t-on-click": (ev) => {
-                const toggleEl = ev.currentTarget;
-                const megaMenuEl = toggleEl.parentElement.querySelector(".o_mega_menu"); 
-                // Activate the mega menu options when shown.
-                if (!megaMenuEl || !megaMenuEl.classList.contains("show")) {
-                    this.websiteEditService.callShared("builderOptions", "deactivateContainers");  
-                } else {
-                    this.websiteEditService.callShared("builderOptions", "updateContainers", megaMenuEl);
-                }
+const MegaMenuDropdownEdit = (I) =>
+    class extends I {
+        dynamicContent = {
+            ...this.dynamicContent,
+            ".o_mega_menu_toggle": {
+                ...this.dynamicContent[".o_mega_menu_toggle"],
+                "t-on-click": (ev) => {
+                    const toggleEl = ev.currentTarget;
+                    const megaMenuEl = toggleEl.parentElement.querySelector(".o_mega_menu");
+                    // Activate the mega menu options when shown.
+                    if (!megaMenuEl || !megaMenuEl.classList.contains("show")) {
+                        this.websiteEditService.callShared(
+                            "builderOptions",
+                            "deactivateContainers"
+                        );
+                    } else {
+                        this.websiteEditService.callShared(
+                            "builderOptions",
+                            "updateContainers",
+                            megaMenuEl
+                        );
+                    }
+                },
             },
-        },
-    };
+        };
 
-    setup() {
-        super.setup();
-        this.websiteEditService = this.services.website_edit;
+        setup() {
+            super.setup();
+            this.websiteEditService = this.services.website_edit;
 
-        // Hide all the open mega menus when destroying the interaction.
-        this.registerCleanup(() => {
-            const megaMenuToggleEls = this.el.querySelectorAll(".o_mega_menu_toggle.show");
-            for (const megaMenuToggleEl of megaMenuToggleEls) {
-                const bsDropdown = window.Dropdown.getOrCreateInstance(megaMenuToggleEl);
-                bsDropdown.hide();
-                bsDropdown.dispose();
-            }
-        });
-    }
-};
+            // Hide all the open mega menus when destroying the interaction.
+            this.registerCleanup(() => {
+                const megaMenuToggleEls = this.el.querySelectorAll(".o_mega_menu_toggle.show");
+                for (const megaMenuToggleEl of megaMenuToggleEls) {
+                    const bsDropdown = window.Dropdown.getOrCreateInstance(megaMenuToggleEl);
+                    bsDropdown.hide();
+                    bsDropdown.dispose();
+                }
+            });
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.mega_menu_dropdown", {
-        Interaction: MegaMenuDropdown,
-        mixin: MegaMenuDropdownEdit,
-    });
+registry.category("public.interactions.edit").add("website.mega_menu_dropdown", {
+    Interaction: MegaMenuDropdown,
+    mixin: MegaMenuDropdownEdit,
+});
diff --git a/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.js b/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.js
index 59db5c66b67d0..051d9f930eba3 100644
--- a/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.js
+++ b/addons/website/static/src/interactions/dropdown/mega_menu_dropdown.js
@@ -102,9 +102,9 @@ export class MegaMenuDropdown extends Interaction {
     onTriggerMegaMenu(ev, currentTargetEl) {
         // Hoverable menus are clicked in mobile view
         if (
-            this.el.classList.contains("o_hoverable_dropdown")
-            && !currentTargetEl.closest(".o_header_mobile")
-            && ev.type !== "keyup"
+            this.el.classList.contains("o_hoverable_dropdown") &&
+            !currentTargetEl.closest(".o_header_mobile") &&
+            ev.type !== "keyup"
         ) {
             return;
         }
@@ -118,8 +118,8 @@ export class MegaMenuDropdown extends Interaction {
     onHoverMegaMenu(ev, currentTargetEl) {
         // Hoverable menus are clicked in mobile view
         if (
-            !this.el.classList.contains("o_hoverable_dropdown")
-            || currentTargetEl.closest(".o_header_mobile")
+            !this.el.classList.contains("o_hoverable_dropdown") ||
+            currentTargetEl.closest(".o_header_mobile")
         ) {
             return;
         }
@@ -139,10 +139,8 @@ export class MegaMenuDropdown extends Interaction {
         const megaMenuToggleEls = ev.target
             .closest(".o_extra_menu_items")
             .querySelectorAll(".o_mega_menu_toggle");
-        megaMenuToggleEls.forEach(el => this.moveMegaMenu(el));
+        megaMenuToggleEls.forEach((el) => this.moveMegaMenu(el));
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.mega_menu_dropdown", MegaMenuDropdown);
+registry.category("public.interactions").add("website.mega_menu_dropdown", MegaMenuDropdown);
diff --git a/addons/website/static/src/interactions/footer_slideout.js b/addons/website/static/src/interactions/footer_slideout.js
index 8b724f0d4b0cb..889dc2c0bb8d8 100644
--- a/addons/website/static/src/interactions/footer_slideout.js
+++ b/addons/website/static/src/interactions/footer_slideout.js
@@ -24,12 +24,8 @@ export class FooterSlideout extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.footer_slideout", FooterSlideout);
+registry.category("public.interactions").add("website.footer_slideout", FooterSlideout);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.footer_slideout", {
-        Interaction: FooterSlideout,
-    });
+registry.category("public.interactions.edit").add("website.footer_slideout", {
+    Interaction: FooterSlideout,
+});
diff --git a/addons/website/static/src/interactions/full_screen_height.edit.js b/addons/website/static/src/interactions/full_screen_height.edit.js
index b997fcb7cff81..31b2a0fbb3eaa 100644
--- a/addons/website/static/src/interactions/full_screen_height.edit.js
+++ b/addons/website/static/src/interactions/full_screen_height.edit.js
@@ -1,16 +1,15 @@
 import { registry } from "@web/core/registry";
 import { FullScreenHeight } from "./full_screen_height";
 
-const FullScreenHeightEdit = I => class extends I {
-    shouldStop() {
-        // Force restart on refresh.
-        return true;
-    }
-};
+const FullScreenHeightEdit = (I) =>
+    class extends I {
+        shouldStop() {
+            // Force restart on refresh.
+            return true;
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.full_screen_height", {
-        Interaction: FullScreenHeight,
-        mixin: FullScreenHeightEdit,
-    });
+registry.category("public.interactions.edit").add("website.full_screen_height", {
+    Interaction: FullScreenHeight,
+    mixin: FullScreenHeightEdit,
+});
diff --git a/addons/website/static/src/interactions/full_screen_height.js b/addons/website/static/src/interactions/full_screen_height.js
index ec2e8b0e821d3..261bf183331ee 100644
--- a/addons/website/static/src/interactions/full_screen_height.js
+++ b/addons/website/static/src/interactions/full_screen_height.js
@@ -14,7 +14,9 @@ export class FullScreenHeight extends Interaction {
         },
         _root: {
             "t-att-style": () => ({
-                "min-height": this.isActive ? `${this.computeIdealHeight()}px !important` : undefined,
+                "min-height": this.isActive
+                    ? `${this.computeIdealHeight()}px !important`
+                    : undefined,
             }),
         },
     };
@@ -26,7 +28,7 @@ export class FullScreenHeight extends Interaction {
         // Only initialize if taller than the ideal height as some extra css
         // rules may alter the full-screen-height class behavior in some
         // cases (blog...).
-        this.isActive = !isVisible(this.el) || (currentHeight > idealHeight + 1);
+        this.isActive = !isVisible(this.el) || currentHeight > idealHeight + 1;
     }
 
     computeIdealHeight() {
@@ -38,21 +40,23 @@ export class FullScreenHeight extends Interaction {
         // can't because of Arc browser).
         const viewportWidth = window.innerWidth;
         const viewportHeight = window.innerHeight;
-        if (!this.smallestViewportHeight
-                // Update svh definition only if the viewport resize seems to
-                // not be to a mobile browser UI change (e.g. Arc browser
-                // mistakenly changes svh while its UI changes at the moment).
-                || Math.abs(viewportWidth - this.previousViewportWidth) > 15
-                || Math.abs(viewportHeight - this.previousViewportHeight) > 150) {
+        if (
+            !this.smallestViewportHeight ||
+            // Update svh definition only if the viewport resize seems to
+            // not be to a mobile browser UI change (e.g. Arc browser
+            // mistakenly changes svh while its UI changes at the moment).
+            Math.abs(viewportWidth - this.previousViewportWidth) > 15 ||
+            Math.abs(viewportHeight - this.previousViewportHeight) > 150
+        ) {
             this.previousViewportWidth = viewportWidth;
             this.previousViewportHeight = viewportHeight;
-            const el = document.createElement('div');
-            el.classList.add('vh-100');
-            el.style.position = 'fixed';
-            el.style.top = '0';
-            el.style.pointerEvents = 'none';
-            el.style.visibility = 'hidden';
-            el.style.setProperty('height', '100svh', 'important');
+            const el = document.createElement("div");
+            el.classList.add("vh-100");
+            el.style.position = "fixed";
+            el.style.top = "0";
+            el.style.pointerEvents = "none";
+            el.style.visibility = "hidden";
+            el.style.setProperty("height", "100svh", "important");
             document.body.appendChild(el);
             this.smallestViewportHeight = parseFloat(el.getBoundingClientRect().height);
             document.body.removeChild(el);
@@ -64,12 +68,14 @@ export class FullScreenHeight extends Interaction {
 
         // Doing it that way allows to consider fixed headers, hidden headers,
         // connected users, ...
-        const firstContentEl = this.el.ownerDocument.querySelector("#wrapwrap > main > :first-child"); // first child to consider the padding-top of main
-        const mainTopPos = firstContentEl.getBoundingClientRect().top + this.el.ownerDocument.documentElement.scrollTop;
-        return (this.smallestViewportHeight - mainTopPos);
+        const firstContentEl = this.el.ownerDocument.querySelector(
+            "#wrapwrap > main > :first-child"
+        ); // first child to consider the padding-top of main
+        const mainTopPos =
+            firstContentEl.getBoundingClientRect().top +
+            this.el.ownerDocument.documentElement.scrollTop;
+        return this.smallestViewportHeight - mainTopPos;
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.full_screen_height", FullScreenHeight);
+registry.category("public.interactions").add("website.full_screen_height", FullScreenHeight);
diff --git a/addons/website/static/src/interactions/header/base_header.edit.js b/addons/website/static/src/interactions/header/base_header.edit.js
index d6a1368366ba5..71862257b16eb 100644
--- a/addons/website/static/src/interactions/header/base_header.edit.js
+++ b/addons/website/static/src/interactions/header/base_header.edit.js
@@ -1,14 +1,13 @@
 import { BaseHeader } from "@website/interactions/header/base_header";
 import { registry } from "@web/core/registry";
 
-const BaseHeaderEdit = I => class extends I {
-    adjustPosition() { }
-};
+const BaseHeaderEdit = (I) =>
+    class extends I {
+        adjustPosition() {}
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.base_header", {
-        Interaction: BaseHeader,
-        mixin: BaseHeaderEdit,
-        isAbstract: true,
-    });
+registry.category("public.interactions.edit").add("website.base_header", {
+    Interaction: BaseHeader,
+    mixin: BaseHeaderEdit,
+    isAbstract: true,
+});
diff --git a/addons/website/static/src/interactions/header/base_header.js b/addons/website/static/src/interactions/header/base_header.js
index 540f4bfd9828d..971de78db2b41 100644
--- a/addons/website/static/src/interactions/header/base_header.js
+++ b/addons/website/static/src/interactions/header/base_header.js
@@ -19,10 +19,10 @@ export class BaseHeader extends Interaction {
         _root: {
             "t-on-transitionend": () => this.adaptToHeaderChangeLoop(-1),
             "t-att-class": () => ({
-                "o_top_fixed_element": this.isVisible,
-                "o_header_affixed": this.cssAffixed,
-                "o_header_is_scrolled": this.isScrolled,
-                "o_header_no_transition": !this.transitionActive,
+                o_top_fixed_element: this.isVisible,
+                o_header_affixed: this.cssAffixed,
+                o_header_is_scrolled: this.isScrolled,
+                o_header_no_transition: !this.transitionActive,
             }),
         },
         ".offcanvas": {
@@ -63,9 +63,11 @@ export class BaseHeader extends Interaction {
 
         this.scrollingElement = document.scrollingElement;
         const navbarEl = this.el.querySelector(".navbar");
-        const navBreakpoint = navbarEl ? Object.keys(SIZES).find((size) =>
-            navbarEl.classList.contains(`navbar-expand-${size.toLowerCase()}`)
-        ) : "LG";
+        const navBreakpoint = navbarEl
+            ? Object.keys(SIZES).find((size) =>
+                  navbarEl.classList.contains(`navbar-expand-${size.toLowerCase()}`)
+              )
+            : "LG";
         this.breakpointSize = SIZES[navBreakpoint];
 
         this.hasScrolled = false;
@@ -99,10 +101,7 @@ export class BaseHeader extends Interaction {
 
     onResize() {
         this.adjustScrollbar();
-        if (
-            document.body.classList.contains('overflow-hidden')
-            && !this.isSmall()
-        ) {
+        if (document.body.classList.contains("overflow-hidden") && !this.isSmall()) {
             const offCanvasEls = this.el.querySelectorAll(".offcanvas.show");
             for (const offCanvasEl of offCanvasEls) {
                 Offcanvas.getOrCreateInstance(offCanvasEl).hide();
@@ -113,8 +112,7 @@ export class BaseHeader extends Interaction {
             for (const collapseEl of collapseEls) {
                 Collapse.getOrCreateInstance(collapseEl).hide();
             }
-        }
-        else {
+        } else {
             this.adjustMainPadding();
         }
     }
@@ -134,7 +132,7 @@ export class BaseHeader extends Interaction {
         }
 
         if (this.closeDropdowns) {
-            this.el.querySelectorAll(".dropdown-toggle.show").forEach(dropdownToggleEl => {
+            this.el.querySelectorAll(".dropdown-toggle.show").forEach((dropdownToggleEl) => {
                 Dropdown.getOrCreateInstance(dropdownToggleEl).hide();
             });
         }
@@ -167,7 +165,9 @@ export class BaseHeader extends Interaction {
             if (addCount !== 0) {
                 clearTimeout(this.changeLoopTimer);
                 this.changeLoopTimer = this.waitForTimeout(
-                    () => this.adaptToHeaderChangeLoop(- this.transitionCount), 500);
+                    () => this.adaptToHeaderChangeLoop(-this.transitionCount),
+                    500
+                );
             }
         } else {
             // When we detected all transitionend events, we need to stop the
@@ -183,7 +183,9 @@ export class BaseHeader extends Interaction {
 
     transformShow() {
         this.isVisible = true;
-        this.el.style.transform = this.atTop ? "" : `translate(0, -${this.forcedScroll + this.topGap}px)`;
+        this.el.style.transform = this.atTop
+            ? ""
+            : `translate(0, -${this.forcedScroll + this.topGap}px)`;
         this.adaptToHeaderChangeLoop(1);
     }
 
@@ -200,18 +202,21 @@ export class BaseHeader extends Interaction {
     adjustPosition() {
         // When the url contains #aRandomSection, prevent the navbar to overlap
         // on the section, for this, we scroll as many px as the navbar height.
-        this.scrollingElement.scrollBy(0, - this.el.offsetHeight);
+        this.scrollingElement.scrollBy(0, -this.el.offsetHeight);
     }
 
     adjustScrollbar() {
-        compensateScrollbar(this.el, this.cssAffixed, false, 'right');
+        compensateScrollbar(this.el, this.cssAffixed, false, "right");
     }
 
     adjustMainPadding() {
         if (this.isOverlay) {
             return;
         }
-        this.mainEl.style.setProperty("padding-top", this.cssAffixed ? this.getHeaderHeight() + "px" : "");
+        this.mainEl.style.setProperty(
+            "padding-top",
+            this.cssAffixed ? this.getHeaderHeight() + "px" : ""
+        );
     }
 
     //--------------------------------------------------------------
diff --git a/addons/website/static/src/interactions/header/base_header_special.js b/addons/website/static/src/interactions/header/base_header_special.js
index f7c1c47f7c6e9..24a4877da191f 100644
--- a/addons/website/static/src/interactions/header/base_header_special.js
+++ b/addons/website/static/src/interactions/header/base_header_special.js
@@ -33,8 +33,8 @@ export class BaseHeaderSpecial extends BaseHeader {
      * @param {Event} ev
      */
     onDropdownShow(ev) {
-        // If a dropdown inside the element 'this.hideEl' is clicked while the 
-        // header is fixed, we need to scroll the page up so that the 
+        // If a dropdown inside the element 'this.hideEl' is clicked while the
+        // header is fixed, we need to scroll the page up so that the
         // 'this.hideEl' element is no longer overflow hidden. Without
         // this, the dropdown would be invisible.
         if (this.cssAffixed) {
@@ -60,8 +60,8 @@ export class BaseHeaderSpecial extends BaseHeader {
 
         const scroll = this.scrollingElement.scrollTop;
 
-        this.atTop = (scroll <= this.topGap);
-        this.isScrolled = (scroll > this.topGap);
+        this.atTop = scroll <= this.topGap;
+        this.isScrolled = scroll > this.topGap;
 
         // Need to be 'unfixed' when the window is not scrolled so that the
         // transparent menu option still works.
@@ -82,18 +82,21 @@ export class BaseHeaderSpecial extends BaseHeader {
             this.hideEl.classList.remove("hidden");
             let elHeight = 0;
             if (this.cssAffixed) {
-                // Close the dropdowns if they are open when scrolling. 
+                // Close the dropdowns if they are open when scrolling.
                 // Otherwise, the calculated height of the 'hideEl' element will
                 // be incorrect because it will include the dropdown height.
-                this.hideEl.querySelectorAll(".dropdown-toggle.show").forEach(dropdownToggleEl => {
-                    Dropdown.getOrCreateInstance(dropdownToggleEl).hide();
-                });
+                this.hideEl
+                    .querySelectorAll(".dropdown-toggle.show")
+                    .forEach((dropdownToggleEl) => {
+                        Dropdown.getOrCreateInstance(dropdownToggleEl).hide();
+                    });
                 elHeight = this.hideEl.offsetHeight;
             } else {
                 elHeight = this.hideEl.scrollHeight;
             }
-            const scrollDelta = window.matchMedia(`(prefers-reduced-motion: reduce)`).matches ?
-                scroll : Math.floor(scroll / 4);
+            const scrollDelta = window.matchMedia(`(prefers-reduced-motion: reduce)`).matches
+                ? scroll
+                : Math.floor(scroll / 4);
             elHeight = Math.max(0, elHeight - scrollDelta);
             this.hideEl.classList.toggle("hidden", elHeight === 0);
             if (elHeight === 0) {
@@ -123,7 +126,7 @@ export class BaseHeaderSpecial extends BaseHeader {
         }
 
         if (this.isAnimated && this.transitionActive) {
-            const scrollingDownward = (scroll > this.position);
+            const scrollingDownward = scroll > this.position;
             this.position = scroll;
             if (this.scrollingDownward !== scrollingDownward) {
                 this.checkpoint = scroll;
@@ -131,13 +134,13 @@ export class BaseHeaderSpecial extends BaseHeader {
             this.scrollingDownward = scrollingDownward;
 
             if (scrollingDownward) {
-                const movement = (this.position - this.checkpoint);
-                if (this.isVisible && movement > (this.scrollOffset + this.topGap)) {
+                const movement = this.position - this.checkpoint;
+                if (this.isVisible && movement > this.scrollOffset + this.topGap) {
                     this.transformHide();
                 }
             } else {
-                const movement = (this.checkpoint - this.position);
-                if (!this.isVisible && movement > ((this.scrollOffset + this.topGap) / 2)) {
+                const movement = this.checkpoint - this.position;
+                if (!this.isVisible && movement > (this.scrollOffset + this.topGap) / 2) {
                     this.transformShow();
                 }
             }
@@ -145,9 +148,7 @@ export class BaseHeaderSpecial extends BaseHeader {
     }
 }
 
-registry
-    .category("public.interactions.edit")
-    .add("website.base_header_special", {
-        Interaction: BaseHeaderSpecial,
-        isAbstract: true,
-    });
+registry.category("public.interactions.edit").add("website.base_header_special", {
+    Interaction: BaseHeaderSpecial,
+    isAbstract: true,
+});
diff --git a/addons/website/static/src/interactions/header/header_disappears.js b/addons/website/static/src/interactions/header/header_disappears.js
index 9ab9b399766e8..f099bc9f57011 100644
--- a/addons/website/static/src/interactions/header/header_disappears.js
+++ b/addons/website/static/src/interactions/header/header_disappears.js
@@ -10,12 +10,8 @@ export class HeaderDisappears extends BaseHeaderSpecial {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.header_disappears", HeaderDisappears);
+registry.category("public.interactions").add("website.header_disappears", HeaderDisappears);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.header_disappears", {
-        Interaction: HeaderDisappears,
-    });
+registry.category("public.interactions.edit").add("website.header_disappears", {
+    Interaction: HeaderDisappears,
+});
diff --git a/addons/website/static/src/interactions/header/header_fade_out.js b/addons/website/static/src/interactions/header/header_fade_out.js
index d544ec4d12b2f..6a9393f4d6c77 100644
--- a/addons/website/static/src/interactions/header/header_fade_out.js
+++ b/addons/website/static/src/interactions/header/header_fade_out.js
@@ -8,7 +8,7 @@ export class HeaderFadeOut extends BaseHeaderSpecial {
         super.setup();
         this.isAnimated = true;
         this.el.style.transitionDuration = "400ms";
-        this.el.style.transitionProperty = 'opacity';
+        this.el.style.transitionProperty = "opacity";
     }
 
     transformShow() {
@@ -20,17 +20,13 @@ export class HeaderFadeOut extends BaseHeaderSpecial {
         this.el.style.opacity = 0;
         this.isVisible = false;
         // We want to translate the header after the transition is complete
-        this.waitForTimeout(() => this.el.style.transform = "translate(0, -100%)", 400);
+        this.waitForTimeout(() => (this.el.style.transform = "translate(0, -100%)"), 400);
         this.adaptToHeaderChangeLoop(1);
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.header_fade_out", HeaderFadeOut);
+registry.category("public.interactions").add("website.header_fade_out", HeaderFadeOut);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.header_fade_out", {
-        Interaction: HeaderFadeOut,
-    });
+registry.category("public.interactions.edit").add("website.header_fade_out", {
+    Interaction: HeaderFadeOut,
+});
diff --git a/addons/website/static/src/interactions/header/header_fixed.js b/addons/website/static/src/interactions/header/header_fixed.js
index 6de5f4b0bafcf..9839ab5420fbc 100644
--- a/addons/website/static/src/interactions/header/header_fixed.js
+++ b/addons/website/static/src/interactions/header/header_fixed.js
@@ -5,12 +5,8 @@ export class HeaderFixed extends BaseHeaderSpecial {
     static selector = "header.o_header_fixed:not(.o_header_sidebar)";
 }
 
-registry
-    .category("public.interactions")
-    .add("website.header_fixed", HeaderFixed);
+registry.category("public.interactions").add("website.header_fixed", HeaderFixed);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.header_fixed", {
-        Interaction: HeaderFixed,
-    });
+registry.category("public.interactions.edit").add("website.header_fixed", {
+    Interaction: HeaderFixed,
+});
diff --git a/addons/website/static/src/interactions/header/header_standard.js b/addons/website/static/src/interactions/header/header_standard.js
index 9da96c466d850..cd41b0e41e9a9 100644
--- a/addons/website/static/src/interactions/header/header_standard.js
+++ b/addons/website/static/src/interactions/header/header_standard.js
@@ -27,10 +27,15 @@ export class HeaderStandard extends BaseHeader {
      */
     canTransition() {
         const scrollEl = this.scrollingElement;
-        const remainingScroll = (scrollEl.scrollHeight - scrollEl.clientHeight) - this.transitionPoint;
+        const remainingScroll =
+            scrollEl.scrollHeight - scrollEl.clientHeight - this.transitionPoint;
         const clonedHeader = this.el.cloneNode(true);
         scrollEl.append(clonedHeader);
-        clonedHeader.classList.add('o_header_is_scrolled', 'o_header_affixed', 'o_header_no_transition');
+        clonedHeader.classList.add(
+            "o_header_is_scrolled",
+            "o_header_affixed",
+            "o_header_no_transition"
+        );
         const endHeaderHeight = clonedHeader.offsetHeight;
         clonedHeader.remove();
         const requiredScroll = this.getHeaderHeight() - endHeaderHeight;
@@ -42,7 +47,7 @@ export class HeaderStandard extends BaseHeader {
 
         const scroll = this.scrollingElement.scrollTop;
 
-        const isScrolled = (scroll > this.transitionPoint);
+        const isScrolled = scroll > this.transitionPoint;
         if (this.isScrolled !== isScrolled) {
             this.transitionPossible = this.canTransition() || !isScrolled;
             if (this.transitionPossible) {
@@ -50,8 +55,9 @@ export class HeaderStandard extends BaseHeader {
             }
         }
 
-        const reachHeaderBottom = (scroll > this.getHeaderHeight() + this.topGap);
-        const reachTransitionPoint = (scroll > this.transitionPoint + this.topGap) && this.transitionPossible;
+        const reachHeaderBottom = scroll > this.getHeaderHeight() + this.topGap;
+        const reachTransitionPoint =
+            scroll > this.transitionPoint + this.topGap && this.transitionPossible;
 
         if (this.atTop == reachHeaderBottom) {
             this.el.classList.add("o_transformed_not_affixed");
@@ -61,8 +67,8 @@ export class HeaderStandard extends BaseHeader {
         reachTransitionPoint
             ? this.transformShow()
             : reachHeaderBottom
-                ? this.transformHide()
-                : this.transformShow()
+            ? this.transformHide()
+            : this.transformShow();
         void this.el.offsetWidth; // Force a paint refresh
 
         this.hideEl?.classList.toggle("hidden", reachHeaderBottom);
@@ -88,12 +94,8 @@ export class HeaderStandard extends BaseHeader {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.header_standard", HeaderStandard);
+registry.category("public.interactions").add("website.header_standard", HeaderStandard);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.header_standard", {
-        Interaction: HeaderStandard,
-    });
+registry.category("public.interactions.edit").add("website.header_standard", {
+    Interaction: HeaderStandard,
+});
diff --git a/addons/website/static/src/interactions/header/header_top.js b/addons/website/static/src/interactions/header/header_top.js
index bb6c4f7c8d759..ee89418005242 100644
--- a/addons/website/static/src/interactions/header/header_top.js
+++ b/addons/website/static/src/interactions/header/header_top.js
@@ -5,10 +5,11 @@ export class HeaderTop extends Interaction {
     static selector = "header#top";
     dynamicContent = {
         "#top_menu_collapse, #top_menu_collapse_mobile": {
-            "t-on-show.bs.offcanvas": () => this.showCollapse = true,
-            "t-on-hidden.bs.offcanvas": () => this.showCollapse &&= this.mobileNavbarEl.matches(".show, .showing"),
+            "t-on-show.bs.offcanvas": () => (this.showCollapse = true),
+            "t-on-hidden.bs.offcanvas": () =>
+                (this.showCollapse &&= this.mobileNavbarEl.matches(".show, .showing")),
             "t-att-class": () => ({
-                "o_top_menu_collapse_shown": this.showCollapse,
+                o_top_menu_collapse_shown: this.showCollapse,
             }),
         },
     };
@@ -19,12 +20,8 @@ export class HeaderTop extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.header_top", HeaderTop);
+registry.category("public.interactions").add("website.header_top", HeaderTop);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.header_top", {
-        Interaction: HeaderTop,
-    });
+registry.category("public.interactions.edit").add("website.header_top", {
+    Interaction: HeaderTop,
+});
diff --git a/addons/website/static/src/interactions/image_gallery.edit.js b/addons/website/static/src/interactions/image_gallery.edit.js
index 6ff3bab712394..ba521bb935351 100644
--- a/addons/website/static/src/interactions/image_gallery.edit.js
+++ b/addons/website/static/src/interactions/image_gallery.edit.js
@@ -3,7 +3,8 @@ import { registry } from "@web/core/registry";
 
 export class ImageGalleryEdit extends Interaction {
     static selector = ".s_image_gallery";
-    static selectorNotHas = "img, a.o_link_readonly, span.fa.object-fit-cover, div.media_iframe_video";
+    static selectorNotHas =
+        "img, a.o_link_readonly, span.fa.object-fit-cover, div.media_iframe_video";
     dynamicContent = {
         ".o_empty_gallery_alert": {
             "t-on-click": this.onAddImage.bind(this),
diff --git a/addons/website/static/src/interactions/image_lazy_loading.js b/addons/website/static/src/interactions/image_lazy_loading.js
index ed88fc00e424f..db6a9d62f206d 100644
--- a/addons/website/static/src/interactions/image_lazy_loading.js
+++ b/addons/website/static/src/interactions/image_lazy_loading.js
@@ -44,6 +44,4 @@ export class ImageLazyLoading extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.image_lazy_loading", ImageLazyLoading);
+registry.category("public.interactions").add("website.image_lazy_loading", ImageLazyLoading);
diff --git a/addons/website/static/src/interactions/image_shape_hover_effect.js b/addons/website/static/src/interactions/image_shape_hover_effect.js
index e5b0bd8b1330f..59146ea446ad2 100644
--- a/addons/website/static/src/interactions/image_shape_hover_effect.js
+++ b/addons/website/static/src/interactions/image_shape_hover_effect.js
@@ -44,53 +44,64 @@ export class ImageShapeHoverEffect extends Interaction {
         if (!this.originalImgSrc || !this.el.dataset.hoverEffect) {
             return;
         }
-        this.lastMouseEvent = this.lastMouseEvent.then(() => new Promise((resolve) => {
-            if (!this.svgInEl) {
-                fetch(this.el.src)
-                    .then(response => response.text())
-                    .then(text => {
-                        const parser = new DOMParser();
-                        const result = parser.parseFromString(text, "text/xml");
-                        const svg = result.getElementsByTagName("svg")[0];
-                        this.svgInEl = svg;
-                        if (!this.svgInEl) {
-                            resolve();
-                            return;
-                        }
-                        // Start animations.
-                        const animateEls = this.svgInEl.querySelectorAll("#hoverEffects animateTransform, #hoverEffects animate");
-                        animateEls.forEach(animateTransformEl => {
-                            animateTransformEl.removeAttribute("begin");
-                        });
+        this.lastMouseEvent = this.lastMouseEvent.then(
+            () =>
+                new Promise((resolve) => {
+                    if (!this.svgInEl) {
+                        fetch(this.el.src)
+                            .then((response) => response.text())
+                            .then((text) => {
+                                const parser = new DOMParser();
+                                const result = parser.parseFromString(text, "text/xml");
+                                const svg = result.getElementsByTagName("svg")[0];
+                                this.svgInEl = svg;
+                                if (!this.svgInEl) {
+                                    resolve();
+                                    return;
+                                }
+                                // Start animations.
+                                const animateEls = this.svgInEl.querySelectorAll(
+                                    "#hoverEffects animateTransform, #hoverEffects animate"
+                                );
+                                animateEls.forEach((animateTransformEl) => {
+                                    animateTransformEl.removeAttribute("begin");
+                                });
+                                this.setImgSrc(this.svgInEl, resolve);
+                            })
+                            .catch(() => {
+                                // Could be the case if somehow the `src` is an absolute
+                                // URL from another domain.
+                            });
+                    } else {
                         this.setImgSrc(this.svgInEl, resolve);
-                    }).catch(() => {
-                        // Could be the case if somehow the `src` is an absolute
-                        // URL from another domain.
-                    });
-            } else {
-                this.setImgSrc(this.svgInEl, resolve);
-            }
-        }));
+                    }
+                })
+        );
     }
 
     mouseLeave() {
-        this.lastMouseEvent = this.lastMouseEvent.then(() => new Promise((resolve) => {
-            if (!this.originalImgSrc || !this.svgInEl || !this.el.dataset.hoverEffect) {
-                resolve();
-                return;
-            }
-            if (!this.svgOutEl) {
-                // Reverse animations.
-                this.svgOutEl = this.svgInEl.cloneNode(true);
-                const animateTransformEls = this.svgOutEl.querySelectorAll("#hoverEffects animateTransform, #hoverEffects animate");
-                animateTransformEls.forEach(animateTransformEl => {
-                    let valuesValue = animateTransformEl.getAttribute("values");
-                    valuesValue = valuesValue.split(";").reverse().join(";");
-                    animateTransformEl.setAttribute("values", valuesValue);
-                });
-            }
-            this.setImgSrc(this.svgOutEl, resolve);
-        }));
+        this.lastMouseEvent = this.lastMouseEvent.then(
+            () =>
+                new Promise((resolve) => {
+                    if (!this.originalImgSrc || !this.svgInEl || !this.el.dataset.hoverEffect) {
+                        resolve();
+                        return;
+                    }
+                    if (!this.svgOutEl) {
+                        // Reverse animations.
+                        this.svgOutEl = this.svgInEl.cloneNode(true);
+                        const animateTransformEls = this.svgOutEl.querySelectorAll(
+                            "#hoverEffects animateTransform, #hoverEffects animate"
+                        );
+                        animateTransformEls.forEach((animateTransformEl) => {
+                            let valuesValue = animateTransformEl.getAttribute("values");
+                            valuesValue = valuesValue.split(";").reverse().join(";");
+                            animateTransformEl.setAttribute("values", valuesValue);
+                        });
+                    }
+                    this.setImgSrc(this.svgOutEl, resolve);
+                })
+        );
     }
 
     /**
@@ -105,7 +116,9 @@ export class ImageShapeHoverEffect extends Interaction {
         }
         // Add random class to prevent browser from caching image. Otherwise the
         // animations do not trigger more than once.
-        const previousRandomClass = [...svg.classList].find(cl => cl.startsWith("o_shape_anim_random_"));
+        const previousRandomClass = [...svg.classList].find((cl) =>
+            cl.startsWith("o_shape_anim_random_")
+        );
         svg.classList.remove(previousRandomClass);
         svg.classList.add("o_shape_anim_random_" + Date.now());
         // Convert the SVG element to a data URI.
@@ -151,8 +164,6 @@ registry
     .category("public.interactions")
     .add("website.image_shape_hover_effect", ImageShapeHoverEffect);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.image_shape_hover_effect", {
-        Interaction: ImageShapeHoverEffect,
-    });
+registry.category("public.interactions.edit").add("website.image_shape_hover_effect", {
+    Interaction: ImageShapeHoverEffect,
+});
diff --git a/addons/website/static/src/interactions/listing_layout.js b/addons/website/static/src/interactions/listing_layout.js
index 3f1301fcd08b5..3de83f1d9fdc8 100644
--- a/addons/website/static/src/interactions/listing_layout.js
+++ b/addons/website/static/src/interactions/listing_layout.js
@@ -11,8 +11,8 @@ export class ListingLayout extends Interaction {
         },
         ".o_website_grid, .o_website_list": {
             "t-att-class": () => ({
-                "o_website_list": this.isList,
-                "o_website_grid": !this.isList,
+                o_website_list: this.isList,
+                o_website_grid: !this.isList,
             }),
         },
         ".o_website_grid > div, .o_website_list > div": {
@@ -32,12 +32,12 @@ export class ListingLayout extends Interaction {
     async onApplyLayoutChange(ev) {
         const clickedValue = ev.target.value;
         this.isList = clickedValue === "list";
-        await this.waitFor(rpc("/website/save_session_layout_mode", {
-            layout_mode: this.isList ? "list" : "grid",
-            view_id: document
-                .querySelector(".listing_layout_switcher")
-                .dataset.viewId,
-        }));
+        await this.waitFor(
+            rpc("/website/save_session_layout_mode", {
+                layout_mode: this.isList ? "list" : "grid",
+                view_id: document.querySelector(".listing_layout_switcher").dataset.viewId,
+            })
+        );
 
         const activeClasses = ev.target.parentElement.dataset.activeClasses.split(" ");
         ev.target.parentElement.querySelectorAll(".btn").forEach((btn) => {
@@ -46,6 +46,4 @@ export class ListingLayout extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.listing_layout", ListingLayout);
+registry.category("public.interactions").add("website.listing_layout", ListingLayout);
diff --git a/addons/website/static/src/interactions/multirange_input.js b/addons/website/static/src/interactions/multirange_input.js
index 27870d3caa7b7..b68082c5392a6 100644
--- a/addons/website/static/src/interactions/multirange_input.js
+++ b/addons/website/static/src/interactions/multirange_input.js
@@ -11,6 +11,4 @@ export class MultirangeInput extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.multirange_input", MultirangeInput);
+registry.category("public.interactions").add("website.multirange_input", MultirangeInput);
diff --git a/addons/website/static/src/interactions/parallax/parallax.js b/addons/website/static/src/interactions/parallax/parallax.js
index 5605360b95efc..c61271d0d0665 100644
--- a/addons/website/static/src/interactions/parallax/parallax.js
+++ b/addons/website/static/src/interactions/parallax/parallax.js
@@ -6,7 +6,10 @@ export class Parallax extends Interaction {
     dynamicSelectors = Object.assign(this.dynamicSelectors, {
         _modal: () => this.el.closest(".modal"),
         // ":scope > .s_parallax_bg" is kept for compatibility
-        _bg: () => this.el.querySelector(":scope > .s_parallax_bg_wrap > .s_parallax_bg, :scope > .s_parallax_bg"),
+        _bg: () =>
+            this.el.querySelector(
+                ":scope > .s_parallax_bg_wrap > .s_parallax_bg, :scope > .s_parallax_bg"
+            ),
     });
     dynamicContent = {
         _document: { "t-on-scroll": this.onScroll },
@@ -14,9 +17,9 @@ export class Parallax extends Interaction {
         _modal: { "t-on-shown.bs.modal": this.updateBackgroundHeight },
         _bg: {
             "t-att-style": () => ({
-                "top": this.styleTop,
-                "bottom": this.styleBottom,
-                "transform": this.styleTransform,
+                top: this.styleTop,
+                bottom: this.styleBottom,
+                transform: this.styleTransform,
             }),
         },
     };
@@ -106,12 +109,8 @@ export class Parallax extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.parallax", Parallax);
+registry.category("public.interactions").add("website.parallax", Parallax);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.parallax", {
-        Interaction: Parallax,
-    });
+registry.category("public.interactions.edit").add("website.parallax", {
+    Interaction: Parallax,
+});
diff --git a/addons/website/static/src/interactions/plausible_push.js b/addons/website/static/src/interactions/plausible_push.js
index d5c5692a1d8b8..91b994f60c7d5 100644
--- a/addons/website/static/src/interactions/plausible_push.js
+++ b/addons/website/static/src/interactions/plausible_push.js
@@ -7,11 +7,11 @@ export class PlausiblePush extends Interaction {
     setup() {
         const { eventName, eventParams } = this.el.dataset;
 
-        window.plausible ||= function () { (window.plausible.q = window.plausible.q || []).push(arguments) };
+        window.plausible ||= function () {
+            (window.plausible.q = window.plausible.q || []).push(arguments);
+        };
         window.plausible(eventName, { props: JSON.parse(eventParams) || {} });
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.plausible_push", PlausiblePush);
+registry.category("public.interactions").add("website.plausible_push", PlausiblePush);
diff --git a/addons/website/static/src/interactions/popup/no_backdrop_popup.edit.js b/addons/website/static/src/interactions/popup/no_backdrop_popup.edit.js
index 78846f7e629e1..dccf253ba87cb 100644
--- a/addons/website/static/src/interactions/popup/no_backdrop_popup.edit.js
+++ b/addons/website/static/src/interactions/popup/no_backdrop_popup.edit.js
@@ -1,31 +1,31 @@
 import { NoBackdropPopup } from "./no_backdrop_popup";
 import { registry } from "@web/core/registry";
 
-export const NoBackdropPopupEdit = (I) => class extends I {
-    start() {
-        super.start();
-        if (this.el.classList.contains("show")) {
-            // Use case: When the "Backdrop" option is disabled in edit mode.
-            // The page scrollbar must be adjusted and events must be added.
-            this.addModalNoBackdropEvents();
+export const NoBackdropPopupEdit = (I) =>
+    class extends I {
+        start() {
+            super.start();
+            if (this.el.classList.contains("show")) {
+                // Use case: When the "Backdrop" option is disabled in edit
+                // mode. The page scrollbar must be adjusted and events must be
+                // added.
+                this.addModalNoBackdropEvents();
+            }
         }
-    }
 
-    addModalNoBackdropEvents() {
-        // We shouldn't normally go through this 2x without removing the
-        // observers in between, but it happens when opening the editor (start)
-        // and then showing the popup (dynamicContent listener).
-        if (this.resizeObserver) {
-            this.removeResizeListener();
-            this.resizeObserver.disconnect();
+        addModalNoBackdropEvents() {
+            // We shouldn't normally go through this 2x without removing the
+            // observers in between, but it happens when opening the editor
+            // (start) and then showing the popup (dynamicContent listener).
+            if (this.resizeObserver) {
+                this.removeResizeListener();
+                this.resizeObserver.disconnect();
+            }
+            super.addModalNoBackdropEvents();
         }
-        super.addModalNoBackdropEvents();
-    }
-};
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.no_backdrop_popup", {
-        Interaction: NoBackdropPopup,
-        mixin: NoBackdropPopupEdit,
-    });
+registry.category("public.interactions.edit").add("website.no_backdrop_popup", {
+    Interaction: NoBackdropPopup,
+    mixin: NoBackdropPopupEdit,
+});
diff --git a/addons/website/static/src/interactions/popup/no_backdrop_popup.js b/addons/website/static/src/interactions/popup/no_backdrop_popup.js
index d5c65730e51df..7039e6bae19fc 100644
--- a/addons/website/static/src/interactions/popup/no_backdrop_popup.js
+++ b/addons/website/static/src/interactions/popup/no_backdrop_popup.js
@@ -6,10 +6,10 @@ import { isScrollableY } from "@web/core/utils/scrolling";
 export class NoBackdropPopup extends Interaction {
     static selector = ".s_popup_no_backdrop";
     dynamicContent = {
-        "_root": {
+        _root: {
             "t-on-shown.bs.modal": this.addModalNoBackdropEvents,
             "t-on-hide.bs.modal": this.removeModalNoBackdropEvents,
-        }
+        },
     };
 
     setup() {
@@ -47,7 +47,11 @@ export class NoBackdropPopup extends Interaction {
 
     addModalNoBackdropEvents() {
         this.updateScrollbar();
-        this.removeResizeListener = this.addListener(window, "resize", this.throttledUpdateScrollbar);
+        this.removeResizeListener = this.addListener(
+            window,
+            "resize",
+            this.throttledUpdateScrollbar
+        );
         this.resizeObserver = new window.ResizeObserver(() => {
             // When the size of the modal changes, the scrollbar needs to be
             // adjusted.
@@ -66,6 +70,4 @@ export class NoBackdropPopup extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.no_backdrop_popup", NoBackdropPopup);
+registry.category("public.interactions").add("website.no_backdrop_popup", NoBackdropPopup);
diff --git a/addons/website/static/src/interactions/popup/popup.js b/addons/website/static/src/interactions/popup/popup.js
index eebfd849761f5..98c7b439b9be1 100644
--- a/addons/website/static/src/interactions/popup/popup.js
+++ b/addons/website/static/src/interactions/popup/popup.js
@@ -15,11 +15,11 @@ export class Popup extends Interaction {
         ".btn-primary": {
             "t-on-click": this.onBtnPrimaryClick,
         },
-        "_root": {
+        _root: {
             "t-on-hide.bs.modal": this.onHideModal,
             "t-on-shown.bs.modal": this.trapFocus,
         },
-        "_window": {
+        _window: {
             "t-on-hashchange": this.onHashChange,
         },
         ".modal:not(.s_popup_no_backdrop)": {
@@ -36,11 +36,15 @@ export class Popup extends Interaction {
         this.modalEl = this.el.querySelector(".modal");
         /** @type {import("bootstrap").Modal} */
         this.bsModal = window.Modal.getOrCreateInstance(this.modalEl);
-        this.registerCleanup(() => { this.bsModal.dispose() });
+        this.registerCleanup(() => {
+            this.bsModal.dispose();
+        });
 
         this.modalShownOnClickEl = this.el.querySelector(".modal[data-display='onClick']");
         if (this.modalShownOnClickEl) {
-            this.showModalBtnEl = document.querySelector(`[href="#${this.modalShownOnClickEl.id}"]`);
+            this.showModalBtnEl = document.querySelector(
+                `[href="#${this.modalShownOnClickEl.id}"]`
+            );
             // Check if a hash exists and if the modal needs to be opened when
             // the page loads (e.g. The user has clicked a button on the
             // "Contact us" page to open a popup on the homepage).
@@ -58,7 +62,7 @@ export class Popup extends Interaction {
         // visibility option uses < LG to hide on mobile. So compute it here.
         const isMobile = uiUtils.getSize() < SIZES.LG;
         const emptyPopup = [
-            ...this.el.querySelectorAll(".oe_structure > *:not(.s_popup_close)")
+            ...this.el.querySelectorAll(".oe_structure > *:not(.s_popup_close)"),
         ].every((el) => {
             const visibilitySelectors = el.dataset.visibilitySelectors;
             const deviceInvisible = isMobile
@@ -136,8 +140,8 @@ export class Popup extends Interaction {
      */
     canBtnPrimaryClosePopup(primaryBtnEl) {
         return !(
-            primaryBtnEl.classList.contains("s_website_form_send")
-            || primaryBtnEl.classList.contains("o_website_form_send")
+            primaryBtnEl.classList.contains("s_website_form_send") ||
+            primaryBtnEl.classList.contains("o_website_form_send")
         );
     }
 
@@ -163,7 +167,9 @@ export class Popup extends Interaction {
         }
         // The focus should stay free for no backdrop popups.
         if (this.el.querySelector(".s_popup_no_backdrop")) {
-            this.addListener(this.el, "hide.bs.modal", () => previouslyFocusedEl.focus(), { once: true });
+            this.addListener(this.el, "hide.bs.modal", () => previouslyFocusedEl.focus(), {
+                once: true,
+            });
             return;
         }
         const onKeydown = (ev) => {
@@ -186,10 +192,15 @@ export class Popup extends Interaction {
             }
         };
         const removeOnKeydown = this.addListener(this.el, "keydown", onKeydown);
-        this.addListener(this.el, "hide.bs.modal", () => {
-            removeOnKeydown();
-            previouslyFocusedEl.focus();
-        }, { once: true });
+        this.addListener(
+            this.el,
+            "hide.bs.modal",
+            () => {
+                removeOnKeydown();
+                previouslyFocusedEl.focus();
+            },
+            { once: true }
+        );
     }
 
     onCloseClick() {
diff --git a/addons/website/static/src/interactions/popup/shared_popup.edit.js b/addons/website/static/src/interactions/popup/shared_popup.edit.js
index a5453492cd6f6..ccaeba71abe83 100644
--- a/addons/website/static/src/interactions/popup/shared_popup.edit.js
+++ b/addons/website/static/src/interactions/popup/shared_popup.edit.js
@@ -1,15 +1,14 @@
 import { SharedPopup } from "./shared_popup";
 import { registry } from "@web/core/registry";
 
-export const SharedPopupEdit = (I) => class extends I {
-    setup() {
-        this.popupShown = true;
-    }
-};
+export const SharedPopupEdit = (I) =>
+    class extends I {
+        setup() {
+            this.popupShown = true;
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.shared_popup", {
-        Interaction: SharedPopup,
-        mixin: SharedPopupEdit,
-    });
+registry.category("public.interactions.edit").add("website.shared_popup", {
+    Interaction: SharedPopup,
+    mixin: SharedPopupEdit,
+});
diff --git a/addons/website/static/src/interactions/popup/shared_popup.js b/addons/website/static/src/interactions/popup/shared_popup.js
index ea7e28ab7b4e0..729a5492ffdf4 100644
--- a/addons/website/static/src/interactions/popup/shared_popup.js
+++ b/addons/website/static/src/interactions/popup/shared_popup.js
@@ -23,7 +23,7 @@ export class SharedPopup extends Interaction {
                 // happens. Otherwise, the transition isn't visible.
                 this.updateContent();
             },
-            "t-on-shown.bs.modal": () => this.popupShown = true,
+            "t-on-shown.bs.modal": () => (this.popupShown = true),
             "t-on-hidden.bs.modal": this.onModalHidden,
             "t-att-class": () => ({ "d-none": !this.popupShown }),
         },
@@ -45,6 +45,4 @@ export class SharedPopup extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.shared_popup", SharedPopup);
+registry.category("public.interactions").add("website.shared_popup", SharedPopup);
diff --git a/addons/website/static/src/interactions/post_link.js b/addons/website/static/src/interactions/post_link.js
index 06a92b1e3cd75..516f5880a23fb 100644
--- a/addons/website/static/src/interactions/post_link.js
+++ b/addons/website/static/src/interactions/post_link.js
@@ -9,7 +9,7 @@ export class PostLink extends Interaction {
         _root: {
             "t-on-click.prevent": this.onClickPost,
             "t-att-class": () => ({
-                "o_post_link_js_loaded": true,
+                o_post_link_js_loaded: true,
             }),
         },
     };
@@ -25,6 +25,4 @@ export class PostLink extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.post_link", PostLink);
+registry.category("public.interactions").add("website.post_link", PostLink);
diff --git a/addons/website/static/src/interactions/ripple_effect.js b/addons/website/static/src/interactions/ripple_effect.js
index 578ec4dc62509..45c24efa36e1f 100644
--- a/addons/website/static/src/interactions/ripple_effect.js
+++ b/addons/website/static/src/interactions/ripple_effect.js
@@ -7,7 +7,7 @@ export class RippleEffect extends Interaction {
         _root: {
             "t-on-click": this.onClick,
             "t-att-class": () => ({
-                "o_js_ripple_effect": this.isActive,
+                o_js_ripple_effect: this.isActive,
             }),
         },
     };
@@ -57,6 +57,4 @@ export class RippleEffect extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.ripple_effect", RippleEffect);
+registry.category("public.interactions").add("website.ripple_effect", RippleEffect);
diff --git a/addons/website/static/src/interactions/scroll_button.js b/addons/website/static/src/interactions/scroll_button.js
index 33c044a504e8a..77ac425b4f854 100644
--- a/addons/website/static/src/interactions/scroll_button.js
+++ b/addons/website/static/src/interactions/scroll_button.js
@@ -20,6 +20,4 @@ export class ScrollButton extends AnchorSlide {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.scroll_button", ScrollButton);
+registry.category("public.interactions").add("website.scroll_button", ScrollButton);
diff --git a/addons/website/static/src/interactions/search_modal.edit.js b/addons/website/static/src/interactions/search_modal.edit.js
index e943c87d1dd6c..2d5a250ca60a8 100644
--- a/addons/website/static/src/interactions/search_modal.edit.js
+++ b/addons/website/static/src/interactions/search_modal.edit.js
@@ -1,17 +1,16 @@
 import { SearchModal } from "./search_modal";
 import { registry } from "@web/core/registry";
 
-const SearchModalEdit = I => class extends I {
-    dynamicContent = {
-        _root: {
-            "t-on-show.bs.modal.prevent": () => { },
-        },
+const SearchModalEdit = (I) =>
+    class extends I {
+        dynamicContent = {
+            _root: {
+                "t-on-show.bs.modal.prevent": () => {},
+            },
+        };
     };
-};
 
-registry
-    .category("public.interactions.edit")
-    .add("website.search_modal", {
-        Interaction: SearchModal,
-        mixin: SearchModalEdit,
-    });
+registry.category("public.interactions.edit").add("website.search_modal", {
+    Interaction: SearchModal,
+    mixin: SearchModalEdit,
+});
diff --git a/addons/website/static/src/interactions/search_modal.js b/addons/website/static/src/interactions/search_modal.js
index 68c513d9ab19f..8dee2c095c861 100644
--- a/addons/website/static/src/interactions/search_modal.js
+++ b/addons/website/static/src/interactions/search_modal.js
@@ -10,6 +10,4 @@ export class SearchModal extends Interaction {
     };
 }
 
-registry
-    .category("public.interactions")
-    .add("website.search_modal", SearchModal);
+registry.category("public.interactions").add("website.search_modal", SearchModal);
diff --git a/addons/website/static/src/interactions/text_highlights.js b/addons/website/static/src/interactions/text_highlights.js
index 1ccd6163e0cac..1f6fcb2971bea 100644
--- a/addons/website/static/src/interactions/text_highlights.js
+++ b/addons/website/static/src/interactions/text_highlights.js
@@ -11,7 +11,7 @@ export class TextHighlight extends Interaction {
     static selector = "#wrapwrap";
     dynamicContent = {
         _root: {
-            "t-on-text_highlight_added": ({target}) => this.onTextHighlightAdded(target),
+            "t-on-text_highlight_added": ({ target }) => this.onTextHighlightAdded(target),
         },
     };
 
@@ -39,8 +39,8 @@ export class TextHighlight extends Interaction {
     _updateEntries(entries) {
         const closestToObserves = new Set();
         for (const { target, addedNodes = [], removedNodes = [] } of entries) {
-            const elements = [target, ...(addedNodes), ...(removedNodes)]
-                .map((el) => el.nodeType === Node.ELEMENT_NODE ? el : el.parentElement)
+            const elements = [target, ...addedNodes, ...removedNodes]
+                .map((el) => (el.nodeType === Node.ELEMENT_NODE ? el : el.parentElement))
                 .filter(Boolean);
             if (!elements.length) {
                 continue;
@@ -100,12 +100,8 @@ export class TextHighlight extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.text_highlight", TextHighlight);
+registry.category("public.interactions").add("website.text_highlight", TextHighlight);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.text_highlight", {
-        Interaction: TextHighlight,
-    });
+registry.category("public.interactions.edit").add("website.text_highlight", {
+    Interaction: TextHighlight,
+});
diff --git a/addons/website/static/src/interactions/video/background_video.js b/addons/website/static/src/interactions/video/background_video.js
index 2bc4ea59dd19e..03d44295ad833 100644
--- a/addons/website/static/src/interactions/video/background_video.js
+++ b/addons/website/static/src/interactions/video/background_video.js
@@ -15,7 +15,7 @@ export class BackgroundVideo extends Interaction {
         _document: {
             // We don't add the optional cookies warning for background videos
             // so that the fallback message doesn't appear behind the content.
-            "t-on-optionalCookiesAccepted.once": () => this.iframeEl.src = this.videoSrc,
+            "t-on-optionalCookiesAccepted.once": () => (this.iframeEl.src = this.videoSrc),
         },
         _window: {
             "t-on-resize": this.throttled(this.adjustIframe),
@@ -24,8 +24,8 @@ export class BackgroundVideo extends Interaction {
             "t-on-shown.bs.dropdown": this.throttled(this.adjustIframe),
         },
         _modal: {
-            "t-on-show.bs.modal": () => this.hideVideoContainer = true,
-            "t-on-shown.bs.modal": () => this.hideVideoContainer = false,
+            "t-on-show.bs.modal": () => (this.hideVideoContainer = true),
+            "t-on-shown.bs.modal": () => (this.hideVideoContainer = false),
         },
         ".o_bg_video_container": {
             "t-att-class": () => ({
@@ -65,25 +65,29 @@ export class BackgroundVideo extends Interaction {
 
         const wrapperWidth = this.el.clientWidth;
         const wrapperHeight = this.el.clientHeight;
-        const relativeRatio = (wrapperWidth / wrapperHeight) / (16 / 9);
+        const relativeRatio = wrapperWidth / wrapperHeight / (16 / 9);
 
         if (this.el.closest(".s_ecomm_categories_showcase_block")) {
             // Chrome-only: percentage sizing makes the video in "Categories
             // Showcase" snippet jitter on hover, so force pixel values while
             // keeping the ratio.
-            const iframeHeight = Math.round(relativeRatio >= 1 ? wrapperWidth * (9 / 16) : wrapperHeight);
-            const iframeWidth = Math.round(relativeRatio >= 1 ? wrapperWidth : wrapperHeight * (16 / 9));
+            const iframeHeight = Math.round(
+                relativeRatio >= 1 ? wrapperWidth * (9 / 16) : wrapperHeight
+            );
+            const iframeWidth = Math.round(
+                relativeRatio >= 1 ? wrapperWidth : wrapperHeight * (16 / 9)
+            );
             this.iframeEl.style.height = `${iframeHeight}px`;
             this.iframeEl.style.width = `${iframeWidth}px`;
         } else if (relativeRatio >= 1.0) {
             this.iframeEl.style.width = "100%";
-            this.iframeEl.style.height = (relativeRatio * 100) + "%";
+            this.iframeEl.style.height = relativeRatio * 100 + "%";
             this.iframeEl.style.insetInlineStart = "0";
-            this.iframeEl.style.insetBlockStart = (-(relativeRatio - 1.0) / 2 * 100) + "%";
+            this.iframeEl.style.insetBlockStart = (-(relativeRatio - 1.0) / 2) * 100 + "%";
         } else {
-            this.iframeEl.style.width = ((1 / relativeRatio) * 100) + "%";
+            this.iframeEl.style.width = (1 / relativeRatio) * 100 + "%";
             this.iframeEl.style.height = "100%";
-            this.iframeEl.style.insetInlineStart = (-((1 / relativeRatio) - 1.0) / 2 * 100) + "%";
+            this.iframeEl.style.insetInlineStart = (-(1 / relativeRatio - 1.0) / 2) * 100 + "%";
             this.iframeEl.style.insetBlockStart = "0";
         }
 
@@ -94,35 +98,42 @@ export class BackgroundVideo extends Interaction {
     appendBgVideo() {
         const allowedCookies = !this.el.dataset.needCookiesApproval;
 
-        const oldContainer = this.bgVideoContainer || this.el.querySelector(":scope > .o_bg_video_container");
+        const oldContainer =
+            this.bgVideoContainer || this.el.querySelector(":scope > .o_bg_video_container");
         oldContainer?.remove();
 
-        this.renderAt("website.background.video", {
-            videoSrc: allowedCookies ? this.videoSrc : "about:blank",
-            iframeID: this.iframeID,
-        }, this.el, "afterbegin");
-
-        this.bgVideoContainer = this.el.querySelector(":scope > .o_bg_video_container")
+        this.renderAt(
+            "website.background.video",
+            {
+                videoSrc: allowedCookies ? this.videoSrc : "about:blank",
+                iframeID: this.iframeID,
+            },
+            this.el,
+            "afterbegin"
+        );
+
+        this.bgVideoContainer = this.el.querySelector(":scope > .o_bg_video_container");
         this.iframeEl = this.bgVideoContainer.querySelector(".o_bg_video_iframe");
-        this.addListener(this.iframeEl, "load", () => {
-            this.bgVideoContainer.querySelector(".o_bg_video_loading")?.remove();
-            // When there is a "slide in (left or right) animation" element, we
-            // need to adjust the iframe size once it has been loaded, otherwise
-            // an horizontal scrollbar may appear.
-            this.adjustIframe();
-        }, { once: true });
+        this.addListener(
+            this.iframeEl,
+            "load",
+            () => {
+                this.bgVideoContainer.querySelector(".o_bg_video_loading")?.remove();
+                // When there is a "slide in (left or right) animation" element,
+                // we need to adjust the iframe size once it has been loaded,
+                // otherwise an horizontal scrollbar may appear.
+                this.adjustIframe();
+            },
+            { once: true }
+        );
 
         this.adjustIframe();
         triggerAutoplay(this.iframeEl);
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.background_video", BackgroundVideo);
+registry.category("public.interactions").add("website.background_video", BackgroundVideo);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.background_video", {
-        Interaction: BackgroundVideo,
-    });
+registry.category("public.interactions.edit").add("website.background_video", {
+    Interaction: BackgroundVideo,
+});
diff --git a/addons/website/static/src/interactions/video/media_video.edit.js b/addons/website/static/src/interactions/video/media_video.edit.js
index 3057aeb4928d5..16009a27091ad 100644
--- a/addons/website/static/src/interactions/video/media_video.edit.js
+++ b/addons/website/static/src/interactions/video/media_video.edit.js
@@ -1,8 +1,6 @@
 import { MediaVideo } from "./media_video";
 import { registry } from "@web/core/registry";
 
-registry
-    .category("public.interactions.edit")
-    .add("website.media_video", {
-        Interaction: MediaVideo,
-    });
+registry.category("public.interactions.edit").add("website.media_video", {
+    Interaction: MediaVideo,
+});
diff --git a/addons/website/static/src/interactions/video/media_video.js b/addons/website/static/src/interactions/video/media_video.js
index 1b26f8930c07e..e676772450010 100644
--- a/addons/website/static/src/interactions/video/media_video.js
+++ b/addons/website/static/src/interactions/video/media_video.js
@@ -40,7 +40,7 @@ export class MediaVideo extends Interaction {
     }
 
     start() {
-        let iframeEl = this.el.querySelector(':scope > iframe');
+        let iframeEl = this.el.querySelector(":scope > iframe");
 
         // The following code is only there to ensure compatibility with
         // videos added before bug fixes or new Odoo versions where the
@@ -50,9 +50,14 @@ export class MediaVideo extends Interaction {
         }
 
         if (iframeEl?.hasAttribute("src")) {
-            const promise = setupAutoplay(iframeEl.getAttribute('src'), !!this.el.dataset.needCookiesApproval);
+            const promise = setupAutoplay(
+                iframeEl.getAttribute("src"),
+                !!this.el.dataset.needCookiesApproval
+            );
             if (promise) {
-                this.waitFor(promise).then(this.protectSyncAfterAsync(() => triggerAutoplay(iframeEl)));
+                this.waitFor(promise).then(
+                    this.protectSyncAfterAsync(() => triggerAutoplay(iframeEl))
+                );
             }
         }
     }
@@ -77,21 +82,27 @@ export class MediaVideo extends Interaction {
         // 'data-oe-expression' one (the latter is used as a workaround in 10.0
         // system but should obviously be reviewed in master).
 
-        let src = htmlEscape(this.el.getAttribute("data-oe-expression") || this.el.getAttribute("data-src"));
+        const src = htmlEscape(
+            this.el.getAttribute("data-oe-expression") || this.el.getAttribute("data-src")
+        );
         // Validate the src to only accept supported domains we can trust
 
-        let m = src.match(/^(?:https?:)?\/\/([^/?#]+)/);
+        const m = src.match(/^(?:https?:)?\/\/([^/?#]+)/);
         if (!m) {
             return;
         }
 
-        let domain = m[1].replace(/^www\./, '');
+        const domain = m[1].replace(/^www\./, "");
         const supportedDomains = [
-            "youtu.be", "youtube.com", "youtube-nocookie.com",
+            "youtu.be",
+            "youtube.com",
+            "youtube-nocookie.com",
             "instagram.com",
-            "player.vimeo.com", "vimeo.com",
+            "player.vimeo.com",
+            "vimeo.com",
             "dailymotion.com",
-            "player.youku.com", "youku.com",
+            "player.youku.com",
+            "youku.com",
         ];
         if (!supportedDomains.includes(domain)) {
             return;
@@ -107,6 +118,4 @@ export class MediaVideo extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.media_video", MediaVideo);
+registry.category("public.interactions").add("website.media_video", MediaVideo);
diff --git a/addons/website/static/src/interactions/zoomed_background_shape.edit.js b/addons/website/static/src/interactions/zoomed_background_shape.edit.js
index 48fceb1564ea0..6b8cca4b8d532 100644
--- a/addons/website/static/src/interactions/zoomed_background_shape.edit.js
+++ b/addons/website/static/src/interactions/zoomed_background_shape.edit.js
@@ -1,16 +1,15 @@
 import { ZoomedBackgroundShape } from "./zoomed_background_shape";
 import { registry } from "@web/core/registry";
 
-const ZoomedBackgroundShapeEdit = I => class extends I {
-    shouldStop() {
-        // Force restart.
-        return true;
-    }
-};
+const ZoomedBackgroundShapeEdit = (I) =>
+    class extends I {
+        shouldStop() {
+            // Force restart.
+            return true;
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.zoomed_background_shape", {
-        Interaction: ZoomedBackgroundShape,
-        mixin: ZoomedBackgroundShapeEdit,
-    });
+registry.category("public.interactions.edit").add("website.zoomed_background_shape", {
+    Interaction: ZoomedBackgroundShape,
+    mixin: ZoomedBackgroundShapeEdit,
+});
diff --git a/addons/website/static/src/interactions/zoomed_background_shape.js b/addons/website/static/src/interactions/zoomed_background_shape.js
index 859c70dae0b5b..9fc20750804a6 100644
--- a/addons/website/static/src/interactions/zoomed_background_shape.js
+++ b/addons/website/static/src/interactions/zoomed_background_shape.js
@@ -30,8 +30,8 @@ export class ZoomedBackgroundShape extends Interaction {
         },
         _root: {
             "t-att-style": () => ({
-                "left": this.offset,
-                "right": this.offset,
+                left: this.offset,
+                right: this.offset,
             }),
         },
     };
diff --git a/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.js b/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.js
index 2d16cf361eb18..924e330d9458a 100644
--- a/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.js
+++ b/addons/website/static/src/js/backend/view_hierarchy/view_hierarchy.js
@@ -19,10 +19,8 @@ export class ViewHierarchy extends Component {
         this.hideGenericViewByWebsite = {};
 
         onWillStart(async () => {
-            ({
-                sibling_views: this.siblingViews,
-                hierarchy: this.state.viewTree,
-            } = await this.orm.call("ir.ui.view", "get_view_hierarchy", [this.viewId], {}));
+            ({ sibling_views: this.siblingViews, hierarchy: this.state.viewTree } =
+                await this.orm.call("ir.ui.view", "get_view_hierarchy", [this.viewId], {}));
 
             this.setupWebsiteNames();
             this.setupHideGenericViewByWebsite();
diff --git a/addons/website/static/src/js/content/adapt_content.js b/addons/website/static/src/js/content/adapt_content.js
index ea70bd3265a64..ead5674f5d980 100644
--- a/addons/website/static/src/js/content/adapt_content.js
+++ b/addons/website/static/src/js/content/adapt_content.js
@@ -1,4 +1,4 @@
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener("DOMContentLoaded", () => {
     const htmlEl = document.documentElement;
     const editTranslations = !!htmlEl.dataset.edit_translations;
     // Hack: on translation editor, textareas with translatable text content
@@ -8,9 +8,9 @@ document.addEventListener('DOMContentLoaded', () => {
     // with attribute translation on CSS). But here, we need to hide the text
     // on JS until the editor's code sets the right values on textareas.
     if (editTranslations) {
-        [...document.querySelectorAll('textarea')].map(textarea => {
-            if (textarea.value.indexOf('data-oe-translation-source-sha') !== -1) {
-                textarea.classList.add('o_text_content_invisible');
+        [...document.querySelectorAll("textarea")].map((textarea) => {
+            if (textarea.value.indexOf("data-oe-translation-source-sha") !== -1) {
+                textarea.classList.add("o_text_content_invisible");
             }
         });
     }
@@ -22,7 +22,7 @@ document.addEventListener('DOMContentLoaded', () => {
     const searchModalEl = document.querySelector("header#top .modal#o_search_modal");
     if (searchModalEl) {
         const mainEl = document.querySelector("main");
-        const searchDivEl = document.createElement('div');
+        const searchDivEl = document.createElement("div");
         searchDivEl.id = "o_search_modal_block";
         searchDivEl.appendChild(searchModalEl);
         mainEl.appendChild(searchDivEl);
diff --git a/addons/website/static/src/js/content/auto_hide_menu.js b/addons/website/static/src/js/content/auto_hide_menu.js
index de0eb4c965395..897a0e458d153 100644
--- a/addons/website/static/src/js/content/auto_hide_menu.js
+++ b/addons/website/static/src/js/content/auto_hide_menu.js
@@ -5,7 +5,7 @@
 // this code and the interaction are needed to ensure the correct behaviour in
 // any possible case. See commit message for more details.
 
-const BREAKPOINT_SIZES = {sm: '575', md: '767', lg: '991', xl: '1199', xxl: '1399'};
+const BREAKPOINT_SIZES = { sm: "575", md: "767", lg: "991", xl: "1199", xxl: "1399" };
 
 let ignoreDOMMutations;
 export function setupIgnoreDOMMutations(fn) {
@@ -25,32 +25,38 @@ export function setupIgnoreDOMMutations(fn) {
  * @param {function} [options.autoClose] returns a value that represents the
  * "auto-close" behaviour of the dropdown (e.g. used to prevent auto-closing in
  * "edit" mode).
-*/
+ */
 async function autoHideMenu(el, options) {
     if (!el) {
         return;
     }
-    const navbar = el.closest('.navbar');
+    const navbar = el.closest(".navbar");
     // Get breakpoint related information from the navbar to correctly handle
     // the "auto-hide" on mobile menu.
-    const [breakpoint = 'md'] = navbar ? Object.keys(BREAKPOINT_SIZES)
-        .filter(suffix => navbar.classList.contains(`navbar-expand-${suffix}`)) : [];
-    const isNoHamburgerMenu = !!navbar && navbar.classList.contains('navbar-expand');
+    const [breakpoint = "md"] = navbar
+        ? Object.keys(BREAKPOINT_SIZES).filter((suffix) =>
+              navbar.classList.contains(`navbar-expand-${suffix}`)
+          )
+        : [];
+    const isNoHamburgerMenu = !!navbar && navbar.classList.contains("navbar-expand");
     const minSize = BREAKPOINT_SIZES[breakpoint];
     let wasExtraMenuOpenBefore = false;
     const docSelection = el.ownerDocument.getSelection();
     let { anchorNode, anchorOffset, focusNode, focusOffset } = docSelection;
 
-    options = Object.assign({
-        unfoldable: 'none',
-        images: [],
-        loadingStyleClasses: [],
-        autoClose: () => true,
-    }, options || {});
+    options = Object.assign(
+        {
+            unfoldable: "none",
+            images: [],
+            loadingStyleClasses: [],
+            autoClose: () => true,
+        },
+        options || {}
+    );
 
-    const isUserNavbar = el.parentElement.classList.contains('o_main_navbar');
-    const dropdownSubMenuClasses = ['show', 'border-0', 'position-static'];
-    const dropdownToggleClasses = ['h-auto', 'py-2', 'text-secondary'];
+    const isUserNavbar = el.parentElement.classList.contains("o_main_navbar");
+    const dropdownSubMenuClasses = ["show", "border-0", "position-static"];
+    const dropdownToggleClasses = ["h-auto", "py-2", "text-secondary"];
     const autoMarginLeftRegex = /\bm[sx]?(?:-(?:sm|md|lg|xl|xxl))?-auto\b/; // grep: ms-auto mx-auto
     const autoMarginRightRegex = /\bm[ex]?(?:-(?:sm|md|lg|xl|xxl))?-auto\b/; // grep: me-auto mx-auto
     var extraItemsToggle = null;
@@ -103,18 +109,18 @@ async function autoHideMenu(el, options) {
             return;
         }
         // Move extra menu items from dropdown-menu to menu element in the same order.
-        [...extraItemsToggle.querySelector('.dropdown-menu').children].forEach((item) => {
+        [...extraItemsToggle.querySelector(".dropdown-menu").children].forEach((item) => {
             if (!isUserNavbar) {
-                item.classList.add('nav-item');
-                const itemLink = item.querySelector('.dropdown-item');
+                item.classList.add("nav-item");
+                const itemLink = item.querySelector(".dropdown-item");
                 if (itemLink) {
-                    itemLink.classList.remove('dropdown-item');
-                    itemLink.classList.add('nav-link');
+                    itemLink.classList.remove("dropdown-item");
+                    itemLink.classList.add("nav-link");
                 }
             } else {
-                item.classList.remove('dropdown-item');
-                const dropdownSubMenu = item.querySelector('.dropdown-menu');
-                const dropdownSubMenuButton = item.querySelector('.dropdown-toggle');
+                item.classList.remove("dropdown-item");
+                const dropdownSubMenu = item.querySelector(".dropdown-menu");
+                const dropdownSubMenuButton = item.querySelector(".dropdown-toggle");
                 if (dropdownSubMenu) {
                     dropdownSubMenu.classList.remove(...dropdownSubMenuClasses);
                 }
@@ -148,12 +154,15 @@ async function autoHideMenu(el, options) {
         _restore();
 
         // Ignore invisible/toggleable top menu element & small viewports.
-        if (!el.getClientRects().length || el.closest('.show')
-            || (window.matchMedia(`(max-width: ${minSize}px)`).matches && !isNoHamburgerMenu)) {
+        if (
+            !el.getClientRects().length ||
+            el.closest(".show") ||
+            (window.matchMedia(`(max-width: ${minSize}px)`).matches && !isNoHamburgerMenu)
+        ) {
             return _endAutoMoreMenu();
         }
 
-        let unfoldableItems = [];
+        const unfoldableItems = [];
         const items = [...el.children].filter((node) => {
             if (node.matches && !node.matches(options.unfoldable)) {
                 return true;
@@ -162,14 +171,24 @@ async function autoHideMenu(el, options) {
             return false;
         });
         var nbItems = items.length;
-        var menuItemsWidth = items.reduce((sum, el) => sum + computeFloatOuterWidthWithMargins(el, true, true, false), 0);
+        var menuItemsWidth = items.reduce(
+            (sum, el) => sum + computeFloatOuterWidthWithMargins(el, true, true, false),
+            0
+        );
         let maxWidth = 0;
 
         if (!maxWidth) {
             maxWidth = computeFloatOuterWidthWithMargins(el, true, true, true);
             var style = window.getComputedStyle(el);
-            maxWidth -= (parseFloat(style.paddingLeft) + parseFloat(style.paddingRight) + parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth));
-            maxWidth -= unfoldableItems.reduce((sum, el) => sum + computeFloatOuterWidthWithMargins(el, true, true, false), 0);
+            maxWidth -=
+                parseFloat(style.paddingLeft) +
+                parseFloat(style.paddingRight) +
+                parseFloat(style.borderLeftWidth) +
+                parseFloat(style.borderRightWidth);
+            maxWidth -= unfoldableItems.reduce(
+                (sum, el) => sum + computeFloatOuterWidthWithMargins(el, true, true, false),
+                0
+            );
         }
         // Ignore if there is no overflow.
         if (maxWidth - menuItemsWidth >= -0.001) {
@@ -179,22 +198,27 @@ async function autoHideMenu(el, options) {
         const dropdownMenu = _addExtraItemsButton(items[nbItems - 1].nextElementSibling);
         menuItemsWidth += computeFloatOuterWidthWithMargins(extraItemsToggle, true, true, false);
         do {
-            menuItemsWidth -= computeFloatOuterWidthWithMargins(items[--nbItems], true, true, false);
-        } while (!(maxWidth - menuItemsWidth >= -0.001) && (nbItems > 0));
+            menuItemsWidth -= computeFloatOuterWidthWithMargins(
+                items[--nbItems],
+                true,
+                true,
+                false
+            );
+        } while (!(maxWidth - menuItemsWidth >= -0.001) && nbItems > 0);
 
         const extraItems = items.slice(nbItems);
         extraItems.forEach((el) => {
             if (!isUserNavbar) {
-                const navLink = el.querySelector('.nav-link, a');
-                el.classList.remove('nav-item');
+                const navLink = el.querySelector(".nav-link, a");
+                el.classList.remove("nav-item");
                 if (navLink) {
-                    navLink.classList.remove('nav-link');
-                    navLink.classList.add('dropdown-item');
+                    navLink.classList.remove("nav-link");
+                    navLink.classList.add("dropdown-item");
                 }
             } else {
-                const dropdownSubMenu = el.querySelector('.dropdown-menu');
-                const dropdownSubMenuButton = el.querySelector('.dropdown-toggle');
-                el.classList.add('dropdown-item', 'p-0');
+                const dropdownSubMenu = el.querySelector(".dropdown-menu");
+                const dropdownSubMenuButton = el.querySelector(".dropdown-toggle");
+                el.classList.add("dropdown-item", "p-0");
                 if (dropdownSubMenu) {
                     dropdownSubMenu.classList.add(...dropdownSubMenuClasses);
                 }
@@ -211,11 +235,23 @@ async function autoHideMenu(el, options) {
         var rect = el.getBoundingClientRect();
         var style = window.getComputedStyle(el);
         var outerWidth = rect.right - rect.left;
-        const isRTL = style.direction === 'rtl';
-        if (mLeft !== false && (considerAutoMargins || !(isRTL ? autoMarginRightRegex : autoMarginLeftRegex).test(el.getAttribute('class')))) {
+        const isRTL = style.direction === "rtl";
+        if (
+            mLeft !== false &&
+            (considerAutoMargins ||
+                !(isRTL ? autoMarginRightRegex : autoMarginLeftRegex).test(
+                    el.getAttribute("class")
+                ))
+        ) {
             outerWidth += parseFloat(style.marginLeft);
         }
-        if (mRight !== false && (considerAutoMargins || !(isRTL ? autoMarginLeftRegex : autoMarginRightRegex).test(el.getAttribute('class')))) {
+        if (
+            mRight !== false &&
+            (considerAutoMargins ||
+                !(isRTL ? autoMarginLeftRegex : autoMarginRightRegex).test(
+                    el.getAttribute("class")
+                ))
+        ) {
             outerWidth += parseFloat(style.marginRight);
         }
         // Would be NaN for invisible elements for example
@@ -223,24 +259,24 @@ async function autoHideMenu(el, options) {
     }
 
     function _addExtraItemsButton(target) {
-        let dropdownMenu = document.createElement("ul");
+        const dropdownMenu = document.createElement("ul");
         extraItemsToggle = document.createElement("li");
-        const extraItemsToggleIcon = document.createElement('i');
-        const extraItemsToggleLink = document.createElement('a');
+        const extraItemsToggleIcon = document.createElement("i");
+        const extraItemsToggleLink = document.createElement("a");
 
-        dropdownMenu.className = 'dropdown-menu';
-        extraItemsToggle.className = 'nav-item dropdown o_extra_menu_items';
+        dropdownMenu.className = "dropdown-menu";
+        extraItemsToggle.className = "nav-item dropdown o_extra_menu_items";
         extraItemsToggle.setAttribute("role", "presentation");
-        extraItemsToggleIcon.className = 'oi oi-plus';
+        extraItemsToggleIcon.className = "oi oi-plus";
         const extraItemsToggleAriaLabel = el.closest("[data-extra-items-toggle-aria-label]")
             ?.dataset.extraItemsToggleAriaLabel;
         Object.entries({
-            role: 'menuitem',
-            href: '#',
-            class: 'nav-link dropdown-toggle o-no-caret',
-            'data-bs-toggle': 'dropdown',
-            'aria-expanded': false,
-            'aria-label': extraItemsToggleAriaLabel || " ",
+            role: "menuitem",
+            href: "#",
+            class: "nav-link dropdown-toggle o-no-caret",
+            "data-bs-toggle": "dropdown",
+            "aria-expanded": false,
+            "aria-label": extraItemsToggleAriaLabel || " ",
         }).forEach(([key, value]) => {
             extraItemsToggleLink.setAttribute(key, value);
         });
@@ -264,10 +300,10 @@ async function autoHideMenu(el, options) {
                 if (!image.width) {
                     // The purpose of the 'o_menu_image_placeholder' class is to add a default
                     // size to non loaded images (on the first update) to prevent flickering.
-                    image.classList.add('o_menu_image_placeholder');
+                    image.classList.add("o_menu_image_placeholder");
                 }
-                image.addEventListener('load', () => {
-                    image.classList.remove('o_menu_image_placeholder');
+                image.addEventListener("load", () => {
+                    image.classList.remove("o_menu_image_placeholder");
                     resolve();
                 });
             });
@@ -283,7 +319,9 @@ async function autoHideMenu(el, options) {
         const extraMenuEl = _getExtraMenuEl();
         const setSelection = () =>
             docSelection.setBaseAndExtent(anchorNode, anchorOffset, focusNode, focusOffset);
-        const anchorInExtra = anchorNode?.parentElement.closest(".o_extra_menu_items .dropdown-menu");
+        const anchorInExtra = anchorNode?.parentElement.closest(
+            ".o_extra_menu_items .dropdown-menu"
+        );
         if (extraMenuEl && (anchorInExtra || wasExtraMenuOpenBefore)) {
             if (anchorInExtra) {
                 el.addEventListener("shown.bs.dropdown", setSelection, { once: true });
@@ -297,20 +335,22 @@ async function autoHideMenu(el, options) {
 /**
  * Auto adapt the header layout so that elements are not wrapped on a new line.
  */
-document.addEventListener('DOMContentLoaded', async () => {
-    const header = document.querySelector('header#top');
+document.addEventListener("DOMContentLoaded", async () => {
+    const header = document.querySelector("header#top");
     if (header) {
         const topMenu = header.querySelector(".top_menu");
         const unfoldable = ".divider, .divider ~ li, .o_no_autohide_item, .js_language_selector";
-        if (!topMenu.querySelector(`:scope > :not(${unfoldable})`)
-                || header.classList.contains("o_no_autohide_menu")) {
-            topMenu.classList.remove('o_menu_loading');
+        if (
+            !topMenu.querySelector(`:scope > :not(${unfoldable})`) ||
+            header.classList.contains("o_no_autohide_menu")
+        ) {
+            topMenu.classList.remove("o_menu_loading");
             return;
         }
-        const excludedImagesSelector = '.o_mega_menu, .o_offcanvas_logo_container, .o_lang_flag';
+        const excludedImagesSelector = ".o_mega_menu, .o_offcanvas_logo_container, .o_lang_flag";
         const excludedImages = [...header.querySelectorAll(excludedImagesSelector)];
-        const images = [...header.querySelectorAll('img')].filter((img) => {
-            excludedImages.forEach(node => {
+        const images = [...header.querySelectorAll("img")].filter((img) => {
+            excludedImages.forEach((node) => {
                 if (node.contains(img)) {
                     return false;
                 }
@@ -320,7 +360,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         autoHideMenu(topMenu, {
             unfoldable: unfoldable,
             images: images,
-            loadingStyleClasses: ['o_menu_loading'],
+            loadingStyleClasses: ["o_menu_loading"],
             // The "auto-hide" menu is closed when clicking inside the extra
             // menu items. The goal here is to prevent this default behaviour
             // on "edit" mode to allow correct editing of extra menu items, mega
diff --git a/addons/website/static/src/js/content/compatibility.js b/addons/website/static/src/js/content/compatibility.js
index fb7071736eaa5..f7ba3710ea9dd 100644
--- a/addons/website/static/src/js/content/compatibility.js
+++ b/addons/website/static/src/js/content/compatibility.js
@@ -6,11 +6,10 @@
 // Check if flex is supported and add the info as an attribute of the HTML
 // element so that css selectors can match it (only if not supported)
 var htmlStyle = document.documentElement.style;
-var isFlexSupported = (('flexWrap' in htmlStyle)
-                    || ('WebkitFlexWrap' in htmlStyle)
-                    || ('msFlexWrap' in htmlStyle));
+var isFlexSupported =
+    "flexWrap" in htmlStyle || "WebkitFlexWrap" in htmlStyle || "msFlexWrap" in htmlStyle;
 if (!isFlexSupported) {
-    document.documentElement.setAttribute('data-no-flex', '');
+    document.documentElement.setAttribute("data-no-flex", "");
 }
 
 export default {
diff --git a/addons/website/static/src/js/content/cookie_watcher.js b/addons/website/static/src/js/content/cookie_watcher.js
index c7f2a14fa4d88..373377ab12773 100644
--- a/addons/website/static/src/js/content/cookie_watcher.js
+++ b/addons/website/static/src/js/content/cookie_watcher.js
@@ -6,7 +6,7 @@
 
 // eslint-disable-next-line no-unused-vars
 function watch3rdPartyScripts(thirdPartyDomainsBlockList) {
-    const removeWWW = (domain) => domain.startsWith("www.") ? domain.slice(4) : domain;
+    const removeWWW = (domain) => (domain.startsWith("www.") ? domain.slice(4) : domain);
     const blockList = thirdPartyDomainsBlockList.map(removeWWW);
     const cookieRegex = /(^|(; ))website_cookies_bar=(?<value>[^;]+)/;
     const scriptSrcDesc = Object.getOwnPropertyDescriptor(HTMLScriptElement.prototype, "src");
@@ -21,8 +21,8 @@ function watch3rdPartyScripts(thirdPartyDomainsBlockList) {
             const cookiesBarCookie = document.cookie.match(cookieRegex)?.groups.value;
             const host = removeWWW(new URL(val, window.location.origin).host.toLowerCase());
             if (
-                (!cookiesBarCookie || !JSON.parse(cookiesBarCookie).optional)
-                && blockList.some((domain) => host === domain || host.endsWith(`.${domain}`))
+                (!cookiesBarCookie || !JSON.parse(cookiesBarCookie).optional) &&
+                blockList.some((domain) => host === domain || host.endsWith(`.${domain}`))
             ) {
                 this.dataset.nocookieSrc = val;
                 this.dataset.needCookiesApproval = "true";
@@ -32,14 +32,20 @@ function watch3rdPartyScripts(thirdPartyDomainsBlockList) {
             }
         },
     });
-    document.addEventListener("optionalCookiesAccepted", () => {
-        for (const scriptEl of document.querySelectorAll("script[data-need-cookies-approval]")) {
-            // We have to completely recreate the scripts for them to fire, we
-            // cannot just switch the src.
-            const newScript = document.createElement("script");
-            newScript._src = scriptEl.dataset.nocookieSrc;
-            scriptEl.insertAdjacentElement("beforebegin", newScript);
-            scriptEl.remove();
-        }
-    }, { once: true });
+    document.addEventListener(
+        "optionalCookiesAccepted",
+        () => {
+            for (const scriptEl of document.querySelectorAll(
+                "script[data-need-cookies-approval]"
+            )) {
+                // We have to completely recreate the scripts for them to fire, we
+                // cannot just switch the src.
+                const newScript = document.createElement("script");
+                newScript._src = scriptEl.dataset.nocookieSrc;
+                scriptEl.insertAdjacentElement("beforebegin", newScript);
+                scriptEl.remove();
+            }
+        },
+        { once: true }
+    );
 }
diff --git a/addons/website/static/src/js/content/inject_dom.js b/addons/website/static/src/js/content/inject_dom.js
index 56aa9eadf9186..61c449e4ca05d 100644
--- a/addons/website/static/src/js/content/inject_dom.js
+++ b/addons/website/static/src/js/content/inject_dom.js
@@ -5,7 +5,7 @@ import { setUtmsHtmlDataset, unhideConditionalElements } from "@website/utils/mi
 // into Interaction
 export { unhideConditionalElements };
 
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener("DOMContentLoaded", () => {
     // Transfer cookie/session data as HTML element's attributes so that CSS
     // selectors can be based on them.
     setUtmsHtmlDataset();
diff --git a/addons/website/static/src/js/content/redirect.js b/addons/website/static/src/js/content/redirect.js
index 3e266cf69081e..6ed036f02590a 100644
--- a/addons/website/static/src/js/content/redirect.js
+++ b/addons/website/static/src/js/content/redirect.js
@@ -1,4 +1,4 @@
-import { session } from '@web/session';
+import { session } from "@web/session";
 
 /**
  * This script, served with frontend pages, displays buttons in the top left
@@ -6,40 +6,47 @@ import { session } from '@web/session';
  * In the case of the page being viewed in the website_preview client action,
  * it will forward some events to its parent.
  */
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener("DOMContentLoaded", () => {
     if (session.is_website_user) {
         return;
     }
 
     if (!window.frameElement) {
-        const frontendToBackendNavEl = document.querySelector('.o_frontend_to_backend_nav');
+        const frontendToBackendNavEl = document.querySelector(".o_frontend_to_backend_nav");
         if (frontendToBackendNavEl) {
-            frontendToBackendNavEl.classList.add('d-flex');
-            frontendToBackendNavEl.classList.remove('d-none');
+            frontendToBackendNavEl.classList.add("d-flex");
+            frontendToBackendNavEl.classList.remove("d-none");
         }
         // Auto redirect to frontend if edit/translation mode is requested
         const currentUrl = new URL(window.location.href);
         currentUrl.pathname = `/@${currentUrl.pathname}`;
-        if (currentUrl.searchParams.get('enable_editor') || currentUrl.searchParams.get('edit_translations')) {
-            document.body.innerHTML = '';
+        if (
+            currentUrl.searchParams.get("enable_editor") ||
+            currentUrl.searchParams.get("edit_translations")
+        ) {
+            document.body.innerHTML = "";
             window.location.replace(currentUrl.href);
             return;
         }
-        const backendEditBtnEl = document.querySelector('.o_frontend_to_backend_edit_btn');
+        const backendEditBtnEl = document.querySelector(".o_frontend_to_backend_edit_btn");
         if (backendEditBtnEl) {
             backendEditBtnEl.href = currentUrl.href;
-            document.addEventListener("keydown", ev => {
-                if (ev.key === "a" && ev.altKey) {
-                    currentUrl.searchParams.set('enable_editor', 1);
-                    window.location.replace(currentUrl.href);
-                }
-            }, true);
+            document.addEventListener(
+                "keydown",
+                (ev) => {
+                    if (ev.key === "a" && ev.altKey) {
+                        currentUrl.searchParams.set("enable_editor", 1);
+                        window.location.replace(currentUrl.href);
+                    }
+                },
+                true
+            );
         }
     } else {
-        const backendUserDropdownLinkEl = document.getElementById('o_backend_user_dropdown_link');
+        const backendUserDropdownLinkEl = document.getElementById("o_backend_user_dropdown_link");
         if (backendUserDropdownLinkEl) {
-            backendUserDropdownLinkEl.classList.add('d-none');
-            backendUserDropdownLinkEl.classList.remove('d-flex');
+            backendUserDropdownLinkEl.classList.add("d-none");
+            backendUserDropdownLinkEl.classList.remove("d-flex");
         }
         // Multiple reasons to do this:
         // - It seems like DOMContentLoaded doesn't always trigger when
@@ -47,6 +54,6 @@ document.addEventListener('DOMContentLoaded', () => {
         // - Having an event that's fire only when the page is from Odoo avoids
         //   weird behaviours. (e.g. if we want to clear out the iframe, it might
         //   fire an DOMContentLoaded on a non odoo page)
-        window.frameElement.dispatchEvent(new CustomEvent('OdooFrameContentLoaded'));
+        window.frameElement.dispatchEvent(new CustomEvent("OdooFrameContentLoaded"));
     }
 });
diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js
index 456b7b5d64643..2994d264c5911 100644
--- a/addons/website/static/src/js/content/snippets.animation.js
+++ b/addons/website/static/src/js/content/snippets.animation.js
@@ -66,7 +66,7 @@ window.SelectorEngine.find = function (...args) {
     try {
         return baseSelectorEngineFind.call(this, ...args);
     } catch {
-        return [document.createElement('div')];
+        return [document.createElement("div")];
     }
 };
 
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js
index 6b03f6afae063..fee7609a79385 100644
--- a/addons/website/static/src/js/content/website_root.js
+++ b/addons/website/static/src/js/content/website_root.js
@@ -1,19 +1,19 @@
-import publicRootData from '@web/legacy/js/public/public_root';
+import publicRootData from "@web/legacy/js/public/public_root";
 import "@website/libs/zoomodoo/zoomodoo";
 import { pick } from "@web/core/utils/objects";
 
 export const WebsiteRoot = publicRootData.PublicRoot.extend({
     events: Object.assign({}, publicRootData.PublicRoot.prototype.events || {}, {
-        'click .js_change_lang': '_onLangChangeClick',
-        'click .js_publish_management .js_publish_btn': '_onPublishBtnClick',
-        'shown.bs.modal': '_onModalShown',
+        "click .js_change_lang": "_onLangChangeClick",
+        "click .js_publish_management .js_publish_btn": "_onPublishBtnClick",
+        "shown.bs.modal": "_onModalShown",
     }),
     custom_events: Object.assign({}, publicRootData.PublicRoot.prototype.custom_events || {}, {
-        'gmap_api_request': '_onGMapAPIRequest',
-        'gmap_api_key_request': '_onGMapAPIKeyRequest',
-        'ready_to_clean_for_save': '_onWidgetsStopRequest',
-        'seo_object_request': '_onSeoObjectRequest',
-        'will_remove_snippet': '_onWidgetsStopRequest',
+        gmap_api_request: "_onGMapAPIRequest",
+        gmap_api_key_request: "_onGMapAPIKeyRequest",
+        ready_to_clean_for_save: "_onWidgetsStopRequest",
+        seo_object_request: "_onSeoObjectRequest",
+        will_remove_snippet: "_onWidgetsStopRequest",
     }),
 
     /**
@@ -31,7 +31,7 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend({
      */
     start: function () {
         // Enable magnify on zommable img
-        this.$('.zoomable img[data-zoom]').zoomOdoo();
+        this.$(".zoomable img[data-zoom]").zoomOdoo();
 
         return this._super.apply(this, arguments);
     },
@@ -45,20 +45,26 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend({
      */
     _getContext: function (context) {
         var html = document.documentElement;
-        return Object.assign({
-            'website_id': html.getAttribute('data-website-id') | 0,
-        }, this._super.apply(this, arguments));
+        return Object.assign(
+            {
+                website_id: html.getAttribute("data-website-id") | 0,
+            },
+            this._super.apply(this, arguments)
+        );
     },
     /**
      * @override
      */
     _getExtraContext: function (context) {
         var html = document.documentElement;
-        return Object.assign({
-            'editable': !!(html.dataset.editable || $('[data-oe-model]').length), // temporary hack, this should be done in python
-            'translatable': !!html.dataset.translatable,
-            'edit_translations': !!html.dataset.edit_translations,
-        }, this._super.apply(this, arguments));
+        return Object.assign(
+            {
+                editable: !!(html.dataset.editable || $("[data-oe-model]").length), // temporary hack, this should be done in python
+                translatable: !!html.dataset.translatable,
+                edit_translations: !!html.dataset.edit_translations,
+            },
+            this._super.apply(this, arguments)
+        );
     },
     /**
      * @override
@@ -95,15 +101,17 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend({
         ev.preventDefault();
         // In edit mode, the client action redirects the iframe to the correct
         // location with the chosen language.
-        if (document.body.classList.contains('editor_enable')) {
+        if (document.body.classList.contains("editor_enable")) {
             return;
         }
         var $target = $(ev.currentTarget);
         // retrieve the hash before the redirect
         var redirect = {
-            lang: encodeURIComponent($target.data('url_code')),
-            url: encodeURIComponent($target.attr('href').replace(/[&?]edit_translations[^&?]+/, '')),
-            hash: encodeURIComponent(window.location.hash)
+            lang: encodeURIComponent($target.data("url_code")),
+            url: encodeURIComponent(
+                $target.attr("href").replace(/[&?]edit_translations[^&?]+/, "")
+            ),
+            hash: encodeURIComponent(window.location.hash),
         };
         window.location.href = `/website/lang/${redirect.lang}?r=${redirect.url}${redirect.hash}`;
     },
@@ -133,7 +141,7 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend({
      * @param {OdooEvent} ev
      */
     _onSeoObjectRequest: function (ev) {
-        var res = this._unslugHtmlDataObject('seo-object');
+        var res = this._unslugHtmlDataObject("seo-object");
         ev.data.callback(res);
     },
     /**
@@ -145,7 +153,7 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend({
      * if not found
      */
     _unslugHtmlDataObject: function (dataAttr) {
-        var repr = $('html').data(dataAttr);
+        var repr = $("html").data(dataAttr);
         var match = repr && repr.match(/(.+)\((-?\d+),(.*)\)/);
         if (!match) {
             return null;
@@ -161,30 +169,30 @@ export const WebsiteRoot = publicRootData.PublicRoot.extend({
      */
     _onPublishBtnClick: function (ev) {
         ev.preventDefault();
-        if (document.body.classList.contains('editor_enable')) {
+        if (document.body.classList.contains("editor_enable")) {
             return;
         }
 
         const publishEl = ev.currentTarget.closest(".js_publish_management");
-        this.orm.call(
-            publishEl.dataset.object,
-            "website_publish_button",
-            [[parseInt(publishEl.dataset.id, 10)]]
-        ).then(function (result) {
-            publishEl.classList.toggle("css_published", result);
-            publishEl.classList.toggle("css_unpublished", !result);
-            const itemEl = publishEl.closest("[data-publish]");
-            if (itemEl) {
-                itemEl.dataset.publish = result ? 'on' : 'off';
-            }
-        });
+        this.orm
+            .call(publishEl.dataset.object, "website_publish_button", [
+                [parseInt(publishEl.dataset.id, 10)],
+            ])
+            .then(function (result) {
+                publishEl.classList.toggle("css_published", result);
+                publishEl.classList.toggle("css_unpublished", !result);
+                const itemEl = publishEl.closest("[data-publish]");
+                if (itemEl) {
+                    itemEl.dataset.publish = result ? "on" : "off";
+                }
+            });
     },
     /**
      * @private
      * @param {Event} ev
      */
     _onModalShown: function (ev) {
-        $(ev.target).addClass('modal_shown');
+        $(ev.target).addClass("modal_shown");
     },
 });
 
diff --git a/addons/website/static/src/js/content/website_root_instance.js b/addons/website/static/src/js/content/website_root_instance.js
index 108582d9858b5..5a4f1261a1986 100644
--- a/addons/website/static/src/js/content/website_root_instance.js
+++ b/addons/website/static/src/js/content/website_root_instance.js
@@ -4,9 +4,9 @@ import { createPublicRoot } from "@web/legacy/js/public/public_root";
 import lazyloader from "@web/legacy/js/public/lazyloader";
 import { WebsiteRoot } from "./website_root";
 
-const prom = createPublicRoot(WebsiteRoot).then(async rootInstance => {
+const prom = createPublicRoot(WebsiteRoot).then(async (rootInstance) => {
     if (window.frameElement) {
-        window.dispatchEvent(new CustomEvent('PUBLIC-ROOT-READY', {detail: {rootInstance}}));
+        window.dispatchEvent(new CustomEvent("PUBLIC-ROOT-READY", { detail: { rootInstance } }));
     }
     return rootInstance;
 });
diff --git a/addons/website/static/src/js/new_content_form.js b/addons/website/static/src/js/new_content_form.js
index 6f3a1c027c13f..cd354d483e401 100644
--- a/addons/website/static/src/js/new_content_form.js
+++ b/addons/website/static/src/js/new_content_form.js
@@ -1,5 +1,5 @@
-import {formView} from "@web/views/form/form_view";
-import {registry} from "@web/core/registry";
+import { formView } from "@web/views/form/form_view";
+import { registry } from "@web/core/registry";
 
 export class NewContentFormController extends formView.Controller {
     /**
@@ -24,7 +24,7 @@ export class NewContentFormController extends formView.Controller {
 
 export const NewContentFormView = {
     ...formView,
-    display: {controlPanel: false},
+    display: { controlPanel: false },
     Controller: NewContentFormController,
 };
 
diff --git a/addons/website/static/src/js/send_mail_form.js b/addons/website/static/src/js/send_mail_form.js
index 752bc4c63b6aa..815de820923f5 100644
--- a/addons/website/static/src/js/send_mail_form.js
+++ b/addons/website/static/src/js/send_mail_form.js
@@ -1,49 +1,58 @@
 import { _t } from "@web/core/l10n/translation";
-import { registry } from '@web/core/registry';
+import { registry } from "@web/core/registry";
 
-registry.category("website.form_editor_actions").add('send_mail', {
-    formFields: [{
-        type: 'char',
-        custom: true,
-        required: true,
-        fillWith: 'name',
-        name: 'name',
-        string: _t('Your Name'),
-    }, {
-        type: 'tel',
-        custom: true,
-        fillWith: 'phone',
-        name: 'phone',
-        string: _t('Phone Number'),
-    }, {
-        type: 'email',
-        modelRequired: true,
-        fillWith: 'email',
-        name: 'email_from',
-        string: _t('Your Email'),
-    }, {
-        type: 'char',
-        custom: true,
-        fillWith: 'commercial_company_name',
-        name: 'company',
-        string: _t('Your Company'),
-    }, {
-        type: 'char',
-        modelRequired: true,
-        name: 'subject',
-        string: _t('Subject'),
-    }, {
-        type: 'text',
-        custom: true,
-        required: true,
-        name: 'description',
-        string: _t('Your Question'),
-    }],
-    fields: [{
-        name: 'email_to',
-        type: 'char',
-        required: true,
-        string: _t('Recipient Email'),
-        defaultValue: 'info@yourcompany.example.com',
-    }],
+registry.category("website.form_editor_actions").add("send_mail", {
+    formFields: [
+        {
+            type: "char",
+            custom: true,
+            required: true,
+            fillWith: "name",
+            name: "name",
+            string: _t("Your Name"),
+        },
+        {
+            type: "tel",
+            custom: true,
+            fillWith: "phone",
+            name: "phone",
+            string: _t("Phone Number"),
+        },
+        {
+            type: "email",
+            modelRequired: true,
+            fillWith: "email",
+            name: "email_from",
+            string: _t("Your Email"),
+        },
+        {
+            type: "char",
+            custom: true,
+            fillWith: "commercial_company_name",
+            name: "company",
+            string: _t("Your Company"),
+        },
+        {
+            type: "char",
+            modelRequired: true,
+            name: "subject",
+            string: _t("Subject"),
+        },
+        {
+            type: "text",
+            custom: true,
+            required: true,
+            name: "description",
+            string: _t("Your Question"),
+        },
+    ],
+    fields: [
+        {
+            name: "email_to",
+            type: "char",
+            required: true,
+            string: _t("Recipient Email"),
+            defaultValue: "info@yourcompany.example.com",
+        },
+    ],
 });
diff --git a/addons/website/static/src/js/text_processing.js b/addons/website/static/src/js/text_processing.js
index 5043a6d41d45a..31766fb7ac73f 100644
--- a/addons/website/static/src/js/text_processing.js
+++ b/addons/website/static/src/js/text_processing.js
@@ -4,184 +4,221 @@ import { isVisible } from "@web/core/utils/ui";
 // SVG generator: contains all information needed to draw highlight SVGs
 // according to text dimensions, highlight style,...
 const _textHighlightFactory = {
-    underline: targetEl => {
-        return drawPath(targetEl, {mode: "line"});
+    underline: (targetEl) => drawPath(targetEl, { mode: "line" }),
+    freehand_1: (targetEl) => {
+        const template = (w, h) => [
+            `M 0,${h * 1.1} C ${w / 8},${h * 1.05} ${w / 4},${h} ${w},${h}`,
+        ];
+        return drawPath(targetEl, { mode: "free", template });
     },
-    freehand_1: targetEl => {
-        const template = (w, h) => [`M 0,${h * 1.1} C ${w / 8},${h * 1.05} ${w / 4},${h} ${w},${h}`];
-        return drawPath(targetEl, {mode: "free", template});
+    freehand_2: (targetEl) => {
+        const template = (w, h) => [
+            `M181.27 13.873c-.451-1.976-.993-3.421-1.072-4.9-.125-2.214-.61-4.856.384-6.539.756-1.287 3.636-2.055 5.443-1.852 3.455.395 7.001 1.231` +
+                ` 10.14 2.676 1.728.802 3.174 3.06 3.817 4.98.237.712-1.953 2.824-3.399 3.4-2.766 1.095-5.748 1.75-8.706 2.179-2.394.339-4.879.068-6.584.068l-.023-.012ZM8.416 3.90` +
+                `2c3.862.26 7.78.249 11.574.926 1.65.294 3.027 2.033 4.54 3.117-1.095 1.186-1.987 2.982-3.343 3.456a67.118 67.118 0 0 1-11.19 2.823c-3.253.53-6.494-.339-8.617-2.98` +
+                `1C.364 9.978-.302 7.686.138 6.263c.361-1.152 2.54-2 4.077-2.44 1.287-.372 2.789.046 4.2.102v-.023Zm154.267 9.983c-4.291-.305-8.153-1.58-9.915-5.623-.745-1.694-.39` +
+                `5-4.382.474-6.121 1.073-2.168 3.512-1.965 5.613-1.005 2.541 1.174 5.251 2.157 7.509 3.76 1.502 1.073 3.557 3.445 3.207 4.574-.519 1.694-2.857 2.913-4.562 4.133-.5` +
+                `76.406-1.592.203-2.326.282ZM72.58 17.42c-2.733-1.807-5.307-3.004-7.137-4.913-.892-.925-.892-3.376-.361-4.776.407-1.05 2.304-2.112 3.546-2.135 3.602-.056 7.238.215` +
+                ` 10.818.723 3.828.542 5.15 4.1 2.213 6.539-2.439 2.021-5.77 2.958-9.079 4.562Zm30.795-.802c-2.507-1.536-5.228-2.823-7.397-4.743-.925-.813-1.377-3.297-.813-4.359.6` +
+                `78-1.265 2.677-2.507 4.11-2.518 3.016-.023 6.155.418 9.001 1.389 1.412.485 3.173 2.552 3.185 3.907 0 1.57-1.423 3.557-2.801 4.619-1.152.892-3.139.711-4.743 1.005-` +
+                `.181.226-.35.463-.531.689l-.011.01Zm-59.704-1.457c-2.066-1.163-4.788-2.224-6.82-4.054-.915-.824-1.04-3.478-.407-4.765.486-.983 2.722-1.559 4.156-1.502 2.676.101 5` +
+                `.398.542 7.95 1.332 1.457.452 3.523 1.75 3.681 2.891.18 1.31-1.13 3.309-2.383 4.201-1.411 1.005-3.466 1.118-6.188 1.886l.011.011Zm88.489-1.863c-2.643-1.48-5.567-2` +
+                `.62-7.803-4.574-1.005-.88-1.31-3.692-.667-5.002.509-1.04 2.982-1.615 4.529-1.513 2.032.135 4.054 1.027 6.007 1.772 2.485.95 5.026 2.236 4.382 5.455-.644 3.15-3.49` +
+                ` 2.947-5.963 3.004-.169.293-.327.575-.496.87l.011-.012Z`,
+        ];
+        return drawPath(targetEl, {
+            mode: "fill",
+            template,
+            SVGWidth: 200,
+            SVGHeight: 18,
+            position: "bottom",
+        });
     },
-    freehand_2: targetEl => {
-        const template = (w, h) => [`M181.27 13.873c-.451-1.976-.993-3.421-1.072-4.9-.125-2.214-.61-4.856.384-6.539.756-1.287 3.636-2.055 5.443-1.852 3.455.395 7.001 1.231` +
-        ` 10.14 2.676 1.728.802 3.174 3.06 3.817 4.98.237.712-1.953 2.824-3.399 3.4-2.766 1.095-5.748 1.75-8.706 2.179-2.394.339-4.879.068-6.584.068l-.023-.012ZM8.416 3.90` +
-        `2c3.862.26 7.78.249 11.574.926 1.65.294 3.027 2.033 4.54 3.117-1.095 1.186-1.987 2.982-3.343 3.456a67.118 67.118 0 0 1-11.19 2.823c-3.253.53-6.494-.339-8.617-2.98` +
-        `1C.364 9.978-.302 7.686.138 6.263c.361-1.152 2.54-2 4.077-2.44 1.287-.372 2.789.046 4.2.102v-.023Zm154.267 9.983c-4.291-.305-8.153-1.58-9.915-5.623-.745-1.694-.39` +
-        `5-4.382.474-6.121 1.073-2.168 3.512-1.965 5.613-1.005 2.541 1.174 5.251 2.157 7.509 3.76 1.502 1.073 3.557 3.445 3.207 4.574-.519 1.694-2.857 2.913-4.562 4.133-.5` +
-        `76.406-1.592.203-2.326.282ZM72.58 17.42c-2.733-1.807-5.307-3.004-7.137-4.913-.892-.925-.892-3.376-.361-4.776.407-1.05 2.304-2.112 3.546-2.135 3.602-.056 7.238.215` +
-        ` 10.818.723 3.828.542 5.15 4.1 2.213 6.539-2.439 2.021-5.77 2.958-9.079 4.562Zm30.795-.802c-2.507-1.536-5.228-2.823-7.397-4.743-.925-.813-1.377-3.297-.813-4.359.6` +
-        `78-1.265 2.677-2.507 4.11-2.518 3.016-.023 6.155.418 9.001 1.389 1.412.485 3.173 2.552 3.185 3.907 0 1.57-1.423 3.557-2.801 4.619-1.152.892-3.139.711-4.743 1.005-` +
-        `.181.226-.35.463-.531.689l-.011.01Zm-59.704-1.457c-2.066-1.163-4.788-2.224-6.82-4.054-.915-.824-1.04-3.478-.407-4.765.486-.983 2.722-1.559 4.156-1.502 2.676.101 5` +
-        `.398.542 7.95 1.332 1.457.452 3.523 1.75 3.681 2.891.18 1.31-1.13 3.309-2.383 4.201-1.411 1.005-3.466 1.118-6.188 1.886l.011.011Zm88.489-1.863c-2.643-1.48-5.567-2` +
-        `.62-7.803-4.574-1.005-.88-1.31-3.692-.667-5.002.509-1.04 2.982-1.615 4.529-1.513 2.032.135 4.054 1.027 6.007 1.772 2.485.95 5.026 2.236 4.382 5.455-.644 3.15-3.49` +
-        ` 2.947-5.963 3.004-.169.293-.327.575-.496.87l.011-.012Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 18, position: "bottom"});
+    freehand_3: (targetEl) => {
+        const template = (w, h) => [
+            `M189.705 18.285c-3.99.994-7.968 2.015-11.958 2.972-1.415.344-2.926 1.008-4.278.727-6.305-1.327-12.568-3.036-18.874-4.376-1.995-.42-4.2` +
+                `46-.701-6.133-.038-5.867 2.067-11.54 2.386-17.374-.242-1.491-.676-3.56-.421-5.125.217-5.523 2.22-10.789 3.597-16.494.127-1.64-.995-4.675-.038-6.584 1.148-6.102 3.` +
+                `789-12.01 4.414-18.198.434-.998-.638-2.681-.638-3.754-.115-6.852 3.355-13.404 2.858-20.043-1.008-1.5-.867-4.02-.6-5.608.307-7.528 4.35-14.842 5.702-22.07-.638-2.1` +
+                `44-1.875-3.71-.37-5.394 1.046-4.622 3.89-9.565 6.327-15.367 4.286C6.338 20.989.505 13.067.022 5.949-.085 4.38.194 1.753.955 1.332 2.253.617 4.537.553 5.588 1.51 7` +
+                `.55 3.27 9.18 5.77 10.52 8.296c2.82 5.269 4.15 5.766 8.504 2.156 1.555-1.288 2.992-2.768 4.396-4.286 4.022-4.311 7.143-4.465 11.26-.472 7.068 6.837 8.226 7.067 15` +
+                `.979 1.314 3.721-2.755 7.206-2.653 10.627.128 4.987 4.056 9.791 4.49 14.853.191 2.702-2.296 5.78-2.296 8.45.115 4.29 3.89 8.45 3.33 12.719.166.847-.638 1.705-1.26` +
+                `3 2.552-1.914 3.035-2.309 6.048-2.5 9.019.166 3.453 3.087 7.12 3.15 10.616.472 4.107-3.138 7.85-3.342 12.16-.306 3.668 2.59 7.83 1.964 11.594-.255 3.935-2.322 7.6` +
+                `67-2.488 11.409.408.365.28.794.612 1.213.65 6.799.549 13.522 3.394 20.428.779 1.887-.715 3.914-1.034 5.899-1.148 3.313-.192 6.659-.358 9.941 0 1.993.23 4.354.905 ` +
+                `5.737 2.436 1.308 1.429 2.113 4.235 2.123 6.442.022 3.023-2.424 3.431-4.472 3.597-1.887.153-3.796.038-5.695.038-.053-.216-.106-.446-.16-.663l.032-.025Z`,
+        ];
+        return drawPath(targetEl, {
+            mode: "fill",
+            template,
+            SVGWidth: 200,
+            SVGHeight: 24,
+            position: "bottom",
+        });
     },
-    freehand_3: targetEl => {
-        const template = (w, h) => [`M189.705 18.285c-3.99.994-7.968 2.015-11.958 2.972-1.415.344-2.926 1.008-4.278.727-6.305-1.327-12.568-3.036-18.874-4.376-1.995-.42-4.2` +
-        `46-.701-6.133-.038-5.867 2.067-11.54 2.386-17.374-.242-1.491-.676-3.56-.421-5.125.217-5.523 2.22-10.789 3.597-16.494.127-1.64-.995-4.675-.038-6.584 1.148-6.102 3.` +
-        `789-12.01 4.414-18.198.434-.998-.638-2.681-.638-3.754-.115-6.852 3.355-13.404 2.858-20.043-1.008-1.5-.867-4.02-.6-5.608.307-7.528 4.35-14.842 5.702-22.07-.638-2.1` +
-        `44-1.875-3.71-.37-5.394 1.046-4.622 3.89-9.565 6.327-15.367 4.286C6.338 20.989.505 13.067.022 5.949-.085 4.38.194 1.753.955 1.332 2.253.617 4.537.553 5.588 1.51 7` +
-        `.55 3.27 9.18 5.77 10.52 8.296c2.82 5.269 4.15 5.766 8.504 2.156 1.555-1.288 2.992-2.768 4.396-4.286 4.022-4.311 7.143-4.465 11.26-.472 7.068 6.837 8.226 7.067 15` +
-        `.979 1.314 3.721-2.755 7.206-2.653 10.627.128 4.987 4.056 9.791 4.49 14.853.191 2.702-2.296 5.78-2.296 8.45.115 4.29 3.89 8.45 3.33 12.719.166.847-.638 1.705-1.26` +
-        `3 2.552-1.914 3.035-2.309 6.048-2.5 9.019.166 3.453 3.087 7.12 3.15 10.616.472 4.107-3.138 7.85-3.342 12.16-.306 3.668 2.59 7.83 1.964 11.594-.255 3.935-2.322 7.6` +
-        `67-2.488 11.409.408.365.28.794.612 1.213.65 6.799.549 13.522 3.394 20.428.779 1.887-.715 3.914-1.034 5.899-1.148 3.313-.192 6.659-.358 9.941 0 1.993.23 4.354.905 ` +
-        `5.737 2.436 1.308 1.429 2.113 4.235 2.123 6.442.022 3.023-2.424 3.431-4.472 3.597-1.887.153-3.796.038-5.695.038-.053-.216-.106-.446-.16-.663l.032-.025Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 24, position: "bottom"});
+    double: (targetEl) => {
+        const template = (w, h) => [`M 0,${h * 0.9} h ${w}`, `M 0,${h * 1.1} h ${w}`];
+        return drawPath(targetEl, { mode: "free", template });
     },
-    double: targetEl => {
+    wavy: (targetEl) => {
         const template = (w, h) => [
-            `M 0,${h * 0.9} h ${w}`,
-            `M 0,${h * 1.1} h ${w}`,
+            `c ${w / 4},0 ${w / 4},-${h / 2} ${w / 2},-${h / 2}` +
+                `c ${w / 4},0 ${w / 4},${h / 2} ${w / 2},${h / 2}`,
         ];
-        return drawPath(targetEl, {mode: "free", template});
+        return drawPath(targetEl, { mode: "pattern", template });
     },
-    wavy: targetEl => {
+    circle_1: (targetEl) => {
         const template = (w, h) => [
-            `c ${w / 4},0 ${w / 4},-${h / 2} ${w / 2},-${h / 2}` +
-            `c ${w / 4},0 ${w / 4},${h / 2} ${w / 2},${h / 2}`
+            `M ${w / 2.88},${h / 1.1} C ${w / 1.1},${h / 1.05} ${w * 1.05},${h / 1.1} ${
+                w * 1.023
+            },${h / 2.32}` +
+                `C ${w}, ${h / 14.6} ${w / 1.411},0 ${w / 2},0 S -2,${h / 14.6} -2,${h / 2.2}` +
+                `S ${w / 4.24},${h} ${w / 1.36},${h * 1.04}`,
         ];
-        return drawPath(targetEl, {mode: "pattern", template});
+        return drawPath(targetEl, { mode: "free", template });
     },
-    circle_1: targetEl => {
+    circle_2: (targetEl) => {
         const template = (w, h) => [
-            `M ${w / 2.88},${h / 1.1} C ${w / 1.1},${h / 1.05} ${w * 1.05},${h / 1.1} ${w * 1.023},${h / 2.32}` +
-            `C ${w}, ${h / 14.6} ${w / 1.411},0 ${w / 2},0 S -2,${h / 14.6} -2,${h / 2.2}` +
-            `S ${w / 4.24},${h} ${w / 1.36},${h * 1.04}`
+            `M112.58 21.164h18.516c-.478-.176-1.722-.64-2.967-1.105.101-.401.214-.803.315-1.192 12.255 2.912 24.561 5.573 36.716 8.823 5.896 1.582 ` +
+                `11.628 3.967 17.171 6.527 10.433 4.832 14.418 14.22 16.479 24.739.377 1.92.566 3.878.83 5.823 2.212 15.94-5.858 23.986-21.595 33.813-.993.615-2.288.79-3.181 1.494` +
+                `-14.229 11.308-31.412 14.32-48.608 17.107-29.01 4.694-57.431 2.209-84.91-8.372-8.145-3.138-16.164-6.853-23.706-11.22C6.176 90.986 1.16 80.053.193 67.25c-1.798-23.` +
+                `809 9.025-42.485 30.356-53.304C44.678 6.793 59.8 3.367 75.45 2.375 90.583 1.42 105.793.379 120.927.78c16.089.427 32.041 3.05 46.911 9.84 2.074.941 3.67 2.912 4.91` +
+                `5 5.083-9.73-1.443-19.433-2.987-29.175-4.305-4.89-.665-9.842-1.067-14.77-1.33-23.82-1.28-47.376.514-70.391 7.003a133.771 133.771 0 0 0-22.639 8.648c-17.9 8.786-27` +
+                `.616 26.935-25.567 46.364.666 6.263 3.507 11.133 9.05 14.308 26.862 15.401 55.748 21.965 86.645 19.819 15.561-1.08 31.01-2.787 45.767-8.284 11.099-4.142 21.658-9.` +
+                `25 30.595-17.195 9.779-8.698 11.715-18.55 5.669-30.249-1.131-2.196-3.256-4.079-5.33-5.56-7.981-5.736-17.773-7.48-26.459-11.534-13.249-6.175-27.541-6.916-41.343-10` +
+                `.167-.817-.188-1.571-.64-2.35-.966.037-.364.088-.728.125-1.092Z`,
         ];
-        return drawPath(targetEl, {mode: "free", template});
+        return drawPath(targetEl, { mode: "fill", template, SVGWidth: 200, SVGHeight: 120 });
     },
-    circle_2: targetEl => {
-        const template = (w, h) => [`M112.58 21.164h18.516c-.478-.176-1.722-.64-2.967-1.105.101-.401.214-.803.315-1.192 12.255 2.912 24.561 5.573 36.716 8.823 5.896 1.582 ` +
-        `11.628 3.967 17.171 6.527 10.433 4.832 14.418 14.22 16.479 24.739.377 1.92.566 3.878.83 5.823 2.212 15.94-5.858 23.986-21.595 33.813-.993.615-2.288.79-3.181 1.494` +
-        `-14.229 11.308-31.412 14.32-48.608 17.107-29.01 4.694-57.431 2.209-84.91-8.372-8.145-3.138-16.164-6.853-23.706-11.22C6.176 90.986 1.16 80.053.193 67.25c-1.798-23.` +
-        `809 9.025-42.485 30.356-53.304C44.678 6.793 59.8 3.367 75.45 2.375 90.583 1.42 105.793.379 120.927.78c16.089.427 32.041 3.05 46.911 9.84 2.074.941 3.67 2.912 4.91` +
-        `5 5.083-9.73-1.443-19.433-2.987-29.175-4.305-4.89-.665-9.842-1.067-14.77-1.33-23.82-1.28-47.376.514-70.391 7.003a133.771 133.771 0 0 0-22.639 8.648c-17.9 8.786-27` +
-        `.616 26.935-25.567 46.364.666 6.263 3.507 11.133 9.05 14.308 26.862 15.401 55.748 21.965 86.645 19.819 15.561-1.08 31.01-2.787 45.767-8.284 11.099-4.142 21.658-9.` +
-        `25 30.595-17.195 9.779-8.698 11.715-18.55 5.669-30.249-1.131-2.196-3.256-4.079-5.33-5.56-7.981-5.736-17.773-7.48-26.459-11.534-13.249-6.175-27.541-6.916-41.343-10` +
-        `.167-.817-.188-1.571-.64-2.35-.966.037-.364.088-.728.125-1.092Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 120});
+    circle_3: (targetEl) => {
+        const template = (w, h) => [
+            `M78.653 89.204c-14.815 0-29.403-1.096-43.354-4.698-5.227-1.346-10.407-3.069-14.997-5.199-22.996-10.649-27.04-28.502-9.135-43.035 12.18` +
+                `-9.866 26.813-18.04 43.355-24.242C88.515-.718 124.19-3.725 161.228 4.889c13.224 3.07 24.449 8.268 31.902 16.662 8.862 9.992 9.453 20.422 0 30.068-5.817 5.889-13.2` +
+                `24 11.37-21.359 15.786-27.176 14.752-58.579 21.518-93.072 21.8h-.046Zm3.5-4.228c4.408-.282 11.725-.47 18.86-1.253 30.357-3.351 57.579-11.432 79.211-26.842 5.362-3` +
+                `.82 10.134-8.832 12.27-13.875 2.545-5.982 5.817-13.311-6.226-17.352-.454-.156-.727-.563-1.045-.845-10.771-9.146-25.086-14.157-41.719-15.348-39.674-2.85-76.62 3.19` +
+                `5-109.66 18.762-8.18 3.883-15.497 9.177-21.359 14.752-9.725 9.27-8.044 19.889 3.727 28.032 4.862 3.383 10.997 6.233 17.269 8.237 14.406 4.605 30.04 5.544 48.58 5.` +
+                `763l.092-.03ZM130.37 3.573c-24.813-1.88-48.263 1.378-70.44 9.146 22.814-5.481 46.172-9.02 70.44-9.146Z`,
+        ];
+        return drawPath(targetEl, { mode: "fill", template, SVGWidth: 200, SVGHeight: 90 });
     },
-    circle_3: targetEl => {
-        const template = (w, h) => [`M78.653 89.204c-14.815 0-29.403-1.096-43.354-4.698-5.227-1.346-10.407-3.069-14.997-5.199-22.996-10.649-27.04-28.502-9.135-43.035 12.18` +
-        `-9.866 26.813-18.04 43.355-24.242C88.515-.718 124.19-3.725 161.228 4.889c13.224 3.07 24.449 8.268 31.902 16.662 8.862 9.992 9.453 20.422 0 30.068-5.817 5.889-13.2` +
-        `24 11.37-21.359 15.786-27.176 14.752-58.579 21.518-93.072 21.8h-.046Zm3.5-4.228c4.408-.282 11.725-.47 18.86-1.253 30.357-3.351 57.579-11.432 79.211-26.842 5.362-3` +
-        `.82 10.134-8.832 12.27-13.875 2.545-5.982 5.817-13.311-6.226-17.352-.454-.156-.727-.563-1.045-.845-10.771-9.146-25.086-14.157-41.719-15.348-39.674-2.85-76.62 3.19` +
-        `5-109.66 18.762-8.18 3.883-15.497 9.177-21.359 14.752-9.725 9.27-8.044 19.889 3.727 28.032 4.862 3.383 10.997 6.233 17.269 8.237 14.406 4.605 30.04 5.544 48.58 5.` +
-        `763l.092-.03ZM130.37 3.573c-24.813-1.88-48.263 1.378-70.44 9.146 22.814-5.481 46.172-9.02 70.44-9.146Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 90});
+    over_underline: (targetEl) => {
+        const template = (w, h) => [`M 0,0 h ${w}`, `M 0,${h} h ${w}`];
+        return drawPath(targetEl, { mode: "free", template });
     },
-    over_underline: targetEl => {
+    scribble_1: (targetEl) => {
         const template = (w, h) => [
-            `M 0,0 h ${w}`,
-            `M 0,${h} h ${w}`,
+            `M ${w / 2},${h * 0.9} c ${w / 16},0 ${w},1 ${w / 5},1 c 2,0 -${w / 10},-2 -${
+                w / 2
+            },-1` +
+                `c -${w / 20},0 -${w / 5},2 -${w / 5},4 c -2,0 ${w / 10},-1 ${w / 2},${h / 16}` +
+                `c ${w / 25},0 ${w / 10},0 ${w / 5},1 c 0,0 -${w / 10},1 -${w / 8},1` +
+                `c -${w / 40},0 -${w / 16},0 -${w / 4},${h / 22}`,
         ];
-        return drawPath(targetEl, {mode: "free", template});
+        return drawPath(targetEl, { mode: "free", template });
     },
-    scribble_1: targetEl => {
+    scribble_2: (targetEl) => {
         const template = (w, h) => [
-            `M ${w / 2},${h * 0.9} c ${w / 16},0 ${w},1 ${w / 5},1 c 2,0 -${w / 10},-2 -${w / 2},-1` +
-            `c -${w / 20},0 -${w / 5},2 -${w / 5},4 c -2,0 ${w / 10},-1 ${w / 2},${h / 16}` +
-            `c ${w / 25},0 ${w / 10},0 ${w / 5},1 c 0,0 -${w / 10},1 -${w / 8},1` +
-            `c -${w / 40},0 -${w / 16},0 -${w / 4},${h / 22}`
+            `M200 3.985c-.228-.332-3.773.541-.01-.006-.811-.037-6.705-1.442-9.978-1.706-1.473.194-2.907.534-4.351.818-1.398.27-2.937.985-4.144.756-` +
+                `9.56-1.782-19.3-1.089-28.955-1.31C118.932 1.767 85.301.942 51.671.45c-13.732-.201-27.492.333-41.233.665C6.561 1.212 3.026 2.363.84 4.838.09 5.684-.262 7.126.223 7` +
+                `.993c.313.554 2.518.79 3.839.728 2.47-.118 4.922-.548 8.096-.936-.96 1.227-1.568 1.865-1.986 2.558-1.368 2.302.029 4 3.203 4.083 24.716.666 49.424 1.4 74.15 2.01 ` +
+                `21.087.52 42.145.34 63.146-1.414 4.495-.374 8.999-.644 14.425-1.026-3.117-1.629-4.723-3.521-8.39-3.535-17.999-.077-36.016-.07-54.005-.534-22.246-.576-44.464-1.58-` +
+                `66.7-2.406-.276-.007-.551-.097-.817-.471 1.016 0 2.033-.021 3.04 0 21.961.506 43.913.998 65.864 1.539 25.249.624 50.47.367 75.642-1.144 5.892-.354 11.765-.93 17.6` +
+                `19-1.54.788-.082 1.416-.99 2.651-1.92Z`,
         ];
-        return drawPath(targetEl, {mode: "free", template});
-    },
-    scribble_2: targetEl => {
-        const template = (w, h) => [`M200 3.985c-.228-.332-3.773.541-.01-.006-.811-.037-6.705-1.442-9.978-1.706-1.473.194-2.907.534-4.351.818-1.398.27-2.937.985-4.144.756-` +
-        `9.56-1.782-19.3-1.089-28.955-1.31C118.932 1.767 85.301.942 51.671.45c-13.732-.201-27.492.333-41.233.665C6.561 1.212 3.026 2.363.84 4.838.09 5.684-.262 7.126.223 7` +
-        `.993c.313.554 2.518.79 3.839.728 2.47-.118 4.922-.548 8.096-.936-.96 1.227-1.568 1.865-1.986 2.558-1.368 2.302.029 4 3.203 4.083 24.716.666 49.424 1.4 74.15 2.01 ` +
-        `21.087.52 42.145.34 63.146-1.414 4.495-.374 8.999-.644 14.425-1.026-3.117-1.629-4.723-3.521-8.39-3.535-17.999-.077-36.016-.07-54.005-.534-22.246-.576-44.464-1.58-` +
-        `66.7-2.406-.276-.007-.551-.097-.817-.471 1.016 0 2.033-.021 3.04 0 21.961.506 43.913.998 65.864 1.539 25.249.624 50.47.367 75.642-1.144 5.892-.354 11.765-.93 17.6` +
-        `19-1.54.788-.082 1.416-.99 2.651-1.92Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 17, position: "bottom"});
-    },
-    scribble_3: targetEl => {
-        const template = (w, h) => [`M133.953 15.961c7.87.502 15.751.975 23.611 1.522 2.027.141 4.055.44 5.999.79 4.118.727 7.202 4.977 2.53 6.707.606.293 1.181.564 1.902.` +
-        `908-8.477 2.069-17.267 2.65-26.203 2.818-19.023.361-38.056.603-57.068 1.088-13.807.355-27.572 1.06-41.369 1.545-3.23.113-6.532.096-9.73-.147-1.548-.118-3.492-.721` +
-        `-4.234-1.42-.93-.88-1.484-2.199-.93-3.1.397-.655 2.812-1.263 4.41-1.33 6.397-.277 12.825-.333 19.243-.474 26.976-.592 53.942-1.156 80.919-1.804 3.742-.09 7.452-.5` +
-        `92 11.173-.908 0-.174-.01-.35-.021-.524-2.717-.197-5.435-.53-8.163-.575-21.865-.383-43.741-1.009-65.607-.936-11.34.04-22.65 1.432-34 2.047-6.898.377-13.88.732-20.` +
-        `779.569-7.044-.17-9.406-3.568-5.34-6.742 3.428-2.677 7.567-4.391 13.984-4.757 16.441-.93 32.798-2.26 49.219-3.27 14.162-.868 28.366-1.516 42.549-2.266.586-.034 1.` +
-        `15-.147 1.641-.45-5.006 0-10.023-.012-15.029.01-1.077 0-2.154.186-3.24.192-18.793.18-37.596.355-56.389.507-10.672.085-21.343.13-32.014.153a65.89 65.89 0 0 1-6.167` +
-        `-.277C1.787 5.555-.02 4.247 0 2.59 0 1.384.89.72 3.293.742c5.874.056 11.748.124 17.622.09C41.045.708 61.186.409 81.317.42c28.408.012 56.827.158 85.225.417 8.686.0` +
-        `8 17.35.7 26.015 1.122 3.23.158 5.832.902 7.024 2.678 1.055 1.572.125 2.21-2.875 1.95a30.51 30.51 0 0 0-2.268-.107c-.397 0-.805.073-1.557.146.721.451 1.306.767 1.` +
-        `777 1.128 2.926 2.238 1.641 4.013-3.272 4.369-13.483.958-26.966 1.91-40.459 2.767-3.334.214-6.752 0-10.118.085-2.31.062-4.609.299-6.909.462l.042.519.011.005Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 32, position: "bottom"});
+        return drawPath(targetEl, {
+            mode: "fill",
+            template,
+            SVGWidth: 200,
+            SVGHeight: 17,
+            position: "bottom",
+        });
     },
-    scribble_4: targetEl => {
-        const template = (w, h) => [`M96.414 17.157c1.34-2.173 2.462-4.075 3.649-5.944 2.117-3.335 5.528-4.302 9.372-2.694 3.962 1.651 4.89 3.575 3.908 8.073-.205.967-.388` +
-        ` 1.934-.022 3.118 1.513-3.075 3.013-6.15 4.557-9.203 1.306-2.586 4.297-3.433 7.859-2.195 2.765.968 4.395 2.706 3.564 5.922-.529 2.054-1.005 4.118-.918 6.487.463-.` +
-        `859 1.015-1.685 1.371-2.586 1.447-3.673 3.002-7.324 4.2-11.083.896-2.792 2.192-3.955 5.323-3.564 4.772.598 7.049 3.412 5.84 7.986-.626 2.38-1.22 4.77-1.144 7.486.` +
-        `745-1.358 1.544-2.683 2.213-4.074a138.72 138.72 0 0 0 2.926-6.487c2.376-5.66 3.12-4.704 8.724-3.618 3.552.685 5.063 4.031 4.34 7.997-.616 3.423-1.166 6.856-1.749 ` +
-        `10.29l.95.358c.993-2.151 2.062-4.27 2.958-6.454.594-1.456.886-3.042 1.403-4.53 2.43-6.911 2.43-6.813 9.566-5.542.928.163 2.656-.967 3.078-1.923.992-2.26 2.332-2.7` +
-        `16 4.523-2.097 4.297 1.206 8.659 2.184 12.945 3.444 2.796.826 4.319 2.988 4.135 5.889-.173 2.684-.961 5.324-1.274 8.008-.734 6.4-1.361 12.799-2.019 19.21-.065.673` +
-        `.043 1.38-.097 2.031-.551 2.477-.41 5.465-3.476 6.421-2.311.717-6.489-2.194-7.644-5.03-.206-.5-.357-1.01-.918-2.63-1.22 3.27-2.073 5.629-2.991 7.965-2.095 5.345-3` +
-        `.66 5.954-8.874 3.705-.853-.37-2.354-.783-2.786-.359-3.163 3.075-5.971 1.217-8.853-.358-.378-.207-.81-.316-1.188-.457-5.851 7.65-12.502 4.596-15.061-3.944-1.543 3` +
-        `.042-2.883 5.726-4.265 8.399-3.357 6.53-7.783 6.975-12.47 1.25-.485-.587-.992-1.152-1.511-1.75-5.647 6.715-12.848 2.293-15.19-6.063-1.253 2.25-2.257 3.88-3.099 5.` +
-        `596-1.285 2.64-2.883 4.65-6.23 3.868-3.498-.826-6.532-4.085-6.65-7.225-.054-1.424 0-2.847-.475-4.433-1.393 2.879-2.71 5.802-4.19 8.637-3.228 6.204-6.067 6.824-11.` +
-        `67 2.912-.962-.673-2.57-.988-3.704-.728-3.681.837-6.272-.619-8.626-3.248-.691-.783-2.084-1.771-2.807-1.543-4.243 1.347-6.91-.641-9.166-3.836-.378-.543-.8-1.053-1.` +
-        `555-2.031-1.08 2.194-2.008 4.041-2.915 5.9-2.397 4.943-5.528 5.932-10.02 2.835-2.008-1.38-3.713-2.118-6.37-1.738-5.117.728-8.54-3.444-7.762-8.649.227-1.521.378-3.` +
-        `064-.086-4.9-.853 1.369-1.793 2.684-2.548 4.107-2.775 5.259-5.301 5.856-10.074 2.206-.971-.75-1.803-1.674-2.86-2.673-.67.271-1.598 1.043-2.257.858-2.71-.771-5.625` +
-        `-1.423-7.838-3.01-.842-.608-.378-3.683.108-5.465 2.008-7.41 4.232-14.755 6.413-22.11.572-1.945 1.166-3.901 1.943-5.77 1.89-4.52 5.02-5.454 9.145-2.89 1.144.706 2.` +
-        `408 1.217 3.552 1.923 2.364 1.456 4.696 2.988 7.439 4.737C32.423 7.14 37.444 6.64 42.82 10.41c2.602-2.107 1.803-7.17 6.748-6.323 3.369.587 6.478 1.217 7.439 4.878` +
-        ` 2.289-2.281 4.221-5.693 6.877-6.42 2.624-.718 5.992 1.26 9.599 2.216-.044.054.636-.565.96-1.348 1.048-2.499 2.883-3.4 5.42-2.825 2.775.62 5.474 1.304 6.284 4.76.` +
-        `216.89 1.285 2.042 2.159 2.248 7.58 1.793 7.6 1.739 8.108 9.55v.012Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 61});
+    scribble_3: (targetEl) => {
+        const template = (w, h) => [
+            `M133.953 15.961c7.87.502 15.751.975 23.611 1.522 2.027.141 4.055.44 5.999.79 4.118.727 7.202 4.977 2.53 6.707.606.293 1.181.564 1.902.` +
+                `908-8.477 2.069-17.267 2.65-26.203 2.818-19.023.361-38.056.603-57.068 1.088-13.807.355-27.572 1.06-41.369 1.545-3.23.113-6.532.096-9.73-.147-1.548-.118-3.492-.721` +
+                `-4.234-1.42-.93-.88-1.484-2.199-.93-3.1.397-.655 2.812-1.263 4.41-1.33 6.397-.277 12.825-.333 19.243-.474 26.976-.592 53.942-1.156 80.919-1.804 3.742-.09 7.452-.5` +
+                `92 11.173-.908 0-.174-.01-.35-.021-.524-2.717-.197-5.435-.53-8.163-.575-21.865-.383-43.741-1.009-65.607-.936-11.34.04-22.65 1.432-34 2.047-6.898.377-13.88.732-20.` +
+                `779.569-7.044-.17-9.406-3.568-5.34-6.742 3.428-2.677 7.567-4.391 13.984-4.757 16.441-.93 32.798-2.26 49.219-3.27 14.162-.868 28.366-1.516 42.549-2.266.586-.034 1.` +
+                `15-.147 1.641-.45-5.006 0-10.023-.012-15.029.01-1.077 0-2.154.186-3.24.192-18.793.18-37.596.355-56.389.507-10.672.085-21.343.13-32.014.153a65.89 65.89 0 0 1-6.167` +
+                `-.277C1.787 5.555-.02 4.247 0 2.59 0 1.384.89.72 3.293.742c5.874.056 11.748.124 17.622.09C41.045.708 61.186.409 81.317.42c28.408.012 56.827.158 85.225.417 8.686.0` +
+                `8 17.35.7 26.015 1.122 3.23.158 5.832.902 7.024 2.678 1.055 1.572.125 2.21-2.875 1.95a30.51 30.51 0 0 0-2.268-.107c-.397 0-.805.073-1.557.146.721.451 1.306.767 1.` +
+                `777 1.128 2.926 2.238 1.641 4.013-3.272 4.369-13.483.958-26.966 1.91-40.459 2.767-3.334.214-6.752 0-10.118.085-2.31.062-4.609.299-6.909.462l.042.519.011.005Z`,
+        ];
+        return drawPath(targetEl, {
+            mode: "fill",
+            template,
+            SVGWidth: 200,
+            SVGHeight: 32,
+            position: "bottom",
+        });
     },
-    jagged: targetEl => {
+    scribble_4: (targetEl) => {
         const template = (w, h) => [
-            `q ${4 * w / 3} -${2 * w / 3} ${2 * w / 3} 0` +
-            `c -${w / 3} ${w / 3} -${w / 3} ${w / 3} ${w / 3} 0`
+            `M96.414 17.157c1.34-2.173 2.462-4.075 3.649-5.944 2.117-3.335 5.528-4.302 9.372-2.694 3.962 1.651 4.89 3.575 3.908 8.073-.205.967-.388` +
+                ` 1.934-.022 3.118 1.513-3.075 3.013-6.15 4.557-9.203 1.306-2.586 4.297-3.433 7.859-2.195 2.765.968 4.395 2.706 3.564 5.922-.529 2.054-1.005 4.118-.918 6.487.463-.` +
+                `859 1.015-1.685 1.371-2.586 1.447-3.673 3.002-7.324 4.2-11.083.896-2.792 2.192-3.955 5.323-3.564 4.772.598 7.049 3.412 5.84 7.986-.626 2.38-1.22 4.77-1.144 7.486.` +
+                `745-1.358 1.544-2.683 2.213-4.074a138.72 138.72 0 0 0 2.926-6.487c2.376-5.66 3.12-4.704 8.724-3.618 3.552.685 5.063 4.031 4.34 7.997-.616 3.423-1.166 6.856-1.749 ` +
+                `10.29l.95.358c.993-2.151 2.062-4.27 2.958-6.454.594-1.456.886-3.042 1.403-4.53 2.43-6.911 2.43-6.813 9.566-5.542.928.163 2.656-.967 3.078-1.923.992-2.26 2.332-2.7` +
+                `16 4.523-2.097 4.297 1.206 8.659 2.184 12.945 3.444 2.796.826 4.319 2.988 4.135 5.889-.173 2.684-.961 5.324-1.274 8.008-.734 6.4-1.361 12.799-2.019 19.21-.065.673` +
+                `.043 1.38-.097 2.031-.551 2.477-.41 5.465-3.476 6.421-2.311.717-6.489-2.194-7.644-5.03-.206-.5-.357-1.01-.918-2.63-1.22 3.27-2.073 5.629-2.991 7.965-2.095 5.345-3` +
+                `.66 5.954-8.874 3.705-.853-.37-2.354-.783-2.786-.359-3.163 3.075-5.971 1.217-8.853-.358-.378-.207-.81-.316-1.188-.457-5.851 7.65-12.502 4.596-15.061-3.944-1.543 3` +
+                `.042-2.883 5.726-4.265 8.399-3.357 6.53-7.783 6.975-12.47 1.25-.485-.587-.992-1.152-1.511-1.75-5.647 6.715-12.848 2.293-15.19-6.063-1.253 2.25-2.257 3.88-3.099 5.` +
+                `596-1.285 2.64-2.883 4.65-6.23 3.868-3.498-.826-6.532-4.085-6.65-7.225-.054-1.424 0-2.847-.475-4.433-1.393 2.879-2.71 5.802-4.19 8.637-3.228 6.204-6.067 6.824-11.` +
+                `67 2.912-.962-.673-2.57-.988-3.704-.728-3.681.837-6.272-.619-8.626-3.248-.691-.783-2.084-1.771-2.807-1.543-4.243 1.347-6.91-.641-9.166-3.836-.378-.543-.8-1.053-1.` +
+                `555-2.031-1.08 2.194-2.008 4.041-2.915 5.9-2.397 4.943-5.528 5.932-10.02 2.835-2.008-1.38-3.713-2.118-6.37-1.738-5.117.728-8.54-3.444-7.762-8.649.227-1.521.378-3.` +
+                `064-.086-4.9-.853 1.369-1.793 2.684-2.548 4.107-2.775 5.259-5.301 5.856-10.074 2.206-.971-.75-1.803-1.674-2.86-2.673-.67.271-1.598 1.043-2.257.858-2.71-.771-5.625` +
+                `-1.423-7.838-3.01-.842-.608-.378-3.683.108-5.465 2.008-7.41 4.232-14.755 6.413-22.11.572-1.945 1.166-3.901 1.943-5.77 1.89-4.52 5.02-5.454 9.145-2.89 1.144.706 2.` +
+                `408 1.217 3.552 1.923 2.364 1.456 4.696 2.988 7.439 4.737C32.423 7.14 37.444 6.64 42.82 10.41c2.602-2.107 1.803-7.17 6.748-6.323 3.369.587 6.478 1.217 7.439 4.878` +
+                ` 2.289-2.281 4.221-5.693 6.877-6.42 2.624-.718 5.992 1.26 9.599 2.216-.044.054.636-.565.96-1.348 1.048-2.499 2.883-3.4 5.42-2.825 2.775.62 5.474 1.304 6.284 4.76.` +
+                `216.89 1.285 2.042 2.159 2.248 7.58 1.793 7.6 1.739 8.108 9.55v.012Z`,
         ];
-        return drawPath(targetEl, {mode: "pattern", template});
+        return drawPath(targetEl, { mode: "fill", template, SVGWidth: 200, SVGHeight: 61 });
     },
-    cross: targetEl => {
+    jagged: (targetEl) => {
         const template = (w, h) => [
-            `M 0,0 L ${w},${h}`,
-            `M 0,${h} L ${w},0`,
+            `q ${(4 * w) / 3} -${(2 * w) / 3} ${(2 * w) / 3} 0` +
+                `c -${w / 3} ${w / 3} -${w / 3} ${w / 3} ${w / 3} 0`,
         ];
-        return drawPath(targetEl, {mode: "free", template});
+        return drawPath(targetEl, { mode: "pattern", template });
     },
-    diagonal: targetEl => {
-        const template = (w, h) => [`M 0,${h} L${w},0`];
-        return drawPath(targetEl, {mode: "free", template});
+    cross: (targetEl) => {
+        const template = (w, h) => [`M 0,0 L ${w},${h}`, `M 0,${h} L ${w},0`];
+        return drawPath(targetEl, { mode: "free", template });
     },
-    strikethrough: targetEl => {
-        return drawPath(targetEl, {mode: "line", position: "center"});
+    diagonal: (targetEl) => {
+        const template = (w, h) => [`M 0,${h} L${w},0`];
+        return drawPath(targetEl, { mode: "free", template });
     },
-    bold: targetEl => {
-        const template = (w, h) => [`M136.604 41.568c5.373.513 10.746 1.047 16.12 1.479 14.437 1.13 29.327 4.047 42.858-4.294 4.92-3.04 2.346-13.56-2.687-13.395-.825.02-1.` +
-        `635.062-2.46.082.858-3.677-.34-8.3-3.545-9.41 2.655.062 5.309.104 7.963.165 6.863.185 6.863-14.176 0-14.36A1958.994 1958.994 0 0 0 5.263 5.778C-.4 6.169-2.392 18.` +
-        `455 3.84 19.893c9.727 2.24 19.454 4.335 29.214 6.307-1.085 1.09-1.764 2.671-2.023 4.356-.615.061-1.214.102-1.83.164-6.748.74-6.959 14.587 0 14.361l107.42-3.513h-.` +
-        `016Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 46});
+    strikethrough: (targetEl) => drawPath(targetEl, { mode: "line", position: "center" }),
+    bold: (targetEl) => {
+        const template = (w, h) => [
+            `M136.604 41.568c5.373.513 10.746 1.047 16.12 1.479 14.437 1.13 29.327 4.047 42.858-4.294 4.92-3.04 2.346-13.56-2.687-13.395-.825.02-1.` +
+                `635.062-2.46.082.858-3.677-.34-8.3-3.545-9.41 2.655.062 5.309.104 7.963.165 6.863.185 6.863-14.176 0-14.36A1958.994 1958.994 0 0 0 5.263 5.778C-.4 6.169-2.392 18.` +
+                `455 3.84 19.893c9.727 2.24 19.454 4.335 29.214 6.307-1.085 1.09-1.764 2.671-2.023 4.356-.615.061-1.214.102-1.83.164-6.748.74-6.959 14.587 0 14.361l107.42-3.513h-.` +
+                `016Z`,
+        ];
+        return drawPath(targetEl, { mode: "fill", template, SVGWidth: 200, SVGHeight: 46 });
     },
-    bold_1: targetEl => {
-        const template = (w, h) => [`M190.276 34.01c5.618-.25 7.136-6.526 4.444-9.755.037-.25.055-.5.072-.749 7.046-.949 7.01-11.752-.523-11.553-.796.017-1.59.017-2.403.05` +
-        `C196.78 9.573 195.931.8 189.264.983L13.784 5.678c-7.226.2-7.497 9.422-1.499 11.32-2.186 0-4.354 0-6.54-.017-7.696-.05-7.624 11.286 0 11.635 8.22.383 16.423.733 24` +
-        `.643 1.016l-7.823.35c-7.624.349-7.678 11.985 0 11.635 55.915-2.53 111.813-5.077 167.729-7.607h-.018Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 42});
+    bold_1: (targetEl) => {
+        const template = (w, h) => [
+            `M190.276 34.01c5.618-.25 7.136-6.526 4.444-9.755.037-.25.055-.5.072-.749 7.046-.949 7.01-11.752-.523-11.553-.796.017-1.59.017-2.403.05` +
+                `C196.78 9.573 195.931.8 189.264.983L13.784 5.678c-7.226.2-7.497 9.422-1.499 11.32-2.186 0-4.354 0-6.54-.017-7.696-.05-7.624 11.286 0 11.635 8.22.383 16.423.733 24` +
+                `.643 1.016l-7.823.35c-7.624.349-7.678 11.985 0 11.635 55.915-2.53 111.813-5.077 167.729-7.607h-.018Z`,
+        ];
+        return drawPath(targetEl, { mode: "fill", template, SVGWidth: 200, SVGHeight: 42 });
     },
-    bold_2: targetEl => {
-        const template = (w, h) => [`M193.221 20.193c.555 1.245.863 2.005 1.22 2.734 1.399 2.84 2.758 5.757 1.607 9.509-1.21 3.95-3.651 4.208-6.072 4.314-5.059.212-10.129.` +
-        `152-15.178.592-15.873 1.367-31.737 3.585-47.619 4.238-19.921.82-39.862.638-59.802.486-13.938-.106-27.887-.88-41.825-1.428-4.018-.151-8.046-.47-12.064-.896-2.758-.` +
-        `304-4.772-2.46-6.21-6.182-.645-1.656-1.756-2.993-2.798-4.177-2.768-3.13-5.06-6.38-3.899-12.502C.9 15.226.393 13.16.165 11.307c-.715-5.818.903-9.524 4.722-9.646 10` +
-        `.218-.35 20.437-.38 30.655-.577C51.236.78 66.94-.04 82.635.264c14.652.273 29.296 1.655 43.948 2.643 19.822 1.336 39.643 2.02 59.455-.426.923-.121 1.835-.5 2.758-.` +
-        `622 1.329-.183 2.688-.456 4.008-.274 3.829.501 7.073 5.666 7.192 11.21.09 4.466-1.418 6.213-6.775 7.428v-.03Z`];
-        return drawPath(targetEl, {mode: "fill", template, SVGWidth: 200, SVGHeight: 43});
+    bold_2: (targetEl) => {
+        const template = (w, h) => [
+            `M193.221 20.193c.555 1.245.863 2.005 1.22 2.734 1.399 2.84 2.758 5.757 1.607 9.509-1.21 3.95-3.651 4.208-6.072 4.314-5.059.212-10.129.` +
+                `152-15.178.592-15.873 1.367-31.737 3.585-47.619 4.238-19.921.82-39.862.638-59.802.486-13.938-.106-27.887-.88-41.825-1.428-4.018-.151-8.046-.47-12.064-.896-2.758-.` +
+                `304-4.772-2.46-6.21-6.182-.645-1.656-1.756-2.993-2.798-4.177-2.768-3.13-5.06-6.38-3.899-12.502C.9 15.226.393 13.16.165 11.307c-.715-5.818.903-9.524 4.722-9.646 10` +
+                `.218-.35 20.437-.38 30.655-.577C51.236.78 66.94-.04 82.635.264c14.652.273 29.296 1.655 43.948 2.643 19.822 1.336 39.643 2.02 59.455-.426.923-.121 1.835-.5 2.758-.` +
+                `622 1.329-.183 2.688-.456 4.008-.274 3.829.501 7.073 5.666 7.192 11.21.09 4.466-1.418 6.213-6.775 7.428v-.03Z`,
+        ];
+        return drawPath(targetEl, { mode: "fill", template, SVGWidth: 200, SVGHeight: 43 });
     },
 };
 // Returns the width of the DOMRect object.
-export const getDOMRectWidth = el => el.getBoundingClientRect().width;
+export const getDOMRectWidth = (el) => el.getBoundingClientRect().width;
 
 /**
  * Draws one or many SVG paths using templates of path shape commands.
@@ -201,14 +238,16 @@ function drawPath(textEl, options) {
     // text highlights in snippets/add page dialogs where iframe is scaled.
     const width = textEl.offsetWidth;
     const height = textEl.offsetHeight;
-    options = {...options, width, height};
+    options = { ...options, width, height };
     const yStart = options.position === "center" ? height / 2 : height;
 
     switch (options.mode) {
         case "pattern": {
-            let i = 0, d = [];
+            let i = 0;
+            const d = [];
             const nbrChars = textEl.textContent.length;
-            const w = width / nbrChars, h = height * 0.2;
+            const w = width / nbrChars,
+                h = height * 0.2;
             while (i < nbrChars) {
                 d.push(options.template(w, h));
                 i++;
@@ -232,13 +271,13 @@ function drawPath(textEl, options) {
  * @returns {Element[]}
  */
 function buildPath(templates, options) {
-    return templates.map(d => {
+    return templates.map((d) => {
         const path = document.createElementNS("http://www.w3.org/2000/svg", "path");
         path.setAttribute("stroke-width", "var(--text-highlight-width)");
         path.setAttribute("stroke", "var(--text-highlight-color)");
         path.setAttribute("stroke-linecap", "round");
         if (options.mode === "fill") {
-            let wScale = options.width / options.SVGWidth;
+            const wScale = options.width / options.SVGWidth;
             let hScale = options.height / options.SVGHeight;
             const transforms = [];
             if (options.position === "bottom") {
@@ -274,8 +313,9 @@ export function drawTextHighlightSVG(textEl, highlightID) {
         "start-0",
         "w-100",
         "h-100",
-        "pe-none");
-    _textHighlightFactory[highlightID](textEl).forEach(pathEl => {
+        "pe-none"
+    );
+    _textHighlightFactory[highlightID](textEl).forEach((pathEl) => {
         pathEl.classList.add(`o_text_highlight_path_${highlightID}`);
         svg.appendChild(pathEl);
     });
@@ -304,14 +344,17 @@ export function applyTextHighlight(topTextEl, highlightID) {
     const style = window.getComputedStyle(topTextEl);
     if (!style.getPropertyValue("--text-highlight-width")) {
         // The default value for `--text-highlight-width` is 0.1em.
-        topTextEl.style.setProperty("--text-highlight-width", `${Math.round(parseFloat(style.fontSize) * 0.1)}px`);
+        topTextEl.style.setProperty(
+            "--text-highlight-width",
+            `${Math.round(parseFloat(style.fontSize) * 0.1)}px`
+        );
     }
     const lines = [];
     let lineIndex = 0;
-    const nodeIsBR = node => node.nodeName === "BR";
-    const isRTL = el => window.getComputedStyle(el).direction === "rtl";
+    const nodeIsBR = (node) => node.nodeName === "BR";
+    const isRTL = (el) => window.getComputedStyle(el).direction === "rtl";
 
-    [...topTextEl.childNodes].forEach(child => {
+    [...topTextEl.childNodes].forEach((child) => {
         // We consider `<br/>` tags as full text lines to ease
         // excluding them when the highlight is applied on the DOM.
         if (nodeIsBR(child)) {
@@ -347,7 +390,7 @@ export function applyTextHighlight(topTextEl, highlightID) {
 
         // for each text line detected, we add the content as new
         // line and adjust the line index accordingly.
-        textLines.map((node, i, {length}) => {
+        textLines.map((node, i, { length }) => {
             if (!lines[lineIndex]) {
                 lines[lineIndex] = [];
             }
@@ -357,15 +400,18 @@ export function applyTextHighlight(topTextEl, highlightID) {
             }
         });
     });
-    topTextEl.replaceChildren(...lines.map(textLine => {
-        // First we add text content to be able to build svg paths
-        // correctly (`<br/>` tags are excluded).
-        return nodeIsBR(textLine[0]) ? textLine[0] :
-            createHighlightContainer(textLine);
-    }));
+    topTextEl.replaceChildren(
+        ...lines.map((textLine) =>
+            // First we add text content to be able to build svg paths
+            // correctly (`<br/>` tags are excluded).
+            nodeIsBR(textLine[0]) ? textLine[0] : createHighlightContainer(textLine)
+        )
+    );
     // Build and set highlight SVGs.
-    [...topTextEl.querySelectorAll(".o_text_highlight_item")].forEach(container => {
-        container.append(drawTextHighlightSVG(container, highlightID || getCurrentTextHighlight(topTextEl)));
+    [...topTextEl.querySelectorAll(".o_text_highlight_item")].forEach((container) => {
+        container.append(
+            drawTextHighlightSVG(container, highlightID || getCurrentTextHighlight(topTextEl))
+        );
     });
     endHighlightUpdate();
 }
@@ -380,14 +426,14 @@ export function removeTextHighlight(topTextEl) {
     // Simply replace every `<span class="o_text_highlight_item">
     // textNode1 [textNode2,...]<svg .../></span>` by `textNode1
     // [textNode2,...]`.
-    [...topTextEl.querySelectorAll(".o_text_highlight_item")].forEach(unit => {
+    [...topTextEl.querySelectorAll(".o_text_highlight_item")].forEach((unit) => {
         unit.after(...[...unit.childNodes].filter((node) => node.tagName !== "svg"));
         unit.remove();
     });
     // Prevents incorrect text lines detection on the next updates.
     let child = topTextEl.firstElementChild;
     while (child) {
-        let next = child.nextElementSibling;
+        const next = child.nextElementSibling;
         // Merge identical elements.
         if (next && next === child.nextSibling && child.cloneNode().isEqualNode(next.cloneNode())) {
             child.replaceChildren(...child.childNodes, ...next.childNodes);
@@ -436,8 +482,8 @@ export function getCurrentTextHighlight(el) {
  * @param {Node} node
  */
 function splitNodeLines(node) {
-    const isTextContainer = node.childNodes.length === 1
-        && node.firstChild.nodeType === Node.TEXT_NODE;
+    const isTextContainer =
+        node.childNodes.length === 1 && node.firstChild.nodeType === Node.TEXT_NODE;
     if (node.nodeType !== Node.TEXT_NODE && !isTextContainer) {
         return [node];
     }
@@ -458,7 +504,7 @@ function splitNodeLines(node) {
     if (lines.length === 1) {
         return [node];
     }
-    return lines.map(line => {
+    return lines.map((line) => {
         if (isTextContainer) {
             const wrapper = node.cloneNode();
             wrapper.appendChild(document.createTextNode(line));
@@ -481,7 +527,7 @@ export function selectAllTextNodes(topNode) {
         if (node.nodeType === Node.TEXT_NODE) {
             textNodes.push(node);
         } else {
-            [...node.childNodes].forEach(child => selectTextNodes(child));
+            [...node.childNodes].forEach((child) => selectTextNodes(child));
         }
     };
     selectTextNodes(topNode);
@@ -498,7 +544,7 @@ export function selectAllTextNodes(topNode) {
  */
 export function getOffsetNode(textEl, offset) {
     let index = 0,
-    offsetNode;
+        offsetNode;
     for (const node of selectAllTextNodes(textEl)) {
         const stepLength = node.textContent.length;
         if (index + stepLength < offset - 1) {
diff --git a/addons/website/static/src/js/tours/configurator_tour.js b/addons/website/static/src/js/tours/configurator_tour.js
index 62d3ff79146f0..88a6c47d6932a 100644
--- a/addons/website/static/src/js/tours/configurator_tour.js
+++ b/addons/website/static/src/js/tours/configurator_tour.js
@@ -11,23 +11,23 @@ import {
 } from "@website/js/tours/tour_utils";
 import { _t } from "@web/core/l10n/translation";
 
-
-registerThemeHomepageTour('configurator_tour', () => {
-    let titleSelector = '#wrap > section:first-child';
-    let title = $(titleSelector).find('h1, h2').first();
+registerThemeHomepageTour("configurator_tour", () => {
+    let titleSelector = "#wrap > section:first-child";
+    let title = $(titleSelector).find("h1, h2").first();
     if (!title.length) {
-        titleSelector = titleSelector.replace('section:first-child', 'section:nth-child(2)');
-        title = $(titleSelector).find('h1, h2').first();
+        titleSelector = titleSelector.replace("section:first-child", "section:nth-child(2)");
+        title = $(titleSelector).find("h1, h2").first();
     }
 
-    let isTitleTextImage = $(titleSelector).hasClass('s_text_image');
-    titleSelector = titleSelector.concat(` ${title.is('h1') ? 'h1' : 'h2'}`);
+    const isTitleTextImage = $(titleSelector).hasClass("s_text_image");
+    titleSelector = titleSelector.concat(` ${title.is("h1") ? "h1" : "h2"}`);
 
-    const shapeSelector = '#wrap > section[data-oe-shape-data]';
-    const backgroundSelector = '#wrap > section:nth-child(2)';
+    const shapeSelector = "#wrap > section[data-oe-shape-data]";
+    const backgroundSelector = "#wrap > section:nth-child(2)";
 
-    const imageStep = isTitleTextImage ?
-        changeImage(titleSelector.replace('h2', 'img')) : changeBackground();
+    const imageStep = isTitleTextImage
+        ? changeImage(titleSelector.replace("h2", "img"))
+        : changeBackground();
 
     const backgroundColorStep = [changeBackgroundColor()];
     if (!isTitleTextImage) {
@@ -39,8 +39,15 @@ registerThemeHomepageTour('configurator_tour', () => {
         if (!$(backgroundSelector).is($(shapeSelector))) {
             shapeStep.push(...clickOnSnippet(shapeSelector));
         }
-        shapeStep.push(changeOption('BackgroundShape', 'we-toggler', _t('Background Shape')));
-        shapeStep.push(selectNested('we-select-page', 'BackgroundShape', ':not(.o_we_pager_controls)', _t('Background Shape')));
+        shapeStep.push(changeOption("BackgroundShape", "we-toggler", _t("Background Shape")));
+        shapeStep.push(
+            selectNested(
+                "we-select-page",
+                "BackgroundShape",
+                ":not(.o_we_pager_controls)",
+                _t("Background Shape")
+            )
+        );
     }
 
     return [
@@ -48,6 +55,6 @@ registerThemeHomepageTour('configurator_tour', () => {
         ...imageStep,
         ...backgroundColorStep,
         ...shapeStep,
-        changePaddingSize('top'),
+        changePaddingSize("top"),
     ];
 });
diff --git a/addons/website/static/src/js/tours/homepage.js b/addons/website/static/src/js/tours/homepage.js
index 8dc4fe11862b9..588dd913eed16 100644
--- a/addons/website/static/src/js/tours/homepage.js
+++ b/addons/website/static/src/js/tours/homepage.js
@@ -9,43 +9,43 @@ import {
 
 const snippets = [
     {
-        id: 's_banner',
-        name: 'Banner',
+        id: "s_banner",
+        name: "Banner",
         groupName: "Intro",
     },
     {
-        id: 's_three_columns',
-        name: 'Columns',
+        id: "s_three_columns",
+        name: "Columns",
         groupName: "Columns",
     },
     {
-        id: 's_text_image',
-        name: 'Image - Text',
+        id: "s_text_image",
+        name: "Image - Text",
         groupName: "Content",
     },
     {
-        id: 's_masonry_block_default_template',
-        name: 'Masonry',
+        id: "s_masonry_block_default_template",
+        name: "Masonry",
         groupName: "Images",
     },
     {
-        id: 's_title',
-        name: 'Title',
+        id: "s_title",
+        name: "Title",
         groupName: "Text",
     },
     {
-        id: 's_showcase',
-        name: 'Showcase',
+        id: "s_showcase",
+        name: "Showcase",
         groupName: "Content",
     },
     {
-        id: 's_call_to_action',
-        name: 'Call to Action',
+        id: "s_call_to_action",
+        name: "Call to Action",
         groupName: "Content",
     },
     {
-        id: 's_quotes_carousel',
-        name: 'Quotes',
+        id: "s_quotes_carousel",
+        name: "Quotes",
         groupName: "People",
     },
 ];
diff --git a/addons/website/static/src/js/tours/tour_utils.js b/addons/website/static/src/js/tours/tour_utils.js
index abdc0894401f0..a8adb36263e77 100644
--- a/addons/website/static/src/js/tours/tour_utils.js
+++ b/addons/website/static/src/js/tours/tour_utils.js
@@ -60,7 +60,11 @@ export function changeBackground(snippet, position = "bottom") {
     return [
         {
             trigger: `.o_customize_tab button[data-action-id="replaceBgImage"]`,
-            content: markup(_t("<b>Customize</b> any block through this menu. Try to change the background image of this block.")),
+            content: markup(
+                _t(
+                    "<b>Customize</b> any block through this menu. Try to change the background image of this block."
+                )
+            ),
             tooltipPosition: position,
             run: "click",
         },
@@ -70,7 +74,11 @@ export function changeBackground(snippet, position = "bottom") {
 export function changeBackgroundColor(position = "bottom") {
     return {
         trigger: ".o_customize_tab .o_we_color_preview",
-        content: markup(_t("<b>Customize</b> any block through this menu. Try to change the background color of this block.")),
+        content: markup(
+            _t(
+                "<b>Customize</b> any block through this menu. Try to change the background color of this block."
+            )
+        ),
         tooltipPosition: position,
         run: "click",
     };
@@ -80,11 +88,10 @@ export function changeBackgroundColor(position = "bottom") {
 // to avoid duplication
 export function selectColorPalette(position = "left") {
     return {
-        trigger:
-            ".o_customize_tab .o_we_color_preview",
+        trigger: ".o_customize_tab .o_we_color_preview",
         content: markup(_t(`<b>Select</b> a Color Palette.`)),
         tooltipPosition: position,
-        run: 'click',
+        run: "click",
     };
 }
 
@@ -104,7 +111,9 @@ export function changeImage(snippet, position = "bottom") {
         },
         {
             trigger: snippet.id ? `#wrapwrap .${snippet.id} img` : snippet,
-            content: markup(_t("<b>Double click on an image</b> to change it with one of your choice.")),
+            content: markup(
+                _t("<b>Double click on an image</b> to change it with one of your choice.")
+            ),
             tooltipPosition: position,
             run: "dblclick",
         },
@@ -116,12 +125,22 @@ export function changeImage(snippet, position = "bottom") {
     By default, prevents the step from being active if a palette is opened.
     Set allowPalette to true to select options within a palette.
 */
-export function changeOption(blockName, actionId = '', optionTooltipLabel = '', position = "bottom", allowPalette = false) {
-    const noPalette = allowPalette ? "" : !document.querySelector(".o_popover .o_font_color_selector") && ".o_customize_tab";
+export function changeOption(
+    blockName,
+    actionId = "",
+    optionTooltipLabel = "",
+    position = "bottom",
+    allowPalette = false
+) {
+    const noPalette = allowPalette
+        ? ""
+        : !document.querySelector(".o_popover .o_font_color_selector") && ".o_customize_tab";
     const option_block = `${noPalette} [data-container-title='${blockName}']`;
     return {
         trigger: `${option_block} ${actionId}, ${option_block} [data-action-id="${actionId}"]`,
-        content: markup(_t("<b>Click</b> on this option to change the %s of the block.", optionTooltipLabel)),
+        content: markup(
+            _t("<b>Click</b> on this option to change the %s of the block.", optionTooltipLabel)
+        ),
         tooltipPosition: position,
         run: "click",
     };
@@ -167,14 +186,23 @@ export function changeOptionInPopover(blockName, optionName, elementName, search
     return steps;
 }
 
-export function selectNested(trigger, optionName, altTrigger = null, optionTooltipLabel = '', position = "top", allowPalette = false) {
-    const noPalette = allowPalette ? '' : '.o_we_customize_panel:not(:has(.o_we_so_color_palette.o_we_widget_opened))';
+export function selectNested(
+    trigger,
+    optionName,
+    altTrigger = null,
+    optionTooltipLabel = "",
+    position = "top",
+    allowPalette = false
+) {
+    const noPalette = allowPalette
+        ? ""
+        : ".o_we_customize_panel:not(:has(.o_we_so_color_palette.o_we_widget_opened))";
     const option_block = `${noPalette} we-customizeblock-option[class='snippet-option-${optionName}']`;
     return {
         trigger: trigger + (altTrigger ? `, ${option_block} ${altTrigger}` : ""),
         content: markup(_t("<b>Select</b> a %s.", optionTooltipLabel)),
         tooltipPosition: position,
-        run: 'click',
+        run: "click",
     };
 }
 
@@ -228,7 +256,7 @@ export function clickOnElement(elementName, selector) {
     return {
         content: `Clicking on the ${elementName}`,
         trigger: selector,
-        run: 'click'
+        run: "click",
     };
 }
 
@@ -238,15 +266,18 @@ export function clickOnElement(elementName, selector) {
  * @param {string} position Where the purple arrow will show up
  */
 export function clickOnEditAndWaitEditMode(position = "bottom") {
-    return [{
-        content: markup(_t("<b>Click Edit</b> to start designing your homepage.")),
-        trigger: "body .o_menu_systray .o_menu_systray_item.o_edit_website_container button",
-        tooltipPosition: position,
-        run: "click",
-    }, {
-        content: "Check that we are in edit mode",
-        trigger: ".o_builder_sidebar_open",
-    }];
+    return [
+        {
+            content: markup(_t("<b>Click Edit</b> to start designing your homepage.")),
+            trigger: "body .o_menu_systray .o_menu_systray_item.o_edit_website_container button",
+            tooltipPosition: position,
+            run: "click",
+        },
+        {
+            content: "Check that we are in edit mode",
+            trigger: ".o_builder_sidebar_open",
+        },
+    ];
 }
 
 /**
@@ -256,20 +287,24 @@ export function clickOnEditAndWaitEditMode(position = "bottom") {
  * @param {string} position Where the purple arrow will show up
  */
 export function clickOnEditAndWaitEditModeInTranslatedPage(position = "bottom") {
-    return [{
-        content: markup(_t("<b>Click Edit</b> dropdown")),
-        trigger: "body .o_menu_systray button:contains('Edit')",
-        tooltipPosition: position,
-        run: "click",
-    }, {
-        content: markup(_t("<b>Click Edit</b> to start designing your homepage.")),
-        trigger: ".o_edit_website_dropdown_item",
-        tooltipPosition: position,
-        run: "click",
-    }, {
-        content: "Check that we are in edit mode",
-        trigger: ".o_builder_sidebar_open",
-    }];
+    return [
+        {
+            content: markup(_t("<b>Click Edit</b> dropdown")),
+            trigger: "body .o_menu_systray button:contains('Edit')",
+            tooltipPosition: position,
+            run: "click",
+        },
+        {
+            content: markup(_t("<b>Click Edit</b> to start designing your homepage.")),
+            trigger: ".o_edit_website_dropdown_item",
+            tooltipPosition: position,
+            run: "click",
+        },
+        {
+            content: "Check that we are in edit mode",
+            trigger: ".o_builder_sidebar_open",
+        },
+    ];
 }
 
 /**
@@ -303,8 +338,10 @@ export function clickOnSave(position = "bottom", timeout = 50000, withContains =
             noPrepend: true,
         },
         {
-            trigger: withContains ? "button[data-action=save]:enabled:contains(save)" : "button[data-action=save]:enabled",
-        content: markup(_t("Good job! It's time to <b>Save</b> your work.")),
+            trigger: withContains
+                ? "button[data-action=save]:enabled:contains(save)"
+                : "button[data-action=save]:enabled",
+            content: markup(_t("Good job! It's time to <b>Save</b> your work.")),
             tooltipPosition: position,
             run: "click",
             timeout,
@@ -331,7 +368,7 @@ export function clickOnText(snippet, element, position = "bottom") {
         },
         {
             trigger: snippet.id ? `:iframe #wrapwrap .${snippet.id} ${element}` : snippet,
-        content: markup(_t("<b>Click on a text</b> to start editing it.")),
+            content: markup(_t("<b>Click on a text</b> to start editing it.")),
             tooltipPosition: position,
             run: "click",
         },
@@ -348,30 +385,38 @@ export function clickOnText(snippet, element, position = "bottom") {
  */
 export function insertSnippet(snippet, { position = "bottom", ignoreLoading = false } = {}) {
     const blockEl = snippet.groupName || snippet.name;
-    const insertSnippetSteps = [{
-        trigger: ".o_builder_sidebar_open",
-        noPrepend: true,
-    }];
-    const snippetIDSelector = snippet.id ? `[data-snippet-id="${snippet.id}"]` : `[data-snippet-id^="${snippet.customID}_"]`;
-    if (snippet.groupName) {
-        insertSnippetSteps.push({
-            content: markup(_t("Click on the <b>%s</b> category.", blockEl)),
-            trigger: `.o_block_tab:not(.o_we_ongoing_insertion) #snippet_groups .o_snippet[name="${blockEl}"].o_draggable .o_snippet_thumbnail_area`,
-            tooltipPosition: position,
-            run: "click",
-        },
+    const insertSnippetSteps = [
         {
-            content: markup(_t("Click on the <b>%s</b> building block.", snippet.name)),
-            // FIXME `:not(.d-none)` should obviously not be needed but it seems
-            // currently needed when using a tour in user/interactive mode.
-            trigger: `.modal .show:iframe .o_snippet_preview_wrap${snippetIDSelector}:not(.d-none)`,
+            trigger: ".o_builder_sidebar_open",
             noPrepend: true,
-            tooltipPosition: "top",
-            run: "click",
-        });
+        },
+    ];
+    const snippetIDSelector = snippet.id
+        ? `[data-snippet-id="${snippet.id}"]`
+        : `[data-snippet-id^="${snippet.customID}_"]`;
+    if (snippet.groupName) {
+        insertSnippetSteps.push(
+            {
+                content: markup(_t("Click on the <b>%s</b> category.", blockEl)),
+                trigger: `.o_block_tab:not(.o_we_ongoing_insertion) #snippet_groups .o_snippet[name="${blockEl}"].o_draggable .o_snippet_thumbnail_area`,
+                tooltipPosition: position,
+                run: "click",
+            },
+            {
+                content: markup(_t("Click on the <b>%s</b> building block.", snippet.name)),
+                // FIXME `:not(.d-none)` should obviously not be needed but it seems
+                // currently needed when using a tour in user/interactive mode.
+                trigger: `.modal .show:iframe .o_snippet_preview_wrap${snippetIDSelector}:not(.d-none)`,
+                noPrepend: true,
+                tooltipPosition: "top",
+                run: "click",
+            }
+        );
     } else {
         insertSnippetSteps.push({
-            content: markup(_t("Drag the <b>%s</b> block and drop it at the bottom of the page.", blockEl)),
+            content: markup(
+                _t("Drag the <b>%s</b> block and drop it at the bottom of the page.", blockEl)
+            ),
             trigger: `.o_block_tab:not(.o_we_ongoing_insertion) #snippet_content .o_snippet[name="${blockEl}"].o_draggable .o_snippet_thumbnail`,
             tooltipPosition: position,
             run: "drag_and_drop :iframe #wrapwrap > footer",
@@ -424,15 +469,15 @@ export function selectHeader(position = "bottom") {
 }
 
 export function selectSnippetColumn(snippet, index = 0, position = "bottom") {
-     return {
+    return {
         trigger: `:iframe #wrapwrap .${snippet.id} .row div[class*="col-lg-"]:eq(${index})`,
         content: markup(_t("<b>Click</b> on this column to access its options.")),
-         tooltipPosition: position,
+        tooltipPosition: position,
         run: "click",
-     };
+    };
 }
 
-export function prepend_trigger(steps, prepend_text='') {
+export function prepend_trigger(steps, prepend_text = "") {
     for (const step of steps) {
         if (!step.noPrepend && prepend_text) {
             step.trigger = prepend_text + step.trigger;
@@ -447,24 +492,28 @@ export function getClientActionUrl(path, edition) {
         url += `?path=${encodeURIComponent(path)}`;
     }
     if (edition) {
-        url += `${path ? '&' : '?'}enable_editor=1`;
+        url += `${path ? "&" : "?"}enable_editor=1`;
     }
     return url;
 }
 
 export function clickOnExtraMenuItem(stepOptions, backend = false) {
-    return Object.assign({
-        content: "Click on the extra menu dropdown toggle if it is there",
-        trigger: `${backend ? ":iframe" : ""} .top_menu`,
-        async run(actions) {
-            // Note: the button might not exist (it only appear if there is many menu items)
-            const extraMenuButton = this.anchor.querySelector(".o_extra_menu_items a.nav-link");
-            // Don't click on the extra menu button if it's already visible.
-            if (extraMenuButton && !extraMenuButton.classList.contains("show")) {
-                await actions.click(extraMenuButton);
-            }
+    return Object.assign(
+        {
+            content: "Click on the extra menu dropdown toggle if it is there",
+            trigger: `${backend ? ":iframe" : ""} .top_menu`,
+            async run(actions) {
+                // Note: the button might not exist (it only appear if there is
+                // many menu items).
+                const extraMenuButton = this.anchor.querySelector(".o_extra_menu_items a.nav-link");
+                // Don't click on the extra menu button if it's already visible.
+                if (extraMenuButton && !extraMenuButton.classList.contains("show")) {
+                    await actions.click(extraMenuButton);
+                }
+            },
         },
-    }, stepOptions);
+        stepOptions
+    );
 }
 
 /**
@@ -532,7 +581,7 @@ export function registerBackendAndFrontendTour(name, options, steps) {
     if (typeof steps !== "function") {
         throw new Error(`tour.steps has to be a function that returns TourStep[]`);
     }
-    if (window.location.pathname === '/odoo') {
+    if (window.location.pathname === "/odoo") {
         return registerWebsitePreviewTour(name, options, () => {
             const newSteps = [];
             for (const step of steps()) {
@@ -546,9 +595,7 @@ export function registerBackendAndFrontendTour(name, options, steps) {
 
     return registry.category("web_tour.tours").add(name, {
         url: options.url,
-        steps: () => {
-            return steps();
-        },
+        steps: () => steps(),
     });
 }
 
@@ -560,39 +607,42 @@ export function registerBackendAndFrontendTour(name, options, steps) {
  * @returns {Array} - The steps required to perform the website switch.
  */
 export function switchWebsite(websiteId, websiteName) {
-    return [{
-        content: `Click on the website switch to switch to website '${websiteName}'`,
-        trigger: '.o_website_switcher_container button',
-        run: "click",
-    },
-    {
-        trigger: `:iframe html:not([data-website-id="${websiteId}"])`,
-    },
-    {
-        content: `Switch to website '${websiteName}'`,
-        trigger: `.o-dropdown--menu .dropdown-item[data-website-id="${websiteId}"]:contains("${websiteName}")`,
-        run: "click",
-    }, {
-        content: "Wait for the iframe to be loaded",
-        // The page reload generates assets for the new website, it may take
-        // some time
-        timeout: 20000,
-        trigger: `:iframe html[data-website-id="${websiteId}"]`,
-    }];
+    return [
+        {
+            content: `Click on the website switch to switch to website '${websiteName}'`,
+            trigger: ".o_website_switcher_container button",
+            run: "click",
+        },
+        {
+            trigger: `:iframe html:not([data-website-id="${websiteId}"])`,
+        },
+        {
+            content: `Switch to website '${websiteName}'`,
+            trigger: `.o-dropdown--menu .dropdown-item[data-website-id="${websiteId}"]:contains("${websiteName}")`,
+            run: "click",
+        },
+        {
+            content: "Wait for the iframe to be loaded",
+            // The page reload generates assets for the new website, it may take
+            // some time
+            timeout: 20000,
+            trigger: `:iframe html[data-website-id="${websiteId}"]`,
+        },
+    ];
 }
 
 /**
-* Switches to a different website by clicking on the website switcher.
-* This function can only be used during test tours as it requires
-* specific cookies to properly function.
-*
-* @param {string} websiteName - The name of the website to switch to.
-* @returns {Array} - The steps required to perform the website switch.
-*/
+ * Switches to a different website by clicking on the website switcher.
+ * This function can only be used during test tours as it requires
+ * specific cookies to properly function.
+ *
+ * @param {string} websiteName - The name of the website to switch to.
+ * @returns {Array} - The steps required to perform the website switch.
+ */
 export function testSwitchWebsite(websiteName) {
-   const websiteIdMapping = JSON.parse(cookie.get('websiteIdMapping') || '{}');
-   const websiteId = websiteIdMapping[websiteName];
-   return switchWebsite(websiteId, websiteName)
+    const websiteIdMapping = JSON.parse(cookie.get("websiteIdMapping") || "{}");
+    const websiteId = websiteIdMapping[websiteName];
+    return switchWebsite(websiteId, websiteName);
 }
 
 /**
diff --git a/addons/website/static/src/js/utils.js b/addons/website/static/src/js/utils.js
index cf5dfdf9bda01..dde000eb35b73 100644
--- a/addons/website/static/src/js/utils.js
+++ b/addons/website/static/src/js/utils.js
@@ -63,7 +63,7 @@ function loadAnchors(url, body) {
  *
  * @param {HTMLInputElement} input
  */
-function autocompleteWithPages(input, options= {}, env = undefined) {
+function autocompleteWithPages(input, options = {}, env = undefined) {
     const owlApp = new App(UrlAutoComplete, {
         env: env || Component.env,
         dev: env ? env.debug : Component.env.debug,
@@ -80,11 +80,11 @@ function autocompleteWithPages(input, options= {}, env = undefined) {
     const container = document.createElement("div");
     container.classList.add("ui-widget", "ui-autocomplete", "ui-widget-content", "border-0");
     document.body.appendChild(container);
-    owlApp.mount(container)
+    owlApp.mount(container);
     return () => {
         owlApp.destroy();
         container.remove();
-    }
+    };
 }
 
 /**
@@ -93,11 +93,11 @@ function autocompleteWithPages(input, options= {}, env = undefined) {
  */
 function onceAllImagesLoaded($element, $excluded) {
     var defs = Array.from($element.find("img").addBack("img")).map((img) => {
-        if (img.complete || $excluded && ($excluded.is(img) || $excluded.has(img).length)) {
+        if (img.complete || ($excluded && ($excluded.is(img) || $excluded.has(img).length))) {
             return; // Already loaded
         }
         var def = new Promise(function (resolve, reject) {
-            $(img).one('load', function () {
+            $(img).one("load", function () {
                 resolve();
             });
         });
@@ -139,35 +139,38 @@ function prompt(options, _qweb) {
      * @param {Object} [options.default=''] default value of the field
      * @param {Function} [options.init] optional function that takes the `field` (enhanced with a fillWith() method) and the `dialog` as parameters [can return a promise]
      */
-    if (typeof options === 'string') {
+    if (typeof options === "string") {
         options = {
-            text: options
+            text: options,
         };
     }
     if (typeof _qweb === "undefined") {
-        _qweb = 'website.prompt';
+        _qweb = "website.prompt";
     }
-    options = Object.assign({
-        window_title: '',
-        field_name: '',
-        'default': '', // dict notation for IE<9
-        init: function () {},
-        btn_primary_title: _t('Create'),
-        btn_secondary_title: _t('Cancel'),
-    }, options || {});
-
-    var type = intersection(Object.keys(options), ['input', 'textarea', 'select']);
-    type = type.length ? type[0] : 'input';
+    options = Object.assign(
+        {
+            window_title: "",
+            field_name: "",
+            default: "", // dict notation for IE<9
+            init: function () {},
+            btn_primary_title: _t("Create"),
+            btn_secondary_title: _t("Cancel"),
+        },
+        options || {}
+    );
+
+    var type = intersection(Object.keys(options), ["input", "textarea", "select"]);
+    type = type.length ? type[0] : "input";
     options.field_type = type;
     options.field_name = options.field_name || options[type];
 
     var def = new Promise(function (resolve, reject) {
-        var dialog = $(renderToElement(_qweb, options)).appendTo('body');
+        var dialog = $(renderToElement(_qweb, options)).appendTo("body");
         options.$dialog = dialog;
         var field = dialog.find(options.field_type).first();
-        field.val(options['default']); // dict notation for IE<9
+        field.val(options["default"]); // dict notation for IE<9
         field.fillWith = function (data) {
-            if (field.is('select')) {
+            if (field.is("select")) {
                 var select = field[0];
                 data.forEach(function (item) {
                     select.options[select.options.length] = new window.Option(item[1], item[0]);
@@ -181,26 +184,26 @@ function prompt(options, _qweb) {
             if (fill) {
                 field.fillWith(fill);
             }
-            dialog.modal('show');
+            dialog.modal("show");
             field.focus();
-            dialog.on('click', '.btn-primary', function () {
-                var backdrop = $('.modal-backdrop');
+            dialog.on("click", ".btn-primary", function () {
+                var backdrop = $(".modal-backdrop");
                 resolve({ val: field.val(), field: field, dialog: dialog });
-                dialog.modal('hide').remove();
-                    backdrop.remove();
+                dialog.modal("hide").remove();
+                backdrop.remove();
             });
         });
-        dialog.on('hidden.bs.modal', function () {
-                var backdrop = $('.modal-backdrop');
+        dialog.on("hidden.bs.modal", function () {
+            var backdrop = $(".modal-backdrop");
             reject();
             dialog.remove();
-                backdrop.remove();
+            backdrop.remove();
         });
         if (field.is('input[type="text"], select')) {
             field.keypress(function (e) {
                 if (e.key === "Enter") {
                     e.preventDefault();
-                    dialog.find('.btn-primary').trigger('click');
+                    dialog.find(".btn-primary").trigger("click");
                 }
             });
         }
@@ -211,12 +214,12 @@ function prompt(options, _qweb) {
 
 function websiteDomain(self) {
     var websiteID;
-    self.trigger_up('context_get', {
+    self.trigger_up("context_get", {
         callback: function (ctx) {
-            websiteID = ctx['website_id'];
+            websiteID = ctx["website_id"];
         },
     });
-    return ['|', ['website_id', '=', false], ['website_id', '=', websiteID]];
+    return ["|", ["website_id", "=", false], ["website_id", "=", websiteID]];
 }
 
 /**
@@ -237,30 +240,29 @@ function isHTTPSorNakedDomainRedirection(url1, url2) {
         // Incorrect URL, `false` URL..
         return false;
     }
-    return url1 === url2 ||
-           url1.replace(/^www\./, '') === url2.replace(/^www\./, '');
+    return url1 === url2 || url1.replace(/^www\./, "") === url2.replace(/^www\./, "");
 }
 
 export function sendRequest(route, params) {
     function _addInput(form, name, value) {
-        let param = document.createElement('input');
-        param.setAttribute('type', 'hidden');
-        param.setAttribute('name', name);
-        param.setAttribute('value', value);
+        const param = document.createElement("input");
+        param.setAttribute("type", "hidden");
+        param.setAttribute("name", name);
+        param.setAttribute("value", value);
         form.appendChild(param);
     }
 
-    let form = document.createElement('form');
-    form.setAttribute('action', route);
-    form.setAttribute('method', params.method || 'POST');
+    const form = document.createElement("form");
+    form.setAttribute("action", route);
+    form.setAttribute("method", params.method || "POST");
     // This is an exception for the 404 page create page button, in backend we
     // want to open the response in the top window not in the iframe.
     if (params.forceTopWindow) {
-        form.setAttribute('target', '_top');
+        form.setAttribute("target", "_top");
     }
 
     if (odoo.csrf_token) {
-        _addInput(form, 'csrf_token', odoo.csrf_token);
+        _addInput(form, "csrf_token", odoo.csrf_token);
     }
 
     for (const key in params) {
@@ -316,14 +318,14 @@ async function _exportToPNG(src, format) {
     function checkImg(imgEl) {
         // Firefox does not support drawing SVG to canvas unless it has width
         // and height attributes set on the root <svg>.
-        return (imgEl.naturalHeight !== 0);
+        return imgEl.naturalHeight !== 0;
     }
     function toPNGViaCanvas(imgEl) {
-        const canvas = document.createElement('canvas');
+        const canvas = document.createElement("canvas");
         canvas.width = imgEl.width;
         canvas.height = imgEl.height;
-        canvas.getContext('2d').drawImage(imgEl, 0, 0);
-        return canvas.toDataURL('image/png');
+        canvas.getContext("2d").drawImage(imgEl, 0, 0);
+        return canvas.toDataURL("image/png");
     }
 
     // In case we receive a loaded image and that this image is not problematic,
@@ -338,7 +340,7 @@ async function _exportToPNG(src, format) {
 
     // At this point, we either did not receive a loaded image or the received
     // loaded image is problematic => we have to do some asynchronous code.
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
         const imgEl = new Image();
         imgEl.onload = () => {
             if (format !== "svg+xml" || checkImg(imgEl)) {
@@ -353,17 +355,17 @@ async function _exportToPNG(src, format) {
             document.body.appendChild(imgEl);
 
             const request = new XMLHttpRequest();
-            request.open('GET', imgEl.src, true);
+            request.open("GET", imgEl.src, true);
             request.onload = () => {
                 // Convert the data URI to a SVG element
                 const parser = new DOMParser();
-                const result = parser.parseFromString(request.responseText, 'text/xml');
+                const result = parser.parseFromString(request.responseText, "text/xml");
                 const svgEl = result.getElementsByTagName("svg")[0];
 
                 // Add the attributes Firefox needs and remove the image from
                 // the DOM.
-                svgEl.setAttribute('width', imgEl.width);
-                svgEl.setAttribute('height', imgEl.height);
+                svgEl.setAttribute("width", imgEl.width);
+                svgEl.setAttribute("height", imgEl.height);
                 imgEl.remove();
 
                 // Convert the SVG element to a data URI
@@ -377,7 +379,7 @@ async function _exportToPNG(src, format) {
             request.send();
         };
         imgEl.src = src;
-    }).then(loadedImgEl => toPNGViaCanvas(loadedImgEl));
+    }).then((loadedImgEl) => toPNGViaCanvas(loadedImgEl));
 }
 
 /**
@@ -386,16 +388,16 @@ async function _exportToPNG(src, format) {
  * @returns {HTMLIframeElement}
  */
 export function generateGMapIframe() {
-    const iframeEl = document.createElement('iframe');
-    iframeEl.classList.add('s_map_embedded', 'o_not_editable');
-    iframeEl.setAttribute('width', '100%');
-    iframeEl.setAttribute('height', '100%');
-    iframeEl.setAttribute('frameborder', '0');
-    iframeEl.setAttribute('scrolling', 'no');
-    iframeEl.setAttribute('marginheight', '0');
-    iframeEl.setAttribute('marginwidth', '0');
-    iframeEl.setAttribute('src', 'about:blank');
-    iframeEl.setAttribute('aria-label', _t("Map"));
+    const iframeEl = document.createElement("iframe");
+    iframeEl.classList.add("s_map_embedded", "o_not_editable");
+    iframeEl.setAttribute("width", "100%");
+    iframeEl.setAttribute("height", "100%");
+    iframeEl.setAttribute("frameborder", "0");
+    iframeEl.setAttribute("scrolling", "no");
+    iframeEl.setAttribute("marginheight", "0");
+    iframeEl.setAttribute("marginwidth", "0");
+    iframeEl.setAttribute("src", "about:blank");
+    iframeEl.setAttribute("aria-label", _t("Map"));
     return iframeEl;
 }
 
@@ -406,10 +408,15 @@ export function generateGMapIframe() {
  * @returns {string} a Google Maps URL
  */
 export function generateGMapLink(dataset) {
-    return 'https://maps.google.com/maps?q=' + encodeURIComponent(dataset.mapAddress)
-        + '&t=' + encodeURIComponent(dataset.mapType)
-        + '&z=' + encodeURIComponent(dataset.mapZoom)
-        + '&ie=UTF8&iwloc=&output=embed';
+    return (
+        "https://maps.google.com/maps?q=" +
+        encodeURIComponent(dataset.mapAddress) +
+        "&t=" +
+        encodeURIComponent(dataset.mapType) +
+        "&z=" +
+        encodeURIComponent(dataset.mapZoom) +
+        "&ie=UTF8&iwloc=&output=embed"
+    );
 }
 
 /**
@@ -441,15 +448,16 @@ function getParsedDataFor(formId, parentEl) {
     if (!dataForEl) {
         return;
     }
-    return JSON.parse(dataForEl.dataset.values
-        // replaces `True` by `true` if they are after `,` or `:` or `[`
-        .replace(/([,:\[]\s*)True/g, '$1true')
-        // replaces `False` and `None` by `""` if they are after `,` or `:` or `[`
-        .replace(/([,:\[]\s*)(False|None)/g, '$1""')
-        // replaces the `'` by `"` if they are before `,` or `:` or `]` or `}`
-        .replace(/'(\s*[,:\]}])/g, '"$1')
-        // replaces the `'` by `"` if they are after `{` or `[` or `,` or `:`
-        .replace(/([{\[:,]\s*)'/g, '$1"')
+    return JSON.parse(
+        dataForEl.dataset.values
+            // replaces `True` by `true` if they are after `,` or `:` or `[`
+            .replace(/([,:[]\s*)True/g, "$1true")
+            // replaces `False` and `None` by `""` if they are after `,` or `:` or `[`
+            .replace(/([,:[]\s*)(False|None)/g, '$1""')
+            // replaces the `'` by `"` if they are before `,` or `:` or `]` or `}`
+            .replace(/'(\s*[,:\]}])/g, '"$1')
+            // replaces the `'` by `"` if they are after `{` or `[` or `,` or `:`
+            .replace(/([{[:,]\s*)'/g, '$1"')
     );
 }
 
@@ -467,11 +475,11 @@ export function cloneContentEls(content, keepScripts = false) {
         copyFragment = new Range().createContextualFragment(content);
     } else {
         copyFragment = new DocumentFragment();
-        const els = [...content.children].map(el => el.cloneNode(true));
+        const els = [...content.children].map((el) => el.cloneNode(true));
         copyFragment.append(...els);
     }
     if (!keepScripts) {
-        copyFragment.querySelectorAll("script").forEach(scriptEl => scriptEl.remove());
+        copyFragment.querySelectorAll("script").forEach((scriptEl) => scriptEl.remove());
     }
     return copyFragment;
 }
@@ -519,11 +527,16 @@ export function checkAndNotifySEO(seo_data, OptimizeSEODialog, services) {
  */
 export function slugify(value) {
     // `NFKD` as in `http_routing` python `slugify()`
-    return !value ? "" : value.trim().normalize("NFKD").toLowerCase()
-        .replace(/['’]/g, "-") // Replace apostrophes with hyphens
-        .replace(/\s+/g, "-") // Replace spaces with -
-        .replace(/[^\w-]+/g, "") // Remove all non-word chars
-        .replace(/--+/g, "-"); // Replace multiple - with single -
+    return !value
+        ? ""
+        : value
+              .trim()
+              .normalize("NFKD")
+              .toLowerCase()
+              .replace(/['’]/g, "-") // Replace apostrophes with hyphens
+              .replace(/\s+/g, "-") // Replace spaces with -
+              .replace(/[^\w-]+/g, "") // Remove all non-word chars
+              .replace(/--+/g, "-"); // Replace multiple - with single -
 }
 
 patch(urlUtils, {
@@ -544,12 +557,13 @@ patch(urlUtils, {
         // In the past, you could not edit your website from abc.odoo.com if you
         // properly configured your real domain already.
         let origin;
-        try { // Needed: "http:" would crash
+        try {
+            // Needed: "http:" would crash
             origin = new URL(url, window.location.origin).origin;
         } catch {
             return false;
         }
-        return `${origin}/`.startsWith(w.domain); 
+        return `${origin}/`.startsWith(w.domain);
     },
 });
 
diff --git a/addons/website/static/src/services/website_custom_menus.js b/addons/website/static/src/services/website_custom_menus.js
index e28af40a5617d..e7f81b529ce55 100644
--- a/addons/website/static/src/services/website_custom_menus.js
+++ b/addons/website/static/src/services/website_custom_menus.js
@@ -1,8 +1,8 @@
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
-import { EditMenuDialog } from '@website/components/dialog/edit_menu';
-import { OptimizeSEODialog } from '@website/components/dialog/seo';
-import {PagePropertiesDialog} from '@website/components/dialog/page_properties';
+import { EditMenuDialog } from "@website/components/dialog/edit_menu";
+import { OptimizeSEODialog } from "@website/components/dialog/seo";
+import { PagePropertiesDialog } from "@website/components/dialog/page_properties";
 
 /**
  * This service displays contextual menus, depending of the state of the
@@ -11,12 +11,12 @@ import {PagePropertiesDialog} from '@website/components/dialog/page_properties';
  * are not client actions.
  */
 export const websiteCustomMenus = {
-    dependencies: ['website', 'orm', 'dialog', 'ui'],
+    dependencies: ["website", "orm", "dialog", "ui"],
     start(env, { website, orm, dialog, ui }) {
         const services = { website, orm, dialog, ui };
         return {
             get(xmlId) {
-                return registry.category('website_custom_menus').get(xmlId, null);
+                return registry.category("website_custom_menus").get(xmlId, null);
             },
             async open(customMenu) {
                 const menuConfig = this.get(customMenu.xmlid);
@@ -29,74 +29,84 @@ export const websiteCustomMenus = {
                     // the content menu to be edited).
                     ...customMenu.dynamicProps,
                 };
-                return dialog.add(
-                    menuConfig.Component,
-                    menuProps,
-                );
+                return dialog.add(menuConfig.Component, menuProps);
             },
             addCustomMenus(sections) {
                 const filteredSections = [];
                 for (const section of sections) {
                     const isWebsiteCustomMenu = !!this.get(section.xmlid);
-                    const displayWebsiteCustomMenu = isWebsiteCustomMenu && website.isRestrictedEditor && this.get(section.xmlid).isDisplayed(env);
+                    const displayWebsiteCustomMenu =
+                        isWebsiteCustomMenu &&
+                        website.isRestrictedEditor &&
+                        this.get(section.xmlid).isDisplayed(env);
                     if (!isWebsiteCustomMenu || displayWebsiteCustomMenu) {
                         let subSections = [];
                         if (section.childrenTree.length) {
                             subSections = this.addCustomMenus(section.childrenTree);
                         }
-                        if (section.xmlid === 'website.custom_menu_edit_menu') {
+                        if (section.xmlid === "website.custom_menu_edit_menu") {
                             // Hack: this code will simulate an XML pre-configured navbar menuitem to edit each
                             // content menu found on the current page by duplicating one menuitem with
                             // different data (name, dialog props...). this will prevent breaking the current
                             // 'navbar menus' display system.
-                            filteredSections.push(...website.currentWebsite.metadata.contentMenus.map((menu, index) => ({
-                                ...section,
-                                name: _t("Edit %s", menu[0]),
-                                dynamicProps: {rootID: parseInt(menu[1], 10)},
-                                // Prevent a 't-foreach' duplicate key on menus template.
-                                id: `${section.id}-${index}`,
-                            })));
+                            filteredSections.push(
+                                ...website.currentWebsite.metadata.contentMenus.map(
+                                    (menu, index) => ({
+                                        ...section,
+                                        name: _t("Edit %s", menu[0]),
+                                        dynamicProps: { rootID: parseInt(menu[1], 10) },
+                                        // Prevent a 't-foreach' duplicate key on menus template.
+                                        id: `${section.id}-${index}`,
+                                    })
+                                )
+                            );
                         } else {
-                            filteredSections.push(Object.assign({}, section, {childrenTree: subSections}));
+                            filteredSections.push(
+                                Object.assign({}, section, { childrenTree: subSections })
+                            );
                         }
                     }
                 }
                 for (const section of filteredSections) {
                     section.childrenTree = section.childrenTree.filter(
                         // Exclude non-leaf node having no visible sub-element.
-                        tree => !(tree.children.length && !tree.childrenTree.length)
+                        (tree) => !(tree.children.length && !tree.childrenTree.length)
                     );
                 }
                 return filteredSections;
             },
         };
-    }
+    },
 };
-registry.category('services').add('website_custom_menus', websiteCustomMenus);
+registry.category("services").add("website_custom_menus", websiteCustomMenus);
 
-registry.category('website_custom_menus').add('website.menu_edit_menu', {
+registry.category("website_custom_menus").add("website.menu_edit_menu", {
     Component: EditMenuDialog,
-    isDisplayed: (env) => !!env.services.website.currentWebsite
-        && env.services.website.isDesigner
-        && !env.services.website.currentWebsite.metadata.translatable,
+    isDisplayed: (env) =>
+        !!env.services.website.currentWebsite &&
+        env.services.website.isDesigner &&
+        !env.services.website.currentWebsite.metadata.translatable,
 });
-registry.category('website_custom_menus').add('website.menu_optimize_seo', {
+registry.category("website_custom_menus").add("website.menu_optimize_seo", {
     Component: OptimizeSEODialog,
-    isDisplayed: (env) => env.services.website.currentWebsite
-        && env.services.website.isRestrictedEditor
-        && !!env.services.website.currentWebsite.metadata.canOptimizeSeo,
+    isDisplayed: (env) =>
+        env.services.website.currentWebsite &&
+        env.services.website.isRestrictedEditor &&
+        !!env.services.website.currentWebsite.metadata.canOptimizeSeo,
 });
-registry.category('website_custom_menus').add('website.menu_ace_editor', {
-    openWidget: (services) => services.website.context.showResourceEditor = true,
-    isDisplayed: (env) => env.services.website.currentWebsite
-        && env.services.website.currentWebsite.metadata.viewXmlid
-        && !env.services.ui.isSmall,
+registry.category("website_custom_menus").add("website.menu_ace_editor", {
+    openWidget: (services) => (services.website.context.showResourceEditor = true),
+    isDisplayed: (env) =>
+        env.services.website.currentWebsite &&
+        env.services.website.currentWebsite.metadata.viewXmlid &&
+        !env.services.ui.isSmall,
 });
-registry.category('website_custom_menus').add('website.menu_page_properties', {
+registry.category("website_custom_menus").add("website.menu_page_properties", {
     Component: PagePropertiesDialog,
-    isDisplayed: (env) => env.services.website.currentWebsite
-        && env.services.website.isDesigner
-        && !!env.services.website.currentWebsite.metadata.mainObject,
+    isDisplayed: (env) =>
+        env.services.website.currentWebsite &&
+        env.services.website.isDesigner &&
+        !!env.services.website.currentWebsite.metadata.mainObject,
     getProps: async ({ orm, website }) => {
         const mainObject = website.currentWebsite.metadata.mainObject;
         const isPage = mainObject.model === "website.page";
@@ -114,13 +124,13 @@ registry.category('website_custom_menus').add('website.menu_page_properties', {
                 try {
                     path = new URL(website.currentWebsite.metadata.path).pathname;
                 } catch {
-                    path = website.currentWebsite.metadata.path || '/';
+                    path = website.currentWebsite.metadata.path || "/";
                 }
             }
-            if (path && !path.startsWith('/')) {
+            if (path && !path.startsWith("/")) {
                 path = `/${path}`;
             }
-            return path || '/';
+            return path || "/";
         };
         const recordValues = isPage
             ? {
@@ -147,12 +157,13 @@ registry.category('website_custom_menus').add('website.menu_page_properties', {
         };
     },
 });
-registry.category('website_custom_menus').add('website.custom_menu_edit_menu', {
+registry.category("website_custom_menus").add("website.custom_menu_edit_menu", {
     Component: EditMenuDialog,
     // 'isDisplayed' === true => at least 1 content menu was found on the page. This
     // menuitem will be cloned (in 'addCustomMenus()') to edit every content menu using
     // the 'EditMenuDialog' component.
-    isDisplayed: (env) => env.services.website.currentWebsite
-        && env.services.website.currentWebsite.metadata.contentMenus
-        && env.services.website.currentWebsite.metadata.contentMenus.length,
+    isDisplayed: (env) =>
+        env.services.website.currentWebsite &&
+        env.services.website.currentWebsite.metadata.contentMenus &&
+        env.services.website.currentWebsite.metadata.contentMenus.length,
 });
diff --git a/addons/website/static/src/services/website_service.js b/addons/website/static/src/services/website_service.js
index 662088a916e49..4d8124a41e5a4 100644
--- a/addons/website/static/src/services/website_service.js
+++ b/addons/website/static/src/services/website_service.js
@@ -1,14 +1,14 @@
 import { jsToPyLocale } from "@web/core/l10n/utils";
 import { _t } from "@web/core/l10n/translation";
-import { registry } from '@web/core/registry';
+import { registry } from "@web/core/registry";
 import { user } from "@web/core/user";
 import { isVisible } from "@web/core/utils/ui";
 
-import { FullscreenIndication } from '../components/fullscreen_indication/fullscreen_indication';
-import { WebsiteLoader } from '../components/website_loader/website_loader';
+import { FullscreenIndication } from "../components/fullscreen_indication/fullscreen_indication";
+import { WebsiteLoader } from "../components/website_loader/website_loader";
 import { reactive, EventBus } from "@odoo/owl";
 
-const websiteSystrayRegistry = registry.category('website_systray');
+const websiteSystrayRegistry = registry.category("website_systray");
 
 // TODO this is duplicated in website_root at least, it should be a shared util
 export const unslugHtmlDataObject = (repr) => {
@@ -22,14 +22,14 @@ export const unslugHtmlDataObject = (repr) => {
     };
 };
 
-const ANONYMOUS_PROCESS_ID = 'ANONYMOUS_PROCESS_ID';
+const ANONYMOUS_PROCESS_ID = "ANONYMOUS_PROCESS_ID";
 
 export const websiteService = {
-    dependencies: ['orm', 'action', 'hotkey'],
+    dependencies: ["orm", "action", "hotkey"],
     start(env, { orm, action, hotkey }) {
         let websites = [];
         let currentWebsiteId;
-        let currentWebsiteIdList = [];
+        const currentWebsiteIdList = [];
         let currentMetadata = {};
         let fullscreen;
         let pageDocument;
@@ -40,7 +40,7 @@ export const websiteService = {
         let isDesigner;
         let hasMultiWebsites;
         let actionJsId;
-        let blockingProcesses = [];
+        const blockingProcesses = [];
         let modelNamesProm = null;
         const modelNames = {};
         let invalidateSnippetCache = false;
@@ -55,27 +55,33 @@ export const websiteService = {
         });
         const bus = new EventBus();
 
-        hotkey.add("escape", () => {
-            // Toggle fullscreen mode when pressing escape.
-            if (
-                (!currentWebsiteId && !fullscreen)
-                || (pageDocument && isVisible(pageDocument.querySelector(".modal")))
-            ) {
-                // Only allow to use this feature while on the website app, or
-                // while it is already fullscreen (in case you left the website
-                // app in fullscreen mode, thanks to CTRL-K), or if a modal
-                // is open within the preview and could be closed with escape.
-                return;
-            }
-            fullscreen = !fullscreen;
-            document.body.classList.toggle('o_website_fullscreen', fullscreen);
-            bus.trigger(fullscreen ? 'FULLSCREEN-INDICATION-SHOW' : 'FULLSCREEN-INDICATION-HIDE');
-        }, { global: true });
-        registry.category('main_components').add('FullscreenIndication', {
+        hotkey.add(
+            "escape",
+            () => {
+                // Toggle fullscreen mode when pressing escape.
+                if (
+                    (!currentWebsiteId && !fullscreen) ||
+                    (pageDocument && isVisible(pageDocument.querySelector(".modal")))
+                ) {
+                    // Only allow to use this feature while on the website app, or
+                    // while it is already fullscreen (in case you left the website
+                    // app in fullscreen mode, thanks to CTRL-K), or if a modal
+                    // is open within the preview and could be closed with escape.
+                    return;
+                }
+                fullscreen = !fullscreen;
+                document.body.classList.toggle("o_website_fullscreen", fullscreen);
+                bus.trigger(
+                    fullscreen ? "FULLSCREEN-INDICATION-SHOW" : "FULLSCREEN-INDICATION-HIDE"
+                );
+            },
+            { global: true }
+        );
+        registry.category("main_components").add("FullscreenIndication", {
             Component: FullscreenIndication,
             props: { bus },
         });
-        registry.category('main_components').add('WebsiteLoader', {
+        registry.category("main_components").add("WebsiteLoader", {
             Component: WebsiteLoader,
             props: { bus },
         });
@@ -107,7 +113,7 @@ export const websiteService = {
                     lastWebsiteId = id;
                 }
                 addWebsiteId(id);
-                websiteSystrayRegistry.trigger('EDIT-WEBSITE');
+                websiteSystrayRegistry.trigger("EDIT-WEBSITE");
             },
             /**
              * This represents the current website being edited in the
@@ -116,7 +122,7 @@ export const websiteService = {
              * not displayed.
              */
             get currentWebsite() {
-                const currentWebsite = websites.find(w => w.id === currentWebsiteId);
+                const currentWebsite = websites.find((w) => w.id === currentWebsiteId);
                 if (currentWebsite) {
                     currentWebsite.metadata = currentMetadata;
                 }
@@ -148,7 +154,18 @@ export const websiteService = {
                 if (!isWebsitePage) {
                     currentMetadata = {};
                 } else {
-                    const { mainObject, seoObject, isPublished, canOptimizeSeo, canPublish, editableInBackend, translatable, viewXmlid, defaultLangName, langName } = dataset;
+                    const {
+                        mainObject,
+                        seoObject,
+                        isPublished,
+                        canOptimizeSeo,
+                        canPublish,
+                        editableInBackend,
+                        translatable,
+                        viewXmlid,
+                        defaultLangName,
+                        langName,
+                    } = dataset;
                     // We ignore multiple menus with the same `content_menu_id`
                     // in the DOM, since it's possible to have different
                     // templates for the same content menu (E.g. used for a
@@ -167,10 +184,10 @@ export const websiteService = {
                         path: document.location.href,
                         mainObject: unslugHtmlDataObject(mainObject),
                         seoObject: unslugHtmlDataObject(seoObject),
-                        isPublished: isPublished === 'True',
-                        canOptimizeSeo: canOptimizeSeo === 'True',
-                        canPublish: canPublish === 'True',
-                        editableInBackend: editableInBackend === 'True',
+                        isPublished: isPublished === "True",
+                        canOptimizeSeo: canOptimizeSeo === "True",
+                        canPublish: canPublish === "True",
+                        editableInBackend: editableInBackend === "True",
                         title: document.title,
                         translatable: !!translatable,
                         contentMenus,
@@ -178,16 +195,18 @@ export const websiteService = {
                         // a page is editable or not. For now, we use
                         // the editable selector because it's the common
                         // denominator of editable pages.
-                        editable: !!document.getElementById('wrapwrap'),
+                        editable: !!document.getElementById("wrapwrap"),
                         viewXmlid: viewXmlid,
                         lang: jsToPyLocale(document.documentElement.getAttribute("lang")),
                         defaultLangName: defaultLangName,
                         langName: langName,
-                        direction: document.documentElement.querySelector('#wrapwrap.o_rtl') ? 'rtl' : 'ltr',
+                        direction: document.documentElement.querySelector("#wrapwrap.o_rtl")
+                            ? "rtl"
+                            : "ltr",
                     };
                 }
                 contentWindow = document.defaultView;
-                websiteSystrayRegistry.trigger('CONTENT-UPDATED');
+                websiteSystrayRegistry.trigger("CONTENT-UPDATED");
             },
             get pageDocument() {
                 return pageDocument;
@@ -247,13 +266,15 @@ export const websiteService = {
                 this.websiteRootInstance = undefined;
                 if (lang) {
                     invalidateSnippetCache = true;
-                    path = `/website/lang/${encodeURIComponent(lang)}?r=${encodeURIComponent(path)}`;
+                    path = `/website/lang/${encodeURIComponent(lang)}?r=${encodeURIComponent(
+                        path
+                    )}`;
                 }
                 action.doAction("website.website_preview", {
                     clearBreadcrumbs: true,
                     props: {
                         websiteId: websiteId || currentWebsiteId || false,
-                        path: path || (contentWindow && contentWindow.location.href) || '/',
+                        path: path || (contentWindow && contentWindow.location.href) || "/",
                         enableEditor: edition,
                         editTranslations: translation,
                     },
@@ -262,9 +283,9 @@ export const websiteService = {
             async fetchUserGroups() {
                 // Fetch user groups, before fetching the websites.
                 [isRestrictedEditor, isDesigner, hasMultiWebsites] = await Promise.all([
-                    user.hasGroup('website.group_website_restricted_editor'),
-                    user.hasGroup('website.group_website_designer'),
-                    user.hasGroup('website.group_multi_website'),
+                    user.hasGroup("website.group_website_restricted_editor"),
+                    user.hasGroup("website.group_website_designer"),
+                    user.hasGroup("website.group_multi_website"),
                 ]);
             },
             async fetchWebsites() {
@@ -282,7 +303,7 @@ export const websiteService = {
             },
             blockPreview(showLoader, processId) {
                 if (!blockingProcesses.length) {
-                    bus.trigger('BLOCK', { showLoader });
+                    bus.trigger("BLOCK", { showLoader });
                 }
                 blockingProcesses.push(processId || ANONYMOUS_PROCESS_ID);
             },
@@ -291,15 +312,15 @@ export const websiteService = {
                 if (processIndex > -1) {
                     blockingProcesses.splice(processIndex, 1);
                     if (blockingProcesses.length === 0) {
-                        bus.trigger('UNBLOCK');
+                        bus.trigger("UNBLOCK");
                     }
                 }
             },
             showLoader(props) {
-                bus.trigger('SHOW-WEBSITE-LOADER', props);
+                bus.trigger("SHOW-WEBSITE-LOADER", props);
             },
             hideLoader() {
-                bus.trigger('HIDE-WEBSITE-LOADER');
+                bus.trigger("HIDE-WEBSITE-LOADER");
             },
             prepareOutLoader() {
                 bus.trigger("PREPARE-OUT-WEBSITE-LOADER");
@@ -318,10 +339,11 @@ export const websiteService = {
                     // with another helper to map a model functional name from
                     // its technical map without the need of the right access
                     // rights (which is why I cannot use search_read here).
-                    modelNamesProm = orm.call("ir.model", "get_available_models")
-                        .then(modelsData => {
+                    modelNamesProm = orm
+                        .call("ir.model", "get_available_models")
+                        .then((modelsData) => {
                             for (const modelData of modelsData) {
-                                modelNames[modelData['model']] = modelData['display_name'];
+                                modelNames[modelData["model"]] = modelData["display_name"];
                             }
                         })
                         // Precaution in case the util is simply removed without
@@ -336,4 +358,4 @@ export const websiteService = {
     },
 };
 
-registry.category('services').add('website', websiteService);
+registry.category("services").add("website", websiteService);
diff --git a/addons/website/static/src/snippets/s_announcement_scroll/announcement_scroll.js b/addons/website/static/src/snippets/s_announcement_scroll/announcement_scroll.js
index d7d4c319f9c6a..cec90e36d2213 100644
--- a/addons/website/static/src/snippets/s_announcement_scroll/announcement_scroll.js
+++ b/addons/website/static/src/snippets/s_announcement_scroll/announcement_scroll.js
@@ -7,24 +7,24 @@ export class AnnouncementScroll extends Interaction {
     dynamicContent = {
         _root: {
             "t-att-class": () => ({
-                "s_announcement_scroll_ready": this.announcementScrollReady,
-                "s_announcement_scroll_page_scrolling": this.announcementScrollPageScrolling,
+                s_announcement_scroll_ready: this.announcementScrollReady,
+                s_announcement_scroll_page_scrolling: this.announcementScrollPageScrolling,
             }),
         },
         _window: {
-            "t-on-resize": this.debounced(this.onResize, 100, {leading: true, trailing: true}),
+            "t-on-resize": this.debounced(this.onResize, 100, { leading: true, trailing: true }),
             "t-on-scroll": this.throttled(this.onScroll),
         },
         ".s_announcement_scroll_marquee_container": {
             "t-att-style": () => ({
-                "transform": `translateX(${this.parallaxPosition}%)`,
+                transform: `translateX(${this.parallaxPosition}%)`,
             }),
         },
     };
 
     setup() {
-        this.marqueeContainerEl = this.el.querySelector('.s_announcement_scroll_marquee_container');
-        this.marqueeItemEl = this.el.querySelector('.s_announcement_scroll_marquee_item');
+        this.marqueeContainerEl = this.el.querySelector(".s_announcement_scroll_marquee_container");
+        this.marqueeItemEl = this.el.querySelector(".s_announcement_scroll_marquee_item");
         this.setParallaxPosition();
     }
 
@@ -88,9 +88,12 @@ export class AnnouncementScroll extends Interaction {
         const rect = this.el.getBoundingClientRect();
         const startScroll = window.scrollY + rect.top - window.innerHeight;
         const endScroll = window.scrollY + rect.bottom;
-        const progress = Math.min(Math.max((window.scrollY - startScroll) / (endScroll - startScroll), 0), 1);
-        if (this.el.classList.contains('s_announcement_scroll_direction_right')) {
-            this.parallaxPosition = (-MIN_LEFT_SHIFT - PARALLAX_AMOUNT) + progress * PARALLAX_AMOUNT;
+        const progress = Math.min(
+            Math.max((window.scrollY - startScroll) / (endScroll - startScroll), 0),
+            1
+        );
+        if (this.el.classList.contains("s_announcement_scroll_direction_right")) {
+            this.parallaxPosition = -MIN_LEFT_SHIFT - PARALLAX_AMOUNT + progress * PARALLAX_AMOUNT;
         } else {
             this.parallaxPosition = -MIN_LEFT_SHIFT - progress * PARALLAX_AMOUNT;
         }
@@ -103,7 +106,7 @@ export class AnnouncementScroll extends Interaction {
         while (this.marqueeContainerEl.children.length > 1) {
             this.marqueeContainerEl.lastChild.remove();
         }
-        this.marqueeContainerEl.style.removeProperty('--marquee-item-size');
+        this.marqueeContainerEl.style.removeProperty("--marquee-item-size");
     }
 
     /**
@@ -112,7 +115,9 @@ export class AnnouncementScroll extends Interaction {
      */
     updateMarqueeLayout() {
         const marqueeItemElWidth = this.marqueeItemEl.offsetWidth;
-        const itemsPerContainer = Math.ceil(this.marqueeContainerEl.offsetWidth / marqueeItemElWidth);
+        const itemsPerContainer = Math.ceil(
+            this.marqueeContainerEl.offsetWidth / marqueeItemElWidth
+        );
         if (itemsPerContainer > 100) {
             return;
         }
@@ -126,13 +131,11 @@ export class AnnouncementScroll extends Interaction {
         const cloneCount = itemsPerContainer * 2 + 1;
         for (let i = 0; i < cloneCount; i++) {
             const cloneEl = this.marqueeItemEl.cloneNode(true);
-            cloneEl.classList.add('s_announcement_scroll_marquee_item_clone');
-            cloneEl.prepend(document.createTextNode('\u00A0')); // NBSP
+            cloneEl.classList.add("s_announcement_scroll_marquee_item_clone");
+            cloneEl.prepend(document.createTextNode("\u00A0")); // NBSP
             this.marqueeContainerEl.appendChild(cloneEl);
         }
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.announcement_scroll", AnnouncementScroll);
+registry.category("public.interactions").add("website.announcement_scroll", AnnouncementScroll);
diff --git a/addons/website/static/src/snippets/s_chart/chart.edit.js b/addons/website/static/src/snippets/s_chart/chart.edit.js
index 57ebdd8106838..a8b5d9e0e2190 100644
--- a/addons/website/static/src/snippets/s_chart/chart.edit.js
+++ b/addons/website/static/src/snippets/s_chart/chart.edit.js
@@ -1,22 +1,21 @@
 import { Chart } from "./chart";
 import { registry } from "@web/core/registry";
 
-const ChartEdit = I => class extends I {
-    setup() {
-        super.setup();
-        this.noAnimation = true;
-    }
+const ChartEdit = (I) =>
+    class extends I {
+        setup() {
+            super.setup();
+            this.noAnimation = true;
+        }
 
-    start() {
-        super.start();
-        this.websiteEditService = this.services.website_edit;
-        this.websiteEditService.callShared("builderOverlay", "refreshOverlays");
-    }
-};
+        start() {
+            super.start();
+            this.websiteEditService = this.services.website_edit;
+            this.websiteEditService.callShared("builderOverlay", "refreshOverlays");
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.chart", {
-        Interaction: Chart,
-        mixin: ChartEdit,
-    });
+registry.category("public.interactions.edit").add("website.chart", {
+    Interaction: Chart,
+    mixin: ChartEdit,
+});
diff --git a/addons/website/static/src/snippets/s_chart/chart.js b/addons/website/static/src/snippets/s_chart/chart.js
index 5011a062a3086..35fbb25740a2d 100644
--- a/addons/website/static/src/snippets/s_chart/chart.js
+++ b/addons/website/static/src/snippets/s_chart/chart.js
@@ -19,7 +19,7 @@ export class Chart extends Interaction {
 
     start() {
         const data = JSON.parse(this.el.dataset.data);
-        data.datasets.forEach(el => {
+        data.datasets.forEach((el) => {
             el.backgroundColor = this.convertToCSS(el.backgroundColor);
             el.borderColor = this.convertToCSS(el.borderColor);
             el.borderWidth = this.el.dataset.borderWidth;
@@ -105,7 +105,7 @@ export class Chart extends Interaction {
         this.chart = new window.Chart(canvasEl, chartData);
         this.registerCleanup(() => {
             this.chart.destroy();
-            this.el.querySelectorAll(".chartjs-size-monitor").forEach(el => el.remove());
+            this.el.querySelectorAll(".chartjs-size-monitor").forEach((el) => el.remove());
         });
     }
 
@@ -114,7 +114,7 @@ export class Chart extends Interaction {
      */
     convertToCSS(paramColor) {
         return Array.isArray(paramColor)
-            ? paramColor.map(color => this.convertToCSSColor(color))
+            ? paramColor.map((color) => this.convertToCSSColor(color))
             : this.convertToCSSColor(paramColor);
     }
 
@@ -126,6 +126,4 @@ export class Chart extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.chart", Chart);
+registry.category("public.interactions").add("website.chart", Chart);
diff --git a/addons/website/static/src/snippets/s_countdown/countdown.edit.js b/addons/website/static/src/snippets/s_countdown/countdown.edit.js
index a5eb2e3876d1c..f170a9280d0c5 100644
--- a/addons/website/static/src/snippets/s_countdown/countdown.edit.js
+++ b/addons/website/static/src/snippets/s_countdown/countdown.edit.js
@@ -1,21 +1,20 @@
 import { Countdown } from "./countdown";
 import { registry } from "@web/core/registry";
 
-const CountdownEdit = (I) => class extends I {
-    setup() {
-        super.setup();
-        this.websiteEditService = this.services.website_edit;
-        this.websiteEditService.callShared("builderOverlay", "refreshOverlays");
-    }
-    get shouldHideCountdown() {
-        return false;
-    }
-    handleEndCountdownAction() { }
-};
+const CountdownEdit = (I) =>
+    class extends I {
+        setup() {
+            super.setup();
+            this.websiteEditService = this.services.website_edit;
+            this.websiteEditService.callShared("builderOverlay", "refreshOverlays");
+        }
+        get shouldHideCountdown() {
+            return false;
+        }
+        handleEndCountdownAction() {}
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.countdown", {
-        Interaction: Countdown,
-        mixin: CountdownEdit,
-    });
+registry.category("public.interactions.edit").add("website.countdown", {
+    Interaction: Countdown,
+    mixin: CountdownEdit,
+});
diff --git a/addons/website/static/src/snippets/s_countdown/countdown.js b/addons/website/static/src/snippets/s_countdown/countdown.js
index 66fe6af8c1ec1..5f605911b073f 100644
--- a/addons/website/static/src/snippets/s_countdown/countdown.js
+++ b/addons/website/static/src/snippets/s_countdown/countdown.js
@@ -19,7 +19,7 @@ export class Countdown extends Interaction {
 
     setup() {
         // Remove SVG previews (used to simulated canvas)
-        this.el.querySelectorAll("svg").forEach(el => el.parentNode.remove());
+        this.el.querySelectorAll("svg").forEach((el) => el.parentNode.remove());
 
         this.wrapperEl = this.el.querySelector(".s_countdown_canvas_wrapper");
         this.hereBeforeTimerEnds = false;
@@ -89,25 +89,31 @@ export class Countdown extends Interaction {
         if (this.endAction === "redirect") {
             const redirectUrl = verifyHttpsUrl(this.el.dataset.redirectUrl) || "/";
             if (this.hereBeforeTimerEnds) {
-                this.waitForTimeout(() => window.location = redirectUrl, 500);
+                this.waitForTimeout(() => (window.location = redirectUrl), 500);
             } else {
                 if (!this.el.querySelector(".s_countdown_end_redirect_message")) {
                     const container = this.el.querySelector(
                         ":scope > .container, :scope > .container-fluid, :scope > .o_container_small"
                     );
-                    this.renderAt("website.s_countdown.end_redirect_message", {
-                        redirectUrl: redirectUrl,
-                    }, container);
+                    this.renderAt(
+                        "website.s_countdown.end_redirect_message",
+                        {
+                            redirectUrl: redirectUrl,
+                        },
+                        container
+                    );
                 }
             }
         } else if (this.endAction === "message" || this.endAction === "message_no_countdown") {
             this.el.querySelector(".s_countdown_end_message")?.classList.remove("d-none");
         }
-        this.registerCleanup(() => this.el.querySelector(".s_countdown_end_message")?.classList.add("d-none"));
+        this.registerCleanup(() =>
+            this.el.querySelector(".s_countdown_end_message")?.classList.add("d-none")
+        );
     }
 
     getDelta() {
-        return this.endTime - (Date.now() / 1000);
+        return this.endTime - Date.now() / 1000;
     }
 
     createCanvasWrapper() {
@@ -224,7 +230,7 @@ export class Countdown extends Interaction {
             }
             this.textWrapperEl.classList.toggle("d-none", this.shouldHideCountdown);
 
-            const countdownText = this.timeDiff.map(e => e.nb + " " + e.label).join(", ");
+            const countdownText = this.timeDiff.map((e) => e.nb + " " + e.label).join(", ");
             this.el.querySelector(".s_countdown_text").innerText = countdownText.toLowerCase();
         } else {
             for (const val of this.timeDiff) {
@@ -286,7 +292,11 @@ export class Countdown extends Interaction {
         ctx.font = `${unitSize}px Arial`;
         ctx.fillText(textUnit, canvas.width / 2, canvas.height / 2 + nbSize / 1.5, this.width);
 
-        if (this.layout === "boxes" && this.layoutBackground !== "none" && this.progressBarStyle === "none") {
+        if (
+            this.layout === "boxes" &&
+            this.layoutBackground !== "none" &&
+            this.progressBarStyle === "none"
+        ) {
             let barWidth = this.size / (this.progressBarWeight === "thin" ? 31 : 10);
             if (full) {
                 barWidth = 0;
@@ -345,22 +355,50 @@ export class Countdown extends Interaction {
         ctx.lineWidth = useThinLine ? this.size / 35 : this.size / 10;
         if (this.layout === "circle") {
             ctx.beginPath();
-            ctx.arc(this.size / 2, this.size / 2, this.size / 2 - this.size / 20, Math.PI / -2, (Math.PI * 2) * (nbUnit / totalUnit) + (Math.PI / -2));
+            ctx.arc(
+                this.size / 2,
+                this.size / 2,
+                this.size / 2 - this.size / 20,
+                Math.PI / -2,
+                Math.PI * 2 * (nbUnit / totalUnit) + Math.PI / -2
+            );
             ctx.stroke();
         } else if (this.layout === "boxes") {
             ctx.lineWidth *= 2;
-            let pc = nbUnit / totalUnit * 100;
+            let pc = (nbUnit / totalUnit) * 100;
 
             // Lines: Top(x1,y1,x2,y2) Right(x1,y1,x2,y2) Bottom(x1,y1,x2,y2) Left(x1,y1,x2,y2)
             const linesCoordFuncs = [
-                (linePc) => [0 + ctx.lineWidth / 2, 0, (this.width - ctx.lineWidth / 2) * linePc / 25 + ctx.lineWidth / 2, 0],
-                (linePc) => [this.width, 0 + ctx.lineWidth / 2, this.width, (this.size - ctx.lineWidth / 2) * linePc / 25 + ctx.lineWidth / 2],
-                (linePc) => [this.width - ((this.width - ctx.lineWidth / 2) * linePc / 25) - ctx.lineWidth / 2, this.size, this.width - ctx.lineWidth / 2, this.size],
-                (linePc) => [0, this.size - ((this.size - ctx.lineWidth / 2) * linePc / 25) - ctx.lineWidth / 2, 0, this.size - ctx.lineWidth / 2],
+                (linePc) => [
+                    0 + ctx.lineWidth / 2,
+                    0,
+                    ((this.width - ctx.lineWidth / 2) * linePc) / 25 + ctx.lineWidth / 2,
+                    0,
+                ],
+                (linePc) => [
+                    this.width,
+                    0 + ctx.lineWidth / 2,
+                    this.width,
+                    ((this.size - ctx.lineWidth / 2) * linePc) / 25 + ctx.lineWidth / 2,
+                ],
+                (linePc) => [
+                    this.width -
+                        ((this.width - ctx.lineWidth / 2) * linePc) / 25 -
+                        ctx.lineWidth / 2,
+                    this.size,
+                    this.width - ctx.lineWidth / 2,
+                    this.size,
+                ],
+                (linePc) => [
+                    0,
+                    this.size - ((this.size - ctx.lineWidth / 2) * linePc) / 25 - ctx.lineWidth / 2,
+                    0,
+                    this.size - ctx.lineWidth / 2,
+                ],
             ];
             while (pc > 0 && linesCoordFuncs.length) {
                 const linePc = Math.min(pc, 25);
-                const lineCoord = (linesCoordFuncs.shift())(linePc);
+                const lineCoord = linesCoordFuncs.shift()(linePc);
                 ctx.beginPath();
                 ctx.moveTo(lineCoord[0], lineCoord[1]);
                 ctx.lineTo(lineCoord[2], lineCoord[3]);
@@ -404,6 +442,4 @@ export class Countdown extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.countdown", Countdown);
+registry.category("public.interactions").add("website.countdown", Countdown);
diff --git a/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.edit.js b/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.edit.js
index 2eeefb4275e25..66c9444c82dc7 100644
--- a/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.edit.js
+++ b/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.edit.js
@@ -1,17 +1,16 @@
 import { DynamicSnippet } from "./dynamic_snippet";
 import { registry } from "@web/core/registry";
 
-const DynamicSnippetEdit = I => class extends I {
-    setup() {
-        super.setup();
-        this.withSample = true;
-    }
-    callToAction() { }
-};
+const DynamicSnippetEdit = (I) =>
+    class extends I {
+        setup() {
+            super.setup();
+            this.withSample = true;
+        }
+        callToAction() {}
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.dynamic_snippet", {
-        Interaction: DynamicSnippet,
-        mixin: DynamicSnippetEdit,
-    });
+registry.category("public.interactions.edit").add("website.dynamic_snippet", {
+    Interaction: DynamicSnippet,
+    mixin: DynamicSnippetEdit,
+});
diff --git a/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.js b/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.js
index ba5160a064114..62d93762b8182 100644
--- a/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.js
+++ b/addons/website/static/src/snippets/s_dynamic_snippet/dynamic_snippet.js
@@ -86,8 +86,8 @@ export class DynamicSnippet extends Interaction {
     getRpcParameters() {
         return this.isSingleMode
             ? {
-                res_model: this.el.dataset.snippetModel,
-                res_id: parseInt(this.el.dataset.snippetResId),
+                  res_model: this.el.dataset.snippetModel,
+                  res_id: parseInt(this.el.dataset.snippetResId),
               }
             : {};
     }
@@ -95,19 +95,22 @@ export class DynamicSnippet extends Interaction {
     async fetchData() {
         if (this.isConfigComplete()) {
             const nodeData = this.el.dataset;
-            const filterFragments = await this.waitFor(rpc(
-                "/website/snippet/filters",
-                Object.assign({
-                    "filter_id": parseInt(nodeData.filterId),
-                    "template_key": nodeData.templateKey,
-                    "limit": parseInt(nodeData.numberOfRecords),
-                    "search_domain": this.getSearchDomain(),
-                    "with_sample": this.withSample,
-                },
-                    this.getRpcParameters(),
-                    JSON.parse(this.el.dataset?.customTemplateData || "{}")
+            const filterFragments = await this.waitFor(
+                rpc(
+                    "/website/snippet/filters",
+                    Object.assign(
+                        {
+                            filter_id: parseInt(nodeData.filterId),
+                            template_key: nodeData.templateKey,
+                            limit: parseInt(nodeData.numberOfRecords),
+                            search_domain: this.getSearchDomain(),
+                            with_sample: this.withSample,
+                        },
+                        this.getRpcParameters(),
+                        JSON.parse(this.el.dataset?.customTemplateData || "{}")
+                    )
                 )
-            ));
+            );
             this.data = filterFragments.map(markup);
         } else {
             this.data = [];
@@ -119,10 +122,7 @@ export class DynamicSnippet extends Interaction {
      * Prepare the content before rendering.
      */
     prepareContent() {
-        this.renderedContentNode = renderToFragment(
-            this.templateKey,
-            this.getQWebRenderOptions()
-        );
+        this.renderedContentNode = renderToFragment(this.templateKey, this.getQWebRenderOptions());
     }
 
     /**
@@ -134,7 +134,8 @@ export class DynamicSnippet extends Interaction {
         const numberOfRecords = parseInt(dataset.numberOfRecords);
         let numberOfElements;
         if (uiUtils.isSmall()) {
-            numberOfElements = parseInt(dataset.numberOfElementsSmallDevices) || DEFAULT_NUMBER_OF_ELEMENTS_SM;
+            numberOfElements =
+                parseInt(dataset.numberOfElementsSmallDevices) || DEFAULT_NUMBER_OF_ELEMENTS_SM;
         } else {
             numberOfElements = parseInt(dataset.numberOfElements) || DEFAULT_NUMBER_OF_ELEMENTS;
         }
@@ -177,7 +178,7 @@ export class DynamicSnippet extends Interaction {
         // extension, because: why not?
         // (TODO review + See interaction with "slider" public widget).
         this.waitForTimeout(() => {
-            templateAreaEl.querySelectorAll(".carousel").forEach(carouselEl => {
+            templateAreaEl.querySelectorAll(".carousel").forEach((carouselEl) => {
                 if (carouselEl.dataset.bsInterval === "0") {
                     delete carouselEl.dataset.bsRide;
                     delete carouselEl.dataset.bsInterval;
@@ -196,6 +197,4 @@ export class DynamicSnippet extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.dynamic_snippet", DynamicSnippet);
+registry.category("public.interactions").add("website.dynamic_snippet", DynamicSnippet);
diff --git a/addons/website/static/src/snippets/s_dynamic_snippet_carousel/dynamic_snippet_carousel.js b/addons/website/static/src/snippets/s_dynamic_snippet_carousel/dynamic_snippet_carousel.js
index e7ddd76d21e5c..ad5dee25ec17d 100644
--- a/addons/website/static/src/snippets/s_dynamic_snippet_carousel/dynamic_snippet_carousel.js
+++ b/addons/website/static/src/snippets/s_dynamic_snippet_carousel/dynamic_snippet_carousel.js
@@ -12,16 +12,13 @@ export class DynamicSnippetCarousel extends DynamicSnippet {
     }
 
     getQWebRenderOptions() {
-        const scrollMode = this.el.classList.contains('o_carousel_multi_items') ? 'single' : 'all';
-        return Object.assign(
-            super.getQWebRenderOptions(...arguments),
-            {
-                interval: parseInt(this.el.dataset.carouselInterval),
-                rowPerSlide: parseInt(uiUtils.isSmall() ? 1 : this.el.dataset.rowPerSlide || 1),
-                arrowPosition: this.el.dataset.arrowPosition || "",
-                scrollMode: scrollMode,
-            },
-        );
+        const scrollMode = this.el.classList.contains("o_carousel_multi_items") ? "single" : "all";
+        return Object.assign(super.getQWebRenderOptions(...arguments), {
+            interval: parseInt(this.el.dataset.carouselInterval),
+            rowPerSlide: parseInt(uiUtils.isSmall() ? 1 : this.el.dataset.rowPerSlide || 1),
+            arrowPosition: this.el.dataset.arrowPosition || "",
+            scrollMode: scrollMode,
+        });
     }
 }
 
diff --git a/addons/website/static/src/snippets/s_embed_code/embed_code.edit.js b/addons/website/static/src/snippets/s_embed_code/embed_code.edit.js
index f13b8a530910b..9a61be2676526 100644
--- a/addons/website/static/src/snippets/s_embed_code/embed_code.edit.js
+++ b/addons/website/static/src/snippets/s_embed_code/embed_code.edit.js
@@ -3,23 +3,30 @@ import { registry } from "@web/core/registry";
 
 import { _t } from "@web/core/l10n/translation";
 
-const EmbedCodeEdit = I => class extends I {
-    start() {
-        if (this.embedCodeEl.offsetHeight === 0) {
-            // Shows a placeholder message in edit mode to be able to select
-            // the snippet if it's visually empty.
-            const placeholderEl = document.createElement("div");
-            placeholderEl.classList.add("s_embed_code_placeholder", "alert", "alert-info", "pt16", "pb16");
-            placeholderEl.textContent = _t("Your Embed Code snippet doesn't have anything to display. Click on Edit to modify it.");
-            this.embedCodeEl.appendChild(placeholderEl);
+const EmbedCodeEdit = (I) =>
+    class extends I {
+        start() {
+            if (this.embedCodeEl.offsetHeight === 0) {
+                // Shows a placeholder message in edit mode to be able to select
+                // the snippet if it's visually empty.
+                const placeholderEl = document.createElement("div");
+                placeholderEl.classList.add(
+                    "s_embed_code_placeholder",
+                    "alert",
+                    "alert-info",
+                    "pt16",
+                    "pb16"
+                );
+                placeholderEl.textContent = _t(
+                    "Your Embed Code snippet doesn't have anything to display. Click on Edit to modify it."
+                );
+                this.embedCodeEl.appendChild(placeholderEl);
+            }
         }
-    }
-    destroy() { }
-};
+        destroy() {}
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.embed_code", {
-        Interaction: EmbedCode,
-        mixin: EmbedCodeEdit,
-    });
+registry.category("public.interactions.edit").add("website.embed_code", {
+    Interaction: EmbedCode,
+    mixin: EmbedCodeEdit,
+});
diff --git a/addons/website/static/src/snippets/s_embed_code/embed_code.js b/addons/website/static/src/snippets/s_embed_code/embed_code.js
index ca782fd2db306..ece29bb47c4a1 100644
--- a/addons/website/static/src/snippets/s_embed_code/embed_code.js
+++ b/addons/website/static/src/snippets/s_embed_code/embed_code.js
@@ -20,6 +20,4 @@ export class EmbedCode extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.embed_code", EmbedCode);
+registry.category("public.interactions").add("website.embed_code", EmbedCode);
diff --git a/addons/website/static/src/snippets/s_facebook_page/facebook_page.edit.js b/addons/website/static/src/snippets/s_facebook_page/facebook_page.edit.js
index e1c671f724c38..7ad5d0b0525a2 100644
--- a/addons/website/static/src/snippets/s_facebook_page/facebook_page.edit.js
+++ b/addons/website/static/src/snippets/s_facebook_page/facebook_page.edit.js
@@ -1,17 +1,16 @@
 import { FacebookPage } from "./facebook_page";
 import { registry } from "@web/core/registry";
 
-const FacebookPageEdit = I => class extends I {
-    dynamicContent = {
-        "iframe": {
-            "t-att-style": () => ({ "pointer-events": "none" }),
-        },
+const FacebookPageEdit = (I) =>
+    class extends I {
+        dynamicContent = {
+            iframe: {
+                "t-att-style": () => ({ "pointer-events": "none" }),
+            },
+        };
     };
-};
 
-registry
-    .category("public.interactions.edit")
-    .add("website.facebook_page", {
-        Interaction: FacebookPage,
-        mixin: FacebookPageEdit,
-    });
+registry.category("public.interactions.edit").add("website.facebook_page", {
+    Interaction: FacebookPage,
+    mixin: FacebookPageEdit,
+});
diff --git a/addons/website/static/src/snippets/s_facebook_page/facebook_page.js b/addons/website/static/src/snippets/s_facebook_page/facebook_page.js
index 50af9d1f7285e..7ce847a5b4afc 100644
--- a/addons/website/static/src/snippets/s_facebook_page/facebook_page.js
+++ b/addons/website/static/src/snippets/s_facebook_page/facebook_page.js
@@ -10,7 +10,15 @@ export class FacebookPage extends Interaction {
 
     setup() {
         this.previousWidth = 0;
-        const params = pick(this.el.dataset, "href", "id", "height", "tabs", "small_header", "hide_cover");
+        const params = pick(
+            this.el.dataset,
+            "href",
+            "id",
+            "height",
+            "tabs",
+            "small_header",
+            "hide_cover"
+        );
         if (!params.href) {
             return;
         }
@@ -21,16 +29,20 @@ export class FacebookPage extends Interaction {
 
         this.renderIframe(params);
 
-        this.resizeObserver = new ResizeObserver(this.debounced(this.renderIframe.bind(this, params), 100));
+        this.resizeObserver = new ResizeObserver(
+            this.debounced(this.renderIframe.bind(this, params), 100)
+        );
         this.resizeObserver.observe(this.el.parentElement);
-        this.registerCleanup(() => { this.resizeObserver.disconnect() });
+        this.registerCleanup(() => {
+            this.resizeObserver.disconnect();
+        });
     }
 
     /**
      * Prepare iframe element & replace it with existing iframe.
      *
      * @param {Object} params
-    */
+     */
     renderIframe(params) {
         params.width = clamp(Math.floor(this.el.getBoundingClientRect().width), 180, 500);
         if (this.previousWidth !== params.width) {
@@ -44,7 +56,9 @@ export class FacebookPage extends Interaction {
             iframeEl.width = params.width;
 
             this.el.replaceChildren(iframeEl);
-            this.registerCleanup(() => { iframeEl.remove(); });
+            this.registerCleanup(() => {
+                iframeEl.remove();
+            });
 
             const src = "https://www.facebook.com/plugins/page.php?" + searchParams;
             this.services.website_cookies.manageIframeSrc(iframeEl, src);
@@ -52,7 +66,4 @@ export class FacebookPage extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.facebook_page", FacebookPage);
-
+registry.category("public.interactions").add("website.facebook_page", FacebookPage);
diff --git a/addons/website/static/src/snippets/s_faq_horizontal/faq_horizontal.js b/addons/website/static/src/snippets/s_faq_horizontal/faq_horizontal.js
index 6a2f5747e315e..8cdfdee7786b8 100644
--- a/addons/website/static/src/snippets/s_faq_horizontal/faq_horizontal.js
+++ b/addons/website/static/src/snippets/s_faq_horizontal/faq_horizontal.js
@@ -6,8 +6,8 @@ export class FaqHorizontal extends Interaction {
     dynamicContent = {
         ".s_faq_horizontal_entry_title": {
             "t-att-style": () => ({
-                "top": `${this.offset}px`,
-                "maxHeight": `calc(100vh - ${this.offset + 40}px)`,
+                top: `${this.offset}px`,
+                maxHeight: `calc(100vh - ${this.offset + 40}px)`,
             }),
         },
     };
@@ -18,7 +18,9 @@ export class FaqHorizontal extends Interaction {
 
     start() {
         this.updateTitlesPosition();
-        this.registerCleanup(this.services.website_menus.registerCallback(this.updateTitlesPosition.bind(this)));
+        this.registerCleanup(
+            this.services.website_menus.registerCallback(this.updateTitlesPosition.bind(this))
+        );
     }
 
     updateTitlesPosition() {
@@ -31,12 +33,8 @@ export class FaqHorizontal extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.faq_horizontal", FaqHorizontal);
+registry.category("public.interactions").add("website.faq_horizontal", FaqHorizontal);
 
-registry
-    .category("public.interactions.edit")
-    .add("website.faq_horizontal", {
-        Interaction: FaqHorizontal,
-    });
+registry.category("public.interactions.edit").add("website.faq_horizontal", {
+    Interaction: FaqHorizontal,
+});
diff --git a/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.edit.js b/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.edit.js
index e9deb5456a5c2..bf4690e6ba2a7 100644
--- a/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.edit.js
+++ b/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.edit.js
@@ -10,7 +10,10 @@ const FloatingBlocksEdit = (I) =>
             },
         };
         isImpactedBy(el) {
-            return this.el.contains(el) && el.matches(".s_floating_blocks_block, .s_floating_blocks_wrapper");
+            return (
+                this.el.contains(el) &&
+                el.matches(".s_floating_blocks_block, .s_floating_blocks_wrapper")
+            );
         }
         shouldStop() {
             // The interaction is restarted every time that the content of
diff --git a/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.js b/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.js
index c8a2e3a502f6b..c09a0521097fb 100644
--- a/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.js
+++ b/addons/website/static/src/snippets/s_floating_blocks/floating_blocks.js
@@ -12,10 +12,10 @@ export class FloatingBlocks extends Interaction {
             "t-on-scroll": this.throttled(this.onScroll),
         },
         ".s_floating_blocks_block": {
-            "t-att-style": blockEl => ({
-                "opacity": "1",
-                "top": this.boxesTops.get(blockEl),
-                "transform": this.boxesTransforms.get(blockEl),
+            "t-att-style": (blockEl) => ({
+                opacity: "1",
+                top: this.boxesTops.get(blockEl),
+                transform: this.boxesTransforms.get(blockEl),
             }),
             "t-on-keydown": this.onKeydown,
         },
@@ -40,7 +40,9 @@ export class FloatingBlocks extends Interaction {
 
     start() {
         this.adaptToHeaderChange();
-        this.registerCleanup(this.services.website_menus.registerCallback(this.adaptToHeaderChange.bind(this)));
+        this.registerCleanup(
+            this.services.website_menus.registerCallback(this.adaptToHeaderChange.bind(this))
+        );
 
         if (this.boxesEls.length >= 2) {
             // The last block does not need to be animated
@@ -49,7 +51,7 @@ export class FloatingBlocks extends Interaction {
             // Calculate the minimal scale based on number of animated cards.
             // Each card decreases the scale by `this.boxScaleStep`.
             this.minimalScale = Math.max(
-                this.maximalScale - (this.boxScaleStep * (this.boxesToAnimate.length - 1)),
+                this.maximalScale - this.boxScaleStep * (this.boxesToAnimate.length - 1),
                 0.7 // Safe-net to ensure we don't go below 0.7 for very large numbers of cards
             );
 
@@ -88,7 +90,7 @@ export class FloatingBlocks extends Interaction {
 
         // Assign proportional scale factors and pre-compute transforms
         for (let i = 0; i < boxesLength; i++) {
-            const scale = this.minimalScale + (scaleStep * i);
+            const scale = this.minimalScale + scaleStep * i;
             boxesScaleStep.push(scale);
 
             // Pre-compute the transform string for this scale
@@ -181,11 +183,16 @@ export class FloatingBlocks extends Interaction {
     onKeydown(ev) {
         const hotkey = getActiveHotkey(ev);
         if (hotkey === "shift+tab") {
-            this.addListener(ev.currentTarget, "focusout", this.onShiftTabFocusout.bind(this), { once: true });
+            this.addListener(ev.currentTarget, "focusout", this.onShiftTabFocusout.bind(this), {
+                once: true,
+            });
         }
     }
     onShiftTabFocusout(ev) {
-        if (!ev.relatedTarget || ev.relatedTarget.closest(".s_floating_blocks_block") === ev.currentTarget) {
+        if (
+            !ev.relatedTarget ||
+            ev.relatedTarget.closest(".s_floating_blocks_block") === ev.currentTarget
+        ) {
             return;
         }
         // Account for `.gap-5` on the container.
@@ -194,6 +201,4 @@ export class FloatingBlocks extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.floating_blocks", FloatingBlocks);
+registry.category("public.interactions").add("website.floating_blocks", FloatingBlocks);
diff --git a/addons/website/static/src/snippets/s_google_map/google_map.js b/addons/website/static/src/snippets/s_google_map/google_map.js
index fdc7b5655e525..57ba329d25abd 100644
--- a/addons/website/static/src/snippets/s_google_map/google_map.js
+++ b/addons/website/static/src/snippets/s_google_map/google_map.js
@@ -13,17 +13,26 @@ export class GoogleMap extends Interaction {
                 }
             },
         },
-    }
+    };
 
     mapColors = {
+        // prettier-ignore
         lightMonoMap: [{ "featureType": "administrative.locality", "elementType": "all", "stylers": [{ "hue": "#2c2e33" }, { "saturation": 7 }, { "lightness": 19 }, { "visibility": "on" }] }, { "featureType": "landscape", "elementType": "all", "stylers": [{ "hue": "#ffffff" }, { "saturation": -100 }, { "lightness": 100 }, { "visibility": "simplified" }] }, { "featureType": "poi", "elementType": "all", "stylers": [{ "hue": "#ffffff" }, { "saturation": -100 }, { "lightness": 100 }, { "visibility": "off" }] }, { "featureType": "road", "elementType": "geometry", "stylers": [{ "hue": "#bbc0c4" }, { "saturation": -93 }, { "lightness": 31 }, { "visibility": "simplified" }] }, { "featureType": "road", "elementType": "labels", "stylers": [{ "hue": "#bbc0c4" }, { "saturation": -93 }, { "lightness": 31 }, { "visibility": "on" }] }, { "featureType": "road.arterial", "elementType": "labels", "stylers": [{ "hue": "#bbc0c4" }, { "saturation": -93 }, { "lightness": -2 }, { "visibility": "simplified" }] }, { "featureType": "road.local", "elementType": "geometry", "stylers": [{ "hue": "#e9ebed" }, { "saturation": -90 }, { "lightness": -8 }, { "visibility": "simplified" }] }, { "featureType": "transit", "elementType": "all", "stylers": [{ "hue": "#e9ebed" }, { "saturation": 10 }, { "lightness": 69 }, { "visibility": "on" }] }, { "featureType": "water", "elementType": "all", "stylers": [{ "hue": "#e9ebed" }, { "saturation": -78 }, { "lightness": 67 }, { "visibility": "simplified" }] }],
+        // prettier-ignore
         lillaMap: [{ elementType: "labels", stylers: [{ saturation: -20 }] }, { featureType: "poi", elementType: "labels", stylers: [{ visibility: "off" }] }, { featureType: 'road.highway', elementType: 'labels', stylers: [{ visibility: "off" }] }, { featureType: "road.local", elementType: "labels.icon", stylers: [{ visibility: "off" }] }, { featureType: "road.arterial", elementType: "labels.icon", stylers: [{ visibility: "off" }] }, { featureType: "road", elementType: "geometry.stroke", stylers: [{ visibility: "off" }] }, { featureType: "transit", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "poi", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "poi.government", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "poi.sport_complex", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "poi.attraction", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "poi.business", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "transit", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "transit.station", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "landscape", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "road", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "road.highway", elementType: "geometry.fill", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }, { featureType: "water", elementType: "geometry", stylers: [{ hue: '#2d313f' }, { visibility: "on" }, { lightness: 5 }, { saturation: -20 }] }],
+        // prettier-ignore
         blueMap: [{ stylers: [{ hue: "#00ffe6" }, { saturation: -20 }] }, { featureType: "road", elementType: "geometry", stylers: [{ lightness: 100 }, { visibility: "simplified" }] }, { featureType: "road", elementType: "labels", stylers: [{ visibility: "off" }] }],
+        // prettier-ignore
         retroMap: [{ "featureType": "administrative", "elementType": "all", "stylers": [{ "visibility": "on" }, { "lightness": 33 }] }, { "featureType": "landscape", "elementType": "all", "stylers": [{ "color": "#f2e5d4" }] }, { "featureType": "poi.park", "elementType": "geometry", "stylers": [{ "color": "#c5dac6" }] }, { "featureType": "poi.park", "elementType": "labels", "stylers": [{ "visibility": "on" }, { "lightness": 20 }] }, { "featureType": "road", "elementType": "all", "stylers": [{ "lightness": 20 }] }, { "featureType": "road.highway", "elementType": "geometry", "stylers": [{ "color": "#c5c6c6" }] }, { "featureType": "road.arterial", "elementType": "geometry", "stylers": [{ "color": "#e4d7c6" }] }, { "featureType": "road.local", "elementType": "geometry", "stylers": [{ "color": "#fbfaf7" }] }, { "featureType": "water", "elementType": "all", "stylers": [{ "visibility": "on" }, { "color": "#acbcc9" }] }],
+        // prettier-ignore
         flatMap: [{ "stylers": [{ "visibility": "off" }] }, { "featureType": "road", "stylers": [{ "visibility": "on" }, { "color": "#ffffff" }] }, { "featureType": "road.arterial", "stylers": [{ "visibility": "on" }, { "color": "#fee379" }] }, { "featureType": "road.highway", "stylers": [{ "visibility": "on" }, { "color": "#fee379" }] }, { "featureType": "landscape", "stylers": [{ "visibility": "on" }, { "color": "#f3f4f4" }] }, { "featureType": "water", "stylers": [{ "visibility": "on" }, { "color": "#7fc8ed" }] }, {}, { "featureType": "road", "elementType": "labels", "stylers": [{ "visibility": "on" }] }, { "featureType": "poi.park", "elementType": "geometry.fill", "stylers": [{ "visibility": "on" }, { "color": "#83cead" }] }, { "elementType": "labels", "stylers": [{ "visibility": "on" }] }, { "featureType": "landscape.man_made", "elementType": "geometry", "stylers": [{ "weight": 0.9 }, { "visibility": "off" }] }],
+        // prettier-ignore
         cobaltMap: [{ "featureType": "all", "elementType": "all", "stylers": [{ "invert_lightness": true }, { "saturation": 10 }, { "lightness": 30 }, { "gamma": 0.5 }, { "hue": "#435158" }] }],
+        // prettier-ignore
         cupertinoMap: [{ "featureType": "water", "elementType": "geometry", "stylers": [{ "color": "#a2daf2" }] }, { "featureType": "landscape.man_made", "elementType": "geometry", "stylers": [{ "color": "#f7f1df" }] }, { "featureType": "landscape.natural", "elementType": "geometry", "stylers": [{ "color": "#d0e3b4" }] }, { "featureType": "landscape.natural.terrain", "elementType": "geometry", "stylers": [{ "visibility": "off" }] }, { "featureType": "poi.park", "elementType": "geometry", "stylers": [{ "color": "#bde6ab" }] }, { "featureType": "poi", "elementType": "labels", "stylers": [{ "visibility": "off" }] }, { "featureType": "poi.medical", "elementType": "geometry", "stylers": [{ "color": "#fbd3da" }] }, { "featureType": "poi.business", "stylers": [{ "visibility": "off" }] }, { "featureType": "road", "elementType": "geometry.stroke", "stylers": [{ "visibility": "off" }] }, { "featureType": "road", "elementType": "labels", "stylers": [{ "visibility": "off" }] }, { "featureType": "road.highway", "elementType": "geometry.fill", "stylers": [{ "color": "#ffe15f" }] }, { "featureType": "road.highway", "elementType": "geometry.stroke", "stylers": [{ "color": "#efd151" }] }, { "featureType": "road.arterial", "elementType": "geometry.fill", "stylers": [{ "color": "#ffffff" }] }, { "featureType": "road.local", "elementType": "geometry.fill", "stylers": [{ "color": "black" }] }, { "featureType": "transit.station.airport", "elementType": "geometry.fill", "stylers": [{ "color": "#cfb2db" }] }],
+        // prettier-ignore
         carMap: [{ "featureType": "administrative", "stylers": [{ "visibility": "off" }] }, { "featureType": "poi", "stylers": [{ "visibility": "simplified" }] }, { "featureType": "road", "stylers": [{ "visibility": "simplified" }] }, { "featureType": "water", "stylers": [{ "visibility": "simplified" }] }, { "featureType": "transit", "stylers": [{ "visibility": "simplified" }] }, { "featureType": "landscape", "stylers": [{ "visibility": "simplified" }] }, { "featureType": "road.highway", "stylers": [{ "visibility": "off" }] }, { "featureType": "road.local", "stylers": [{ "visibility": "on" }] }, { "featureType": "road.highway", "elementType": "geometry", "stylers": [{ "visibility": "on" }] }, { "featureType": "water", "stylers": [{ "color": "#84afa3" }, { "lightness": 52 }] }, { "stylers": [{ "saturation": -77 }] }, { "featureType": "road" }],
+        // prettier-ignore
         bwMap: [{ stylers: [{ hue: "#00ffe6" }, { saturation: -100 }] }, { featureType: "road", elementType: "geometry", stylers: [{ lightness: 100 }, { visibility: "simplified" }] }, { featureType: "road", elementType: "labels", stylers: [{ visibility: "off" }] }],
     };
 
@@ -35,7 +44,7 @@ export class GoogleMap extends Interaction {
     }
 
     async willStart() {
-        if (typeof google !== 'object' || typeof google.maps !== 'object') {
+        if (typeof google !== "object" || typeof google.maps !== "object") {
             // @TODO mysterious-egg: this would not be needed if we didn't
             // duplicate the API loading:
             const refetch = window.top.refetchGoogleMaps;
@@ -65,16 +74,16 @@ export class GoogleMap extends Interaction {
             streetViewControl: false,
             scrollwheel: false,
             mapTypeControlOptions: {
-                mapTypeIds: [google.maps.MapTypeId.ROADMAP, 'map_style']
+                mapTypeIds: [google.maps.MapTypeId.ROADMAP, "map_style"],
             },
         };
 
         // Render Map
-        const mapC = this.el.querySelector('.map_container');
+        const mapC = this.el.querySelector(".map_container");
         const map = new google.maps.Map(mapC, myOptions);
 
         // Update GPS position
-        const p = this.el.dataset.mapGps.substring(1).slice(0, -1).split(',');
+        const p = this.el.dataset.mapGps.substring(1).slice(0, -1).split(",");
 
         this.gps = new google.maps.LatLng(p[0], p[1]);
         map.setCenter(this.gps);
@@ -83,10 +92,10 @@ export class GoogleMap extends Interaction {
         const markerOptions = {
             map: map,
             animation: google.maps.Animation.DROP,
-            position: new google.maps.LatLng(p[0], p[1])
+            position: new google.maps.LatLng(p[0], p[1]),
         };
-        if (this.el.dataset.pinStyle === 'flat') {
-            markerOptions.icon = '/website/static/src/img/snippets_thumbs/s_google_map_marker.png';
+        if (this.el.dataset.pinStyle === "flat") {
+            markerOptions.icon = "/website/static/src/img/snippets_thumbs/s_google_map_marker.png";
         }
         new google.maps.Marker(markerOptions);
 
@@ -97,13 +106,14 @@ export class GoogleMap extends Interaction {
         const mapColorAttr = this.el.dataset.mapColor;
         if (mapColorAttr) {
             const mapColor = this.mapColors[mapColorAttr];
-            map.mapTypes.set('map_style', new google.maps.StyledMapType(mapColor, { name: "Styled Map" }));
-            map.setMapTypeId('map_style');
+            map.mapTypes.set(
+                "map_style",
+                new google.maps.StyledMapType(mapColor, { name: "Styled Map" })
+            );
+            map.setMapTypeId("map_style");
         }
         this.map = map;
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.google_map", GoogleMap);
+registry.category("public.interactions").add("website.google_map", GoogleMap);
diff --git a/addons/website/static/src/snippets/s_image_gallery/gallery.js b/addons/website/static/src/snippets/s_image_gallery/gallery.js
index b61b3b4f7e45c..e3f902df99260 100644
--- a/addons/website/static/src/snippets/s_image_gallery/gallery.js
+++ b/addons/website/static/src/snippets/s_image_gallery/gallery.js
@@ -7,14 +7,16 @@ import { renderToElement } from "@web/core/utils/render";
 export class Gallery extends Interaction {
     static selector = ".s_image_gallery:not(.o_slideshow)";
     dynamicContent = {
-        "img": {
+        img: {
             "t-on-click": this.onClickImg,
         },
     };
 
     setup() {
         this.modalEl = null;
-        this.originalSources = [...this.el.querySelectorAll("img")].map(img => img.getAttribute("src"));
+        this.originalSources = [...this.el.querySelectorAll("img")].map((img) =>
+            img.getAttribute("src")
+        );
     }
 
     /**
@@ -75,11 +77,15 @@ export class Gallery extends Interaction {
             this.modalEl = undefined;
         });
 
-        this.modalEl.addEventListener("shown.bs.modal", () => {
-            const slideshowEl = this.modalEl.querySelector(".modal-body.o_slideshow");
-            this.services["public.interactions"].startInteractions(slideshowEl);
-            this.modalEl.addEventListener("keydown", this.onModalKeydownBound);
-        }, { once: true });
+        this.modalEl.addEventListener(
+            "shown.bs.modal",
+            () => {
+                const slideshowEl = this.modalEl.querySelector(".modal-body.o_slideshow");
+                this.services["public.interactions"].startInteractions(slideshowEl);
+                this.modalEl.addEventListener("keydown", this.onModalKeydownBound);
+            },
+            { once: true }
+        );
 
         this.insert(this.modalEl, document.body);
         const modalBS = new Modal(this.modalEl, { keyboard: true, backdrop: true });
@@ -101,6 +107,4 @@ export class Gallery extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.gallery", Gallery);
+registry.category("public.interactions").add("website.gallery", Gallery);
diff --git a/addons/website/static/src/snippets/s_image_gallery/gallery_slider.edit.js b/addons/website/static/src/snippets/s_image_gallery/gallery_slider.edit.js
index 1f6441bd35d85..06d929aecacd8 100644
--- a/addons/website/static/src/snippets/s_image_gallery/gallery_slider.edit.js
+++ b/addons/website/static/src/snippets/s_image_gallery/gallery_slider.edit.js
@@ -1,16 +1,15 @@
 import { GallerySlider } from "./gallery_slider";
 import { registry } from "@web/core/registry";
 
-const GallerySliderEdit = I => class extends I {
-    setup() {
-        super.setup();
-        this.hideOnClickIndicator = false;
-    }
-};
+const GallerySliderEdit = (I) =>
+    class extends I {
+        setup() {
+            super.setup();
+            this.hideOnClickIndicator = false;
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.gallery_slider", {
-        Interaction: GallerySlider,
-        mixin: GallerySliderEdit,
-    });
+registry.category("public.interactions.edit").add("website.gallery_slider", {
+    Interaction: GallerySlider,
+    mixin: GallerySliderEdit,
+});
diff --git a/addons/website/static/src/snippets/s_image_gallery/gallery_slider.js b/addons/website/static/src/snippets/s_image_gallery/gallery_slider.js
index 7bdbf553c758b..5edc10ef6637f 100644
--- a/addons/website/static/src/snippets/s_image_gallery/gallery_slider.js
+++ b/addons/website/static/src/snippets/s_image_gallery/gallery_slider.js
@@ -17,7 +17,9 @@ export class GallerySlider extends Interaction {
 
     setup() {
         this.hideOnClickIndicator = true;
-        this.carouselEl = this.el.classList.contains("carousel") ? this.el : this.el.querySelector(".carousel");
+        this.carouselEl = this.el.classList.contains("carousel")
+            ? this.el
+            : this.el.querySelector(".carousel");
         this.indicatorEl = this.carouselEl?.querySelector(".carousel-indicators");
         if (this.indicatorEl) {
             this.prevEl = this.indicatorEl.querySelector("li.o_indicators_left");
@@ -46,7 +48,13 @@ export class GallerySlider extends Interaction {
                     indicatorParentEl = indicatorParentEl.parentElement;
                 }
             }
-            this.nbPerPage = Math.floor(indicatorWidth / (this.liEls.length > 0 ? this.liEls[0].getBoundingClientRect().width : undefined)) - 3; // - navigator - 1 to leave some space
+            this.nbPerPage =
+                Math.floor(
+                    indicatorWidth /
+                        (this.liEls.length > 0
+                            ? this.liEls[0].getBoundingClientRect().width
+                            : undefined)
+                ) - 3; // - navigator - 1 to leave some space
             this.realNbPerPage = this.nbPerPage || 1;
             this.nbPages = Math.ceil(this.liEls.length / this.realNbPerPage);
         }
@@ -67,7 +75,9 @@ export class GallerySlider extends Interaction {
             return;
         }
         this.waitForTimeout(() => {
-            const itemEl = this.carouselEl.querySelector(".carousel-inner .carousel-item-prev, .carousel-inner .carousel-item-next");
+            const itemEl = this.carouselEl.querySelector(
+                ".carousel-inner .carousel-item-prev, .carousel-inner .carousel-item-next"
+            );
             if (!itemEl) {
                 return;
             }
@@ -75,7 +85,7 @@ export class GallerySlider extends Interaction {
             for (const liEl of this.liEls) {
                 liEl.classList.remove("active");
             }
-            const selectedLiEl = [...this.liEls].find(el => el.dataset.bsSlideTo === `${index}`);
+            const selectedLiEl = [...this.liEls].find((el) => el.dataset.bsSlideTo === `${index}`);
             selectedLiEl?.classList.add("active");
         }, 0);
     }
@@ -101,7 +111,10 @@ export class GallerySlider extends Interaction {
 
     hide() {
         for (let i = 0; i < this.liEls?.length; i++) {
-            this.liEls[i].classList.toggle("d-none", i < this.page * this.nbPerPage || i >= (this.page + 1) * this.nbPerPage);
+            this.liEls[i].classList.toggle(
+                "d-none",
+                i < this.page * this.nbPerPage || i >= (this.page + 1) * this.nbPerPage
+            );
         }
         if (this.prevEl) {
             if (this.page <= 0) {
@@ -116,7 +129,7 @@ export class GallerySlider extends Interaction {
                 this.nextEl.remove();
             } else {
                 this.nextEl.classList.remove("d-none");
-                this.insert(this.nextEl, this.indicatorEl, "beforeend")
+                this.insert(this.nextEl, this.indicatorEl, "beforeend");
             }
         }
     }
@@ -131,6 +144,4 @@ export class GallerySlider extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.gallery_slider", GallerySlider);
+registry.category("public.interactions").add("website.gallery_slider", GallerySlider);
diff --git a/addons/website/static/src/snippets/s_instagram_page/instagram_page.edit.js b/addons/website/static/src/snippets/s_instagram_page/instagram_page.edit.js
index 02e8985f47823..4c23963e4be7c 100644
--- a/addons/website/static/src/snippets/s_instagram_page/instagram_page.edit.js
+++ b/addons/website/static/src/snippets/s_instagram_page/instagram_page.edit.js
@@ -1,22 +1,21 @@
 import { registry } from "@web/core/registry";
 import { InstagramPage } from "./instagram_page";
 
-const InstagramPageEdit = I => class extends I {
-    setup () {
-        super.setup();
-        this.dynamicContent["iframe"] = {
-            "t-att-style": () => ({ "pointer-events": "none" }),
-        };
-    }
+const InstagramPageEdit = (I) =>
+    class extends I {
+        setup() {
+            super.setup();
+            this.dynamicContent["iframe"] = {
+                "t-att-style": () => ({ "pointer-events": "none" }),
+            };
+        }
 
-    getConfigurationSnapshot() {
-        return this.el.dataset.instagramPage;
-    }
-}
+        getConfigurationSnapshot() {
+            return this.el.dataset.instagramPage;
+        }
+    };
 
-registry
-    .category("public.interactions.edit")
-    .add("website.instagram_page", {
-        Interaction: InstagramPage,
-        mixin: InstagramPageEdit,
-    });
+registry.category("public.interactions.edit").add("website.instagram_page", {
+    Interaction: InstagramPage,
+    mixin: InstagramPageEdit,
+});
diff --git a/addons/website/static/src/snippets/s_instagram_page/instagram_page.js b/addons/website/static/src/snippets/s_instagram_page/instagram_page.js
index 6be2c3b03bed5..727b3700cf0c5 100644
--- a/addons/website/static/src/snippets/s_instagram_page/instagram_page.js
+++ b/addons/website/static/src/snippets/s_instagram_page/instagram_page.js
@@ -45,7 +45,10 @@ export class InstagramPage extends Interaction {
      * @param {Event} ev
      */
     onMessage(ev) {
-        if (ev.origin !== "https://www.instagram.com" || this.iframeEl.contentWindow !== ev.source) {
+        if (
+            ev.origin !== "https://www.instagram.com" ||
+            this.iframeEl.contentWindow !== ev.source
+        ) {
             return;
         }
         const evDataJSON = JSON.parse(ev.data);
@@ -61,6 +64,4 @@ export class InstagramPage extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.instagram_page", InstagramPage);
+registry.category("public.interactions").add("website.instagram_page", InstagramPage);
diff --git a/addons/website/static/src/snippets/s_map/map.js b/addons/website/static/src/snippets/s_map/map.js
index da8a2908d7021..875ac93e6df8d 100644
--- a/addons/website/static/src/snippets/s_map/map.js
+++ b/addons/website/static/src/snippets/s_map/map.js
@@ -21,6 +21,4 @@ export class Map extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.map", Map);
+registry.category("public.interactions").add("website.map", Map);
diff --git a/addons/website/static/src/snippets/s_searchbar/search_bar.js b/addons/website/static/src/snippets/s_searchbar/search_bar.js
index 9523fca2f89b3..34627d60e17cc 100644
--- a/addons/website/static/src/snippets/s_searchbar/search_bar.js
+++ b/addons/website/static/src/snippets/s_searchbar/search_bar.js
@@ -11,10 +11,10 @@ export class SearchBar extends Interaction {
     dynamicContent = {
         _root: {
             "t-on-focusout": this.debounced(this.onFocusOut, 100),
-            "t-on-safarihack": (ev) => this.linkHasFocus = ev.detail.linkHasFocus,
+            "t-on-safarihack": (ev) => (this.linkHasFocus = ev.detail.linkHasFocus),
             "t-att-class": () => ({
-                "dropdown": this.hasDropdown,
-                "show": this.hasDropdown,
+                dropdown: this.hasDropdown,
+                show: this.hasDropdown,
             }),
         },
         ".search-query": {
@@ -41,24 +41,26 @@ export class SearchBar extends Interaction {
         }
         const dataset = this.inputEl.dataset;
         this.options = {
-            "displayImage": dataset.displayImage,
-            "displayDescription": dataset.displayDescription,
-            "displayExtraLink": dataset.displayExtraLink,
-            "displayDetail": dataset.displayDetail,
+            displayImage: dataset.displayImage,
+            displayDescription: dataset.displayDescription,
+            displayExtraLink: dataset.displayExtraLink,
+            displayDetail: dataset.displayDetail,
             // Make it easy for customization to disable fuzzy matching on specific searchboxes
-            "allowFuzzy": !dataset.noFuzzy,
+            allowFuzzy: !dataset.noFuzzy,
         };
         for (const fieldEl of form.querySelectorAll("input[type='hidden']")) {
             this.options[fieldEl.name] = fieldEl.value;
         }
-        const action = form.getAttribute("action") || window.location.pathname + window.location.search;
+        const action =
+            form.getAttribute("action") || window.location.pathname + window.location.search;
         const [urlPath, urlParams] = action.split("?");
         if (urlParams) {
             for (const keyValue of urlParams.split("&")) {
                 const [key, value] = keyValue.split("=");
                 if (value && key !== "search") {
                     // Decode URI parameters: revert + to space then decodeURIComponent.
-                    this.options[decodeURIComponent(key.replace(/\+/g, "%20"))] = decodeURIComponent(value.replace(/\+/g, "%20"));
+                    this.options[decodeURIComponent(key.replace(/\+/g, "%20"))] =
+                        decodeURIComponent(value.replace(/\+/g, "%20"));
                 }
             }
         }
@@ -66,7 +68,8 @@ export class SearchBar extends Interaction {
         for (const index in pathParts) {
             const value = decodeURIComponent(pathParts[index]);
             const indexNumber = parseInt(index);
-            if (indexNumber > 0 && /-[0-9]+$/.test(value)) { // is sluggish
+            if (indexNumber > 0 && /-[0-9]+$/.test(value)) {
+                // is sluggish
                 this.options[decodeURIComponent(pathParts[indexNumber - 1])] = value;
             }
         }
@@ -88,15 +91,17 @@ export class SearchBar extends Interaction {
 
     async fetch() {
         const res = await rpc("/website/snippet/autocomplete", {
-            "search_type": this.searchType,
-            "term": this.inputEl.value,
-            "order": this.order,
-            "limit": this.limit,
-            "max_nb_chars": Math.round(Math.max(this.autocompleteMinWidth, parseInt(this.el.clientWidth)) * 0.22),
-            "options": this.options,
+            search_type: this.searchType,
+            term: this.inputEl.value,
+            order: this.order,
+            limit: this.limit,
+            max_nb_chars: Math.round(
+                Math.max(this.autocompleteMinWidth, parseInt(this.el.clientWidth)) * 0.22
+            ),
+            options: this.options,
         });
         const fieldNames = this.getFieldsNames();
-        res.results.forEach(record => {
+        res.results.forEach((record) => {
             for (const fieldName of fieldNames) {
                 if (record[fieldName]) {
                     record[fieldName] = markup(record[fieldName]);
@@ -121,28 +126,25 @@ export class SearchBar extends Interaction {
             if (getTemplate(candidate)) {
                 template = candidate;
             }
-            this.menuEl = this.renderAt(template, {
-                results: results,
-                parts: res["parts"],
-                hasMoreResults: results.length < res["results_count"],
-                search: this.inputEl.value,
-                fuzzySearch: res["fuzzy_search"],
-                widget: this.options,
-            }, this.el)[0];
+            this.menuEl = this.renderAt(
+                template,
+                {
+                    results: results,
+                    parts: res["parts"],
+                    hasMoreResults: results.length < res["results_count"],
+                    search: this.inputEl.value,
+                    fuzzySearch: res["fuzzy_search"],
+                    widget: this.options,
+                },
+                this.el
+            )[0];
         }
         this.hasDropdown = !!res;
         prevMenuEl?.remove();
     }
 
     getFieldsNames() {
-        return [
-            "description",
-            "detail",
-            "detail_extra",
-            "detail_strike",
-            "extra_link",
-            "name",
-        ];
+        return ["description", "detail", "detail_extra", "detail_strike", "extra_link", "name"];
     }
 
     async onInput() {
@@ -158,7 +160,10 @@ export class SearchBar extends Interaction {
     }
 
     onFocusOut() {
-        if (!this.linkHasFocus && document.activeElement?.closest(".o_searchbar_form") !== this.el) {
+        if (
+            !this.linkHasFocus &&
+            document.activeElement?.closest(".o_searchbar_form") !== this.el
+        ) {
             this.render();
         }
     }
@@ -194,15 +199,15 @@ export class SearchBar extends Interaction {
      * @param {MouseEvent} ev
      */
     onSearch(ev) {
-        if (this.inputEl.value) { // actual search
+        if (this.inputEl.value) {
+            // actual search
             this.limit = 0; // prevent autocomplete
-        } else { // clear button clicked
+        } else {
+            // clear button clicked
             this.render(); // remove existing suggestions
             ev.preventDefault();
         }
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.search_bar", SearchBar);
+registry.category("public.interactions").add("website.search_bar", SearchBar);
diff --git a/addons/website/static/src/snippets/s_searchbar/search_bar_results.js b/addons/website/static/src/snippets/s_searchbar/search_bar_results.js
index ffcf1fe63c8b3..c73f8455236c9 100644
--- a/addons/website/static/src/snippets/s_searchbar/search_bar_results.js
+++ b/addons/website/static/src/snippets/s_searchbar/search_bar_results.js
@@ -17,27 +17,29 @@ export class SearchBarResults extends Interaction {
             "t-att-style": () => {
                 const bcr = this.searchBarEl.getBoundingClientRect();
                 return {
-                    "position": "absolute !important",
+                    position: "absolute !important",
                     "max-width": `${bcr.width}px !important`,
-                    "max-height": `max(40vh, ${document.body.clientHeight - bcr.bottom - 16}px) !important`,
+                    "max-height": `max(40vh, ${
+                        document.body.clientHeight - bcr.bottom - 16
+                    }px) !important`,
                     "min-width": this.autocompleteMinWidth,
                 };
             },
             "t-att-class": () => ({
-                "show": true,
+                show: true,
             }),
-            "t-att-data-bs-popper": () => this.isDropup ? "" : undefined,
+            "t-att-data-bs-popper": () => (this.isDropup ? "" : undefined),
         },
         _searchbar: {
             "t-att-class": () => ({
-                "dropup": this.isDropup,
+                dropup: this.isDropup,
             }),
         },
         _window: {
-            "t-on-resize": () => { }, // Re-apply _root:t-att-style.
+            "t-on-resize": () => {}, // Re-apply _root:t-att-style.
         },
         _scrollingParent: {
-            "t-on-scroll": () => { }, // Re-apply _root:t-att-style.
+            "t-on-scroll": () => {}, // Re-apply _root:t-att-style.
         },
         ".dropdown-item": {
             "t-on-mousedown": this.onMousedown,
@@ -88,7 +90,9 @@ export class SearchBarResults extends Interaction {
                 // height has been reduced, we position it where most space is
                 // available
                 const searchPosition = this.searchBarEl.getBoundingClientRect();
-                this.isDropup = searchPosition.top > document.documentElement.offsetHeight - searchPosition.bottom;
+                this.isDropup =
+                    searchPosition.top >
+                    document.documentElement.offsetHeight - searchPosition.bottom;
             }
         }
     }
@@ -98,14 +102,18 @@ export class SearchBarResults extends Interaction {
         // to get around that behavior to avoid onFocusOut() from triggering
         // render(), as this would prevent the click from working.
         if (isBrowserSafari) {
-            this.searchBarEl.dispatchEvent(new CustomEvent('safarihack', { detail: { linkHasFocus: true } }));
+            this.searchBarEl.dispatchEvent(
+                new CustomEvent("safarihack", { detail: { linkHasFocus: true } })
+            );
         }
     }
 
     onMouseup() {
         // See comment in onMousedown.
         if (isBrowserSafari) {
-            this.searchBarEl.dispatchEvent(new CustomEvent('safarihack', { detail: { linkHasFocus: false } }));
+            this.searchBarEl.dispatchEvent(
+                new CustomEvent("safarihack", { detail: { linkHasFocus: false } })
+            );
         }
     }
 
@@ -115,7 +123,7 @@ export class SearchBarResults extends Interaction {
     onKeydown(ev) {
         switch (ev.key) {
             case "ArrowUp":
-            case "ArrowDown":
+            case "ArrowDown": {
                 ev.preventDefault();
                 const focusableEls = [this.inputEl, ...this.el.children];
                 const focusedEl = document.activeElement;
@@ -125,6 +133,7 @@ export class SearchBarResults extends Interaction {
                 const nextFocusedEl = focusableEls[nextIndex];
                 nextFocusedEl.focus();
                 break;
+            }
         }
     }
 
@@ -136,6 +145,4 @@ export class SearchBarResults extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.search_bar_results", SearchBarResults);
+registry.category("public.interactions").add("website.search_bar_results", SearchBarResults);
diff --git a/addons/website/static/src/snippets/s_share/share.js b/addons/website/static/src/snippets/s_share/share.js
index d20963914ae62..dd2c35816002c 100644
--- a/addons/website/static/src/snippets/s_share/share.js
+++ b/addons/website/static/src/snippets/s_share/share.js
@@ -4,7 +4,7 @@ import { registry } from "@web/core/registry";
 export class Share extends Interaction {
     static selector = ".s_share, .oe_share";
     dynamicContent = {
-        "a": { "t-on-click": this.onClick },
+        a: { "t-on-click": this.onClick },
     };
 
     /**
@@ -29,8 +29,11 @@ export class Share extends Interaction {
         // obviously won't cover all cases (people may have added URL that look
         // like sharer but are not but in that case, it was probably already
         // broken before).
-        if (![...urlParams, ...titleParams, ...mediaParams]
-            .some(param => modifiedUrl.searchParams.has(param))) {
+        if (
+            ![...urlParams, ...titleParams, ...mediaParams].some((param) =>
+                modifiedUrl.searchParams.has(param)
+            )
+        ) {
             return;
         }
 
@@ -40,16 +43,16 @@ export class Share extends Interaction {
         // We don't need to encode the URL as searchParams.set does it for us.
         const currentUrl = window.location.href;
 
-        const urlParamFound = urlParams.find(param => modifiedUrl.searchParams.has(param));
+        const urlParamFound = urlParams.find((param) => modifiedUrl.searchParams.has(param));
         if (urlParamFound) {
             modifiedUrl.searchParams.set(urlParamFound, currentUrl);
         }
 
-        const titleParamFound = titleParams.find(param => modifiedUrl.searchParams.has(param));
+        const titleParamFound = titleParams.find((param) => modifiedUrl.searchParams.has(param));
         if (titleParamFound) {
             // We don't need to encode the title as searchParams.set does it.
             const currentTitle = document.title;
-            if (aEl.classList.contains('s_share_whatsapp')) {
+            if (aEl.classList.contains("s_share_whatsapp")) {
                 // WhatsApp does not support the "url" GET parameter.
                 // Instead we need to include the url within the passed "text"
                 // parameter, merging everything together, e.g of output:
@@ -60,12 +63,14 @@ export class Share extends Interaction {
                 // The built-in `URLSearchParams.set()` method encodes spaces
                 // as "+" characters, which are not properly parsed as spaces
                 // by email clients, so we can't use it here.
-                modifiedUrl.search = modifiedUrl.search
-                    .replace(encodeURIComponent("{title}"), encodeURIComponent(currentTitle));
+                modifiedUrl.search = modifiedUrl.search.replace(
+                    encodeURIComponent("{title}"),
+                    encodeURIComponent(currentTitle)
+                );
             }
         }
 
-        const mediaParamFound = mediaParams.find(param => modifiedUrl.searchParams.has(param));
+        const mediaParamFound = mediaParams.find((param) => modifiedUrl.searchParams.has(param));
         if (mediaParamFound) {
             const ogImageEl = document.querySelector("meta[property='og:image']");
             // Some pages (/profile/user/ID) don't have an image to share.
@@ -81,11 +86,9 @@ export class Share extends Interaction {
         window.open(
             modifiedUrl.toString(),
             aEl.target,
-            "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600",
+            "menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600"
         );
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.share", Share);
+registry.category("public.interactions").add("website.share", Share);
diff --git a/addons/website/static/src/snippets/s_table_of_content/table_of_content.js b/addons/website/static/src/snippets/s_table_of_content/table_of_content.js
index 9b9d25d96a228..832592b20fb90 100644
--- a/addons/website/static/src/snippets/s_table_of_content/table_of_content.js
+++ b/addons/website/static/src/snippets/s_table_of_content/table_of_content.js
@@ -6,8 +6,8 @@ import { closestScrollableY, isScrollableY } from "@web/core/utils/scrolling";
 import { isVisible } from "@web/core/utils/ui";
 import { AnchorSlide } from "@website/interactions/anchor_slide";
 
-const getSelector = element => {
-    let hrefAttr = element.getAttribute("href");
+const getSelector = (element) => {
+    const hrefAttr = element.getAttribute("href");
     if (!hrefAttr?.startsWith("#")) {
         return null;
     }
@@ -40,13 +40,13 @@ export class TableOfContent extends Interaction {
     dynamicContent = {
         _root: {
             "t-att-style": () => ({
-                "top": this.isHorizontal ? `${this.position}px` : undefined,
+                top: this.isHorizontal ? `${this.position}px` : undefined,
             }),
         },
         ".s_table_of_content_navbar": {
             "t-att-style": () => ({
-                "top": this.isHorizontal ? undefined : `${this.position}px`,
-                "maxHeight": this.isHorizontal ? undefined : `calc(100vh - ${this.position + 40}px)`,
+                top: this.isHorizontal ? undefined : `${this.position}px`,
+                maxHeight: this.isHorizontal ? undefined : `calc(100vh - ${this.position + 40}px)`,
             }),
         },
     };
@@ -62,15 +62,23 @@ export class TableOfContent extends Interaction {
         this.scrollHeight = 0;
         this.offset = 0;
 
-        this.scrollElement = closestScrollableY(this.el.closest(".s_table_of_content")) || this.el.ownerDocument.scrollingElement;
-        this.scrollTarget = isScrollableY(this.scrollElement) ? this.scrollElement : this.scrollElement.ownerDocument.defaultView;
+        this.scrollElement =
+            closestScrollableY(this.el.closest(".s_table_of_content")) ||
+            this.el.ownerDocument.scrollingElement;
+        this.scrollTarget = isScrollableY(this.scrollElement)
+            ? this.scrollElement
+            : this.scrollElement.ownerDocument.defaultView;
         this.tocElement = this.el.querySelector(".s_table_of_content_navbar");
         this.previousPosition = -1;
     }
 
     start() {
         this.updateTableOfContentNavbarPosition();
-        this.registerCleanup(this.services.website_menus.registerCallback(this.updateTableOfContentNavbarPosition.bind(this)));
+        this.registerCleanup(
+            this.services.website_menus.registerCallback(
+                this.updateTableOfContentNavbarPosition.bind(this)
+            )
+        );
 
         this.addListener(this.scrollTarget, "scroll", this.scrollBound);
     }
@@ -91,7 +99,7 @@ export class TableOfContent extends Interaction {
         }
 
         this.position = position;
-        position += (this.isHorizontal ? this.el.offsetHeight : 0);
+        position += this.isHorizontal ? this.el.offsetHeight : 0;
 
         if (this.previousPosition !== position) {
             this.offset = position + 100;
@@ -103,29 +111,38 @@ export class TableOfContent extends Interaction {
     }
 
     getScrollHeight() {
-        return this.scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);
+        return (
+            this.scrollElement.scrollHeight ||
+            Math.max(document.body.scrollHeight, document.documentElement.scrollHeight)
+        );
     }
 
     refresh() {
         this.offsets = [];
         this.targets = [];
         this.scrollHeight = this.getScrollHeight();
-        const targets = [...this.tocElement.querySelectorAll(".nav-link, .list-group-item, .dropdown-item")];
-        targets.map(element => {
-            const targetSelector = getSelector(element);
-            const target = targetSelector ? document.querySelector(targetSelector) : null;
-            if (target) {
-                const targetBCR = target.getBoundingClientRect();
-
-                if (targetBCR.width || targetBCR.height) {
-                    return [targetBCR.top, targetSelector];
+        const targets = [
+            ...this.tocElement.querySelectorAll(".nav-link, .list-group-item, .dropdown-item"),
+        ];
+        targets
+            .map((element) => {
+                const targetSelector = getSelector(element);
+                const target = targetSelector ? document.querySelector(targetSelector) : null;
+                if (target) {
+                    const targetBCR = target.getBoundingClientRect();
+
+                    if (targetBCR.width || targetBCR.height) {
+                        return [targetBCR.top, targetSelector];
+                    }
                 }
-            }
-            return null;
-        }).filter(item => item).sort((a, b) => a[0] - b[0]).forEach(item => {
-            this.offsets.push(item[0]);
-            this.targets.push(item[1]);
-        });
+                return null;
+            })
+            .filter((item) => item)
+            .sort((a, b) => a[0] - b[0])
+            .forEach((item) => {
+                this.offsets.push(item[0]);
+                this.targets.push(item[1]);
+            });
         const baseScrollTop = this.scrollElement.scrollTop;
         for (let i = 0; i < this.offsets.length; i++) {
             this.offsets[i] += baseScrollTop;
@@ -142,7 +159,9 @@ export class TableOfContent extends Interaction {
         }
         this.activeTarget = target;
         this.clear();
-        const queries = ".nav-link, .list-group-item, .dropdown-item".split(",").map(selector => `${selector}[href="${target}"]`);
+        const queries = ".nav-link, .list-group-item, .dropdown-item"
+            .split(",")
+            .map((selector) => `${selector}[href="${target}"]`);
         const link = this.tocElement.querySelector(queries.join(","));
         link.classList.add("active");
         if (link.classList.contains("dropdown-item")) {
@@ -154,14 +173,14 @@ export class TableOfContent extends Interaction {
                 // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor
                 const itemEls = prev(listGroupEl, ".nav-link, .list-group-item");
                 for (const itemEl of itemEls) {
-                    itemEl.classList.add("active")
+                    itemEl.classList.add("active");
                 }
                 // Handle special case when .nav-link is inside .nav-item
                 const navItemEls = prev(listGroupEl, ".nav-item");
                 for (const navItemEl of navItemEls) {
                     for (const childEl of navItemEl.children) {
                         if (childEl.matches(".nav-link")) {
-                            childEl.classList.add("active")
+                            childEl.classList.add("active");
                         }
                     }
                 }
@@ -170,7 +189,9 @@ export class TableOfContent extends Interaction {
     }
 
     clear() {
-        const itemEls = this.tocElement.querySelectorAll(".nav-link, .list-group-item, .dropdown-item");
+        const itemEls = this.tocElement.querySelectorAll(
+            ".nav-link, .list-group-item, .dropdown-item"
+        );
         for (const itemEl of itemEls) {
             itemEl.classList.remove("active");
         }
@@ -179,7 +200,8 @@ export class TableOfContent extends Interaction {
     process() {
         const scrollTop = this.scrollElement.scrollTop + this.offset;
         const scrollHeight = this.getScrollHeight();
-        const maxScroll = this.offset + scrollHeight - this.scrollElement.getBoundingClientRect().height;
+        const maxScroll =
+            this.offset + scrollHeight - this.scrollElement.getBoundingClientRect().height;
         if (this.scrollHeight !== scrollHeight) {
             this.refresh();
         }
@@ -194,12 +216,11 @@ export class TableOfContent extends Interaction {
             this.activeTarget = null;
             this.clear();
         } else {
-            for (let i = this.offsets.length; i--;) {
+            for (let i = this.offsets.length; i--; ) {
                 const isActiveTarget =
-                    this.activeTarget !== this.targets[i]
-                    && scrollTop >= this.offsets[i]
-                    && (typeof this.offsets[i + 1] === "undefined"
-                        || scrollTop < this.offsets[i + 1]);
+                    this.activeTarget !== this.targets[i] &&
+                    scrollTop >= this.offsets[i] &&
+                    (typeof this.offsets[i + 1] === "undefined" || scrollTop < this.offsets[i + 1]);
 
                 if (isActiveTarget) {
                     this.activate(this.targets[i]);
@@ -222,7 +243,9 @@ patch(AnchorSlide.prototype, {
     computeExtraOffset() {
         let extraOffset = super.computeExtraOffset(...arguments);
         if (this.el.classList.contains("table_of_content_link")) {
-            const tableOfContentNavbarEl = this.el.closest(".s_table_of_content_navbar_sticky.s_table_of_content_horizontal_navbar");
+            const tableOfContentNavbarEl = this.el.closest(
+                ".s_table_of_content_navbar_sticky.s_table_of_content_horizontal_navbar"
+            );
             if (tableOfContentNavbarEl) {
                 extraOffset += tableOfContentNavbarEl.getBoundingClientRect().height;
             }
@@ -231,6 +254,4 @@ patch(AnchorSlide.prototype, {
     },
 });
 
-registry
-    .category("public.interactions")
-    .add("website.table_of_content", TableOfContent);
+registry.category("public.interactions").add("website.table_of_content", TableOfContent);
diff --git a/addons/website/static/src/snippets/s_website_form/form.edit.js b/addons/website/static/src/snippets/s_website_form/form.edit.js
index 8be2064474b93..f3ffec2a3aac6 100644
--- a/addons/website/static/src/snippets/s_website_form/form.edit.js
+++ b/addons/website/static/src/snippets/s_website_form/form.edit.js
@@ -2,10 +2,7 @@ import { Interaction } from "@web/public/interaction";
 import { registry } from "@web/core/registry";
 import { Form } from "./form";
 import { patch } from "@web/core/utils/patch";
-import {
-    formatDate,
-    formatDateTime,
-} from "@web/core/l10n/dates";
+import { formatDate, formatDateTime } from "@web/core/l10n/dates";
 
 const { DateTime } = luxon;
 
@@ -31,16 +28,17 @@ export class FormEdit extends Interaction {
             return [];
         }
         return Object.keys(this.dataForValues)
-            .map(name => this.el.querySelector(`[name="${CSS.escape(name)}"]`))
-            .filter(dataForValuesFieldEl => dataForValuesFieldEl && dataForValuesFieldEl.name !== "email_to");
+            .map((name) => this.el.querySelector(`[name="${CSS.escape(name)}"]`))
+            .filter(
+                (dataForValuesFieldEl) =>
+                    dataForValuesFieldEl && dataForValuesFieldEl.name !== "email_to"
+            );
     }
 }
 
-registry
-    .category("public.interactions.edit")
-    .add("website.form", {
-        Interaction: FormEdit,
-    });
+registry.category("public.interactions.edit").add("website.form", {
+    Interaction: FormEdit,
+});
 
 // Translation mode.
 patch(Form.prototype, {
diff --git a/addons/website/static/src/snippets/s_website_form/form.js b/addons/website/static/src/snippets/s_website_form/form.js
index dde801f04232f..43196f569fdd3 100644
--- a/addons/website/static/src/snippets/s_website_form/form.js
+++ b/addons/website/static/src/snippets/s_website_form/form.js
@@ -28,17 +28,19 @@ export class Form extends Interaction {
         _endMessage: () => this.el.parentNode.querySelector(".s_website_form_end_message"),
     };
     dynamicContent = {
-        ".s_website_form_send, .o_website_form_send": { "t-on-click.prevent": this.locked(this.send, true) }, // !compatibility
+        ".s_website_form_send, .o_website_form_send": {
+            "t-on-click.prevent": this.locked(this.send, true),
+        }, // !compatibility
         _root: {
             "t-on-submit.prevent": this.locked(this.send, true),
             "t-att-class": () => ({
                 "d-none": this.isHidden,
-            })
+            }),
         },
         _endMessage: {
             "t-att-class": () => ({
                 "d-none": !this.isHidden,
-            })
+            }),
         },
         "input[type=file]": { "t-on-change": this.changeFile },
         "input.o_add_files_button": { "t-on-click": this.clickAddFilesButton },
@@ -51,11 +53,12 @@ export class Form extends Interaction {
         ".s_website_form_field:not(.s_website_form_model_required) .s_website_form_input": {
             "t-att-disabled": (el) => !this.isInputVisible(el) || undefined,
         },
-        ".s_website_form_datetime, .o_website_form_datetime, .s_website_form_date, .o_website_form_date": {
-            "t-att-class": () => ({
-                "s_website_form_datepicker_initialized": this.datepickerInitialized,
-            }),
-        },
+        ".s_website_form_datetime, .o_website_form_datetime, .s_website_form_date, .o_website_form_date":
+            {
+                "t-att-class": () => ({
+                    s_website_form_datepicker_initialized: this.datepickerInitialized,
+                }),
+            },
     };
 
     setup() {
@@ -66,8 +69,12 @@ export class Form extends Interaction {
         this.disabledStates = new Map();
         this.visibilityFunctionByFieldEl = new Map();
         this.visibilityFunctionByFieldName = new Map();
-        this.inputEls = this.el.querySelectorAll(".s_website_form_field.s_website_form_field_hidden_if .s_website_form_input");
-        this.dateFieldEls = this.el.querySelectorAll(".s_website_form_datetime, .o_website_form_datetime, .s_website_form_date, .o_website_form_date");
+        this.inputEls = this.el.querySelectorAll(
+            ".s_website_form_field.s_website_form_field_hidden_if .s_website_form_input"
+        );
+        this.dateFieldEls = this.el.querySelectorAll(
+            ".s_website_form_datetime, .o_website_form_datetime, .s_website_form_date, .o_website_form_date"
+        );
         this.disableDateTimePickers = [];
         this.preFillValues = {};
         this.lastFormData = this.getFormDataIncludingDisabledFields(this.el);
@@ -80,11 +87,14 @@ export class Form extends Interaction {
         }
         // fetch user data (required by fill-with behavior)
         if (user.userId) {
-            this.preFillValues = (await this.services.orm.read(
-                "res.users",
-                [user.userId],
-                this.getUserPreFillFields()
-            ))[0] || {};
+            this.preFillValues =
+                (
+                    await this.services.orm.read(
+                        "res.users",
+                        [user.userId],
+                        this.getUserPreFillFields()
+                    )
+                )[0] || {};
         }
         // Reset the form first, as it is still filled when coming back
         // after a redirect.
@@ -102,7 +112,7 @@ export class Form extends Interaction {
             this.visibilityFunctionByFieldEl.set(fieldEl, func);
         }
         for (const [name, funcs] of visibilityFunctionsByFieldName.entries()) {
-            this.visibilityFunctionByFieldName.set(name, () => funcs.some(func => func()));
+            this.visibilityFunctionByFieldName.set(name, () => funcs.some((func) => func()));
         }
     }
 
@@ -115,7 +125,7 @@ export class Form extends Interaction {
         this.updateContent();
 
         if (session.geoip_phone_code) {
-            this.el.querySelectorAll(`input[type="tel"]`).forEach(telField => {
+            this.el.querySelectorAll(`input[type="tel"]`).forEach((telField) => {
                 if (!telField.value) {
                     telField.value = "+" + session.geoip_phone_code;
                 }
@@ -127,7 +137,7 @@ export class Form extends Interaction {
         }
 
         // Add the files zones where the file blocks will be displayed.
-        this.el.querySelectorAll("input[type=file]").forEach(inputEl => {
+        this.el.querySelectorAll("input[type=file]").forEach((inputEl) => {
             const filesZoneEl = document.createElement("DIV");
             filesZoneEl.classList.add("o_files_zone", "row", "gx-1");
             inputEl.parentNode.insertBefore(filesZoneEl, inputEl);
@@ -142,20 +152,22 @@ export class Form extends Interaction {
         this.resetForm();
 
         // Apply default values
-        this.el.querySelectorAll(`input[type="text"], input[type="email"], input[type="number"]`).forEach(el => {
-            let value = el.getAttribute("value");
-            if (value) {
-                if (el.classList.contains("datetimepicker-input")) {
-                    const format =
-                        el.closest(".s_website_form_field").dataset.type === "date"
-                            ? formatDate
-                            : formatDateTime;
-                    value = format(DateTime.fromSeconds(parseInt(value)));
+        this.el
+            .querySelectorAll(`input[type="text"], input[type="email"], input[type="number"]`)
+            .forEach((el) => {
+                let value = el.getAttribute("value");
+                if (value) {
+                    if (el.classList.contains("datetimepicker-input")) {
+                        const format =
+                            el.closest(".s_website_form_field").dataset.type === "date"
+                                ? formatDate
+                                : formatDateTime;
+                        value = format(DateTime.fromSeconds(parseInt(value)));
+                    }
+                    el.value = value;
                 }
-                el.value = value;
-            }
-        });
-        this.el.querySelectorAll("textarea").forEach(el => el.value = el.textContent);
+            });
+        this.el.querySelectorAll("textarea").forEach((el) => (el.value = el.textContent));
 
         // Remove saving of the error colors
         for (const errorEl of this.el.querySelectorAll(".o_has_error")) {
@@ -174,7 +186,9 @@ export class Form extends Interaction {
         }
 
         // All 'hidden if' fields start with d-none
-        this.el.querySelectorAll(".s_website_form_field_hidden_if:not(.d-none)").forEach(el => el.classList.add("d-none"));
+        this.el
+            .querySelectorAll(".s_website_form_field_hidden_if:not(.d-none)")
+            .forEach((el) => el.classList.add("d-none"));
 
         // Prevent "data-for" values removal on destroy, they are still used
         // in edit mode to keep the form linked to its predefined server
@@ -205,14 +219,21 @@ export class Form extends Interaction {
         for (const fieldEl of this.dateFieldEls) {
             const inputEl = fieldEl.querySelector("input");
             const defaultValue = inputEl.getAttribute("value");
-            this.disableDateTimePickers.push(this.services.datetime_picker.create({
-                target: inputEl,
-                onChange: () => inputEl.dispatchEvent(new Event("input", { bubbles: true })),
-                pickerProps: {
-                    type: fieldEl.matches(".s_website_form_date, .o_website_form_date") ? "date" : "datetime",
-                    value: defaultValue && DateTime.fromSeconds(parseInt(defaultValue)),
-                },
-            }).enable());
+            this.disableDateTimePickers.push(
+                this.services.datetime_picker
+                    .create({
+                        target: inputEl,
+                        onChange: () =>
+                            inputEl.dispatchEvent(new Event("input", { bubbles: true })),
+                        pickerProps: {
+                            type: fieldEl.matches(".s_website_form_date, .o_website_form_date")
+                                ? "date"
+                                : "datetime",
+                            value: defaultValue && DateTime.fromSeconds(parseInt(defaultValue)),
+                        },
+                    })
+                    .enable()
+            );
         }
         this.datepickerInitialized = true;
     }
@@ -248,7 +269,9 @@ export class Form extends Interaction {
                 // take priority over set default values. The 'email_to'
                 // field is however treated as an exception at the moment
                 // so that values set by users are always used.
-                if (name === "email_to" && fieldEl.value
+                if (
+                    name === "email_to" &&
+                    fieldEl.value &&
                     // The following value is the default value that
                     // is set if the form is edited in any way. (see the
                     // @website/js/form_editor_registry module in editor
@@ -257,7 +280,8 @@ export class Form extends Interaction {
                     // unless explicitely manipulated by the user or on
                     // custom form addition but that seems risky to
                     // change as a stable fix.
-                    && fieldEl.value !== "info@yourcompany.example.com") {
+                    fieldEl.value !== "info@yourcompany.example.com"
+                ) {
                     continue;
                 }
 
@@ -287,7 +311,7 @@ export class Form extends Interaction {
         const formFields = [];
         new FormData(this.el).forEach((value, key) => {
             const inputElement = this.el.querySelector(`[name="${CSS.escape(key)}"]`);
-            if (inputElement && inputElement.type !== 'file') {
+            if (inputElement && inputElement.type !== "file") {
                 formFields.push({ name: key, value: value });
             }
         });
@@ -327,8 +351,12 @@ export class Form extends Interaction {
         });
 
         // force server date format usage for existing fields
-        for (const fieldEl of this.el.querySelectorAll(".s_website_form_field:not(.s_website_form_custom)")) {
-            for (const dateEl of fieldEl.querySelectorAll(".s_website_form_date, .s_website_form_datetime")) {
+        for (const fieldEl of this.el.querySelectorAll(
+            ".s_website_form_field:not(.s_website_form_custom)"
+        )) {
+            for (const dateEl of fieldEl.querySelectorAll(
+                ".s_website_form_date, .s_website_form_datetime"
+            )) {
                 const inputEl = dateEl.querySelector("input");
                 const { value } = inputEl;
                 if (!value) {
@@ -361,7 +389,11 @@ export class Form extends Interaction {
         }
 
         // Post form and handle result
-        return post(this.el.getAttribute("action") + (this.el.dataset.force_action || this.el.dataset.model_name), formData)
+        return post(
+            this.el.getAttribute("action") +
+                (this.el.dataset.force_action || this.el.dataset.model_name),
+            formData
+        )
             .then(async (resultData) => {
                 if (!resultData.id) {
                     // Failure, the server didn't return the created record ID
@@ -401,12 +433,18 @@ export class Form extends Interaction {
                                     successPage = successPage.replace("#", "/#");
                                     hashIndex++;
                                 }
-                                if ([successPage, "/" + session.lang_url_code + successPage].some(link => link.startsWith(currentUrlPath + "#"))) {
+                                if (
+                                    [successPage, "/" + session.lang_url_code + successPage].some(
+                                        (link) => link.startsWith(currentUrlPath + "#")
+                                    )
+                                ) {
                                     successPage = successPage.substring(hashIndex);
                                 }
                             }
                             if (successPage.charAt(0) === "#") {
-                                const successAnchorEl = document.getElementById(successPage.substring(1));
+                                const successAnchorEl = document.getElementById(
+                                    successPage.substring(1)
+                                );
                                 if (successAnchorEl) {
                                     // Check if the target of the link is a modal.
                                     if (successAnchorEl.classList.contains("modal")) {
@@ -415,10 +453,12 @@ export class Form extends Interaction {
                                         // popup.
                                         window.location.href = successPage;
                                     } else {
-                                        await this.waitFor(scrollTo(successAnchorEl, {
-                                            duration: 500,
-                                            extraOffset: 0,
-                                        }));
+                                        await this.waitFor(
+                                            scrollTo(successAnchorEl, {
+                                                duration: 500,
+                                                extraOffset: 0,
+                                            })
+                                        );
                                     }
                                 }
                                 break;
@@ -449,10 +489,12 @@ export class Form extends Interaction {
                     this.resetForm();
                 }
             })
-            .catch(error => {
+            .catch((error) => {
                 this.updateStatus(
                     "error",
-                    error.message && error.message === 'Content too large' ? _t("Uploaded file is too large.") : "",
+                    error.message && error.message === "Content too large"
+                        ? _t("Uploaded file is too large.")
+                        : ""
                 );
             });
     }
@@ -467,10 +509,10 @@ export class Form extends Interaction {
         this.removeErrorMessages();
         // For file inputs, remove the files zone, restore the file input
         // and remove the files list.
-        this.el.querySelectorAll("input[type=file]").forEach(inputEl => {
+        this.el.querySelectorAll("input[type=file]").forEach((inputEl) => {
             const fieldEl = inputEl.closest(".s_website_form_field");
-            fieldEl.querySelectorAll(".o_files_zone").forEach(el => el.remove());
-            fieldEl.querySelectorAll(".o_add_files_button").forEach(el => el.remove());
+            fieldEl.querySelectorAll(".o_files_zone").forEach((el) => el.remove());
+            fieldEl.querySelectorAll(".o_add_files_button").forEach((el) => el.remove());
             inputEl.classList.remove("d-none");
             delete inputEl.fileList;
         });
@@ -479,14 +521,19 @@ export class Form extends Interaction {
     checkErrorFields(errorFields) {
         let formValid = true;
         // Loop on all fields
-        for (const fieldEl of this.el.querySelectorAll(".form-field, .s_website_form_field")) { // !compatibility
+        for (const fieldEl of this.el.querySelectorAll(".form-field, .s_website_form_field")) {
+            // !compatibility
             // FIXME that seems broken, "for" does not contain the field
             // but this is used to retrieve errors sent from the server...
             // need more investigation.
             const fieldName = fieldEl.querySelector(".col-form-label")?.getAttribute("for");
 
             // Validate inputs for this field
-            const inputEls = [...fieldEl.querySelectorAll(".s_website_form_input:not(#editable_select), .o_website_form_input:not(#editable_select)")]; // !compatibility
+            const inputEls = [
+                ...fieldEl.querySelectorAll(
+                    ".s_website_form_input:not(#editable_select), .o_website_form_input:not(#editable_select)"
+                ),
+            ]; // !compatibility
             const invalidInputs = inputEls.filter((inputEl) => {
                 // Special check for multiple required checkbox for same
                 // field as it seems checkValidity forces every required
@@ -501,7 +548,9 @@ export class Form extends Interaction {
                     // filter neither on required, nor on checkbox and
                     // checking the validity of the group of checkbox is
                     // currently done for each checkbox of that group...
-                    const checkboxes = inputEls.filter(el => el.required && el.type === "checkbox");
+                    const checkboxes = inputEls.filter(
+                        (el) => el.required && el.type === "checkbox"
+                    );
                     return !checkboxes.some((checkbox) => checkbox.checkValidity());
 
                     // Special cases for dates and datetimes
@@ -511,12 +560,14 @@ export class Form extends Interaction {
                     // was made)... need more investigation (if restored,
                     // consider checking the date inputs are not disabled before
                     // saying they are invalid (see checkValidity used here))
-                } else if (inputEl.matches(".s_website_form_date, .o_website_form_date")) { // !compatibility
+                } else if (inputEl.matches(".s_website_form_date, .o_website_form_date")) {
+                    // !compatibility
                     const date = parseDate(inputEl.value);
                     if (!date || !date.isValid) {
                         return true;
                     }
-                } else if (inputEl.matches(".s_website_form_datetime, .o_website_form_datetime")) { // !compatibility
+                } else if (inputEl.matches(".s_website_form_datetime, .o_website_form_datetime")) {
+                    // !compatibility
                     const date = parseDateTime(inputEl.value);
                     if (!date || !date.isValid) {
                         return true;
@@ -541,7 +592,9 @@ export class Form extends Interaction {
             });
 
             // Update field color if invalid or erroneous
-            const controlEls = fieldEl.querySelectorAll(".form-control, .form-select, .form-check-input");
+            const controlEls = fieldEl.querySelectorAll(
+                ".form-control, .form-select, .form-check-input"
+            );
             fieldEl.classList.remove("o_has_error");
             for (const controlEl of controlEls) {
                 controlEl.classList.remove("is-invalid");
@@ -574,13 +627,22 @@ export class Form extends Interaction {
             message = _t("An error has occured, the form has not been sent.");
         }
 
-        const renderedEls = this.renderAt(`website.s_website_form_status_${status}`, {
-            message: message,
-        }, resultEl, "afterend", undefined, false);
+        const renderedEls = this.renderAt(
+            `website.s_website_form_status_${status}`,
+            {
+                message: message,
+            },
+            resultEl,
+            "afterend",
+            undefined,
+            false
+        );
         // Handle cleanup manually to keep s_website_form_result in DOM.
         this.registerCleanup(() => {
             for (const el of renderedEls) {
-                const renderedResultEl = el.matches("#s_website_form_result") ? el : el.querySelector("#s_website_form_result");
+                const renderedResultEl = el.matches("#s_website_form_result")
+                    ? el
+                    : el.querySelector("#s_website_form_result");
                 renderedResultEl.replaceChildren();
             }
         });
@@ -772,8 +834,10 @@ export class Form extends Interaction {
         const between = fieldEl.dataset.visibilityBetween;
         return () => {
             // To be visible, at least one field with the dependency name must be visible.
-            const dependencyVisibilityFunction = this.visibilityFunctionByFieldName.get(dependencyName);
-            const dependencyIsVisible = !dependencyVisibilityFunction || dependencyVisibilityFunction();
+            const dependencyVisibilityFunction =
+                this.visibilityFunctionByFieldName.get(dependencyName);
+            const dependencyIsVisible =
+                !dependencyVisibilityFunction || dependencyVisibilityFunction();
             if (!dependencyIsVisible) {
                 return false;
             }
@@ -781,7 +845,12 @@ export class Form extends Interaction {
             const currentValueOfDependency = ["contains", "!contains"].includes(comparator)
                 ? this.lastFormData.getAll(dependencyName).join()
                 : this.lastFormData.get(dependencyName);
-            return this.compareTo(comparator, currentValueOfDependency, visibilityCondition, between);
+            return this.compareTo(
+                comparator,
+                currentValueOfDependency,
+                visibilityCondition,
+                between
+            );
         };
     }
 
@@ -847,7 +916,13 @@ export class Form extends Interaction {
      *      displayed
      */
     createFileBlock(fileDetails, filesZoneEl) {
-        this.renderAt("website.file_block", { fileName: fileDetails.name }, filesZoneEl, "beforeend", (els) => els[0].fileDetails = fileDetails);
+        this.renderAt(
+            "website.file_block",
+            { fileName: fileDetails.name },
+            filesZoneEl,
+            "beforeend",
+            (els) => (els[0].fileDetails = fileDetails)
+        );
     }
 
     /**
@@ -861,7 +936,8 @@ export class Form extends Interaction {
         addFilesButtonEl.classList.add("o_add_files_button", "form-control");
         addFilesButtonEl.type = "button";
         addFilesButtonEl.value = inputEl.hasAttribute("multiple")
-            ? _t("Add Files") : _t("Replace File");
+            ? _t("Add Files")
+            : _t("Replace File");
         inputEl.parentNode.insertBefore(addFilesButtonEl, inputEl);
         inputEl.classList.add("d-none");
     }
@@ -891,7 +967,7 @@ export class Form extends Interaction {
         const addFilesButtonEl = fieldEl.querySelector(".o_add_files_button");
 
         // The zone where the file blocks are displayed.
-        let filesZoneEl = fieldEl.querySelector(".o_files_zone");
+        const filesZoneEl = fieldEl.querySelector(".o_files_zone");
         // Update the button text content.
         if (!addFilesButtonEl) {
             this.createAddFilesButton(fileInputEl);
@@ -913,8 +989,14 @@ export class Form extends Interaction {
 
         // Add the uploaded files if they are not already there.
         for (const newFile of uploadedFiles) {
-            if (![...fileInputEl.fileList.files].some(file => newFile.name === file.name &&
-                newFile.size === file.size && newFile.type === file.type)) {
+            if (
+                ![...fileInputEl.fileList.files].some(
+                    (file) =>
+                        newFile.name === file.name &&
+                        newFile.size === file.size &&
+                        newFile.type === file.type
+                )
+            ) {
                 fileInputEl.fileList.items.add(newFile);
                 const fileDetails = { name: newFile.name, size: newFile.size, type: newFile.type };
                 this.createFileBlock(fileDetails, filesZoneEl);
@@ -943,8 +1025,11 @@ export class Form extends Interaction {
         // Create a new file list containing the remaining files.
         const newFileList = new DataTransfer();
         for (const file of Object.values(fileInputEl.fileList.files)) {
-            if (file.name !== fileDetails.name || file.size !== fileDetails.size
-                || file.type !== fileDetails.type) {
+            if (
+                file.name !== fileDetails.name ||
+                file.size !== fileDetails.size ||
+                file.type !== fileDetails.type
+            ) {
                 newFileList.items.add(file);
             }
         }
@@ -981,6 +1066,4 @@ export class Form extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website.form", Form);
+registry.category("public.interactions").add("website.form", Form);
diff --git a/addons/website/static/src/utils/images.js b/addons/website/static/src/utils/images.js
index 87e28757b604a..09342bf86d9b3 100644
--- a/addons/website/static/src/utils/images.js
+++ b/addons/website/static/src/utils/images.js
@@ -4,10 +4,7 @@
  * @param {HTMLElement} element
  */
 export function onceAllImagesLoaded(element) {
-    const imgEls =
-        element.nodeName === "IMG"
-            ? [element]
-            : [...element.querySelectorAll("img")];
+    const imgEls = element.nodeName === "IMG" ? [element] : [...element.querySelectorAll("img")];
     const defs = imgEls.map((imgEl) => {
         if (imgEl.complete) {
             return; // Already loaded
diff --git a/addons/website/static/src/utils/misc.js b/addons/website/static/src/utils/misc.js
index c8c604b62e52c..820fd8ad143d5 100644
--- a/addons/website/static/src/utils/misc.js
+++ b/addons/website/static/src/utils/misc.js
@@ -13,7 +13,7 @@ export class EventBus extends EventTarget {
 export function unhideConditionalElements() {
     // Create CSS rules in a dedicated style tag according to the snippet
     // visibility option's computed ones (saved as data attributes).
-    const styleEl = document.createElement('style');
+    const styleEl = document.createElement("style");
     styleEl.id = "conditional_visibility";
     document.head.appendChild(styleEl);
     const conditionalEls = document.querySelectorAll('[data-visibility="conditional"]');
@@ -24,22 +24,22 @@ export function unhideConditionalElements() {
 
     // Now remove the classes that makes them always invisible
     for (const conditionalEl of conditionalEls) {
-        conditionalEl.classList.remove('o_conditional_hidden');
+        conditionalEl.classList.remove("o_conditional_hidden");
     }
 }
 
 export function setUtmsHtmlDataset() {
     const htmlEl = document.documentElement;
     const cookieNamesToDataNames = {
-        'utm_source': 'utmSource',
-        'utm_medium': 'utmMedium',
-        'utm_campaign': 'utmCampaign',
+        utm_source: "utmSource",
+        utm_medium: "utmMedium",
+        utm_campaign: "utmCampaign",
     };
     for (const [name, dsName] of Object.entries(cookieNamesToDataNames)) {
         const cookie = cookieManager.get(`odoo_${name}`);
         if (cookie) {
             // Remove leading and trailing " and '
-            htmlEl.dataset[dsName] = cookie.replace(/(^["']|["']$)/g, '');
+            htmlEl.dataset[dsName] = cookie.replace(/(^["']|["']$)/g, "");
         }
     }
 }
diff --git a/addons/website/static/src/utils/videos.js b/addons/website/static/src/utils/videos.js
index 0ce9765fa78da..f885d74317bc1 100644
--- a/addons/website/static/src/utils/videos.js
+++ b/addons/website/static/src/utils/videos.js
@@ -12,12 +12,12 @@ import { SIZES, utils as uiUtils } from "@web/core/ui/ui_service";
  * @param {boolean} needCookiesApproval
  */
 export function setupAutoplay(src, needCookiesApproval = false) {
-    const isYoutubeVideo = src.indexOf('youtube') >= 0;
+    const isYoutubeVideo = src.indexOf("youtube") >= 0;
     const isMobileEnv = uiUtils.getSize() <= SIZES.LG && hasTouch();
 
     if (isYoutubeVideo && isMobileEnv && !window.YT && !needCookiesApproval) {
         const oldOnYoutubeIframeAPIReady = window.onYouTubeIframeAPIReady;
-        const promise = new Promise(resolve => {
+        const promise = new Promise((resolve) => {
             window.onYouTubeIframeAPIReady = () => {
                 if (oldOnYoutubeIframeAPIReady) {
                     oldOnYoutubeIframeAPIReady();
@@ -25,7 +25,7 @@ export function setupAutoplay(src, needCookiesApproval = false) {
                 return resolve();
             };
         });
-        loadJS('https://www.youtube.com/iframe_api');
+        loadJS("https://www.youtube.com/iframe_api");
         return promise;
     }
     return Promise.resolve();
@@ -35,7 +35,7 @@ export function setupAutoplay(src, needCookiesApproval = false) {
  * @param {HTMLIframeElement} iframeEl - the iframe containing the video player
  */
 export function triggerAutoplay(iframeEl) {
-    const isYoutubeVideo = iframeEl.src.indexOf('youtube') >= 0;
+    const isYoutubeVideo = iframeEl.src.indexOf("youtube") >= 0;
     const isMobileEnv = uiUtils.getSize() <= SIZES.LG && hasTouch();
 
     // YouTube does not allow to auto-play video in mobile devices, so we
@@ -43,8 +43,8 @@ export function triggerAutoplay(iframeEl) {
     if (isYoutubeVideo && isMobileEnv && iframeEl.closest("[data-need-cookies-approval]")) {
         new window.YT.Player(iframeEl, {
             events: {
-                onReady: ev => ev.target.playVideo(),
-            }
+                onReady: (ev) => ev.target.playVideo(),
+            },
         });
     }
 }
diff --git a/addons/website/static/tests/builder/options/content_width_option.test.js b/addons/website/static/tests/builder/options/content_width_option.test.js
index 74ce2d2c96fa7..9fe122b4fd4b1 100644
--- a/addons/website/static/tests/builder/options/content_width_option.test.js
+++ b/addons/website/static/tests/builder/options/content_width_option.test.js
@@ -1,6 +1,9 @@
 import { expect, test } from "@odoo/hoot";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/options/countdown_option.test.js b/addons/website/static/tests/builder/options/countdown_option.test.js
index 0bdec38d6f84f..650cc4c93b8ca 100644
--- a/addons/website/static/tests/builder/options/countdown_option.test.js
+++ b/addons/website/static/tests/builder/options/countdown_option.test.js
@@ -1,7 +1,10 @@
 import { expect, test } from "@odoo/hoot";
 import { queryFirst, waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/options/floating_blocks_option.test.js b/addons/website/static/tests/builder/options/floating_blocks_option.test.js
index 8864609070945..c8dbd5358eec3 100644
--- a/addons/website/static/tests/builder/options/floating_blocks_option.test.js
+++ b/addons/website/static/tests/builder/options/floating_blocks_option.test.js
@@ -1,4 +1,7 @@
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 import { expect, test } from "@odoo/hoot";
 import { contains, onRpc } from "@web/../tests/web_test_helpers";
 
diff --git a/addons/website/static/tests/builder/options/grid_column_option.test.js b/addons/website/static/tests/builder/options/grid_column_option.test.js
index 22b46da4ab0e4..dcd71f4dc0150 100644
--- a/addons/website/static/tests/builder/options/grid_column_option.test.js
+++ b/addons/website/static/tests/builder/options/grid_column_option.test.js
@@ -9,7 +9,10 @@ import {
     waitFor,
 } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/options/layout_option.test.js b/addons/website/static/tests/builder/options/layout_option.test.js
index 8b0746e9c2b8e..2ecc06ec55fd2 100644
--- a/addons/website/static/tests/builder/options/layout_option.test.js
+++ b/addons/website/static/tests/builder/options/layout_option.test.js
@@ -1,7 +1,10 @@
 import { expect, test } from "@odoo/hoot";
 import { animationFrame, waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/options/pricelist_boxed_option.test.js b/addons/website/static/tests/builder/options/pricelist_boxed_option.test.js
index d21ce0b85d22b..f038a32f2fd41 100644
--- a/addons/website/static/tests/builder/options/pricelist_boxed_option.test.js
+++ b/addons/website/static/tests/builder/options/pricelist_boxed_option.test.js
@@ -1,7 +1,10 @@
 import { expect, test } from "@odoo/hoot";
 import { queryAll, waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/options/top_menu_visibility_option.test.js b/addons/website/static/tests/builder/options/top_menu_visibility_option.test.js
index 6dd522b0f7c6c..184dd0ff1a12b 100644
--- a/addons/website/static/tests/builder/options/top_menu_visibility_option.test.js
+++ b/addons/website/static/tests/builder/options/top_menu_visibility_option.test.js
@@ -2,7 +2,10 @@ import { redo, undo } from "@html_editor/../tests/_helpers/user_actions";
 import { expect, test } from "@odoo/hoot";
 import { queryOne, waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/snippets_menu.test.js b/addons/website/static/tests/builder/snippets_menu.test.js
index 96b0977afc6af..7a489fc2dde18 100644
--- a/addons/website/static/tests/builder/snippets_menu.test.js
+++ b/addons/website/static/tests/builder/snippets_menu.test.js
@@ -43,7 +43,9 @@ test("navigate between builder tab don't fetch snippet description again", async
         "Style",
         "Theme",
     ]);
-    expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText("Blocks");
+    expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText(
+        "Blocks"
+    );
     expect.verifySteps(["render_public_asset"]);
 
     await contains(".o-website-builder_sidebar .o-snippets-tabs button:contains(Theme)").click();
@@ -53,7 +55,9 @@ test("navigate between builder tab don't fetch snippet description again", async
     );
 
     await contains(".o-website-builder_sidebar .o-snippets-tabs button:contains(Blocks)").click();
-    expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText("Blocks");
+    expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText(
+        "Blocks"
+    );
     expect.verifySteps([]);
 });
 
@@ -89,7 +93,9 @@ test("undo and redo buttons", async () => {
 
 test("activate customize tab without any selection", async () => {
     await setupWebsiteBuilder("<h1> Homepage </h1>");
-    expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText("Blocks");
+    expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText(
+        "Blocks"
+    );
     await contains(".o-website-builder_sidebar .o-snippets-tabs button:contains(Style)").click();
     expect(queryOne(".o-website-builder_sidebar .o-snippets-tabs button.active")).toHaveText(
         "Style"
diff --git a/addons/website/static/tests/builder/theme_tab/palette.test.js b/addons/website/static/tests/builder/theme_tab/palette.test.js
index 6a9f995ffe8f6..4b5af7fa692e6 100644
--- a/addons/website/static/tests/builder/theme_tab/palette.test.js
+++ b/addons/website/static/tests/builder/theme_tab/palette.test.js
@@ -1,5 +1,8 @@
 import { expect, test } from "@odoo/hoot";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 import { contains, defineModels, models, onRpc } from "@web/../tests/web_test_helpers";
 import { Deferred } from "@odoo/hoot-dom";
 
diff --git a/addons/website/static/tests/builder/videos.test.js b/addons/website/static/tests/builder/videos.test.js
index 0ae5e755fb3c8..9adac5fad69ab 100644
--- a/addons/website/static/tests/builder/videos.test.js
+++ b/addons/website/static/tests/builder/videos.test.js
@@ -43,20 +43,30 @@ test("vertical toggle of video options", async () => {
     await dblclick(":iframe iframe");
     await animationFrame();
     expect(".modal-content:contains(Select a media) .o_video_dialog_form").toHaveCount(1);
-    expect(".modal-content:contains(Select a media) .media_iframe_video .media_iframe_video_size").toHaveCount(1);
+    expect(
+        ".modal-content:contains(Select a media) .media_iframe_video .media_iframe_video_size"
+    ).toHaveCount(1);
     // Wait for options to be rendered before interaction
-    await waitFor(".modal-content:contains(Select a media) .o_video_dialog_form .o_video_dialog_options");
+    await waitFor(
+        ".modal-content:contains(Select a media) .o_video_dialog_form .o_video_dialog_options"
+    );
     // Toggle the “Vertical” option
-    const verticalToggle = queryOne('.modal-content:contains("Select a media") .o_video_dialog_form .o_video_dialog_options label:contains(Vertical) input');
+    const verticalToggle = queryOne(
+        '.modal-content:contains("Select a media") .o_video_dialog_form .o_video_dialog_options label:contains(Vertical) input'
+    );
     verticalToggle.click();
 
     // Confirm vertical class is applied in the preview area
-    await waitFor(".modal-content:contains(Select a media) .media_iframe_video .media_iframe_video_size_for_vertical");
-    queryOne('.modal-content:contains(Select a media) footer button:contains(Add)').click();
+    await waitFor(
+        ".modal-content:contains(Select a media) .media_iframe_video .media_iframe_video_size_for_vertical"
+    );
+    queryOne(".modal-content:contains(Select a media) footer button:contains(Add)").click();
     await animationFrame();
     // Verify the vertical class persists in the website preview
     expect(":iframe .media_iframe_video .media_iframe_video_size_for_vertical").toHaveCount(1);
     // Reopen configurator and ensure the vertical setting is still active
     await dblclick(":iframe iframe");
-    await waitFor(".modal-content:contains(Select a media) .media_iframe_video .media_iframe_video_size_for_vertical");
+    await waitFor(
+        ".modal-content:contains(Select a media) .media_iframe_video .media_iframe_video_size_for_vertical"
+    );
 });
diff --git a/addons/website/static/tests/builder/website_builder/carousel.test.js b/addons/website/static/tests/builder/website_builder/carousel.test.js
index d24dba3daebe8..1bbc7e92a2728 100644
--- a/addons/website/static/tests/builder/website_builder/carousel.test.js
+++ b/addons/website/static/tests/builder/website_builder/carousel.test.js
@@ -1,5 +1,8 @@
 import { expect, test } from "@odoo/hoot";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 import { contains } from "@web/../tests/web_test_helpers";
 
 defineWebsiteModels();
diff --git a/addons/website/static/tests/builder/website_builder/carousel_item.test.js b/addons/website/static/tests/builder/website_builder/carousel_item.test.js
index 8b2b0e029ad5e..9fb887bcfe9fe 100644
--- a/addons/website/static/tests/builder/website_builder/carousel_item.test.js
+++ b/addons/website/static/tests/builder/website_builder/carousel_item.test.js
@@ -1,6 +1,9 @@
 import { expect, test } from "@odoo/hoot";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 import { waitFor } from "@odoo/hoot-dom";
 
 defineWebsiteModels();
diff --git a/addons/website/static/tests/builder/website_builder/chart_option.test.js b/addons/website/static/tests/builder/website_builder/chart_option.test.js
index 25a50ccd5bfbf..f929c68dadc07 100644
--- a/addons/website/static/tests/builder/website_builder/chart_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/chart_option.test.js
@@ -1,5 +1,8 @@
 import { describe, expect, test } from "@odoo/hoot";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 import { contains } from "@web/../tests/web_test_helpers";
 import { animationFrame, press, queryFirst } from "@odoo/hoot-dom";
 
@@ -70,7 +73,9 @@ describe("Differences between pie & non-pie charts", () => {
         await setupWebsiteBuilder(chartTemplate(type, getData(type)));
         await contains(":iframe .s_chart").click();
         await animationFrame();
-        await contains(".options-container table [data-action-id=updateDatasetLabel]:last input").click();
+        await contains(
+            ".options-container table [data-action-id=updateDatasetLabel]:last input"
+        ).click();
         await animationFrame();
         expect(
             ".options-container [data-label='Dataset Color'] button.o_we_color_preview"
@@ -91,7 +96,9 @@ describe("Differences between pie & non-pie charts", () => {
         await setupWebsiteBuilder(chartTemplate(type, getData(type)));
         await contains(":iframe .s_chart").click();
         await animationFrame();
-        await contains(".options-container table [data-action-id=updateDatasetLabel]:first input").click();
+        await contains(
+            ".options-container table [data-action-id=updateDatasetLabel]:first input"
+        ).click();
         await animationFrame();
         expect(
             ".options-container [data-label='Dataset Color'] button.o_we_color_preview"
@@ -117,7 +124,9 @@ describe("Differences between pie & non-pie charts", () => {
         await setupWebsiteBuilder(chartTemplate(type, getData(type)));
         await contains(":iframe .s_chart").click();
         await animationFrame();
-        await contains(".options-container table td:nth-child(3) [data-action-id=updateDatasetValue]:first input").click();
+        await contains(
+            ".options-container table td:nth-child(3) [data-action-id=updateDatasetValue]:first input"
+        ).click();
         await animationFrame();
         expect(
             ".options-container [data-label='Data Color'] button.o_we_color_preview"
@@ -138,7 +147,9 @@ describe("Differences between pie & non-pie charts", () => {
         await setupWebsiteBuilder(chartTemplate(type, getData(type)));
         await contains(":iframe .s_chart").click();
         await animationFrame();
-        await contains(".options-container table td:nth-child(2) [data-action-id=updateDatasetValue]:first input").click();
+        await contains(
+            ".options-container table td:nth-child(2) [data-action-id=updateDatasetValue]:first input"
+        ).click();
         await animationFrame();
         expect(
             ".options-container [data-label='Data Color'] button.o_we_color_preview"
diff --git a/addons/website/static/tests/builder/website_builder/cookies_bar_option.test.js b/addons/website/static/tests/builder/website_builder/cookies_bar_option.test.js
index 91795616108c4..8b423d91863d7 100644
--- a/addons/website/static/tests/builder/website_builder/cookies_bar_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/cookies_bar_option.test.js
@@ -3,7 +3,10 @@ import { insertText } from "@html_editor/../tests/_helpers/user_actions";
 import { describe, expect, test } from "@odoo/hoot";
 import { queryOne, waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/website_builder/customize_website_color.test.js b/addons/website/static/tests/builder/website_builder/customize_website_color.test.js
index 9d80f5c255480..af5e9f7aef033 100644
--- a/addons/website/static/tests/builder/website_builder/customize_website_color.test.js
+++ b/addons/website/static/tests/builder/website_builder/customize_website_color.test.js
@@ -2,7 +2,11 @@ import { expect, test } from "@odoo/hoot";
 import { animationFrame, Deferred } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
 import { contains, defineModels, models, onRpc } from "@web/../tests/web_test_helpers";
-import { addOption, defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    addOption,
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/website_builder/dynamic_svg_option.test.js b/addons/website/static/tests/builder/website_builder/dynamic_svg_option.test.js
index d26be9822acb4..b2a98e554ef3e 100644
--- a/addons/website/static/tests/builder/website_builder/dynamic_svg_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/dynamic_svg_option.test.js
@@ -1,7 +1,10 @@
 import { expect, test } from "@odoo/hoot";
 import { waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/website_builder/edition_bootstrap.test.js b/addons/website/static/tests/builder/website_builder/edition_bootstrap.test.js
index 19f98ba55dc5a..883d66930e90f 100644
--- a/addons/website/static/tests/builder/website_builder/edition_bootstrap.test.js
+++ b/addons/website/static/tests/builder/website_builder/edition_bootstrap.test.js
@@ -1,7 +1,10 @@
 import { expect, test } from "@odoo/hoot";
 import { waitFor } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/website_builder/form_option.test.js b/addons/website/static/tests/builder/website_builder/form_option.test.js
index ea0e996ea4de1..3aa664fb490ec 100644
--- a/addons/website/static/tests/builder/website_builder/form_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/form_option.test.js
@@ -386,7 +386,9 @@ test("Form using the Outgoing Mails model includes hidden email_to field", async
     await contains("div.o-dropdown-item:contains('Send an E-mail')").click();
 
     expect(":iframe input[type='hidden'][name='email_to']").toHaveCount(1);
-    expect(":iframe input[type='hidden'][name='email_to']").toHaveValue("info@yourcompany.example.com");
+    expect(":iframe input[type='hidden'][name='email_to']").toHaveValue(
+        "info@yourcompany.example.com"
+    );
 });
 
 test("Last list entry cannot be removed", async () => {
diff --git a/addons/website/static/tests/builder/website_builder/map_option.test.js b/addons/website/static/tests/builder/website_builder/map_option.test.js
index 8b29dec19ad21..709eee28517fc 100644
--- a/addons/website/static/tests/builder/website_builder/map_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/map_option.test.js
@@ -1,6 +1,9 @@
 import { expect, test } from "@odoo/hoot";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
@@ -19,8 +22,12 @@ test("test description option", async () => {
     // Check Gradient tab background color
     await contains("div[data-label='Background Color'] .o_we_color_preview").click();
     await contains(".o_popover .o_font_color_selector .btn-tab:contains('Gradient')").click();
-    await contains(".o_colorpicker_sections .o_color_button[data-color='linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)']").click();
-    expect(":iframe .s_map .description").toHaveStyle({ "background-image": "linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)" });
+    await contains(
+        ".o_colorpicker_sections .o_color_button[data-color='linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)']"
+    ).click();
+    expect(":iframe .s_map .description").toHaveStyle({
+        "background-image": "linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)",
+    });
 
     // Check Custom tab background color
     await contains("div[data-label='Background Color'] .o_we_color_preview").click();
@@ -31,5 +38,5 @@ test("test description option", async () => {
     // Check text color
     await contains("div[data-label='Text Color'] .o_we_color_preview").click();
     await contains(".o_popover .o_colorpicker_widget .o_hex_input").edit("#EB28EB");
-    expect(":iframe .s_map .description").toHaveStyle({ "color": "rgb(235, 40, 235)" });
+    expect(":iframe .s_map .description").toHaveStyle({ color: "rgb(235, 40, 235)" });
 });
diff --git a/addons/website/static/tests/builder/website_builder/menu_data.test.js b/addons/website/static/tests/builder/website_builder/menu_data.test.js
index 797a018ea3ecd..e619e01aaa56f 100644
--- a/addons/website/static/tests/builder/website_builder/menu_data.test.js
+++ b/addons/website/static/tests/builder/website_builder/menu_data.test.js
@@ -1,6 +1,9 @@
 import { describe, expect, test, beforeEach } from "@odoo/hoot";
 import { waitFor, waitForNone, click, queryOne } from "@odoo/hoot-dom";
-import { defineWebsiteModels, setupWebsiteBuilder } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilder,
+} from "@website/../tests/builder/website_helpers";
 import { setupEditor } from "@html_editor/../tests/_helpers/editor";
 import { setSelection } from "@html_editor/../tests/_helpers/selection";
 import { expectElementCount } from "@html_editor/../tests/_helpers/ui_expectations";
@@ -153,12 +156,10 @@ describe("MenuDialog", () => {
                 this.website.pageDocument = el.ownerDocument;
             },
         });
-        onRpc("/website/get_suggested_links", () => {
-            return {
-                matching_pages: [],
-                others: [],
-            };
-        });
+        onRpc("/website/get_suggested_links", () => ({
+            matching_pages: [],
+            others: [],
+        }));
         expect(".o-we-linkpopover:has(button.js_edit_menu)").toHaveCount(0);
         // open navbar link popover
         setSelection({ anchorNode: el.querySelector(".nav-link > span"), anchorOffset: 0 });
@@ -240,12 +241,10 @@ describe("EditMenuDialog", () => {
             return sampleMenuData;
         });
 
-        onRpc("/website/get_suggested_links", () => {
-            return {
-                matching_pages: [],
-                others: [],
-            };
-        });
+        onRpc("/website/get_suggested_links", () => ({
+            matching_pages: [],
+            others: [],
+        }));
 
         expect(".o-we-linkpopover:has(button.js_edit_menu)").toHaveCount(0);
         // open navbar link popover
@@ -284,12 +283,10 @@ describe("EditMenuDialog", () => {
             return sampleMenuData;
         });
 
-        onRpc("/website/get_suggested_links", () => {
-            return {
-                matching_pages: [],
-                others: [],
-            };
-        });
+        onRpc("/website/get_suggested_links", () => ({
+            matching_pages: [],
+            others: [],
+        }));
 
         await waitFor(".o-we-linkpopover");
         await click(".js_edit_menu");
@@ -324,12 +321,10 @@ describe("EditMenuDialog", () => {
             return sampleMenuData;
         });
 
-        onRpc("/website/get_suggested_links", () => {
-            return {
-                matching_pages: [],
-                others: [],
-            };
-        });
+        onRpc("/website/get_suggested_links", () => ({
+            matching_pages: [],
+            others: [],
+        }));
 
         const editor = getEditor();
 
diff --git a/addons/website/static/tests/builder/website_builder/steps_options.test.js b/addons/website/static/tests/builder/website_builder/steps_options.test.js
index 3f963e11234ea..057f930e9d147 100644
--- a/addons/website/static/tests/builder/website_builder/steps_options.test.js
+++ b/addons/website/static/tests/builder/website_builder/steps_options.test.js
@@ -1,6 +1,9 @@
 import { expect, test } from "@odoo/hoot";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/builder/website_builder/timeline_option.test.js b/addons/website/static/tests/builder/website_builder/timeline_option.test.js
index 1d92ea81f3399..9c721e2d6c057 100644
--- a/addons/website/static/tests/builder/website_builder/timeline_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/timeline_option.test.js
@@ -1,7 +1,10 @@
 import { expect, test } from "@odoo/hoot";
 import { queryAll, queryAllTexts } from "@odoo/hoot-dom";
 import { contains } from "@web/../tests/web_test_helpers";
-import { defineWebsiteModels, setupWebsiteBuilderWithSnippet } from "@website/../tests/builder/website_helpers";
+import {
+    defineWebsiteModels,
+    setupWebsiteBuilderWithSnippet,
+} from "@website/../tests/builder/website_helpers";
 
 defineWebsiteModels();
 
diff --git a/addons/website/static/tests/core/public_component_edit.test.js b/addons/website/static/tests/core/public_component_edit.test.js
index ec76000127021..bdf4bb320bc1b 100644
--- a/addons/website/static/tests/core/public_component_edit.test.js
+++ b/addons/website/static/tests/core/public_component_edit.test.js
@@ -12,8 +12,7 @@ test(`owl components are neutered in edit mode`, async () => {
     class MyPublicComp extends Component {
         static template = xml`<div>hello</div>`;
         static props = ["*"];
-        setup() {
-        }
+        setup() {}
     }
     publicComponentRegistry.add("my_public_comp", MyPublicComp);
 
@@ -35,7 +34,7 @@ test(`owl components are neutered in edit mode`, async () => {
         </owl-component>
     `);
 
-    await switchToEditMode(core)
+    await switchToEditMode(core);
     await animationFrame();
 
     // in edit mode, we have pointer-events: none on owl-component
@@ -46,15 +45,13 @@ test(`owl components are neutered in edit mode`, async () => {
             </owl-root>
         </owl-component>
     `);
-
 });
 
 test(`edit owl components are not neutered in edit mode`, async () => {
     class MyPublicComp extends Component {
         static template = xml`<div>hello</div>`;
         static props = ["*"];
-        setup() {
-        }
+        setup() {}
     }
     publicComponentRegistry.add("my_public_comp", MyPublicComp);
     publicComponentRegistryEdit.add("my_public_comp", MyPublicComp);
@@ -77,10 +74,10 @@ test(`edit owl components are not neutered in edit mode`, async () => {
         </owl-component>
     `);
 
-    await switchToEditMode(core)
+    await switchToEditMode(core);
     await animationFrame();
 
-    // in edit mode, there should not be a pointer-events: none 
+    // in edit mode, there should not be a pointer-events: none
     expect(`.test`).toHaveInnerHTML(`
         <owl-component name="my_public_comp" >
             <owl-root contenteditable="false" data-oe-protected="true" style="display: contents;">
@@ -88,6 +85,4 @@ test(`edit owl components are not neutered in edit mode`, async () => {
             </owl-root>
         </owl-component>
     `);
-
 });
-
diff --git a/addons/website/static/tests/helpers.js b/addons/website/static/tests/helpers.js
index 8b7da7e01371e..44cee7427c306 100644
--- a/addons/website/static/tests/helpers.js
+++ b/addons/website/static/tests/helpers.js
@@ -11,9 +11,7 @@ export async function switchToEditMode(core) {
     core.stopInteractions();
     const activeInteractions = setupInteractionWhiteList.getWhiteList();
     const unmatchedInteractions = activeInteractions ? new Set(activeInteractions) : new Set();
-    const builders = registry
-        .category("public.interactions.edit")
-        .getEntries();
+    const builders = registry.category("public.interactions.edit").getEntries();
     for (const [key, builder] of builders) {
         if (activeInteractions && !activeInteractions.includes(key)) {
             builder.isAbstract = true;
@@ -21,9 +19,7 @@ export async function switchToEditMode(core) {
         unmatchedInteractions.delete(key);
     }
     if (unmatchedInteractions.size) {
-        throw new Error(
-            `White-listed Interaction does not exist: ${[...unmatchedInteractions]}.`
-        );
+        throw new Error(`White-listed Interaction does not exist: ${[...unmatchedInteractions]}.`);
     }
     const Interactions = builders.map((builder) => builder[1]);
     const editableInteractions = buildEditableInteractions(Interactions);
diff --git a/addons/website/static/tests/interactions/animate_overflow.test.js b/addons/website/static/tests/interactions/animate_overflow.test.js
index d798b80daf83d..53a0d48d93a71 100644
--- a/addons/website/static/tests/interactions/animate_overflow.test.js
+++ b/addons/website/static/tests/interactions/animate_overflow.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { manuallyDispatchProgrammaticEvent, queryOne } from "@odoo/hoot-dom";
diff --git a/addons/website/static/tests/interactions/bottom_fixed_element.test.js b/addons/website/static/tests/interactions/bottom_fixed_element.test.js
index 6d240898e6289..0b256b89b8cba 100644
--- a/addons/website/static/tests/interactions/bottom_fixed_element.test.js
+++ b/addons/website/static/tests/interactions/bottom_fixed_element.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, getFixture, test } from "@odoo/hoot";
 import { manuallyDispatchProgrammaticEvent, queryOne, queryRect, scroll } from "@odoo/hoot-dom";
@@ -19,17 +16,17 @@ const scrollTo = async function (el, scrollTarget, bottomFixedElement) {
     bottomFixedElement.style.left = `calc(50% - ${queryRect(bottomFixedElement).width / 2}px)`;
     // Dispatch the scroll event
     await manuallyDispatchProgrammaticEvent(document, "scroll");
-}
+};
 
 const scrollToMiddle = async function (el, bottomFixedElement) {
     // 2550 = headerHeight + mainHeight + footerHeight
-    await scrollTo(el, 2550 / 2 - queryRect(bottomFixedElement).height, bottomFixedElement)
-}
+    await scrollTo(el, 2550 / 2 - queryRect(bottomFixedElement).height, bottomFixedElement);
+};
 
 const scrollToBottom = async function (el, bottomFixedElement) {
     // 2550 = headerHeight + mainHeight + footerHeight
-    await scrollTo(el, 2550 - queryRect(bottomFixedElement).height, bottomFixedElement)
-}
+    await scrollTo(el, 2550 - queryRect(bottomFixedElement).height, bottomFixedElement);
+};
 
 const getTemplate = function (options = {}) {
     const withButtonLeft = options.withButtonLeft || false;
@@ -49,7 +46,7 @@ const getTemplate = function (options = {}) {
             ${emptyDiv}
         </footer>
     `;
-}
+};
 
 test("bottom_fixed_element is started when there is an element #wrapwrap", async () => {
     const { core } = await startInteractions(getTemplate());
diff --git a/addons/website/static/tests/interactions/carousel/carousel.test.js b/addons/website/static/tests/interactions/carousel/carousel.test.js
index d54a47956ad69..0cad5b5d8f53b 100644
--- a/addons/website/static/tests/interactions/carousel/carousel.test.js
+++ b/addons/website/static/tests/interactions/carousel/carousel.test.js
@@ -39,7 +39,7 @@ const defaultCarouselStyleSnippet = (bsRide, bsInterval) => `
         </div>
     </section>`;
 
-const imageGalleryCarouselStyleSnippet = (bsRide, bsInterval) =>`
+const imageGalleryCarouselStyleSnippet = (bsRide, bsInterval) => `
     <section class="s_image_gallery o_slideshow pt24 pb24 s_image_gallery_controllers_outside s_image_gallery_controllers_outside_arrows_right s_image_gallery_indicators_dots s_image_gallery_arrows_default" data-snippet="s_image_gallery" data-vcss="002" data-columns="3">
         <div class="o_container_small overflow-hidden">
             <div id="slideshow_sample" class="carousel carousel-dark slide" data-bs-ride="${bsRide}" data-bs-interval="${bsInterval}">
diff --git a/addons/website/static/tests/interactions/footer_slideout.test.js b/addons/website/static/tests/interactions/footer_slideout.test.js
index 1ac946bf9f5d5..40724d37a8d83 100644
--- a/addons/website/static/tests/interactions/footer_slideout.test.js
+++ b/addons/website/static/tests/interactions/footer_slideout.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { queryAll, queryFirst } from "@odoo/hoot-dom";
@@ -31,7 +28,7 @@ test("footer_slideout adds a pixel if the effect is enabled on safari", async ()
     `);
     expect(core.interactions).toHaveLength(1);
     expect(queryAll("#wrapwrap > div")).toHaveLength(1);
-    expect("#wrapwrap > div").toHaveStyle({ "width": "1px" });
+    expect("#wrapwrap > div").toHaveStyle({ width: "1px" });
     core.stopInteractions();
     expect(core.interactions).toHaveLength(0);
     expect(queryFirst("#wrapwrap > div")).toBe(null);
diff --git a/addons/website/static/tests/interactions/header/base_header.test.js b/addons/website/static/tests/interactions/header/base_header.test.js
index 2e3c8b5b15398..38dc22715e38f 100644
--- a/addons/website/static/tests/interactions/header/base_header.test.js
+++ b/addons/website/static/tests/interactions/header/base_header.test.js
@@ -1,13 +1,8 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 
-import {
-    getTemplateWithoutHideOnScroll,
-} from "./helpers";
+import { getTemplateWithoutHideOnScroll } from "./helpers";
 
 setupInteractionWhiteList("website.header_standard");
 
diff --git a/addons/website/static/tests/interactions/header/base_header_special.test.js b/addons/website/static/tests/interactions/header/base_header_special.test.js
index 91ad5448377cf..b0cb9e6b52194 100644
--- a/addons/website/static/tests/interactions/header/base_header_special.test.js
+++ b/addons/website/static/tests/interactions/header/base_header_special.test.js
@@ -1,13 +1,8 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 
-import {
-    getTemplateWithoutHideOnScroll,
-} from "./helpers";
+import { getTemplateWithoutHideOnScroll } from "./helpers";
 
 setupInteractionWhiteList("website.header_disappears");
 
diff --git a/addons/website/static/tests/interactions/header/header_top.test.js b/addons/website/static/tests/interactions/header/header_top.test.js
index 23227438152d0..a847ab0881a37 100644
--- a/addons/website/static/tests/interactions/header/header_top.test.js
+++ b/addons/website/static/tests/interactions/header/header_top.test.js
@@ -1,9 +1,6 @@
 import { describe, expect, test } from "@odoo/hoot";
 
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 setupInteractionWhiteList("website.header_top");
 describe.current.tags("interaction_dev");
diff --git a/addons/website/static/tests/interactions/multirange_input.test.js b/addons/website/static/tests/interactions/multirange_input.test.js
index 1caed03d45c26..2db55225c89de 100644
--- a/addons/website/static/tests/interactions/multirange_input.test.js
+++ b/addons/website/static/tests/interactions/multirange_input.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { queryAll } from "@odoo/hoot-dom";
diff --git a/addons/website/static/tests/interactions/parallax.test.js b/addons/website/static/tests/interactions/parallax.test.js
index 319819f3ab35c..3a45638d4f842 100644
--- a/addons/website/static/tests/interactions/parallax.test.js
+++ b/addons/website/static/tests/interactions/parallax.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, getFixture, test } from "@odoo/hoot";
 import { manuallyDispatchProgrammaticEvent, queryOne, queryRect, scroll } from "@odoo/hoot-dom";
@@ -22,7 +19,7 @@ const getTemplate = function (options = {}) {
         </section>
         <section style="height: ${height}px; background-color: #FFCCCC;"></section>
     `;
-}
+};
 
 const simulateScrolls = async function (fixture) {
     fixture.style.overflow = "scroll";
@@ -36,7 +33,7 @@ const simulateScrolls = async function (fixture) {
         spacings.push(spacing);
     }
     return spacings;
-}
+};
 
 test("parallax is started when there is an element .parallax", async () => {
     const { core } = await startInteractions(getTemplate());
diff --git a/addons/website/static/tests/interactions/plausible_push.test.js b/addons/website/static/tests/interactions/plausible_push.test.js
index b040ae7b69056..24010a0f0cfa6 100644
--- a/addons/website/static/tests/interactions/plausible_push.test.js
+++ b/addons/website/static/tests/interactions/plausible_push.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 
@@ -27,5 +24,5 @@ test("plausible_push interaction notifies plausible if .js_plausible_push", asyn
     `);
     expect(core.interactions).toHaveLength(1);
     expect(window.plausible.q[0][0]).toBe("Lead Generation");
-    expect(window.plausible.q[0][1]).toEqual({ props: {"CTA": "Contact Us"} });
+    expect(window.plausible.q[0][1]).toEqual({ props: { CTA: "Contact Us" } });
 });
diff --git a/addons/website/static/tests/interactions/ripple_effect.test.js b/addons/website/static/tests/interactions/ripple_effect.test.js
index a7454cf8ff561..951d07df635c3 100644
--- a/addons/website/static/tests/interactions/ripple_effect.test.js
+++ b/addons/website/static/tests/interactions/ripple_effect.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { click, queryFirst } from "@odoo/hoot-dom";
diff --git a/addons/website/static/tests/interactions/snippets/countdown.edit.test.js b/addons/website/static/tests/interactions/snippets/countdown.edit.test.js
index fe7e5fbf29874..fcaca8a665ee3 100644
--- a/addons/website/static/tests/interactions/snippets/countdown.edit.test.js
+++ b/addons/website/static/tests/interactions/snippets/countdown.edit.test.js
@@ -9,7 +9,9 @@ setupInteractionWhiteList("website.countdown");
 const getTemplate = function (options = { endAction: "nothing", endTime: "98765432100" }) {
     return `
         <div style="background-color: white;">
-            <section class="s_countdown pt48 pb48 ${options.endAction === "message_no_countdown" ? "hide-countdown" : ""}"
+            <section class="s_countdown pt48 pb48 ${
+                options.endAction === "message_no_countdown" ? "hide-countdown" : ""
+            }"
             data-display="dhms"
             data-end-action="${options.endAction}"
             data-size="175"
@@ -33,7 +35,7 @@ const getTemplate = function (options = { endAction: "nothing", endTime: "987654
                 ${["message", "message_no_countdown"].includes(options.endAction) ? endMessage : ""}
             </section>
         </div>
-    `
+    `;
 };
 
 const endMessage = `
diff --git a/addons/website/static/tests/interactions/snippets/countdown.test.js b/addons/website/static/tests/interactions/snippets/countdown.test.js
index e6f8432c3be11..7e331de8fd7b2 100644
--- a/addons/website/static/tests/interactions/snippets/countdown.test.js
+++ b/addons/website/static/tests/interactions/snippets/countdown.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { queryAll, queryOne, tick } from "@odoo/hoot-dom";
@@ -14,7 +11,9 @@ describe.current.tags("interaction_dev");
 const getTemplate = function (options = { endAction: "nothing", endTime: "98765432100" }) {
     return `
         <div style="background-color: white;">
-            <section class="s_countdown pt48 pb48 ${options.endAction === "message_no_countdown" ? "hide-countdown" : ""}"
+            <section class="s_countdown pt48 pb48 ${
+                options.endAction === "message_no_countdown" ? "hide-countdown" : ""
+            }"
             data-display="dhms"
             data-end-action="${options.endAction}"
             data-size="175"
@@ -38,7 +37,7 @@ const getTemplate = function (options = { endAction: "nothing", endTime: "987654
                 ${["message", "message_no_countdown"].includes(options.endAction) ? endMessage : ""}
             </section>
         </div>
-    `
+    `;
 };
 
 const endMessage = `
@@ -68,7 +67,7 @@ const wasDataChanged = function (data1, data2, l) {
         }
     }
     return false;
-}
+};
 
 test("countdown is started when there is an element .s_countdown", async () => {
     const { core } = await startInteractions(getTemplate());
@@ -84,30 +83,60 @@ test("countdown is started when there is an element .s_countdown", async () => {
 test("[time] countdown display is updated correctly when time pass", async () => {
     await startInteractions(getTemplate());
 
-    const canvasEls = queryAll('canvas');
+    const canvasEls = queryAll("canvas");
     const canvasHours = canvasEls[1];
     const canvasSeconds = canvasEls[3];
-    const canvasHoursCtx = canvasHours.getContext('2d');
-    const canvasSecondsCtx = canvasSeconds.getContext('2d');
+    const canvasHoursCtx = canvasHours.getContext("2d");
+    const canvasSecondsCtx = canvasSeconds.getContext("2d");
 
     // time T
-    const data1Hours = canvasHoursCtx.getImageData(0, 0, canvasHours.width, canvasHours.height).data;
-    const data1Seconds = canvasSecondsCtx.getImageData(0, 0, canvasSeconds.width, canvasSeconds.height).data;
+    const data1Hours = canvasHoursCtx.getImageData(
+        0,
+        0,
+        canvasHours.width,
+        canvasHours.height
+    ).data;
+    const data1Seconds = canvasSecondsCtx.getImageData(
+        0,
+        0,
+        canvasSeconds.width,
+        canvasSeconds.height
+    ).data;
 
     // time T + 1s
     await advanceTime(1000);
-    const data2Hours = canvasHoursCtx.getImageData(0, 0, canvasHours.width, canvasHours.height).data;
-    const data2Seconds = canvasSecondsCtx.getImageData(0, 0, canvasSeconds.width, canvasSeconds.height).data;
+    const data2Hours = canvasHoursCtx.getImageData(
+        0,
+        0,
+        canvasHours.width,
+        canvasHours.height
+    ).data;
+    const data2Seconds = canvasSecondsCtx.getImageData(
+        0,
+        0,
+        canvasSeconds.width,
+        canvasSeconds.height
+    ).data;
 
     // time T + 2s
     await advanceTime(1000);
-    const data3Hours = canvasHoursCtx.getImageData(0, 0, canvasHours.width, canvasHours.height).data;
-    const data3Seconds = canvasSecondsCtx.getImageData(0, 0, canvasSeconds.width, canvasSeconds.height).data;
+    const data3Hours = canvasHoursCtx.getImageData(
+        0,
+        0,
+        canvasHours.width,
+        canvasHours.height
+    ).data;
+    const data3Seconds = canvasSecondsCtx.getImageData(
+        0,
+        0,
+        canvasSeconds.width,
+        canvasSeconds.height
+    ).data;
 
     // Check that the data are not empty & the same size
 
     const dataHoursLength = data1Hours.length;
-    const dataSecondsLength = data1Seconds.length
+    const dataSecondsLength = data1Seconds.length;
     expect(dataSecondsLength).toBe(dataHoursLength);
     expect(dataSecondsLength).not.toBe(0);
 
diff --git a/addons/website/static/tests/interactions/snippets/embed_code.test.js b/addons/website/static/tests/interactions/snippets/embed_code.test.js
index 5500fca44c8c0..f749e58942e5c 100644
--- a/addons/website/static/tests/interactions/snippets/embed_code.test.js
+++ b/addons/website/static/tests/interactions/snippets/embed_code.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { queryOne } from "@odoo/hoot-dom";
diff --git a/addons/website/static/tests/interactions/snippets/form.test.js b/addons/website/static/tests/interactions/snippets/form.test.js
index 22900bf60132e..8ddd7b8c7ae61 100644
--- a/addons/website/static/tests/interactions/snippets/form.test.js
+++ b/addons/website/static/tests/interactions/snippets/form.test.js
@@ -119,7 +119,9 @@ function createFileUploadForm(maxFiles = 1) {
                                         <div class="o_files_zone row gx-1"></div>
                                         <input type="file" class="form-control s_website_form_input"
                                             name="File Upload" required id="o3xe8o85w0ct"
-                                           ${maxFiles > 1 ? "multiple" : ""} data-max-files-number="${maxFiles}" data-max-file-size="64">
+                                           ${
+                                               maxFiles > 1 ? "multiple" : ""
+                                           } data-max-files-number="${maxFiles}" data-max-file-size="64">
                                     </div>
                                 </div>
                             </div>
@@ -258,9 +260,7 @@ test("(name) form checks conditions", async () => {
     await advanceTime(400); // Debounce delay.
     checkField(nameEl, true, false);
     // Submit
-    onRpc("/website/form/mail.mail", async () => {
-        return {};
-    });
+    onRpc("/website/form/mail.mail", async () => ({}));
     await click("a.s_website_form_send");
     checkField(nameEl, true, false);
 });
@@ -315,9 +315,7 @@ test("(mail) form checks conditions", async () => {
     await advanceTime(400); // Debounce delay.
     checkField(mailEl, true, false);
     // Submit
-    onRpc("/website/form/mail.mail", async () => {
-        return {};
-    });
+    onRpc("/website/form/mail.mail", async () => ({}));
     await click("a.s_website_form_send");
     checkField(mailEl, true, false);
 });
@@ -352,9 +350,7 @@ test("(subject) form checks conditions", async () => {
     await advanceTime(400); // Debounce delay.
     checkField(subjectEl, true, false);
     // Submit
-    onRpc("/website/form/mail.mail", async () => {
-        return {};
-    });
+    onRpc("/website/form/mail.mail", async () => ({}));
     await click("a.s_website_form_send");
     checkField(subjectEl, true, false);
 });
@@ -389,9 +385,7 @@ test("(question) form checks conditions", async () => {
     await advanceTime(400); // Debounce delay.
     checkField(questionEl, true, true);
     // Submit
-    onRpc("/website/form/mail.mail", async () => {
-        return {};
-    });
+    onRpc("/website/form/mail.mail", async () => ({}));
     await click("a.s_website_form_send");
     checkField(questionEl, true, false);
 });
diff --git a/addons/website/static/tests/interactions/snippets/gallery.test.js b/addons/website/static/tests/interactions/snippets/gallery.test.js
index ad08e62c11056..053f7038b958b 100644
--- a/addons/website/static/tests/interactions/snippets/gallery.test.js
+++ b/addons/website/static/tests/interactions/snippets/gallery.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { animationFrame, click, press, queryAll } from "@odoo/hoot-dom";
@@ -91,6 +88,7 @@ test("gallery interaction opens lightbox on click, then use mouse", async () =>
     await checkLightbox({
         close: async (lightboxEl) => await click(lightboxEl.querySelector(".btn-close")),
         next: async (lightboxEl) => await click(lightboxEl.querySelector(".carousel-control-next")),
-        previous: async (lightboxEl) => await click(lightboxEl.querySelector(".carousel-control-prev")),
+        previous: async (lightboxEl) =>
+            await click(lightboxEl.querySelector(".carousel-control-prev")),
     });
 });
diff --git a/addons/website/static/tests/interactions/snippets/gallery_slider.test.js b/addons/website/static/tests/interactions/snippets/gallery_slider.test.js
index 28cb7d115542e..38a229fb7fada 100644
--- a/addons/website/static/tests/interactions/snippets/gallery_slider.test.js
+++ b/addons/website/static/tests/interactions/snippets/gallery_slider.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, getFixture, test } from "@odoo/hoot";
 import { animationFrame, click, queryOne } from "@odoo/hoot-dom";
diff --git a/addons/website/static/tests/interactions/snippets/media_dialog.edit.test.js b/addons/website/static/tests/interactions/snippets/media_dialog.edit.test.js
index 91a59165bdff7..61a5c73f82d77 100644
--- a/addons/website/static/tests/interactions/snippets/media_dialog.edit.test.js
+++ b/addons/website/static/tests/interactions/snippets/media_dialog.edit.test.js
@@ -16,10 +16,7 @@ const videoTemplate = `
 `;
 
 test("media video: iframe not replaced in edition if present", async () => {
-    const { core } = await startInteractions(
-        videoTemplate,
-        { editMode: true },
-    );
+    const { core } = await startInteractions(videoTemplate, { editMode: true });
     expect("iframe[original='true']").toHaveCount(1);
     expect("iframe").toHaveCount(1);
     await switchToEditMode(core);
@@ -28,10 +25,9 @@ test("media video: iframe not replaced in edition if present", async () => {
 });
 
 test("media video: iframe replaced in edition if not present", async () => {
-    const { core } = await startInteractions(
-        videoTemplate.replace(/<iframe.*<\/iframe>/, ''),
-        { editMode: true },
-    );
+    const { core } = await startInteractions(videoTemplate.replace(/<iframe.*<\/iframe>/, ""), {
+        editMode: true,
+    });
     expect("iframe").toHaveCount(0);
     await switchToEditMode(core);
     expect("iframe").toHaveCount(1);
diff --git a/addons/website/static/tests/interactions/snippets/search_bar.test.js b/addons/website/static/tests/interactions/snippets/search_bar.test.js
index fdcd00cc7d659..64486139e032e 100644
--- a/addons/website/static/tests/interactions/snippets/search_bar.test.js
+++ b/addons/website/static/tests/interactions/snippets/search_bar.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { click, press, queryAll, queryOne } from "@odoo/hoot-dom";
@@ -45,29 +42,29 @@ function supportAutocomplete() {
         expect(json.params.options.displayExtraLink).toBe("true");
         expect(json.params.options.displayDetail).toBe("false");
         return {
-            "results": [
+            results: [
                 {
-                    "_fa": "fa-file-o",
-                    "name": "Xyz 1",
-                    "website_url": "/website/test/xyz-1",
+                    _fa: "fa-file-o",
+                    name: "Xyz 1",
+                    website_url: "/website/test/xyz-1",
                 },
                 {
-                    "_fa": "fa-file-o",
-                    "name": "Xyz 2",
-                    "website_url": "/website/test/xyz-2",
+                    _fa: "fa-file-o",
+                    name: "Xyz 2",
+                    website_url: "/website/test/xyz-2",
                 },
                 {
-                    "_fa": "fa-file-o",
-                    "name": "Xyz 3",
-                    "website_url": "/website/test/xyz-3",
-                }
+                    _fa: "fa-file-o",
+                    name: "Xyz 3",
+                    website_url: "/website/test/xyz-3",
+                },
             ],
-            "results_count": 3,
-            "parts": {
-                "name": true,
-                "website_url": true,
+            results_count: 3,
+            parts: {
+                name: true,
+                website_url: true,
             },
-            "fuzzy_search": false
+            fuzzy_search: false,
         };
     });
 }
diff --git a/addons/website/static/tests/interactions/text_highlight.test.js b/addons/website/static/tests/interactions/text_highlight.test.js
index 1f2791b99ad88..08f9faf98f39d 100644
--- a/addons/website/static/tests/interactions/text_highlight.test.js
+++ b/addons/website/static/tests/interactions/text_highlight.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { animationFrame, queryAll, queryFirst } from "@odoo/hoot-dom";
diff --git a/addons/website/static/tests/interactions/zoomed_background_shape.test.js b/addons/website/static/tests/interactions/zoomed_background_shape.test.js
index 767112fada87f..5020ba0b6ccb5 100644
--- a/addons/website/static/tests/interactions/zoomed_background_shape.test.js
+++ b/addons/website/static/tests/interactions/zoomed_background_shape.test.js
@@ -1,7 +1,4 @@
-import {
-    startInteractions,
-    setupInteractionWhiteList,
-} from "@web/../tests/public/helpers";
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
 
 import { describe, expect, test } from "@odoo/hoot";
 import { queryOne } from "@odoo/hoot-dom";
@@ -22,9 +19,9 @@ test("zoomed_background_shape is not needed without zoom", async () => {
     expect(core.interactions).toHaveLength(1);
     const shapeEl = queryOne(".o_we_shape");
     expect(shapeEl).not.toHaveAttribute("style", /left:/);
-    expect(shapeEl).toHaveStyle({"left": "0px"});
+    expect(shapeEl).toHaveStyle({ left: "0px" });
     expect(shapeEl).not.toHaveAttribute("style", /right:/);
-    expect(shapeEl).toHaveStyle({"right": "0px"});
+    expect(shapeEl).toHaveStyle({ right: "0px" });
 });
 
 // TODO: @mysterious-egg check if it s ok in mobile
@@ -42,8 +39,8 @@ test("zoomed_background_shape applies correction on zoom", async () => {
     const shapeEl = queryOne(".o_we_shape");
     // Adjustment depends on window size during test.
     expect(shapeEl).toHaveAttribute("style", /left:/);
-    expect(shapeEl).not.toHaveStyle({"left": "0px"});
+    expect(shapeEl).not.toHaveStyle({ left: "0px" });
     expect(shapeEl).toHaveAttribute("style", /right:/);
-    expect(shapeEl).not.toHaveStyle({"right": "0px"});
+    expect(shapeEl).not.toHaveStyle({ right: "0px" });
     expect(shapeEl).toHaveStyle({ left: shapeEl.style.right });
 });
diff --git a/addons/website/static/tests/mock_server/mock_models/website_page.js b/addons/website/static/tests/mock_server/mock_models/website_page.js
index 1136a8b9aa6d9..2c2ab9c109d9a 100644
--- a/addons/website/static/tests/mock_server/mock_models/website_page.js
+++ b/addons/website/static/tests/mock_server/mock_models/website_page.js
@@ -6,4 +6,3 @@ export class WebsitePage extends models.Model {
 
     name = fields.Char();
 }
-
diff --git a/addons/website/static/tests/new_content_systray_item.test.js b/addons/website/static/tests/new_content_systray_item.test.js
index 3d9372ed53e4f..0e96bdd693133 100644
--- a/addons/website/static/tests/new_content_systray_item.test.js
+++ b/addons/website/static/tests/new_content_systray_item.test.js
@@ -1,10 +1,5 @@
 import { expect, test } from "@odoo/hoot";
-import {
-    mountWithCleanup,
-    onRpc,
-    contains,
-    mockService,
-} from "@web/../tests/web_test_helpers";
+import { mountWithCleanup, onRpc, contains, mockService } from "@web/../tests/web_test_helpers";
 import { NewContentSystrayItem } from "@website/client_actions/website_preview/new_content_systray_item";
 import { defineWebsiteModels } from "./builder/website_helpers";
 
diff --git a/addons/website/static/tests/redirect_field.test.js b/addons/website/static/tests/redirect_field.test.js
index a25807e8183f0..0f0cc466628f2 100644
--- a/addons/website/static/tests/redirect_field.test.js
+++ b/addons/website/static/tests/redirect_field.test.js
@@ -31,8 +31,8 @@ class Appointment extends models.Model {
                         <field name="is_published" widget="website_redirect_button" />
                     </div>
                 </sheet>
-            </form>`
-    }
+            </form>`,
+    };
 }
 
 defineModels([Appointment]);
diff --git a/addons/website/static/tests/tour_utils/lifecycle_dep_interaction.js b/addons/website/static/tests/tour_utils/lifecycle_dep_interaction.js
index 9b4d5e1630342..bc5ea6fe04746 100644
--- a/addons/website/static/tests/tour_utils/lifecycle_dep_interaction.js
+++ b/addons/website/static/tests/tour_utils/lifecycle_dep_interaction.js
@@ -9,9 +9,9 @@ odoo.loader.bus.addEventListener("module-started", (e) => {
 
     const { Interaction } = e.detail.module;
 
-    const localStorageKey = 'interactionAndWysiwygLifecycle';
+    const localStorageKey = "interactionAndWysiwygLifecycle";
     if (!localStorage.getItem(localStorageKey)) {
-        localStorage.setItem(localStorageKey, '[]');
+        localStorage.setItem(localStorageKey, "[]");
     }
 
     function addLifecycleStep(step) {
@@ -23,29 +23,25 @@ odoo.loader.bus.addEventListener("module-started", (e) => {
     class CountdownPatch extends Interaction {
         static selector = ".s_countdown";
         dynamicContent = {
-            "_root": {
+            _root: {
                 "t-att-class": () => ({
-                    "interaction_started": true,
+                    interaction_started: true,
                 }),
             },
         };
 
         start() {
-            addLifecycleStep('interactionStart');
+            addLifecycleStep("interactionStart");
         }
 
         destroy() {
-            addLifecycleStep('interactionStop');
+            addLifecycleStep("interactionStop");
         }
     }
 
-    registry
-        .category("public.interactions")
-        .add("website.countdown_patch", CountdownPatch);
+    registry.category("public.interactions").add("website.countdown_patch", CountdownPatch);
 
-    registry
-        .category("public.interactions.edit")
-        .add("website.countdown_patch", {
-            Interaction: CountdownPatch,
-        });
+    registry.category("public.interactions.edit").add("website.countdown_patch", {
+        Interaction: CountdownPatch,
+    });
 });
diff --git a/addons/website/static/tests/tour_utils/lifecycle_patch_wysiwyg.js b/addons/website/static/tests/tour_utils/lifecycle_patch_wysiwyg.js
index dedc1595fabff..f05894faa3c2e 100644
--- a/addons/website/static/tests/tour_utils/lifecycle_patch_wysiwyg.js
+++ b/addons/website/static/tests/tour_utils/lifecycle_patch_wysiwyg.js
@@ -12,7 +12,7 @@ odoo.loader.bus.addEventListener("module-started", (e) => {
     // Cannot be imported for some reason, probably because of this being lazy
     // loaded?
     function addLifecycleStep(step) {
-        const localStorageKey = 'interactionAndWysiwygLifecycle';
+        const localStorageKey = "interactionAndWysiwygLifecycle";
         const oldValue = window.localStorage.getItem(localStorageKey);
         const newValue = JSON.stringify(JSON.parse(oldValue).concat(step));
         window.localStorage.setItem(localStorageKey, newValue);
@@ -37,7 +37,7 @@ odoo.loader.bus.addEventListener("module-started", (e) => {
                 this.__consideredInitialized = true;
             });
             onMounted(() => {
-                addLifecycleStep('wysiwygStarted');
+                addLifecycleStep("wysiwygStarted");
             });
         },
         /**
@@ -45,7 +45,7 @@ odoo.loader.bus.addEventListener("module-started", (e) => {
          */
         editableElements() {
             if (!this.__consideredInitialized) {
-                addLifecycleStep('wysiwygStart');
+                addLifecycleStep("wysiwygStart");
             }
             return super.editableElements(...arguments);
         },
@@ -53,7 +53,7 @@ odoo.loader.bus.addEventListener("module-started", (e) => {
          * @override
          */
         destroy() {
-            addLifecycleStep('wysiwygStop');
+            addLifecycleStep("wysiwygStop");
             super.destroy(...arguments);
         },
     });
diff --git a/addons/website/static/tests/tours/carousel.js b/addons/website/static/tests/tours/carousel.js
index 9a377acff8ddc..d1d5cac749b01 100644
--- a/addons/website/static/tests/tours/carousel.js
+++ b/addons/website/static/tests/tours/carousel.js
@@ -13,43 +13,56 @@ import {
 
 const carouselInnerSelector = ":iframe .carousel-inner";
 
-registerWebsitePreviewTour("carousel_content_removal", {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_carousel',
-        name: 'Carousel',
-        groupName: "Intro",
-}), {
-    trigger: ":iframe .carousel .carousel-item.active .carousel-content",
-    content: "Select the active carousel item.",
-    run: "click",
-}, {
-    trigger: ".overlay .oe_snippet_remove",
-    content: "Remove the active carousel item.",
-    run: "click",
-}, {
-    trigger: ":iframe .carousel .carousel-item.active .container:not(:has(*)):not(:visible)",
-    content: "Check for a carousel slide with an empty container tag",
-},
-    goBackToBlocks(),
-    ...insertSnippet({
-        id: "s_quotes_carousel",
-        name: "Blockquote",
-        groupName: "People",
-}), {
-    trigger: ":iframe .s_quotes_carousel_wrapper .carousel-item.active .s_blockquote",
-    content: "Select the blockquote.",
-    run: "click",
-}, {
-    trigger: ".overlay .oe_snippet_remove",
-    content: "Remove the blockquote from the carousel item.",
-    run: "click",
-}, {
-    trigger: ":iframe .s_quotes_carousel_wrapper .carousel-item.active:not(:has(.s_blockquote))",
-    content: "Check that the blockquote has been removed and the carousel item is empty.",
-}]);
+registerWebsitePreviewTour(
+    "carousel_content_removal",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_carousel",
+            name: "Carousel",
+            groupName: "Intro",
+        }),
+        {
+            trigger: ":iframe .carousel .carousel-item.active .carousel-content",
+            content: "Select the active carousel item.",
+            run: "click",
+        },
+        {
+            trigger: ".overlay .oe_snippet_remove",
+            content: "Remove the active carousel item.",
+            run: "click",
+        },
+        {
+            trigger:
+                ":iframe .carousel .carousel-item.active .container:not(:has(*)):not(:visible)",
+            content: "Check for a carousel slide with an empty container tag",
+        },
+        goBackToBlocks(),
+        ...insertSnippet({
+            id: "s_quotes_carousel",
+            name: "Blockquote",
+            groupName: "People",
+        }),
+        {
+            trigger: ":iframe .s_quotes_carousel_wrapper .carousel-item.active .s_blockquote",
+            content: "Select the blockquote.",
+            run: "click",
+        },
+        {
+            trigger: ".overlay .oe_snippet_remove",
+            content: "Remove the blockquote from the carousel item.",
+            run: "click",
+        },
+        {
+            trigger:
+                ":iframe .s_quotes_carousel_wrapper .carousel-item.active:not(:has(.s_blockquote))",
+            content: "Check that the blockquote has been removed and the carousel item is empty.",
+        },
+    ]
+);
 
 const checkSlides = (number, position) => {
     const nSlide = (n) => `div.carousel-item:eq(${n})`;
@@ -113,7 +126,7 @@ registerWebsitePreviewTour(
             content: "Add a slide",
             trigger: "button.btn.btn-success[aria-label='Add Slide']",
             async run(helpers) {
-                await helpers.click()
+                await helpers.click();
                 await delay(360);
             },
         },
diff --git a/addons/website/static/tests/tours/client_action_iframe_fallback.js b/addons/website/static/tests/tours/client_action_iframe_fallback.js
index 689ed41aa4195..736423d7c9c6b 100644
--- a/addons/website/static/tests/tours/client_action_iframe_fallback.js
+++ b/addons/website/static/tests/tours/client_action_iframe_fallback.js
@@ -1,19 +1,23 @@
-import { registerWebsitePreviewTour } from '@website/js/tours/tour_utils';
+import { registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('client_action_iframe_fallback', {
-    url: '/',
-},
-() => [
+registerWebsitePreviewTour(
+    "client_action_iframe_fallback",
     {
-        content: "Ensure we are on the expected page",
-        trigger: ':iframe html[data-view-xmlid="website.homepage"]',
-    }, {
-        content: "Ensure the iframe fallback is not loaded in test mode",
-        trigger: 'body',
-        run() {
-            if (document.querySelector('iframe[src="/website/iframefallback"]')) {
-                throw new Error("The iframe fallback shouldn't be inside the DOM.");
-            }
-        },
+        url: "/",
     },
-]);
+    () => [
+        {
+            content: "Ensure we are on the expected page",
+            trigger: ':iframe html[data-view-xmlid="website.homepage"]',
+        },
+        {
+            content: "Ensure the iframe fallback is not loaded in test mode",
+            trigger: "body",
+            run() {
+                if (document.querySelector('iframe[src="/website/iframefallback"]')) {
+                    throw new Error("The iframe fallback shouldn't be inside the DOM.");
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/client_action_redirect.js b/addons/website/static/tests/tours/client_action_redirect.js
index 98287680e70e7..c78af79862ea5 100644
--- a/addons/website/static/tests/tours/client_action_redirect.js
+++ b/addons/website/static/tests/tours/client_action_redirect.js
@@ -3,78 +3,85 @@
 import { registry } from "@web/core/registry";
 import { stepUtils } from "@web_tour/tour_utils";
 
-const testUrl = '/test_client_action_redirect';
+const testUrl = "/test_client_action_redirect";
 
-const goToBackendSteps = [{
-    content: "Go to the backend",
-    trigger: 'body',
-    async run() {
-        window.location.assign(`/@${testUrl}`);
+const goToBackendSteps = [
+    {
+        content: "Go to the backend",
+        trigger: "body",
+        async run() {
+            window.location.assign(`/@${testUrl}`);
+        },
+        expectUnloadPage: true,
     },
-    expectUnloadPage: true,
-},
-stepUtils.waitIframeIsReady(),
-{
-    content: "Check we are in the backend",
-    trigger: ".o_website_preview :iframe main:has(#test_contact_BE):has(#test_contact_FE)",
-}];
-const checkEditorSteps = [{
-    content: "Check that the editor is loaded",
-    trigger: ':iframe body.editor_enable',
-    timeout: 30000,
-}, {
-    content: "exit edit mode",
-    trigger: "button[data-action=save]:enabled:contains(save)",
-    run: "click",
-    timeout: 30000,
-}, {
-    content: "wait for editor to close",
-    trigger: ':iframe body:not(.editor_enable)',
-}];
-
-registry.category("web_tour.tours").add('client_action_redirect', {
-    url: testUrl,
-    steps: () => [
-    // Case 1: From frontend, click on `enable_editor=1` link without `/@/` in it
+    stepUtils.waitIframeIsReady(),
     {
-        content: "Check we are in the frontend",
-        trigger: 'body:not(:has(.o_website_preview)) #test_contact_FE',
+        content: "Check we are in the backend",
+        trigger: ".o_website_preview :iframe main:has(#test_contact_BE):has(#test_contact_FE)",
     },
+];
+const checkEditorSteps = [
     {
-        content: "Click on the link to frontend",
-        trigger: '#test_contact_FE',
-        run: "click",
-        expectUnloadPage: true,
+        content: "Check that the editor is loaded",
+        trigger: ":iframe body.editor_enable",
+        timeout: 30000,
     },
-    ...checkEditorSteps,
-
-    // Case 2: From frontend, click on `enable_editor=1` link with `/@/` in it
-    ...goToBackendSteps,
     {
-        content: "Click on the link to backend",
-        trigger: ':iframe #test_contact_BE',
+        content: "exit edit mode",
+        trigger: "button[data-action=save]:enabled:contains(save)",
         run: "click",
-        expectUnloadPage: true,
+        timeout: 30000,
     },
-    ...checkEditorSteps,
-
-    // Case 3: From backend, click on `enable_editor=1` link without `/@/` in it
-    // TODO: This will be fixed in another fix related to the listening of the
-    //       URL changes from the client action.
-    // ...goToBackendSteps,
-    // {
-    //     content: "Click on the link to frontend (2)",
-    //     trigger: ':iframe #test_contact_FR',
-    // },
-    // ...checkEditorSteps,
-
-    // Case 4: From backend, click on `enable_editor=1` link with `/@/` in it
-    ...goToBackendSteps,
     {
-        content: "Click on the link to backend (2)",
-        trigger: ':iframe #test_contact_BE',
-        run: "click",
-        expectUnloadPage: true,
+        content: "wait for editor to close",
+        trigger: ":iframe body:not(.editor_enable)",
     },
-    ...checkEditorSteps,
-]});
+];
+
+registry.category("web_tour.tours").add("client_action_redirect", {
+    url: testUrl,
+    steps: () => [
+        // Case 1: From frontend, click on `enable_editor=1` link without `/@/` in it
+        {
+            content: "Check we are in the frontend",
+            trigger: "body:not(:has(.o_website_preview)) #test_contact_FE",
+        },
+        {
+            content: "Click on the link to frontend",
+            trigger: "#test_contact_FE",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        ...checkEditorSteps,
+
+        // Case 2: From frontend, click on `enable_editor=1` link with `/@/` in it
+        ...goToBackendSteps,
+        {
+            content: "Click on the link to backend",
+            trigger: ":iframe #test_contact_BE",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        ...checkEditorSteps,
+
+        // Case 3: From backend, click on `enable_editor=1` link without `/@/` in it
+        // TODO: This will be fixed in another fix related to the listening of the
+        //       URL changes from the client action.
+        // ...goToBackendSteps,
+        // {
+        //     content: "Click on the link to frontend (2)",
+        //     trigger: ':iframe #test_contact_FR',
+        // },
+        // ...checkEditorSteps,
+
+        // Case 4: From backend, click on `enable_editor=1` link with `/@/` in it
+        ...goToBackendSteps,
+        {
+            content: "Click on the link to backend (2)",
+            trigger: ":iframe #test_contact_BE",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        ...checkEditorSteps,
+    ],
+});
diff --git a/addons/website/static/tests/tours/colorpicker.js b/addons/website/static/tests/tours/colorpicker.js
index 9dffcb59a9f9d..63bf19a3ef08e 100644
--- a/addons/website/static/tests/tours/colorpicker.js
+++ b/addons/website/static/tests/tours/colorpicker.js
@@ -3,26 +3,26 @@ import {
     clickOnSave,
     clickOnEditAndWaitEditMode,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 function selectColorpickerSwitchPanel(type) {
     return [
         {
             content: "Select text snippet",
             trigger: ":iframe #wrap .s_text_block",
-            run: "click"
+            run: "click",
         },
         {
             content: "Click on background-color option",
             trigger: "div[data-label='Background'] .o_we_color_preview[title='Color']",
-            run: "click"
+            run: "click",
         },
         {
             content: "Select type of colorpicker in switch panel",
             trigger: `.o_popover .o_font_color_selector .btn-tab:contains("${type}")`,
-            run: "click"
+            run: "click",
         },
-    ]
+    ];
 }
 
 function checkBackgroundColorWithHEX(hexCode) {
@@ -35,45 +35,51 @@ function checkBackgroundColorWithHEX(hexCode) {
                 if (hex !== hexCode) {
                     console.error("There may be a problem with the RGBA colorpicker");
                 }
-            }
+            },
         },
-    ]
+    ];
 }
 
-registerWebsitePreviewTour("website_background_colorpicker", {
-    edition: true,
-    url: "/",
-}, () => [
-    ...insertSnippet({
-        id: "s_text_block",
-        name: "Text",
-        groupName: "Text",
-    }),
-    ...selectColorpickerSwitchPanel("Gradient"),
-    {
-        content: "Select first gradient element",
-        trigger: ".o_colorpicker_sections .o_color_button[data-color='linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)']",
-        run: "click"
-    },
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-    ...selectColorpickerSwitchPanel("Gradient"),
+registerWebsitePreviewTour(
+    "website_background_colorpicker",
     {
-        content: "Click on custom button to open colorpicker widget",
-        trigger: "button:contains('Custom')[style='background-image: linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%);']",
-        run: "click"
+        edition: true,
+        url: "/",
     },
-    ...checkBackgroundColorWithHEX("#FFCC33"),
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-    ...selectColorpickerSwitchPanel("Custom"),
-    {
-        content: "Select first custom color element",
-        trigger: ".o_colorpicker_section button[data-color='black']",
-        run: "click"
-    },
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-    ...selectColorpickerSwitchPanel("Custom"),
-    ...checkBackgroundColorWithHEX("#000000"),
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_block",
+            name: "Text",
+            groupName: "Text",
+        }),
+        ...selectColorpickerSwitchPanel("Gradient"),
+        {
+            content: "Select first gradient element",
+            trigger:
+                ".o_colorpicker_sections .o_color_button[data-color='linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%)']",
+            run: "click",
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        ...selectColorpickerSwitchPanel("Gradient"),
+        {
+            content: "Click on custom button to open colorpicker widget",
+            trigger:
+                "button:contains('Custom')[style='background-image: linear-gradient(135deg, rgb(255, 204, 51) 0%, rgb(226, 51, 255) 100%);']",
+            run: "click",
+        },
+        ...checkBackgroundColorWithHEX("#FFCC33"),
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        ...selectColorpickerSwitchPanel("Custom"),
+        {
+            content: "Select first custom color element",
+            trigger: ".o_colorpicker_section button[data-color='black']",
+            run: "click",
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        ...selectColorpickerSwitchPanel("Custom"),
+        ...checkBackgroundColorWithHEX("#000000"),
+    ]
+);
diff --git a/addons/website/static/tests/tours/conditional_visibility.js b/addons/website/static/tests/tours/conditional_visibility.js
index dfa833d3bd667..c6a91f1c4c93a 100644
--- a/addons/website/static/tests/tours/conditional_visibility.js
+++ b/addons/website/static/tests/tours/conditional_visibility.js
@@ -6,12 +6,12 @@ import {
     insertSnippet,
     goBackToBlocks,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const snippets = [
     {
-        id: 's_text_image',
-        name: 'Text - Image',
+        id: "s_text_image",
+        name: "Text - Image",
         groupName: "Content",
     },
     {
@@ -25,8 +25,8 @@ const snippets = [
         groupName: "Content",
     },
     {
-        id: 's_image_text',
-        name: 'Image - Text',
+        id: "s_image_text",
+        name: "Image - Text",
         groupName: "Content",
     },
 ];
@@ -36,10 +36,9 @@ function checkEyeIcon(snippetName, visible) {
     const endExplanation = `should be ${openOrClose} in the "Invisible Elements" panel`;
     const invisibleElPanel = "o_we_invisible_el_panel";
     return {
-            content: `The eye icon of ${snippetName} ${endExplanation}`,
-            trigger:
-            `.${invisibleElPanel} .o_we_invisible_entry:contains("${snippetName}") i.${eyeIcon}`,
-        };
+        content: `The eye icon of ${snippetName} ${endExplanation}`,
+        trigger: `.${invisibleElPanel} .o_we_invisible_entry:contains("${snippetName}") i.${eyeIcon}`,
+    };
 }
 function checkEyesIconAfterSave(footerIsHidden = true) {
     const eyeIconChecks = [
@@ -53,245 +52,282 @@ function checkEyesIconAfterSave(footerIsHidden = true) {
     }
     return eyeIconChecks;
 }
-registerWebsitePreviewTour('conditional_visibility_1', {
-    edition: true,
-    url: '/',
-}, () => [
-...insertSnippet(snippets[0]),
-...clickOnSnippet(snippets[0]),
-...changeOptionInPopover("Text - Image", "Visibility", "Conditionally"),
-{
-    content: 'click on utm medium toggler',
-    trigger: '[data-label="UTM Medium"] ~ div button.dropdown-toggle:contains("Choose a record...")',
-    run: 'click',
-},
-{
-    trigger: '.o_popover input',
-    content: 'Search for Email',
-    run: "edit Email",
-},
-{
-    trigger: ".o_popover .o-dropdown-item:contains('Email')",
-    content: 'click on Email',
-    run: 'click',
-},
-...clickOnSave(),
-{
-    trigger: ".o_website_preview",
-},
-{
-    content: 'Check if the rule was applied',
-    trigger: ':iframe #wrap:not(:visible)',
-    run: function (actions) {
-        const style = window.getComputedStyle(this.anchor.getElementsByClassName('s_text_image')[0]);
-        if (style.display !== 'none') {
-            console.error('error This item should be invisible and only visible if utm_medium === email');
-        }
-    },
-},
-...clickOnEditAndWaitEditMode(),
-{
-    content: 'Check if the element is visible as it should always be visible in edit view',
-    trigger: ':iframe #wrap .s_text_image',
-    run: function (actions) {
-        const style = window.getComputedStyle((this.anchor));
-        if (style.display === 'none') {
-            console.error('error This item should now be visible because utm_medium === email');
-        }
-    },
-},
-]);
-
-registerWebsitePreviewTour("conditional_visibility_3", {
-    edition: true,
-    url: "/",
-},
-() => [
-checkEyeIcon("Text - Image", true),
-// Drag a "Banner" snippet on the website.
-...insertSnippet(snippets[1]),
-// Click on the "Banner" snippet.
-...clickOnSnippet(snippets[1]),
-...changeOptionInPopover("Banner", "Visibility", "Conditionally"),
-checkEyeIcon("Banner", true),
-goBackToBlocks(),
-// Drag a "Popup" snippet on the website.
-...insertSnippet(snippets[2]),
-{
-    content: "Wait for the popup to display",
-    trigger: ":iframe .s_popup .modal_shown",
-},
-{
-    content: "Toggle the visibility of the popup",
-    trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Popup')",
-    run: "click",
-},
-checkEyeIcon("Popup", false),
-{
-    content: "Click on footer",
-    trigger: ":iframe #wrapwrap footer",
-    run: "click",
-},
-{
-    content: "Click on Page Visibility",
-    trigger: "[data-container-title='Footer'] [data-label='Page Visibility'] [data-action-id='setWebsiteFooterVisible'] .form-check-input",
-    run: "click",
-},
-checkEyeIcon("Footer", false),
-{
-    content: "Click on Header",
-    trigger: ":iframe #wrapwrap header",
-    run: "click",
-},
-...changeOptionInPopover("Header", "Header Position", "[data-action-value='hidden']"),
-checkEyeIcon("Header", false),
-...clickOnSnippet(snippets[1]),
-...changeOptionInPopover("Banner", "Visibility", "Conditionally"),
-{
-    content: "Toggle the visibility of the Banner",
-    trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Banner')",
-    run: "click",
-},
-checkEyeIcon("Banner", false),
-...clickOnSave(),
-...clickOnEditAndWaitEditMode(),
-...checkEyesIconAfterSave(),
-]);
-
-registerWebsitePreviewTour("conditional_visibility_4", {
-    edition: true,
-    url: "/",
-},
-() => [
-// Click on the "Text-Image" snippet.
-...clickOnSnippet(snippets[0]),
-{
-    content: "Click on the 'move down' option",
-    trigger: ".o_overlay_options button.fa-angle-down",
-    run: "click",
-},
-...checkEyesIconAfterSave(),
-{
-    content: "Check the order on the 'Invisible Elements' panel",
-    trigger: ".o_we_invisible_el_panel div:nth-child(3):contains('Banner')",
-},
-{
-    content: "Toggle the visibility of the Footer",
-    trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Footer')",
-    run: "click",
-},
-{
-    content: "Check that the footer is visible",
-    trigger: ":iframe #wrapwrap footer",
-},
-// Click on the "Banner" snippet.
-...clickOnSnippet(snippets[1]),
-{
-    content: "Drag the 'Banner' snippet to the end of the page",
-    trigger: ".o_overlay_options button.o_move_handle",
-    run: "drag_and_drop :iframe #wrapwrap footer",
-},
-...checkEyesIconAfterSave(false),
-{
-    content: "Check the order on the 'Invisible Elements' panel",
-    trigger: ".o_we_invisible_el_panel div:nth-child(3):contains('Text - Image')",
-},
-]);
-
-registerWebsitePreviewTour("conditional_visibility_5", {
-    edition: true,
-    url: "/",
-}, () => [
-    {
-        content: "Toggle the visibility of the Footer",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Footer')",
-        run: "click",
-    },
-    {
-        content: "Check that the footer is visible",
-        trigger: ":iframe #wrapwrap footer",
-    },
-    goBackToBlocks(),
-    ...insertSnippet(snippets[3]),
-    {
-        content: "Click on the image of the dragged snippet",
-        trigger: ":iframe .s_text_image[data-snippet=s_image_text] img",
-        run: "click",
-    },
-    {
-        content: "Change visibility of the 'Image - Text' snippet",
-        trigger: "[data-container-title='Column'] [data-label='Visibility'] button[data-action-param='no_desktop']",
-        run: "click",
-    },
-    {
-        content: "Check that the Column has been added in the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Column')",
-    },
-    {
-        content: "Click on the 'Image - Text' snippet",
-        trigger: ":iframe .s_text_image[data-snippet=s_image_text]",
-        run: "click",
-    },
-    {
-        content: "Change visibility of the 'Image - Text' snippet",
-        trigger: "[data-container-title='Image - Text'] [data-label='Visibility'] button[data-action-param='no_desktop']",
-        run: "click",
-    },
-    {
-        content: "Check that only the 'Image - Text' entry is in the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_root_parent.o_we_invisible_entry:contains('Image - Text') + .o_we_invisible_entry:not(.o_we_sublevel_1)",
-    },
-    {
-        content: "Click on the 'Image - Text' entry on the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_root_parent.o_we_invisible_entry:contains('Image - Text')",
-        run: "click",
-    },
-    {
-        content: "Check that the snippet is visible on the website",
-        trigger: ":iframe .s_text_image[data-snippet=s_image_text].o_snippet_desktop_invisible.o_snippet_override_invisible",
-    },
-    {
-        content: "Check that the 'Column' entry is in the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel ul .o_we_invisible_entry.o_we_sublevel_1:contains('Column')",
-    },
-    {
-        content: "Change visibility of the 'Image - Text' snippet",
-        trigger: "[data-container-title='Image - Text'] [data-label='Visibility'] button[data-action-param='no_mobile']",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "conditional_visibility_1",
     {
-        content: "Check that the 'Image - Text' has been removed from the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel:not(:visible):not(:has(.o_we_invisible_entry:contains('Image - Text')))",
-    },
-    {
-        content: "Click on the 'Column' entry on the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Column')",
-        run: "click",
-    },
-    {
-        content: "Check that the column is visible on the website",
-        trigger: ":iframe .s_text_image[data-snippet=s_image_text] .row > .o_snippet_desktop_invisible.o_snippet_override_invisible",
-    },
-    {
-        content: "Change visibility of the 'Image - Text' snippet",
-        trigger: "[data-container-title='Column'] [data-label='Visibility'] button[data-action-param='no_mobile']",
-        run: "click",
-    },
-    {
-        content: "Check that the column has been removed from the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel:not(:visible):not(:has(.o_we_invisible_entry:contains('Column')))",
+        edition: true,
+        url: "/",
     },
+    () => [
+        ...insertSnippet(snippets[0]),
+        ...clickOnSnippet(snippets[0]),
+        ...changeOptionInPopover("Text - Image", "Visibility", "Conditionally"),
+        {
+            content: "click on utm medium toggler",
+            trigger:
+                '[data-label="UTM Medium"] ~ div button.dropdown-toggle:contains("Choose a record...")',
+            run: "click",
+        },
+        {
+            trigger: ".o_popover input",
+            content: "Search for Email",
+            run: "edit Email",
+        },
+        {
+            trigger: ".o_popover .o-dropdown-item:contains('Email')",
+            content: "click on Email",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            trigger: ".o_website_preview",
+        },
+        {
+            content: "Check if the rule was applied",
+            trigger: ":iframe #wrap:not(:visible)",
+            run: function (actions) {
+                const style = window.getComputedStyle(
+                    this.anchor.getElementsByClassName("s_text_image")[0]
+                );
+                if (style.display !== "none") {
+                    console.error(
+                        "error This item should be invisible and only visible if utm_medium === email"
+                    );
+                }
+            },
+        },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check if the element is visible as it should always be visible in edit view",
+            trigger: ":iframe #wrap .s_text_image",
+            run: function (actions) {
+                const style = window.getComputedStyle(this.anchor);
+                if (style.display === "none") {
+                    console.error(
+                        "error This item should now be visible because utm_medium === email"
+                    );
+                }
+            },
+        },
+    ]
+);
+
+registerWebsitePreviewTour(
+    "conditional_visibility_3",
     {
-        content: "Check that the 'Image - Text' entry has been removed from the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel:not(:visible):not(:has(.o_we_invisible_entry:contains('Image - Text')))",
+        edition: true,
+        url: "/",
     },
+    () => [
+        checkEyeIcon("Text - Image", true),
+        // Drag a "Banner" snippet on the website.
+        ...insertSnippet(snippets[1]),
+        // Click on the "Banner" snippet.
+        ...clickOnSnippet(snippets[1]),
+        ...changeOptionInPopover("Banner", "Visibility", "Conditionally"),
+        checkEyeIcon("Banner", true),
+        goBackToBlocks(),
+        // Drag a "Popup" snippet on the website.
+        ...insertSnippet(snippets[2]),
+        {
+            content: "Wait for the popup to display",
+            trigger: ":iframe .s_popup .modal_shown",
+        },
+        {
+            content: "Toggle the visibility of the popup",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Popup')",
+            run: "click",
+        },
+        checkEyeIcon("Popup", false),
+        {
+            content: "Click on footer",
+            trigger: ":iframe #wrapwrap footer",
+            run: "click",
+        },
+        {
+            content: "Click on Page Visibility",
+            trigger:
+                "[data-container-title='Footer'] [data-label='Page Visibility'] [data-action-id='setWebsiteFooterVisible'] .form-check-input",
+            run: "click",
+        },
+        checkEyeIcon("Footer", false),
+        {
+            content: "Click on Header",
+            trigger: ":iframe #wrapwrap header",
+            run: "click",
+        },
+        ...changeOptionInPopover("Header", "Header Position", "[data-action-value='hidden']"),
+        checkEyeIcon("Header", false),
+        ...clickOnSnippet(snippets[1]),
+        ...changeOptionInPopover("Banner", "Visibility", "Conditionally"),
+        {
+            content: "Toggle the visibility of the Banner",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Banner')",
+            run: "click",
+        },
+        checkEyeIcon("Banner", false),
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        ...checkEyesIconAfterSave(),
+    ]
+);
+
+registerWebsitePreviewTour(
+    "conditional_visibility_4",
     {
-        content: "Activate mobile preview",
-        trigger: ".o-snippets-top-actions button[data-action='mobile']",
-        run: "click",
+        edition: true,
+        url: "/",
     },
+    () => [
+        // Click on the "Text-Image" snippet.
+        ...clickOnSnippet(snippets[0]),
+        {
+            content: "Click on the 'move down' option",
+            trigger: ".o_overlay_options button.fa-angle-down",
+            run: "click",
+        },
+        ...checkEyesIconAfterSave(),
+        {
+            content: "Check the order on the 'Invisible Elements' panel",
+            trigger: ".o_we_invisible_el_panel div:nth-child(3):contains('Banner')",
+        },
+        {
+            content: "Toggle the visibility of the Footer",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Footer')",
+            run: "click",
+        },
+        {
+            content: "Check that the footer is visible",
+            trigger: ":iframe #wrapwrap footer",
+        },
+        // Click on the "Banner" snippet.
+        ...clickOnSnippet(snippets[1]),
+        {
+            content: "Drag the 'Banner' snippet to the end of the page",
+            trigger: ".o_overlay_options button.o_move_handle",
+            run: "drag_and_drop :iframe #wrapwrap footer",
+        },
+        ...checkEyesIconAfterSave(false),
+        {
+            content: "Check the order on the 'Invisible Elements' panel",
+            trigger: ".o_we_invisible_el_panel div:nth-child(3):contains('Text - Image')",
+        },
+    ]
+);
+
+registerWebsitePreviewTour(
+    "conditional_visibility_5",
     {
-        content: "Check that the 'Image - Text' entry is in the 'Invisible Elements' panel",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Image - Text')",
+        edition: true,
+        url: "/",
     },
-]);
+    () => [
+        {
+            content: "Toggle the visibility of the Footer",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Footer')",
+            run: "click",
+        },
+        {
+            content: "Check that the footer is visible",
+            trigger: ":iframe #wrapwrap footer",
+        },
+        goBackToBlocks(),
+        ...insertSnippet(snippets[3]),
+        {
+            content: "Click on the image of the dragged snippet",
+            trigger: ":iframe .s_text_image[data-snippet=s_image_text] img",
+            run: "click",
+        },
+        {
+            content: "Change visibility of the 'Image - Text' snippet",
+            trigger:
+                "[data-container-title='Column'] [data-label='Visibility'] button[data-action-param='no_desktop']",
+            run: "click",
+        },
+        {
+            content: "Check that the Column has been added in the 'Invisible Elements' panel",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Column')",
+        },
+        {
+            content: "Click on the 'Image - Text' snippet",
+            trigger: ":iframe .s_text_image[data-snippet=s_image_text]",
+            run: "click",
+        },
+        {
+            content: "Change visibility of the 'Image - Text' snippet",
+            trigger:
+                "[data-container-title='Image - Text'] [data-label='Visibility'] button[data-action-param='no_desktop']",
+            run: "click",
+        },
+        {
+            content:
+                "Check that only the 'Image - Text' entry is in the 'Invisible Elements' panel",
+            trigger:
+                ".o_we_invisible_el_panel .o_we_invisible_root_parent.o_we_invisible_entry:contains('Image - Text') + .o_we_invisible_entry:not(.o_we_sublevel_1)",
+        },
+        {
+            content: "Click on the 'Image - Text' entry on the 'Invisible Elements' panel",
+            trigger:
+                ".o_we_invisible_el_panel .o_we_invisible_root_parent.o_we_invisible_entry:contains('Image - Text')",
+            run: "click",
+        },
+        {
+            content: "Check that the snippet is visible on the website",
+            trigger:
+                ":iframe .s_text_image[data-snippet=s_image_text].o_snippet_desktop_invisible.o_snippet_override_invisible",
+        },
+        {
+            content: "Check that the 'Column' entry is in the 'Invisible Elements' panel",
+            trigger:
+                ".o_we_invisible_el_panel ul .o_we_invisible_entry.o_we_sublevel_1:contains('Column')",
+        },
+        {
+            content: "Change visibility of the 'Image - Text' snippet",
+            trigger:
+                "[data-container-title='Image - Text'] [data-label='Visibility'] button[data-action-param='no_mobile']",
+            run: "click",
+        },
+        {
+            content:
+                "Check that the 'Image - Text' has been removed from the 'Invisible Elements' panel",
+            trigger:
+                ".o_we_invisible_el_panel:not(:visible):not(:has(.o_we_invisible_entry:contains('Image - Text')))",
+        },
+        {
+            content: "Click on the 'Column' entry on the 'Invisible Elements' panel",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Column')",
+            run: "click",
+        },
+        {
+            content: "Check that the column is visible on the website",
+            trigger:
+                ":iframe .s_text_image[data-snippet=s_image_text] .row > .o_snippet_desktop_invisible.o_snippet_override_invisible",
+        },
+        {
+            content: "Change visibility of the 'Image - Text' snippet",
+            trigger:
+                "[data-container-title='Column'] [data-label='Visibility'] button[data-action-param='no_mobile']",
+            run: "click",
+        },
+        {
+            content: "Check that the column has been removed from the 'Invisible Elements' panel",
+            trigger:
+                ".o_we_invisible_el_panel:not(:visible):not(:has(.o_we_invisible_entry:contains('Column')))",
+        },
+        {
+            content:
+                "Check that the 'Image - Text' entry has been removed from the 'Invisible Elements' panel",
+            trigger:
+                ".o_we_invisible_el_panel:not(:visible):not(:has(.o_we_invisible_entry:contains('Image - Text')))",
+        },
+        {
+            content: "Activate mobile preview",
+            trigger: ".o-snippets-top-actions button[data-action='mobile']",
+            run: "click",
+        },
+        {
+            content: "Check that the 'Image - Text' entry is in the 'Invisible Elements' panel",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Image - Text')",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/conditional_visibility_frontend.js b/addons/website/static/tests/tours/conditional_visibility_frontend.js
index 9d6c8d0e900b0..f88e6d85522de 100644
--- a/addons/website/static/tests/tours/conditional_visibility_frontend.js
+++ b/addons/website/static/tests/tours/conditional_visibility_frontend.js
@@ -1,17 +1,21 @@
 import { registry } from "@web/core/registry";
 
-registry.category("web_tour.tours").add('conditional_visibility_2', {
-    url: '/?utm_medium=Email',
-    steps: () => [{
-    content: 'The content previously hidden should now be visible',
-    trigger: 'body #wrapwrap',
-    run: function (actions) {
-        const style = window.getComputedStyle(
-            this.anchor.getElementsByClassName("s_text_image")[0]
-        );
-        if (style.display === 'none') {
-            console.error('error This item should now be visible because utm_medium === email');
-        }
-    },
-},
-]});
+registry.category("web_tour.tours").add("conditional_visibility_2", {
+    url: "/?utm_medium=Email",
+    steps: () => [
+        {
+            content: "The content previously hidden should now be visible",
+            trigger: "body #wrapwrap",
+            run: function (actions) {
+                const style = window.getComputedStyle(
+                    this.anchor.getElementsByClassName("s_text_image")[0]
+                );
+                if (style.display === "none") {
+                    console.error(
+                        "error This item should now be visible because utm_medium === email"
+                    );
+                }
+            },
+        },
+    ],
+});
diff --git a/addons/website/static/tests/tours/configurator_translation.js b/addons/website/static/tests/tours/configurator_translation.js
index d9c337d11764b..38d6198e8413f 100644
--- a/addons/website/static/tests/tours/configurator_translation.js
+++ b/addons/website/static/tests/tours/configurator_translation.js
@@ -76,34 +76,36 @@ function runConfiguratorFlow(industrySearchText, featureOrPageName) {
     ];
 }
 
-registry.category("web_tour.tours").add('configurator_translation', {
-    url: '/website/configurator',
+registry.category("web_tour.tours").add("configurator_translation", {
+    url: "/website/configurator",
     steps: () => [
-    ...runConfiguratorFlow("in fr", "Parseltongue_pricing"),
-    {
-        content: "Check if the current interface language is active and monkey patch terms",
-        trigger: "body",
-        run() {
-            if (localization.code !== "pa_GB") {
-                throw new Error("The user language is not the correct one");
-            } else {
-                translatedTermsGlobal["Save"] = "Save_Parseltongue";
-            }
-        }
-    },
-    ...clickOnEditAndWaitEditMode(),
-    {
-        // Check the content of the save button to make sure the website is in
-        // Parseltongue. (The editor should be in the website's default language,
-        // which should be parseltongue in this test.)
-        content: "exit edit mode",
-        trigger: ".o-snippets-top-actions button.btn-success:contains('Save_Parseltongue')",
-        run: "click",
-    }, {
-         content: "wait for editor to be closed",
-         trigger: ':iframe #wrapwrap:not(.odoo-editor-editable)',
-    }
-]});
+        ...runConfiguratorFlow("in fr", "Parseltongue_pricing"),
+        {
+            content: "Check if the current interface language is active and monkey patch terms",
+            trigger: "body",
+            run() {
+                if (localization.code !== "pa_GB") {
+                    throw new Error("The user language is not the correct one");
+                } else {
+                    translatedTermsGlobal["Save"] = "Save_Parseltongue";
+                }
+            },
+        },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            // Check the content of the save button to make sure the website is in
+            // Parseltongue. (The editor should be in the website's default language,
+            // which should be parseltongue in this test.)
+            content: "exit edit mode",
+            trigger: ".o-snippets-top-actions button.btn-success:contains('Save_Parseltongue')",
+            run: "click",
+        },
+        {
+            content: "wait for editor to be closed",
+            trigger: ":iframe #wrapwrap:not(.odoo-editor-editable)",
+        },
+    ],
+});
 
 registry.category("web_tour.tours").add("configurator_page_creation", {
     url: "/website/configurator",
@@ -131,7 +133,8 @@ registry.category("web_tour.tours").add("configurator_page_creation", {
         },
         {
             content: "Configurator pages should appear at the start of the landing category",
-            trigger: "[data-id='landing'] .row > :first-child .o_page_template:first-of-type[data-configurator-page]",
+            trigger:
+                "[data-id='landing'] .row > :first-child .o_page_template:first-of-type[data-configurator-page]",
         },
         {
             content: "Exit dialog",
diff --git a/addons/website/static/tests/tours/create_missing_page.js b/addons/website/static/tests/tours/create_missing_page.js
index 8cdd2c89b9426..029e992d5790f 100644
--- a/addons/website/static/tests/tours/create_missing_page.js
+++ b/addons/website/static/tests/tours/create_missing_page.js
@@ -5,182 +5,195 @@ import {
     clickOnSave,
 } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("create_missing_page", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...clickOnSnippet({id: "o_header_standard", name: "Header"}),
-    changeOption("Header", "[aria-label='Open menu editor']"),
-    {
-        content: "Open the link dialog (click 'Add Menu Item')",
-        trigger: ".modal-body a:eq(0)",
-        run: "click",
-    },
-    {
-        content: "Edit the 'Menu Title' input",
-        trigger: ".modal-dialog .o_website_dialog input:eq(0)",
-        run: "edit Zoé’s Diner",
-    },
-    {
-        content: "Check if the 'url' input is correctly slugified.",
-        trigger: ".modal-dialog .o_website_dialog input:eq(1):value('zoe-s-diner')",
-    },
-    {
-        content: "Edit the 'url' input",
-        trigger: ".modal-dialog .o_website_dialog input:eq(1)",
-        run: "edit /contactus",
-    },
-    {
-        content: "Check whether the page is found.",
-        trigger: ".modal-dialog .o_website_dialog main div.position-relative:not(.o_page_not_found)",
-    },
-    {
-        content: "Edit the 'url' input again",
-        trigger: ".modal-dialog .o_website_dialog input:eq(1)",
-        run: "edit zoe-s-diner",
-    },
-    {
-        content: "Check that the page is not found.",
-        trigger: ".modal-dialog .o_website_dialog main div.position-relative.o_page_not_found",
-    },
-    {
-        content: "Confirm the new menu entry",
-        trigger: ".modal-dialog .o_website_dialog .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    // Drag the new menu item to the first position. If this is not done, the
-    // tour fails when the new menu is in the extra menu.
-    {
-        content: "Drag the new menu item at the top",
-        trigger: '.oe_menu_editor li:contains("Zoé’s Diner") .oi-draggable',
-        run(helpers) {
-            return helpers.drag_and_drop('.oe_menu_editor li:contains("Home") .oi-draggable', {
-                position: {
-                    top: 20,
-                },
-                relative: true,
-            });
+registerWebsitePreviewTour(
+    "create_missing_page",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
+        changeOption("Header", "[aria-label='Open menu editor']"),
+        {
+            content: "Open the link dialog (click 'Add Menu Item')",
+            trigger: ".modal-body a:eq(0)",
+            run: "click",
         },
-    },
-    {
-        content: "Click on the 'Create Page' button",
-        trigger: ".oe_menu_editor button:contains('Create Page')",
-        run: "click",
-    },
-    {
-        content: "Click on 'Blank Page'",
-        trigger: ".o_page_template .o_button_area:not(:visible)",
-        run: "click",
-    },
-    {
-        content: "Wait to land on '/zoe-s-diner' page",
-        trigger: ':iframe a[href="/zoe-s-diner"].nav-link.active',
-    },
-    {
-        content: "Wait edit mode",
-        trigger: ".o_builder_sidebar_open",
-    },
-    ...clickOnSnippet({id: "o_header_standard", name: "Header"}),
-    changeOption("Header", "[aria-label='Open menu editor']"),
-    {
-        content: "Check that the 'Create Page' button is missing.",
-        trigger: ".oe_menu_editor .js_menu_label:contains('Zoé’s Diner')",
-        run() {
-            if (this.anchor.closest(".form-control")
-                    .querySelector("button")
-                    ?.textContent.includes('Create Page')) {
-                throw new Error("The 'Create Page' button should be missing");
-            }
+        {
+            content: "Edit the 'Menu Title' input",
+            trigger: ".modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit Zoé’s Diner",
         },
-    },
-    {
-        content: "Save the menu",
-        trigger: ".modal-footer .btn-primary",
-        run: "click",
-    },
-    {
-        content: "Check that we are on the new page.",
-        trigger: ":iframe a[href='/zoe-s-diner'].nav-link.active",
-    },
-    {
-        content: "Check that it is not a 404 page.",
-        trigger: ".o_website_preview:not([data-view-xmlid='website.page_404'])",
-    },
-    {
-        content: "Check that the page title has been correctly set.",
-        trigger: ':iframe head title:contains("Zoé’s Diner"):not(:visible)',
-    },
-    {
-        content: "Click on the 'Zoé’s Diner' link.",
-        trigger: ":iframe a[href='/zoe-s-diner'].nav-link.active span",
-        run: "click",
-    },
-    {
-        content: "Click Edit Menu in the popover.",
-        trigger: ".o-we-linkpopover button.js_edit_menu",
-        run: "click",
-    },
-    {
-        content: "Open the link dialog (click 'Add Menu Item')",
-        trigger: ".modal-body a:eq(0)",
-        run: "click",
-    },
-    {
-        content: "Edit the 'Menu Title' input",
-        trigger: ".modal-dialog .o_website_dialog input:eq(0)",
-        run: "edit The Sea Hotel",
-    },
-    {
-        content: "Edit the 'url' input",
-        trigger: ".modal-dialog .o_website_dialog input:eq(1)",
-        run: "edit sea-hotel",
-    },
-    {
-        content: "Confirm the new menu entry",
-        trigger: ".modal-dialog .o_website_dialog .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    // Drag the new menu item to the first position. If this is not done, the
-    // tour fails when the new menu is in the extra menu.
-    {
-        content: "Drag the new menu item at the top",
-        trigger: '.oe_menu_editor li:contains("The Sea Hotel") .oi-draggable',
-        run(helpers) {
-            return helpers.drag_and_drop('.oe_menu_editor li:contains("Zoé’s Diner") .oi-draggable', {
-                position: {
-                    top: 20,
-                },
-                relative: true,
-            });
+        {
+            content: "Check if the 'url' input is correctly slugified.",
+            trigger: ".modal-dialog .o_website_dialog input:eq(1):value('zoe-s-diner')",
         },
-    },
-    {
-        content: "Save the menu",
-        trigger: ".modal-footer .btn-primary",
-        run: "click",
-    },
-    ...clickOnSave(),
-    {
-        content: "Click on the 'The Sea Hotel' link.",
-        trigger: ":iframe a[href='/sea-hotel'].nav-link",
-        run: "click",
-    },
-    {
-        content: "Click on the 'Create Page' alert button.",
-        trigger: ".o_action_manager .alert a.btn",
-        run: "click",
-    },
-    {
-        content: "Click on 'Blank Page'",
-        trigger: ".o_page_template .o_button_area:not(:visible)",
-        run: "click",
-    },
-    {
-        content: "Wait edit mode",
-        trigger: ".o_builder_sidebar_open",
-    },
-    {
-        content: "Wait to land on '/sea-hotel' page",
-        trigger: ':iframe a[href="/sea-hotel"].nav-link.active',
-    },
-]);
+        {
+            content: "Edit the 'url' input",
+            trigger: ".modal-dialog .o_website_dialog input:eq(1)",
+            run: "edit /contactus",
+        },
+        {
+            content: "Check whether the page is found.",
+            trigger:
+                ".modal-dialog .o_website_dialog main div.position-relative:not(.o_page_not_found)",
+        },
+        {
+            content: "Edit the 'url' input again",
+            trigger: ".modal-dialog .o_website_dialog input:eq(1)",
+            run: "edit zoe-s-diner",
+        },
+        {
+            content: "Check that the page is not found.",
+            trigger: ".modal-dialog .o_website_dialog main div.position-relative.o_page_not_found",
+        },
+        {
+            content: "Confirm the new menu entry",
+            trigger:
+                ".modal-dialog .o_website_dialog .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        // Drag the new menu item to the first position. If this is not done,
+        // the tour fails when the new menu is in the extra menu.
+        {
+            content: "Drag the new menu item at the top",
+            trigger: '.oe_menu_editor li:contains("Zoé’s Diner") .oi-draggable',
+            run(helpers) {
+                return helpers.drag_and_drop('.oe_menu_editor li:contains("Home") .oi-draggable', {
+                    position: {
+                        top: 20,
+                    },
+                    relative: true,
+                });
+            },
+        },
+        {
+            content: "Click on the 'Create Page' button",
+            trigger: ".oe_menu_editor button:contains('Create Page')",
+            run: "click",
+        },
+        {
+            content: "Click on 'Blank Page'",
+            trigger: ".o_page_template .o_button_area:not(:visible)",
+            run: "click",
+        },
+        {
+            content: "Wait to land on '/zoe-s-diner' page",
+            trigger: ':iframe a[href="/zoe-s-diner"].nav-link.active',
+        },
+        {
+            content: "Wait edit mode",
+            trigger: ".o_builder_sidebar_open",
+        },
+        ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
+        changeOption("Header", "[aria-label='Open menu editor']"),
+        {
+            content: "Check that the 'Create Page' button is missing.",
+            trigger: ".oe_menu_editor .js_menu_label:contains('Zoé’s Diner')",
+            run() {
+                if (
+                    this.anchor
+                        .closest(".form-control")
+                        .querySelector("button")
+                        ?.textContent.includes("Create Page")
+                ) {
+                    throw new Error("The 'Create Page' button should be missing");
+                }
+            },
+        },
+        {
+            content: "Save the menu",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            content: "Check that we are on the new page.",
+            trigger: ":iframe a[href='/zoe-s-diner'].nav-link.active",
+        },
+        {
+            content: "Check that it is not a 404 page.",
+            trigger: ".o_website_preview:not([data-view-xmlid='website.page_404'])",
+        },
+        {
+            content: "Check that the page title has been correctly set.",
+            trigger: ':iframe head title:contains("Zoé’s Diner"):not(:visible)',
+        },
+        {
+            content: "Click on the 'Zoé’s Diner' link.",
+            trigger: ":iframe a[href='/zoe-s-diner'].nav-link.active span",
+            run: "click",
+        },
+        {
+            content: "Click Edit Menu in the popover.",
+            trigger: ".o-we-linkpopover button.js_edit_menu",
+            run: "click",
+        },
+        {
+            content: "Open the link dialog (click 'Add Menu Item')",
+            trigger: ".modal-body a:eq(0)",
+            run: "click",
+        },
+        {
+            content: "Edit the 'Menu Title' input",
+            trigger: ".modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit The Sea Hotel",
+        },
+        {
+            content: "Edit the 'url' input",
+            trigger: ".modal-dialog .o_website_dialog input:eq(1)",
+            run: "edit sea-hotel",
+        },
+        {
+            content: "Confirm the new menu entry",
+            trigger:
+                ".modal-dialog .o_website_dialog .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        // Drag the new menu item to the first position. If this is not done,
+        // the tour fails when the new menu is in the extra menu.
+        {
+            content: "Drag the new menu item at the top",
+            trigger: '.oe_menu_editor li:contains("The Sea Hotel") .oi-draggable',
+            run(helpers) {
+                return helpers.drag_and_drop(
+                    '.oe_menu_editor li:contains("Zoé’s Diner") .oi-draggable',
+                    {
+                        position: {
+                            top: 20,
+                        },
+                        relative: true,
+                    }
+                );
+            },
+        },
+        {
+            content: "Save the menu",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Click on the 'The Sea Hotel' link.",
+            trigger: ":iframe a[href='/sea-hotel'].nav-link",
+            run: "click",
+        },
+        {
+            content: "Click on the 'Create Page' alert button.",
+            trigger: ".o_action_manager .alert a.btn",
+            run: "click",
+        },
+        {
+            content: "Click on 'Blank Page'",
+            trigger: ".o_page_template .o_button_area:not(:visible)",
+            run: "click",
+        },
+        {
+            content: "Wait edit mode",
+            trigger: ".o_builder_sidebar_open",
+        },
+        {
+            content: "Wait to land on '/sea-hotel' page",
+            trigger: ':iframe a[href="/sea-hotel"].nav-link.active',
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/default_shape_gets_palette_colors.js b/addons/website/static/tests/tours/default_shape_gets_palette_colors.js
index c202aa800b4de..0639647a7f626 100644
--- a/addons/website/static/tests/tours/default_shape_gets_palette_colors.js
+++ b/addons/website/static/tests/tours/default_shape_gets_palette_colors.js
@@ -5,28 +5,36 @@ import {
     registerWebsitePreviewTour,
 } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("default_shape_gets_palette_colors", {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
-    ...clickOnSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-    }),
-    changeOption("Text - Image", "toggleBgShape"),
+registerWebsitePreviewTour(
+    "default_shape_gets_palette_colors",
     {
-        content: "Check that shape does not have a background-image in its inline style",
-        trigger: ':iframe #wrap .s_text_image .o_we_shape',
-        run({ queryFirst }) {
-            const shape = queryFirst(":iframe :not(.o_ignore_in_tour) #wrap .s_text_image .o_we_shape");
-            if (shape.style.backgroundImage) {
-                throw new Error("The default shape has a background-image in its inline style (should rely on the class)");
-            }
-        },
+        url: "/",
+        edition: true,
     },
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        ...clickOnSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+        }),
+        changeOption("Text - Image", "toggleBgShape"),
+        {
+            content: "Check that shape does not have a background-image in its inline style",
+            trigger: ":iframe #wrap .s_text_image .o_we_shape",
+            run({ queryFirst }) {
+                const shape = queryFirst(
+                    ":iframe :not(.o_ignore_in_tour) #wrap .s_text_image .o_we_shape"
+                );
+                if (shape.style.backgroundImage) {
+                    throw new Error(
+                        "The default shape has a background-image in its inline style (should rely on the class)"
+                    );
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/drag_and_drop_on_non_editable.js b/addons/website/static/tests/tours/drag_and_drop_on_non_editable.js
index 5da8f4d836451..d5328a0a1311d 100644
--- a/addons/website/static/tests/tours/drag_and_drop_on_non_editable.js
+++ b/addons/website/static/tests/tours/drag_and_drop_on_non_editable.js
@@ -1,34 +1,45 @@
-import { insertSnippet, goBackToBlocks, registerWebsitePreviewTour } from '@website/js/tours/tour_utils';
+import {
+    insertSnippet,
+    goBackToBlocks,
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("test_drag_and_drop_on_non_editable", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_company_team",
-        name: "Team",
-        groupName: "People",
-    }),
+registerWebsitePreviewTour(
+    "test_drag_and_drop_on_non_editable",
     {
-        content: "Click on an editable media in non editable env.",
-        trigger: ":iframe .s_company_team .o_not_editable > .o_editable_media",
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Verify that the Replace options is in the editor.",
-        trigger: "[data-label='Media'] button[data-action-id='replaceMedia']",
-    },
-    goBackToBlocks(),
-    {
-        trigger: ".o_builder_sidebar_open .o_snippet",
-    },
-    {
-        content: "Drag and drop the Text Highlight building block next to the Team block media.",
-        trigger: ".o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Text Highlight'].o_draggable .o_snippet_thumbnail",
-        run: "drag_and_drop :iframe .s_company_team .o_not_editable > .o_editable_media",
-    },
-    {
-        content: "Verify that the Text Highlight building block isn't in a non editable element.",
-        trigger: ":iframe .s_company_team :not(.o_not_editable) > .s_text_highlight",
-    },
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_company_team",
+            name: "Team",
+            groupName: "People",
+        }),
+        {
+            content: "Click on an editable media in non editable env.",
+            trigger: ":iframe .s_company_team .o_not_editable > .o_editable_media",
+            run: "click",
+        },
+        {
+            content: "Verify that the Replace options is in the editor.",
+            trigger: "[data-label='Media'] button[data-action-id='replaceMedia']",
+        },
+        goBackToBlocks(),
+        {
+            trigger: ".o_builder_sidebar_open .o_snippet",
+        },
+        {
+            content:
+                "Drag and drop the Text Highlight building block next to the Team block media.",
+            trigger:
+                ".o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Text Highlight'].o_draggable .o_snippet_thumbnail",
+            run: "drag_and_drop :iframe .s_company_team .o_not_editable > .o_editable_media",
+        },
+        {
+            content:
+                "Verify that the Text Highlight building block isn't in a non editable element.",
+            trigger: ":iframe .s_company_team :not(.o_not_editable) > .s_text_highlight",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/drop_404_ir_attachment_url.js b/addons/website/static/tests/tours/drop_404_ir_attachment_url.js
index 6ef3f0a81ac37..2746d29b61255 100644
--- a/addons/website/static/tests/tours/drop_404_ir_attachment_url.js
+++ b/addons/website/static/tests/tours/drop_404_ir_attachment_url.js
@@ -2,52 +2,59 @@ import {
     changeOption,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { onceAllImagesLoaded } from "@website/utils/images";
 
-registerWebsitePreviewTour('drop_404_ir_attachment_url', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_404_snippet',
-        name: '404 Snippet',
-        groupName: "Images",
-    }),
+registerWebsitePreviewTour(
+    "drop_404_ir_attachment_url",
     {
-        content: 'Click on the snippet image',
-        trigger: ':iframe .s_404_snippet img',
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    {
-        trigger: "[data-action-id='replaceMedia']",
-    },
-    {
-        content: 'Once the image UI appears, check the image has no size (404)',
-        trigger: ':iframe .s_404_snippet img',
-        async run() {
-            const imgEl = this.anchor;
-            await onceAllImagesLoaded(imgEl);
-            if (imgEl.naturalWidth !== 0 || imgEl.naturalHeight !== 0) {
-                throw new Error('This is supposed to be a 404 image');
-            }
+    () => [
+        ...insertSnippet({
+            id: "s_404_snippet",
+            name: "404 Snippet",
+            groupName: "Images",
+        }),
+        {
+            content: "Click on the snippet image",
+            trigger: ":iframe .s_404_snippet img",
+            run: "click",
         },
-    },
-    changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
-    {
-        content: "Click on the first image shape",
-        trigger: "[data-action-id='setImageShape']",
-        run: "click",
-    },
-    {
-        content: 'Once the shape is applied, check the image has now a size (placeholder image)',
-        trigger: ':iframe .s_404_snippet img[src^="data:"]',
-        async run() {
-            const imgEl = this.anchor;
-            await onceAllImagesLoaded(imgEl);
-            if (imgEl.naturalWidth === 0 || imgEl.naturalHeight === 0) {
-                throw new Error('Even though the original image was a 404, the option should have been applied on the placeholder image');
-            }
+        {
+            trigger: "[data-action-id='replaceMedia']",
         },
-    },
-]);
+        {
+            content: "Once the image UI appears, check the image has no size (404)",
+            trigger: ":iframe .s_404_snippet img",
+            async run() {
+                const imgEl = this.anchor;
+                await onceAllImagesLoaded(imgEl);
+                if (imgEl.naturalWidth !== 0 || imgEl.naturalHeight !== 0) {
+                    throw new Error("This is supposed to be a 404 image");
+                }
+            },
+        },
+        changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
+        {
+            content: "Click on the first image shape",
+            trigger: "[data-action-id='setImageShape']",
+            run: "click",
+        },
+        {
+            content:
+                "Once the shape is applied, check the image has now a size (placeholder image)",
+            trigger: ':iframe .s_404_snippet img[src^="data:"]',
+            async run() {
+                const imgEl = this.anchor;
+                await onceAllImagesLoaded(imgEl);
+                if (imgEl.naturalWidth === 0 || imgEl.naturalHeight === 0) {
+                    throw new Error(
+                        "Even though the original image was a 404, the option should have been applied on the placeholder image"
+                    );
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/dropdowns_and_header_hide_on_scroll.js b/addons/website/static/tests/tours/dropdowns_and_header_hide_on_scroll.js
index 0b74b1593c677..04f49a93328ed 100644
--- a/addons/website/static/tests/tours/dropdowns_and_header_hide_on_scroll.js
+++ b/addons/website/static/tests/tours/dropdowns_and_header_hide_on_scroll.js
@@ -31,45 +31,57 @@ const scrollDownToMediaList = function () {
     };
 };
 
-registerWebsitePreviewTour("dropdowns_and_header_hide_on_scroll", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({id: "s_media_list", name: "Media List", groupName: "Content"}),
-    selectHeader(),
-    ...changeOptionInPopover("Header", "Scroll Effect", ".dropdown-item:contains('Fixed')"),
+registerWebsitePreviewTour(
+    "dropdowns_and_header_hide_on_scroll",
     {
-        content: "Wait for the option to be applied",
-        trigger: "[data-label='Scroll Effect'] .dropdown-toggle:contains('Fixed')",
-        timeout: 30000,
+        url: "/",
+        edition: true,
     },
-    {
-        trigger: ":iframe #wrapwrap header.o_header_fixed",
-    },
-    selectHeader(),
-    ...changeOptionInPopover("Header", "Template", ".dropdown-item[data-action-param*=sales_two]"),
-    {
-        trigger: ":iframe .o_header_sales_two_top",
-        timeout: 30000,
-    },
-    {
-        content: "check that header_sales_two_opt is well selected",
-        trigger: ":iframe #wrapwrap header.o_header_fixed div[aria-label=Middle] div[role=search]",
-    },
-    ...clickOnSave(undefined, 30000),
-    ...checkIfUserMenuNotMasked(),
-    // We scroll the page a little because when clicking on the dropdown, the
-    // page needs to scroll to the top first and then open the dropdown menu.
-    scrollDownToMediaList(),
-    ...checkIfUserMenuNotMasked(),
-    // We scroll the page again because when typing in the searchbar input, the
-    // page needs also to scroll to the top first and then open the dropdown
-    // with the search results.
-    scrollDownToMediaList(),
-    {
-        content: "Type a search query into the searchbar input",
-        trigger: ":iframe #wrapwrap header .s_searchbar_input input.search-query",
-        run: "edit a",
-    },
-    checkIfVisibleOnScreen(":iframe #wrapwrap header .s_searchbar_input.show .o_dropdown_menu.show"),
-]);
+    () => [
+        ...insertSnippet({ id: "s_media_list", name: "Media List", groupName: "Content" }),
+        selectHeader(),
+        ...changeOptionInPopover("Header", "Scroll Effect", ".dropdown-item:contains('Fixed')"),
+        {
+            content: "Wait for the option to be applied",
+            trigger: "[data-label='Scroll Effect'] .dropdown-toggle:contains('Fixed')",
+            timeout: 30000,
+        },
+        {
+            trigger: ":iframe #wrapwrap header.o_header_fixed",
+        },
+        selectHeader(),
+        ...changeOptionInPopover(
+            "Header",
+            "Template",
+            ".dropdown-item[data-action-param*=sales_two]"
+        ),
+        {
+            trigger: ":iframe .o_header_sales_two_top",
+            timeout: 30000,
+        },
+        {
+            content: "check that header_sales_two_opt is well selected",
+            trigger:
+                ":iframe #wrapwrap header.o_header_fixed div[aria-label=Middle] div[role=search]",
+        },
+        ...clickOnSave(undefined, 30000),
+        ...checkIfUserMenuNotMasked(),
+        // We scroll the page a little because when clicking on the dropdown,
+        // the page needs to scroll to the top first and then open the dropdown
+        // menu.
+        scrollDownToMediaList(),
+        ...checkIfUserMenuNotMasked(),
+        // We scroll the page again because when typing in the searchbar input,
+        // the page needs also to scroll to the top first and then open the
+        // dropdown with the search results.
+        scrollDownToMediaList(),
+        {
+            content: "Type a search query into the searchbar input",
+            trigger: ":iframe #wrapwrap header .s_searchbar_input input.search-query",
+            run: "edit a",
+        },
+        checkIfVisibleOnScreen(
+            ":iframe #wrapwrap header .s_searchbar_input.show .o_dropdown_menu.show"
+        ),
+    ]
+);
diff --git a/addons/website/static/tests/tours/edit_link_popover.js b/addons/website/static/tests/tours/edit_link_popover.js
index 8e0c66d9a06ee..27caa7bae55a2 100644
--- a/addons/website/static/tests/tours/edit_link_popover.js
+++ b/addons/website/static/tests/tours/edit_link_popover.js
@@ -7,7 +7,7 @@ import {
 import { browser } from "@web/core/browser/browser";
 import { patch } from "@web/core/utils/patch";
 
-const FIRST_PARAGRAPH = ':iframe #wrap .s_text_image p:nth-child(2)';
+const FIRST_PARAGRAPH = ":iframe #wrap .s_text_image p:nth-child(2)";
 
 const clickEditLink = {
     content: "Click on Edit Link in Popover",
@@ -28,164 +28,182 @@ const editLinkAndApply = (url) => [
     },
 ];
 
-registerWebsitePreviewTour('edit_link_popover', {
-    url: '/',
-    edition: true,
-}, () => [
-    // 1. Test links in page content (web_editor)
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
-    {
-        content: "Click on a paragraph",
-        trigger: FIRST_PARAGRAPH,
-        run: "editor Paragraph", // Make sure the selection is set in the paragraph
-    },
-    ...clickToolbarButton("Paragraph", "#wrap .s_text_image p", "Add a link", false),
-    ...editLinkAndApply("/contactus"),
-    ...openLinkPopup(`${FIRST_PARAGRAPH} a`, "/contactus", 1, true),
-    {
-        content: "Popover should be shown for contact us",
-        trigger: ".o-we-linkpopover .o_we_url_link:contains('Contact Us')",
-    },
-    clickEditLink,
-    ...editLinkAndApply("/"),
-    {
-        content: "Remove paragraph selection",
-        trigger: ":iframe body",
-        async run() {
-            const el = this.anchor;
-            const sel = el.ownerDocument.getSelection();
-            sel.removeAllRanges();
+registerWebsitePreviewTour(
+    "edit_link_popover",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        // 1. Test links in page content (web_editor)
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            content: "Click on a paragraph",
+            trigger: FIRST_PARAGRAPH,
+            run: "editor Paragraph", // Make sure the selection is set in the paragraph
         },
-    },
-    ...openLinkPopup(`${FIRST_PARAGRAPH} a`, "/", 1, true),
-    {
-        content: "Popover should be shown for home",
-        trigger: ".o-we-linkpopover .o_we_url_link:contains('Home')",
-    },
-    {
-        content: "Click on Remove Link in Popover",
-        trigger: ".o-we-linkpopover .o_we_remove_link",
-        run: "click",
-    },
-    {
-        content: "Link should be removed",
-        trigger: `${FIRST_PARAGRAPH}:not(:has(a))`,
-    },
-    {
-        content: "Ensure popover is closed",
-        trigger: ".o-overlay-container:not(:visible:has(.o-we-linkpopover))", // popover should be closed
-    },
-    // 2. Test links in navbar (website)
-    {
-        content: "Click navbar menu Home",
-        trigger: ':iframe .top_menu a:contains("Home")',
-        run: "click",
-    },
-    ...openLinkPopup(":iframe #o_main_nav a.nav-link:contains('Home')", "/contactus", 1, false),
-    {
-        content: "Popover should be shown (2)",
-        trigger: ".o-we-linkpopover .o_we_url_link:contains('Home')",
-    },
-    clickEditLink,
-    {
-        content: "Change the URL",
-        trigger: ".modal-dialog #url_input",
-        run: "edit /contactus",
-    },
-    {
-        content: "Save the Edit Menu modal",
-        trigger: ".modal-footer .btn-primary",
-        run: "click",
-    },
-    ...openLinkPopup(":iframe .top_menu a:contains('Home')[href='/contactus']", "/contactus", 0, true),
-    {
-        content: "Popover should be shown with updated preview data (2)",
-        trigger: ".o-we-linkpopover .o_we_url_link:contains('Contact Us')",
-    },
-    {
-        content: "Click on Edit Menu in Popover",
-        trigger: ".o-we-linkpopover .js_edit_menu",
-        run: "click",
-    },
-    {
-        content: "Edit Menu (tree) should open",
-        trigger: ".o_website_dialog .oe_menu_editor",
-    },
-    {
-        content: "Close modal",
-        trigger: ".modal-footer .btn-secondary",
-        run: "click",
-    },
-    {
-        content: "Check that the modal is closed",
-        trigger: ":iframe html:not(.modal-body)",
-    },
-    // 3. Test other links (CTA in navbar & links in footer)
-    ...openLinkPopup(":iframe #o_main_nav a.btn-primary[href='/contactus']", "CTA", 1, true),
-    {
-        content: "Popover should be shown (3)",
-        trigger: ".o-we-linkpopover .o_we_url_link:contains('Contact Us')",
-    },
-    ...openLinkPopup(":iframe footer a[href='/']", "Footer Home", 1, true),
-    {
-        content: "Popover should be shown (4)",
-        trigger: ".o-we-linkpopover .o_we_url_link:contains('Home')",
-    },
-    // 4. Popover should close when clicking non-link element
-    {
-        content: "Click outside the link popover",
-        trigger: ":iframe body",
-        run: "click",
-    },
-    {
-        content: "Ensure popover is closed",
-        trigger: ".o-overlay-container:not(:visible:has(.o-we-linkpopover))", // popover should be closed
-    },
-    // 5. Double click should not open popover but should open toolbar link
-    {
-        content: "Double click on link",
-        trigger: ':iframe footer a[href="/"]',
-        async run(actions) {
-            // Create range to simulate real double click, see pull request
-            const el = this.anchor;
-            const sel = el.ownerDocument.getSelection();
-            sel.collapse(el.childNodes[1], 1);
-            await actions.click();
-            await actions.dblclick();
+        ...clickToolbarButton("Paragraph", "#wrap .s_text_image p", "Add a link", false),
+        ...editLinkAndApply("/contactus"),
+        ...openLinkPopup(`${FIRST_PARAGRAPH} a`, "/contactus", 1, true),
+        {
+            content: "Popover should be shown for contact us",
+            trigger: ".o-we-linkpopover .o_we_url_link:contains('Contact Us')",
         },
-    },
-    {
-        content: "Ensure that the link toolbar is opened",
-        trigger: ".o-we-toolbar button[name='link']",
-    },
-    {
-        content: "Click on the link from toolbar",
-        trigger: ".o-we-toolbar",
-        run: "click",
-    },
-    // 6. Test link popover link opens a new window in edit mode
-    ...openLinkPopup(":iframe footer a[href='/']", "Footer Home", 1, true),
-    {
-        content: "Ensure that a click on the link popover link opens a new window in edit mode",
-        trigger: ".o-we-linkpopover a.o_we_url_link[target='_blank']",
-        run(actions) {
-            // We do not want to open a link in a tour
-            patch(browser, {
-                open(url) {
-                    if (window.location.hostname === url.hostname && url.pathname.startsWith('/@/')) {
-                        document.querySelector('body').classList.add('new_backend_window_opened');
-                    }
-                }
-            }, {pure: true});
-            actions.click();
+        clickEditLink,
+        ...editLinkAndApply("/"),
+        {
+            content: "Remove paragraph selection",
+            trigger: ":iframe body",
+            async run() {
+                const el = this.anchor;
+                const sel = el.ownerDocument.getSelection();
+                sel.removeAllRanges();
+            },
         },
-    },
-    {
-        content: "Ensure that link is opened correctly in edit mode",
-        trigger: '.new_backend_window_opened',
-    },
-]);
+        ...openLinkPopup(`${FIRST_PARAGRAPH} a`, "/", 1, true),
+        {
+            content: "Popover should be shown for home",
+            trigger: ".o-we-linkpopover .o_we_url_link:contains('Home')",
+        },
+        {
+            content: "Click on Remove Link in Popover",
+            trigger: ".o-we-linkpopover .o_we_remove_link",
+            run: "click",
+        },
+        {
+            content: "Link should be removed",
+            trigger: `${FIRST_PARAGRAPH}:not(:has(a))`,
+        },
+        {
+            content: "Ensure popover is closed",
+            trigger: ".o-overlay-container:not(:visible:has(.o-we-linkpopover))", // popover should be closed
+        },
+        // 2. Test links in navbar (website)
+        {
+            content: "Click navbar menu Home",
+            trigger: ':iframe .top_menu a:contains("Home")',
+            run: "click",
+        },
+        ...openLinkPopup(":iframe #o_main_nav a.nav-link:contains('Home')", "/contactus", 1, false),
+        {
+            content: "Popover should be shown (2)",
+            trigger: ".o-we-linkpopover .o_we_url_link:contains('Home')",
+        },
+        clickEditLink,
+        {
+            content: "Change the URL",
+            trigger: ".modal-dialog #url_input",
+            run: "edit /contactus",
+        },
+        {
+            content: "Save the Edit Menu modal",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        ...openLinkPopup(
+            ":iframe .top_menu a:contains('Home')[href='/contactus']",
+            "/contactus",
+            0,
+            true
+        ),
+        {
+            content: "Popover should be shown with updated preview data (2)",
+            trigger: ".o-we-linkpopover .o_we_url_link:contains('Contact Us')",
+        },
+        {
+            content: "Click on Edit Menu in Popover",
+            trigger: ".o-we-linkpopover .js_edit_menu",
+            run: "click",
+        },
+        {
+            content: "Edit Menu (tree) should open",
+            trigger: ".o_website_dialog .oe_menu_editor",
+        },
+        {
+            content: "Close modal",
+            trigger: ".modal-footer .btn-secondary",
+            run: "click",
+        },
+        {
+            content: "Check that the modal is closed",
+            trigger: ":iframe html:not(.modal-body)",
+        },
+        // 3. Test other links (CTA in navbar & links in footer)
+        ...openLinkPopup(":iframe #o_main_nav a.btn-primary[href='/contactus']", "CTA", 1, true),
+        {
+            content: "Popover should be shown (3)",
+            trigger: ".o-we-linkpopover .o_we_url_link:contains('Contact Us')",
+        },
+        ...openLinkPopup(":iframe footer a[href='/']", "Footer Home", 1, true),
+        {
+            content: "Popover should be shown (4)",
+            trigger: ".o-we-linkpopover .o_we_url_link:contains('Home')",
+        },
+        // 4. Popover should close when clicking non-link element
+        {
+            content: "Click outside the link popover",
+            trigger: ":iframe body",
+            run: "click",
+        },
+        {
+            content: "Ensure popover is closed",
+            trigger: ".o-overlay-container:not(:visible:has(.o-we-linkpopover))", // popover should be closed
+        },
+        // 5. Double click should not open popover but should open toolbar link
+        {
+            content: "Double click on link",
+            trigger: ':iframe footer a[href="/"]',
+            async run(actions) {
+                // Create range to simulate real double click, see pull request
+                const el = this.anchor;
+                const sel = el.ownerDocument.getSelection();
+                sel.collapse(el.childNodes[1], 1);
+                await actions.click();
+                await actions.dblclick();
+            },
+        },
+        {
+            content: "Ensure that the link toolbar is opened",
+            trigger: ".o-we-toolbar button[name='link']",
+        },
+        {
+            content: "Click on the link from toolbar",
+            trigger: ".o-we-toolbar",
+            run: "click",
+        },
+        // 6. Test link popover link opens a new window in edit mode
+        ...openLinkPopup(":iframe footer a[href='/']", "Footer Home", 1, true),
+        {
+            content: "Ensure that a click on the link popover link opens a new window in edit mode",
+            trigger: ".o-we-linkpopover a.o_we_url_link[target='_blank']",
+            run(actions) {
+                // We do not want to open a link in a tour
+                patch(
+                    browser,
+                    {
+                        open(url) {
+                            if (
+                                window.location.hostname === url.hostname &&
+                                url.pathname.startsWith("/@/")
+                            ) {
+                                document
+                                    .querySelector("body")
+                                    .classList.add("new_backend_window_opened");
+                            }
+                        },
+                    },
+                    { pure: true }
+                );
+                actions.click();
+            },
+        },
+        {
+            content: "Ensure that link is opened correctly in edit mode",
+            trigger: ".new_backend_window_opened",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/edit_megamenu.js b/addons/website/static/tests/tours/edit_megamenu.js
index 8c76c4d54ebe3..075ae573b462f 100644
--- a/addons/website/static/tests/tours/edit_megamenu.js
+++ b/addons/website/static/tests/tours/edit_megamenu.js
@@ -7,253 +7,274 @@ import {
     clickToolbarButton,
 } from "@website/js/tours/tour_utils";
 
-const toggleMegaMenu = (stepOptions) => Object.assign({}, {
-    content: "Toggles the mega menu.",
-    trigger: ":iframe .top_menu .nav-item a.o_mega_menu_toggle",
-    run(helpers) {
-        // If the mega menu is displayed inside the extra menu items, it should
-        // already be displayed.
-        if (!this.anchor.closest(".o_extra_menu_items")) {
-            helpers.click();
-        }
-    },
-}, stepOptions);
+const toggleMegaMenu = (stepOptions) =>
+    Object.assign(
+        {},
+        {
+            content: "Toggles the mega menu.",
+            trigger: ":iframe .top_menu .nav-item a.o_mega_menu_toggle",
+            run(helpers) {
+                // If the mega menu is displayed inside the extra menu items, it should
+                // already be displayed.
+                if (!this.anchor.closest(".o_extra_menu_items")) {
+                    helpers.click();
+                }
+            },
+        },
+        stepOptions
+    );
 
-registerWebsitePreviewTour('edit_megamenu', {
-    url: '/',
-    edition: true,
-}, () => [
-    // Add a megamenu item to the top menu.
-    {
-        content: "Click on a menu item",
-        trigger: ":iframe .top_menu .nav-item .nav-link [data-oe-model='website.menu']",
-        run: "click",
-    },
-    {
-        content: "Click on 'Link' to open Link Dialog",
-        trigger: '.o-we-linkpopover .js_edit_menu',
-        run: "click",
-    },
-    {
-        trigger: ".o_website_dialog:visible",
-    },
-    {
-        content: "Trigger the link dialog (click 'Add Mega Menu Item')",
-        trigger: '.modal-body a:eq(1)',
-        run: "click",
-    },
-    {
-        content: "Write a label for the new menu item",
-        trigger: '.modal-dialog .o_website_dialog input',
-        run: "edit Megaaaaa!",
-    },
-    {
-        content: "Confirm the mega menu label",
-        trigger: ".modal .modal-footer button:contains(Continue)",
-        run: "click",
-    },
-    {
-        trigger: '.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("Megaaaaa!")',
-    },
-    {
-        content: "Save the website menu with a new mega menu",
-        trigger: ".modal .modal-footer button:contains(save)",
-        run: "click",
-    },
-    {
-        trigger: "body:not(:has(.modal))",
-    },
-    {
-        trigger: '.o_builder_sidebar_open',
-    },
-    {
-        trigger: ".o_builder_open .o_website_preview:not(.o_is_blocked)"
-    },
-    // Edit a menu item
-    clickOnExtraMenuItem({}, true),
-    toggleMegaMenu({}),
-    {
-        content: "Select the last menu link of the first column",
-        trigger: ':iframe .s_mega_menu_odoo_menu .row > div:first-child .nav > :nth-child(6)', // 6th is the last one
-        run: "click",
-    },
-    {
-        content: "Hit the delete button to remove the menu link",
-        trigger: '.o_overlay_options .oe_snippet_remove',
-        run: "click",
-    },
-    {
-        content: "Check that the last menu link was deleted",
-        trigger: ':iframe .s_mega_menu_odoo_menu .row > div:first-child .nav:not(:has(:nth-child(6)))',
-    },
-    {
-        content: "Click on the first title item.",
-        trigger: ':iframe .o_mega_menu h4',
-        run: "click",
-    },
-    {
-        content: "Press enter.",
-        trigger: ':iframe .o_mega_menu h4',
-        run() {
-            this.anchor.dispatchEvent(
-                new window.InputEvent("input", {bubbles: true, inputType: "insertParagraph"})
-            );
+registerWebsitePreviewTour(
+    "edit_megamenu",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        // Add a megamenu item to the top menu.
+        {
+            content: "Click on a menu item",
+            trigger: ":iframe .top_menu .nav-item .nav-link [data-oe-model='website.menu']",
+            run: "click",
         },
-    },
-    {
-        content: "The menu should still be visible. Edit a menu item.",
-        trigger: ':iframe .o_mega_menu h4',
-        // The content is removed in the previous step so it's now invisible.
-        run: "editor New Menu Item",
-    },
-    {
-        // If this step fails, it means that a patch inside bootstrap was lost.
-        content: "Press the 'down arrow' key.",
-        trigger: ':iframe .o_mega_menu h4',
-        run: "press ArrowDown",
-    },
-    ...clickOnSave(),
-    clickOnExtraMenuItem({}, true),
-    toggleMegaMenu(),
-    {
-        content: "The menu item should have been renamed.",
-        trigger: ':iframe .o_mega_menu h4:contains("New Menu Item")',
-    },
-]);
-registerWebsitePreviewTour("megamenu_active_nav_link", {
-    url: "/",
-    edition: true,
-}, () => [
-       // Add a megamenu item to the top menu.
-    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Home')", "Home"),
-    {
-        content: "Click on 'Link' to open Link Dialog",
-        trigger: ".o-we-linkpopover button.js_edit_menu",
-        run: "click",
-    },
-    {
-        trigger: ".o_website_dialog",
-    },
-    {
-        content: "Trigger the link dialog (click 'Add Mega Menu Item')",
-        trigger: ".modal-body a:eq(1)",
-        run: "click",
-    },
-    {
-        content: "Write a label for the new menu item",
-        trigger: ".modal-dialog .o_website_dialog input",
-        run: "edit MegaTron",
-    },
-    {
-        content: "Confirm the mega menu label",
-        trigger: ".modal .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    {
-        trigger: `.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("MegaTron")`,
-    },
-    {
-        content: "Save the website menu with a new mega menu",
-        trigger: ".modal-footer .btn-primary",
-        run: "click",
-    },
-    {
-        trigger: "body:not(:has(.modal))",
-    },
-    {
-        content: "Check for the new mega menu",
-        trigger: `:iframe .top_menu:has(.nav-item a.o_mega_menu_toggle:contains("Megatron"))`,
-    },
-    clickOnExtraMenuItem({}, true),
-    toggleMegaMenu({}),
-    ...openLinkPopup(":iframe .s_mega_menu_odoo_menu .nav-link:contains('Laptops')", "Laptops"),
-    {
-        content: "Click on 'Edit Link'",
-        trigger: ".o-we-linkpopover a.o_we_edit_link",
-        run: "click",
-    },
-    {
-        content: "Change the link",
-        trigger: ".o-we-linkpopover input.o_we_href_input_link",
-        run: "edit /new_page"
-    },
-    ...clickOnSave(),
-    clickOnExtraMenuItem({}, true),
-    toggleMegaMenu(),
-    {
-        content: "Click on the first menu link of the first column",
-        trigger: ":iframe .s_mega_menu_odoo_menu .row > div:first-child .nav > :nth-child(1)",
-        run: "click",
-    },
-    {
-        content: "Check if the new mega menu is active",
-        trigger: `:iframe .top_menu:has(.nav-item a.o_mega_menu_toggle.active:contains("MegaTron"))`,
-    },
-])
-registerWebsitePreviewTour('edit_megamenu_big_icons_subtitles', {
-    url: '/',
-    edition: true,
-}, () => [
-    // Add a megamenu item to the top menu.
-    ...openLinkPopup(":iframe .top_menu .nav-item a", "Home"),
-    {
-        content: "Click on 'Link' to open Link Dialog",
-        trigger: ".o-we-linkpopover .js_edit_menu",
-        run: "click",
-    },
-    {
-        trigger: ".o_website_dialog",
-    },
-    {
-        content: "Trigger the link dialog (click 'Add Mega Menu Item')",
-        trigger: '.modal-body a:eq(1)',
-        run: "click",
-    },
-    {
-        content: "Write a label for the new menu item",
-        trigger: '.modal-dialog .o_website_dialog input',
-        run: "edit Megaaaaa2!",
-    },
-    {
-        content: "Confirm the mega menu label",
-        trigger: ".modal .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    {
-        trigger: '.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("Megaaaaa2!")',
-    },
-    {
-        content: "Save the website menu with a new mega menu",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
-    },
-    {
-        trigger: "body:not(:has(.modal))",
-    },
-    {
-        content: "Check for the new mega menu",
-        trigger: ':iframe .top_menu:has(.nav-item a.o_mega_menu_toggle:contains("Megaaaaa2!"))',
-    },
-    // Edit a menu item
-    clickOnExtraMenuItem({}, true),
-    toggleMegaMenu({}),
-    {
-        content: "Select the first menu link of the first column",
-        trigger: ':iframe .s_mega_menu_odoo_menu .row > div:first-child .nav > :first-child',
-        run: "click",
-    },
-    // Change MegaMenu template
-    ...changeOptionInPopover("Mega Menu", "Template", "[title='Big Icons Subtitles']"),
-    ...clickToolbarButton(
-        "h4 of first menu link of the first column",
-        ".s_mega_menu_big_icons_subtitles .row > div:first-child .nav > :first-child h4",
-        "Toggle bold"
-    ),
-    ...clickOnSave(),
-    clickOnExtraMenuItem({}, true),
-    toggleMegaMenu(),
-    {
-        content: "The menu item should only convert selected text to Bold.",
-        trigger: ':iframe .s_mega_menu_big_icons_subtitles .row > div:first-child .nav > :first-child span:not(:has(strong))',
-    },
-]);
+        {
+            content: "Click on 'Link' to open Link Dialog",
+            trigger: ".o-we-linkpopover .js_edit_menu",
+            run: "click",
+        },
+        {
+            trigger: ".o_website_dialog:visible",
+        },
+        {
+            content: "Trigger the link dialog (click 'Add Mega Menu Item')",
+            trigger: ".modal-body a:eq(1)",
+            run: "click",
+        },
+        {
+            content: "Write a label for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input",
+            run: "edit Megaaaaa!",
+        },
+        {
+            content: "Confirm the mega menu label",
+            trigger: ".modal .modal-footer button:contains(Continue)",
+            run: "click",
+        },
+        {
+            trigger:
+                '.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("Megaaaaa!")',
+        },
+        {
+            content: "Save the website menu with a new mega menu",
+            trigger: ".modal .modal-footer button:contains(save)",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.modal))",
+        },
+        {
+            trigger: ".o_builder_sidebar_open",
+        },
+        {
+            trigger: ".o_builder_open .o_website_preview:not(.o_is_blocked)",
+        },
+        // Edit a menu item
+        clickOnExtraMenuItem({}, true),
+        toggleMegaMenu({}),
+        {
+            content: "Select the last menu link of the first column",
+            trigger: ":iframe .s_mega_menu_odoo_menu .row > div:first-child .nav > :nth-child(6)", // 6th is the last one
+            run: "click",
+        },
+        {
+            content: "Hit the delete button to remove the menu link",
+            trigger: ".o_overlay_options .oe_snippet_remove",
+            run: "click",
+        },
+        {
+            content: "Check that the last menu link was deleted",
+            trigger:
+                ":iframe .s_mega_menu_odoo_menu .row > div:first-child .nav:not(:has(:nth-child(6)))",
+        },
+        {
+            content: "Click on the first title item.",
+            trigger: ":iframe .o_mega_menu h4",
+            run: "click",
+        },
+        {
+            content: "Press enter.",
+            trigger: ":iframe .o_mega_menu h4",
+            run() {
+                this.anchor.dispatchEvent(
+                    new window.InputEvent("input", { bubbles: true, inputType: "insertParagraph" })
+                );
+            },
+        },
+        {
+            content: "The menu should still be visible. Edit a menu item.",
+            trigger: ":iframe .o_mega_menu h4",
+            // The content is removed in the previous step so it's now invisible.
+            run: "editor New Menu Item",
+        },
+        {
+            // If this step fails, it means that a patch inside bootstrap was lost.
+            content: "Press the 'down arrow' key.",
+            trigger: ":iframe .o_mega_menu h4",
+            run: "press ArrowDown",
+        },
+        ...clickOnSave(),
+        clickOnExtraMenuItem({}, true),
+        toggleMegaMenu(),
+        {
+            content: "The menu item should have been renamed.",
+            trigger: ':iframe .o_mega_menu h4:contains("New Menu Item")',
+        },
+    ]
+);
+registerWebsitePreviewTour(
+    "megamenu_active_nav_link",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        // Add a megamenu item to the top menu.
+        ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Home')", "Home"),
+        {
+            content: "Click on 'Link' to open Link Dialog",
+            trigger: ".o-we-linkpopover button.js_edit_menu",
+            run: "click",
+        },
+        {
+            trigger: ".o_website_dialog",
+        },
+        {
+            content: "Trigger the link dialog (click 'Add Mega Menu Item')",
+            trigger: ".modal-body a:eq(1)",
+            run: "click",
+        },
+        {
+            content: "Write a label for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input",
+            run: "edit MegaTron",
+        },
+        {
+            content: "Confirm the mega menu label",
+            trigger: ".modal .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            trigger: `.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("MegaTron")`,
+        },
+        {
+            content: "Save the website menu with a new mega menu",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.modal))",
+        },
+        {
+            content: "Check for the new mega menu",
+            trigger: `:iframe .top_menu:has(.nav-item a.o_mega_menu_toggle:contains("Megatron"))`,
+        },
+        clickOnExtraMenuItem({}, true),
+        toggleMegaMenu({}),
+        ...openLinkPopup(":iframe .s_mega_menu_odoo_menu .nav-link:contains('Laptops')", "Laptops"),
+        {
+            content: "Click on 'Edit Link'",
+            trigger: ".o-we-linkpopover a.o_we_edit_link",
+            run: "click",
+        },
+        {
+            content: "Change the link",
+            trigger: ".o-we-linkpopover input.o_we_href_input_link",
+            run: "edit /new_page",
+        },
+        ...clickOnSave(),
+        clickOnExtraMenuItem({}, true),
+        toggleMegaMenu(),
+        {
+            content: "Click on the first menu link of the first column",
+            trigger: ":iframe .s_mega_menu_odoo_menu .row > div:first-child .nav > :nth-child(1)",
+            run: "click",
+        },
+        {
+            content: "Check if the new mega menu is active",
+            trigger: `:iframe .top_menu:has(.nav-item a.o_mega_menu_toggle.active:contains("MegaTron"))`,
+        },
+    ]
+);
+registerWebsitePreviewTour(
+    "edit_megamenu_big_icons_subtitles",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        // Add a megamenu item to the top menu.
+        ...openLinkPopup(":iframe .top_menu .nav-item a", "Home"),
+        {
+            content: "Click on 'Link' to open Link Dialog",
+            trigger: ".o-we-linkpopover .js_edit_menu",
+            run: "click",
+        },
+        {
+            trigger: ".o_website_dialog",
+        },
+        {
+            content: "Trigger the link dialog (click 'Add Mega Menu Item')",
+            trigger: ".modal-body a:eq(1)",
+            run: "click",
+        },
+        {
+            content: "Write a label for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input",
+            run: "edit Megaaaaa2!",
+        },
+        {
+            content: "Confirm the mega menu label",
+            trigger: ".modal .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            trigger:
+                '.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("Megaaaaa2!")',
+        },
+        {
+            content: "Save the website menu with a new mega menu",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.modal))",
+        },
+        {
+            content: "Check for the new mega menu",
+            trigger: ':iframe .top_menu:has(.nav-item a.o_mega_menu_toggle:contains("Megaaaaa2!"))',
+        },
+        // Edit a menu item
+        clickOnExtraMenuItem({}, true),
+        toggleMegaMenu({}),
+        {
+            content: "Select the first menu link of the first column",
+            trigger: ":iframe .s_mega_menu_odoo_menu .row > div:first-child .nav > :first-child",
+            run: "click",
+        },
+        // Change MegaMenu template
+        ...changeOptionInPopover("Mega Menu", "Template", "[title='Big Icons Subtitles']"),
+        ...clickToolbarButton(
+            "h4 of first menu link of the first column",
+            ".s_mega_menu_big_icons_subtitles .row > div:first-child .nav > :first-child h4",
+            "Toggle bold"
+        ),
+        ...clickOnSave(),
+        clickOnExtraMenuItem({}, true),
+        toggleMegaMenu(),
+        {
+            content: "The menu item should only convert selected text to Bold.",
+            trigger:
+                ":iframe .s_mega_menu_big_icons_subtitles .row > div:first-child .nav > :first-child span:not(:has(strong))",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/edit_menus.js b/addons/website/static/tests/tours/edit_menus.js
index 0febfba35b174..64bc6f3d17075 100644
--- a/addons/website/static/tests/tours/edit_menus.js
+++ b/addons/website/static/tests/tours/edit_menus.js
@@ -10,7 +10,7 @@ import {
     insertSnippet,
     openLinkPopup,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 registry.category("web_tour.tours").add("parent_child_menu", {
     url: "/odoo/action-website.action_website_menu",
@@ -71,457 +71,483 @@ registry.category("web_tour.tours").add("parent_child_menu", {
     ],
 });
 
-registerWebsitePreviewTour('edit_menus', {
-    url: '/',
-}, () => [
-    // Add a megamenu item from the menu.
-    {
-        trigger: ":iframe #wrapwrap",
-    },
-    {
-        content: "open site menu",
-        trigger: 'button[data-menu-xmlid="website.menu_site"]',
-        run: "click",
-    },
-    {
-        content: "Click on Edit Menu",
-        trigger: 'a[data-menu-xmlid="website.menu_edit_menu"]',
-        run: "click",
-    },
-    {
-        trigger: ".o_website_dialog:visible",
-    },
-    {
-        content: "Trigger the link dialog (click 'Add Mega Menu Item')",
-        trigger: '.modal:not(.o_inactive_modal) .modal-body a:eq(1)',
-        run: "click",
-    },
-    {
-        content: "Write a label for the new menu item",
-        trigger: '.modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input',
-        run: "edit Megaaaaa!",
-    },
-    {
-        content: "Confirm the mega menu label",
-        trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    {
-        trigger: '.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("Megaaaaa!")',
-    },
-    {
-        content: "Save the new menu",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
-    },
-    {
-        trigger: "body:not(:has(.oe_menu_editor))",
-    },
-    {
-        trigger: ":iframe body:contains(welcome to your)",
-    },
-    clickOnExtraMenuItem({}, true),
-    {
-        content: "There should be a new megamenu item.",
-        trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
-    },
-    // Add a menu item in edit mode.
-    ...clickOnEditAndWaitEditMode(),
-    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Home')", "Home"),
-    {
-        content: "Click on Edit Menu",
-        trigger: '.o-we-linkpopover .js_edit_menu',
-        run: "click",
-    },
-    {
-        trigger: ".o_website_dialog:visible",
-    },
-    {
-        content: "Trigger the link dialog (click 'Add Menu Item')",
-        trigger: '.modal-body a:eq(0)',
-        run: "click",
-    },
-    {
-        trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input:eq(0)",
-    },
-    {
-        content: "Confirm the new menu entry without a label",
-        trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    {
-        content: "It didn't save without a label. Fill label input.",
-        trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input:eq(0)",
-        run: "edit Random!",
-    },
-    {
-        content: "Remove the URL input value",
-        trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input#url_input",
-        run: "edit ",
-    },
-    {
-        content: "Confirm the new menu entry without a url",
-        trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    {
-        content: "Re-open the link dialog ",
-        trigger: '.modal .input-group:has(.js_menu_label:contains("Random!")) .js_edit_menu',
-        run: "click",
-    },
-    {
-        content: "Check that the URL is #",
-        trigger: ".modal:not(.o_inactive_modal) #url_input:value('#')",
-    },
-    {
-        content: "Save the dialog",
-        trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
-        run: "click",
-    },
-    {
-        trigger: '.oe_menu_editor .js_menu_label:contains("Random!")',
-    },
-    {
-        content: "Save the website menu with the new entry",
-        trigger: '.modal:not(.o_inactive_modal) .modal-footer .btn-primary',
-        run: "click",
-    },
-    {
-        trigger: "body:not(:has(.modal))",
-    },
-    // Edit the new menu item from the "edit link" popover button
-    clickOnExtraMenuItem({}, true),
-    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Random!')", "Random!"),
-    {
-        content: "navbar shouldn't have any zwnbsp and no o_link_in_selection class",
-        trigger: ':iframe nav.navbar:not(:has(.o_link_in_selection)):not(:contains("\ufeff"))',
-    },
-    {
-        content: "Click on Edit Link",
-        trigger: '.o-we-linkpopover a.o_we_edit_link',
-        run: "click",
-    },
-    {
-        content: "Change the label",
-        trigger: '.modal-dialog .o_website_dialog input:eq(0)',
-        run: "edit Modnar",
-    },
-    {
-        content: "Confirm the new label",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
-    },
-    ...clickOnSave(),
-    clickOnExtraMenuItem({}, true),
+registerWebsitePreviewTour(
+    "edit_menus",
     {
-        content: "Label should have changed",
-        trigger: ':iframe .top_menu .nav-item a:contains("Modnar")',
+        url: "/",
     },
-    // Edit the menu item from the "edit menu" popover button
-    ...clickOnEditAndWaitEditMode(),
-    clickOnExtraMenuItem({}, true),
-    {
-        content: "Wait for the builder sidebar to fully open",
-        trigger: ":iframe .editor_enable",
-        run: async function() {
-            // Entering the edit mode opens the builder sidebar, which triggers
-            // multiple iframe resize events, which in turn rebuilds the extra
-            // menu items dropdown (see `auto_hide_menu.js` resize handler).
-            //
-            // We wait briefly to ensure all recalculations complete,
-            // avoiding race conditions when opening the link popover.
-            //
-            // NOTE: the delay below (200ms) matches the CSS `transition-delay`
-            // defined for `o-website-builder_sidebar`.
-            await delay(200);
+    () => [
+        // Add a megamenu item from the menu.
+        {
+            trigger: ":iframe #wrapwrap",
         },
-    },
-    ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Modnar')", "Modnar"),
-    {
-        content: "Click on the popover Edit Menu button",
-        trigger: '.o-we-linkpopover .js_edit_menu',
-        run: "click",
-    },
-    {
-        content: "Click on the dialog Edit Menu button",
-        trigger: '.oe_menu_editor .js_menu_label:contains("Modnar")',
-        run() {
-            const liEl = this.anchor.closest('[data-menu-id]');
-            liEl.querySelector('button.js_edit_menu').click();
+        {
+            content: "open site menu",
+            trigger: 'button[data-menu-xmlid="website.menu_site"]',
+            run: "click",
         },
-    },
-    {
-        content: "Change the label",
-        trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input:eq(0)",
-        run: "edit Modnar !!",
-    },
-    {
-        content: "Confirm the new menu label",
-        trigger: ".modal:not(.o_inactive_modal) .modal-footer button:contains(Continue)",
-        run: "click",
-    },
-    {
-        trigger: '.oe_menu_editor .js_menu_label:contains("Modnar !!")',
-    },
-    {
-        content: "Save the website menu with the new menu label",
-        trigger: ".modal:not(.o_inactive_modal) .modal-footer button:contains(save)",
-        run: "click",
-    },
-    {
-        trigger: "body:not(:has(.oe_menu_editor))",
-    },
-    // Drag a block to be able to scroll later.
-    goBackToBlocks(),
-    ...insertSnippet({ id: "s_media_list", name: "Media List", groupName: "Content" }),
-    ...clickOnSave(),
-    clickOnExtraMenuItem({}, true),
-    {
-        content: "Label should have changed",
-        trigger: ':iframe .top_menu .nav-item a:contains("Modnar !!")',
-    },
-    // Nest menu item from the menu.
-    {
-        content: "open site menu",
-        trigger: 'button[data-menu-xmlid="website.menu_site"]',
-        run: "click",
-    },
-    {
-        content: "Click on Edit Menu",
-        trigger: 'a[data-menu-xmlid="website.menu_edit_menu"]',
-        run: "click",
-    },
-    {
-        content: `Drag "Modnar !!" menu below "Home" menu`,
-        trigger: '.oe_menu_editor li:contains("Modnar !!") .oi-draggable',
-        run(helpers) {
-            return helpers.drag_and_drop('.oe_menu_editor li:contains("Home")', {
-                position: {
-                    top: 57,
-                    left: 5,
-                },
-                relative: true,
-            });
+        {
+            content: "Click on Edit Menu",
+            trigger: 'a[data-menu-xmlid="website.menu_edit_menu"]',
+            run: "click",
         },
-    },
-    {
-        content: "Drag 'Modnar !!' item as a child of the 'Home' item",
-        trigger: '.oe_menu_editor li:contains("Modnar !!") .oi-draggable',
-        run: 'drag_and_drop .oe_menu_editor li:contains("Modnar !!") .form-control',
-    },
-    {
-        content: "Wait for drop",
-        trigger: '.oe_menu_editor li:contains("Home") ul li:contains("Modnar !!")',
-    },
-    // Drag the Mega menu to the first position.
-    {
-        content: "Drag Mega at the top",
-        trigger: '.oe_menu_editor li:contains("Megaaaaa!") .oi-draggable',
-        run(helpers) {
-            return helpers.drag_and_drop('.oe_menu_editor li:contains("Home") .oi-draggable', {
-                position: {
-                    top: 20,
-                },
-                relative: true,
-            });
+        {
+            trigger: ".o_website_dialog:visible",
         },
-    },
-    {
-        content: "Wait for drop",
-        trigger: '.oe_menu_editor:first-child:contains("Megaaaaa!")',
-    },
-    {
-        content: "Save the website menu with new nested menus",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
-    },
-    {
-        content: "Menu item should have a child",
-        trigger: ':iframe .top_menu .nav-item a.dropdown-toggle:contains("Home")',
-        run: "click",
-    },
-    // Check that with the auto close of dropdown menus, the dropdowns remain
-    // openable.
-    {
-        content: "When menu item is opened, child item must appear in the shown menu",
-        trigger: ':iframe .top_menu .nav-item:contains("Home") ul.show li a.dropdown-item:contains("Modnar !!")',
-        run() {
-            // Scroll down.
-            this.anchor.closest("body").querySelector(".o_footer_copyright_name")
-                .scrollIntoView({ block: "start", inline: "nearest", behavior: "smooth" });
+        {
+            content: "Trigger the link dialog (click 'Add Mega Menu Item')",
+            trigger: ".modal:not(.o_inactive_modal) .modal-body a:eq(1)",
+            run: "click",
         },
-    },
-    {
-        content: "The Home menu should be closed",
-        trigger: ':iframe .top_menu .nav-item:contains("Home"):has(ul:not(.show))',
-    },
-    {
-        content: "Open the Home menu after scroll",
-        trigger: ':iframe .top_menu .nav-item a.dropdown-toggle:contains("Home")',
-        async run(helpers) {
-            await delay(1000);
-            await helpers.click();
+        {
+            content: "Write a label for the new menu item",
+            trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input",
+            run: "edit Megaaaaa!",
         },
-    },
-    {
-        content: "Check that the Home menu is opened",
-        trigger: ':iframe .top_menu .nav-item:contains("Home") ul.show li' +
-            ' a.dropdown-item:contains("Modnar !!")',
-    },
-    {
-        content: "Close the Home menu",
-        trigger: ':iframe .top_menu .nav-item:has(a.dropdown-toggle:contains("Home"))',
-        run: "click",
-    },
-    {
-        content: "Check that the Home menu is closed",
-        trigger: ':iframe .top_menu .nav-item:contains("Home"):has(ul:not(.show))',
-    },
-    {
-        content: "Open the mega menu",
-        trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
-        run: "click",
-    },
-    {
-        content: "When the mega menu is opened, scroll up",
-        trigger: ":iframe .top_menu .o_mega_menu_toggle.show",
-        run() {
-            const marginTopOfMegaMenu = getComputedStyle(
-                this.anchor.closest(".dropdown").querySelector(".o_mega_menu"))["margin-top"];
-            if (marginTopOfMegaMenu !== '0px') {
-                console.error('The margin-top of the mega menu should be 0px');
-            }
-            // Scroll up.
-            this.anchor.closest("body").querySelector(".s_media_list_item:nth-child(2)")
-                .scrollIntoView(true);
-        }
-    },
-    {
-        content: "Check that the mega menu is closed",
-        trigger: ':iframe .top_menu .nav-item:contains("Megaaaaa!"):has(div[data-name="Mega Menu"]:not(.show))',
-    },
-    {
-        content: "Open the mega menu after scroll",
-        trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
-        run: "click",
-    },
-    {
-        content: "Check that the mega menu is opened",
-        trigger: ':iframe .top_menu .nav-item:has(a.o_mega_menu_toggle:contains("Megaaaaa!")) ' +
-            '.s_mega_menu_odoo_menu',
-    },
-    ...clickOnEditAndWaitEditMode(),
-    {
-        trigger: ":iframe main section.s_media_list .s_media_list_item:eq(2) h3:contains(post)",
-    },
-    {
-        content: "Open nested menu item",
-        trigger: ':iframe .o_top_fixed_element .nav-item:contains("Home"):nth-child(2) .dropdown-toggle',
-        run: "click",
-    },
-    {
-        // If this step fails, it means that a patch inside bootstrap was lost.
-        content: "Press the 'down arrow' key.",
-        trigger: ':iframe .top_menu .nav-item:contains("Home") li:contains("Modnar !!")',
-        run: "press ArrowDown",
-    },
-    ...clickOnSave(),
-    // Nest and re-arrange menu items for a newly created menu
-    {
-        content: "Open site menu",
-        trigger: 'button[data-menu-xmlid="website.menu_site"]',
-        run: "click",
-    },
-    {
-        content: "Click on Edit Menu",
-        trigger: 'a[data-menu-xmlid="website.menu_edit_menu"]',
-        run: "click",
-    },
-    {
-        content: "Trigger link dialog (click 'Add Menu Item')",
-        trigger: '.modal-body a:eq(0)',
-        run: "click",
-    },
-    {
-        content: "Write a label for the new menu item",
-        trigger: '.modal-dialog .o_website_dialog input:eq(0)',
-        run: "edit new_menu",
-    },
-    {
-        content: "Write a url for the new menu item",
-        trigger: '.modal-dialog .o_website_dialog input:eq(1)',
-        run: "edit #",
-    },
-    {
-        content: "Confirm the new menu entry",
-        trigger: '.modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)',
-        run: "click",
-    },
-    {
-        content: "Check if new menu(new_menu) is added",
-        trigger: '.oe_menu_editor li:contains("new_menu")',
-    },
-    {
-        content: "Trigger link dialog (click 'Add Menu Item')",
-        trigger: '.modal-body a:eq(0)',
-        run: "click",
-    },
-    {
-        content: "Write a label for the new menu item",
-        trigger: '.modal-dialog .o_website_dialog input:eq(0)',
-        run: "edit new_nested_menu",
-    },
-    {
-        content: "Write a url for the new menu item",
-        trigger: '.modal-dialog .o_website_dialog input:eq(1)',
-        run: "edit #",
-    },
-    {
-        content: "Confirm the new menu entry",
-        trigger: '.modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)',
-        run: "click",
-    },
-    {
-        content: "Check if new menu(new_nested_menu) is added",
-        trigger: '.oe_menu_editor li:contains("new_nested_menu")',
-    },
-    {
-        content: "Nest 'new_nested_menu' under 'new_menu'",
-        trigger: '.oe_menu_editor li:contains("new_nested_menu") .oi-draggable',
-        run: "drag_and_drop .oe_menu_editor li:contains('new_menu') .form-control",
-    },
-    {
-        content: "Drag 'Modnar !!' below 'new_menu'",
-        trigger: '.oe_menu_editor li:contains("Home") > ul > li:contains("Modnar !!") .oi-draggable',
-        async run(helpers) {
-            await helpers.drag_and_drop('.oe_menu_editor li:contains("new_menu") .oi-draggable', {
-                position: "bottom",
-            });
+        {
+            content: "Confirm the mega menu label",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
         },
-    },
-    {
-        content: "Nest 'Modnar !!' under 'new_menu'",
-        trigger: '.oe_menu_editor li:contains("Modnar !!") .oi-draggable',
-        run: "drag_and_drop .oe_menu_editor li:contains('new_menu') .form-control",
-    },
-    {
-        content: "Check if 'nested_menu' and 'Modnar !!' is nested under 'new_menu'",
-        trigger: '.oe_menu_editor li:contains("new_menu") > ul > li:contains("Modnar !!") + li:contains("nested_menu")',
-    },
-    {
-        content: "Move 'Modnar !!' below 'new_nested_menu' inside the 'new_menu'",
-        trigger: '.oe_menu_editor  li:contains("new_menu") > ul > li:contains("Modnar !!") .oi-draggable',
-        async run(helpers) {
-            await helpers.drag_and_drop(".oe_menu_editor  li:contains('new_menu') > ul > li:contains('new_nested_menu') .oi-draggable", {
-                position: "bottom",
-            });
+        {
+            trigger:
+                '.oe_menu_editor [data-is-mega-menu="true"] .js_menu_label:contains("Megaaaaa!")',
         },
-    },
-    {
-        content: "Check if 'Modnar !!' is now below 'new_nested_menu' in 'new_menu'",
-        trigger: '.oe_menu_editor li:contains("new_menu") > ul > li:last-child:contains("Modnar !!")',
-    },
-]);
+        {
+            content: "Save the new menu",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.oe_menu_editor))",
+        },
+        {
+            trigger: ":iframe body:contains(welcome to your)",
+        },
+        clickOnExtraMenuItem({}, true),
+        {
+            content: "There should be a new megamenu item.",
+            trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
+        },
+        // Add a menu item in edit mode.
+        ...clickOnEditAndWaitEditMode(),
+        ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Home')", "Home"),
+        {
+            content: "Click on Edit Menu",
+            trigger: ".o-we-linkpopover .js_edit_menu",
+            run: "click",
+        },
+        {
+            trigger: ".o_website_dialog:visible",
+        },
+        {
+            content: "Trigger the link dialog (click 'Add Menu Item')",
+            trigger: ".modal-body a:eq(0)",
+            run: "click",
+        },
+        {
+            trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input:eq(0)",
+        },
+        {
+            content: "Confirm the new menu entry without a label",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            content: "It didn't save without a label. Fill label input.",
+            trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit Random!",
+        },
+        {
+            content: "Remove the URL input value",
+            trigger:
+                ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input#url_input",
+            run: "edit ",
+        },
+        {
+            content: "Confirm the new menu entry without a url",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            content: "Re-open the link dialog ",
+            trigger: '.modal .input-group:has(.js_menu_label:contains("Random!")) .js_edit_menu',
+            run: "click",
+        },
+        {
+            content: "Check that the URL is #",
+            trigger: ".modal:not(.o_inactive_modal) #url_input:value('#')",
+        },
+        {
+            content: "Save the dialog",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            trigger: '.oe_menu_editor .js_menu_label:contains("Random!")',
+        },
+        {
+            content: "Save the website menu with the new entry",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.modal))",
+        },
+        // Edit the new menu item from the "edit link" popover button
+        clickOnExtraMenuItem({}, true),
+        ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Random!')", "Random!"),
+        {
+            content: "navbar shouldn't have any zwnbsp and no o_link_in_selection class",
+            trigger: ':iframe nav.navbar:not(:has(.o_link_in_selection)):not(:contains("\ufeff"))',
+        },
+        {
+            content: "Click on Edit Link",
+            trigger: ".o-we-linkpopover a.o_we_edit_link",
+            run: "click",
+        },
+        {
+            content: "Change the label",
+            trigger: ".modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit Modnar",
+        },
+        {
+            content: "Confirm the new label",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        ...clickOnSave(),
+        clickOnExtraMenuItem({}, true),
+        {
+            content: "Label should have changed",
+            trigger: ':iframe .top_menu .nav-item a:contains("Modnar")',
+        },
+        // Edit the menu item from the "edit menu" popover button
+        ...clickOnEditAndWaitEditMode(),
+        clickOnExtraMenuItem({}, true),
+        {
+            content: "Wait for the builder sidebar to fully open",
+            trigger: ":iframe .editor_enable",
+            run: async function () {
+                // Entering the edit mode opens the builder sidebar, which triggers
+                // multiple iframe resize events, which in turn rebuilds the extra
+                // menu items dropdown (see `auto_hide_menu.js` resize handler).
+                //
+                // We wait briefly to ensure all recalculations complete,
+                // avoiding race conditions when opening the link popover.
+                //
+                // NOTE: the delay below (200ms) matches the CSS `transition-delay`
+                // defined for `o-website-builder_sidebar`.
+                await delay(200);
+            },
+        },
+        ...openLinkPopup(":iframe .top_menu .nav-item a:contains('Modnar')", "Modnar"),
+        {
+            content: "Click on the popover Edit Menu button",
+            trigger: ".o-we-linkpopover .js_edit_menu",
+            run: "click",
+        },
+        {
+            content: "Click on the dialog Edit Menu button",
+            trigger: '.oe_menu_editor .js_menu_label:contains("Modnar")',
+            run() {
+                const liEl = this.anchor.closest("[data-menu-id]");
+                liEl.querySelector("button.js_edit_menu").click();
+            },
+        },
+        {
+            content: "Change the label",
+            trigger: ".modal:not(.o_inactive_modal) .modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit Modnar !!",
+        },
+        {
+            content: "Confirm the new menu label",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer button:contains(Continue)",
+            run: "click",
+        },
+        {
+            trigger: '.oe_menu_editor .js_menu_label:contains("Modnar !!")',
+        },
+        {
+            content: "Save the website menu with the new menu label",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer button:contains(save)",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.oe_menu_editor))",
+        },
+        // Drag a block to be able to scroll later.
+        goBackToBlocks(),
+        ...insertSnippet({ id: "s_media_list", name: "Media List", groupName: "Content" }),
+        ...clickOnSave(),
+        clickOnExtraMenuItem({}, true),
+        {
+            content: "Label should have changed",
+            trigger: ':iframe .top_menu .nav-item a:contains("Modnar !!")',
+        },
+        // Nest menu item from the menu.
+        {
+            content: "open site menu",
+            trigger: 'button[data-menu-xmlid="website.menu_site"]',
+            run: "click",
+        },
+        {
+            content: "Click on Edit Menu",
+            trigger: 'a[data-menu-xmlid="website.menu_edit_menu"]',
+            run: "click",
+        },
+        {
+            content: `Drag "Modnar !!" menu below "Home" menu`,
+            trigger: '.oe_menu_editor li:contains("Modnar !!") .oi-draggable',
+            run(helpers) {
+                return helpers.drag_and_drop('.oe_menu_editor li:contains("Home")', {
+                    position: {
+                        top: 57,
+                        left: 5,
+                    },
+                    relative: true,
+                });
+            },
+        },
+        {
+            content: "Drag 'Modnar !!' item as a child of the 'Home' item",
+            trigger: '.oe_menu_editor li:contains("Modnar !!") .oi-draggable',
+            run: 'drag_and_drop .oe_menu_editor li:contains("Modnar !!") .form-control',
+        },
+        {
+            content: "Wait for drop",
+            trigger: '.oe_menu_editor li:contains("Home") ul li:contains("Modnar !!")',
+        },
+        // Drag the Mega menu to the first position.
+        {
+            content: "Drag Mega at the top",
+            trigger: '.oe_menu_editor li:contains("Megaaaaa!") .oi-draggable',
+            run(helpers) {
+                return helpers.drag_and_drop('.oe_menu_editor li:contains("Home") .oi-draggable', {
+                    position: {
+                        top: 20,
+                    },
+                    relative: true,
+                });
+            },
+        },
+        {
+            content: "Wait for drop",
+            trigger: '.oe_menu_editor:first-child:contains("Megaaaaa!")',
+        },
+        {
+            content: "Save the website menu with new nested menus",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            content: "Menu item should have a child",
+            trigger: ':iframe .top_menu .nav-item a.dropdown-toggle:contains("Home")',
+            run: "click",
+        },
+        // Check that with the auto close of dropdown menus, the dropdowns remain
+        // openable.
+        {
+            content: "When menu item is opened, child item must appear in the shown menu",
+            trigger:
+                ':iframe .top_menu .nav-item:contains("Home") ul.show li a.dropdown-item:contains("Modnar !!")',
+            run() {
+                // Scroll down.
+                this.anchor
+                    .closest("body")
+                    .querySelector(".o_footer_copyright_name")
+                    .scrollIntoView({ block: "start", inline: "nearest", behavior: "smooth" });
+            },
+        },
+        {
+            content: "The Home menu should be closed",
+            trigger: ':iframe .top_menu .nav-item:contains("Home"):has(ul:not(.show))',
+        },
+        {
+            content: "Open the Home menu after scroll",
+            trigger: ':iframe .top_menu .nav-item a.dropdown-toggle:contains("Home")',
+            async run(helpers) {
+                await delay(1000);
+                await helpers.click();
+            },
+        },
+        {
+            content: "Check that the Home menu is opened",
+            trigger:
+                ':iframe .top_menu .nav-item:contains("Home") ul.show li' +
+                ' a.dropdown-item:contains("Modnar !!")',
+        },
+        {
+            content: "Close the Home menu",
+            trigger: ':iframe .top_menu .nav-item:has(a.dropdown-toggle:contains("Home"))',
+            run: "click",
+        },
+        {
+            content: "Check that the Home menu is closed",
+            trigger: ':iframe .top_menu .nav-item:contains("Home"):has(ul:not(.show))',
+        },
+        {
+            content: "Open the mega menu",
+            trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
+            run: "click",
+        },
+        {
+            content: "When the mega menu is opened, scroll up",
+            trigger: ":iframe .top_menu .o_mega_menu_toggle.show",
+            run() {
+                const marginTopOfMegaMenu = getComputedStyle(
+                    this.anchor.closest(".dropdown").querySelector(".o_mega_menu")
+                )["margin-top"];
+                if (marginTopOfMegaMenu !== "0px") {
+                    console.error("The margin-top of the mega menu should be 0px");
+                }
+                // Scroll up.
+                this.anchor
+                    .closest("body")
+                    .querySelector(".s_media_list_item:nth-child(2)")
+                    .scrollIntoView(true);
+            },
+        },
+        {
+            content: "Check that the mega menu is closed",
+            trigger:
+                ':iframe .top_menu .nav-item:contains("Megaaaaa!"):has(div[data-name="Mega Menu"]:not(.show))',
+        },
+        {
+            content: "Open the mega menu after scroll",
+            trigger: ':iframe .top_menu .nav-item a.o_mega_menu_toggle:contains("Megaaaaa!")',
+            run: "click",
+        },
+        {
+            content: "Check that the mega menu is opened",
+            trigger:
+                ':iframe .top_menu .nav-item:has(a.o_mega_menu_toggle:contains("Megaaaaa!")) ' +
+                ".s_mega_menu_odoo_menu",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            trigger: ":iframe main section.s_media_list .s_media_list_item:eq(2) h3:contains(post)",
+        },
+        {
+            content: "Open nested menu item",
+            trigger:
+                ':iframe .o_top_fixed_element .nav-item:contains("Home"):nth-child(2) .dropdown-toggle',
+            run: "click",
+        },
+        {
+            // If this step fails, it means that a patch inside bootstrap was lost.
+            content: "Press the 'down arrow' key.",
+            trigger: ':iframe .top_menu .nav-item:contains("Home") li:contains("Modnar !!")',
+            run: "press ArrowDown",
+        },
+        ...clickOnSave(),
+        // Nest and re-arrange menu items for a newly created menu
+        {
+            content: "Open site menu",
+            trigger: 'button[data-menu-xmlid="website.menu_site"]',
+            run: "click",
+        },
+        {
+            content: "Click on Edit Menu",
+            trigger: 'a[data-menu-xmlid="website.menu_edit_menu"]',
+            run: "click",
+        },
+        {
+            content: "Trigger link dialog (click 'Add Menu Item')",
+            trigger: ".modal-body a:eq(0)",
+            run: "click",
+        },
+        {
+            content: "Write a label for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit new_menu",
+        },
+        {
+            content: "Write a url for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input:eq(1)",
+            run: "edit #",
+        },
+        {
+            content: "Confirm the new menu entry",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            content: "Check if new menu(new_menu) is added",
+            trigger: '.oe_menu_editor li:contains("new_menu")',
+        },
+        {
+            content: "Trigger link dialog (click 'Add Menu Item')",
+            trigger: ".modal-body a:eq(0)",
+            run: "click",
+        },
+        {
+            content: "Write a label for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input:eq(0)",
+            run: "edit new_nested_menu",
+        },
+        {
+            content: "Write a url for the new menu item",
+            trigger: ".modal-dialog .o_website_dialog input:eq(1)",
+            run: "edit #",
+        },
+        {
+            content: "Confirm the new menu entry",
+            trigger: ".modal:not(.o_inactive_modal) .modal-footer .btn-primary:contains(Continue)",
+            run: "click",
+        },
+        {
+            content: "Check if new menu(new_nested_menu) is added",
+            trigger: '.oe_menu_editor li:contains("new_nested_menu")',
+        },
+        {
+            content: "Nest 'new_nested_menu' under 'new_menu'",
+            trigger: '.oe_menu_editor li:contains("new_nested_menu") .oi-draggable',
+            run: "drag_and_drop .oe_menu_editor li:contains('new_menu') .form-control",
+        },
+        {
+            content: "Drag 'Modnar !!' below 'new_menu'",
+            trigger:
+                '.oe_menu_editor li:contains("Home") > ul > li:contains("Modnar !!") .oi-draggable',
+            async run(helpers) {
+                await helpers.drag_and_drop(
+                    '.oe_menu_editor li:contains("new_menu") .oi-draggable',
+                    {
+                        position: "bottom",
+                    }
+                );
+            },
+        },
+        {
+            content: "Nest 'Modnar !!' under 'new_menu'",
+            trigger: '.oe_menu_editor li:contains("Modnar !!") .oi-draggable',
+            run: "drag_and_drop .oe_menu_editor li:contains('new_menu') .form-control",
+        },
+        {
+            content: "Check if 'nested_menu' and 'Modnar !!' is nested under 'new_menu'",
+            trigger:
+                '.oe_menu_editor li:contains("new_menu") > ul > li:contains("Modnar !!") + li:contains("nested_menu")',
+        },
+        {
+            content: "Move 'Modnar !!' below 'new_nested_menu' inside the 'new_menu'",
+            trigger:
+                '.oe_menu_editor  li:contains("new_menu") > ul > li:contains("Modnar !!") .oi-draggable',
+            async run(helpers) {
+                await helpers.drag_and_drop(
+                    ".oe_menu_editor  li:contains('new_menu') > ul > li:contains('new_nested_menu') .oi-draggable",
+                    {
+                        position: "bottom",
+                    }
+                );
+            },
+        },
+        {
+            content: "Check if 'Modnar !!' is now below 'new_nested_menu' in 'new_menu'",
+            trigger:
+                '.oe_menu_editor li:contains("new_menu") > ul > li:last-child:contains("Modnar !!")',
+        },
+    ]
+);
 
 registerWebsitePreviewTour(
     "edit_menus_delete_parent",
diff --git a/addons/website/static/tests/tours/edit_translated_page.js b/addons/website/static/tests/tours/edit_translated_page.js
index 8cfaff6e0ce2d..d2c48a82d0e4d 100644
--- a/addons/website/static/tests/tours/edit_translated_page.js
+++ b/addons/website/static/tests/tours/edit_translated_page.js
@@ -1,36 +1,38 @@
 import { registry } from "@web/core/registry";
 import { clickOnEditAndWaitEditModeInTranslatedPage } from "@website/js/tours/tour_utils";
 
-registry.category("web_tour.tours").add('edit_translated_page_redirect', {
-    url: '/nl/contactus',
+registry.category("web_tour.tours").add("edit_translated_page_redirect", {
+    url: "/nl/contactus",
     steps: () => [
-    {
-        content: "Enter backend",
-        trigger: 'a.o_frontend_to_backend_edit_btn',
-        run: "click",
-        expectUnloadPage: true,
-    },
-    {
-        content: "Check the data-for attribute",
-        trigger: ':iframe main span[data-for="contactus_form"]:not(:visible)',
-    },
-    ...clickOnEditAndWaitEditModeInTranslatedPage(),
-    {
-        content: "Go to /nl",
-        trigger: "body",
-        run: () => {
-            // After checking the presence of the editor dashboard, we visit a
-            // translated version of the homepage. The homepage is a special
-            // case (there is no trailing slash), so we test it separately.
-            location.href = '/nl';
+        {
+            content: "Enter backend",
+            trigger: "a.o_frontend_to_backend_edit_btn",
+            run: "click",
+            expectUnloadPage: true,
         },
-        expectUnloadPage: true,
-    },
-    {
-        content: "Enter backend",
-        trigger: 'a.o_frontend_to_backend_edit_btn',
-        run: "click",
-        expectUnloadPage: true,
-    },
-    ...clickOnEditAndWaitEditModeInTranslatedPage(),
-]});
+        {
+            content: "Check the data-for attribute",
+            trigger: ':iframe main span[data-for="contactus_form"]:not(:visible)',
+        },
+        ...clickOnEditAndWaitEditModeInTranslatedPage(),
+        {
+            content: "Go to /nl",
+            trigger: "body",
+            run: () => {
+                // After checking the presence of the editor dashboard, we visit
+                // a translated version of the homepage. The homepage is a
+                // special case (there is no trailing slash), so we test it
+                // separately.
+                location.href = "/nl";
+            },
+            expectUnloadPage: true,
+        },
+        {
+            content: "Enter backend",
+            trigger: "a.o_frontend_to_backend_edit_btn",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        ...clickOnEditAndWaitEditModeInTranslatedPage(),
+    ],
+});
diff --git a/addons/website/static/tests/tours/editable_root_as_custom_snippet.js b/addons/website/static/tests/tours/editable_root_as_custom_snippet.js
index a49d6318497e5..a42fcb5ef2766 100644
--- a/addons/website/static/tests/tours/editable_root_as_custom_snippet.js
+++ b/addons/website/static/tests/tours/editable_root_as_custom_snippet.js
@@ -6,38 +6,45 @@ import {
     insertSnippet,
     registerWebsitePreviewTour,
     goBackToBlocks,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("editable_root_as_custom_snippet", {
-    edition: true,
-    url: '/custom-page',
-}, () => [
-    ...clickOnSnippet('.s_title.custom[data-oe-model][data-oe-id][data-oe-field][data-oe-xpath]'),
-    changeOption('Block', '.oe_snippet_save'),
+registerWebsitePreviewTour(
+    "editable_root_as_custom_snippet",
     {
-        content: "Confirm modal",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
+        edition: true,
+        url: "/custom-page",
     },
-    goBackToBlocks(),
-    {
-        content: "Wait for the custom category to appear in the panel",
-        trigger: '.o_snippet[name="Custom"]',
-    },
-    ...clickOnSave(),
-    {
-        content: "Go to homepage",
-        trigger: ':iframe a[href="/"].nav-link',
-        run: "click",
-    },
-    {
-        content: "Wait to land on homepage",
-        trigger: ':iframe a[href="/"].nav-link.active',
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...insertSnippet({customID: "s_title", name: "Custom Title", groupName: "Custom"}),
-    {
-        content: "Check that the custom snippet does not have branding",
-        trigger: ':iframe #wrap .s_title.custom:not([data-oe-model]):not([data-oe-id]):not([data-oe-field]):not([data-oe-xpath])',
-    },
-]);
+    () => [
+        ...clickOnSnippet(
+            ".s_title.custom[data-oe-model][data-oe-id][data-oe-field][data-oe-xpath]"
+        ),
+        changeOption("Block", ".oe_snippet_save"),
+        {
+            content: "Confirm modal",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        goBackToBlocks(),
+        {
+            content: "Wait for the custom category to appear in the panel",
+            trigger: '.o_snippet[name="Custom"]',
+        },
+        ...clickOnSave(),
+        {
+            content: "Go to homepage",
+            trigger: ':iframe a[href="/"].nav-link',
+            run: "click",
+        },
+        {
+            content: "Wait to land on homepage",
+            trigger: ':iframe a[href="/"].nav-link.active',
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...insertSnippet({ customID: "s_title", name: "Custom Title", groupName: "Custom" }),
+        {
+            content: "Check that the custom snippet does not have branding",
+            trigger:
+                ":iframe #wrap .s_title.custom:not([data-oe-model]):not([data-oe-id]):not([data-oe-field]):not([data-oe-xpath])",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/grid_layout.js b/addons/website/static/tests/tours/grid_layout.js
index 7b56a9e8bef1a..4d3c3ce8dfdf4 100644
--- a/addons/website/static/tests/tours/grid_layout.js
+++ b/addons/website/static/tests/tours/grid_layout.js
@@ -4,95 +4,112 @@ import {
     clickOnSnippet,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const snippet = {
-    id: 's_text_image',
-    name: 'Text - Image',
+    id: "s_text_image",
+    name: "Text - Image",
     groupName: "Content",
 };
 
-registerWebsitePreviewTour('website_replace_grid_image', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet(snippet),
+registerWebsitePreviewTour(
+    "website_replace_grid_image",
     {
-        // TODO: should check if o_loading_screen is not present (TO check with PIPU)
-        // Await step in the history
-        trigger: `:iframe:has(#wrap[contenteditable='true'])`,
+        url: "/",
+        edition: true,
     },
-    ...clickOnSnippet(snippet),
-    {
-        content: "Toggle to grid mode",
-        trigger: "[data-action-id='setGridLayout']",
-        run: "click",
-    },
-    {
-        content: "Replace image",
-        trigger: ':iframe .s_text_image img',
-        run: 'dblclick',
-    },
-    {
-        content: "Pick new image",
-        trigger: '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image.jpg"]',
-        run: "click",
-    },
-    {
-        content: "Add new image column",
-        trigger: "[data-action-id='addGridElement'][data-action-param='image']",
-        run: "click",
-    },
-    {
-        content: "Pick new image",
-        trigger: '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image2.webp"]',
-        run: "click",
-    },
-    {
-        content: "Replace new image",
-        trigger: ':iframe .s_text_image img[src*="s_banner_default_image2.webp"]',
-        run: 'dblclick',
-    },
-    {
-        content: "Pick new image",
-        trigger: '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image.jpg"]',
-        run: "click",
-    },
-    ...clickOnSave()
-]);
+    () => [
+        ...insertSnippet(snippet),
+        {
+            // TODO: should check if o_loading_screen is not present (TO check with PIPU)
+            // Await step in the history
+            trigger: `:iframe:has(#wrap[contenteditable='true'])`,
+        },
+        ...clickOnSnippet(snippet),
+        {
+            content: "Toggle to grid mode",
+            trigger: "[data-action-id='setGridLayout']",
+            run: "click",
+        },
+        {
+            content: "Replace image",
+            trigger: ":iframe .s_text_image img",
+            run: "dblclick",
+        },
+        {
+            content: "Pick new image",
+            trigger:
+                '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image.jpg"]',
+            run: "click",
+        },
+        {
+            content: "Add new image column",
+            trigger: "[data-action-id='addGridElement'][data-action-param='image']",
+            run: "click",
+        },
+        {
+            content: "Pick new image",
+            trigger:
+                '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image2.webp"]',
+            run: "click",
+        },
+        {
+            content: "Replace new image",
+            trigger: ':iframe .s_text_image img[src*="s_banner_default_image2.webp"]',
+            run: "dblclick",
+        },
+        {
+            content: "Pick new image",
+            trigger:
+                '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image.jpg"]',
+            run: "click",
+        },
+        ...clickOnSave(),
+    ]
+);
 
-registerWebsitePreviewTour("scroll_to_new_grid_item", {
-    url: "/",
-    edition: true,
-}, () => [
-    // Drop enough snippets to scroll.
-    ...insertSnippet({id: "s_text_image", name: "Text - Image", groupName: "Content"}),
-    ...insertSnippet({id: "s_image_text", name: "Image - Text", groupName: "Content"}),
-    ...insertSnippet({id: "s_image_text", name: "Image - Text", groupName: "Content"}),
-    // Toggle the first snippet to grid mode.
-    ...clickOnSnippet({id: "s_text_image", name: "Text - Image"}),
-    changeOption("Text - Image", "setGridLayout"),
-    // Add a new grid item.
-    changeOption("Text - Image", "[data-action-id='addGridElement'][data-action-param='image']"),
+registerWebsitePreviewTour(
+    "scroll_to_new_grid_item",
     {
-        content: "Select the new image in the media dialog",
-        trigger: '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image.jpg"]',
-        run: "click",
-    }, {
-        content: "Check that the page scrolled to the new grid item",
-        trigger: ":iframe .s_text_image .o_grid_item:nth-child(3)",
-        async run() {
-            // Leave some time to the page to scroll.
-            await new Promise((r) => setTimeout(r, 500));
-            const newItemPosition = this.anchor.getBoundingClientRect();
-            if (newItemPosition.top < 0) {
-                throw new Error("The page did not scroll to the new grid item.");
-            }
-            document.body.classList.add("o_scrolled_to_grid_item");
-        },
-    }, {
-        content: "Make sure the scroll check is done",
-        trigger: ".o_scrolled_to_grid_item",
+        url: "/",
+        edition: true,
     },
-    ...clickOnSave(),
-]);
+    () => [
+        // Drop enough snippets to scroll.
+        ...insertSnippet({ id: "s_text_image", name: "Text - Image", groupName: "Content" }),
+        ...insertSnippet({ id: "s_image_text", name: "Image - Text", groupName: "Content" }),
+        ...insertSnippet({ id: "s_image_text", name: "Image - Text", groupName: "Content" }),
+        // Toggle the first snippet to grid mode.
+        ...clickOnSnippet({ id: "s_text_image", name: "Text - Image" }),
+        changeOption("Text - Image", "setGridLayout"),
+        // Add a new grid item.
+        changeOption(
+            "Text - Image",
+            "[data-action-id='addGridElement'][data-action-param='image']"
+        ),
+        {
+            content: "Select the new image in the media dialog",
+            trigger:
+                '.o_select_media_dialog .o_button_area[aria-label="s_banner_default_image.jpg"]',
+            run: "click",
+        },
+        {
+            content: "Check that the page scrolled to the new grid item",
+            trigger: ":iframe .s_text_image .o_grid_item:nth-child(3)",
+            async run() {
+                // Leave some time to the page to scroll.
+                await new Promise((r) => setTimeout(r, 500));
+                const newItemPosition = this.anchor.getBoundingClientRect();
+                if (newItemPosition.top < 0) {
+                    throw new Error("The page did not scroll to the new grid item.");
+                }
+                document.body.classList.add("o_scrolled_to_grid_item");
+            },
+        },
+        {
+            content: "Make sure the scroll check is done",
+            trigger: ".o_scrolled_to_grid_item",
+        },
+        ...clickOnSave(),
+    ]
+);
diff --git a/addons/website/static/tests/tours/html_editor.js b/addons/website/static/tests/tours/html_editor.js
index 14522b2de829c..f45cf76b96eda 100644
--- a/addons/website/static/tests/tours/html_editor.js
+++ b/addons/website/static/tests/tours/html_editor.js
@@ -1,55 +1,72 @@
 /* global ace */
 
-import {clickOnSave, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+import { clickOnSave, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
-const adminCssModif = '#wrap {display: none;}';
-const demoCssModif = '// demo_edition';
+const adminCssModif = "#wrap {display: none;}";
+const demoCssModif = "// demo_edition";
 
-registerWebsitePreviewTour('html_editor_language', {
-    url: '/test_page',
-}, () => [
-    {
-        content: "Wait the content is loaded and html/css editor is in menu before clicking on open site menu",
-        trigger: ":iframe main:contains(rommelpot)",
-    },
+registerWebsitePreviewTour(
+    "html_editor_language",
     {
-    content: "open site menu",
-    trigger: 'button[data-menu-xmlid="website.menu_site"]',
-    run: "click",
-}, {
-    content: "open html editor",
-    trigger: 'a[data-menu-xmlid="website.menu_ace_editor"]',
-    run: "click",
-}, {
-    content: "add something in the page's default language version",
-    trigger: 'div.ace_line .ace_xml:contains("rommelpot")',
-    run: () => {
-        ace.edit(document.querySelector('#resource-editor div')).getSession().insert({
-            row: 1,
-            column: 1,
-        }, '<div class="test_language"/>\n');
+        url: "/test_page",
     },
-}, {
-    content: "save the html editor",
-    trigger: 'body:has(div.ace_line .ace_xml:contains("test_language")) .o_resource_editor .btn-primary',
-    run: "click",
-}, {
-    content: "check that the page has the modification",
-    trigger: ':iframe #wrapwrap:has(.test_language)',
-}, {
-    content: "check that the page has not lost the original text",
-    trigger: ':iframe #wrapwrap:contains("rommelpot")',
-}]
+    () => [
+        {
+            content:
+                "Wait the content is loaded and html/css editor is in menu before clicking on open site menu",
+            trigger: ":iframe main:contains(rommelpot)",
+        },
+        {
+            content: "open site menu",
+            trigger: 'button[data-menu-xmlid="website.menu_site"]',
+            run: "click",
+        },
+        {
+            content: "open html editor",
+            trigger: 'a[data-menu-xmlid="website.menu_ace_editor"]',
+            run: "click",
+        },
+        {
+            content: "add something in the page's default language version",
+            trigger: 'div.ace_line .ace_xml:contains("rommelpot")',
+            run: () => {
+                ace.edit(document.querySelector("#resource-editor div")).getSession().insert(
+                    {
+                        row: 1,
+                        column: 1,
+                    },
+                    '<div class="test_language"/>\n'
+                );
+            },
+        },
+        {
+            content: "save the html editor",
+            trigger:
+                'body:has(div.ace_line .ace_xml:contains("test_language")) .o_resource_editor .btn-primary',
+            run: "click",
+        },
+        {
+            content: "check that the page has the modification",
+            trigger: ":iframe #wrapwrap:has(.test_language)",
+        },
+        {
+            content: "check that the page has not lost the original text",
+            trigger: ':iframe #wrapwrap:contains("rommelpot")',
+        },
+    ]
 );
 
-registerWebsitePreviewTour('html_editor_multiple_templates', {
-    url: '/generic',
-    edition: true,
-},
+registerWebsitePreviewTour(
+    "html_editor_multiple_templates",
+    {
+        url: "/generic",
+        edition: true,
+    },
     () => [
         {
             content: "drop a snippet group",
-            trigger: ".o-website-builder_sidebar .o_snippet[name=Intro].o_draggable .o_snippet_thumbnail",
+            trigger:
+                ".o-website-builder_sidebar .o_snippet[name=Intro].o_draggable .o_snippet_thumbnail",
             // id starting by 'oe_structure..' will actually create an inherited view
             run: "drag_and_drop :iframe #oe_structure_test_ui",
         },
@@ -74,7 +91,9 @@ registerWebsitePreviewTour('html_editor_multiple_templates', {
             content: "add something in the generic view",
             trigger: 'div.ace_line .ace_xml:contains("Generic")',
             run() {
-                ace.edit(document.querySelector('#resource-editor div')).getSession().insert({row: 3, column: 1}, '<p>somenewcontent</p>\n');
+                ace.edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 3, column: 1 }, "<p>somenewcontent</p>\n");
             },
         },
         // 3. Edit oe_structure specific view
@@ -99,7 +118,9 @@ registerWebsitePreviewTour('html_editor_multiple_templates', {
             content: "add something in the oe_structure specific view",
             trigger: 'div.ace_line .ace_xml:contains("s_cover")',
             run() {
-                ace.edit(document.querySelector('#resource-editor div')).getSession().insert({row: 2, column: 1}, '<p>anothernewcontent</p>\n');
+                ace.edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 2, column: 1 }, "<p>anothernewcontent</p>\n");
             },
         },
         {
@@ -114,15 +135,17 @@ registerWebsitePreviewTour('html_editor_multiple_templates', {
             trigger: ':iframe #wrapwrap:contains("anothernewcontent")',
         },
         {
-           content: "check that the page has both modification",
-           trigger: ':iframe #wrapwrap:contains("somenewcontent")',
-       },
+            content: "check that the page has both modification",
+            trigger: ':iframe #wrapwrap:contains("somenewcontent")',
+        },
     ]
 );
 
-registerWebsitePreviewTour('test_html_editor_scss', {
-    url: '/contactus',
-},
+registerWebsitePreviewTour(
+    "test_html_editor_scss",
+    {
+        url: "/contactus",
+    },
     () => [
         // 1. Open Html Editor and select a scss file
         {
@@ -146,7 +169,7 @@ registerWebsitePreviewTour('test_html_editor_scss', {
         },
         {
             content: "open type switcher",
-            trigger: '.o_resource_editor_type_switcher button',
+            trigger: ".o_resource_editor_type_switcher button",
             run: "click",
         },
         {
@@ -163,7 +186,9 @@ registerWebsitePreviewTour('test_html_editor_scss', {
             content: "add some scss content in the file",
             trigger: 'div.ace_line .ace_comment:contains("footer {")',
             run() {
-                ace.edit(document.querySelector('#resource-editor div')).getSession().insert({row: 2, column: 0}, `${adminCssModif}\n`);
+                ace.edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 2, column: 0 }, `${adminCssModif}\n`);
             },
         },
         {
@@ -176,22 +201,24 @@ registerWebsitePreviewTour('test_html_editor_scss', {
         },
         {
             content: "check that the scss modification got applied",
-            trigger: ':iframe body:has(#wrap:hidden)',
+            trigger: ":iframe body:has(#wrap:hidden)",
             timeout: 30000, // SCSS compilation might take some time
         },
         {
-            content: "reset view (after reload, html editor should have been reopened where it was)",
-            trigger: '#resource-editor-id button:contains(Reset)',
+            content:
+                "reset view (after reload, html editor should have been reopened where it was)",
+            trigger: "#resource-editor-id button:contains(Reset)",
             run: "click",
         },
         {
             content: "confirm reset warning",
-            trigger: '.modal-footer .btn-primary',
+            trigger: ".modal-footer .btn-primary",
             run: "click",
         },
         {
-            content: "check that the scss file was reset correctly, wrap content should now be visible again",
-            trigger: ':iframe #wrap:visible',
+            content:
+                "check that the scss file was reset correctly, wrap content should now be visible again",
+            trigger: ":iframe #wrap:visible",
             timeout: 30000, // SCSS compilation might take some time
         },
         // 3. Customize again that file (will be used in second part of the test
@@ -200,7 +227,9 @@ registerWebsitePreviewTour('test_html_editor_scss', {
             content: "add some scss content in the file",
             trigger: 'div.ace_line .ace_comment:contains("footer {")',
             run() {
-                ace.edit(document.querySelector('#resource-editor div')).getSession().insert({row: 2, column: 0}, `${adminCssModif}\n`);
+                ace.edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 2, column: 0 }, `${adminCssModif}\n`);
             },
         },
         {
@@ -221,9 +250,11 @@ registerWebsitePreviewTour('test_html_editor_scss', {
     ]
 );
 
-registerWebsitePreviewTour('test_html_editor_scss_2', {
-    url: '/',
-},
+registerWebsitePreviewTour(
+    "test_html_editor_scss_2",
+    {
+        url: "/",
+    },
     () => [
         // This part of the test ensures that a restricted user can still use
         // the HTML Editor if someone else made a customization previously.
@@ -244,7 +275,7 @@ registerWebsitePreviewTour('test_html_editor_scss_2', {
         },
         {
             content: "open type switcher",
-            trigger: '.o_resource_editor_type_switcher button',
+            trigger: ".o_resource_editor_type_switcher button",
             run: "click",
         },
         {
@@ -262,7 +293,9 @@ registerWebsitePreviewTour('test_html_editor_scss_2', {
             trigger: `div.ace_line:contains("${adminCssModif}")`,
             // ensure the admin modification is here
             run() {
-                ace.edit(document.querySelector('#resource-editor div')).getSession().insert({row: 2, column: 0}, `${demoCssModif}\n`);
+                ace.edit(document.querySelector("#resource-editor div"))
+                    .getSession()
+                    .insert({ row: 2, column: 0 }, `${demoCssModif}\n`);
             },
         },
         {
@@ -274,8 +307,9 @@ registerWebsitePreviewTour('test_html_editor_scss_2', {
             run: "click",
         },
         {
-            content: "reset view (after reload, html editor should have been reopened where it was)",
-            trigger: '#resource-editor-id button:contains(Reset)',
+            content:
+                "reset view (after reload, html editor should have been reopened where it was)",
+            trigger: "#resource-editor-id button:contains(Reset)",
             timeout: 30000, // SCSS compilation might take some time
             run: "click",
         },
@@ -321,16 +355,20 @@ registerWebsitePreviewTour(
             run: "click",
         },
         // Test all 3 file type options
-        ...[{
-            menuItemIndex: 1,
-            editorMode: 'qweb',
-        }, {
-            menuItemIndex: 2,
-            editorMode: 'scss',
-        }, {
-            menuItemIndex: 3,
-            editorMode: 'javascript',
-        }]
+        ...[
+            {
+                menuItemIndex: 1,
+                editorMode: "qweb",
+            },
+            {
+                menuItemIndex: 2,
+                editorMode: "scss",
+            },
+            {
+                menuItemIndex: 3,
+                editorMode: "javascript",
+            },
+        ]
             .map(({ menuItemIndex, editorMode }) => [
                 {
                     content: "Open file type dropdown",
diff --git a/addons/website/static/tests/tours/interaction_lifecycle.js b/addons/website/static/tests/tours/interaction_lifecycle.js
index 4b652c30a0eb9..bbbe5b38653ad 100644
--- a/addons/website/static/tests/tours/interaction_lifecycle.js
+++ b/addons/website/static/tests/tours/interaction_lifecycle.js
@@ -2,70 +2,86 @@ import {
     clickOnEditAndWaitEditMode,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 // Note: cannot import @website/../tests/tour_utils/lifecycle_dep_interaction
 // here because that module requires web.public.interaction which is not available
 // in the backend, where this tour definition is loaded. Easier to duplicate
 // that key for now rather than create a whole file to handle this localStorage
 // key only.
-const localStorageKey = 'interactionAndWysiwygLifecycle';
+const localStorageKey = "interactionAndWysiwygLifecycle";
 
-registerWebsitePreviewTour("interaction_lifecycle", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_countdown",
-        name: "Countdown",
-        groupName: "Content",
-    }),
+registerWebsitePreviewTour(
+    "interaction_lifecycle",
     {
-        content: "Wait for the interaction to be started and empty the interactionAndWysiwygLifecycle list",
-        trigger: ":iframe .s_countdown.interaction_started",
-        run: () => {
-            // Start recording the calls to the "start" and "destroy" method of
-            // the interaction and the wysiwyg.
-            window.localStorage.setItem(localStorageKey, '[]');
-        },
-    },
-    {
-        trigger: "button[data-action=save]:enabled:contains(save)",
-        run: "click",
-    },
-    {
-        content: "Wait for the interaction to be started",
-        trigger: ":iframe .s_countdown.interaction_started",
+        url: "/",
+        edition: true,
     },
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Wait for the interaction to be started and check the order of the lifecycle method call of the interaction and the wysiwyg",
-        trigger: ":iframe .s_countdown.interaction_started",
-        run() {
-            const result = JSON.parse(window.localStorage.interactionAndWysiwygLifecycle);
-            const expected = ["interactionStop", "interactionStart", "interactionStop", "interactionStart"];
-            const alternative = ["interactionStop", "interactionStart", "wysiwygStop",
-                "interactionStop", "wysiwygStart", "wysiwygStarted", "interactionStart",
-            ];
-            const resultIsEqualTo = (arr) => {
-                return arr.length === result.length
-                    && arr.every((item, i) => item === result[i]);
-            };
-            if (!(resultIsEqualTo(expected) || resultIsEqualTo(alternative))) {
-                // The "destroy" method of the wysiwyg is called two times when
-                // leaving the edit mode: the first one comes explicitly from
-                // the "leaveEditMode" of the "wysiwyg_adapter". The second
-                // comes from the OWL mechanism as the wysiwyg is not present in
-                // the DOM when the page is reloaded. Because it is not
-                // guaranteed that this last call happens before the start of
-                // the interaction at the page reload, two sequences are
-                // acceptable as a result.
-                console.error(`
+    () => [
+        ...insertSnippet({
+            id: "s_countdown",
+            name: "Countdown",
+            groupName: "Content",
+        }),
+        {
+            content:
+                "Wait for the interaction to be started and empty the interactionAndWysiwygLifecycle list",
+            trigger: ":iframe .s_countdown.interaction_started",
+            run: () => {
+                // Start recording the calls to the "start" and "destroy" method
+                // of the interaction and the wysiwyg.
+                window.localStorage.setItem(localStorageKey, "[]");
+            },
+        },
+        {
+            trigger: "button[data-action=save]:enabled:contains(save)",
+            run: "click",
+        },
+        {
+            content: "Wait for the interaction to be started",
+            trigger: ":iframe .s_countdown.interaction_started",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content:
+                "Wait for the interaction to be started and check the order of the lifecycle method call of the interaction and the wysiwyg",
+            trigger: ":iframe .s_countdown.interaction_started",
+            run() {
+                const result = JSON.parse(window.localStorage.interactionAndWysiwygLifecycle);
+                const expected = [
+                    "interactionStop",
+                    "interactionStart",
+                    "interactionStop",
+                    "interactionStart",
+                ];
+                const alternative = [
+                    "interactionStop",
+                    "interactionStart",
+                    "wysiwygStop",
+                    "interactionStop",
+                    "wysiwygStart",
+                    "wysiwygStarted",
+                    "interactionStart",
+                ];
+                const resultIsEqualTo = (arr) =>
+                    arr.length === result.length && arr.every((item, i) => item === result[i]);
+                if (!(resultIsEqualTo(expected) || resultIsEqualTo(alternative))) {
+                    // The "destroy" method of the wysiwyg is called two times
+                    // when leaving the edit mode: the first one comes
+                    // explicitly from the "leaveEditMode" of the
+                    // "wysiwyg_adapter". The second comes from the OWL
+                    // mechanism as the wysiwyg is not present in the DOM when
+                    // the page is reloaded. Because it is not guaranteed that
+                    // this last call happens before the start of the
+                    // interaction at the page reload, two sequences are
+                    // acceptable as a result.
+                    console.error(`
                     Expected: ${expected.toString()}
                     Or:       ${alternative.toString()}
                     Result:   ${result.toString()}
                 `);
-            }
+                }
+            },
         },
-    },
-]);
+    ]
+);
diff --git a/addons/website/static/tests/tours/media_dialog.js b/addons/website/static/tests/tours/media_dialog.js
index 9081ba4179d58..8e5b4fc2053ff 100644
--- a/addons/website/static/tests/tours/media_dialog.js
+++ b/addons/website/static/tests/tours/media_dialog.js
@@ -3,223 +3,261 @@ import {
     clickOnSave,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("website_media_dialog_undraw", {
-    url: '/',
-    edition: true,
-}, () => [
-...insertSnippet({
-    id: 's_text_image',
-    name: 'Text - Image',
-    groupName: "Content",
-}),
-{
-    content: "Open the media dialog from the snippet",
-    trigger: ":iframe .s_text_image img",
-    run: "dblclick",
-}, {
-    content: "Search for 'banner' to call the media library", // Mocked call
-    trigger: ".o_select_media_dialog .o_we_search",
-    run: "edit banner",
-}, {
-    content: "Check that the media library is available",
-    trigger: '.o_select_media_dialog:has(.o_we_search_select option[value="media-library"])',
-},
-{
-    content: "Ensure all images are loaded to avoid CORS is misconfigured on the API server, image will be treated as non-dynamic.",
-    trigger: ".modal .o_load_done_msg",
-},
-]);
-
-registerWebsitePreviewTour("website_media_dialog_external_library", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_text_image",
-        name: "Text - Image",
-        groupName: "Content",
-    }),
-    {
-        content: "Open the media dialog from the snippet",
-        trigger: ":iframe .s_text_image img",
-        run: "dblclick",
-    }, {
-        content: "Dummy search to call the media library",
-        trigger: ".o_select_media_dialog .o_we_search",
-        run: "edit a",
-    }, {
-        content: "Choose the media library to only show its media",
-        trigger: ".o_select_media_dialog .o_we_search_select",
-        run: "select Illustrations",
-    }, {
-        content: "Double click on the first image",
-        trigger: ".o_select_media_dialog img.o_we_attachment_highlight",
-        run: "click",
-    }, {
-        content: "Reopen the media dialog",
-        trigger: ":iframe .s_text_image img",
-        run: "dblclick",
-    }, {
-        content: "Check that the image was created only once",
-        trigger: ".o_select_media_dialog .o_we_existing_attachments .o_existing_attachment_cell img[src^='/html_editor/shape/illustration/']",
-        run() {
-            const listEl = this.anchor.closest(".o_select_media_dialog .o_we_existing_attachments");
-            const selector = ".o_existing_attachment_cell img[src^='/html_editor/shape/illustration/']";
-            const uploadedImgs = listEl.querySelectorAll(`${selector}[title='${this.anchor.title}']`);
-            if (uploadedImgs.length !== 1) {
-                throw new Error(`${uploadedImgs.length} attachment(s) were found. Exactly 1 should have been created.`);
-            }
-        },
-    },
-    {
-        content: "Click on the first illustration image",
-        trigger: ".o_select_media_dialog .o_we_attachment_highlight",
-        run: "click",
-    },
-    {
-        content: "Select the image",
-        trigger: ":iframe .s_text_image img",
-        run: "click",
-    },
-    {
-        content: "Try to crop the image",
-        trigger: "#oe_snippets .o_we_customize_panel .o_we_user_value_widget[data-crop='true']",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "website_media_dialog_undraw",
     {
-        content: "Observe the crop is denied for illustration image",
-        trigger: ".o_notification_manager .o_notification",
+        url: "/",
+        edition: true,
     },
-    ...clickOnSave(),
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            content: "Open the media dialog from the snippet",
+            trigger: ":iframe .s_text_image img",
+            run: "dblclick",
+        },
+        {
+            content: "Search for 'banner' to call the media library", // Mocked call
+            trigger: ".o_select_media_dialog .o_we_search",
+            run: "edit banner",
+        },
+        {
+            content: "Check that the media library is available",
+            trigger:
+                '.o_select_media_dialog:has(.o_we_search_select option[value="media-library"])',
+        },
+        {
+            content:
+                "Ensure all images are loaded to avoid CORS is misconfigured on the API server, image will be treated as non-dynamic.",
+            trigger: ".modal .o_load_done_msg",
+        },
+    ]
+);
 
-registerWebsitePreviewTour('website_media_dialog_icons', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_social_media',
-        name: 'Social Media',
-    }),
-    {
-        content: "Open MediaDialog from a snippet icon",
-        trigger: ':iframe .s_social_media .fa-instagram',
-        run: "dblclick",
-    },
-    {
-        content: "Pick the same icon",
-        trigger: '.o_select_media_dialog .o_we_attachment_selected.fa-instagram',
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "website_media_dialog_external_library",
     {
-        content: "Check if the icon remains the same",
-        trigger: ':iframe .s_social_media .fa-instagram',
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Open MediaDialog again",
-        trigger: ':iframe .s_social_media .fa-instagram',
-        run: "dblclick",
-    },
-    {
-        content: "Click on the ADD button",
-        trigger: '.o_select_media_dialog .btn:contains(Add)',
-        run: "click",
-    },
-    {
-        content: "Check if the icon remains the same",
-        trigger: ':iframe .s_social_media .fa-instagram',
-    },
-    ...clickOnSave()
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            content: "Open the media dialog from the snippet",
+            trigger: ":iframe .s_text_image img",
+            run: "dblclick",
+        },
+        {
+            content: "Dummy search to call the media library",
+            trigger: ".o_select_media_dialog .o_we_search",
+            run: "edit a",
+        },
+        {
+            content: "Choose the media library to only show its media",
+            trigger: ".o_select_media_dialog .o_we_search_select",
+            run: "select Illustrations",
+        },
+        {
+            content: "Double click on the first image",
+            trigger: ".o_select_media_dialog img.o_we_attachment_highlight",
+            run: "click",
+        },
+        {
+            content: "Reopen the media dialog",
+            trigger: ":iframe .s_text_image img",
+            run: "dblclick",
+        },
+        {
+            content: "Check that the image was created only once",
+            trigger:
+                ".o_select_media_dialog .o_we_existing_attachments .o_existing_attachment_cell img[src^='/html_editor/shape/illustration/']",
+            run() {
+                const listEl = this.anchor.closest(
+                    ".o_select_media_dialog .o_we_existing_attachments"
+                );
+                const selector =
+                    ".o_existing_attachment_cell img[src^='/html_editor/shape/illustration/']";
+                const uploadedImgs = listEl.querySelectorAll(
+                    `${selector}[title='${this.anchor.title}']`
+                );
+                if (uploadedImgs.length !== 1) {
+                    throw new Error(
+                        `${uploadedImgs.length} attachment(s) were found. Exactly 1 should have been created.`
+                    );
+                }
+            },
+        },
+        {
+            content: "Click on the first illustration image",
+            trigger: ".o_select_media_dialog .o_we_attachment_highlight",
+            run: "click",
+        },
+        {
+            content: "Select the image",
+            trigger: ":iframe .s_text_image img",
+            run: "click",
+        },
+        {
+            content: "Try to crop the image",
+            trigger: "#oe_snippets .o_we_customize_panel .o_we_user_value_widget[data-crop='true']",
+            run: "click",
+        },
+        {
+            content: "Observe the crop is denied for illustration image",
+            trigger: ".o_notification_manager .o_notification",
+        },
+        ...clickOnSave(),
+    ]
+);
 
-registerWebsitePreviewTour("website_media_dialog_image_shape", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_text_image",
-        name: "Text - Image",
-        groupName: "Content",
-    }),
-    {
-        content: "Click on the image",
-        trigger: ":iframe .s_text_image img:not(:visible), :iframe .s_text_image img",
-        run: "click",
-    },
-    changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
-    {
-        content: "Click on the first image shape",
-        trigger: "[data-action-id='setImageShape']",
-        run: "click",
-    },
-    {
-        content: "Open MediaDialog from an image",
-        trigger: ".btn-success[data-action-id='replaceMedia']",
-        run: "click",
-    },
-    {
-        content: "Click on the 'Icons' tab",
-        trigger: '.o_select_media_dialog .o_notebook_headers .nav-item a:contains("Icons")',
-        run: "click",
-    },
-    {
-        content: "Select an icon",
-        trigger: ".o_select_media_dialog:has(.nav-link.active:contains('Icons')) .tab-content span.fa-heart",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "website_media_dialog_icons",
     {
-        content: "Checks that the icon doesn't have a shape",
-        trigger: ":iframe .s_text_image .fa-heart:not([data-shape])",
+        url: "/",
+        edition: true,
     },
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_social_media",
+            name: "Social Media",
+        }),
+        {
+            content: "Open MediaDialog from a snippet icon",
+            trigger: ":iframe .s_social_media .fa-instagram",
+            run: "dblclick",
+        },
+        {
+            content: "Pick the same icon",
+            trigger: ".o_select_media_dialog .o_we_attachment_selected.fa-instagram",
+            run: "click",
+        },
+        {
+            content: "Check if the icon remains the same",
+            trigger: ":iframe .s_social_media .fa-instagram",
+        },
+        {
+            content: "Open MediaDialog again",
+            trigger: ":iframe .s_social_media .fa-instagram",
+            run: "dblclick",
+        },
+        {
+            content: "Click on the ADD button",
+            trigger: ".o_select_media_dialog .btn:contains(Add)",
+            run: "click",
+        },
+        {
+            content: "Check if the icon remains the same",
+            trigger: ":iframe .s_social_media .fa-instagram",
+        },
+        ...clickOnSave(),
+    ]
+);
 
-registerWebsitePreviewTour("website_media_dialog_insert_media", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_text_block",
-        name: "Text",
-        groupName: "Text",
-    }),
+registerWebsitePreviewTour(
+    "website_media_dialog_image_shape",
     {
-        content: "Click on the first paragraph",
-        trigger: ":iframe .s_text_block p",
-        run: "editor test",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Show the powerbox",
-        trigger: ":iframe .s_text_block p:last-child",
-        async run(actions) {
-            await actions.editor(`/`);
-            const wrapwrap = this.anchor.closest("#wrapwrap");
-            wrapwrap.dispatchEvent(
-                new InputEvent("input", {
-                    inputType: "insertText",
-                    data: "/",
-                })
-            );
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            content: "Click on the image",
+            trigger: ":iframe .s_text_image img:not(:visible), :iframe .s_text_image img",
+            run: "click",
         },
-    },
-    {
-        content: "Click on the media item from powerbox",
-        trigger: "div.o-we-command-name:contains('Media')",
-        run: "click",
-    },
-    {
-        content: "Click on the 'Icons' tab",
-        trigger: ".o_select_media_dialog a.nav-link:contains('Icons')",
-        run: "click",
-    },
-    {
-        content: "Click on the first icon",
-        trigger: ".o_select_media_dialog .font-icons-icon",
-        run: "click",
-    },
+        changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
+        {
+            content: "Click on the first image shape",
+            trigger: "[data-action-id='setImageShape']",
+            run: "click",
+        },
+        {
+            content: "Open MediaDialog from an image",
+            trigger: ".btn-success[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "Click on the 'Icons' tab",
+            trigger: '.o_select_media_dialog .o_notebook_headers .nav-item a:contains("Icons")',
+            run: "click",
+        },
+        {
+            content: "Select an icon",
+            trigger:
+                ".o_select_media_dialog:has(.nav-link.active:contains('Icons')) .tab-content span.fa-heart",
+            run: "click",
+        },
+        {
+            content: "Checks that the icon doesn't have a shape",
+            trigger: ":iframe .s_text_image .fa-heart:not([data-shape])",
+        },
+    ]
+);
+
+registerWebsitePreviewTour(
+    "website_media_dialog_insert_media",
     {
-        content: "Verify that the icon was inserted",
-        trigger: ":iframe .s_text_block p > span.fa",
+        url: "/",
+        edition: true,
     },
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_block",
+            name: "Text",
+            groupName: "Text",
+        }),
+        {
+            content: "Click on the first paragraph",
+            trigger: ":iframe .s_text_block p",
+            run: "editor test",
+        },
+        {
+            content: "Show the powerbox",
+            trigger: ":iframe .s_text_block p:last-child",
+            async run(actions) {
+                await actions.editor(`/`);
+                const wrapwrap = this.anchor.closest("#wrapwrap");
+                wrapwrap.dispatchEvent(
+                    new InputEvent("input", {
+                        inputType: "insertText",
+                        data: "/",
+                    })
+                );
+            },
+        },
+        {
+            content: "Click on the media item from powerbox",
+            trigger: "div.o-we-command-name:contains('Media')",
+            run: "click",
+        },
+        {
+            content: "Click on the 'Icons' tab",
+            trigger: ".o_select_media_dialog a.nav-link:contains('Icons')",
+            run: "click",
+        },
+        {
+            content: "Click on the first icon",
+            trigger: ".o_select_media_dialog .font-icons-icon",
+            run: "click",
+        },
+        {
+            content: "Verify that the icon was inserted",
+            trigger: ":iframe .s_text_block p > span.fa",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/media_iframe_video.js b/addons/website/static/tests/tours/media_iframe_video.js
index c9b012c45e373..441353e4d1f64 100644
--- a/addons/website/static/tests/tours/media_iframe_video.js
+++ b/addons/website/static/tests/tours/media_iframe_video.js
@@ -1,9 +1,12 @@
 import { insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("website_media_iframe_video", {
+registerWebsitePreviewTour(
+    "website_media_iframe_video",
+    {
         url: "/",
         edition: true,
-    }, () => [
+    },
+    () => [
         ...insertSnippet({
             id: "s_text_image",
             name: "Text - Image",
diff --git a/addons/website/static/tests/tours/multi_edition.js b/addons/website/static/tests/tours/multi_edition.js
index 41db346161040..7542a8cf9fe33 100644
--- a/addons/website/static/tests/tours/multi_edition.js
+++ b/addons/website/static/tests/tours/multi_edition.js
@@ -1,35 +1,43 @@
-import { clickOnSave, insertSnippet, registerWebsitePreviewTour } from '@website/js/tours/tour_utils';
+import {
+    clickOnSave,
+    insertSnippet,
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('website_multi_edition', {
-    url: '/',
-    edition: true,
-}, () => [
+registerWebsitePreviewTour(
+    "website_multi_edition",
     {
-        content: 'Check the current page has not the elements that will be added',
-        trigger: ':iframe body:not(:has(.s_text_image)):not(:has(.s_hr))',
+        url: "/",
+        edition: true,
     },
-    // Edit the main element of the page
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
-    // Edit another part in the page, like the footer
-    {
-        trigger: ".o-website-builder_sidebar.o_builder_sidebar_open .o_snippet",
-    },
-    {
-        trigger: `.o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name="Separator"].o_draggable .o_snippet_thumbnail`,
-        content: "Drag the Separator building block and drop it at the bottom of the page.",
-        run: "drag_and_drop :iframe .oe_drop_zone:last",
-    },
-    ...clickOnSave(),
-    {
-        content: 'Check that the main element of the page was properly saved',
-        trigger: ':iframe main .s_text_image',
-    },
-    {
-        content: 'Check that the footer was properly saved',
-        trigger: ':iframe footer .s_hr',
-    },
-]);
+    () => [
+        {
+            content: "Check the current page has not the elements that will be added",
+            trigger: ":iframe body:not(:has(.s_text_image)):not(:has(.s_hr))",
+        },
+        // Edit the main element of the page
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        // Edit another part in the page, like the footer
+        {
+            trigger: ".o-website-builder_sidebar.o_builder_sidebar_open .o_snippet",
+        },
+        {
+            trigger: `.o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name="Separator"].o_draggable .o_snippet_thumbnail`,
+            content: "Drag the Separator building block and drop it at the bottom of the page.",
+            run: "drag_and_drop :iframe .oe_drop_zone:last",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the main element of the page was properly saved",
+            trigger: ":iframe main .s_text_image",
+        },
+        {
+            content: "Check that the footer was properly saved",
+            trigger: ":iframe footer .s_hr",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/page_manager.js b/addons/website/static/tests/tours/page_manager.js
index 755aab49e6886..38567af949df9 100644
--- a/addons/website/static/tests/tours/page_manager.js
+++ b/addons/website/static/tests/tours/page_manager.js
@@ -1,4 +1,4 @@
-import { testSwitchWebsite, registerWebsitePreviewTour } from '@website/js/tours/tour_utils';
+import { testSwitchWebsite, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 import { registry } from "@web/core/registry";
 
 // TODO: This part should be moved in a QUnit test
@@ -126,7 +126,7 @@ const checkWebsiteFilters = [
 const deleteSelectedPage = [
     {
         content: "Click on Action",
-        trigger: '.o_cp_action_menus button',
+        trigger: ".o_cp_action_menus button",
         run: "click",
     },
     {
@@ -144,9 +144,9 @@ const deleteSelectedPage = [
     },
     {
         content: "Click on OK",
-        trigger: '.modal-content footer button.btn-primary:not([disabled])',
+        trigger: ".modal-content footer button.btn-primary:not([disabled])",
         run: "click",
-    }
+    },
 ];
 const homePage = 'tr:contains("Home")';
 
@@ -225,78 +225,96 @@ const duplicateMultiplePage = [
     ...refreshPage,
 ];
 
-registerWebsitePreviewTour('website_page_manager', {
-    url: '/',
-}, () => [
-    {
-        content: "Click on Site",
-        trigger: 'button.dropdown-toggle[data-menu-xmlid="website.menu_site"]',
-        run: "click",
-    },
-    {
-        content: "Click on Pages",
-        trigger: 'a.dropdown-item[data-menu-xmlid="website.menu_website_pages_list"]',
-        run: "click",
-    },
-    ...checkKanbanGroupBy,
-    ...checkWebsiteFilters,
-    {
-        content: "Open the search menu dropdown",
-        trigger: ".o_searchview_dropdown_toggler",
-        run: "click",
-    },
-    {
-        content: "Select 'My Website' filter",
-        trigger: ".o_filter_menu .o-dropdown-item:contains('My Website')",
-        run: "click",
-    },
-    {
-        content: "Click on Home Page",
-        trigger: `.o_list_renderer ${homePage} td.o_list_record_selector input[type="checkbox"]`,
-        run: "click",
-    },
-    ...deleteSelectedPage,
-    {
-        content: "Check that the page has been removed",
-        trigger: `.o_list_renderer:not(:has(${homePage}))`,
-    },
+registerWebsitePreviewTour(
+    "website_page_manager",
     {
-        content: "Click on All Pages",
-        trigger: '.o_list_renderer thead input[type="checkbox"]',
-        run: "click",
+        url: "/",
     },
-    ...deleteSelectedPage,
+    () => [
+        {
+            content: "Click on Site",
+            trigger: 'button.dropdown-toggle[data-menu-xmlid="website.menu_site"]',
+            run: "click",
+        },
+        {
+            content: "Click on Pages",
+            trigger: 'a.dropdown-item[data-menu-xmlid="website.menu_website_pages_list"]',
+            run: "click",
+        },
+        ...checkKanbanGroupBy,
+        ...checkWebsiteFilters,
+        {
+            content: "Open the search menu dropdown",
+            trigger: ".o_searchview_dropdown_toggler",
+            run: "click",
+        },
+        {
+            content: "Select 'My Website' filter",
+            trigger: ".o_filter_menu .o-dropdown-item:contains('My Website')",
+            run: "click",
+        },
+        {
+            content: "Click on Home Page",
+            trigger: `.o_list_renderer ${homePage} td.o_list_record_selector input[type="checkbox"]`,
+            run: "click",
+        },
+        ...deleteSelectedPage,
+        {
+            content: "Check that the page has been removed",
+            trigger: `.o_list_renderer:not(:has(${homePage}))`,
+        },
+        {
+            content: "Click on All Pages",
+            trigger: '.o_list_renderer thead input[type="checkbox"]',
+            run: "click",
+        },
+        ...deleteSelectedPage,
+        {
+            content: "Check that all pages have been removed",
+            trigger: ".o_list_renderer tbody:not(:has([data-id]))",
+        },
+    ]
+);
+
+registerWebsitePreviewTour(
+    "website_page_manager_session_forced",
     {
-        content: "Check that all pages have been removed",
-        trigger: '.o_list_renderer tbody:not(:has([data-id]))',
+        url: "/",
     },
-]);
-
-registerWebsitePreviewTour('website_page_manager_session_forced', {
-    url: '/',
-}, () => [...testSwitchWebsite('Test Website'), {
-    content: "Click on Site",
-    trigger: 'button.dropdown-toggle[data-menu-xmlid="website.menu_site"]',
-    run:" click",
-}, {
-    content: "Click on Pages",
-    trigger: 'a.dropdown-item[data-menu-xmlid="website.menu_website_pages_list"]',
-    run:" click",
-}, {
-    content: "Check that the homepage is the one of Test Website",
-    trigger: ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Home') " +
-             "~ .o_data_cell[name=website_id]:contains('Test Website')",
-}, ...verifySelectedWebsiteFilter("Test Website"),
-]);
+    () => [
+        ...testSwitchWebsite("Test Website"),
+        {
+            content: "Click on Site",
+            trigger: 'button.dropdown-toggle[data-menu-xmlid="website.menu_site"]',
+            run: " click",
+        },
+        {
+            content: "Click on Pages",
+            trigger: 'a.dropdown-item[data-menu-xmlid="website.menu_website_pages_list"]',
+            run: " click",
+        },
+        {
+            content: "Check that the homepage is the one of Test Website",
+            trigger:
+                ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Home') " +
+                "~ .o_data_cell[name=website_id]:contains('Test Website')",
+        },
+        ...verifySelectedWebsiteFilter("Test Website"),
+    ]
+);
 
-registry.category("web_tour.tours").add('website_page_manager_direct_access', {
-    url: '/odoo/action-website.action_website_pages_list',
-    steps: () => [{
-    content: "Check that the homepage is the one of Test Website",
-    trigger: ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Home') " +
-             "~ .o_data_cell[name=website_id]:contains('Test Website')",
-}, ...verifySelectedWebsiteFilter("Test Website"),
-]});
+registry.category("web_tour.tours").add("website_page_manager_direct_access", {
+    url: "/odoo/action-website.action_website_pages_list",
+    steps: () => [
+        {
+            content: "Check that the homepage is the one of Test Website",
+            trigger:
+                ".o_list_table .o_data_row .o_data_cell[name=name]:contains('Home') " +
+                "~ .o_data_cell[name=website_id]:contains('Test Website')",
+        },
+        ...verifySelectedWebsiteFilter("Test Website"),
+    ],
+});
 
 registerWebsitePreviewTour(
     "website_clone_pages",
diff --git a/addons/website/static/tests/tours/parallax.js b/addons/website/static/tests/tours/parallax.js
index 6f6331656a2f7..f1341b1dc2b39 100644
--- a/addons/website/static/tests/tours/parallax.js
+++ b/addons/website/static/tests/tours/parallax.js
@@ -7,55 +7,64 @@ import {
     registerWebsitePreviewTour,
 } from "@website/js/tours/tour_utils";
 
-const coverSnippet = {id: "s_cover", name: "Cover", groupName: "Intro"};
+const coverSnippet = { id: "s_cover", name: "Cover", groupName: "Intro" };
 
-registerWebsitePreviewTour("test_parallax", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet(coverSnippet),
-    ...clickOnSnippet(coverSnippet),
-...changeOptionInPopover("Cover", "Filter", "Blur"),
-{
-    content: "Check that the Cover snippet has the Blur filter on its background image",
-    trigger: ":iframe .s_cover span[data-gl-filter='blur']",
-},
-...changeOptionInPopover("Cover", "Scroll Effect", "None"),
-{
-    content: "Check that the data related to the filter have been transferred to the new target",
-    trigger: ":iframe .s_cover[data-gl-filter='blur']",
-},
-{
-    content: "Check that the 'o_modified_image_to_save' class has been transferred to the new target",
-    trigger: ":iframe .s_cover.o_modified_image_to_save",
-},
-...changeOptionInPopover("Cover", "Scroll Effect", "Fixed"),
-{
-    content: "Check that the 'o_modified_image_to_save' class has been deleted from the old target",
-    trigger: ":iframe .s_cover:not(.o_modified_image_to_save)",
-},
-{
-    content: "Check that the 'o_modified_image_to_save' class has been transferred to the new target",
-    trigger: ":iframe span.s_parallax_bg.o_modified_image_to_save",
-},
-{
-    content: "Check that the data related to the filter have been transferred to the new target",
-    trigger: ":iframe span.s_parallax_bg[data-gl-filter='blur']",
-},
-...changeOptionInPopover("Cover", "Scroll Effect", "Parallax to Top"),
-{
-    content: "Check that the option was correctly applied",
-    trigger: ':iframe span.s_parallax_bg[style*=top][style*=bottom][style*=transform]',
-},
-...changeOptionInPopover("Cover", "Scroll Effect", "Zoom In"),
-{
-    content: "Check that the option was correctly applied",
-    trigger: ':iframe span.s_parallax_bg[style*="transform: scale("]',
-},
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-{
-    content: "The parallax should not add o_dirty when entering edit mode",
-    trigger: ':iframe #wrap:not(.o_dirty)',
-},
-]);
+registerWebsitePreviewTour(
+    "test_parallax",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet(coverSnippet),
+        ...clickOnSnippet(coverSnippet),
+        ...changeOptionInPopover("Cover", "Filter", "Blur"),
+        {
+            content: "Check that the Cover snippet has the Blur filter on its background image",
+            trigger: ":iframe .s_cover span[data-gl-filter='blur']",
+        },
+        ...changeOptionInPopover("Cover", "Scroll Effect", "None"),
+        {
+            content:
+                "Check that the data related to the filter have been transferred to the new target",
+            trigger: ":iframe .s_cover[data-gl-filter='blur']",
+        },
+        {
+            content:
+                "Check that the 'o_modified_image_to_save' class has been transferred to the new target",
+            trigger: ":iframe .s_cover.o_modified_image_to_save",
+        },
+        ...changeOptionInPopover("Cover", "Scroll Effect", "Fixed"),
+        {
+            content:
+                "Check that the 'o_modified_image_to_save' class has been deleted from the old target",
+            trigger: ":iframe .s_cover:not(.o_modified_image_to_save)",
+        },
+        {
+            content:
+                "Check that the 'o_modified_image_to_save' class has been transferred to the new target",
+            trigger: ":iframe span.s_parallax_bg.o_modified_image_to_save",
+        },
+        {
+            content:
+                "Check that the data related to the filter have been transferred to the new target",
+            trigger: ":iframe span.s_parallax_bg[data-gl-filter='blur']",
+        },
+        ...changeOptionInPopover("Cover", "Scroll Effect", "Parallax to Top"),
+        {
+            content: "Check that the option was correctly applied",
+            trigger: ":iframe span.s_parallax_bg[style*=top][style*=bottom][style*=transform]",
+        },
+        ...changeOptionInPopover("Cover", "Scroll Effect", "Zoom In"),
+        {
+            content: "Check that the option was correctly applied",
+            trigger: ':iframe span.s_parallax_bg[style*="transform: scale("]',
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "The parallax should not add o_dirty when entering edit mode",
+            trigger: ":iframe #wrap:not(.o_dirty)",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/popup_visibility_option.js b/addons/website/static/tests/tours/popup_visibility_option.js
index 800fb7e072933..1880188969a21 100644
--- a/addons/website/static/tests/tours/popup_visibility_option.js
+++ b/addons/website/static/tests/tours/popup_visibility_option.js
@@ -19,8 +19,7 @@ registerWebsitePreviewTour(
         },
         {
             content: "Click the 'No Desktop' visibility option to hide the banner.",
-            trigger:
-                `.options-container [data-label="Visibility"] button[data-action-param="no_desktop"]`,
+            trigger: `.options-container [data-label="Visibility"] button[data-action-param="no_desktop"]`,
             run: "click",
         },
         {
diff --git a/addons/website/static/tests/tours/powerbox_snippet.js b/addons/website/static/tests/tours/powerbox_snippet.js
index 543bf9c515d25..acba6cae2cdeb 100644
--- a/addons/website/static/tests/tours/powerbox_snippet.js
+++ b/addons/website/static/tests/tours/powerbox_snippet.js
@@ -1,47 +1,54 @@
-import {clickOnSnippet, insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+import {
+    clickOnSnippet,
+    insertSnippet,
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("website_powerbox_snippet",{
-    edition: true,
-},
-() => [
-...insertSnippet({
-    id: "s_text_block",
-    name: "Text",
-    groupName: "Text",
-}),
-...clickOnSnippet({
-    id: "s_text_block",
-    name: "Text",
-}),
-{
-    content: "Select the last paragraph",
-    trigger: ":iframe .s_text_block p:last-child",
-    run: "click",
-},
-{
-    content: "Show the powerbox",
-    trigger: ":iframe .s_text_block p:last-child",
-    async run(actions) {
-        await actions.editor(`/`);
-        const wrapwrap = this.anchor.closest("#wrapwrap");
-        wrapwrap.dispatchEvent(
-            new InputEvent("input", {
-                inputType: "insertText",
-                data: "/",
-            })
-        );
+registerWebsitePreviewTour(
+    "website_powerbox_snippet",
+    {
+        edition: true,
     },
-},
-{
-    content: "Click on the alert snippet",
-    trigger: ".o-we-powerbox .o-we-command:contains('Alert')",
-    run: "click",
-},
-{
-    content: "Check if s_alert snipept is inserted",
-    trigger: ":iframe .s_alert",
-}
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_text_block",
+            name: "Text",
+            groupName: "Text",
+        }),
+        ...clickOnSnippet({
+            id: "s_text_block",
+            name: "Text",
+        }),
+        {
+            content: "Select the last paragraph",
+            trigger: ":iframe .s_text_block p:last-child",
+            run: "click",
+        },
+        {
+            content: "Show the powerbox",
+            trigger: ":iframe .s_text_block p:last-child",
+            async run(actions) {
+                await actions.editor(`/`);
+                const wrapwrap = this.anchor.closest("#wrapwrap");
+                wrapwrap.dispatchEvent(
+                    new InputEvent("input", {
+                        inputType: "insertText",
+                        data: "/",
+                    })
+                );
+            },
+        },
+        {
+            content: "Click on the alert snippet",
+            trigger: ".o-we-powerbox .o-we-command:contains('Alert')",
+            run: "click",
+        },
+        {
+            content: "Check if s_alert snipept is inserted",
+            trigger: ":iframe .s_alert",
+        },
+    ]
+);
 
 registerWebsitePreviewTour(
     "website_powerbox_keyword",
@@ -82,7 +89,8 @@ registerWebsitePreviewTour(
             trigger: ".o-we-powerbox .o-we-command:contains('Alert')",
         },
         {
-            content: "Change the content to '/table' so that alert snippet should not be present in the powerbox",
+            content:
+                "Change the content to '/table' so that alert snippet should not be present in the powerbox",
             trigger: ":iframe .s_text_block p:last-child",
             run() {
                 const wrapwrapEl = this.anchor.closest("#wrapwrap");
diff --git a/addons/website/static/tests/tours/reset_password.js b/addons/website/static/tests/tours/reset_password.js
index 3a6ffe9d80ad6..008235abfb2b6 100644
--- a/addons/website/static/tests/tours/reset_password.js
+++ b/addons/website/static/tests/tours/reset_password.js
@@ -1,33 +1,34 @@
 import { registry } from "@web/core/registry";
 
-registry.category("web_tour.tours").add('website_reset_password', {
+registry.category("web_tour.tours").add("website_reset_password", {
     steps: () => [
-    {
-        content: "fill new password",
-        trigger: '.oe_reset_password_form input[name="password"]',
-        run: "edit adminadmin",
-    },
-    {
-        content: "fill confirm password",
-        trigger: '.oe_reset_password_form input[name="confirm_password"]',
-        run: "edit adminadmin",
-    },
-    {
-        content: "submit reset password form",
-        trigger: '.oe_reset_password_form button[type="submit"]',
-        run: "click",
-        expectUnloadPage: true,
-    },
-    {
-        content: "check that we get the success alert",
-        trigger: '.alert-success',
-    },
-    {
-        content: "click on the back to login link",
-        trigger: '.btn-link',
-    },
-    {
-        content: "check that we're on the login page",
-        trigger: '.oe_login_form',
-    },
-]});
+        {
+            content: "fill new password",
+            trigger: '.oe_reset_password_form input[name="password"]',
+            run: "edit adminadmin",
+        },
+        {
+            content: "fill confirm password",
+            trigger: '.oe_reset_password_form input[name="confirm_password"]',
+            run: "edit adminadmin",
+        },
+        {
+            content: "submit reset password form",
+            trigger: '.oe_reset_password_form button[type="submit"]',
+            run: "click",
+            expectUnloadPage: true,
+        },
+        {
+            content: "check that we get the success alert",
+            trigger: ".alert-success",
+        },
+        {
+            content: "click on the back to login link",
+            trigger: ".btn-link",
+        },
+        {
+            content: "check that we're on the login page",
+            trigger: ".oe_login_form",
+        },
+    ],
+});
diff --git a/addons/website/static/tests/tours/restricted_editor.js b/addons/website/static/tests/tours/restricted_editor.js
index 1fe317d11f5ed..4a98d359c44ac 100644
--- a/addons/website/static/tests/tours/restricted_editor.js
+++ b/addons/website/static/tests/tours/restricted_editor.js
@@ -1,7 +1,12 @@
-import { clickOnEditAndWaitEditMode, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+import {
+    clickOnEditAndWaitEditMode,
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("restricted_editor", {
-    url: "/",
-}, () => [
-    ...clickOnEditAndWaitEditMode(),
-]);
+registerWebsitePreviewTour(
+    "restricted_editor",
+    {
+        url: "/",
+    },
+    () => [...clickOnEditAndWaitEditMode()]
+);
diff --git a/addons/website/static/tests/tours/rte.js b/addons/website/static/tests/tours/rte.js
index 2224c0b8ea80e..af15696a1af30 100644
--- a/addons/website/static/tests/tours/rte.js
+++ b/addons/website/static/tests/tours/rte.js
@@ -14,29 +14,34 @@ function installParseltongueAndOpenLangDropdown() {
             content: "click on Add a language",
             trigger: "button[data-action-id='addLanguage']",
             run: "click",
-        }, {
+        },
+        {
             content: "confirm leave editor",
             trigger: ".modal-dialog button.btn-primary",
             run: "click",
-        }, {
+        },
+        {
             content: "type Parseltongue",
             trigger: 'div[name="lang_ids"] .o_input_dropdown input',
             run: "edit Parseltongue",
-        }, {
-            content: 'select Parseltongue',
-            trigger: '.dropdown-item:contains(Parseltongue)',
+        },
+        {
+            content: "select Parseltongue",
+            trigger: ".dropdown-item:contains(Parseltongue)",
             run: "click",
         },
         {
-            trigger: '.modal-dialog div[name="lang_ids"] .rounded-pill .o_tag_badge_text:contains(Parseltongue)',
+            trigger:
+                '.modal-dialog div[name="lang_ids"] .rounded-pill .o_tag_badge_text:contains(Parseltongue)',
         },
         {
             content: "load Parseltongue",
-            trigger: '.modal-footer .btn-primary',
+            trigger: ".modal-footer .btn-primary",
             run: "click",
-        }, {
+        },
+        {
             content: "click language dropdown (2)",
-            trigger: ':iframe .js_language_selector .dropdown-toggle',
+            trigger: ":iframe .js_language_selector .dropdown-toggle",
             timeout: 60000,
             run: "click",
         },
@@ -47,288 +52,371 @@ function installParseltongueAndOpenLangDropdown() {
     ];
 }
 
-registerWebsitePreviewTour('rte_translator', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...installParseltongueAndOpenLangDropdown(),
-{
-    content: "go to english version",
-    trigger: ':iframe .o_header_language_selector a[data-url_code="en"]',
-    run: "click",
-},
-{
-    trigger: ':iframe html[lang*="en-US"]',
-},
-{
-    content: "Open new page menu",
-    trigger: ".o_menu_systray .o_new_content_container button",
-    run: "click",
-}, {
-    content: "click on new page",
-    trigger: 'button.o_new_content_element',
-    run: "click",
-}, {
-    content: "click on Use this template",
-    trigger: ".o_page_template .o_button_area:not(:visible)",
-    run: "click",
-}, {
-    content: "insert file name",
-    trigger: ".modal:not(.o_inactive_modal):contains(new page) .modal-body input[type=text]",
-    run: "edit rte_translator.xml && press Enter",
-},
-{
-    trigger: '.modal:not(.o_inactive_modal):contains(new page) .modal-body input[type="text"]:value(rte_translator.xml)',
-},
-{
-    content: "create file",
-    trigger: ".modal:not(.o_inactive_modal):contains(new page) button.btn-primary:contains(create)",
-    run: "click",
-}, {
-    content: "click on the 'page manager' button",
-    trigger: 'button[name="website.action_website_pages_list"]',
-    run: "click",
-}, {
-    content: "click on the record to display the xml file in the iframe",
-    trigger: 'td:contains("rte_translator.xml")',
-    run: "click",
-}, {
-    content: "Open new page menu",
-    trigger: ".o_menu_systray .o_new_content_container button",
-    run: "click",
-}, {
-    content: "click on new page",
-    trigger: 'button.o_new_content_element',
-    run: "click",
-}, {
-    content: "click on Use this template",
-    trigger: ".o_page_template .o_button_area:not(:visible)",
-    run: "click",
-}, {
-    content: "insert page name",
-    trigger: '.modal .modal-dialog .modal-body input[type="text"]',
-    run: "edit rte_translator",
-},
-{
-    trigger: 'input[type="text"]:value(rte_translator)',
-},
-{
-    content: "create page",
-    trigger: ".modal button.btn-primary:contains(create)",
-    run: "click",
-},
-{
-    trigger: "body:not(:has(.modal))",
-},
-...insertSnippet({
-    id: "s_cover",
-    name: "Cover",
-    groupName: "Intro",
-}), {
-    content: "change content",
-    trigger: ':iframe #wrap',
-    run() {
-        this.anchor.querySelector("p").innerHTML = '<p>Write one or <font style="background-color: yellow;">two paragraphs <b>describing</b></font> your product or\
+registerWebsitePreviewTour(
+    "rte_translator",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...installParseltongueAndOpenLangDropdown(),
+        {
+            content: "go to english version",
+            trigger: ':iframe .o_header_language_selector a[data-url_code="en"]',
+            run: "click",
+        },
+        {
+            trigger: ':iframe html[lang*="en-US"]',
+        },
+        {
+            content: "Open new page menu",
+            trigger: ".o_menu_systray .o_new_content_container button",
+            run: "click",
+        },
+        {
+            content: "click on new page",
+            trigger: "button.o_new_content_element",
+            run: "click",
+        },
+        {
+            content: "click on Use this template",
+            trigger: ".o_page_template .o_button_area:not(:visible)",
+            run: "click",
+        },
+        {
+            content: "insert file name",
+            trigger:
+                ".modal:not(.o_inactive_modal):contains(new page) .modal-body input[type=text]",
+            run: "edit rte_translator.xml && press Enter",
+        },
+        {
+            trigger:
+                '.modal:not(.o_inactive_modal):contains(new page) .modal-body input[type="text"]:value(rte_translator.xml)',
+        },
+        {
+            content: "create file",
+            trigger:
+                ".modal:not(.o_inactive_modal):contains(new page) button.btn-primary:contains(create)",
+            run: "click",
+        },
+        {
+            content: "click on the 'page manager' button",
+            trigger: 'button[name="website.action_website_pages_list"]',
+            run: "click",
+        },
+        {
+            content: "click on the record to display the xml file in the iframe",
+            trigger: 'td:contains("rte_translator.xml")',
+            run: "click",
+        },
+        {
+            content: "Open new page menu",
+            trigger: ".o_menu_systray .o_new_content_container button",
+            run: "click",
+        },
+        {
+            content: "click on new page",
+            trigger: "button.o_new_content_element",
+            run: "click",
+        },
+        {
+            content: "click on Use this template",
+            trigger: ".o_page_template .o_button_area:not(:visible)",
+            run: "click",
+        },
+        {
+            content: "insert page name",
+            trigger: '.modal .modal-dialog .modal-body input[type="text"]',
+            run: "edit rte_translator",
+        },
+        {
+            trigger: 'input[type="text"]:value(rte_translator)',
+        },
+        {
+            content: "create page",
+            trigger: ".modal button.btn-primary:contains(create)",
+            run: "click",
+        },
+        {
+            trigger: "body:not(:has(.modal))",
+        },
+        ...insertSnippet({
+            id: "s_cover",
+            name: "Cover",
+            groupName: "Intro",
+        }),
+        {
+            content: "change content",
+            trigger: ":iframe #wrap",
+            run() {
+                this.anchor.querySelector("p").innerHTML =
+                    '<p>Write one or <font style="background-color: yellow;">two paragraphs <b>describing</b></font> your product or\
             <font style="color: rgb(255, 0, 0);">services</font>. To be successful your content needs to be\
             useful to your <a href="/999">readers</a>.</p> <input value="test translate default value" placeholder="test translate placeholder"/>\
             <p>&lt;b&gt;&lt;/b&gt; is an HTML&nbsp;tag &amp; is empty</p>';
-        this.anchor.querySelector(".oe_img_bg").title ="test translate image title";
-        const editor = editorsWeakMap.get(this.anchor.ownerDocument);
-        editor.shared.history.addStep();
-    }
-    }, {
-    content: "ensure change was applied",
-    trigger: ':iframe #wrap p:first b',
-},
-...clickOnSave(),
-{
-    content: "click language dropdown (3)",
-    trigger: ':iframe .js_language_selector .dropdown-toggle',
-    run: "click",
-},
-{
-    trigger: ':iframe html[lang*="en"]',
-},
-{
-    content: "click on Parseltongue version",
-    trigger: ':iframe .js_language_selector a[data-url_code="pa_GB"]',
-    run: "click",
-}, {
-    content: "edit",
-    trigger: ".o-website-btn-custo-primary.dropdown-toggle:contains('edit')",
-    run: "click",
-},
-{
-    trigger: ":iframe html:not(:has(#wrap p span))",
-},
-{
-    content: "translate",
-    trigger: '.o_translate_website_dropdown_item',
-    run: "click",
-}, {
-    content: "close modal",
-    trigger: '.modal-footer .btn-secondary',
-    run: "click",
-}, {
-    content: "check if translation is activate",
-    trigger: ':iframe [data-oe-translation-source-sha]',
-},
-{
-    trigger: ".o_builder_sidebar_open",
-},
-{
-    content: "translate text",
-    trigger: ':iframe #wrap p font:first',
-    async run(actionHelper) {
-        await actionHelper.editor('translated Parseltongue text');
-        setSelection({ anchorNode: this.anchor.childNodes[0], anchorOffset: 22 })
-        this.anchor.dispatchEvent(new KeyboardEvent("keyup", {bubbles: true, key: "_"}));
-        this.anchor.dispatchEvent(new InputEvent("input", {bubbles: true}));
-    },
-}, {
-    content: "translate text with special char",
-    trigger: ':iframe #wrap input + p span:first',
-    async run(actionHelper) {
-        await actionHelper.click();
-        this.anchor.textContent = '<{translated}>' + this.anchor.textContent;
-        const editor = editorsWeakMap.get(this.anchor.ownerDocument);
-        editor.shared.history.addStep();
-        setSelection({ anchorNode: this.anchor.childNodes[0], anchorOffset: 0 })
-        this.anchor.dispatchEvent(new KeyboardEvent("keyup", {bubbles: true, key: "_"}));
-        this.anchor.dispatchEvent(new InputEvent("input", {bubbles: true}));
-    },
-},
-{
-    trigger: ':iframe #wrap .o_dirty font:first:contains(translated Parseltongue text)',
-},
-{
-    content: "click on input",
-    trigger: ':iframe #wrap input:first',
-    run: 'click',
-}, {
-    content: "translate placeholder",
-    trigger: '.modal-dialog input:first',
-    run: "edit test Parseltongue placeholder",
-}, {
-    content: "translate default value",
-    trigger: '.modal-dialog input:last',
-    run: "edit test Parseltongue default value",
-},
-{
-    trigger: '.modal input:value("test Parseltongue placeholder")',
-},
-{
-    content: "close modal",
-    trigger: '.modal-footer .btn-primary',
-    run: "click",
-}, {
-    content: "check: input marked as translated",
-    trigger: ':iframe input[placeholder="test Parseltongue placeholder"].oe_translated',
-},
-...clickOnSave(),
-{
-    content: "check: content is translated",
-    trigger: ':iframe #wrap p font:first:contains(translated Parseltongue text)',
-}, {
-    content: "check: content with special char is translated",
-    trigger: ":iframe #wrap input + p:contains(<{translated}><b></b> is an HTML tag & )",
-}, {
-    content: "check: placeholder translation",
-    trigger: ':iframe input[placeholder="test Parseltongue placeholder"]',
-}, {
-    content: "check: default value translation",
-    trigger: ':iframe input[value="test Parseltongue default value"]',
-},
-{
-    trigger: ':iframe html[lang*="pa-GB"]:not(:has(#wrap p span))',
-},
-{
-    content: "open language selector",
-    trigger: ':iframe .js_language_selector button:first',
-    run: "click",
-}, {
-    content: "return to english version",
-    trigger: ':iframe .js_language_selector a[data-url_code="en"]',
-    run: "click",
-}, {
-    content: "Check body",
-    trigger: ":iframe body:not(:has(#wrap p font:first:contains(/^paragraphs <b>describing</b>$/)))",
-},
-...clickOnEditAndWaitEditModeInTranslatedPage(),
-{
-    content: "select text",
-    trigger: ':iframe #wrap p',
-    async run(actionHelper) {
-        await actionHelper.click();
-        var el = this.anchor;
-        var mousedown = document.createEvent('MouseEvents');
-        mousedown.initMouseEvent('mousedown', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, el);
-        el.dispatchEvent(mousedown);
-        var mouseup = document.createEvent('MouseEvents');
-        setSelection({ anchorNode: this.anchor.childNodes[0], anchorOffset: 6, focusNode: el.childNodes[2], focusOffset: 13 });
-        mouseup.initMouseEvent('mouseup', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, el);
-        el.dispatchEvent(mouseup);
-    },
-// This is disabled for now because it reveals a bug that is fixed in saas-15.1
-// and considered a tradeoff in 15.0. The bug concerns the invalidation of
-// translations when inserting tags with more than one character. Whereas <u>
-// didn't trigger an invalidation, <span style="text-decoration-line: underline;">
-// does.
-// }, {
-//     content: "underline",
-//     trigger: '.oe-toolbar #underline',
-},
-...clickOnSave(),
-{
-    content: "click language dropdown (4)",
-    trigger: ':iframe .js_language_selector .dropdown-toggle',
-    run: "click",
-}, {
-    content: "return in Parseltongue",
-    trigger: ':iframe html[lang="en-US"] .js_language_selector .js_change_lang[data-url_code="pa_GB"]',
-    run: "click",
-},
-{
-    trigger: ':iframe html[lang*="pa-GB"]',
-},
-{
-    content: "check bis: content is translated",
-    trigger: ':iframe #wrap p font:first:contains(translated Parseltongue text)',
-    run: "click",
-}, {
-    content: "check bis: placeholder translation",
-    trigger: ':iframe input[placeholder="test Parseltongue placeholder"]',
-    run: "edit Test",
-}, {
-    content: "open site menu",
-    trigger: 'button[data-menu-xmlid="website.menu_site"]',
-    run: "click",
-}, {
-    content: "Open HTML editor",
-    trigger: 'a[data-menu-xmlid="website.menu_ace_editor"]',
-    run: "click",
-}, {
-    content: "Check that the editor is not showing translated content (1)",
-    trigger: '.ace_text-layer .ace_line:contains("an HTML")',
-    run() {
-        const parser = new DOMParser();
-        const doc = parser.parseFromString(this.anchor.textContent, 'text/html');
-        const lineEscapedText = doc.body.querySelector("p:last-child").textContent;
-        if (lineEscapedText !== "&lt;b&gt;&lt;/b&gt; is an HTML&nbsp;tag &amp; is empty") {
-            console.error('The HTML editor should display the correct untranslated content');
-            document.querySelector('iframe:not(.o_ignore_in_tour)').contentDocument.body.classList.add('rte_translator_error');
-            const editor = editorsWeakMap.get(this.anchor.ownerDocument);
-            editor.shared.history.addStep();
-        }
-    },
-}, {
-    content: "Check that the editor is not showing translated content (2)",
-    trigger: ':iframe body:not(.rte_translator_error)',
-}]);
+                this.anchor.querySelector(".oe_img_bg").title = "test translate image title";
+                const editor = editorsWeakMap.get(this.anchor.ownerDocument);
+                editor.shared.history.addStep();
+            },
+        },
+        {
+            content: "ensure change was applied",
+            trigger: ":iframe #wrap p:first b",
+        },
+        ...clickOnSave(),
+        {
+            content: "click language dropdown (3)",
+            trigger: ":iframe .js_language_selector .dropdown-toggle",
+            run: "click",
+        },
+        {
+            trigger: ':iframe html[lang*="en"]',
+        },
+        {
+            content: "click on Parseltongue version",
+            trigger: ':iframe .js_language_selector a[data-url_code="pa_GB"]',
+            run: "click",
+        },
+        {
+            content: "edit",
+            trigger: ".o-website-btn-custo-primary.dropdown-toggle:contains('edit')",
+            run: "click",
+        },
+        {
+            trigger: ":iframe html:not(:has(#wrap p span))",
+        },
+        {
+            content: "translate",
+            trigger: ".o_translate_website_dropdown_item",
+            run: "click",
+        },
+        {
+            content: "close modal",
+            trigger: ".modal-footer .btn-secondary",
+            run: "click",
+        },
+        {
+            content: "check if translation is activate",
+            trigger: ":iframe [data-oe-translation-source-sha]",
+        },
+        {
+            trigger: ".o_builder_sidebar_open",
+        },
+        {
+            content: "translate text",
+            trigger: ":iframe #wrap p font:first",
+            async run(actionHelper) {
+                await actionHelper.editor("translated Parseltongue text");
+                setSelection({ anchorNode: this.anchor.childNodes[0], anchorOffset: 22 });
+                this.anchor.dispatchEvent(new KeyboardEvent("keyup", { bubbles: true, key: "_" }));
+                this.anchor.dispatchEvent(new InputEvent("input", { bubbles: true }));
+            },
+        },
+        {
+            content: "translate text with special char",
+            trigger: ":iframe #wrap input + p span:first",
+            async run(actionHelper) {
+                await actionHelper.click();
+                this.anchor.textContent = "<{translated}>" + this.anchor.textContent;
+                const editor = editorsWeakMap.get(this.anchor.ownerDocument);
+                editor.shared.history.addStep();
+                setSelection({ anchorNode: this.anchor.childNodes[0], anchorOffset: 0 });
+                this.anchor.dispatchEvent(new KeyboardEvent("keyup", { bubbles: true, key: "_" }));
+                this.anchor.dispatchEvent(new InputEvent("input", { bubbles: true }));
+            },
+        },
+        {
+            trigger: ":iframe #wrap .o_dirty font:first:contains(translated Parseltongue text)",
+        },
+        {
+            content: "click on input",
+            trigger: ":iframe #wrap input:first",
+            run: "click",
+        },
+        {
+            content: "translate placeholder",
+            trigger: ".modal-dialog input:first",
+            run: "edit test Parseltongue placeholder",
+        },
+        {
+            content: "translate default value",
+            trigger: ".modal-dialog input:last",
+            run: "edit test Parseltongue default value",
+        },
+        {
+            trigger: '.modal input:value("test Parseltongue placeholder")',
+        },
+        {
+            content: "close modal",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        {
+            content: "check: input marked as translated",
+            trigger: ':iframe input[placeholder="test Parseltongue placeholder"].oe_translated',
+        },
+        ...clickOnSave(),
+        {
+            content: "check: content is translated",
+            trigger: ":iframe #wrap p font:first:contains(translated Parseltongue text)",
+        },
+        {
+            content: "check: content with special char is translated",
+            trigger: ":iframe #wrap input + p:contains(<{translated}><b></b> is an HTML tag & )",
+        },
+        {
+            content: "check: placeholder translation",
+            trigger: ':iframe input[placeholder="test Parseltongue placeholder"]',
+        },
+        {
+            content: "check: default value translation",
+            trigger: ':iframe input[value="test Parseltongue default value"]',
+        },
+        {
+            trigger: ':iframe html[lang*="pa-GB"]:not(:has(#wrap p span))',
+        },
+        {
+            content: "open language selector",
+            trigger: ":iframe .js_language_selector button:first",
+            run: "click",
+        },
+        {
+            content: "return to english version",
+            trigger: ':iframe .js_language_selector a[data-url_code="en"]',
+            run: "click",
+        },
+        {
+            content: "Check body",
+            trigger:
+                ":iframe body:not(:has(#wrap p font:first:contains(/^paragraphs <b>describing</b>$/)))",
+        },
+        ...clickOnEditAndWaitEditModeInTranslatedPage(),
+        {
+            content: "select text",
+            trigger: ":iframe #wrap p",
+            async run(actionHelper) {
+                await actionHelper.click();
+                var el = this.anchor;
+                var mousedown = document.createEvent("MouseEvents");
+                mousedown.initMouseEvent(
+                    "mousedown",
+                    true,
+                    true,
+                    window,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    false,
+                    false,
+                    false,
+                    false,
+                    0,
+                    el
+                );
+                el.dispatchEvent(mousedown);
+                var mouseup = document.createEvent("MouseEvents");
+                setSelection({
+                    anchorNode: this.anchor.childNodes[0],
+                    anchorOffset: 6,
+                    focusNode: el.childNodes[2],
+                    focusOffset: 13,
+                });
+                mouseup.initMouseEvent(
+                    "mouseup",
+                    true,
+                    true,
+                    window,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    false,
+                    false,
+                    false,
+                    false,
+                    0,
+                    el
+                );
+                el.dispatchEvent(mouseup);
+            },
+            // This is disabled for now because it reveals a bug that is fixed in saas-15.1
+            // and considered a tradeoff in 15.0. The bug concerns the invalidation of
+            // translations when inserting tags with more than one character. Whereas <u>
+            // didn't trigger an invalidation, <span style="text-decoration-line: underline;">
+            // does.
+            // }, {
+            //     content: "underline",
+            //     trigger: '.oe-toolbar #underline',
+        },
+        ...clickOnSave(),
+        {
+            content: "click language dropdown (4)",
+            trigger: ":iframe .js_language_selector .dropdown-toggle",
+            run: "click",
+        },
+        {
+            content: "return in Parseltongue",
+            trigger:
+                ':iframe html[lang="en-US"] .js_language_selector .js_change_lang[data-url_code="pa_GB"]',
+            run: "click",
+        },
+        {
+            trigger: ':iframe html[lang*="pa-GB"]',
+        },
+        {
+            content: "check bis: content is translated",
+            trigger: ":iframe #wrap p font:first:contains(translated Parseltongue text)",
+            run: "click",
+        },
+        {
+            content: "check bis: placeholder translation",
+            trigger: ':iframe input[placeholder="test Parseltongue placeholder"]',
+            run: "edit Test",
+        },
+        {
+            content: "open site menu",
+            trigger: 'button[data-menu-xmlid="website.menu_site"]',
+            run: "click",
+        },
+        {
+            content: "Open HTML editor",
+            trigger: 'a[data-menu-xmlid="website.menu_ace_editor"]',
+            run: "click",
+        },
+        {
+            content: "Check that the editor is not showing translated content (1)",
+            trigger: '.ace_text-layer .ace_line:contains("an HTML")',
+            run() {
+                const parser = new DOMParser();
+                const doc = parser.parseFromString(this.anchor.textContent, "text/html");
+                const lineEscapedText = doc.body.querySelector("p:last-child").textContent;
+                if (lineEscapedText !== "&lt;b&gt;&lt;/b&gt; is an HTML&nbsp;tag &amp; is empty") {
+                    console.error(
+                        "The HTML editor should display the correct untranslated content"
+                    );
+                    document
+                        .querySelector("iframe:not(.o_ignore_in_tour)")
+                        .contentDocument.body.classList.add("rte_translator_error");
+                    const editor = editorsWeakMap.get(this.anchor.ownerDocument);
+                    editor.shared.history.addStep();
+                }
+            },
+        },
+        {
+            content: "Check that the editor is not showing translated content (2)",
+            trigger: ":iframe body:not(.rte_translator_error)",
+        },
+    ]
+);
 
-registerWebsitePreviewTour('multiple_websites_add_language', {
-    url: '/',
-    edition: true,
-}, () => [
-...installParseltongueAndOpenLangDropdown(),
-])
+registerWebsitePreviewTour(
+    "multiple_websites_add_language",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [...installParseltongueAndOpenLangDropdown()]
+);
diff --git a/addons/website/static/tests/tours/skip_website_configurator.js b/addons/website/static/tests/tours/skip_website_configurator.js
index 0a8f2e84b16ab..bf9cba67f8a62 100644
--- a/addons/website/static/tests/tours/skip_website_configurator.js
+++ b/addons/website/static/tests/tours/skip_website_configurator.js
@@ -1,38 +1,39 @@
 import { registry } from "@web/core/registry";
 
-registry.category("web_tour.tours").add('skip_website_configurator', {
-    url: '/odoo/action-website.action_website_configuration',
+registry.category("web_tour.tours").add("skip_website_configurator", {
+    url: "/odoo/action-website.action_website_configuration",
     steps: () => [
-    {
-        content: "create a new website",
-        trigger: 'button[name="action_website_create_new"]',
-        run: "click",
-    },
-    {
-        content: "insert website name",
-        trigger: 'div[name="name"] input',
-        run: "edit Website EN",
-    },
-    {
-        content: "validate the website creation modal",
-        trigger: '.modal button.btn-primary',
-        run: "click",
-        expectUnloadPage: true,
-    },
-    {
-        content: "skip configurator",
-        // This trigger targets the skip button, it doesn't have a more
-        // explicit class or ID.
-        trigger: '.o_configurator_container .container-fluid .btn.btn-link',
-        run: "click",
-    },
-    {
-        content: "Check that the homepage is loaded",
-        trigger: ".o_website_preview :iframe html[data-view-xmlid='website.homepage']",
-        timeout: 30000,
-    },
-    {
-        content: "Wait title is present before close tour",
-        trigger: ":iframe h2:contains(welcome to your)",
-    }
-]});
+        {
+            content: "create a new website",
+            trigger: 'button[name="action_website_create_new"]',
+            run: "click",
+        },
+        {
+            content: "insert website name",
+            trigger: 'div[name="name"] input',
+            run: "edit Website EN",
+        },
+        {
+            content: "validate the website creation modal",
+            trigger: ".modal button.btn-primary",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        {
+            content: "skip configurator",
+            // This trigger targets the skip button, it doesn't have a more
+            // explicit class or ID.
+            trigger: ".o_configurator_container .container-fluid .btn.btn-link",
+            run: "click",
+        },
+        {
+            content: "Check that the homepage is loaded",
+            trigger: ".o_website_preview :iframe html[data-view-xmlid='website.homepage']",
+            timeout: 30000,
+        },
+        {
+            content: "Wait title is present before close tour",
+            trigger: ":iframe h2:contains(welcome to your)",
+        },
+    ],
+});
diff --git a/addons/website/static/tests/tours/snippet_background_edition.js b/addons/website/static/tests/tours/snippet_background_edition.js
index 9c61a86bb6daf..bde49ce887901 100644
--- a/addons/website/static/tests/tours/snippet_background_edition.js
+++ b/addons/website/static/tests/tours/snippet_background_edition.js
@@ -7,12 +7,12 @@ import {
     clickOnSnippet,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const snippets = [
     {
-        id: 's_text_image',
-        name: 'Text - Image',
+        id: "s_text_image",
+        name: "Text - Image",
         groupName: "Content",
     },
 ];
@@ -27,8 +27,8 @@ const backgroundColors = [
     },
 ];
 const gradients = [
-    'linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)',
-    'linear-gradient(135deg, rgb(255, 222, 202) 0%, rgb(202, 115, 69) 100%)',
+    "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+    "linear-gradient(135deg, rgb(255, 222, 202) 0%, rgb(202, 115, 69) 100%)",
 ];
 
 function typeToName(xType) {
@@ -70,19 +70,22 @@ function addCheck(steps, checkX, checkNoX, xType, noSwitch = false) {
 }
 
 function checkAndUpdateBackgroundColor({
-    checkCC, checkNoCC,
-    checkBg, checkNoBg,
-    checkGradient, checkNoGradient,
-    changeType, change,
-    finalSelector, finalRun
+    checkCC,
+    checkNoCC,
+    checkBg,
+    checkNoBg,
+    checkGradient,
+    checkNoGradient,
+    changeType,
+    change,
+    finalSelector,
+    finalRun,
 }) {
-    const steps = [
-        changeBackgroundColor(),
-    ];
+    const steps = [changeBackgroundColor()];
 
-    addCheck(steps, checkCC, checkNoCC, 'cc');
-    addCheck(steps, checkBg, checkNoBg, 'bg');
-    addCheck(steps, checkGradient, checkNoGradient, 'gradient');
+    addCheck(steps, checkCC, checkNoCC, "cc");
+    addCheck(steps, checkBg, checkNoBg, "bg");
+    addCheck(steps, checkGradient, checkNoGradient, "gradient");
 
     if (changeType) {
         steps.push(switchTo(changeType));
@@ -94,7 +97,7 @@ function checkAndUpdateBackgroundColor({
         steps.push({
             trigger: finalSelector,
             content: "The selected colors have been applied (CC AND (BG or GRADIENT))",
-            tooltipPosition: 'bottom',
+            tooltipPosition: "bottom",
             run: finalRun,
         });
     }
@@ -102,299 +105,318 @@ function checkAndUpdateBackgroundColor({
     return steps;
 }
 
-function updateAndCheckCustomGradient({updateStep, checkGradient}) {
-    const steps = [ updateStep ];
-    addCheck(steps, checkGradient, checkGradient !== gradients[0] && gradients[0], 'gradient', true);
+function updateAndCheckCustomGradient({ updateStep, checkGradient }) {
+    const steps = [updateStep];
+    addCheck(
+        steps,
+        checkGradient,
+        checkGradient !== gradients[0] && gradients[0],
+        "gradient",
+        true
+    );
     return steps;
 }
 
-registerWebsitePreviewTour('snippet_background_edition', {
-    url: '/',
-    edition: true,
-},
-() => [
-...insertSnippet(snippets[0]),
-...clickOnSnippet(snippets[0]),
+registerWebsitePreviewTour(
+    "snippet_background_edition",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet(snippets[0]),
+        ...clickOnSnippet(snippets[0]),
 
-// Set background image and save.
-changeOption("Text - Image", "button[data-action-id='toggleBgImage']"),
-{
-    content: "Click on image",
-    trigger: ".o_select_media_dialog .o_button_area[aria-label='test.png']",
-    run: "click",
-},
-...clickOnSave(),
-{
-    content: "Check that the image is set",
-    trigger: `:iframe section.${snippets[0].id}[style^="background-image: url("]`,
-},
-...clickOnEditAndWaitEditMode(),
-...clickOnSnippet(snippets[0]),
-// Remove background image.
-changeOption("Text - Image", "button[data-action-id='toggleBgImage']"),
+        // Set background image and save.
+        changeOption("Text - Image", "button[data-action-id='toggleBgImage']"),
+        {
+            content: "Click on image",
+            trigger: ".o_select_media_dialog .o_button_area[aria-label='test.png']",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the image is set",
+            trigger: `:iframe section.${snippets[0].id}[style^="background-image: url("]`,
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet(snippets[0]),
+        // Remove background image.
+        changeOption("Text - Image", "button[data-action-id='toggleBgImage']"),
 
-// Add a color combination
-...checkAndUpdateBackgroundColor({
-    changeType: 'cc',
-    change: "o_cc3",
-    finalSelector: `:iframe .${snippets[0].id}.o_cc3:not([class*=bg-]):not([style*="background"])`,
-}),
+        // Add a color combination
+        ...checkAndUpdateBackgroundColor({
+            changeType: "cc",
+            change: "o_cc3",
+            finalSelector: `:iframe .${snippets[0].id}.o_cc3:not([class*=bg-]):not([style*="background"])`,
+        }),
 
-// Change the color combination + Check the previous one was marked as selected
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc3",
-    changeType: 'cc',
-    change: "o_cc2",
-    finalSelector: `:iframe .${snippets[0].id}.o_cc2:not(.o_cc3):not([class*=bg-])`,
-}),
+        // Change the color combination + Check the previous one was marked as selected
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc3",
+            changeType: "cc",
+            change: "o_cc2",
+            finalSelector: `:iframe .${snippets[0].id}.o_cc2:not(.o_cc3):not([class*=bg-])`,
+        }),
 
-// Check the color combination was marked as selected + Edit the bg color
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc2",
-    checkNoCC: "o_cc3",
-    changeType: 'bg',
-    change: backgroundColors[0].code,
-    finalSelector: `:iframe .${snippets[0].id}.o_cc2.bg-${backgroundColors[0].code}`,
-}),
+        // Check the color combination was marked as selected + Edit the bg color
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc2",
+            checkNoCC: "o_cc3",
+            changeType: "bg",
+            change: backgroundColors[0].code,
+            finalSelector: `:iframe .${snippets[0].id}.o_cc2.bg-${backgroundColors[0].code}`,
+        }),
 
-// Check the current color palette selection + Change the bg color
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc2",
-    checkBg: backgroundColors[0].code,
-    changeType: 'bg',
-    change: backgroundColors[1].code,
-    finalSelector: `:iframe .${snippets[0].id}.o_cc2.bg-${backgroundColors[1].code}:not(.bg-${backgroundColors[0].code})`,
-}),
+        // Check the current color palette selection + Change the bg color
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc2",
+            checkBg: backgroundColors[0].code,
+            changeType: "bg",
+            change: backgroundColors[1].code,
+            finalSelector: `:iframe .${snippets[0].id}.o_cc2.bg-${backgroundColors[1].code}:not(.bg-${backgroundColors[0].code})`,
+        }),
 
-// Check the current color palette selection + Change the color combination
-// again. It should keep the bg color class.
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc2",
-    checkNoBg: backgroundColors[0].code,
-    changeType: 'cc',
-    change: "o_cc4",
-    finalSelector: `:iframe .${snippets[0].id}.o_cc4:not(.o_cc2):not(.bg-${backgroundColors[1].code})`,
-}),
+        // Check the current color palette selection + Change the color combination
+        // again. It should keep the bg color class.
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc2",
+            checkNoBg: backgroundColors[0].code,
+            changeType: "cc",
+            change: "o_cc4",
+            finalSelector: `:iframe .${snippets[0].id}.o_cc4:not(.o_cc2):not(.bg-${backgroundColors[1].code})`,
+        }),
 
-// Check the current color palette status + Replace the bg color by a gradient
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc4",
-    checkNoCC: "o_cc2",
-    checkNoBg: backgroundColors[1].code,
-    changeType: 'gradient',
-    change: gradients[0],
-    finalSelector: `:iframe .${snippets[0].id}.o_cc4:not(.bg-${backgroundColors[1].code})[style*="background-image: ${gradients[0]}"]`,
-}),
+        // Check the current color palette status + Replace the bg color by a gradient
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc4",
+            checkNoCC: "o_cc2",
+            checkNoBg: backgroundColors[1].code,
+            changeType: "gradient",
+            change: gradients[0],
+            finalSelector: `:iframe .${snippets[0].id}.o_cc4:not(.bg-${backgroundColors[1].code})[style*="background-image: ${gradients[0]}"]`,
+        }),
 
-// Check the current color palette status + Replace the gradient
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc4",
-    checkNoBg: backgroundColors[1].code,
-    checkGradient: gradients[0],
-    changeType: 'gradient',
-    change: gradients[1],
-    finalSelector: `:iframe .${snippets[0].id}.o_cc4[style*="background-image: ${gradients[1]}"]:not([style*="background-image: ${gradients[0]}"])`,
-}),
+        // Check the current color palette status + Replace the gradient
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc4",
+            checkNoBg: backgroundColors[1].code,
+            checkGradient: gradients[0],
+            changeType: "gradient",
+            change: gradients[1],
+            finalSelector: `:iframe .${snippets[0].id}.o_cc4[style*="background-image: ${gradients[1]}"]:not([style*="background-image: ${gradients[0]}"])`,
+        }),
 
-// Check the current color palette selection + Change the color combination
-// again. Gradients should switch.
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc4",
-    checkGradient: gradients[1],
-    checkNoGradient: gradients[0],
-    changeType: 'cc',
-    change: "o_cc1",
-    finalSelector: `:iframe .${snippets[0].id}.o_cc1:not(.o_cc4):not([style*="background-image: ${gradients[1]}"])`,
-}),
+        // Check the current color palette selection + Change the color combination
+        // again. Gradients should switch.
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc4",
+            checkGradient: gradients[1],
+            checkNoGradient: gradients[0],
+            changeType: "cc",
+            change: "o_cc1",
+            finalSelector: `:iframe .${snippets[0].id}.o_cc1:not(.o_cc4):not([style*="background-image: ${gradients[1]}"])`,
+        }),
 
-// Final check of the color status in the color palette + re-add a gradient
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc1",
-    checkNoCC: "o_cc4",
-    checkNoGradient: gradients[1],
-    changeType: 'gradient',
-    change: gradients[1],
-    finalSelector: `:iframe .${snippets[0].id}.o_cc1:not(.o_cc4)[style*="background-image: ${gradients[1]}"]`,
-}),
+        // Final check of the color status in the color palette + re-add a gradient
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc1",
+            checkNoCC: "o_cc4",
+            checkNoGradient: gradients[1],
+            changeType: "gradient",
+            change: gradients[1],
+            finalSelector: `:iframe .${snippets[0].id}.o_cc1:not(.o_cc4)[style*="background-image: ${gradients[1]}"]`,
+        }),
 
-// Now, add an image on top of that color combination + gradient
-changeOption("Text - Image", "button[data-action-id='toggleBgImage']"),
-{
-    trigger: '.o_existing_attachment_cell .o_button_area',
-    content: "Select an image in the media dialog",
-    run: "click",
-},
-{
-    trigger: `:iframe .${snippets[0].id}.o_cc1`,
-    run: function () {
-        const parts = backgroundImageCssToParts(
-            getComputedStyle(this.anchor)["background-image"]
-        );
-        if (!parts.url || !parts.url.startsWith('url(')) {
-            throw new Error('An image should have been added as background.');
-        }
-        if (parts.gradient !== gradients[1]) {
-            throw new Error('The gradient should have been kept when adding the background image');
-        }
-    },
-},
+        // Now, add an image on top of that color combination + gradient
+        changeOption("Text - Image", "button[data-action-id='toggleBgImage']"),
+        {
+            trigger: ".o_existing_attachment_cell .o_button_area",
+            content: "Select an image in the media dialog",
+            run: "click",
+        },
+        {
+            trigger: `:iframe .${snippets[0].id}.o_cc1`,
+            run: function () {
+                const parts = backgroundImageCssToParts(
+                    getComputedStyle(this.anchor)["background-image"]
+                );
+                if (!parts.url || !parts.url.startsWith("url(")) {
+                    throw new Error("An image should have been added as background.");
+                }
+                if (parts.gradient !== gradients[1]) {
+                    throw new Error(
+                        "The gradient should have been kept when adding the background image"
+                    );
+                }
+            },
+        },
 
-// Replace the gradient while there is a background-image
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc1",
-    checkGradient: gradients[1],
-    changeType: 'gradient',
-    change: gradients[0],
-    finalSelector: `:iframe .${snippets[0].id}.o_cc1:not([style*="${gradients[1]}"])`,
-    finalRun: function () {
-        const parts = backgroundImageCssToParts(
-            getComputedStyle(this.anchor)["background-image"]
-        );
-        if (!parts.url || !parts.url.startsWith('url(')) {
-            throw new Error('The image should have been kept when changing the gradient');
-        }
-        if (parts.gradient !== gradients[0]) {
-            throw new Error('The gradient should have been changed');
-        }
-    },
-}),
+        // Replace the gradient while there is a background-image
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc1",
+            checkGradient: gradients[1],
+            changeType: "gradient",
+            change: gradients[0],
+            finalSelector: `:iframe .${snippets[0].id}.o_cc1:not([style*="${gradients[1]}"])`,
+            finalRun: function () {
+                const parts = backgroundImageCssToParts(
+                    getComputedStyle(this.anchor)["background-image"]
+                );
+                if (!parts.url || !parts.url.startsWith("url(")) {
+                    throw new Error("The image should have been kept when changing the gradient");
+                }
+                if (parts.gradient !== gradients[0]) {
+                    throw new Error("The gradient should have been changed");
+                }
+            },
+        }),
 
-// Customize gradient
-changeBackgroundColor(),
-switchTo('gradient'),
-{
-    content: "Click on 'Custom' button to show custom gradient options",
-    trigger: ".o_popover .o_custom_gradient_button",
-    run: "click",
-},
-// Avoid navigating across tabs to maintain current editor state
-// Step colors
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover .gradient-preview",
-        content: 'Add step',
-        run: "click"
-    },
-    checkGradient: "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(139, 160, 237) 50%, rgb(75, 225, 236) 100%)",
-}),
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover .gradient-colors input.active",
-        content: 'Move step',
-        run: "range 45",
-    },
-    checkGradient: "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(139, 160, 237) 45%, rgb(75, 225, 236) 100%)",
-}),
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover .o_color_picker_inputs .o_hex_div input",
-        content: 'Pick step color',
-        run: "edit #FF0000",
-    },
-    checkGradient: 'linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(255, 0, 0) 45%, rgb(75, 225, 236) 100%)',
-}),
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover .gradient-color-bin a",
-        content: 'Delete step',
-        run: 'click',
-    },
-    checkGradient: 'linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)',
-}),
-// Linear
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover input[name='angle']",
-        content: 'Change angle',
-        run: "edit 50 && click .o_color_picker_inputs",
-    },
-    checkGradient: 'linear-gradient(50deg, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)',
-}),
-// Radial
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover button:contains('Radial')",
-        content: 'Switch to Radial',
-        run: 'click',
-    },
-    checkGradient: "radial-gradient(circle closest-side at 25% 25%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
-}),
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover input[name='positionX']",
-        content: 'Change X position',
-        run: "edit 33 && click .o_color_picker_inputs",
-    },
-    checkGradient: "radial-gradient(circle closest-side at 33% 25%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
-}),
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover input[name='positionY']",
-        content: 'Change Y position',
-        run: "edit 75 && click .o_color_picker_inputs",
-    },
-    checkGradient: "radial-gradient(circle closest-side at 33% 75%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
-}),
-...updateAndCheckCustomGradient({
-    updateStep: {
-        trigger: ".o_popover button[title='Extend to the farthest side']",
-        content: 'Change color spread size',
-        run: 'click',
-    },
-    checkGradient: "radial-gradient(circle farthest-side at 33% 75%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
-}),
-// Revert to predefined gradient
-{
-    trigger: `.o_colorpicker_sections button[data-color="${gradients[0]}"]`,
-    content: `Revert to predefiend gradient ${gradients[0]}`,
-    run: 'click',
-},
+        // Customize gradient
+        changeBackgroundColor(),
+        switchTo("gradient"),
+        {
+            content: "Click on 'Custom' button to show custom gradient options",
+            trigger: ".o_popover .o_custom_gradient_button",
+            run: "click",
+        },
+        // Avoid navigating across tabs to maintain current editor state
+        // Step colors
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover .gradient-preview",
+                content: "Add step",
+                run: "click",
+            },
+            checkGradient:
+                "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(139, 160, 237) 50%, rgb(75, 225, 236) 100%)",
+        }),
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover .gradient-colors input.active",
+                content: "Move step",
+                run: "range 45",
+            },
+            checkGradient:
+                "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(139, 160, 237) 45%, rgb(75, 225, 236) 100%)",
+        }),
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover .o_color_picker_inputs .o_hex_div input",
+                content: "Pick step color",
+                run: "edit #FF0000",
+            },
+            checkGradient:
+                "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(255, 0, 0) 45%, rgb(75, 225, 236) 100%)",
+        }),
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover .gradient-color-bin a",
+                content: "Delete step",
+                run: "click",
+            },
+            checkGradient: "linear-gradient(135deg, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+        }),
+        // Linear
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover input[name='angle']",
+                content: "Change angle",
+                run: "edit 50 && click .o_color_picker_inputs",
+            },
+            checkGradient: "linear-gradient(50deg, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+        }),
+        // Radial
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover button:contains('Radial')",
+                content: "Switch to Radial",
+                run: "click",
+            },
+            checkGradient:
+                "radial-gradient(circle closest-side at 25% 25%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+        }),
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover input[name='positionX']",
+                content: "Change X position",
+                run: "edit 33 && click .o_color_picker_inputs",
+            },
+            checkGradient:
+                "radial-gradient(circle closest-side at 33% 25%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+        }),
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover input[name='positionY']",
+                content: "Change Y position",
+                run: "edit 75 && click .o_color_picker_inputs",
+            },
+            checkGradient:
+                "radial-gradient(circle closest-side at 33% 75%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+        }),
+        ...updateAndCheckCustomGradient({
+            updateStep: {
+                trigger: ".o_popover button[title='Extend to the farthest side']",
+                content: "Change color spread size",
+                run: "click",
+            },
+            checkGradient:
+                "radial-gradient(circle farthest-side at 33% 75%, rgb(203, 94, 238) 0%, rgb(75, 225, 236) 100%)",
+        }),
+        // Revert to predefined gradient
+        {
+            trigger: `.o_colorpicker_sections button[data-color="${gradients[0]}"]`,
+            content: `Revert to predefiend gradient ${gradients[0]}`,
+            run: "click",
+        },
 
-// Replace the gradient by a bg color
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc1",
-    checkGradient: gradients[0],
-    checkNoGradient: gradients[1],
-    changeType: 'bg',
-    change: backgroundColors[1].code,
-    finalSelector: `:iframe .${snippets[0].id}.o_cc1.bg-${backgroundColors[1].code}[style^="background-image: url("]:not([style*="${gradients[0]}"])`,
-}),
+        // Replace the gradient by a bg color
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc1",
+            checkGradient: gradients[0],
+            checkNoGradient: gradients[1],
+            changeType: "bg",
+            change: backgroundColors[1].code,
+            finalSelector: `:iframe .${snippets[0].id}.o_cc1.bg-${backgroundColors[1].code}[style^="background-image: url("]:not([style*="${gradients[0]}"])`,
+        }),
 
-// Re-add a gradient
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc1",
-    checkBg: backgroundColors[1].code,
-    checkNoGradient: gradients[0],
-    changeType: 'gradient',
-    change: gradients[1],
-    finalSelector: `:iframe .${snippets[0].id}.o_cc1:not(.bg-${backgroundColors[1].code})`,
-    finalRun() {
-        const parts = backgroundImageCssToParts(
-            getComputedStyle(this.anchor)["background-image"]
-        );
-        if (!parts.url || !parts.url.startsWith('url(')) {
-            throw new Error('The image should have been kept when re-adding the gradient');
-        }
-        if (parts.gradient !== gradients[1]) {
-            throw new Error('The gradient should have been re-added');
-        }
-    },
-}),
+        // Re-add a gradient
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc1",
+            checkBg: backgroundColors[1].code,
+            checkNoGradient: gradients[0],
+            changeType: "gradient",
+            change: gradients[1],
+            finalSelector: `:iframe .${snippets[0].id}.o_cc1:not(.bg-${backgroundColors[1].code})`,
+            finalRun() {
+                const parts = backgroundImageCssToParts(
+                    getComputedStyle(this.anchor)["background-image"]
+                );
+                if (!parts.url || !parts.url.startsWith("url(")) {
+                    throw new Error("The image should have been kept when re-adding the gradient");
+                }
+                if (parts.gradient !== gradients[1]) {
+                    throw new Error("The gradient should have been re-added");
+                }
+            },
+        }),
 
-// Final check of color selection and removing the image
-...checkAndUpdateBackgroundColor({
-    checkCC: "o_cc1",
-    checkNoBg: backgroundColors[1].code,
-    checkGradient: gradients[1],
-}),
-// Now removing all colors via the 'None' button (note: colorpicker still opened)
-{
-    trigger: ".o_popover button[title='Reset']",
-    content: "Click on the None button of the color palette",
-    run: "click",
-},
-{
-    trigger: `:iframe .${snippets[0].id}:not(.o_cc1):not([style*="${gradients[1]}"])[style^="background-image: url("]`,
-    content: "All color classes and properties should have been removed and image should still be applied",
-}
-]);
+        // Final check of color selection and removing the image
+        ...checkAndUpdateBackgroundColor({
+            checkCC: "o_cc1",
+            checkNoBg: backgroundColors[1].code,
+            checkGradient: gradients[1],
+        }),
+        // Now removing all colors via the 'None' button (note: colorpicker still opened)
+        {
+            trigger: ".o_popover button[title='Reset']",
+            content: "Click on the None button of the color palette",
+            run: "click",
+        },
+        {
+            trigger: `:iframe .${snippets[0].id}:not(.o_cc1):not([style*="${gradients[1]}"])[style^="background-image: url("]`,
+            content:
+                "All color classes and properties should have been removed and image should still be applied",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_cache_across_websites.js b/addons/website/static/tests/tours/snippet_cache_across_websites.js
index 46b78ec14a30f..8475dea810adb 100644
--- a/addons/website/static/tests/tours/snippet_cache_across_websites.js
+++ b/addons/website/static/tests/tours/snippet_cache_across_websites.js
@@ -3,32 +3,39 @@ import {
     clickOnSave,
     registerWebsitePreviewTour,
     testSwitchWebsite,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('snippet_cache_across_websites', {
-    edition: true,
-    url: '/@/'
-}, () => [
+registerWebsitePreviewTour(
+    "snippet_cache_across_websites",
     {
-        content: "Click on the Custom category block",
-        trigger: ".o-website-builder_sidebar .o_snippet[name='Custom'].o_draggable .o_snippet_thumbnail_area",
-        run: "click",
+        edition: true,
+        url: "/@/",
     },
-    {
-        content: "Ensure custom snippet preview appeared in the dialog",
-        trigger: ":iframe .o_snippet_preview_wrap[data-snippet-id^='s_text_block_'] section[data-name='custom_snippet_test']",
-    },
-    {
-        content: "Close the 'add snippet' dialog",
-        trigger: ".o_add_snippet_dialog .modal-header .btn-close",
-        run: "click",
-    },
-    // There's no need to save, but canceling might or might not show a popup...
-    ...clickOnSave(),
-    ...testSwitchWebsite('Test Website'),
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Check that the custom snippet category is not here",
-        trigger: ".o-website-builder_sidebar:not(:has(.o_snippet[name='Custom']))",
-    },
-]);
+    () => [
+        {
+            content: "Click on the Custom category block",
+            trigger:
+                ".o-website-builder_sidebar .o_snippet[name='Custom'].o_draggable .o_snippet_thumbnail_area",
+            run: "click",
+        },
+        {
+            content: "Ensure custom snippet preview appeared in the dialog",
+            trigger:
+                ":iframe .o_snippet_preview_wrap[data-snippet-id^='s_text_block_'] section[data-name='custom_snippet_test']",
+        },
+        {
+            content: "Close the 'add snippet' dialog",
+            trigger: ".o_add_snippet_dialog .modal-header .btn-close",
+            run: "click",
+        },
+        // There's no need to save, but canceling might or might not show a
+        // popup...
+        ...clickOnSave(),
+        ...testSwitchWebsite("Test Website"),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check that the custom snippet category is not here",
+            trigger: ".o-website-builder_sidebar:not(:has(.o_snippet[name='Custom']))",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_countdown.js b/addons/website/static/tests/tours/snippet_countdown.js
index 2ad00a7d16f1e..94652e1ce04e2 100644
--- a/addons/website/static/tests/tours/snippet_countdown.js
+++ b/addons/website/static/tests/tours/snippet_countdown.js
@@ -4,49 +4,55 @@ import {
     insertSnippet,
     registerWebsitePreviewTour,
     changeOptionInPopover,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('snippet_countdown', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({id: "s_countdown", name: "Countdown", groupName: "Content"}),
-    ...clickOnSnippet({id: 's_countdown', name: 'Countdown'}),
-    ...changeOptionInPopover("Countdown", "At The End", "Show Message and keep countdown"),
-    changeOption("Countdown", "previewEndMessage"),
-    // The next two steps check that the end message does not disappear when a
-    // widgets_start_request is triggered.
+registerWebsitePreviewTour(
+    "snippet_countdown",
     {
-        content: "Hover an option which has a preview",
-        trigger: "[data-action-param='o_half_screen_height']",
-        run: "hover",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Check that the countdown message is still displayed",
-        trigger: ':iframe .s_countdown .s_picture',
-        run() {
-            // Just a visibility check
+    () => [
+        ...insertSnippet({ id: "s_countdown", name: "Countdown", groupName: "Content" }),
+        ...clickOnSnippet({ id: "s_countdown", name: "Countdown" }),
+        ...changeOptionInPopover("Countdown", "At The End", "Show Message and keep countdown"),
+        changeOption("Countdown", "previewEndMessage"),
+        // The next two steps check that the end message does not disappear when
+        // a widgets_start_request is triggered.
+        {
+            content: "Hover an option which has a preview",
+            trigger: "[data-action-param='o_half_screen_height']",
+            run: "hover",
+        },
+        {
+            content: "Check that the countdown message is still displayed",
+            trigger: ":iframe .s_countdown .s_picture",
+            run() {
+                // Just a visibility check
 
-            // Also make sure the mouseout and mouseleave are triggered so that
-            // next steps make sense.
-            // TODO the next steps are not actually testing anything without
-            // it and the mouseout and mouseleave make sense but really it
-            // should not be *necessary* to simulate those for the editor flow
-            // to make some sense.
-            const previousAnchor = document.querySelector("[data-action-param='o_half_screen_height']");
-            previousAnchor.dispatchEvent(new Event("mouseout"));
-            previousAnchor.dispatchEvent(new Event("mouseleave"));
+                // Also make sure the mouseout and mouseleave are triggered so
+                // that next steps make sense.
+                // TODO the next steps are not actually testing anything without
+                // it and the mouseout and mouseleave make sense but really it
+                // should not be *necessary* to simulate those for the editor
+                // flow to make some sense.
+                const previousAnchor = document.querySelector(
+                    "[data-action-param='o_half_screen_height']"
+                );
+                previousAnchor.dispatchEvent(new Event("mouseout"));
+                previousAnchor.dispatchEvent(new Event("mouseleave"));
+            },
         },
-    },
-    // Next, we change the end action to message and no countdown while the edit
-    // message toggle is still activated. It should hide the countdown
-    ...changeOptionInPopover("Countdown", "At The End", "Show Message and hide countdown"),
-    {
-        content: "Check that the countdown is not displayed",
-        trigger: ':iframe .s_countdown:has(.s_countdown_canvas_wrapper:not(:visible))',
-    },
-    {
-        content: "Check that the message is still displayed",
-        trigger: ':iframe .s_countdown .s_picture',
-    },
-]);
+        // Next, we change the end action to message and no countdown while the
+        // edit message toggle is still activated. It should hide the countdown.
+        ...changeOptionInPopover("Countdown", "At The End", "Show Message and hide countdown"),
+        {
+            content: "Check that the countdown is not displayed",
+            trigger: ":iframe .s_countdown:has(.s_countdown_canvas_wrapper:not(:visible))",
+        },
+        {
+            content: "Check that the message is still displayed",
+            trigger: ":iframe .s_countdown .s_picture",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_editor_panel_options.js b/addons/website/static/tests/tours/snippet_editor_panel_options.js
index d756db6b83fd5..aa72615187ee8 100644
--- a/addons/website/static/tests/tours/snippet_editor_panel_options.js
+++ b/addons/website/static/tests/tours/snippet_editor_panel_options.js
@@ -6,8 +6,8 @@ import {
     goBackToBlocks,
     registerWebsitePreviewTour,
     selectFullText,
-} from '@website/js/tours/tour_utils';
-import { browser } from '@web/core/browser/browser';
+} from "@website/js/tours/tour_utils";
+import { browser } from "@web/core/browser/browser";
 
 const checkIfParagraphSelected = (trigger) => ({
     content: "Check if the paragraph is selected.",
@@ -26,102 +26,115 @@ const checkIfTextToolbarVisible = {
     trigger: ".o-we-toolbar",
 };
 
-registerWebsitePreviewTour('snippet_editor_panel_options', {
-    url: '/',
-    edition: true,
-}, () => [
-...insertSnippet({
-    id: 's_text_image',
-    name: 'Text - Image',
-    groupName: "Content",
-}),
-// Test keeping the text selection when using the width option.
-selectFullText("first paragraph", ".s_text_image p"),
-checkIfParagraphSelected(":iframe .s_text_image p"),
-checkIfTextToolbarVisible,
-{
-    content: "Click on the width option.",
-    trigger: "[data-action-param='o_container_small']",
-    run: "click",
-}, {
-    content: "The snippet should have the correct class.",
-    trigger: ':iframe .s_text_image > .o_container_small',
-},
-checkIfParagraphSelected(":iframe .s_text_image p"),
-// Test the anchor option.
-{
-    content: "Click on the anchor option",
-    trigger: "[data-container-title='Text - Image'] .oe_snippet_anchor",
-    async run(helpers) {
-        // Patch and ignore write on clipboard in tour as we don't have permissions
-        const oldWriteText = browser.navigator.clipboard.writeText;
-        browser.navigator.clipboard.writeText = () => { console.info('Copy in clipboard ignored!') };
-        await helpers.click();
-        // Restore the writeText after a short delay to avoid reverting it
-        // before the plugin function has been completed
-        await new Promise(resolve => setTimeout(resolve, 100));
-        browser.navigator.clipboard.writeText = oldWriteText;
-    }
-}, {
-    content: "Check the copied url from the notification toast",
-    trigger: '.o_notification_manager .o_notification_content',
-    run() {
-        const { textContent } = this.anchor;
-        const url = textContent.substring(textContent.indexOf('/'));
+registerWebsitePreviewTour(
+    "snippet_editor_panel_options",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        // Test keeping the text selection when using the width option.
+        selectFullText("first paragraph", ".s_text_image p"),
+        checkIfParagraphSelected(":iframe .s_text_image p"),
+        checkIfTextToolbarVisible,
+        {
+            content: "Click on the width option.",
+            trigger: "[data-action-param='o_container_small']",
+            run: "click",
+        },
+        {
+            content: "The snippet should have the correct class.",
+            trigger: ":iframe .s_text_image > .o_container_small",
+        },
+        checkIfParagraphSelected(":iframe .s_text_image p"),
+        // Test the anchor option.
+        {
+            content: "Click on the anchor option",
+            trigger: "[data-container-title='Text - Image'] .oe_snippet_anchor",
+            async run(helpers) {
+                // Patch and ignore write on clipboard in tour as we don't have
+                // permissions.
+                const oldWriteText = browser.navigator.clipboard.writeText;
+                browser.navigator.clipboard.writeText = () => {
+                    console.info("Copy in clipboard ignored!");
+                };
+                await helpers.click();
+                // Restore the writeText after a short delay to avoid reverting
+                // it before the plugin function has been completed.
+                await new Promise((resolve) => setTimeout(resolve, 100));
+                browser.navigator.clipboard.writeText = oldWriteText;
+            },
+        },
+        {
+            content: "Check the copied url from the notification toast",
+            trigger: ".o_notification_manager .o_notification_content",
+            run() {
+                const { textContent } = this.anchor;
+                const url = textContent.substring(textContent.indexOf("/"));
 
-        // The url should not target the client action
-        if (url.startsWith('/@')) {
-            console.error('The anchor option should target the frontend');
-        }
+                // The url should not target the client action
+                if (url.startsWith("/@")) {
+                    console.error("The anchor option should target the frontend");
+                }
 
-        const iframeDocument = document.querySelector(".o_iframe_container iframe").contentDocument;
-        const snippetId = iframeDocument.querySelector('.s_text_image').id;
-        if (!url || url.indexOf(snippetId) < 0) {
-            console.error('The anchor option does not target the correct snippet.');
-        }
-    },
-},
-// Test keeping the text selection when adding columns to a snippet with none.
-goBackToBlocks(),
-...insertSnippet({
-    id: 's_text_block',
-    name: 'Text',
-    groupName: "Text",
-}),
-selectFullText("first paragraph", ".s_text_block p"),
-checkIfParagraphSelected(":iframe .s_text_block p"),
-checkIfTextToolbarVisible,
-...changeOptionInPopover("Text", "Layout", "[data-action-value='3']"),
-{
-    content: "The snippet should have the correct number of columns.",
-    trigger: ':iframe .s_text_block .container > .row .col-lg-4:eq(3)',
-    run() {
-        if (this.anchor.childElementCount !== 3) {
-            console.error("The snippet does not have the correct number of columns");
-        }
-    },
-},
-checkIfParagraphSelected(":iframe .s_text_block p"),
-// Test keeping the text selection when removing all columns of a snippet.
-...changeOptionInPopover("Text", "Layout", "[data-action-value='0']"),
-{
-    content: "The snippet should have the correct number of columns.",
-    trigger: ':iframe .s_text_block .container:not(:has(.row))',
-},
-checkIfParagraphSelected(":iframe .s_text_block p"),
-// Test keeping the text selection when toggling the grid mode.
-changeOption("Text", "[data-action-id='setGridLayout']"),
-{
-    content: "The snippet row should have the grid mode class.",
-    trigger: ":iframe .s_text_block .row.o_grid_mode",
-},
-checkIfParagraphSelected(":iframe .s_text_block p"),
-// Test keeping the text selection when toggling back the column mode.
-changeOption("Text", "[data-action-id='setColumnLayout']"),
-{
-    content: "The snippet row should not have the grid mode class anymore.",
-    trigger: ":iframe .s_text_block .row:not(.o_grid_mode)",
-},
-checkIfParagraphSelected(":iframe .s_text_block p"),
-...clickOnSave(),
-]);
+                const iframeDocument = document.querySelector(
+                    ".o_iframe_container iframe"
+                ).contentDocument;
+                const snippetId = iframeDocument.querySelector(".s_text_image").id;
+                if (!url || url.indexOf(snippetId) < 0) {
+                    console.error("The anchor option does not target the correct snippet.");
+                }
+            },
+        },
+        // Test keeping the text selection when adding columns to a snippet with
+        // none.
+        goBackToBlocks(),
+        ...insertSnippet({
+            id: "s_text_block",
+            name: "Text",
+            groupName: "Text",
+        }),
+        selectFullText("first paragraph", ".s_text_block p"),
+        checkIfParagraphSelected(":iframe .s_text_block p"),
+        checkIfTextToolbarVisible,
+        ...changeOptionInPopover("Text", "Layout", "[data-action-value='3']"),
+        {
+            content: "The snippet should have the correct number of columns.",
+            trigger: ":iframe .s_text_block .container > .row .col-lg-4:eq(3)",
+            run() {
+                if (this.anchor.childElementCount !== 3) {
+                    console.error("The snippet does not have the correct number of columns");
+                }
+            },
+        },
+        checkIfParagraphSelected(":iframe .s_text_block p"),
+        // Test keeping the text selection when removing all columns of a
+        // snippet.
+        ...changeOptionInPopover("Text", "Layout", "[data-action-value='0']"),
+        {
+            content: "The snippet should have the correct number of columns.",
+            trigger: ":iframe .s_text_block .container:not(:has(.row))",
+        },
+        checkIfParagraphSelected(":iframe .s_text_block p"),
+        // Test keeping the text selection when toggling the grid mode.
+        changeOption("Text", "[data-action-id='setGridLayout']"),
+        {
+            content: "The snippet row should have the grid mode class.",
+            trigger: ":iframe .s_text_block .row.o_grid_mode",
+        },
+        checkIfParagraphSelected(":iframe .s_text_block p"),
+        // Test keeping the text selection when toggling back the column mode.
+        changeOption("Text", "[data-action-id='setColumnLayout']"),
+        {
+            content: "The snippet row should not have the grid mode class anymore.",
+            trigger: ":iframe .s_text_block .row:not(.o_grid_mode)",
+        },
+        checkIfParagraphSelected(":iframe .s_text_block p"),
+        ...clickOnSave(),
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_image.js b/addons/website/static/tests/tours/snippet_image.js
index 7fea729894c6a..233f15551a0b8 100644
--- a/addons/website/static/tests/tours/snippet_image.js
+++ b/addons/website/static/tests/tours/snippet_image.js
@@ -1,44 +1,49 @@
-import {insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+import { insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("snippet_image", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({id: "s_image", name: "Image"}, { ignoreLoading: true }),
-{
-    content: "Verify if the media dialog opens",
-    trigger: ".o_select_media_dialog",
-},
-{
-    content: "Close the media dialog",
-    trigger: ".o_select_media_dialog .btn-close",
-    run: "click",
-},
-{
-    content: "Verify if the image placeholder has been removed",
-    trigger: ":iframe footer:not(:has(.s_image > svg))",
-},
-    ...insertSnippet({id: "s_image", name: "Image"}, { ignoreLoading: true }),
-{
-    content: "Verify that the image placeholder is within the page",
-    trigger: ":iframe footer .s_image > svg",
-},
-{
-    content: "Click on the image",
-    trigger: ".o_select_media_dialog .o_existing_attachment_cell .o_button_area",
-    run: "click",
-},
-{
-    content: "Verify if the image has been added in the footer and if the image placeholder has been removed",
-    trigger: ":iframe footer:not(:has(.s_image > svg)) img.o_we_custom_image",
-},
-{
-    content: "Click on the 'undo' button",
-    trigger: '.o-snippets-top-actions button.fa-undo',
-    run: "click",
-},
-{
-    content: "Check that the image and the image placeholder have been removed",
-    trigger: ":iframe footer:not(:has(.s_image > svg)):not(:has(img.o_we_custom_image))",
-},
-]);
+registerWebsitePreviewTour(
+    "snippet_image",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({ id: "s_image", name: "Image" }, { ignoreLoading: true }),
+        {
+            content: "Verify if the media dialog opens",
+            trigger: ".o_select_media_dialog",
+        },
+        {
+            content: "Close the media dialog",
+            trigger: ".o_select_media_dialog .btn-close",
+            run: "click",
+        },
+        {
+            content: "Verify if the image placeholder has been removed",
+            trigger: ":iframe footer:not(:has(.s_image > svg))",
+        },
+        ...insertSnippet({ id: "s_image", name: "Image" }, { ignoreLoading: true }),
+        {
+            content: "Verify that the image placeholder is within the page",
+            trigger: ":iframe footer .s_image > svg",
+        },
+        {
+            content: "Click on the image",
+            trigger: ".o_select_media_dialog .o_existing_attachment_cell .o_button_area",
+            run: "click",
+        },
+        {
+            content:
+                "Verify if the image has been added in the footer and if the image placeholder has been removed",
+            trigger: ":iframe footer:not(:has(.s_image > svg)) img.o_we_custom_image",
+        },
+        {
+            content: "Click on the 'undo' button",
+            trigger: ".o-snippets-top-actions button.fa-undo",
+            run: "click",
+        },
+        {
+            content: "Check that the image and the image placeholder have been removed",
+            trigger: ":iframe footer:not(:has(.s_image > svg)):not(:has(img.o_we_custom_image))",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_image_gallery.js b/addons/website/static/tests/tours/snippet_image_gallery.js
index 38a4d1ecbfb5e..4aef8899b66f2 100644
--- a/addons/website/static/tests/tours/snippet_image_gallery.js
+++ b/addons/website/static/tests/tours/snippet_image_gallery.js
@@ -8,146 +8,189 @@ import {
     changeOptionInPopover,
 } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('snippet_image_gallery', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({id: 's_images_wall', name: 'Images Wall', groupName: "Images"}),
-    ...clickOnSave(),
+registerWebsitePreviewTour(
+    "snippet_image_gallery",
     {
-        content: 'Click on an image of the Image Wall',
-        trigger: ':iframe .s_image_gallery img',
-        run: 'click',
+        url: "/",
+        edition: true,
     },
+    () => [
+        ...insertSnippet({ id: "s_images_wall", name: "Images Wall", groupName: "Images" }),
+        ...clickOnSave(),
+        {
+            content: "Click on an image of the Image Wall",
+            trigger: ":iframe .s_image_gallery img",
+            run: "click",
+        },
+        {
+            content: "Check that the modal has opened properly",
+            trigger: ":iframe .s_gallery_lightbox img",
+        },
+    ]
+);
+
+registerWebsitePreviewTour(
+    "snippet_image_gallery_remove",
     {
-        content: 'Check that the modal has opened properly',
-        trigger: ':iframe .s_gallery_lightbox img',
+        url: "/",
+        edition: true,
     },
-]);
-
-registerWebsitePreviewTour("snippet_image_gallery_remove", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_image_gallery",
-        name: "Image Gallery",
-        groupName: "Images",
-}),
-...clickOnSnippet({
-    id: 's_image_gallery',
-    name: 'Image Gallery',
-}), {
-    content: "Click on Remove all",
-    trigger: "button[data-action-id='removeAllImages']",
-    run: "click",
-}, {
-    content: "Click on Add Images",
-    trigger: ":iframe span:contains('Add Images')",
-    run: "click",
-}, {
-    content: "Click on the first new image",
-    trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image.jpg']",
-    run: "click",
-}, {
-    content: "Click on the second new image",
-    trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image2.webp']",
-    run: "click",
-},
-    addMedia(),
-   {
-    content: "Click on the image of the Image Gallery snippet",
-    trigger: ":iframe .s_image_gallery .carousel-item.active  img",
-    run: "click",
-}, {
-    content: "Check that the Snippet Editor of the clicked image has been loaded with its size",
-    trigger: ".o-tab-content [data-container-title='Image']:has([title='Size']:contains(/^.+ kB$/)",
-}, {
-    content: "Click on Remove Block",
-    trigger: ".o_customize_tab .options-container[data-container-title='Image Gallery'] .oe_snippet_remove",
-    run: "click",
-}, {
-    content: "Check that the Image Gallery snippet has been removed",
-    trigger: ":iframe #wrap:not(:has(.s_image_gallery))",
-}]);
+    () => [
+        ...insertSnippet({
+            id: "s_image_gallery",
+            name: "Image Gallery",
+            groupName: "Images",
+        }),
+        ...clickOnSnippet({
+            id: "s_image_gallery",
+            name: "Image Gallery",
+        }),
+        {
+            content: "Click on Remove all",
+            trigger: "button[data-action-id='removeAllImages']",
+            run: "click",
+        },
+        {
+            content: "Click on Add Images",
+            trigger: ":iframe span:contains('Add Images')",
+            run: "click",
+        },
+        {
+            content: "Click on the first new image",
+            trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image.jpg']",
+            run: "click",
+        },
+        {
+            content: "Click on the second new image",
+            trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image2.webp']",
+            run: "click",
+        },
+        addMedia(),
+        {
+            content: "Click on the image of the Image Gallery snippet",
+            trigger: ":iframe .s_image_gallery .carousel-item.active  img",
+            run: "click",
+        },
+        {
+            content:
+                "Check that the Snippet Editor of the clicked image has been loaded with its size",
+            trigger:
+                ".o-tab-content [data-container-title='Image']:has([title='Size']:contains(/^.+ kB$/)",
+        },
+        {
+            content: "Click on Remove Block",
+            trigger:
+                ".o_customize_tab .options-container[data-container-title='Image Gallery'] .oe_snippet_remove",
+            run: "click",
+        },
+        {
+            content: "Check that the Image Gallery snippet has been removed",
+            trigger: ":iframe #wrap:not(:has(.s_image_gallery))",
+        },
+    ]
+);
 
-registerWebsitePreviewTour("snippet_image_gallery_reorder", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_image_gallery",
-        name: "Image Gallery",
-        groupName: "Images",
-    }),
-{
-    content: "Click on the first image of the snippet",
-    trigger: ":iframe .s_image_gallery .carousel-item.active img",
-    run: "click",
-},
-    ...changeOptionInPopover("Image", "Filter", "Blur"),
-{
-    content: "Check that the image has the correct filter",
-    trigger: ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('Blur')",
-},
-changeOption("Image", "[data-label='Re-order'] button[data-action-value='next']"),
-{
-    content: "Check that the image has been moved",
-    trigger: ":iframe .s_image_gallery .carousel-item.active img[data-index='1']",
-}, {
-    content: "Click on the footer to reload the editor panel",
-    trigger: ":iframe #footer",
-    run: "click",
-}, {
-    content: "Check that the footer options have been loaded",
-    trigger:".o-tab-content [data-container-title='Footer']",
-}, {
-    content: "Click on the moved image",
-    trigger: ":iframe .s_image_gallery .carousel-item.active img",
-    run: "click",
-}, {
-    content: "Check that the image still has the correct filter",
-    trigger: ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('Blur')",
-}, {
-    content: "Click to access next image",
-    trigger: ":iframe .s_image_gallery .carousel-control-next",
-    run: "click",
-}, {
-    content: "Check that the option has changed",
-    trigger: ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('None')",
-}, {
-    content: "Click to access previous image",
-    trigger: ":iframe .s_image_gallery .carousel-control-prev",
-    run: "click",
-}, {
-    content: "Check that the option is restored",
-    trigger: ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('Blur')",
-}]);
+registerWebsitePreviewTour(
+    "snippet_image_gallery_reorder",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_image_gallery",
+            name: "Image Gallery",
+            groupName: "Images",
+        }),
+        {
+            content: "Click on the first image of the snippet",
+            trigger: ":iframe .s_image_gallery .carousel-item.active img",
+            run: "click",
+        },
+        ...changeOptionInPopover("Image", "Filter", "Blur"),
+        {
+            content: "Check that the image has the correct filter",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('Blur')",
+        },
+        changeOption("Image", "[data-label='Re-order'] button[data-action-value='next']"),
+        {
+            content: "Check that the image has been moved",
+            trigger: ":iframe .s_image_gallery .carousel-item.active img[data-index='1']",
+        },
+        {
+            content: "Click on the footer to reload the editor panel",
+            trigger: ":iframe #footer",
+            run: "click",
+        },
+        {
+            content: "Check that the footer options have been loaded",
+            trigger: ".o-tab-content [data-container-title='Footer']",
+        },
+        {
+            content: "Click on the moved image",
+            trigger: ":iframe .s_image_gallery .carousel-item.active img",
+            run: "click",
+        },
+        {
+            content: "Check that the image still has the correct filter",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('Blur')",
+        },
+        {
+            content: "Click to access next image",
+            trigger: ":iframe .s_image_gallery .carousel-control-next",
+            run: "click",
+        },
+        {
+            content: "Check that the option has changed",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('None')",
+        },
+        {
+            content: "Click to access previous image",
+            trigger: ":iframe .s_image_gallery .carousel-control-prev",
+            run: "click",
+        },
+        {
+            content: "Check that the option is restored",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] [data-label='Filter'] .o-dropdown:contains('Blur')",
+        },
+    ]
+);
 
-registerWebsitePreviewTour("snippet_image_gallery_thumbnail_update", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_image_gallery",
-        name: "Image Gallery",
-        groupName: "Images",
-    }),
-    ...clickOnSnippet({
-        id: "s_image_gallery",
-        name: "Image Gallery",
-    }),
-    changeOption("Image Gallery", "addImage"),
-{
-    content: "Click on the default image",
-    trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image.jpg']",
-    run: "click",
-},
-    addMedia(),
-{
-    content: "Check that the new image has been added",
-    trigger: ":iframe .s_image_gallery:has(img[data-index='3'])",
-}, {
-    content: "Check that the thumbnail of the first image has not been changed",
-    trigger: ":iframe .s_image_gallery div.carousel-indicators button:first-child[style='background-image: url(/web/image/website.library_image_08)']",
-}]);
+registerWebsitePreviewTour(
+    "snippet_image_gallery_thumbnail_update",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_image_gallery",
+            name: "Image Gallery",
+            groupName: "Images",
+        }),
+        ...clickOnSnippet({
+            id: "s_image_gallery",
+            name: "Image Gallery",
+        }),
+        changeOption("Image Gallery", "addImage"),
+        {
+            content: "Click on the default image",
+            trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image.jpg']",
+            run: "click",
+        },
+        addMedia(),
+        {
+            content: "Check that the new image has been added",
+            trigger: ":iframe .s_image_gallery:has(img[data-index='3'])",
+        },
+        {
+            content: "Check that the thumbnail of the first image has not been changed",
+            trigger:
+                ":iframe .s_image_gallery div.carousel-indicators button:first-child[style='background-image: url(/web/image/website.library_image_08)']",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_image_quality.js b/addons/website/static/tests/tours/snippet_image_quality.js
index f331bf89bb1c6..02fa045055761 100644
--- a/addons/website/static/tests/tours/snippet_image_quality.js
+++ b/addons/website/static/tests/tours/snippet_image_quality.js
@@ -1,51 +1,59 @@
 import { insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('website_image_quality', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
+registerWebsitePreviewTour(
+    "website_image_quality",
     {
-        content: "Select image",
-        trigger: ':iframe .s_text_image img',
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Set low quality",
-        trigger: ".o_customize_tab div[data-container-title='Image'] div[data-action-id='setImageQuality'] input",
-        run: 'range 5',
-    },
-    {
-        content: "Wait for image update: NOT original image",
-        trigger: ':iframe .s_text_image img:not([src$="s_text_image_default_image"])',
-    },
-    {
-        content: "Check image size",
-        // Reached size cannot be hardcoded because it changes with
-        // different versions of Chrome.
-        trigger: ".o_customize_tab [data-container-title='Image'] span[title='Size']:contains(' kb'):not(:contains('42.9 kb'))",
-        run() {
-            // Make sure the reached size is smaller than the original one.
-            if (parseFloat(this.anchor.innerText) >= 42.9) {
-                throw new Error("Image size should be smaller than original");
-            }
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            content: "Select image",
+            trigger: ":iframe .s_text_image img",
+            run: "click",
         },
-    },
-    {
-        content: "Set high quality",
-        trigger: ".o_customize_tab div[data-container-title='Image'] div[data-action-id='setImageQuality'] input",
-        run: 'range 99',
-    },
-    {
-        content: "Wait for image update: back to original image",
-        trigger: ':iframe .s_text_image img[src$="S55YBaZ4YLuRoopv55ZIqZKBC8uATEEUgAAA="]',
-    },
-    {
-        content: "Check image size",
-        trigger: ".o_customize_tab [data-container-title='Image'] span[title='Size']:contains('22.8')",
-    },
-]);
+        {
+            content: "Set low quality",
+            trigger:
+                ".o_customize_tab div[data-container-title='Image'] div[data-action-id='setImageQuality'] input",
+            run: "range 5",
+        },
+        {
+            content: "Wait for image update: NOT original image",
+            trigger: ':iframe .s_text_image img:not([src$="s_text_image_default_image"])',
+        },
+        {
+            content: "Check image size",
+            // Reached size cannot be hardcoded because it changes with
+            // different versions of Chrome.
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] span[title='Size']:contains(' kb'):not(:contains('42.9 kb'))",
+            run() {
+                // Make sure the reached size is smaller than the original one.
+                if (parseFloat(this.anchor.innerText) >= 42.9) {
+                    throw new Error("Image size should be smaller than original");
+                }
+            },
+        },
+        {
+            content: "Set high quality",
+            trigger:
+                ".o_customize_tab div[data-container-title='Image'] div[data-action-id='setImageQuality'] input",
+            run: "range 99",
+        },
+        {
+            content: "Wait for image update: back to original image",
+            trigger: ':iframe .s_text_image img[src$="S55YBaZ4YLuRoopv55ZIqZKBC8uATEEUgAAA="]',
+        },
+        {
+            content: "Check image size",
+            trigger:
+                ".o_customize_tab [data-container-title='Image'] span[title='Size']:contains('22.8')",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_images_wall.js b/addons/website/static/tests/tours/snippet_images_wall.js
index 055db7d0556d0..1a24f49716660 100644
--- a/addons/website/static/tests/tours/snippet_images_wall.js
+++ b/addons/website/static/tests/tours/snippet_images_wall.js
@@ -1,22 +1,29 @@
-import {clickOnSnippet, insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+import {
+    clickOnSnippet,
+    insertSnippet,
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
 const wallRaceConditionClass = "image_wall_race_condition";
-const preventRaceConditionSteps = [{
-    content: "Wait a few ms to avoid race condition",
-    // Ensure the class is remove from previous call of those steps
-    trigger: `body:not(.${wallRaceConditionClass})`,
-    run() {
-        setTimeout(() => {
-            document.body.classList.add(wallRaceConditionClass);
-        }, 500);
-    }
-}, {
-    content: "Check the race condition class is added after a few ms",
-    trigger: `body.${wallRaceConditionClass}`,
-    run() {
-        document.body.classList.remove(wallRaceConditionClass);
-    }
-}];
+const preventRaceConditionSteps = [
+    {
+        content: "Wait a few ms to avoid race condition",
+        // Ensure the class is remove from previous call of those steps
+        trigger: `body:not(.${wallRaceConditionClass})`,
+        run() {
+            setTimeout(() => {
+                document.body.classList.add(wallRaceConditionClass);
+            }, 500);
+        },
+    },
+    {
+        content: "Check the race condition class is added after a few ms",
+        trigger: `body.${wallRaceConditionClass}`,
+        run() {
+            document.body.classList.remove(wallRaceConditionClass);
+        },
+    },
+];
 
 const selectSignImageStep = [
     {
@@ -47,74 +54,91 @@ const reselectSignImageSteps = [
     ...selectSignImageStep,
 ];
 
-registerWebsitePreviewTour("snippet_images_wall", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_images_wall",
-        name: "Images Wall",
-        groupName: "Images",
-}),
-...clickOnSnippet({
-    id: "s_image_gallery",
-    name: "Images Wall",
-}),
+registerWebsitePreviewTour(
+    "snippet_images_wall",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_images_wall",
+            name: "Images Wall",
+            groupName: "Images",
+        }),
+        ...clickOnSnippet({
+            id: "s_image_gallery",
+            name: "Images Wall",
+        }),
         ...selectSignImageStep,
-{
-    content: "Click on add a link",
-    trigger: "div[data-label='Media'] button[data-action-id='setLink']",
-    run: "click",
-}, {
-    content: "Change the link of the image",
-    trigger: "div[data-label='Your URL'] div[data-action-id='setUrl'] input",
-    // TODO: This should not be needed, but there seems to be an odd behavior
-    // with the input not properly blurring when clicking on the reorder
-    // buttons. However this is also the case in older versions. It
-    // only crashes here because there is also a change in the tour framework
-    // now using hoot.
-    run: "edit /contactus && click body",
-}, {
-    content: "Click on move to previous",
-    trigger: "div[data-label='Re-order'] button[data-action-value='prev']",
-    run: "click",
-}, {
-    content: "Check if sign is in second column",
-    trigger: ":iframe .s_image_gallery .o_masonry_col:nth-child(2):has(img[data-index='1'][src*='library_image_14'])",
-},
-...reselectSignImageSteps,
-{
-    content: "Click on move to first",
-    trigger: "div[data-label='Re-order'] button[data-action-value='first']",
-    run: "click",
-}, {
-    content: "Check if sign is in first column",
-    trigger: ":iframe .s_image_gallery .o_masonry_col:nth-child(1):has(img[data-index='0'][src*='library_image_14'])",
-},
-...reselectSignImageSteps,
-{
-    content: "Click on move to previous",
-    trigger: "div[data-label='Re-order'] button[data-action-value='prev']",
-    run: "click",
-}, {
-    content: "Check if sign is in third column",
-    trigger: ":iframe .s_image_gallery .o_masonry_col:nth-child(3):has(img[data-index='5'][src*='library_image_14'])",
-},
-...reselectSignImageSteps,
-{
-    content: "Click on move to next",
-    trigger: "div[data-label='Re-order'] button[data-action-value='next']",
-    run: "click",
-}, {
-    content: "Check if sign is in first column",
-    trigger: ":iframe .s_image_gallery .o_masonry_col:nth-child(1):has(img[data-index='0'][src*='library_image_14'])",
-},
-...reselectSignImageSteps,
-{
-    content: "Click on move to last",
-    trigger: "div[data-label='Re-order'] button[data-action-value='last']",
-    run: "click",
-}, {
-    content: "Check layout",
-    trigger: ":iframe .s_image_gallery .o_masonry_col:nth-child(3):has(img[data-index='5'][src*='library_image_14'])",
-}]);
+        {
+            content: "Click on add a link",
+            trigger: "div[data-label='Media'] button[data-action-id='setLink']",
+            run: "click",
+        },
+        {
+            content: "Change the link of the image",
+            trigger: "div[data-label='Your URL'] div[data-action-id='setUrl'] input",
+            // TODO: This should not be needed, but there seems to be an odd
+            // behavior with the input not properly blurring when clicking on
+            // the reorder buttons. However this is also the case in older
+            // versions. It only crashes here because there is also a change in
+            // the tour framework now using hoot.
+            run: "edit /contactus && click body",
+        },
+        {
+            content: "Click on move to previous",
+            trigger: "div[data-label='Re-order'] button[data-action-value='prev']",
+            run: "click",
+        },
+        {
+            content: "Check if sign is in second column",
+            trigger:
+                ":iframe .s_image_gallery .o_masonry_col:nth-child(2):has(img[data-index='1'][src*='library_image_14'])",
+        },
+        ...reselectSignImageSteps,
+        {
+            content: "Click on move to first",
+            trigger: "div[data-label='Re-order'] button[data-action-value='first']",
+            run: "click",
+        },
+        {
+            content: "Check if sign is in first column",
+            trigger:
+                ":iframe .s_image_gallery .o_masonry_col:nth-child(1):has(img[data-index='0'][src*='library_image_14'])",
+        },
+        ...reselectSignImageSteps,
+        {
+            content: "Click on move to previous",
+            trigger: "div[data-label='Re-order'] button[data-action-value='prev']",
+            run: "click",
+        },
+        {
+            content: "Check if sign is in third column",
+            trigger:
+                ":iframe .s_image_gallery .o_masonry_col:nth-child(3):has(img[data-index='5'][src*='library_image_14'])",
+        },
+        ...reselectSignImageSteps,
+        {
+            content: "Click on move to next",
+            trigger: "div[data-label='Re-order'] button[data-action-value='next']",
+            run: "click",
+        },
+        {
+            content: "Check if sign is in first column",
+            trigger:
+                ":iframe .s_image_gallery .o_masonry_col:nth-child(1):has(img[data-index='0'][src*='library_image_14'])",
+        },
+        ...reselectSignImageSteps,
+        {
+            content: "Click on move to last",
+            trigger: "div[data-label='Re-order'] button[data-action-value='last']",
+            run: "click",
+        },
+        {
+            content: "Check layout",
+            trigger:
+                ":iframe .s_image_gallery .o_masonry_col:nth-child(3):has(img[data-index='5'][src*='library_image_14'])",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_popup_add_remove.js b/addons/website/static/tests/tours/snippet_popup_add_remove.js
index 136133db6ccab..87d1ee7f16a26 100644
--- a/addons/website/static/tests/tours/snippet_popup_add_remove.js
+++ b/addons/website/static/tests/tours/snippet_popup_add_remove.js
@@ -3,68 +3,88 @@ import {
     clickOnSave,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('snippet_popup_add_remove', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        name: "Popup",
-        id: "s_popup",
-        groupName: "Content",
-}), {
-    content: 'Edit s_popup snippet',
-    trigger: ':iframe #wrap.o_editable [data-snippet="s_popup"] .row > div', // Click deep in the snippet structure
-    run: "click",
-}, {
-    content: 'Check s_popup setting are loaded, wait panel is visible',
-    trigger: ".o_customize_tab",
-},
-...clickOnSave(),
-...clickOnEditAndWaitEditMode(),
-{
-    content: 'Toggle the visibility of the Popup',
-    trigger: '.o_we_invisible_el_panel .o_we_invisible_entry:contains("Popup")',
-    run: "click",
-}, {
-    content: 'Edit s_popup snippet(2)',
-    trigger: ':iframe #wrap.o_editable [data-snippet="s_popup"] h2',
-    run: function() {
-        // Simulating pressing enter.
-        const anchor = this.anchor;
-        // Trick the editor into keyboardType === 'PHYSICAL' and press enter
-        anchor.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
-        // Trigger editor's '_onInput' handler, which leads to historyRollback.
-        anchor.dispatchEvent(new InputEvent('input', { inputType: 'insertLineBreak', bubbles: true }));
-    }
-}, {
-    content: 'Check the s_popup was visible',
-    trigger: ':iframe #wrapwrap:has([data-snippet="s_popup"]:not(.d-none))',
-}, {
-    content: `Remove the s_popup snippet`,
-    trigger: ".o_customize_tab [data-container-title='Popup'] button.oe_snippet_remove",
-    run: "click",
-}, {
-    content: 'Check the s_popup was removed',
-    trigger: ":iframe #wrap.o_editable:not(:has([data-snippet='s_popup']))",
-},
-// Test that undoing dropping the snippet removes the invisible elements panel.
-...insertSnippet({
-    name: "Popup",
-    id: "s_popup",
-    groupName: "Content",
-}), {
-    content: "The popup should be in the invisible elements panel.",
-    trigger: '.o_we_invisible_el_panel .o_we_invisible_entry',
-}, {
-    content: "Click on the 'undo' button.",
-    trigger: ".o-snippets-top-actions button.fa-undo",
-    run: "click",
-}, {
-    content: "Check that the s_popup was removed.",
-    trigger: ':iframe #wrap.o_editable:not(:has([data-snippet="s_popup"]))',
-}, {
-    content: "The invisible elements panel should also be removed.",
-    trigger: ".o-snippets-menu:not(:has(.o_we_invisible_el_panel)",
-}]);
+registerWebsitePreviewTour(
+    "snippet_popup_add_remove",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            name: "Popup",
+            id: "s_popup",
+            groupName: "Content",
+        }),
+        {
+            content: "Edit s_popup snippet",
+            trigger: ':iframe #wrap.o_editable [data-snippet="s_popup"] .row > div', // Click deep in the snippet structure
+            run: "click",
+        },
+        {
+            content: "Check s_popup setting are loaded, wait panel is visible",
+            trigger: ".o_customize_tab",
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Toggle the visibility of the Popup",
+            trigger: '.o_we_invisible_el_panel .o_we_invisible_entry:contains("Popup")',
+            run: "click",
+        },
+        {
+            content: "Edit s_popup snippet(2)",
+            trigger: ':iframe #wrap.o_editable [data-snippet="s_popup"] h2',
+            run: function () {
+                // Simulating pressing enter.
+                const anchor = this.anchor;
+                // Trick the editor into keyboardType === 'PHYSICAL' and press
+                // enter.
+                anchor.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
+                // Trigger editor's '_onInput' handler, which leads to
+                // historyRollback.
+                anchor.dispatchEvent(
+                    new InputEvent("input", { inputType: "insertLineBreak", bubbles: true })
+                );
+            },
+        },
+        {
+            content: "Check the s_popup was visible",
+            trigger: ':iframe #wrapwrap:has([data-snippet="s_popup"]:not(.d-none))',
+        },
+        {
+            content: `Remove the s_popup snippet`,
+            trigger: ".o_customize_tab [data-container-title='Popup'] button.oe_snippet_remove",
+            run: "click",
+        },
+        {
+            content: "Check the s_popup was removed",
+            trigger: ":iframe #wrap.o_editable:not(:has([data-snippet='s_popup']))",
+        },
+        // Test that undoing dropping the snippet removes the invisible elements
+        // panel.
+        ...insertSnippet({
+            name: "Popup",
+            id: "s_popup",
+            groupName: "Content",
+        }),
+        {
+            content: "The popup should be in the invisible elements panel.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
+        },
+        {
+            content: "Click on the 'undo' button.",
+            trigger: ".o-snippets-top-actions button.fa-undo",
+            run: "click",
+        },
+        {
+            content: "Check that the s_popup was removed.",
+            trigger: ':iframe #wrap.o_editable:not(:has([data-snippet="s_popup"]))',
+        },
+        {
+            content: "The invisible elements panel should also be removed.",
+            trigger: ".o-snippets-menu:not(:has(.o_we_invisible_el_panel)",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_popup_and_animations.js b/addons/website/static/tests/tours/snippet_popup_and_animations.js
index 8f97f5a18792c..26e75b169498b 100644
--- a/addons/website/static/tests/tours/snippet_popup_and_animations.js
+++ b/addons/website/static/tests/tours/snippet_popup_and_animations.js
@@ -41,179 +41,218 @@ function scrollToSnippet(snippetId) {
             content: `Scroll to the ${snippetId} snippet`,
             run() {
                 this.anchor.scrollIntoView();
-            }
-        }
+            },
+        },
     ];
-};
+}
 
-registerWebsitePreviewTour("snippet_popup_and_animations", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet(snippets[1]), // Media List
-    ...insertSnippet(snippets[1]), // Media List
-    ...insertSnippet(snippets[2]), // Columns
-    clickOnElement("3rd columns", ":iframe .s_three_columns .row > :last-child"),
-    ...setOnScrollAnim(),
-    {
-        content: "Open the Cookies Bar.",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "snippet_popup_and_animations",
     {
-        trigger: ":iframe #website_cookies_bar:not(.d-none):not(:visible)",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Scroll to top",
-        trigger: ":iframe html",
-        run() {
-            const animatedColumnEl = this.anchor.querySelector(".s_three_columns .row > :last-child");
-            // When the animated element is fully visible, its animation delay
-            // should be rounded to -1 in the following condition.
-            if (Math.round(parseFloat(animatedColumnEl.style.animationDelay)) !== -1) {
-                throw new Error("The scroll animation in the page did not start properly with the cookies bar open.");
-            }
-            this.anchor.scrollTo({
-                top: 0,
-                left: 0,
-                behavior: 'smooth'
-            });
+    () => [
+        ...insertSnippet(snippets[1]), // Media List
+        ...insertSnippet(snippets[1]), // Media List
+        ...insertSnippet(snippets[2]), // Columns
+        clickOnElement("3rd columns", ":iframe .s_three_columns .row > :last-child"),
+        ...setOnScrollAnim(),
+        {
+            content: "Open the Cookies Bar.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
+            run: "click",
         },
-    },
-    {
-        trigger: ":iframe header#top:not(.o_header_affixed)",
-    },
-    {
-        content: "Wait for the page to be scrolled to the top.",
-        trigger: ":iframe .s_three_columns .row > .o_animating:last-child",
-        isActive: [`:iframe .s_three_columns .row > .o_animating:last-child`],
-        async run({ waitUntil, anchor }) {
-            await waitUntil(
-                () => !anchor.classList.contains(`o_animating`),
-                { timeout: 10000 }
-            );
-        }
-    },
-    {
-        content: "Close the Cookies Bar.",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
-        run: "click",
-    },
-    ...insertSnippet(snippets[0]), // Popup
-    ...insertSnippet(snippets[1]), // Media List
-    {
-        content: "Drag the Columns snippet group and drop it at the bottom of the popup.",
-        trigger: ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Columns'].o_draggable .o_snippet_thumbnail",
-        run: "drag_and_drop :iframe #wrap .s_popup .modal-content.oe_structure .oe_drop_zone:last",
-    },
-    {
-        content: "Click on the s_three_columns snippet.",
-        trigger: ":iframe .o_add_snippets_preview [data-snippet-id='s_three_columns']",
-        run: "click",
-    },
-    {
-        trigger: ":iframe:not(:has(.o_loading_screen))",
-    },
-    clickOnElement("3rd columns", ":iframe .s_popup .s_three_columns .row > :last-child"),
-    ...setOnScrollAnim(),
-    {
-        content: "Verify the animation delay of the animated element in the popup at the beginning",
-        trigger: ":iframe .s_popup .modal",
-        run() {
-            const animatedColumnEl = this.anchor.querySelector(".s_three_columns .row > :last-child");
-            // When the animated element is fully visible, its animation delay
-            // should be rounded to -1 in the following condition.
-            if (Math.round(parseFloat(animatedColumnEl.style.animationDelay)) !== -1) {
-                throw new Error("The scroll animation in the modal did not start properly.");
-            }
-            this.anchor.closest(".modal").scrollTo({
-                top: 0,
-                left: 0,
-                behavior: 'smooth'
-            });
+        {
+            trigger: ":iframe #website_cookies_bar:not(.d-none):not(:visible)",
         },
-    },
-    {
-        content: "Wait until the column is no longer animated/visible.",
-        trigger: ":iframe .s_three_columns .row > .o_animating:last-child",
-        isActive: [`:iframe .s_three_columns .row > .o_animating:last-child`],
-        async run({ anchor, waitUntil }) {
-            await waitUntil(
-                () => !anchor.classList.contains(`o_animating`),
-                { timeout: 10000 }
-            );
-        }
-    },
-    {
-        content: "Close the Popup",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Popup') i.fa-eye",
-        run: "click",
-    },
-    {
-        content: "Check that the popup has been closed",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Popup') i.fa-eye-slash",
-    },
-    ...scrollToSnippet("s_three_columns"),
-    clickOnElement("Last image of the 'Columns' snippet", ":iframe .s_three_columns .o_animate_on_scroll img"),
-    ...changeOptionInPopover("Image", "Animation", "On Hover"),
-    {
-        content: "Check that the hover effect animation has been applied on the image",
-        trigger: ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='overlay']",
-    },
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-    ...scrollToSnippet("s_three_columns"),
-    clickOnElement("Image of the 'Columns' snippet with the overlay effect", ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='overlay']"),
-    ...changeOptionInPopover("Image", "Effect", "Outline"),
-    {
-        trigger: ".o_customize_tab .options-container[data-container-title='Image'] [data-label='Effect'] button:contains('Outline')",
-    },
-    {
-        content: "Check that the outline effect has been applied on the image",
-        trigger: ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']",
-    },
-    ...clickOnSave(),
-    {
-        content: "Check that the image src is not the raw data",
-        trigger: ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']",
-        run() {
-            const imgEl = document.querySelector("iframe").contentDocument.querySelector(".s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']");
-            const src = imgEl.getAttribute("src");
-            if (src.startsWith("data:image")) {
-                throw new Error("The image source should not be raw data after the editor save");
-            }
+        {
+            content: "Scroll to top",
+            trigger: ":iframe html",
+            run() {
+                const animatedColumnEl = this.anchor.querySelector(
+                    ".s_three_columns .row > :last-child"
+                );
+                // When the animated element is fully visible, its animation
+                // delay should be rounded to -1 in the following condition.
+                if (Math.round(parseFloat(animatedColumnEl.style.animationDelay)) !== -1) {
+                    throw new Error(
+                        "The scroll animation in the page did not start properly with the cookies bar open."
+                    );
+                }
+                this.anchor.scrollTo({
+                    top: 0,
+                    left: 0,
+                    behavior: "smooth",
+                });
+            },
         },
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...scrollToSnippet("s_three_columns"),
-    clickOnElement("Image of the 'Columns' snippet with the outline effect", ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']"),
-    ...changeOptionInPopover("Image", "Filter", "Blur"),
-    {
-        trigger: ".o_customize_tab .options-container[data-container-title='Image'] [data-label='Filter'] button:contains('Blur')",
-    },
-    {
-        content: "Check that the Blur filter has been applied on the image",
-        trigger: ":iframe .s_three_columns .o_animate_on_scroll img[data-gl-filter='blur']",
-    },
-    {
-        content: "Click on the 'undo' button",
-        trigger: ".o-snippets-top-actions button.fa-undo",
-        run: "click",
-    },
-    {
-        content: "Check that the Blur filter has been removed from the image",
-        trigger: ":iframe .s_three_columns .o_animate_on_scroll img:not([data-gl-filter='blur'])",
-    },
-    ...clickOnSave(),
-    {
-        content: "Check that the image src is not the raw data",
-        trigger: ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']",
-        run() {
-            const imgEl = document.querySelector("iframe").contentDocument.querySelector(".s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']");
-            const src = imgEl.getAttribute("src");
-            if (src.startsWith("data:image")) {
-                throw new Error("The image source should not be raw data after the editor save");
-            }
+        {
+            trigger: ":iframe header#top:not(.o_header_affixed)",
         },
-    },
-]);
+        {
+            content: "Wait for the page to be scrolled to the top.",
+            trigger: ":iframe .s_three_columns .row > .o_animating:last-child",
+            isActive: [`:iframe .s_three_columns .row > .o_animating:last-child`],
+            async run({ waitUntil, anchor }) {
+                await waitUntil(() => !anchor.classList.contains(`o_animating`), {
+                    timeout: 10000,
+                });
+            },
+        },
+        {
+            content: "Close the Cookies Bar.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
+            run: "click",
+        },
+        ...insertSnippet(snippets[0]), // Popup
+        ...insertSnippet(snippets[1]), // Media List
+        {
+            content: "Drag the Columns snippet group and drop it at the bottom of the popup.",
+            trigger:
+                ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Columns'].o_draggable .o_snippet_thumbnail",
+            run: "drag_and_drop :iframe #wrap .s_popup .modal-content.oe_structure .oe_drop_zone:last",
+        },
+        {
+            content: "Click on the s_three_columns snippet.",
+            trigger: ":iframe .o_add_snippets_preview [data-snippet-id='s_three_columns']",
+            run: "click",
+        },
+        {
+            trigger: ":iframe:not(:has(.o_loading_screen))",
+        },
+        clickOnElement("3rd columns", ":iframe .s_popup .s_three_columns .row > :last-child"),
+        ...setOnScrollAnim(),
+        {
+            content:
+                "Verify the animation delay of the animated element in the popup at the beginning",
+            trigger: ":iframe .s_popup .modal",
+            run() {
+                const animatedColumnEl = this.anchor.querySelector(
+                    ".s_three_columns .row > :last-child"
+                );
+                // When the animated element is fully visible, its animation
+                // delay should be rounded to -1 in the following condition.
+                if (Math.round(parseFloat(animatedColumnEl.style.animationDelay)) !== -1) {
+                    throw new Error("The scroll animation in the modal did not start properly.");
+                }
+                this.anchor.closest(".modal").scrollTo({
+                    top: 0,
+                    left: 0,
+                    behavior: "smooth",
+                });
+            },
+        },
+        {
+            content: "Wait until the column is no longer animated/visible.",
+            trigger: ":iframe .s_three_columns .row > .o_animating:last-child",
+            isActive: [`:iframe .s_three_columns .row > .o_animating:last-child`],
+            async run({ anchor, waitUntil }) {
+                await waitUntil(() => !anchor.classList.contains(`o_animating`), {
+                    timeout: 10000,
+                });
+            },
+        },
+        {
+            content: "Close the Popup",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Popup') i.fa-eye",
+            run: "click",
+        },
+        {
+            content: "Check that the popup has been closed",
+            trigger:
+                ".o_we_invisible_el_panel .o_we_invisible_entry:contains('Popup') i.fa-eye-slash",
+        },
+        ...scrollToSnippet("s_three_columns"),
+        clickOnElement(
+            "Last image of the 'Columns' snippet",
+            ":iframe .s_three_columns .o_animate_on_scroll img"
+        ),
+        ...changeOptionInPopover("Image", "Animation", "On Hover"),
+        {
+            content: "Check that the hover effect animation has been applied on the image",
+            trigger:
+                ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='overlay']",
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        ...scrollToSnippet("s_three_columns"),
+        clickOnElement(
+            "Image of the 'Columns' snippet with the overlay effect",
+            ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='overlay']"
+        ),
+        ...changeOptionInPopover("Image", "Effect", "Outline"),
+        {
+            trigger:
+                ".o_customize_tab .options-container[data-container-title='Image'] [data-label='Effect'] button:contains('Outline')",
+        },
+        {
+            content: "Check that the outline effect has been applied on the image",
+            trigger:
+                ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the image src is not the raw data",
+            trigger:
+                ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']",
+            run() {
+                const imgEl = document
+                    .querySelector("iframe")
+                    .contentDocument.querySelector(
+                        ".s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']"
+                    );
+                const src = imgEl.getAttribute("src");
+                if (src.startsWith("data:image")) {
+                    throw new Error(
+                        "The image source should not be raw data after the editor save"
+                    );
+                }
+            },
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...scrollToSnippet("s_three_columns"),
+        clickOnElement(
+            "Image of the 'Columns' snippet with the outline effect",
+            ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']"
+        ),
+        ...changeOptionInPopover("Image", "Filter", "Blur"),
+        {
+            trigger:
+                ".o_customize_tab .options-container[data-container-title='Image'] [data-label='Filter'] button:contains('Blur')",
+        },
+        {
+            content: "Check that the Blur filter has been applied on the image",
+            trigger: ":iframe .s_three_columns .o_animate_on_scroll img[data-gl-filter='blur']",
+        },
+        {
+            content: "Click on the 'undo' button",
+            trigger: ".o-snippets-top-actions button.fa-undo",
+            run: "click",
+        },
+        {
+            content: "Check that the Blur filter has been removed from the image",
+            trigger:
+                ":iframe .s_three_columns .o_animate_on_scroll img:not([data-gl-filter='blur'])",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the image src is not the raw data",
+            trigger:
+                ":iframe .s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']",
+            run() {
+                const imgEl = document
+                    .querySelector("iframe")
+                    .contentDocument.querySelector(
+                        ".s_three_columns .o_animate_on_scroll img[data-hover-effect='outline']"
+                    );
+                const src = imgEl.getAttribute("src");
+                if (src.startsWith("data:image")) {
+                    throw new Error(
+                        "The image source should not be raw data after the editor save"
+                    );
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js b/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js
index 4e039d86eaf0e..0191d30e0ea19 100644
--- a/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js
+++ b/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js
@@ -20,13 +20,21 @@ const snippets = [
 
 const checkScrollbar = function (hasScrollbar) {
     return {
-        content: `Check that the page ${hasScrollbar ? "has" : "does not have"} a vertical scrollbar.`,
+        content: `Check that the page ${
+            hasScrollbar ? "has" : "does not have"
+        } a vertical scrollbar.`,
         trigger: `:iframe ${hasScrollbar ? "body:not(.modal-open)" : "body.modal-open"}`,
         run: function () {
             const style = window.getComputedStyle(this.anchor);
-            if (!hasScrollbar && (style.overflow !== "hidden" || parseFloat(style.paddingRight) < 1)) {
+            if (
+                !hasScrollbar &&
+                (style.overflow !== "hidden" || parseFloat(style.paddingRight) < 1)
+            ) {
                 console.error("error The vertical scrollbar should be hidden");
-            } else if (hasScrollbar && (style.overflow === "hidden" || parseFloat(style.paddingRight) > 0)) {
+            } else if (
+                hasScrollbar &&
+                (style.overflow === "hidden" || parseFloat(style.paddingRight) > 0)
+            ) {
                 console.error("error The vertical scrollbar should be displayed");
             }
         },
@@ -35,7 +43,7 @@ const checkScrollbar = function (hasScrollbar) {
 
 function toggleBackdrop(snippet) {
     return changeOption(`${snippet}`, "[data-action-id='setBackdrop'] .form-check-input");
-};
+}
 
 const scrollIntoView = (selector) => ({
     content: `Scroll into view to make sure snippet controls are visible`,
@@ -45,138 +53,146 @@ const scrollIntoView = (selector) => ({
     },
 });
 
-registerWebsitePreviewTour("snippet_popup_and_scrollbar", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet(snippets[1]), // Media List
-    ...insertSnippet(snippets[0]), // Popup
-    checkScrollbar(false),
-    {
-        content: 'Click on the s_popup snippet',
-        trigger: ':iframe .s_popup .modal',
-        run: "click",
-    },
-    toggleBackdrop("Popup"), // hide Popup backdrop
-    checkScrollbar(true),
-    goBackToBlocks(),
-    {
-        content: "Drag the Content snippet group and drop it at the bottom of the popup.",
-        trigger: ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Content'].o_draggable .o_snippet_thumbnail",
-        run: "drag_and_drop :iframe #wrap .s_popup .oe_drop_zone:last",
-    },
-    {
-        content: "Click on the s_media_list snippet.",
-        trigger: ":iframe .o_add_snippets_preview [data-snippet='s_media_list']",
-        run: "click",
-    },
-    checkScrollbar(false),
-    {
-        trigger: ":iframe:not(:has(.o_loading_screen))",
-    },
-    {
-        content: "Select the Media List snippet in the Popup.",
-        trigger: ":iframe .s_popup .s_media_list",
-        run: "click",
-    },
-    {
-        content: "Remove the s_media_list snippet",
-        trigger: ".overlay .o_overlay_options .oe_snippet_remove",
-        run: "click",
-    },
-    checkScrollbar(true),
-    toggleBackdrop("Popup"), // show Popup backdrop
-    {
-        content: "Close the Popup that has now backdrop.",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:first",
-        run: "click",
-    },
-    checkScrollbar(true),
-    {
-        content: "Open the Cookies Bar.",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:last",
-        run: "click",
-    },
-    checkScrollbar(true),
-    toggleBackdrop("Cookies Bar"), // show Cookies Bar backdrop
-    toggleBackdrop("Cookies Bar"), // hide Cookies Bar backdrop
-    checkScrollbar(true),
-    {
-        content: "Open the Popup that has backdrop.",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:first",
-        run: "click",
-    },
-    goBackToBlocks(),
-    {
-        content: "Drag the Content snippet group and drop it at the bottom of the popup.",
-        trigger: ".o-snippets-menu .o_snippet[name='Content'] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)",
-        run: "drag_and_drop :iframe #wrap .s_popup .modal-content.oe_structure .oe_drop_zone:last",
-    },
-    {
-        content: "Click on the s_media_list snippet.",
-        trigger: ":iframe .o_add_snippets_preview [data-snippet='s_media_list']",
-        run: "click",
-    },
-    {
-        content: 'Click on the s_popup snippet',
-        trigger: ':iframe .s_popup .modal',
-        run() {
-            this.anchor.scrollIntoView();
-            this.anchor.click();
+registerWebsitePreviewTour(
+    "snippet_popup_and_scrollbar",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet(snippets[1]), // Media List
+        ...insertSnippet(snippets[0]), // Popup
+        checkScrollbar(false),
+        {
+            content: "Click on the s_popup snippet",
+            trigger: ":iframe .s_popup .modal",
+            run: "click",
         },
-    },
-    {
-        content: "Remove the s_popup snippet",
-        trigger: ".overlay .o_overlay_options .oe_snippet_remove",
-        run: "click",
-    },
-    checkScrollbar(true),
-    {
-        content: "Open the Cookie Bar.",
-        trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
-        run: "click",
-    },
-    goBackToBlocks(),
-    {
-        content: "Drag the Content snippet group and drop it in the Cookies Bar.",
-        trigger: ".o-snippets-menu .o_snippet[name='Content'] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)",
-        run: "drag_and_drop :iframe #website_cookies_bar .modal-content.oe_structure",
-    },
-    {
-        content: "Click on the s_media_list snippet.",
-        trigger: ":iframe .o_add_snippets_preview [data-snippet='s_media_list']",
-        run: "click",
-    },
-    {
-        trigger: ":iframe:not(:has(.o_loading_screen))",
-    },
-    {
-        content: "Select the Media List snippet in the Cookies Bar.",
-        trigger: ":iframe #website_cookies_bar .modal-content .s_media_list",
-        run: "click",
-    },
-    {
-        content: "Duplicate the Media List snippet",
-        trigger: ".o_customize_tab .options-container[data-container-title='Media List'] .oe_snippet_clone",
-        run: "click",
-    },
-    checkScrollbar(false),
-    {
-        content: "Select the Media List snippet in the Cookies Bar.",
-        trigger: ":iframe #website_cookies_bar .modal-content .s_media_list",
-        run: "click",
-    },
-    scrollIntoView("#website_cookies_bar .s_media_list_item:last-child"),
-    {
-        content: "Remove the first Media List snippet in the Cookies Bar.",
-        trigger: ".overlay .o_overlay_options .oe_snippet_remove",
-        run: "click",
-    },
-    scrollIntoView("#website_cookies_bar .s_media_list_item:last-child"),
-    {
-        content: "Remove the second Media List snippet in the Cookies Bar.",
-        trigger: ".overlay .o_overlay_options .oe_snippet_remove",
-        run: "click",
-    },
-    checkScrollbar(true),
-]);
+        toggleBackdrop("Popup"), // hide Popup backdrop
+        checkScrollbar(true),
+        goBackToBlocks(),
+        {
+            content: "Drag the Content snippet group and drop it at the bottom of the popup.",
+            trigger:
+                ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Content'].o_draggable .o_snippet_thumbnail",
+            run: "drag_and_drop :iframe #wrap .s_popup .oe_drop_zone:last",
+        },
+        {
+            content: "Click on the s_media_list snippet.",
+            trigger: ":iframe .o_add_snippets_preview [data-snippet='s_media_list']",
+            run: "click",
+        },
+        checkScrollbar(false),
+        {
+            trigger: ":iframe:not(:has(.o_loading_screen))",
+        },
+        {
+            content: "Select the Media List snippet in the Popup.",
+            trigger: ":iframe .s_popup .s_media_list",
+            run: "click",
+        },
+        {
+            content: "Remove the s_media_list snippet",
+            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            run: "click",
+        },
+        checkScrollbar(true),
+        toggleBackdrop("Popup"), // show Popup backdrop
+        {
+            content: "Close the Popup that has now backdrop.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:first",
+            run: "click",
+        },
+        checkScrollbar(true),
+        {
+            content: "Open the Cookies Bar.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:last",
+            run: "click",
+        },
+        checkScrollbar(true),
+        toggleBackdrop("Cookies Bar"), // show Cookies Bar backdrop
+        toggleBackdrop("Cookies Bar"), // hide Cookies Bar backdrop
+        checkScrollbar(true),
+        {
+            content: "Open the Popup that has backdrop.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry:first",
+            run: "click",
+        },
+        goBackToBlocks(),
+        {
+            content: "Drag the Content snippet group and drop it at the bottom of the popup.",
+            trigger:
+                ".o-snippets-menu .o_snippet[name='Content'] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)",
+            run: "drag_and_drop :iframe #wrap .s_popup .modal-content.oe_structure .oe_drop_zone:last",
+        },
+        {
+            content: "Click on the s_media_list snippet.",
+            trigger: ":iframe .o_add_snippets_preview [data-snippet='s_media_list']",
+            run: "click",
+        },
+        {
+            content: "Click on the s_popup snippet",
+            trigger: ":iframe .s_popup .modal",
+            run() {
+                this.anchor.scrollIntoView();
+                this.anchor.click();
+            },
+        },
+        {
+            content: "Remove the s_popup snippet",
+            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            run: "click",
+        },
+        checkScrollbar(true),
+        {
+            content: "Open the Cookie Bar.",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
+            run: "click",
+        },
+        goBackToBlocks(),
+        {
+            content: "Drag the Content snippet group and drop it in the Cookies Bar.",
+            trigger:
+                ".o-snippets-menu .o_snippet[name='Content'] .o_snippet_thumbnail:not(.o_we_ongoing_insertion)",
+            run: "drag_and_drop :iframe #website_cookies_bar .modal-content.oe_structure",
+        },
+        {
+            content: "Click on the s_media_list snippet.",
+            trigger: ":iframe .o_add_snippets_preview [data-snippet='s_media_list']",
+            run: "click",
+        },
+        {
+            trigger: ":iframe:not(:has(.o_loading_screen))",
+        },
+        {
+            content: "Select the Media List snippet in the Cookies Bar.",
+            trigger: ":iframe #website_cookies_bar .modal-content .s_media_list",
+            run: "click",
+        },
+        {
+            content: "Duplicate the Media List snippet",
+            trigger:
+                ".o_customize_tab .options-container[data-container-title='Media List'] .oe_snippet_clone",
+            run: "click",
+        },
+        checkScrollbar(false),
+        {
+            content: "Select the Media List snippet in the Cookies Bar.",
+            trigger: ":iframe #website_cookies_bar .modal-content .s_media_list",
+            run: "click",
+        },
+        scrollIntoView("#website_cookies_bar .s_media_list_item:last-child"),
+        {
+            content: "Remove the first Media List snippet in the Cookies Bar.",
+            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            run: "click",
+        },
+        scrollIntoView("#website_cookies_bar .s_media_list_item:last-child"),
+        {
+            content: "Remove the second Media List snippet in the Cookies Bar.",
+            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            run: "click",
+        },
+        checkScrollbar(true),
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_popup_display_on_click.js b/addons/website/static/tests/tours/snippet_popup_display_on_click.js
index 058012acb0ec2..88bf05792e60b 100644
--- a/addons/website/static/tests/tours/snippet_popup_display_on_click.js
+++ b/addons/website/static/tests/tours/snippet_popup_display_on_click.js
@@ -5,106 +5,114 @@ import {
     insertSnippet,
     registerWebsitePreviewTour,
     openLinkPopup,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { browser } from "@web/core/browser/browser";
 
-registerWebsitePreviewTour("snippet_popup_display_on_click", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({id: "s_text_image", name: "Image - Text", groupName: "Content"}),
-    ...insertSnippet({id: "s_popup", name: "Popup", groupName: "Content"}),
+registerWebsitePreviewTour(
+    "snippet_popup_display_on_click",
     {
-        content: "Click inside the popup to access its options menu.",
-        trigger: ":iframe .s_popup .s_banner",
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Click on Display option",
-        trigger: ".o_customize_tab [data-container-title='Popup'] [data-label='Display'] .dropdown-toggle",
-        run: "click",
-    },
-    {
-        content: "Click on the display 'On Click' option",
-        trigger: ".o_popover [data-action-id='copyAnchor']",
-        async run(helpers) {
-            // Patch and ignore write on clipboard in tour as we don't have permissions
-            const oldWriteText = browser.navigator.clipboard.writeText;
-            browser.navigator.clipboard.writeText = () => { console.info('Copy in clipboard ignored!') };
-            await helpers.click();
-            browser.navigator.clipboard.writeText = oldWriteText;
-        }
-    },
-    {
-        content: "Check the copied anchor from the notification toast",
-        trigger: ".o_notification_manager .o_notification_content",
-        run() {
-            const notificationContent = this.anchor.innerText;
-            const anchor = notificationContent.substring(notificationContent.indexOf("#"));
+    () => [
+        ...insertSnippet({ id: "s_text_image", name: "Image - Text", groupName: "Content" }),
+        ...insertSnippet({ id: "s_popup", name: "Popup", groupName: "Content" }),
+        {
+            content: "Click inside the popup to access its options menu.",
+            trigger: ":iframe .s_popup .s_banner",
+            run: "click",
+        },
+        {
+            content: "Click on Display option",
+            trigger:
+                ".o_customize_tab [data-container-title='Popup'] [data-label='Display'] .dropdown-toggle",
+            run: "click",
+        },
+        {
+            content: "Click on the display 'On Click' option",
+            trigger: ".o_popover [data-action-id='copyAnchor']",
+            async run(helpers) {
+                // Patch and ignore write on clipboard in tour as we don't have
+                // permissions.
+                const oldWriteText = browser.navigator.clipboard.writeText;
+                browser.navigator.clipboard.writeText = () => {
+                    console.info("Copy in clipboard ignored!");
+                };
+                await helpers.click();
+                browser.navigator.clipboard.writeText = oldWriteText;
+            },
+        },
+        {
+            content: "Check the copied anchor from the notification toast",
+            trigger: ".o_notification_manager .o_notification_content",
+            run() {
+                const notificationContent = this.anchor.innerText;
+                const anchor = notificationContent.substring(notificationContent.indexOf("#"));
 
-            if (anchor !== "#Win-%2420") {
-                console.error("The popup anchor is not '#Win-%2420' as expected.");
-            }
+                if (anchor !== "#Win-%2420") {
+                    console.error("The popup anchor is not '#Win-%2420' as expected.");
+                }
+            },
         },
-    },
-    clickOnElement("button to close the popup", ":iframe .s_popup_close"),
-    ...openLinkPopup(":iframe .s_text_image a.btn-secondary", "Button", 1),
-    clickOnElement("text image snippet button", ".o-we-linkpopover .o_we_edit_link"),
-    {
-        content: "Add a link to the popup in the URL input",
-        trigger: ".o-we-linkpopover .o_we_href_input_link",
-        run: "edit #Win-%2420"
-    },
-    ...clickOnSave(),
-    {
-        content: "Wait content of iframe is loaded",
-        trigger: ":iframe main:contains(enhance your)",
-    },
-    clickOnElement("text image snippet button", ":iframe .s_text_image .btn-secondary"),
-    {
-        content: "Verify that the popup opens after clicked the button.",
-        trigger: ":iframe .s_popup .modal[id='Win-%2420'].show",
-        run: "click",
-    },
-    clickOnElement("button to close the popup", ":iframe .s_popup_close"),
-    {
-        content: "Go to the 'contactus' page.",
-        trigger: ":iframe a[href='/contactus']",
-        run: "click",
-    },
-    {
-        content: "wait for the page to be loaded",
-        trigger: ":iframe [data-view-xmlid='website.contactus']",
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...insertSnippet({id: "s_text_image", name: "Image - Text", groupName: "Content"}),
-    {
-        content: "Click on the text image snippet to edit it.",
-        trigger: ":iframe .s_text_image",
-        run: "click",
-    },
-    ...openLinkPopup(":iframe .s_text_image a.btn-secondary", "Button", 1),
-    clickOnElement("text image snippet button", ".o-we-linkpopover .o_we_edit_link"),
-    {
-        content: "Add a link to the homepage in the URL input",
-        trigger: ".o-we-linkpopover .o_we_href_input_link",
-        run: "edit /#Win-%2420"
-    },
-    ...clickOnSave(),
-    {
-        content: "Wait content of iframe is loaded",
-        trigger: ":iframe main:contains(enhance your)",
-    },
-    {
-        content: "Wait form is patched",
-        trigger: ":iframe form#contactus_form input[name=company]:value(yourcompany)",
-    },
-    clickOnElement("text image snippet button", ":iframe .s_text_image .btn-secondary"),
-    {
-        trigger: ":iframe [data-view-xmlid='website.homepage']",
-    },
-    {
-        content: "Verify that the popup opens when the homepage page loads.",
-        trigger: ":iframe .s_popup .modal[id='Win-%2420'].show",
-    },
-]);
+        clickOnElement("button to close the popup", ":iframe .s_popup_close"),
+        ...openLinkPopup(":iframe .s_text_image a.btn-secondary", "Button", 1),
+        clickOnElement("text image snippet button", ".o-we-linkpopover .o_we_edit_link"),
+        {
+            content: "Add a link to the popup in the URL input",
+            trigger: ".o-we-linkpopover .o_we_href_input_link",
+            run: "edit #Win-%2420",
+        },
+        ...clickOnSave(),
+        {
+            content: "Wait content of iframe is loaded",
+            trigger: ":iframe main:contains(enhance your)",
+        },
+        clickOnElement("text image snippet button", ":iframe .s_text_image .btn-secondary"),
+        {
+            content: "Verify that the popup opens after clicked the button.",
+            trigger: ":iframe .s_popup .modal[id='Win-%2420'].show",
+            run: "click",
+        },
+        clickOnElement("button to close the popup", ":iframe .s_popup_close"),
+        {
+            content: "Go to the 'contactus' page.",
+            trigger: ":iframe a[href='/contactus']",
+            run: "click",
+        },
+        {
+            content: "wait for the page to be loaded",
+            trigger: ":iframe [data-view-xmlid='website.contactus']",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...insertSnippet({ id: "s_text_image", name: "Image - Text", groupName: "Content" }),
+        {
+            content: "Click on the text image snippet to edit it.",
+            trigger: ":iframe .s_text_image",
+            run: "click",
+        },
+        ...openLinkPopup(":iframe .s_text_image a.btn-secondary", "Button", 1),
+        clickOnElement("text image snippet button", ".o-we-linkpopover .o_we_edit_link"),
+        {
+            content: "Add a link to the homepage in the URL input",
+            trigger: ".o-we-linkpopover .o_we_href_input_link",
+            run: "edit /#Win-%2420",
+        },
+        ...clickOnSave(),
+        {
+            content: "Wait content of iframe is loaded",
+            trigger: ":iframe main:contains(enhance your)",
+        },
+        {
+            content: "Wait form is patched",
+            trigger: ":iframe form#contactus_form input[name=company]:value(yourcompany)",
+        },
+        clickOnElement("text image snippet button", ":iframe .s_text_image .btn-secondary"),
+        {
+            trigger: ":iframe [data-view-xmlid='website.homepage']",
+        },
+        {
+            content: "Verify that the popup opens when the homepage page loads.",
+            trigger: ":iframe .s_popup .modal[id='Win-%2420'].show",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_popup_open_on_top.js b/addons/website/static/tests/tours/snippet_popup_open_on_top.js
index 8b5c15ea3b661..0c8cf20155820 100644
--- a/addons/website/static/tests/tours/snippet_popup_open_on_top.js
+++ b/addons/website/static/tests/tours/snippet_popup_open_on_top.js
@@ -1,52 +1,63 @@
 /** @odoo-module **/
 
-import { clickOnSave, insertSnippet, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+import {
+    clickOnSave,
+    insertSnippet,
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("snippet_popup_open_on_top", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        name: "Popup",
-        id: "s_popup",
-        groupName: "Content",
-    }),
+registerWebsitePreviewTour(
+    "snippet_popup_open_on_top",
     {
-        content: "Change content for long text.",
-        trigger: ":iframe .s_popup p.lead",
-        run: 'editor ' + ' hello world'.repeat(300),
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Set delay to 0 second",
-        trigger: '[data-action-id="setPopupDelay"] input',
-        run: 'edit 0',
-    },
-    ...clickOnSave(),
-    {
-        content: 'Check that the modal is scrolled on top',
-        trigger: ":iframe .s_popup .modal.show:contains('hello world')",
-        run: async function () {
-            const modalEl = this.anchor;
-            let activeEl = modalEl.ownerDocument.activeElement;
-            if (activeEl.parentElement.closest('.modal') !== modalEl) {
-                // Wait after Popup.trapFocus by waiting for modal shown event
-                await new Promise((resolve) => modalEl.addEventListener("shown.bs.modal", resolve));
-            }
-            if (modalEl.scrollHeight <= modalEl.clientHeight) {
-                console.error('There is no scrollbar on the modal');
-            }
-            activeEl = modalEl.ownerDocument.activeElement;
-            if (activeEl.parentElement.closest('.modal') !== modalEl) {
-                // Note: it might not be the best idea to still focus a button
-                // that is not in the viewport, but since this is a niche case
-                // this is the behavior right now. The important parts are:
-                // in the normal case, focus the button; in all cases, the modal
-                // should not be scrolled when opened.
-                console.error('The focus should be on an element inside the modal');
-            }
-            if (modalEl.scrollTop !== 0) {
-                console.error('The modal scrollbar is not scrolled at the top');
-            }
+    () => [
+        ...insertSnippet({
+            name: "Popup",
+            id: "s_popup",
+            groupName: "Content",
+        }),
+        {
+            content: "Change content for long text.",
+            trigger: ":iframe .s_popup p.lead",
+            run: "editor " + " hello world".repeat(300),
         },
-    },
-]);
+        {
+            content: "Set delay to 0 second",
+            trigger: '[data-action-id="setPopupDelay"] input',
+            run: "edit 0",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the modal is scrolled on top",
+            trigger: ":iframe .s_popup .modal.show:contains('hello world')",
+            run: async function () {
+                const modalEl = this.anchor;
+                let activeEl = modalEl.ownerDocument.activeElement;
+                if (activeEl.parentElement.closest(".modal") !== modalEl) {
+                    // Wait after Popup.trapFocus by waiting for modal shown
+                    // event.
+                    await new Promise((resolve) =>
+                        modalEl.addEventListener("shown.bs.modal", resolve)
+                    );
+                }
+                if (modalEl.scrollHeight <= modalEl.clientHeight) {
+                    console.error("There is no scrollbar on the modal");
+                }
+                activeEl = modalEl.ownerDocument.activeElement;
+                if (activeEl.parentElement.closest(".modal") !== modalEl) {
+                    // Note: it might not be the best idea to still focus a
+                    // button that is not in the viewport, but since this is a
+                    // niche case this is the behavior right now. The important
+                    // parts are: in the normal case, focus the button; in all
+                    // cases, the modal should not be scrolled when opened.
+                    console.error("The focus should be on an element inside the modal");
+                }
+                if (modalEl.scrollTop !== 0) {
+                    console.error("The modal scrollbar is not scrolled at the top");
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_rating.js b/addons/website/static/tests/tours/snippet_rating.js
index 372f9d7f97fac..3e748817fd1e2 100644
--- a/addons/website/static/tests/tours/snippet_rating.js
+++ b/addons/website/static/tests/tours/snippet_rating.js
@@ -3,27 +3,39 @@ import {
     clickOnSnippet,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("snippet_rating", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({ id: "s_rating", name: "Rating" }),
-    ...clickOnSnippet({ id: "s_rating", name: "Rating" }),
-    ...changeOptionInPopover("Rating", "Title Position", "[data-class-action='s_rating_inline']"),
+registerWebsitePreviewTour(
+    "snippet_rating",
     {
-        content: "Check whether s_rating_inline class applied or not",
-        trigger: ":iframe .s_rating_inline",
+        url: "/",
+        edition: true,
     },
-    ...changeOptionInPopover("Rating", "Title Position", "[data-class-action='s_rating_no_title']"),
-    {
-        content: "Check whether s_rating_no_title class applied or not",
-        trigger: ":iframe .s_rating_no_title",
-    },
-    ...changeOptionInPopover("Rating", "Title Position", "Top"),
-    {
-        content: "Check whether s_rating_no_title class removed or not",
-        trigger: ":iframe .s_rating:not(.s_rating_no_title)",
-    },
-]);
+    () => [
+        ...insertSnippet({ id: "s_rating", name: "Rating" }),
+        ...clickOnSnippet({ id: "s_rating", name: "Rating" }),
+        ...changeOptionInPopover(
+            "Rating",
+            "Title Position",
+            "[data-class-action='s_rating_inline']"
+        ),
+        {
+            content: "Check whether s_rating_inline class applied or not",
+            trigger: ":iframe .s_rating_inline",
+        },
+        ...changeOptionInPopover(
+            "Rating",
+            "Title Position",
+            "[data-class-action='s_rating_no_title']"
+        ),
+        {
+            content: "Check whether s_rating_no_title class applied or not",
+            trigger: ":iframe .s_rating_no_title",
+        },
+        ...changeOptionInPopover("Rating", "Title Position", "Top"),
+        {
+            content: "Check whether s_rating_no_title class removed or not",
+            trigger: ":iframe .s_rating:not(.s_rating_no_title)",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_social_media.js b/addons/website/static/tests/tours/snippet_social_media.js
index 299121d0229aa..6d60620d0455c 100644
--- a/addons/website/static/tests/tours/snippet_social_media.js
+++ b/addons/website/static/tests/tours/snippet_social_media.js
@@ -4,217 +4,236 @@ import {
     clickOnSnippet,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 // TODO: Remove following steps once fix of task-3212519 is done.
 // Those steps are preventing a race condition to happen in the meantime: when
 // the tour was clicking on the toggle to hide facebook in the next step, it
 // would actually "ignore" the result of the click on the toggle and would just
 // consider the action of focusing out the input.
-const socialRaceConditionClass = 'social_media_race_condition';
+const socialRaceConditionClass = "social_media_race_condition";
 const preventRaceConditionStep = [
     {
         trigger: `body:not(.${socialRaceConditionClass})`,
     },
     {
-    content: "Wait a few ms to avoid race condition",
-    // Ensure the class is remove from previous call of those steps
-    trigger: ':iframe .s_social_media',
-    run() {
-        setTimeout(() => {
-            document.body.classList.add(socialRaceConditionClass);
-        }, 500);
-    }
-}, {
-    content: "Check the race condition class is added after a few ms",
-    trigger: `body.${socialRaceConditionClass}`,
-    run() {
-        document.body.classList.remove(socialRaceConditionClass);
-    }
-}];
-
-const replaceIconByImage = function (url) {
-    return [{
-        content: "Replace the icon by an image",
-        trigger: `:iframe .s_social_media a[href='${url}'] i.fa`,
-        run: "dblclick",
-    },
-    {
-        content: "Go to the Images tab in the media dialog",
-        trigger: ".o_select_media_dialog .o_notebook_headers .nav-item a:contains('Images')",
-        run: "click",
+        content: "Wait a few ms to avoid race condition",
+        // Ensure the class is remove from previous call of those steps
+        trigger: ":iframe .s_social_media",
+        run() {
+            setTimeout(() => {
+                document.body.classList.add(socialRaceConditionClass);
+            }, 500);
+        },
     },
     {
-        content: "Select the image",
-        trigger: ".o_select_media_dialog .o_button_area[aria-label='s_banner_default_image.jpg']",
-        run: "click",
+        content: "Check the race condition class is added after a few ms",
+        trigger: `body.${socialRaceConditionClass}`,
+        run() {
+            document.body.classList.remove(socialRaceConditionClass);
+        },
     },
-    ...preventRaceConditionStep,
+];
+
+const replaceIconByImage = function (url) {
+    return [
+        {
+            content: "Replace the icon by an image",
+            trigger: `:iframe .s_social_media a[href='${url}'] i.fa`,
+            run: "dblclick",
+        },
+        {
+            content: "Go to the Images tab in the media dialog",
+            trigger: ".o_select_media_dialog .o_notebook_headers .nav-item a:contains('Images')",
+            run: "click",
+        },
+        {
+            content: "Select the image",
+            trigger:
+                ".o_select_media_dialog .o_button_area[aria-label='s_banner_default_image.jpg']",
+            run: "click",
+        },
+        ...preventRaceConditionStep,
     ];
 };
 
 const addNewSocialNetwork = function (optionIndex, linkIndex, url, replaceIcon = false) {
-    const replaceIconByImageSteps = replaceIcon ? replaceIconByImage("https://www.example.com") : [];
-    return [{
-        content: "Click on Add New Social Network",
-        trigger: "div[data-container-title='Social Media'] button[data-action-id='addSocialMediaLink']",
-        run: "click",
-    },
-    {
-        content: "Ensure new option is found",
-        trigger: `.o_social_media_list tr:eq(${optionIndex}):has(div[data-action-id="editSocialMediaLink"])`,
-    },
-    {
-        content: "Ensure new link is found",
-        trigger: `:iframe .s_social_media:has(a:eq(${linkIndex})[href='https://www.example.com'])`,
-    },
-    ...replaceIconByImageSteps,
-    {
-        content: "Change added Option label",
-        trigger: `.o_social_media_list tr:eq(${optionIndex}) input`,
-        run: `edit ${url} && click body`,
-    },
-    {
-        content: "Ensure new link is changed",
-        trigger: `:iframe .s_social_media:has(a:eq(${linkIndex})[href='${url}'])`,
-    },
-    ...preventRaceConditionStep,
+    const replaceIconByImageSteps = replaceIcon
+        ? replaceIconByImage("https://www.example.com")
+        : [];
+    return [
+        {
+            content: "Click on Add New Social Network",
+            trigger:
+                "div[data-container-title='Social Media'] button[data-action-id='addSocialMediaLink']",
+            run: "click",
+        },
+        {
+            content: "Ensure new option is found",
+            trigger: `.o_social_media_list tr:eq(${optionIndex}):has(div[data-action-id="editSocialMediaLink"])`,
+        },
+        {
+            content: "Ensure new link is found",
+            trigger: `:iframe .s_social_media:has(a:eq(${linkIndex})[href='https://www.example.com'])`,
+        },
+        ...replaceIconByImageSteps,
+        {
+            content: "Change added Option label",
+            trigger: `.o_social_media_list tr:eq(${optionIndex}) input`,
+            run: `edit ${url} && click body`,
+        },
+        {
+            content: "Ensure new link is changed",
+            trigger: `:iframe .s_social_media:has(a:eq(${linkIndex})[href='${url}'])`,
+        },
+        ...preventRaceConditionStep,
     ];
 };
 
-registerWebsitePreviewTour('snippet_social_media', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({id: 's_social_media', name: 'Social Media'}),
-    ...clickOnSnippet({id: 's_social_media', name: 'Social Media'}),
-    ...addNewSocialNetwork(8, 8, 'https://www.youtu.be/y7TlnAv6cto'),
-    {
-        content: 'Click on the toggle to hide Facebook',
-        trigger: ".o_social_media_list div[data-action-id='toggleRecordedSocialMediaLink'] input[type='checkbox']",
-        run: 'click',
-    },
-    {
-        content: "Ensure twitter became first",
-        trigger: ':iframe .s_social_media:has(a:eq(0)[href="/website/social/twitter"])',
-    },
-    {
-        content: 'Drag the facebook link at the end of the list',
-        trigger: ".o_social_media_list button.o_drag_handle",
-        tooltipPosition: 'bottom',
-        run: "drag_and_drop .o_social_media_list tr:last-child",
-    },
-    {
-        content: 'Check drop completed',
-        trigger: ".o_social_media_list tr:eq(8) div[data-action-param='facebook']",
-    },
-    ...preventRaceConditionStep,
-    // Create a Link for which we don't have an icon to propose.
-    ...addNewSocialNetwork(9, 8, 'https://whatever.it/1EdSw9X'),
-    // Create a custom instagram link.
-    ...addNewSocialNetwork(10, 9, 'https://instagr.am/odoo.official/'),
-    {
-        content: "Check if the result is correct before removing",
-        trigger: ":iframe .s_social_media" +
-                 ":has(a:eq(0)[href='/website/social/twitter'])" +
-                 ":has(a:eq(1)[href='/website/social/linkedin'])" +
-                 ":has(a:eq(2)[href='/website/social/youtube'])" +
-                 ":has(a:eq(3)[href='/website/social/instagram'])" +
-                 ":has(a:eq(4)[href='/website/social/github'])" +
-                 ":has(a:eq(5)[href='/website/social/tiktok'])" +
-                 ":has(a:eq(6)[href='/website/social/discord'])" +
-                 ":has(a:eq(7)[href='https://www.youtu.be/y7TlnAv6cto']:has(i.fa-youtube-play))" +
-                 ":has(a:eq(8)[href='https://whatever.it/1EdSw9X']:has(i.fa-pencil))" +
-                 ":has(a:eq(9)[href='https://instagr.am/odoo.official/']:has(i.fa-instagram))",
-    },
-    // Create a custom link, not officially supported, ensure icon is found.
-    {
-        content: 'Change custom social to unsupported link',
-        trigger: ".o_social_media_list tr:eq(7) input",
-        run: "edit https://www.paypal.com/abc && click body",
-    },
-    {
-        content: "Ensure paypal icon is found",
-        trigger: ":iframe .s_social_media" +
-                 ":has(a:eq(7)[href='https://www.paypal.com/abc']:has(i.fa-paypal))",
-    },
-    ...preventRaceConditionStep,
-    {
-        content: 'Delete the custom link',
-        trigger: ".o_social_media_list button[data-action-id='deleteSocialMediaLink']",
-        run: 'click',
-    },
-    {
-        content: "Ensure custom link was removed",
-        trigger: ':iframe .s_social_media:has(a:eq(7)[href="https://whatever.it/1EdSw9X"]:has(i.fa-pencil))',
-    },
-    {
-        content: 'Click on the toggle to show Facebook',
-        trigger: ".o_social_media_list input[type='checkbox']:not(:checked)",
-        run: 'click',
-    },
-    {
-        content: "Check if the result is correct after removing",
-        trigger: ":iframe .s_social_media" +
-                 ":has(a:eq(0)[href='/website/social/twitter'])" +
-                 ":has(a:eq(1)[href='/website/social/linkedin'])" +
-                 ":has(a:eq(2)[href='/website/social/youtube'])" +
-                 ":has(a:eq(3)[href='/website/social/instagram'])" +
-                 ":has(a:eq(4)[href='/website/social/github'])" +
-                 ":has(a:eq(5)[href='/website/social/tiktok'])" +
-                 ":has(a:eq(6)[href='/website/social/discord'])" +
-                 ":has(a:eq(7)[href='/website/social/facebook'])" +
-                 ":has(a:eq(8)[href='https://whatever.it/1EdSw9X']:has(i.fa-pencil))" +
-                 ":has(a:eq(9)[href='https://instagr.am/odoo.official/']:has(i.fa-instagram))",
-    },
-    {
-        content: 'Change url of the DB instagram link',
-        trigger: ".o_social_media_list tr:eq(3) input",
-        run: "edit https://instagram.com/odoo.official/ && click body",
-    },
-    ...preventRaceConditionStep,
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-    ...clickOnSnippet({
-        id: 's_social_media',
-        name: 'Social Media',
-    }),
-    {
-        content: "Check if we can still change custom icons",
-        trigger: ':iframe .s_social_media a[href="https://whatever.it/1EdSw9X"] i.fa-pencil',
-        run: 'dblclick',
-    },
-    {
-        content: "Select a new icon",
-        trigger: '.o_select_media_dialog .fa-heart',
-        run: "click",
-    },
-    {
-        content: "Check if the result is correct after setting the icon",
-        trigger: ":iframe .s_social_media" +
-                 ":has(a:eq(0)[href='/website/social/twitter'])" +
-                 ":has(a:eq(1)[href='/website/social/linkedin'])" +
-                 ":has(a:eq(2)[href='/website/social/youtube'])" +
-                 ":has(a:eq(3)[href='/website/social/instagram'])" +
-                 ":has(a:eq(4)[href='/website/social/github'])" +
-                 ":has(a:eq(5)[href='/website/social/tiktok'])" +
-                 ":has(a:eq(6)[href='/website/social/discord'])" +
-                 ":has(a:eq(7)[href='/website/social/facebook'])" +
-                 ":has(a:eq(8)[href='https://whatever.it/1EdSw9X']:has(i.fa-heart))" +
-                 ":has(a:eq(9)[href='https://instagr.am/odoo.official/']:has(i.fa-instagram))",
-    },
-    // Create a social network but replace its icon by an image before setting
-    // the link (`replaceIcon` parameter set to `true`).
-    ...addNewSocialNetwork(10, 10, "https://google.com", true),
-    // Create a social network after replacing the first icon by an image.
-    ...replaceIconByImage("/website/social/twitter"),
-    ...addNewSocialNetwork(11, 11, "https://facebook.com"),
-    {
-        content: "Check if the result is correct after adding images",
-        trigger: ":iframe .s_social_media" +
-                 ":has(a:eq(0)[href='/website/social/twitter']:has(img))" +
-                 ":has(a:eq(10)[href='https://google.com']:has(img))" +
-                 ":has(a:eq(11)[href='https://facebook.com']:has(img))",
-    },
-    ...clickOnSave(),
-]);
+registerWebsitePreviewTour(
+    "snippet_social_media",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({ id: "s_social_media", name: "Social Media" }),
+        ...clickOnSnippet({ id: "s_social_media", name: "Social Media" }),
+        ...addNewSocialNetwork(8, 8, "https://www.youtu.be/y7TlnAv6cto"),
+        {
+            content: "Click on the toggle to hide Facebook",
+            trigger:
+                ".o_social_media_list div[data-action-id='toggleRecordedSocialMediaLink'] input[type='checkbox']",
+            run: "click",
+        },
+        {
+            content: "Ensure twitter became first",
+            trigger: ':iframe .s_social_media:has(a:eq(0)[href="/website/social/twitter"])',
+        },
+        {
+            content: "Drag the facebook link at the end of the list",
+            trigger: ".o_social_media_list button.o_drag_handle",
+            tooltipPosition: "bottom",
+            run: "drag_and_drop .o_social_media_list tr:last-child",
+        },
+        {
+            content: "Check drop completed",
+            trigger: ".o_social_media_list tr:eq(8) div[data-action-param='facebook']",
+        },
+        ...preventRaceConditionStep,
+        // Create a Link for which we don't have an icon to propose.
+        ...addNewSocialNetwork(9, 8, "https://whatever.it/1EdSw9X"),
+        // Create a custom instagram link.
+        ...addNewSocialNetwork(10, 9, "https://instagr.am/odoo.official/"),
+        {
+            content: "Check if the result is correct before removing",
+            trigger:
+                ":iframe .s_social_media" +
+                ":has(a:eq(0)[href='/website/social/twitter'])" +
+                ":has(a:eq(1)[href='/website/social/linkedin'])" +
+                ":has(a:eq(2)[href='/website/social/youtube'])" +
+                ":has(a:eq(3)[href='/website/social/instagram'])" +
+                ":has(a:eq(4)[href='/website/social/github'])" +
+                ":has(a:eq(5)[href='/website/social/tiktok'])" +
+                ":has(a:eq(6)[href='/website/social/discord'])" +
+                ":has(a:eq(7)[href='https://www.youtu.be/y7TlnAv6cto']:has(i.fa-youtube-play))" +
+                ":has(a:eq(8)[href='https://whatever.it/1EdSw9X']:has(i.fa-pencil))" +
+                ":has(a:eq(9)[href='https://instagr.am/odoo.official/']:has(i.fa-instagram))",
+        },
+        // Create a custom link, not officially supported, ensure icon is found.
+        {
+            content: "Change custom social to unsupported link",
+            trigger: ".o_social_media_list tr:eq(7) input",
+            run: "edit https://www.paypal.com/abc && click body",
+        },
+        {
+            content: "Ensure paypal icon is found",
+            trigger:
+                ":iframe .s_social_media" +
+                ":has(a:eq(7)[href='https://www.paypal.com/abc']:has(i.fa-paypal))",
+        },
+        ...preventRaceConditionStep,
+        {
+            content: "Delete the custom link",
+            trigger: ".o_social_media_list button[data-action-id='deleteSocialMediaLink']",
+            run: "click",
+        },
+        {
+            content: "Ensure custom link was removed",
+            trigger:
+                ':iframe .s_social_media:has(a:eq(7)[href="https://whatever.it/1EdSw9X"]:has(i.fa-pencil))',
+        },
+        {
+            content: "Click on the toggle to show Facebook",
+            trigger: ".o_social_media_list input[type='checkbox']:not(:checked)",
+            run: "click",
+        },
+        {
+            content: "Check if the result is correct after removing",
+            trigger:
+                ":iframe .s_social_media" +
+                ":has(a:eq(0)[href='/website/social/twitter'])" +
+                ":has(a:eq(1)[href='/website/social/linkedin'])" +
+                ":has(a:eq(2)[href='/website/social/youtube'])" +
+                ":has(a:eq(3)[href='/website/social/instagram'])" +
+                ":has(a:eq(4)[href='/website/social/github'])" +
+                ":has(a:eq(5)[href='/website/social/tiktok'])" +
+                ":has(a:eq(6)[href='/website/social/discord'])" +
+                ":has(a:eq(7)[href='/website/social/facebook'])" +
+                ":has(a:eq(8)[href='https://whatever.it/1EdSw9X']:has(i.fa-pencil))" +
+                ":has(a:eq(9)[href='https://instagr.am/odoo.official/']:has(i.fa-instagram))",
+        },
+        {
+            content: "Change url of the DB instagram link",
+            trigger: ".o_social_media_list tr:eq(3) input",
+            run: "edit https://instagram.com/odoo.official/ && click body",
+        },
+        ...preventRaceConditionStep,
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet({
+            id: "s_social_media",
+            name: "Social Media",
+        }),
+        {
+            content: "Check if we can still change custom icons",
+            trigger: ':iframe .s_social_media a[href="https://whatever.it/1EdSw9X"] i.fa-pencil',
+            run: "dblclick",
+        },
+        {
+            content: "Select a new icon",
+            trigger: ".o_select_media_dialog .fa-heart",
+            run: "click",
+        },
+        {
+            content: "Check if the result is correct after setting the icon",
+            trigger:
+                ":iframe .s_social_media" +
+                ":has(a:eq(0)[href='/website/social/twitter'])" +
+                ":has(a:eq(1)[href='/website/social/linkedin'])" +
+                ":has(a:eq(2)[href='/website/social/youtube'])" +
+                ":has(a:eq(3)[href='/website/social/instagram'])" +
+                ":has(a:eq(4)[href='/website/social/github'])" +
+                ":has(a:eq(5)[href='/website/social/tiktok'])" +
+                ":has(a:eq(6)[href='/website/social/discord'])" +
+                ":has(a:eq(7)[href='/website/social/facebook'])" +
+                ":has(a:eq(8)[href='https://whatever.it/1EdSw9X']:has(i.fa-heart))" +
+                ":has(a:eq(9)[href='https://instagr.am/odoo.official/']:has(i.fa-instagram))",
+        },
+        // Create a social network but replace its icon by an image before setting
+        // the link (`replaceIcon` parameter set to `true`).
+        ...addNewSocialNetwork(10, 10, "https://google.com", true),
+        // Create a social network after replacing the first icon by an image.
+        ...replaceIconByImage("/website/social/twitter"),
+        ...addNewSocialNetwork(11, 11, "https://facebook.com"),
+        {
+            content: "Check if the result is correct after adding images",
+            trigger:
+                ":iframe .s_social_media" +
+                ":has(a:eq(0)[href='/website/social/twitter']:has(img))" +
+                ":has(a:eq(10)[href='https://google.com']:has(img))" +
+                ":has(a:eq(11)[href='https://facebook.com']:has(img))",
+        },
+        ...clickOnSave(),
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_table_of_content.js b/addons/website/static/tests/tours/snippet_table_of_content.js
index ce872243fcd37..b64575dd585ba 100644
--- a/addons/website/static/tests/tours/snippet_table_of_content.js
+++ b/addons/website/static/tests/tours/snippet_table_of_content.js
@@ -4,7 +4,7 @@ import {
     insertSnippet,
     goBackToBlocks,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const scrollToHeading = function (position) {
     return {
@@ -22,87 +22,92 @@ const checkTOCNavBar = function (tocPosition, activeHeaderPosition) {
     };
 };
 
-registerWebsitePreviewTour('snippet_table_of_content', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({id: "s_table_of_content", name: "Table of Content", groupName: "Text"}),
+registerWebsitePreviewTour(
+    "snippet_table_of_content",
     {
-        content: "Drag the Text snippet group and drop it.",
-        trigger: ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Text'] .o_snippet_thumbnail",
-        run: "drag_and_drop :iframe #wrap",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Click on the s_table_of_content snippet.",
-        trigger: ':iframe .o_add_snippets_preview [data-snippet="s_table_of_content"]',
-        run: "click",
-    },
-    // To make sure that the public widgets of the two previous ones started.
-    ...insertSnippet({id: "s_banner", name: "Banner", groupName: "Intro"}),
-    {
-        content: "Drag the Intro snippet group and drop it.",
-        trigger: ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Intro'] .o_snippet_thumbnail",
-        run: "drag_and_drop :iframe #wrap",
-    },
-    {
-        content: "Click on the s_banner snippet.",
-        trigger: ':iframe .o_add_snippets_preview [data-snippet="s_banner"]',
-        run: "click",
-    },
-    ...clickOnSave(),
-    checkTOCNavBar(0, 0),
-    checkTOCNavBar(1, 0),
-    scrollToHeading(1),
-    checkTOCNavBar(0, 1),
-    checkTOCNavBar(1, 0),
-    scrollToHeading(2),
-    checkTOCNavBar(1, 0),
-    scrollToHeading(3),
-    checkTOCNavBar(1, 0),
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Click on the first TOC's title",
-        trigger: ':iframe .s_table_of_content:eq(0) h2',
-        run: "click",
-    },
-    {
-        content: "Hide the first TOC on mobile",
-        trigger: '[data-action-param="no_mobile"]',
-        run: "click",
-    },
-    // Go back to blocks tabs to avoid changing the first ToC options
-    goBackToBlocks(),
-    {
-        content: "Click on the second TOC's title",
-        trigger: ':iframe .s_table_of_content:eq(1) h2',
-        run: "click",
-    },
-    {
-        content: "Hide the second TOC on desktop",
-        trigger: '[data-action-param="no_desktop"]',
-        run: "click",
-    },
-    ...clickOnSave(),
-    {
-        content: "Check that we have the good TOC on desktop",
-        trigger: ':iframe .s_table_of_content.o_snippet_mobile_invisible',
-    },
-    {
-        content: "The mobile TOC should not be visible on desktop",
-        trigger: ':iframe .s_table_of_content.o_snippet_desktop_invisible:not(:visible)',
-    },
-    {
-        content: "Toggle the mobile view",
-        trigger: '.o_mobile_preview > a',
-        run: "click",
-    },
-    {
-        content: "Check that we have the good TOC on mobile",
-        trigger: ':iframe .s_table_of_content.o_snippet_desktop_invisible',
-    },
-    {
-        content: "The desktop TOC should not be visible on mobile",
-        trigger: ":iframe .s_table_of_content.o_snippet_mobile_invisible:not(:visible)",
-
-    }
-]);
+    () => [
+        ...insertSnippet({ id: "s_table_of_content", name: "Table of Content", groupName: "Text" }),
+        {
+            content: "Drag the Text snippet group and drop it.",
+            trigger:
+                ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Text'] .o_snippet_thumbnail",
+            run: "drag_and_drop :iframe #wrap",
+        },
+        {
+            content: "Click on the s_table_of_content snippet.",
+            trigger: ':iframe .o_add_snippets_preview [data-snippet="s_table_of_content"]',
+            run: "click",
+        },
+        // To make sure that the public widgets of the two previous ones started.
+        ...insertSnippet({ id: "s_banner", name: "Banner", groupName: "Intro" }),
+        {
+            content: "Drag the Intro snippet group and drop it.",
+            trigger:
+                ".o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Intro'] .o_snippet_thumbnail",
+            run: "drag_and_drop :iframe #wrap",
+        },
+        {
+            content: "Click on the s_banner snippet.",
+            trigger: ':iframe .o_add_snippets_preview [data-snippet="s_banner"]',
+            run: "click",
+        },
+        ...clickOnSave(),
+        checkTOCNavBar(0, 0),
+        checkTOCNavBar(1, 0),
+        scrollToHeading(1),
+        checkTOCNavBar(0, 1),
+        checkTOCNavBar(1, 0),
+        scrollToHeading(2),
+        checkTOCNavBar(1, 0),
+        scrollToHeading(3),
+        checkTOCNavBar(1, 0),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Click on the first TOC's title",
+            trigger: ":iframe .s_table_of_content:eq(0) h2",
+            run: "click",
+        },
+        {
+            content: "Hide the first TOC on mobile",
+            trigger: '[data-action-param="no_mobile"]',
+            run: "click",
+        },
+        // Go back to blocks tabs to avoid changing the first ToC options
+        goBackToBlocks(),
+        {
+            content: "Click on the second TOC's title",
+            trigger: ":iframe .s_table_of_content:eq(1) h2",
+            run: "click",
+        },
+        {
+            content: "Hide the second TOC on desktop",
+            trigger: '[data-action-param="no_desktop"]',
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that we have the good TOC on desktop",
+            trigger: ":iframe .s_table_of_content.o_snippet_mobile_invisible",
+        },
+        {
+            content: "The mobile TOC should not be visible on desktop",
+            trigger: ":iframe .s_table_of_content.o_snippet_desktop_invisible:not(:visible)",
+        },
+        {
+            content: "Toggle the mobile view",
+            trigger: ".o_mobile_preview > a",
+            run: "click",
+        },
+        {
+            content: "Check that we have the good TOC on mobile",
+            trigger: ":iframe .s_table_of_content.o_snippet_desktop_invisible",
+        },
+        {
+            content: "The desktop TOC should not be visible on mobile",
+            trigger: ":iframe .s_table_of_content.o_snippet_mobile_invisible:not(:visible)",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_tabs.js b/addons/website/static/tests/tours/snippet_tabs.js
index fe42e5a444543..f7c62c13b97be 100644
--- a/addons/website/static/tests/tours/snippet_tabs.js
+++ b/addons/website/static/tests/tours/snippet_tabs.js
@@ -3,40 +3,44 @@ import {
     insertSnippet,
     changeOption,
     clickOnSnippet,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("snippet_tabs", {
-    edition: true,
-    url: "/",
-}, () => [
-    ...insertSnippet({
-        id: "s_tabs",
-        name: "Tabs",
-        groupName: "Content",
-    }),
-    ...clickOnSnippet(".s_tabs_common.s_tabs"),
-    changeOption("Tabs", "button[aria-label='Remove Tab']"),
+registerWebsitePreviewTour(
+    "snippet_tabs",
     {
-        content: "Check that only 2 tab panes remain",
-        trigger: ":iframe .s_tabs .s_tabs_content",
-        run() {
-            if (this.anchor.querySelectorAll(".tab-pane").length !== 2) {
-                console.error("There should be exactly 2 tab panes in the DOM.");
-            }
-        },
-    },
-    {
-        content: "Check that the first tab link is active",
-        trigger: ":iframe .s_tabs .nav-item:nth-of-type(1) .nav-link.active",
+        edition: true,
+        url: "/",
     },
-    changeOption("Tabs", "button[aria-label='Add Tab']"),
-    {
-        content: "Check there are 3 tab panes",
-        trigger: ":iframe .s_tabs .s_tabs_content",
-        run() {
-            if (this.anchor.querySelectorAll(".tab-pane").length !== 3) {
-                console.error("There should be exactly 3 tab panes in the DOM.");
-            }
+    () => [
+        ...insertSnippet({
+            id: "s_tabs",
+            name: "Tabs",
+            groupName: "Content",
+        }),
+        ...clickOnSnippet(".s_tabs_common.s_tabs"),
+        changeOption("Tabs", "button[aria-label='Remove Tab']"),
+        {
+            content: "Check that only 2 tab panes remain",
+            trigger: ":iframe .s_tabs .s_tabs_content",
+            run() {
+                if (this.anchor.querySelectorAll(".tab-pane").length !== 2) {
+                    console.error("There should be exactly 2 tab panes in the DOM.");
+                }
+            },
         },
-    },
-]);
+        {
+            content: "Check that the first tab link is active",
+            trigger: ":iframe .s_tabs .nav-item:nth-of-type(1) .nav-link.active",
+        },
+        changeOption("Tabs", "button[aria-label='Add Tab']"),
+        {
+            content: "Check there are 3 tab panes",
+            trigger: ":iframe .s_tabs .s_tabs_content",
+            run() {
+                if (this.anchor.querySelectorAll(".tab-pane").length !== 3) {
+                    console.error("There should be exactly 3 tab panes in the DOM.");
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_translation.js b/addons/website/static/tests/tours/snippet_translation.js
index 6c60b470931c8..d1ce937da8079 100644
--- a/addons/website/static/tests/tours/snippet_translation.js
+++ b/addons/website/static/tests/tours/snippet_translation.js
@@ -1,5 +1,5 @@
-import { localization } from '@web/core/l10n/localization';
-import { translatedTermsGlobal } from '@web/core/l10n/translation';
+import { localization } from "@web/core/l10n/localization";
+import { translatedTermsGlobal } from "@web/core/l10n/translation";
 import {
     clickOnEditAndWaitEditMode,
     clickOnEditAndWaitEditModeInTranslatedPage,
@@ -7,89 +7,99 @@ import {
     insertSnippet,
     registerWebsitePreviewTour,
     testSwitchWebsite,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 
-registerWebsitePreviewTour('snippet_translation', {
-    url: '/',
-}, () => [
-    {
-        content: "Wait for website preview and check language",
-        trigger: ":iframe html:has(body:contains(welcome to your)):has(.o_top_fixed_element)",
-        run: () => {
-            if (localization.code !== "fu_GB") {
-                console.error("the user language is not properly set");
-            } else {
-                translatedTermsGlobal["Save"] = "Save in fu_GB";
-            }
-        }
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...insertSnippet({id: "s_cover", name: "Cover", groupName: "Intro"}),
-    {
-        content: "Check that contact us contain Parseltongue",
-        trigger: ':iframe .s_cover .btn-outline-secondary:contains("Contact us in Parseltongue")',
-    },
-    {
-        content: "Check that the save button contains 'in fu_GB'",
-        trigger: '.btn[data-action="save"]:contains("Save in fu_GB")',
-    },
-]);
-registerWebsitePreviewTour('snippet_translation_changing_lang', {
-    url: '/',
-}, () => [
-    stepUtils.waitIframeIsReady(),
-    {
-        content: "Open dropdown language selector",
-        trigger: ':iframe .js_language_selector button',
-        run: "click",
-    },
-    {
-        content: "Select the language to Parseltongue",
-        trigger: ":iframe .js_language_selector .js_change_lang[data-url_code=pa_GB]",
-        run: "click",
-    },
-    {
-        content: "Wait the language has changed.",
-        trigger: ":iframe header.o_top_fixed_element nav li:contains(parseltongue)",
-    },
-    {
-        content: "Open dropdown language selector",
-        trigger: ':iframe .js_language_selector button',
-        run: "click",
-    },
-    {
-        content: "Select the language to English",
-        trigger: ":iframe .js_language_selector .js_change_lang[data-url_code=en]",
-        run: "click",
-    },
-    {
-        content: "Wait the language has changed.",
-        trigger: ":iframe nav li:contains(english)",
-    },
-    {
-        content: "Open Edit dropdown",
-        trigger: '.o_edit_website_container button',
-        run: "click",
-    },
-    {
-        content: "Enable translation",
-        trigger: '.o_translate_website_dropdown_item',
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "snippet_translation",
     {
-        content: "Close the dialog",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
+        url: "/",
     },
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditModeInTranslatedPage(),
-    ...insertSnippet({name: "Cover", id: "s_cover", groupName: "Intro"}),
+    () => [
+        {
+            content: "Wait for website preview and check language",
+            trigger: ":iframe html:has(body:contains(welcome to your)):has(.o_top_fixed_element)",
+            run: () => {
+                if (localization.code !== "fu_GB") {
+                    console.error("the user language is not properly set");
+                } else {
+                    translatedTermsGlobal["Save"] = "Save in fu_GB";
+                }
+            },
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...insertSnippet({ id: "s_cover", name: "Cover", groupName: "Intro" }),
+        {
+            content: "Check that contact us contain Parseltongue",
+            trigger:
+                ':iframe .s_cover .btn-outline-secondary:contains("Contact us in Parseltongue")',
+        },
+        {
+            content: "Check that the save button contains 'in fu_GB'",
+            trigger: '.btn[data-action="save"]:contains("Save in fu_GB")',
+        },
+    ]
+);
+registerWebsitePreviewTour(
+    "snippet_translation_changing_lang",
     {
-        content: "Check that contact us contain Parseltongue",
-        trigger: ':iframe .s_cover .btn-outline-secondary:contains("Contact us in Parseltongue")',
+        url: "/",
     },
-]);
+    () => [
+        stepUtils.waitIframeIsReady(),
+        {
+            content: "Open dropdown language selector",
+            trigger: ":iframe .js_language_selector button",
+            run: "click",
+        },
+        {
+            content: "Select the language to Parseltongue",
+            trigger: ":iframe .js_language_selector .js_change_lang[data-url_code=pa_GB]",
+            run: "click",
+        },
+        {
+            content: "Wait the language has changed.",
+            trigger: ":iframe header.o_top_fixed_element nav li:contains(parseltongue)",
+        },
+        {
+            content: "Open dropdown language selector",
+            trigger: ":iframe .js_language_selector button",
+            run: "click",
+        },
+        {
+            content: "Select the language to English",
+            trigger: ":iframe .js_language_selector .js_change_lang[data-url_code=en]",
+            run: "click",
+        },
+        {
+            content: "Wait the language has changed.",
+            trigger: ":iframe nav li:contains(english)",
+        },
+        {
+            content: "Open Edit dropdown",
+            trigger: ".o_edit_website_container button",
+            run: "click",
+        },
+        {
+            content: "Enable translation",
+            trigger: ".o_translate_website_dropdown_item",
+            run: "click",
+        },
+        {
+            content: "Close the dialog",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditModeInTranslatedPage(),
+        ...insertSnippet({ name: "Cover", id: "s_cover", groupName: "Intro" }),
+        {
+            content: "Check that contact us contain Parseltongue",
+            trigger:
+                ':iframe .s_cover .btn-outline-secondary:contains("Contact us in Parseltongue")',
+        },
+    ]
+);
 registerWebsitePreviewTour(
     "snippet_translation_switching_website",
     {
@@ -137,5 +147,5 @@ registerWebsitePreviewTour(
             trigger:
                 ":iframe link[type='text/css'][href*='/web.assets_frontend.rtl']:not(:visible)",
         },
-    ],
+    ]
 );
diff --git a/addons/website/static/tests/tours/snippet_version.js b/addons/website/static/tests/tours/snippet_version.js
index ac2d3c36c73bf..f0e69b9170c38 100644
--- a/addons/website/static/tests/tours/snippet_version.js
+++ b/addons/website/static/tests/tours/snippet_version.js
@@ -1,36 +1,57 @@
 import {
     clickOnSave,
     insertSnippet,
-    registerWebsitePreviewTour
-} from '@website/js/tours/tour_utils';
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("snippet_version_1", {
-    edition: true,
-    url: "/",
-}, () => [
-    ...insertSnippet({
-        id: 's_test_snip',
-        name: 'Test snip',
-        groupName: "Content",
-    }),
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
+registerWebsitePreviewTour(
+    "snippet_version_1",
     {
-    content: "Test t-snippet and t-snippet-call: snippets have data-snippet set",
-    trigger: '.o-snippets-menu .o_snippets_container_body > .o_snippet',
-    run: function () {
-        // Tests done here as all these are not visible on the page
-        const draggableSnippets = [...document.querySelectorAll('.o-snippets-menu .o_snippets_container_body > .o_snippet:not([data-module-id]) > :nth-child(2)')];
-        if (draggableSnippets.length && !draggableSnippets.every(el => el.dataset.snippet)) {
-            console.error("error Some t-snippet are missing their template name or there are no snippets to drop");
-        }
-        if (!document.querySelector('iframe:not(.o_ignore_in_tour)').contentDocument.querySelector('#wrap [data-snippet="s_test_snip"] [data-snippet="s_share"]')) {
-            console.error("error Dropped a s_test_snip snippet but missing s_share template name in it");
-        }
+        edition: true,
+        url: "/",
     },
-},
-    ...clickOnSave(),
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_test_snip",
+            name: "Test snip",
+            groupName: "Content",
+        }),
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            content: "Test t-snippet and t-snippet-call: snippets have data-snippet set",
+            trigger: ".o-snippets-menu .o_snippets_container_body > .o_snippet",
+            run: function () {
+                // Tests done here as all these are not visible on the page
+                const draggableSnippets = [
+                    ...document.querySelectorAll(
+                        ".o-snippets-menu .o_snippets_container_body > .o_snippet:not([data-module-id]) > :nth-child(2)"
+                    ),
+                ];
+                if (
+                    draggableSnippets.length &&
+                    !draggableSnippets.every((el) => el.dataset.snippet)
+                ) {
+                    console.error(
+                        "error Some t-snippet are missing their template name or there are no snippets to drop"
+                    );
+                }
+                if (
+                    !document
+                        .querySelector("iframe:not(.o_ignore_in_tour)")
+                        .contentDocument.querySelector(
+                            '#wrap [data-snippet="s_test_snip"] [data-snippet="s_share"]'
+                        )
+                ) {
+                    console.error(
+                        "error Dropped a s_test_snip snippet but missing s_share template name in it"
+                    );
+                }
+            },
+        },
+        ...clickOnSave(),
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippet_visibility_option.js b/addons/website/static/tests/tours/snippet_visibility_option.js
index 3f82566d6ec26..6126d9c7400e6 100644
--- a/addons/website/static/tests/tours/snippet_visibility_option.js
+++ b/addons/website/static/tests/tours/snippet_visibility_option.js
@@ -3,124 +3,151 @@ import {
     clickOnSave,
     clickOnEditAndWaitEditMode,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("snippet_visibility_option", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_popup",
-        name: "Popup",
-        groupName: "Content",
-    }),
+registerWebsitePreviewTour(
+    "snippet_visibility_option",
     {
-        content: "Click on the column within the popup snippet.",
-        trigger: ":iframe #wrap .s_popup .o_cc1",
-        run: "click"
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Click the 'No Desktop' visibility option.",
-        trigger: "[data-container-title='Column'] [data-action-param='no_desktop']",
-        run: "click"
-    },
-    {
-        content: "Click on the banner within the popup snippet.",
-        trigger: ":iframe #wrap .s_popup .s_banner",
-        run: "click"
-    },
-    {
-        content: "Click the 'No Desktop' visibility option.",
-        trigger: "[data-container-title='Block'] [data-action-param='no_desktop']",
-        run: "click"
-    },
-    {
-        content: "Click on the popup snippet to hide",
-        trigger: ".o_we_invisible_root_parent",
-        run: "click"
-    },
-    {
-        content: "Click on the popup snippet in the list of invisible elements.",
-        trigger: ".o_we_invisible_root_parent",
-        run: "click"
-    },
-    {
-        content: "Check that only the banner is marked as invisible and the column entry does not appear in the panel.",
-        trigger: "li > .o_we_invisible_entry",
-        run: () => {
-            const isBlockInvisible = document.querySelector("li .o_we_invisible_entry i").classList.contains("fa-eye-slash");
-            const isColumnEntryDisplayed = document.querySelector("li li .o_we_invisible_entry");
-            if (!isBlockInvisible || !!isColumnEntryDisplayed) {
-                console.error("Visibility issue detected with the elements.");
-            }
-        }
-    },
-    ...clickOnSave(),
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Check that only the popup entry is displayed and that it is invisible.",
-        trigger: ".o_we_invisible_root_parent",
-        run: () => {
-            const isSubentryDisplayed = document.querySelector("li .o_we_invisible_entry");
-            const isPopupInvisible = document.querySelector(".o_we_invisible_root_parent > i").classList.contains("fa-eye-slash");
-            if (!!isSubentryDisplayed || !isPopupInvisible) {
-                console.error("Visibility issue detected with the elements.");
-            }
-        }
-    },
-    {
-        content: "Click on the popup entry to show it.",
-        trigger: ".o_we_invisible_root_parent",
-        run: "click"
-    },
-    {
-        content: "Click on the banner entry to show it.",
-        trigger: "li > .o_we_invisible_entry",
-        run: "click"
-    },
-    {
-        content: "Check that the popup and banner are visible and the column is still invisible.",
-        trigger: "li li > .o_we_invisible_entry",
-        run: () => {
-            const isPopupVisible = document.querySelector(".o_we_invisible_root_parent i").classList.contains("fa-eye");
-            const isBannerVisible = document.querySelector("li .o_we_invisible_entry i").classList.contains("fa-eye");
-            const isColumnInvisible = document.querySelector("li li .o_we_invisible_entry i").classList.contains("fa-eye-slash");
-            if (!isPopupVisible || !isBannerVisible || !isColumnInvisible) {
-                console.error("Visibility issue detected with the elements.");
-            }
-        }
-    },
-    {
-        content: "Click on the popup entry to hide it.",
-        trigger: ".o_we_invisible_root_parent",
-        run: "click",
-    },
-    {
-        content: "Check that only the popup entry is displayed and that it is invisible.",
-        trigger: ".o_we_invisible_root_parent",
-        run: () => {
-            const isSubentryDisplayed = document.querySelector("li .o_we_invisible_entry");
-            const isPopupInvisible = document.querySelector(".o_we_invisible_root_parent > i").classList.contains("fa-eye-slash");
-            if (!!isSubentryDisplayed || !isPopupInvisible) {
-                console.error("Visibility issue detected with the elements.");
-            }
-        }
-    },
-    {
-        content: "Click on the popup entry to show it.",
-        trigger: ".o_we_invisible_root_parent",
-        run: "click",
-    },
-    {
-        content: "Check that the popup and banner are visible and the column is still invisible.",
-        trigger: "li > .o_we_invisible_entry",
-        run: () => {
-            const isPopupVisible = document.querySelector(".o_we_invisible_root_parent i").classList.contains("fa-eye");
-            const isBannerVisible = document.querySelector("li .o_we_invisible_entry i").classList.contains("fa-eye");
-            const isColumnInvisible = document.querySelector("li li .o_we_invisible_entry i").classList.contains("fa-eye-slash");
-            if (!isPopupVisible || !isBannerVisible || !isColumnInvisible) {
-                console.error("Visibility issue detected with the elements.");
-            }
-        }
-    },
-]);
+    () => [
+        ...insertSnippet({
+            id: "s_popup",
+            name: "Popup",
+            groupName: "Content",
+        }),
+        {
+            content: "Click on the column within the popup snippet.",
+            trigger: ":iframe #wrap .s_popup .o_cc1",
+            run: "click",
+        },
+        {
+            content: "Click the 'No Desktop' visibility option.",
+            trigger: "[data-container-title='Column'] [data-action-param='no_desktop']",
+            run: "click",
+        },
+        {
+            content: "Click on the banner within the popup snippet.",
+            trigger: ":iframe #wrap .s_popup .s_banner",
+            run: "click",
+        },
+        {
+            content: "Click the 'No Desktop' visibility option.",
+            trigger: "[data-container-title='Block'] [data-action-param='no_desktop']",
+            run: "click",
+        },
+        {
+            content: "Click on the popup snippet to hide",
+            trigger: ".o_we_invisible_root_parent",
+            run: "click",
+        },
+        {
+            content: "Click on the popup snippet in the list of invisible elements.",
+            trigger: ".o_we_invisible_root_parent",
+            run: "click",
+        },
+        {
+            content:
+                "Check that only the banner is marked as invisible and the column entry does not appear in the panel.",
+            trigger: "li > .o_we_invisible_entry",
+            run: () => {
+                const isBlockInvisible = document
+                    .querySelector("li .o_we_invisible_entry i")
+                    .classList.contains("fa-eye-slash");
+                const isColumnEntryDisplayed = document.querySelector(
+                    "li li .o_we_invisible_entry"
+                );
+                if (!isBlockInvisible || !!isColumnEntryDisplayed) {
+                    console.error("Visibility issue detected with the elements.");
+                }
+            },
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check that only the popup entry is displayed and that it is invisible.",
+            trigger: ".o_we_invisible_root_parent",
+            run: () => {
+                const isSubentryDisplayed = document.querySelector("li .o_we_invisible_entry");
+                const isPopupInvisible = document
+                    .querySelector(".o_we_invisible_root_parent > i")
+                    .classList.contains("fa-eye-slash");
+                if (!!isSubentryDisplayed || !isPopupInvisible) {
+                    console.error("Visibility issue detected with the elements.");
+                }
+            },
+        },
+        {
+            content: "Click on the popup entry to show it.",
+            trigger: ".o_we_invisible_root_parent",
+            run: "click",
+        },
+        {
+            content: "Click on the banner entry to show it.",
+            trigger: "li > .o_we_invisible_entry",
+            run: "click",
+        },
+        {
+            content:
+                "Check that the popup and banner are visible and the column is still invisible.",
+            trigger: "li li > .o_we_invisible_entry",
+            run: () => {
+                const isPopupVisible = document
+                    .querySelector(".o_we_invisible_root_parent i")
+                    .classList.contains("fa-eye");
+                const isBannerVisible = document
+                    .querySelector("li .o_we_invisible_entry i")
+                    .classList.contains("fa-eye");
+                const isColumnInvisible = document
+                    .querySelector("li li .o_we_invisible_entry i")
+                    .classList.contains("fa-eye-slash");
+                if (!isPopupVisible || !isBannerVisible || !isColumnInvisible) {
+                    console.error("Visibility issue detected with the elements.");
+                }
+            },
+        },
+        {
+            content: "Click on the popup entry to hide it.",
+            trigger: ".o_we_invisible_root_parent",
+            run: "click",
+        },
+        {
+            content: "Check that only the popup entry is displayed and that it is invisible.",
+            trigger: ".o_we_invisible_root_parent",
+            run: () => {
+                const isSubentryDisplayed = document.querySelector("li .o_we_invisible_entry");
+                const isPopupInvisible = document
+                    .querySelector(".o_we_invisible_root_parent > i")
+                    .classList.contains("fa-eye-slash");
+                if (!!isSubentryDisplayed || !isPopupInvisible) {
+                    console.error("Visibility issue detected with the elements.");
+                }
+            },
+        },
+        {
+            content: "Click on the popup entry to show it.",
+            trigger: ".o_we_invisible_root_parent",
+            run: "click",
+        },
+        {
+            content:
+                "Check that the popup and banner are visible and the column is still invisible.",
+            trigger: "li > .o_we_invisible_entry",
+            run: () => {
+                const isPopupVisible = document
+                    .querySelector(".o_we_invisible_root_parent i")
+                    .classList.contains("fa-eye");
+                const isBannerVisible = document
+                    .querySelector("li .o_we_invisible_entry i")
+                    .classList.contains("fa-eye");
+                const isColumnInvisible = document
+                    .querySelector("li li .o_we_invisible_entry i")
+                    .classList.contains("fa-eye-slash");
+                if (!isPopupVisible || !isBannerVisible || !isColumnInvisible) {
+                    console.error("Visibility issue detected with the elements.");
+                }
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/snippets_all_drag_and_drop.js b/addons/website/static/tests/tours/snippets_all_drag_and_drop.js
index 794fe5e3de331..2e5860261e665 100644
--- a/addons/website/static/tests/tours/snippets_all_drag_and_drop.js
+++ b/addons/website/static/tests/tours/snippets_all_drag_and_drop.js
@@ -17,12 +17,12 @@ export const SUB_SNIPPET_TEMPLATES = {
 };
 
 const DROP_IN_ONLY_SNIPPETS = {
-    "s_button": ".btn",
-    "s_video": ".media_iframe_video",
+    s_button: ".btn",
+    s_video: ".media_iframe_video",
 };
 
 // Extract the snippets names from the URL parameters.
-let snippetsNames = (new URL(document.location.href)).searchParams.get("snippets_names") || "";
+let snippetsNames = new URL(document.location.href).searchParams.get("snippets_names") || "";
 // When this test is loaded in the backend, the search params aren't as easy to
 // read as before. Little trickery to make this test run.
 const searchParams = new URLSearchParams(window.location.search).get("path");
@@ -42,7 +42,11 @@ registry.category("web_tour.tours").add("snippets_all_drag_and_drop", {
                 name: snippet.split(":")[0],
                 group: snippet.split(":")[1],
             };
-            const isModal = ["s_popup", "s_newsletter_subscribe_popup", "s_newsletter_benefits_popup"].includes(snippet.name);
+            const isModal = [
+                "s_popup",
+                "s_newsletter_subscribe_popup",
+                "s_newsletter_benefits_popup",
+            ].includes(snippet.name);
             const isDropInOnlySnippet = Object.keys(DROP_IN_ONLY_SNIPPETS).includes(snippet.name);
             const snippetKey = SUB_SNIPPET_TEMPLATES[snippet.name] || snippet.name;
 
@@ -55,7 +59,9 @@ registry.category("web_tour.tours").add("snippets_all_drag_and_drop", {
 
             const snippetSteps = [
                 {
-                    content: `Drop ${snippet.group || snippet.name} ${snippet.group ? "group" : "snippet"} [${n}/${snippetsNames.length}]`,
+                    content: `Drop ${snippet.group || snippet.name} ${
+                        snippet.group ? "group" : "snippet"
+                    } [${n}/${snippetsNames.length}]`,
                     trigger: draggableElSelector,
                     run: "drag_and_drop :iframe #wrapwrap .oe_drop_zone",
                 },
@@ -65,7 +71,9 @@ registry.category("web_tour.tours").add("snippets_all_drag_and_drop", {
                 },
                 {
                     content: `Click on ${snippet.name} snippet`,
-                    trigger: `:iframe #wrapwrap [data-snippet="${snippetKey}"]${isModal ? " .modal.show" : ""}`,
+                    trigger: `:iframe #wrapwrap [data-snippet="${snippetKey}"]${
+                        isModal ? " .modal.show" : ""
+                    }`,
                     run: "click",
                 },
                 {
@@ -95,19 +103,26 @@ registry.category("web_tour.tours").add("snippets_all_drag_and_drop", {
                     run: "click",
                 });
             } else if (isModal) {
-                snippetSteps.splice(5, 2, {
-                    content: `Make sure ${snippet.name} is shown`,
-                    trigger: ":iframe body.modal-open",
-                }, {
-                    content: `Hide the ${snippet.name} popup`,
-                    trigger: `:iframe [data-snippet='${snippet.name}'] .s_popup_close`,
-                    run: "click",
-                });
+                snippetSteps.splice(
+                    5,
+                    2,
+                    {
+                        content: `Make sure ${snippet.name} is shown`,
+                        trigger: ":iframe body.modal-open",
+                    },
+                    {
+                        content: `Hide the ${snippet.name} popup`,
+                        trigger: `:iframe [data-snippet='${snippet.name}'] .s_popup_close`,
+                        run: "click",
+                    }
+                );
             } else if (isDropInOnlySnippet) {
                 // The 'drop in only' snippets have their 'data-snippet' attribute
                 // removed once they are dropped, so we need to use a different
                 // selector.
-                snippetSteps[2].trigger = `:iframe #wrapwrap ${DROP_IN_ONLY_SNIPPETS[snippet.name]}`;
+                snippetSteps[2].trigger = `:iframe #wrapwrap ${
+                    DROP_IN_ONLY_SNIPPETS[snippet.name]
+                }`;
             }
             steps = steps.concat(snippetSteps);
         }
@@ -125,7 +140,9 @@ registry.category("web_tour.tours").add("snippets_all_drag_and_drop", {
                     // receive no steps. The test would then not test anything anymore
                     // without us noticing it.
                     if (steps.length < 500) {
-                        console.error(`This test is not behaving as it should, got only ${steps.length} steps.`);
+                        console.error(
+                            `This test is not behaving as it should, got only ${steps.length} steps.`
+                        );
                     }
                 },
             },
@@ -149,9 +166,11 @@ registry.category("web_tour.tours").add("snippets_all_drag_and_drop", {
             ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
             ...changeOptionInPopover("Header", "Header Position", "Hidden"),
             goBackToBlocks(),
-        ].concat(steps).map((step) => {
-            delete step.noPrepend;
-            return step;
-        });
+        ]
+            .concat(steps)
+            .map((step) => {
+                delete step.noPrepend;
+                return step;
+            });
     },
 });
diff --git a/addons/website/static/tests/tours/specific_website_editor.js b/addons/website/static/tests/tours/specific_website_editor.js
index c2fb3abcd2e76..8a12b20e6d474 100644
--- a/addons/website/static/tests/tours/specific_website_editor.js
+++ b/addons/website/static/tests/tours/specific_website_editor.js
@@ -1,24 +1,32 @@
 import { registry } from "@web/core/registry";
 import {
     clickOnEditAndWaitEditMode,
-    registerWebsitePreviewTour
-} from '@website/js/tours/tour_utils';
+    registerWebsitePreviewTour,
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("generic_website_editor", {
-    edition: true,
-}, () => [{
-    trigger: ':iframe body:not([data-hello="world"])',
-    content: 'Check that the editor DOM matches its website-generic features',
-}]);
+registerWebsitePreviewTour(
+    "generic_website_editor",
+    {
+        edition: true,
+    },
+    () => [
+        {
+            trigger: ':iframe body:not([data-hello="world"])',
+            content: "Check that the editor DOM matches its website-generic features",
+        },
+    ]
+);
 
 // Good practice would have been to use `registerWebsitePreviewTour`
 // for this tour with `edition: true` and remove the first step to enter edit
 // mode. Unfortunately this breaks the page and therefore the test fails for
 // unknown reason.
-registry.category("web_tour.tours").add('specific_website_editor', {
+registry.category("web_tour.tours").add("specific_website_editor", {
     steps: () => [
-    ...clickOnEditAndWaitEditMode(),
-{
-    trigger: ':iframe body[data-hello="world"]',
-    content: 'Check that the editor DOM matches its website-specific features',
-}]});
+        ...clickOnEditAndWaitEditMode(),
+        {
+            trigger: ':iframe body[data-hello="world"]',
+            content: "Check that the editor DOM matches its website-specific features",
+        },
+    ],
+});
diff --git a/addons/website/static/tests/tours/start_cloned_snippet.js b/addons/website/static/tests/tours/start_cloned_snippet.js
index 20aced067854d..1416a9e4384ff 100644
--- a/addons/website/static/tests/tours/start_cloned_snippet.js
+++ b/addons/website/static/tests/tours/start_cloned_snippet.js
@@ -2,34 +2,43 @@ import {
     clickOnSnippet,
     registerWebsitePreviewTour,
     insertSnippet,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour('website_start_cloned_snippet', {
-    edition: true,
-    url: '/',
-}, () => {
-    const countdownSnippet = {
-        name: 'Countdown',
-        id: 's_countdown',
-    };
-    return [
-        ...insertSnippet(countdownSnippet),
-        ...clickOnSnippet(countdownSnippet),
-        {
-            content: 'Click on clone snippet',
-            trigger: '.oe_snippet_clone',
-            run: "click",
-        },
-        {
-            content: 'Check that the cloned snippet has a canvas and that something has been drawn inside of it',
-            trigger: ':iframe .s_countdown:eq(1) canvas',
-            run: function () {
-                // Check that at least one bit has been drawn in the canvas
-                if (!this.anchor.getContext("2d").getImageData(0, 0, 1000, 1000).data.includes(1)) {
-                    console.error('The cloned snippet should have been started');
-                }
+registerWebsitePreviewTour(
+    "website_start_cloned_snippet",
+    {
+        edition: true,
+        url: "/",
+    },
+    () => {
+        const countdownSnippet = {
+            name: "Countdown",
+            id: "s_countdown",
+        };
+        return [
+            ...insertSnippet(countdownSnippet),
+            ...clickOnSnippet(countdownSnippet),
+            {
+                content: "Click on clone snippet",
+                trigger: ".oe_snippet_clone",
+                run: "click",
             },
-        },
-
-    ]
-});
+            {
+                content:
+                    "Check that the cloned snippet has a canvas and that something has been drawn inside of it",
+                trigger: ":iframe .s_countdown:eq(1) canvas",
+                run: function () {
+                    // Check that at least one bit has been drawn in the canvas
+                    if (
+                        !this.anchor
+                            .getContext("2d")
+                            .getImageData(0, 0, 1000, 1000)
+                            .data.includes(1)
+                    ) {
+                        console.error("The cloned snippet should have been started");
+                    }
+                },
+            },
+        ];
+    }
+);
diff --git a/addons/website/static/tests/tours/text_highlights.js b/addons/website/static/tests/tours/text_highlights.js
index 64bec1c3a237f..a2910e68dd35e 100644
--- a/addons/website/static/tests/tours/text_highlights.js
+++ b/addons/website/static/tests/tours/text_highlights.js
@@ -2,101 +2,110 @@ import {
     insertSnippet,
     registerWebsitePreviewTour,
     clickToolbarButton,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { editorsWeakMap } from "@html_editor/../tests/tours/helpers/editor";
 
-registerWebsitePreviewTour("text_highlights", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: "s_cover",
-        name: "Cover",
-        groupName: "Intro",
-    }),
-    ...clickToolbarButton("snippet title", ".s_cover h1", "Apply highlight", true),
+registerWebsitePreviewTour(
+    "text_highlights",
     {
-        content: "Check that the highlights grid was displayed",
-        trigger: ".o_popover .o_text_highlight",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Select the highlight effect",
-        trigger: ".o_popover span.o_text_highlight_underline",
-        run: "click",
-    },
-    {
-        content: "Check that the highlight was applied",
-        trigger: ":iframe .s_cover h1 span.o_text_highlight_underline svg.o_text_highlight_svg",
-    },
-    {
-        content: "Disable the highlight effect",
-        trigger: ".o_popover button[title='Reset']",
-        run: "click",
-    },
-    {
-        content: "Check that the highlight was disabled for the title",
-        trigger: ":iframe .s_cover:not(:has(.o_text_highlight))",
-    },
-    {
-        // On muti-line text, the highlight effect is added on every detected
-        // line (using the `.o_text_highlight_item` span).
-        content: "Update and select the snippet paragraph content",
-        trigger: ":iframe .s_cover p",
-        run() {
-            const iframeDOC = document.querySelector(".o_iframe_container > iframe").contentDocument;
-            const firstLine = document.createElement("strong");
-            firstLine.textContent = "Text content line A";
-            const secondLine = document.createElement("i");
-            secondLine.textContent = "Text content line B";
-            this.anchor.replaceChildren(firstLine, document.createElement("br"), secondLine);
-            const editor = editorsWeakMap.get(this.anchor.ownerDocument);
-            editor.shared.history.addStep();
-            // Select the whole content.
-            const range = iframeDOC.createRange();
-            const selection = iframeDOC.getSelection();
-            range.selectNodeContents(this.anchor);
-            selection.removeAllRanges();
-            selection.addRange(range);
+    () => [
+        ...insertSnippet({
+            id: "s_cover",
+            name: "Cover",
+            groupName: "Intro",
+        }),
+        ...clickToolbarButton("snippet title", ".s_cover h1", "Apply highlight", true),
+        {
+            content: "Check that the highlights grid was displayed",
+            trigger: ".o_popover .o_text_highlight",
         },
-    },
-    {
-        content: "Check that the highlights grid was displayed",
-        trigger: ".o_popover .o_text_highlight",
-    },
-    {
-        content: "Select the highlight effect",
-        trigger: ".o_popover span.o_text_highlight_underline",
-        run: "click",
-    },
-    {
-        content: "Check if the text was correctly updated",
-        trigger: ":iframe span.o_text_highlight_underline:contains(Text content line A) + br + span.o_text_highlight_underline:contains(Text content line B)",
-    },
-    {
-        content: "Click on highlight picker to change the highlight effect",
-        trigger: ".o_popover #highlightPicker",
-        run: "click",
-    },
-    {
-        content: "Check that the highlights grid was displayed",
-        trigger: ".o_popover .o_text_highlight",
-    },
-    {
-        content: "Change the highlight effect",
-        trigger: ".o_popover span.o_text_highlight_jagged",
-        run: "click",
-    },
-    {
-        content: "Check if the text was correctly updated",
-        trigger: ":iframe span.o_text_highlight_jagged:contains('Text content line A') + br + span.o_text_highlight_jagged:contains('Text content line B')",
-    },
-    {
-        content: "Disable the highlight effect",
-        trigger: ".o_popover button[title='Reset']",
-        run: "click",
-    },
-    {
-        content: "Check if the original DOM structure was restored",
-        trigger: ":iframe .s_cover p:has(strong:contains(Text content line A) + br + i:contains(Text content line B))",
-    },
-]);
+        {
+            content: "Select the highlight effect",
+            trigger: ".o_popover span.o_text_highlight_underline",
+            run: "click",
+        },
+        {
+            content: "Check that the highlight was applied",
+            trigger: ":iframe .s_cover h1 span.o_text_highlight_underline svg.o_text_highlight_svg",
+        },
+        {
+            content: "Disable the highlight effect",
+            trigger: ".o_popover button[title='Reset']",
+            run: "click",
+        },
+        {
+            content: "Check that the highlight was disabled for the title",
+            trigger: ":iframe .s_cover:not(:has(.o_text_highlight))",
+        },
+        {
+            // On muti-line text, the highlight effect is added on every
+            // detected line (using the `.o_text_highlight_item` span).
+            content: "Update and select the snippet paragraph content",
+            trigger: ":iframe .s_cover p",
+            run() {
+                const iframeDOC = document.querySelector(
+                    ".o_iframe_container > iframe"
+                ).contentDocument;
+                const firstLine = document.createElement("strong");
+                firstLine.textContent = "Text content line A";
+                const secondLine = document.createElement("i");
+                secondLine.textContent = "Text content line B";
+                this.anchor.replaceChildren(firstLine, document.createElement("br"), secondLine);
+                const editor = editorsWeakMap.get(this.anchor.ownerDocument);
+                editor.shared.history.addStep();
+                // Select the whole content.
+                const range = iframeDOC.createRange();
+                const selection = iframeDOC.getSelection();
+                range.selectNodeContents(this.anchor);
+                selection.removeAllRanges();
+                selection.addRange(range);
+            },
+        },
+        {
+            content: "Check that the highlights grid was displayed",
+            trigger: ".o_popover .o_text_highlight",
+        },
+        {
+            content: "Select the highlight effect",
+            trigger: ".o_popover span.o_text_highlight_underline",
+            run: "click",
+        },
+        {
+            content: "Check if the text was correctly updated",
+            trigger:
+                ":iframe span.o_text_highlight_underline:contains(Text content line A) + br + span.o_text_highlight_underline:contains(Text content line B)",
+        },
+        {
+            content: "Click on highlight picker to change the highlight effect",
+            trigger: ".o_popover #highlightPicker",
+            run: "click",
+        },
+        {
+            content: "Check that the highlights grid was displayed",
+            trigger: ".o_popover .o_text_highlight",
+        },
+        {
+            content: "Change the highlight effect",
+            trigger: ".o_popover span.o_text_highlight_jagged",
+            run: "click",
+        },
+        {
+            content: "Check if the text was correctly updated",
+            trigger:
+                ":iframe span.o_text_highlight_jagged:contains('Text content line A') + br + span.o_text_highlight_jagged:contains('Text content line B')",
+        },
+        {
+            content: "Disable the highlight effect",
+            trigger: ".o_popover button[title='Reset']",
+            run: "click",
+        },
+        {
+            content: "Check if the original DOM structure was restored",
+            trigger:
+                ":iframe .s_cover p:has(strong:contains(Text content line A) + br + i:contains(Text content line B))",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/translate_menu_name.js b/addons/website/static/tests/tours/translate_menu_name.js
index ca3292fe8f7e5..933170e565938 100644
--- a/addons/website/static/tests/tours/translate_menu_name.js
+++ b/addons/website/static/tests/tours/translate_menu_name.js
@@ -2,49 +2,54 @@ import {
     clickOnExtraMenuItem,
     clickOnSave,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 import { translationIsReady } from "@web/core/l10n/translation";
 
-registerWebsitePreviewTour('translate_menu_name', {
-    url: '/pa_GB',
-    edition: false,
-}, () => [
+registerWebsitePreviewTour(
+    "translate_menu_name",
     {
-        content: "Open Edit dropdown",
-        trigger: ".o_menu_systray button:contains('Edit')",
-        run: "click",
+        url: "/pa_GB",
+        edition: false,
     },
-    {
-        content: "activate translate mode",
-        trigger: '.o_translate_website_dropdown_item',
-        run: "click",
-    },
-    {
-        content: "Close the dialog",
-        trigger: '.modal-footer .btn-primary',
-        run: "click",
-    },
-    clickOnExtraMenuItem({}, true),
-    {
-        content: "translate the menu entry",
-        trigger: ':iframe a[href="/englishURL"] span',
-        run: "editor value pa-GB",
-    },
-    ...clickOnSave(),
-    {
-        content: "Back to preview mode",
-        trigger: ".o_edit_website_container button",
-    }, {
-        trigger: "body:not(.o_builder_open)",
-        noPrepend: true,
-    },
-    stepUtils.waitIframeIsReady(),
-    {
-        content: "Await translationIsReady",
-        trigger: "body",
-        run: async () => {
-            await translationIsReady;
+    () => [
+        {
+            content: "Open Edit dropdown",
+            trigger: ".o_menu_systray button:contains('Edit')",
+            run: "click",
         },
-    },
-]);
+        {
+            content: "activate translate mode",
+            trigger: ".o_translate_website_dropdown_item",
+            run: "click",
+        },
+        {
+            content: "Close the dialog",
+            trigger: ".modal-footer .btn-primary",
+            run: "click",
+        },
+        clickOnExtraMenuItem({}, true),
+        {
+            content: "translate the menu entry",
+            trigger: ':iframe a[href="/englishURL"] span',
+            run: "editor value pa-GB",
+        },
+        ...clickOnSave(),
+        {
+            content: "Back to preview mode",
+            trigger: ".o_edit_website_container button",
+        },
+        {
+            trigger: "body:not(.o_builder_open)",
+            noPrepend: true,
+        },
+        stepUtils.waitIframeIsReady(),
+        {
+            content: "Await translationIsReady",
+            trigger: "body",
+            run: async () => {
+                await translationIsReady;
+            },
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/translate_text_options.js b/addons/website/static/tests/tours/translate_text_options.js
index a446baecc0ca4..83609d4aed48f 100644
--- a/addons/website/static/tests/tours/translate_text_options.js
+++ b/addons/website/static/tests/tours/translate_text_options.js
@@ -57,7 +57,10 @@ registerWebsitePreviewTour(
             run: "click",
         },
         // Select the highlighted text content and check highlight options were displayed.
-        selectFullText("snippet highlighted text content", "#wrap .s_text_block p:last .o_text_highlight"),
+        selectFullText(
+            "snippet highlighted text content",
+            "#wrap .s_text_block p:last .o_text_highlight"
+        ),
         {
             content: "Expand the toolbar for more buttons",
             trigger: ".o-we-toolbar button[name='expand_toolbar']",
@@ -98,7 +101,8 @@ registerWebsitePreviewTour(
         },
         {
             content: "Check that all text options are removed",
-            trigger: ".o-we-toolbar button[title='Apply highlight']:not(:has(.active)), .o-we-toolbar button[title='Animate Text']:not(:has(.active))",
+            trigger:
+                ".o-we-toolbar button[title='Apply highlight']:not(:has(.active)), .o-we-toolbar button[title='Animate Text']:not(:has(.active))",
         },
         selectFullText(
             "highlighted text content again",
@@ -111,7 +115,8 @@ registerWebsitePreviewTour(
         },
         {
             content: "Check that only the highlight options are displayed",
-            trigger: ".o-we-toolbar button[title='Apply highlight'].active, .o-we-toolbar button[title='Animate Text']:not(.active)",
+            trigger:
+                ".o-we-toolbar button[title='Apply highlight'].active, .o-we-toolbar button[title='Animate Text']:not(.active)",
         },
         ...clickOnSave(),
         {
diff --git a/addons/website/static/tests/tours/unsplash_beacon.js b/addons/website/static/tests/tours/unsplash_beacon.js
index 235000956cdd6..bf622cd166ecf 100644
--- a/addons/website/static/tests/tours/unsplash_beacon.js
+++ b/addons/website/static/tests/tours/unsplash_beacon.js
@@ -2,8 +2,10 @@ import { registry } from "@web/core/registry";
 
 registry.category("web_tour.tours").add("test_unsplash_beacon", {
     url: "/",
-    steps: () => [{
-        content: "Verify whether beacon was sent.",
-        trigger: 'img[data-beacon="sent"]',
-    }],
+    steps: () => [
+        {
+            content: "Verify whether beacon was sent.",
+            trigger: 'img[data-beacon="sent"]',
+        },
+    ],
 });
diff --git a/addons/website/static/tests/tours/website_backend_menus_redirect.js b/addons/website/static/tests/tours/website_backend_menus_redirect.js
index 986b9e0f5cd74..fc0b938025c80 100644
--- a/addons/website/static/tests/tours/website_backend_menus_redirect.js
+++ b/addons/website/static/tests/tours/website_backend_menus_redirect.js
@@ -1,32 +1,37 @@
 import { registry } from "@web/core/registry";
 
-registry.category("web_tour.tours").add('website_backend_menus_redirect', {
-    url: '/',
+registry.category("web_tour.tours").add("website_backend_menus_redirect", {
+    url: "/",
     steps: () => [
-{
-    isActive: ["enterprise"],
-    content: 'Need at least a step so the tour is not failing in enterprise',
-    trigger: 'body',
-}, {
-    isActive: ["community"],
-    content: 'Make frontend to backend menus appears',
-    trigger: 'body:has(#wrap)',
-    run: function () {
-        // The dropdown is hidden behind an SVG on hover animation.
-        this.anchor.querySelector(".o_frontend_to_backend_apps_menu").classList.add("show");
-    },
-}, {
-    isActive: ["community"],
-    content: 'Click on Test Root backend menu',
-    trigger: '.o_frontend_to_backend_apps_menu a:contains("Test Root")',
-    run: "click",
-    expectUnloadPage: true,
-}, {
-    isActive: ["community"],
-    content: 'Check that we landed on the apps page (Apps), and not the Home Action page (Settings)',
-    // It cannot be the name of the menu here, as that would still be displayed
-    // even when the default home action would be loaded. So instead, use a
-    // class used by the Apps Kanban.
-    trigger: '.oe_module_flag:not(:visible)',
-}
-]});
+        {
+            isActive: ["enterprise"],
+            content: "Need at least a step so the tour is not failing in enterprise",
+            trigger: "body",
+        },
+        {
+            isActive: ["community"],
+            content: "Make frontend to backend menus appears",
+            trigger: "body:has(#wrap)",
+            run: function () {
+                // The dropdown is hidden behind an SVG on hover animation.
+                this.anchor.querySelector(".o_frontend_to_backend_apps_menu").classList.add("show");
+            },
+        },
+        {
+            isActive: ["community"],
+            content: "Click on Test Root backend menu",
+            trigger: '.o_frontend_to_backend_apps_menu a:contains("Test Root")',
+            run: "click",
+            expectUnloadPage: true,
+        },
+        {
+            isActive: ["community"],
+            content:
+                "Check that we landed on the apps page (Apps), and not the Home Action page (Settings)",
+            // It cannot be the name of the menu here, as that would still be
+            // displayed even when the default home action would be loaded. So
+            // instead, use a class used by the Apps Kanban.
+            trigger: ".oe_module_flag:not(:visible)",
+        },
+    ],
+});
diff --git a/addons/website/static/tests/tours/website_click_tests.js b/addons/website/static/tests/tours/website_click_tests.js
index 567fa6e9c643a..300b57f145bf7 100644
--- a/addons/website/static/tests/tours/website_click_tests.js
+++ b/addons/website/static/tests/tours/website_click_tests.js
@@ -5,46 +5,51 @@ import {
     insertSnippet,
     goBackToBlocks,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 
 const cover = {
-    id: 's_cover',
-    name: 'Cover',
+    id: "s_cover",
+    name: "Cover",
     groupName: "Intro",
 };
 
-registerWebsitePreviewTour('website_click_tour', {
-    url: '/',
-}, () => [
-    stepUtils.waitIframeIsReady(),
+registerWebsitePreviewTour(
+    "website_click_tour",
     {
-        content: "trigger a page navigation",
-        trigger: ':iframe a[href="/contactus"]',
-        run: "click",
+        url: "/",
     },
-    {
-        content: "wait for the page to be loaded",
-        trigger: ".o_website_preview :iframe [data-view-xmlid='website.contactus']",
-    },
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "click on a link that would trigger navigation",
-        trigger: ':iframe a[href="/"]',
-        run: "click",
-    },
-    {
-        content: "click the User dropdown to show Log out button",
-        trigger: ":iframe .dropdown:has(#o_logout) > a",
-        run: "click",
-    },
-    {
-        content: "click the Log out button and expect not to be logged out during the following steps",
-        trigger: ":iframe .editor_enable #o_logout",
-        run: "click",
-    },
-    goBackToBlocks(),
-    ...insertSnippet(cover),
-    ...clickOnSnippet(cover),
-    ...clickOnSave(),
-]);
+    () => [
+        stepUtils.waitIframeIsReady(),
+        {
+            content: "trigger a page navigation",
+            trigger: ':iframe a[href="/contactus"]',
+            run: "click",
+        },
+        {
+            content: "wait for the page to be loaded",
+            trigger: ".o_website_preview :iframe [data-view-xmlid='website.contactus']",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "click on a link that would trigger navigation",
+            trigger: ':iframe a[href="/"]',
+            run: "click",
+        },
+        {
+            content: "click the User dropdown to show Log out button",
+            trigger: ":iframe .dropdown:has(#o_logout) > a",
+            run: "click",
+        },
+        {
+            content:
+                "click the Log out button and expect not to be logged out during the following steps",
+            trigger: ":iframe .editor_enable #o_logout",
+            run: "click",
+        },
+        goBackToBlocks(),
+        ...insertSnippet(cover),
+        ...clickOnSnippet(cover),
+        ...clickOnSave(),
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_form_editor.js b/addons/website/static/tests/tours/website_form_editor.js
index c21e1138415af..0e22d8a672c97 100644
--- a/addons/website/static/tests/tours/website_form_editor.js
+++ b/addons/website/static/tests/tours/website_form_editor.js
@@ -6,24 +6,24 @@ import {
     goBackToBlocks,
     registerWebsitePreviewTour,
     changeOptionInPopover,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 import { editorsWeakMap } from "@html_editor/../tests/tours/helpers/editor";
 
 // Visibility possible values:
-const VISIBLE = 'Always Visible';
-const CONDITIONALVISIBILITY = 'Visible only if';
+const VISIBLE = "Always Visible";
+const CONDITIONALVISIBILITY = "Visible only if";
 
 const NB_NON_ESSENTIAL_REQUIRED_FIELDS_IN_DEFAULT_FORM = 2;
 const ESSENTIAL_FIELDS_VALID_DATA_FOR_DEFAULT_FORM = [
     {
-        name: 'email_from',
-        value: 'admin@odoo.com',
+        name: "email_from",
+        value: "admin@odoo.com",
     },
     {
-        name: 'subject',
-        value: 'Hello, world!',
-    }
+        name: "subject",
+        value: "Hello, world!",
+    },
 ];
 const essentialFieldsForDefaultFormFillInSteps = [];
 for (const data of ESSENTIAL_FIELDS_VALID_DATA_FOR_DEFAULT_FORM) {
@@ -39,19 +39,18 @@ for (const data of ESSENTIAL_FIELDS_VALID_DATA_FOR_DEFAULT_FORM) {
 
 // Replace all `"` character by `&quot;`.
 const getQuotesEncodedName = function (name) {
-        return name.replaceAll(/"/g, character => `&quot;`);
+    return name.replaceAll(/"/g, (character) => `&quot;`);
 };
 
-const triggerFieldByLabel = (label) => {
-    return `.s_website_form_field.s_website_form_custom:has(label:contains("${label}"))`;
-};
-const selectFieldByLabel = (label) => {
-    return [{
+const triggerFieldByLabel = (label) =>
+    `.s_website_form_field.s_website_form_custom:has(label:contains("${label}"))`;
+const selectFieldByLabel = (label) => [
+    {
         content: `Select field "${label}"`,
         trigger: ":iframe " + triggerFieldByLabel(label),
         run: "click",
-    }];
-};
+    },
+];
 const selectButtonByText = function (text, dropdownContent) {
     return [
         {
@@ -167,713 +166,775 @@ const compareIds = ({ content, firstElSelector, secondElSelector, errorMessage }
     },
 });
 
-registerWebsitePreviewTour("website_form_editor_tour", {
-    url: '/',
-    edition: true,
-}, () => [
-    // Drop a form builder snippet and configure it
-    ...insertSnippet({id: "s_title_form", name: "Contact & Forms", groupName: "Contact & Forms"}),
-    {
-        trigger: ":iframe .s_website_form_field",
-    },
-    {
-        content: "Select form by clicking on an input field",
-        trigger: ":iframe .s_website_form_field .s_website_form_input",
-        run: "click",
-    }, {
-        content: "Verify that the form editor appeared",
-        trigger: ".o_customize_tab div[data-container-title='Form']",
-    },
-    goBackToBlocks(),
-    {
-        trigger: ":iframe .s_website_form_field",
-    },
-    {
-        content: "Select form by clicking on a text area",
-        trigger: ":iframe .s_website_form_field textarea.s_website_form_input",
-        run: "click",
-    },
-    {
-        content: "Verify that the form editor appeared",
-        trigger: ".o_customize_tab div[data-container-title='Form']",
-    },
-    {
-        content: "Rename and leave the field label",
-        trigger: ".o_customize_tab div[data-action-id='setLabelText'] input",
-        run: "edit Renamed && click body",
-    },
-    goBackToBlocks(),
-    {
-        trigger: ":iframe .s_website_form_field",
-    },
-    {
-        content: "Select form itself (not a specific field)",
-        trigger: ':iframe section.s_website_form',
-        run: "click",
-    },
-    ...changeOptionInPopover("Form", "Action", "Send an E-mail"),
-    {
-        content: "Form has a model name",
-        trigger: ':iframe section.s_website_form form[data-model_name="mail.mail"]',
-        run: "click",
-    }, {
-        content: "Set the offset and width of the Phone Number field",
-        trigger: ':iframe input[name="phone"]',
-        run: function () {
-            const fieldEl = this.anchor.closest('.s_website_form_field');
-            fieldEl.classList.add('offset-lg-3');
-            fieldEl.classList.add('col-lg-9');
-        },
-    }, {
-        content: 'Edit the Phone Number field',
-        trigger: ':iframe input[name="phone"]',
-        run: "click",
-    }, {
-        content: 'Change the label position of the phone field',
-        trigger: ".o_customize_tab div[data-label='Position'] button[data-action-value='right']",
-        run: "click",
-    },
-    ...addCustomField("char", "text", "Conditional Visibility Check 1", false),
-    ...addCustomField("char", "text", "Conditional Visibility Check 2", false),
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='Conditional Visibility Check 1']"
-    ),
-    ...addCustomField("char", "text", "Conditional Visibility Check 2", false),
-    ...selectFieldByLabel("Conditional Visibility Check 1"),
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    {
-        content: "Open list of the visibility selector of Conditional Visibility Check 1",
-        trigger: ".o_customize_tab button:contains('Your Name')",
-        run: "click",
-    },
-    {
-        content: "Check that 'Conditional Visibility Check 2' is not in the list of the visibility selector of Conditional Visibility Check 1",
-        trigger: ".o_popover div:not(:has([data-action-value='Conditional Visibility Check 2']))",
-    },
-    ...addCustomField("char", "text", "Conditional Visibility Check 3", false),
-    ...addCustomField("char", "text", "Conditional Visibility Check 4", false),
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='Conditional Visibility Check 3']"
-    ),
-    {
-        content: "Change the label of 'Conditional Visibility Check 4' and change it to 'Conditional Visibility Check 3'",
-        trigger: ".o_customize_tab div[data-action-id='setLabelText'] input",
-        // TODO: remove && click body
-        run: "edit Conditional Visibility Check 3 && click body",
-    },
-    {
-        content: "Check that the conditional visibility of the renamed field is removed",
-        trigger: ".o_customize_tab [data-label='Visibility'] button:contains('Always Visible')",
-    },
-    ...addCustomField("char", "text", "Conditional Visibility Check 5", false),
-    ...addCustomField("char", "text", "Conditional Visibility Check 6", false),
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    {
-        content: "Change the label of 'Conditional Visibility Check 6' and change it to 'Conditional Visibility Check 5'",
-        trigger: ".o_customize_tab div[data-action-id='setLabelText'] input",
-        // TODO: remove && click body
-        run: "edit Conditional Visibility Check 5 && click body",
-    },
-    {
-        content: "Open list of the visibility selector of Conditional Visibility Check 1",
-        trigger: ".o_customize_tab button:contains('Your Name')",
-        run: "click",
-    },
-    {
-        content: "Check that 'Conditional Visibility Check 5' is not in the list of the renamed field",
-        trigger: ".o_popover div:not(:has([data-action-value='Conditional Visibility Check 5']))",
-    },
-    ...addExistingField('email_cc', 'text', 'Test conditional visibility', false, {visibility: CONDITIONALVISIBILITY, condition: 'odoo'}),
-    {
-        content: "Ensure that the description has correctly been added on the field",
-        trigger: ":iframe .s_website_form_field:contains('Test conditional visibility') .s_website_form_field_description",
-    },
-    // Check that visibility condition is deleted on dependency type change.
-    ...addCustomField("char", "text", "dependent", false, {visibility: CONDITIONALVISIBILITY}),
-    ...addCustomField("selection", "radio", "dependency", false),
-    ...selectFieldByLabel("dependent"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='dependency']"
-    ),
-    ...selectFieldByLabel("dependency"),
-    ...selectButtonByData("Radio Buttons", "[data-action-value='char']"),
-    ...selectFieldByLabel("dependent"),
-    {
-        content: "Open the select",
-        trigger: ".o_customize_tab button:contains('Always Visible')",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "website_form_editor_tour",
     {
-        content: "Check that the field no longer has conditional visibility",
-        trigger: ".o_popover div[data-action-value='visible'].active",
+        url: "/",
+        edition: true,
     },
+    () => [
+        // Drop a form builder snippet and configure it
+        ...insertSnippet({
+            id: "s_title_form",
+            name: "Contact & Forms",
+            groupName: "Contact & Forms",
+        }),
+        {
+            trigger: ":iframe .s_website_form_field",
+        },
+        {
+            content: "Select form by clicking on an input field",
+            trigger: ":iframe .s_website_form_field .s_website_form_input",
+            run: "click",
+        },
+        {
+            content: "Verify that the form editor appeared",
+            trigger: ".o_customize_tab div[data-container-title='Form']",
+        },
+        goBackToBlocks(),
+        {
+            trigger: ":iframe .s_website_form_field",
+        },
+        {
+            content: "Select form by clicking on a text area",
+            trigger: ":iframe .s_website_form_field textarea.s_website_form_input",
+            run: "click",
+        },
+        {
+            content: "Verify that the form editor appeared",
+            trigger: ".o_customize_tab div[data-container-title='Form']",
+        },
+        {
+            content: "Rename and leave the field label",
+            trigger: ".o_customize_tab div[data-action-id='setLabelText'] input",
+            run: "edit Renamed && click body",
+        },
+        goBackToBlocks(),
+        {
+            trigger: ":iframe .s_website_form_field",
+        },
+        {
+            content: "Select form itself (not a specific field)",
+            trigger: ":iframe section.s_website_form",
+            run: "click",
+        },
+        ...changeOptionInPopover("Form", "Action", "Send an E-mail"),
+        {
+            content: "Form has a model name",
+            trigger: ':iframe section.s_website_form form[data-model_name="mail.mail"]',
+            run: "click",
+        },
+        {
+            content: "Set the offset and width of the Phone Number field",
+            trigger: ':iframe input[name="phone"]',
+            run: function () {
+                const fieldEl = this.anchor.closest(".s_website_form_field");
+                fieldEl.classList.add("offset-lg-3");
+                fieldEl.classList.add("col-lg-9");
+            },
+        },
+        {
+            content: "Edit the Phone Number field",
+            trigger: ':iframe input[name="phone"]',
+            run: "click",
+        },
+        {
+            content: "Change the label position of the phone field",
+            trigger:
+                ".o_customize_tab div[data-label='Position'] button[data-action-value='right']",
+            run: "click",
+        },
+        ...addCustomField("char", "text", "Conditional Visibility Check 1", false),
+        ...addCustomField("char", "text", "Conditional Visibility Check 2", false),
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        ...selectButtonByData("Your Name", "[data-action-value='Conditional Visibility Check 1']"),
+        ...addCustomField("char", "text", "Conditional Visibility Check 2", false),
+        ...selectFieldByLabel("Conditional Visibility Check 1"),
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        {
+            content: "Open list of the visibility selector of Conditional Visibility Check 1",
+            trigger: ".o_customize_tab button:contains('Your Name')",
+            run: "click",
+        },
+        {
+            content:
+                "Check that 'Conditional Visibility Check 2' is not in the list of the visibility selector of Conditional Visibility Check 1",
+            trigger:
+                ".o_popover div:not(:has([data-action-value='Conditional Visibility Check 2']))",
+        },
+        ...addCustomField("char", "text", "Conditional Visibility Check 3", false),
+        ...addCustomField("char", "text", "Conditional Visibility Check 4", false),
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        ...selectButtonByData("Your Name", "[data-action-value='Conditional Visibility Check 3']"),
+        {
+            content:
+                "Change the label of 'Conditional Visibility Check 4' and change it to 'Conditional Visibility Check 3'",
+            trigger: ".o_customize_tab div[data-action-id='setLabelText'] input",
+            // TODO: remove && click body
+            run: "edit Conditional Visibility Check 3 && click body",
+        },
+        {
+            content: "Check that the conditional visibility of the renamed field is removed",
+            trigger: ".o_customize_tab [data-label='Visibility'] button:contains('Always Visible')",
+        },
+        ...addCustomField("char", "text", "Conditional Visibility Check 5", false),
+        ...addCustomField("char", "text", "Conditional Visibility Check 6", false),
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        {
+            content:
+                "Change the label of 'Conditional Visibility Check 6' and change it to 'Conditional Visibility Check 5'",
+            trigger: ".o_customize_tab div[data-action-id='setLabelText'] input",
+            // TODO: remove && click body
+            run: "edit Conditional Visibility Check 5 && click body",
+        },
+        {
+            content: "Open list of the visibility selector of Conditional Visibility Check 1",
+            trigger: ".o_customize_tab button:contains('Your Name')",
+            run: "click",
+        },
+        {
+            content:
+                "Check that 'Conditional Visibility Check 5' is not in the list of the renamed field",
+            trigger:
+                ".o_popover div:not(:has([data-action-value='Conditional Visibility Check 5']))",
+        },
+        ...addExistingField("email_cc", "text", "Test conditional visibility", false, {
+            visibility: CONDITIONALVISIBILITY,
+            condition: "odoo",
+        }),
+        {
+            content: "Ensure that the description has correctly been added on the field",
+            trigger:
+                ":iframe .s_website_form_field:contains('Test conditional visibility') .s_website_form_field_description",
+        },
+        // Check that visibility condition is deleted on dependency type change.
+        ...addCustomField("char", "text", "dependent", false, {
+            visibility: CONDITIONALVISIBILITY,
+        }),
+        ...addCustomField("selection", "radio", "dependency", false),
+        ...selectFieldByLabel("dependent"),
+        ...selectButtonByData("Your Name", "[data-action-value='dependency']"),
+        ...selectFieldByLabel("dependency"),
+        ...selectButtonByData("Radio Buttons", "[data-action-value='char']"),
+        ...selectFieldByLabel("dependent"),
+        {
+            content: "Open the select",
+            trigger: ".o_customize_tab button:contains('Always Visible')",
+            run: "click",
+        },
+        {
+            content: "Check that the field no longer has conditional visibility",
+            trigger: ".o_popover div[data-action-value='visible'].active",
+        },
 
-    ...addExistingField('date', 'text', 'Test Date', true),
-
-    ...addExistingField('body_html', 'textarea', 'Your Message', true),
+        ...addExistingField("date", "text", "Test Date", true),
 
-    ...addExistingField('recipient_ids', 'checkbox'),
+        ...addExistingField("body_html", "textarea", "Your Message", true),
 
-    ...addCustomField('one2many', 'checkbox', 'Products', true),
-    {
-        content: "Change Option 1 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(0)",
-        run: "edit Iphone && press Tab",
-    }, {
-        content: "Change Option 2 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(1)",
-        run: "edit Galaxy S && press Tab",
-    },{
-        content: "Change first Option 3 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(2)",
-        run: "edit Xperia && press Tab",
-    },
-    {
-        content: "Click on Add new Checkbox",
-        trigger: "button.builder_list_add_item",
-        run: "click",
-    },
-    {
-        content: "Change added Option label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
-        run: "edit Wiko Stairway && press Tab",
-    }, {
-        content: "Check the resulting field",
-        trigger: ":iframe .s_website_form_field.s_website_form_custom.s_website_form_required" +
-                    ":has(.s_website_form_multiple[data-display='horizontal'])" +
-                    ":has(.checkbox:has(label:contains('Iphone')):has(input[type='checkbox'][required]))" +
-                    ":has(.checkbox:has(label:contains('Galaxy S')):has(input[type='checkbox'][required]))" +
-                    ":has(.checkbox:has(label:contains('Xperia')):has(input[type='checkbox'][required]))" +
-                    ":has(.checkbox:has(label:contains('Wiko Stairway')):has(input[type='checkbox'][required]))",
-    },
-    ...selectButtonByData("Horizontal", "[data-action-value='vertical']"),
-    {
-        content: "Check the resulting field",
-        trigger: ":iframe .s_website_form_field.s_website_form_custom.s_website_form_required" +
-                    ":has(.s_website_form_multiple[data-display='vertical'])" +
-                    ":has(.checkbox:has(label:contains('Iphone')):has(input[type='checkbox'][required]))" +
-                    ":has(.checkbox:has(label:contains('Galaxy S')):has(input[type='checkbox'][required]))" +
-                    ":has(.checkbox:has(label:contains('Xperia')):has(input[type='checkbox'][required]))" +
-                    ":has(.checkbox:has(label:contains('Wiko Stairway')):has(input[type='checkbox'][required]))",
-    },
-    // Check conditional visibility for the relational fields
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    ...selectButtonByData("Your Name", "[data-action-value='recipient_ids']"),
-    ...selectButtonByText("Is equal to", "Is not equal to"),
-    {
-        content: "Click on option to change the partner for visiblity condition",
-        trigger: "[data-name='hidden_condition_additional_text'] button",
-        run: "click",
-    },
-    {
-        content: "Click on option to change the partner for visiblity condition",
-        trigger: ".o_popover div[role='menuitem']:contains('Mitchell Admin')",
-        run: "click",
-    },
-    ...clickOnSave(),
-    {
-        content: "Check 'products' field is visible.",
-        trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("Products")}:visible)`,
-    }, {
-        content: "choose the option 'Mitchell Admin' of partner.",
-        trigger: ":iframe .checkbox:has(label:contains('Mitchell Admin')) input[type='checkbox']",
-        run: "click",
-    }, {
-        content: "Check 'products' field is not visible.",
-        trigger: ":iframe .s_website_form" +`:has(${triggerFieldByLabel("Products")}:not(:visible))`,
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...addCustomField('selection', 'radio', 'Service', true),
-    {
-        content: "Change Option 1 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(0)",
-        run: "edit After-sales Service && press Tab",
-    }, {
-        content: "Change Option 2 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(1)",
-        run: "edit Invoicing Service && press Tab",
-    }, {
-        content: "Change first Option 3 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(2)",
-        run: "edit Development Service && press Tab",
-    },
-    {
-        content: "Click on Add new Checkbox",
-        trigger: "button.builder_list_add_item",
-        run: "click",
-    }, {
-        content: "Change last Option label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
-        run: "edit Management Service",
-    }, {
-        content: "Mark the field as not required",
-        trigger: "div[data-action-id='toggleRequired'] input[type='checkbox']",
-        run: "click",
-    },
-    {
-        content: "Check the resulting field",
-        trigger: ":iframe .s_website_form_field.s_website_form_custom:not(.s_website_form_required)" +
-                    ":has(.radio:has(label:contains('After-sales Service')):has(input[type='radio']:not([required])))" +
-                    ":has(.radio:has(label:contains('Invoicing Service')):has(input[type='radio']:not([required])))" +
-                    ":has(.radio:has(label:contains('Development Service')):has(input[type='radio']:not([required])))" +
-                    ":has(.radio:has(label:contains('Management Service')):has(input[type='radio']:not([required])))",
-    },
+        ...addExistingField("recipient_ids", "checkbox"),
 
-    ...addCustomField('many2one', 'select', 'State', true),
+        ...addCustomField("one2many", "checkbox", "Products", true),
+        {
+            content: "Change Option 1 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(0)",
+            run: "edit Iphone && press Tab",
+        },
+        {
+            content: "Change Option 2 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(1)",
+            run: "edit Galaxy S && press Tab",
+        },
+        {
+            content: "Change first Option 3 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(2)",
+            run: "edit Xperia && press Tab",
+        },
+        {
+            content: "Click on Add new Checkbox",
+            trigger: "button.builder_list_add_item",
+            run: "click",
+        },
+        {
+            content: "Change added Option label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
+            run: "edit Wiko Stairway && press Tab",
+        },
+        {
+            content: "Check the resulting field",
+            trigger:
+                ":iframe .s_website_form_field.s_website_form_custom.s_website_form_required" +
+                ":has(.s_website_form_multiple[data-display='horizontal'])" +
+                ":has(.checkbox:has(label:contains('Iphone')):has(input[type='checkbox'][required]))" +
+                ":has(.checkbox:has(label:contains('Galaxy S')):has(input[type='checkbox'][required]))" +
+                ":has(.checkbox:has(label:contains('Xperia')):has(input[type='checkbox'][required]))" +
+                ":has(.checkbox:has(label:contains('Wiko Stairway')):has(input[type='checkbox'][required]))",
+        },
+        ...selectButtonByData("Horizontal", "[data-action-value='vertical']"),
+        {
+            content: "Check the resulting field",
+            trigger:
+                ":iframe .s_website_form_field.s_website_form_custom.s_website_form_required" +
+                ":has(.s_website_form_multiple[data-display='vertical'])" +
+                ":has(.checkbox:has(label:contains('Iphone')):has(input[type='checkbox'][required]))" +
+                ":has(.checkbox:has(label:contains('Galaxy S')):has(input[type='checkbox'][required]))" +
+                ":has(.checkbox:has(label:contains('Xperia')):has(input[type='checkbox'][required]))" +
+                ":has(.checkbox:has(label:contains('Wiko Stairway')):has(input[type='checkbox'][required]))",
+        },
+        // Check conditional visibility for the relational fields
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        ...selectButtonByData("Your Name", "[data-action-value='recipient_ids']"),
+        ...selectButtonByText("Is equal to", "Is not equal to"),
+        {
+            content: "Click on option to change the partner for visiblity condition",
+            trigger: "[data-name='hidden_condition_additional_text'] button",
+            run: "click",
+        },
+        {
+            content: "Click on option to change the partner for visiblity condition",
+            trigger: ".o_popover div[role='menuitem']:contains('Mitchell Admin')",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check 'products' field is visible.",
+            trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("Products")}:visible)`,
+        },
+        {
+            content: "choose the option 'Mitchell Admin' of partner.",
+            trigger:
+                ":iframe .checkbox:has(label:contains('Mitchell Admin')) input[type='checkbox']",
+            run: "click",
+        },
+        {
+            content: "Check 'products' field is not visible.",
+            trigger:
+                ":iframe .s_website_form" +
+                `:has(${triggerFieldByLabel("Products")}:not(:visible))`,
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...addCustomField("selection", "radio", "Service", true),
+        {
+            content: "Change Option 1 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(0)",
+            run: "edit After-sales Service && press Tab",
+        },
+        {
+            content: "Change Option 2 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(1)",
+            run: "edit Invoicing Service && press Tab",
+        },
+        {
+            content: "Change first Option 3 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(2)",
+            run: "edit Development Service && press Tab",
+        },
+        {
+            content: "Click on Add new Checkbox",
+            trigger: "button.builder_list_add_item",
+            run: "click",
+        },
+        {
+            content: "Change last Option label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
+            run: "edit Management Service",
+        },
+        {
+            content: "Mark the field as not required",
+            trigger: "div[data-action-id='toggleRequired'] input[type='checkbox']",
+            run: "click",
+        },
+        {
+            content: "Check the resulting field",
+            trigger:
+                ":iframe .s_website_form_field.s_website_form_custom:not(.s_website_form_required)" +
+                ":has(.radio:has(label:contains('After-sales Service')):has(input[type='radio']:not([required])))" +
+                ":has(.radio:has(label:contains('Invoicing Service')):has(input[type='radio']:not([required])))" +
+                ":has(.radio:has(label:contains('Development Service')):has(input[type='radio']:not([required])))" +
+                ":has(.radio:has(label:contains('Management Service')):has(input[type='radio']:not([required])))",
+        },
 
-    // Customize custom selection field
-    {
-        content: "Change Option 1 Label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(0)",
-        run: "edit Germany && press Tab",
-    }, {
-        content: "Change Option 2 Label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(1)",
-        run: "edit Belgium && press Tab",
-    }, {
-        content: "Change first Option 3 label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(2)",
-        run: "edit France && press Tab",
-    },
-    {
-        content: "Click on Add new Checkbox",
-        trigger: "button.builder_list_add_item",
-        run: "click",
-    },
-    {
-        content: "Change last Option label",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
-        // TODO: Fix code to avoid blur event
-        run: "edit Canada && press Tab",
-    }, {
-        content: "Remove Germany Option",
-        trigger: ".builder_list_remove_item:eq(0)",
-        run: "click",
-    },
-    {
-        content: "Click on Add new Checkbox",
-        trigger: "button.builder_list_add_item",
-        run: "click",
-    }, {
-        content: "Change last option label with a number",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
-        run: "edit 44 - UK",
-    }, {
-        content: "Check that the input value is the full option value",
-        trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
-        run: () => {
-            // We need this 'setTimeout' to ensure that the 'input' event of
-            // the input has enough time to be executed (see the
-            // '_onListItemBlurInput' function of the 'we-list' widget).
-            setTimeout(() => {
-                const addedOptionEl = document.querySelector('iframe').contentDocument.querySelector('.s_website_form_field select option[value="44 - UK"]');
-                if (!addedOptionEl) {
-                    console.error('The number option was not correctly added');
-                }
-            }, 500);
-        },
-    }, {
-        content: "Check the resulting snippet",
-        trigger: ":iframe .s_website_form_field.s_website_form_custom.s_website_form_required" +
-                    ":has(label:contains('State'))" +
-                    ":has(select[required])" +
-                    ":has(option:contains('Belgium')):not([selected])" +
-                    ":has(option:contains('France'))" +
-                    ":has(option:contains('Canada'))" +
-                    ":has(option:contains('44 - UK'))" +
-                    ":not(:has(option:contains('Germany')))",
-    },
+        ...addCustomField("many2one", "select", "State", true),
 
-    ...addExistingField('attachment_ids', 'file', 'Invoice Scan'),
-    {
-        content: "Insure the history step of the editor is not checking for unbreakable",
-        trigger: ':iframe #wrapwrap',
-        run() {
-            const editor = editorsWeakMap.get(this.anchor.ownerDocument);
-            editor.shared.history.addStep();
+        // Customize custom selection field
+        {
+            content: "Change Option 1 Label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(0)",
+            run: "edit Germany && press Tab",
         },
-    },
-    // Edit the submit button using linkDialog.
-    {
-        content: "Click submit button to show edit popover",
-        trigger: ":iframe .s_website_form_send",
-        run: "click",
-    }, {
-        content: "Click on Edit Link in Popover",
-        trigger: ".o-we-linkpopover .o_we_edit_link",
-        run: "click",
-    },
-    {
-        content: "Change button's style",
-        trigger: ".o-we-linkpopover select[name='link_type']",
-        run: "select custom",
-    },
-    {
-        trigger: ".o-we-linkpopover select[name=link_style_shape]",
-        run: "select rounded-circle",
-    },
-    {
-        trigger: ".o-we-linkpopover select[name='link_style_size']",
-        run: "select sm",
-    }, {
-        trigger: ".o-we-linkpopover .o_we_apply_link",
-        run: "click",
-    }, {
-        content: "Check the resulting button",
-        trigger: ":iframe .s_website_form_send.btn.btn-sm.btn-custom.rounded-circle",
-    },
-    // Add a default value to a auto-fillable field.
-    ...selectFieldByLabel("Your Name"),
-    {
-        content: 'Set a default value to the name field',
-        trigger: "[data-label='Default Value'] input",
-        run: "edit John Smith",
-    },
-
-    // Add two fields: the 1st one's visibility is tied to the 2nd one
-    // being set, and the 2nd one is autopopulated. As a result, both
-    // should be visible by default.
-    ...addCustomField("char", "text", "field A", false, {visibility: CONDITIONALVISIBILITY}),
-    ...addCustomField("char", "text", "field B", false),
-    ...selectFieldByLabel("field A"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='field B']"
-    ),
-    ...selectButtonByText("Is equal to", "Is set"),
-    ...selectFieldByLabel("field B"),
-    {
-        content: "Insert default value",
-        trigger: "[data-label='Default Value'] input",
-        run: "edit prefilled",
-    },
-    ...clickOnSave(),
-    {
-        content: 'Verify value attribute and property',
-        trigger: ":iframe .s_website_form_field input[value='John Smith']:value('Mitchell Admin')",
-        run: "click",
-    },
-    {
-        content: 'Verify that phone field is still auto-fillable',
-        trigger: ':iframe .s_website_form_field input[data-fill-with="phone"]:value("+1 555-555-5555")',
-        run: "click",
-    },
-    {
-        content: "Check that the offset and width of the Phone Number field are still correct",
-        trigger: ':iframe .s_website_form_field input[data-fill-with="phone"]',
-        run: function () {
-            const fieldEl = this.anchor.closest('.s_website_form_field');
-            if (!fieldEl.classList.contains('offset-lg-3')) {
-                throw new Error("The offset of the Phone Number field should have been kept");
-            }
-            if (!fieldEl.classList.contains('col-lg-9')) {
-                throw new Error("The width of the Phone Number field should have been kept");
-            }
+        {
+            content: "Change Option 2 Label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(1)",
+            run: "edit Belgium && press Tab",
+        },
+        {
+            content: "Change first Option 3 label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(2)",
+            run: "edit France && press Tab",
+        },
+        {
+            content: "Click on Add new Checkbox",
+            trigger: "button.builder_list_add_item",
+            run: "click",
+        },
+        {
+            content: "Change last Option label",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
+            // TODO: Fix code to avoid blur event
+            run: "edit Canada && press Tab",
+        },
+        {
+            content: "Remove Germany Option",
+            trigger: ".builder_list_remove_item:eq(0)",
+            run: "click",
+        },
+        {
+            content: "Click on Add new Checkbox",
+            trigger: "button.builder_list_add_item",
+            run: "click",
+        },
+        {
+            content: "Change last option label with a number",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
+            run: "edit 44 - UK",
+        },
+        {
+            content: "Check that the input value is the full option value",
+            trigger: ".o_we_table_wrapper table input[name='display_name']:eq(3)",
+            run: () => {
+                // We need this 'setTimeout' to ensure that the 'input' event of
+                // the input has enough time to be executed (see the
+                // '_onListItemBlurInput' function of the 'we-list' widget).
+                setTimeout(() => {
+                    const addedOptionEl = document
+                        .querySelector("iframe")
+                        .contentDocument.querySelector(
+                            '.s_website_form_field select option[value="44 - UK"]'
+                        );
+                    if (!addedOptionEl) {
+                        console.error("The number option was not correctly added");
+                    }
+                }, 500);
+            },
+        },
+        {
+            content: "Check the resulting snippet",
+            trigger:
+                ":iframe .s_website_form_field.s_website_form_custom.s_website_form_required" +
+                ":has(label:contains('State'))" +
+                ":has(select[required])" +
+                ":has(option:contains('Belgium')):not([selected])" +
+                ":has(option:contains('France'))" +
+                ":has(option:contains('Canada'))" +
+                ":has(option:contains('44 - UK'))" +
+                ":not(:has(option:contains('Germany')))",
         },
-    },
-    // Check that the resulting form behavior is correct.
-    {
-        content: "Check that field B prefill text is set",
-        trigger: `:iframe ${triggerFieldByLabel("field B")}:has(input[value="prefilled"])`,
-    }, {
-        content: "Check that field A is visible",
-        trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field A")}:visible)`,
-    },
-    // A) Check that if we edit again and save again the default value is
-    // not deleted.
-    // B) Add a 3rd field. Field A's visibility is tied to field B being set,
-    // field B is autopopulated and its visibility is tied to field C being
-    // set, and field C is empty.
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: 'Edit the form',
-        trigger: ":iframe .s_website_form_field input",
-        run: 'click',
-    },
-    ...addCustomField("char", "text", "field C", false),
-    ...selectFieldByLabel("field B"),
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    {
-        content: "Verify that the default comparator should be set",
-        trigger: ".o_customize_tab #hidden_condition_opt:not(:empty)",
-    },
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='field C']"
-    ),
-    ...selectButtonByText("Is equal to", "Is set"),
-    ...selectFieldByLabel("field C"),
-    ...clickOnSave(),
 
-    // Check that the resulting form behavior is correct.
-    {
-        content: 'Verify that the value has not been deleted',
-        trigger: ":iframe .s_website_form_field input[value='John Smith']",
-        run: "click",
-    }, {
-        content: "Check that fields A and B are not visible and that field B's prefill text is still set",
-        trigger: ":iframe .s_website_form" +
-            `:has(${triggerFieldByLabel("field A")}:not(:visible))` +
-            `:has(${triggerFieldByLabel("field B")}` +
-            `:has(input[value="prefilled"]):not(:visible))`,
-    }, {
-        content: "Type something in field C",
-        trigger: `:iframe ${triggerFieldByLabel("field C")} input`,
-        run: "edit Sesame",
-    }, {
-        content: "Check that fields A and B are visible",
-        trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field B")}:visible)` +
-            `:has(${triggerFieldByLabel("field A")}:visible)`,
-    },
+        ...addExistingField("attachment_ids", "file", "Invoice Scan"),
+        {
+            content: "Insure the history step of the editor is not checking for unbreakable",
+            trigger: ":iframe #wrapwrap",
+            run() {
+                const editor = editorsWeakMap.get(this.anchor.ownerDocument);
+                editor.shared.history.addStep();
+            },
+        },
+        // Edit the submit button using linkDialog.
+        {
+            content: "Click submit button to show edit popover",
+            trigger: ":iframe .s_website_form_send",
+            run: "click",
+        },
+        {
+            content: "Click on Edit Link in Popover",
+            trigger: ".o-we-linkpopover .o_we_edit_link",
+            run: "click",
+        },
+        {
+            content: "Change button's style",
+            trigger: ".o-we-linkpopover select[name='link_type']",
+            run: "select custom",
+        },
+        {
+            trigger: ".o-we-linkpopover select[name=link_style_shape]",
+            run: "select rounded-circle",
+        },
+        {
+            trigger: ".o-we-linkpopover select[name='link_style_size']",
+            run: "select sm",
+        },
+        {
+            trigger: ".o-we-linkpopover .o_we_apply_link",
+            run: "click",
+        },
+        {
+            content: "Check the resulting button",
+            trigger: ":iframe .s_website_form_send.btn.btn-sm.btn-custom.rounded-circle",
+        },
+        // Add a default value to a auto-fillable field.
+        ...selectFieldByLabel("Your Name"),
+        {
+            content: "Set a default value to the name field",
+            trigger: "[data-label='Default Value'] input",
+            run: "edit John Smith",
+        },
 
-    // Have field A's visibility tied to field B containing something,
-    // while field B's visibility is also tied to another field.
-    ...clickOnEditAndWaitEditMode(),
-    ...selectFieldByLabel("field A"),
-    {
-        content: "Verify that the form editor appeared",
-        trigger: ".o_customize_tab div[data-container-title='Form'] .we-bg-options-container",
-    },
-    ...selectButtonByText("Is set", "Contains"),
-    {
-        content: "Tie the visibility of field A to field B containing 'peek-a-boo'",
-        trigger: "[data-name='hidden_condition_additional_text'] input",
-        run: "edit peek-a-boo",
-    },
-    ...clickOnSave(),
+        // Add two fields: the 1st one's visibility is tied to the 2nd one
+        // being set, and the 2nd one is autopopulated. As a result, both
+        // should be visible by default.
+        ...addCustomField("char", "text", "field A", false, { visibility: CONDITIONALVISIBILITY }),
+        ...addCustomField("char", "text", "field B", false),
+        ...selectFieldByLabel("field A"),
+        ...selectButtonByData("Your Name", "[data-action-value='field B']"),
+        ...selectButtonByText("Is equal to", "Is set"),
+        ...selectFieldByLabel("field B"),
+        {
+            content: "Insert default value",
+            trigger: "[data-label='Default Value'] input",
+            run: "edit prefilled",
+        },
+        ...clickOnSave(),
+        {
+            content: "Verify value attribute and property",
+            trigger:
+                ":iframe .s_website_form_field input[value='John Smith']:value('Mitchell Admin')",
+            run: "click",
+        },
+        {
+            content: "Verify that phone field is still auto-fillable",
+            trigger:
+                ':iframe .s_website_form_field input[data-fill-with="phone"]:value("+1 555-555-5555")',
+            run: "click",
+        },
+        {
+            content: "Check that the offset and width of the Phone Number field are still correct",
+            trigger: ':iframe .s_website_form_field input[data-fill-with="phone"]',
+            run: function () {
+                const fieldEl = this.anchor.closest(".s_website_form_field");
+                if (!fieldEl.classList.contains("offset-lg-3")) {
+                    throw new Error("The offset of the Phone Number field should have been kept");
+                }
+                if (!fieldEl.classList.contains("col-lg-9")) {
+                    throw new Error("The width of the Phone Number field should have been kept");
+                }
+            },
+        },
+        // Check that the resulting form behavior is correct.
+        {
+            content: "Check that field B prefill text is set",
+            trigger: `:iframe ${triggerFieldByLabel("field B")}:has(input[value="prefilled"])`,
+        },
+        {
+            content: "Check that field A is visible",
+            trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field A")}:visible)`,
+        },
+        // A) Check that if we edit again and save again the default value is
+        // not deleted.
+        // B) Add a 3rd field. Field A's visibility is tied to field B being set,
+        // field B is autopopulated and its visibility is tied to field C being
+        // set, and field C is empty.
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Edit the form",
+            trigger: ":iframe .s_website_form_field input",
+            run: "click",
+        },
+        ...addCustomField("char", "text", "field C", false),
+        ...selectFieldByLabel("field B"),
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        {
+            content: "Verify that the default comparator should be set",
+            trigger: ".o_customize_tab #hidden_condition_opt:not(:empty)",
+        },
+        ...selectButtonByData("Your Name", "[data-action-value='field C']"),
+        ...selectButtonByText("Is equal to", "Is set"),
+        ...selectFieldByLabel("field C"),
+        ...clickOnSave(),
 
-    // Check that the resulting form works and does not raise an error.
-     {
-        content: "Write anything in C",
-        trigger: `:iframe ${triggerFieldByLabel("field C")} input`,
-        run: "edit Mellon && press Tab",
-    }, {
-        content: "Check that field B is visible, but field A is not",
-        trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field B")}:visible)` +
-            `:has(${triggerFieldByLabel("field A")}:not(:visible))`,
-    }, {
-        content: "Insert 'peek-a-boo' in field B",
-        trigger: `:iframe ${triggerFieldByLabel("field B")} input`,
-        run: "edit peek-a-boo",
-    }, {
-        content: "Check that field A is visible",
-        trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field A")}:visible)`,
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...addCustomField("char", "text", "Philippe of Belgium", false),
-    {
-        content: "Select the 'Subject' field",
-        trigger: ':iframe .s_website_form_field.s_website_form_model_required:has(label:contains("Subject"))',
-        run: "click",
-    },
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='Philippe of Belgium']"
-    ),
-    ...selectButtonByText("Is equal to", "Is set"),
-    {
-        content: "Set a default value to the 'Subject' field",
-        trigger: "[data-label='Default Value'] input",
-        run: "edit Default Subject",
-    },
-    {
-        content: "Select the 'Your Message' field",
-        trigger: ':iframe .s_website_form_field.s_website_form_required:has(label:contains("Your Message"))',
-        run: "click",
-    },
-    ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='Philippe of Belgium']"
-    ),
-    ...selectButtonByText("Is equal to", "Is set"),
+        // Check that the resulting form behavior is correct.
+        {
+            content: "Verify that the value has not been deleted",
+            trigger: ":iframe .s_website_form_field input[value='John Smith']",
+            run: "click",
+        },
+        {
+            content:
+                "Check that fields A and B are not visible and that field B's prefill text is still set",
+            trigger:
+                ":iframe .s_website_form" +
+                `:has(${triggerFieldByLabel("field A")}:not(:visible))` +
+                `:has(${triggerFieldByLabel("field B")}` +
+                `:has(input[value="prefilled"]):not(:visible))`,
+        },
+        {
+            content: "Type something in field C",
+            trigger: `:iframe ${triggerFieldByLabel("field C")} input`,
+            run: "edit Sesame",
+        },
+        {
+            content: "Check that fields A and B are visible",
+            trigger:
+                `:iframe .s_website_form:has(${triggerFieldByLabel("field B")}:visible)` +
+                `:has(${triggerFieldByLabel("field A")}:visible)`,
+        },
 
-    ...clickOnSave(),
-    // Ensure that a field required for a model is not disabled when
-    // conditionally hidden.
-    {
-        content: "Check that the 'Subject' field is not disabled",
-        trigger: `:iframe .s_website_form:has(.s_website_form_model_required ` +
-            `.s_website_form_input[value="Default Subject"]:not([disabled]):not(:visible))`,
-    },
-    // Ensure that a required field (but not for a model) is disabled when
-    // conditionally hidden.
-    {
-        content: "Check that the 'Your Message' field is disabled",
-        trigger: `:iframe .s_website_form:has(.s_website_form_required ` +
-            `.s_website_form_input[name="body_html"][required][disabled]:not(:visible))`,
-    },
+        // Have field A's visibility tied to field B containing something,
+        // while field B's visibility is also tied to another field.
+        ...clickOnEditAndWaitEditMode(),
+        ...selectFieldByLabel("field A"),
+        {
+            content: "Verify that the form editor appeared",
+            trigger: ".o_customize_tab div[data-container-title='Form'] .we-bg-options-container",
+        },
+        ...selectButtonByText("Is set", "Contains"),
+        {
+            content: "Tie the visibility of field A to field B containing 'peek-a-boo'",
+            trigger: "[data-name='hidden_condition_additional_text'] input",
+            run: "edit peek-a-boo",
+        },
+        ...clickOnSave(),
 
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Select the 'Subject' field",
-        trigger: ':iframe .s_website_form_field.s_website_form_model_required:has(label:contains("Subject"))',
-        run: "click",
-    },
-    ...changeOptionInPopover("Field", "Visibility", "Always Visible"),
-    {
-        content: "Empty the default value of the 'Subject' field",
-        trigger: "[data-label='Default Value'] input",
-        run: "clear",
-    },
-    {
-        content: "Select the 'Your Message' field",
-        trigger: ':iframe .s_website_form_field.s_website_form_required:has(label:contains("Your Message"))',
-        run: "click",
-    },
-    ...changeOptionInPopover("Field", "Visibility", "Always Visible"),
-    // This step is to ensure select fields are properly cleaned before
-    // exiting edit mode
-    {
-        content: "Click on the select field",
-        trigger: ":iframe .s_website_form_field select",
-        run: "click",
-    },
-    {
-        content: 'Click on the submit button',
-        trigger: ':iframe .s_website_form_send',
-        run: 'click',
-    },
-    {
-        content: 'Change the Recipient Email',
-        trigger: '[data-label="Recipient Email"] input',
-        run: "edit test@test.test",
-    },
-    // Test a field visibility when it's tied to another Date [Time] field
-    // being set.
-    ...addCustomField("char", "text", "field D", false, { visibility: CONDITIONALVISIBILITY }),
-    ...addCustomField("date", "text", "field E", false),
-    ...selectFieldByLabel("field D"),
-    ...selectButtonByData(
-        "Your Name",
-        "[data-action-value='field E']"
-    ),
-    {
-        content: "Open the comparator select",
-        trigger: "#hidden_condition_time_comparators_opt",
-        run: "click",
-    },
-    {
-        content: "Select the 'Is after' comparator",
-        trigger: ".o_popover div[role='menuitem']:contains('Is after')",
-        run: "click",
-    },
-    {
-        content: "Enter a date in the date input",
-        trigger: "[data-name='hidden_condition_additional_text'] input",
-        run: "edit 03/28/2017",
-    },
-    ...clickOnSave(),
-    {
-        content: "Enter an invalid date in field E",
-        trigger: `:iframe ${triggerFieldByLabel("field E")} input`,
-        run() {
-            this.anchor.value = "25071981";
-            this.anchor.dispatchEvent(new InputEvent("input", {bubbles: true}));
-            // Adds a delay to let the input code run.
-            setTimeout(() => {
-                this.anchor.classList.add("invalidDate");
-            }, 500);
+        // Check that the resulting form works and does not raise an error.
+        {
+            content: "Write anything in C",
+            trigger: `:iframe ${triggerFieldByLabel("field C")} input`,
+            run: "edit Mellon && press Tab",
+        },
+        {
+            content: "Check that field B is visible, but field A is not",
+            trigger:
+                `:iframe .s_website_form:has(${triggerFieldByLabel("field B")}:visible)` +
+                `:has(${triggerFieldByLabel("field A")}:not(:visible))`,
+        },
+        {
+            content: "Insert 'peek-a-boo' in field B",
+            trigger: `:iframe ${triggerFieldByLabel("field B")} input`,
+            run: "edit peek-a-boo",
+        },
+        {
+            content: "Check that field A is visible",
+            trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field A")}:visible)`,
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...addCustomField("char", "text", "Philippe of Belgium", false),
+        {
+            content: "Select the 'Subject' field",
+            trigger:
+                ':iframe .s_website_form_field.s_website_form_model_required:has(label:contains("Subject"))',
+            run: "click",
+        },
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        ...selectButtonByData("Your Name", "[data-action-value='Philippe of Belgium']"),
+        ...selectButtonByText("Is equal to", "Is set"),
+        {
+            content: "Set a default value to the 'Subject' field",
+            trigger: "[data-label='Default Value'] input",
+            run: "edit Default Subject",
+        },
+        {
+            content: "Select the 'Your Message' field",
+            trigger:
+                ':iframe .s_website_form_field.s_website_form_required:has(label:contains("Your Message"))',
+            run: "click",
         },
-    },
-    {
-        content: "Enter an valid date in field E",
-        trigger: `:iframe ${triggerFieldByLabel("field E")} input.invalidDate`,
-        run() {
-            this.anchor.classList.remove("invalidDate");
-            this.anchor.value = "07/25/1981";
-            this.anchor.dispatchEvent(new InputEvent("input", {bubbles: true}));
-            // Adds a delay to let the input code run.
-            setTimeout(() => {
-                this.anchor.classList.add("validDate");
-            }, 500);
+        ...changeOptionInPopover("Field", "Visibility", "Visible only if"),
+        ...selectButtonByData("Your Name", "[data-action-value='Philippe of Belgium']"),
+        ...selectButtonByText("Is equal to", "Is set"),
+
+        ...clickOnSave(),
+        // Ensure that a field required for a model is not disabled when
+        // conditionally hidden.
+        {
+            content: "Check that the 'Subject' field is not disabled",
+            trigger:
+                `:iframe .s_website_form:has(.s_website_form_model_required ` +
+                `.s_website_form_input[value="Default Subject"]:not([disabled]):not(:visible))`,
         },
-    },
-    {
-        content: "Click to open the date picker popover from field E",
-        trigger: `:iframe ${triggerFieldByLabel("field E")} input.validDate`,
-        run(actions) {
-            this.anchor.classList.remove("validDate");
-            actions.click();
+        // Ensure that a required field (but not for a model) is disabled when
+        // conditionally hidden.
+        {
+            content: "Check that the 'Your Message' field is disabled",
+            trigger:
+                `:iframe .s_website_form:has(.s_website_form_required ` +
+                `.s_website_form_input[name="body_html"][required][disabled]:not(:visible))`,
         },
-    },
-    {
-        content: "Select today's date from the date picker",
-        trigger: ":iframe .o_datetime_picker .o_date_item_cell.o_today",
-        run: "click",
-    },
-    {
-        content: "Check that field D is visible",
-        trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field D")}:visible)`,
-    },
-    ...clickOnEditAndWaitEditMode(),
-    // The next four calls to "addCustomField" are there to ensure such
-    // characters do not make the form editor crash.
-    ...addCustomField("char", "text", "''", false),
-    ...addCustomField("char", "text", '""', false),
-    ...addCustomField("char", "text", "``", false),
-    ...addCustomField("char", "text", "\\", false),
 
-    // Ensure that the description option is working as wanted.
-    ...addCustomField("char", "text", "Check description option", false),
-    changeOption("Field", "[data-action-id='toggleDescription'] input"),
-    {
-        content: "Ensure that the description has correctly been added on the field",
-        trigger: ":iframe .s_website_form_field:contains('Check description option') .s_website_form_field_description",
-    },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Select the 'Subject' field",
+            trigger:
+                ':iframe .s_website_form_field.s_website_form_model_required:has(label:contains("Subject"))',
+            run: "click",
+        },
+        ...changeOptionInPopover("Field", "Visibility", "Always Visible"),
+        {
+            content: "Empty the default value of the 'Subject' field",
+            trigger: "[data-label='Default Value'] input",
+            run: "clear",
+        },
+        {
+            content: "Select the 'Your Message' field",
+            trigger:
+                ':iframe .s_website_form_field.s_website_form_required:has(label:contains("Your Message"))',
+            run: "click",
+        },
+        ...changeOptionInPopover("Field", "Visibility", "Always Visible"),
+        // This step is to ensure select fields are properly cleaned before
+        // exiting edit mode
+        {
+            content: "Click on the select field",
+            trigger: ":iframe .s_website_form_field select",
+            run: "click",
+        },
+        {
+            content: "Click on the submit button",
+            trigger: ":iframe .s_website_form_send",
+            run: "click",
+        },
+        {
+            content: "Change the Recipient Email",
+            trigger: '[data-label="Recipient Email"] input',
+            run: "edit test@test.test",
+        },
+        // Test a field visibility when it's tied to another Date [Time] field
+        // being set.
+        ...addCustomField("char", "text", "field D", false, { visibility: CONDITIONALVISIBILITY }),
+        ...addCustomField("date", "text", "field E", false),
+        ...selectFieldByLabel("field D"),
+        ...selectButtonByData("Your Name", "[data-action-value='field E']"),
+        {
+            content: "Open the comparator select",
+            trigger: "#hidden_condition_time_comparators_opt",
+            run: "click",
+        },
+        {
+            content: "Select the 'Is after' comparator",
+            trigger: ".o_popover div[role='menuitem']:contains('Is after')",
+            run: "click",
+        },
+        {
+            content: "Enter a date in the date input",
+            trigger: "[data-name='hidden_condition_additional_text'] input",
+            run: "edit 03/28/2017",
+        },
+        ...clickOnSave(),
+        {
+            content: "Enter an invalid date in field E",
+            trigger: `:iframe ${triggerFieldByLabel("field E")} input`,
+            run() {
+                this.anchor.value = "25071981";
+                this.anchor.dispatchEvent(new InputEvent("input", { bubbles: true }));
+                // Adds a delay to let the input code run.
+                setTimeout(() => {
+                    this.anchor.classList.add("invalidDate");
+                }, 500);
+            },
+        },
+        {
+            content: "Enter an valid date in field E",
+            trigger: `:iframe ${triggerFieldByLabel("field E")} input.invalidDate`,
+            run() {
+                this.anchor.classList.remove("invalidDate");
+                this.anchor.value = "07/25/1981";
+                this.anchor.dispatchEvent(new InputEvent("input", { bubbles: true }));
+                // Adds a delay to let the input code run.
+                setTimeout(() => {
+                    this.anchor.classList.add("validDate");
+                }, 500);
+            },
+        },
+        {
+            content: "Click to open the date picker popover from field E",
+            trigger: `:iframe ${triggerFieldByLabel("field E")} input.validDate`,
+            run(actions) {
+                this.anchor.classList.remove("validDate");
+                actions.click();
+            },
+        },
+        {
+            content: "Select today's date from the date picker",
+            trigger: ":iframe .o_datetime_picker .o_date_item_cell.o_today",
+            run: "click",
+        },
+        {
+            content: "Check that field D is visible",
+            trigger: `:iframe .s_website_form:has(${triggerFieldByLabel("field D")}:visible)`,
+        },
+        ...clickOnEditAndWaitEditMode(),
+        // The next four calls to "addCustomField" are there to ensure such
+        // characters do not make the form editor crash.
+        ...addCustomField("char", "text", "''", false),
+        ...addCustomField("char", "text", '""', false),
+        ...addCustomField("char", "text", "``", false),
+        ...addCustomField("char", "text", "\\", false),
 
-    ...clickOnSave(),
-    {
-        content: 'Verify that the recipient email has been saved',
-        // We have to this that way because the input type = hidden.
-        trigger: ':iframe form:has(input[name="email_to"][value="test@test.test"])',
-    }
-]);
+        // Ensure that the description option is working as wanted.
+        ...addCustomField("char", "text", "Check description option", false),
+        changeOption("Field", "[data-action-id='toggleDescription'] input"),
+        {
+            content: "Ensure that the description has correctly been added on the field",
+            trigger:
+                ":iframe .s_website_form_field:contains('Check description option') .s_website_form_field_description",
+        },
+
+        ...clickOnSave(),
+        {
+            content: "Verify that the recipient email has been saved",
+            // We have to this that way because the input type = hidden.
+            trigger: ':iframe form:has(input[name="email_to"][value="test@test.test"])',
+        },
+    ]
+);
 
 function editContactUs(steps) {
-return [
-    {
-        trigger: ".o-website-builder_sidebar .o_snippet_thumbnail",
-    },
-    {
-        content: "Select the contact us form by clicking on an input field",
-        trigger: ":iframe .s_website_form input",
-        run: "click",
-    },
-    ...steps,
-    ...clickOnSave(),
-];
+    return [
+        {
+            trigger: ".o-website-builder_sidebar .o_snippet_thumbnail",
+        },
+        {
+            content: "Select the contact us form by clicking on an input field",
+            trigger: ":iframe .s_website_form input",
+            run: "click",
+        },
+        ...steps,
+        ...clickOnSave(),
+    ];
 }
 
-registerWebsitePreviewTour('website_form_contactus_edition_with_email', {
-    url: '/contactus',
-    edition: true,
-}, () => editContactUs([
+registerWebsitePreviewTour(
+    "website_form_contactus_edition_with_email",
     {
-        content: "Change the Recipient Email",
-        trigger: "div[data-label='Recipient Email'] input",
-        run: "edit test@test.test",
+        url: "/contactus",
+        edition: true,
     },
-]));
-registerWebsitePreviewTour('website_form_contactus_edition_no_email', {
-    url: '/contactus',
-    edition: true,
-}, () => editContactUs([
+    () =>
+        editContactUs([
+            {
+                content: "Change the Recipient Email",
+                trigger: "div[data-label='Recipient Email'] input",
+                run: "edit test@test.test",
+            },
+        ])
+);
+registerWebsitePreviewTour(
+    "website_form_contactus_edition_no_email",
     {
-        content: "Change a random option",
-        trigger: "[data-action-id='setMark'] input",
-        run: "edit **",
-    }, {
-        content: "Check that the recipient email is correct",
-        trigger: "div[data-label='Recipient Email'] input:value('website_form_contactus_edition_no_email@mail.com')",
+        url: "/contactus",
+        edition: true,
     },
-]));
+    () =>
+        editContactUs([
+            {
+                content: "Change a random option",
+                trigger: "[data-action-id='setMark'] input",
+                run: "edit **",
+            },
+            {
+                content: "Check that the recipient email is correct",
+                trigger:
+                    "div[data-label='Recipient Email'] input:value('website_form_contactus_edition_no_email@mail.com')",
+            },
+        ])
+);
 
 registerWebsitePreviewTour(
     "website_form_conditional_required_checkboxes",
@@ -1031,103 +1092,116 @@ registerWebsitePreviewTour(
     ]
 );
 
-registerWebsitePreviewTour('website_form_contactus_change_random_option', {
-    url: '/contactus',
-    edition: true,
-}, () => editContactUs([
+registerWebsitePreviewTour(
+    "website_form_contactus_change_random_option",
     {
-        content: "Change a random option",
-        trigger: "[data-action-id='setMark'] input",
-        run: "edit **",
+        url: "/contactus",
+        edition: true,
     },
-]));
+    () =>
+        editContactUs([
+            {
+                content: "Change a random option",
+                trigger: "[data-action-id='setMark'] input",
+                run: "edit **",
+            },
+        ])
+);
 
-registerWebsitePreviewTour("website_form_nested_forms", {
-    url: "/my/account",
-    edition: true,
-},
-() => [
-    {
-        trigger: ".o-website-builder_sidebar .o_snippets_container .o_snippet",
-        noPrepend: true,
-    },
-    {
-        trigger: ".o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Form'].o_draggable .o_snippet_thumbnail",
-        content: "Try to drag the form into another form",
-        run: "drag_and_drop :iframe .o_customer_address_fill a",
-    },
+registerWebsitePreviewTour(
+    "website_form_nested_forms",
     {
-        content: "Check the form was not dropped into another form",
-        trigger:
-            ":iframe form[action='/my/address/submit']:not(:has([data-snippet='s_website_form']))",
-        run: () => null,
+        url: "/my/account",
+        edition: true,
     },
-]);
+    () => [
+        {
+            trigger: ".o-website-builder_sidebar .o_snippets_container .o_snippet",
+            noPrepend: true,
+        },
+        {
+            trigger:
+                ".o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Form'].o_draggable .o_snippet_thumbnail",
+            content: "Try to drag the form into another form",
+            run: "drag_and_drop :iframe .o_customer_address_fill a",
+        },
+        {
+            content: "Check the form was not dropped into another form",
+            trigger:
+                ":iframe form[action='/my/address/submit']:not(:has([data-snippet='s_website_form']))",
+            run: () => null,
+        },
+    ]
+);
 
 // Check that the editable form content is actually editable.
-registerWebsitePreviewTour("website_form_editable_content", {
-    url: "/",
-    edition: true,
-}, () => [
-    {
-        trigger: ".o-snippets-menu div.o_snippet",
-    },
-    {
-        trigger: `.o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name="Form"].o_draggable .o_snippet_thumbnail`,
-        run: "drag_and_drop :iframe #wrap",
-    },
+registerWebsitePreviewTour(
+    "website_form_editable_content",
     {
-        trigger: ":iframe .s_website_form_field",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Check that a form field is not editable",
-        trigger: ":iframe section.s_website_form input",
-        run: function () {
-            if (this.anchor.isContentEditable) {
-                console.error("A form field should not be editable.");
-            }
+    () => [
+        {
+            trigger: ".o-snippets-menu div.o_snippet",
         },
-    },
-    goBackToBlocks(),
-    ...insertSnippet({id: "s_three_columns", name: "Columns", groupName: "Columns"}),
-    {
-        content: "Select the first column",
-        trigger: ":iframe .s_three_columns .row > :nth-child(1)",
-        run: "click",
-    },
-    {
-        content: "Drag and drop the selected column inside the form",
-        trigger: ".o_overlay_options .o_move_handle",
-        run: "drag_and_drop :iframe section.s_website_form",
-    },
-    {
-        trigger: ":iframe section.s_website_form .col-lg-4[contenteditable=true]",
-    },
-    {
-        content: "Click on the text inside the dropped form column",
-        trigger: ":iframe section.s_website_form h2.card-title",
-        run: "dblclick",
-    },
-    {
-        // Simulate a user interaction with the editable content.
-        content: "Update the text inside the form column",
-        trigger: ":iframe section.s_website_form h2.card-title",
-        run: "editor ABC",
-    },
-    {
-        content: "Check that the new text value was correctly set",
-        trigger: ":iframe section.s_website_form h2:contains(/^ABC$/)",
-        run() {
-            this.anchor.scrollIntoView();
-        }
-    },
-    {
-        content: "Remove the dropped column",
-        trigger: ".o_overlay_options .oe_snippet_remove",
-        run: "click",
-    },
-    ...clickOnSave(),
-]);
+        {
+            trigger: `.o-snippets-menu .o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name="Form"].o_draggable .o_snippet_thumbnail`,
+            run: "drag_and_drop :iframe #wrap",
+        },
+        {
+            trigger: ":iframe .s_website_form_field",
+        },
+        {
+            content: "Check that a form field is not editable",
+            trigger: ":iframe section.s_website_form input",
+            run: function () {
+                if (this.anchor.isContentEditable) {
+                    console.error("A form field should not be editable.");
+                }
+            },
+        },
+        goBackToBlocks(),
+        ...insertSnippet({ id: "s_three_columns", name: "Columns", groupName: "Columns" }),
+        {
+            content: "Select the first column",
+            trigger: ":iframe .s_three_columns .row > :nth-child(1)",
+            run: "click",
+        },
+        {
+            content: "Drag and drop the selected column inside the form",
+            trigger: ".o_overlay_options .o_move_handle",
+            run: "drag_and_drop :iframe section.s_website_form",
+        },
+        {
+            trigger: ":iframe section.s_website_form .col-lg-4[contenteditable=true]",
+        },
+        {
+            content: "Click on the text inside the dropped form column",
+            trigger: ":iframe section.s_website_form h2.card-title",
+            run: "dblclick",
+        },
+        {
+            // Simulate a user interaction with the editable content.
+            content: "Update the text inside the form column",
+            trigger: ":iframe section.s_website_form h2.card-title",
+            run: "editor ABC",
+        },
+        {
+            content: "Check that the new text value was correctly set",
+            trigger: ":iframe section.s_website_form h2:contains(/^ABC$/)",
+            run() {
+                this.anchor.scrollIntoView();
+            },
+        },
+        {
+            content: "Remove the dropped column",
+            trigger: ".o_overlay_options .oe_snippet_remove",
+            run: "click",
+        },
+        ...clickOnSave(),
+    ]
+);
 
 registerWebsitePreviewTour(
     "website_form_special_characters",
@@ -1172,100 +1246,108 @@ registerWebsitePreviewTour(
     ]
 );
 
-registerWebsitePreviewTour("website_form_duplicate_field_ids", {
-    url: '/',
-    edition: true,
-}, () => [
-    // Fields in two form snippet should have unique IDs
-    {
-        content: "Drop a form snippet",
-        trigger: ".o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Form'].o_draggable .o_snippet_thumbnail",
-        run: "drag_and_drop :iframe #wrap",
-    },
-    {
-        content: "Check if form snippet is dropped",
-        trigger: ":iframe .s_website_form_field",
-    },
-    ...insertSnippet({
-        id: "s_title_form",
-        name: "Title - Form",
-        groupName: "Contact & Forms",
-    }),
-    compareIds({
-        content: "Check that the first field of both the form snippets have different IDs",
-        firstElSelector: ".s_website_form input[name='name']",
-        secondElSelector: ".s_title_form .s_website_form input[name='name']",
-        errorMessage: "The first fields of two different form snippet have the same ID",
-    }),
-    {
-        content: "Click on the form snippet",
-        trigger: ":iframe .s_website_form",
-        run: "click",
-    },
-    {
-        content: "Delete the form snippet",
-        trigger: "[data-container-title='Form'] .options-container-header .oe_snippet_remove",
-        run: "click",
-    },
-    // Cloning a snippet with form in it should generate new IDs for the cloned
-    // form fields
-    {
-        content: "Click on 'Title - Form' snippet",
-        trigger: ":iframe .s_title_form",
-        run: "click",
-    },
-    {
-        content: "Clone the 'Title - Form' snippet",
-        trigger: "[data-container-title='Title - Form'] .options-container-header .oe_snippet_clone",
-        run: "click",
-    },
-    {
-        content: "Check if the form is cloned",
-        trigger: ":iframe .s_title_form:nth-of-type(2)",
-    },
-    compareIds({
-        content: "Check if the first field of forms in original and cloned snippets have different IDs",
-        firstElSelector: ".s_title_form .s_website_form input[name='name']",
-        secondElSelector: ".s_title_form:nth-of-type(2) .s_website_form input[name='name']",
-        errorMessage: "The first fields of original and cloned form snippet have the same ID",
-    }),
-    // Cloning a form itself should should generate new IDs for the cloned form
-    // fields
-    {
-        content: "Click on the form in 'Title - Form' snippet",
-        trigger: ":iframe .s_title_form .s_website_form",
-        run: "click",
-    },
-    {
-        content: "Clone the form",
-        trigger: "[data-container-title='Form'] .options-container-header .oe_snippet_clone",
-        run: "click",
-    },
-    {
-        content: "Check if the form is cloned",
-        trigger: ":iframe .s_title_form .s_website_form:nth-of-type(2)",
-    },
-    compareIds({
-        content: "Check if the first field of original and cloned form snippets have different IDs",
-        firstElSelector: ".s_title_form .s_website_form input[name='name']",
-        secondElSelector: ".s_title_form .s_website_form:nth-of-type(2) input[name='name']",
-        errorMessage: "The first fields of original and cloned form snippet have the same ID",
-    }),
-    // Cloning a field should generate new ID for the cloned field
-    {
-        content: "Click on the name field",
-        trigger: ":iframe .s_title_form .s_website_form input[name='name']",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "website_form_duplicate_field_ids",
     {
-        content: "Clone the name field",
-        trigger: "[data-container-title='Field'] .options-container-header .oe_snippet_clone",
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    compareIds({
-        content: "Check if both, original and cloned name fields have unique IDs",
-        firstElSelector: ".s_title_form .s_website_form input[name='name']",
-        secondElSelector: ".s_title_form [data-name='Field']:nth-of-type(3) input[name='name']",
-        errorMessage: "Original and cloned fields have the same ID",
-    })
-]);
+    () => [
+        // Fields in two form snippet should have unique IDs
+        {
+            content: "Drop a form snippet",
+            trigger:
+                ".o_block_tab:not(.o_we_ongoing_insertion) .o_snippet[name='Form'].o_draggable .o_snippet_thumbnail",
+            run: "drag_and_drop :iframe #wrap",
+        },
+        {
+            content: "Check if form snippet is dropped",
+            trigger: ":iframe .s_website_form_field",
+        },
+        ...insertSnippet({
+            id: "s_title_form",
+            name: "Title - Form",
+            groupName: "Contact & Forms",
+        }),
+        compareIds({
+            content: "Check that the first field of both the form snippets have different IDs",
+            firstElSelector: ".s_website_form input[name='name']",
+            secondElSelector: ".s_title_form .s_website_form input[name='name']",
+            errorMessage: "The first fields of two different form snippet have the same ID",
+        }),
+        {
+            content: "Click on the form snippet",
+            trigger: ":iframe .s_website_form",
+            run: "click",
+        },
+        {
+            content: "Delete the form snippet",
+            trigger: "[data-container-title='Form'] .options-container-header .oe_snippet_remove",
+            run: "click",
+        },
+        // Cloning a snippet with form in it should generate new IDs for the
+        // cloned form fields.
+        {
+            content: "Click on 'Title - Form' snippet",
+            trigger: ":iframe .s_title_form",
+            run: "click",
+        },
+        {
+            content: "Clone the 'Title - Form' snippet",
+            trigger:
+                "[data-container-title='Title - Form'] .options-container-header .oe_snippet_clone",
+            run: "click",
+        },
+        {
+            content: "Check if the form is cloned",
+            trigger: ":iframe .s_title_form:nth-of-type(2)",
+        },
+        compareIds({
+            content:
+                "Check if the first field of forms in original and cloned snippets have different IDs",
+            firstElSelector: ".s_title_form .s_website_form input[name='name']",
+            secondElSelector: ".s_title_form:nth-of-type(2) .s_website_form input[name='name']",
+            errorMessage: "The first fields of original and cloned form snippet have the same ID",
+        }),
+        // Cloning a form itself should should generate new IDs for the cloned
+        // form fields.
+        {
+            content: "Click on the form in 'Title - Form' snippet",
+            trigger: ":iframe .s_title_form .s_website_form",
+            run: "click",
+        },
+        {
+            content: "Clone the form",
+            trigger: "[data-container-title='Form'] .options-container-header .oe_snippet_clone",
+            run: "click",
+        },
+        {
+            content: "Check if the form is cloned",
+            trigger: ":iframe .s_title_form .s_website_form:nth-of-type(2)",
+        },
+        compareIds({
+            content:
+                "Check if the first field of original and cloned form snippets have different IDs",
+            firstElSelector: ".s_title_form .s_website_form input[name='name']",
+            secondElSelector: ".s_title_form .s_website_form:nth-of-type(2) input[name='name']",
+            errorMessage: "The first fields of original and cloned form snippet have the same ID",
+        }),
+        // Cloning a field should generate new ID for the cloned field
+        {
+            content: "Click on the name field",
+            trigger: ":iframe .s_title_form .s_website_form input[name='name']",
+            run: "click",
+        },
+        {
+            content: "Clone the name field",
+            trigger: "[data-container-title='Field'] .options-container-header .oe_snippet_clone",
+            run: "click",
+        },
+        compareIds({
+            content: "Check if both, original and cloned name fields have unique IDs",
+            firstElSelector: ".s_title_form .s_website_form input[name='name']",
+            secondElSelector: ".s_title_form [data-name='Field']:nth-of-type(3) input[name='name']",
+            errorMessage: "Original and cloned fields have the same ID",
+        }),
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_form_editor_frontend.js b/addons/website/static/tests/tours/website_form_editor_frontend.js
index 5d0adaecde06b..bfef2b5616262 100644
--- a/addons/website/static/tests/tours/website_form_editor_frontend.js
+++ b/addons/website/static/tests/tours/website_form_editor_frontend.js
@@ -3,8 +3,9 @@ import { registry } from "@web/core/registry";
 
 registry.category("web_tour.tours").add("website_form_editor_tour_submit", {
     steps: () => [
-    {
-        trigger:  "form[data-model_name='mail.mail']" +
+        {
+            trigger:
+                "form[data-model_name='mail.mail']" +
                 "[data-success-page='/contactus-thank-you']" +
                 ":has(.s_website_form_field:has(label:contains('Your Name')):has(input[type='text'][name='name'][required]))" +
                 ":has(.s_website_form_field:has(label:contains('Your Email')):has(input[type='email'][name='email_from'][required]))" +
@@ -26,14 +27,15 @@ registry.category("web_tour.tours").add("website_form_editor_tour_submit", {
                 ":has(.s_website_form_field:has(label:contains('Invoice Scan')))" +
                 ":has(.s_website_form_field:has(input[name='email_to'][value='test@test.test']))" +
                 ":has(.s_website_form_field:has(input[name='website_form_signature']))",
-    },
-    {
-        content:  "Try to send the form with some required fields not filled in",
-        trigger:  ".s_website_form_send",
-        run: "click",
-    },
-    {
-        trigger:  "form:has(#s_website_form_result.text-danger)" +
+        },
+        {
+            content: "Try to send the form with some required fields not filled in",
+            trigger: ".s_website_form_send",
+            run: "click",
+        },
+        {
+            trigger:
+                "form:has(#s_website_form_result.text-danger)" +
                 ":has(.s_website_form_field:has(label:contains('Your Name')):not(.o_has_error))" +
                 ":has(.s_website_form_field:has(label:contains('Email')).o_has_error)" +
                 ":has(.s_website_form_field:has(label:contains('Your Question')).o_has_error)" +
@@ -44,19 +46,20 @@ registry.category("web_tour.tours").add("website_form_editor_tour_submit", {
                 ":has(.s_website_form_field:has(label:contains('Service')):not(.o_has_error))" +
                 ":has(.s_website_form_field:has(label:contains('State')).o_has_error)" +
                 ":has(.s_website_form_field:has(label:contains('Invoice Scan')):not(.o_has_error))",
-    },
-    {
-        content:  "Check if required fields were detected and complete the Subject field",
-        trigger:  "input[name=subject]",
-        run:      "edit Jane Smith",
-    },
-    {
-        content:  "Update required field status by trying to Send again",
-        trigger:  ".s_website_form_send",
-        run: "click",
-    },
-    {
-        trigger:  "form:has(#s_website_form_result.text-danger)" +
+        },
+        {
+            content: "Check if required fields were detected and complete the Subject field",
+            trigger: "input[name=subject]",
+            run: "edit Jane Smith",
+        },
+        {
+            content: "Update required field status by trying to Send again",
+            trigger: ".s_website_form_send",
+            run: "click",
+        },
+        {
+            trigger:
+                "form:has(#s_website_form_result.text-danger)" +
                 ":has(.s_website_form_field:has(label:contains('Your Name')):not(.o_has_error))" +
                 ":has(.s_website_form_field:has(label:contains('Email')).o_has_error)" +
                 ":has(.s_website_form_field:has(label:contains('Your Question')).o_has_error)" +
@@ -67,19 +70,20 @@ registry.category("web_tour.tours").add("website_form_editor_tour_submit", {
                 ":has(.s_website_form_field:has(label:contains('Service')):not(.o_has_error))" +
                 ":has(.s_website_form_field:has(label:contains('State')).o_has_error)" +
                 ":has(.s_website_form_field:has(label:contains('Invoice Scan')):not(.o_has_error))",
-    },
-    {
-        content:  "Check if required fields were detected and complete the Message field",
-        trigger:  "textarea[name=body_html]",
-        run:      "edit A useless message"
-    },
-    {
-        content:  "Update required field status by trying to Send again",
-        trigger:  ".s_website_form_send",
-        run: "click",
-    },
-    {
-        trigger:  "form:has(#s_website_form_result.text-danger)" +
+        },
+        {
+            content: "Check if required fields were detected and complete the Message field",
+            trigger: "textarea[name=body_html]",
+            run: "edit A useless message",
+        },
+        {
+            content: "Update required field status by trying to Send again",
+            trigger: ".s_website_form_send",
+            run: "click",
+        },
+        {
+            trigger:
+                "form:has(#s_website_form_result.text-danger)" +
                 ":has(.s_website_form_field:has(label:contains('Your Name')):not(.o_has_error))" +
                 ":has(.s_website_form_field:has(label:contains('Email')).o_has_error)" +
                 ":has(.s_website_form_field:has(label:contains('Your Question')).o_has_error)" +
@@ -90,162 +94,171 @@ registry.category("web_tour.tours").add("website_form_editor_tour_submit", {
                 ":has(.s_website_form_field:has(label:contains('Service')):not(.o_has_error))" +
                 ":has(.s_website_form_field:has(label:contains('State')).o_has_error)" +
                 ":has(.s_website_form_field:has(label:contains('Invoice Scan')):not(.o_has_error))",
-    },
-    {
-        content:  "Check if required fields was detected and check a product. If this fails, you probably broke the cleanForSave.",
-        trigger:  "input[name=Products][value='Wiko Stairway']",
-        run: "click",
-    },
-    {
-        content:  "Open datetime picker",
-        trigger:  ".s_website_form_datetime input",
-        run:      "click",
-    },
-    {
-        content:  "Complete Date field",
-        trigger:  ".o_date_picker .o_today",
-        run: "click",
-    },
-    {
-        content:  "Check another product",
-        trigger:  "input[name='Products'][value='Xperia']",
-        run: "click",
-    },
-    {
-        content:  "Check a service",
-        trigger:  "input[name='Service'][value='Development Service']",
-        run: "click",
-    },
-    {
-        content:  "Select a State",
-        trigger:  "select[name='State']",
-        run:      "select Canada",
-    },
-    {
-        content:  "Complete Your Name field",
-        trigger:  "input[name='name']",
-        run:      "edit chhagan",
-    },
-    {
-        content:  "Complete Email field",
-        trigger:  "input[name=email_from]",
-        run:      "edit test@mail.com",
-    },
-    {
-        content: "Complete Subject field",
-        trigger: 'input[name="subject"]',
-        run: "edit subject",
-    },
-    {
-        content:  "Complete Your Question field",
-        trigger:  "textarea[name='description']",
-        run:      "edit magan",
-    },
-    {
-        content: "Check if conditional field is visible, it shouldn't.",
-        trigger: "body",
-        run: function () {
-            const style = window.getComputedStyle(this.anchor.getElementsByClassName('s_website_form_field_hidden_if')[0]);
-            if (style.display !== 'none') {
-                console.error('error This field should be invisible when the name is not odoo');
-            }
-        }
-    },
-    {
-        content: "Change name input",
-        trigger: "input[name='name']",
-        run: "edit odoo",
-    },
-    {
-        content: "Check if conditional field is visible, it should.",
-        trigger: "input[name='email_cc']",
-        run: "click",
-    },
-    {
-        content: "Select state option",
-        trigger: "select[name='State']",
-        run: "select 44 - UK",
-    },
-    {
-        content:  "Send the form",
-        trigger:  ".s_website_form_send",
-        run: "click",
-        expectUnloadPage: true,
-    },
-    {
-        content:  "Check form is submitted without errors",
-        trigger:  "#wrap:has(h1:contains('Thank You!'))",
-    }
-]});
+        },
+        {
+            content:
+                "Check if required fields was detected and check a product. If this fails, you probably broke the cleanForSave.",
+            trigger: "input[name=Products][value='Wiko Stairway']",
+            run: "click",
+        },
+        {
+            content: "Open datetime picker",
+            trigger: ".s_website_form_datetime input",
+            run: "click",
+        },
+        {
+            content: "Complete Date field",
+            trigger: ".o_date_picker .o_today",
+            run: "click",
+        },
+        {
+            content: "Check another product",
+            trigger: "input[name='Products'][value='Xperia']",
+            run: "click",
+        },
+        {
+            content: "Check a service",
+            trigger: "input[name='Service'][value='Development Service']",
+            run: "click",
+        },
+        {
+            content: "Select a State",
+            trigger: "select[name='State']",
+            run: "select Canada",
+        },
+        {
+            content: "Complete Your Name field",
+            trigger: "input[name='name']",
+            run: "edit chhagan",
+        },
+        {
+            content: "Complete Email field",
+            trigger: "input[name=email_from]",
+            run: "edit test@mail.com",
+        },
+        {
+            content: "Complete Subject field",
+            trigger: 'input[name="subject"]',
+            run: "edit subject",
+        },
+        {
+            content: "Complete Your Question field",
+            trigger: "textarea[name='description']",
+            run: "edit magan",
+        },
+        {
+            content: "Check if conditional field is visible, it shouldn't.",
+            trigger: "body",
+            run: function () {
+                const style = window.getComputedStyle(
+                    this.anchor.getElementsByClassName("s_website_form_field_hidden_if")[0]
+                );
+                if (style.display !== "none") {
+                    console.error("error This field should be invisible when the name is not odoo");
+                }
+            },
+        },
+        {
+            content: "Change name input",
+            trigger: "input[name='name']",
+            run: "edit odoo",
+        },
+        {
+            content: "Check if conditional field is visible, it should.",
+            trigger: "input[name='email_cc']",
+            run: "click",
+        },
+        {
+            content: "Select state option",
+            trigger: "select[name='State']",
+            run: "select 44 - UK",
+        },
+        {
+            content: "Send the form",
+            trigger: ".s_website_form_send",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        {
+            content: "Check form is submitted without errors",
+            trigger: "#wrap:has(h1:contains('Thank You!'))",
+        },
+    ],
+});
 
 registry.category("web_tour.tours").add("website_form_editor_tour_results", {
     steps: () => [
-    {
-        content: "Check mail.mail records have been created",
-        trigger: "body",
-        run: function () {
-            var mailDef = rpc(`/web/dataset/call_kw/mail.mail/search_count`, {
-                model: "mail.mail",
-                method: "search_count",
-                args: [[
-                    ['email_to', '=', 'test@test.test'],
-                    ['body_html', 'like', 'A useless message'],
-                    ['body_html', 'like', 'Service : Development Service'],
-                    ['body_html', 'like', 'State : 44 - UK'],
-                    ['body_html', 'like', 'Products : Xperia,Wiko Stairway']
-                ]],
-                kwargs: {},
-            });
-            var success = function(model, count) {
-                if (count > 0) {
-                    const div = document.createElement("div");
-                    div.id = `website_form_editor_success_test_tour_${model}`;
-                    document.body.append(div);
-                }
-            };
-            mailDef.then(success.bind(this, 'mail_mail'));
-        }
-    },
-    {
-        content:  "Check mail.mail records have been created",
-        trigger:  "#website_form_editor_success_test_tour_mail_mail:not(:visible)",
-    }
-]});
-registry.category("web_tour.tours").add('website_form_contactus_submit', {
-    url: '/contactus',
+        {
+            content: "Check mail.mail records have been created",
+            trigger: "body",
+            run: function () {
+                var mailDef = rpc(`/web/dataset/call_kw/mail.mail/search_count`, {
+                    model: "mail.mail",
+                    method: "search_count",
+                    args: [
+                        [
+                            ["email_to", "=", "test@test.test"],
+                            ["body_html", "like", "A useless message"],
+                            ["body_html", "like", "Service : Development Service"],
+                            ["body_html", "like", "State : 44 - UK"],
+                            ["body_html", "like", "Products : Xperia,Wiko Stairway"],
+                        ],
+                    ],
+                    kwargs: {},
+                });
+                var success = function (model, count) {
+                    if (count > 0) {
+                        const div = document.createElement("div");
+                        div.id = `website_form_editor_success_test_tour_${model}`;
+                        document.body.append(div);
+                    }
+                };
+                mailDef.then(success.bind(this, "mail_mail"));
+            },
+        },
+        {
+            content: "Check mail.mail records have been created",
+            trigger: "#website_form_editor_success_test_tour_mail_mail:not(:visible)",
+        },
+    ],
+});
+registry.category("web_tour.tours").add("website_form_contactus_submit", {
+    url: "/contactus",
     steps: () => [
-    // As the demo portal user, only two inputs needs to be filled to send
-    // the email
-    {
-        isActive: ["body:has(.o-livechat-root)"],
-        trigger: ":shadow span:contains(select an option above)",
-    },
-    {
-        content: "Fill in the subject",
-        trigger: 'input[name="subject"]',
-        run: "edit Test",
-    },
-    {
-        content: 'Fill in the message',
-        trigger: 'textarea[name="description"]',
-        run: "edit Test",
-    },
-    {
-        content: 'Send the form',
-        trigger: '.s_website_form_send',
-        run: "click",
-        expectUnloadPage: true,
-    },
-    {
-        content: 'Check form is submitted without errors',
-        trigger: '#wrap:has(h1:contains("Thank You!"))',
-    },
-]});
-registry.category("web_tour.tours").add('website_form_contactus_check_changed_email', {
-    url: '/contactus',
+        // As the demo portal user, only two inputs needs to be filled to send
+        // the email
+        {
+            isActive: ["body:has(.o-livechat-root)"],
+            trigger: ":shadow span:contains(select an option above)",
+        },
+        {
+            content: "Fill in the subject",
+            trigger: 'input[name="subject"]',
+            run: "edit Test",
+        },
+        {
+            content: "Fill in the message",
+            trigger: 'textarea[name="description"]',
+            run: "edit Test",
+        },
+        {
+            content: "Send the form",
+            trigger: ".s_website_form_send",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        {
+            content: "Check form is submitted without errors",
+            trigger: '#wrap:has(h1:contains("Thank You!"))',
+        },
+    ],
+});
+registry.category("web_tour.tours").add("website_form_contactus_check_changed_email", {
+    url: "/contactus",
     steps: () => [
         {
             content: "Check that the recipient email is updated",
             trigger: 'form:has(input[name="email_to"][value="after.change@mail.com"])',
         },
-]});
+    ],
+});
diff --git a/addons/website/static/tests/tours/website_navbar_menu.js b/addons/website/static/tests/tours/website_navbar_menu.js
index b497d18732780..583617840af75 100644
--- a/addons/website/static/tests/tours/website_navbar_menu.js
+++ b/addons/website/static/tests/tours/website_navbar_menu.js
@@ -23,27 +23,23 @@ registry.category("web_tour.tours").add("website_navbar_menu", {
     ],
 });
 
-registerWebsitePreviewTour(
-    "website_systray_items_disappear",
-    { url: "/" },
-    () => [
-        {
-            content: "Ensure frontend systray items have been added to the navbar",
-            trigger: ".o_main_navbar .o_menu_systray:has(.o_edit_website_container)",
-        },
-        {
-            content: "Open configuration dropdown",
-            trigger: ".o_main_navbar button:contains(Configuration)",
-            run: "click",
-        },
-        {
-            content: "Go to settings",
-            trigger: `.o_popover .o-dropdown-item:contains(Settings)`,
-            run: "click",
-        },
-        {
-            content: "Ensure frontend systray items have disappeared",
-            trigger: `.o_main_navbar .o_menu_systray:not(:has(.o_edit_website_container, .o_new_content_container))`,
-        },
-    ]
-);
+registerWebsitePreviewTour("website_systray_items_disappear", { url: "/" }, () => [
+    {
+        content: "Ensure frontend systray items have been added to the navbar",
+        trigger: ".o_main_navbar .o_menu_systray:has(.o_edit_website_container)",
+    },
+    {
+        content: "Open configuration dropdown",
+        trigger: ".o_main_navbar button:contains(Configuration)",
+        run: "click",
+    },
+    {
+        content: "Go to settings",
+        trigger: `.o_popover .o-dropdown-item:contains(Settings)`,
+        run: "click",
+    },
+    {
+        content: "Ensure frontend systray items have disappeared",
+        trigger: `.o_main_navbar .o_menu_systray:not(:has(.o_edit_website_container, .o_new_content_container))`,
+    },
+]);
diff --git a/addons/website/static/tests/tours/website_no_dirty_page.js b/addons/website/static/tests/tours/website_no_dirty_page.js
index de3ff02d154ee..7d3b36bda157a 100644
--- a/addons/website/static/tests/tours/website_no_dirty_page.js
+++ b/addons/website/static/tests/tours/website_no_dirty_page.js
@@ -1,21 +1,23 @@
-import { browser } from '@web/core/browser/browser';
+import { browser } from "@web/core/browser/browser";
 import {
     clickOnEditAndWaitEditMode,
     clickOnSave,
     insertSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const makeSteps = (steps = []) => [
     ...insertSnippet({
         id: "s_text_image",
         name: "Text - Image",
         groupName: "Content",
-    }), {
+    }),
+    {
         content: "Click on Discard",
         trigger: ".o-snippets-top-actions [data-action='cancel']",
         run: "click",
-    }, {
+    },
+    {
         content: "Check that discarding actually warns when there are dirty changes, and cancel",
         trigger: ".modal-footer .btn-secondary",
         run: "click",
@@ -51,98 +53,117 @@ const makeSteps = (steps = []) => [
         content: "Click on Discard",
         trigger: ".o-snippets-top-actions [data-action='cancel']",
         run: "click",
-    }, {
+    },
+    {
         content: "Confirm we are not in edit mode anymore",
         trigger: ":iframe #wrapwrap:not(.odoo-editor-editable)",
     },
 ];
 
-registerWebsitePreviewTour('website_no_action_no_dirty_page', {
-    url: '/',
-    edition: true,
-}, () => makeSteps());
-
-registerWebsitePreviewTour('website_no_dirty_page', {
-    url: '/',
-    edition: true,
-}, () => makeSteps([
+registerWebsitePreviewTour(
+    "website_no_action_no_dirty_page",
     {
-        // This has been known to mark the page as dirty because of the "drag
-        // the column on image move" feature.
-        content: "Click on default image",
-        trigger: ':iframe .s_text_image img',
-        run: "click",
-    }, {
-        // There was a feature that auto-selected default text and was known to
-        // break the dirty behavior. It was removed but it does not hurt to
-        // still click on default text anyway.
-        content: "Click on default paragraph",
-        trigger: ':iframe .s_text_image h2 + p',
-        run: "click",
-    }, {
-        // Link edition was also known to break the dirty behavior.
-        content: "Click on button",
-        trigger: ':iframe .s_text_image .btn',
-        async run(actions) {
-            await actions.click();
-            const el = this.anchor;
-            const sel = el.ownerDocument.getSelection();
-            sel.collapse(el, 0);
-            el.focus();
-        },
-    }, {
-        content: "Add useless space at the end of the snippet class attribute, then click on it",
-        trigger: ":iframe .s_text_image",
-        async run(actions) {
-            this.anchor.setAttribute("class", this.anchor.getAttribute("class") + " ");
-            return actions.click();
-        },
+        url: "/",
+        edition: true,
     },
-]));
+    () => makeSteps()
+);
 
-registerWebsitePreviewTour('website_no_dirty_lazy_image', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...insertSnippet({
-        id: 's_text_image',
-        name: 'Text - Image',
-        groupName: "Content",
-    }),
+registerWebsitePreviewTour(
+    "website_no_dirty_page",
     {
-        // Ensure the test keeps testing what it should test (eg if we ever
-        trigger: ':iframe img.o_lang_flag[loading="lazy"]',
-    },
-    {
-        content: "Replace first paragraph, to insert a new link",
-        // remove the lazy loading on those language img))
-        trigger: ':iframe #wrap .s_text_image p',
-        run: 'editor SomeTestText',
-    },
-    {
-        trigger: ':iframe #wrap .s_text_image p:contains("SomeTestText")',
-    },
-    {
-        content: "Click elsewhere to be sure the editor fully process the new content",
-        trigger: ':iframe #wrap .s_text_image img',
-        run: "click",
+        url: "/",
+        edition: true,
     },
+    () =>
+        makeSteps([
+            {
+                // This has been known to mark the page as dirty because of the
+                // "drag the column on image move" feature.
+                content: "Click on default image",
+                trigger: ":iframe .s_text_image img",
+                run: "click",
+            },
+            {
+                // There was a feature that auto-selected default text and was
+                // known to break the dirty behavior. It was removed but it does
+                // not hurt to still click on default text anyway.
+                content: "Click on default paragraph",
+                trigger: ":iframe .s_text_image h2 + p",
+                run: "click",
+            },
+            {
+                // Link edition was also known to break the dirty behavior.
+                content: "Click on button",
+                trigger: ":iframe .s_text_image .btn",
+                async run(actions) {
+                    await actions.click();
+                    const el = this.anchor;
+                    const sel = el.ownerDocument.getSelection();
+                    sel.collapse(el, 0);
+                    el.focus();
+                },
+            },
+            {
+                content:
+                    "Add useless space at the end of the snippet class attribute, then click on it",
+                trigger: ":iframe .s_text_image",
+                async run(actions) {
+                    this.anchor.setAttribute("class", this.anchor.getAttribute("class") + " ");
+                    return actions.click();
+                },
+            },
+        ])
+);
+
+registerWebsitePreviewTour(
+    "website_no_dirty_lazy_image",
     {
-        trigger: "[data-action-id='replaceMedia']",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Check that there is no more than one dirty flag",
-        trigger: ':iframe body',
-        run: function () {
-            const dirtyCount = this.anchor.querySelectorAll('.o_dirty').length;
-            if (dirtyCount !== 1) {
-                console.error(dirtyCount + " dirty flag(s) found");
-            } else {
-                this.anchor.querySelector('#wrap').classList.add('o_dirty_as_expected');
-            }
+    () => [
+        ...insertSnippet({
+            id: "s_text_image",
+            name: "Text - Image",
+            groupName: "Content",
+        }),
+        {
+            // Ensure the test keeps testing what it should test (eg if we ever
+            trigger: ':iframe img.o_lang_flag[loading="lazy"]',
+        },
+        {
+            content: "Replace first paragraph, to insert a new link",
+            // remove the lazy loading on those language img))
+            trigger: ":iframe #wrap .s_text_image p",
+            run: "editor SomeTestText",
+        },
+        {
+            trigger: ':iframe #wrap .s_text_image p:contains("SomeTestText")',
+        },
+        {
+            content: "Click elsewhere to be sure the editor fully process the new content",
+            trigger: ":iframe #wrap .s_text_image img",
+            run: "click",
+        },
+        {
+            trigger: "[data-action-id='replaceMedia']",
+        },
+        {
+            content: "Check that there is no more than one dirty flag",
+            trigger: ":iframe body",
+            run: function () {
+                const dirtyCount = this.anchor.querySelectorAll(".o_dirty").length;
+                if (dirtyCount !== 1) {
+                    console.error(dirtyCount + " dirty flag(s) found");
+                } else {
+                    this.anchor.querySelector("#wrap").classList.add("o_dirty_as_expected");
+                }
+            },
+        },
+        {
+            content: "Check previous step went through correctly about dirty flags",
+            trigger: ":iframe #wrap.o_dirty_as_expected",
         },
-    }, {
-        content: "Check previous step went through correctly about dirty flags",
-        trigger: ':iframe #wrap.o_dirty_as_expected',
-    }
-]);
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_page_options.js b/addons/website/static/tests/tours/website_page_options.js
index ed7cb1a7e9368..a80241197c134 100644
--- a/addons/website/static/tests/tours/website_page_options.js
+++ b/addons/website/static/tests/tours/website_page_options.js
@@ -4,103 +4,109 @@ import {
     clickOnSave,
     clickOnSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
-
-registerWebsitePreviewTour('website_page_options', {
-    url: '/',
-    edition: true,
-}, () => [
-    ...clickOnSnippet({id: 'o_header_standard', name: 'Header'}),
-    ...changeOptionInPopover("Header", "Header Position", "Over the content"),
-    // It's important to test saving right after changing that option only as
-    // this is why this test was made in the first place: the page was not
-    // marked as dirty when that option was the only one that was changed.
-    ...clickOnSave(),
-    {
-        content: "Check that the header is transparent",
-        trigger: ':iframe #wrapwrap.o_header_overlay',
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...clickOnSnippet({id: 'o_header_standard', name: 'Header'}),
-    {
-        content: "Open the color picker to change the background color of the header",
-        trigger:"div[data-container-title='Header'] .hb-row[data-label='Header Position'] + .hb-row-sublevel-1[data-label='Background'] button",
-        run: "click",
-    },
-    {
-        content: "Select the color black-600",
-        trigger: ".popover button[data-color='600']",
-        run: "click",
-    },
-    ...clickOnSave(),
-    {
-        content: "Check that the header is in black-600",
-        trigger: ":iframe header#top.bg-600",
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...clickOnSnippet({id: 'o_header_standard', name: 'Header'}),
-    {
-        content: "Open the color picker to change the text color of the header",
-        trigger: "div[data-container-title='Header'] .hb-row-sublevel-1[data-label='Text Color'] button",
-        run: "click",
-    },
+registerWebsitePreviewTour(
+    "website_page_options",
     {
-        content: "Select the color red",
-        trigger: ".popover button[data-color='#FF0000']",
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    ...clickOnSave(),
-    {
-        content: "Check that text color of the header is in red",
-        trigger: ':iframe header#top[style=" color: #ff0000;"]',
-    },
-    {
-        content: "Enable the mobile view",
-        trigger: ".o_mobile_preview > a",
-        run: "click",
-    },
-    {
-        content: "Check that text color of the navbar toggler icon is in red",
-        trigger: ':iframe header#top [data-bs-toggle="offcanvas"] .navbar-toggler-icon',
-        run: function () {
-            if (getComputedStyle(this.anchor).color !== "rgb(255, 0, 0)") {
-                console.error("The navbar toggler icon is not in red");
-            }
+    () => [
+        ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
+        ...changeOptionInPopover("Header", "Header Position", "Over the content"),
+        // It's important to test saving right after changing that option only as
+        // this is why this test was made in the first place: the page was not
+        // marked as dirty when that option was the only one that was changed.
+        ...clickOnSave(),
+        {
+            content: "Check that the header is transparent",
+            trigger: ":iframe #wrapwrap.o_header_overlay",
         },
-    },
-    {
-        content: "Disable the mobile view",
-        trigger: ".o_mobile_preview > a",
-        run: "click",
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...clickOnSnippet({id: "o_header_standard", name: "Header"}),
-    ...changeOptionInPopover("Header", "Header Position", "Hidden"),
-    ...clickOnSave(),
-    {
-        content: "Check that the header is hidden",
-        trigger: ':iframe #wrapwrap:has(header#top.d-none.o_snippet_invisible)',
-    },
-    ...clickOnEditAndWaitEditMode(),
-    {
-        content: "Click on 'header' in the invisible elements list",
-        trigger: '.o_we_invisible_el_panel .o_we_invisible_entry',
-        run: "click",
-    },
-    ...clickOnSnippet({id: 'o_footer', name: 'Footer'}),
-    {
-        content: "Click on the visibility toggle to change the visibility of the footer",
-        trigger: "div[data-container-title='Footer'] div[data-label='Page Visibility'] div[data-action-id='setWebsiteFooterVisible'] input",
-        run: "click",
-    },
-    ...clickOnSave(),
-    {
-        content: "Check that the header is visible",
-        trigger: ":iframe #wrapwrap header#top:not(.d-none)",
-    },
-    {
-        content: "Check that the footer is hidden",
-        trigger: ':iframe #wrapwrap:has(.o_footer.d-none.o_snippet_invisible)',
-    },
-]);
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
+        {
+            content: "Open the color picker to change the background color of the header",
+            trigger:
+                "div[data-container-title='Header'] .hb-row[data-label='Header Position'] + .hb-row-sublevel-1[data-label='Background'] button",
+            run: "click",
+        },
+        {
+            content: "Select the color black-600",
+            trigger: ".popover button[data-color='600']",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the header is in black-600",
+            trigger: ":iframe header#top.bg-600",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
+        {
+            content: "Open the color picker to change the text color of the header",
+            trigger:
+                "div[data-container-title='Header'] .hb-row-sublevel-1[data-label='Text Color'] button",
+            run: "click",
+        },
+        {
+            content: "Select the color red",
+            trigger: ".popover button[data-color='#FF0000']",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that text color of the header is in red",
+            trigger: ':iframe header#top[style=" color: #ff0000;"]',
+        },
+        {
+            content: "Enable the mobile view",
+            trigger: ".o_mobile_preview > a",
+            run: "click",
+        },
+        {
+            content: "Check that text color of the navbar toggler icon is in red",
+            trigger: ':iframe header#top [data-bs-toggle="offcanvas"] .navbar-toggler-icon',
+            run: function () {
+                if (getComputedStyle(this.anchor).color !== "rgb(255, 0, 0)") {
+                    console.error("The navbar toggler icon is not in red");
+                }
+            },
+        },
+        {
+            content: "Disable the mobile view",
+            trigger: ".o_mobile_preview > a",
+            run: "click",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet({ id: "o_header_standard", name: "Header" }),
+        ...changeOptionInPopover("Header", "Header Position", "Hidden"),
+        ...clickOnSave(),
+        {
+            content: "Check that the header is hidden",
+            trigger: ":iframe #wrapwrap:has(header#top.d-none.o_snippet_invisible)",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Click on 'header' in the invisible elements list",
+            trigger: ".o_we_invisible_el_panel .o_we_invisible_entry",
+            run: "click",
+        },
+        ...clickOnSnippet({ id: "o_footer", name: "Footer" }),
+        {
+            content: "Click on the visibility toggle to change the visibility of the footer",
+            trigger:
+                "div[data-container-title='Footer'] div[data-label='Page Visibility'] div[data-action-id='setWebsiteFooterVisible'] input",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the header is visible",
+            trigger: ":iframe #wrapwrap header#top:not(.d-none)",
+        },
+        {
+            content: "Check that the footer is hidden",
+            trigger: ":iframe #wrapwrap:has(.o_footer.d-none.o_snippet_invisible)",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_snippets_menu_tabs.js b/addons/website/static/tests/tours/website_snippets_menu_tabs.js
index 80a4f56226066..dd9886937bcdb 100644
--- a/addons/website/static/tests/tours/website_snippets_menu_tabs.js
+++ b/addons/website/static/tests/tours/website_snippets_menu_tabs.js
@@ -1,34 +1,35 @@
-import {
-    goToTheme,
-    registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+import { goToTheme, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
-registerWebsitePreviewTour("website_snippets_menu_tabs", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...goToTheme(),
+registerWebsitePreviewTour(
+    "website_snippets_menu_tabs",
     {
-        trigger: "div[data-container-title='Colors'] div.we-bg-options-container",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Click on the empty 'DRAG BUILDING BLOCKS HERE' area.",
-        trigger: ":iframe main > .oe_structure.oe_empty",
-        run: 'click',
-    },
-    ...goToTheme(),
-    {
-        content: "Verify that the customize panel is not empty.",
-        trigger: ".o_theme_tab .options-container",
-    },
-    {
-        content: "Click on the style tab.",
-        trigger: "button[data-name='customize']",
-        run: "click",
-    },
-    ...goToTheme(),
-    {
-        content: "Verify that the customize panel is not empty.",
-        trigger: ".o_theme_tab .options-container",
-    },
-]);
+    () => [
+        ...goToTheme(),
+        {
+            trigger: "div[data-container-title='Colors'] div.we-bg-options-container",
+        },
+        {
+            content: "Click on the empty 'DRAG BUILDING BLOCKS HERE' area.",
+            trigger: ":iframe main > .oe_structure.oe_empty",
+            run: "click",
+        },
+        ...goToTheme(),
+        {
+            content: "Verify that the customize panel is not empty.",
+            trigger: ".o_theme_tab .options-container",
+        },
+        {
+            content: "Click on the style tab.",
+            trigger: "button[data-name='customize']",
+            run: "click",
+        },
+        ...goToTheme(),
+        {
+            content: "Verify that the customize panel is not empty.",
+            trigger: ".o_theme_tab .options-container",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_style_edition.js b/addons/website/static/tests/tours/website_style_edition.js
index 1314fbc2b80f0..cc3d6b8d8d4d8 100644
--- a/addons/website/static/tests/tours/website_style_edition.js
+++ b/addons/website/static/tests/tours/website_style_edition.js
@@ -4,123 +4,151 @@ import {
     clickOnSave,
     goToTheme,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const TARGET_FONT_SIZE = 20; // The max to not be impacted by the responsive font size system
-const TARGET_BODY_BG_COLOR = '#00FF00';
-const TARGET_BODY_BG_COLOR_V2 = 'rgb(0, 255, 0)';
-const TARGET_BODY_COLOR = '#FF00FF';
-const TARGET_BODY_COLOR_V2 = 'rgb(255, 0, 255)';
+const TARGET_BODY_BG_COLOR = "#00FF00";
+const TARGET_BODY_BG_COLOR_V2 = "rgb(0, 255, 0)";
+const TARGET_BODY_COLOR = "#FF00FF";
+const TARGET_BODY_COLOR_V2 = "rgb(255, 0, 255)";
 
 const checkFontSize = function () {
     const style = document.defaultView.getComputedStyle(this.anchor);
     if (!areCssValuesEqual(style.fontSize, `${TARGET_FONT_SIZE}px`, "font-size", style)) {
-        console.error(`Expected the font-size to be equal to ${TARGET_FONT_SIZE}px but found ${style.fontSize} instead`);
+        console.error(
+            `Expected the font-size to be equal to ${TARGET_FONT_SIZE}px but found ${style.fontSize} instead`
+        );
     }
 };
 const checkBodyBgColor = function () {
     const style = document.defaultView.getComputedStyle(this.anchor);
-    if (!areCssValuesEqual(style.backgroundColor, `${TARGET_BODY_BG_COLOR}`, "background-color", style)) {
-        console.error(`Expected the background color to be equal to ${TARGET_BODY_BG_COLOR} but found ${style.backgroundColor} instead`);
+    if (
+        !areCssValuesEqual(
+            style.backgroundColor,
+            `${TARGET_BODY_BG_COLOR}`,
+            "background-color",
+            style
+        )
+    ) {
+        console.error(
+            `Expected the background color to be equal to ${TARGET_BODY_BG_COLOR} but found ${style.backgroundColor} instead`
+        );
     }
 };
 const checkBodyColor = function () {
     const style = document.defaultView.getComputedStyle(this.anchor);
     if (!areCssValuesEqual(style.color, `${TARGET_BODY_COLOR}`, "color", style)) {
-        console.error(`Expected the color to be equal to ${TARGET_BODY_COLOR} but found ${style.color} instead`);
+        console.error(
+            `Expected the color to be equal to ${TARGET_BODY_COLOR} but found ${style.color} instead`
+        );
     }
 };
 
-registerWebsitePreviewTour("website_style_edition", {
-    url: '/',
-    edition: true,
-}, () => [
-...goToTheme(),
-{
-    content: "Change font size",
-    trigger: "[data-action-param='font-size-base'] input",
-    run: `edit ${TARGET_FONT_SIZE} && click body`,
-},
-{
-    // Waiting the CSS to be reloaded: the code adds a new assets bundle with
-    // a #t=... at the end then removes the old one.
-    trigger: ':iframe html:not(:has(link[href$="web.assets_frontend.min.css"]))',
-},
-{
-    content: "Check the font size was properly adapted",
-    trigger: ':iframe #wrapwrap',
-    run: checkFontSize,
-}, {
-    content: "Open the color combinations area",
-    trigger: "div[data-label='Color Presets'] button",
-    run: "click",
-}, {
-    content: "Open a color combination",
-    trigger: "div[id^='builder_collapse_content'] button.o_hb_collapse_toggler",
-    run: "click",
-}, {
-    content: "Edit the background color of that color combination",
-    trigger: "div[id^='builder_collapse_content'] div .o_we_color_preview",
-    run: "click",
-}, {
-    content: "Choose a color",
-    trigger: `.o_font_color_selector .o_color_button[data-color="${TARGET_BODY_BG_COLOR}"]`,
-    run: "click",
-},
-{
-    trigger: `
+registerWebsitePreviewTour(
+    "website_style_edition",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...goToTheme(),
+        {
+            content: "Change font size",
+            trigger: "[data-action-param='font-size-base'] input",
+            run: `edit ${TARGET_FONT_SIZE} && click body`,
+        },
+        {
+            // Waiting the CSS to be reloaded: the code adds a new assets bundle
+            // with a #t=... at the end then removes the old one.
+            trigger: ':iframe html:not(:has(link[href$="web.assets_frontend.min.css"]))',
+        },
+        {
+            content: "Check the font size was properly adapted",
+            trigger: ":iframe #wrapwrap",
+            run: checkFontSize,
+        },
+        {
+            content: "Open the color combinations area",
+            trigger: "div[data-label='Color Presets'] button",
+            run: "click",
+        },
+        {
+            content: "Open a color combination",
+            trigger: "div[id^='builder_collapse_content'] button.o_hb_collapse_toggler",
+            run: "click",
+        },
+        {
+            content: "Edit the background color of that color combination",
+            trigger: "div[id^='builder_collapse_content'] div .o_we_color_preview",
+            run: "click",
+        },
+        {
+            content: "Choose a color",
+            trigger: `.o_font_color_selector .o_color_button[data-color="${TARGET_BODY_BG_COLOR}"]`,
+            run: "click",
+        },
+        {
+            trigger: `
         div[id^='builder_collapse_content'] div .o_we_color_preview[style*="${TARGET_BODY_BG_COLOR}"],
         div[id^='builder_collapse_content'] div .o_we_color_preview[style*="${TARGET_BODY_BG_COLOR_V2}"]
     `,
-},
-{
-    content: "Check the body background color was properly adapted",
-    trigger: ':iframe body',
-    run: checkBodyBgColor,
-}, {
-    content: "Edit the text color of that color combination",
-    trigger: "div[id^='builder_collapse_content'] div[data-label='Text'] .o_we_color_preview",
-    run: "click",
-}, {
-    content: "Choose a color",
-    trigger: `.o_font_color_selector .o_color_button[data-color="${TARGET_BODY_COLOR}"]`,
-    run: "click",
-},
-{
-    trigger: `
+        },
+        {
+            content: "Check the body background color was properly adapted",
+            trigger: ":iframe body",
+            run: checkBodyBgColor,
+        },
+        {
+            content: "Edit the text color of that color combination",
+            trigger:
+                "div[id^='builder_collapse_content'] div[data-label='Text'] .o_we_color_preview",
+            run: "click",
+        },
+        {
+            content: "Choose a color",
+            trigger: `.o_font_color_selector .o_color_button[data-color="${TARGET_BODY_COLOR}"]`,
+            run: "click",
+        },
+        {
+            trigger: `
         div[id^='builder_collapse_content'] div .o_we_color_preview[style*="${TARGET_BODY_COLOR}"],
         div[id^='builder_collapse_content'] div .o_we_color_preview[style*="${TARGET_BODY_COLOR_V2}"]
     `,
-},
-{
-    content: "Check the body color was properly adapted",
-    trigger: ':iframe body',
-    run: checkBodyColor,
-},
-...clickOnSave(),
-{
-    content: "Check the font size is still ok outside of edit mode",
-    trigger: ':iframe body #wrapwrap',
-    run: checkFontSize,
-}, {
-    content: "Check the body background color is still ok outside of edit mode",
-    trigger: ':iframe body',
-    run: checkBodyBgColor,
-}, {
-    content: "Check the body color is still ok outside of edit mode",
-    trigger: ':iframe body',
-    run: checkBodyColor,
-},
-...clickOnEditAndWaitEditMode(),
-...goToTheme(),
-{
-    trigger: "div[data-label='Background'] button[data-action-value='NONE'].active",
-},
-{
-    content: "Click on the Background Image selection",
-    trigger: "div[data-label='Background'] button[data-action-value='image']:not(.active)",
-    run: "click",
-}, {
-    content: "The media dialog should open",
-    trigger: '.o_select_media_dialog',
-}]);
+        },
+        {
+            content: "Check the body color was properly adapted",
+            trigger: ":iframe body",
+            run: checkBodyColor,
+        },
+        ...clickOnSave(),
+        {
+            content: "Check the font size is still ok outside of edit mode",
+            trigger: ":iframe body #wrapwrap",
+            run: checkFontSize,
+        },
+        {
+            content: "Check the body background color is still ok outside of edit mode",
+            trigger: ":iframe body",
+            run: checkBodyBgColor,
+        },
+        {
+            content: "Check the body color is still ok outside of edit mode",
+            trigger: ":iframe body",
+            run: checkBodyColor,
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...goToTheme(),
+        {
+            trigger: "div[data-label='Background'] button[data-action-value='NONE'].active",
+        },
+        {
+            content: "Click on the Background Image selection",
+            trigger: "div[data-label='Background'] button[data-action-value='image']:not(.active)",
+            run: "click",
+        },
+        {
+            content: "The media dialog should open",
+            trigger: ".o_select_media_dialog",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_text_edition.js b/addons/website/static/tests/tours/website_text_edition.js
index fd3b76d74e328..13d8f7969f4f0 100644
--- a/addons/website/static/tests/tours/website_text_edition.js
+++ b/addons/website/static/tests/tours/website_text_edition.js
@@ -9,63 +9,68 @@ import { rgbToHex } from "@web/core/utils/colors";
 
 const WEBSITE_MAIN_COLOR = "#ABCDEF";
 
-registerWebsitePreviewTour("website_text_edition", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...goToTheme(),
+registerWebsitePreviewTour(
+    "website_text_edition",
     {
-        content: "Open colorpicker to change website main color",
-        trigger: ".we-bg-options-container .o_we_color_preview",
-        run: "click",
+        url: "/",
+        edition: true,
     },
-    {
-        content: "Open colorpicker to change website main color",
-        trigger: ".o_font_color_selector button:contains('Custom')",
-        run: "click",
-    },
-    {
-        content: "Input the value for the new website main color (also make sure it is independent from the backend)",
-        trigger: ".o_hex_input",
-        run: `edit ${WEBSITE_MAIN_COLOR} && click body`,
-    },
-    goBackToBlocks(),
-    ...insertSnippet({id: "s_text_block", name: "Text", groupName: "Text"}),
-    ...clickToolbarButton(
-        "text block first paragraph",
-        ".s_text_block p",
-        "Apply Font Color",
-        true
-    ),
-    {
-        content: "Open solid section in color picker",
-        trigger: ".o_font_color_selector button:contains('Custom')",
-        run: "click",
-    },
-    {
-        content: "Select main color",
-        trigger: ".o_colorpicker_widget .o_color_picker_inputs .o_hex_input",
-        run: `edit ${WEBSITE_MAIN_COLOR} && click body`,
-    },
-    {
-        content: "Check that paragraph now uses the main color *class*",
-        trigger: ":iframe .s_text_block p",
-        run: function (actions) {
-            const fontEl = this.anchor.querySelector("font");
-            if (!fontEl) {
-                console.error("A background color should have been applied");
-                return;
-            }
-            if (fontEl.style.backgroundColor) {
-                console.error("The paragraph should not have an inline style background color");
-                return;
-            }
-            const rgbColor = fontEl.style.getPropertyValue("color");
-            const hexColor = rgbToHex(rgbColor);
-            if (hexColor.toUpperCase() !== WEBSITE_MAIN_COLOR) {
-                console.error("The paragraph should have the right background color class");
-                return;
-            }
+    () => [
+        ...goToTheme(),
+        {
+            content: "Open colorpicker to change website main color",
+            trigger: ".we-bg-options-container .o_we_color_preview",
+            run: "click",
+        },
+        {
+            content: "Open colorpicker to change website main color",
+            trigger: ".o_font_color_selector button:contains('Custom')",
+            run: "click",
+        },
+        {
+            content:
+                "Input the value for the new website main color (also make sure it is independent from the backend)",
+            trigger: ".o_hex_input",
+            run: `edit ${WEBSITE_MAIN_COLOR} && click body`,
+        },
+        goBackToBlocks(),
+        ...insertSnippet({ id: "s_text_block", name: "Text", groupName: "Text" }),
+        ...clickToolbarButton(
+            "text block first paragraph",
+            ".s_text_block p",
+            "Apply Font Color",
+            true
+        ),
+        {
+            content: "Open solid section in color picker",
+            trigger: ".o_font_color_selector button:contains('Custom')",
+            run: "click",
+        },
+        {
+            content: "Select main color",
+            trigger: ".o_colorpicker_widget .o_color_picker_inputs .o_hex_input",
+            run: `edit ${WEBSITE_MAIN_COLOR} && click body`,
+        },
+        {
+            content: "Check that paragraph now uses the main color *class*",
+            trigger: ":iframe .s_text_block p",
+            run: function (actions) {
+                const fontEl = this.anchor.querySelector("font");
+                if (!fontEl) {
+                    console.error("A background color should have been applied");
+                    return;
+                }
+                if (fontEl.style.backgroundColor) {
+                    console.error("The paragraph should not have an inline style background color");
+                    return;
+                }
+                const rgbColor = fontEl.style.getPropertyValue("color");
+                const hexColor = rgbToHex(rgbColor);
+                if (hexColor.toUpperCase() !== WEBSITE_MAIN_COLOR) {
+                    console.error("The paragraph should have the right background color class");
+                    return;
+                }
+            },
         },
-    }
-]);
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_text_font_size.js b/addons/website/static/tests/tours/website_text_font_size.js
index 9ba8987bf7e40..832a2ed9b0d40 100644
--- a/addons/website/static/tests/tours/website_text_font_size.js
+++ b/addons/website/static/tests/tours/website_text_font_size.js
@@ -3,22 +3,82 @@ import {
     goToTheme,
     registerWebsitePreviewTour,
     clickToolbarButton,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { FONT_SIZE_CLASSES } from "@html_editor/utils/formatting";
 
 const classNameInfo = new Map();
-classNameInfo.set("display-1-fs", {scssVariableName: "display-1-font-size", start: 80, end: 90, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("display-2-fs", {scssVariableName: "display-2-font-size", start: 72, end: 80, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("display-3-fs", {scssVariableName: "display-3-font-size", start: 64, end: 70, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("display-4-fs", {scssVariableName: "display-4-font-size", start: 56, end: 60, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("h1-fs", {scssVariableName: "h1-font-size", start: 48, end: 50, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("h2-fs", {scssVariableName: "h2-font-size", start: 40, end: 42, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("h3-fs", {scssVariableName: "h3-font-size", start: 32, end: 38, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("h4-fs", {scssVariableName: "h4-font-size", start: 24, end: 34, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("h5-fs", {scssVariableName: "h5-font-size", start: 20, end: 30, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("h6-fs", {scssVariableName: "h6-font-size", start: 16, end: 26, scssVariableMainName: "h1-font-size"});
-classNameInfo.set("base-fs", {scssVariableName: "font-size-base", start: 16, end: 26, scssVariableMainName: "font-size-base"});
-classNameInfo.set("o_small-fs", {scssVariableName: "small-font-size", start: 14, end: 24, scssVariableMainName: "font-size-base"});
+classNameInfo.set("display-1-fs", {
+    scssVariableName: "display-1-font-size",
+    start: 80,
+    end: 90,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("display-2-fs", {
+    scssVariableName: "display-2-font-size",
+    start: 72,
+    end: 80,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("display-3-fs", {
+    scssVariableName: "display-3-font-size",
+    start: 64,
+    end: 70,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("display-4-fs", {
+    scssVariableName: "display-4-font-size",
+    start: 56,
+    end: 60,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("h1-fs", {
+    scssVariableName: "h1-font-size",
+    start: 48,
+    end: 50,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("h2-fs", {
+    scssVariableName: "h2-font-size",
+    start: 40,
+    end: 42,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("h3-fs", {
+    scssVariableName: "h3-font-size",
+    start: 32,
+    end: 38,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("h4-fs", {
+    scssVariableName: "h4-font-size",
+    start: 24,
+    end: 34,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("h5-fs", {
+    scssVariableName: "h5-font-size",
+    start: 20,
+    end: 30,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("h6-fs", {
+    scssVariableName: "h6-font-size",
+    start: 16,
+    end: 26,
+    scssVariableMainName: "h1-font-size",
+});
+classNameInfo.set("base-fs", {
+    scssVariableName: "font-size-base",
+    start: 16,
+    end: 26,
+    scssVariableMainName: "font-size-base",
+});
+classNameInfo.set("o_small-fs", {
+    scssVariableName: "small-font-size",
+    start: 14,
+    end: 24,
+    scssVariableMainName: "font-size-base",
+});
 
 function checkComputedFontSize(fontSizeClass, stage) {
     return {
@@ -30,16 +90,18 @@ function checkComputedFontSize(fontSizeClass, stage) {
             const gapBetweenSizes = Math.abs(computedFontSize - expectedFontSize);
             const gapTolerance = 7; // Because the font size is responsive.
             if (gapBetweenSizes > gapTolerance) {
-                console.error(`When applied class ${fontSizeClass}, the font size is ` +
-                    `${computedFontSize} instead of ~${expectedFontSize}`);
+                console.error(
+                    `When applied class ${fontSizeClass}, the font size is ` +
+                        `${computedFontSize} instead of ~${expectedFontSize}`
+                );
             }
-        }
+        },
     };
 }
 
 function getFontSizeTestSteps(fontSizeClass) {
     return [
-        ...insertSnippet({id: "s_text_block", name: "Text", groupName: "Text"}),
+        ...insertSnippet({ id: "s_text_block", name: "Text", groupName: "Text" }),
         ...clickToolbarButton(
             `text block first paragraph [${fontSizeClass}]`,
             ".s_text_block p",
@@ -47,28 +109,40 @@ function getFontSizeTestSteps(fontSizeClass) {
         ),
         {
             content: `Select ${fontSizeClass} in the dropdown`,
-            trigger: `.o_font_size_selector_menu span:contains(${classNameInfo.get(fontSizeClass).start})`,
+            trigger: `.o_font_size_selector_menu span:contains(${
+                classNameInfo.get(fontSizeClass).start
+            })`,
             run: "click",
         },
         checkComputedFontSize(fontSizeClass, "start"),
         ...goToTheme(),
         {
             content: `Open the collapse to see the font size of ${fontSizeClass}`,
-            trigger: `.we-bg-options-container:has([data-action-param="${classNameInfo.get(fontSizeClass).scssVariableMainName}"]) [data-label="Font Size"] .o_hb_collapse_toggler`,
+            trigger: `.we-bg-options-container:has([data-action-param="${
+                classNameInfo.get(fontSizeClass).scssVariableMainName
+            }"]) [data-label="Font Size"] .o_hb_collapse_toggler`,
             run: "click",
-        }, {
+        },
+        {
             content: `Check that the setting for ${fontSizeClass} is correct`,
-            trigger: `[data-action-param="${classNameInfo.get(fontSizeClass).scssVariableName}"]`+ ` input:value("${classNameInfo.get(fontSizeClass).start}")`,
-        }, {
+            trigger:
+                `[data-action-param="${classNameInfo.get(fontSizeClass).scssVariableName}"]` +
+                ` input:value("${classNameInfo.get(fontSizeClass).start}")`,
+        },
+        {
             content: `Change the setting value of ${fontSizeClass}`,
-            trigger: `[data-action-param="${classNameInfo.get(fontSizeClass).scssVariableName}"] input`,
+            trigger: `[data-action-param="${
+                classNameInfo.get(fontSizeClass).scssVariableName
+            }"] input`,
             // TODO: Remove "&& click body"
             run: `edit ${classNameInfo.get(fontSizeClass).end} && click body`,
-        }, {
+        },
+        {
             content: `[${fontSizeClass}] Go to blocks tab`,
             trigger: "[data-name='blocks']",
             run: "click",
-        }, {
+        },
+        {
             content: `[${fontSizeClass}] Wait to be in blocks tab`,
             trigger: "[data-name='blocks'].active",
             run: "click",
@@ -76,20 +150,25 @@ function getFontSizeTestSteps(fontSizeClass) {
         ...goToTheme(),
         {
             content: `Open the collapse to see the font size of ${fontSizeClass}`,
-            trigger: `.we-bg-options-container:has([data-action-param="${classNameInfo.get(fontSizeClass).scssVariableMainName}"]) [data-label="Font Size"] .o_hb_collapse_toggler`,
+            trigger: `.we-bg-options-container:has([data-action-param="${
+                classNameInfo.get(fontSizeClass).scssVariableMainName
+            }"]) [data-label="Font Size"] .o_hb_collapse_toggler`,
             run: "click",
         },
         {
             content: `Check that the setting of ${fontSizeClass} has been updated`,
-            trigger: `[data-action-param="${classNameInfo.get(fontSizeClass).scssVariableName}"]`
-                + ` input:value("${classNameInfo.get(fontSizeClass).end}")`,
+            trigger:
+                `[data-action-param="${classNameInfo.get(fontSizeClass).scssVariableName}"]` +
+                ` input:value("${classNameInfo.get(fontSizeClass).end}")`,
         },
         {
             trigger: `body:not(:has(.o_we_ui_loading))`,
         },
         {
             content: `Close the collapse to hide the font size of ${fontSizeClass}`,
-            trigger: `.we-bg-options-container:has([data-action-param="${classNameInfo.get(fontSizeClass).scssVariableMainName}"]) [data-label="Font Size"] .o_hb_collapse_toggler`,
+            trigger: `.we-bg-options-container:has([data-action-param="${
+                classNameInfo.get(fontSizeClass).scssVariableMainName
+            }"]) [data-label="Font Size"] .o_hb_collapse_toggler`,
             run: "click",
         },
         checkComputedFontSize(fontSizeClass, "end"),
@@ -97,7 +176,8 @@ function getFontSizeTestSteps(fontSizeClass) {
             content: `Click again on the text with class ${fontSizeClass}`,
             trigger: `:iframe #wrap .s_text_block .${fontSizeClass}`,
             run: "click",
-        }, {
+        },
+        {
             content: `Remove the text snippet containing the text with class ${fontSizeClass}`,
             trigger: `.oe_snippet_remove`,
             async run(helpers) {
@@ -105,7 +185,7 @@ function getFontSizeTestSteps(fontSizeClass) {
                 // TODO: Remove the below setTimeout or understand why it should be required.
                 await new Promise((r) => setTimeout(r, 300));
             },
-        }
+        },
     ];
 }
 
@@ -129,14 +209,18 @@ function getAllFontSizesTestSteps() {
     return steps;
 }
 
-registerWebsitePreviewTour("website_text_font_size", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...getAllFontSizesTestSteps(),
-    // The last step has to be a check.
+registerWebsitePreviewTour(
+    "website_text_font_size",
     {
-        content: "Verify that the text block has been deleted",
-        trigger: ":iframe #wrap:not(:has(.s_text_block))",
+        url: "/",
+        edition: true,
     },
-]);
+    () => [
+        ...getAllFontSizesTestSteps(),
+        // The last step has to be a check.
+        {
+            content: "Verify that the text block has been deleted",
+            trigger: ":iframe #wrap:not(:has(.s_text_block))",
+        },
+    ]
+);
diff --git a/addons/website/static/tests/tours/website_update_column_count.js b/addons/website/static/tests/tours/website_update_column_count.js
index 5ac5ceed7fcc3..3c5225edf1a3a 100644
--- a/addons/website/static/tests/tours/website_update_column_count.js
+++ b/addons/website/static/tests/tours/website_update_column_count.js
@@ -4,211 +4,246 @@ import {
     registerWebsitePreviewTour,
     toggleMobilePreview,
     changeOptionInPopover,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 
 const columnCountOptSelector = "div[data-label='Layout'] .dropdown-toggle";
 const columnsSnippetRow = ":iframe .s_three_columns .row";
 const textImageSnippetRow = ":iframe .s_text_image .row";
-const changeFirstAndSecondColumnsMobileOrder = (snippetRowSelector, snippetName) => {
-    return [{
+const changeFirstAndSecondColumnsMobileOrder = (snippetRowSelector, snippetName) => [
+    {
         content: `Scroll into view`,
         trigger: `${snippetRowSelector} > div:nth-child(1)`,
         run() {
             this.anchor.scrollIntoView();
         },
-    }, {
+    },
+    {
         content: `Click on the first column of the '${snippetName}' snippet`,
         trigger: `${snippetRowSelector} > div:nth-child(1)`,
         run: "click",
-    }, {
+    },
+    {
         content: "Change the orders of the 1st and 2nd columns",
         trigger: "body .o_overlay_options button[title='Move right']",
         run: "click",
-    }];
-};
+    },
+];
 
 const addMobileOrderToTextImageSnippet = [
     ...changeFirstAndSecondColumnsMobileOrder(textImageSnippetRow, "Text-Image"),
     {
         content: "Check that the mobile order classes and styles are correct",
-        trigger: `${textImageSnippetRow}:has(.order-lg-0[style*='order: 1;']:nth-child(1))`
-            + ":has(.order-lg-0[style*='order: 0;']:nth-child(2))",
+        trigger:
+            `${textImageSnippetRow}:has(.order-lg-0[style*='order: 1;']:nth-child(1))` +
+            ":has(.order-lg-0[style*='order: 0;']:nth-child(2))",
     },
 ];
 
-const checkIfNoMobileOrder = (snippetRowSelector) => {
-    return {
-        content: "Check that the mobile order classes and styles were removed",
-        trigger: `${snippetRowSelector}:not(:has(.order-lg-0[style*='order: ']))`,
-    };
-};
+const checkIfNoMobileOrder = (snippetRowSelector) => ({
+    content: "Check that the mobile order classes and styles were removed",
+    trigger: `${snippetRowSelector}:not(:has(.order-lg-0[style*='order: ']))`,
+});
 
-registerWebsitePreviewTour("website_update_column_count", {
-    url: "/",
-    edition: true,
-}, () => [
-...insertSnippet({
-    id: "s_three_columns",
-    name: "Columns",
-    groupName: "Columns",
-}),
-...clickOnSnippet({
-    id: "s_three_columns",
-    name: "Columns",
-}),
-...changeOptionInPopover("Columns", "Layout", "[data-action-value='5']"),
-{
-    content: "Check that there are now 5 items on 5 columns, and that it didn't change the mobile layout",
-    trigger: `${columnsSnippetRow}:has(.col-lg-2:nth-child(5):not(.col-2)):not(:has(:nth-child(6)))`,
-}, {
-    content: "Check that there is an offset on the 1st item to center the row on desktop, but not on mobile",
-    trigger: `${columnsSnippetRow} > .offset-lg-1:not(.offset-1):first-child`,
-},
-...changeOptionInPopover("Columns", "Layout", "[data-action-value='2']"),
-{
-    content: "Check that there are still 5 items in the row and click on the last one",
-    trigger: `${columnsSnippetRow} > :nth-child(5)`,
-    run: "click",
-}, {
-    content: "Delete the item",
-    trigger: "div[data-container-title='Card'] .oe_snippet_remove",
-    run: "click",
-}, {
-    content: "Toggle mobile view",
-    trigger: ".o-snippets-top-actions button[data-action='mobile']",
-    run: "click",
-}, {
-    content: "Check that there is 1 column on mobile and click on the selector",
-    trigger: `${columnCountOptSelector}:contains('1')`,
-    run: "click",
-}, {
-    content: "Set 3 columns on mobile",
-    trigger: ".o_popover div[data-action-id='changeColumnCount'][data-action-value='3']",
-    run: "click",
-}, {
-    content: "Check that there are still 4 items but on rows of 3 columns",
-    trigger: `${columnsSnippetRow}:has(.col-lg-6.col-4:nth-child(4))`,
-},
-// As there is no practical way to resize the items through the handles, the
-// next step approximates part of what could be reached.
-{
-    content: "Click on the 2nd item",
-    trigger: `${columnsSnippetRow} > :nth-child(2)`,
-    run: "click",
-}, {
-    content: "Add a fake resized class on mobile to the 2nd item",
-    trigger: `${columnsSnippetRow} > :nth-child(2)`,
-    async run() {
-        const overlayEl = document.querySelector(".oe_overlay.oe_active .o_side_x.e");
+registerWebsitePreviewTour(
+    "website_update_column_count",
+    {
+        url: "/",
+        edition: true,
+    },
+    () => [
+        ...insertSnippet({
+            id: "s_three_columns",
+            name: "Columns",
+            groupName: "Columns",
+        }),
+        ...clickOnSnippet({
+            id: "s_three_columns",
+            name: "Columns",
+        }),
+        ...changeOptionInPopover("Columns", "Layout", "[data-action-value='5']"),
+        {
+            content:
+                "Check that there are now 5 items on 5 columns, and that it didn't change the mobile layout",
+            trigger: `${columnsSnippetRow}:has(.col-lg-2:nth-child(5):not(.col-2)):not(:has(:nth-child(6)))`,
+        },
+        {
+            content:
+                "Check that there is an offset on the 1st item to center the row on desktop, but not on mobile",
+            trigger: `${columnsSnippetRow} > .offset-lg-1:not(.offset-1):first-child`,
+        },
+        ...changeOptionInPopover("Columns", "Layout", "[data-action-value='2']"),
+        {
+            content: "Check that there are still 5 items in the row and click on the last one",
+            trigger: `${columnsSnippetRow} > :nth-child(5)`,
+            run: "click",
+        },
+        {
+            content: "Delete the item",
+            trigger: "div[data-container-title='Card'] .oe_snippet_remove",
+            run: "click",
+        },
+        {
+            content: "Toggle mobile view",
+            trigger: ".o-snippets-top-actions button[data-action='mobile']",
+            run: "click",
+        },
+        {
+            content: "Check that there is 1 column on mobile and click on the selector",
+            trigger: `${columnCountOptSelector}:contains('1')`,
+            run: "click",
+        },
+        {
+            content: "Set 3 columns on mobile",
+            trigger: ".o_popover div[data-action-id='changeColumnCount'][data-action-value='3']",
+            run: "click",
+        },
+        {
+            content: "Check that there are still 4 items but on rows of 3 columns",
+            trigger: `${columnsSnippetRow}:has(.col-lg-6.col-4:nth-child(4))`,
+        },
+        // As there is no practical way to resize the items through the handles,
+        // the next step approximates part of what could be reached.
+        {
+            content: "Click on the 2nd item",
+            trigger: `${columnsSnippetRow} > :nth-child(2)`,
+            run: "click",
+        },
+        {
+            content: "Add a fake resized class on mobile to the 2nd item",
+            trigger: `${columnsSnippetRow} > :nth-child(2)`,
+            async run() {
+                const overlayEl = document.querySelector(".oe_overlay.oe_active .o_side_x.e");
 
-        const triggerPointerEvent = (type, x, y) => {
-            const event = new PointerEvent(type, {
-                bubbles: true,
-                pageX: x,
-                pageY: y,
-                clientX: x,
-                clientY: y,
-                pointerType: 'mouse',
-            });
-            (type === "pointermove" ? window : overlayEl).dispatchEvent(event);
-        };
+                const triggerPointerEvent = (type, x, y) => {
+                    const event = new PointerEvent(type, {
+                        bubbles: true,
+                        pageX: x,
+                        pageY: y,
+                        clientX: x,
+                        clientY: y,
+                        pointerType: "mouse",
+                    });
+                    (type === "pointermove" ? window : overlayEl).dispatchEvent(event);
+                };
 
-        // Trigger pointer down
-        triggerPointerEvent("pointerdown", 100, 100);
-        // Wait for the mutex/this.next to lock and sizingResolve to be ready
-        await new Promise((resolve) => setTimeout(resolve, 0));
-        // Dragging
-        triggerPointerEvent("pointermove", 150, 100);
-        triggerPointerEvent("pointerup", 150, 100);
-    }
-}, {
-    content: "Check that the counter shows 'Custom'",
-    trigger: `${columnCountOptSelector}:contains('Custom')`,
-}, {
-    content: "Click on the 2nd item",
-    trigger: `${columnsSnippetRow} > :nth-child(2)`,
-    run: "click",
-}, {
-    content: "Change the orders of the 2nd and 3rd items",
-    trigger: ".o_overlay_options [aria-label='Move right']",
-    run: "click",
-}, {
-    trigger: `${columnsSnippetRow}:has([style*='order: 2;'].order-lg-0:nth-child(2) + [style*='order: 1;'].order-lg-0:nth-child(3))`,
-}, {
-    content: "Check that the 1st item now has order: 0 and a class .order-lg-0 " +
-             "and that order: 1, .order-lg-0 is set on the 3rd item, and order: 2, .order-lg-0 on the 2nd",
-    trigger: `${columnsSnippetRow}:has([style*='order: 0;'].order-lg-0:first-child)`,
-}, {
-    content: "Toggle desktop view",
-    trigger: ".o-snippets-top-actions button[data-action='mobile']",
-    run: "click",
-},
-...changeOptionInPopover("Columns", "Layout", "[data-action-value='6']"),
-{
-    content: "Check that each item has a different mobile order from 0 to 5",
-    trigger: `${columnsSnippetRow}${[0, 1, 2, 3, 4, 5].map(n => `:has([style*='order: ${n};'].order-lg-0)`).join("")}`,
-}, {
-    content: "Click on the 6th item",
-    trigger: `${columnsSnippetRow} > :nth-child(6)`,
-    run: "click",
-}, {
-    content: "Change the orders of the 5th and 6th items to override the mobile orders",
-    trigger: ".o_overlay_options [aria-label='Move left']",
-    run: "click",
-}, {
-    content: "Check that there are no orders anymore",
-    trigger: `${columnsSnippetRow}:not(:has([style*='order: 0;'])):not(:has(.order-lg-0))`,
-},
-]);
+                // Trigger pointer down
+                triggerPointerEvent("pointerdown", 100, 100);
+                // Wait for the mutex/this.next to lock and sizingResolve to be
+                // ready.
+                await new Promise((resolve) => setTimeout(resolve, 0));
+                // Dragging
+                triggerPointerEvent("pointermove", 150, 100);
+                triggerPointerEvent("pointerup", 150, 100);
+            },
+        },
+        {
+            content: "Check that the counter shows 'Custom'",
+            trigger: `${columnCountOptSelector}:contains('Custom')`,
+        },
+        {
+            content: "Click on the 2nd item",
+            trigger: `${columnsSnippetRow} > :nth-child(2)`,
+            run: "click",
+        },
+        {
+            content: "Change the orders of the 2nd and 3rd items",
+            trigger: ".o_overlay_options [aria-label='Move right']",
+            run: "click",
+        },
+        {
+            trigger: `${columnsSnippetRow}:has([style*='order: 2;'].order-lg-0:nth-child(2) + [style*='order: 1;'].order-lg-0:nth-child(3))`,
+        },
+        {
+            content:
+                "Check that the 1st item now has order: 0 and a class .order-lg-0 " +
+                "and that order: 1, .order-lg-0 is set on the 3rd item, and order: 2, .order-lg-0 on the 2nd",
+            trigger: `${columnsSnippetRow}:has([style*='order: 0;'].order-lg-0:first-child)`,
+        },
+        {
+            content: "Toggle desktop view",
+            trigger: ".o-snippets-top-actions button[data-action='mobile']",
+            run: "click",
+        },
+        ...changeOptionInPopover("Columns", "Layout", "[data-action-value='6']"),
+        {
+            content: "Check that each item has a different mobile order from 0 to 5",
+            trigger: `${columnsSnippetRow}${[0, 1, 2, 3, 4, 5]
+                .map((n) => `:has([style*='order: ${n};'].order-lg-0)`)
+                .join("")}`,
+        },
+        {
+            content: "Click on the 6th item",
+            trigger: `${columnsSnippetRow} > :nth-child(6)`,
+            run: "click",
+        },
+        {
+            content: "Change the orders of the 5th and 6th items to override the mobile orders",
+            trigger: ".o_overlay_options [aria-label='Move left']",
+            run: "click",
+        },
+        {
+            content: "Check that there are no orders anymore",
+            trigger: `${columnsSnippetRow}:not(:has([style*='order: 0;'])):not(:has(.order-lg-0))`,
+        },
+    ]
+);
 
-registerWebsitePreviewTour("website_mobile_order_with_drag_and_drop", {
-    url: "/",
-    edition: true,
-}, () => [
-    ...insertSnippet({id: "s_three_columns", name: "Columns", groupName: "Columns"}),
-    ...insertSnippet({id: "s_text_image", name: "Text - Image", groupName: "Content"}),
-    ...toggleMobilePreview(true),
-    // Add a mobile order to the "Columns" snippet columns.
-    ...changeFirstAndSecondColumnsMobileOrder(columnsSnippetRow, "Columns"),
-    {
-        content: "Check that the mobile order classes and styles are correct",
-        trigger: `${columnsSnippetRow}:has(.order-lg-0[style*='order: 1;']:nth-child(1))`
-            + ":has(.order-lg-0[style*='order: 0;']:nth-child(2))"
-            + ":has(.order-lg-0[style*='order: 2;']:nth-child(3))",
-    },
-    // Add a mobile order to the "Text-Image" snippet columns.
-    ...addMobileOrderToTextImageSnippet,
-    // Test the drag and drop in the same snippet.
-    ...toggleMobilePreview(false),
+registerWebsitePreviewTour(
+    "website_mobile_order_with_drag_and_drop",
     {
-        content: "Drag a 'Text-Image' column and drop it in the same snippet",
-        trigger: "body .o_overlay_options .o_move_handle",
-        run(helpers) {
-            return helpers.drag_and_drop(textImageSnippetRow, {
-                position: "bottom",
-                relative: true,
-            });
-        }
+        url: "/",
+        edition: true,
     },
-    checkIfNoMobileOrder(textImageSnippetRow),
-    // Add again a mobile order to the "Text-Image" snippet columns.
-    ...toggleMobilePreview(true),
-    ...addMobileOrderToTextImageSnippet,
-    // Test the drag and drop from "Columns" to "Text-Image".
-    ...toggleMobilePreview(false),
-    {
-        content: "Click on the second column of the 'Columns' snippet",
-        trigger: `${columnsSnippetRow} > div:nth-child(2)`,
-        run: "click",
-    }, {
-        content: "Drag the second column of 'Columns' and drop it in 'Text-Image'",
-        trigger: "body .o_overlay_options .o_move_handle, body .o_overlay_options .o_move_handle:not(:visible)",
-        run: `drag_and_drop ${textImageSnippetRow}`,
-    },
-    checkIfNoMobileOrder(textImageSnippetRow),
-    {
-        content: "Check that the order gap left in 'Columns' was filled",
-        trigger: `${columnsSnippetRow}:has(.order-lg-0[style*='order: 0;']:nth-child(1))`
-            + ":has(.order-lg-0[style*='order: 1;']:nth-child(2))",
-    },
-]);
+    () => [
+        ...insertSnippet({ id: "s_three_columns", name: "Columns", groupName: "Columns" }),
+        ...insertSnippet({ id: "s_text_image", name: "Text - Image", groupName: "Content" }),
+        ...toggleMobilePreview(true),
+        // Add a mobile order to the "Columns" snippet columns.
+        ...changeFirstAndSecondColumnsMobileOrder(columnsSnippetRow, "Columns"),
+        {
+            content: "Check that the mobile order classes and styles are correct",
+            trigger:
+                `${columnsSnippetRow}:has(.order-lg-0[style*='order: 1;']:nth-child(1))` +
+                ":has(.order-lg-0[style*='order: 0;']:nth-child(2))" +
+                ":has(.order-lg-0[style*='order: 2;']:nth-child(3))",
+        },
+        // Add a mobile order to the "Text-Image" snippet columns.
+        ...addMobileOrderToTextImageSnippet,
+        // Test the drag and drop in the same snippet.
+        ...toggleMobilePreview(false),
+        {
+            content: "Drag a 'Text-Image' column and drop it in the same snippet",
+            trigger: "body .o_overlay_options .o_move_handle",
+            run(helpers) {
+                return helpers.drag_and_drop(textImageSnippetRow, {
+                    position: "bottom",
+                    relative: true,
+                });
+            },
+        },
+        checkIfNoMobileOrder(textImageSnippetRow),
+        // Add again a mobile order to the "Text-Image" snippet columns.
+        ...toggleMobilePreview(true),
+        ...addMobileOrderToTextImageSnippet,
+        // Test the drag and drop from "Columns" to "Text-Image".
+        ...toggleMobilePreview(false),
+        {
+            content: "Click on the second column of the 'Columns' snippet",
+            trigger: `${columnsSnippetRow} > div:nth-child(2)`,
+            run: "click",
+        },
+        {
+            content: "Drag the second column of 'Columns' and drop it in 'Text-Image'",
+            trigger:
+                "body .o_overlay_options .o_move_handle, body .o_overlay_options .o_move_handle:not(:visible)",
+            run: `drag_and_drop ${textImageSnippetRow}`,
+        },
+        checkIfNoMobileOrder(textImageSnippetRow),
+        {
+            content: "Check that the order gap left in 'Columns' was filled",
+            trigger:
+                `${columnsSnippetRow}:has(.order-lg-0[style*='order: 0;']:nth-child(1))` +
+                ":has(.order-lg-0[style*='order: 1;']:nth-child(2))",
+        },
+    ]
+);
diff --git a/addons/website_blog/static/src/interactions/website_blog.js b/addons/website_blog/static/src/interactions/website_blog.js
index 5ae81d0d1e14d..5e19b11c968dc 100644
--- a/addons/website_blog/static/src/interactions/website_blog.js
+++ b/addons/website_blog/static/src/interactions/website_blog.js
@@ -17,9 +17,10 @@ export class WebsiteBlog extends Interaction {
         "#o_wblog_post_content_jump": {
             "t-on-click.prevent.withTarget": this.onContentAnchorClick,
         },
-        ".o_twitter, .o_facebook, .o_linkedin, .o_google, .o_twitter_complete, .o_facebook_complete, .o_linkedin_complete, .o_google_complete": {
-            "t-on-click.prevent.withTarget": this.onShareArticleClick,
-        },
+        ".o_twitter, .o_facebook, .o_linkedin, .o_google, .o_twitter_complete, .o_facebook_complete, .o_linkedin_complete, .o_google_complete":
+            {
+                "t-on-click.prevent.withTarget": this.onShareArticleClick,
+            },
     };
 
     /**
@@ -28,17 +29,25 @@ export class WebsiteBlog extends Interaction {
     async onNextBlogClick(ev) {
         const blogNextContainerEl = ev.currentTarget.closest("#o_wblog_next_container");
         const nextInfo = blogNextContainerEl.querySelector("#o_wblog_next_post_info").dataset;
-        const recordCoverContainerEl = blogNextContainerEl.querySelector(".o_record_cover_container");
+        const recordCoverContainerEl = blogNextContainerEl.querySelector(
+            ".o_record_cover_container"
+        );
         const classes = nextInfo.size.split(" ");
         recordCoverContainerEl.classList.add(...classes, nextInfo.textContent);
-        blogNextContainerEl.querySelectorAll(".o_wblog_toggle").forEach(el => el.classList.toggle("d-none"));
+        blogNextContainerEl
+            .querySelectorAll(".o_wblog_toggle")
+            .forEach((el) => el.classList.toggle("d-none"));
         // Appending a placeholder so that the cover can scroll to the top of the
         // screen, regardless of its height.
         const placeholder = document.createElement("div");
         placeholder.style.minHeight = "100vh";
         this.insert(placeholder, this.el.querySelector("#o_wblog_next_container"), "beforeend");
         const nextUrl = verifyHttpsUrl(nextInfo.url);
-        await this.forumScrollAction(blogNextContainerEl, 300, () => browser.location.href = nextUrl);
+        await this.forumScrollAction(
+            blogNextContainerEl,
+            300,
+            () => (browser.location.href = nextUrl)
+        );
     }
     /**
      * @param {KeyboardEvent} ev
@@ -58,7 +67,11 @@ export class WebsiteBlog extends Interaction {
         ev.stopImmediatePropagation();
         const scrollTargetEl = document.querySelector(currentTargetEl.hash);
 
-        await this.forumScrollAction(scrollTargetEl, 500, () => browser.location.hash = "blog_content");
+        await this.forumScrollAction(
+            scrollTargetEl,
+            500,
+            () => (browser.location.hash = "blog_content")
+        );
     }
 
     /**
@@ -74,11 +87,15 @@ export class WebsiteBlog extends Interaction {
                 title: blogPostTitle,
                 url: articleURL,
             });
-            url = "https://twitter.com/intent/tweet?tw_p=tweetbutton&text=" + encodeURIComponent(tweetText);
+            url =
+                "https://twitter.com/intent/tweet?tw_p=tweetbutton&text=" +
+                encodeURIComponent(tweetText);
         } else if (currentTargetEl.classList.contains("o_facebook")) {
             url = "https://www.facebook.com/sharer/sharer.php?u=" + encodeURIComponent(articleURL);
         } else if (currentTargetEl.classList.contains("o_linkedin")) {
-            url = "https://www.linkedin.com/sharing/share-offsite/?url=" + encodeURIComponent(articleURL);
+            url =
+                "https://www.linkedin.com/sharing/share-offsite/?url=" +
+                encodeURIComponent(articleURL);
         }
         window.open(url, "", "menubar=no, width=500, height=400");
     }
@@ -94,6 +111,4 @@ export class WebsiteBlog extends Interaction {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website_blog.website_blog", WebsiteBlog);
+registry.category("public.interactions").add("website_blog.website_blog", WebsiteBlog);
diff --git a/addons/website_blog/static/src/js/systray_items/new_content.js b/addons/website_blog/static/src/js/systray_items/new_content.js
index fe75058e5c163..f5f90feadee73 100644
--- a/addons/website_blog/static/src/js/systray_items/new_content.js
+++ b/addons/website_blog/static/src/js/systray_items/new_content.js
@@ -8,7 +8,9 @@ patch(NewContentSystrayItem.prototype, {
     setup() {
         super.setup();
 
-        const newBlogElement = this.state.newContentElements.find(element => element.moduleXmlId === 'base.module_website_blog');
+        const newBlogElement = this.state.newContentElements.find(
+            (element) => element.moduleXmlId === "base.module_website_blog"
+        );
         newBlogElement.createNewContent = () =>
             this.onAddContent(
                 "website_blog.blog_post_action_add",
@@ -16,7 +18,7 @@ patch(NewContentSystrayItem.prototype, {
                 this.getCurrentBlogContext()
             );
         newBlogElement.status = MODULE_STATUS.INSTALLED;
-        newBlogElement.model = 'blog.post';
+        newBlogElement.model = "blog.post";
     },
 
     getCurrentBlogContext() {
diff --git a/addons/website_blog/static/src/snippets/s_blog_posts/blog_posts.js b/addons/website_blog/static/src/snippets/s_blog_posts/blog_posts.js
index f30e9106851ab..7ca985f39b65c 100644
--- a/addons/website_blog/static/src/snippets/s_blog_posts/blog_posts.js
+++ b/addons/website_blog/static/src/snippets/s_blog_posts/blog_posts.js
@@ -17,12 +17,8 @@ export class BlogPosts extends DynamicSnippet {
     }
 }
 
-registry
-    .category("public.interactions")
-    .add("website_blog.blog_posts", BlogPosts);
+registry.category("public.interactions").add("website_blog.blog_posts", BlogPosts);
 
-registry
-    .category("public.interactions.edit")
-    .add("website_blog.blog_posts", {
-        Interaction: BlogPosts,
-    });
+registry.category("public.interactions.edit").add("website_blog.blog_posts", {
+    Interaction: BlogPosts,
+});
diff --git a/addons/website_blog/static/src/tours/website_blog.js b/addons/website_blog/static/src/tours/website_blog.js
index 99b8bb1de80c7..95258ec1f784d 100644
--- a/addons/website_blog/static/src/tours/website_blog.js
+++ b/addons/website_blog/static/src/tours/website_blog.js
@@ -1,103 +1,121 @@
 import { _t } from "@web/core/l10n/translation";
-import {
-    clickOnSave,
-    registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+import { clickOnSave, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
 
 import { markup } from "@odoo/owl";
 
-registerWebsitePreviewTour("blog", {
-    url: "/",
-}, () => [{
-    trigger: "body:not(:has(.o_new_content_menu_choices)) .o_new_content_container > button",
-    content: _t("Click here to add new content to your website."),
-    tooltipPosition: 'bottom',
-    run: "click",
-}, {
-    trigger: 'button[data-module-xml-id="base.module_website_blog"]',
-    content: _t("Select this menu item to create a new blog post."),
-    tooltipPosition: "bottom",
-    run: "click",
-}, {
-    trigger: 'div[name="name"] input',
-    content: _t("Enter your post's title"),
-    tooltipPosition: "bottom",
-    run: "edit Test",
-},
-{
-    trigger: 'div.o_field_widget[name="blog_id"]',
-},
-{
-    trigger: "button.o_form_button_save",
-    content: _t("Select the blog you want to add the post to."),
-    // Without demo data (and probably in most user cases) there is only
-    // one blog so this step would not be needed and would block the tour.
-    // We keep the step with "auto: true", so that the main python test
-    // still works but never display this to the user anymore. We suppose
-    // the user does not need guidance once that modal is opened. Note: if
-    // you run the tour via your console without demo data, the tour will
-    // thus fail as this will be considered.
-    run: "click",
-},
-{
-    trigger: ".o_builder_sidebar_open .o-snippets-menu",
-    timeout: 15000,
-},
-{
-    trigger: ":iframe h1[data-oe-expression=\"blog_post.name\"]",
-    content: _t("Edit your title, the subtitle is optional."),
-    tooltipPosition: "top",
-    run: "click",
-},
-{
-    trigger: `:iframe #wrap h1[data-oe-expression="blog_post.name"]:not(:contains(''))`,
-},
-{
-    trigger: "button[data-action-id='setCoverBackground'][title='Image']",
-    content: markup(_t("Set a blog post <b>cover</b>.")),
-    tooltipPosition: "top",
-    run: "click",
-}, {
-    trigger: ".o_select_media_dialog .o_we_search",
-    content: _t("Search for an image. (eg: type \"business\")"),
-    tooltipPosition: "top",
-},
-{
-    trigger: ".o_select_media_dialog .o_existing_attachment_cell:first .o_button_area",
-    content: _t("Choose an image from the library."),
-    tooltipPosition: "top",
-    run: "click",
-}, {
-    trigger: ":iframe #o_wblog_post_content p",
-    content: markup(_t("<b>Write your story here.</b> Use the top toolbar to style your text: add an image or table, set bold or italic, etc. Drag and drop building blocks for more graphical blogs.")),
-    tooltipPosition: "top",
-    run: "editor Blog content",
-},
-...clickOnSave(),
-{
-    trigger: ".o_menu_systray_item.o_mobile_preview > a",
-    content: markup(_t("Use this icon to preview your blog post on <b>mobile devices</b>.")),
-    tooltipPosition: "bottom",
-    run: "click",
-},
-{
-    trigger: ".o_website_preview.o_is_mobile",
-},
-{
-    trigger: ".o_menu_systray_item.o_mobile_preview > a",
-    content: _t("Once you have reviewed the content on mobile, you can switch back to the normal view by clicking here again"),
-    tooltipPosition: "right",
-    run: "click",
-},
-{
-    trigger: ":iframe body:not(.editor_enable)",
-},
-{
-    trigger: '.o_menu_systray_item a:contains("Unpublished")',
-    tooltipPosition: "bottom",
-    content: markup(_t("<b>Publish your blog post</b> to make it visible to your visitors.")),
-    run: "click",
-}, {
-    trigger: '.o_menu_systray_item a:contains("Published")',
-}
-]);
+registerWebsitePreviewTour(
+    "blog",
+    {
+        url: "/",
+    },
+    () => [
+        {
+            trigger:
+                "body:not(:has(.o_new_content_menu_choices)) .o_new_content_container > button",
+            content: _t("Click here to add new content to your website."),
+            tooltipPosition: "bottom",
+            run: "click",
+        },
+        {
+            trigger: 'button[data-module-xml-id="base.module_website_blog"]',
+            content: _t("Select this menu item to create a new blog post."),
+            tooltipPosition: "bottom",
+            run: "click",
+        },
+        {
+            trigger: 'div[name="name"] input',
+            content: _t("Enter your post's title"),
+            tooltipPosition: "bottom",
+            run: "edit Test",
+        },
+        {
+            trigger: 'div.o_field_widget[name="blog_id"]',
+        },
+        {
+            trigger: "button.o_form_button_save",
+            content: _t("Select the blog you want to add the post to."),
+            // Without demo data (and probably in most user cases) there is only
+            // one blog so this step would not be needed and would block the
+            // tour. We keep the step with "auto: true", so that the main python
+            // test still works but never display this to the user anymore. We
+            // suppose the user does not need guidance once that modal is
+            // opened. Note: if you run the tour via your console without demo
+            // data, the tour will thus fail as this will be considered.
+            run: "click",
+        },
+        {
+            trigger: ".o_builder_sidebar_open .o-snippets-menu",
+            timeout: 15000,
+        },
+        {
+            trigger: ':iframe h1[data-oe-expression="blog_post.name"]',
+            content: _t("Edit your title, the subtitle is optional."),
+            tooltipPosition: "top",
+            run: "click",
+        },
+        {
+            trigger: `:iframe #wrap h1[data-oe-expression="blog_post.name"]:not(:contains(''))`,
+        },
+        {
+            trigger: "button[data-action-id='setCoverBackground'][title='Image']",
+            content: markup(_t("Set a blog post <b>cover</b>.")),
+            tooltipPosition: "top",
+            run: "click",
+        },
+        {
+            trigger: ".o_select_media_dialog .o_we_search",
+            content: _t('Search for an image. (eg: type "business")'),
+            tooltipPosition: "top",
+        },
+        {
+            trigger: ".o_select_media_dialog .o_existing_attachment_cell:first .o_button_area",
+            content: _t("Choose an image from the library."),
+            tooltipPosition: "top",
+            run: "click",
+        },
+        {
+            trigger: ":iframe #o_wblog_post_content p",
+            content: markup(
+                _t(
+                    "<b>Write your story here.</b> Use the top toolbar to style your text: add an image or table, set bold or italic, etc. Drag and drop building blocks for more graphical blogs."
+                )
+            ),
+            tooltipPosition: "top",
+            run: "editor Blog content",
+        },
+        ...clickOnSave(),
+        {
+            trigger: ".o_menu_systray_item.o_mobile_preview > a",
+            content: markup(
+                _t("Use this icon to preview your blog post on <b>mobile devices</b>.")
+            ),
+            tooltipPosition: "bottom",
+            run: "click",
+        },
+        {
+            trigger: ".o_website_preview.o_is_mobile",
+        },
+        {
+            trigger: ".o_menu_systray_item.o_mobile_preview > a",
+            content: _t(
+                "Once you have reviewed the content on mobile, you can switch back to the normal view by clicking here again"
+            ),
+            tooltipPosition: "right",
+            run: "click",
+        },
+        {
+            trigger: ":iframe body:not(.editor_enable)",
+        },
+        {
+            trigger: '.o_menu_systray_item a:contains("Unpublished")',
+            tooltipPosition: "bottom",
+            content: markup(
+                _t("<b>Publish your blog post</b> to make it visible to your visitors.")
+            ),
+            run: "click",
+        },
+        {
+            trigger: '.o_menu_systray_item a:contains("Published")',
+        },
+    ]
+);
diff --git a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
index a25b936bf0a75..2dd6bed3d52c4 100644
--- a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
@@ -10,7 +10,7 @@ import { DynamicSnippetBlogPostsOption } from "./dynamic_snippet_blog_posts_opti
 class DynamicSnippetBlogPostsOptionPlugin extends Plugin {
     static id = "dynamicSnippetBlogPostsOption";
     static dependencies = ["dynamicSnippetOption"];
-    static shared = ["fetchBlogs","getModelNameFilter"];
+    static shared = ["fetchBlogs", "getModelNameFilter"];
     modelNameFilter = "blog.post";
     resources = {
         builder_options: withSequence(DYNAMIC_SNIPPET, DynamicSnippetBlogPostsOption),
diff --git a/addons/website_blog/static/tests/interactions/snippets/website_blog.test.js b/addons/website_blog/static/tests/interactions/snippets/website_blog.test.js
index 8b2a975648801..f5542d8191fb1 100644
--- a/addons/website_blog/static/tests/interactions/snippets/website_blog.test.js
+++ b/addons/website_blog/static/tests/interactions/snippets/website_blog.test.js
@@ -19,7 +19,7 @@ test("click on next blog updates URL", async () => {
         </section>
     `);
     expect(core.interactions).toHaveLength(1);
-    expect(browser.location.pathname).toBe("/")
+    expect(browser.location.pathname).toBe("/");
     await click(".o_wblog_next_button");
     await advanceTime(300);
     expect(browser.location.pathname).toBe("/some/blog");
diff --git a/addons/website_blog/static/tests/tours/blog_search_with_date.js b/addons/website_blog/static/tests/tours/blog_search_with_date.js
index c8927d5773c37..d755d9619bece 100644
--- a/addons/website_blog/static/tests/tours/blog_search_with_date.js
+++ b/addons/website_blog/static/tests/tours/blog_search_with_date.js
@@ -4,30 +4,34 @@ import { registry } from "@web/core/registry";
  * Makes sure that blog search can be used with the date filtering.
  */
 registry.category("web_tour.tours").add("blog_autocomplete_with_date", {
-    url: '/blog',
-    steps: () => [{
-    content: "Select first month",
-    trigger: 'select[name=archive]',
-    run: "selectByIndex 1",
-    expectUnloadPage: true,
-},
-{
-    trigger: '#o_wblog_posts_loop span:has(i.fa-calendar-o):has(a[href="/blog"])',
-},
-{
-    content: "Enter search term",
-    trigger: '.o_searchbar_form input',
-    run: "edit a",
-},
-{
-    trigger: ".o_searchbar_form .o_dropdown_menu .o_search_result_item",
-},
-{
-    content: "Wait for suggestions then click on search icon",
-    trigger: '.o_searchbar_form button:has(i.oi-search)',
-    run: "click",
-    expectUnloadPage: true,
-}, {
-    content: "Ensure both filters are applied",
-    trigger: `#o_wblog_posts_loop:has(span a[href="/blog?search=a"]):has(span i.fa-calendar-o):has(span a[href^="/blog?date_begin"]):has(span i.fa-search)`,
-}]});
+    url: "/blog",
+    steps: () => [
+        {
+            content: "Select first month",
+            trigger: "select[name=archive]",
+            run: "selectByIndex 1",
+            expectUnloadPage: true,
+        },
+        {
+            trigger: '#o_wblog_posts_loop span:has(i.fa-calendar-o):has(a[href="/blog"])',
+        },
+        {
+            content: "Enter search term",
+            trigger: ".o_searchbar_form input",
+            run: "edit a",
+        },
+        {
+            trigger: ".o_searchbar_form .o_dropdown_menu .o_search_result_item",
+        },
+        {
+            content: "Wait for suggestions then click on search icon",
+            trigger: ".o_searchbar_form button:has(i.oi-search)",
+            run: "click",
+            expectUnloadPage: true,
+        },
+        {
+            content: "Ensure both filters are applied",
+            trigger: `#o_wblog_posts_loop:has(span a[href="/blog?search=a"]):has(span i.fa-calendar-o):has(span a[href^="/blog?date_begin"]):has(span i.fa-search)`,
+        },
+    ],
+});
diff --git a/addons/website_blog/static/tests/tours/blog_tags_tour.js b/addons/website_blog/static/tests/tours/blog_tags_tour.js
index c2cb7bf01f5e0..1ddc5fdd8d804 100644
--- a/addons/website_blog/static/tests/tours/blog_tags_tour.js
+++ b/addons/website_blog/static/tests/tours/blog_tags_tour.js
@@ -3,80 +3,85 @@ import {
     clickOnSave,
     clickOnSnippet,
     registerWebsitePreviewTour,
-} from '@website/js/tours/tour_utils';
+} from "@website/js/tours/tour_utils";
 import { stepUtils } from "@web_tour/tour_utils";
 
-
 /**
  * Makes sure that blog tags can be created and removed.
  */
-registerWebsitePreviewTour('blog_tags', {
-    url: '/blog',
-}, () => [
-    stepUtils.waitIframeIsReady(),
-    {
-        content: "Go to the 'Post Test' blog",
-        trigger: ":iframe article[name=blog_post] a:contains('Post Test')",
-        run: "click",
-    },
-    {
-        content: "Ensure that the blog is opened",
-        trigger: ":iframe h1.o_wblog_post_name",
-    },
-    ...clickOnEditAndWaitEditMode(),
-    ...clickOnSnippet('#o_wblog_post_top .o_wblog_post_page_cover'),
-    {
-        content: "Open tag dropdown",
-        trigger: "[data-label='Tags'] button.o_select_menu_toggler",
-        run: "click",
-    },
-    ...stepUtils.editSelectMenuInput(".o_select_menu_input", "testtag"),
-    {
-        content: "Save tag",
-        trigger: ".dropdown-menu a.o_we_m2o_create",
-        run: "click",
-    },
-    {
-        content: "Verify tag appears in options",
-        trigger: "[data-label='Tags'] table input[data-name='testtag']",
-    },
-    ...clickOnSave(),
+registerWebsitePreviewTour(
+    "blog_tags",
     {
-        content: "Verify tag appears in blog post",
-        trigger: ":iframe #o_wblog_post_content .badge:contains('testtag')",
+        url: "/blog",
     },
-    ...clickOnEditAndWaitEditMode(),
-    ...clickOnSnippet('#o_wblog_post_top .o_wblog_post_page_cover'),
-    {
-        content: "Remove tag",
-        trigger: "[data-label='Tags'] table tr:has(input[data-name='testtag']) button.fa-minus",
-        run: "click",
-    }, {
-        content: "Verify tag does not appear in options anymore",
-        trigger: "[data-label='Tags'] table:not(:has(input[data-name='testtag']))",
-    },
-    ...clickOnSave(),
-    {
-        content: "Verify tag does not appear in blog post anymore",
-        trigger: ":iframe #o_wblog_post_content div:has(.badge):not(:contains('testtag'))",
-    },
-    {
-        trigger: ":iframe .o_wblog_post_title:contains(post test)",
-    },
-    {
-        content: "Go back to /blog",
-        trigger: ":iframe a:contains(all blogs)",
-        run: "click",
-    },
-    {
-        trigger: ":iframe .h1:contains(our latest posts)",
-    },
-    {
-        content: "Click on the adventure tag",
-        trigger: ":iframe a[href^='/blog/tag/adventure'].o_post_link_js_loaded",
-        run: "click",
-    }, {
-        content: "Verify we are still on the backend",
-        trigger: ":iframe span:contains(adventure) i.fa-tag",
-    }]
+    () => [
+        stepUtils.waitIframeIsReady(),
+        {
+            content: "Go to the 'Post Test' blog",
+            trigger: ":iframe article[name=blog_post] a:contains('Post Test')",
+            run: "click",
+        },
+        {
+            content: "Ensure that the blog is opened",
+            trigger: ":iframe h1.o_wblog_post_name",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet("#o_wblog_post_top .o_wblog_post_page_cover"),
+        {
+            content: "Open tag dropdown",
+            trigger: "[data-label='Tags'] button.o_select_menu_toggler",
+            run: "click",
+        },
+        ...stepUtils.editSelectMenuInput(".o_select_menu_input", "testtag"),
+        {
+            content: "Save tag",
+            trigger: ".dropdown-menu a.o_we_m2o_create",
+            run: "click",
+        },
+        {
+            content: "Verify tag appears in options",
+            trigger: "[data-label='Tags'] table input[data-name='testtag']",
+        },
+        ...clickOnSave(),
+        {
+            content: "Verify tag appears in blog post",
+            trigger: ":iframe #o_wblog_post_content .badge:contains('testtag')",
+        },
+        ...clickOnEditAndWaitEditMode(),
+        ...clickOnSnippet("#o_wblog_post_top .o_wblog_post_page_cover"),
+        {
+            content: "Remove tag",
+            trigger: "[data-label='Tags'] table tr:has(input[data-name='testtag']) button.fa-minus",
+            run: "click",
+        },
+        {
+            content: "Verify tag does not appear in options anymore",
+            trigger: "[data-label='Tags'] table:not(:has(input[data-name='testtag']))",
+        },
+        ...clickOnSave(),
+        {
+            content: "Verify tag does not appear in blog post anymore",
+            trigger: ":iframe #o_wblog_post_content div:has(.badge):not(:contains('testtag'))",
+        },
+        {
+            trigger: ":iframe .o_wblog_post_title:contains(post test)",
+        },
+        {
+            content: "Go back to /blog",
+            trigger: ":iframe a:contains(all blogs)",
+            run: "click",
+        },
+        {
+            trigger: ":iframe .h1:contains(our latest posts)",
+        },
+        {
+            content: "Click on the adventure tag",
+            trigger: ":iframe a[href^='/blog/tag/adventure'].o_post_link_js_loaded",
+            run: "click",
+        },
+        {
+            content: "Verify we are still on the backend",
+            trigger: ":iframe span:contains(adventure) i.fa-tag",
+        },
+    ]
 );
diff --git a/addons/website_blog/static/tests/tours/blog_tags_with_date.js b/addons/website_blog/static/tests/tours/blog_tags_with_date.js
index 17dcf933cc6c5..8d391af959c03 100644
--- a/addons/website_blog/static/tests/tours/blog_tags_with_date.js
+++ b/addons/website_blog/static/tests/tours/blog_tags_with_date.js
@@ -4,51 +4,70 @@ import { registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
  * Makes sure that blog tags should not be removed on the addition of date filter
  * and on the removal of date filter.
  */
-registerWebsitePreviewTour("blog_tags_with_date", {
-    url: "/blog",
-}, () => [{
-        content: "Check that the sidebar is present",
-        trigger: ":iframe #o_wblog_sidebar",
-    }, {
-        content: "Click on 'adventure' tag",
-        trigger: ":iframe #o_wblog_sidebar a:contains('adventure')",
-        run: "click",
-    }, {
-        content: "Check 'adventure' tag has been added",
-        trigger: ":iframe #o_wblog_posts_loop span:contains('adventure')",
-    }, {
-        content: "Click on 'discovery' tag",
-        trigger: ":iframe #o_wblog_sidebar a:contains('discovery')",
-        run: "click",
-    }, {
-        content: "Check 'discovery' tag has been added",
-        trigger: ":iframe #o_wblog_posts_loop span:contains('discovery')",
-    }, {
-        content: "Select first month",
-        trigger: ":iframe select[name=archive]",
-        run: function (helpers) {
-            const options = Array.from(this.anchor?.options ?? []);
-            const firstMonthIndex = options.findIndex((option) => option.closest("optgroup"));
-            if (firstMonthIndex === -1) {
-                throw new Error("Expected an option inside an optgroup in the archive select.");
-            }
-            return helpers.selectByIndex(firstMonthIndex, this.anchor);
-        },
-    }, {
-        content: "Check date filter has been added",
-        trigger: ":iframe #o_wblog_posts_loop span>i.fa-calendar-o",
-    }, {
-        content: "Check 'adventure' and 'discovery' tag is present after addition of date filter",
-        trigger: ":iframe #o_wblog_posts_loop:has(span:contains('adventure'), span:contains('discovery'))",
-    }, {
-        content: "Remove the date filter",
-        trigger: ":iframe #o_wblog_posts_loop span:has(i.fa-calendar-o) a",
-        run: "click",
-    }, {
-        content: "Date filter should not be present",
-        trigger: ":iframe #o_wblog_posts_loop span:not(:has(i.fa-calendar-o))",
-    }, {
-        content: "Check 'adventure' and 'discovery' tag is present after removal of date filter",
-        trigger: ":iframe #o_wblog_posts_loop:has(span:contains('adventure'), span:contains('discovery'))",
-    }]
+registerWebsitePreviewTour(
+    "blog_tags_with_date",
+    {
+        url: "/blog",
+    },
+    () => [
+        {
+            content: "Check that the sidebar is present",
+            trigger: ":iframe #o_wblog_sidebar",
+        },
+        {
+            content: "Click on 'adventure' tag",
+            trigger: ":iframe #o_wblog_sidebar a:contains('adventure')",
+            run: "click",
+        },
+        {
+            content: "Check 'adventure' tag has been added",
+            trigger: ":iframe #o_wblog_posts_loop span:contains('adventure')",
+        },
+        {
+            content: "Click on 'discovery' tag",
+            trigger: ":iframe #o_wblog_sidebar a:contains('discovery')",
+            run: "click",
+        },
+        {
+            content: "Check 'discovery' tag has been added",
+            trigger: ":iframe #o_wblog_posts_loop span:contains('discovery')",
+        },
+        {
+            content: "Select first month",
+            trigger: ":iframe select[name=archive]",
+            run: function (helpers) {
+                const options = Array.from(this.anchor?.options ?? []);
+                const firstMonthIndex = options.findIndex((option) => option.closest("optgroup"));
+                if (firstMonthIndex === -1) {
+                    throw new Error("Expected an option inside an optgroup in the archive select.");
+                }
+                return helpers.selectByIndex(firstMonthIndex, this.anchor);
+            },
+        },
+        {
+            content: "Check date filter has been added",
+            trigger: ":iframe #o_wblog_posts_loop span>i.fa-calendar-o",
+        },
+        {
+            content:
+                "Check 'adventure' and 'discovery' tag is present after addition of date filter",
+            trigger:
+                ":iframe #o_wblog_posts_loop:has(span:contains('adventure'), span:contains('discovery'))",
+        },
+        {
+            content: "Remove the date filter",
+            trigger: ":iframe #o_wblog_posts_loop span:has(i.fa-calendar-o) a",
+            run: "click",
+        },
+        {
+            content: "Date filter should not be present",
+            trigger: ":iframe #o_wblog_posts_loop span:not(:has(i.fa-calendar-o))",
+        },
+        {
+            content:
+                "Check 'adventure' and 'discovery' tag is present after removal of date filter",
+            trigger:
+                ":iframe #o_wblog_posts_loop:has(span:contains('adventure'), span:contains('discovery'))",
+        },
+    ]
 );
diff --git a/addons/website_cf_turnstile/static/src/interactions/error_handler.js b/addons/website_cf_turnstile/static/src/interactions/error_handler.js
index a529294f23c6f..f2a9ccc67e544 100644
--- a/addons/website_cf_turnstile/static/src/interactions/error_handler.js
+++ b/addons/website_cf_turnstile/static/src/interactions/error_handler.js
@@ -8,9 +8,9 @@ function turnstileErrorHandler(env, error) {
             name: _t("Cloudflare Turnstile Error"),
             traceback: _t(
                 `There was an error with Cloudflare Turnstile, the captcha system.\n` +
-                `Please make sure your credentials for this service are properly set up.\n` +
-                `The error code is: %s.\n` +
-                `You can find more information about this error code here: https://developers.cloudflare.com/turnstile/reference/errors.`,
+                    `Please make sure your credentials for this service are properly set up.\n` +
+                    `The error code is: %s.\n` +
+                    `You can find more information about this error code here: https://developers.cloudflare.com/turnstile/reference/errors.`,
                 error.event.error.code
             ),
         });
diff --git a/addons/website_cf_turnstile/static/src/interactions/turnstile.js b/addons/website_cf_turnstile/static/src/interactions/turnstile.js
index eca596a4bf771..2d3b5c8c7a0c4 100644
--- a/addons/website_cf_turnstile/static/src/interactions/turnstile.js
+++ b/addons/website_cf_turnstile/static/src/interactions/turnstile.js
@@ -51,8 +51,8 @@ export class TurnStile {
 
         // avoid autosubmit from password manager
         const inputValidation = document.createElement("input");
-        inputValidation.style = 'display: none;';
-        inputValidation.className = 'turnstile_captcha_valid';
+        inputValidation.style = "display: none;";
+        inputValidation.className = "turnstile_captcha_valid";
         inputValidation.required = true;
 
         this.turnstileEl = turnstileContainer;
@@ -68,7 +68,7 @@ export class TurnStile {
      */
     static clean(el) {
         const turnstileEls = el.querySelectorAll(".s_turnstile");
-        turnstileEls.forEach(element => element.remove());
+        turnstileEls.forEach((element) => element.remove());
     }
 
     static disableSubmit(submitButton) {
diff --git a/addons/website_cf_turnstile/static/src/interactions/turnstile_captcha.js b/addons/website_cf_turnstile/static/src/interactions/turnstile_captcha.js
index 065e28e59ec65..817db40418d70 100644
--- a/addons/website_cf_turnstile/static/src/interactions/turnstile_captcha.js
+++ b/addons/website_cf_turnstile/static/src/interactions/turnstile_captcha.js
@@ -13,10 +13,7 @@ export class TurnstileCaptcha extends Interaction {
     }
 
     start() {
-        if (
-            !this.el.querySelector(".s_turnstile")
-            && session.turnstile_site_key
-        ) {
+        if (!this.el.querySelector(".s_turnstile") && session.turnstile_site_key) {
             this.uniq = uniqueId("turnstile_");
             const action = this.el.dataset.captcha || "generic";
             const turnstile = new TurnStile(action);
diff --git a/addons/website_cf_turnstile/static/tests/helpers.js b/addons/website_cf_turnstile/static/tests/helpers.js
index bab99bc64f60e..1120d8c74e927 100644
--- a/addons/website_cf_turnstile/static/tests/helpers.js
+++ b/addons/website_cf_turnstile/static/tests/helpers.js
@@ -1,6 +1,5 @@
 import { TurnStile } from "@website_cf_turnstile/interactions/turnstile";
 
-
 /**
  * For unit tests, we want to avoid talking to an external API.
  */
diff --git a/addons/website_customer/static/src/website_builder/customer_filter_option.js b/addons/website_customer/static/src/website_builder/customer_filter_option.js
index 244556f427143..1b418da61122f 100644
--- a/addons/website_customer/static/src/website_builder/customer_filter_option.js
+++ b/addons/website_customer/static/src/website_builder/customer_filter_option.js
@@ -5,7 +5,8 @@ import { useService } from "@web/core/utils/hooks";
 
 export class CustomerFilterOption extends BaseOptionComponent {
     static template = "website_customer.CustomerFilterOption";
-    static selector = "main:not(:has(#oe_structure_website_crm_partner_assign_layout_1)):has(.o_wcrm_filters_top)";
+    static selector =
+        "main:not(:has(#oe_structure_website_crm_partner_assign_layout_1)):has(.o_wcrm_filters_top)";
     static groups = ["website.group_website_designer"];
     static title = _t("Customers Page");
     static editableOnly = false;
diff --git a/addons/website_google_map/static/src/js/website_google_map.js b/addons/website_google_map/static/src/js/website_google_map.js
index 1a66135641ff2..346833d73ed8f 100644
--- a/addons/website_google_map/static/src/js/website_google_map.js
+++ b/addons/website_google_map/static/src/js/website_google_map.js
@@ -1,14 +1,13 @@
 /* global MarkerClusterer, google */
 function initialize_map() {
-    'use strict';
+    "use strict";
 
     // MAP CONFIG AND LOADING
-    var map = new google.maps.Map(document.getElementById('odoo-google-map'), {
+    var map = new google.maps.Map(document.getElementById("odoo-google-map"), {
         zoom: 1,
-        center: {lat: 0.0, lng: 0.0},
+        center: { lat: 0.0, lng: 0.0 },
         mapTypeId: google.maps.MapTypeId.ROADMAP,
         gestureHandling: "greedy",
-
     });
 
     // ENABLE ADDRESS GEOCODING
@@ -16,80 +15,90 @@ function initialize_map() {
 
     // INFO BUBBLES
     var infoWindow = new google.maps.InfoWindow();
-    var partners = new google.maps.MarkerImage('/website_google_map/static/src/img/partners.png', new google.maps.Size(25, 25));
-    var partner_url = document.body.getAttribute('data-partner-url') || '';
+    var partners = new google.maps.MarkerImage(
+        "/website_google_map/static/src/img/partners.png",
+        new google.maps.Size(25, 25)
+    );
+    var partner_url = document.body.getAttribute("data-partner-url") || "";
     var markers = [];
     var options = {
-        imagePath: '/website_google_map/static/src/lib/images/m'
+        imagePath: "/website_google_map/static/src/lib/images/m",
     };
 
-    google.maps.event.addListener(map, 'click', function() {
+    google.maps.event.addListener(map, "click", function () {
         infoWindow.close();
     });
 
     // Display the bubble once clicked
-    var onMarkerClick = function() {
+    var onMarkerClick = function () {
         var marker = this;
         var p = marker.partner;
         infoWindow.setContent(
-              '<div class="marker">'+
-              (partner_url.length ? '<a target="_top" href="'+partner_url+p.id+'"><b>'+p.name +'</b></a>' : '<b>'+p.name+'</b>' )+
-              (p.type ? '  <b>' + p.type + '</b>' : '')+
-              '  <pre>' + p.address + '</pre>'+
-              '</div>'
-          );
+            '<div class="marker">' +
+                (partner_url.length
+                    ? '<a target="_top" href="' + partner_url + p.id + '"><b>' + p.name + "</b></a>"
+                    : "<b>" + p.name + "</b>") +
+                (p.type ? "  <b>" + p.type + "</b>" : "") +
+                "  <pre>" +
+                p.address +
+                "</pre>" +
+                "</div>"
+        );
         infoWindow.open(map, marker);
     };
 
     // Create a bubble for a partner
-    var set_marker = function(partner) {
-      return new Promise((resolve, reject) => {
-        // If no lat & long, geocode address
-        // TODO: a server cronjob that will store these coordinates in database instead of resolving them on-the-fly
-        if (!partner.latitude && !partner.longitude) {
-            Geocoder.geocode({'address': partner.address}, function(results, status) {
-                if (status === google.maps.GeocoderStatus.OK) {
-                    var location = results[0].geometry.location;
-                    partner.latitude = location.ob;
-                    partner.longitude = location.pb;
-                    var marker = new google.maps.Marker({
-                        partner: partner,
-                        map: map,
-                        icon: partners,
-                        position: location
-                    });
-                    google.maps.event.addListener(marker, 'click', onMarkerClick);
-                    markers.push(marker);
-                    resolve();
-                } else {
-                    console.debug('Geocode was not successful for the following reason: ' + status);
-                    reject('Geocode failed: ' + status);
-                }
-            });
-        } else {
-            var latLng = new google.maps.LatLng(partner.latitude, partner.longitude);
-            var marker = new google.maps.Marker({
-                partner: partner,
-                icon: partners,
-                map: map,
-                position: latLng
-            });
-            google.maps.event.addListener(marker, 'click', onMarkerClick);
-            markers.push(marker);
-            resolve();
-        }
-      });
+    var set_marker = function (partner) {
+        return new Promise((resolve, reject) => {
+            // If no lat & long, geocode address
+            // TODO: a server cronjob that will store these coordinates in database instead of resolving them on-the-fly
+            if (!partner.latitude && !partner.longitude) {
+                Geocoder.geocode({ address: partner.address }, function (results, status) {
+                    if (status === google.maps.GeocoderStatus.OK) {
+                        var location = results[0].geometry.location;
+                        partner.latitude = location.ob;
+                        partner.longitude = location.pb;
+                        var marker = new google.maps.Marker({
+                            partner: partner,
+                            map: map,
+                            icon: partners,
+                            position: location,
+                        });
+                        google.maps.event.addListener(marker, "click", onMarkerClick);
+                        markers.push(marker);
+                        resolve();
+                    } else {
+                        console.debug(
+                            "Geocode was not successful for the following reason: " + status
+                        );
+                        reject("Geocode failed: " + status);
+                    }
+                });
+            } else {
+                var latLng = new google.maps.LatLng(partner.latitude, partner.longitude);
+                var marker = new google.maps.Marker({
+                    partner: partner,
+                    icon: partners,
+                    map: map,
+                    position: latLng,
+                });
+                google.maps.event.addListener(marker, "click", onMarkerClick);
+                markers.push(marker);
+                resolve();
+            }
+        });
     };
 
-
     /* eslint-disable no-undef */
     async function initializeMarkers(odooPartnerData) {
         // Create the markers and cluster them on the map
-        if (odooPartnerData) { /* odoo_partner_data special variable should have been defined in google_map.xml */
+        if (odooPartnerData) {
+            /* odoo_partner_data special variable should have been defined in google_map.xml */
             const markerPromises = [];
             for (var i = 0; i < odoo_partner_data.counter; i++) {
-                const prom = set_marker(odoo_partner_data.partners[i])
-                    .catch(error => console.error(error));
+                const prom = set_marker(odoo_partner_data.partners[i]).catch((error) =>
+                    console.error(error)
+                );
                 markerPromises.push(prom);
             }
             await Promise.all(markerPromises);
@@ -97,7 +106,7 @@ function initialize_map() {
 
             // auto center map and auto zoom
             const bounds = new google.maps.LatLngBounds();
-            markers.forEach(n => bounds.extend(n.position));
+            markers.forEach((n) => bounds.extend(n.position));
             map.setCenter(bounds.getCenter());
             map.fitBounds(bounds);
             map.setZoom(map.getZoom() - 1);
@@ -110,4 +119,4 @@ function initialize_map() {
 }
 
 // Initialize map once the DOM has been loaded
-google.maps.event.addDomListener(window, 'load', initialize_map);
+google.maps.event.addDomListener(window, "load", initialize_map);
diff --git a/addons/website_project/static/src/js/website_project_editor.js b/addons/website_project/static/src/js/website_project_editor.js
index 6a38c633b5c16..7e53336d17cf5 100644
--- a/addons/website_project/static/src/js/website_project_editor.js
+++ b/addons/website_project/static/src/js/website_project_editor.js
@@ -1,53 +1,63 @@
 import { _t } from "@web/core/l10n/translation";
-import { registry } from '@web/core/registry';
+import { registry } from "@web/core/registry";
 
-registry.category("website.form_editor_actions").add('create_task', {
-    formFields: [{
-        type: 'char',
-        required: true,
-        fillWith: 'name',
-        name: 'partner_name',
-        string: _t('Full Name'),
-    }, {
-        type: 'tel',
-        fillWith: 'phone',
-        name: 'partner_phone',
-        string: _t('Phone Number'),
-    }, {
-        type: 'email',
-        custom: true,
-        required: true,
-        fillWith: 'email',
-        name: 'email_from',
-        string: _t('Email Address'),
-    }, {
-        type: 'char',
-        fillWith: 'commercial_company_name',
-        name: 'partner_company_name',
-        string: _t('Company Name'),
-    }, {
-        type: 'char',
-        modelRequired: true,
-        name: 'name',
-        string: _t('Message Subject'),
-    }, {
-        type: 'text',
-        required: true,
-        name: 'description',
-        string: _t('Ask Your Question'),
-    }, {
-        type: 'binary',
-        custom: true,
-        name: _t('Attach File'),
-    }],
-    fields: [{
-        name: 'project_id',
-        type: 'many2one',
-        required: true,
-        relation: 'project.project',
-        string: _t('Project'),
-        domain: [["is_template", "=", false]],
-        createAction: 'project.open_view_project_all',
-    }],
-    successPage: '/your-task-has-been-submitted',
+registry.category("website.form_editor_actions").add("create_task", {
+    formFields: [
+        {
+            type: "char",
+            required: true,
+            fillWith: "name",
+            name: "partner_name",
+            string: _t("Full Name"),
+        },
+        {
+            type: "tel",
+            fillWith: "phone",
+            name: "partner_phone",
+            string: _t("Phone Number"),
+        },
+        {
+            type: "email",
+            custom: true,
+            required: true,
+            fillWith: "email",
+            name: "email_from",
+            string: _t("Email Address"),
+        },
+        {
+            type: "char",
+            fillWith: "commercial_company_name",
+            name: "partner_company_name",
+            string: _t("Company Name"),
+        },
+        {
+            type: "char",
+            modelRequired: true,
+            name: "name",
+            string: _t("Message Subject"),
+        },
+        {
+            type: "text",
+            required: true,
+            name: "description",
+            string: _t("Ask Your Question"),
+        },
+        {
+            type: "binary",
+            custom: true,
+            name: _t("Attach File"),
+        },
+    ],
+    fields: [
+        {
+            name: "project_id",
+            type: "many2one",
+            required: true,
+            relation: "project.project",
+            string: _t("Project"),
+            domain: [["is_template", "=", false]],
+            createAction: "project.open_view_project_all",
+        },
+    ],
+    successPage: "/your-task-has-been-submitted",
 });

From 5b3d1aec55f686ea45777ca1e78eb5f9740aadff Mon Sep 17 00:00:00 2001
From: FrancoisGe <fge@odoo.com>
Date: Thu, 30 Oct 2025 15:33:38 +0000
Subject: [PATCH 145/673] [FIX] website: fix bg color selector

During the FW-port PR https://github.com/odoo/odoo/pull/230283,
the background color selectors were mistakenly modified.
This commit restores their correct values.

closes odoo/odoo#233928

X-original-commit: 380f61565bb81129b492fd11e27d15e46bb0b724
Signed-off-by: Robin Lejeune (role) <role@odoo.com>
---
 .../website/static/src/builder/plugins/options/utils.js   | 7 ++-----
 .../plugins/options/website_background_option_plugin.js   | 8 +++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/website/static/src/builder/plugins/options/utils.js b/addons/website/static/src/builder/plugins/options/utils.js
index ac4201e7aaad7..90467f410239b 100644
--- a/addons/website/static/src/builder/plugins/options/utils.js
+++ b/addons/website/static/src/builder/plugins/options/utils.js
@@ -1,11 +1,8 @@
 export const CARD_PARENT_HANDLERS =
     ".s_three_columns .row > div, .s_comparisons .row > div, .s_cards_grid .row > div, .s_cards_soft .row > div, .s_product_list .row > div, .s_newsletter_centered .row > div, .s_company_team_spotlight .row > div, .s_comparisons_horizontal .row > div, .s_company_team_grid .row > div, .s_company_team_card .row > div, .s_carousel_cards_item";
 
-export const BASE_ONLY_BG_IMAGE_SELECTOR = `.s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .s_image_gallery .row > div, .s_text_cover .row > .o_not_editable, [data-snippet] :not(.oe_structure) > .s_hr, ${CARD_PARENT_HANDLERS}, .s_website_form_cover .row > .o_not_editable, .s_bento_grid .row > div`;
-
-export const BOTH_BG_COLOR_IMAGE_SELECTOR =
-    "section, .carousel-item, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .parallax, .s_text_cover .row > .o_not_editable, .s_website_form_cover .row > .o_not_editable, .s_split_intro .row > .o_not_editable, .s_bento_grid .row > div, .s_banner_categories .row > div, .s_ecomm_categories_showcase_block";
-export const BOTH_BG_COLOR_IMAGE_EXCLUDE = `${BASE_ONLY_BG_IMAGE_SELECTOR}, .s_carousel_wrapper, .s_image_gallery .carousel-item, .s_google_map, .s_map, [data-snippet] :not(.oe_structure) > [data-snippet], .s_masonry_block .s_col_no_resize, .s_quotes_carousel_wrapper, .s_carousel_intro_wrapper, .s_carousel_cards_item, .s_dynamic_snippet_category .s_dynamic_snippet_title`;
+export const BASE_ONLY_BG_IMAGE_SELECTOR =
+    ".s_tabs .oe_structure > *, footer .oe_structure > *:not(.o_footer_bottom_part)";
 
 export const CARD_DISABLE_WIDTH_APPLY_TO = ":scope > .s_card:not(.s_carousel_cards_card)";
 export const WEBSITE_BG_APPLY_TO = ":scope > .s_carousel_cards_card";
diff --git a/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
index 3746b14d340d9..9a2db7d081f07 100644
--- a/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
@@ -1,7 +1,7 @@
 import { BaseWebsiteBackgroundOption } from "@website/builder/plugins/options/background_option";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
-import { BASE_ONLY_BG_IMAGE_SELECTOR, CARD_PARENT_HANDLERS } from "./utils";
+import { CARD_PARENT_HANDLERS, BASE_ONLY_BG_IMAGE_SELECTOR } from "./utils";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC_BEFORE } from "@html_builder/utils/option_sequence";
 import { WEBSITE_BACKGROUND_OPTIONS } from "@website/builder/option_sequence";
@@ -20,8 +20,8 @@ export class WebsiteBackgroundCarouselOption extends BaseWebsiteBackgroundOption
 
 export class WebsiteBackgroundBGColorImageOption extends BaseWebsiteBackgroundOption {
     static selector =
-        "section, .carousel-item, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .parallax, .s_text_cover .row > .o_not_editable, .s_website_form_cover .row > .o_not_editable, .s_split_intro .row > .o_not_editable, .s_bento_grid .row > div";
-    static exclude = `${BASE_ONLY_BG_IMAGE_SELECTOR}, .s_carousel_wrapper, .s_image_gallery .carousel-item, .s_google_map, .s_map, [data-snippet] :not(.oe_structure) > [data-snippet], .s_masonry_block .s_col_no_resize, .s_quotes_carousel_wrapper, .s_carousel_intro_wrapper, .s_carousel_cards_item`;
+        "section, .carousel-item, .s_masonry_block .row > div, .s_color_blocks_2 .row > div, .parallax, .s_text_cover .row > .o_not_editable, .s_website_form_cover .row > .o_not_editable, .s_split_intro .row > .o_not_editable, .s_bento_grid .row > div, .s_banner_categories .row > div, .s_ecomm_categories_showcase_block";
+    static exclude = `${BASE_ONLY_BG_IMAGE_SELECTOR}, .s_carousel_wrapper, .s_image_gallery .carousel-item, .s_google_map, .s_map, [data-snippet] :not(.oe_structure) > [data-snippet], .s_masonry_block .s_col_no_resize, .s_quotes_carousel_wrapper, .s_carousel_intro_wrapper, .s_carousel_cards_item, .s_dynamic_snippet_category .s_dynamic_snippet_title`;
     static defaultProps = {
         withColors: true,
         withImages: true,
@@ -40,8 +40,10 @@ export class WebsiteBackgroundBGColorOption extends BaseWebsiteBackgroundOption
         withColorCombinations: true,
     };
 }
+
 export class WebsiteBackgroundOnlyBGImageOption extends BaseWebsiteBackgroundOption {
     static selector = BASE_ONLY_BG_IMAGE_SELECTOR;
+    static exclude = "";
     static defaultProps = {
         withColors: false,
         withImages: true,

From 8f6429276878e94e82b7adb495bf1238902b7623 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Tue, 7 Oct 2025 10:30:34 +0200
Subject: [PATCH 146/673] [FIX] hr: Remove dead field from whitelist

closes odoo/odoo#230247

Related: odoo/enterprise#96385
Related: odoo/upgrade#8555
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/tests/test_payroll_fields_access.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr/tests/test_payroll_fields_access.py b/addons/hr/tests/test_payroll_fields_access.py
index bd50285779a55..c2debebc42ac5 100644
--- a/addons/hr/tests/test_payroll_fields_access.py
+++ b/addons/hr/tests/test_payroll_fields_access.py
@@ -63,7 +63,6 @@ def _test_payroll_fields_are_hidden_to_non_payroll_users(self, model_name, view_
             'lang',
             'registration_number',
             'standard_calendar_id',
-            'employee_age',
             'distance_home_work',
             'distance_home_work_unit',
             'show_billable_time_target',

From 7d16ea7479ce84ae85d2426a570b2c40dc980db8 Mon Sep 17 00:00:00 2001
From: FrancoisGe <fge@odoo.com>
Date: Wed, 29 Oct 2025 09:45:35 +0000
Subject: [PATCH 147/673] [FIX] website_sale: ProductsListPageOption should be
 always visible

Before this commit, the ProductsListPageOption component only became
visible after clicking on the web page (By example, clicking on a product).
Now, by adapting the selector to target <main>, the page options remain
visible when navigating to the "Style" tab.

closes odoo/odoo#233696

X-original-commit: 160a2c90a12d683726e7df50d83df10068c55e0b
Signed-off-by: Valentin Chevalier <vcr@odoo.com>
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../static/src/website_builder/products_list_page_option.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/static/src/website_builder/products_list_page_option.js b/addons/website_sale/static/src/website_builder/products_list_page_option.js
index 4e0807f16ab4b..0ea5a7cf4b9e0 100644
--- a/addons/website_sale/static/src/website_builder/products_list_page_option.js
+++ b/addons/website_sale/static/src/website_builder/products_list_page_option.js
@@ -4,7 +4,7 @@ import { products_sort_mapping } from "@website_sale/website_builder/shared";
 
 export class ProductsListPageOption extends BaseOptionComponent {
     static template = "website_sale.ProductsListPageOption";
-    static selector = "#o_wsale_container";
+    static selector = "main:has(#o_wsale_container)";
     static title = _t("Products Page");
     static groups = ["website.group_website_designer"];
     static editableOnly = false;

From 5df1d4b88e0f4f312ad6256e8d19c4ab03d17bb9 Mon Sep 17 00:00:00 2001
From: reka-odoo <reka@odoo.com>
Date: Tue, 28 Oct 2025 09:30:03 +0000
Subject: [PATCH 148/673] [FIX] analytic: fix error when grouping by any field
 in analytic accounts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When grouping by any field in Analytic Accounts, a traceback occurs.

Steps to reproduce the error:
- Install "Accounting" module
- Go to Settings > Enable "Analytic Accounting" > Save
- Go to Accounting > Configurations > Analytic Accounts > Group by any field

Traceback:
"ValueError: Cannot convert account.analytic.account.debit to SQL because it is
 not stored"

https://github.com/odoo/odoo/blob/a884794ebfc8145c61bb34908093f00246f224ff/addons/analytic/models/analytic_account.py#L128-L133
When the user applies Group By, the "_read_group_select" method is called with
"debit:sum_currency" as the "aggregate_spec".
This method then calls the super "_read_group_select" method,
and the super method calls the "_field_to_sql" method from [1].
which uses "field.to_sql()" to build an SQL object for the "debit" field at [2].
Since the "debit" field is a non-stored computed field, the "to_sql()" method
raises the above ValueError at [3].

[1]: https://github.com/odoo/odoo/blob/a884794ebfc8145c61bb34908093f00246f224ff/odoo/orm/models.py#L2002

[2]: https://github.com/odoo/odoo/blob/a884794ebfc8145c61bb34908093f00246f224ff/odoo/orm/models.py#L2930

[3]: https://github.com/odoo/odoo/blob/a884794ebfc8145c61bb34908093f00246f224ff/odoo/orm/fields.py#L1211

sentry-6921656195

closes odoo/odoo#234183

X-original-commit: 1260e689b0b95ef04ed07d2f62651bdc0500408c
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/analytic/models/analytic_account.py | 28 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/analytic/models/analytic_account.py b/addons/analytic/models/analytic_account.py
index 9acdc868c2d40..4c45dcc49de4a 100644
--- a/addons/analytic/models/analytic_account.py
+++ b/addons/analytic/models/analytic_account.py
@@ -128,15 +128,35 @@ def web_read(self, specification: dict[str, dict]) -> list[dict]:
     def _read_group_select(self, aggregate_spec, query):
         # flag balance/debit/credit as aggregatable, and manually sum the values
         # from the records in the group
-        if aggregate_spec in ('balance:sum', 'debit:sum', 'credit:sum'):
+        if aggregate_spec in (
+            'balance:sum',
+            'balance:sum_currency',
+            'debit:sum',
+            'debit:sum_currency',
+            'credit:sum',
+            'credit:sum_currency',
+        ):
             return super()._read_group_select('id:recordset', query)
         return super()._read_group_select(aggregate_spec, query)
 
     def _read_group_postprocess_aggregate(self, aggregate_spec, raw_values):
-        if aggregate_spec in ('balance:sum', 'debit:sum', 'credit:sum'):
-            field_name = aggregate_spec.split(':')[0]
+        if aggregate_spec in (
+            'balance:sum',
+            'balance:sum_currency',
+            'debit:sum',
+            'debit:sum_currency',
+            'credit:sum',
+            'credit:sum_currency',
+        ):
+            field_name, op = aggregate_spec.split(':')
             column = super()._read_group_postprocess_aggregate('id:recordset', raw_values)
-            return (sum(records.mapped(field_name)) for records in column)
+            if op == 'sum':
+                return (sum(records.mapped(field_name)) for records in column)
+            if op == 'sum_currency':
+                return (sum(record.currency_id._convert(
+                    from_amount=record[field_name],
+                    to_currency=self.env.company.currency_id,
+                ) for record in records) for records in column)
         return super()._read_group_postprocess_aggregate(aggregate_spec, raw_values)
 
     @api.depends('line_ids.amount')

From aa646835da59c9d71065adbcfca66d110e31f6bb Mon Sep 17 00:00:00 2001
From: Romeo Fragomeli <rfr@odoo.com>
Date: Fri, 31 Oct 2025 13:49:08 +0000
Subject: [PATCH 149/673] [FIX] web: datetime: avoid double picker

Before this commit, it was possible to have multiple pickers
open if you programmatically set the focus on several date inputs.
This could occur in a form view when the first date field was a `button`
rather than an `input` and the second one is date field as an input.
The autofocus feature only selects `input` elements (see `relational_utils.js`).

We agree that this behavior should be improved in the future,
but for now we prefer a simpler fix.

Now, all pickers are closed before opening a new one.
This ensures that only one picker is open, even if the focus changes multiple times.

Steps to reproduce:
- Go to Employees
- Click on create
- Go in the Certifications tab
- Click on "Add a line"
=> The `valid_from` picker and the `valid_to` picker are open.

closes odoo/odoo#234188

X-original-commit: b79567ae1e1e94c4c255495b79f21d1fea544630
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 .../src/core/datetime/datetime_picker_hook.js |  8 +++++--
 .../core/datetime/datetimepicker_service.js   | 16 ++++++++++++--
 .../tests/views/fields/date_field.test.js     | 22 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/core/datetime/datetime_picker_hook.js b/addons/web/static/src/core/datetime/datetime_picker_hook.js
index 925d9f20b1866..d30a64196dfe7 100644
--- a/addons/web/static/src/core/datetime/datetime_picker_hook.js
+++ b/addons/web/static/src/core/datetime/datetime_picker_hook.js
@@ -1,4 +1,4 @@
-import { useRef } from "@odoo/owl";
+import { onWillDestroy, useRef } from "@odoo/owl";
 import { useService } from "@web/core/utils/hooks";
 
 /**
@@ -28,5 +28,9 @@ export function useDateTimePicker(params) {
         useOwlHooks: true,
     });
 
-    return useService("datetime_picker").create(serviceParams);
+    const picker = useService("datetime_picker").create(serviceParams);
+    onWillDestroy(() => {
+        picker.disable();
+    });
+    return picker;
 }
diff --git a/addons/web/static/src/core/datetime/datetimepicker_service.js b/addons/web/static/src/core/datetime/datetimepicker_service.js
index 803f40d72417f..172ed5bd0e69d 100644
--- a/addons/web/static/src/core/datetime/datetimepicker_service.js
+++ b/addons/web/static/src/core/datetime/datetimepicker_service.js
@@ -74,6 +74,7 @@ const parsers = {
 export const datetimePickerService = {
     dependencies: ["popover"],
     start(env, { popover: popoverService }) {
+        const dateTimePickerList = new Set();
         return {
             /**
              * @param {DateTimePickerServiceParams} [params]
@@ -265,6 +266,9 @@ export const datetimePickerService = {
                                 popoverTarget.style.marginBottom = marginBottom;
                             };
                         }
+                        for (const picker of dateTimePickerList) {
+                            picker.close();
+                        }
                         popover.open(popoverTarget, { pickerProps });
                     }
 
@@ -529,8 +533,16 @@ export const datetimePickerService = {
                         `datetime picker service error: cannot use target as ref name when not using Owl hooks`
                     );
                 }
-
-                return { enable, isOpen, open, state: pickerProps };
+                const picker = {
+                    enable,
+                    disable: () => dateTimePickerList.delete(picker),
+                    isOpen,
+                    open,
+                    close: () => popover.close(),
+                    state: pickerProps,
+                };
+                dateTimePickerList.add(picker);
+                return picker;
             },
         };
     },
diff --git a/addons/web/static/tests/views/fields/date_field.test.js b/addons/web/static/tests/views/fields/date_field.test.js
index 016a1e063f4b6..ccf79a6ef84fa 100644
--- a/addons/web/static/tests/views/fields/date_field.test.js
+++ b/addons/web/static/tests/views/fields/date_field.test.js
@@ -1,4 +1,4 @@
-import { expect, test } from "@odoo/hoot";
+import { expect, queryFirst, test } from "@odoo/hoot";
 import { click, edit, press, queryAllTexts, queryOne, scroll } from "@odoo/hoot-dom";
 import { animationFrame, mockDate, mockTimeZone } from "@odoo/hoot-mock";
 import {
@@ -61,6 +61,26 @@ test("toggle datepicker", async () => {
     expect(".o_datetime_picker").toHaveCount(0);
 });
 
+test("Ensure only one datepicker is open", async () => {
+    Partner._fields.date_start = fields.Date();
+
+    await mountView({
+        type: "form",
+        resModel: "res.partner",
+        arch: `
+            <form>
+                <field name="date_start"/>
+                <field name="date"/>
+            </form>`,
+        resId: 1,
+    });
+
+    await queryFirst("[data-field='date_start']").click();
+    await queryFirst("[data-field='date']").click();
+    await animationFrame();
+    expect(".o_datetime_picker").toHaveCount(1);
+});
+
 test.tags("desktop");
 test("open datepicker on Control+Enter", async () => {
     defineParams({

From 7bc5efa831bd1e7a3b1cff494f608587c1b75fcb Mon Sep 17 00:00:00 2001
From: Jay Savaliya <jasa@odoo.com>
Date: Wed, 29 Oct 2025 12:05:16 +0000
Subject: [PATCH 150/673] [IMP] l10n_in: improve GSTR section assignment logic

This commit introduces enhancements to the `_set_l10n_in_gstr_section` method,
including:
-Calling `_get_l10n_in_tax_tag_ids` directly on all moves instead of ines.
-Improving the logic for assigning GSTR section values.

closes odoo/odoo#234184

X-original-commit: 3d0890315ac2224809d50776fcc852e89644f863
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Jay Savaliya (jasa) <jasa@odoo.com>
---
 addons/l10n_in/models/account_invoice.py      |  6 +--
 addons/l10n_in/models/account_move_line.py    | 26 ++++++-----
 .../l10n_in_pos/models/account_move_line.py   | 45 ++++++++++---------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/addons/l10n_in/models/account_invoice.py b/addons/l10n_in/models/account_invoice.py
index 2fe2bb879f710..529740b3677ea 100644
--- a/addons/l10n_in/models/account_invoice.py
+++ b/addons/l10n_in/models/account_invoice.py
@@ -725,6 +725,6 @@ def _get_sync_stack(self, container):
     @contextmanager
     def _sync_l10n_in_gstr_section(self, moves):
         yield
-        for move in moves:
-            # we set the section on the invoice lines
-            move.line_ids._set_l10n_in_gstr_section()
+        tax_tags_dict = self.env['account.move.line']._get_l10n_in_tax_tag_ids()
+        # we set the section on the invoice lines
+        moves.line_ids._set_l10n_in_gstr_section(tax_tags_dict)
diff --git a/addons/l10n_in/models/account_move_line.py b/addons/l10n_in/models/account_move_line.py
index 274d53604f271..b926611863ccd 100644
--- a/addons/l10n_in/models/account_move_line.py
+++ b/addons/l10n_in/models/account_move_line.py
@@ -48,7 +48,7 @@ class AccountMoveLine(models.Model):
             ("purchase_out_of_scope", "Out of Scope"),
             ],
         string="GSTR Section",
-        index=True,
+        index="btree_not_null",
     )
 
     # withholding related fields
@@ -95,7 +95,7 @@ def get_tag_ids(*refs):
             'eco_9_5': get_tag_ids('l10n_in.tax_tag_eco_9_5'),
         }
 
-    def _set_l10n_in_gstr_section(self):
+    def _get_l10n_in_gstr_section(self, tax_tags_dict):
 
         def tags_have_categ(line_tax_tags, categories):
             return any(tag in line_tax_tags for category in categories for tag in tax_tags_dict.get(category, []))
@@ -115,7 +115,7 @@ def is_reverse_charge_tax(line):
         def is_lut_tax(line):
             return any(tax.l10n_in_is_lut for tax in line.tax_ids | line.tax_line_id)
 
-        def get_sales_section(line, tax_tags_dict):
+        def get_sales_section(line):
             move = line.move_id
             gst_treatment = move.l10n_in_gst_treatment
             transaction_type = get_transaction_type(move)
@@ -223,7 +223,7 @@ def get_sales_section(line, tax_tags_dict):
             # If none of the above match, default to out of scope
             return 'sale_out_of_scope'
 
-        def get_purchase_section(line, tax_tags_dict):
+        def get_purchase_section(line):
             move = line.move_id
             gst_treatment = move.l10n_in_gst_treatment
             line_tags = line.tax_tag_ids.ids
@@ -305,11 +305,17 @@ def get_purchase_section(line, tax_tags_dict):
         )
         # No Indian sale or purchase lines to process
         if not indian_sale_moves_lines and not indian_moves_purchase_lines:
-            return
-        tax_tags_dict = self._get_l10n_in_tax_tag_ids()
+            return {}
 
-        for move_line in indian_sale_moves_lines:
-            move_line.l10n_in_gstr_section = get_sales_section(move_line, tax_tags_dict)
+        move_lines_by_gstr_section = {
+            **indian_sale_moves_lines.grouped(get_sales_section),
+            **indian_moves_purchase_lines.grouped(get_purchase_section),
+        }
+
+        return move_lines_by_gstr_section
 
-        for move_line in indian_moves_purchase_lines:
-            move_line.l10n_in_gstr_section = get_purchase_section(move_line, tax_tags_dict)
+    def _set_l10n_in_gstr_section(self, tax_tags_dict):
+        move_lines_by_gstr_section = self._get_l10n_in_gstr_section(tax_tags_dict)
+        if move_lines_by_gstr_section:
+            for gstr_section, move_lines in move_lines_by_gstr_section.items():
+                move_lines.l10n_in_gstr_section = gstr_section
diff --git a/addons/l10n_in_pos/models/account_move_line.py b/addons/l10n_in_pos/models/account_move_line.py
index 4e3d29d269de6..1873850268635 100644
--- a/addons/l10n_in_pos/models/account_move_line.py
+++ b/addons/l10n_in_pos/models/account_move_line.py
@@ -4,8 +4,25 @@
 class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
 
-    def _set_l10n_in_gstr_section(self):
-        super()._set_l10n_in_gstr_section()
+    def _get_l10n_in_gstr_section(self, tax_tags_dict):
+        result = super()._get_l10n_in_gstr_section(tax_tags_dict)
+
+        eco_9_5_tag = tax_tags_dict['eco_9_5']
+        all_gst_tags = tax_tags_dict['cgst'] + tax_tags_dict['sgst'] + tax_tags_dict['igst'] + tax_tags_dict['cess']
+
+        def get_section(line):
+            tax_tags = line.tax_tag_ids.ids
+            if any(tag == eco_9_5_tag for tag in tax_tags):
+                return 'sale_eco_9_5'
+            if any(tag in tax_tags for tag in all_gst_tags):
+                return 'sale_b2cs'
+            if any(tax.l10n_in_tax_type == 'nil_rated' for tax in line.tax_ids):
+                return 'sale_nil_rated'
+            if any(tax.l10n_in_tax_type == 'exempt' for tax in line.tax_ids):
+                return 'sale_exempt'
+            if any(tax.l10n_in_tax_type == 'non_gst' for tax in line.tax_ids):
+                return 'sale_non_gst_supplies'
+            return 'sale_out_of_scope'
 
         in_pos_closing_and_reversed_lines = self.filtered(
             lambda l: l.move_id.country_code == 'IN'
@@ -14,23 +31,11 @@ def _set_l10n_in_gstr_section(self):
             and (l.move_id.sudo().pos_session_ids or l.move_id.sudo().reversed_pos_order_id)
         )
         if not in_pos_closing_and_reversed_lines:
-            return
+            return result
 
-        tax_tags_dict = self._get_l10n_in_tax_tag_ids()
-        eco_9_5_tag = tax_tags_dict.get('eco_9_5')
-        all_gst_tags = tax_tags_dict.get('cgst') + tax_tags_dict.get('sgst') + tax_tags_dict.get('igst') + tax_tags_dict.get('cess')
+        move_lines_by_gstr_section = in_pos_closing_and_reversed_lines.grouped(get_section)
 
-        for line in in_pos_closing_and_reversed_lines:
-            tax_tags = line.tax_tag_ids.ids
-            if any(tag == eco_9_5_tag for tag in tax_tags):
-                line.l10n_in_gstr_section = 'sale_eco_9_5'
-            elif any(tag in tax_tags for tag in all_gst_tags):
-                line.l10n_in_gstr_section = 'sale_b2cs'
-            elif any(tax.l10n_in_tax_type == 'nil_rated' for tax in line.tax_ids):
-                line.l10n_in_gstr_section = 'sale_nil_rated'
-            elif any(tax.l10n_in_tax_type == 'exempt' for tax in line.tax_ids):
-                line.l10n_in_gstr_section = 'sale_exempt'
-            elif any(tax.l10n_in_tax_type == 'non_gst' for tax in line.tax_ids):
-                line.l10n_in_gstr_section = 'sale_non_gst_supplies'
-            else:
-                line.l10n_in_gstr_section = 'sale_out_of_scope'
+        for section, lines in move_lines_by_gstr_section.items():
+            result[section] = result.get(section, self.env['account.move.line']) | lines
+
+        return result

From 2819c2d7eeb4ad1eefdd2afb226576a91803108b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 3 Nov 2025 10:26:25 +0000
Subject: [PATCH 151/673] [FIX] mail: fa-user(s)-plus should be oi-user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Icon of invite-people and chats were changed from `fa-user-plus` and
`fa-users` to respectively `oi-user-plus` and `oi-users`.

Some occurrences of use of these icons were still using the `fa-`
version, which looked off on UI. This commit replaces them to `oi-`
as it should.

closes odoo/odoo#234186

X-original-commit: 6a9f65d94630a345a287cee224e57209bdb13020
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/common/thread_icon.xml              | 2 +-
 .../mail/static/src/discuss/core/common/channel_member_list.xml | 2 +-
 .../core/public_web/discuss_app/discuss_app_model_patch.js      | 2 +-
 .../src/discuss/core/public_web/discuss_command_palette.js      | 2 +-
 .../src/discuss/core/public_web/discuss_command_palette.xml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/core/common/thread_icon.xml b/addons/mail/static/src/core/common/thread_icon.xml
index 86e37dfa786fa..f6a62a281355a 100644
--- a/addons/mail/static/src/core/common/thread_icon.xml
+++ b/addons/mail/static/src/core/common/thread_icon.xml
@@ -18,7 +18,7 @@
                     </t>
                 </t>
             </t>
-            <div t-elif="props.thread.channel?.channel_type === 'group'" class="o-mail-ThreadIcon fa fa-fw fa-users" t-att-class="largeClass" title="Grouped Chat"/>
+            <div t-elif="props.thread.channel?.channel_type === 'group'" class="o-mail-ThreadIcon oi fa-fw oi-users" t-att-class="largeClass" title="Grouped Chat"/>
             <t t-elif="props.thread.model === 'mail.box'">
                 <div t-if="props.thread.id === 'inbox'" class="fa fa-fw fa-inbox" t-att-class="largeClass"/>
                 <div t-elif="props.thread.id === 'starred'" class="fa fa-fw fa-star-o" t-att-class="largeClass"/>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.xml b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
index 653222c4cf6bf..3002da7d0ee8e 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_list.xml
+++ b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
@@ -44,7 +44,7 @@
                 <span class="ms-2 text-truncate text-muted fw-bold" t-esc="member.name" t-att-title="member.name"/>
             </div>
             <span class="ms-auto">
-                <span t-if="member.in(props.thread.invited_member_ids)" class="p-1 fa fa-user-plus opacity-75"/>
+                <span t-if="member.in(props.thread.invited_member_ids)" class="p-1 oi oi-user-plus opacity-75"/>
                 <span t-if="member.rtcSession?.is_muted and !member.rtcSession?.is_deaf" class="p-1 fa fa-microphone-slash opacity-75"/>
                 <span t-elif="member.rtcSession?.is_deaf" class="p-1 fa fa-deaf opacity-75"/>
                 <span t-if="member.rtcSession?.raisingHand" class="p-1 fa fa-hand-paper-o"/>
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
index 53c60d256b5ea..19dc2dc2f9920 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
@@ -53,7 +53,7 @@ const discussAppPatch = {
             addTitle: _t("Start a conversation"),
             canView: false,
             extraClass: "o-mail-DiscussSidebarCategory-chat",
-            icon: "fa fa-users",
+            icon: "oi oi-users",
             id: "chats",
             name: _t("Direct messages"),
             sequence: 30,
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
index eaecae93bb4e3..96925a1d03861 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
@@ -291,7 +291,7 @@ export class DiscussCommandPalette {
                 },
                 name: _t("Create Chat"),
                 className: "d-flex",
-                props: { action: { icon: "fa fa-fw fa-users" } },
+                props: { action: { icon: "oi fa-fw oi-users" } },
             };
         }
         throw new Error(`Unsupported use of makeDiscussCommand("${threadOrPersona}")`);
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml
index 1f8f2d3113ce6..6b269254ad343 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml
@@ -42,7 +42,7 @@
     <Dialog size="'md'" title.translate="Make Chat" contentClass="'o-mail-CreateChatDialog'" bodyClass="'py-0'">
         <div class="d-flex flex-column flex-grow-1 bg-inherit w-100">
             <div class="d-flex align-items-center px-0 mb-1 gap-1">
-                <span class="ms-2 my-1 text-uppercase text-muted o-xsmaller opacity-75"><i class="fa fa-user-plus"/> Invite people</span>
+                <span class="ms-2 my-1 text-uppercase text-muted o-xsmaller opacity-75"><i class="oi oi-user-plus"/> Invite people</span>
             </div>
             <ChannelInvitation state="invitePeopleState"/>
         </div>

From a8d2a17da2ebd77aebc2984ae05713443c9c7e75 Mon Sep 17 00:00:00 2001
From: Ian <iada@odoo.com>
Date: Fri, 1 Aug 2025 17:35:01 +0000
Subject: [PATCH 152/673] [FIX] account: Add a test to ensure the product
 description is correct

Issue: If a description is added on a product line, the printed invoice PDF only shows
the description without the product name.

Purpose of this PR:
To add a test to ensure that the product description is correctly reflected on invoice PDF.

Original issue was fixed by this PR: #222589

opw-4985815

closes odoo/odoo#233200

X-original-commit: 0aec544bc084e22477203551a5181352fa2342b4
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
Signed-off-by: Ian Dao (iada) <iada@odoo.com>
---
 .../static/tests/account_move_form.test.js    | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/addons/account/static/tests/account_move_form.test.js b/addons/account/static/tests/account_move_form.test.js
index 483cba596cab7..56bf17bbf96c9 100644
--- a/addons/account/static/tests/account_move_form.test.js
+++ b/addons/account/static/tests/account_move_form.test.js
@@ -7,7 +7,7 @@ import {
     triggerHotkey,
 } from "@mail/../tests/mail_test_helpers";
 import { expect, test } from "@odoo/hoot";
-import { contains, onRpc } from "@web/../tests/web_test_helpers";
+import { contains, defineModels, fields, onRpc, models} from "@web/../tests/web_test_helpers";
 import { defineAccountModels } from "./account_test_helpers";
 
 defineAccountModels();
@@ -61,3 +61,63 @@ test("Confirmation dialog on delete contains a warning", async () => {
         { message: "warning message has been added in the dialog" }
     );
 });
+class AccountMove extends models.Model {
+    line_ids = fields.One2many({
+        string: "Invoice Lines",
+        relation: "account.move.line",
+    })
+
+    _records = [{ id: 1, name: "account.move" }]
+}
+class AccountMoveLine extends models.Model {
+    name = fields.Char();
+    product_id = fields.Many2one({
+        string:"Product",
+        relation:"product",
+    });
+    move_id = fields.Many2one({
+        string: "Account Move",
+        relation: "account.move",
+    })
+}
+class Product extends models.Model {
+    name = fields.Char();
+    _records = [{ id: 1, name: "testProduct" }];
+}
+
+defineModels({ Product, AccountMoveLine, AccountMove });
+
+test("Update description on product line", async() => {
+    const pyEnv = await startServer();
+    const productId = pyEnv["product"].browse([1]);
+    const accountMove = pyEnv["account.move"].browse([1]);
+    pyEnv["account.move.line"].create({ name: productId[0].name, product_id: productId[0].id, move_id: accountMove[0].id });
+    await start();
+    onRpc("account.move", "web_save", () => { expect.step("save")});
+    await openFormView("account.move", accountMove[0].id, {
+        arch: `<form js_class="account_move_form">
+            <sheet>
+                <notebook>
+                    <page id="invoice_tab" name="invoice_tab" string="Invoice Lines">
+                        <field name="invoice_line_ids" mode="list" widget="product_label_section_and_note_field_o2m">
+                            <list name="journal_items" editable="bottom" string="Journal Items">
+                                <field name="product_id" widget="product_label_section_and_note_field" readonly="0"/>
+                                <field name="name" widget="section_and_note_text" optional="show"/>
+                            </list>
+                        </field>
+                    </page>
+                </notebook>
+            </sheet>
+        </form>`,
+    });
+
+    await click(".o_many2one");
+    await contains("#labelVisibilityButtonId").click()
+    await insertText("textarea[placeholder='Enter a description']", "testDescription");
+    await click(".o_form_button_save");
+    await expect.waitForSteps(["save"]);
+
+    const line = pyEnv["account.move.line"].browse([1])[0];
+    expect(line.name).toBe("testProduct\ntestDescription");
+
+});

From 90aa32ce4494626c627c0f2315a9627459082e4e Mon Sep 17 00:00:00 2001
From: alkh-odoo <alkh@odoo.com>
Date: Tue, 22 Jul 2025 08:41:04 +0000
Subject: [PATCH 153/673] [ADD] l10n_tr_nilvera_einvoice_extended,
 l10n_tr_nilvera_einvoice: Add Nilvera e-Invoice extension
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit introduces support for multiple legal invoice
by creating seperete tools to support UBL TR node
structure.

scenarios & their types in Türkiye:

- Withholding VAT
- Exemption Invoices
- Export Invoices
- Public Sector Invoices

It adds new models to handle Turkish Tax Offices and GIB reasons.

- The Tax Office field is available on Turkish partners.
- GIB reasons related to Withholding can be configured on
  Withholding Taxes.
- Other GIB reasons are set on the invoice depending on the selected
  scenario.

These changes ensure compliance with Turkish e-invoicing regulations.

Supported Invoice Types per Scenario:

Basic Scenario:
  - Sales
  - Withholding
  - Tax Exempt
  - Registered for Export
  - Export

Tax Exempt Scenario:
  - Public

Public Scenario:
  - Sales
  - Withholding
  - Tax Exempt
  - Registered for Export

task-4345639

closes odoo/odoo#234187

X-original-commit: 8aa776d29c00c54f54df8eab95db05d24c8b2da0
Signed-off-by: Khumam Alzagim (alkh) <alkh@odoo.com>
---
 .../models/account_move.py                    |    5 +
 .../models/account_move_send.py               |  104 +-
 .../tests/__init__.py                         |    3 +-
 ...ml_ubl_tr.py => test_xml_ubl_tr_common.py} |   61 +-
 .../__init__.py                               |   21 +
 .../__manifest__.py                           |   34 +
 .../data/account_incoterms_data.xml           |   21 +
 ...r_nilvera_einvoice_extended.tax.office.csv | 1047 +++++++++++++++++
 .../data/template/account.tax-tr.csv          |  271 +++++
 ..._einvoice_extended.account.tax.code-tr.csv |   39 +
 .../data/ubl_tr_templates.xml                 |   32 +
 .../l10n_tr_nilvera_einvoice_extended.pot     |  702 +++++++++++
 .../i18n/tr.po                                |  720 ++++++++++++
 .../models/__init__.py                        |   13 +
 .../models/account_edi_xml_ubl_tr.py          |  495 ++++++++
 .../models/account_move.py                    |   86 ++
 .../models/account_move_line.py               |   24 +
 .../models/account_move_send.py               |   65 +
 .../models/account_tax.py                     |   12 +
 ...vera_einvoice_extended_account_tax_code.py |   28 +
 ...tr_nilvera_einvoice_extended_tax_office.py |   12 +
 .../models/product_product.py                 |   15 +
 .../models/product_template.py                |   18 +
 .../models/res_company.py                     |   12 +
 .../models/res_config_settings.py             |   11 +
 .../models/res_partner.py                     |   17 +
 .../models/template_tr.py                     |   16 +
 .../security/ir.model.access.csv              |    8 +
 .../tests/__init__.py                         |    1 +
 ...voice_basic_export_registered_einvoice.xml |  158 +++
 .../invoice_basic_sale_earchive.xml}          |   47 +-
 .../invoice_basic_sale_einvoice.xml           |  156 +++
 .../invoice_basic_tax_exempt_einvoice.xml     |  158 +++
 .../invoice_basic_withholding_einvoice.xml}   |   57 +-
 .../invoice_earchive_multicurrency.xml        |   49 +-
 .../invoice_einvoice_multicurrency.xml        |   49 +-
 .../expected_xmls/invoice_export_earchive.xml |  200 ++++
 .../tests/test_xml_ubl_tr.py                  |  100 ++
 .../tools/__init__.py                         |    3 +
 .../tools/clean_node_dict.py                  |   40 +
 .../tools/ubl_tr_common.py                    |  363 ++++++
 .../tools/ubl_tr_invoice.py                   |   64 +
 .../views/account_move_views.xml              |   33 +
 .../views/account_tax_views.xml               |   13 +
 ...nvoice_extended_account_tax_code_views.xml |   59 +
 ...era_einvoice_extended_tax_office_views.xml |   49 +
 .../views/product_views.xml                   |   31 +
 .../views/res_company_views.xml               |   13 +
 .../views/res_config_settings_views.xml       |   21 +
 .../views/res_partner_views.xml               |   15 +
 50 files changed, 5329 insertions(+), 242 deletions(-)
 rename addons/l10n_tr_nilvera_einvoice/tests/{test_xml_ubl_tr.py => test_xml_ubl_tr_common.py} (56%)
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/__init__.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/data/account_incoterms_data.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/data/l10n_tr_nilvera_einvoice_extended.tax.office.csv
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/data/template/account.tax-tr.csv
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/data/template/l10n_tr_nilvera_einvoice_extended.account.tax.code-tr.csv
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/data/ubl_tr_templates.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/i18n/l10n_tr_nilvera_einvoice_extended.pot
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/i18n/tr.po
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/__init__.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/account_move.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/account_move_line.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/account_tax.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_account_tax_code.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_tax_office.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/product_product.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/product_template.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/res_company.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/res_config_settings.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/res_partner.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/models/template_tr.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/security/ir.model.access.csv
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tests/__init__.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml
 rename addons/{l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive.xml => l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_earchive.xml} (76%)
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_einvoice.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_tax_exempt_einvoice.xml
 rename addons/{l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice.xml => l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml} (79%)
 rename addons/{l10n_tr_nilvera_einvoice => l10n_tr_nilvera_einvoice_extended}/tests/expected_xmls/invoice_earchive_multicurrency.xml (76%)
 rename addons/{l10n_tr_nilvera_einvoice => l10n_tr_nilvera_einvoice_extended}/tests/expected_xmls/invoice_einvoice_multicurrency.xml (77%)
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_export_earchive.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tests/test_xml_ubl_tr.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tools/__init__.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tools/clean_node_dict.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_common.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_invoice.py
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/account_move_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/account_tax_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_account_tax_code_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_tax_office_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/product_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/res_company_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/res_config_settings_views.xml
 create mode 100644 addons/l10n_tr_nilvera_einvoice_extended/views/res_partner_views.xml

diff --git a/addons/l10n_tr_nilvera_einvoice/models/account_move.py b/addons/l10n_tr_nilvera_einvoice/models/account_move.py
index d0fd297411822..d43c33d378b26 100644
--- a/addons/l10n_tr_nilvera_einvoice/models/account_move.py
+++ b/addons/l10n_tr_nilvera_einvoice/models/account_move.py
@@ -348,6 +348,11 @@ def _l10n_tr_nilvera_einvoice_check_negative_lines(self):
             for line in self.invoice_line_ids
         )
 
+    def _get_partner_l10n_tr_nilvera_customer_alias_name(self):
+        # Allows overriding the default customer alias with a custom one.
+        self.ensure_one()
+        return self.partner_id.l10n_tr_nilvera_customer_alias_id.name
+
     # -------------------------------------------------------------------------
     # CRONS
     # -------------------------------------------------------------------------
diff --git a/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py b/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py
index c95cebd8aa585..6ca5681dbf227 100644
--- a/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py
+++ b/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py
@@ -72,25 +72,16 @@ def _is_valid_nilvera_name(move):
             }
 
         # Alert if partner is missing required data (tax ID, street, city, state, country)
-        if tr_partners_missing_required_fields := tr_nilvera_moves.filtered(
-            lambda m: (
-                not m.partner_id.vat
-                or not m.partner_id.street
-                or not m.partner_id.city
-                or not m.partner_id.state_id
-                or not m.partner_id.country_id
-            )
-        ).partner_id:
-            alerts["tr_partners_missing_required_fields"] = {
-                'level': 'danger',
-                "message": _(
-                    "The following partner(s) are missing at least one of these fields: Tax ID, Street, City, State or Country"
-                ),
-                "action_text": _("View Partner(s)"),
-                "action": tr_partners_missing_required_fields._get_records_action(name=_(
-                    "Check Tax ID, City, Street, State, and Country or Partner(s)"
-                )),
-            }
+        if tr_partners_missing_required_fields := self._get_l10n_tr_tax_partner_address_alert(tr_nilvera_moves):
+            alerts["tr_partners_missing_required_fields"] = tr_partners_missing_required_fields
+
+        # Alert if partner is missing required tax office
+        if tr_partners_missing_tax_office := self._get_l10n_tr_tax_partner_tax_office_alert(tr_nilvera_moves):
+            alerts["tr_partners_missing_tax_office"] = tr_partners_missing_tax_office
+
+        # Alert if TR company is missing required tax office
+        if tr_companies_missing_tax_office := self._get_l10n_tr_tax_company_tax_office_alert(tr_nilvera_moves):
+            alerts["tr_companies_missing_tax_office"] = tr_companies_missing_tax_office
 
         # Alert if partner does not use UBL TR e-invoice format or has not checked Nilvera status
         if tr_partners_invalid_edi_or_status := tr_nilvera_moves.filtered(
@@ -126,37 +117,6 @@ def _is_valid_nilvera_name(move):
                 ),
             }
 
-        # Alert if partner is missing Tax office name on reference field
-        if tr_einvoice_partners_missing_ref := moves.partner_id.filtered(
-            lambda p: p.l10n_tr_nilvera_customer_status == "einvoice" and not p.ref
-        ):
-            alerts["critical_partner_missing_reference_field"] = {
-                "message": _(
-                    "The following E-Invoice partner(s) must have the reference field set to the tax office name."
-                ),
-                "action_text": _("View Partner(s)"),
-                "action": tr_einvoice_partners_missing_ref._get_records_action(
-                    name=_("Check reference on Partner(s)")
-                ),
-                "level": "danger",
-            }
-
-        # Alert if company is missing Tax office name on reference field
-        if (
-            tr_companies_missing_required_fields
-            := tr_nilvera_moves.company_id.partner_id.filtered(lambda p: not p.ref)
-        ):
-            alerts["tr_companies_missing_reference_field"] = {
-                "level": "danger",
-                "message": _(
-                    "The following company(s) must have the reference field set to the tax office name."
-                ),
-                "action_text": _("View Company(s)"),
-                "action": tr_companies_missing_required_fields._get_records_action(
-                    name=_("Check reference on Company(s)")
-                ),
-            }
-
         if invalid_negative_lines := tr_nilvera_moves.filtered(
             lambda move: move._l10n_tr_nilvera_einvoice_check_negative_lines(),
         ):
@@ -180,6 +140,48 @@ def _is_valid_nilvera_name(move):
 
         return alerts
 
+    def _get_l10n_tr_tax_partner_address_alert(self, moves):
+        # Extended in l10n_tr_nilvera_einvoice_extended to remove error based on l10n_tr_is_export_invoice
+        if tr_partners_missing_required_fields := moves.filtered(
+            lambda m: (
+                not m.partner_id.vat
+                or not m.partner_id.street
+                or not m.partner_id.city
+                or not m.partner_id.state_id
+                or not m.partner_id.country_id
+            ),
+        ).partner_id:
+            return {
+                "message": _("The following partner(s) are missing at least one of these fields: Tax ID, Street, City, State or Country"),
+                "action_text": _("View Partner(s)"),
+                "action": tr_partners_missing_required_fields._get_records_action(name=_("Check Tax ID, City, Street, State, and Country or Partner(s)")),
+                "level": "danger",
+            }
+        return {}
+
+    def _get_l10n_tr_tax_partner_tax_office_alert(self, moves):
+        # Overriden in l10n_tr_nilvera_einvoice_extended to give error based on l10n_tax_office field
+        if tr_einvoice_partners_missing_ref := moves.partner_id.filtered(lambda p: p.l10n_tr_nilvera_customer_status == "einvoice" and not p.ref and p.country_code == "TR"):
+            return {
+                "message": _("The following E-Invoice partner(s) must have the reference field set to the tax office name."),
+                "action_text": _("View Partner(s)"),
+                "action": tr_einvoice_partners_missing_ref._get_records_action(name=_("Check reference on Partner(s)")),
+                "level": "danger",
+            }
+
+        return {}
+
+    def _get_l10n_tr_tax_company_tax_office_alert(self, moves):
+        # Overriden in l10n_tr_nilvera_einvoice_extended to give error based on l10n_tax_office field
+        if tr_companies_missing_tax_office := moves.company_id.partner_id.filtered(lambda p: not p.reference and p.country_code == "TR"):
+            return {
+                "message": _("The following TR Company(s) must have the reference field set to the tax office name."),
+                "action_text": _("View Company(s)"),
+                "action": tr_companies_missing_tax_office._get_records_action(name=_("TR Company(s)")),
+                "level": "danger",
+            }
+        return {}
+
     # -------------------------------------------------------------------------
     # BUSINESS ACTIONS
     # -------------------------------------------------------------------------
@@ -210,7 +212,7 @@ def _call_web_service_before_invoice_pdf_render(self, invoices_data):
                     # If no alias is saved, the user is either an E-Archive user or we haven't checked before. Check again
                     # just in case.
                     invoice.partner_id._check_nilvera_customer()
-                customer_alias = invoice.partner_id.l10n_tr_nilvera_customer_alias_id.name
+                customer_alias = invoice._get_partner_l10n_tr_nilvera_customer_alias_name()
                 if customer_alias:  # E-Invoice
                     invoice._l10n_tr_nilvera_submit_einvoice(xml_file, customer_alias)
                 else:   # E-Archive
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/__init__.py b/addons/l10n_tr_nilvera_einvoice/tests/__init__.py
index 6c7b3d7b3769a..c500dadb2e838 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/__init__.py
+++ b/addons/l10n_tr_nilvera_einvoice/tests/__init__.py
@@ -1,2 +1,3 @@
-from . import test_xml_ubl_tr
+
 from . import test_account_move_send
+from . import test_xml_ubl_tr_common
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/test_xml_ubl_tr.py b/addons/l10n_tr_nilvera_einvoice/tests/test_xml_ubl_tr_common.py
similarity index 56%
rename from addons/l10n_tr_nilvera_einvoice/tests/test_xml_ubl_tr.py
rename to addons/l10n_tr_nilvera_einvoice/tests/test_xml_ubl_tr_common.py
index 68c5e3bb48867..78043c3669f82 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/test_xml_ubl_tr.py
+++ b/addons/l10n_tr_nilvera_einvoice/tests/test_xml_ubl_tr_common.py
@@ -2,12 +2,9 @@
 
 from odoo import Command
 from odoo.addons.account.tests.common import AccountTestInvoicingCommon
-from odoo.tests import tagged
-from odoo.tools import file_open
 
 
-@tagged('post_install_l10n', 'post_install', '-at_install')
-class TestUBLTR(AccountTestInvoicingCommon):
+class TestUBLTRCommon(AccountTestInvoicingCommon):
 
     @classmethod
     @AccountTestInvoicingCommon.setup_country('tr')
@@ -74,7 +71,8 @@ def setUpClass(cls):
             'company_id': cls.company_data['company'].id,
         })
 
-    def _generate_invoice_xml(self, partner_id, **kwargs):
+    def _generate_invoice_xml(self, partner_id, tax=None, **kwargs):
+        invoice_tax = (tax and tax.ids) or self.tax_20.ids
         invoice = self.env['account.move'].create({
             'move_type': 'out_invoice',
             'company_id': self.company_data['company'].id,
@@ -88,59 +86,10 @@ def _generate_invoice_xml(self, partner_id, **kwargs):
                     'price_unit': 50.00,
                     'quantity': 3,
                     'discount': 12,
-                    'tax_ids': [Command.set(self.tax_20.ids)],
+                    'tax_ids': [Command.set(invoice_tax)],
                 }),
             ],
             **kwargs,
         })
         invoice.action_post()
-        generated_xml = self.env['account.edi.xml.ubl.tr']._export_invoice(invoice)[0]
-        return generated_xml
-
-    def test_xml_invoice_einvoice(self):
-        with freeze_time('2025-03-05'):
-            generated_xml = self._generate_invoice_xml(self.einvoice_partner)
-
-        with file_open('l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice.xml', 'rb') as expected_xml_file:
-            expected_xml = expected_xml_file.read()
-
-        self.assertXmlTreeEqual(
-            self.get_xml_tree_from_string(generated_xml),
-            self.get_xml_tree_from_string(expected_xml),
-        )
-
-    def test_xml_invoice_einvoice_multicurrency(self):
-        with freeze_time('2025-03-05'):
-            generated_xml = self._generate_invoice_xml(partner_id=self.einvoice_partner, currency_id=self.env.ref('base.USD').id)
-
-        with file_open('l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice_multicurrency.xml', 'rb') as expected_xml_file:
-            expected_xml = expected_xml_file.read()
-
-        self.assertXmlTreeEqual(
-            self.get_xml_tree_from_string(generated_xml),
-            self.get_xml_tree_from_string(expected_xml),
-        )
-
-    def test_xml_invoice_earchive(self):
-        with freeze_time('2025-03-05'):
-            generated_xml = self._generate_invoice_xml(self.earchive_partner)
-
-        with file_open('l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive.xml', 'rb') as expected_xml_file:
-            expected_xml = expected_xml_file.read()
-
-        self.assertXmlTreeEqual(
-            self.get_xml_tree_from_string(generated_xml),
-            self.get_xml_tree_from_string(expected_xml),
-        )
-
-    def test_xml_invoice_earchive_multicurrency(self):
-        with freeze_time('2025-03-05'):
-            generated_xml = self._generate_invoice_xml(self.earchive_partner, currency_id=self.env.ref('base.USD').id)
-
-        with file_open('l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive_multicurrency.xml', 'rb') as expected_xml_file:
-            expected_xml = expected_xml_file.read()
-
-        self.assertXmlTreeEqual(
-            self.get_xml_tree_from_string(generated_xml),
-            self.get_xml_tree_from_string(expected_xml),
-        )
+        return self.env['account.edi.xml.ubl.tr']._export_invoice(invoice)[0]
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/__init__.py b/addons/l10n_tr_nilvera_einvoice_extended/__init__.py
new file mode 100644
index 0000000000000..40a89137e6db7
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/__init__.py
@@ -0,0 +1,21 @@
+import logging
+
+from . import models
+
+_logger = logging.getLogger(__name__)
+
+
+def _l10n_tr_nilvera_einvoice_extended_post_init(env):
+    """Existing companies that have the Turkish Chart of Accounts set"""
+    tr_companies = env["res.company"].search([("chart_template", "=", "tr")], order="parent_path")
+    for company in tr_companies:
+        chart_template = env["account.chart.template"].with_company(company)
+        chart_template._load_data({
+            "l10n_tr_nilvera_einvoice_extended.account.tax.code": chart_template._get_tr_withholding_account_tax_code(),
+            "account.tax": {
+                xml_id: data
+                for xml_id, data in chart_template._get_tr_withholding_account_tax().items()
+                if not env.ref(f"account.{company.id}_{xml_id}", raise_if_not_found=False)
+            },
+        })
+        chart_template._load_translations(companies=company)
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py b/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py
new file mode 100644
index 0000000000000..e76e8b7e905a3
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py
@@ -0,0 +1,34 @@
+{
+    'name': 'Türkiye - Nilvera E-Invoice Extended',
+    'version': '1.0',
+    'category': 'Accounting/Accounting',
+    'description': """
+This module enhances the core Nilvera integration by adding additional invoice scenarios and types required for Turkish e-Invoicing compliance.
+
+Features include:
+    1.Support for invoice scenarios: Basic, Export, and Public Sector
+    2.Support for invoice types: Sales, Withholding, Tax Exempt, and Registered for Export
+    3.Configuration of withholding reasons and exemption reasons
+    4.Addition of Tax Offices.
+    """,
+    'depends': ['l10n_tr_nilvera_einvoice', 'contacts'],
+    'data': [
+        'security/ir.model.access.csv',
+        'data/l10n_tr_nilvera_einvoice_extended.tax.office.csv',
+        'data/account_incoterms_data.xml',
+        'data/ubl_tr_templates.xml',
+        'views/res_company_views.xml',
+        'views/l10n_tr_nilvera_einvoice_extended_account_tax_code_views.xml',
+        'views/l10n_tr_nilvera_einvoice_extended_tax_office_views.xml',
+        'views/res_partner_views.xml',
+        'views/account_move_views.xml',
+        'views/account_tax_views.xml',
+        'views/product_views.xml',
+        'views/res_config_settings_views.xml',
+    ],
+    'auto_install': ['l10n_tr_nilvera_einvoice'],
+    'installable': True,
+    'post_init_hook': '_l10n_tr_nilvera_einvoice_extended_post_init',
+    'author': 'Odoo S.A.',
+    'license': 'LGPL-3',
+}
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/data/account_incoterms_data.xml b/addons/l10n_tr_nilvera_einvoice_extended/data/account_incoterms_data.xml
new file mode 100644
index 0000000000000..17d21a2bc7728
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/data/account_incoterms_data.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="incoterm_DAF" model="account.incoterms">
+            <field name="code">DAF</field>
+            <field name="name">DELIVERED AT FRONTIER</field>
+        </record>
+        <record id="incoterm_DDU" model="account.incoterms">
+            <field name="code">DDU</field>
+            <field name="name">DELIVERED DUTY UNPAID</field>
+        </record>
+        <record id="incoterm_DEQ" model="account.incoterms">
+            <field name="code">DEQ</field>
+            <field name="name">DELIVERED EX QUAY (DUTY PAID)</field>
+        </record>
+        <record id="incoterm_DES" model="account.incoterms">
+            <field name="code">DES</field>
+            <field name="name">DELIVERED EX SHIP</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/data/l10n_tr_nilvera_einvoice_extended.tax.office.csv b/addons/l10n_tr_nilvera_einvoice_extended/data/l10n_tr_nilvera_einvoice_extended.tax.office.csv
new file mode 100644
index 0000000000000..0c453d6c836e6
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/data/l10n_tr_nilvera_einvoice_extended.tax.office.csv
@@ -0,0 +1,1047 @@
+id,code,name,state_id:id
+l10n_tr_nilvera_einvoice_extended_tax_office_001,101,Akseki Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_002,101,Göynücek Malmüdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_003,101,Ardanuç Malmüdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_004,101,Diyadin Malmüdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_005,101,Besni Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_006,101,Bozdoğan Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_007,10102,Balya Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_008,10110,Havran Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_009,10111,İvrindi Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_010,10112,Kepsut Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_011,10113,Manyas Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_012,10114,Savaştepe Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_013,10117,Marmara Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_014,10118,Gömeç Malmüdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_015,102,Çelikhan Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_016,102,Ayaş Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_017,10201,Karesi Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_018,10260,Ayvalık Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_019,10261,Bandırma Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_020,10262,Burhaniye Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_021,10263,Edremit Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_022,10264,Gönen Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_023,10265,Susurluk Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_024,10266,Erdek Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_025,10267,Bigadiç Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_026,10268,Sındırgı Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_027,10269,Dursunbey Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_028,10280,Kurtdereli Vergi Dairesi Müdürlüğü,base.state_tr_10
+l10n_tr_nilvera_einvoice_extended_tax_office_029,103,Borçka Malmüdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_030,103,Eleşkirt Malmüdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_031,103,Dazkırı Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_032,103,Balâ Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_033,103,Feke Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_034,103,Gerger Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_035,104,Hamur Malmüdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_036,104,Finike Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_037,104,Gölbaşı Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_038,104,Karacasu Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_039,105,Karaisalı Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_040,105,Gazipaşa Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_041,105,Şavşat Malmüdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_042,105,İhsaniye Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_043,105,Koçarlı Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_044,106,Hamamözü Malmüdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_045,106,Yusufeli Malmüdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_046,106,Çamlıdere Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_047,106,Samsat Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_048,106,Taşlıçay Malmüdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_049,106,Gündoğmuş Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_050,107,Tutak Malmüdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_051,107,Kaş Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_052,107,Murgul Malmüdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_053,107,Sinanpaşa Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_054,107,Sincik Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_055,107,Kuyucak Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_056,108,Tut Malmüdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_057,108,Sultandağı Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_058,109,Pozantı Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_059,109,Şuhut Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_060,110,Sultanhisar Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_061,110,Güdül Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_062,110,Saimbeyli Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_063,111,Yenipazar Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_064,111,Başmakçı Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_065,111,Tufanbeyli Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_066,11102,Gölpazarı Malmüdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_067,11103,Osmaneli Malmüdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_068,11104,Pazaryeri Malmüdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_069,11105,Söğüt Malmüdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_070,11106,Yenipazar Malmüdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_071,11107,İnhisar Malmüdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_072,112,Demre Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_073,112,Kalecik Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_074,112,Yumurtalık Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_075,112,Buharkent Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_076,112,Bayat Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_077,11260,Bilecik Vergi Dairesi Müdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_078,11261,Bozüyük Vergi Dairesi Müdürlüğü,base.state_tr_11
+l10n_tr_nilvera_einvoice_extended_tax_office_079,113,İbradı Malmüdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_080,113,İncirliova Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_081,114,Çobanlar Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_082,114,Karpuzlu Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_083,114,Aladağ Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_084,115,Köşk Malmüdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_085,115,Kızılcahamam Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_086,115,Evciler Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_087,115,İmamoğlu Malmüdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_088,116,Hocalar Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_089,117,Nallıhan Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_090,117,Kızılören Malmüdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_091,12101,Genç Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_092,12102,Karlıova Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_093,12103,Kiğı Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_094,12104,Solhan Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_095,12105,Adaklı Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_096,12106,Yayladere Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_097,12107,Yedisu Malmüdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_098,12260,Bingöl Vergi Dairesi Müdürlüğü,base.state_tr_12
+l10n_tr_nilvera_einvoice_extended_tax_office_099,125,Akyurt Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_100,127,Evren Malmüdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_101,13101,Adilcevaz Malmüdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_102,13102,Ahlat Malmüdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_103,13103,Hizan Malmüdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_104,13104,Mutki Malmüdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_105,13106,Güroymak Malmüdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_106,13260,Bitlis Vergi Dairesi Müdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_107,13261,Tatvan Vergi Dairesi Müdürlüğü,base.state_tr_13
+l10n_tr_nilvera_einvoice_extended_tax_office_108,14104,Göynük Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_109,14105,Kıbrıscık Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_110,14106,Mengen Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_111,14107,Mudurnu Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_112,14108,Seben Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_113,14113,Dörtdivan Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_114,14114,Yeniçağa Malmüdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_115,14260,Bolu Vergi Dairesi Müdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_116,14262,Gerede Vergi Dairesi Müdürlüğü,base.state_tr_14
+l10n_tr_nilvera_einvoice_extended_tax_office_117,15101,Ağlasun Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_118,15103,Gölhisar Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_119,15104,Tefenni Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_120,15105,Yeşilova Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_121,15106,Karamanlı Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_122,15107,Kemer Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_123,15108,Altınyayla Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_124,15109,Çavdır Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_125,15110,Çeltikçi Malmüdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_126,15260,Burdur Vergi Dairesi Müdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_127,15261,Bucak Vergi Dairesi Müdürlüğü,base.state_tr_15
+l10n_tr_nilvera_einvoice_extended_tax_office_128,16105,Keles Malmüdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_129,16108,Orhaneli Malmüdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_130,16111,Harmancık Malmüdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_131,16112,Büyükorhan Malmüdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_132,16201,Gemlik Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_133,16202,İnegöl Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_134,16203,Karacabey Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_135,16204,Mustafakemalpaşa Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_136,16205,Mudanya Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_137,16206,Orhangazi Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_138,16207,İznik Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_139,16208,Yenişehir Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_140,16250,Bursa İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_141,16251,Osmangazi Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_142,16252,Yıldırım Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_143,16253,Çekirge Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_144,16254,Setbaşı Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_145,16255,Uludağ Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_146,16256,Yeşil Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_147,16257,Nilüfer Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_148,16258,Ertuğrulgazi Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_149,16259,Gökdere Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_150,16260,Bursa Veraset ve Harçlar Vergi Dairesi Müdürlüğü,base.state_tr_16
+l10n_tr_nilvera_einvoice_extended_tax_office_151,17101,Ayvacık Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_152,17102,Bayramiç Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_153,17104,Bozcaada Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_154,17106,Eceabat Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_155,17107,Ezine Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_156,17109,Gökçeada Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_157,17110,Lapseki Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_158,17111,Yenice Malmüdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_159,17260,Çanakkale Vergi Dairesi Müdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_160,17261,Biga Vergi Dairesi Müdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_161,17262,Çan Vergi Dairesi Müdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_162,17263,Gelibolu Vergi Dairesi Müdürlüğü,base.state_tr_17
+l10n_tr_nilvera_einvoice_extended_tax_office_163,18101,Çerkeş Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_164,18102,Eldivan Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_165,18104,Ilgaz Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_166,18105,Kurşunlu Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_167,18106,Orta Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_168,18108,Şabanözü Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_169,18109,Yapraklı Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_170,18110,Atkaracalar Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_171,18111,Kızılırmak Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_172,18112,Bayramören Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_173,18113,Korgun Malmüdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_174,18260,Çankırı Vergi Dairesi Müdürlüğü,base.state_tr_18
+l10n_tr_nilvera_einvoice_extended_tax_office_175,19101,Alaca Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_176,19102,Bayat Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_177,19103,İskilip Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_178,19104,Kargı Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_179,19105,Mecitözü Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_180,19106,Ortaköy Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_181,19107,Osmancık Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_182,19109,Boğazkale Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_183,19110,Uğurludağ Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_184,19111,Dodurga Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_185,19112,Oğuzlar Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_186,19113,Laçin Malmüdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_187,19260,Çorum Vergi Dairesi Müdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_188,19261,Sungurlu Vergi Dairesi Müdürlüğü,base.state_tr_19
+l10n_tr_nilvera_einvoice_extended_tax_office_189,201,Efeler Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_190,201,Tınaztepe Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_191,201,Alanya Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_192,201,Ceyhan Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_193,20104,Çameli Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_194,20105,Çardak Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_195,20107,Güney Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_196,20108,Kale Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_197,20111,Babadağ Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_198,20112,Bekilli Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_199,20113,Honaz Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_200,20114,Serinhisar Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_201,20115,Pamukkale Malmüdürlüğü (Akköy),base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_202,20116,Baklan Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_203,20117,Beyağaç Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_204,20118,Bozkurt Malmüdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_205,202,Serik Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_206,202,Çay Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_207,20201,Saraylar Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_208,20202,Çınar Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_209,20203,Gökpınar Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_210,20250,Denizli İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_211,20260,Sarayköy Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_212,20261,Acıpayam Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_213,20262,Tavas Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_214,20263,Buldan Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_215,20264,Çal Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_216,20265,Çivril Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_217,20280,Pamukkale Vergi Dairesi Müdürlüğü,base.state_tr_20
+l10n_tr_nilvera_einvoice_extended_tax_office_218,203,Manavgat Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_219,203,Kozan Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_220,204,Elmalı Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_221,205,Kemer Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_222,205,Karataş Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_223,205,Polatlı Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_224,206,Kumluca Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_225,207,Şereflikoçhisar Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_226,209,Beypazarı Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_227,211,Çubuk Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_228,21102,Çermik Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_229,21103,Çınar Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_230,21104,Çüngüş Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_231,21105,Dicle Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_232,21107,Hani Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_233,21108,Hazro Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_234,21109,Kulp Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_235,21110,Lice Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_236,21111,Silvan Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_237,21112,Eğil Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_238,21113,Kocaköy Malmüdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_239,21251,Gökalp Vergi Dairesi Müdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_240,21281,Süleyman Nazif Vergi Dairesi Müdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_241,21282,Cahit Sıtkı Tarancı Vergi Dairesi Müdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_242,21283,Ergani Vergi Dairesi Müdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_243,21284,Bismil Vergi Dairesi Müdürlüğü,base.state_tr_21
+l10n_tr_nilvera_einvoice_extended_tax_office_244,213,Haymana Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_245,215,Elmadağ Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_246,22101,Enez Malmüdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_247,22105,Lalapaşa Malmüdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_248,22106,Meriç Malmüdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_249,22108,Süloğlu Malmüdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_250,22201,Arda Vergi Dairesi Müdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_251,22260,Kırkpınar Vergi Dairesi Müdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_252,22261,Keşan Vergi Dairesi Müdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_253,22262,Uzunköprü Vergi Dairesi Müdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_254,22263,Havsa Vergi Dairesi Müdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_255,22264,İpsala Vergi Dairesi Müdürlüğü,base.state_tr_22
+l10n_tr_nilvera_einvoice_extended_tax_office_256,23101,Ağın Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_257,23102,Baskil Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_258,23103,Karakoçan Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_259,23104,Keban Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_260,23105,Maden Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_261,23106,Palu Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_262,23107,Sivrice Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_263,23108,Arıcak Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_264,23109,Kovancılar Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_265,23110,Alacakaya Malmüdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_266,23201,Harput Vergi Dairesi Müdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_267,23280,Hazar Vergi Dairesi Müdürlüğü,base.state_tr_23
+l10n_tr_nilvera_einvoice_extended_tax_office_268,24101,Çayırlı Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_269,24102,İliç Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_270,24103,Kemah Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_271,24104,Kemaliye Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_272,24105,Refahiye Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_273,24106,Tercan Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_274,24107,Üzümlü Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_275,24108,Otlukbeli Malmüdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_276,24260,Fevzipaşa Vergi Dairesi Müdürlüğü,base.state_tr_24
+l10n_tr_nilvera_einvoice_extended_tax_office_277,250,Adana İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_278,251,5 Ocak Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_279,251,Üçkapılar Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_280,25101,Aşkale Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_281,25102,Çat Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_282,25103,Hınıs Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_283,25104,Horasan Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_284,25105,İspir Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_285,25106,Karayazı Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_286,25107,Narman Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_287,25108,Oltu Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_288,25109,Olur Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_289,25110,Pasinler Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_290,25111,Şenkaya Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_291,25112,Tekman Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_292,25113,Tortum Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_293,25114,Karaçoban Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_294,25115,Uzundere Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_295,25116,Pazaryolu Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_296,25117,Aziziye Malmüdürlüğü (Ilıca),base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_297,25118,Köprüköy Malmüdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_298,252,Yüreğir Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_299,252,Veraset ve İntikal Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_300,252,Kalekapı Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_301,25251,Aziziye Vergi Dairesi Müdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_302,25280,Kazımkarabekir Vergi Dairesi Müdürlüğü,base.state_tr_25
+l10n_tr_nilvera_einvoice_extended_tax_office_303,253,Muratpaşa Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_304,253,Seyhan Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_305,253,Kavaklıdere Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_306,254,Ziyapaşa Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_307,254,Düden Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_308,254,Maltepe Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_309,255,Antalya Kurumlar Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_310,255,Çukurova Vergi Dairesi Müdürlüğü,base.state_tr_01
+l10n_tr_nilvera_einvoice_extended_tax_office_311,255,Yenimahalle Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_312,256,Antalya İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_313,257,Çankaya Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_314,257,Korkuteli Vergi Dairesi Müdürlüğü,base.state_tr_07
+l10n_tr_nilvera_einvoice_extended_tax_office_315,258,Kızılbey Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_316,259,Mithatpaşa Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_317,260,Dinar Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_318,260,Adıyaman Vergi Dairesi Müdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_319,260,Amasya Vergi Dairesi Müdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_320,260,Ağrı Vergi Dairesi Müdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_321,260,Artvin Vergi Dairesi Müdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_322,260,Nazilli Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_323,260,Ulus Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_324,261,Yıldırım Beyazıt Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_325,261,Bolvadin Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_326,261,Hopa Vergi Dairesi Müdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_327,261,Söke Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_328,261,Kahta Vergi Dairesi Müdürlüğü,base.state_tr_02
+l10n_tr_nilvera_einvoice_extended_tax_office_329,261,Merzifon Vergi Dairesi Müdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_330,261,Doğubeyazıt Vergi Dairesi Müdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_331,26102,Mahmudiye Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_332,26103,Mihalıççık Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_333,26104,Sarıcakaya Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_334,26105,Seyitgazi Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_335,26107,Alpu Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_336,26108,Beylikova Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_337,26109,İnönü Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_338,26110,Günyüzü Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_339,26111,Han Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_340,26112,Mihalgazi Malmüdürlüğü,base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_341,262,Emirdağ Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_342,262,Çine Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_343,262,Patnos Vergi Dairesi Müdürlüğü,base.state_tr_04
+l10n_tr_nilvera_einvoice_extended_tax_office_344,262,Gümüşhacıköy Vergi Dairesi Müdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_345,262,Arhavi Vergi Dairesi Müdürlüğü,base.state_tr_08
+l10n_tr_nilvera_einvoice_extended_tax_office_346,262,Seğmenler Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_347,26250,Eskişehir Vergi Dairesi Başkanlığı (*),base.state_tr_26
+l10n_tr_nilvera_einvoice_extended_tax_office_348,263,Sandıklı Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_349,263,Germencik Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_350,263,Taşova Vergi Dairesi Müdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_351,264,Dikimevi Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_352,264,Suluova Vergi Dairesi Müdürlüğü,base.state_tr_05
+l10n_tr_nilvera_einvoice_extended_tax_office_353,264,İscehisar Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_354,265,Kuşadası Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_355,265,Doğanbey Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_356,266,Yeğenbey Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_357,268,Hitit Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_358,269,Yahya Galip Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_359,270,Muhammet Karagüzel Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_360,271,Ostim Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_361,27101,Araban Malmüdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_362,27105,Oğuzeli Malmüdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_363,27106,Yavuzeli Malmüdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_364,27107,Karkamış Malmüdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_365,27108,Nurdağı Malmüdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_366,272,Gölbaşı Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_367,27202,Nizip Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_368,27203,İslahiye Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_369,27250,Gaziantep İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_370,27251,Suburcu Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_371,27252,Şehitkâmil Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_372,27253,Şahinbey Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_373,27254,Gazikent Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_374,27255,Kozanlı Vergi Dairesi Müdürlüğü,base.state_tr_27
+l10n_tr_nilvera_einvoice_extended_tax_office_375,273,Sincan Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_376,274,Dışkapı Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_377,275,Etimesgut Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_378,276,Başkent Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_379,277,Cumhuriyet Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_380,278,Keçiören Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_381,279,Kahramankazan Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_382,280,Anadolu İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_383,280,Kocatepe Vergi Dairesi Müdürlüğü,base.state_tr_03
+l10n_tr_nilvera_einvoice_extended_tax_office_384,280,Güzelhisar Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_385,281,Didim Vergi Dairesi Müdürlüğü,base.state_tr_09
+l10n_tr_nilvera_einvoice_extended_tax_office_386,281,Ankara İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_387,28101,Alucra Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_388,28103,Dereli Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_389,28104,Espiye Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_390,28105,Eynesil Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_391,28106,Görele Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_392,28107,Keşap Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_393,28108,Şebinkarahisar Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_394,28109,Tirebolu Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_395,28110,Piraziz Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_396,28111,Yağlıdere Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_397,28112,Çanakçı Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_398,28113,Güce Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_399,28114,Çamoluk Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_400,28115,Doğankent Malmüdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_401,282,Harçlar Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_402,28260,Giresun Vergi Dairesi Müdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_403,28261,Bulancak Vergi Dairesi Müdürlüğü,base.state_tr_28
+l10n_tr_nilvera_einvoice_extended_tax_office_404,283,Ankara Kurumlar Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_405,284,İvedik Vergi Dairesi Müdürlüğü,base.state_tr_06
+l10n_tr_nilvera_einvoice_extended_tax_office_406,29102,Kelkit Malmüdürlüğü,base.state_tr_29
+l10n_tr_nilvera_einvoice_extended_tax_office_407,29103,Şiran Malmüdürlüğü,base.state_tr_29
+l10n_tr_nilvera_einvoice_extended_tax_office_408,29104,Torul Malmüdürlüğü,base.state_tr_29
+l10n_tr_nilvera_einvoice_extended_tax_office_409,29107,Köse Malmüdürlüğü,base.state_tr_29
+l10n_tr_nilvera_einvoice_extended_tax_office_410,29108,Kürtün Malmüdürlüğü,base.state_tr_29
+l10n_tr_nilvera_einvoice_extended_tax_office_411,29260,Gümüşhane Vergi Dairesi Müdürlüğü,base.state_tr_29
+l10n_tr_nilvera_einvoice_extended_tax_office_412,30102,Çukurca Malmüdürlüğü,base.state_tr_30
+l10n_tr_nilvera_einvoice_extended_tax_office_413,30103,Şemdinli Malmüdürlüğü,base.state_tr_30
+l10n_tr_nilvera_einvoice_extended_tax_office_414,30104,Derecik Malmüdürlüğü,base.state_tr_30
+l10n_tr_nilvera_einvoice_extended_tax_office_415,30260,Hakkari Vergi Dairesi Müdürlüğü,base.state_tr_30
+l10n_tr_nilvera_einvoice_extended_tax_office_416,30261,Yüksekova Vergi Dairesi Müdürlüğü,base.state_tr_30
+l10n_tr_nilvera_einvoice_extended_tax_office_417,31101,Altınözü Malmüdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_418,31103,Hassa Malmüdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_419,31108,Yayladağı Malmüdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_420,31109,Erzin Malmüdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_421,31110,Belen Malmüdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_422,31111,Kumlu Malmüdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_423,31201,23 Temmuz Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_424,31202,Sahil Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_425,31203,Antakya Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_426,31260,Dörtyol Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_427,31261,Kırıkhan Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_428,31262,Reyhanlı Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_429,31263,Samandağ Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_430,31280,Şükrükanatlı Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_431,31281,Akdeniz Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_432,31290,Asım Gündüz Vergi Dairesi Müdürlüğü,base.state_tr_31
+l10n_tr_nilvera_einvoice_extended_tax_office_433,32101,Atabey Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_434,32103,Gelendost Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_435,32104,Keçiborlu Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_436,32105,Senirkent Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_437,32106,Sütçüler Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_438,32107,Şarkikaraağaç Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_439,32108,Uluborlu Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_440,32110,Aksu Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_441,32111,Gönen Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_442,32112,Yenişarbademli Malmüdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_443,32201,Davraz Vergi Dairesi Müdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_444,32260,Kaymakkapı Vergi Dairesi Müdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_445,32261,Eğirdir Vergi Dairesi Müdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_446,32262,Yalvaç Vergi Dairesi Müdürlüğü,base.state_tr_32
+l10n_tr_nilvera_einvoice_extended_tax_office_447,33103,Gülnar Malmüdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_448,33104,Mut Malmüdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_449,33107,Aydıncık Malmüdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_450,33108,Bozyazı Malmüdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_451,33109,Çamlıyayla Malmüdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_452,33201,Erdemli Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_453,33202,Silifke Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_454,33203,Anamur Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_455,33204,Kızılmurat Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_456,33205,Şehitkerim Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_457,33250,İstiklâl Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_458,33252,Uray Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_459,33254,Liman Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_460,33255,Toros Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_461,33256,Mersin İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_33
+l10n_tr_nilvera_einvoice_extended_tax_office_462,34203,Silivri Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_463,34204,Büyükçekmece Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_464,34205,Şile Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_465,34220,Haliç İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_466,34221,Vatan İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_467,34222,Çamlıca İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_468,34223,Alemdağ Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_469,34224,Yenikapı Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_470,34230,Büyük Mükellefler Vergi Dairesi Başkanlığı (*),base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_471,34231,Boğaziçi Kurumlar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_472,34232,Marmara Kurumlar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_473,34234,Davutpaşa Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_474,34235,Esenler Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_475,34236,Fatih Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_476,34237,Küçükköy Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_477,34239,Merter Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_478,34242,Sultanbeyli Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_479,34244,Anadolu Kurumlar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_480,34245,Tuzla Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_481,34246,Kozyatağı Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_482,34247,Maslak Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_483,34248,Zincirlikuyu Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_484,34249,İkitelli Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_485,34251,Beşiktaş Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_486,34252,Ümraniye Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_487,34253,Yeditepe Veraset ve Harçlar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_488,34254,Kasımpaşa Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_489,34255,Erenköy Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_490,34256,Hisar Veraset ve Harçlar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_491,34257,Tuna Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_492,34258,Rıhtım Veraset ve Harçlar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_493,34259,Güngören Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_494,34260,Kocasinan Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_495,34261,Güneşli Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_496,34262,Küçükyalı Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_497,34263,Pendik Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_498,34264,Bayrampaşa Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_499,34265,Beyazıt Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_500,34266,Beyoğlu Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_501,34269,Gaziosmanpaşa Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_502,34270,Göztepe Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_503,34271,Hocapaşa Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_504,34272,Kadıköy Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_505,34273,Kocamustafapaşa Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_506,34274,Mecidiyeköy Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_507,34276,Şişli Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_508,34277,Üsküdar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_509,34278,Halkalı Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_510,34279,Kağıthane Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_511,34280,Zeytinburnu Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_512,34281,Beykoz Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_513,34283,Sarıyer Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_514,34284,Bakırköy Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_515,34285,Kartal Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_516,34287,Nakil Vasıtaları Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_517,34288,Sarıgazi Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_518,34291,Atışalanı Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_519,34292,Yakacık Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_520,34293,Yenibosna Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_521,34294,Avcılar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_522,34295,Adalar Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_523,34296,Küçükçekmece Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_524,34297,Beylikdüzü Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_525,34298,Esenyurt Vergi Dairesi Müdürlüğü,base.state_tr_34
+l10n_tr_nilvera_einvoice_extended_tax_office_526,35105,Dikili Malmüdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_527,35106,Foça Malmüdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_528,35107,Karaburun Malmüdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_529,35114,Seferihisar Malmüdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_530,35120,Beydağ Malmüdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_531,35201,Bayındır Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_532,35202,Bergama Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_533,35203,Menemen Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_534,35204,Ödemiş Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_535,35205,Tire Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_536,35206,Torbalı Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_537,35207,Kemalpaşa Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_538,35208,Urla Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_539,35209,Selçuk Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_540,35210,Kınık Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_541,35211,Kiraz Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_542,35212,Çeşme Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_543,35213,Aliağa Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_544,35215,Menderes Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_545,35250,İzmir İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_546,35251,9 Eylül Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_547,35252,Yamanlar Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_548,35254,Belkahve Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_549,35256,Karşıyaka Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_550,35257,Kemeraltı Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_551,35258,Konak Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_552,35259,Kordon Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_553,35260,Şirinyer Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_554,35261,Kadifekale Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_555,35262,Taşıtlar Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_556,35263,Hasan Tahsin Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_557,35264,Bornova Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_558,35266,Balçova Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_559,35267,Gaziemir Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_560,35268,Ege Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_561,35269,Çiğli Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_562,35270,Çakabey İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_35
+l10n_tr_nilvera_einvoice_extended_tax_office_563,36103,Arpaçay Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_564,36105,Digor Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_565,36109,Kağızman Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_566,36111,Sarıkamış Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_567,36112,Selim Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_568,36113,Susuz Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_569,36115,Akyaka Malmüdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_570,36260,Kars Vergi Dairesi Müdürlüğü,base.state_tr_36
+l10n_tr_nilvera_einvoice_extended_tax_office_571,37101,Araç Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_572,37102,Azdavay Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_573,37103,Bozkurt Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_574,37104,Cide Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_575,37105,Çatalzeytin Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_576,37106,Daday Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_577,37107,Devrekani Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_578,37108,İnebolu Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_579,37109,Küre Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_580,37112,Abana Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_581,37113,İhsangazi Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_582,37114,Pınarbaşı Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_583,37115,Şenpazar Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_584,37116,Ağlı Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_585,37117,Doğanyurt Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_586,37118,Hanönü Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_587,37119,Seydiler Malmüdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_588,37260,Kastamonu Vergi Dairesi Müdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_589,37261,Tosya Vergi Dairesi Müdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_590,37262,Taşköprü Vergi Dairesi Müdürlüğü,base.state_tr_37
+l10n_tr_nilvera_einvoice_extended_tax_office_591,38103,Felahiye Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_592,38104,İncesu Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_593,38106,Sarıoğlan Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_594,38107,Sarız Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_595,38108,Tomarza Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_596,38109,Yahyalı Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_597,38110,Yeşilhisar Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_598,38111,Akkışla Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_599,38113,Hacılar Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_600,38114,Özvatan Malmüdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_601,38201,Develi Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_602,38202,Pınarbaşı Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_603,38203,Bünyan Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_604,38250,Kayseri İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_605,38251,Mimar Sinan Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_606,38252,Erciyes Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_607,38253,Kaleönü Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_608,38254,Gevher Nesibe Vergi Dairesi Müdürlüğü,base.state_tr_38
+l10n_tr_nilvera_einvoice_extended_tax_office_609,39102,Demirköy Malmüdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_610,39103,Kofçaz Malmüdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_611,39105,Pehlivanköy Malmüdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_612,39106,Pınarhisar Malmüdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_613,39107,Vize Malmüdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_614,39260,Kırklareli Vergi Dairesi Müdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_615,39261,Lüleburgaz Vergi Dairesi Müdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_616,39262,Babaeski Vergi Dairesi Müdürlüğü,base.state_tr_39
+l10n_tr_nilvera_einvoice_extended_tax_office_617,40101,Çiçekdağı Malmüdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_618,40103,Mucur Malmüdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_619,40104,Akpınar Malmüdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_620,40105,Akçakent Malmüdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_621,40106,Boztepe Malmüdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_622,40260,Kırşehir Vergi Dairesi Müdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_623,40261,Kaman Vergi Dairesi Müdürlüğü,base.state_tr_40
+l10n_tr_nilvera_einvoice_extended_tax_office_624,41103,Kandıra Malmüdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_625,41202,Uluçınar Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_626,41203,İlyasbey Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_627,41204,Gölcük Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_628,41205,Karamürsel Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_629,41206,Körfez Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_630,41207,Derince Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_631,41250,Kocaeli İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_632,41252,Tepecik Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_633,41253,Alemdar Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_634,41254,Gebze İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_635,41290,Acısu Vergi Dairesi Müdürlüğü,base.state_tr_41
+l10n_tr_nilvera_einvoice_extended_tax_office_636,42103,Bozkır Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_637,42106,Doğanhisar Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_638,42109,Hadim Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_639,42111,Kadınhanı Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_640,42115,Sarayönü Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_641,42117,Yunak Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_642,42118,Akören Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_643,42119,Altınekin Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_644,42121,Derebucak Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_645,42122,Hüyük Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_646,42123,Taşkent Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_647,42124,Ahırlı Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_648,42125,Çeltik Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_649,42126,Derbent Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_650,42127,Emirgazi Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_651,42128,Güneysınır Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_652,42129,Halkapınar Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_653,42130,Tuzlukçu Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_654,42131,Yalıhüyük Malmüdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_655,42201,Akşehir Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_656,42202,Ereğli Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_657,42204,Beyşehir Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_658,42205,Cihanbeyli Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_659,42206,Çumra Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_660,42207,Seydişehir Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_661,42208,Ilgın Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_662,42209,Kulu Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_663,42210,Karapınar Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_664,42250,Konya İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_665,42251,Selçuk Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_666,42252,Mevlana Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_667,42253,Meram Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_668,42254,Alaaddin Vergi Dairesi Müdürlüğü,base.state_tr_42
+l10n_tr_nilvera_einvoice_extended_tax_office_669,43101,Altıntaş Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_670,43102,Domaniç Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_671,43107,Aslanapa Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_672,43108,Dumlupınar Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_673,43109,Hisarcık Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_674,43110,Şaphane Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_675,43111,Çavdarhisar Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_676,43112,Pazarlar Malmüdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_677,43201,30 Ağustos Vergi Dairesi Müdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_678,43260,Gediz Vergi Dairesi Müdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_679,43261,Simav Vergi Dairesi Müdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_680,43262,Tavşanlı Vergi Dairesi Müdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_681,43263,Emet Vergi Dairesi Müdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_682,43280,Çinili Vergi Dairesi Müdürlüğü,base.state_tr_43
+l10n_tr_nilvera_einvoice_extended_tax_office_683,44101,Akçadağ Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_684,44102,Arapgir Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_685,44103,Arguvan Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_686,44104,Darende Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_687,44105,Doğanşehir Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_688,44106,Hekimhan Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_689,44107,Pütürge Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_690,44108,Yeşilyurt Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_691,44109,Battalgazi Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_692,44110,Doğanyol Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_693,44111,Kale Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_694,44112,Kuluncak Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_695,44113,Yazıhan Malmüdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_696,44251,Fırat Vergi Dairesi Müdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_697,44252,Beydağı Vergi Dairesi Müdürlüğü,base.state_tr_44
+l10n_tr_nilvera_einvoice_extended_tax_office_698,45110,Selendi Malmüdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_699,45113,Ahmetli Malmüdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_700,45114,Gölmarmara Malmüdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_701,45115,Köprübaşı Malmüdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_702,45201,Akhisar Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_703,45202,Alaşehir Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_704,45203,Demirci Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_705,45204,Kırkağaç Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_706,45205,Salihli Adil Oral Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_707,45206,Sarıgöl Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_708,45207,Saruhanlı Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_709,45208,Soma Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_710,45209,Turgutlu Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_711,45210,Gördes Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_712,45211,Kula Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_713,45250,Manisa İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_714,45251,Şehit Cihan Güneş Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_715,45252,Mesir Vergi Dairesi Müdürlüğü,base.state_tr_45
+l10n_tr_nilvera_einvoice_extended_tax_office_716,46102,Andırın Malmüdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_717,46104,Göksun Malmüdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_718,46106,Türkoğlu Malmüdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_719,46107,Çağlayancerit Malmüdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_720,46108,Ekinözü Malmüdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_721,46109,Nurhak Malmüdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_722,46201,Aslanbey Vergi Dairesi Müdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_723,46260,Elbistan Vergi Dairesi Müdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_724,46261,Afşin Vergi Dairesi Müdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_725,46262,Pazarcık Vergi Dairesi Müdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_726,46280,Aksu Vergi Dairesi Müdürlüğü,base.state_tr_46
+l10n_tr_nilvera_einvoice_extended_tax_office_727,47102,Derik Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_728,47106,Mazıdağı Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_729,47107,Midyat Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_730,47109,Ömerli Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_731,47110,Savur Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_732,47112,Dargeçit Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_733,47113,Yeşilli Malmüdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_734,47260,Mardin Vergi Dairesi Müdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_735,47261,Kızıltepe Vergi Dairesi Müdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_736,47262,Nusaybin Vergi Dairesi Müdürlüğü,base.state_tr_47
+l10n_tr_nilvera_einvoice_extended_tax_office_737,48102,Datça Malmüdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_738,48108,Ula Malmüdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_739,48109,Dalaman Malmüdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_740,48110,Ortaca Malmüdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_741,48111,Kavaklıdere Malmüdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_742,48113,Seydikemer Malmüdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_743,48260,Muğla Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_744,48261,Bodrum Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_745,48262,Fethiye Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_746,48263,Köyceğiz Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_747,48264,Milas Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_748,48265,Marmaris Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_749,48266,Yatağan Vergi Dairesi Müdürlüğü,base.state_tr_48
+l10n_tr_nilvera_einvoice_extended_tax_office_750,49101,Bulanık Malmüdürlüğü,base.state_tr_49
+l10n_tr_nilvera_einvoice_extended_tax_office_751,49102,Malazgirt Malmüdürlüğü,base.state_tr_49
+l10n_tr_nilvera_einvoice_extended_tax_office_752,49103,Varto Malmüdürlüğü,base.state_tr_49
+l10n_tr_nilvera_einvoice_extended_tax_office_753,49104,Hasköy Malmüdürlüğü,base.state_tr_49
+l10n_tr_nilvera_einvoice_extended_tax_office_754,49105,Korkut Malmüdürlüğü,base.state_tr_49
+l10n_tr_nilvera_einvoice_extended_tax_office_755,49260,Muş Vergi Dairesi Müdürlüğü,base.state_tr_49
+l10n_tr_nilvera_einvoice_extended_tax_office_756,50101,Avanos Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_757,50102,Derinkuyu Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_758,50103,Gülşehir Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_759,50104,Hacıbektaş Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_760,50105,Kozaklı Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_761,50106,Ürgüp Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_762,50107,Acıgöl Malmüdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_763,50260,Nevşehir Vergi Dairesi Müdürlüğü,base.state_tr_50
+l10n_tr_nilvera_einvoice_extended_tax_office_764,51103,Çamardı Malmüdürlüğü,base.state_tr_51
+l10n_tr_nilvera_einvoice_extended_tax_office_765,51105,Ulukışla Malmüdürlüğü,base.state_tr_51
+l10n_tr_nilvera_einvoice_extended_tax_office_766,51106,Altunhisar Malmüdürlüğü,base.state_tr_51
+l10n_tr_nilvera_einvoice_extended_tax_office_767,51107,Çiftlik Malmüdürlüğü,base.state_tr_51
+l10n_tr_nilvera_einvoice_extended_tax_office_768,51260,Niğde Vergi Dairesi Müdürlüğü,base.state_tr_51
+l10n_tr_nilvera_einvoice_extended_tax_office_769,51262,Bor Vergi Dairesi Müdürlüğü,base.state_tr_51
+l10n_tr_nilvera_einvoice_extended_tax_office_770,52101,Akkuş Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_771,52102,Aybastı Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_772,52104,Gölköy Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_773,52105,Korgan Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_774,52106,Kumru Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_775,52107,Mesudiye Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_776,52108,Perşembe Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_777,52109,Ulubey Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_778,52111,Gülyalı Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_779,52112,Gürgentepe Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_780,52113,Çamaş Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_781,52114,Çatalpınar Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_782,52115,Çaybaşı Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_783,52116,İkizce Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_784,52117,Kabadüz Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_785,52118,Kabataş Malmüdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_786,52201,Boztepe Vergi Dairesi Müdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_787,52260,Köprübaşı Vergi Dairesi Müdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_788,52261,Fatsa Vergi Dairesi Müdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_789,52262,Ünye Vergi Dairesi Müdürlüğü,base.state_tr_52
+l10n_tr_nilvera_einvoice_extended_tax_office_790,53102,Çamlıhemşin Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_791,53104,Fındıklı Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_792,53105,İkizdere Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_793,53106,Kalkandere Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_794,53108,Güneysu Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_795,53109,Derepazarı Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_796,53110,Hemşin Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_797,53111,İyidere Malmüdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_798,53201,Kaçkar Vergi Dairesi Müdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_799,53260,Yeşilçay Vergi Dairesi Müdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_800,53261,Çayeli Vergi Dairesi Müdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_801,53262,Pazar Vergi Dairesi Müdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_802,53263,Ardeşen Vergi Dairesi Müdürlüğü,base.state_tr_53
+l10n_tr_nilvera_einvoice_extended_tax_office_803,54105,Kaynarca Malmüdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_804,54107,Kocaali Malmüdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_805,54108,Pamukova Malmüdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_806,54109,Taraklı Malmüdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_807,54111,Karapürçek Malmüdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_808,54201,Akyazı Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_809,54202,Geyve Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_810,54203,Hendek Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_811,54204,Karasu Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_812,54250,Sakarya İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_813,54251,Gümrükönü Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_814,54252,Ali Fuat Cebesoy Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_815,54253,Sapanca Vergi Dairesi Müdürlüğü,base.state_tr_54
+l10n_tr_nilvera_einvoice_extended_tax_office_816,55101,Alaçam Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_817,55105,Kavak Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_818,55106,Ladik Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_819,55108,Vezirköprü Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_820,55109,Asarcık Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_821,55110,Ondokuz Mayıs Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_822,55111,Salıpazarı Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_823,55112,Tekkeköy Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_824,55113,Ayvacık Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_825,55114,Yakakent Malmüdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_826,55202,Bafra Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_827,55203,Çarşamba Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_828,55204,Terme Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_829,55205,Havza Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_830,55251,19 Mayıs Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_831,55252,Gaziler Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_832,55290,Zafer Vergi Dairesi Müdürlüğü,base.state_tr_55
+l10n_tr_nilvera_einvoice_extended_tax_office_833,56102,Baykan Malmüdürlüğü,base.state_tr_56
+l10n_tr_nilvera_einvoice_extended_tax_office_834,56104,Eruh Malmüdürlüğü,base.state_tr_56
+l10n_tr_nilvera_einvoice_extended_tax_office_835,56106,Kurtalan Malmüdürlüğü,base.state_tr_56
+l10n_tr_nilvera_einvoice_extended_tax_office_836,56107,Pervari Malmüdürlüğü,base.state_tr_56
+l10n_tr_nilvera_einvoice_extended_tax_office_837,56110,Şirvan Malmüdürlüğü,base.state_tr_56
+l10n_tr_nilvera_einvoice_extended_tax_office_838,56260,Siirt Vergi Dairesi Müdürlüğü,base.state_tr_56
+l10n_tr_nilvera_einvoice_extended_tax_office_839,57101,Ayancık Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_840,57103,Durağan Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_841,57104,Erfelek Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_842,57105,Gerze Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_843,57106,Türkeli Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_844,57107,Dikmen Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_845,57108,Saraydüzü Malmüdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_846,57260,Sinop Vergi Dairesi Müdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_847,57261,Boyabat Vergi Dairesi Müdürlüğü,base.state_tr_57
+l10n_tr_nilvera_einvoice_extended_tax_office_848,58101,Divriği Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_849,58102,Gemerek Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_850,58103,Gürün Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_851,58104,Hafik Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_852,58105,İmranlı Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_853,58106,Kangal Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_854,58107,Koyulhisar Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_855,58109,Suşehri Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_856,58110,Yıldızeli Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_857,58111,Zara Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_858,58112,Akıncılar Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_859,58113,Altınyayla Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_860,58114,Doğanşar Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_861,58115,Gölova Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_862,58116,Ulaş Malmüdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_863,58201,Kale Vergi Dairesi Müdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_864,58260,Şarkışla Vergi Dairesi Müdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_865,58280,Site Vergi Dairesi Müdürlüğü,base.state_tr_58
+l10n_tr_nilvera_einvoice_extended_tax_office_866,59106,Saray Malmüdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_867,59108,Marmaraereğlisi Malmüdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_868,59201,Süleymanpaşa Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_869,59250,Çorlu İhtisas Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_870,59260,Namık Kemal Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_871,59261,Çerkezköy Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_872,59262,Çorlu Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_873,59263,Hayrabolu Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_874,59264,Malkara Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_875,59265,Muratlı Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_876,59266,Şarköy Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_877,59267,Kapaklı Vergi Dairesi Müdürlüğü,base.state_tr_59
+l10n_tr_nilvera_einvoice_extended_tax_office_878,60101,Almus Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_879,60102,Artova Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_880,60105,Reşadiye Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_881,60108,Pazar Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_882,60109,Yeşilyurt Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_883,60110,Başçiftlik Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_884,60111,Sulusaray Malmüdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_885,60260,Tokat Vergi Dairesi Müdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_886,60261,Erbaa Vergi Dairesi Müdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_887,60262,Niksar Vergi Dairesi Müdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_888,60263,Turhal Vergi Dairesi Müdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_889,60264,Zile Vergi Dairesi Müdürlüğü,base.state_tr_60
+l10n_tr_nilvera_einvoice_extended_tax_office_890,61102,Araklı Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_891,61103,Arsin Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_892,61104,Çaykara Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_893,61105,Maçka Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_894,61107,Sürmene Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_895,61108,Tonya Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_896,61110,Yomra Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_897,61111,Beşikdüzü Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_898,61112,Şalpazarı Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_899,61113,Çarşıbaşı Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_900,61114,Dernekpazarı Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_901,61115,Düzköy Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_902,61116,Hayrat Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_903,61117,Köprübaşı Malmüdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_904,61201,Hızırbey Vergi Dairesi Müdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_905,61260,Akçaabat Vergi Dairesi Müdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_906,61261,Of Vergi Dairesi Müdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_907,61262,Vakfıkebir Vergi Dairesi Müdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_908,61280,Karadeniz Vergi Dairesi Müdürlüğü,base.state_tr_61
+l10n_tr_nilvera_einvoice_extended_tax_office_909,62101,Çemişgezek Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_910,62102,Hozat Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_911,62103,Mazgirt Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_912,62104,Nazimiye Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_913,62105,Ovacık Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_914,62106,Pertek Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_915,62107,Pülümür Malmüdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_916,62260,Tunceli Vergi Dairesi Müdürlüğü,base.state_tr_62
+l10n_tr_nilvera_einvoice_extended_tax_office_917,63101,Akçakale Malmüdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_918,63103,Bozova Malmüdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_919,63104,Halfeti Malmüdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_920,63105,Hilvan Malmüdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_921,63109,Ceylanpınar Malmüdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_922,63110,Harran Malmüdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_923,63201,Şehitlik Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_924,63260,Siverek Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_925,63261,Viranşehir Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_926,63262,Birecik Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_927,63263,Suruç Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_928,63280,Topçu Meydanı Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_929,63281,Göbeklitepe Vergi Dairesi Müdürlüğü,base.state_tr_63
+l10n_tr_nilvera_einvoice_extended_tax_office_930,64103,Karahallı Malmüdürlüğü,base.state_tr_64
+l10n_tr_nilvera_einvoice_extended_tax_office_931,64104,Ulubey Malmüdürlüğü,base.state_tr_64
+l10n_tr_nilvera_einvoice_extended_tax_office_932,64105,Sivaslı Malmüdürlüğü,base.state_tr_64
+l10n_tr_nilvera_einvoice_extended_tax_office_933,64260,Uşak Vergi Dairesi Müdürlüğü,base.state_tr_64
+l10n_tr_nilvera_einvoice_extended_tax_office_934,64261,Banaz Vergi Dairesi Müdürlüğü,base.state_tr_64
+l10n_tr_nilvera_einvoice_extended_tax_office_935,64262,Eşme Vergi Dairesi Müdürlüğü,base.state_tr_64
+l10n_tr_nilvera_einvoice_extended_tax_office_936,65101,Başkale Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_937,65102,Çatak Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_938,65104,Gevaş Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_939,65105,Gürpınar Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_940,65106,Muradiye Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_941,65107,Özalp Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_942,65108,Bahçesaray Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_943,65109,Çaldıran Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_944,65110,Edremit Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_945,65111,Saray Malmüdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_946,65201,Erciş Vergi Dairesi Müdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_947,65260,Van Vergi Dairesi Müdürlüğü,base.state_tr_65
+l10n_tr_nilvera_einvoice_extended_tax_office_948,66101,Akdağmadeni Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_949,66103,Çayıralan Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_950,66104,Çekerek Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_951,66105,Sarıkaya Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_952,66106,Şefaatli Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_953,66109,Aydıncık Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_954,66110,Çandır Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_955,66111,Kadışehri Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_956,66112,Saraykent Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_957,66113,Yenifakılı Malmüdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_958,66260,Yozgat Vergi Dairesi Müdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_959,66261,Boğazlıyan Vergi Dairesi Müdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_960,66262,Sorgun Vergi Dairesi Müdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_961,66263,Yerköy Vergi Dairesi Müdürlüğü,base.state_tr_66
+l10n_tr_nilvera_einvoice_extended_tax_office_962,67110,Alaplı Malmüdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_963,67113,Gökçebey Malmüdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_964,67201,Uzunmehmet Vergi Dairesi Müdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_965,67261,Ereğli Vergi Dairesi Müdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_966,67263,Çaycuma Vergi Dairesi Müdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_967,67264,Devrek Vergi Dairesi Müdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_968,67280,Kara Elmas Vergi Dairesi Müdürlüğü,base.state_tr_67
+l10n_tr_nilvera_einvoice_extended_tax_office_969,68101,Ağaçören Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_970,68102,Güzelyurt Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_971,68103,Ortaköy Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_972,68104,Sarıyahşi Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_973,68105,Eskil Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_974,68106,Gülağaç Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_975,68107,Sultanhanı Malmüdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_976,68201,Aksaray Vergi Dairesi Müdürlüğü,base.state_tr_68
+l10n_tr_nilvera_einvoice_extended_tax_office_977,69101,Aydıntepe Malmüdürlüğü,base.state_tr_69
+l10n_tr_nilvera_einvoice_extended_tax_office_978,69102,Demirözü Malmüdürlüğü,base.state_tr_69
+l10n_tr_nilvera_einvoice_extended_tax_office_979,69201,Bayburt Vergi Dairesi Müdürlüğü,base.state_tr_69
+l10n_tr_nilvera_einvoice_extended_tax_office_980,70101,Ayrancı Malmüdürlüğü,base.state_tr_70
+l10n_tr_nilvera_einvoice_extended_tax_office_981,70102,Ermenek Malmüdürlüğü,base.state_tr_70
+l10n_tr_nilvera_einvoice_extended_tax_office_982,70103,Kazım Karabekir Malmüdürlüğü,base.state_tr_70
+l10n_tr_nilvera_einvoice_extended_tax_office_983,70104,Başyayla Malmüdürlüğü,base.state_tr_70
+l10n_tr_nilvera_einvoice_extended_tax_office_984,70105,Sarıveliler Malmüdürlüğü,base.state_tr_70
+l10n_tr_nilvera_einvoice_extended_tax_office_985,70201,Karaman Vergi Dairesi Müdürlüğü,base.state_tr_70
+l10n_tr_nilvera_einvoice_extended_tax_office_986,71101,Delice Malmüdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_987,71102,Keskin Malmüdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_988,71103,Sulakyurt Malmüdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_989,71105,Balışeyh Malmüdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_990,71106,Çelebi Malmüdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_991,71107,Karakeçili Malmüdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_992,71201,Irmak Vergi Dairesi Müdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_993,71202,Kaletepe Vergi Dairesi Müdürlüğü,base.state_tr_71
+l10n_tr_nilvera_einvoice_extended_tax_office_994,72101,Beşiri Malmüdürlüğü,base.state_tr_72
+l10n_tr_nilvera_einvoice_extended_tax_office_995,72102,Gercüş Malmüdürlüğü,base.state_tr_72
+l10n_tr_nilvera_einvoice_extended_tax_office_996,72103,Hasankeyf Malmüdürlüğü,base.state_tr_72
+l10n_tr_nilvera_einvoice_extended_tax_office_997,72104,Kozluk Malmüdürlüğü,base.state_tr_72
+l10n_tr_nilvera_einvoice_extended_tax_office_998,72105,Sason Malmüdürlüğü,base.state_tr_72
+l10n_tr_nilvera_einvoice_extended_tax_office_999,72260,Batman Vergi Dairesi Müdürlüğü,base.state_tr_72
+l10n_tr_nilvera_einvoice_extended_tax_office_1000,73101,Beytüşşebap Malmüdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1001,73103,Güçlükonak Malmüdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1002,73104,İdil Malmüdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1003,73106,Uludere Malmüdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1004,73260,Şırnak Vergi Dairesi Müdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1005,73261,Cizre Vergi Dairesi Müdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1006,73262,Silopi Vergi Dairesi Müdürlüğü,base.state_tr_73
+l10n_tr_nilvera_einvoice_extended_tax_office_1007,74101,Amasra Malmüdürlüğü,base.state_tr_74
+l10n_tr_nilvera_einvoice_extended_tax_office_1008,74102,Kurucaşile Malmüdürlüğü,base.state_tr_74
+l10n_tr_nilvera_einvoice_extended_tax_office_1009,74103,Ulus Malmüdürlüğü,base.state_tr_74
+l10n_tr_nilvera_einvoice_extended_tax_office_1010,74260,Bartın Vergi Dairesi Müdürlüğü,base.state_tr_74
+l10n_tr_nilvera_einvoice_extended_tax_office_1011,75101,Çıldır Malmüdürlüğü,base.state_tr_75
+l10n_tr_nilvera_einvoice_extended_tax_office_1012,75102,Damal Malmüdürlüğü,base.state_tr_75
+l10n_tr_nilvera_einvoice_extended_tax_office_1013,75103,Göle Malmüdürlüğü,base.state_tr_75
+l10n_tr_nilvera_einvoice_extended_tax_office_1014,75104,Hanak Malmüdürlüğü,base.state_tr_75
+l10n_tr_nilvera_einvoice_extended_tax_office_1015,75105,Posof Malmüdürlüğü,base.state_tr_75
+l10n_tr_nilvera_einvoice_extended_tax_office_1016,75201,Ardahan Vergi Dairesi Müdürlüğü,base.state_tr_75
+l10n_tr_nilvera_einvoice_extended_tax_office_1017,76101,Aralık Malmüdürlüğü,base.state_tr_76
+l10n_tr_nilvera_einvoice_extended_tax_office_1018,76102,Karakoyunlu Malmüdürlüğü,base.state_tr_76
+l10n_tr_nilvera_einvoice_extended_tax_office_1019,76103,Tuzluca Malmüdürlüğü,base.state_tr_76
+l10n_tr_nilvera_einvoice_extended_tax_office_1020,76201,Iğdır Vergi Dairesi Müdürlüğü,base.state_tr_76
+l10n_tr_nilvera_einvoice_extended_tax_office_1021,77101,Altınova Malmüdürlüğü,base.state_tr_77
+l10n_tr_nilvera_einvoice_extended_tax_office_1022,77102,Armutlu Malmüdürlüğü,base.state_tr_77
+l10n_tr_nilvera_einvoice_extended_tax_office_1023,77103,Çınarcık Malmüdürlüğü,base.state_tr_77
+l10n_tr_nilvera_einvoice_extended_tax_office_1024,77201,Yalova Vergi Dairesi Müdürlüğü,base.state_tr_77
+l10n_tr_nilvera_einvoice_extended_tax_office_1025,78101,Eflani Malmüdürlüğü,base.state_tr_78
+l10n_tr_nilvera_einvoice_extended_tax_office_1026,78102,Eskipazar Malmüdürlüğü,base.state_tr_78
+l10n_tr_nilvera_einvoice_extended_tax_office_1027,78103,Ovacık Malmüdürlüğü,base.state_tr_78
+l10n_tr_nilvera_einvoice_extended_tax_office_1028,78105,Yenice Malmüdürlüğü,base.state_tr_78
+l10n_tr_nilvera_einvoice_extended_tax_office_1029,78201,Karabük Vergi Dairesi Müdürlüğü,base.state_tr_78
+l10n_tr_nilvera_einvoice_extended_tax_office_1030,78260,Safranbolu Vergi Dairesi Müdürlüğü,base.state_tr_78
+l10n_tr_nilvera_einvoice_extended_tax_office_1031,79201,Kilis Vergi Dairesi Müdürlüğü,base.state_tr_79
+l10n_tr_nilvera_einvoice_extended_tax_office_1032,80101,Bahçe Malmüdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1033,80102,Düziçi Malmüdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1034,80104,Hasanbeyli Malmüdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1035,80105,Sumbas Malmüdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1036,80106,Toprakkale Malmüdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1037,80201,Osmaniye Vergi Dairesi Müdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1038,80260,Kadirli Vergi Dairesi Müdürlüğü,base.state_tr_80
+l10n_tr_nilvera_einvoice_extended_tax_office_1039,81102,Cumayeri Malmüdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1040,81103,Çilimli Malmüdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1041,81104,Gölyaka Malmüdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1042,81105,Gümüşova Malmüdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1043,81106,Kaynaşlı Malmüdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1044,81107,Yığılca Malmüdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1045,81260,Düzce Vergi Dairesi Müdürlüğü,base.state_tr_81
+l10n_tr_nilvera_einvoice_extended_tax_office_1046,81261,Akçakoca Vergi Dairesi Müdürlüğü,base.state_tr_81
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/data/template/account.tax-tr.csv b/addons/l10n_tr_nilvera_einvoice_extended/data/template/account.tax-tr.csv
new file mode 100644
index 0000000000000..0c10ce3c90157
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/data/template/account.tax-tr.csv
@@ -0,0 +1,271 @@
+"id","sequence","description","invoice_label","name","amount","amount_type","children_tax_ids","type_tax_use","tax_group_id","repartition_line_ids/repartition_type","repartition_line_ids/document_type","repartition_line_ids/account_id","repartition_line_ids/tag_ids","description@tr_TR","price_include_override","l10n_tr_tax_withholding_code_id"
+"tr_s_wh_20_IMH","1","Construction Works and Engineering-Architecture and Survey-Project Services Performed Along with These Works","-8%","WH 20% (4/10) - İMH","-8.0","percent","","none","tr_tax_group_wh_8","base","invoice","","SAL_20_BASE_4_10","Yapım İşleri İle Bu İşlerle Birlikte İfa Edilen Mühendislik-Mimarlık ve Etüt-Proje Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_4_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_4_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_4_10","",""
+"tr_s_wh_20_PDH","2","Survey, Plan-Project, Consultancy, Audit and Similar Services","-18%","WH 20% (9/10) - PDH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Etüt, Plan-Proje, Danışmanlık, Denetim ve Benzeri Hizmetler","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_MEBH","3","Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed Assets and Vehicles","-14%","WH 20% (7/10) - MEBH","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","Makine, Teçhizat, Demirbaş ve Taşıtlara Ait Tadil, Bakım, Onarım Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_603"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_YSH","4","Food Service","-10%","WH 20% (5/10) - YSH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","SAL_20_BASE_5_10","Yemek Servis Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_604"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_5_10","",""
+"tr_s_wh_20_OH","5","Organization Service","-10%","WH 20% (5/10) - OH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","SAL_20_BASE_5_10","Organizasyon Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_605"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_5_10","",""
+"tr_s_wh_20_ITH","6","Labor Supply Services","-18%","WH 20% (9/10) - İTH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","İşgücü Temin Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_606"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_OGH","7","Private Security Service","-18%","WH 20% (9/10) - ÖGH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Özel Güvenlik Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_607"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_YDH","8","Building Inspection Services","-18%","WH 20% (9/10) - YDH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Yapı Denetim Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_608"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_FTKI","9","Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary Services for These Works","-14%","WH 20% (7/10) - FTKİ","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","Fason Olarak Yaptırılan Tekstil ve Konfeksiyon İşleri, Çanta ve Ayakkabı Dikim İşleri ve Bu İşlere Aracılık Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_609"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_TMH","10","Customer Finding / Taking Services to Tourist Shops","-18%","WH 20% (9/10) - TMH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Turistik Mağazalara Verilen Müşteri Bulma / Götürme Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_610"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_SKGI","11","Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues of Sports Clubs","-18%","WH 20% (9/10) - SKGİ","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Spor Kulüplerinin Yayın, Reklam ve İsim Hakkı Gelirlerine Konu İşlemleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_611"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_TH","12","Cleaning Service","-18%","WH 20% (9/10) - TH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Temizlik Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_612"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_CBH","13","Environmental and Garden Maintenance Services","-18%","WH 20% (9/10) - ÇBH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Çevre ve Bahçe Bakım Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_613"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_STH","14","Shuttle Transportation Service","-10%","WH 20% (5/10) - STH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","SAL_20_BASE_5_10","Servis Taşımacılığı Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_614"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_5_10","",""
+"tr_s_wh_20_BBH","15","All Kinds of Printing and Printing Services","-14%","WH 20% (7/10) - BBH","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","Her Türlü Baskı ve Basım Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_615"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_DH","16","Other Services","-10%","WH 20% (5/10) - DH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","SAL_20_BASE_5_10","Diğer Hizmetler","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_616"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_5_10","",""
+"tr_s_wh_20_HMK","17","Ingot Deliveries Obtained from Scrap Metal","-14%","WH 20% (7/10) - HMK","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","Hurda Metalden Elde Edilen Külçe Teslimleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_617"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_DMK","18","Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than Those Obtained from Scrap Metal","-14%","WH 20% (7/10) - DMK","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","Hurda Metalden Elde Edilenler Dışındaki Bakır, Çinko, Demir-Çelik, Alüminyum ve Kurşun Külçe Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_618"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_MUT","19","Delivery of Copper, Zinc and Aluminum Products","-14%","WH 20% (7/10) - MÜT","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","Bakır, Çinko ve Alüminyum Ürünlerinin Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_619"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_VHT","20","Scrap and Waste Delivery of Those Who Waive the Exception","-14%","WH 20% (7/10) - VHT","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","SAL_20_BASE_7_10","İstisnadan Vazgeçenlerin Hurda ve Atık Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_620"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_7_10","",""
+"tr_s_wh_20_DLDT","21","Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and Glass Scrap and Waste","-18%","WH 20% (9/10) - DLDT","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Metal, Plastik, Lastik, Kauçuk, Kağıt ve Cam Hurda ve Atıklardan Elde Edilen Hammadde Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_621"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_OUT","22","Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries","-18%","WH 20% (9/10) - OÜT","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","SAL_20_BASE_9_10","Pamuk, Tiftik, Yün ve Yapağı İle Ham Post ve Deri Teslimleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_622"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_9_10","",""
+"tr_s_wh_20_AUT","23","Delivery of Wood and Forest Products","-10%","WH 20% (5/10) - AÜT","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","SAL_20_BASE_5_10","Ağaç ve Orman Ürünleri Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_623"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_5_10","",""
+"tr_s_wh_20_YTH","24","Freight Transportation Service","-4%","WH 20% (2/10) - YTH","-4.0","percent","","none","tr_tax_group_wh_4","base","invoice","","SAL_20_BASE_2_10","Yük Taşımacılığı Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_624"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_2_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_2_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_2_10","",""
+"tr_s_wh_20_TRH","25","Commercial Advertising Services","-6%","WH 20% (3/10) - TRH","-6.0","percent","","none","tr_tax_group_wh_6","base","invoice","","SAL_20_BASE_3_10","Ticari Reklam Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_625"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_3_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_3_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_3_10","",""
+"tr_s_wh_20_DT","26","Other Submissions","-4%","WH 20% (2/10) - DT","-4.0","percent","","none","tr_tax_group_wh_4","base","invoice","","SAL_20_BASE_2_10","Diğer Teslimler","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_626"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_2_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_2_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_2_10","",""
+"tr_s_wh_20_DCUT","27","Delivery of Iron and Steel Products","-10%","WH 20% (5/10) - DÇÜT","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","SAL_20_BASE_5_10","Demir-Çelik Ürünlerinin Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_627"
+"","","","","","","","","","","tax","invoice","tr391004","SAL_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","SAL_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391004","SAL_20_TAX_5_10","",""
+"tr_s_vat_wh_20_IMH","28","Sales Construction Works and Engineering-Architecture and Survey-Project Services Performed Along with These Works","","WH 20% (4/10) - İMH","0.0","group","tr_s_wh_20_IMH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Yapım İşleri İle Bu İşlerle Birlikte İfa Edilen Mühendislik-Mimarlık ve Etüt-Proje Hizmetleri","",""
+"tr_s_vat_wh_20_PDH","29","Sales Survey, Plan-Project, Consultancy, Audit and Similar Services","","WH 20% (9/10) - PDH","0.0","group","tr_s_wh_20_PDH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Etüt, Plan-Proje, Danışmanlık, Denetim ve Benzeri Hizmetler","",""
+"tr_s_vat_wh_20_MEBH","30","Sales Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed Assets and Vehicles","","WH 20% (7/10) - MEBH","0.0","group","tr_s_wh_20_MEBH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Makine, Teçhizat, Demirbaş ve Taşıtlara Ait Tadil, Bakım, Onarım Hizmetleri","",""
+"tr_s_vat_wh_20_YSH","31","Sales Food Service","","WH 20% (5/10) - YSH","0.0","group","tr_s_wh_20_YSH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Yemek Servis Hizmeti","",""
+"tr_s_vat_wh_20_OH","32","Sales Organization Service","","WH 20% (5/10) - OH","0.0","group","tr_s_wh_20_OH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Organizasyon Hizmeti","",""
+"tr_s_vat_wh_20_ITH","33","Sales Labor Supply Services","","WH 20% (9/10) - İTH","0.0","group","tr_s_wh_20_ITH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","İşgücü Temin Hizmetleri","",""
+"tr_s_vat_wh_20_OGH","34","Sales Private Security Service","","WH 20% (9/10) - ÖGH","0.0","group","tr_s_wh_20_OGH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Özel Güvenlik Hizmeti","",""
+"tr_s_vat_wh_20_YDH","35","Sales Building Inspection Services","","WH 20% (9/10) - YDH","0.0","group","tr_s_wh_20_YDH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Yapı Denetim Hizmetleri","",""
+"tr_s_vat_wh_20_FTKI","36","Sales Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary Services for These Works","","WH 20% (7/10) - FTKİ","0.0","group","tr_s_wh_20_FTKI,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Fason Olarak Yaptırılan Tekstil ve Konfeksiyon İşleri, Çanta ve Ayakkabı Dikim İşleri ve Bu İşlere Aracılık Hizmetleri","",""
+"tr_s_vat_wh_20_TMH","37","Sales Customer Finding / Taking Services to Tourist Shops","","WH 20% (9/10) - TMH","0.0","group","tr_s_wh_20_TMH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Turistik Mağazalara Verilen Müşteri Bulma / Götürme Hizmetleri","",""
+"tr_s_vat_wh_20_SKGI","38","Sales Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues of Sports Clubs","","WH 20% (9/10) - SKGİ","0.0","group","tr_s_wh_20_SKGI,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Spor Kulüplerinin Yayın, Reklam ve İsim Hakkı Gelirlerine Konu İşlemleri","",""
+"tr_s_vat_wh_20_TH","39","Sales Cleaning Service","","WH 20% (9/10) - TH","0.0","group","tr_s_wh_20_TH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Temizlik Hizmeti","",""
+"tr_s_vat_wh_20_CBH","40","Sales Environmental and Garden Maintenance Services","","WH 20% (9/10) - ÇBH","0.0","group","tr_s_wh_20_CBH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Çevre ve Bahçe Bakım Hizmetleri","",""
+"tr_s_vat_wh_20_STH","41","Sales Shuttle Transportation Service","","WH 20% (5/10) - STH","0.0","group","tr_s_wh_20_STH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Servis Taşımacılığı Hizmeti","",""
+"tr_s_vat_wh_20_BBH","42","Sales All Kinds of Printing and Printing Services","","WH 20% (7/10) - BBH","0.0","group","tr_s_wh_20_BBH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Her Türlü Baskı ve Basım Hizmetleri","",""
+"tr_s_vat_wh_20_DH","43","Sales Other Services","","WH 20% (5/10) - DH","0.0","group","tr_s_wh_20_DH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Diğer Hizmetler","",""
+"tr_s_vat_wh_20_HMK","44","Sales Ingot Deliveries Obtained from Scrap Metal","","WH 20% (7/10) - HMK","0.0","group","tr_s_wh_20_HMK,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Hurda Metalden Elde Edilen Külçe Teslimleri","",""
+"tr_s_vat_wh_20_DMK","45","Sales Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than Those Obtained from Scrap Metal","","WH 20% (7/10) - DMK","0.0","group","tr_s_wh_20_DMK,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Hurda Metalden Elde Edilenler Dışındaki Bakır, Çinko, Demir-Çelik, Alüminyum ve Kurşun Külçe Teslimi","",""
+"tr_s_vat_wh_20_MUT","46","Sales Delivery of Copper, Zinc and Aluminum Products","","WH 20% (7/10) - MÜT","0.0","group","tr_s_wh_20_MUT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Bakır, Çinko ve Alüminyum Ürünlerinin Teslimi","",""
+"tr_s_vat_wh_20_VHT","47","Sales Scrap and Waste Delivery of Those Who Waive the Exception","","WH 20% (7/10) - VHT","0.0","group","tr_s_wh_20_VHT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","İstisnadan Vazgeçenlerin Hurda ve Atık Teslimi","",""
+"tr_s_vat_wh_20_DLDT","48","Sales Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and Glass Scrap and Waste","","WH 20% (9/10) - DLDT","0.0","group","tr_s_wh_20_DLDT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Metal, Plastik, Lastik, Kauçuk, Kağıt ve Cam Hurda ve Atıklardan Elde Edilen Hammadde Teslimi","",""
+"tr_s_vat_wh_20_OUT","49","Sales Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries","","WH 20% (9/10) - OÜT","0.0","group","tr_s_wh_20_OUT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Pamuk, Tiftik, Yün ve Yapağı İle Ham Post ve Deri Teslimleri","",""
+"tr_s_vat_wh_20_AUT","50","Sales Delivery of Wood and Forest Products","","WH 20% (5/10) - AÜT","0.0","group","tr_s_wh_20_AUT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Ağaç ve Orman Ürünleri Teslimi","",""
+"tr_s_vat_wh_20_YTH","51","Sales Freight Transport Service","","WH 20% (2/10) - YTH","0.0","group","tr_s_wh_20_YTH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Yük Taşımacılığı Hizmeti","",""
+"tr_s_vat_wh_20_TRH","52","Sales Commercial Advertising Services","","WH 20% (3/10) - TRH","0.0","group","tr_s_wh_20_TRH,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Ticari Reklam Hizmetleri","",""
+"tr_s_vat_wh_20_DT","53","Sales Other Submissions","","WH 20% (2/10) - DT","0.0","group","tr_s_wh_20_DT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Diğer Teslimler","",""
+"tr_s_vat_wh_20_DCUT","54","Sales Delivery of Iron and Steel Products","","WH 20% (5/10) - DÇÜT","0.0","group","tr_s_wh_20_DCUT,tr_s_20","sale","tr_tax_group_kdv_20","","","","","Demir-Çelik Ürünlerinin Teslimi","",""
+"tr_p_wh_20_IMH","1","Purchasing Construction Works and Engineering-Architecture and Survey-Project Services Performed Along with These Works","-8%","WH 20% (4/10) - İMH","-8.0","percent","","none","tr_tax_group_wh_8","base","invoice","","PUR_20_BASE_4_10","Yapım İşleri İle Bu İşlerle Birlikte İfa Edilen Mühendislik-Mimarlık ve Etüt-Proje Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_4_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_4_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_4_10","",""
+"tr_p_wh_20_PDH","2","Purchasing Survey, Plan-Project, Consultancy, Audit and Similar Services","-18%","WH 20% (9/10) - PDH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Etüt, Plan-Proje, Danışmanlık, Denetim ve Benzeri Hizmetler","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_MEBH","3","Purchasing Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed Assets and Vehicles","-14%","WH 20% (7/10) - MEBH","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","Makine, Teçhizat, Demirbaş ve Taşıtlara Ait Tadil, Bakım, Onarım Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_603"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_YSH","4","Purchasing Food Service","-10%","WH 20% (5/10) - YSH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","PUR_20_BASE_5_10","Yemek Servis Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_604"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_5_10","",""
+"tr_p_wh_20_OH","5","Purchasing Organization Service","-10%","WH 20% (5/10) - OH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","PUR_20_BASE_5_10","Organizasyon Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_605"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_5_10","",""
+"tr_p_wh_20_ITH","6","Purchasing Labor Supply Services","-18%","WH 20% (9/10) - İTH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","İşgücü Temin Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_606"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_OGH","7","Purchasing Private Security Service","-18%","WH 20% (9/10) - ÖGH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Özel Güvenlik Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_607"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_YDH","8","Purchasing Building Inspection Services","-18%","WH 20% (9/10) - YDH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Yapı Denetim Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_608"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_FTKI","9","Purchasing Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary Services for These Works","-14%","WH 20% (7/10) - FTKİ","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","Fason Olarak Yaptırılan Tekstil ve Konfeksiyon İşleri, Çanta ve Ayakkabı Dikim İşleri ve Bu İşlere Aracılık Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_609"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_TMH","10","Purchasing Customer Finding / Taking Services to Tourist Shops","-18%","WH 20% (9/10) - TMH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Turistik Mağazalara Verilen Müşteri Bulma / Götürme Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_610"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_SKGI","11","Purchasing Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues of Sports Clubs","-18%","WH 20% (9/10) - SKGİ","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Spor Kulüplerinin Yayın, Reklam ve İsim Hakkı Gelirlerine Konu İşlemleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_611"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_TH","12","Purchasing Cleaning Service","-18%","WH 20% (9/10) - TH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Temizlik Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_612"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_CBH","13","Purchasing Environmental and Garden Maintenance Services","-18%","WH 20% (9/10) - ÇBH","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Çevre ve Bahçe Bakım Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_613"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_STH","14","Purchasing Shuttle Transportation Service","-10%","WH 20% (5/10) - STH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","PUR_20_BASE_5_10","Servis Taşımacılığı Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_614"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_5_10","",""
+"tr_p_wh_20_BBH","15","Purchasing All Kinds of Printing and Printing Services","-14%","WH 20% (7/10) - BBH","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","Her Türlü Baskı ve Basım Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_615"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_DH","16","Purchasing Other Services","-10%","WH 20% (5/10) - DH","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","PUR_20_BASE_5_10","Diğer Hizmetler","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_616"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_5_10","",""
+"tr_p_wh_20_HMK","17","Purchasing Ingot Deliveries Obtained from Scrap Metal","-14%","WH 20% (7/10) - HMK","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","Hurda Metalden Elde Edilen Külçe Teslimleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_617"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_DMK","18","Purchasing Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than Those Obtained from Scrap Metal","-14%","WH 20% (7/10) - DMK","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","Hurda Metalden Elde Edilenler Dışındaki Bakır, Çinko, Demir-Çelik, Alüminyum ve Kurşun Külçe Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_618"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_MUT","19","Purchasing Delivery of Copper, Zinc and Aluminum Products","-14%","WH 20% (7/10) - MÜT","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","Bakır, Çinko ve Alüminyum Ürünlerinin Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_619"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_VHT","20","Purchasing Scrap and Waste Delivery of Those Who Waive the Exception","-14%","WH 20% (7/10) - VHT","-14.0","percent","","none","tr_tax_group_wh_14","base","invoice","","PUR_20_BASE_7_10","İstisnadan Vazgeçenlerin Hurda ve Atık Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_620"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_7_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_7_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_7_10","",""
+"tr_p_wh_20_DLDT","21","Purchasing Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and Glass Scrap and Wastel","-18%","WH 20% (9/10) - DLDT","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Metal, Plastik, Lastik, Kauçuk, Kağıt ve Cam Hurda ve Atıklardan Elde Edilen Hammadde Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_621"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_OUT","22","Purchasing Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries","-18%","WH 20% (9/10) - OÜT","-18.0","percent","","none","tr_tax_group_wh_18","base","invoice","","PUR_20_BASE_9_10","Pamuk, Tiftik, Yün ve Yapağı İle Ham Post ve Deri Teslimleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_622"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_9_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_9_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_9_10","",""
+"tr_p_wh_20_AUT","23","Purchasing Delivery of Wood and Forest Products","-10%","WH 20% (5/10) - AÜT","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","PUR_20_BASE_5_10","Ağaç ve Orman Ürünleri Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_623"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_5_10","",""
+"tr_p_wh_20_YTH","24","Purchasing Freight Transport Service","-4.00%","WH 20% (2/10) - YTH","-4.0","percent","","none","tr_tax_group_wh_4","base","invoice","","PUR_20_BASE_2_10","Yük Taşımacılığı Hizmeti","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_624"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_2_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_2_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_2_10","",""
+"tr_p_wh_20_TRH","25","Purchasing Commercial Advertising Services","-6%","WH 20% (3/10) - TRH","-6.0","percent","","none","tr_tax_group_wh_6","base","invoice","","PUR_20_BASE_3_10","Ticari Reklam Hizmetleri","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_625"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_3_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_10_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_3_10","",""
+"tr_p_wh_20_DT","26","Purchasing Other Submissions","-4%","WH 20% (2/10) - DT","-4.0","percent","","none","tr_tax_group_wh_4","base","invoice","","PUR_20_BASE_2_10","Diğer Teslimler","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_626"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_2_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_2_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_2_10","",""
+"tr_p_wh_20_DCUT","27","Purchasing Delivery of Iron and Steel Products","-10%","WH 20% (5/10) - DÇÜT","-10.0","percent","","none","tr_tax_group_wh_10","base","invoice","","PUR_20_BASE_5_10","Demir-Çelik Ürünlerinin Teslimi","tax_excluded","l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_627"
+"","","","","","","","","","","tax","invoice","tr391005","PUR_20_TAX_5_10","",""
+"","","","","","","","","","","base","refund","","PUR_20_BASE_5_10","",""
+"","","","","","","","","","","tax","refund","tr391005","PUR_20_TAX_5_10","",""
+"tr_p_vat_wh_20_IMH","55","Purchase Construction Works and Engineering-Architecture and Survey-Project Services Performed Along with These Works","","WH 20% (4/10) - İMH","0.0","group","tr_p_wh_20_IMH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Stopajlı Satın Alma KDVsi (4/10) Yapım İşleri İle Bu İşlerle Birlikte İfa Edilen Mühendislik-Mimarlık ve Etüt-Proje Hizmetleri","",""
+"tr_p_vat_wh_20_PDH","56","Purchase Survey, Plan-Project, Consultancy, Audit and Similar Services","","WH 20% (9/10) - PDH","0.0","group","tr_p_wh_20_PDH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Etüt, Plan-Proje, Danışmanlık, Denetim ve Benzeri Hizmetler","",""
+"tr_p_vat_wh_20_MEBH","57","Purchase Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed Assets and Vehicles","","WH 20% (7/10) - MEBH","0.0","group","tr_p_wh_20_MEBH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Makine, Teçhizat, Demirbaş ve Taşıtlara Ait Tadil, Bakım, Onarım Hizmetleri","",""
+"tr_p_vat_wh_20_YSH","58","Purchase Food Service","","WH 20% (5/10) - YSH","0.0","group","tr_p_wh_20_YSH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Yemek Servis Hizmeti","",""
+"tr_p_vat_wh_20_OH","59","Purchase Organization Service","","WH 20% (5/10) - OH","0.0","group","tr_p_wh_20_OH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Organizasyon Hizmeti","",""
+"tr_p_vat_wh_20_ITH","60","Purchase Labor Supply Services","","WH 20% (9/10) - İTH","0.0","group","tr_p_wh_20_ITH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","İşgücü Temin Hizmetleri","",""
+"tr_p_vat_wh_20_OGH","61","Purchase Private Security Service","","WH 20% (9/10) - ÖGH","0.0","group","tr_p_wh_20_OGH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Özel Güvenlik Hizmeti","",""
+"tr_p_vat_wh_20_YDH","62","Purchase Building Inspection Services","","WH 20% (9/10) - YDH","0.0","group","tr_p_wh_20_YDH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Yapı Denetim Hizmetleri","",""
+"tr_p_vat_wh_20_FTKI","63","Purchase Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary Services for These Works","","WH 20% (7/10) - FTKİ","0.0","group","tr_p_wh_20_FTKI,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Fason Olarak Yaptırılan Tekstil ve Konfeksiyon İşleri, Çanta ve Ayakkabı Dikim İşleri ve Bu İşlere Aracılık Hizmetleri","",""
+"tr_p_vat_wh_20_TMH","64","Purchase Customer Finding / Taking Services to Tourist Shops","","WH 20% (9/10) - TMH","0.0","group","tr_p_wh_20_TMH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Turistik Mağazalara Verilen Müşteri Bulma / Götürme Hizmetleri","",""
+"tr_p_vat_wh_20_SKGI","65","Purchase Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues of Sports Clubs","","WH 20% (9/10) - SKGİ","0.0","group","tr_p_wh_20_SKGI,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Spor Kulüplerinin Yayın, Reklam ve İsim Hakkı Gelirlerine Konu İşlemleri","",""
+"tr_p_vat_wh_20_TH","66","Purchase Cleaning Service","","WH 20% (9/10) - TH","0.0","group","tr_p_wh_20_TH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Temizlik Hizmeti","",""
+"tr_p_vat_wh_20_CBH","67","Purchase Environmental and Garden Maintenance Services","","WH 20% (9/10) - ÇBH","0.0","group","tr_p_wh_20_CBH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Çevre ve Bahçe Bakım Hizmetleri","",""
+"tr_p_vat_wh_20_STH","68","Purchase Shuttle Transportation Service","","WH 20% (5/10) - STH","0.0","group","tr_p_wh_20_STH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Servis Taşımacılığı Hizmeti","",""
+"tr_p_vat_wh_20_BBH","69","Purchase All Kinds of Printing and Printing Services","","WH 20% (7/10) - BBH","0.0","group","tr_p_wh_20_BBH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Her Türlü Baskı ve Basım Hizmetleri","",""
+"tr_p_vat_wh_20_DH","70","Purchase Other Services","","WH 20% (5/10) - DH","0.0","group","tr_p_wh_20_DH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Diğer Hizmetler","",""
+"tr_p_vat_wh_20_HMK","71","Purchase Ingot Deliveries Obtained from Scrap Metal","","WH 20% (7/10) - HMK","0.0","group","tr_p_wh_20_HMK,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Hurda Metalden Elde Edilen Külçe Teslimleri","",""
+"tr_p_vat_wh_20_DMK","72","Purchase Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than Those Obtained from Scrap Metal","","WH 20% (7/10) - DMK","0.0","group","tr_p_wh_20_DMK,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Hurda Metalden Elde Edilenler Dışındaki Bakır, Çinko, Demir-Çelik, Alüminyum ve Kurşun Külçe Teslimi","",""
+"tr_p_vat_wh_20_MUT","73","Purchase Delivery of Copper, Zinc and Aluminum Products","","WH 20% (7/10) - MÜT","0.0","group","tr_p_wh_20_MUT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Bakır, Çinko ve Alüminyum Ürünlerinin Teslimi","",""
+"tr_p_vat_wh_20_VHT","74","Purchase Scrap and Waste Delivery of Those Who Waive the Exception","","WH 20% (7/10) - VHT","0.0","group","tr_p_wh_20_VHT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","İstisnadan Vazgeçenlerin Hurda ve Atık Teslimi","",""
+"tr_p_vat_wh_20_DLDT","75","Purchase Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and Glass Scrap and Waste","","WH 20% (9/10) - DLDT","0.0","group","tr_p_wh_20_DLDT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Metal, Plastik, Lastik, Kauçuk, Kağıt ve Cam Hurda ve Atıklardan Elde Edilen Hammadde Teslimi","",""
+"tr_p_vat_wh_20_OUT","76","Purchase Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries","","WH 20% (9/10) - OÜT","0.0","group","tr_p_wh_20_OUT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Pamuk, Tiftik, Yün ve Yapağı İle Ham Post ve Deri Teslimleri","",""
+"tr_p_vat_wh_20_AUT","77","Purchase Delivery of Wood and Forest Products","","WH 20% (5/10) - AÜT","0.0","group","tr_p_wh_20_AUT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Ağaç ve Orman Ürünleri Teslimi","",""
+"tr_p_vat_wh_20_YTH","78","Purchase Freight Transport Service","","WH 20% (2/10) - YTH","0.0","group","tr_p_wh_20_YTH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Yük Taşımacılığı Hizmeti","",""
+"tr_p_vat_wh_20_TRH","79","Purchase Commercial Advertising Services","","WH 20% (3/10) - TRH","0.0","group","tr_p_wh_20_TRH,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Ticari Reklam Hizmetleri","",""
+"tr_p_vat_wh_20_DT","80","Purchase Other Submissions","","WH 20% (2/10) - DT","0.0","group","tr_p_wh_20_DT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Diğer Teslimler","",""
+"tr_p_vat_wh_20_DCUT","81","Purchase Delivery of Iron and Steel Products","","WH 20% (5/10) - DÇÜT","0.0","group","tr_p_wh_20_DCUT,tr_p_20","purchase","tr_tax_group_kdv_20","","","","","Demir-Çelik Ürünlerinin Teslimi","",""
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/data/template/l10n_tr_nilvera_einvoice_extended.account.tax.code-tr.csv b/addons/l10n_tr_nilvera_einvoice_extended/data/template/l10n_tr_nilvera_einvoice_extended.account.tax.code-tr.csv
new file mode 100644
index 0000000000000..b7f625203abbc
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/data/template/l10n_tr_nilvera_einvoice_extended.account.tax.code-tr.csv
@@ -0,0 +1,39 @@
+"id","name","name@tr_TR","code","percentage","code_type"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_212,"17/4-i Services Provided in Free Zones","17/4-ı Serbest Bölgelerde Verilen Hizmetler",212,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_228,"Deliveries Made Free of Charge to the Institutions and Organizations Listed in Article (17/1) of Law 17/2-b","17/2-b Kanunun (17/1) Maddesinde Sayılan Kurum ve Kuruluşlara Bedelsiz Olarak Yapılan Teslimler",228,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_250,"Partial Others","Kısmi İstisna Diğerleri",250,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_301,"11/1-a Export of Goods","Kısmi İstisna Diğerleri",301,0,"export_exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_302,"11/1-a Service Export","11/1-a Hizmet İhracatı",302,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_308,"13/d Delivery of Incentive Investment Goods","13/d Teşvikli Yatırım Mallarının Teslimi",308,0,"export_exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_316,"11/1-a Contract Services for Customers in Free Zones","11/1-a Serbest Bölgelerdeki Müşteriler İçin Yapılan Fason Hizmetler",316,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_328,"13/i Residential or Workplace Deliveries","13/i Konut veya İşyeri Teslimleri",328,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_338,"Exports of Goods by Manufacturers","İmalatçıların Mal İhracatları",338,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_350,"Other","İstisna Diğer",350,0,"exception"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601,"Construction Works and Engineering-Architecture and Survey-Project Services Performed Along with These Works","Yapım İşleri İle Bu İşlerle Birlikte İfa Edilen Mühendislik-Mimarlık ve Etüt-Proje Hizmetleri",601,0.4,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_602,"Survey, Plan-Project, Consultancy, Audit and Similar Services","Etüt, Plan-Proje, Danışmanlık, Denetim ve Benzeri Hizmetler",602,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_603,"Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed Assets and Vehicles","Makine, Teçhizat, Demirbaş ve Taşıtlara Ait Tadil, Bakım, Onarım Hizmetleri",603,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_604,"Food Service","Yemek Servis Hizmeti",604,0.5,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_605,"Organization Service","Organizasyon Hizmeti",605,0.5,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_606,"Labor Supply Services","İşgücü Temin Hizmetleri",606,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_607,"Private Security Service","Özel Güvenlik Hizmeti",607,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_608,"Building Inspection Services","Yapı Denetim Hizmetleri",608,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_609,"Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary Services for These Works","Fason Olarak Yaptırılan Tekstil ve Konfeksiyon İşleri, Çanta ve Ayakkabı Dikim İşleri ve Bu İşlere Aracılık Hizmetleri",609,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_610,"Customer Finding / Taking Services to Tourist Shops","Turistik Mağazalara Verilen Müşteri Bulma / Götürme Hizmetleri",610,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_611,"Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues of Sports Clubs","Spor Kulüplerinin Yayın, Reklam ve İsim Hakkı Gelirlerine Konu İşlemleri",611,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_612,"Cleaning Service","Temizlik Hizmeti",612,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_613,"Environmental and Garden Maintenance Services","Çevre ve Bahçe Bakım Hizmetleri",613,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_614,"Shuttle Transportation Service","Servis Taşımacılığı Hizmeti",614,0.5,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_615,"All Kinds of Printing and Printing Services","Her Türlü Baskı ve Basım Hizmetleri",615,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_616,"Other Services","Diğer Hizmetler",616,0.5,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_617,"Ingot Deliveries Obtained from Scrap Metal","Hurda Metalden Elde Edilen Külçe Teslimleri",617,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_618,"Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than Those Obtained from Scrap Metal","Hurda Metalden Elde Edilenler Dışındaki Bakır, Çinko, Demir-Çelik, Alüminyum ve Kurşun Külçe Teslimi",618,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_619,"Delivery of Copper, Zinc and Aluminum Products","Bakır, Çinko ve Alüminyum Ürünlerinin Teslimi",619,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_620,"Scrap and Waste Delivery of Those Who Waive the Exception","İstisnadan Vazgeçenlerin Hurda ve Atık Teslimi",620,0.7,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_621,"Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and Glass Scrap and Waste","Metal, Plastik, Lastik, Kauçuk, Kağıt ve Cam Hurda ve Atıklardan Elde Edilen Hammadde Teslimi",621,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_622,"Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries","Pamuk, Tiftik, Yün ve Yapağı İle Ham Post ve Deri Teslimleri",622,0.9,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_623,"Delivery of Wood and Forest Products","Ağaç ve Orman Ürünleri Teslimi",623,0.5,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_624,"Freight Transport Service","Yük Taşımacılığı Hizmeti",624,0.2,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_625,"Commercial Advertising Services","Ticari Reklam Hizmetleri",625,0.3,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_626,"Other Submissions","Diğer Teslimler",626,0.2,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_627,"Delivery of Iron and Steel Products","Demir-Çelik Ürünlerinin Teslimi",627,0.5,"withholding"
+l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_701,"Export Registered Sales within the scope of Article 11/1-c of the VAT Law No. 3065","3065 s. KDV Kanununun 11/1-c md. Kapsamındaki İhraç Kayıtlı Satış",701,0,"export_registration"
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/data/ubl_tr_templates.xml b/addons/l10n_tr_nilvera_einvoice_extended/data/ubl_tr_templates.xml
new file mode 100644
index 0000000000000..d0411ab7542e6
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/data/ubl_tr_templates.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="ubl_tr_LineDelivery">
+        <t xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+            xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+            <cac:Delivery>
+                <cac:DeliveryAddress>
+                    <t t-set="delivery_address_vals" t-value="vals.get('delivery_address_vals', {})"/>
+                    <cbc:StreetName t-out="delivery_address_vals.get('street')"/>
+                    <cbc:CitySubdivisionName t-out="delivery_address_vals.get('city')"/>
+                    <cbc:CityName t-out="delivery_address_vals.get('state')"/>
+                    <cbc:PostalZone t-out="delivery_address_vals.get('zip')"/>
+                    <cac:Country>
+                        <cbc:Name t-out="delivery_address_vals.get('country')"/>
+                    </cac:Country>
+                </cac:DeliveryAddress>
+                <cac:DeliveryTerms>
+                    <cbc:ID schemeID="INCOTERMS" t-out="vals.get('incoterm_code')"/>
+                </cac:DeliveryTerms>
+                <cac:Shipment>
+                    <cbc:ID t-out="vals.get('id')"/>
+                    <cac:GoodsItem>
+                        <cbc:RequiredCustomsID t-out="vals.get('product_customs_code')"/>
+                    </cac:GoodsItem>
+                    <cac:ShipmentStage>
+                        <cbc:TransportModeCode t-out="vals.get('shipping_method_code')"/>
+                    </cac:ShipmentStage>
+                </cac:Shipment>
+            </cac:Delivery>
+        </t>
+    </template>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/i18n/l10n_tr_nilvera_einvoice_extended.pot b/addons/l10n_tr_nilvera_einvoice_extended/i18n/l10n_tr_nilvera_einvoice_extended.pot
new file mode 100644
index 0000000000000..5a251c6fd3cfe
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/i18n/l10n_tr_nilvera_einvoice_extended.pot
@@ -0,0 +1,702 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_tr_nilvera_einvoice_extended
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~18.4+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-10 06:41+0000\n"
+"PO-Revision-Date: 2025-10-10 06:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid " TR Company(s)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_316
+msgid "11/1-a Contract Services for Customers in Free Zones"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_301
+msgid "11/1-a Export of Goods"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_302
+msgid "11/1-a Service Export"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_308
+msgid "13/d Delivery of Incentive Investment Goods"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_328
+msgid "13/i Residential or Workplace Deliveries"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_212
+msgid "17/4-i Services Provided in Free Zones"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.res_config_settings_view_form_l10n_tr_nilvera_extended
+msgid ""
+"<span class=\"fw-bold\">Warning:</span> Changing the Export Alias will cause"
+" issues for export invoice scenario."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.account_move_form_view_l10n_tr_nilvera_extended
+msgid ""
+"<span class=\"o_form_label mx-3\" "
+"invisible=\"l10n_tr_nilvera_customer_status != 'einvoice'\">is</span>"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_chart_template
+msgid "Account Chart Template"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_move_send
+msgid "Account Move Send"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__4
+msgid "Air Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_615
+msgid "All Kinds of Printing and Printing Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_scenario__temelfatura
+msgid "Basic"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_608
+msgid "Building Inspection Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_line__l10n_tr_ctsp_number
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_product__l10n_tr_ctsp_number
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_template__l10n_tr_ctsp_number
+msgid "CTSP Number"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_line.py:0
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/product_product.py:0
+msgid "CTSP Number must be 12 digits or fewer."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "Check Products"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "Check reference on Partner(s)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_612
+msgid "Cleaning Service"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type
+msgid "Code Type"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__6
+msgid "Combined Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_625
+msgid "Commercial Advertising Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601
+msgid ""
+"Construction Works and Engineering-Architecture and Survey-Project Services "
+"Performed Along with These Works"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_622
+msgid "Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.actions.act_window,help:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_account_tax_code_list
+msgid "Create a GIB Reason"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.actions.act_window,help:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_tax_office_list
+msgid "Create a Tax Office"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_610
+msgid "Customer Finding / Taking Services to Tourist Shops"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DAF
+msgid "DELIVERED AT FRONTIER"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DDU
+msgid "DELIVERED DUTY UNPAID"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DEQ
+msgid "DELIVERED EX QUAY (DUTY PAID)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DES
+msgid "DELIVERED EX SHIP"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_228
+msgid ""
+"Deliveries Made Free of Charge to the Institutions and Organizations Listed "
+"in Article (17/1) of Law 17/2-b"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_619
+msgid "Delivery of Copper, Zinc and Aluminum Products"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_618
+msgid ""
+"Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than "
+"Those Obtained from Scrap Metal"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_627
+msgid "Delivery of Iron and Steel Products"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_621
+msgid ""
+"Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and "
+"Glass Scrap and Waste"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_623
+msgid "Delivery of Wood and Forest Products"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_chart_template__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_edi_xml_ubl_tr__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_send__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_tax__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_product__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_template__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_partner__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__8
+msgid "Domestic Water Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_613
+msgid "Environmental and Garden Maintenance Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__exception
+msgid "Exception"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_exemption_code_id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_exemption_code_id
+msgid "Exemption Reason"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.res_config_settings_view_form_l10n_tr_nilvera_extended
+msgid "Export Alias"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__export_exception
+msgid "Export Exception"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_701
+msgid ""
+"Export Registered Sales within the scope of Article 11/1-c of the VAT Law "
+"No. 3065"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__export_registration
+msgid "Export Registration"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_338
+msgid "Exports of Goods by Manufacturers"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__7
+msgid "Fixed Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_604
+msgid "Food Service"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form
+msgid "For a full list of codes and descriptions, check"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_624
+msgid "Freight Transport Service"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.actions.act_window,name:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_account_tax_code_list
+#: model:ir.ui.menu,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_menu_account_tax_code
+msgid "GIB Codes"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_type
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_type
+msgid "GIB Invoice Type"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.actions.act_window,name:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_tax_office_list
+#: model:ir.ui.menu,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_menu_state_office_partner
+msgid "GIB Tax Offices"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_chart_template__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_edi_xml_ubl_tr__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_line__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_send__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_tax__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_product__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_template__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_config_settings__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_partner__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_617
+msgid "Ingot Deliveries Obtained from Scrap Metal"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__9
+msgid "Invalid Transportation Method"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_scenario
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_scenario
+msgid "Invoice Scenario"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.account_move_form_view_l10n_tr_nilvera_extended
+msgid "Invoice Type"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_is_export_invoice
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_is_export_invoice
+msgid "Is GIB Export"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_exemption_code_domain_list
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_exemption_code_domain_list
+msgid "L10N Tr Exemption Code Domain List"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_606
+msgid "Labor Supply Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__l10n_tr_nilvera_export_alias
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_config_settings__l10n_tr_nilvera_export_alias
+msgid "Nilvera Export Alias"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form
+msgid "Nilvera's documentation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_605
+msgid "Organization Service"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_350
+msgid "Other"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_616
+msgid "Other Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_626
+msgid "Other Submissions"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_250
+msgid "Partial Others"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_nilvera_customer_status
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_nilvera_customer_status
+msgid "Partner Nilvera Status"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__percentage
+msgid "Percentage"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__5
+msgid "Post"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_607
+msgid "Private Security Service"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_product_template
+msgid "Product"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_product_product
+msgid "Product Variant"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_scenario__kamu
+msgid "Public Sector"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__2
+msgid "Railway Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__name
+msgid "Reason"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__code
+msgid "Reason Code"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__ihrackayitli
+msgid "Registered for Export"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_603
+msgid ""
+"Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed "
+"Assets and Vehicles"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__3
+msgid "Road Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__satis
+msgid "Sales"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_620
+msgid "Scrap and Waste Delivery of Those Who Waive the Exception"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__1
+msgid "Sea Transportation"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_shipping_type
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_shipping_type
+msgid "Shipping Method"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_614
+msgid "Shuttle Transportation Service"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_602
+msgid "Survey, Plan-Project, Consultancy, Audit and Similar Services"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_tax
+msgid "Tax"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form
+msgid "Tax Code"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_list
+msgid "Tax Codes"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__istisna
+msgid "Tax Exempt"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_tax_office_view_form
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.view_company_form_inherit_l10n_tr_nilvera_extended
+msgid "Tax Office"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_tax_office_view_list
+msgid "Tax Offices"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_609
+msgid ""
+"Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary "
+"Services for These Works"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "The Tax Office is not set on the following TR Company(s)."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "The Tax Office is not set on the following TR Partner(s)."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_exemption_code_id
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_exemption_code_id
+msgid "The exception reason of the invoice."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid ""
+"The following products are missing a CTSP Number:\n"
+"%(products)s\n"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_tax__l10n_tr_tax_withholding_code_id
+msgid "The reason for withholding tax."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_scenario
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_scenario
+msgid "The scenario of the invoice to be sent to GİB."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_type
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_type
+msgid "The type of invoice to be sent to GİB."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_shipping_type
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_shipping_type
+msgid "The type of shipping."
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_611
+msgid ""
+"Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues"
+" of Sports Clubs"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_l10n_tr_nilvera_einvoice_extended_account_tax_code
+msgid "Turkish Tax Codes (GIB Codes)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_l10n_tr_nilvera_einvoice_extended_tax_office
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__l10n_tr_tax_office_id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_partner__l10n_tr_tax_office_id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_users__l10n_tr_tax_office_id
+msgid "Turkish Tax Office"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_edi_xml_ubl_tr
+msgid "UBL-TR 1.2"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "View Company(s)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "View Partner(s)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "View Product(s)"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__tevkifat
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__withholding
+msgid "Withholding"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_tax__l10n_tr_tax_withholding_code_id
+msgid "Withholding Reason"
+msgstr ""
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/i18n/tr.po b/addons/l10n_tr_nilvera_einvoice_extended/i18n/tr.po
new file mode 100644
index 0000000000000..a23ff67e25c7a
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/i18n/tr.po
@@ -0,0 +1,720 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_tr_nilvera_einvoice_extended
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~18.4+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-10 06:42+0000\n"
+"PO-Revision-Date: 2025-10-10 06:42+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid " TR Company(s)"
+msgstr "TR Şirket(ler)i"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_316
+msgid "11/1-a Contract Services for Customers in Free Zones"
+msgstr "11/1-a Serbest Bölgelerdeki Müşteriler İçin Yapılan Fason Hizmetler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_301
+msgid "11/1-a Export of Goods"
+msgstr "Kısmi İstisna Diğerleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_302
+msgid "11/1-a Service Export"
+msgstr "11/1-a Hizmet İhracatı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_308
+msgid "13/d Delivery of Incentive Investment Goods"
+msgstr "13/d Teşvikli Yatırım Mallarının Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_328
+msgid "13/i Residential or Workplace Deliveries"
+msgstr "13/i Konut veya İşyeri Teslimleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_212
+msgid "17/4-i Services Provided in Free Zones"
+msgstr "17/4-ı Serbest Bölgelerde Verilen Hizmetler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.res_config_settings_view_form_l10n_tr_nilvera_extended
+msgid ""
+"<span class=\"fw-bold\">Warning:</span> Changing the Export Alias will cause"
+" issues for export invoice scenario."
+msgstr ""
+"<span class=\"fw-bold\">Uyarı:</span> İhracat Takma Adını değiştirmek, ihracat"
+"faturası senaryosu için sorunlara neden olabilir"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.account_move_form_view_l10n_tr_nilvera_extended
+msgid ""
+"<span class=\"o_form_label mx-3\" "
+"invisible=\"l10n_tr_nilvera_customer_status != 'einvoice'\">is</span>"
+msgstr ""
+"<span class=\"o_form_label mx-3\" "
+"invisible=\"l10n_tr_nilvera_customer_status != 'einvoice'\">tipi</span>"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "Hesap Planı Şablonu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_move_send
+msgid "Account Move Send"
+msgstr "Hesap Hareketi Yollandı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__4
+msgid "Air Transportation"
+msgstr "Hava Taşımacılığı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_615
+msgid "All Kinds of Printing and Printing Services"
+msgstr "Her Türlü Baskı ve Basım Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_scenario__temelfatura
+msgid "Basic"
+msgstr "Temel Fatura"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_608
+msgid "Building Inspection Services"
+msgstr "Yapı Denetim Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_line__l10n_tr_ctsp_number
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_product__l10n_tr_ctsp_number
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_template__l10n_tr_ctsp_number
+msgid "CTSP Number"
+msgstr "GTİP Numarası"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_line.py:0
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/product_product.py:0
+msgid "CTSP Number must be 12 digits or fewer."
+msgstr "GTİP Numarası maksimum 12 hane olmalıdır."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "Check Products"
+msgstr "Ürünleri Kontrol Et"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "Check reference on Partner(s)"
+msgstr "Ortak(lar) üzerindeki referansı kontrol et"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_612
+msgid "Cleaning Service"
+msgstr "Temizlik Hizmeti"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type
+msgid "Code Type"
+msgstr "Kod Türü"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__6
+msgid "Combined Transportation"
+msgstr "Kombine Taşımacılık"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_625
+msgid "Commercial Advertising Services"
+msgstr "Ticari Reklam Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_res_company
+msgid "Companies"
+msgstr "Şirketler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_res_config_settings
+msgid "Config Settings"
+msgstr "Yapılandırma Ayarları"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_601
+msgid ""
+"Construction Works and Engineering-Architecture and Survey-Project Services "
+"Performed Along with These Works"
+msgstr ""
+"Yapım İşleri İle Bu İşlerle Birlikte İfa Edilen Mühendislik-Mimarlık ve "
+"Etüt-Proje Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_res_partner
+msgid "Contact"
+msgstr "Kontak"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_622
+msgid "Cotton, Mohair, Wool and Fleece, Raw Hide and Skin Deliveries"
+msgstr "Pamuk, Tiftik, Yün ve Yapağı İle Ham Post ve Deri Teslimleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.actions.act_window,help:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_account_tax_code_list
+msgid "Create a GIB Reason"
+msgstr "Bir GİB Nedeni Oluşturun"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.actions.act_window,help:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_tax_office_list
+msgid "Create a Tax Office"
+msgstr "Bir Vergi Dairesi Oluştur"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__create_uid
+msgid "Created by"
+msgstr "Tarafından oluşturuldu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__create_date
+msgid "Created on"
+msgstr "Oluşturulma tarihi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_610
+msgid "Customer Finding / Taking Services to Tourist Shops"
+msgstr "Turistik Mağazalara Verilen Müşteri Bulma / Götürme Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DAF
+msgid "DELIVERED AT FRONTIER"
+msgstr "Sınırda Teslim"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DDU
+msgid "DELIVERED DUTY UNPAID"
+msgstr "Gümrük Resmi Ödenmemiş Olarak Teslim"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DEQ
+msgid "DELIVERED EX QUAY (DUTY PAID)"
+msgstr "Rıhtımda Teslim (Gümrük Vergi ve Harçları Ödenmiş Olarak)"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:account.incoterms,name:l10n_tr_nilvera_einvoice_extended.incoterm_DES
+msgid "DELIVERED EX SHIP"
+msgstr "Gemide Teslim"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_228
+msgid ""
+"Deliveries Made Free of Charge to the Institutions and Organizations Listed "
+"in Article (17/1) of Law 17/2-b"
+msgstr ""
+"17/2-b Kanunun (17/1) Maddesinde Sayılan Kurum ve Kuruluşlara Bedelsiz "
+"Olarak Yapılan Teslimler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_619
+msgid "Delivery of Copper, Zinc and Aluminum Products"
+msgstr "Bakır, Çinko ve Alüminyum Ürünlerinin Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_618
+msgid ""
+"Delivery of Copper, Zinc, Iron-Steel, Aluminum and Lead Ingots Other Than "
+"Those Obtained from Scrap Metal"
+msgstr ""
+"Hurda Metalden Elde Edilenler Dışındaki Bakır, Çinko, Demir-Çelik, Alüminyum"
+" ve Kurşun Külçe Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_627
+msgid "Delivery of Iron and Steel Products"
+msgstr "Demir-Çelik Ürünlerinin Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_621
+msgid ""
+"Delivery of Raw Materials Obtained from Metal, Plastic, Rubber, Paper and "
+"Glass Scrap and Waste"
+msgstr ""
+"Metal, Plastik, Lastik, Kauçuk, Kağıt ve Cam Hurda ve Atıklardan Elde Edilen"
+" Hammadde Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_623
+msgid "Delivery of Wood and Forest Products"
+msgstr "Ağaç ve Orman Ürünleri Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_chart_template__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_edi_xml_ubl_tr__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_line__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_send__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_tax__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_product__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_template__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_config_settings__display_name
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_partner__display_name
+msgid "Display Name"
+msgstr "İsim Göster"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__8
+msgid "Domestic Water Transportation"
+msgstr "Yurtiçi Su Taşımacılığı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_613
+msgid "Environmental and Garden Maintenance Services"
+msgstr "Çevre ve Bahçe Bakım Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__exception
+msgid "Exception"
+msgstr "İstisna"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_exemption_code_id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_exemption_code_id
+msgid "Exemption Reason"
+msgstr "İstisna Sebebi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.res_config_settings_view_form_l10n_tr_nilvera_extended
+msgid "Export Alias"
+msgstr "İhracat Takma Adı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__export_exception
+msgid "Export Exception"
+msgstr "İhracat İstisna"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_701
+msgid ""
+"Export Registered Sales within the scope of Article 11/1-c of the VAT Law "
+"No. 3065"
+msgstr "3065 s. KDV Kanununun 11/1-c md. Kapsamındaki İhraç Kayıtlı Satış"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__export_registration
+msgid "Export Registration"
+msgstr "İhracat Kayıt"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_338
+msgid "Exports of Goods by Manufacturers"
+msgstr "İmalatçıların Mal İhracatları"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__7
+msgid "Fixed Transportation"
+msgstr "Sabit Taşımacılık"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_604
+msgid "Food Service"
+msgstr "Yemek Servis Hizmeti"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form
+msgid "For a full list of codes and descriptions, check"
+msgstr "Kodların ve açıklamaların tam listesi için göz atın:"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_624
+msgid "Freight Transport Service"
+msgstr "Yük Taşımacılığı Hizmeti"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.actions.act_window,name:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_account_tax_code_list
+#: model:ir.ui.menu,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_menu_account_tax_code
+msgid "GIB Codes"
+msgstr "Vergi Kodları"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_type
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_type
+msgid "GIB Invoice Type"
+msgstr "GİB Fatura Türü"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.actions.act_window,name:l10n_tr_nilvera_einvoice_extended.action_l10n_tr_nilvera_einvoice_extended_tax_office_list
+#: model:ir.ui.menu,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_menu_state_office_partner
+msgid "GIB Tax Offices"
+msgstr "Vergi Daireleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_chart_template__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_edi_xml_ubl_tr__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_line__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move_send__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_tax__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_product__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_product_template__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_config_settings__id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_partner__id
+msgid "ID"
+msgstr "İD"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_617
+msgid "Ingot Deliveries Obtained from Scrap Metal"
+msgstr "Hurda Metalden Elde Edilen Külçe Teslimleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__9
+msgid "Invalid Transportation Method"
+msgstr "Geçersiz Taşıma Yöntemi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_scenario
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_scenario
+msgid "Invoice Scenario"
+msgstr "GİB Fatura Senaryosu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.account_move_form_view_l10n_tr_nilvera_extended
+msgid "Invoice Type"
+msgstr "GİB Fatura Türü"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_is_export_invoice
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_is_export_invoice
+msgid "Is GIB Export"
+msgstr "GİB İhracat Faturası"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_move
+msgid "Journal Entry"
+msgstr "Yevmiye Kaydı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_move_line
+msgid "Journal Item"
+msgstr "Yevmiye Kalemi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_exemption_code_domain_list
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_exemption_code_domain_list
+msgid "L10N Tr Exemption Code Domain List"
+msgstr "L10N Tr İstisna Kodu Alan Listesi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_606
+msgid "Labor Supply Services"
+msgstr "İşgücü Temin Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__write_uid
+msgid "Last Updated by"
+msgstr "Son Güncelleme"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__write_date
+msgid "Last Updated on"
+msgstr "Son Güncelleme tarihi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__l10n_tr_nilvera_export_alias
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_config_settings__l10n_tr_nilvera_export_alias
+msgid "Nilvera Export Alias"
+msgstr "Nilvera İhracat Takma Adı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form
+msgid "Nilvera's documentation"
+msgstr "Nilvera dökümantasyonu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_605
+msgid "Organization Service"
+msgstr "Organizasyon Hizmeti"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_350
+msgid "Other"
+msgstr "İstisna Diğer"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_616
+msgid "Other Services"
+msgstr "Diğer Hizmetler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_626
+msgid "Other Submissions"
+msgstr "Diğer Teslimler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_250
+msgid "Partial Others"
+msgstr "Kısmi İstisna Diğerleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_nilvera_customer_status
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_nilvera_customer_status
+msgid "Partner Nilvera Status"
+msgstr "Nilvera Durumu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__percentage
+msgid "Percentage"
+msgstr "Yüzde"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__5
+msgid "Post"
+msgstr "Postalamak"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_607
+msgid "Private Security Service"
+msgstr "Özel Güvenlik Hizmeti"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_product_template
+msgid "Product"
+msgstr "Ürün"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_product_product
+msgid "Product Variant"
+msgstr "Ürün Varyantı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_scenario__kamu
+msgid "Public Sector"
+msgstr "Kamu Sektörü"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__2
+msgid "Railway Transportation"
+msgstr "Demiryolu Taşımacılığı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__name
+msgid "Reason"
+msgstr "Sebep"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_l10n_tr_nilvera_einvoice_extended_account_tax_code__code
+msgid "Reason Code"
+msgstr "Sebep Kodu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__ihrackayitli
+msgid "Registered for Export"
+msgstr "İhracata Kayıtlı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_603
+msgid ""
+"Renovation, Maintenance and Repair Services for Machinery, Equipment, Fixed "
+"Assets and Vehicles"
+msgstr ""
+"Makine, Teçhizat, Demirbaş ve Taşıtlara Ait Tadil, Bakım, Onarım Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__3
+msgid "Road Transportation"
+msgstr "Karayolu Taşımacılığı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__satis
+msgid "Sales"
+msgstr "Satış"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_620
+msgid "Scrap and Waste Delivery of Those Who Waive the Exception"
+msgstr "İstisnadan Vazgeçenlerin Hurda ve Atık Teslimi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_shipping_type__1
+msgid "Sea Transportation"
+msgstr "Deniz Taşımacılığı"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_shipping_type
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_shipping_type
+msgid "Shipping Method"
+msgstr "Nakliye Yöntemi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_614
+msgid "Shuttle Transportation Service"
+msgstr "Servis Taşımacılığı Hizmeti"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_602
+msgid "Survey, Plan-Project, Consultancy, Audit and Similar Services"
+msgstr "Etüt, Plan-Proje, Danışmanlık, Denetim ve Benzeri Hizmetler"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_tax
+msgid "Tax"
+msgstr "Vergi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form
+msgid "Tax Code"
+msgstr "Vergi Kodu"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_view_list
+msgid "Tax Codes"
+msgstr "Vergi Kodları"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__istisna
+msgid "Tax Exempt"
+msgstr "KDV Istisna"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_tax_office_view_form
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.view_company_form_inherit_l10n_tr_nilvera_extended
+msgid "Tax Office"
+msgstr "Vergi Dairesi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model_terms:ir.ui.view,arch_db:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_tax_office_view_list
+msgid "Tax Offices"
+msgstr "Vergi Daireleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_609
+msgid ""
+"Textile and Garment Works, Bag and Shoe Sewing Works and Intermediary "
+"Services for These Works"
+msgstr ""
+"Fason Olarak Yaptırılan Tekstil ve Konfeksiyon İşleri, Çanta ve Ayakkabı "
+"Dikim İşleri ve Bu İşlere Aracılık Hizmetleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "The Tax Office is not set on the following TR Company(s)."
+msgstr "Aşağıdaki TR Şirket(ler) Vergi Dairesi Alanı eksik."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "The Tax Office is not set on the following TR Partner(s)."
+msgstr "Aşağıdaki TR Ortak(lar) Vergi Dairesi Alanı eksik."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_exemption_code_id
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_exemption_code_id
+msgid "The exception reason of the invoice."
+msgstr "Faturanın istisna sebebi."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid ""
+"The following products are missing a CTSP Number:\n"
+"%(products)s\n"
+msgstr ""
+"Aşağıdaki ürünlerde GTİP Numarası eksik:\n"
+"%(products)s\n"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_tax__l10n_tr_tax_withholding_code_id
+msgid "The reason for withholding tax."
+msgstr "Tevkifat vergisinin sebebi."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_scenario
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_scenario
+msgid "The scenario of the invoice to be sent to GİB."
+msgstr "GİB'e gönderilecek faturanın senaryosu."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_gib_invoice_type
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_gib_invoice_type
+msgid "The type of invoice to be sent to GİB."
+msgstr "GİB'e gönderilecek faturanın türü."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_bank_statement_line__l10n_tr_shipping_type
+#: model:ir.model.fields,help:l10n_tr_nilvera_einvoice_extended.field_account_move__l10n_tr_shipping_type
+msgid "The type of shipping."
+msgstr "Gönderim türü."
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:l10n_tr_nilvera_einvoice_extended.account.tax.code,name:l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_611
+msgid ""
+"Transactions Subject to Broadcasting, Advertising and Naming Rights Revenues"
+" of Sports Clubs"
+msgstr ""
+"Spor Kulüplerinin Yayın, Reklam ve İsim Hakkı Gelirlerine Konu İşlemleri"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_l10n_tr_nilvera_einvoice_extended_account_tax_code
+msgid "Turkish Tax Codes (GIB Codes)"
+msgstr "Vergi Kesintisi Kanunu (Vergi Kodları)"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_l10n_tr_nilvera_einvoice_extended_tax_office
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_company__l10n_tr_tax_office_id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_partner__l10n_tr_tax_office_id
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_res_users__l10n_tr_tax_office_id
+msgid "Turkish Tax Office"
+msgstr "Vergi Dairesi"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model,name:l10n_tr_nilvera_einvoice_extended.model_account_edi_xml_ubl_tr
+msgid "UBL-TR 1.2"
+msgstr ""
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "View Company(s)"
+msgstr "Şirket(ler)i Görüntüle"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "View Partner(s)"
+msgstr "Ortak(lar)ı Görüntüle"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#. odoo-python
+#: code:addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py:0
+msgid "View Product(s)"
+msgstr "Ürünü(leri) Görüntüle"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__account_move__l10n_tr_gib_invoice_type__tevkifat
+#: model:ir.model.fields.selection,name:l10n_tr_nilvera_einvoice_extended.selection__l10n_tr_nilvera_einvoice_extended_account_tax_code__code_type__withholding
+msgid "Withholding"
+msgstr "Tevkifat"
+
+#. module: l10n_tr_nilvera_einvoice_extended
+#: model:ir.model.fields,field_description:l10n_tr_nilvera_einvoice_extended.field_account_tax__l10n_tr_tax_withholding_code_id
+msgid "Withholding Reason"
+msgstr "Tevkifat Sebebi"
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/__init__.py b/addons/l10n_tr_nilvera_einvoice_extended/models/__init__.py
new file mode 100644
index 0000000000000..58fe257acadeb
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/__init__.py
@@ -0,0 +1,13 @@
+from . import account_edi_xml_ubl_tr
+from . import account_move
+from . import account_move_line
+from . import account_move_send
+from . import account_tax
+from . import l10n_tr_nilvera_einvoice_extended_account_tax_code
+from . import l10n_tr_nilvera_einvoice_extended_tax_office
+from . import product_product
+from . import product_template
+from . import res_company
+from . import res_config_settings
+from . import res_partner
+from . import template_tr
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
new file mode 100644
index 0000000000000..5f61de7961ea2
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
@@ -0,0 +1,495 @@
+from collections import defaultdict
+from lxml import etree
+
+from odoo import api, models
+from odoo.tools import float_compare, frozendict
+from odoo.addons.l10n_tr_nilvera_einvoice_extended.tools.clean_node_dict import clean_node_dict
+from odoo.addons.l10n_tr_nilvera_einvoice_extended.tools.ubl_tr_invoice import TrInvoice
+
+
+class AccountEdiXmlUblTr(models.AbstractModel):
+    _inherit = "account.edi.xml.ubl.tr"
+
+    # -------------------------------------------------------------------------
+    # EXPORT
+    # -------------------------------------------------------------------------
+    def _get_invoice_node(self, vals):
+        """Generate and clean the invoice XML node dictionary.
+
+        Extends the base invoice node by adding buyer/customer party nodes
+        and removing child nodes not defined in the template while keeping UBL attributes.
+
+        :param vals: dict with invoice data.
+        :return: cleaned invoice node dict for XML rendering.
+        """
+        document_node = super()._get_invoice_node(vals)
+        self._add_invoice_buyer_customer_party_nodes(document_node, vals)
+        return clean_node_dict(document_node, self._get_document_template({'document_node': document_node, 'document_type': 'invoice'}))
+
+    def _add_invoice_header_nodes(self, document_node, vals):
+        """Extend the invoice header node generation with Turkish-specific fields.
+
+        The Extended flow is only applied for outgoing invoices (out_invoice). This method customizes
+        the standard invoice XML header for Turkish e-Invoicing (UBL) by adding localized fields and
+        structure required by GIB.
+
+        :param document_node: dict
+        :param vals: dict
+        :return: None
+        """
+        super()._add_invoice_header_nodes(document_node, vals)
+        # The Nilvera Extended flow is only for out_invoice type
+        if vals['document_type'] != 'invoice':
+            return
+        invoice = vals['invoice']
+        document_node.update({
+            'cbc:ProfileID': {'_text': self._get_tr_profile_id(invoice)},
+            'cbc:InvoiceTypeCode': {'_text': 'ISTISNA' if invoice.l10n_tr_is_export_invoice else invoice.l10n_tr_gib_invoice_type},
+        })
+
+    @api.model
+    def _add_invoice_buyer_customer_party_nodes(self, document_node, vals):
+        """Adds BuyerCustomerParty node for TR E-Invoicing.
+
+        For export invoices, a buyer party node is created based on the customer,
+        and the PartyIdentification values are updated to indicate an export customer.
+
+        :param document_node: dict representing the invoice XML structure to modify.
+        :param vals: dict containing invoice-related values, including 'invoice'.
+        """
+        if vals['invoice'].l10n_tr_is_export_invoice:
+            buyer_party_node = self._get_party_node({**vals, 'partner': vals['customer'], 'role': 'buyer'})
+            buyer_party_node['cac:PartyIdentification'] = [{'cbc:ID': {
+                '_text': 'EXPORT',
+                'schemeID': 'PARTYTYPE',
+                },
+            }]
+            document_node['cac:BuyerCustomerParty'] = {'cac:Party': buyer_party_node}
+
+    def _add_invoice_accounting_customer_party_nodes(self, document_node, vals):
+        """Extend invoice accounting customer party nodes for TR E-Invoicing.
+
+        For export invoice, the AccountingCustomerParty is set to the static
+        Turkish Ministry of Customs and Trade node.
+
+        :param document_node: dict representing the invoice XML structure to modify.
+        :param vals: dict containing invoice-related values, including 'invoice'.
+        """
+        super()._add_invoice_accounting_customer_party_nodes(document_node, vals)
+        if vals['invoice'].l10n_tr_is_export_invoice:
+            document_node['cac:AccountingCustomerParty'] = {'cac:Party': self._get_ministry_party_node()}
+
+    @api.model
+    def _get_ministry_party_node(self):
+        """Return the fixed ministry (party) information required for TR E-invoicing.
+
+        This method provides identification, address, tax, and naming
+        details of the Turkish Ministry of Customs and Trade.
+
+        :return: dict containing ministry party node.
+        """
+        return {
+            'cac:PartyIdentification': {
+                'cbc:ID': {
+                    '_text': '1460415308',
+                    'schemeID': 'VKN',
+                },
+            },
+            'cac:PartyName': {
+                'cbc:Name': {'_text': 'Gümrük ve Ticaret Bakanlığı Gümrükler Genel Müdürlüğü- Bilgi İşlem Dairesi Başkanlığı'},
+            },
+            'cac:PostalAddress': {
+                'cbc:CitySubdivisionName': {'_text': 'Ulus'},
+                'cbc:CityName': {'_text': 'Ankara'},
+                'cac:Country': {'cbc:Name': {'_text': 'Türkiye'}},
+            },
+            'cac:PartyTaxScheme': {
+                'cac:TaxScheme': {'cbc:Name': {'_text': 'Ulus'}},
+            },
+        }
+
+    @api.model
+    def _get_tr_profile_id(self, invoice):
+        """Determine the TR profile ID for the given invoice.
+
+        - If the customer is an e-invoice user and the invoice has a
+          l10n_tr_gib_invoice_scenario, return that scenario.
+        - If the invoice is marked as an export invoice, return "IHRACAT".
+        - Otherwise:
+            • Return "TEMELFATURA" if the customer is an e-invoice user.
+            • Return "EARSIVFATURA" for e-archive invoices.
+
+        :param invoice: account.move record (the invoice).
+        :return: str, TR profile ID to be used in E-invoicing.
+        """
+        if (is_einvoice := invoice.l10n_tr_nilvera_customer_status == 'einvoice') and invoice.l10n_tr_gib_invoice_scenario:
+            return invoice.l10n_tr_gib_invoice_scenario
+        if invoice.l10n_tr_is_export_invoice:
+            return 'IHRACAT'
+        return 'TEMELFATURA' if is_einvoice else 'EARSIVFATURA'
+
+    def _get_document_template(self, vals):
+        """Determines the document template to use based on the provided values.
+
+        If the document is a Turkish invoice (CustomizationID 'TR1.2' and document_type 'invoice'),
+        it returns the `TrInvoice` template. Otherwise, it falls back to the default implementation.
+
+        :param vals: Dictionary containing document data, including 'document_node' and 'document_type'.
+        :return: Document template class to be used for generating the document.
+        """
+        if vals['document_node']['cbc:CustomizationID']['_text'] == 'TR1.2' and vals['document_type'] == 'invoice':
+            return TrInvoice
+        return super()._get_document_template(vals)
+
+    def _get_party_node(self, vals):
+        """Extend the party node getter with the Turkish tax office name.
+
+        Adds the tax office name if the partner has a Turkish
+        tax office set to the partner's PartyTaxScheme.
+
+        :param vals: dict containing invoice-related values.
+        :return: dict representing the updated party node.
+        """
+        partner = vals['partner']
+        party_node = super()._get_party_node(vals)
+        if tax_office := partner.l10n_tr_tax_office_id:
+            party_node['cac:PartyTaxScheme']['cac:TaxScheme']['cbc:Name']['_text'] = tax_office.name
+        return party_node
+
+    def _get_invoice_line_node(self, vals):
+        """Generate the invoice line XML node dictionary.
+
+        Extends the base line node by adding delivery-specific nodes.
+        Uses context to skip TR reason code processing.
+
+        :param vals: dict with invoice line data.
+        :return: invoice line node dict ready for XML rendering.
+        """
+        line_node = super(AccountEdiXmlUblTr, self.with_context(skip_tr_reason_code=True))._get_invoice_line_node(vals)
+        self._add_invoice_line_delivery_nodes(line_node, vals)
+        return line_node
+
+    def _add_invoice_line_delivery_nodes(self, line_node, vals):
+        """Add delivery information to an invoice line node for export invoices.
+
+        For export invoice, it builds the cac:Delivery section of the
+        UBL TR XML for invoice lines. The delivery node includes
+        address, incoterms, shipment, and customs-related details.
+
+        :param line_node: dict representing the invoice line XML structure to update.
+        :param vals: dict containing invoice line data.
+        """
+        move_line = vals['base_line']['record']
+        if move_line.move_id.l10n_tr_is_export_invoice:
+            line_node['cac:Delivery'] = {
+                'cac:DeliveryAddress': {
+                    'cbc:StreetName': {'_text': move_line.move_id.partner_id.street},
+                    'cbc:CitySubdivisionName': {'_text': move_line.move_id.partner_id.city},
+                    'cbc:CityName': {'_text': move_line.move_id.partner_id.state_id.with_context(lang='tr_TR').name},
+                    'cbc:PostalZone': {'_text': move_line.move_id.partner_id.zip},
+                    'cac:Country': {'cbc:Name': {'_text': move_line.move_id.partner_id.country_id.with_context(lang='tr_TR').name}},
+                },
+                'cac:DeliveryTerms': {
+                    'cbc:ID': {'_text': move_line.move_id.invoice_incoterm_id.code, 'schemeID': 'INCOTERMS'},
+                },
+                'cac:Shipment': {
+                    'cbc:ID': {'_text': 'NO_ID'},
+                    'cac:GoodsItem': {'cbc:RequiredCustomsID': {'_text': move_line.l10n_tr_ctsp_number or move_line.product_id.l10n_tr_ctsp_number}},
+                    'cac:ShipmentStage': {'cbc:TransportModeCode': {'_text': move_line.move_id.l10n_tr_shipping_type}},
+                },
+            }
+
+    def _add_document_line_tax_total_nodes(self, line_node, vals):
+        """Adds tax total nodes to a document line.
+
+        For Turkish withholding invoices TEVKIFAT, this method
+        delegates to add_withholding_document_line_tax_total_nodes.
+        Otherwise, it falls back to the default behavior.
+
+        :param line_node: XML node representing the invoice line.
+        :param vals: Dictionary containing the invoice data.
+        :return: Updated XML line node with tax total information.
+        """
+        if vals['invoice'].l10n_tr_gib_invoice_type == 'TEVKIFAT':
+            return self._add_withholding_document_line_tax_total_nodes(line_node, vals)
+        return super()._add_document_line_tax_total_nodes(line_node, vals)
+
+    def _add_invoice_tax_total_nodes(self, document_node, vals):
+        """Adds tax total nodes to the invoice document.
+
+        For Turkish withholding invoices ('TEVKIFAT'), this method
+        delegates to `_add_withholding_document_tax_total_nodes`.
+        Otherwise, it uses the default tax total behavior.
+
+        :param document_node: XML node representing the full invoice document.
+        :param vals: Dictionary containing the invoice data.
+        :return: lxml.etree.Element or similar XML node representing the updated invoice document.
+
+        """
+        if vals['invoice'].l10n_tr_gib_invoice_type == 'TEVKIFAT':
+            return self._add_withholding_document_tax_total_nodes(document_node, vals)
+        return super()._add_document_tax_total_nodes(document_node, vals)
+
+    def _add_withholding_document_tax_total_nodes(self, line_node, vals):
+        """Extends the aggregation of tax details to include Turkish (TR) withholding-specific amounts
+        for an invoice line.
+
+        This method performs the following:
+            - Aggregates tax details across all base lines.
+            - Adds two fields per grouping key:
+                - tr_total_taxed_amount: Total tax amount used in the withholding tax line.
+                - tr_total_taxed_residual_amount: Total tax amount after withholding, shown in the tax line.
+            - Splits aggregated tax details into normal taxes and withholding taxes.
+            - Updates `line_node` with:
+                - 'cac:TaxTotal' for normal taxes
+                - 'cac:WithholdingTaxTotal' for withholding taxes (if the document is an invoice)
+
+        If there is a 20% tax and 18% is withheld on ₺10:
+            - tr_total_taxed_amount = ₺2
+            - tr_total_taxed_residual_amount = ₺0.2
+
+        :param line_node: XML node representing the invoice line to be updated.
+        :param vals: Dictionary containing invoice data and base lines.
+        """
+        base_lines_aggregated_tax_details = self.env['account.tax']._aggregate_base_lines_tax_details(vals['base_lines'], self.tax_grouping_function)
+        aggregated_tax_details = self.env['account.tax']._aggregate_base_lines_aggregated_values(base_lines_aggregated_tax_details)
+
+        for base_line, aggregated_values in base_lines_aggregated_tax_details:
+            for grouping_key in aggregated_values:
+                taxes_data = base_line.get('tax_details', {}).get('taxes_data', [])
+                rounding = base_line.get('record').currency_id.rounding
+
+                # Sum of positive tax amounts (with rounding check)
+                total_taxed_amount = sum(
+                    tax_line['tax_amount']
+                    for tax_line in taxes_data
+                    if float_compare(tax_line['tax_amount'], 0, precision_rounding=rounding) > 0
+                )
+
+                # Sum of all tax amounts
+                total_residual_amount = sum(tax_line['tax_amount'] for tax_line in taxes_data)
+
+                # Update values_per_grouping_key
+                group_vals = aggregated_tax_details[grouping_key]
+                group_vals['tr_total_taxed_amount'] = group_vals.get('tr_total_taxed_amount', 0.0) + total_taxed_amount
+                group_vals['tr_total_taxed_residual_amount'] = group_vals.get('tr_total_taxed_residual_amount', 0.0) + total_residual_amount
+
+        aggregated_tax_details_by_l10n_tr_tax_withholding_code_id = {'tax': defaultdict(dict), 'withholding_tax': defaultdict(dict)}
+
+        for grouping_key, values in aggregated_tax_details.items():
+            if grouping_key:
+                key = 'withholding_tax' if (l10n_tr_tax_withheld := grouping_key['l10n_tr_tax_withheld']) else 'tax'
+                aggregated_tax_details_by_l10n_tr_tax_withholding_code_id[key][l10n_tr_tax_withheld][grouping_key] = values
+
+        line_node['cac:TaxTotal'] = [
+            self._get_withholding_tax_total_node({**vals, 'aggregated_tax_details': tax_details, 'role': 'line'})
+            for tax_details in aggregated_tax_details_by_l10n_tr_tax_withholding_code_id['tax'].values()
+        ]
+        if vals['document_type'] == 'invoice':
+            line_node['cac:WithholdingTaxTotal'] = [
+                self._get_withholding_tax_total_node({**vals, 'aggregated_tax_details': tax_details, 'role': 'line', 'withholding': True, 'sign': -1})
+                for tax_details in aggregated_tax_details_by_l10n_tr_tax_withholding_code_id['withholding_tax'].values()
+            ]
+
+    @api.model
+    def tax_grouping_function(self, base_line, tax_data):
+        """Build a grouping key for tax aggregation, extended for Turkish (TR) withholding taxes.
+
+        This method extends the default tax grouping logic to include TR-specific
+        withholding details. It constructs a grouping key for each tax line and
+        appends withholding-related fields when applicable.
+
+        Specifically, for invoices of type TEVKIFAT with a withholding tax code,
+        the following fields are added to the grouping key:
+            - l10n_tr_tax_withheld: The ID of the withholding tax code.
+            - percent_withheld: The percentage of tax to be withheld (as an integer).
+            - name: The localized name of the withholding tax (in Turkish).
+            - tax_type_code: The code of the withholding tax.
+
+        :param dict base_line: The base invoice line containing the record and tax details.
+        :param dict tax_data: The dictionary containing the tax and its computed values.
+        :return: The grouping key dictionary for this tax line, including TR withholding details if applicable.
+        """
+        invoice = base_line["record"].move_id
+        supplier = invoice.company_id.partner_id.commercial_partner_id
+        customer = invoice.partner_id
+        tax = tax_data["tax"]
+
+        grouping_key = {
+            "tax_category_code": self._get_tax_category_code(customer.commercial_partner_id, supplier, tax),
+            **self._get_tax_exemption_reason(customer.commercial_partner_id, supplier, tax),
+            "amount": tax.amount if tax else 0.0,
+            "amount_type": tax.amount_type if tax else "percent",
+            "l10n_tr_tax_withheld": tax.l10n_tr_tax_withholding_code_id.id,
+        }
+
+        if invoice.l10n_tr_gib_invoice_type == "TEVKIFAT" and tax.l10n_tr_tax_withholding_code_id:
+            withholding_code = tax.l10n_tr_tax_withholding_code_id
+            grouping_key.update(
+                {
+                    "percent_withheld": int(withholding_code.percentage * 100),
+                    "name": withholding_code.with_context(lang="tr_TR").name,
+                    "tax_type_code": withholding_code.code,
+                },
+            )
+
+        return grouping_key
+
+    def _add_withholding_document_line_tax_total_nodes(self, line_node, vals):
+        """Extend aggregation of line tax details to include Turkish (TR) withholding-specific amounts.
+
+        For each tax grouping key, this method adds two fields:
+            - tr_total_taxed_amount: The total tax amount applied to the line before withholding.
+            - tr_total_taxed_residual_amount: The remaining tax amount after withholding.
+
+        If there is a 20% tax and 18% is withheld on ₺10:
+            - tr_total_taxed_amount = ₺2
+            - tr_total_taxed_residual_amount = ₺0.2
+
+        :param line_node: The invoice line node containing tax details.
+        :param vals: Tax values used to compute withholding amounts.
+        """
+        encountered_groups = set()
+        base_line = vals['base_line']
+        tax_details = base_line['tax_details']
+        taxes_data = tax_details['taxes_data']
+        aggregated_tax_details = self.env['account.tax']._aggregate_base_line_tax_details(base_line, self.tax_grouping_function)
+
+        for tax_data in taxes_data:
+            grouping_key = self.tax_grouping_function(base_line, tax_data)
+            if isinstance(grouping_key, dict):
+                grouping_key = frozendict(grouping_key)
+            already_accounted = grouping_key in encountered_groups
+            encountered_groups.add(grouping_key)
+            if not already_accounted:
+                taxes_data = base_line.get('tax_details', {}).get('taxes_data', [])
+                rounding = base_line.get('record').currency_id.rounding
+
+                total_taxed_amount = sum(tax_line['tax_amount'] for tax_line in taxes_data if float_compare(tax_line['tax_amount'], 0, precision_rounding=rounding) > 0)
+                total_residual_amount = sum(tax_line['tax_amount'] for tax_line in taxes_data)
+
+                group_vals = aggregated_tax_details[grouping_key]
+                group_vals['tr_total_taxed_amount'] = group_vals.get('tr_total_taxed_amount', 0.0) + total_taxed_amount
+                group_vals['tr_total_taxed_residual_amount'] = group_vals.get('tr_total_taxed_residual_amount', 0.0) + total_residual_amount
+
+        aggregated_tax_details_by_l10n_tr_tax_withholding_code_id = {'tax': defaultdict(dict), 'withholding_tax': defaultdict(dict)}
+
+        for grouping_key, values in aggregated_tax_details.items():
+            if grouping_key:
+                key = 'withholding_tax' if (l10n_tr_tax_withheld := grouping_key['l10n_tr_tax_withheld']) else 'tax'
+                aggregated_tax_details_by_l10n_tr_tax_withholding_code_id[key][l10n_tr_tax_withheld][grouping_key] = values
+
+        line_node['cac:TaxTotal'] = [
+            self._get_withholding_tax_total_node({**vals, 'aggregated_tax_details': tax_details, 'role': 'line'})
+            for tax_details in aggregated_tax_details_by_l10n_tr_tax_withholding_code_id['tax'].values()
+        ]
+        if vals['document_type'] == 'invoice':
+            line_node['cac:WithholdingTaxTotal'] = [
+                self._get_withholding_tax_total_node({**vals, 'aggregated_tax_details': tax_details, 'role': 'line', 'withholding': True, 'sign': -1})
+                for tax_details in aggregated_tax_details_by_l10n_tr_tax_withholding_code_id['withholding_tax'].values()
+            ]
+
+    @api.model
+    def _get_withholding_tax_total_node(self, vals):
+        """Build the TaxTotal node for withholding taxes in TR E-Invoicing.
+
+        This method calculates total and subtotal withholding tax amounts.
+
+        :param vals: dict containing tax details, currency info, and related data.
+        :return: dict representing the withholding tax total node.
+        """
+        aggregated_tax_details = vals['aggregated_tax_details']
+        currency_suffix = vals['currency_suffix']
+        currency_name = vals['currency_name']
+        precision = vals['currency_dp']
+        sign = vals.get('sign', 1)
+        is_withholding = vals.get('withholding')
+
+        def get_tax_amount_total():
+            """Compute total tax amount depending on whether it is withholding."""
+            if is_withholding:
+                return sum(
+                    details[f'tax_amount{currency_suffix}']
+                    for grouping_key, details in aggregated_tax_details.items()
+                    if grouping_key
+                )
+            return sum(
+                values['tr_total_taxed_residual_amount']
+                for grouping_key, values in aggregated_tax_details.items()
+                if grouping_key
+            )
+
+        def get_total_tax_subtotal_amount(details):
+            """Compute the total taxable amount depending on whether it is withholding."""
+            return details['tr_total_taxed_amount'] if is_withholding else details.get(f'base_amount{currency_suffix}', 0)
+
+        return {
+            'cbc:TaxAmount': {
+                '_text': self.format_float(sign * get_tax_amount_total(), precision),
+                'currencyID': currency_name,
+            },
+            'cac:TaxSubtotal': [
+                {
+                    'cbc:TaxableAmount': {
+                        '_text': self.format_float(get_total_tax_subtotal_amount(details), precision),
+                        'currencyID': currency_name,
+                    },
+                    'cbc:TaxAmount': {
+                        '_text': self.format_float(sign * details[f'tax_amount{currency_suffix}'], precision),
+                        'currencyID': currency_name,
+                    },
+                    'cbc:Percent': {
+                        # The percentatge can't be a float as it is expected to return as an integer
+                        '_text': grouping_key['percent_withheld'] if is_withholding else False,
+                    },
+                    'cac:TaxCategory': self._get_tax_category_node({**vals, 'grouping_key': grouping_key}),
+                }
+                for grouping_key, details in aggregated_tax_details.items()
+                if grouping_key
+            ],
+        }
+
+    def _get_tax_category_node(self, vals):
+        """Returns the tax category node for a line or invoice, including TR-specific fields.
+
+        - For lines with Turkish withholding (`l10n_tr_tax_withheld`), returns a minimal
+        TaxScheme node with the tax name and type code.
+        - For other lines, it extends the default tax category node to include:
+            - `cbc:TaxExemptionReasonCode`: The TR tax exemption code.
+            - `cbc:TaxExemptionReason`: The localized TR tax exemption name.
+        These fields are only added if a TR exemption is set and the context does not skip it.
+
+        :param vals: Dictionary containing: grouping_key & invoice record.
+        :return: dict representing the XML structure of the tax category node.
+        """
+        grouping_key = vals['grouping_key']
+        if grouping_key.get('l10n_tr_tax_withheld'):
+            return {
+                'cac:TaxScheme': {
+                    'cbc:Name': {'_text': grouping_key['name']},
+                    'cbc:TaxTypeCode': {'_text': grouping_key['tax_type_code']},
+                },
+            }
+        tax_totals_vals = super()._get_tax_category_node(vals)
+        tax_invoice_exemption = vals['invoice'].l10n_tr_exemption_code_id
+        if self.env.context.get('skip_tr_reason_code') or not tax_invoice_exemption:
+            return tax_totals_vals
+
+        tax_totals_vals.update({
+            'cbc:TaxExemptionReasonCode': {'_text': tax_invoice_exemption.code},
+            'cbc:TaxExemptionReason': {'_text': tax_invoice_exemption.with_context(lang='tr_TR').name},
+        })
+        return tax_totals_vals
+
+    def _export_invoice(self, invoice):
+        # EXTENDS account.edi.xml.ubl_21
+        # _export_invoice normally cleans up the xml to remove empty nodes.
+        # However, in the TR UBL version, we always want the Shipment with ID empty node, due to it being required.
+        # We'll replace the empty value by a dummy one so that the node doesn't get cleaned up and remove its content after the file generation.
+        xml, errors = super()._export_invoice(invoice)
+        xml_root = etree.fromstring(xml)
+        shipment_id_elements = xml_root.findall('.//cac:Shipment/cbc:ID', namespaces=xml_root.nsmap)
+        for element in shipment_id_elements:
+            if element.text == 'NO_ID':
+                element.text = ''
+        return etree.tostring(xml_root, xml_declaration=True, encoding='UTF-8'), errors
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_move.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_move.py
new file mode 100644
index 0000000000000..5d26e10599ae0
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_move.py
@@ -0,0 +1,86 @@
+from odoo import api, fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    l10n_tr_gib_invoice_scenario = fields.Selection(
+        selection=[
+            ("TEMELFATURA", "Basic"),
+            ("KAMU", "Public Sector"),
+        ],
+        default="TEMELFATURA",
+        string="Invoice Scenario",
+        help="The scenario of the invoice to be sent to GİB.",
+    )
+    l10n_tr_gib_invoice_type = fields.Selection(
+        compute="_compute_l10n_tr_gib_invoice_type",
+        store=True,
+        readonly=False,
+        default="SATIS",
+        string="GIB Invoice Type",
+        selection=[
+            ("SATIS", "Sales"),
+            ("TEVKIFAT", "Withholding"),
+            ("IHRACKAYITLI", "Registered for Export"),
+            ("ISTISNA", "Tax Exempt"),
+        ],
+        help="The type of invoice to be sent to GİB.",
+    )
+    l10n_tr_is_export_invoice = fields.Boolean(string="Is GIB Export")
+    l10n_tr_shipping_type = fields.Selection(
+        selection=[
+            ("1", "Sea Transportation"),
+            ("2", "Railway Transportation"),
+            ("3", "Road Transportation"),
+            ("4", "Air Transportation"),
+            ("5", "Post"),
+            ("6", "Combined Transportation"),
+            ("7", "Fixed Transportation"),
+            ("8", "Domestic Water Transportation"),
+            ("9", "Invalid Transportation Method"),
+        ],
+        string="Shipping Method",
+        help="The type of shipping.",
+    )
+    l10n_tr_exemption_code_id = fields.Many2one(
+        "l10n_tr_nilvera_einvoice_extended.account.tax.code",
+        compute="_compute_l10n_tr_exemption_code_id",
+        store=True,
+        readonly=False,
+        string="Exemption Reason",
+        help="The exception reason of the invoice.",
+    )
+    l10n_tr_exemption_code_domain_list = fields.Binary(compute="_compute_l10n_tr_exemption_code_domain_list")
+    l10n_tr_nilvera_customer_status = fields.Selection(
+        string="Partner Nilvera Status",
+        related="partner_id.l10n_tr_nilvera_customer_status",
+    )
+
+    @api.depends("l10n_tr_gib_invoice_scenario", "l10n_tr_gib_invoice_type", "l10n_tr_is_export_invoice")
+    def _compute_l10n_tr_exemption_code_domain_list(self):
+        for record in self:
+            domain = []
+            if record.l10n_tr_gib_invoice_type == "ISTISNA":
+                domain.extend(("exception", "export_exception"))
+            if record.l10n_tr_gib_invoice_type == "IHRACKAYITLI":
+                domain.append("export_registration")
+            if record.l10n_tr_is_export_invoice:
+                domain.append("export_exception")
+            record.l10n_tr_exemption_code_domain_list = domain
+
+    @api.depends("l10n_tr_gib_invoice_scenario", "l10n_tr_is_export_invoice")
+    def _compute_l10n_tr_gib_invoice_type(self):
+        for record in self:
+            record.l10n_tr_gib_invoice_type = False
+
+    @api.depends("l10n_tr_gib_invoice_scenario", "l10n_tr_gib_invoice_type", "partner_id")
+    def _compute_l10n_tr_exemption_code_id(self):
+        for record in self:
+            record.l10n_tr_exemption_code_id = False
+
+    def _get_partner_l10n_tr_nilvera_customer_alias_name(self):
+        self.ensure_one()
+        if self.l10n_tr_is_export_invoice:
+            return self.company_id.l10n_tr_nilvera_export_alias
+        return super()._get_partner_l10n_tr_nilvera_customer_alias_name()
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_move_line.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_move_line.py
new file mode 100644
index 0000000000000..1bbb28549b407
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_move_line.py
@@ -0,0 +1,24 @@
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    l10n_tr_ctsp_number = fields.Char(
+        string="CTSP Number",
+        compute="_compute_l10n_tr_ctsp_number",
+        store=True,
+        readonly=False,
+    )
+
+    @api.depends("product_id.l10n_tr_ctsp_number")
+    def _compute_l10n_tr_ctsp_number(self):
+        for record in self:
+            record.l10n_tr_ctsp_number = record.product_id.l10n_tr_ctsp_number
+
+    @api.constrains("l10n_tr_ctsp_number")
+    def _check_l10n_tr_ctsp_number(self):
+        for record in self:
+            if record.l10n_tr_ctsp_number and len(record.l10n_tr_ctsp_number) > 12:
+                raise ValidationError(_("CTSP Number must be 12 digits or fewer."))
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py
new file mode 100644
index 0000000000000..ce00849318d98
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_move_send.py
@@ -0,0 +1,65 @@
+from odoo import _, models
+
+
+class AccountMoveSend(models.AbstractModel):
+    _inherit = "account.move.send"
+
+    # -------------------------------------------------------------------------
+    # ALERTS
+    # -------------------------------------------------------------------------
+
+    def _get_alerts(self, moves, moves_data):
+        # EXTENDS 'account'
+        alerts = super()._get_alerts(moves, moves_data)
+        tr_moves = moves.filtered(lambda m: m.country_code == "TR")
+
+        # Warning alert if product is missing CTSP Number
+        if non_eligible_tr_products := tr_moves.invoice_line_ids.product_id.filtered(
+            lambda p: not p.l10n_tr_ctsp_number and "TR" in p.fiscal_country_codes,
+        ):
+            alerts["l10n_tr_non_eligible_products"] = {
+                "message": _(
+                    "The following products are missing a CTSP Number:\n%(products)s\n",
+                    products="\n".join(f"- {product.display_name}" for product in non_eligible_tr_products),
+                ),
+                "level": "warning",
+                "action_text": _("View Product(s)"),
+                "action": non_eligible_tr_products._get_records_action(
+                    name=_("Check Products"),
+                ),
+            }
+        return alerts
+
+    def _get_l10n_tr_tax_partner_tax_office_alert(self, moves):
+        # OVERRIDES l10n_tr_nilvera_einvoice.
+        if tr_einvoice_partners_missing_ref := moves.partner_id.filtered(
+            lambda p: p.l10n_tr_nilvera_customer_status == "einvoice" and not p.l10n_tr_tax_office_id,
+        ):
+            return {
+                "message": _("The Tax Office is not set on the following TR Partner(s)."),
+                "action_text": _("View Partner(s)"),
+                "action": tr_einvoice_partners_missing_ref._get_records_action(
+                    name=_("Check reference on Partner(s)"),
+                ),
+                "level": "danger",
+            }
+        return {}
+
+    def _get_l10n_tr_tax_company_tax_office_alert(self, moves):
+        # OVERRIDES l10n_tr_nilvera_einvoice.
+        if tr_companies_missing_tax_office := moves.company_id.filtered(
+            lambda c: (not c.l10n_tr_tax_office_id and c.country_code == "TR"),
+        ):
+            return {
+                "message": _("The Tax Office is not set on the following TR Company(s)."),
+                "action_text": _("View Company(s)"),
+                "action": tr_companies_missing_tax_office._get_records_action(
+                    name=_(" TR Company(s)"),
+                ),
+                "level": "danger",
+            }
+        return {}
+
+    def _get_l10n_tr_tax_partner_address_alert(self, moves):
+        # EXTENDS l10n_tr_nilvera_einvoice.
+        return super()._get_l10n_tr_tax_partner_address_alert(moves.filtered(lambda move: not move.l10n_tr_is_export_invoice))
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_tax.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_tax.py
new file mode 100644
index 0000000000000..f4d9c25461561
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_tax.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class AccountTax(models.Model):
+    _inherit = "account.tax"
+
+    l10n_tr_tax_withholding_code_id = fields.Many2one(
+        comodel_name="l10n_tr_nilvera_einvoice_extended.account.tax.code",
+        string="Withholding Reason",
+        domain="[('code_type', '=', 'withholding')]",
+        help="The reason for withholding tax.",
+    )
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_account_tax_code.py b/addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_account_tax_code.py
new file mode 100644
index 0000000000000..4673f36b80e6c
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_account_tax_code.py
@@ -0,0 +1,28 @@
+from odoo import api, fields, models
+
+
+class L10nTrNilveraEinvoiceExtendedAccountTaxCode(models.Model):
+    _name = "l10n_tr_nilvera_einvoice_extended.account.tax.code"
+    _description = "Turkish Tax Codes (GIB Codes)"
+
+    name = fields.Char(string="Reason", required=True, translate=True)
+    code = fields.Integer(string="Reason Code", required=True)
+    percentage = fields.Float()
+    code_type = fields.Selection(
+        selection=[
+            ("withholding", "Withholding"),
+            ("exception", "Exception"),
+            ("export_exception", "Export Exception"),
+            ("export_registration", "Export Registration"),
+        ],
+        required=True,
+        string="Code Type",
+    )
+
+    @api.depends("name", "percentage")
+    def _compute_display_name(self):
+        for record in self:
+            name = record.name
+            if record.percentage:
+                name = f"{record.percentage * 100}% {name}"
+            record.display_name = name
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_tax_office.py b/addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_tax_office.py
new file mode 100644
index 0000000000000..d1866f7c993bb
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/l10n_tr_nilvera_einvoice_extended_tax_office.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class L10nTrNilveraEinvoiceExtendedTaxOffice(models.Model):
+    _name = "l10n_tr_nilvera_einvoice_extended.tax.office"
+    _description = "Turkish Tax Office"
+    _translate = False
+
+    name = fields.Char(translate=True)
+    code = fields.Integer()
+    state_id = fields.Many2one(comodel_name="res.country.state")
+    state_code = fields.Char(related="state_id.code")
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/product_product.py b/addons/l10n_tr_nilvera_einvoice_extended/models/product_product.py
new file mode 100644
index 0000000000000..bf5c18be4bc33
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/product_product.py
@@ -0,0 +1,15 @@
+from odoo import _, api, fields, models
+
+from odoo.exceptions import ValidationError
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    l10n_tr_ctsp_number = fields.Char(string="CTSP Number", copy=False, index="btree_not_null")
+
+    @api.constrains("l10n_tr_ctsp_number")
+    def _check_l10n_tr_ctsp_number(self):
+        for record in self:
+            if record.l10n_tr_ctsp_number and len(record.l10n_tr_ctsp_number) > 12:
+                raise ValidationError(_("CTSP Number must be 12 digits or fewer."))
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/product_template.py b/addons/l10n_tr_nilvera_einvoice_extended/models/product_template.py
new file mode 100644
index 0000000000000..feba8b8170ed2
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/product_template.py
@@ -0,0 +1,18 @@
+from odoo import api, fields, models
+
+
+class ProductTemplate(models.Model):
+    _inherit = "product.template"
+
+    l10n_tr_ctsp_number = fields.Char(
+        string="CTSP Number",
+        compute="_compute_l10n_tr_ctsp_number",
+        inverse="_set_l10n_tr_ctsp_number",
+    )
+
+    @api.depends("product_variant_ids.l10n_tr_ctsp_number")
+    def _compute_l10n_tr_ctsp_number(self):
+        self._compute_template_field_from_variant_field("l10n_tr_ctsp_number")
+
+    def _set_l10n_tr_ctsp_number(self):
+        self._set_product_variant_field("l10n_tr_ctsp_number")
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/res_company.py b/addons/l10n_tr_nilvera_einvoice_extended/models/res_company.py
new file mode 100644
index 0000000000000..9766ec0677a2f
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/res_company.py
@@ -0,0 +1,12 @@
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    l10n_tr_tax_office_id = fields.Many2one(related="partner_id.l10n_tr_tax_office_id", readonly=False)
+    l10n_tr_nilvera_export_alias = fields.Char(
+        string="Nilvera Export Alias",
+        default="urn:mail:ihracatpk@gtb.gov.tr",
+        groups="base.group_system",
+    )
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/res_config_settings.py b/addons/l10n_tr_nilvera_einvoice_extended/models/res_config_settings.py
new file mode 100644
index 0000000000000..c5bd93fa4bfe0
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/res_config_settings.py
@@ -0,0 +1,11 @@
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    l10n_tr_nilvera_export_alias = fields.Char(
+        related='company_id.l10n_tr_nilvera_export_alias',
+        string="Nilvera Export Alias",
+        readonly=False,
+    )
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/res_partner.py b/addons/l10n_tr_nilvera_einvoice_extended/models/res_partner.py
new file mode 100644
index 0000000000000..3bb999312453e
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/res_partner.py
@@ -0,0 +1,17 @@
+from odoo import api, fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    l10n_tr_tax_office_id = fields.Many2one("l10n_tr_nilvera_einvoice_extended.tax.office", string="Turkish Tax Office")
+
+    @api.depends('l10n_tr_tax_office_id')
+    def _compute_display_name(self):
+        super()._compute_display_name()
+        tr_partners_with_tax_office = self.filtered("l10n_tr_tax_office_id")
+        if not self.env.context.get('show_address'):
+            return
+        for partner in tr_partners_with_tax_office:
+            if not partner.env.context.get("formatted_display_name"):
+                partner.display_name = (f"{partner.display_name}\n{partner.l10n_tr_tax_office_id.name}")
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/template_tr.py b/addons/l10n_tr_nilvera_einvoice_extended/models/template_tr.py
new file mode 100644
index 0000000000000..1699b78ddb1e7
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/template_tr.py
@@ -0,0 +1,16 @@
+from odoo import models
+from odoo.addons.account.models.chart_template import template
+
+
+class AccountChartTemplate(models.AbstractModel):
+    _inherit = "account.chart.template"
+
+    @template("tr", "account.tax")
+    def _get_tr_withholding_account_tax(self):
+        additional = self._parse_csv("tr", "account.tax", module="l10n_tr_nilvera_einvoice_extended")
+        self._deref_account_tags("tr", additional)
+        return additional
+
+    @template("tr", "l10n_tr_nilvera_einvoice_extended.account.tax.code")
+    def _get_tr_withholding_account_tax_code(self):
+        return self._parse_csv("tr", "l10n_tr_nilvera_einvoice_extended.account.tax.code", module="l10n_tr_nilvera_einvoice_extended")
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/security/ir.model.access.csv b/addons/l10n_tr_nilvera_einvoice_extended/security/ir.model.access.csv
new file mode 100644
index 0000000000000..149913409698b
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/security/ir.model.access.csv
@@ -0,0 +1,8 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_l10n_tr_nilvera_einvoice_extended_account_tax_code_readonly,l10n_tr_nilvera_einvoice_extended_account_tax_code_readonly,model_l10n_tr_nilvera_einvoice_extended_account_tax_code,account.group_account_readonly,1,0,0,0
+access_l10n_tr_nilvera_einvoice_extended_account_tax_code,l10n_tr_nilvera_einvoice_extended_account_tax_code,model_l10n_tr_nilvera_einvoice_extended_account_tax_code,account.group_account_basic,1,1,1,1
+access_l10n_tr_nilvera_einvoice_extended_tax_office_public,l10n_tr_nilvera_einvoice_extended_tax_office_group_public_user,model_l10n_tr_nilvera_einvoice_extended_tax_office,base.group_public,1,0,0,0
+access_l10n_tr_nilvera_einvoice_extended_tax_office_portal,l10n_tr_nilvera_einvoice_extended_tax_office_group_protal_user,model_l10n_tr_nilvera_einvoice_extended_tax_office,base.group_portal,1,0,0,0
+access_l10n_tr_nilvera_einvoice_extended_tax_office_employee,l10n_tr_nilvera_einvoice_extended_tax_office_group_user,model_l10n_tr_nilvera_einvoice_extended_tax_office,base.group_user,1,0,0,0
+access_l10n_tr_nilvera_einvoice_extended_tax_office_group_partner_manager,l10n_tr_nilvera_einvoice_extended_tax_office_group_partner_manager,model_l10n_tr_nilvera_einvoice_extended_tax_office,base.group_partner_manager,1,1,1,1
+access_l10n_tr_nilvera_einvoice_extended_tax_office_group_system,l10n_tr_nilvera_einvoice_extended_tax_office_group_system,model_l10n_tr_nilvera_einvoice_extended_tax_office,base.group_system,1,1,1,1
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/__init__.py b/addons/l10n_tr_nilvera_einvoice_extended/tests/__init__.py
new file mode 100644
index 0000000000000..30a684ae24ae0
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_xml_ubl_tr
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml
new file mode 100644
index 0000000000000..12e241a215de8
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml
@@ -0,0 +1,158 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Invoice
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
+  <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+  <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
+  <cbc:ProfileID>TEMELFATURA</cbc:ProfileID>
+  <cbc:ID>EIN2025000000001</cbc:ID>
+  <cbc:CopyIndicator>false</cbc:CopyIndicator>
+  <cbc:UUID>___ignore___</cbc:UUID>
+  <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  <cbc:InvoiceTypeCode>IHRACKAYITLI</cbc:InvoiceTypeCode>
+  <cbc:Note>3 products</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ TRY KIRK KURUS</cbc:Note>
+  <cbc:DocumentCurrencyCode>TRY</cbc:DocumentCurrencyCode>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
+  <cac:OrderReference>
+    <cbc:ID>EIN/2025/1</cbc:ID>
+    <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  </cac:OrderReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="VKN">3297552117</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>company_1_data</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>3281. Cadde</cbc:StreetName>
+        <cbc:CitySubdivisionName>İç Anadolu Bölgesi</cbc:CitySubdivisionName>
+        <cbc:CityName>Düzce</cbc:CityName>
+        <cbc:PostalZone>06810</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>company_1_data</cbc:RegistrationName>
+        <cbc:CompanyID>3297552117</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
+        <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="TCKN">1729171602</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>einvoice_partner</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Gökhane Sokak No:1</cbc:StreetName>
+        <cbc:CitySubdivisionName>Sincan/Ankara</cbc:CitySubdivisionName>
+        <cbc:CityName>Ankara</cbc:CityName>
+        <cbc:PostalZone>06934</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>einvoice_partner</cbc:RegistrationName>
+        <cbc:CompanyID>1729171602</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
+        <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
+      </cac:Contact>
+      <cac:Person>
+        <cbc:FirstName>einvoice_partner</cbc:FirstName>
+        <cbc:FamilyName>___ignore___</cbc:FamilyName>
+      </cac:Person>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentDueDate>2025-03-05</cbc:PaymentDueDate>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>TR0123456789</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:AllowanceCharge>
+    <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+    <cbc:AllowanceChargeReason>Discount</cbc:AllowanceChargeReason>
+    <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+  </cac:AllowanceCharge>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cbc:Percent>20.0</cbc:Percent>
+      <cac:TaxCategory>
+        <cbc:TaxExemptionReasonCode>701</cbc:TaxExemptionReasonCode>
+        <cbc:TaxExemptionReason>3065 s. KDV Kanununun 11/1-c md. Kapsamındaki İhraç Kayıtlı Satış</cbc:TaxExemptionReason>
+        <cac:TaxScheme>
+          <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+          <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="TRY">158.40</cbc:TaxInclusiveAmount>
+    <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
+    <cbc:PayableAmount currencyID="TRY">158.40</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">3.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
+      <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:TaxTotal>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cac:TaxSubtotal>
+        <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+        <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+        <cbc:Percent>20.0</cbc:Percent>
+        <cac:TaxCategory>
+          <cac:TaxScheme>
+            <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+            <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+          </cac:TaxScheme>
+        </cac:TaxCategory>
+      </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="TRY">50.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_earchive.xml
similarity index 76%
rename from addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive.xml
rename to addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_earchive.xml
index eaf724a07267f..8a626e26fd418 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive.xml
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_earchive.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+<Invoice
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
   <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
   <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
   <cbc:ProfileID>EARSIVFATURA</cbc:ProfileID>
@@ -9,9 +12,9 @@
   <cbc:IssueDate>2025-03-03</cbc:IssueDate>
   <cbc:InvoiceTypeCode>SATIS</cbc:InvoiceTypeCode>
   <cbc:Note>3 products</cbc:Note>
-  <cbc:Note>YALNIZ : YÜZELLIÜÇ TRY ONIKI KURUS</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ TRY KIRK KURUS</cbc:Note>
   <cbc:DocumentCurrencyCode>TRY</cbc:DocumentCurrencyCode>
-  <cbc:LineCountNumeric>4</cbc:LineCountNumeric>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
   <cac:OrderReference>
     <cbc:ID>EIN/2025/1</cbc:ID>
     <cbc:IssueDate>2025-03-03</cbc:IssueDate>
@@ -41,7 +44,7 @@
       </cac:PostalAddress>
       <cac:PartyTaxScheme>
         <cac:TaxScheme>
-          <cbc:Name>Ulus</cbc:Name>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
@@ -49,8 +52,6 @@
         <cbc:CompanyID>3297552117</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>company_1_data</cbc:Name>
         <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
         <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -79,8 +80,6 @@
         <cbc:CompanyID>17291716060</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>earchive_partner</cbc:Name>
         <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
         <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -103,7 +102,7 @@
     <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
   </cac:AllowanceCharge>
   <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="TRY">21.12</cbc:TaxAmount>
+    <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
     <cac:TaxSubtotal>
       <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
       <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
@@ -115,24 +114,13 @@
         </cac:TaxScheme>
       </cac:TaxCategory>
     </cac:TaxSubtotal>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="TRY">-5.28</cbc:TaxAmount>
-      <cbc:Percent>-4.0</cbc:Percent>
-      <cac:TaxCategory>
-        <cac:TaxScheme>
-          <cbc:Name>KDV Tevkifatı</cbc:Name>
-          <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
   </cac:TaxTotal>
   <cac:LegalMonetaryTotal>
     <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
     <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="TRY">153.12</cbc:TaxInclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="TRY">158.40</cbc:TaxInclusiveAmount>
     <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
-    <cbc:PayableAmount currencyID="TRY">153.12</cbc:PayableAmount>
+    <cbc:PayableAmount currencyID="TRY">158.40</cbc:PayableAmount>
   </cac:LegalMonetaryTotal>
   <cac:InvoiceLine>
     <cbc:ID>1</cbc:ID>
@@ -140,11 +128,11 @@
     <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-  		<cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
     </cac:AllowanceCharge>
     <cac:TaxTotal>
-      <cbc:TaxAmount currencyID="TRY">21.12</cbc:TaxAmount>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
       <cac:TaxSubtotal>
         <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
         <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
@@ -156,17 +144,6 @@
           </cac:TaxScheme>
         </cac:TaxCategory>
       </cac:TaxSubtotal>
-      <cac:TaxSubtotal>
-        <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
-        <cbc:TaxAmount currencyID="TRY">-5.28</cbc:TaxAmount>
-        <cbc:Percent>-4.0</cbc:Percent>
-        <cac:TaxCategory>
-          <cac:TaxScheme>
-            <cbc:Name>KDV Tevkifatı</cbc:Name>
-            <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
-          </cac:TaxScheme>
-        </cac:TaxCategory>
-      </cac:TaxSubtotal>
     </cac:TaxTotal>
     <cac:Item>
       <cbc:Description>product_a</cbc:Description>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_einvoice.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_einvoice.xml
new file mode 100644
index 0000000000000..a198f742c8831
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_einvoice.xml
@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Invoice
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+  <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+  <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
+  <cbc:ProfileID>TEMELFATURA</cbc:ProfileID>
+  <cbc:ID>EIN2025000000001</cbc:ID>
+  <cbc:CopyIndicator>false</cbc:CopyIndicator>
+  <cbc:UUID>___ignore___</cbc:UUID>
+  <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  <cbc:InvoiceTypeCode>SATIS</cbc:InvoiceTypeCode>
+  <cbc:Note>3 products</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ TRY KIRK KURUS</cbc:Note>
+  <cbc:DocumentCurrencyCode>TRY</cbc:DocumentCurrencyCode>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
+  <cac:OrderReference>
+    <cbc:ID>EIN/2025/1</cbc:ID>
+    <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  </cac:OrderReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="VKN">3297552117</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>company_1_data</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>3281. Cadde</cbc:StreetName>
+        <cbc:CitySubdivisionName>İç Anadolu Bölgesi</cbc:CitySubdivisionName>
+        <cbc:CityName>Düzce</cbc:CityName>
+        <cbc:PostalZone>06810</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>company_1_data</cbc:RegistrationName>
+        <cbc:CompanyID>3297552117</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
+        <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="TCKN">1729171602</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>einvoice_partner</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Gökhane Sokak No:1</cbc:StreetName>
+        <cbc:CitySubdivisionName>Sincan/Ankara</cbc:CitySubdivisionName>
+        <cbc:CityName>Ankara</cbc:CityName>
+        <cbc:PostalZone>06934</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>einvoice_partner</cbc:RegistrationName>
+        <cbc:CompanyID>1729171602</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
+        <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
+      </cac:Contact>
+      <cac:Person>
+        <cbc:FirstName>einvoice_partner</cbc:FirstName>
+        <cbc:FamilyName>___ignore___</cbc:FamilyName>
+      </cac:Person>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentDueDate>2025-03-05</cbc:PaymentDueDate>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>TR0123456789</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:AllowanceCharge>
+    <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+    <cbc:AllowanceChargeReason>Discount</cbc:AllowanceChargeReason>
+    <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+  </cac:AllowanceCharge>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cbc:Percent>20.0</cbc:Percent>
+      <cac:TaxCategory>
+        <cac:TaxScheme>
+          <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+          <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="TRY">158.40</cbc:TaxInclusiveAmount>
+    <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
+    <cbc:PayableAmount currencyID="TRY">158.40</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">3.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
+      <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:TaxTotal>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cac:TaxSubtotal>
+        <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+        <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+        <cbc:Percent>20.0</cbc:Percent>
+        <cac:TaxCategory>
+          <cac:TaxScheme>
+            <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+            <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+          </cac:TaxScheme>
+        </cac:TaxCategory>
+      </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="TRY">50.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_tax_exempt_einvoice.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_tax_exempt_einvoice.xml
new file mode 100644
index 0000000000000..127b965224098
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_tax_exempt_einvoice.xml
@@ -0,0 +1,158 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Invoice
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2">
+  <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+  <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
+  <cbc:ProfileID>TEMELFATURA</cbc:ProfileID>
+  <cbc:ID>EIN2025000000001</cbc:ID>
+  <cbc:CopyIndicator>false</cbc:CopyIndicator>
+  <cbc:UUID>___ignore___</cbc:UUID>
+  <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  <cbc:InvoiceTypeCode>ISTISNA</cbc:InvoiceTypeCode>
+  <cbc:Note>3 products</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ TRY KIRK KURUS</cbc:Note>
+  <cbc:DocumentCurrencyCode>TRY</cbc:DocumentCurrencyCode>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
+  <cac:OrderReference>
+    <cbc:ID>EIN/2025/1</cbc:ID>
+    <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  </cac:OrderReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="VKN">3297552117</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>company_1_data</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>3281. Cadde</cbc:StreetName>
+        <cbc:CitySubdivisionName>İç Anadolu Bölgesi</cbc:CitySubdivisionName>
+        <cbc:CityName>Düzce</cbc:CityName>
+        <cbc:PostalZone>06810</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>company_1_data</cbc:RegistrationName>
+        <cbc:CompanyID>3297552117</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
+        <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="TCKN">1729171602</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>einvoice_partner</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Gökhane Sokak No:1</cbc:StreetName>
+        <cbc:CitySubdivisionName>Sincan/Ankara</cbc:CitySubdivisionName>
+        <cbc:CityName>Ankara</cbc:CityName>
+        <cbc:PostalZone>06934</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>einvoice_partner</cbc:RegistrationName>
+        <cbc:CompanyID>1729171602</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
+        <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
+      </cac:Contact>
+      <cac:Person>
+        <cbc:FirstName>einvoice_partner</cbc:FirstName>
+        <cbc:FamilyName>___ignore___</cbc:FamilyName>
+      </cac:Person>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentDueDate>2025-03-05</cbc:PaymentDueDate>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>TR0123456789</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:AllowanceCharge>
+    <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+    <cbc:AllowanceChargeReason>Discount</cbc:AllowanceChargeReason>
+    <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+  </cac:AllowanceCharge>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cbc:Percent>20.0</cbc:Percent>
+      <cac:TaxCategory>
+        <cbc:TaxExemptionReasonCode>212</cbc:TaxExemptionReasonCode>
+        <cbc:TaxExemptionReason>17/4-ı Serbest Bölgelerde Verilen Hizmetler</cbc:TaxExemptionReason>
+        <cac:TaxScheme>
+          <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+          <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="TRY">158.40</cbc:TaxInclusiveAmount>
+    <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
+    <cbc:PayableAmount currencyID="TRY">158.40</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">3.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
+      <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:TaxTotal>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cac:TaxSubtotal>
+        <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+        <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+        <cbc:Percent>20.0</cbc:Percent>
+        <cac:TaxCategory>
+          <cac:TaxScheme>
+            <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+            <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+          </cac:TaxScheme>
+        </cac:TaxCategory>
+      </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="TRY">50.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml
similarity index 79%
rename from addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice.xml
rename to addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml
index fcc0d9a39d9fa..3fc934585623d 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice.xml
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+<Invoice
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
   <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
   <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
   <cbc:ProfileID>TEMELFATURA</cbc:ProfileID>
@@ -7,9 +10,9 @@
   <cbc:CopyIndicator>false</cbc:CopyIndicator>
   <cbc:UUID>___ignore___</cbc:UUID>
   <cbc:IssueDate>2025-03-03</cbc:IssueDate>
-  <cbc:InvoiceTypeCode>SATIS</cbc:InvoiceTypeCode>
+  <cbc:InvoiceTypeCode>TEVKIFAT</cbc:InvoiceTypeCode>
   <cbc:Note>3 products</cbc:Note>
-  <cbc:Note>YALNIZ : YÜZELLIÜÇ TRY ONIKI KURUS</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZOTUZDÖRT TRY ALTMIŞÜÇ KURUS</cbc:Note>
   <cbc:DocumentCurrencyCode>TRY</cbc:DocumentCurrencyCode>
   <cbc:LineCountNumeric>4</cbc:LineCountNumeric>
   <cac:OrderReference>
@@ -36,7 +39,7 @@
       </cac:PostalAddress>
       <cac:PartyTaxScheme>
         <cac:TaxScheme>
-          <cbc:Name>Ulus</cbc:Name>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
@@ -44,8 +47,6 @@
         <cbc:CompanyID>3297552117</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>company_1_data</cbc:Name>
         <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
         <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -71,7 +72,7 @@
       </cac:PostalAddress>
       <cac:PartyTaxScheme>
         <cac:TaxScheme>
-          <cbc:Name>Ulus</cbc:Name>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
@@ -79,8 +80,6 @@
         <cbc:CompanyID>1729171602</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>einvoice_partner</cbc:Name>
         <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
         <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -103,11 +102,10 @@
     <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
   </cac:AllowanceCharge>
   <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="TRY">21.12</cbc:TaxAmount>
+    <cbc:TaxAmount currencyID="TRY">2.64</cbc:TaxAmount>
     <cac:TaxSubtotal>
       <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
       <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
-      <cbc:Percent>20.0</cbc:Percent>
       <cac:TaxCategory>
         <cac:TaxScheme>
           <cbc:Name>Gerçek Usulde KDV</cbc:Name>
@@ -115,24 +113,27 @@
         </cac:TaxScheme>
       </cac:TaxCategory>
     </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:WithholdingTaxTotal>
+    <cbc:TaxAmount currencyID="TRY">23.76</cbc:TaxAmount>
     <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="TRY">-5.28</cbc:TaxAmount>
-      <cbc:Percent>-4.0</cbc:Percent>
+      <cbc:TaxableAmount currencyID="TRY">26.40</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="TRY">23.76</cbc:TaxAmount>
+      <cbc:Percent>90</cbc:Percent>
       <cac:TaxCategory>
         <cac:TaxScheme>
-          <cbc:Name>KDV Tevkifatı</cbc:Name>
-          <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
+          <cbc:Name>Özel Güvenlik Hizmeti</cbc:Name>
+          <cbc:TaxTypeCode>607</cbc:TaxTypeCode>
         </cac:TaxScheme>
       </cac:TaxCategory>
     </cac:TaxSubtotal>
-  </cac:TaxTotal>
+  </cac:WithholdingTaxTotal>
   <cac:LegalMonetaryTotal>
     <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
     <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="TRY">153.12</cbc:TaxInclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="TRY">134.64</cbc:TaxInclusiveAmount>
     <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
-    <cbc:PayableAmount currencyID="TRY">153.12</cbc:PayableAmount>
+    <cbc:PayableAmount currencyID="TRY">134.64</cbc:PayableAmount>
   </cac:LegalMonetaryTotal>
   <cac:InvoiceLine>
     <cbc:ID>1</cbc:ID>
@@ -144,11 +145,10 @@
       <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
     </cac:AllowanceCharge>
     <cac:TaxTotal>
-      <cbc:TaxAmount currencyID="TRY">21.12</cbc:TaxAmount>
+      <cbc:TaxAmount currencyID="TRY">2.64</cbc:TaxAmount>
       <cac:TaxSubtotal>
         <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
         <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
-        <cbc:Percent>20.0</cbc:Percent>
         <cac:TaxCategory>
           <cac:TaxScheme>
             <cbc:Name>Gerçek Usulde KDV</cbc:Name>
@@ -156,18 +156,21 @@
           </cac:TaxScheme>
         </cac:TaxCategory>
       </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:WithholdingTaxTotal>
+      <cbc:TaxAmount currencyID="TRY">23.76</cbc:TaxAmount>
       <cac:TaxSubtotal>
-        <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
-        <cbc:TaxAmount currencyID="TRY">-5.28</cbc:TaxAmount>
-        <cbc:Percent>-4.0</cbc:Percent>
+        <cbc:TaxableAmount currencyID="TRY">26.40</cbc:TaxableAmount>
+        <cbc:TaxAmount currencyID="TRY">23.76</cbc:TaxAmount>
+        <cbc:Percent>90</cbc:Percent>
         <cac:TaxCategory>
           <cac:TaxScheme>
-            <cbc:Name>KDV Tevkifatı</cbc:Name>
-            <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
+            <cbc:Name>Özel Güvenlik Hizmeti</cbc:Name>
+            <cbc:TaxTypeCode>607</cbc:TaxTypeCode>
           </cac:TaxScheme>
         </cac:TaxCategory>
       </cac:TaxSubtotal>
-    </cac:TaxTotal>
+    </cac:WithholdingTaxTotal>
     <cac:Item>
       <cbc:Description>product_a</cbc:Description>
       <cbc:Name>product_a</cbc:Name>
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive_multicurrency.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_earchive_multicurrency.xml
similarity index 76%
rename from addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive_multicurrency.xml
rename to addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_earchive_multicurrency.xml
index 2dbf9775b82d5..9b1c6ece1523d 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_earchive_multicurrency.xml
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_earchive_multicurrency.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+<Invoice
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
   <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
   <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
   <cbc:ProfileID>EARSIVFATURA</cbc:ProfileID>
@@ -9,12 +12,12 @@
   <cbc:IssueDate>2025-03-03</cbc:IssueDate>
   <cbc:InvoiceTypeCode>SATIS</cbc:InvoiceTypeCode>
   <cbc:Note>3 products</cbc:Note>
-  <cbc:Note>YALNIZ : ALTIBINYÜZYIRMIDÖRT TRY SEKSEN KURUS</cbc:Note>
-  <cbc:Note>YALNIZ : YÜZELLIÜÇ USD ONIKI CENTS</cbc:Note>
+  <cbc:Note>YALNIZ : ALTIBINÜÇYÜZOTUZALTI TRY SIFIR KURUS</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ USD KIRK CENTS</cbc:Note>
   <cbc:Note>KUR : 40.000000 TL</cbc:Note>
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
   <cbc:PricingCurrencyCode>USD</cbc:PricingCurrencyCode>
-  <cbc:LineCountNumeric>4</cbc:LineCountNumeric>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
   <cac:OrderReference>
     <cbc:ID>EIN/2025/1</cbc:ID>
     <cbc:IssueDate>2025-03-03</cbc:IssueDate>
@@ -44,7 +47,7 @@
       </cac:PostalAddress>
       <cac:PartyTaxScheme>
         <cac:TaxScheme>
-          <cbc:Name>Ulus</cbc:Name>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
@@ -52,8 +55,6 @@
         <cbc:CompanyID>3297552117</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>company_1_data</cbc:Name>
         <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
         <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -82,8 +83,6 @@
         <cbc:CompanyID>17291716060</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>earchive_partner</cbc:Name>
         <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
         <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -112,7 +111,7 @@
     <cbc:Date>2025-03-03</cbc:Date>
   </cac:PricingExchangeRate>
   <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="USD">21.12</cbc:TaxAmount>
+    <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
     <cac:TaxSubtotal>
       <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
       <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
@@ -124,24 +123,13 @@
         </cac:TaxScheme>
       </cac:TaxCategory>
     </cac:TaxSubtotal>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">-5.28</cbc:TaxAmount>
-      <cbc:Percent>-4.0</cbc:Percent>
-      <cac:TaxCategory>
-        <cac:TaxScheme>
-          <cbc:Name>KDV Tevkifatı</cbc:Name>
-          <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
   </cac:TaxTotal>
   <cac:LegalMonetaryTotal>
     <cbc:LineExtensionAmount currencyID="USD">132.00</cbc:LineExtensionAmount>
     <cbc:TaxExclusiveAmount currencyID="USD">132.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="USD">153.12</cbc:TaxInclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="USD">158.40</cbc:TaxInclusiveAmount>
     <cbc:AllowanceTotalAmount currencyID="USD">18.00</cbc:AllowanceTotalAmount>
-    <cbc:PayableAmount currencyID="USD">153.12</cbc:PayableAmount>
+    <cbc:PayableAmount currencyID="USD">158.40</cbc:PayableAmount>
   </cac:LegalMonetaryTotal>
   <cac:InvoiceLine>
     <cbc:ID>1</cbc:ID>
@@ -149,11 +137,11 @@
     <cbc:LineExtensionAmount currencyID="USD">132.00</cbc:LineExtensionAmount>
     <cac:AllowanceCharge>
       <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
-  		<cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
+      <cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
       <cbc:Amount currencyID="USD">18.00</cbc:Amount>
     </cac:AllowanceCharge>
     <cac:TaxTotal>
-      <cbc:TaxAmount currencyID="USD">21.12</cbc:TaxAmount>
+      <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
       <cac:TaxSubtotal>
         <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
         <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
@@ -165,17 +153,6 @@
           </cac:TaxScheme>
         </cac:TaxCategory>
       </cac:TaxSubtotal>
-      <cac:TaxSubtotal>
-        <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
-        <cbc:TaxAmount currencyID="USD">-5.28</cbc:TaxAmount>
-        <cbc:Percent>-4.0</cbc:Percent>
-        <cac:TaxCategory>
-          <cac:TaxScheme>
-            <cbc:Name>KDV Tevkifatı</cbc:Name>
-            <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
-          </cac:TaxScheme>
-        </cac:TaxCategory>
-      </cac:TaxSubtotal>
     </cac:TaxTotal>
     <cac:Item>
       <cbc:Description>product_a</cbc:Description>
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice_multicurrency.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_einvoice_multicurrency.xml
similarity index 77%
rename from addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice_multicurrency.xml
rename to addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_einvoice_multicurrency.xml
index 3631546b21725..f13fb64715c8a 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/expected_xmls/invoice_einvoice_multicurrency.xml
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_einvoice_multicurrency.xml
@@ -1,5 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Invoice xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
+<Invoice
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
   <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
   <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
   <cbc:ProfileID>TEMELFATURA</cbc:ProfileID>
@@ -9,12 +12,12 @@
   <cbc:IssueDate>2025-03-03</cbc:IssueDate>
   <cbc:InvoiceTypeCode>SATIS</cbc:InvoiceTypeCode>
   <cbc:Note>3 products</cbc:Note>
-  <cbc:Note>YALNIZ : ALTIBINYÜZYIRMIDÖRT TRY SEKSEN KURUS</cbc:Note>
-  <cbc:Note>YALNIZ : YÜZELLIÜÇ USD ONIKI CENTS</cbc:Note>
+  <cbc:Note>YALNIZ : ALTIBINÜÇYÜZOTUZALTI TRY SIFIR KURUS</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ USD KIRK CENTS</cbc:Note>
   <cbc:Note>KUR : 40.000000 TL</cbc:Note>
   <cbc:DocumentCurrencyCode>USD</cbc:DocumentCurrencyCode>
   <cbc:PricingCurrencyCode>USD</cbc:PricingCurrencyCode>
-  <cbc:LineCountNumeric>4</cbc:LineCountNumeric>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
   <cac:OrderReference>
     <cbc:ID>EIN/2025/1</cbc:ID>
     <cbc:IssueDate>2025-03-03</cbc:IssueDate>
@@ -39,7 +42,7 @@
       </cac:PostalAddress>
       <cac:PartyTaxScheme>
         <cac:TaxScheme>
-          <cbc:Name>Ulus</cbc:Name>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
@@ -47,8 +50,6 @@
         <cbc:CompanyID>3297552117</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>company_1_data</cbc:Name>
         <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
         <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -74,7 +75,7 @@
       </cac:PostalAddress>
       <cac:PartyTaxScheme>
         <cac:TaxScheme>
-          <cbc:Name>Ulus</cbc:Name>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
         </cac:TaxScheme>
       </cac:PartyTaxScheme>
       <cac:PartyLegalEntity>
@@ -82,8 +83,6 @@
         <cbc:CompanyID>1729171602</cbc:CompanyID>
       </cac:PartyLegalEntity>
       <cac:Contact>
-        <cbc:ID>___ignore___</cbc:ID>
-        <cbc:Name>einvoice_partner</cbc:Name>
         <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
         <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
       </cac:Contact>
@@ -112,7 +111,7 @@
     <cbc:Date>2025-03-03</cbc:Date>
   </cac:PricingExchangeRate>
   <cac:TaxTotal>
-    <cbc:TaxAmount currencyID="USD">21.12</cbc:TaxAmount>
+    <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
     <cac:TaxSubtotal>
       <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
       <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
@@ -124,24 +123,13 @@
         </cac:TaxScheme>
       </cac:TaxCategory>
     </cac:TaxSubtotal>
-    <cac:TaxSubtotal>
-      <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
-      <cbc:TaxAmount currencyID="USD">-5.28</cbc:TaxAmount>
-      <cbc:Percent>-4.0</cbc:Percent>
-      <cac:TaxCategory>
-        <cac:TaxScheme>
-          <cbc:Name>KDV Tevkifatı</cbc:Name>
-          <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
-        </cac:TaxScheme>
-      </cac:TaxCategory>
-    </cac:TaxSubtotal>
   </cac:TaxTotal>
   <cac:LegalMonetaryTotal>
     <cbc:LineExtensionAmount currencyID="USD">132.00</cbc:LineExtensionAmount>
     <cbc:TaxExclusiveAmount currencyID="USD">132.00</cbc:TaxExclusiveAmount>
-    <cbc:TaxInclusiveAmount currencyID="USD">153.12</cbc:TaxInclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="USD">158.40</cbc:TaxInclusiveAmount>
     <cbc:AllowanceTotalAmount currencyID="USD">18.00</cbc:AllowanceTotalAmount>
-    <cbc:PayableAmount currencyID="USD">153.12</cbc:PayableAmount>
+    <cbc:PayableAmount currencyID="USD">158.40</cbc:PayableAmount>
   </cac:LegalMonetaryTotal>
   <cac:InvoiceLine>
     <cbc:ID>1</cbc:ID>
@@ -153,7 +141,7 @@
       <cbc:Amount currencyID="USD">18.00</cbc:Amount>
     </cac:AllowanceCharge>
     <cac:TaxTotal>
-      <cbc:TaxAmount currencyID="USD">21.12</cbc:TaxAmount>
+      <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
       <cac:TaxSubtotal>
         <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
         <cbc:TaxAmount currencyID="USD">26.40</cbc:TaxAmount>
@@ -165,17 +153,6 @@
           </cac:TaxScheme>
         </cac:TaxCategory>
       </cac:TaxSubtotal>
-      <cac:TaxSubtotal>
-        <cbc:TaxableAmount currencyID="USD">132.00</cbc:TaxableAmount>
-        <cbc:TaxAmount currencyID="USD">-5.28</cbc:TaxAmount>
-        <cbc:Percent>-4.0</cbc:Percent>
-        <cac:TaxCategory>
-          <cac:TaxScheme>
-            <cbc:Name>KDV Tevkifatı</cbc:Name>
-            <cbc:TaxTypeCode>9015</cbc:TaxTypeCode>
-          </cac:TaxScheme>
-        </cac:TaxCategory>
-      </cac:TaxSubtotal>
     </cac:TaxTotal>
     <cac:Item>
       <cbc:Description>product_a</cbc:Description>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_export_earchive.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_export_earchive.xml
new file mode 100644
index 0000000000000..bd7b8061b5c82
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_export_earchive.xml
@@ -0,0 +1,200 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Invoice
+  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
+  xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
+  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2">
+  <cbc:UBLVersionID>2.1</cbc:UBLVersionID>
+  <cbc:CustomizationID>TR1.2</cbc:CustomizationID>
+  <cbc:ProfileID>IHRACAT</cbc:ProfileID>
+  <cbc:ID>EIN2025000000001</cbc:ID>
+  <cbc:CopyIndicator>false</cbc:CopyIndicator>
+  <cbc:UUID>___ignore___</cbc:UUID>
+  <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  <cbc:InvoiceTypeCode>ISTISNA</cbc:InvoiceTypeCode>
+  <cbc:Note>3 products</cbc:Note>
+  <cbc:Note>YALNIZ : YÜZELLISEKIZ TRY KIRK KURUS</cbc:Note>
+  <cbc:DocumentCurrencyCode>TRY</cbc:DocumentCurrencyCode>
+  <cbc:LineCountNumeric>3</cbc:LineCountNumeric>
+  <cac:OrderReference>
+    <cbc:ID>EIN/2025/1</cbc:ID>
+    <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+  </cac:OrderReference>
+  <cac:AdditionalDocumentReference>
+    <cbc:ID>ELEKTRONIK</cbc:ID>
+    <cbc:IssueDate>2025-03-03</cbc:IssueDate>
+    <cbc:DocumentTypeCode>SEND_TYPE</cbc:DocumentTypeCode>
+  </cac:AdditionalDocumentReference>
+  <cac:AccountingSupplierParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="VKN">3297552117</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>company_1_data</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>3281. Cadde</cbc:StreetName>
+        <cbc:CitySubdivisionName>İç Anadolu Bölgesi</cbc:CitySubdivisionName>
+        <cbc:CityName>Düzce</cbc:CityName>
+        <cbc:PostalZone>06810</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus Malmüdürlüğü</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>company_1_data</cbc:RegistrationName>
+        <cbc:CompanyID>3297552117</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 501 234 56 78</cbc:Telephone>
+        <cbc:ElectronicMail>info@company.trexample.com</cbc:ElectronicMail>
+      </cac:Contact>
+    </cac:Party>
+  </cac:AccountingSupplierParty>
+  <cac:AccountingCustomerParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="VKN">1460415308</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>Gümrük ve Ticaret Bakanlığı Gümrükler Genel Müdürlüğü- Bilgi İşlem Dairesi Başkanlığı</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:CitySubdivisionName>Ulus</cbc:CitySubdivisionName>
+        <cbc:CityName>Ankara</cbc:CityName>
+        <cac:Country>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyTaxScheme>
+        <cac:TaxScheme>
+          <cbc:Name>Ulus</cbc:Name>
+        </cac:TaxScheme>
+      </cac:PartyTaxScheme>
+    </cac:Party>
+  </cac:AccountingCustomerParty>
+  <cac:BuyerCustomerParty>
+    <cac:Party>
+      <cac:PartyIdentification>
+        <cbc:ID schemeID="PARTYTYPE">EXPORT</cbc:ID>
+      </cac:PartyIdentification>
+      <cac:PartyName>
+        <cbc:Name>earchive_partner</cbc:Name>
+      </cac:PartyName>
+      <cac:PostalAddress>
+        <cbc:StreetName>Gökhane Sokak No:1</cbc:StreetName>
+        <cbc:CitySubdivisionName>Sincan/Ankara</cbc:CitySubdivisionName>
+        <cbc:CityName>Ankara</cbc:CityName>
+        <cbc:PostalZone>06934</cbc:PostalZone>
+        <cac:Country>
+          <cbc:IdentificationCode>TR</cbc:IdentificationCode>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:PostalAddress>
+      <cac:PartyLegalEntity>
+        <cbc:RegistrationName>earchive_partner</cbc:RegistrationName>
+        <cbc:CompanyID>17291716060</cbc:CompanyID>
+      </cac:PartyLegalEntity>
+      <cac:Contact>
+        <cbc:Telephone>+90 509 876 54 32</cbc:Telephone>
+        <cbc:ElectronicMail>info@tr_partner.com</cbc:ElectronicMail>
+      </cac:Contact>
+      <cac:Person>
+        <cbc:FirstName>earchive_partner</cbc:FirstName>
+        <cbc:FamilyName>___ignore___</cbc:FamilyName>
+      </cac:Person>
+    </cac:Party>
+  </cac:BuyerCustomerParty>
+  <cac:PaymentMeans>
+    <cbc:PaymentMeansCode name="credit transfer">30</cbc:PaymentMeansCode>
+    <cbc:PaymentDueDate>2025-03-05</cbc:PaymentDueDate>
+    <cac:PayeeFinancialAccount>
+      <cbc:ID>TR0123456789</cbc:ID>
+    </cac:PayeeFinancialAccount>
+  </cac:PaymentMeans>
+  <cac:AllowanceCharge>
+    <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+    <cbc:AllowanceChargeReason>Discount</cbc:AllowanceChargeReason>
+    <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+  </cac:AllowanceCharge>
+  <cac:TaxTotal>
+    <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+    <cac:TaxSubtotal>
+      <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cbc:Percent>20.0</cbc:Percent>
+      <cac:TaxCategory>
+        <cbc:TaxExemptionReasonCode>301</cbc:TaxExemptionReasonCode>
+        <cbc:TaxExemptionReason>Kısmi İstisna Diğerleri</cbc:TaxExemptionReason>
+        <cac:TaxScheme>
+          <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+          <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+        </cac:TaxScheme>
+      </cac:TaxCategory>
+    </cac:TaxSubtotal>
+  </cac:TaxTotal>
+  <cac:LegalMonetaryTotal>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
+    <cbc:TaxInclusiveAmount currencyID="TRY">158.40</cbc:TaxInclusiveAmount>
+    <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
+    <cbc:PayableAmount currencyID="TRY">158.40</cbc:PayableAmount>
+  </cac:LegalMonetaryTotal>
+  <cac:InvoiceLine>
+    <cbc:ID>1</cbc:ID>
+    <cbc:InvoicedQuantity unitCode="C62">3.0</cbc:InvoicedQuantity>
+    <cbc:LineExtensionAmount currencyID="TRY">132.00</cbc:LineExtensionAmount>
+    <cac:Delivery>
+      <cac:DeliveryAddress>
+        <cbc:StreetName>Gökhane Sokak No:1</cbc:StreetName>
+        <cbc:CitySubdivisionName>Sincan/Ankara</cbc:CitySubdivisionName>
+        <cbc:CityName>Ankara</cbc:CityName>
+        <cbc:PostalZone>06934</cbc:PostalZone>
+        <cac:Country>
+          <cbc:Name>Türkiye</cbc:Name>
+        </cac:Country>
+      </cac:DeliveryAddress>
+      <cac:DeliveryTerms>
+        <cbc:ID schemeID="INCOTERMS">DAF</cbc:ID>
+      </cac:DeliveryTerms>
+      <cac:Shipment>
+        <cbc:ID></cbc:ID>
+        <cac:ShipmentStage>
+          <cbc:TransportModeCode>1</cbc:TransportModeCode>
+        </cac:ShipmentStage>
+      </cac:Shipment>
+    </cac:Delivery>
+    <cac:AllowanceCharge>
+      <cbc:ChargeIndicator>false</cbc:ChargeIndicator>
+      <cbc:MultiplierFactorNumeric>0.12</cbc:MultiplierFactorNumeric>
+      <cbc:Amount currencyID="TRY">18.00</cbc:Amount>
+    </cac:AllowanceCharge>
+    <cac:TaxTotal>
+      <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cac:TaxSubtotal>
+        <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
+        <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+        <cbc:Percent>20.0</cbc:Percent>
+        <cac:TaxCategory>
+          <cac:TaxScheme>
+            <cbc:Name>Gerçek Usulde KDV</cbc:Name>
+            <cbc:TaxTypeCode>0015</cbc:TaxTypeCode>
+          </cac:TaxScheme>
+        </cac:TaxCategory>
+      </cac:TaxSubtotal>
+    </cac:TaxTotal>
+    <cac:Item>
+      <cbc:Description>product_a</cbc:Description>
+      <cbc:Name>product_a</cbc:Name>
+    </cac:Item>
+    <cac:Price>
+      <cbc:PriceAmount currencyID="TRY">50.0</cbc:PriceAmount>
+    </cac:Price>
+  </cac:InvoiceLine>
+</Invoice>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/test_xml_ubl_tr.py b/addons/l10n_tr_nilvera_einvoice_extended/tests/test_xml_ubl_tr.py
new file mode 100644
index 0000000000000..60d03845f36c8
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/test_xml_ubl_tr.py
@@ -0,0 +1,100 @@
+from freezegun import freeze_time
+
+from odoo.addons.l10n_tr_nilvera_einvoice.tests.test_xml_ubl_tr_common import TestUBLTRCommon
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+
+@tagged('post_install_l10n', 'post_install', '-at_install')
+class TestUBLTR(TestUBLTRCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.company_data['company'].partner_id.write({'l10n_tr_tax_office_id': cls.env.ref("l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_tax_office_1009").id})
+        cls.einvoice_partner.write({'l10n_tr_tax_office_id': cls.env.ref("l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_tax_office_1009").id})
+
+        cls.tax_20 = cls.env['account.chart.template'].ref('tr_s_20')
+        cls.tax_20_withholding = cls.env['account.chart.template'].ref('tr_s_vat_wh_20_OGH')
+        # Registered for Export Reason
+        cls.reason_701 = cls.env['account.chart.template'].ref('l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_701')
+
+        # Tax Exemption Reason
+        cls.reason_212 = cls.env['account.chart.template'].ref('l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_212')
+
+        # Export Reason
+        cls.reason_301 = cls.env['account.chart.template'].ref('l10n_tr_nilvera_einvoice_extended.l10n_tr_nilvera_einvoice_extended_account_tax_code_301')
+        cls.incoterm = cls.env['account.chart.template'].ref('l10n_tr_nilvera_einvoice_extended.incoterm_DAF')
+
+    def test_xml_invoice_basic_export_registered_einvoice(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.einvoice_partner, l10n_tr_gib_invoice_type="IHRACKAYITLI", l10n_tr_exemption_code_id=self.reason_701.id)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_basic_sale_earchive(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.earchive_partner)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_earchive.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_basic_sale_einvoice(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.einvoice_partner)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_sale_einvoice.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_basic_tax_exempt_einvoice(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.einvoice_partner, l10n_tr_gib_invoice_type="ISTISNA", l10n_tr_exemption_code_id=self.reason_212.id)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_tax_exempt_einvoice.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_basic_withholding_einvoice(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.einvoice_partner, self.tax_20_withholding, l10n_tr_gib_invoice_type="TEVKIFAT")
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_earchive_multicurrency(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.earchive_partner, currency_id=self.env.ref('base.USD').id)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_earchive_multicurrency.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_einvoice_multicurrency(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(partner_id=self.einvoice_partner, currency_id=self.env.ref('base.USD').id)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_einvoice_multicurrency.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
+
+    def test_xml_invoice_export_earchive(self):
+        with freeze_time('2025-03-05'):
+            generated_xml = self._generate_invoice_xml(self.earchive_partner, l10n_tr_is_export_invoice=True, l10n_tr_exemption_code_id=self.reason_301.id, l10n_tr_shipping_type="1", invoice_incoterm_id=self.incoterm.id)
+
+        with file_open('l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_export_earchive.xml', 'rb') as expected_xml_file:
+            expected_xml = expected_xml_file.read()
+
+        self.assertXmlTreeEqual(self.get_xml_tree_from_string(generated_xml), self.get_xml_tree_from_string(expected_xml))
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tools/__init__.py b/addons/l10n_tr_nilvera_einvoice_extended/tools/__init__.py
new file mode 100644
index 0000000000000..b66cc710dde90
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tools/__init__.py
@@ -0,0 +1,3 @@
+from . import clean_node_dict
+from . import ubl_tr_common
+from . import ubl_tr_invoice
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tools/clean_node_dict.py b/addons/l10n_tr_nilvera_einvoice_extended/tools/clean_node_dict.py
new file mode 100644
index 0000000000000..a65c26563fb15
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tools/clean_node_dict.py
@@ -0,0 +1,40 @@
+def clean_node_dict(node, template=None):
+    """Clean a UBL-style node dictionary by removing child nodes not defined in the template.
+    Attributes and metadata (like '_text', 'CurrencyID', 'SchemeID') are preserved.
+
+    :param node: dict representing the node
+    :param template: dict defining allowed child keys
+    :return: cleaned node dict
+    """
+    if not isinstance(node, dict) or template is None:
+        return node
+
+    for child_tag, child in list(node.items()):
+        # Skip special keys or simple attributes
+        if child_tag.startswith('_') or not isinstance(child, (dict, list)):
+            continue
+
+        # Remove child if not in template
+        if child_tag not in template:
+            node.pop(child_tag)
+            continue
+
+        child_template = template.get(child_tag)
+
+        if isinstance(child, dict):
+            # Recursive cleaning for dict children
+            cleaned_child = clean_node_dict(child, template=child_template)
+            node[child_tag] = cleaned_child
+
+        elif isinstance(child, list):
+            cleaned_list = []
+            for item in child:
+                if isinstance(item, dict):
+                    cleaned_item = clean_node_dict(item, template=child_template)
+                    cleaned_list.append(cleaned_item)
+                else:
+                    # If item is not a dict, keep as is
+                    cleaned_list.append(item)
+            node[child_tag] = cleaned_list
+
+    return node
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_common.py b/addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_common.py
new file mode 100644
index 0000000000000..0090393f8030f
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_common.py
@@ -0,0 +1,363 @@
+# This file contains dicts defining the order of nodes of UBL 1.2 elements.
+# These are the elements used in the Invoice, CreditNote, DebitNote, Distpatch and Order documents.
+
+# If you need to use a new element, you should define it below so that it will be added at the
+# correct place in the XML.
+
+Attachment = {
+    'cbc:EmbeddedDocumentBinaryObject': {},
+    'cac:ExternalReference': {
+        'cbc:URI': {},
+        'cbc:MimeCode': {},
+        'cbc:EncodingCode': {},
+        'cbc:FileName': {},
+        'cbc:Description': {},
+    },
+}
+
+Branch = {
+    'cbc:Name': {},
+    'cac:FinancialInstitution': {
+        'cbc:Name': {},
+    },
+}
+
+CommodityClassification = {
+    'cbc:ItemClassificationCode': {},
+}
+
+Country = {
+    'cbc:IdentificationCode': {},
+    'cbc:Name': {},
+}
+
+Contact = {
+    'cbc:Telephone': {},
+    'cbc:ElectronicMail': {},
+    'cbc:Telefax': {},
+}
+
+DocumentReference = {
+    'cbc:AttributeID': {},
+    'cbc:Measure': {},
+    'cbc:Description': {},
+    'cbc:MinimumMeasure': {},
+    'cbc:MaximumMeasure': {},
+}
+
+Price = {
+    'cbc:PriceAmount': {},
+}
+
+Period = {
+    'cbc:StartDate': {},
+    'cbc:StartTime': {},
+    'cbc:EndDate': {},
+    'cbc:EndTime': {},
+    'cbc:DurationMeasure': {},
+    'cbc:Description': {},
+}
+
+OrderReference = {
+    'cbc:ID': {},
+    'cbc:SalesOrderID': {},
+    'cbc:IssueDate': {},
+    'cbc:DocumentReference': {},
+}
+
+Address = {
+    'cbc:ID': {},
+    'cbc:AddressTypeCode': {},
+    'cbc:AddressFormatCode': {},
+    'cbc:StreetName': {},
+    'cbc:AdditionalStreetName': {},
+    'cbc:BuildingName': {},
+    'cbc:BuildingNumber': {},
+    'cbc:PlotIdentification': {},
+    'cbc:CitySubdivisionName': {},
+    'cbc:CityName': {},
+    'cbc:PostalZone': {},
+    'cbc:CountrySubentity': {},
+    'cbc:CountrySubentityCode': {},
+    'cac:AddressLine': {
+        'cbc:Line': {},
+    },
+    'cac:Country': Country,
+}
+
+BillingReference = {
+    'cac:InvoiceDocumentReference': DocumentReference,
+}
+
+IssuerParty = {
+    'cbc:EndpointID': {},
+    'cac:PartyIdentification': {
+        'cbc:ID': {},
+    },
+    'cac:PostalAddress': Address,
+}
+
+DocumentReference = {
+    'cbc:ID': {},
+    'cbc:UUID': {},
+    'cbc:IssueDate': {},
+    'cbc:IssueTime': {},
+    'cbc:DocumentTypeCode': {},
+    'cbc:DocumentStatusCode': {},
+    'cbc:DocumentType': {},
+    'cbc:DocumentDescription': {},
+    'cac:Attachment': Attachment,
+    'cac:IssuerParty': IssuerParty,
+}
+
+Signature = {
+    'cbc:ID': {},
+    'cbc:SignatureMethod': {},
+    'cac:SignatoryParty': {
+        'cac:PartyIdentification': {
+            'cbc:ID': {},
+        },
+        'cac:PostalAddress': Address,
+        'cac:PartyName': {
+            'cbc:Name': {},
+        },
+    },
+    'cac:DigitalSignatureAttachment': {
+        'cac:ExternalReference': {
+            'cbc:URI': {},
+        },
+    },
+}
+
+FinancialAccount = {
+    'cbc:ID': {},
+    'cbc:CurrencyCode': {},
+    'cbc:PaymentNote': {},
+    'cac:FinancialInstitutionBranch': Branch,
+}
+
+Person = {
+    'cbc:FirstName': {},
+    'cbc:FamilyName': {},
+    'cbc:Title': {},
+    'cbc:MiddleName': {},
+    'cbc:NameSuffix': {},
+    'cbc:NationID': {},
+    'cac:FinancialAccount': FinancialAccount,
+    'cac:IdentityDocumentReference': DocumentReference,
+}
+
+CorporateRegistrationScheme = {
+    'cbc:ID': {},
+    'cbc:Name': {},
+    'cbc:CorporateRegistrationTypeCode': {},
+    'cac:JuridictionRegionAddress': Address,
+}
+
+Party = {
+    'cbc:WebsiteURL': {},
+    'cbc:EndpointID': {},
+    'cbc:IndustryClassificationCode': {},
+    'cac:PartyIdentification': {
+        'cbc:ID': {},
+    },
+    'cac:PartyName': {
+        'cbc:Name': {},
+    },
+    'cac:PostalAddress': Address,
+    'cac:PhysicalLocation': Address,
+    'cac:PartyTaxScheme': {
+        'cac:TaxScheme': {
+            'cbc:Name': {},
+        },
+    },
+    'cac:PartyLegalEntity': {
+        'cbc:RegistrationName': {},
+        'cbc:CompanyID': {},
+        'cbc:RegistrationDate': {},
+        'cbc:SoleProprietorshipIndicator': {},
+        'cbc:CorporateStockAmount': {},
+        'cbc:FullyPaidSharesIndicator': {},
+        'cac:CorporateRegistrationScheme': CorporateRegistrationScheme,
+        'cac:HeadOfficeParty': {
+            'cac:PartyIdentification': {
+                'cbc:ID': {},
+            },
+            'cac:PostalAddress': Address,
+        },
+    },
+    'cac:Contact': Contact,
+    'cac:Person': Person,
+}
+
+
+SupplierParty = {
+    'cac:Party': Party,
+    'cac:DespatchContact': Contact,
+}
+
+CustomerParty = {
+    'cac:Party': Party,
+    'cac:DeliveryContact': Contact,
+}
+
+DeliveryTerms = {
+    'cbc:ID': {},
+    'cbc:SpecialTerms': {},
+    'cbc:Amount': {},
+}
+
+Despatch = {
+    'cbc:ID': {},
+    'cbc:ActualDespatchDate': {},
+    'cbc:ActualDespatchTime': {},
+    'cbc:Insuctions': {},
+    'cac:DespatchAddress': Address,
+    'cac:DespatchParty': Party,
+    'cac:Contact': Contact,
+    'cac:EstimatedDespatchPeriod': Period,
+}
+
+# cac:shipment has to be fully added here for l10n__nilvera_edispatch to be integrated with E-Invoicing
+# l10n__nilvera_edispatch.xml template has to be removed.
+GoodsItem = {
+    'cbc:RequiredCustomsID': {},
+}
+
+ShipmentStage = {
+    'cbc:TransportModeCode': {},
+}
+
+Shippment = {
+    'cbc:ID': {},
+    'cac:GoodsItem': GoodsItem,
+    'cac:ShipmentStage': ShipmentStage,
+}
+
+Delivery = {
+    'cbc:ID': {},
+    'cbc:Quantity': {},
+    'cbc:ActualDeliveryDate': {},
+    'cbc:ActualDeliveryTime': {},
+    'cbc:LatestDeliveryDate': {},
+    'cbc:LatestDeliveryTime': {},
+    'cbc:ackingID': {},
+    'cac:DeliveryAddress': Address,
+    'cac:AlternativeDeliveryLocation': Address,
+    'cac:EstimatedDeliveryPeriod': Period,
+    'cac:CarrierParty': Party,
+    'cac:DeliveryParty': Party,
+    'cac:Despatch': Despatch,
+    'cac:DeliveryTerms': DeliveryTerms,
+    'cac:Shipment': Shippment,
+}
+
+PaymentMeans = {
+    'cbc:PaymentMeansCode': {},
+    'cbc:PaymentDueDate': {},
+    'cbc:PaymentChannelCode': {},
+    'cbc:InsuctionNote': {},
+    'cac:PayerFinancialAccount': FinancialAccount,
+    'cac:PayeeFinancialAccount': FinancialAccount,
+}
+
+PaymentTerms = {
+    'cbc:Note': {},
+    'cbc:PenaltySurchargePercent': {},
+    'cbc:Amount': {},
+    'cbc:PenaltyAmount': {},
+    'cbc:PaymentDueDate': {},
+    'cac:SettlementPeriod': Period,
+}
+
+ExchangeRate = {
+    'cbc:SourceCurrencyCode': {},
+    'cbc:TargetCurrencyCode': {},
+    'cbc:CalculationRate': {},
+    'cbc:Date': {},
+}
+
+TaxCategory = {
+    'cbc:Name': {},
+    'cbc:TaxExemptionReasonCode': {},
+    'cbc:TaxExemptionReason': {},
+    'cac:TaxScheme': {
+        'cbc:ID': {},
+        'cbc:Name': {},
+        'cbc:TaxTypeCode': {},
+    },
+}
+
+AllowanceCharge = {
+    'cbc:ChargeIndicator': {},
+    'cbc:AllowanceChargeReason': {},
+    'cbc:MultiplierFactorNumeric': {},
+    'cbc:SequenceNumeric': {},
+    'cbc:Amount': {},
+    'cbc:BaseAmount': {},
+    'cbc:PerUnitAmount': {},
+}
+
+TaxTotal = {
+    'cbc:TaxAmount': {},
+    'cac:TaxSubtotal': {
+        'cbc:TaxableAmount': {},
+        'cbc:TaxAmount': {},
+        'cbc:CalculationSequenceNumeric': {},
+        'cbc:ansactionCurrencyTaxAmount': {},
+        'cbc:Percent': {},
+        'cbc:BaseUnitMeasure': {},
+        'cbc:PerUnitAmount': {},
+        'cac:TaxCategory': TaxCategory,
+    },
+}
+
+MonetaryTotal = {
+    'cbc:LineExtensionAmount': {},
+    'cbc:TaxExclusiveAmount': {},
+    'cbc:TaxInclusiveAmount': {},
+    'cbc:AllowanceTotalAmount': {},
+    'cbc:ChargeTotalAmount': {},
+    'cbc:PayableRoundingAmount': {},
+    'cbc:PayableAmount': {},
+}
+
+OrderLineReference = {
+    'cbc:LineID': {},
+}
+
+ItemIdentification = {
+    'cbc:ID': {},
+}
+
+# Any additional Properties for the Item Instance have to be added here
+AdditionalItemProperty = {
+
+}
+
+ItemInstance = {
+    'cbc:ProductaceID': {},
+    'cbc:ManufacturedDate': {},
+    'cbc:ManufacturedTime': {},
+    'cbc:BestBeforeDate': {},
+    'cbc:RegisationID': {},
+    'cbc:SerialID': {},
+    'cac:AdditionalItemProperty': AdditionalItemProperty,
+    'cac:LotIdentification': ItemIdentification,
+}
+
+Item = {
+    'cbc:Description': {},
+    'cbc:Name': {},
+    'cbc:Keyword': {},
+    'cbc:BrandName': {},
+    'cbc:ModelName': {},
+    'cac:BuyersItemIdentification': ItemIdentification,
+    'cac:SellersItemIdentification': ItemIdentification,
+    'cac:StandardItemIdentification': ItemIdentification,
+    'cac:ManufacturersItemIdentification': ItemIdentification,
+    'cac:AdditionalItemIdentification': ItemIdentification,
+    'cac:OriginCountry': Country,
+    'cac:CommodityClassification': CommodityClassification,
+    'cac:ItemInstance': ItemIdentification,
+}
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_invoice.py b/addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_invoice.py
new file mode 100644
index 0000000000000..24ea0fb010a11
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tools/ubl_tr_invoice.py
@@ -0,0 +1,64 @@
+# The Invoice dict defines the structure of a UBL TR Invoice, with all nodes in the correct order.
+# It can be passed as the `template` argument to `clean_dict_nodes` and then  `dict_to_xml` to
+# enforce the order of nodes. The TR Invoice dict is a created as a seperate dict than the UBL 2.1
+# and cleaned, since Turkey follows UBL 1.2.
+
+import odoo.addons.l10n_tr_nilvera_einvoice_extended.tools.ubl_tr_common as cac
+
+TrInvoiceLine = {
+    'cbc:ID': {},
+    'cbc:Note': {},
+    'cbc:InvoicedQuantity': {},
+    'cbc:LineExtensionAmount': {},
+    'cac:OrderLineReference': cac.OrderLineReference,
+    'cac:DespatchLineReference': cac.BillingReference,
+    'cac:ReceipitReference': cac.BillingReference,
+    'cac:Delivery': cac.Delivery,
+    'cac:AllowanceCharge': cac.AllowanceCharge,
+    'cac:TaxTotal': cac.TaxTotal,
+    'cac:WithholdingTaxTotal': cac.TaxTotal,
+    'cac:Item': cac.Item,
+    'cac:Price': cac.Price,
+}
+
+TrInvoice = {
+    '_tag': 'Invoice',
+    'ext:UBLExtensions': {},
+    'cbc:UBLVersionID': {},
+    'cbc:CustomizationID': {},
+    'cbc:ProfileID': {},
+    'cbc:ProfileExecutionID': {},
+    'cbc:ID': {},
+    'cbc:CopyIndicator': {},
+    'cbc:UUID': {},
+    'cbc:IssueDate': {},
+    'cbc:IssueTime': {},
+    'cbc:DueDate': {},
+    'cbc:InvoiceTypeCode': {},
+    'cbc:Note': {},
+    'cbc:DocumentCurrencyCode': {},
+    'cbc:TaxCurrencyCode': {},
+    'cbc:PricingCurrencyCode': {},
+    'cbc:LineCountNumeric': {},
+    'cbc:BuyerReference': {},
+    'cac:InvoicePeriod': cac.Period,
+    'cac:OrderReference': cac.OrderReference,
+    'cac:BillingReference': cac.BillingReference,
+    'cac:AdditionalDocumentReference': cac.DocumentReference,
+    'cac:Signature': cac.Signature,
+    'cac:AccountingSupplierParty': cac.SupplierParty,
+    'cac:AccountingCustomerParty': cac.CustomerParty,
+    'cac:SellerSupplierParty': cac.SupplierParty,
+    'cac:BuyerCustomerParty': cac.CustomerParty,
+    'cac:Delivery': cac.Delivery,
+    'cac:PaymentMeans': cac.PaymentMeans,
+    'cac:PaymentTerms': cac.PaymentTerms,
+    'cac:AllowanceCharge': cac.AllowanceCharge,
+    'cac:TaxExchangeRate': cac.ExchangeRate,
+    'cac:PricingExchangeRate': cac.ExchangeRate,
+    'cac:PaymentExchangeRate': cac.ExchangeRate,
+    'cac:TaxTotal': cac.TaxTotal,
+    'cac:WithholdingTaxTotal': cac.TaxTotal,
+    'cac:LegalMonetaryTotal': cac.MonetaryTotal,
+    'cac:InvoiceLine': TrInvoiceLine,
+}
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/account_move_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/account_move_views.xml
new file mode 100644
index 0000000000000..cfb38ad2fe20c
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/account_move_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_move_form_view_l10n_tr_nilvera_extended" model="ir.ui.view">
+        <field name="name">account.move.form.view.inherit.l10n_tr_nilvera_extended</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='accounting_info_group']/field[@name='invoice_incoterm_id']" position="attributes">
+                <attribute name="required" add="l10n_tr_is_export_invoice" separator=" or "/>
+            </xpath>
+
+            <xpath expr="//div[@name='journal_div']" position="after">
+                <field name="l10n_tr_is_export_invoice" invisible="l10n_tr_nilvera_customer_status != 'earchive'" readonly="state in ['cancel', 'posted']"/>
+                <div class="o_td_label" invisible="l10n_tr_is_export_invoice or country_code != 'TR' or move_type != 'out_invoice' or l10n_tr_nilvera_customer_status not in ['einvoice', 'earchive']">
+                    <label for="l10n_tr_gib_invoice_scenario" invisible="l10n_tr_nilvera_customer_status != 'einvoice'" />
+                    <label string="Invoice Type" for="l10n_tr_gib_invoice_type" invisible="l10n_tr_nilvera_customer_status != 'earchive'"/>
+                </div>
+                <div class="d-flex" invisible="l10n_tr_is_export_invoice or country_code != 'TR' or move_type != 'out_invoice' or l10n_tr_nilvera_customer_status not in ['einvoice', 'earchive']">
+                    <field name="l10n_tr_gib_invoice_scenario" invisible="l10n_tr_nilvera_customer_status != 'einvoice'" readonly="state in ['cancel', 'posted']"/>
+                    <span class="o_form_label mx-3" invisible="l10n_tr_nilvera_customer_status != 'einvoice'">is</span>
+                    <field name="l10n_tr_gib_invoice_type" invisible="l10n_tr_nilvera_customer_status not in ['einvoice', 'earchive']" readonly="state in ['cancel', 'posted']"/>
+                </div>
+                <field name="l10n_tr_exemption_code_id" domain="[('code_type', 'in', l10n_tr_exemption_code_domain_list or [])]" invisible="not l10n_tr_exemption_code_domain_list or l10n_tr_nilvera_customer_status not in ['einvoice', 'earchive']"  required="l10n_tr_is_export_invoice or l10n_tr_gib_invoice_type == 'IHRACKAYITLI'" readonly="state in ['cancel', 'posted']"/>
+                <field name="l10n_tr_shipping_type" invisible="not l10n_tr_exemption_code_domain_list or l10n_tr_nilvera_customer_status != 'earchive' or not l10n_tr_is_export_invoice" readonly="state in ['cancel', 'posted']"/>
+            </xpath>
+
+            <xpath expr="//field[@name='invoice_line_ids']//list//field[@name='tax_ids']" position="after">
+                <field name="l10n_tr_ctsp_number" optional="hide"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/account_tax_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/account_tax_views.xml
new file mode 100644
index 0000000000000..3b27fd556e931
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/account_tax_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_tax_form_view_l10n_tr_nilvera_extended" model="ir.ui.view">
+        <field name="name">account.tax.form.view.inherit.l10n_tr_nilvera_extended</field>
+        <field name="model">account.tax</field>
+        <field name="inherit_id" ref="account.view_tax_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='tax_scope']" position="after">
+                <field name="l10n_tr_tax_withholding_code_id" invisible="country_code != 'TR' or amount_type != 'percent' or amount &gt;= 0"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_account_tax_code_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_account_tax_code_views.xml
new file mode 100644
index 0000000000000..e423dc9b5c701
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_account_tax_code_views.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="l10n_tr_nilvera_einvoice_extended_account_tax_code_view_list" model="ir.ui.view">
+        <field name="name">l10n_tr_nilvera_einvoice_extended.account.tax.code.list</field>
+        <field name="model">l10n_tr_nilvera_einvoice_extended.account.tax.code</field>
+        <field name="arch" type="xml">
+            <list string="Tax Codes" multi_edit="1">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="code_type"/>
+                <field name="percentage" widget="percentage" optional="hide"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="l10n_tr_nilvera_einvoice_extended_account_tax_code_view_form" model="ir.ui.view">
+        <field name="name">l10n_tr_nilvera_einvoice_extended.account.tax.code.form</field>
+        <field name="model">l10n_tr_nilvera_einvoice_extended.account.tax.code</field>
+        <field name="arch" type="xml">
+            <form string="Tax Code">
+                <div class="alert alert-info text-center" role="alert">
+                        For a full list of codes and descriptions, check
+                        <a href="https://developer.nilvera.com/kod-listeleri">
+                        Nilvera's documentation</a>.
+                </div>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="code_type"/>
+                            <field name="percentage" widget="percentage"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_l10n_tr_nilvera_einvoice_extended_account_tax_code_list" model="ir.actions.act_window">
+        <field name="name">GIB Codes</field>
+        <field name="res_model">l10n_tr_nilvera_einvoice_extended.account.tax.code</field>
+        <field name="view_id" ref="l10n_tr_nilvera_einvoice_extended_account_tax_code_view_list"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a GIB Reason
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+        id="l10n_tr_menu_account_tax_code"
+        action="action_l10n_tr_nilvera_einvoice_extended_account_tax_code_list"
+        parent="account.account_account_menu"
+        sequence="9"
+        groups="base.group_no_one"/>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_tax_office_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_tax_office_views.xml
new file mode 100644
index 0000000000000..e744ff7b913a0
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/l10n_tr_nilvera_einvoice_extended_tax_office_views.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="l10n_tr_nilvera_einvoice_extended_tax_office_view_list" model="ir.ui.view">
+        <field name="name">l10n_tr_nilvera_einvoice_extended.tax.office.list</field>
+        <field name="model">l10n_tr_nilvera_einvoice_extended.tax.office</field>
+        <field name="arch" type="xml">
+            <list string="Tax Offices" multi_edit="1">
+                <field name="code" optional="hide"/>
+                <field name="name"/>
+                <field name="state_code"/>
+                <field name="state_id"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="l10n_tr_nilvera_einvoice_extended_tax_office_view_form" model="ir.ui.view">
+        <field name="name">l10n_tr_nilvera_einvoice_extended.tax.office.form</field>
+        <field name="model">l10n_tr_nilvera_einvoice_extended.tax.office</field>
+        <field name="arch" type="xml">
+            <form string="Tax Office">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="state_id"/>
+                            <field name="state_code"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_l10n_tr_nilvera_einvoice_extended_tax_office_list" model="ir.actions.act_window">
+        <field name="name">GIB Tax Offices</field>
+        <field name="res_model">l10n_tr_nilvera_einvoice_extended.tax.office</field>
+        <field name="view_id" ref="l10n_tr_nilvera_einvoice_extended_tax_office_view_list"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a Tax Office
+            </p>
+        </field>
+    </record>
+
+    <menuitem id="l10n_tr_menu_state_office_partner" action="action_l10n_tr_nilvera_einvoice_extended_tax_office_list" parent="contacts.menu_localisation" sequence="10"/>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/product_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/product_views.xml
new file mode 100644
index 0000000000000..d600dad9a7b22
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/product_views.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <!-- view used for product.template only -->
+        <record id="product_template_only_form_view_inherit_l10n_tr_nilvera_extended" model="ir.ui.view">
+            <field name="name">product.template.product.form.view.inherit.l10n_tr_nilvera_extended</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_only_form_view"/>
+            <field name="arch" type="xml">
+                    <xpath expr="//field[@name='barcode']" position="after">
+                        <field name="l10n_tr_ctsp_number"
+                               invisible="product_variant_count &gt; 1
+                                    or (product_variant_count == 0
+                                    and valid_product_template_attribute_line_ids)
+                                    or 'TR' not in fiscal_country_codes"/>
+                    </xpath>
+                </field>
+        </record>
+        <!-- view used for product.product only -->
+        <record id="product_product_only_form_view_inherit_l10n_tr_nilvera_extended" model="ir.ui.view">
+            <field name="name">product.product.form.view.inherit.l10n_tr_nilvera_extended</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='barcode']" position="after">
+                    <field name="l10n_tr_ctsp_number" invisible="'TR' not in fiscal_country_codes"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/res_company_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/res_company_views.xml
new file mode 100644
index 0000000000000..e16043bdb9bad
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/res_company_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_company_form_inherit_l10n_tr_nilvera_extended" model="ir.ui.view">
+        <field name="name">res.company.form.inherit.l10n_tr_nilvera_extended</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='vat']" position="after">
+                <field name="l10n_tr_tax_office_id" string="Tax Office" invisible="country_code != 'TR'"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/res_config_settings_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/res_config_settings_views.xml
new file mode 100644
index 0000000000000..e730b1df4df77
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/res_config_settings_views.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form_l10n_tr_nilvera_extended" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.l10n_tr_nilvera_extended</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="l10n_tr_nilvera.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//block[@id='l10n_tr_nilvera_settings']/div/div[hasclass('o_setting_right_pane')]" position="inside">
+                <div class="row" groups="base.group_no_one">
+                    <label string="Export Alias" for="l10n_tr_nilvera_export_alias" class="col-lg-3 o_light_label"/>
+                    <field name="l10n_tr_nilvera_export_alias"/>
+                </div>
+                <div class="alert alert-warning o_setting_box" groups="base.group_no_one" role="alert">
+                    <p>
+                        <span class="fw-bold">Warning:</span> Changing the Export Alias will cause issues for export invoice scenario.
+                    </p>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/views/res_partner_views.xml b/addons/l10n_tr_nilvera_einvoice_extended/views/res_partner_views.xml
new file mode 100644
index 0000000000000..becc743d6c23e
--- /dev/null
+++ b/addons/l10n_tr_nilvera_einvoice_extended/views/res_partner_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_partner_form_l10n_tr_nilvera_extended" model="ir.ui.view">
+            <field name="name">view.partner.form.inherit.l10n_tr_nilvera_extended</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div/field[@name='state_id']/.." position="after">
+                    <field name="l10n_tr_tax_office_id" invisible="country_code != 'TR'"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>

From ac9a9259a03c2dad76e6bbe061cce94c0cb40441 Mon Sep 17 00:00:00 2001
From: Harsh Modi <hamo@odoo.com>
Date: Mon, 3 Nov 2025 11:52:37 +0000
Subject: [PATCH 154/673] [FIX] l10n_in: Use partner autocomplete data to set
 GST Treatment

Before this commit:
We used to set `regular` treatment when using QR Vendor Scan
or Fetching bill with IRN

After this commit:
We use the GST Treatment received from Partner Autocomplete
to set the GST Treatment

task-none

closes odoo/odoo#234264

X-original-commit: 3519695058e3ecfdc7ddc017006ce7dd7572ee75
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Harsh Modi (hamo) <hamo@odoo.com>
---
 addons/l10n_in/models/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in/models/res_partner.py b/addons/l10n_in/models/res_partner.py
index 26f12fac71e73..bc84fdc67c191 100644
--- a/addons/l10n_in/models/res_partner.py
+++ b/addons/l10n_in/models/res_partner.py
@@ -238,7 +238,7 @@ def _l10n_in_get_partner_vals_by_vat(self, vat):
             'country_id': partner_data.get('country_id', {}).get('id'),
             'state_id': partner_data.get('state_id', {}).get('id'),
             'company_type': 'company',
-            'l10n_in_gst_treatment': 'regular',
+            'l10n_in_gst_treatment': partner_data.get('l10n_in_gst_treatment', 'regular'),
         })
         return partner_data
 

From 0141da4c85bc8d38a5ed3ff6162b38c02ce01a7e Mon Sep 17 00:00:00 2001
From: masm-odoo <masm@odoo.com>
Date: Fri, 26 Sep 2025 12:05:19 +0000
Subject: [PATCH 155/673] [ADD] l10n_in: introduce new 40% GST tax rates

This commit adds new GST taxes under the Indian tax type.

For the Purchase category, the following taxes are added:
- CGST 20%
- SGST 20%
- GST 40% (group of CGST + SGST)
- IGST 40%
- SEZ/EXPORT 40%
- SEZ/EXPORT-LUT 40%

For the Sale category, the following taxes are added:
- CGST 20%
- SGST 20%
- GST 40% (group of CGST + SGST)
- IGST 40%

Task-5116912

closes odoo/odoo#234190

X-original-commit: 60a88b72d0c9c14cfc0894782f134272eab253db
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: MohsinAli Masi (masm) <masm@odoo.com>
---
 .../l10n_in/data/template/account.tax-in.csv  | 44 +++++++++++++++++++
 addons/l10n_in/models/template_in.py          |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in/data/template/account.tax-in.csv b/addons/l10n_in/data/template/account.tax-in.csv
index ff0e8c9978e51..a126ce303c40b 100644
--- a/addons/l10n_in/data/template/account.tax-in.csv
+++ b/addons/l10n_in/data/template/account.tax-in.csv
@@ -48,6 +48,10 @@
 "","","","","","","","","","","","","","","","","","","tax","invoice","p11234","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p11234","l10n_in.tax_tag_igst","","","",""
+"igst_sale_40","40% IGST S","IGST","IGST 40%","sale","gst","percent","40.0","","False","igst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","sgst_sale_40",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p11234","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p11234","l10n_in.tax_tag_igst","","","",""
 "sgst_sale_0_5","0.5% SGST S","SGST","SGST 0.5%","none","gst","percent","0.5","","False","sgst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_sgst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","invoice","p11232","l10n_in.tax_tag_sgst","","","",""
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_sgst","","","",""
@@ -102,6 +106,15 @@
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_cgst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p11233","l10n_in.tax_tag_cgst","","","",""
 "sgst_sale_5","5% GST S","GST","GST 5%","sale","","group","5.0","","False","gst_group","","","sgst_sale_2_5,cgst_sale_2_5","","0","","","","","","","","","",""
+"sgst_sale_20","20% SGST S","SGST","SGST 20%","none","gst","percent","20.0","","False","sgst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_sgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p11232","l10n_in.tax_tag_sgst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_sgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p11232","l10n_in.tax_tag_sgst","","","",""
+"cgst_sale_20","20% CGST S","CGST","CGST 20%","none","gst","percent","20.0","","False","cgst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_cgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p11233","l10n_in.tax_tag_cgst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_cgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p11233","l10n_in.tax_tag_cgst","","","",""
+"sgst_sale_40","40% GST S","GST","GST 40%","sale","","group","40.0","","False","gst_group","","","sgst_sale_20,cgst_sale_20","","","","","","","","","","","",""
 "cess_purchase_5","5% CESS P","CESS","CESS 5%","none","gst","percent","5.0","","False","cess_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_cess","","","",""
 "","","","","","","","","","","","","","","","","","","tax","invoice","p10055","l10n_in.tax_tag_cess","","","",""
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_cess","","","",""
@@ -151,6 +164,10 @@
 "","","","","","","","","","","","","","","","","","","tax","invoice","p10053","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p10053","l10n_in.tax_tag_igst","","","",""
+"igst_purchase_40","40% IGST P","IGST","IGST 40%","purchase","gst","percent","40.0","","False","igst_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","sgst_purchase_40",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p10053","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p10053","l10n_in.tax_tag_igst","","","",""
 "sgst_purchase_0_5","0.5% SGST P","SGST","SGST 0.5%","none","gst","percent","0.5","","False","sgst_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_sgst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","invoice","p10051","l10n_in.tax_tag_sgst","","","",""
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_sgst","","","",""
@@ -205,6 +222,15 @@
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_cgst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p10052","l10n_in.tax_tag_cgst","","","",""
 "sgst_purchase_5","5% GST P","GST","GST 5%","purchase","","group","5.0","","False","gst_group","","","sgst_purchase_2_5,cgst_purchase_2_5","","0","","","","","","","","","",""
+"sgst_purchase_20","20% SGST P","SGST","SGST 20%","none","gst","percent","20","","False","sgst_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_sgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p10051","l10n_in.tax_tag_sgst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_sgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p10051","l10n_in.tax_tag_sgst","","","",""
+"cgst_purchase_20","20% CGST P","CGST","CGST 20%","none","gst","percent","20","","False","cgst_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_cgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p10052","l10n_in.tax_tag_cgst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_cgst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p10052","l10n_in.tax_tag_cgst","","","",""
+"sgst_purchase_40","40% GST P","GST","GST 40%","purchase","","group","40.0","","False","gst_group","","","sgst_purchase_20,cgst_purchase_20","","","","","","","","","","","",""
 "cess_purchase_5_rc","5% CESS RC","CESS","CESS 5% RC","none","gst","percent","5.0","","False","cess_group","","","","","","True","","base","invoice","","l10n_in.tax_tag_base_cess","","fiscal_position_in_reverse_charge_intra","cess_purchase_5",""
 "","","","","","","","","","","","","","","","","","","tax","invoice","p10057","","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","invoice","p11235","l10n_in.tax_tag_cess","","","",""
@@ -386,6 +412,12 @@
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p112342","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","refund","p100531","","","","",""
+"igst_sale_40_sez_exp","40% IGST S (EXP)","IGST (EXPORT)","IGST (EXPORT) 40%","sale","gst","percent","40.0","","False","igst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","sgst_sale_40",""
+"","","","","","","","","","","","","","","","","","","tax","invoice","p112342","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","-100","tax","invoice","p100531","","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p112342","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","-100","tax","refund","p100531","","","","",""
 "igst_sale_0_sez_exp_lut","0% IGST S (EXP-LUT)","IGST (Export under LUT)","IGST (EXPORT-LUT) 0%","sale","gst","percent","0.0","","False","igst_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","exempt_sale,nil_rated_sale,non_gst_supplies_sale","True"
 "","","","","","","","","","","","","","","","","","","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
@@ -428,6 +460,12 @@
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
+"igst_sale_40_sez_exp_lut","40% IGST S (EXP-LUT)","IGST (Export under LUT)","IGST (EXPORT-LUT) 40%","sale","gst","percent","40.0","","False","igst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","sgst_sale_40","True"
+"","","","","","","","","","","","","","","","","","","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","-100","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","-100","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
 "igst_sale_0_sez_lut","0% IGST S (SEZ-LUT)","IGST (Special Economic Zone under LUT)","IGST (SEZ-LUT)  0%","sale","gst","percent","0.0","","False","igst_group","","","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","exempt_sale,nil_rated_sale,non_gst_supplies_sale","True"
 "","","","","","","","","","","","","","","","","","","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
@@ -470,6 +508,12 @@
 "","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
 "","","","","","","","","","","","","","","","","","","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
+"igst_sale_40_sez_lut","40% IGST S (SEZ-LUT)","IGST (Special Economic Zone under LUT)","IGST (SEZ-LUT) 40%","sale","gst","percent","40.0","","False","igst_group","False","True","","","","","","base","invoice","","l10n_in.tax_tag_base_igst","","","sgst_sale_40","True"
+"","","","","","","","","","","","","","","","","","","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","-100","tax","invoice","p112341","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","","base","refund","","l10n_in.tax_tag_base_igst","","","",""
+"","","","","","","","","","","","","","","","","","","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
+"","","","","","","","","","","","","","","","","","-100","tax","refund","p112341","l10n_in.tax_tag_igst","","","",""
 "igst_sale_18_rc","18% IGST RC","IGST (RC)","IGST 18%","sale","gst","percent","18.0","","False","igst_group","","","","","","True","","base","invoice","","l10n_in.tax_tag_base_igst","","fiscal_position_in_reverse_charge_inter","sgst_sale_18",""
 "","","","","","","","","","","","","","","","","","","tax","invoice","p11237","l10n_in.tax_tag_igst","","","",""
 "","","","","","","","","","","","","","","","","","-100","tax","invoice","p11237","","","","",""
diff --git a/addons/l10n_in/models/template_in.py b/addons/l10n_in/models/template_in.py
index 4a96668d89a34..40d8045cd57c2 100644
--- a/addons/l10n_in/models/template_in.py
+++ b/addons/l10n_in/models/template_in.py
@@ -109,7 +109,7 @@ def _get_in_account_fiscal_position(self):
         }
 
     def _get_l10n_in_fiscal_tax_vals(self, fiscal_position_xml_ids):
-        rates = [1, 2, 5, 12, 18, 28]
+        rates = [1, 2, 5, 12, 18, 28, 40]
         taxes_xml_ids = []
 
         if fiscal_position_xml_ids == 'fiscal_position_in_intra_state':

From e517235f3ad5cce026149c8c067fb12f23bcb179 Mon Sep 17 00:00:00 2001
From: khsr-odoo <khsr@odoo.com>
Date: Fri, 10 Oct 2025 07:26:33 +0000
Subject: [PATCH 156/673] [FIX] base: incorrect address format for Chile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
1. Go to Sales > Create and edit a new customer.
2. Select Chile as the country and choose a state.

Issue:
State codes appear as numbers (e.g., 01, 02, 03...) which are not ISO-compliant.

Cause:
State codes in the CSV file were defined as simple numbers instead of proper ISO
codes.

Solution:
Updated all state codes to match the official ISO 3166-2:IQ codes
(Reference: https://www.iso.org/obp/ui/#iso:code:3166:CL)

opw-5148562

closes odoo/odoo#234244

X-original-commit: ea4168ce6a97bc2c9da809089c6875fbd3be7187
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
Signed-off-by: Khushi Srivastava (khsr) <khsr@odoo.com>
---
 odoo/addons/base/data/res.country.state.csv | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/odoo/addons/base/data/res.country.state.csv b/odoo/addons/base/data/res.country.state.csv
index 402e2ad451fe1..237714a2b8c37 100644
--- a/odoo/addons/base/data/res.country.state.csv
+++ b/odoo/addons/base/data/res.country.state.csv
@@ -1144,22 +1144,22 @@ state_pe_22,pe,"San Martín","22"
 state_pe_23,pe,"Tacna","23"
 state_pe_24,pe,"Tumbes","24"
 state_pe_25,pe,"Ucayali","25"
-state_cl_01,cl,"Tarapacá","01"
-state_cl_02,cl,"Antofagasta","02"
-state_cl_03,cl,"Atacama","03"
-state_cl_04,cl,"Coquimbo","04"
-state_cl_05,cl,"Valparaíso","05"
-state_cl_06,cl,"del Libertador Gral. Bernardo O'Higgins","06"
-state_cl_07,cl,"del Maule","07"
-state_cl_08,cl,"del BíoBio","08"
-state_cl_09,cl,"de la Araucania","09"
-state_cl_10,cl,"de los Lagos","10"
-state_cl_11,cl,"Aysén del Gral. Carlos Ibáñez del Campo","11"
-state_cl_12,cl,"Magallanes","12"
-state_cl_13,cl,"Metropolitana","13"
-state_cl_14,cl,"Los Ríos","14"
-state_cl_15,cl,"Arica y Parinacota","15"
-state_cl_16,cl,"del Ñuble","16"
+state_cl_01,cl,"Tarapacá","CL-TA"
+state_cl_02,cl,"Antofagasta","CL-AN"
+state_cl_03,cl,"Atacama","CL-AT"
+state_cl_04,cl,"Coquimbo","CL-CO"
+state_cl_05,cl,"Valparaíso","CL-VS"
+state_cl_06,cl,"del Libertador Gral. Bernardo O'Higgins","CL-LI"
+state_cl_07,cl,"del Maule","CL-ML"
+state_cl_08,cl,"del BíoBio","CL-BI"
+state_cl_09,cl,"de la Araucania","CL-AR"
+state_cl_10,cl,"de los Lagos","CL-LL"
+state_cl_11,cl,"Aysén del Gral. Carlos Ibáñez del Campo","CL-AI"
+state_cl_12,cl,"Magallanes","CL-MA"
+state_cl_13,cl,"Metropolitana","CL-RM"
+state_cl_14,cl,"Los Ríos","CL-LR"
+state_cl_15,cl,"Arica y Parinacota","CL-AP"
+state_cl_16,cl,"del Ñuble","CL-NB"
 state_ee_37,ee,"Harjumaa","EE-37"
 state_ee_39,ee,"Hiiumaa","EE-39"
 state_ee_44,ee,"Ida-Virumaa","EE-44"

From edd93e656152da13be2d58a5ee6edcc6e00ef082 Mon Sep 17 00:00:00 2001
From: Saurabh <sauc@odoo.com>
Date: Tue, 9 Sep 2025 11:47:00 +0000
Subject: [PATCH 157/673] [FIX] web: refine ribbon position in modal forms with
 statusbar

Previously, `position: static` was added on `.o_form_sheet` in modal
forms to fix an issue where the ribbon looked ugly (not pinned to the
top right) due to the absence of borders in modals. See commit:
https://github.com/odoo/odoo/commit/1ac2ff5b7dd64ccfe1bfb9c3fb7bb8a758e887d7

However, when a statusbar is present, this rule caused the ribbon to
merge into the statusbar, making its display worse.

In addition, on scrolling in a modal, the statusbar and
the form contents were getting merged.

This commit refines :
- the selector so that `position: static` is only
applied when a modal form has a ribbon but no statusbar. When a
statusbar exists, the ribbon remains visually separated from the
statusbar.
- the statusbar background-color logic so that inside modals
it uses the proper `$o-view-background-color`, ensuring a
clean separation even on scrolling.

task-4873636

closes odoo/odoo#234255

X-original-commit: db206035bb92ebbb00fec83f9464021448161c23
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/web/static/src/views/form/form_controller.scss  | 5 +++--
 addons/web/static/src/views/widgets/ribbon/ribbon.scss | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/views/form/form_controller.scss b/addons/web/static/src/views/form/form_controller.scss
index 291957439556f..54012a58f91d1 100644
--- a/addons/web/static/src/views/form/form_controller.scss
+++ b/addons/web/static/src/views/form/form_controller.scss
@@ -308,9 +308,10 @@
             position: sticky;
             top: 0;
             z-index: $zindex-sticky;
+            background-color: $body-bg;
 
-            &:not(.modal .o_form_statusbar) {
-                background-color: $body-bg;
+            .modal & {
+                background-color: $o-view-background-color;
             }
         }
 
diff --git a/addons/web/static/src/views/widgets/ribbon/ribbon.scss b/addons/web/static/src/views/widgets/ribbon/ribbon.scss
index cd45f895ea36b..0bbb77dff505d 100644
--- a/addons/web/static/src/views/widgets/ribbon/ribbon.scss
+++ b/addons/web/static/src/views/widgets/ribbon/ribbon.scss
@@ -64,6 +64,7 @@
     }
 }
 
-.modal .modal-dialog .o_form_sheet:has(> .o_widget_web_ribbon) {
+.modal .modal-dialog .o_form_sheet_bg:not(:has(> .o_form_statusbar))
+    > .o_form_sheet:has(> .o_widget_web_ribbon) {
     position: static !important;
 }

From 943ea19af21c39ebc2822c85ed4dbbe5eb874e0d Mon Sep 17 00:00:00 2001
From: Jitendra Prajapat <jipr@odoo.com>
Date: Wed, 29 Oct 2025 12:51:57 +0000
Subject: [PATCH 158/673] [FIX] point_of_sale: hide total on payment buttons
 without cash rounding

Before this commit:
====================
The total amount was displayed on payment method buttons on the payment screen
even when no cash rounding method was configured.

After this commit:
=======================
The total amount is no longer shown on payment method buttons if no cash
rounding method is configured.

Task-5219865

closes odoo/odoo#234236

X-original-commit: 43c3d49522f2fbc9a7773ef768e6736f4e4191e5
Signed-off-by: David Monnom (moda) <moda@odoo.com>
Signed-off-by: Jitendra Kumar Prajapat (jipr) <jipr@odoo.com>
---
 .../static/src/app/services/pos_store.js      |  9 ++++++++-
 .../tests/unit/services/pos_service.test.js   | 20 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index e88c05b4081bd..097968280aef9 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -2602,7 +2602,14 @@ export class PosStore extends WithLazyGetterTrap {
     }
     getPaymentMethodFmtAmount(pm, order) {
         const amount = order.getDefaultAmountDueToPayIn(pm);
-        return this.env.utils.formatCurrency(amount, true);
+        const fmtAmount = this.env.utils.formatCurrency(amount, true);
+
+        if (!this.currency.isPositive(amount) || !this.config.cash_rounding) {
+            return;
+        }
+        if (!this.config.only_round_cash_method || pm.type === "cash") {
+            return fmtAmount;
+        }
     }
     getDate(date) {
         const todayTs = DateTime.now().startOf("day").ts;
diff --git a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
index c6cf00004c7b3..00b09ba04166a 100644
--- a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
+++ b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
@@ -8,6 +8,7 @@ import {
     getStrNotes,
     filterChangeByCategories,
 } from "@point_of_sale/app/models/utils/order_change";
+import { prepareRoundingVals } from "../accounting/utils";
 
 definePosModels();
 
@@ -409,6 +410,25 @@ describe("pos_store.js", () => {
         expect(orderToDelete).toHaveLength(0);
     });
 
+    test("getPaymentMethodFmtAmount", async () => {
+        const store = await setupPosEnv();
+        const order = await getFilledOrder(store);
+        const cashPm = store.models["pos.payment.method"].find((pm) => pm.is_cash_count);
+
+        // Case 1: No rounding enabled
+        expect(store.getPaymentMethodFmtAmount(cashPm, order)).toBeEmpty();
+
+        // Case 2: Rounding enabled, not limited to cash
+        const { cashPm: cash1, cardPm: card1 } = prepareRoundingVals(store, 0.05, "HALF-UP", false);
+        expect(store.getPaymentMethodFmtAmount(cash1, order)).toBe("$ 17.85");
+        expect(store.getPaymentMethodFmtAmount(card1, order)).toBe("$ 17.85");
+
+        // Case 3: Rounding enabled, only for cash
+        const { cashPm: cash2, cardPm: card2 } = prepareRoundingVals(store, 0.05, "HALF-UP", true);
+        expect(store.getPaymentMethodFmtAmount(cash2, order)).toBe("$ 17.85");
+        expect(store.getPaymentMethodFmtAmount(card2, order)).toBeEmpty();
+    });
+
     describe("cacheReceiptLogo", () => {
         function getCompanyLogo256Url(companyId) {
             const fullUrl = imageUrl("res.company", companyId, "logo", {

From 80c5cf13f49b13a97e6085356e530e428f2ab854 Mon Sep 17 00:00:00 2001
From: Maryam Kia <maki@odoo.com>
Date: Thu, 25 Sep 2025 11:15:26 +0200
Subject: [PATCH 159/673] [IMP] mail, *: use `count` pseudo in tests when it's
 possible

*: test_mail_full, website_livechat

It's now possible to use the count pseudo class in selectors since the commit
below. This change converts some parts of the tests to use this new pseudo.

https://github.com/odoo/odoo/pull/231355/commits/56c772fff011ae99c54c0d66708691c27a24499d

task-5106412

closes odoo/odoo#224941

Signed-off-by: Maryam Kia (maki) <maki@odoo.com>
---
 .../tours/discuss_channel_as_guest_tour.js    | 10 ++----
 .../tours/discuss_sub_channel_search_tour.js  | 29 ++++++++--------
 .../tests/tours/mail_composer_test_tour.js    |  7 ++--
 .../tours/mail_message_load_order_tour.js     | 10 +++---
 .../tours/user_modify_own_profile_tour.js     | 14 +++-----
 .../static/tests/tours/load_more_tour.js      |  9 +----
 .../tests/tours/message_actions_tour.js       | 25 ++------------
 .../tours/website_livechat_chatbot_flow.js    | 10 ++----
 ...website_livechat_chatbot_test_page_tour.js | 34 ++++---------------
 ..._livechat_no_new_session_with_hide_rule.js | 12 ++-----
 10 files changed, 42 insertions(+), 118 deletions(-)

diff --git a/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js b/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js
index a2344459e7442..a19689c6d24d8 100644
--- a/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js
+++ b/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js
@@ -1,5 +1,4 @@
 import { registry } from "@web/core/registry";
-import { contains } from "@web/../tests/utils";
 
 registry.category("web_tour.tours").add("discuss_channel_as_guest_tour.js", {
     steps: () => [
@@ -31,13 +30,8 @@ registry.category("web_tour.tours").add("discuss_channel_as_guest_tour.js", {
             run: "fill @",
         },
         {
-            trigger: ".o-mail-DiscussCommand",
-            async run() {
-                await contains(".fa-hashtag", {
-                    parent: [".o-mail-DiscussCommand", { text: "Test channel" }],
-                });
-                await contains(".fa-user", { count: 0 });
-            },
+            trigger:
+                ".o-mail-DiscussCommand:not(:has(.fa-user)):has(.fa-hashtag):contains(/^Test channel$/)",
         },
     ],
 });
diff --git a/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js b/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js
index b64e5b97096b4..04e61c7f35f94 100644
--- a/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js
+++ b/addons/mail/static/tests/tours/discuss_sub_channel_search_tour.js
@@ -37,14 +37,15 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             run: "click",
         },
         {
-            trigger: ".o-mail-SubChannelList",
-            async run() {
+            trigger: ".o-mail-SubChannelList .o-mail-SubChannelPreview:count(30)",
+            async run({ waitFor }) {
                 // 30 newest sub channels are loaded initially.
                 for (let i = 99; i > 69; i--) {
                     await contains(".o-mail-SubChannelPreview", {
                         text: `Sub Channel ${i}`,
                     });
-                    await contains(".o-mail-SubChannelPreview", { count: 30 });
+                    // If any sub channel was added or removed during the previous await, this fails.
+                    await waitFor(".o-mail-SubChannelPreview:count(30)");
                 }
             },
         },
@@ -58,9 +59,9 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             run: "click",
         },
         {
-            trigger: ".o-mail-SubChannelPreview:contains(Sub Channel 10)",
+            trigger:
+                ".o-mail-SubChannelList .o-mail-SubChannelPreview:count(1):contains(Sub Channel 10)",
             async run() {
-                await contains(".o-mail-SubChannelPreview", { count: 1 });
                 waitForLoadMoreToDisappearDef = new Deferred();
             },
         },
@@ -69,9 +70,9 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             run: "clear",
         },
         {
-            trigger: ".o-mail-SubChannelPreview:contains(Sub Channel 99)",
+            trigger:
+                ".o-mail-SubChannelList .o-mail-SubChannelPreview:count(31):contains(Sub Channel 99)",
             async run() {
-                await contains(".o-mail-SubChannelPreview", { count: 31 });
                 // Already fetched sub channels are shown in addition to the one
                 // that was fetched during the search.
                 for (let i = 99; i > 69; i--) {
@@ -87,9 +88,9 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             },
         },
         {
-            trigger: ".o-mail-SubChannelPreview:contains(Sub Channel 40)",
+            trigger:
+                ".o-mail-SubChannelList .o-mail-SubChannelPreview:count(61):contains(Sub Channel 40)",
             async run() {
-                await contains(".o-mail-SubChannelPreview", { count: 61 });
                 for (let i = 99; i > 39; i--) {
                     await contains(".o-mail-SubChannelPreview", {
                         text: `Sub Channel ${i}`,
@@ -101,9 +102,9 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             },
         },
         {
-            trigger: ".o-mail-SubChannelPreview:contains(Sub Channel 11)",
+            trigger:
+                ".o-mail-SubChannelList .o-mail-SubChannelPreview:count(90):contains(Sub Channel 11)",
             async run() {
-                await contains(".o-mail-SubChannelPreview", { count: 90 });
                 for (let i = 99; i > 9; i--) {
                     await contains(".o-mail-SubChannelPreview", {
                         text: `Sub Channel ${i}`,
@@ -114,10 +115,10 @@ registry.category("web_tour.tours").add("test_discuss_sub_channel_search", {
             },
         },
         {
-            trigger: ".o-mail-SubChannelPreview:contains(Sub Channel 0)",
+            trigger:
+                ".o-mail-SubChannelList .o-mail-SubChannelPreview:count(100):contains(Sub Channel 0)",
             async run() {
-                await contains(".o-mail-SubChannelPreview", { count: 100 });
-                for (let i = 99; i > 0; i--) {
+                for (let i = 99; i >= 0; i--) {
                     await contains(".o-mail-SubChannelPreview", {
                         text: `Sub Channel ${i}`,
                     });
diff --git a/addons/mail/static/tests/tours/mail_composer_test_tour.js b/addons/mail/static/tests/tours/mail_composer_test_tour.js
index e670fa52ba6f6..e69eca194b326 100644
--- a/addons/mail/static/tests/tours/mail_composer_test_tour.js
+++ b/addons/mail/static/tests/tours/mail_composer_test_tour.js
@@ -1,5 +1,5 @@
 import { registry } from "@web/core/registry";
-import { contains, dragenterFiles, dropFiles, inputFiles } from "@web/../tests/utils";
+import { dragenterFiles, dropFiles, inputFiles } from "@web/../tests/utils";
 
 /**
  * This tour depends on data created by python test in charge of launching it.
@@ -11,10 +11,7 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/mail_composer_t
     steps: () => [
         {
             content: "Wait for the chatter to be fully loaded",
-            trigger: ".o-mail-Chatter",
-            async run() {
-                await contains(".o-mail-Message", { count: 1 });
-            },
+            trigger: ".o-mail-Chatter .o-mail-Message:count(1)",
         },
         {
             content: "Click on Send Message",
diff --git a/addons/mail/static/tests/tours/mail_message_load_order_tour.js b/addons/mail/static/tests/tours/mail_message_load_order_tour.js
index e6942b2e5074a..fb01959a24a7c 100644
--- a/addons/mail/static/tests/tours/mail_message_load_order_tour.js
+++ b/addons/mail/static/tests/tours/mail_message_load_order_tour.js
@@ -8,9 +8,8 @@ registry.category("web_tour.tours").add("mail_message_load_order_tour", {
             run: "click",
         },
         {
-            trigger: ".o-mail-Thread .o-mail-Message",
+            trigger: ".o-mail-Thread .o-mail-Message:count(30)",
             async run() {
-                await contains(".o-mail-Thread .o-mail-Message", { count: 30 });
                 await contains(".o-mail-Thread", { scroll: "bottom" });
             },
         },
@@ -29,9 +28,8 @@ registry.category("web_tour.tours").add("mail_message_load_order_tour", {
             // will be (31 - 60). This trigger ensures the next messages
             // are fetched after jumping to the message.
             trigger:
-                ".o-mail-Thread .o-mail-Message:first .o-mail-Message-textContent:not(:contains(31))",
+                ".o-mail-Thread .o-mail-Message:count(31):first .o-mail-Message-textContent:not(:contains(31))",
             async run() {
-                await contains(".o-mail-Thread .o-mail-Message", { count: 31 });
                 await contains(".o-mail-Thread", { scroll: 0 });
                 // ensure 1 - 31 are loaded in order: 30 below and the
                 // one we're loading messages around.
@@ -51,9 +49,9 @@ registry.category("web_tour.tours").add("mail_message_load_order_tour", {
             // was (1 -31): 30 before (but none were found), 30 after
             // and the pinned message itself. This trigger ensures the
             // next messages are fetched after scrolling to the bottom.
-            trigger: ".o-mail-Thread .o-mail-Message .o-mail-Message-textContent:contains(17)",
+            trigger:
+                ".o-mail-Thread .o-mail-Message:count(60) .o-mail-Message-textContent:contains(17)",
             async run() {
-                await contains(".o-mail-Thread .o-mail-Message", { count: 60 });
                 // ensure 1 - 60  are loaded in order.
                 const messages = Array.from(
                     document.querySelectorAll(".o-mail-Thread .o-mail-Message-content")
diff --git a/addons/mail/static/tests/tours/user_modify_own_profile_tour.js b/addons/mail/static/tests/tours/user_modify_own_profile_tour.js
index e8aed978485b7..0a0300696ab00 100644
--- a/addons/mail/static/tests/tours/user_modify_own_profile_tour.js
+++ b/addons/mail/static/tests/tours/user_modify_own_profile_tour.js
@@ -1,5 +1,4 @@
 import { registry } from "@web/core/registry";
-import { click, contains } from "@web/../tests/utils";
 
 /**
  * Verify that a user can modify their own profile information.
@@ -19,10 +18,10 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/user_modify_own
         {
             content: "Update the notification type",
             trigger: '.modal div[name="notification_type"] input[data-value="inbox"]',
-            async run() {
-                await click('.modal div[name="notification_type"] input[data-value="inbox"]');
-                await contains(".o_form_dirty", { count: 1 });
-            },
+            run: "click",
+        },
+        {
+            trigger: "body .o_form_dirty:count(1)",
         },
         {
             content: "Save the form",
@@ -31,10 +30,7 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/user_modify_own
         },
         {
             content: "Wait until the modal is closed",
-            trigger: "body:not(.modal-open)",
-            async run() {
-                await contains(".o_form_dirty", { count: 0 });
-            },
+            trigger: "body:not(.modal-open):not(:has(.o_form_dirty))",
         },
     ],
 });
diff --git a/addons/test_mail_full/static/tests/tours/load_more_tour.js b/addons/test_mail_full/static/tests/tours/load_more_tour.js
index a67afd4e1d3b8..5231d94c356f1 100644
--- a/addons/test_mail_full/static/tests/tours/load_more_tour.js
+++ b/addons/test_mail_full/static/tests/tours/load_more_tour.js
@@ -1,16 +1,9 @@
 import { registry } from "@web/core/registry";
-import { contains } from "@web/../tests/utils";
 
 registry.category("web_tour.tours").add("load_more_tour", {
     steps: () => [
         {
-            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message",
-            run: async function () {
-                await contains(".o-mail-Thread .o-mail-Message", {
-                    count: 30,
-                    target: document.querySelector("#chatterRoot").shadowRoot,
-                });
-            },
+            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message:count(30)",
         },
         {
             trigger: "#chatterRoot:shadow .o-mail-Thread button:contains(Load More):not(:visible)",
diff --git a/addons/test_mail_full/static/tests/tours/message_actions_tour.js b/addons/test_mail_full/static/tests/tours/message_actions_tour.js
index 093fa50b71dad..0faa2ddad8fe3 100644
--- a/addons/test_mail_full/static/tests/tours/message_actions_tour.js
+++ b/addons/test_mail_full/static/tests/tours/message_actions_tour.js
@@ -1,5 +1,4 @@
 import { registry } from "@web/core/registry";
-import { contains } from "@web/../tests/utils";
 
 registry.category("web_tour.tours").add("star_message_tour", {
     steps: () => [
@@ -17,13 +16,7 @@ registry.category("web_tour.tours").add("star_message_tour", {
 registry.category("web_tour.tours").add("message_actions_tour", {
     steps: () => [
         {
-            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message",
-            run: async function () {
-                await contains(".o-mail-Thread .o-mail-Message", {
-                    count: 1,
-                    target: document.querySelector("#chatterRoot").shadowRoot,
-                });
-            },
+            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message:count(1)",
         },
         {
             trigger: "#chatterRoot:shadow .o-mail-Composer-input",
@@ -34,13 +27,7 @@ registry.category("web_tour.tours").add("message_actions_tour", {
             run: "click",
         },
         {
-            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message",
-            run: async function () {
-                await contains(".o-mail-Thread .o-mail-Message", {
-                    count: 2,
-                    target: document.querySelector("#chatterRoot").shadowRoot,
-                });
-            },
+            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message:count(2)",
         },
         {
             trigger: "#chatterRoot:shadow .o-mail-Message[data-persistent]:contains(New message)",
@@ -79,13 +66,7 @@ registry.category("web_tour.tours").add("message_actions_tour", {
             run: "click",
         },
         {
-            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message",
-            run: async function () {
-                await contains(".o-mail-Thread .o-mail-Message", {
-                    count: 1,
-                    target: document.querySelector("#chatterRoot").shadowRoot,
-                });
-            },
+            trigger: "#chatterRoot:shadow .o-mail-Thread .o-mail-Message:count(1)",
         },
     ],
 });
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_chatbot_flow.js b/addons/website_livechat/static/tests/tours/website_livechat_chatbot_flow.js
index c516d947a167b..f7a1c8781a3c5 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_chatbot_flow.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_chatbot_flow.js
@@ -1,5 +1,4 @@
 import { patchWithCleanup } from "@web/../tests/helpers/utils";
-import { contains } from "@web/../tests/utils";
 import { registry } from "@web/core/registry";
 import { Deferred } from "@web/core/utils/concurrency";
 import { Chatbot } from "@im_livechat/core/common/chatbot_model";
@@ -48,15 +47,10 @@ registry.category("web_tour.tours").add("website_livechat_chatbot_flow_tour", {
                 run: "click",
             },
             {
-                trigger: ".o-livechat-root:shadow .o-mail-ChatWindow",
                 // check selected option is posted and reactions are available since
                 // the thread has been persisted in the process
-                async run() {
-                    await contains(".o-mail-Message-actions [title='Add a Reaction']", {
-                        target: this.anchor.getRootNode(),
-                        parent: [".o-mail-Message", { text: "I'd like to buy the software" }],
-                    });
-                },
+                trigger:
+                    ".o-livechat-root:shadow .o-mail-ChatWindow .o-mail-Message:has(.o-mail-Message-actions [title='Add a Reaction']):contains('I\\'d like to buy the software')",
             },
             {
                 // check ask email step following selecting option A
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js b/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js
index dd5a90da7a6d0..8e359d16c6dec 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js
@@ -1,20 +1,12 @@
 import { registry } from "@web/core/registry";
-import { contains } from "@web/../tests/utils";
 
 const messagesContain = (text) => `.o-livechat-root:shadow .o-mail-Message:contains("${text}")`;
 
 registry.category("web_tour.tours").add("website_livechat_chatbot_test_page_tour", {
     steps: () => [
         {
-            trigger: messagesContain("Hello! I'm a bot!"),
-            async run() {
-                const ChatHub = this.anchor.closest(".o-mail-ChatHub");
-                await contains(".o-mail-ChatWindow", {
-                    text: "Testing Bot",
-                    count: 1,
-                    target: ChatHub,
-                });
-            },
+            trigger:
+                ".o-livechat-root:shadow .o-mail-ChatHub:has(.o-mail-ChatWindow .o-mail-ChatWindow-header:contains(/^Testing Bot$/)):count(1) .o-mail-Message-body:contains(/^Hello! I'm a bot!$/)",
         },
         {
             trigger: messagesContain("I help lost visitors find their way."),
@@ -36,15 +28,8 @@ registry.category("web_tour.tours").add("website_livechat_chatbot_test_page_tour
             expectUnloadPage: true,
         },
         {
-            trigger: messagesContain("Hello! I'm a bot!"),
-            async run() {
-                const ChatHub = this.anchor.closest(".o-mail-ChatHub");
-                await contains(".o-mail-ChatWindow", {
-                    text: "Testing Bot",
-                    count: 1,
-                    target: ChatHub,
-                });
-            },
+            trigger:
+                ".o-livechat-root:shadow .o-mail-ChatHub:has(.o-mail-ChatWindow .o-mail-ChatWindow-header:contains(/^Testing Bot$/)):count(1) .o-mail-Message-body:contains(/^Hello! I'm a bot!$/)",
         },
         {
             trigger: '.o-livechat-root:shadow button:contains("Other & Documentation")',
@@ -63,15 +48,8 @@ registry.category("web_tour.tours").add("website_livechat_chatbot_test_page_tour
             run: "click",
         },
         {
-            trigger: ".o-livechat-root:shadow p:contains('Did we correctly answer your question?')",
-            async run() {
-                await contains("button", { target: this.anchor.getRootNode(), text: "Close" });
-                await contains("button", {
-                    target: this.anchor.getRootNode(),
-                    text: "New Session",
-                    count: 0,
-                });
-            },
+            trigger:
+                ".o-livechat-root:shadow .o-mail-ChatWindow:has(p:contains('Did we correctly answer your question?')):has(button:contains('Close')):not(:has(button:contains('New Session')))",
         },
         {
             trigger: ".o-livechat-root:shadow button:contains('Close')",
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_no_new_session_with_hide_rule.js b/addons/website_livechat/static/tests/tours/website_livechat_no_new_session_with_hide_rule.js
index 71ae099c884d2..3d641b6f73d50 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_no_new_session_with_hide_rule.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_no_new_session_with_hide_rule.js
@@ -1,5 +1,4 @@
 import { registry } from "@web/core/registry";
-import { contains } from "@web/../tests/utils";
 
 const sendFirstMessageSteps = [
     {
@@ -52,15 +51,8 @@ registry.category("web_tour.tours").add("website_livechat_no_session_with_hide_r
             run: "click",
         },
         {
-            trigger: ".o-livechat-root:shadow p:contains('Did we correctly answer your question?')",
-            async run() {
-                await contains("button", { target: this.anchor.getRootNode(), text: "Close" });
-                await contains("button", {
-                    target: this.anchor.getRootNode(),
-                    text: "New Session",
-                    count: 0,
-                });
-            },
+            trigger:
+                ".o-livechat-root:shadow .o-mail-ChatWindow:has(p:contains('Did we correctly answer your question?')):has(button:contains('Close')):not(:has(button:contains('New Session')))",
         },
     ],
 });

From b936cfb5403964ae3f5a25a2813db766910713ea Mon Sep 17 00:00:00 2001
From: Harsh Modi <hamo@odoo.com>
Date: Fri, 10 Oct 2025 09:37:49 +0000
Subject: [PATCH 160/673] [FIX] partner_autocomplete: logo not fetching on
 search and enrich

Before this commit-
We used to rely on clearbit to fetch the logo of the company
on the client side and we used to show logo on search as well

After this commit-
We replace it with logo.dev and remove the fetching of logo
from client side and move it to the IAP and remove the
logo fetching from Search selection, now the logo will
be only be fetched during enrichment

task-5126337

closes odoo/odoo#234174

X-original-commit: b46e7ca7321ae5d0b512bb0dff37c2bd43a6704a
Signed-off-by: Ricardo Gomes Rodrigues (rigr) <rigr@odoo.com>
Signed-off-by: Harsh Modi (hamo) <hamo@odoo.com>
Co-authored-by: Vivek Pathak <vivp@odoo.com>
---
 .../src/js/partner_autocomplete_core.js       | 148 ++----------------
 .../static/src/xml/partner_autocomplete.xml   |   1 -
 2 files changed, 17 insertions(+), 132 deletions(-)

diff --git a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js
index c59bbdc13d6e5..4e14efcd32d87 100644
--- a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js
+++ b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js
@@ -2,11 +2,9 @@
 
 import { loadJS } from "@web/core/assets";
 import { _t } from "@web/core/l10n/translation";
-import { browser } from "@web/core/browser/browser";
 import { KeepLast } from "@web/core/utils/concurrency";
 import { useService } from "@web/core/utils/hooks";
 import { renderToMarkup } from "@web/core/utils/render";
-import { getDataURLFromFile } from "@web/core/utils/urls";
 import { status, useComponent } from "@odoo/owl";
 
 /**
@@ -103,125 +101,29 @@ export function usePartnerAutocomplete() {
      * @returns {Promise}
      */
     function getCreateData(company, fieldsToKeep) {
-        return new Promise((resolve) => {
+        return enrichCompany(company).then((companyData) => {
             // Fetch additional company info via Autocomplete Enrichment API
-            const enrichPromise = enrichCompany(company);
 
-            // Get logo
-            const logoPromise = company.logoUrl ? getCompanyLogo(company.logoUrl) : false;
-            whenAll([enrichPromise, logoPromise]).then(([companyData, logoData]) => {
-
-                if (companyData.error) {
-                    if (companyData.error_message === 'Insufficient Credit') {
-                        notifyNoCredits();
-                    }
-                    else if (companyData.error_message === 'No Account Token') {
-                        notifyAccountToken();
-                    }
-                    else {
-                        notification.add(companyData.error_message);
-                    }
-                    companyData = {
-                        ...company,
-                        ...companyData,
-                    };
+            if (companyData.error) {
+                if (companyData.error_message === 'Insufficient Credit') {
+                    notifyNoCredits();
                 }
-
-                resolve({
-                    company: companyData,
-                    logo: logoData
-                });
-            })
-        });
-    }
-
-    async function fetchNoCaching(url) {
-        try {
-            const response = await browser.fetch(
-                url,
-                {
-                    method: 'GET',
-                    cache: 'no-cache',
+                else if (companyData.error_message === 'No Account Token') {
+                    notifyAccountToken();
                 }
-            );
-            return await response.json();
-        } catch {
-            return {}
-        }
-    }
-
-    /**
-     * Use Clearbit API to get the company logo if there is a match with the company name or domain
-     *
-     * @param {string} value
-     * @returns {Promise}
-     * @private
-     */
-    async function getClearbitLogoUrl(company) {
-        let clearbitData = await fetchNoCaching(encodeURI(`https://autocomplete.clearbit.com/v1/companies/suggest?query=${company.name}`));
-        if (!clearbitData.length) {
-            if (company.domain) {
-                clearbitData = await fetchNoCaching(encodeURI(`https://autocomplete.clearbit.com/v1/companies/suggest?query=${company.domain}`));
-            }
-            if (!clearbitData.length) {
-                return '';
-            }
-        }
-        const firstResult = clearbitData[0];
-        if (
-            firstResult.name.toLowerCase() === company.name.toLowerCase()
-            ||
-            (
-                company.domain !== undefined
-                &&
-                firstResult.domain === company.domain
-            )
-        ){
-            return firstResult.logo;
-        }
-        return '';
-    }
-
-    /**
-     * Get the company logo as Base 64 image from url
-     *
-     * @param {string} url
-     * @returns {Promise}
-     * @private
-     */
-    async function getCompanyLogo(logoUrl) {
-        try {
-            if (!logoUrl) {
-                return false;
+                else {
+                    notification.add(companyData.error_message);
+                }
+                companyData = {
+                    ...company,
+                    ...companyData,
+                };
             }
-            const base64Image = await getBase64Image(logoUrl);
-            // base64Image equals "data:" if image not available on given url
-            return base64Image ? base64Image.replace(/^data:image[^;]*;base64,?/, '') : false;
-        }
-        catch {
-            return false;
-        }
-    }
-
-    /**
-     * Returns a promise which will be resolved with the base64 data of the
-     * image fetched from the given url.
-     *
-     * @private
-     * @param {string} url : the url where to find the image to fetch
-     * @returns {Promise}
-     */
-    function getBase64Image(url) {
-        return new Promise((resolve, reject) => {
-            const xhr = new XMLHttpRequest();
-            xhr.onload = () => {
-                getDataURLFromFile(xhr.response).then(resolve);
+            return {
+                company: companyData,
+                logo: companyData.logo || false,
             };
-            xhr.open('GET', url);
-            xhr.responseType = 'blob';
-            xhr.onerror = reject;
-            xhr.send();
-        });
+        })
     }
 
     /**
@@ -256,7 +158,6 @@ export function usePartnerAutocomplete() {
 
         await Promise.all(suggestions.map(async (suggestion) => {
             suggestion.query = value;  // Save queried value (name, VAT) for later
-            suggestion.logoUrl = await getClearbitLogoUrl(suggestion);
             suggestion.description = '';
             if (suggestion.city){
                 suggestion.description += suggestion.city;
@@ -270,21 +171,6 @@ export function usePartnerAutocomplete() {
         return suggestions;
     }
 
-    /**
-     * Utility to wait for multiple promises
-     * Promise.all will reject all promises whenever a promise is rejected
-     * This utility will continue
-     *
-     * @param {Promise[]} promises
-     * @returns {Promise}
-     * @private
-     */
-    function whenAll(promises) {
-        return Promise.all(promises.map((p) => {
-            return Promise.resolve(p);
-        }));
-    }
-
     /**
      * @private
      * @returns {Promise}
diff --git a/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml b/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml
index cad4929278ed3..eeb984fce75c0 100644
--- a/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml
+++ b/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml
@@ -64,7 +64,6 @@
                 <span t-esc="option.label"/>,
                 <span class="text-muted" t-esc="option.data.description"/>
             </div>
-            <img style="width: 24px; max-height: 100%" class="ms-1" t-att-src="option.data.logoUrl" onerror="this.style.display='none'"/>
         </div>
     </t>
 

From 13d0841ef27408d3ec340ba54c705ed2aab7a98e Mon Sep 17 00:00:00 2001
From: Bastien PIERRE <ipb@odoo.com>
Date: Mon, 3 Nov 2025 09:33:06 +0000
Subject: [PATCH 161/673] [FIX] web: remaining days use formatter

Before this commit, remaining_days widget was not
using the new date formatter when showing the date.

closes odoo/odoo#234218

X-original-commit: 723abea1fd571fab254bb563570ed6e129f5dfc0
Signed-off-by: Bastien Pierre (ipb) <ipb@odoo.com>
---
 .../remaining_days/remaining_days_field.js      | 12 +++++++-----
 .../remaining_days/remaining_days_field.xml     |  2 +-
 .../views/fields/remaining_days_field.test.js   | 17 ++++++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/views/fields/remaining_days/remaining_days_field.js b/addons/web/static/src/views/fields/remaining_days/remaining_days_field.js
index 88fd955023c23..82ae417701585 100644
--- a/addons/web/static/src/views/fields/remaining_days/remaining_days_field.js
+++ b/addons/web/static/src/views/fields/remaining_days/remaining_days_field.js
@@ -1,13 +1,12 @@
 import { Component } from "@odoo/owl";
 import { evaluateExpr } from "@web/core/py_js/py";
-import { formatDate, formatDateTime } from "@web/core/l10n/dates";
 import { getClassNameFromDecoration } from "@web/views/utils";
-import { localization } from "@web/core/l10n/localization";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import { DateTimeField } from "../datetime/datetime_field";
 import { standardFieldProps } from "../standard_field_props";
 import { capitalize } from "@web/core/utils/strings";
+import { formatDate } from "../formatters";
 
 const { DateTime } = luxon;
 
@@ -54,9 +53,12 @@ export class RemainingDaysField extends Component {
 
     get formattedValue() {
         const { record, name } = this.props;
-        return record.fields[name].type === "datetime"
-            ? formatDateTime(record.data[name], { format: localization.dateFormat })
-            : formatDate(record.data[name]);
+        return formatDate(record.data[name]);
+    }
+
+    get numericValue() {
+        const { record, name } = this.props;
+        return formatDate(record.data[name], { numeric: true });
     }
 
     get classNames() {
diff --git a/addons/web/static/src/views/fields/remaining_days/remaining_days_field.xml b/addons/web/static/src/views/fields/remaining_days/remaining_days_field.xml
index 94b0e90afa32d..28bbd4a8ef027 100644
--- a/addons/web/static/src/views/fields/remaining_days/remaining_days_field.xml
+++ b/addons/web/static/src/views/fields/remaining_days/remaining_days_field.xml
@@ -4,7 +4,7 @@
         <t t-if="props.readonly">
             <div
                 t-att-class="classNames"
-                t-att-title="formattedValue"
+                t-att-title="numericValue"
             >
                 <t t-esc="diffString"/>
             </div>
diff --git a/addons/web/static/tests/views/fields/remaining_days_field.test.js b/addons/web/static/tests/views/fields/remaining_days_field.test.js
index ceb7e3d657632..ac7cd5c2893ce 100644
--- a/addons/web/static/tests/views/fields/remaining_days_field.test.js
+++ b/addons/web/static/tests/views/fields/remaining_days_field.test.js
@@ -2,7 +2,14 @@ import { beforeEach, expect, test } from "@odoo/hoot";
 import { click, edit, queryAll, queryAllTexts, queryOne } from "@odoo/hoot-dom";
 import { animationFrame, mockDate } from "@odoo/hoot-mock";
 import { getPickerCell } from "@web/../tests/core/datetime/datetime_test_helpers";
-import { defineModels, fields, models, mountView, onRpc, contains } from "@web/../tests/web_test_helpers";
+import {
+    defineModels,
+    fields,
+    models,
+    mountView,
+    onRpc,
+    contains,
+} from "@web/../tests/web_test_helpers";
 
 class Partner extends models.Model {
     date = fields.Date({ string: "A date", searchable: true });
@@ -39,8 +46,8 @@ test("RemainingDaysField on a date field in list view", async () => {
     expect(cells[2]).toHaveText("Yesterday");
     expect(cells[3]).toHaveText("In 2 days");
     expect(cells[4]).toHaveText("3 days ago");
-    expect(cells[5]).toHaveText("02/08/2018");
-    expect(cells[6]).toHaveText("06/08/2017");
+    expect(cells[5]).toHaveText("Feb 8, 2018");
+    expect(cells[6]).toHaveText("Jun 8");
     expect(cells[7]).toHaveText("");
 
     expect(queryOne(".o_field_widget > div", { root: cells[0] })).toHaveAttribute(
@@ -286,8 +293,8 @@ test("RemainingDaysField on a datetime field in list view in UTC", async () => {
         "Yesterday",
         "In 2 days",
         "3 days ago",
-        "02/08/2018",
-        "06/08/2017",
+        "Feb 8, 2018",
+        "Jun 8",
         "",
     ]);
 

From d5d9c697e1993b6cdff128989596309f7dc86a38 Mon Sep 17 00:00:00 2001
From: MohsinAli Masi <masm@odoo.com>
Date: Fri, 10 Oct 2025 13:24:44 +0000
Subject: [PATCH 162/673] [FIX] l10n_sa_edi: correct placeholder of street2
 field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit: The `street2` field on `res.company` and `res.partner` was mapped
to `cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cbc:CitySubdivisionName`,
but its placeholder displayed `Street 2…`.

This caused confusion among users, as they assumed it referred to
`cbc:AdditionalStreetName`, leading to incorrect data entry and potential
non-compliance.

After this commit: The placeholder of the `street2` field has been changed from
`Street 2…` to `District…`, clarifying that this field represents the city
subdivision (district or borough) of the Seller/Customer, in line with the
Saudi Arabia e-invoicing specification.

Task-4951545

closes odoo/odoo#234273

X-original-commit: 450a8f35a7b242019b4207ac26699ff3e655b59a
Signed-off-by: MohsinAli Masi (masm) <masm@odoo.com>
Signed-off-by: Maximilien La Barre (malb) <malb@odoo.com>
---
 addons/l10n_sa_edi/data/res_country_data.xml   |  6 ++----
 addons/l10n_sa_edi/i18n/ar.po                  | 15 +++++++++++++--
 addons/l10n_sa_edi/i18n/l10n_sa_edi.pot        | 15 +++++++++++++--
 addons/l10n_sa_edi/views/res_company_views.xml |  4 ++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_sa_edi/data/res_country_data.xml b/addons/l10n_sa_edi/data/res_country_data.xml
index 7fcd07259e080..b45b86017f3de 100644
--- a/addons/l10n_sa_edi/data/res_country_data.xml
+++ b/addons/l10n_sa_edi/data/res_country_data.xml
@@ -11,10 +11,8 @@
                     <field name="type" invisible="1"/>
                     <field name="street" placeholder="Street..." class="o_address_street"
                            readonly="type == 'contact' and parent_id"/>
-                    <field name="street2" placeholder="Street 2..." class="o_address_street"
-                           readonly="type == 'contact' and parent_id" invisible="country_code == 'SA'"/>
-                    <field name="street2" placeholder="Neighborhood..." class="o_address_street"
-                           readonly="type == 'contact' and parent_id" invisible="country_code != 'SA'"/>
+                    <field name="street2" placeholder="District..." class="o_address_street"
+                            readonly="type == 'contact' and parent_id"/>
                     <field name="city" placeholder="City" class="o_address_city"
                            readonly="type == 'contact' and parent_id"/>
                     <field name="state_id" class="o_address_state" placeholder="State" options='{"no_open": True}'
diff --git a/addons/l10n_sa_edi/i18n/ar.po b/addons/l10n_sa_edi/i18n/ar.po
index 506fda5a4ac74..b736ccb0e37b5 100644
--- a/addons/l10n_sa_edi/i18n/ar.po
+++ b/addons/l10n_sa_edi/i18n/ar.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 18.4a1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-22 06:34+0000\n"
-"PO-Revision-Date: 2025-08-22 10:51+0400\n"
+"POT-Creation-Date: 2025-10-13 12:36+0000\n"
+"PO-Revision-Date: 2025-10-13 12:36+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ar\n"
@@ -319,6 +319,12 @@ msgstr "اسم العرض"
 msgid "Do you really want to re-onboard this Journal with ZATCA?"
 msgstr "هل ترغب حقًا في إعادة تهيئة دفتر اليوميات هذا مع زاتكا؟"
 
+#. module: l10n_sa_edi
+#: model_terms:ir.ui.view,arch_db:l10n_sa_edi.sa_partner_address_form
+#: model_terms:ir.ui.view,arch_db:l10n_sa_edi.view_company_form
+msgid "District"
+msgstr "اﺳﻢ اﻟﺤﻲ"
+
 #. module: l10n_sa_edi
 #: model:ir.model.fields,field_description:l10n_sa_edi.field_account_bank_statement_line__l10n_sa_uuid
 #: model:ir.model.fields,field_description:l10n_sa_edi.field_account_move__l10n_sa_uuid
@@ -806,6 +812,11 @@ msgstr "تم بنجاح: تم قبول الفاتورة من قبل زاتكا"
 msgid "Success: Journal is onboarded and valid until"
 msgstr "تم بنجاح: تمت تهيئة دفتر اليومية وهو صالح حتى"
 
+#. module: l10n_sa_edi
+#: model_terms:ir.ui.view,arch_db:l10n_sa_edi.view_company_form
+msgid "Street 2..."
+msgstr "الشارع ..."
+
 #. module: l10n_sa_edi
 #: model:ir.model,name:l10n_sa_edi.model_account_tax
 msgid "Tax"
diff --git a/addons/l10n_sa_edi/i18n/l10n_sa_edi.pot b/addons/l10n_sa_edi/i18n/l10n_sa_edi.pot
index 2d1f77f7bb6c7..7f567bd6dfbb1 100644
--- a/addons/l10n_sa_edi/i18n/l10n_sa_edi.pot
+++ b/addons/l10n_sa_edi/i18n/l10n_sa_edi.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 18.5a1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-22 06:34+0000\n"
-"PO-Revision-Date: 2025-08-22 06:34+0000\n"
+"POT-Creation-Date: 2025-10-13 12:35+0000\n"
+"PO-Revision-Date: 2025-10-13 12:35+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -329,6 +329,12 @@ msgstr ""
 msgid "Do you really want to re-onboard this Journal with ZATCA?"
 msgstr ""
 
+#. module: l10n_sa_edi
+#: model_terms:ir.ui.view,arch_db:l10n_sa_edi.sa_partner_address_form
+#: model_terms:ir.ui.view,arch_db:l10n_sa_edi.view_company_form
+msgid "District"
+msgstr ""
+
 #. module: l10n_sa_edi
 #: model:ir.model.fields,field_description:l10n_sa_edi.field_account_bank_statement_line__l10n_sa_uuid
 #: model:ir.model.fields,field_description:l10n_sa_edi.field_account_move__l10n_sa_uuid
@@ -827,6 +833,11 @@ msgstr ""
 msgid "Success: Journal is onboarded and valid until"
 msgstr ""
 
+#. module: l10n_sa_edi
+#: model_terms:ir.ui.view,arch_db:l10n_sa_edi.view_company_form
+msgid "Street 2..."
+msgstr ""
+
 #. module: l10n_sa_edi
 #: model:ir.model,name:l10n_sa_edi.model_account_tax
 msgid "Tax"
diff --git a/addons/l10n_sa_edi/views/res_company_views.xml b/addons/l10n_sa_edi/views/res_company_views.xml
index 8a455728c30d6..f1fd38e4e05e7 100644
--- a/addons/l10n_sa_edi/views/res_company_views.xml
+++ b/addons/l10n_sa_edi/views/res_company_views.xml
@@ -18,6 +18,10 @@
                     <field name="l10n_sa_edi_additional_identification_scheme" invisible="country_code != 'SA'"/>
                     <field name="l10n_sa_edi_additional_identification_number" string="Identification Number" invisible="country_code != 'SA' or l10n_sa_edi_additional_identification_scheme == 'TIN'"/>
                 </xpath>
+                <xpath expr="//field[@name='street2']" position="replace">
+                    <field name="street2" placeholder="District" class="o_address_street" invisible="country_code != 'SA'"/>
+                    <field name="street2" placeholder="Street 2..." class="o_address_street" invisible="country_code == 'SA'"/>
+                </xpath>
             </field>
         </record>
     </data>

From 8e4b39a10c59a873ee8bc0ad8f5148bc32393b5a Mon Sep 17 00:00:00 2001
From: dhba <dhba@odoo.com>
Date: Thu, 5 Jun 2025 13:16:11 +0000
Subject: [PATCH 163/673] [FIX] html_editor: preserve cursor on single backtick

Before this commit:

- Because of the change made in commit [1], the selection was not set until two
  backticks were detected. As a result, inserting a single backtick caused the
  cursor position to change unexpectedly.

After this commit:

- The text node is merged with its siblings only when two backtick are detected,
  so no DOM changes occur with a single backtick, and the selection no longer
  needs to be updated in that case.

[1]: f792acf0bc66fb77e25bf8a0753c6a2f4284f0e8

task:4585706

X-original-commit: 0b31f3c822bb5df626f9ce54a41625268b9f7db3
Part-of: odoo/odoo#233435
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../static/src/main/inline_code.js            | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/html_editor/static/src/main/inline_code.js b/addons/html_editor/static/src/main/inline_code.js
index d0025cb016275..954e2b6b0b7f3 100644
--- a/addons/html_editor/static/src/main/inline_code.js
+++ b/addons/html_editor/static/src/main/inline_code.js
@@ -18,24 +18,25 @@ export class InlineCodePlugin extends Plugin {
         // We just inserted a backtick, check if there was another
         // one in the text.
         let textNode = selection.startContainer;
-        let offset = selection.startOffset;
-        let sibling = textNode.previousSibling;
-        while (sibling && sibling.nodeType === Node.TEXT_NODE) {
-            offset += sibling.textContent.length;
-            sibling.textContent += textNode.textContent;
-            textNode.remove();
-            textNode = sibling;
-            sibling = textNode.previousSibling;
-        }
-        sibling = textNode.nextSibling;
-        while (sibling && sibling.nodeType === Node.TEXT_NODE) {
-            textNode.textContent += sibling.textContent;
-            sibling.remove();
-            sibling = textNode.nextSibling;
-        }
-        const textHasTwoTicks = /`.*`/.test(textNode.textContent);
+        const wholeText = textNode.wholeText;
+        const textHasTwoTicks = /`.*`/.test(wholeText);
         // We don't apply the code tag if there is no content between the two `
-        if (textHasTwoTicks && textNode.textContent.replace(/`/g, "").length) {
+        if (textHasTwoTicks && wholeText.replace(/`/g, "").length) {
+            let offset = selection.startOffset;
+            let sibling = textNode.previousSibling;
+            while (sibling && sibling.nodeType === Node.TEXT_NODE) {
+                offset += sibling.textContent.length;
+                sibling.textContent += textNode.textContent;
+                textNode.remove();
+                textNode = sibling;
+                sibling = sibling.previousSibling;
+            }
+            sibling = textNode.nextSibling;
+            while (sibling && sibling.nodeType === Node.TEXT_NODE) {
+                textNode.textContent += sibling.textContent;
+                sibling.remove();
+                sibling = sibling.nextSibling;
+            }
             this.dependencies.selection.setSelection({
                 anchorNode: textNode,
                 anchorOffset: offset,

From a1aac0a9db05bd68fb9635ed12ee84706ed70611 Mon Sep 17 00:00:00 2001
From: dhba <dhba@odoo.com>
Date: Wed, 19 Feb 2025 10:34:12 +0000
Subject: [PATCH 164/673] [IMP] html_editor: wrap selected text in inline code

Purpose:

- Wrap the selected text in a inline code element when the '`' key is pressed.

Task: 4585706
X-original-commit: 670d3d7cb9306ceccf924fd834928803a5b5a96b
Part-of: odoo/odoo#233435
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../static/src/main/inline_code.js            | 98 ++++++++++++++++++-
 .../static/src/main/link/link_plugin.js       | 11 +++
 .../html_editor/static/tests/markdown.test.js | 72 +++++++++++++-
 3 files changed, 176 insertions(+), 5 deletions(-)

diff --git a/addons/html_editor/static/src/main/inline_code.js b/addons/html_editor/static/src/main/inline_code.js
index 954e2b6b0b7f3..d65120e29e6fb 100644
--- a/addons/html_editor/static/src/main/inline_code.js
+++ b/addons/html_editor/static/src/main/inline_code.js
@@ -1,20 +1,110 @@
 import { Plugin } from "@html_editor/plugin";
-import { splitTextNode } from "@html_editor/utils/dom";
-import { closestElement } from "@html_editor/utils/dom_traversal";
-import { DIRECTIONS } from "@html_editor/utils/position";
+import { isBlock, closestBlock } from "@html_editor/utils/blocks";
+import { splitTextNode, unwrapContents } from "@html_editor/utils/dom";
+import { isElement, isTextNode } from "@html_editor/utils/dom_info";
+import { closestElement, selectElements, findFurthest } from "@html_editor/utils/dom_traversal";
+import { DIRECTIONS, nodeSize } from "@html_editor/utils/position";
 
 export class InlineCodePlugin extends Plugin {
     static id = "inlineCode";
-    static dependencies = ["selection", "history", "input"];
+    static dependencies = ["selection", "history", "input", "split"];
     resources = {
         input_handlers: this.onInput.bind(this),
+        selectionchange_handlers: this.handleSelectionChange.bind(this),
     };
 
+    setup() {
+        this.addDomListener(this.document, "keydown", this.onKeyDown.bind(this));
+    }
+
+    handleSelectionChange() {
+        if (this.historySavePointRestore) {
+            delete this.historySavePointRestore;
+        }
+    }
+
+    onKeyDown() {
+        const selection = this.dependencies.selection.getEditableSelection();
+        if (
+            selection.isCollapsed ||
+            closestElement(selection.anchorNode, "code") ||
+            closestElement(selection.focusNode, "code")
+        ) {
+            return;
+        }
+        const targetBlocks = this.dependencies.selection.getTargetedBlocks();
+        const hasTextNode = this.dependencies.selection.getTargetedNodes().some(isTextNode);
+        if (targetBlocks.size === 1 && hasTextNode) {
+            this.historySavePointRestore = this.dependencies.history.makeSavePoint();
+        }
+    }
+
     onInput(ev) {
         const selection = this.dependencies.selection.getEditableSelection();
         if (ev.data !== "`" || closestElement(selection.anchorNode, "code")) {
             return;
         }
+        if (this.historySavePointRestore) {
+            this.historySavePointRestore();
+            let { anchorNode, anchorOffset, focusNode, focusOffset, direction } =
+                this.dependencies.split.splitSelection();
+            const blockEl = closestBlock(anchorNode);
+            // Adjust if anchor/focus directly equals block element
+            const deepChild = (node, offset) => (node === blockEl ? node.childNodes[offset] : node);
+            anchorNode = deepChild(anchorNode, anchorOffset);
+            focusNode = deepChild(focusNode, focusOffset);
+            if (direction === DIRECTIONS.LEFT) {
+                // Swap anchorNode and focusNode
+                [anchorNode, anchorOffset, focusNode, focusOffset] = [
+                    focusNode,
+                    focusOffset,
+                    anchorNode,
+                    anchorOffset,
+                ];
+            }
+            const furthestAnchorElement = findFurthest(anchorNode, blockEl, (n) => !isBlock(n));
+            let start = this.dependencies.split.splitAroundUntil(anchorNode, furthestAnchorElement);
+            const furthestFocusElement = findFurthest(focusNode, blockEl, (n) => !isBlock(n));
+            const end = this.dependencies.split.splitAroundUntil(focusNode, furthestFocusElement);
+
+            let codeElement = this.document.createElement("code");
+            codeElement.classList.add("o_inline_code");
+            start.before(codeElement);
+            while (start) {
+                if (isElement(start)) {
+                    for (const code of selectElements(start, "code")) {
+                        start = unwrapContents(code)[0];
+                    }
+                }
+                const next = start.nextSibling;
+                if (start.nodeName === "IMG") {
+                    // Only create <code> if we still have nodes to process
+                    // after this one.
+                    if (start !== end && next) {
+                        codeElement = this.document.createElement("code");
+                        codeElement.classList.add("o_inline_code");
+                    }
+                } else {
+                    if (!codeElement.isConnected) {
+                        start.before(codeElement);
+                    }
+                    codeElement.appendChild(start);
+                }
+                if (start === end) {
+                    break;
+                }
+                start = next;
+            }
+            this.dispatchTo("to_inline_code_processors", codeElement);
+            this.dependencies.selection.setSelection({
+                anchorNode: codeElement,
+                anchorOffset: nodeSize(codeElement),
+            });
+            this.dependencies.history.addStep();
+            delete this.historySavePointRestore;
+            return;
+        }
+
         // We just inserted a backtick, check if there was another
         // one in the text.
         let textNode = selection.startContainer;
diff --git a/addons/html_editor/static/src/main/link/link_plugin.js b/addons/html_editor/static/src/main/link/link_plugin.js
index 54eee86079751..6c6e0de59f984 100644
--- a/addons/html_editor/static/src/main/link/link_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_plugin.js
@@ -275,6 +275,17 @@ export class LinkPlugin extends Plugin {
         delete_image_overrides: this.deleteImageLink.bind(this),
         double_click_overrides: this.doubleClickLinkOverrides.bind(this),
         triple_click_overrides: this.tripleClickButtonOverrides.bind(this),
+
+        /** Processors */
+        to_inline_code_processors: (node) => {
+            this.removeEmptyLinks(node);
+            for (const btn of selectElements(node, "a.btn")) {
+                // Remove all attributes from the button link except "href"
+                [...btn.attributes].forEach(
+                    (attr) => attr.name !== "href" && btn.removeAttribute(attr.name)
+                );
+            }
+        },
     };
 
     setup() {
diff --git a/addons/html_editor/static/tests/markdown.test.js b/addons/html_editor/static/tests/markdown.test.js
index a57170772bf78..0ba22a1682f31 100644
--- a/addons/html_editor/static/tests/markdown.test.js
+++ b/addons/html_editor/static/tests/markdown.test.js
@@ -1,6 +1,6 @@
 import { describe, test } from "@odoo/hoot";
 import { patchWithCleanup } from "@web/../tests/web_test_helpers";
-import { testEditor } from "./_helpers/editor";
+import { base64Img, testEditor } from "./_helpers/editor";
 import { insertText } from "./_helpers/user_actions";
 
 describe("inline code", () => {
@@ -167,4 +167,74 @@ describe("inline code", () => {
             contentAfter: "<p>`````[]</p>",
         });
     });
+
+    test("should wrap selection in inline code", async () => {
+        await testEditor({
+            contentBefore: "<p>a[bc]d</p>",
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter: '<p>a<code class="o_inline_code">bc[]</code>\u200Bd</p>',
+        });
+        await testEditor({
+            contentBefore: `<p>ab[cd<a href="#">test</a>ef]gh</p>`,
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter: `<p>ab<code class="o_inline_code">cd<a href="#">test</a>ef[]</code>\u200Bgh</p>`,
+        });
+    });
+
+    test("should split selected inline element and wrap only the selected text in inline code", async () => {
+        await testEditor({
+            contentBefore: "<p>ab[cd<strong>ef]g</strong>h</p>",
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter:
+                '<p>ab<code class="o_inline_code">cd<strong>ef[]</strong></code>\u200B<strong>g</strong>h</p>',
+        });
+    });
+
+    test("should split selected inline element and wrap only the selected text in inline code(1)", async () => {
+        await testEditor({
+            contentBefore: "<p><strong>a<u>b[cd</u>ef]g</strong></p>",
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter:
+                '<p><strong>a<u>b</u></strong>\u200b<code class="o_inline_code"><strong><u>cd</u>ef[]</strong></code>\u200b<strong>g</strong></p>',
+        });
+    });
+
+    test("should apply inline code when selection partially includes a link", async () => {
+        await testEditor({
+            contentBefore: `<p>ab[cd<a href="#">te]st</a>ef</p>`,
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter: '<p>ab`[]<a href="#">st</a>ef</p>',
+        });
+    });
+
+    test("should wrap text selection in inline code but skip images", async () => {
+        await testEditor({
+            contentBefore: `<p>a[bc<img src="${base64Img}">de]f</p>`,
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter: `<p>a<code class="o_inline_code">bc</code><img src="${base64Img}"><code class="o_inline_code">de[]</code>f</p>`,
+        });
+
+        await testEditor({
+            contentBefore: `<p>a[bcde<img src="${base64Img}">]</p>`,
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter: `<p>a<code class="o_inline_code">bcde[]</code><img src="${base64Img}"></p>`,
+        });
+    });
+
+    test("should convert partially selected button into link and wrap selection in inline code", async () => {
+        await testEditor({
+            contentBefore: `<p>ab[cd<a href="#" class="btn btn-primary">te]st</a>ef</p>`,
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter:
+                '<p>ab<code class="o_inline_code">cd<a href="#">te[]</a></code><a href="#" class="btn btn-primary">st</a>ef</p>',
+        });
+    });
+
+    test("should not apply inline code when selection spans multiple block elements", async () => {
+        await testEditor({
+            contentBefore: "<p>a[b</p><p>cd</p><p>e]f</p>",
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfter: "<p>a`[]f</p>",
+        });
+    });
 });

From 8223a9eef5baef5959b7af8108331b8120a3adcf Mon Sep 17 00:00:00 2001
From: dhba <dhba@odoo.com>
Date: Fri, 1 Aug 2025 09:57:26 +0000
Subject: [PATCH 165/673] [IMP] html_editor: replace ZWS with feffs in inline
 code elements

Purpose:

Replaced ZWS with feffs around and inside inline code elements.

This improves:
- feffs are now added on editor initialization (like links) and removed during
  cleanForSave.
- Arrow key navigation no longer skips characters at code boundaries.
- Empty inline code elements can properly hold the cursor
  (via mouse or arrow keys).

X-original-commit: f9b2d96bb1e2c47ac4aab162dcb27cb11dc72ede
Part-of: odoo/odoo#233435
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../static/src/main/feff_plugin.js            | 27 ++++++-
 .../static/src/main/inline_code.js            | 21 ++++--
 .../src/main/link/link_selection_plugin.js    | 30 +-------
 .../html_editor/static/tests/markdown.test.js | 70 +++++++++++++++----
 4 files changed, 99 insertions(+), 49 deletions(-)

diff --git a/addons/html_editor/static/src/main/feff_plugin.js b/addons/html_editor/static/src/main/feff_plugin.js
index 7c1405238cb73..792b65f5512c7 100644
--- a/addons/html_editor/static/src/main/feff_plugin.js
+++ b/addons/html_editor/static/src/main/feff_plugin.js
@@ -24,7 +24,7 @@ import { callbacksForCursorUpdate } from "@html_editor/utils/selection";
 export class FeffPlugin extends Plugin {
     static id = "feff";
     static dependencies = ["selection"];
-    static shared = ["addFeff", "removeFeffs"];
+    static shared = ["addFeff", "removeFeffs", "surroundWithFeffs"];
 
     resources = {
         normalize_handlers: this.updateFeffs.bind(this),
@@ -78,6 +78,31 @@ export class FeffPlugin extends Plugin {
         return feff;
     }
 
+    surroundWithFeffs(node, cursors) {
+        const addFeff = (position) => {
+            // skip cursor update for append, we want to keep it before
+            // the added FEFF
+            const c = position === "append" ? null : cursors;
+            return this.addFeff(node, position, c);
+        };
+
+        const zwnbspNodes = [];
+        for (const [position, relation] of [
+            ["before", "previousSibling"],
+            ["after", "nextSibling"],
+            ["prepend", "firstChild"],
+            ["append", "lastChild"],
+        ]) {
+            const candidate = node[relation];
+            const feff =
+                isZwnbsp(candidate) && !zwnbspNodes.includes(candidate)
+                    ? candidate
+                    : addFeff(position);
+            zwnbspNodes.push(feff);
+        }
+        return zwnbspNodes;
+    }
+
     /**
      * Adds a FEFF before and after each element that matches the selectors
      * provided by the registered providers.
diff --git a/addons/html_editor/static/src/main/inline_code.js b/addons/html_editor/static/src/main/inline_code.js
index d65120e29e6fb..0de70ba3685a2 100644
--- a/addons/html_editor/static/src/main/inline_code.js
+++ b/addons/html_editor/static/src/main/inline_code.js
@@ -1,16 +1,19 @@
 import { Plugin } from "@html_editor/plugin";
 import { isBlock, closestBlock } from "@html_editor/utils/blocks";
 import { splitTextNode, unwrapContents } from "@html_editor/utils/dom";
-import { isElement, isTextNode } from "@html_editor/utils/dom_info";
+import { isElement, isTextNode, isZwnbsp } from "@html_editor/utils/dom_info";
 import { closestElement, selectElements, findFurthest } from "@html_editor/utils/dom_traversal";
 import { DIRECTIONS, nodeSize } from "@html_editor/utils/position";
-
 export class InlineCodePlugin extends Plugin {
     static id = "inlineCode";
-    static dependencies = ["selection", "history", "input", "split"];
+    static dependencies = ["selection", "history", "input", "split", "feff"];
     resources = {
         input_handlers: this.onInput.bind(this),
         selectionchange_handlers: this.handleSelectionChange.bind(this),
+        feff_providers: (root, cursors) =>
+            [...selectElements(root, ".o_inline_code")].flatMap((code) =>
+                this.dependencies.feff.surroundWithFeffs(code, cursors)
+            ),
     };
 
     setup() {
@@ -115,7 +118,9 @@ export class InlineCodePlugin extends Plugin {
             let offset = selection.startOffset;
             let sibling = textNode.previousSibling;
             while (sibling && sibling.nodeType === Node.TEXT_NODE) {
-                offset += sibling.textContent.length;
+                if (!isZwnbsp(sibling)) {
+                    offset += sibling.textContent.length;
+                }
                 sibling.textContent += textNode.textContent;
                 textNode.remove();
                 textNode = sibling;
@@ -123,7 +128,9 @@ export class InlineCodePlugin extends Plugin {
             }
             sibling = textNode.nextSibling;
             while (sibling && sibling.nodeType === Node.TEXT_NODE) {
-                textNode.textContent += sibling.textContent;
+                if (!isZwnbsp(sibling)) {
+                    textNode.textContent += sibling.textContent;
+                }
                 sibling.remove();
                 sibling = sibling.nextSibling;
             }
@@ -175,18 +182,18 @@ export class InlineCodePlugin extends Plugin {
             }
             if (isClosingForward) {
                 // Move selection out of code element.
-                codeElement.after(document.createTextNode("\u200B"));
+                this.dependencies.history.addStep();
                 this.dependencies.selection.setSelection({
                     anchorNode: codeElement.nextSibling,
                     anchorOffset: 1,
                 });
             } else {
+                this.dependencies.history.addStep();
                 this.dependencies.selection.setSelection({
                     anchorNode: codeElement.firstChild,
                     anchorOffset: 0,
                 });
             }
         }
-        this.dependencies.history.addStep();
     }
 }
diff --git a/addons/html_editor/static/src/main/link/link_selection_plugin.js b/addons/html_editor/static/src/main/link/link_selection_plugin.js
index f6f6814d011f3..17e58774ed1f3 100644
--- a/addons/html_editor/static/src/main/link/link_selection_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_selection_plugin.js
@@ -1,7 +1,7 @@
 import { Plugin } from "@html_editor/plugin";
 import { closestElement, selectElements } from "@html_editor/utils/dom_traversal";
 import { removeClass } from "@html_editor/utils/dom";
-import { isProtected, isProtecting, isZwnbsp } from "@html_editor/utils/dom_info";
+import { isProtected, isProtecting } from "@html_editor/utils/dom_info";
 
 /*
     This plugin solves selection issues around links (allowing the cursor at the
@@ -48,31 +48,7 @@ export class LinkSelectionPlugin extends Plugin {
     addFeffsToLinks(root, cursors) {
         return [...selectElements(root, "a")]
             .filter(this.isLinkEligibleForZwnbsp.bind(this))
-            .flatMap((link) => this.addFeffs(link, cursors));
-    }
-
-    addFeffs(link, cursors) {
-        const addFeff = (position) => {
-            // skip cursor update for append, we want to keep it before the added FEFF
-            const c = position === "append" ? null : cursors;
-            return this.dependencies.feff.addFeff(link, position, c);
-        };
-
-        const zwnbspNodes = [];
-        for (const [position, relation] of [
-            ["before", "previousSibling"],
-            ["after", "nextSibling"],
-            ["prepend", "firstChild"],
-            ["append", "lastChild"],
-        ]) {
-            const candidate = link[relation];
-            const feff =
-                isZwnbsp(candidate) && !zwnbspNodes.includes(candidate)
-                    ? candidate
-                    : addFeff(position);
-            zwnbspNodes.push(feff);
-        }
-        return zwnbspNodes;
+            .flatMap((link) => this.dependencies.feff.surroundWithFeffs(link, cursors));
     }
 
     /**
@@ -83,7 +59,7 @@ export class LinkSelectionPlugin extends Plugin {
      */
     padLinkWithZwnbsp(link) {
         const cursors = this.dependencies.selection.preserveSelection();
-        this.addFeffs(link, cursors);
+        this.dependencies.feff.surroundWithFeffs(link, cursors);
         cursors.restore();
     }
 
diff --git a/addons/html_editor/static/tests/markdown.test.js b/addons/html_editor/static/tests/markdown.test.js
index 0ba22a1682f31..df208d960c862 100644
--- a/addons/html_editor/static/tests/markdown.test.js
+++ b/addons/html_editor/static/tests/markdown.test.js
@@ -8,13 +8,17 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: "<p>`ab[]cd</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
-            contentAfter: '<p>\u200B<code class="o_inline_code">ab</code>\u200B[]cd</p>',
+            contentAfterEdit:
+                '<p>\u200b\ufeff<code class="o_inline_code">\ufeffab\ufeff</code>\ufeff[]cd</p>',
+            contentAfter: '<p>\u200b<code class="o_inline_code">ab</code>[]cd</p>',
         });
         // BACKWARDS
         await testEditor({
             contentBefore: "<p>[]ab`cd</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
-            contentAfter: '<p>\u200B<code class="o_inline_code">[]ab</code>cd</p>',
+            contentAfterEdit:
+                '<p>\u200b\ufeff<code class="o_inline_code">[]\ufeffab\ufeff</code>\ufeffcd</p>',
+            contentAfter: '<p>\u200b<code class="o_inline_code">[]ab</code>cd</p>',
         });
     });
 
@@ -22,12 +26,16 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: "<p>ab`cd[]ef</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
-            contentAfter: '<p>ab<code class="o_inline_code">cd</code>\u200B[]ef</p>',
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffcd\ufeff</code>\ufeff[]ef</p>',
+            contentAfter: '<p>ab<code class="o_inline_code">cd</code>[]ef</p>',
         });
         // BACKWARDS
         await testEditor({
             contentBefore: "<p>ab[]cd`ef</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">[]\ufeffcd\ufeff</code>\ufeffef</p>',
             contentAfter: '<p>ab<code class="o_inline_code">[]cd</code>ef</p>',
         });
     });
@@ -36,12 +44,16 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: "<p>ab`cd[]</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
-            contentAfter: '<p>ab<code class="o_inline_code">cd</code>\u200B[]</p>',
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffcd\ufeff</code>\ufeff[]</p>',
+            contentAfter: '<p>ab<code class="o_inline_code">cd</code>[]</p>',
         });
         // BACKWARDS
         await testEditor({
             contentBefore: "<p>ab[]cd`</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">[]\ufeffcd\ufeff</code>\ufeff</p>',
             contentAfter: '<p>ab<code class="o_inline_code">[]cd</code></p>',
         });
     });
@@ -51,12 +63,16 @@ describe("inline code", () => {
             contentBefore: "<p>a`b`cd[]e`f</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
             // The closest PREVIOUS backtick is prioritary
-            contentAfter: '<p>a`b<code class="o_inline_code">cd</code>\u200B[]e`f</p>',
+            contentAfterEdit:
+                '<p>a`b\ufeff<code class="o_inline_code">\ufeffcd\ufeff</code>\ufeff[]e`f</p>',
+            contentAfter: '<p>a`b<code class="o_inline_code">cd</code>[]e`f</p>',
         });
         await testEditor({
             contentBefore: "<p>ab[]cd`e`f</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
             // If there is no previous backtick, use the closest NEXT backtick.
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">[]\ufeffcd\ufeff</code>\ufeffe`f</p>',
             contentAfter: '<p>ab<code class="o_inline_code">[]cd</code>e`f</p>',
         });
     });
@@ -81,6 +97,8 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: '<p>a<code class="o_inline_code">b`cd[]e</code>f</p>',
             stepFunction: async (editor) => await insertText(editor, "`"),
+            contentAfterEdit:
+                '<p>a\ufeff<code class="o_inline_code">\ufeffb`cd`[]e\ufeff</code>\ufefff</p>',
             contentAfter: '<p>a<code class="o_inline_code">b`cd`[]e</code>f</p>',
         });
     });
@@ -97,7 +115,9 @@ describe("inline code", () => {
 
                 await insertText(editor, "`");
             },
-            contentAfter: '<p>ab<code class="o_inline_code">c</code>\u200B[]d</p>',
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffc\ufeff</code>\ufeff[]d</p>',
+            contentAfter: '<p>ab<code class="o_inline_code">c</code>[]d</p>',
         });
         // AFTER
         await testEditor({
@@ -106,7 +126,9 @@ describe("inline code", () => {
                 editor.document.getSelection().anchorNode.after(document.createTextNode("d"));
                 await insertText(editor, "`");
             },
-            contentAfter: '<p>a<code class="o_inline_code">b</code>\u200B[]cd</p>',
+            contentAfterEdit:
+                '<p>a\ufeff<code class="o_inline_code">\ufeffb\ufeff</code>\ufeff[]cd</p>',
+            contentAfter: '<p>a<code class="o_inline_code">b</code>[]cd</p>',
         });
         // BOTH
         await testEditor({
@@ -116,7 +138,9 @@ describe("inline code", () => {
                 editor.document.getSelection().anchorNode.after(document.createTextNode("e"));
                 await insertText(editor, "`");
             },
-            contentAfter: '<p>ab<code class="o_inline_code">c</code>\u200B[]de</p>',
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffc\ufeff</code>\ufeff[]de</p>',
+            contentAfter: '<p>ab<code class="o_inline_code">c</code>[]de</p>',
         });
     });
 
@@ -132,7 +156,9 @@ describe("inline code", () => {
 
                 await insertText(editor, "`");
             },
-            contentAfter: '<p>\u200B<code class="o_inline_code">ab</code>\u200B[]c</p>',
+            contentAfterEdit:
+                '<p>\ufeff<code class="o_inline_code">\ufeffab\ufeff</code>\ufeff[]c</p>',
+            contentAfter: '<p><code class="o_inline_code">ab</code>[]c</p>',
         });
         // BACKTICK IS NEXT SIBLING
         await testEditor({
@@ -141,6 +167,8 @@ describe("inline code", () => {
                 editor.document.getSelection().anchorNode.after(document.createTextNode("`"));
                 await insertText(editor, "`");
             },
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">[]\ufeffc\ufeff</code>\ufeff</p>',
             contentAfter: '<p>ab<code class="o_inline_code">[]c</code></p>',
         });
     });
@@ -172,12 +200,15 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: "<p>a[bc]d</p>",
             stepFunction: async (editor) => insertText(editor, "`"),
-            contentAfter: '<p>a<code class="o_inline_code">bc[]</code>\u200Bd</p>',
+            contentAfterEdit:
+                '<p>a\ufeff<code class="o_inline_code">\ufeffbc[]\ufeff</code>\ufeffd</p>',
+            contentAfter: '<p>a<code class="o_inline_code">bc[]</code>d</p>',
         });
         await testEditor({
             contentBefore: `<p>ab[cd<a href="#">test</a>ef]gh</p>`,
             stepFunction: async (editor) => insertText(editor, "`"),
-            contentAfter: `<p>ab<code class="o_inline_code">cd<a href="#">test</a>ef[]</code>\u200Bgh</p>`,
+            contentAfterEdit: `<p>ab\ufeff<code class="o_inline_code">\ufeffcd\ufeff<a href="#">\ufefftest\ufeff</a>\ufeffef[]\ufeff</code>\ufeffgh</p>`,
+            contentAfter: `<p>ab<code class="o_inline_code">cd<a href="#">test</a>ef[]</code>gh</p>`,
         });
     });
 
@@ -185,8 +216,10 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: "<p>ab[cd<strong>ef]g</strong>h</p>",
             stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffcd<strong>ef[]</strong>\ufeff</code>\ufeff<strong>g</strong>h</p>',
             contentAfter:
-                '<p>ab<code class="o_inline_code">cd<strong>ef[]</strong></code>\u200B<strong>g</strong>h</p>',
+                '<p>ab<code class="o_inline_code">cd<strong>ef[]</strong></code><strong>g</strong>h</p>',
         });
     });
 
@@ -194,8 +227,10 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: "<p><strong>a<u>b[cd</u>ef]g</strong></p>",
             stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfterEdit:
+                '<p><strong>a<u>b</u></strong>\ufeff<code class="o_inline_code">\ufeff<strong><u>cd</u>ef[]</strong>\ufeff</code>\ufeff<strong>g</strong></p>',
             contentAfter:
-                '<p><strong>a<u>b</u></strong>\u200b<code class="o_inline_code"><strong><u>cd</u>ef[]</strong></code>\u200b<strong>g</strong></p>',
+                '<p><strong>a<u>b</u></strong><code class="o_inline_code"><strong><u>cd</u>ef[]</strong></code><strong>g</strong></p>',
         });
     });
 
@@ -203,7 +238,10 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: `<p>ab[cd<a href="#">te]st</a>ef</p>`,
             stepFunction: async (editor) => insertText(editor, "`"),
-            contentAfter: '<p>ab`[]<a href="#">st</a>ef</p>',
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffcd\ufeff<a href="#" class="o_link_in_selection">\ufeffte[]\ufeff</a>\ufeff</code>\ufeff<a href="#">\ufeffst\ufeff</a>\ufeffef</p>',
+            contentAfter:
+                '<p>ab<code class="o_inline_code">cd<a href="#">te[]</a></code><a href="#">st</a>ef</p>',
         });
     });
 
@@ -211,12 +249,14 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: `<p>a[bc<img src="${base64Img}">de]f</p>`,
             stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfterEdit: `<p>a\ufeff<code class="o_inline_code">\ufeffbc\ufeff</code>\ufeff<img src="${base64Img}">\ufeff<code class="o_inline_code">\ufeffde[]\ufeff</code>\ufefff</p>`,
             contentAfter: `<p>a<code class="o_inline_code">bc</code><img src="${base64Img}"><code class="o_inline_code">de[]</code>f</p>`,
         });
 
         await testEditor({
             contentBefore: `<p>a[bcde<img src="${base64Img}">]</p>`,
             stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfterEdit: `<p>a\ufeff<code class="o_inline_code">\ufeffbcde[]\ufeff</code>\ufeff<img src="${base64Img}"></p>`,
             contentAfter: `<p>a<code class="o_inline_code">bcde[]</code><img src="${base64Img}"></p>`,
         });
     });
@@ -225,6 +265,8 @@ describe("inline code", () => {
         await testEditor({
             contentBefore: `<p>ab[cd<a href="#" class="btn btn-primary">te]st</a>ef</p>`,
             stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfterEdit:
+                '<p>ab\ufeff<code class="o_inline_code">\ufeffcd\ufeff<a href="#" class="o_link_in_selection">\ufeffte[]\ufeff</a>\ufeff</code>\ufeff<a href="#" class="btn btn-primary">\ufeffst\ufeff</a>\ufeffef</p>',
             contentAfter:
                 '<p>ab<code class="o_inline_code">cd<a href="#">te[]</a></code><a href="#" class="btn btn-primary">st</a>ef</p>',
         });

From d1b618155377a4be27dfd49498c543e2d14e4499 Mon Sep 17 00:00:00 2001
From: dhba <dhba@odoo.com>
Date: Thu, 17 Apr 2025 11:38:25 +0000
Subject: [PATCH 166/673] [FIX] html_editor: empty inline code formatting with
 backticks

Before this commit:

- Typing two backticks (``) without any text between them did not properly
  create an inline code element.

After this commit:

- Typing two backticks with nothing in between now correctly creates an empty
  inline code element.

X-original-commit: c31b3f176c6adf2fa24e908ab4705f6ac8a921a5
Part-of: odoo/odoo#233435
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../html_editor/static/src/main/inline_code.js | 16 ++++++++--------
 .../html_editor/static/tests/markdown.test.js  | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/addons/html_editor/static/src/main/inline_code.js b/addons/html_editor/static/src/main/inline_code.js
index 0de70ba3685a2..d4d97feae7ed7 100644
--- a/addons/html_editor/static/src/main/inline_code.js
+++ b/addons/html_editor/static/src/main/inline_code.js
@@ -142,7 +142,7 @@ export class InlineCodePlugin extends Plugin {
             const insertedBacktickIndex = offset - 1;
             const textBeforeInsertedBacktick = textNode.textContent.substring(
                 0,
-                insertedBacktickIndex - 1
+                insertedBacktickIndex
             );
             let startOffset, endOffset;
             const isClosingForward = textBeforeInsertedBacktick.includes("`");
@@ -174,13 +174,13 @@ export class InlineCodePlugin extends Plugin {
             codeElement.classList.add("o_inline_code");
             textNode.before(codeElement);
             codeElement.append(textNode);
-            if (
-                !codeElement.previousSibling ||
-                codeElement.previousSibling.nodeType !== Node.TEXT_NODE
-            ) {
-                codeElement.before(document.createTextNode("\u200B"));
-            }
-            if (isClosingForward) {
+            if (!codeElement.textContent.length) {
+                this.dependencies.history.addStep();
+                this.dependencies.selection.setSelection({
+                    anchorNode: codeElement.firstChild,
+                    anchorOffset: 1,
+                });
+            } else if (isClosingForward) {
                 // Move selection out of code element.
                 this.dependencies.history.addStep();
                 this.dependencies.selection.setSelection({
diff --git a/addons/html_editor/static/tests/markdown.test.js b/addons/html_editor/static/tests/markdown.test.js
index df208d960c862..fba7a723669d2 100644
--- a/addons/html_editor/static/tests/markdown.test.js
+++ b/addons/html_editor/static/tests/markdown.test.js
@@ -9,16 +9,16 @@ describe("inline code", () => {
             contentBefore: "<p>`ab[]cd</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
             contentAfterEdit:
-                '<p>\u200b\ufeff<code class="o_inline_code">\ufeffab\ufeff</code>\ufeff[]cd</p>',
-            contentAfter: '<p>\u200b<code class="o_inline_code">ab</code>[]cd</p>',
+                '<p>\ufeff<code class="o_inline_code">\ufeffab\ufeff</code>\ufeff[]cd</p>',
+            contentAfter: '<p><code class="o_inline_code">ab</code>[]cd</p>',
         });
         // BACKWARDS
         await testEditor({
             contentBefore: "<p>[]ab`cd</p>",
             stepFunction: async (editor) => await insertText(editor, "`"),
             contentAfterEdit:
-                '<p>\u200b\ufeff<code class="o_inline_code">[]\ufeffab\ufeff</code>\ufeffcd</p>',
-            contentAfter: '<p>\u200b<code class="o_inline_code">[]ab</code>cd</p>',
+                '<p>\ufeff<code class="o_inline_code">[]\ufeffab\ufeff</code>\ufeffcd</p>',
+            contentAfter: '<p><code class="o_inline_code">[]ab</code>cd</p>',
         });
     });
 
@@ -272,6 +272,16 @@ describe("inline code", () => {
         });
     });
 
+    test("should create an empty inline code when their is no text in between two backtics", async () => {
+        await testEditor({
+            contentBefore: "<p>a`[]b</p>",
+            stepFunction: async (editor) => insertText(editor, "`"),
+            contentAfterEdit:
+                '<p>a\ufeff<code class="o_inline_code">\ufeff[]\ufeff</code>\ufeffb</p>',
+            contentAfter: '<p>a<code class="o_inline_code">[]</code>b</p>',
+        });
+    });
+
     test("should not apply inline code when selection spans multiple block elements", async () => {
         await testEditor({
             contentBefore: "<p>a[b</p><p>cd</p><p>e]f</p>",

From 0d66e96eb2d12271186c768a09728008643e4ef5 Mon Sep 17 00:00:00 2001
From: dhba <dhba@odoo.com>
Date: Fri, 31 Oct 2025 15:49:27 +0530
Subject: [PATCH 167/673] [REM] html_editor: remove deprecated
 padLinkWithZwnbsp method

Purpose:

The padLinkWithZwnbsp method has been deprecated and is no longer used.
This commit removes it entirely.

task-4585706

closes odoo/odoo#233435

Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../src/main/link/link_selection_plugin.js    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/addons/html_editor/static/src/main/link/link_selection_plugin.js b/addons/html_editor/static/src/main/link/link_selection_plugin.js
index 17e58774ed1f3..2b57ca02ebf3f 100644
--- a/addons/html_editor/static/src/main/link/link_selection_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_selection_plugin.js
@@ -26,16 +26,9 @@ import { isProtected, isProtecting } from "@html_editor/utils/dom_info";
     - on non-editable links or links that are not within the editable area
  */
 
-/**
- * @typedef { Object } LinkSelectionShared
- * @property { LinkSelectionPlugin['padLinkWithZwnbsp'] } padLinkWithZwnbsp
- */
-
 export class LinkSelectionPlugin extends Plugin {
     static id = "linkSelection";
     static dependencies = ["selection", "feff"];
-    // TODO ABD: refactor to handle Knowledge comments inside this plugin without sharing padLinkWithZwnbsp.
-    static shared = ["padLinkWithZwnbsp"];
     resources = {
         /** Handlers */
         selectionchange_handlers: this.resetLinkInSelection.bind(this),
@@ -51,18 +44,6 @@ export class LinkSelectionPlugin extends Plugin {
             .flatMap((link) => this.dependencies.feff.surroundWithFeffs(link, cursors));
     }
 
-    /**
-     * Take a link and pad it with non-break zero-width spaces to ensure that it
-     * is always possible to place the cursor at its inner and outer edges.
-     *
-     * @param {HTMLAnchorElement} link
-     */
-    padLinkWithZwnbsp(link) {
-        const cursors = this.dependencies.selection.preserveSelection();
-        this.dependencies.feff.surroundWithFeffs(link, cursors);
-        cursors.restore();
-    }
-
     isLinkEligibleForZwnbsp(link) {
         return (
             link.isContentEditable &&

From 5c787f717db18662eb7bddf8cea391dee4dd104f Mon Sep 17 00:00:00 2001
From: "David Van Droogenbroeck (DROD)" <drod@odoo.com>
Date: Thu, 21 Aug 2025 14:38:17 +0000
Subject: [PATCH 168/673] [FIX] mrp: reference correct dest move for split
 backorders

Issue
-----
After splitting a MO, the linked delivery's quantity only gets updated when the
original MO is validated. Validating the backorder MOs doesn't affect the shown
quantity.

Steps to reproduce
-----
- Unarchive MTO route
- Create a stored product
	- Routes MTO & Manufacturing
	- Empty BoM
- Create a Sale Order for 3 units of the product & confirm it
- Go to the linked MO and split it in 2 (quants of 1 and 2)
- Confirm both MOs (and produce)
- Go to the sale's delivery
> The delivery's move only shows 1 unit of the product

Why the move quantity is only 1
-----
After confirming the first of the 2 backorder productions, when we manufacture
the product, we go through

https://github.com/odoo/odoo/blob/e6b87a2a37b4550faf60a77981c533d19aa054d4/addons/mrp/models/mrp_production.py#L2054

Since the first backorder kept the existing move, it has the delivery move in
`move_dest_ids` so we do

https://github.com/odoo/odoo/blob/e6b87a2a37b4550faf60a77981c533d19aa054d4/addons/stock/models/stock_move.py#L2088-L2091

Which creates a SML for the delivery move when reserving it

https://github.com/odoo/odoo/blob/e6b87a2a37b4550faf60a77981c533d19aa054d4/addons/stock/models/stock_move.py#L1853-L1858

https://github.com/odoo/odoo/blob/e6b87a2a37b4550faf60a77981c533d19aa054d4/addons/stock/models/stock_move.py#L1950-L1971

This in turn triggers the computation of the move's quantity since it depends on
the move's lines

https://github.com/odoo/odoo/blob/e6b87a2a37b4550faf60a77981c533d19aa054d4/addons/stock/models/stock_move.py#L382-L383

Our move ends up with a quantity of 1.

When we proceed with the second MO, things are a little different since there is
nothing in `moves_todo.move_dest_ids` when we do

https://github.com/odoo/odoo/blob/e6b87a2a37b4550faf60a77981c533d19aa054d4/addons/stock/models/stock_move.py#L2088-L2091

This means we don't create a new SML for the delivery move, so the quantity
stays at 1.

Why there is no move_dest_id
-----
When splitting the production, we go through

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/mrp_production.py#L1815-L1829

We create new a MO and SM for the backorder. The SM is created here

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/mrp_production.py#L1894-L1915

When preparing the values, we correctly copy the `move_dest_ids` of the original
MO's SM, see

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/stock_move.py#L646-L656

So when the backorder is created, its' SM has a correct `move_dest_ids`. The
problem actually comes from what happens after `_split_productions` in
`action_split` when we set the `date_start`

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/wizard/mrp_production_split.py#L68-L78

In the write, we get to a line where we access the production's state

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/mrp_production.py#L931

This triggers a recompute of the field.

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/mrp_production.py#L539-L552

In the compute, we access `move_finished_ids`, which again triggers a recompute.
In this compute, we call `_create_update_move_finished`

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/mrp_production.py#L800

The problem is that the move we create gets its' `move_dest_ids` from the MO
instead of using the one populated using `group_orders`.

https://github.com/odoo/odoo/blob/bc22cf5a225a4e7d58548a8d6dedbcd84d771acb/addons/mrp/models/mrp_production.py#L1142-L1167

-----
Ticket:
opw-4865082

closes odoo/odoo#234191

X-original-commit: 2a23dd2d29f522b419ffb94dd3730b3cfdf2bd54
Signed-off-by: Adrien Widart (awt) <awt@odoo.com>
Signed-off-by: David Van Droogenbroeck (drod) <drod@odoo.com>
---
 addons/mrp/models/mrp_production.py         |  6 ++-
 addons/sale_mrp/tests/test_sale_mrp_flow.py | 41 +++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 7ffd6ddc165bb..5aa9e71520369 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -1185,6 +1185,10 @@ def _get_default_picking_type_id(self, company_id):
         ], limit=1).id
 
     def _get_move_finished_values(self, product_id, product_uom_qty, product_uom, operation_id=False, byproduct_id=False, cost_share=0):
+        group_orders = self.production_group_id.production_ids
+        move_dest_ids = self.move_dest_ids
+        if len(group_orders) > 1:
+            move_dest_ids |= group_orders[0].move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_dest_ids
         return {
             'product_id': product_id,
             'product_uom_qty': product_uom_qty,
@@ -1202,7 +1206,7 @@ def _get_move_finished_values(self, product_id, product_uom_qty, product_uom, op
             'origin': self.product_id.partner_ref,
             'reference_ids': self.reference_ids.ids,
             'propagate_cancel': self.propagate_cancel,
-            'move_dest_ids': [(4, x.id) for x in self.move_dest_ids if not byproduct_id],
+            'move_dest_ids': [(4, x.id) for x in move_dest_ids if not byproduct_id],
             'cost_share': cost_share,
             'production_group_id': self.production_group_id.id,
         }
diff --git a/addons/sale_mrp/tests/test_sale_mrp_flow.py b/addons/sale_mrp/tests/test_sale_mrp_flow.py
index f2461dbe8d74b..f5d95dc5a6a01 100644
--- a/addons/sale_mrp/tests/test_sale_mrp_flow.py
+++ b/addons/sale_mrp/tests/test_sale_mrp_flow.py
@@ -2644,3 +2644,44 @@ def test_so_with_kit_and_multiple_same_component(self):
         # is linked to all moves (this is a known limitation).
         self.assertEqual(exchange_picking.move_ids.bom_line_id, self.bom_kit_1.bom_line_ids[0], "All moves in the exchange picking should be linked to the first BOM line.")
         self.assertEqual(exchange_picking.move_ids.quantity, 2)
+
+    def test_delivery_after_splitting_production(self):
+        """
+        Test that processing the different MOs of a split production correctly
+        updates the picking SM's quantity.
+        """
+        # Set product up with MTO + Manufacture with (empty) BoM
+        product = self._cls_create_product('Split Product', self.uom_unit, routes=[
+            self.company_data['default_warehouse'].mto_pull_id.route_id,
+            self.company_data['default_warehouse'].manufacture_pull_id.route_id,
+        ])
+        self.env['mrp.bom'].create({
+            'product_tmpl_id': product.product_tmpl_id.id,
+            'product_uom_id': self.env.ref('uom.product_uom_unit').id,
+        })
+
+        sale_order = self.env['sale.order'].create({
+            'partner_id': self.partner.id,
+            'order_line': [Command.create({
+                'name': f"2 of {self.product.name}",
+                'product_id': product.id,
+                'product_uom_qty': 2,
+            })],
+        })
+        sale_order.action_confirm()
+        sale_picking = sale_order.picking_ids
+        self.assertTrue(sale_picking)
+
+        mo = self.env['mrp.production'].search([('product_id', '=', product.id)], limit=1)
+        action = mo.action_split()
+        wizard = Form(self.env[action['res_model']].with_context(action['context']))
+        wizard.max_batch_size = 1
+        wizard.save().action_split()
+        self.assertEqual(len(mo.production_group_id.production_ids), 2)
+
+        mo.production_group_id.production_ids[0].button_mark_done()
+        self.assertEqual(sale_picking.move_ids.quantity, 1)
+        mo.production_group_id.production_ids[1].button_mark_done()
+        self.assertEqual(sale_picking.move_ids.quantity, 2)
+        sale_picking.button_validate()
+        self.assertEqual(sale_order.order_line.qty_delivered, 2.0)

From c4b2dd8d9efbd12ab425c9734abeec01b89b3f86 Mon Sep 17 00:00:00 2001
From: "Walid (wasa)" <wasa@odoo.com>
Date: Wed, 13 Aug 2025 14:19:11 +0000
Subject: [PATCH 169/673] [FIX] website: remove duplicate text highlight from
 ancestors

Problem:
When a text highlight is applied on a node that has an ancestor
with the same text highlighted, both highlights remain. The
ancestor's highlight should be removed before applying the new one.

Cause:
When applying highlight, it is done on the text node (leaf node).
However, one of the ancestors might already have the highlight
applied. This is not removed, leading to duplicate highlights.

Solution:
When applying the highlight, check if an ancestor has the same
text and highlight style applied. If so, remove it before
applying the new highlight.

Steps to reproduce:
1. Add text "ABC".
2. Apply text highlight on "B".
3. Apply animation on "B".
4. Apply text highlight on "ABC".
5. In the DOM, "B" has two highlights (visually noticeable).

opw-5014674

closes odoo/odoo#234240

X-original-commit: 7e3ce1b9d5cfe619eac484fdb9cc5826100b0701
Signed-off-by: Outagant Mehdi (mou) <mou@odoo.com>
Signed-off-by: Walid Sahli (wasa) <wasa@odoo.com>
---
 .../plugins/highlight/highlight_plugin.js     |  5 +++
 .../builder/website_builder/highlight.test.js | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js b/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js
index 349c5b2c7d189..a63e784ba64c7 100644
--- a/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js
+++ b/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js
@@ -246,6 +246,11 @@ formatsSpecs.highlight = {
     isFormatted: (node) => closestElement(node)?.classList.contains("o_text_highlight"),
     hasStyle: (node) => closestElement(node)?.classList.contains("o_text_highlight"),
     addStyle: (node, { highlightId, thicknessToRestore, colorToRestore }) => {
+        const styledNode = closestElement(node, ".o_text_highlight");
+        if (styledNode) {
+            formatsSpecs.highlight.removeStyle(styledNode);
+            node = styledNode;
+        }
         node.classList.add("o_text_highlight", `o_text_highlight_${highlightId}`);
         if (colorToRestore && colorToRestore !== "currentColor") {
             node.style.setProperty("--text-highlight-color", colorToRestore);
diff --git a/addons/website/static/tests/builder/website_builder/highlight.test.js b/addons/website/static/tests/builder/website_builder/highlight.test.js
index 6118b8fbb2adb..198259eef6e30 100644
--- a/addons/website/static/tests/builder/website_builder/highlight.test.js
+++ b/addons/website/static/tests/builder/website_builder/highlight.test.js
@@ -11,6 +11,7 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
 import { Plugin } from "@html_editor/plugin";
 import { highlightIdToName } from "@website/builder/plugins/highlight/highlight_configurator";
 import { textHighlightFactory } from "@website/js/highlight_utils";
+import { unformat } from "@html_editor/../tests/_helpers/format";
 
 defineMailModels();
 
@@ -192,3 +193,33 @@ test("each highlight has a name", () => {
     highlightWithAPath.sort();
     expect(highlightWithAPath).toEqual(highlightWithAName);
 });
+
+test("Should override existing highlight", async () => {
+    const { el } = await setupEditor(
+        unformat(
+            `<p>
+                [a
+                <span class="o_text_highlight o_text_highlight_freehand_1" style="--text-highlight-width: 4px;">
+                    <span class="o_animated_text o_animate o_anim_fade_in o_visible o_animated" style="visibility: visible; animation-play-state: running;">b</span>
+                </span>
+                c]
+            </p>`
+        ),
+        { config: { Plugins: [...MAIN_PLUGINS, HighlightPlugin, FakeEditInteractionPlugin] } }
+    );
+    await expandToolbar();
+    await contains(".o-we-toolbar .o-select-highlight").click();
+    await contains("#highlightPicker").click();
+    await contains(".o_popover .o_text_highlight_underline").click();
+    expect(el.innerHTML).toBe(
+        unformat(
+            `<p>
+                <span class="o_text_highlight o_text_highlight_underline" style="--text-highlight-width: 4px;">
+                    a
+                    <span class="o_animated_text o_animate o_anim_fade_in o_visible o_animated" style="visibility: visible; animation-play-state: running;"><span>b</span></span>
+                    c
+                </span>
+            </p>`
+        )
+    );
+});

From d8d586925de458b62d4c70b8e3415dff6f3acfcd Mon Sep 17 00:00:00 2001
From: Alvaro Fuentes <afu@odoo.com>
Date: Mon, 3 Nov 2025 10:48:49 +0000
Subject: [PATCH 170/673] [FIX] core: fix migration order

When we list the versions to upgrade we go over the values in
`self.migrations[pkg.name]`. This object is a mapping of mappings
`{script_location: {version: scripts_list}}`. The location could be
`module` or `module_upgrades` for local scripts, or `upgrade` for
scripts in any of the extra upgrade paths.

The problem is that if we have a minor version that matches a major one
in different locations the order is non-deterministic. For example if we
have a local upgrade script in `1.2`, and an extra upgrade script in
`16.0.1.2`. Both `version` keys (`1.2` and `16.0.1.2`) will resolve to
`16.0.1.2` when ordering. But the order they _actually_ appear in the
set of versions is non-deterministic --due to the `set` implementation
in Python.

The solution is to use a container that keeps the order, in this case a
`dict`.

closes odoo/odoo#234265

X-original-commit: 55f60621502d8e5308ea8e4e1046b157739c1122
Signed-off-by: Christophe Simonis (chs) <chs@odoo.com>
Signed-off-by: Alvaro Fuentes Suarez (afu) <afu@odoo.com>
---
 odoo/modules/migration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo/modules/migration.py b/odoo/modules/migration.py
index 5c30bb7e97324..ab06fe2a5893e 100644
--- a/odoo/modules/migration.py
+++ b/odoo/modules/migration.py
@@ -165,7 +165,7 @@ def convert_version(version: str) -> str:
 
         def _get_migration_versions(pkg, stage: str) -> list[str]:
             versions = sorted({
-                ver
+                ver: None
                 for lv in self.migrations[pkg.name].values()
                 for ver, lf in lv.items()
                 if lf

From 993b644715a54d171cf6b435c988420ae0c833d8 Mon Sep 17 00:00:00 2001
From: David Vidal <david@moduon.team>
Date: Fri, 19 Sep 2025 09:23:45 +0000
Subject: [PATCH 171/673] [IMP] stock_picking_batch: allow to extend auto wave
 conditions

This improvement just adds some hook methods that allow to decapsulate
the logic of auto waves so its doable to extend the conditions for
auto-waving.

closes odoo/odoo#230269

X-original-commit: da66ff8b2e60db06872eb926c6f22a6f99a7f879
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
---
 .../models/stock_move_line.py                 | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/stock_picking_batch/models/stock_move_line.py b/addons/stock_picking_batch/models/stock_move_line.py
index 564c5d82bf7e6..a3244356f6711 100644
--- a/addons/stock_picking_batch/models/stock_move_line.py
+++ b/addons/stock_picking_batch/models/stock_move_line.py
@@ -162,6 +162,22 @@ def _auto_wave(self):
         if remaining_lines:
             remaining_lines._auto_wave_lines_into_new_waves(nearest_parent_locations=lines_nearest_parent_locations)
 
+    def _get_potential_existing_waves_extra_domain(self, domain_list, picking_type):
+        """Extend extra conditions here"""
+        return domain_list
+
+    def _get_potential_new_waves_extra_domain(self, domain_list, picking_type):
+        """Extend extra conditions here"""
+        return domain_list
+
+    def _is_potential_existing_wave_extra(self, wave):
+        """Extend extra conditions here"""
+        return True
+
+    def _is_new_potential_line_extra(self, potential_line):
+        """Extend extra conditions here"""
+        return True
+
     def _auto_wave_lines_into_existing_waves(self, nearest_parent_locations=False):
         """ Try to add move lines to existing waves if possible, return move lines of which no appropriate waves were found to link to
          :param nearest_parent_locations (defaultdict): the key is the move line and the value is the nearest parent location in the wave locations list"""
@@ -185,6 +201,7 @@ def _auto_wave_lines_into_existing_waves(self, nearest_parent_locations=False):
                     domains.append(Domain('picking_ids.location_id', 'in', lines.location_id.ids))
                 if picking_type.batch_group_by_dest_loc:
                     domains.append(Domain('picking_ids.location_dest_id', 'in', lines.location_dest_id.ids))
+                domains = lines._get_potential_existing_waves_extra_domain(domains, picking_type)
 
                 potential_waves = self.env['stock.picking.batch'].search(Domain.AND(domains))
                 wave_to_new_lines = defaultdict(set)
@@ -218,7 +235,8 @@ def _auto_wave_lines_into_existing_waves(self, nearest_parent_locations=False):
                         or (picking_type.batch_group_by_dest_loc and line.location_dest_id != wave.picking_ids.location_dest_id) \
                         or (picking_type.wave_group_by_product and line.product_id != wave.move_line_ids.product_id) \
                         or (picking_type.wave_group_by_category and line.product_id.categ_id != wave.move_line_ids.product_id.categ_id) \
-                        or (picking_type.wave_group_by_location and waves_nearest_parent_locations[wave] != nearest_parent_locations[line].id):
+                        or (picking_type.wave_group_by_location and waves_nearest_parent_locations[wave] != nearest_parent_locations[line].id) \
+                        or not line._is_potential_existing_wave_extra(wave):
                             continue
 
                         wave_new_move_ids = wave_to_new_moves[wave]
@@ -279,6 +297,7 @@ def _auto_wave_lines_into_new_waves(self, nearest_parent_locations=False):
                 domains.append(Domain('product_id.categ_id', 'in', lines.product_id.categ_id.ids))
             if picking_type.wave_group_by_location:
                 domains.append(Domain('location_id', 'child_of', picking_type.wave_location_ids.ids))
+            domains = lines._get_potential_new_waves_extra_domain(domains, picking_type)
 
             potential_lines = self.env['stock.move.line'].search(Domain.AND(domains))
             lines_nearest_parent_locations = defaultdict(int)
@@ -305,7 +324,8 @@ def _auto_wave_lines_into_new_waves(self, nearest_parent_locations=False):
                     or (picking_type.batch_group_by_dest_loc and line.location_dest_id != potential_line.location_dest_id) \
                     or (picking_type.wave_group_by_product and line.product_id != potential_line.product_id) \
                     or (picking_type.wave_group_by_category and line.product_id.categ_id != potential_line.product_id.categ_id) \
-                    or (picking_type.wave_group_by_location and lines_nearest_parent_locations[potential_line] != nearest_parent_locations[line].id):
+                    or (picking_type.wave_group_by_location and lines_nearest_parent_locations[potential_line] != nearest_parent_locations[line].id)  \
+                    or not line._is_new_potential_line_extra(potential_line):
                         continue
 
                     line_to_lines[line].add(potential_line.id)

From 41e48922b888313f7f8ec9463e81513ce68feffc Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Mon, 3 Nov 2025 16:17:24 +0100
Subject: [PATCH 172/673] [IMP] mail,im_livechat: avoid delete param

closes odoo/odoo#233567

Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 .../static/src/core/common/chat_window_model_patch.js      | 5 +++--
 .../src/discuss/core/common/discuss_channel_model.js       | 7 ++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/im_livechat/static/src/core/common/chat_window_model_patch.js b/addons/im_livechat/static/src/core/common/chat_window_model_patch.js
index d5fc8c3fc48e4..1b8280c48813a 100644
--- a/addons/im_livechat/static/src/core/common/chat_window_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/chat_window_model_patch.js
@@ -26,8 +26,9 @@ const chatWindowPatch = {
         switch (this.livechatStep) {
             case CW_LIVECHAT_STEP.NONE: {
                 if (this.channel.isTransient) {
-                    this.channel.delete({ closeChatWindow: false });
-                    super.close(...arguments);
+                    const channel = this.channel;
+                    this.delete();
+                    channel.delete();
                     break;
                 }
                 if (this.channel.livechat_end_dt) {
diff --git a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
index 3330d417e30e2..2c4f9c4360301 100644
--- a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
+++ b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
@@ -78,13 +78,10 @@ export class DiscussChannel extends Record {
         inverse: "channel",
         onDelete: (r) => r?.delete(),
     });
-
     typingMembers = fields.Many("discuss.channel.member", { inverse: "channelAsTyping" });
 
-    delete(options = { closeChatWindow: true }) {
-        if (this.chatWindow?.exists() && options.closeChatWindow) {
-            this.chatWindow.close();
-        }
+    delete() {
+        this.chatWindow?.close();
         super.delete(...arguments);
     }
 

From d5e389cdd7629ffc6b17b2a02c2030f1ac1198f4 Mon Sep 17 00:00:00 2001
From: "Julien (jdeh)" <jdeh@odoo.com>
Date: Wed, 22 Oct 2025 13:59:02 +0200
Subject: [PATCH 173/673] [FIX] web: align close icon on badges

This commit fixes the vertical alignment of the `oi-close` icon on
`badge.tag.xml` and `tags_list`.

task-5072923

closes odoo/odoo#232683

Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/web/static/src/core/tags_list/badge_tag.xml            | 4 ++--
 addons/web/static/src/core/tags_list/tags_list.xml            | 4 ++--
 .../src/views/fields/many2many_tags/many2many_tags_field.scss | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/core/tags_list/badge_tag.xml b/addons/web/static/src/core/tags_list/badge_tag.xml
index b35497d136052..8aa967d1c334b 100644
--- a/addons/web/static/src/core/tags_list/badge_tag.xml
+++ b/addons/web/static/src/core/tags_list/badge_tag.xml
@@ -7,8 +7,8 @@
                 <div class="o_tag_badge_text o_badge_text" t-out="this.props.text"/>
             </t>
             <t t-if="this.props.onDelete">
-                <a class="o_delete d-flex align-items-center opacity-100-hover ps-1 opacity-75" href="#" tabindex="-1" aria-label="Delete" data-tooltip="Delete" t-on-click.stop.prevent="() => this.props.onDelete()">
-                    <i class="oi oi-close align-text-center"/>
+                <a class="o_delete ps-1 opacity-75 opacity-100-hover" href="#" tabindex="-1" aria-label="Delete" data-tooltip="Delete" t-on-click.stop.prevent="() => this.props.onDelete()">
+                    <i class="oi oi-close"/>
                 </a>
             </t>
         </span>
diff --git a/addons/web/static/src/core/tags_list/tags_list.xml b/addons/web/static/src/core/tags_list/tags_list.xml
index 1ee0b96bc4f4e..179d82e5efb9c 100644
--- a/addons/web/static/src/core/tags_list/tags_list.xml
+++ b/addons/web/static/src/core/tags_list/tags_list.xml
@@ -40,7 +40,7 @@
                 <a
                     t-if="tag.onDelete"
                     t-on-click.stop.prevent="(ev) => tag.onDelete and tag.onDelete(ev)"
-                    class="o_delete d-flex align-items-center opacity-100-hover"
+                    class="o_delete opacity-100-hover"
                     t-att-class="{
                             'btn btn-link position-relative py-0 px-1 text-danger opacity-0': tag.img,
                             'ps-1 opacity-75': !tag.img
@@ -49,7 +49,7 @@
                     aria-label="Delete"
                     tabIndex="-1"
                     href="#">
-                        <i class="oi oi-close align-text-top"/>
+                        <i class="oi oi-close"/>
                 </a>
             </span>
         </t>
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
index a7ca95e44a931..f5c920e8ef7bc 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.scss
@@ -40,6 +40,10 @@
             @include o-text-overflow(inline-block);
             max-width: var(--Tag-max-width, 200px);
         }
+
+        .o_delete {
+            line-height: normal;
+        }
     }
 }
 

From 812652ad3b5956d1cd7a530e3ff9a629f2e81bad Mon Sep 17 00:00:00 2001
From: FrancoisGe <fge@odoo.com>
Date: Thu, 30 Oct 2025 16:08:40 +0000
Subject: [PATCH 174/673] [FIX] html_builder: use BaseOptionComponent in test

In PR https://github.com/odoo/odoo/pull/220746, we forgot to replace the use of Component
with BaseOptionComponent in few tests. This commit fixes that.

closes odoo/odoo#234241

X-original-commit: 5b5dd63d7ca18231f4ac8bd60757ca36ad7b7ac0
Signed-off-by: Nicolas Bayet (nby) <nby@odoo.com>
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../custom_tab/builder_components/builder_list.test.js      | 6 +++---
 addons/html_builder/static/tests/custom_tab/misc.test.js    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js
index 509750f26aa49..2df0f12aeca9e 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_list.test.js
@@ -2,7 +2,7 @@ import { addBuilderOption, setupHTMLBuilder } from "@html_builder/../tests/helpe
 import { BuilderList } from "@html_builder/core/building_blocks/builder_list";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { expect, test, describe } from "@odoo/hoot";
-import { Component, onError, xml } from "@odoo/owl";
+import { onError, xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
 
 describe.current.tags("desktop");
@@ -150,7 +150,7 @@ test("reorder items", async () => {
 });
 
 async function testBuilderListFaultyProps(template) {
-    class Test extends Component {
+    class Test extends BaseOptionComponent {
         static template = xml`${template}`;
         static components = { BuilderList };
         static props = ["*"];
@@ -262,7 +262,7 @@ test("hides hiddenProperties from options", async () => {
 });
 
 test("do not lose id when adjusting 'selected'", async () => {
-    class Test extends Component {
+    class Test extends BaseOptionComponent {
         static template = xml`
             <BuilderList
                 dataAttributeAction="'list'"
diff --git a/addons/html_builder/static/tests/custom_tab/misc.test.js b/addons/html_builder/static/tests/custom_tab/misc.test.js
index 545a1877599af..6ad14e6088166 100644
--- a/addons/html_builder/static/tests/custom_tab/misc.test.js
+++ b/addons/html_builder/static/tests/custom_tab/misc.test.js
@@ -11,7 +11,7 @@ import { redo, undo } from "@html_editor/../tests/_helpers/user_actions";
 import { withSequence } from "@html_editor/utils/resource";
 import { describe, expect, test } from "@odoo/hoot";
 import { animationFrame, queryAllTexts, queryFirst } from "@odoo/hoot-dom";
-import { Component, onWillStart, xml } from "@odoo/owl";
+import { onWillStart, xml } from "@odoo/owl";
 import { contains, patchWithCleanup } from "@web/../tests/web_test_helpers";
 
 describe.current.tags("desktop");
@@ -477,7 +477,7 @@ test("no need to define 'isApplied' method for custom action if the widget alrea
 test("useDomState callback shouldn't be called when the editingElement is removed", async () => {
     let editor;
     let count = 0;
-    class TestOption extends Component {
+    class TestOption extends BaseOptionComponent {
         static template = xml`<div class="test_option">test</div>`;
         static selector = ".s_test";
         static editableOnly = false;

From baa8a7608670611fdb60bf6617433e1b1eb959b2 Mon Sep 17 00:00:00 2001
From: Mahmoudk3m <kmah@odoo.com>
Date: Tue, 4 Nov 2025 07:20:40 +0100
Subject: [PATCH 175/673] [FIX] hr: fix employee avatar display in mobile UI

The employee form view displayed misaligned or inconsistent avatar
images on mobile screens.

task-5058793

closes odoo/odoo#234155

X-original-commit: a135da458d870a664aeec04e36041098392e9a1f
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/views/hr_employee_views.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index 9a3132f7b8024..77604d2e6fa6c 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -130,28 +130,28 @@
                                 </div>
                             </button>
                         </div>
-                        <div class="row flex-column flex-sm-row align-items-center">
-                            <div class="o_employee_avatar ms-3 p-0 h-100 mw-25 align-self-start align-self-sm-center">
-                                <field name="image_1920" widget='image' class="m-0" options='{"size": [175,175], "zoom": true, "preview_image":"avatar_128"}'/>
+                        <div class="d-flex flex-column flex-sm-row align-items-center">
+                            <div class="o_employee_avatar ms-2 p-0">
+                                <field name="image_1920" widget='image' class="m-0" options='{"size": [128,158], "zoom": true, "preview_image":"avatar_128"}'/>
                                 <field name="show_hr_icon_display" invisible="1" />
                             </div>
-                            <div class="align-self-start o_employee_form_header_info">
-                                <div class="oe_title ps-0 pe-2 mw-100">
+                            <div class="col px-4">
+                                <div class="oe_title ps-0 pe-sm-2">
                                     <h1 class="d-flex flex-row align-items-center">
                                         <field name="name" placeholder="Employee's Name"
                                             required="True" style="font-size: min(4vw, 2.6rem);"/>
                                     </h1>
                                     <h5 class="d-flex align-items-baseline mb-0">
                                         <i class="fa fa-envelope fa-fw me-1 text-primary" title="Work Email"/>
-                                        <field name="work_email" widget="email" placeholder="e.g. johndoe@example.com" string="Work Email"/>
+                                        <field name="work_email" widget="email" placeholder="e.g. johndoe@example.com" string="Work Email" class="w-100 w-sm-75"/>
                                     </h5>
                                     <h5 class="d-flex align-items-baseline mb-0">
                                         <i class="fa fa-phone fa-fw me-1 text-primary" title="Work Phone"/>
-                                        <field name="work_phone" widget="phone" placeholder="Work Phone" string="Work Phone"/>
+                                        <field name="work_phone" widget="phone" placeholder="Work Phone" string="Work Phone"  class="w-100 w-sm-75"/>
                                     </h5>
                                     <h5 class="d-flex align-items-baseline mb-0">
                                         <i class="fa fa-mobile fa-fw me-1 text-primary" title="Work Mobile"/>
-                                        <field name="mobile_phone" widget="phone" placeholder="Work Mobile" string="Work Mobile"/>
+                                        <field name="mobile_phone" widget="phone" placeholder="Work Mobile" string="Work Mobile"  class="w-100 w-sm-75"/>
                                     </h5>
                                     <h5>
                                         <i class="fa fa-tags fa-fw me-1 text-primary" title="Tags"/>

From 278216a81c84f12010c6050379973953348aeb61 Mon Sep 17 00:00:00 2001
From: "Victor Piryns (pivi)" <pivi@odoo.com>
Date: Mon, 20 Oct 2025 14:05:16 +0000
Subject: [PATCH 176/673] [PERF] hr_recruitment: Speed-up recruitment views

Description
-----------
The commit odoo/odoo@0f981b14ea22cc154bcd93f53dc19f46c37ecb13 tried
to fix an issue where, if the `company_id` was not set in the Form view,
no `user_id` would match if they had a `company_id` set,
while the wanted behavior was the inverse, all internal users
should match regardless of companies.

This was fixed by introducing a computed field `allowed_user_ids`
which was doing the company computation manually and replaced the
`company_ids` domain leaf on the field.
Sadly, this approach introduces a performance regression on the
front-end side, as the webclient creates internal data structures
*per* individual result of the RHS in the domain. So if
`allowed_user_ids` returns a lot of matching `ids`, it becomes a
significant overhead.

Following the refactoring of `domains.py`, a slight semantic change
happened and the initial issue of the bugfix can be resolved by
just changing the domain operator to `'=?'` instead. When
`company_id=False`, the domain leaf `('company_ids, '=?', False)` is
optimized out by `_operator_equal_if_value` as `_TRUE_DOMAIN`
(aka `(1, '=', 1)`). This is as expected behavior post-bugfix.
This was not the case before the refactoring.

This allows us to completely deprecate the usage of the field
`allowed_user_ids` and the front-end has no significant post-processing
to do.

/!\ This commits deprecates `hr.job.allowed_user_ids`, but doesn't
remove it yet, as it might be referenced by views or custom JS.

Benchmark
---------
On a 19.0 database where `allowed_user_ids` returns 1.4k ids,
opening the default kanban view of the Recruitment app took:

|                       | Before  | After  | Improvement |
|-----------------------|---------|--------|-------------|
| Backend process time  | 400ms   | 160ms  | 2.5x        |
| Frontend process time | 3.3s    | 220ms  | **15x**     |
| Total (LCP) time      | 3.7s    | 380ms  | 9.7x        |
| Response Payload size | ~800KiB | ~33KiB | **24x**     |

closes odoo/odoo#234219

X-original-commit: aba32513f01dd77ad6d8bdeca47a8dee09a970f6
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
Signed-off-by: Piryns Victor (pivi) <pivi@odoo.com>
---
 addons/hr/models/hr_job.py                    |  3 +-
 addons/hr_recruitment/models/hr_job.py        |  2 +-
 .../test_recruitment_allowed_user_ids.py      | 46 ++++++++++---------
 addons/hr_recruitment/views/hr_job_views.xml  |  2 -
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/addons/hr/models/hr_job.py b/addons/hr/models/hr_job.py
index 2592e53bc2a92..9068ed87f79a7 100644
--- a/addons/hr/models/hr_job.py
+++ b/addons/hr/models/hr_job.py
@@ -26,13 +26,14 @@ class HrJob(models.Model):
     user_id = fields.Many2one(
         "res.users",
         "Recruiter",
-        domain="[('share', '=', False), ('id', 'in', allowed_user_ids)]",
+        domain="[('share', '=', False), ('company_ids', '=?', company_id)]",
         default=lambda self: self.env.user,
         groups="hr.group_hr_user",
         tracking=True,
         help="The Recruiter will be the default value for all Applicants in this job \
             position. The Recruiter is automatically added to all meetings with the Applicant.",
     )
+    # TODO (master): remove the field `allowed_user_ids`.
     allowed_user_ids = fields.Many2many('res.users', compute='_compute_allowed_user_ids', readonly=True)
     department_id = fields.Many2one('hr.department', string='Department', check_company=True, tracking=True, index='btree_not_null')
     company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.company, tracking=True)
diff --git a/addons/hr_recruitment/models/hr_job.py b/addons/hr_recruitment/models/hr_job.py
index 3f6a1b93c0910..41492c30b6c0c 100644
--- a/addons/hr_recruitment/models/hr_job.py
+++ b/addons/hr_recruitment/models/hr_job.py
@@ -63,7 +63,7 @@ def _get_default_favorite_user_ids(self):
     favorite_user_ids = fields.Many2many('res.users', 'job_favorite_user_rel', 'job_id', 'user_id', default=_get_default_favorite_user_ids)
     interviewer_ids = fields.Many2many(
         "res.users",
-        domain="[('id', 'in', allowed_user_ids)]",
+        domain="[('share', '=', False), ('company_ids', '=?', company_id)]",
         string="Interviewers",
         groups="hr_recruitment.group_hr_recruitment_interviewer",
         help="The Interviewers set on the job position can see all Applicants in it. They have access to the information, the attachments, the meeting management and they can refuse him. You don't need to have Recruitment rights to be set as an interviewer.",
diff --git a/addons/hr_recruitment/tests/test_recruitment_allowed_user_ids.py b/addons/hr_recruitment/tests/test_recruitment_allowed_user_ids.py
index e2f1b959bb777..c63259b59aabf 100644
--- a/addons/hr_recruitment/tests/test_recruitment_allowed_user_ids.py
+++ b/addons/hr_recruitment/tests/test_recruitment_allowed_user_ids.py
@@ -33,37 +33,39 @@ def setUp(self):
             'company_id': self.company_b.id,
         })
 
-    def test_recruiter_allowed_user_ids_with_company(self):
-        job = self.env['hr.job'].create({
+    def test_recruiter_user_id_with_company(self):
+        # Test job with company A - should allow user_a but not user_b
+        job_a = self.env['hr.job'].create({
             'name': 'Job Position Company A',
             'company_id': self.company_a.id,
         })
-        job._compute_allowed_user_ids()
-
-        matched_users = job.allowed_user_ids
-
-        self.assertIn(self.user_a, matched_users)
-        self.assertNotIn(self.user_b, matched_users)
-
-        job = self.env['hr.job'].create({
-            'name': 'Job Position Company B',
-            'company_id': self.company_b.id,
-        })
-        job._compute_allowed_user_ids()
 
-        matched_users = job.allowed_user_ids
+        # user_a can be set as a recruiter
+        job_a.user_id = self.user_a
+        self.assertEqual(job_a.user_id, self.user_a)
 
-        self.assertIn(self.user_b, matched_users)
-        self.assertNotIn(self.user_a, matched_users)
+        # Validate that the domain defined on hr.job.user_id contains user_a, but excludes user_b
+        domain = [('share', '=', False), ('company_ids', '=?', self.company_a.id)]
+        allowed_users = self.env['res.users'].search(domain)
+        self.assertIn(self.user_a, allowed_users)
+        self.assertNotIn(self.user_b, allowed_users)
 
-    def test_recruiter_allowed_user_ids_without_company(self):
+    def test_recruiter_user_id_without_company(self):
+        # Test job without company - should allow both users
         job = self.env['hr.job'].create({
             'name': 'Job Position',
             'company_id': False,
         })
-        job._compute_allowed_user_ids()
 
-        matched_users = job.allowed_user_ids
+        # When company_id is False, users from *any* company are ok
+        domain = [('share', '=', False), ('company_ids', '=?', False)]
+        allowed_users = self.env['res.users'].search(domain)
+        self.assertIn(self.user_a, allowed_users)
+        self.assertIn(self.user_b, allowed_users)
+
+        # Both users should be settable as recruiter
+        job.user_id = self.user_a
+        self.assertEqual(job.user_id, self.user_a)
 
-        self.assertIn(self.user_a, matched_users)
-        self.assertIn(self.user_b, matched_users)
+        job.user_id = self.user_b
+        self.assertEqual(job.user_id, self.user_b)
diff --git a/addons/hr_recruitment/views/hr_job_views.xml b/addons/hr_recruitment/views/hr_job_views.xml
index 0b44429c8f0bb..468cfd783848f 100644
--- a/addons/hr_recruitment/views/hr_job_views.xml
+++ b/addons/hr_recruitment/views/hr_job_views.xml
@@ -22,7 +22,6 @@
                 >
                 <field name="active"/>
                 <field name="alias_email"/>
-                <field name="allowed_user_ids" invisible="1"/>
                 <templates>
                     <t t-name="menu" groups="hr_recruitment.group_hr_recruitment_user">
                         <div class="container">
@@ -431,7 +430,6 @@
                 <field name="alias_name" column_invisible="True"/>
                 <field name="alias_id" invisible="not alias_name" optional="hide"
                     groups="hr_recruitment.group_hr_recruitment_interviewer"/>
-                <field name="allowed_user_ids" invisible="1"/>
                 <field name="user_id" widget="many2one_avatar_user" optional="hide"
                     groups="hr_recruitment.group_hr_recruitment_interviewer,hr.group_hr_user"/>
             </field>

From e8f48bd632385d904fe1efb0e179084ab3d565b4 Mon Sep 17 00:00:00 2001
From: "Julien (jdeh)" <jdeh@odoo.com>
Date: Thu, 23 Oct 2025 12:20:31 +0000
Subject: [PATCH 177/673] [FIX] website: loader progress bar color

This commits changes the website loader progress bar color, from black
to `primary`. This provides a better contrast in dark mode as well as
better consistency.

task-5170115

closes odoo/odoo#233874

X-original-commit: 412191a797cc5e98f27243a9bcf3f0df8831373c
Signed-off-by: Romaric Moyeuvre (romo) <romo@odoo.com>
---
 .../static/src/components/website_loader/website_loader.scss     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website/static/src/components/website_loader/website_loader.scss b/addons/website/static/src/components/website_loader/website_loader.scss
index 19b49e5a8bf31..ac036fb999582 100644
--- a/addons/website/static/src/components/website_loader/website_loader.scss
+++ b/addons/website/static/src/components/website_loader/website_loader.scss
@@ -34,7 +34,6 @@
     }
     .o_website_loader_progress {
         --progress-height: 0.5rem;
-        --progress-bar-bg: black;
     }
     .o_website_loader_check {
         @keyframes loaderCheck {

From 1a78a43a46970d9f510969dec11196701565b5cb Mon Sep 17 00:00:00 2001
From: Mahmoudk3m <kmah@odoo.com>
Date: Thu, 14 Aug 2025 13:42:42 +0200
Subject: [PATCH 178/673] [IMP] website_hr_recruitment: show remote jobs with
 country filter

Currently, job positions are filtered based on the visitor's IP country.
This causes remote jobs to be hidden if they do not match the visitor's country.

This commit ensures that even when jobs are filtered by IP country, all jobs
marked as 'Remote' are always displayed.

closes odoo/odoo#222983

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/website_hr_recruitment/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index 1aba44bf37288..b52fde52ec584 100644
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -52,7 +52,8 @@ def job_filtering_condition(job, filter_to_disable=False):
             )
             if not all_fields or (
                 country_filter and not (
-                    job.address_id and job.address_id.country_id == country
+                    not job.address_id or
+                    (job.address_id and job.address_id.country_id == country)
                 )
             ):
                 return False

From 2fcaa205e6655ea1534a49931db0ffe0643644b0 Mon Sep 17 00:00:00 2001
From: rmun-odoo <rmun@odoo.com>
Date: Tue, 15 Apr 2025 18:40:14 +0530
Subject: [PATCH 179/673] [IMP] fleet: add engine option for bike-type vehicles

Previously, bike-type vehicles in the fleet app did not support an engine option
This has been updated to accommodate motorbikes, which require engine
specifications.

task-4653379

closes odoo/odoo#206785

Related: odoo/enterprise#88597
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/fleet/models/fleet_vehicle.py             | 6 ++++--
 addons/fleet/models/fleet_vehicle_model.py       | 8 ++++++--
 addons/fleet/views/fleet_vehicle_model_views.xml | 5 +++--
 addons/fleet/views/fleet_vehicle_views.xml       | 4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py
index 79946cb9b2f0a..e54f0c7a8a967 100644
--- a/addons/fleet/models/fleet_vehicle.py
+++ b/addons/fleet/models/fleet_vehicle.py
@@ -94,7 +94,7 @@ def _get_year_selection(self):
         ('miles', 'mi')
         ], 'Odometer Unit', default='kilometers', required=True)
     transmission = fields.Selection(
-        [('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission',
+        [('manual', 'Manual'), ('semi_automatic', 'Semi-Automatic'), ('automatic', 'Automatic')], 'Transmission',
         compute='_compute_transmission', store=True, readonly=False)
     fuel_type = fields.Selection(FUEL_TYPES, 'Fuel Type', compute='_compute_fuel_type', store=True, readonly=False)
     power_unit = fields.Selection([
@@ -139,7 +139,9 @@ def _get_year_selection(self):
         ('today', 'Today'),
     ], compute='_compute_service_activity')
     vehicle_properties = fields.Properties('Properties', definition='model_id.vehicle_properties_definition', copy=True)
-    vehicle_range = fields.Integer(string="Range")
+    vehicle_range = fields.Integer(string="Range",
+        help="Range represents the maximum distance a vehicle can travel on a full charge (for EVs) or \
+            a full tank (for fuel-powered vehicles)")
     range_unit = fields.Selection([('km', 'km'), ('mi', 'mi')],
         compute='_compute_range_unit', store=True, readonly=False, default="km", required=True)
 
diff --git a/addons/fleet/models/fleet_vehicle_model.py b/addons/fleet/models/fleet_vehicle_model.py
index dca9ee2d5b851..5e5e2142ecd0b 100644
--- a/addons/fleet/models/fleet_vehicle_model.py
+++ b/addons/fleet/models/fleet_vehicle_model.py
@@ -36,7 +36,9 @@ def _get_year_selection(self):
     image_128 = fields.Image(related='brand_id.image_128', readonly=True)
     active = fields.Boolean(default=True)
     vehicle_type = fields.Selection([('car', 'Car'), ('bike', 'Bike')], default='car', required=True, tracking=True)
-    transmission = fields.Selection([('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission', tracking=True)
+    transmission = fields.Selection(
+        selection=[('manual', 'Manual'), ('semi_automatic', 'Semi-Automatic'), ('automatic', 'Automatic')],
+        string='Transmission', tracking=True)
     vehicle_count = fields.Integer(compute='_compute_vehicle_count', search='_search_vehicle_count')
     model_year = fields.Selection(selection='_get_year_selection', tracking=True)
     color = fields.Char(tracking=True)
@@ -61,7 +63,9 @@ def _get_year_selection(self):
         ('horsepower', 'Horsepower (hp)')
         ], 'Power Unit', default='power', required=True)
     vehicle_properties_definition = fields.PropertiesDefinition('Vehicle Properties')
-    vehicle_range = fields.Integer(string="Range")
+    vehicle_range = fields.Integer(string="Range",
+        help="Range represents the maximum distance a vehicle can travel on a full charge (for EVs) or \
+            a full tank (for fuel-powered vehicles)")
     range_unit = fields.Selection([('km', 'km'), ('mi', 'mi')], default="km", required=True)
     drive_type = fields.Selection([
         ('fwd', 'Front-Wheel Drive (FWD)'),
diff --git a/addons/fleet/views/fleet_vehicle_model_views.xml b/addons/fleet/views/fleet_vehicle_model_views.xml
index f68867c8200a9..fa546664ebc7c 100644
--- a/addons/fleet/views/fleet_vehicle_model_views.xml
+++ b/addons/fleet/views/fleet_vehicle_model_views.xml
@@ -48,10 +48,11 @@
                                     <field name="color"/>
                                     <field name="trailer_hook"/>
                                 </group>
-                                <group id="vehicle_information" string="Vehicle Information" invisible="vehicle_type != 'bike'">
+                                <group id="vehicle_information" string="Model" invisible="vehicle_type != 'bike'">
+                                    <field name="model_year"/>
                                     <field name="electric_assistance"/>
                                 </group>
-                                <group string="Engine" invisible="vehicle_type != 'car'" name="group_engine">
+                                <group string="Engine" name="group_engine">
                                     <field name="default_fuel_type" required="1"/>
                                     <field name="transmission"/>
                                     <field name="drive_type"/>
diff --git a/addons/fleet/views/fleet_vehicle_views.xml b/addons/fleet/views/fleet_vehicle_views.xml
index 53c552d11072a..e1867e13b626e 100644
--- a/addons/fleet/views/fleet_vehicle_views.xml
+++ b/addons/fleet/views/fleet_vehicle_views.xml
@@ -148,9 +148,9 @@
                                     </div>
                                     <field name="electric_assistance" invisible="vehicle_type != 'bike'"/>
                                 </group>
-                                <group string="Engine" invisible="vehicle_type != 'car'">
+                                <group string="Engine">
                                     <field name="fuel_type"/>
-                                    <field name="transmission" invisible="vehicle_type != 'car'"/>
+                                    <field name="transmission"/>
                                     <label for="power" invisible="power_unit != 'power'"/>
                                     <div class="o_row" invisible="power_unit != 'power'">
                                         <field name="power"/>

From 74634dc60afc14645a0d9c379d3afb8b4c40acb2 Mon Sep 17 00:00:00 2001
From: amga-odoo <amga@odoo.com>
Date: Mon, 23 Jun 2025 19:01:54 +0530
Subject: [PATCH 180/673] [IMP] fleet: warnings on contract type specific

Before:
- The contract expiration warning logic does not differentiate between contract types.
- A contract line turns red when it is expired and has no subsequent contracts.
- The line returns to gray if any new contract is added, regardless of type.
- This can result in prematurely removed warnings, especially when the
new contract is of a different type (e.g., Omnium vs Leasing).
- The "type" column is not shown in the list view.

After:
- Added "type" column to the list view (default visible).
- A contract line now turns red only if it is expired and there are no future
contracts of the same type.
- Contracts with no type are treated as a separate type category.
- When a valid future contract of the same type exists, the color is cleared from the line.
- Ensured outdated red warnings are properly removed (e.g., "Yesterday" no longer
stays red once warning condition is cleared).

Task-4885171

closes odoo/odoo#215524

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/fleet/models/fleet_vehicle_log_contract.py | 5 +++--
 addons/fleet/views/fleet_vehicle_cost_views.xml   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/fleet/models/fleet_vehicle_log_contract.py b/addons/fleet/models/fleet_vehicle_log_contract.py
index ca3a9917b0ad9..4e5ca3020e45a 100644
--- a/addons/fleet/models/fleet_vehicle_log_contract.py
+++ b/addons/fleet/models/fleet_vehicle_log_contract.py
@@ -72,7 +72,7 @@ def _compute_contract_name(self):
                 name = record.cost_subtype_id.name + ' ' + name
             record.name = name
 
-    @api.depends('vehicle_id')
+    @api.depends('vehicle_id', 'cost_subtype_id')
     def _compute_has_open_contract(self):
         today = fields.Date.today()
         open_contracts = self.env['fleet.vehicle.log.contract'].search([
@@ -80,8 +80,9 @@ def _compute_has_open_contract(self):
             ('state', '=', 'open'),
             ('expiration_date', '>=', today)
         ])
+        open_contract_keys = {(c.vehicle_id.id, c.cost_subtype_id.id) for c in open_contracts}
         for log_contract in self:
-            log_contract.has_open_contract = log_contract.vehicle_id in open_contracts.vehicle_id
+            log_contract.has_open_contract = (log_contract.vehicle_id.id, log_contract.cost_subtype_id.id) in open_contract_keys
 
     @api.depends('expiration_date', 'state')
     def _compute_days_left(self):
diff --git a/addons/fleet/views/fleet_vehicle_cost_views.xml b/addons/fleet/views/fleet_vehicle_cost_views.xml
index 2c993b6b6f9c3..a348f145b42f4 100644
--- a/addons/fleet/views/fleet_vehicle_cost_views.xml
+++ b/addons/fleet/views/fleet_vehicle_cost_views.xml
@@ -75,8 +75,10 @@
                 <field name="active" column_invisible="True"/>
                 <field name="expires_today" column_invisible="True"/>
                 <field name="name" class="fw-bold" />
+                <field name="cost_subtype_id" />
                 <field name="start_date" />
-                <field name="expiration_date" widget="remaining_days"/>
+                <field name="expiration_date" widget="remaining_days"
+                    options="{'classes': {'danger': 'record.days_left==0 and not record.expires_today and not record.has_open_contract'}}"/>
                 <field name="days_left" column_invisible="True"/>
                 <field name="vehicle_id"/>
                 <field name="insurer_id" />

From 81da4557c489a5a7ff16a727c356eb37085fcb39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Belpaire?= <beje@odoo.com>
Date: Fri, 17 Oct 2025 14:20:58 +0200
Subject: [PATCH 181/673] [FIX] hr_recruitement: scope kanban styles to prevent
 UI conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A style rule for grouped kanban views in the recruitment app was too broad.
This unintentionally affected the layout of other kanban views of other apps,
notably causing incorrect margins in the documents app.

This commit scopes the recruitment-specific styles to apply only to the
kanban views within the hr_recruitment module.
By using the existing .o_kanban_applicant class to scope the styles, we also
removed unnecessary nesting, making the SCSS cleaner and more maintainable.

Issue introduced in: 17af9256a7a9c5ca (hr_recruitment: review design)

Task-5170338

closes odoo/odoo#232467

Signed-off-by: Warnon Aurélien (awa) <awa@odoo.com>
---
 .../static/src/scss/hr_job.scss               | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/addons/hr_recruitment/static/src/scss/hr_job.scss b/addons/hr_recruitment/static/src/scss/hr_job.scss
index f8c3411655b97..639d01fe107ff 100644
--- a/addons/hr_recruitment/static/src/scss/hr_job.scss
+++ b/addons/hr_recruitment/static/src/scss/hr_job.scss
@@ -3,22 +3,36 @@
         padding: 0px;
         border-top: 0px !important;
 
-        &.o_kanban_ungrouped .o_kanban_record {
-            width: 100%;
-            --KanbanRecord-padding-v: #{map-get($spacers, 2)} !important;
-            --KanbanRecord-padding-h: 0px !important;
-            --Ribbon-font-size: 0.6rem;
-            --Ribbon-wrapper-width: 5rem;
-            --Ribbon-height: 1.9;
-
-            @include media-breakpoint-up(md) {
-                min-width: 768px;
+        &.o_kanban_ungrouped {
+            .o_kanban_record {
+                width: 100%;
+                --KanbanRecord-padding-v: #{map-get($spacers, 2)} !important;
+                --KanbanRecord-padding-h: 0px !important;
+                --Ribbon-font-size: 0.6rem;
+                --Ribbon-wrapper-width: 5rem;
+                --Ribbon-height: 1.9;
+
+                @include media-breakpoint-up(md) {
+                    min-width: 768px;
+                }
+
+                &:not(.o_kanban_ghost) {
+                    border: none;
+                    border-bottom: $border-width solid $border-color;
+                    justify-content: center;
+                }
             }
 
-            &:not(.o_kanban_ghost) {
-                border: none;
-                border-bottom: $border-width solid $border-color;
-                justify-content: center;
+            @include media-breakpoint-down(md) {
+                .o_hr_recruitment_kanban_card_large_screen {
+                    display: none;    
+                }
+            }
+            
+            @media only screen and (min-width: 768px) {
+                .o_hr_recruitment_kanban_card_mobile_screen {
+                    display: none;
+                }
             }
         }
 
@@ -45,11 +59,7 @@
         .o_field_many2one_avatar_user .o_avatar{
             column-gap: 0.375rem;
         }
-    }
-}
-
-.o_kanban_view {
-    .o_kanban_renderer {
+        
         .o_hr_recruitment_kanban_card_mobile_screen {
             min-height: 130px;
         }
@@ -58,23 +68,14 @@
             .o_hr_recruitment_kanban_card_large_screen {
                 display: none;    
             }
-
-            .o_kanban_record {
-                margin: 0 0 ($border-width * -1);
-            }
         }
+    }
+}
 
-        &.o_kanban_ungrouped {
-            @include media-breakpoint-down(md) {
-                .o_hr_recruitment_kanban_card_large_screen {
-                    display: none;    
-                }
-            }
-            @media only screen and (min-width: 768px) {
-                .o_hr_recruitment_kanban_card_mobile_screen {
-                    display: none;
-                }
-            }
+.o_kanban_applicant {
+    .o_kanban_renderer.o_kanban_grouped {
+        .o_kanban_record {
+            margin: 0 0 ($border-width * -1);
         }
     }
 }

From 2c513d679f6e56a3b9001a04245e77f44df3588a Mon Sep 17 00:00:00 2001
From: sami odoo <sami@odoo.com>
Date: Thu, 18 Sep 2025 14:18:49 +0530
Subject: [PATCH 182/673] [IMP] web:  display app icon header

Purpose:
Previously, when a user edited an app's icon in Studio and selected a Font
Awesome icon instead of an image, the icon was not displayed in the navbar or
mobile sidebar. This commit ensures the icon now displays correctly in both
locations.

task-5085482

closes odoo/odoo#228966

Related: odoo/enterprise#95725
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 .../static/src/webclient/menus/menu_command_item.xml |  4 ++--
 addons/web/static/src/webclient/navbar/navbar.js     | 12 +++++++++++-
 addons/web/static/src/webclient/navbar/navbar.scss   |  6 ++++--
 addons/web/static/src/webclient/navbar/navbar.xml    |  2 ++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/webclient/menus/menu_command_item.xml b/addons/web/static/src/webclient/menus/menu_command_item.xml
index 76d2d8c654101..b363af2101fee 100644
--- a/addons/web/static/src/webclient/menus/menu_command_item.xml
+++ b/addons/web/static/src/webclient/menus/menu_command_item.xml
@@ -4,8 +4,8 @@
   <t t-name="web.AppIconCommand">
     <div class="o_command_default position-relative d-flex align-items-center px-4 py-2 cursor-pointer">
       <img t-if="props.webIconData" class="me-2 o_app_icon position-relative rounded-1" t-attf-src="{{props.webIconData}}"/>
-      <div t-else="" class="me-2 o_app_icon d-flex align-items-center justify-content-center" t-attf-style="background-color:{{props.webIcon.backgroundColor}}" >
-        <i t-att-class="props.webIcon.iconClass" t-attf-style="color:{{props.webIcon.color}}"></i>
+      <div t-else="" class="me-2 o_app_icon d-flex align-items-center justify-content-center">
+        <i t-att-class="`${props.webIcon.iconClass} fa-2x`" t-attf-style="color:{{props.webIcon.color}}"></i>
       </div>
       <t t-slot="name"/>
       <span class="ms-auto flex-shrink-0">
diff --git a/addons/web/static/src/webclient/navbar/navbar.js b/addons/web/static/src/webclient/navbar/navbar.js
index 9ca52601297aa..66f6eee392a47 100644
--- a/addons/web/static/src/webclient/navbar/navbar.js
+++ b/addons/web/static/src/webclient/navbar/navbar.js
@@ -85,7 +85,17 @@ export class NavBar extends Component {
     }
 
     get currentApp() {
-        return this.menuService.getCurrentApp();
+        const app = this.menuService.getCurrentApp();
+        if (app?.webIcon) {
+            const [webIconClass, webIconColor, webIconBg] = app.webIcon.split(",");
+            return {
+                ...app,
+                webIconClass,
+                webIconColor,
+                webIconBg,
+            };
+        }
+        return app;
     }
 
     get currentAppSections() {
diff --git a/addons/web/static/src/webclient/navbar/navbar.scss b/addons/web/static/src/webclient/navbar/navbar.scss
index f7fc4eba00d01..b22016e3e2466 100644
--- a/addons/web/static/src/webclient/navbar/navbar.scss
+++ b/addons/web/static/src/webclient/navbar/navbar.scss
@@ -76,7 +76,8 @@
         // Animate on large screen without 'reduced-motion' only.
         // --------------------------------------------------------------------
         @include media-breakpoint-up(md) {
-            &.hasImage:not(.o_menu_toggle_back) {
+            &.hasImage:not(.o_menu_toggle_back),
+            &.hasFaIcon:not(.o_menu_toggle_back) {
                 .o_menu_toggle_icon {
                     opacity: 0;
                 }
@@ -105,7 +106,8 @@
                     transition: all .1s;
                 }
 
-                &.hasImage:not(.o_menu_toggle_back) {
+                &.hasImage:not(.o_menu_toggle_back),
+                &.hasFaIcon:not(.o_menu_toggle_back) {
                     transform: none;
                     transition: none;
 
diff --git a/addons/web/static/src/webclient/navbar/navbar.xml b/addons/web/static/src/webclient/navbar/navbar.xml
index 10b538a87c6a3..dca113d9bda24 100644
--- a/addons/web/static/src/webclient/navbar/navbar.xml
+++ b/addons/web/static/src/webclient/navbar/navbar.xml
@@ -115,6 +115,7 @@
           <nav class="o_burger_menu_content flex-grow-1 flex-shrink-1 overflow-auto o_burger_menu_app">
                 <div t-if="!state.isAllAppsMenuOpened and currentApp" class="d-flex align-items-center m-3 mb-0">
                   <img style="height: 2em;" t-if="currentApp.webIconData" class="o_app_icon me-2" t-attf-src="{{currentApp.webIconData}}"/>
+                  <i t-elif="currentApp.webIcon" t-att-class="`${currentApp.webIconClass} fa-2x me-2`" t-att-style="'color:' + currentApp.webIconColor"></i>
                   <span class="fs-4 fw-bolder"><t t-esc="currentApp.name"/></span>
                 </div>
                 <ul class="list-unstyled py-2 ps-0 mb-0">
@@ -131,6 +132,7 @@
                         <li t-att-data-menu-xmlid="app.xmlid" class="o_app fw-bolder py-2" t-att-class="{'bg-primary-subtle': menuService.getCurrentApp() === app}" t-on-click="() => {this.onNavBarDropdownItemSelection(app); this._closeAppMenuSidebar();}">
                           <div class="d-flex align-items-center">
                             <img style="height: 3em;" t-if="app.webIconData" class="o_app_icon me-2" t-attf-src="{{app.webIconData}}"/>
+                            <i t-elif="app.webIcon" t-att-class="app.webIcon.split(',')[0] + ' fa-3x me-2'" t-att-style="'color:' + app.webIcon.split(',')[1]"></i>
                             <t t-esc="app.name"/>
                           </div>
                         </li>

From ef03fc7ab7ece2b8219a496088b0fbe6edac28e3 Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Mon, 3 Nov 2025 09:29:39 +0000
Subject: [PATCH 183/673] [FIX] web: tests - restore mock fields defaults

Before this commit, default values in mock fields defined by functions
would be lost when extending a model, because by doing so the fields
were JSON-copied and the default functions were lost.

To fix this, this commit introduces another way to copy field
definitions that preserves functions, allowing default values (typically
for the 'create_date' and 'write_date' fields) to be applied correctly.

closes odoo/odoo#234262

X-original-commit: 38d6850465ad06e3a65deca19f556ffa0e16d342
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
---
 .../tests/_framework/mock_server/mock_fields.js  | 16 ++++++++++++++++
 .../tests/_framework/mock_server/mock_model.js   | 14 +++++++-------
 .../static/tests/mock_server/mock_model.test.js  |  3 ++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/tests/_framework/mock_server/mock_fields.js b/addons/web/static/tests/_framework/mock_server/mock_fields.js
index 04d565a373d75..ffd78f567eba1 100644
--- a/addons/web/static/tests/_framework/mock_server/mock_fields.js
+++ b/addons/web/static/tests/_framework/mock_server/mock_fields.js
@@ -1,3 +1,4 @@
+import { deepCopy } from "@web/core/utils/objects";
 import { MockServerError } from "./mock_server_utils";
 
 /**
@@ -92,6 +93,21 @@ const R_ENDS_WITH_ID = /_id(s)?$/i;
 const R_LOWER_FOLLOWED_BY_UPPER = /([a-z])([A-Z])/g;
 const R_SPACE_OR_UNDERSCORE = /[\s_]+/g;
 
+/**
+ * @param {Record<string, FieldDefinition & MockFieldProperties>} fields
+ */
+export function copyFields(fields) {
+    const fieldsCopy = {};
+    for (const [fieldName, field] of Object.entries(fields)) {
+        const fieldCopy = {};
+        for (const [property, value] of Object.entries(field)) {
+            fieldCopy[property] = typeof value === "object" ? deepCopy(value) : value;
+        }
+        fieldsCopy[fieldName] = fieldCopy;
+    }
+    return fieldsCopy;
+}
+
 /**
  * @param {FieldDefinition & MockFieldProperties} field
  */
diff --git a/addons/web/static/tests/_framework/mock_server/mock_model.js b/addons/web/static/tests/_framework/mock_server/mock_model.js
index 7752f93d0d17f..113f678673fd3 100644
--- a/addons/web/static/tests/_framework/mock_server/mock_model.js
+++ b/addons/web/static/tests/_framework/mock_server/mock_model.js
@@ -20,7 +20,8 @@ import {
     safeSplit,
 } from "./mock_server_utils";
 
-const { DEFAULT_FIELD_VALUES, DEFAULT_RELATIONAL_FIELD_VALUES, S_FIELD, isComputed } = fields;
+const { DEFAULT_FIELD_VALUES, DEFAULT_RELATIONAL_FIELD_VALUES, S_FIELD, copyFields, isComputed } =
+    fields;
 
 /**
  * @typedef {import("fields").INumerical["aggregator"]} Aggregator
@@ -286,12 +287,11 @@ function getModelDefinition(previous, constructor) {
                 }
             }
             for (const [key, map] of INHERITED_OBJECT_KEYS) {
-                for (const subKey in previous[key]) {
+                const previousValue = map ? map(previous[key]) : previous[key];
+                for (const subKey in previousValue) {
                     // Assign only if empty
                     if (isEmptyValue(model[key][subKey])) {
-                        model[key][subKey] = map
-                            ? map(previous[key][subKey])
-                            : previous[key][subKey];
+                        model[key][subKey] = previousValue[subKey];
                     }
                 }
             }
@@ -811,7 +811,7 @@ function parseView(model, params) {
     const { arch } = params;
     const level = params.level || 0;
     const editable = params.editable || true;
-    const fields = deepCopy(model._fields);
+    const fields = copyFields(model._fields);
 
     const { _onChanges } = model;
     const fieldNodes = {};
@@ -1370,7 +1370,7 @@ const DATETIME_FORMAT = {
 };
 const INHERITED_OBJECT_KEYS = [
     ["_computes", null],
-    ["_fields", deepCopy],
+    ["_fields", copyFields],
     ["_onChanges", null],
     ["_toolbar", deepCopy],
     ["_views", null],
diff --git a/addons/web/static/tests/mock_server/mock_model.test.js b/addons/web/static/tests/mock_server/mock_model.test.js
index 34120d2623bcf..8b6af7526eae5 100644
--- a/addons/web/static/tests/mock_server/mock_model.test.js
+++ b/addons/web/static/tests/mock_server/mock_model.test.js
@@ -158,10 +158,11 @@ describe("level 1", () => {
         await makeMockEnv();
 
         await expect(
-            getService("orm").searchRead("oui", [], ["id", "name", "age", "surname"])
+            getService("orm").searchRead("oui", [], ["id", "name", "age", "surname", "create_date"])
         ).resolves.toEqual([
             {
                 id: 1,
+                create_date: luxon.DateTime.utc().toSQL().slice(0, 19),
                 name: "John Doe",
                 age: 42,
                 surname: "doedoe",

From 5e66b265d5c360db91149a31f3855d3809d18c26 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Fri, 31 Oct 2025 13:19:30 +0100
Subject: [PATCH 184/673] [FIX] mass_mailing: notify user of obsolete snippets

In a prior [commit], the feature to inform a user that a snippet was obsolete
was removed in html\_builder. This feature removal is reverted for
mass\_mailing because no upgrade was performed on pre-editor-refactoring
snippets. Existing mail content produced with the old editor can still be used
and sent, but further edition of existing mailings is discouraged and may not
work properly. Proper automatized upgrade is still being considered if there is
a demand for it.

[commit]: https://github.com/odoo/odoo/commit/8da70d072b931f98aac56157027c6d5026b0071c

task-5089259

Part-of: odoo/odoo#234057
Related: odoo/enterprise#98631
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../src/builder/mass_mailing_builder.js       | 18 +++++++-
 .../src/builder/options/options_container.js  | 24 +++++++++++
 .../builder/options/options_container.scss    | 11 +++++
 .../src/builder/options/options_container.xml | 24 +++++++++++
 .../builder/plugins/version_control_plugin.js | 41 +++++++++++++++++++
 5 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 addons/mass_mailing/static/src/builder/options/options_container.js
 create mode 100644 addons/mass_mailing/static/src/builder/options/options_container.scss
 create mode 100644 addons/mass_mailing/static/src/builder/options/options_container.xml
 create mode 100644 addons/mass_mailing/static/src/builder/plugins/version_control_plugin.js

diff --git a/addons/mass_mailing/static/src/builder/mass_mailing_builder.js b/addons/mass_mailing/static/src/builder/mass_mailing_builder.js
index 688eb81ac90fd..775770d304ecb 100644
--- a/addons/mass_mailing/static/src/builder/mass_mailing_builder.js
+++ b/addons/mass_mailing/static/src/builder/mass_mailing_builder.js
@@ -4,10 +4,26 @@ import { CORE_PLUGINS } from "@html_builder/core/core_plugins";
 import { removePlugins } from "@html_builder/utils/utils";
 import { DYNAMIC_PLACEHOLDER_PLUGINS } from "@html_editor/backend/plugin_sets";
 import { registry } from "@web/core/registry";
+import { CustomizeTab } from "@html_builder/sidebar/customize_tab";
+import { OptionsContainerWithSnippetVersionControl } from "./options/options_container";
+
+class CustomizeTabWithSnippetVersionControl extends CustomizeTab {
+    static components = {
+        ...CustomizeTab.components,
+        OptionsContainer: OptionsContainerWithSnippetVersionControl,
+    };
+}
+
+class BuilderWithSnippetVersionControl extends Builder {
+    static components = {
+        ...Builder.components,
+        CustomizeTab: CustomizeTabWithSnippetVersionControl,
+    };
+}
 
 export class MassMailingBuilder extends Component {
     static template = "mass_mailing.MassMailingBuilder";
-    static components = { Builder };
+    static components = { Builder: BuilderWithSnippetVersionControl };
     static props = {
         builderProps: { type: Object },
         toggleCodeView: { type: Function, optional: true },
diff --git a/addons/mass_mailing/static/src/builder/options/options_container.js b/addons/mass_mailing/static/src/builder/options/options_container.js
new file mode 100644
index 0000000000000..bded3a7a0aebd
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/options/options_container.js
@@ -0,0 +1,24 @@
+import { OptionsContainer } from "@html_builder/sidebar/option_container";
+import { useState } from "@odoo/owl";
+
+export class OptionsContainerWithSnippetVersionControl extends OptionsContainer {
+    static template = "mass_mailing.OptionsContainer";
+    setup() {
+        super.setup();
+        this.versionState = useState({
+            isUpToDate: this.env.editor.shared.versionControl.hasAccessToOutdatedEl(
+                this.props.editingElement
+            ),
+        });
+    }
+    // Version control
+    replaceElementWithNewVersion() {
+        this.callOperation(() => {
+            this.env.editor.shared.versionControl.replaceWithNewVersion(this.props.editingElement);
+        });
+    }
+    accessOutdated() {
+        this.env.editor.shared.versionControl.giveAccessToOutdatedEl(this.props.editingElement);
+        this.versionState.isUpToDate = true;
+    }
+}
diff --git a/addons/mass_mailing/static/src/builder/options/options_container.scss b/addons/mass_mailing/static/src/builder/options/options_container.scss
new file mode 100644
index 0000000000000..fe44a4c22fc49
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/options/options_container.scss
@@ -0,0 +1,11 @@
+.options-container {
+        .o_we_version_control {
+        background-color: $o-we-color-info;
+
+        div.title {
+            margin-bottom: $o-we-sidebar-content-field-label-spacing;
+            text-transform: uppercase;
+            font-weight: bold;
+        }
+    }
+}
diff --git a/addons/mass_mailing/static/src/builder/options/options_container.xml b/addons/mass_mailing/static/src/builder/options/options_container.xml
new file mode 100644
index 0000000000000..e44dedf371b0d
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/options/options_container.xml
@@ -0,0 +1,24 @@
+<templates xml:space="preserve">
+    <t t-name="mass_mailing.OptionsContainer" t-inherit="html_builder.OptionsContainer">
+        <xpath expr="//div[@t-ref='content']" position="replace">
+            <t t-if="versionState.isUpToDate">
+                <div class="we-bg-options-container pb-3" t-ref="content">
+                    <t t-foreach="props.options" t-as="OptionClass" t-key="OptionClass.name + '-' + OptionClass.template">
+                        <BuilderContext applyTo="OptionClass.applyTo" t-if="hasAccess(OptionClass.groups)">
+                            <t t-component="OptionClass"></t>
+                        </BuilderContext>
+                    </t>
+                </div>
+            </t>
+            <t t-else="">
+                <div class="o_we_version_control d-flex flex-column p-3 pt-4 align-items-center text-center text-white">
+                    <div class="title">This block is outdated.</div>
+                    <div>You might not be able to customize it anymore.</div>
+                    <button type="button" class="btn btn-primary py-2 my-4 border-0" t-on-click="() => this.replaceElementWithNewVersion()">REPLACE BY NEW VERSION</button>
+                    <div>You can still access the block options but it might be ineffective.</div>
+                    <button type="button" class="btn btn-primary py-2 my-4 border-0" t-on-click="() => this.accessOutdated()">ACCESS OPTIONS ANYWAY</button>
+                </div>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/addons/mass_mailing/static/src/builder/plugins/version_control_plugin.js b/addons/mass_mailing/static/src/builder/plugins/version_control_plugin.js
new file mode 100644
index 0000000000000..22fb668d557de
--- /dev/null
+++ b/addons/mass_mailing/static/src/builder/plugins/version_control_plugin.js
@@ -0,0 +1,41 @@
+import { Plugin } from "@html_editor/plugin";
+import { registry } from "@web/core/registry";
+
+export class VersionControlPlugin extends Plugin {
+    static id = "versionControl";
+    static dependencies = ["builderOptions"];
+    accessPerOutdatedEl = new WeakMap();
+    static shared = ["hasAccessToOutdatedEl", "giveAccessToOutdatedEl", "replaceWithNewVersion"];
+
+    hasAccessToOutdatedEl(el) {
+        if (!el.dataset.snippet) {
+            return true;
+        }
+        if (this.accessPerOutdatedEl.has(el)) {
+            return this.accessPerOutdatedEl.get(el);
+        }
+        const snippetKey = el.dataset.snippet;
+        const snippet = this.config.snippetModel.getOriginalSnippet(snippetKey);
+        let isUpToDate = true;
+        if (snippet) {
+            const { vxml: originalVxml } = snippet.content.dataset;
+            const { vxml: elVxml } = el.dataset;
+            isUpToDate = originalVxml === elVxml;
+        }
+        this.accessPerOutdatedEl.set(el, isUpToDate);
+        return isUpToDate;
+    }
+    giveAccessToOutdatedEl(el) {
+        this.accessPerOutdatedEl.set(el, true);
+    }
+    replaceWithNewVersion(el) {
+        const snippetKey = el.dataset.snippet;
+        const snippet = this.config.snippetModel.getOriginalSnippet(snippetKey);
+        const cloneEl = snippet.content.cloneNode(true);
+        el.after(cloneEl);
+        el.remove();
+        this.dependencies.builderOptions.setNextTarget(cloneEl);
+    }
+}
+
+registry.category("mass_mailing-plugins").add(VersionControlPlugin.id, VersionControlPlugin);

From 8d9f79b150da5a5bb34d932266614041235cb5e0 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Fri, 26 Sep 2025 14:35:34 +0200
Subject: [PATCH 185/673] [FIX] mass_mailing(_themes): increment mass_mailing
 snippets vxml

Add a `vxml` (xml version) for every `mass_mailing` snippet, so that users
with templates using old version of it can choose to update their snippet using
the builder.
It's the bare minimum in lieu of a proper upgrade (which will come later).

Wrap orphan phrasing content in paragraphs, avoid phrasing content containing
flow content.

task-5134263

Part-of: odoo/odoo#234057
Related: odoo/enterprise#98631
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
Co-authored-by: Damien Abeloos <abd@odoo.com>
Co-authored-by: Thomas Josse <thjo@odoo.com>
---
 .../themes/theme_selector/theme_selector.xml  |   4 +-
 .../tests/mass_mailing_html_field.test.js     |  10 +-
 .../mass_mailing_columns_snippets.xml         |  20 +-
 .../snippets/mass_mailing_footer_snippets.xml |   4 +-
 .../mass_mailing_headers_snippets.xml         |   4 +-
 .../mass_mailing_headings_snippets.xml        |   2 +-
 .../snippets/mass_mailing_images_snippets.xml |   8 +-
 .../snippets/mass_mailing_inner_snippets.xml  |   8 +-
 .../mass_mailing_marketing_snippets.xml       |   8 +-
 .../mass_mailing_masonry_snippets.xml         |   2 +-
 .../snippets/mass_mailing_people_snippets.xml |   4 +-
 .../snippets/mass_mailing_text_snippets.xml   |   2 +-
 .../mass_mailing/views/themes_templates.xml   |   6 +-
 .../views/mass_mailing_themes_templates.xml   | 262 +++++++++---------
 14 files changed, 175 insertions(+), 169 deletions(-)

diff --git a/addons/mass_mailing/static/src/themes/theme_selector/theme_selector.xml b/addons/mass_mailing/static/src/themes/theme_selector/theme_selector.xml
index 0706ac6f35b8a..483b8ea99047d 100644
--- a/addons/mass_mailing/static/src/themes/theme_selector/theme_selector.xml
+++ b/addons/mass_mailing/static/src/themes/theme_selector/theme_selector.xml
@@ -16,12 +16,12 @@
                 </div>
             </div>
             <div class="d-inline-block w-100">
-                <a t-foreach="themes.values()" t-as="theme" t-key="theme_index" role="menuitem" href="#" class="dropdown-item px-4"
+                <div t-foreach="themes.values()" t-as="theme" t-key="theme_index" role="menuitem" class="cursor-pointer dropdown-item px-4"
                     t-on-click="() => this.onSelectTheme(theme)" t-att-data-name="theme.name">
                     <div class="o_thumb small mb-2" t-attf-style="background-image: url(#{theme.imgPath}_small.png)"/>
                     <div class="o_thumb large mb-2" t-attf-style="background-image: url(#{theme.imgPath}_large.png)"/>
                     <h5 class="text-capitalize text-truncate" t-out="theme.title"/>
-                </a>
+                </div>
             </div>
         </div>
     </div>
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
index bbfcfb74909de..95429e8589c83 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
@@ -225,7 +225,11 @@ describe("field HTML", () => {
             arch: mailViewArch,
         });
         expect(queryOne(".o_mass_mailing_iframe_wrapper iframe")).toHaveClass("d-none");
-        await click(waitFor(".o_mailing_template_preview_wrapper a:contains(Start From Scratch)"));
+        await click(
+            waitFor(
+                ".o_mailing_template_preview_wrapper div[role='menuitem']:contains(Start From Scratch)"
+            )
+        );
         await waitFor(".o_mass_mailing_iframe_wrapper iframe:not(.d-none)");
         expect(await waitFor(":iframe .o_layout", { timeout: 3000 })).toHaveClass("o_empty_theme");
         await clickSave();
@@ -301,7 +305,7 @@ describe("field HTML", () => {
             resId: 1,
             arch: mailViewArch,
         });
-        await click(waitFor(".o_mailing_template_preview_wrapper a[data-name='default']"));
+        await click(waitFor(".o_mailing_template_preview_wrapper [data-name='default']"));
         await waitFor(".o_mass_mailing_iframe_wrapper iframe:not(.d-none)");
         expect(await waitFor(":iframe .o_layout", { timeout: 3000 })).toHaveClass(
             "o_default_theme"
@@ -378,7 +382,7 @@ describe("field HTML: with loaded assets", () => {
             resId: 1,
             arch: mailViewArch,
         });
-        await click(waitFor(".o_mailing_template_preview_wrapper a[data-name='default']"));
+        await click(waitFor(".o_mailing_template_preview_wrapper [data-name='default']"));
         await waitFor(".o_mass_mailing_iframe_wrapper iframe:not(.d-none)");
         const { bundleControls } = await htmlField.ensureIframeLoaded();
 
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_columns_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_columns_snippets.xml
index b2c5f8c3717e3..71ecc68d155c1 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_columns_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_columns_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_three_columns" name="Columns">
-    <section class="s_three_columns o_mail_snippet_general o_cc o_cc2 pt32 pb32">
+    <section class="s_three_columns o_mail_snippet_general o_cc o_cc2 pt32 pb32" data-vxml="001">
         <div class="container">
             <div class="row d-flex align-items-stretch">
                 <div class="col-md-4 o_mail_no_colorpicker pt16 pb16 col-12">
@@ -42,7 +42,7 @@
 </template>
 
 <template name="Big Boxes" id="s_color_blocks_2">
-    <section class="s_mail_color_blocks_2 o_mail_snippet_general">
+    <section class="s_mail_color_blocks_2 o_mail_snippet_general" data-vxml="001">
         <div class="container mx-auto my-auto">
             <div class="row">
                 <div class="col-md-6 o_cc o_cc4 pb24 pt24 col-12">
@@ -61,7 +61,7 @@
 </template>
 
 <template name="Media List" id="s_media_list">
-    <section class="s_media_list pt32 pb32 o_colored_level o_cc o_cc2 o_mail_snippet_general" data-vcss="001">
+    <section class="s_media_list pt32 pb32 o_colored_level o_cc o_cc2 o_mail_snippet_general" data-vcss="001" data-vxml="001">
         <div class="container">
             <div class="row s_nb_column_fixed">
                 <div class="col-md-12 s_media_list_item pt16 pb16 col-12" data-name="Media item">
@@ -72,7 +72,7 @@
                         <div class="col-md-8 s_media_list_body ps-md-4 col-12">
                             <h2>Media heading</h2>
                             <p>Use this snippet to build various types of components that feature a left- or right-aligned image alongside textual content. Duplicate the element to create a list that fits your needs.</p>
-                            <a href="#">Discover more <span class="fa fa-long-arrow-right align-middle ms-1"/></a>
+                            <p><a href="#">Discover more <span class="fa fa-long-arrow-right align-middle ms-1"/></a></p>
                         </div>
                     </div>
                 </div>
@@ -95,7 +95,7 @@
                         <div class="col-md-8 s_media_list_body ps-md-4 col-12">
                             <h2>Post heading</h2>
                             <p>Use this component for creating a list of featured elements to which you want to bring attention.</p>
-                            <a href="#">Continue reading <span class="fa fa-long-arrow-right align-middle ms-1"/></a>
+                            <p><a href="#">Continue reading <span class="fa fa-long-arrow-right align-middle ms-1"/></a></p>
                         </div>
                     </div>
                 </div>
@@ -105,7 +105,7 @@
 </template>
 
 <template id="s_attributes_horizontal" name="Horizontal Attributes">
-    <section class="s_attributes_horizontal pt24 pb24 o_mail_snippet_general">
+    <section class="s_attributes_horizontal pt24 pb24 o_mail_snippet_general" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="s_attributes_horizontal_col col-md-4 pt24 pb24 col-12" data-name="Column">
@@ -177,7 +177,7 @@
 </template>
 
 <template id="s_numbers" name="Numbers">
-    <section class="s_numbers o_mail_snippet_general o_cc o_cc1">
+    <section class="s_numbers o_mail_snippet_general o_cc o_cc1" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-4 pt24 pb24 o_cc o_cc2 col-12" style="text-align: center;">
@@ -198,7 +198,7 @@
 </template>
 
 <template id="s_event" name="Event">
-    <section class="s_mail_block_event o_mail_snippet_general bg-100">
+    <section class="s_mail_block_event o_mail_snippet_general bg-100" data-vxml="001">
         <div class="container">
             <div class="row align-items-center">
                 <div class="o_mail_no_colorpicker col-md-6 pt32 pb32 col-12">
@@ -242,7 +242,7 @@
 </template>
 
 <template id="s_product_list" name="Items">
-    <section class="s_mail_product_list o_mail_snippet_general">
+    <section class="s_mail_product_list o_mail_snippet_general" data-vxml="001">
         <div class="container pt16">
             <h2><span class="h3-fs">Our finest selection</span></h2>
             <div class="row">
@@ -276,7 +276,7 @@
 </template>
 
 <template id="s_features_grid" name="Features Grid">
-    <section class="s_mail_features_grid o_mail_snippet_general pt48 pb24">
+    <section class="s_mail_features_grid o_mail_snippet_general pt48 pb24" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-6 o_cc col-12">
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_footer_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_footer_snippets.xml
index 2af046a2869fc..ea15fc4b600f5 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_footer_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_footer_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_mail_block_footer_social">
-    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-900 pt16" data-name="Footer Center">
+    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-900 pt16" data-name="Footer Center" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md o_mail_footer_social col" style="text-align: center;">
@@ -28,7 +28,7 @@
 </template>
 
 <template id="s_mail_block_footer_social_left" name="Footer Left">
-    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16" data-name="Footer Left">
+    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16" data-name="Footer Left" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-6 o_mail_footer_description col-12">
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_headers_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_headers_snippets.xml
index af044408b5239..1021e270c91fe 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_headers_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_headers_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_mail_block_header_social" name="Left Logo">
-    <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16" data-name="Left Logo">
+    <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16" data-name="Left Logo" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-4 pt16 pb16">
@@ -20,7 +20,7 @@
 </template>
 
 <template id="s_mail_block_header_logo" name="Centered Logo">
-    <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-name="Centered Logo">
+    <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-name="Centered Logo" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-3"/>
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_headings_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_headings_snippets.xml
index 8ab733859d71c..e03aeef5dd97b 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_headings_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_headings_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_title" name="Title">
-    <section class="s_title o_mail_snippet_general pt16 pb16">
+    <section class="s_title o_mail_snippet_general pt16 pb16" data-vxml="001">
         <div class="container s_allow_columns">
             <h1 style="text-align:center">Your Title</h1>
         </div>
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_images_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_images_snippets.xml
index d299f956d7ac1..357cfb4c075b5 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_images_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_images_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_cover" name="Cover">
-    <section class="s_cover o_mail_snippet_general">
+    <section class="s_cover o_mail_snippet_general" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-12 oe_img_bg pt56 pb48 col-12" style="background-image: url('/web/image/mass_mailing.s_cover_default_image'); background-position: 50% 84.7081%;">
@@ -14,7 +14,7 @@
 </template>
 
 <template id="s_image_text" name="Image - Text">
-    <section class="s_text_image o_mail_snippet_general pt32 pb32">
+    <section class="s_text_image o_mail_snippet_general pt32 pb32" data-vxml="001">
         <div class="container">
             <div class="row align-items-center">
                 <div class="col-md-6 pt16 pb16 col-12">
@@ -34,7 +34,7 @@
 </template>
 
 <template id="s_text_image" name="Text - Image">
-    <section class="s_text_image o_mail_snippet_general pt80 pb80">
+    <section class="s_text_image o_mail_snippet_general pt80 pb80" data-vxml="001">
         <div class="container">
             <div class="row align-items-center">
                 <div class="col-md-5 col-12 pt16 pb16">
@@ -54,7 +54,7 @@
 </template>
 
 <template id="s_picture" name="Picture">
-    <section class="s_picture o_mail_snippet_general pt48 pb24 o_cc o_cc2" style="padding-left: 15px; padding-right: 15px;">
+    <section class="s_picture o_mail_snippet_general pt48 pb24 o_cc o_cc2" style="padding-left: 15px; padding-right: 15px;" data-vxml="001">
         <div class="container s_allow_columns">
             <h2 style="text-align: center;">Step Up Your Game</h2>
             <p style="text-align: center;">Experience unparalleled comfort, cutting-edge design, and performance-enhancing<br/>technology with this latest innovation, crafted to elevate every athlete's journey.</p>
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_inner_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_inner_snippets.xml
index c40f795e42a2d..f1f989c04ac6f 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_inner_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_inner_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_text_highlight" name="Text Highlight">
-    <div class="s_text_highlight s_mail_text_highlight o_mail_snippet_general o_cc o_cc3 pt32 pb32 text-center mx-auto w-100" style="border-radius: 6px;">
+    <div class="s_text_highlight s_mail_text_highlight o_mail_snippet_general o_cc o_cc3 pt32 pb32 text-center mx-auto w-100" style="border-radius: 6px;" data-vxml="001">
         <h3><font class="text-white">Text Highlight</font></h3>
         <p><font class="text-white">Put the focus on what you have to say!</font></p>
     </div>
@@ -8,7 +8,7 @@
 
 
 <template id="s_rating" name="Rating">
-    <div class="s_rating o_mail_snippet_general pt16 pb16" style="padding: 0 15px;" data-vcss="001" data-icon="fa-star">
+    <div class="s_rating o_mail_snippet_general pt16 pb16" style="padding: 0 15px;" data-vcss="001" data-vxml="001" data-icon="fa-star">
         <h3 class="s_rating_title">Quality</h3>
         <div class="s_rating_icons o_not_editable">
             <span class="s_rating_active_icons">
@@ -25,7 +25,7 @@
 </template>
 
 <template id="s_hr" name="Separator">
-    <div class="s_hr o_mail_snippet_general pt16 pb16 o_not_editable">
+    <div class="s_hr o_mail_snippet_general pt16 pb16 o_not_editable" data-vxml="001">
         <hr class="w-100 mx-auto"/>
     </div>
 </template>
@@ -35,7 +35,7 @@
 </template>
 
 <template id="s_alert" name="Alert">
-    <div class="s_mail_alert o_mail_snippet_general pt16 pb16 mx-auto" data-name="Alert">
+    <div class="s_mail_alert o_mail_snippet_general pt16 pb16 mx-auto" data-name="Alert" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-12 col-12">
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_marketing_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_marketing_snippets.xml
index d002751e644c1..4b3e6cafdb23c 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_marketing_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_marketing_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_comparisons" name="Comparisons">
-    <section class="s_comparisons pt48 pb48 o_mail_snippet_general" data-vcss="001">
+    <section class="s_comparisons pt48 pb48 o_mail_snippet_general" data-vcss="001" data-vxml="001">
         <div class="container">
             <div class="row gap-4 gap-md-0">
                 <div class="col-12 col-md-6" data-name="Plan">
@@ -61,7 +61,7 @@
 </template>
 
 <template name="Showcase" id="s_showcase">
-    <section class="s_showcase o_mail_snippet_general pt48 pb48">
+    <section class="s_showcase o_mail_snippet_general pt48 pb48" data-vxml="001">
         <div class="container">
             <div class="row s_nb_column_fixed">
                 <div class="col-12 pb32 oe_unmovable">
@@ -119,7 +119,7 @@
 </template>
 
 <template id="s_call_to_action" name="Call to Action">
-    <section class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt48 pb24">
+    <section class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt48 pb24" data-vxml="001">
         <div class="container">
             <div class="row">
                 <div class="col-md-9 col-9">
@@ -137,7 +137,7 @@
 </template>
 
 <template id="s_coupon_code" name="Promo Code">
-    <section class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" style="padding-left: 15px; padding-right: 15px;">
+    <section class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" style="padding-left: 15px; padding-right: 15px;" data-vxml="001">
         <h2 style="text-align: center;"><span><font style="font-weight: bolder;">GET $20 OFF</font></span></h2>
         <p style="text-align: center;">
             Here's your coupon code - but hurry! Ends 9/28
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_masonry_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_masonry_snippets.xml
index 94f2e276cd9f0..ff5270ca6accb 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_masonry_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_masonry_snippets.xml
@@ -3,7 +3,7 @@
 
 <!-- Template -->
 <template id="s_masonry_block" name="Masonry">
-    <section class="s_masonry_block o_mail_snippet_general" data-vcss="001" data-template-name="default_template">
+    <section class="s_masonry_block o_mail_snippet_general" data-vcss="001" data-vxml="001" data-template-name="default_template">
         <div class="container text-white">
             <t t-call="mass_mailing.s_masonry_block_default_template"/>
         </div>
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_people_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_people_snippets.xml
index 89912ff86ab6f..ab5c06d9ce3d1 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_people_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_people_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_company_team" name="Team">
-    <section class="s_company_team o_mail_snippet_general">
+    <section class="s_company_team o_mail_snippet_general" data-vxml="001">
         <div class="container">
             <div class="ms-3">
                 <h3>Meet our team</h3>
@@ -233,7 +233,7 @@
 </template>
 
 <template id="s_references" name="References">
-    <section class="s_references o_mail_snippet_general pt32 pb32">
+    <section class="s_references o_mail_snippet_general pt32 pb32" data-vxml="001">
         <div class="container">
             <h2 style="text-align: center;">Our References</h2>
             <p style="text-align: center;">We are in good company.</p>
diff --git a/addons/mass_mailing/views/snippets/mass_mailing_text_snippets.xml b/addons/mass_mailing/views/snippets/mass_mailing_text_snippets.xml
index ca31c8ad32318..fe2b2ee44e5cb 100644
--- a/addons/mass_mailing/views/snippets/mass_mailing_text_snippets.xml
+++ b/addons/mass_mailing/views/snippets/mass_mailing_text_snippets.xml
@@ -1,6 +1,6 @@
 <odoo>
 <template id="s_text_block" name="Text">
-    <section class="s_text_block o_mail_snippet_general pt24 pb24" style="padding-left: 15px; padding-right: 15px;">
+    <section class="s_text_block o_mail_snippet_general pt24 pb24" style="padding-left: 15px; padding-right: 15px;" data-vxml="001">
         <div class="container s_allow_columns">
             <p>Great stories have a <strong>personality</strong>. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.</p>
             <p>Great stories are <strong>for everyone</strong> even when only written <strong>for just one person</strong>. If you try to write with a wide, general audience in mind, your story will sound fake and lack emotion. No one will be interested. Write for one person. If it's genuine for the one, it's genuine for the rest.</p>
diff --git a/addons/mass_mailing/views/themes_templates.xml b/addons/mass_mailing/views/themes_templates.xml
index ed96c5ca31259..fa53daacc9136 100644
--- a/addons/mass_mailing/views/themes_templates.xml
+++ b/addons/mass_mailing/views/themes_templates.xml
@@ -25,7 +25,7 @@
                 --separator-border-color: #ced4da !important;
             }
         </style>
-        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16" data-snippet="s_header_logo" data-name="Centered Logo">
+        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16" data-snippet="s_header_logo" data-name="Centered Logo" data-vxml="001">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4"/>
@@ -38,7 +38,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general pt40 pb16" style="padding-left: 15px; padding-right: 15px;" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general pt40 pb16" style="padding-left: 15px; padding-right: 15px;" data-snippet="s_text_block" data-name="Text" data-vxml="001">
             <div class="container s_allow_columns">
                 <h2>Thank you for joining us!</h2>
                 <p><br/>We want to take this opportunity to welcome you to our ever-growing community!
@@ -52,7 +52,7 @@
                 </p>
             </div>
         </section>
-        <div class="s_hr pt16 pb16" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr pt16 pb16" data-snippet="s_hr" data-name="Separator" data-vxml="001">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
         <t t-call="mass_mailing.s_mail_block_footer_social_left"/>
diff --git a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
index 405fac800544e..9976556a2a0cb 100644
--- a/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
+++ b/addons/mass_mailing_themes/views/mass_mailing_themes_templates.xml
@@ -50,7 +50,7 @@
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="website_url_or_none" t-value="(company_id.website) or '#'"/>
-        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_header_social" style="background-color: rgb(26, 36, 54) !important;" data-name="Header Social">
+        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_mail_block_header_social" style="background-color: rgb(26, 36, 54) !important;" data-name="Header Social">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4">
@@ -78,7 +78,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general pb16 pt32" style="background-color: rgb(43, 59, 88) !important; padding-left: 15px; padding-right: 15px;" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general pb16 pt32" data-vxml="001" style="background-color: rgb(43, 59, 88) !important; padding-left: 15px; padding-right: 15px;" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p><font style="color: rgb(255, 255, 255);">Hi there!</font></p>
                 <p><font style="color: rgb(255, 255, 255);">The next edition of <span style="font-weight: bolder;">Odoo Experience Online</span> is coming soon!
@@ -86,7 +86,7 @@
                 </p>
             </div>
         </section>
-        <section class="s_media_list o_mail_snippet_general o_cc o_cc2 pb16 pt0" style="background-color: rgb(43, 59, 88) !important; padding-left: 15px; padding-right: 15px;" data-snippet="s_media_list" data-vcss="001" data-name="Media List">
+        <section class="s_media_list o_mail_snippet_general o_cc o_cc2 pb16 pt0" style="background-color: rgb(43, 59, 88) !important; padding-left: 15px; padding-right: 15px;" data-snippet="s_media_list" data-vcss="001" data-vxml="001" data-name="Media List">
             <div class="container">
                 <div class="row s_nb_column_fixed">
                     <div class="col-md-12 s_media_list_item pt0 pb0" data-name="Media item">
@@ -97,7 +97,7 @@
                             <div class="col-md-7 s_media_list_body">
                                 <h3>Get 6-months' worth of knowledge<br/>in just 2 days</h3>
                                 <p>Learn through workshops, product demos, and inspiring talks from Odoo Experts and Partners.</p>
-                                <a class="btn btn-primary" t-att-href="website_url_or_none">See what we've got planned</a>
+                                <p><a class="btn btn-primary" t-att-href="website_url_or_none">See what we've got planned</a></p>
                             </div>
                         </div>
                     </div>
@@ -109,7 +109,7 @@
                             <div class="col-md-7 s_media_list_body">
                                 <h3>Meet (other) awesome members<br/>of the community</h3>
                                 <p>Create your very own chat room or join an existing one that sparks your interest.</p>
-                                <a class="btn btn-primary" t-att-href="website_url_or_none">Go to the chatrooms</a>
+                                <p><a class="btn btn-primary" t-att-href="website_url_or_none">Go to the chatrooms</a></p>
                             </div>
                         </div>
                     </div>
@@ -121,14 +121,14 @@
                             <div class="col-md-7 s_media_list_body">
                                 <h3>An interactive, fun<br/>and comprehensive experience</h3>
                                 <p>Experience everything from a virtual exhibitor's hall to multiple interactive presentations and demos.</p>
-                                <a class="btn btn-primary" t-att-href="website_url_or_none">Find out more</a>
+                                <p><a class="btn btn-primary" t-att-href="website_url_or_none">Find out more</a></p>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </section>
-        <section class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt40 pb40" style="background-color: rgb(26, 36, 54) !important;" data-snippet="s_call_to_action" data-name="Call to Action">
+        <section class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt40 pb40" data-vxml="001" style="background-color: rgb(26, 36, 54) !important;" data-snippet="s_call_to_action" data-name="Call to Action">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12" style="border-color: rgb(56, 62, 69) !important;">
@@ -136,12 +136,12 @@
                         <p style="text-align: center;"><font style="color: rgb(255, 255, 255);">Zero, zilch, nada! Odoo Experience is free for everyone!</font></p>
                     </div>
                     <div class="col-md-12" style="text-align: center;">
-                        <a class="btn btn-primary btn-lg" t-att-href="website_url_or_none">Register now!</a>
+                        <p><a class="btn btn-primary btn-lg" t-att-href="website_url_or_none">Register now!</a></p>
                     </div>
                 </div>
             </div>
         </section>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16 pb16" data-vxml="001" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
@@ -187,7 +187,7 @@
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="website_url_or_none" t-value="(company_id.website) or '#'"/>
-        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt40 pb32" data-snippet="s_mail_block_header_social" data-name="Header Social">
+        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt40 pb32" data-vxml="001" data-snippet="s_mail_block_header_social" data-name="Header Social">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4">
@@ -223,7 +223,7 @@
         <div class="s_hr o_mail_snippet_general pt0 pb0" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_text_image o_mail_snippet_general" data-snippet="s_text_image" data-name="Text - Image">
+        <section class="s_text_image o_mail_snippet_general" data-vxml="001" data-snippet="s_text_image" data-name="Text - Image">
             <div class="container">
                 <div class="row align-items-center">
                     <div class="col-md-7 pt16 pb16">
@@ -238,10 +238,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt0 pb16" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt0 pb16" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_media_list o_mail_snippet_general o_cc o_cc2 pb0 pt0 bg-white" style="padding-left: 15px; padding-right: 15px;" data-snippet="s_media_list" data-vcss="001" data-name="Media List">
+        <section class="s_media_list o_mail_snippet_general o_cc o_cc2 pb0 pt0 bg-white" style="padding-left: 15px; padding-right: 15px;" data-snippet="s_media_list" data-vxml="001" data-vcss="001" data-name="Media List">
             <div class="container">
                 <div class="row s_nb_column_fixed o_mail_no_colorpicker">
                     <div class="col-md-12 s_media_list_item pb0 pt0" data-name="Media item">
@@ -252,9 +252,9 @@
                             <div class="col-md-8 s_media_list_body">
                                 <h3>The future of smartphone video production</h3>
                                 <p>Modern smartphones have all the built-in tech equal to a majority of the current professional cameras.</p>
-                                <a class="btn btn-primary" t-att-href="website_url_or_none"><span class="fa fa-play" />&amp;nbsp;&amp;nbsp;WATCH VIDEO</a>
+                                <p><a class="btn btn-primary" t-att-href="website_url_or_none"><span class="fa fa-play" />&amp;nbsp;&amp;nbsp;WATCH VIDEO</a>
                                 &amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;
-                                <a class="btn btn-link" href="#">READ MORE</a>
+                                <a class="btn btn-link" href="#">READ MORE</a></p>
                             </div>
                         </div>
                     </div>
@@ -275,7 +275,7 @@
                             <div class="col-md-8 s_media_list_body pt16 pb16">
                                 <h3>5 Ways Drones Can Better Your Live Events</h3>
                                 <p>One clever use of drones is for delivering gifts — but another that's becoming popular for event safety purposes.</p>
-                                <a class="btn btn-primary" t-att-href="website_url_or_none">READ MORE</a>
+                                <p><a class="btn btn-primary" t-att-href="website_url_or_none">READ MORE</a></p>
                             </div>
                         </div>
                     </div>
@@ -296,17 +296,17 @@
                             <div class="col-md-8 s_media_list_body">
                                 <h3>How to Code a Website Without Experience</h3>
                                 <p>Anyone with an ounce of business acumen knows that any business that wants to succeed needs a website.</p>
-                                <a class="btn btn-primary" t-att-href="website_url_or_none">READ MORE</a>
+                                <p><a class="btn btn-primary" t-att-href="website_url_or_none">READ MORE</a></p>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Social Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-vxml="001" data-name="Footer Social Center">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 o_mail_footer_links pt8 pb8" style="text-align: center;">
@@ -355,7 +355,7 @@
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="future_date" t-value="(datetime.date.today() + datetime.timedelta(days=30))"/>
         <t t-set="website_url_or_none" t-value="(company_id.website) or '#'"/>
-        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-snippet="s_mail_block_header_logo" data-name="Centered Logo" style="background-color: rgb(36, 37, 48) !important;">
+        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-snippet="s_mail_block_header_logo" data-name="Centered Logo" data-vxml="001" style="background-color: rgb(36, 37, 48) !important;">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4" style="text-align: center;">
@@ -374,25 +374,25 @@
                 </div>
             </div>
         </section>
-        <section class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(36, 37, 48) !important;">
+        <section class="s_cover o_mail_snippet_general" data-vxml="001" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(36, 37, 48) !important;">
             <img src="/mass_mailing_themes/static/src/img/theme_coupon/vip_banner_part1.png" alt="Cover" class="img-fluid w-100 mx-auto"/>
         </section>
-        <div class="s_hr o_mail_snippet_general pt0 pb16" data-snippet="s_hr" data-name="Separator" style="background-color: rgb(36, 37, 48) !important;">
+        <div class="s_hr o_mail_snippet_general pt0 pb16" data-vxml="001" data-snippet="s_hr" data-name="Separator" style="background-color: rgb(36, 37, 48) !important;">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <div class="s_title o_mail_snippet_general pb8 pt8" data-snippet="s_title" data-name="Title" style="background-color: rgb(36, 37, 48) !important;">
+        <div class="s_title o_mail_snippet_general pb8 pt8" data-vxml="001" data-snippet="s_title" data-name="Title" style="background-color: rgb(36, 37, 48) !important;">
             <div class="container s_allow_columns">
                 <h1 style="text-align:center;"><font class="text-white">$100 OFF</font></h1>
                 <h2 style="text-align:center;"><font class="text-white">VIP members only</font></h2>
             </div>
         </div>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" data-snippet="s_hr" data-name="Separator" style="background-color: rgb(36, 37, 48) !important;">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" data-vxml="001" data-snippet="s_hr" data-name="Separator" style="background-color: rgb(36, 37, 48) !important;">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(36, 37, 48) !important;">
+        <section class="s_cover o_mail_snippet_general" data-vxml="001" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(36, 37, 48) !important;">
             <img src="/mass_mailing_themes/static/src/img/theme_coupon/vip_banner_part2.png" alt="Cover" class="img-fluid w-100 mx-auto"/>
         </section>
-        <section class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" data-snippet="s_coupon_code" data-name="Promo Code" style="background-color: rgb(36, 37, 48) !important; text-align: center; padding-left: 15px; padding-right: 15px;">
+        <section class="s_discount2 o_mail_block_discount2 o_mail_snippet_general pt32 pb32" data-vxml="001" data-snippet="s_coupon_code" data-name="Promo Code" style="background-color: rgb(36, 37, 48) !important; text-align: center; padding-left: 15px; padding-right: 15px;">
             <p style="text-align: center;"><font class="text-white">Here's your coupon code*:</font></p>
             <table cellpadding="0" cellspacing="0" align="center" class="border" style="background-color: rgb(36, 37, 48) !important; border-collapse: collapse; border-color: rgb(198, 150, 120) !important;">
                 <tr>
@@ -407,7 +407,7 @@
                 <a class="btn btn-primary btn-lg" t-att-href="website_url_or_none">Redeem it now</a>
             </p>
         </section>
-        <section class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt24 pb24" data-snippet="s_call_to_action" data-name="Call to Action" style="background-color: rgb(36, 37, 48) !important;">
+        <section class="s_call_to_action o_mail_snippet_general o_cc o_cc3 pt24 pb24" data-vxml="001" data-snippet="s_call_to_action" data-name="Call to Action" style="background-color: rgb(36, 37, 48) !important;">
             <div class="container">
                 <div class="row">
                     <div class="col-md-10 offset-md-1 border pt24 pb16" style="border-width: 2px !important; border-color: rgb(198, 150, 120) !important;">
@@ -420,7 +420,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center" style="background-color: rgb(36, 37, 48) !important;">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_mail_block_footer_social" data-name="Footer Center" style="background-color: rgb(36, 37, 48) !important;">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12" style="text-align: center;" t-translation="off">
@@ -481,7 +481,7 @@
             }
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
-        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general bg-white pt32 pb16" data-snippet="s_mail_block_header_logo" data-name="Centered Logo">
+        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general bg-white pt32 pb16" data-vxml="001" data-snippet="s_mail_block_header_logo" data-name="Centered Logo">
             <div class="container">
                 <div class="row">
                     <div class="col-md-3">
@@ -501,10 +501,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pb32" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pb32" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_text_image o_mail_snippet_general" data-snippet="s_text_image" data-name="Image - Text">
+        <section class="s_text_image o_mail_snippet_general" data-vxml="001" data-snippet="s_text_image" data-name="Image - Text">
             <div class="container">
                 <div class="row align-items-center">
                     <div class="col-md-8 px-0">
@@ -512,7 +512,7 @@
                     </div>
                     <div class="col-md-4 o_cc pt0 pb0">
                         <h2 style="text-align: center;">IN THIS ISSUE</h2>
-                        <div class="s_hr o_mail_snippet_general pt16 pb16" data-snippet="s_hr" data-name="Separator">
+                        <div class="s_hr o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_hr" data-name="Separator">
                             <hr class="s_hr_1px s_hr_solid"/>
                         </div>
                         <p>
@@ -545,17 +545,17 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt32 pb32" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt32 pb32" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_mail_product_list o_mail_snippet_general pt0" data-snippet="s_product_list" data-name="Items">
+        <section class="s_mail_product_list o_mail_snippet_general pt0" data-vxml="001" data-snippet="s_product_list" data-name="Items">
             <div class="container">
                 <div class="row">
                     <div class="col-md-6 o_cc">
                         <h3><font style="background-color: rgb(231, 148, 57);">TRAVEL</font></h3>
-                        <a href="#">
+                        <p class="md-0"><a href="#">
                             <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_magazine/s_default_image_product_2.jpg" alt="Man on a rock looking at mountains in the distance" style="width: 100% !important; padding: 15px 0px;"/>
-                        </a>
+                        </a></p>
                         <h2 style="text-align: left;">Destinations for an eco-holiday</h2>
                         <p style="text-align: left;">Bitten by the travel bug but looking to travel consciously? Eco-travel is the way forward.</p>
                         <p style="text-align: right;">
@@ -566,9 +566,9 @@
                     </div>
                     <div class="col-md-6 o_cc">
                         <h3><font style="background-color: rgb(231, 99, 99);">LIFESTYLE</font></h3>
-                        <a href="#">
+                        <p class="md-0"><a href="#">
                             <img class="img-fluid o_we_custom_image" src="/mass_mailing_themes/static/src/img/theme_magazine/s_default_image_product_1.jpg" alt="Woman having breakfast in bed" style="width: 100% !important; padding: 15px 0px;"/>
-                        </a>
+                        </a></p>
                         <h2 style="text-align: left;">Top 5 energy-boosting morning routines</h2>
                         <p style="text-align: left;">Imagine waking up with more energy, more flexibility, with less stress and fewer instances of anxiously rushing out the door.</p>
                         <p style="text-align: right;">
@@ -580,10 +580,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb32" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb32" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_text_image o_mail_snippet_general" data-snippet="s_text_image" data-name="Text - Image">
+        <section class="s_text_image o_mail_snippet_general" data-vxml="001" data-snippet="s_text_image" data-name="Text - Image">
             <div class="container">
                 <div class="row align-items-center">
                     <div class="col-md-6 o_cc pt16 pb16">
@@ -602,10 +602,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt32 pb16" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt32 pb16" data-vxml="001"  data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general pt16 pb16" data-vxml="001"  data-snippet="s_mail_block_footer_social" data-name="Footer Center">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12" style="text-align: center;" t-translation="off">
@@ -667,7 +667,7 @@
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="future_date" t-value="(datetime.date.today() + datetime.timedelta(days=30))"/>
-        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16 bg-200" data-snippet="s_mail_block_header_logo" data-name="Header Logo">
+        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16 bg-200" data-vxml="001"  data-snippet="s_mail_block_header_logo" data-name="Header Logo">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4"></div>
@@ -680,15 +680,15 @@
                 </div>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general pt32 pb16" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general pt32 pb16" data-vxml="001"  data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h1 style="text-align: center;">WE'RE MOVING</h1>
             </div>
         </section>
-        <section class="s_cover o_mail_snippet_general pt0" data-snippet="s_cover" data-name="Cover">
+        <section class="s_cover o_mail_snippet_general pt0" data-vxml="001"  data-snippet="s_cover" data-name="Cover">
             <img src="/mass_mailing_themes/static/src/img/theme_bignews/s_default_image_cover.jpg" alt="Cover image" class="img-fluid w-100 mx-auto" style="padding: 15px;"/>
         </section>
-        <section class="s_text_block o_mail_snippet_general pt32 pb32" data-snippet="s_text_block" data-name="Text" style="padding-left: 15px; padding-right: 15px;">
+        <section class="s_text_block o_mail_snippet_general pt32 pb32" data-vxml="001"  data-snippet="s_text_block" data-name="Text" style="padding-left: 15px; padding-right: 15px;">
             <div class="container s_allow_columns">
                 <h2>BEGINNING <t t-out="future_date.strftime('%B %d').upper()" /></h2>
                 <p>We are proud to announce that due to our remarkable growth in the Springfield area, we are moving to a new location on July 1.
@@ -705,7 +705,7 @@
                 </p>
             </div>
         </section>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16 pb16" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16 pb16" data-vxml="001"  data-snippet="s_mail_block_footer_social" data-name="Footer Center">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12" style="text-align: center;" t-translation="off">
@@ -763,7 +763,7 @@
         </style>
         <t t-set="now" t-value="datetime.datetime.now()"/>
         <t t-set="website_url_or_none" t-value="(company_id.website) or '#'"/>
-        <section class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_header_text_social" data-name="Left Text">
+        <section class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_mail_block_header_text_social" data-name="Left Text">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4 pt16 pb16">
@@ -784,9 +784,9 @@
         <section class="s_title o_mail_snippet_general pt72 pb80" data-snippet="s_title" data-name="Title" style="background-color: rgb(255, 187, 0) !important;">
             <div class="container s_allow_columns">
                 <h1 style="text-align:center">
-                        <font style="font-size: 62px; background-color: rgb(255, 255, 255);">&amp;nbsp;10% OFF&amp;nbsp;</font>
+                    <font style="font-size: 62px; background-color: rgb(255, 255, 255);">&amp;nbsp;10% OFF&amp;nbsp;</font>
                     <br/>
-                        <font style="font-size: 62px; background-color: rgb(255, 255, 255);">&amp;nbsp;SALES&amp;nbsp;</font>
+                    <font style="font-size: 62px; background-color: rgb(255, 255, 255);">&amp;nbsp;SALES&amp;nbsp;</font>
                 </h1>
             </div>
         </section>
@@ -806,29 +806,29 @@
                 <a role="button" class="btn btn-primary btn-lg" t-att-href="website_url_or_none">Visit the website</a>
             </p>
         </section>
-        <div class="s_hr pt16 pb16" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr pt16 pb16" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid"/>
         </div>
-        <section class="s_features o_mail_snippet_general" data-snippet="s_features" data-name="Features">
+        <section class="s_features o_mail_snippet_general" data-vxml="001" data-snippet="s_features" data-name="Features">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4 pt16 pb16" style="text-align:center;">
-                        <img alt="Customer Service" src="/mass_mailing_themes/static/src/img/theme_promotion/s_default_image_product_1.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
+                        <p class="md-0"><img alt="Customer Service" src="/mass_mailing_themes/static/src/img/theme_promotion/s_default_image_product_1.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/></p>
                         <h3>24/7 <br/>Customer Service</h3>
                     </div>
                     <div class="col-md-4 pt16 pb16" style="text-align:center;">
-                        <img alt="Free Delivery" src="/mass_mailing_themes/static/src/img/theme_promotion/s_default_image_product_2.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
+                        <p class="md-0"><img alt="Free Delivery" src="/mass_mailing_themes/static/src/img/theme_promotion/s_default_image_product_2.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/></p>
                         <h3 style="text-align:center;">Free delivery*</h3>
                         <p style="text-align:center;">*For orders over $39.</p>
                     </div>
                     <div class="col-md-4 pt16 pb16" style="text-align:center;">
-                        <img alt="Easy Returns" src="/mass_mailing_themes/static/src/img/theme_promotion/s_default_image_product_3.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/>
+                        <p class="md-0"><img alt="Easy Returns" src="/mass_mailing_themes/static/src/img/theme_promotion/s_default_image_product_3.jpg" class="img-fluid o_we_custom_image mx-auto d-block" style="width: 100px;"/></p>
                         <h3 style="text-align:center;">Easy Returns</h3>
                     </div>
                 </div>
             </div>
         </section>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16 pb16" data-snippet="s_mail_block_footer_social_left" data-name="Footer Left" style="background-color: rgb(255, 187, 0) !important;">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_mail_block_footer_social_left" data-name="Footer Left" style="background-color: rgb(255, 187, 0) !important;">
             <div class="container">
                 <div class="row">
                     <div class="col-md-6">
@@ -901,7 +901,7 @@
                 }
             }
         </style>
-        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general" style="background-color: rgb(238, 233, 226) !important;" data-snippet="s_mail_block_header_social" data-name="Left Logo">
+        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general" style="background-color: rgb(238, 233, 226) !important;" data-vxml="001" data-snippet="s_mail_block_header_social" data-name="Left Logo">
             <div class="container">
                 <div class="row">
                     <div class="col-md-8 pt16 pb16">
@@ -910,35 +910,35 @@
                         </a>
                     </div>
                     <div class="col-md-4 o_mail_header_social" style="text-align: right">
-                            <a aria-label="Facebook" title="Facebook" target="_blank" href="https://www.facebook.com/Odoo">
-                                <span class="fa fa-facebook" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;"></span>
-                            </a>&amp;nbsp;&amp;nbsp;
-                            <a style="margin-left:10px" aria-label="X" title="X" target="_blank" href="https://twitter.com/Odoo">
-                                <span class="fa fa-twitter" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;"></span>
-                            </a>&amp;nbsp;&amp;nbsp;
-                            <a style="margin-left:10px" aria-label="Instagram" title="Instagram" target="_blank" href="https://www.instagram.com/explore/tags/odoo/">
-                                <span class="fa fa-instagram" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;"></span>
-                            </a>
+                        <a aria-label="Facebook" title="Facebook" target="_blank" href="https://www.facebook.com/Odoo">
+                            <span class="fa fa-facebook" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;"></span>
+                        </a>&amp;nbsp;&amp;nbsp;
+                        <a style="margin-left:10px" aria-label="X" title="X" target="_blank" href="https://twitter.com/Odoo">
+                            <span class="fa fa-twitter" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;"></span>
+                        </a>&amp;nbsp;&amp;nbsp;
+                        <a style="margin-left:10px" aria-label="Instagram" title="Instagram" target="_blank" href="https://www.instagram.com/explore/tags/odoo/">
+                            <span class="fa fa-instagram" style="color: rgb(84, 52, 39) !important; background-color: rgb(211, 197, 177) !important;"></span>
+                        </a>
                     </div>
                 </div>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general pt16 pb16" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h1 class="text-center">Company News</h1>
                 <h2 class="text-center">28 Jan 2022</h2>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid" style="border-color: rgba(0,0,0,0)"/>
         </div>
-        <section class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover">
+        <section class="s_cover o_mail_snippet_general" data-vxml="001" data-snippet="s_cover" data-name="Cover">
             <img src="/mass_mailing_themes/static/src/img/theme_coffeebreak/s_default_image_block_banner.jpg" alt="Cover image" class="img-fluid w-100 mx-auto"/>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid" style="border-color: rgba(0,0,0,0)"/>
         </div>
-        <section class="s_text_block o_mail_snippet_general pt40 pb40 px-3" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general pt40 pb40 px-3" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <div class="row">
                     <div class="col-md-5 offset-md-1">
@@ -957,15 +957,17 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid" style="border-color: rgba(0,0,0,0)"/>
         </div>
-        <section class="s_text_image o_mail_snippet_general pt32 pb32" data-snippet="s_image_text" data-name="Image - Text">
+        <section class="s_text_image o_mail_snippet_general pt32 pb32" data-vxml="001" data-snippet="s_image_text" data-name="Image - Text">
             <div class="container">
                 <div class="row align-items-center">
                     <div class="col-md-10 offset-md-1 px-0">
                         <h3>NEW PEOPLE</h3>
-                        <img src="/mass_mailing_themes/static/src/img/theme_coffeebreak/s_default_image_block_image_text.jpg" class="img w-100"/>
+                        <p class="md-0">
+                            <img src="/mass_mailing_themes/static/src/img/theme_coffeebreak/s_default_image_block_image_text.jpg" class="img w-100"/>
+                        </p>
                     </div>
                 </div>
                 <div class="row">
@@ -979,10 +981,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid" style="border-color: rgba(0,0,0,0)"/>
         </div>
-        <section class="s_text_block o_mail_snippet_general pt40 pb32" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general pt40 pb32" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <div class="row">
                     <div class="offset-md-1 col-md-10">
@@ -1011,10 +1013,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb0" style="background-color: rgb(238, 233, 226) !important;" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid" style="border-color: rgba(0,0,0,0)"/>
         </div>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general o_cc o_cc5 pt24 pb24" style="background-color: rgb(84, 52, 39) !important;" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general o_cc o_cc5 pt24 pb24" style="background-color: rgb(84, 52, 39) !important;" data-vxml="001" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
             <div class="container">
                 <div class="row">
                     <div class="col-10 offset-md-1">
@@ -1060,20 +1062,20 @@
                 --btn-secondary-border-color: #CE0000;
             }
         </style>
-        <section class="o_snippet_view_in_browser o_mail_snippet_general pt16 pb0" style="text-align: left; padding-left: 15px; padding-right: 15px;" data-snippet="s_mail_block_header_view" data-name="View Online">
+        <section class="o_snippet_view_in_browser o_mail_snippet_general pt16 pb0" style="text-align: left; padding-left: 15px; padding-right: 15px;" data-vxml="001" data-snippet="s_mail_block_header_view" data-name="View Online">
             <p><a href="/view" class="" target="_blank" data-bs-original-title="" title="">View Online</a> - <font style="color: rgb(183, 191, 199);"><span style="font-size: 12.25px" t-out="datetime.datetime.now().strftime('%B %d %Y')"/></font></p>
         </section>
-        <section class="s_title o_mail_snippet_general pt32 pb32" data-snippet="s_title" data-name="Title" style="background-color: rgb(255, 255, 255) !important;">
+        <section class="s_title o_mail_snippet_general pt32 pb32" data-vxml="001" data-snippet="s_title" data-name="Title" style="background-color: rgb(255, 255, 255) !important;">
             <div class="container s_allow_columns">
                 <h1 style="text-align:center" class="">Weekly Musings</h1>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                     <h2 style="" class="">The story of Odoo</h2>
             </div>
         </section>
-        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general bg-white px-3 pt24 pb24" style="" data-snippet="s_mail_block_header_social" data-name="Left Logo">
+        <section class="s_header_social o_mail_block_header_social o_mail_snippet_general bg-white px-3 pt24 pb24" style="" data-vxml="001" data-snippet="s_mail_block_header_social" data-name="Left Logo">
             <div class="container" style="">
                 <div class="col-md-12 o_mail_header_social" style="background-color: rgb(255, 255, 255) !important; text-align: left;">
                     <a aria-label="Facebook" target="_blank" href="https://www.facebook.com/Odoo" data-original-title="Facebook" rel="noreferrer">
@@ -1088,17 +1090,17 @@
                 </div>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pb24" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pb24" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p style="font-size: 14px;" class="small text-muted">Musings on the week from <a style="font-size: 14px;" href="https://twitter.com/fpodoo?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Eauthor">@fpodoo</a></p>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>Making companies a better place, one app at a time</h3>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24 " data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24 " data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>I needed to change the world. I wanted to... You know how it is when you are young; you have big dreams, a lot of energy and naive stupidity. My dream was to lead the enterprise management market with a fully open source software (I also wanted to get 100 employees before 30 years old with a self-financed company but I failed this one by only a few months).</p>
                 <p>To fuel my motivation, I had to pick someone to fight against. In business, it's like a playground. When you arrive in a new school, if you want to quickly become the leader, you must choose the class bully, the older guy who terrorizes small boys, and kick his butt in front of everyone. That was my strategy with SAP, the enterprise software giant.</p>
@@ -1109,15 +1111,15 @@
                 <p>In 2010, we had a 100+ employees selling services on OpenERP and a powerful but ugly product. This is what happens when delivering services to customers distracts you from building an exceptional product. It was time to do a pivot in the business model.</p>
             </div>
         </section>
-        <section class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover">
+        <section class="s_cover o_mail_snippet_general" data-vxml="001" data-snippet="s_cover" data-name="Cover">
             <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner.jpg" alt="Cover image" class="img-fluid w-100 mx-auto"/>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>The Pivot</h3>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>We wanted to switch from a service company to a software publisher company. This would allow us to increase our efforts in our research and development activities. As a result, <a href="https://accounts.openerp.com/blog/OpenERP-Blog-Post-1/post/Open-Source-Free-as-in-Freedom-not-free-as-in-Free-services-119" target="_blank">we changed our business model</a> and decided to stop our services for customers and focus on building a strong partner network and maintenance offer. This would cost money, so I had to raise a few million euros.</p>
                 <p>After a few months of pitching investors, I got roughly 10 LOI from different VCs. We chose Sofinnova Partners, the biggest European VC, and Xavier Niel the founder of Iliad, the only company in France funded in the past 10 years to have reached the 1 billion EUR valuation.</p>
@@ -1126,15 +1128,15 @@
                 <p>We changed the deal and I got the 3 million EUR. It allowed me to recruit a rocking management team.</p>
             </div>
         </section>
-        <section class="s_cover o_mail_snippet_general pb24" data-snippet="s_cover" data-name="Cover">
+        <section class="s_cover o_mail_snippet_general pb24" data-vxml="001" data-snippet="s_cover" data-name="Cover">
             <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner_2.jpg" alt="Cover image" class="img-fluid w-100 mx-auto"/>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>Being a Mature Company</h3>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>With this money in our bank account, we boosted two departments: R&amp;D and Sales. We burned 2 million EUR in 18 months, mostly in salaries. The company started to grow even faster. We developed a partner network of 500 partners in 100 countries and we started to sign contracts with 6 zeros.</p>
                 <p>Then, things became different. You know, tedious things like handling human resources, board meetings, dealing with big customer contracts, traveling to launch international subsidiaries. We did boring stuff like budgets, career paths, management meetings, etc.</p>
@@ -1143,12 +1145,12 @@
                 <p>As usual, I should have listened to my wife. She is way more lucid than I am. Every week I complained to her "It's not good enough, we should grow faster, what am I missing?" and she used to reply: "But you already are the fastest growing company in Belgium!" (Deloitte awarded us as <a href="https://accounts.openerp.com/blog/OpenERP-Blog-1/post/Three-Awards-for-OpenERP-in-2013-139" target="_blank">the fastest growing company of Belgium</a> with 1549% growth of the turnover between 2007 and 2011).</p>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>Changing the World</h3>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>Then the dream started to become reality. We started to get clues that what we did would change the world:</p>
                 <ul>
@@ -1162,26 +1164,26 @@
                 <p>Something is happening... And it's big!</p>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>New Financing in 2014</h3>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb24" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>After years of rapid growth, we achieved another amazing goal - we secured a new round of 10 Million USD of financing, jointly provided by leading venture capital firms XAnge (France), SRIW (Belgium), Sofinnova (France), and the management team.</p>
                 <p>The new financing will support the acceleration of the outstanding growth the company has seen over the last years, enabling the doubling of the commercial force and increased R&amp;D staff - already 100+ people strong. </p>
             </div>
         </section>
-        <section class="s_cover o_mail_snippet_general pb24" data-snippet="s_cover" data-name="Cover">
+        <section class="s_cover o_mail_snippet_general pb24" data-vxml="001" data-snippet="s_cover" data-name="Cover">
             <img src="/mass_mailing_themes/static/src/img/theme_newsletter/s_default_image_block_banner_3.jpg" alt="Cover image" class="img-fluid w-100 mx-auto"/>
         </section>
-        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general px-3 pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>The Rise of Odoo</h3>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>After having disrupted the ERP market, OpenERP moved far beyond the boundaries of traditional ERP players. The integration of business activities is no longer restricted to sales, accounting, inventory and procurements. In June 2014, we released version 8 with awesome CMS &amp; eCommerce, a Point of Sale, an integrated Business Intelligence engine and much more (3000+ modules).</p>
                 <p>Our exceptional technology allowed us to move to newer markets (CMS &amp; eCommerce) and propose a product that disrupts existing open source players (Wordpress, Magento, etc). The OpenERP CMS is so good that even top competitors admitted it publicly when we released the beta version.</p>
@@ -1191,7 +1193,7 @@
                 <p>And a new story just started...</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general pb16 px-3" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general pb16 px-3" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <img src="/mass_mailing_themes/static/src/img/theme_newsletter/FPsignature.gif" style="width: 125px" alt=""/>
                 <p style="text-align:center;" class="pt32">
@@ -1199,7 +1201,7 @@
                 </p>
             </div>
         </section>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general o_cc o_cc1 pt0 pb0" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general o_cc o_cc1 pt0 pb0" data-vxml="001" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
             <div class="container">
                 <div class="col-md-12 o_mail_footer_social pt0 pb0" style="text-align: center;">
                     <a aria-label="Facebook" target="_blank" href="https://www.facebook.com/Odoo" data-original-title="Facebook" rel="noreferrer">
@@ -1214,10 +1216,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pt16 pb16" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pt16 pb16" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid" style="border-top-color: rgb(108, 117, 125) !important;"/>
         </div>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general o_cc o_cc1 pt0 pb0" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general o_cc o_cc1 pt0 pb0" data-vxml="001" data-snippet="s_mail_block_footer_social" data-name="Footer Center">
             <div class="container" style="text-align: center; color:rgb(183, 191, 199) !important;">
                 <span style="font-size: 12px;"><font style="color: rgb(183, 191, 199);">8000 Marina Blvd, Suite 300</font></span>
                 <br/>
@@ -1245,9 +1247,9 @@
                 --link-color: #35979c;
             }
         </style>
-        <section class="s_text_block o_mail_snippet_general pt40 px-3 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general pt40 px-3 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
-                <div class="s_title o_mail_snippet_general pb0 pt0" data-snippet="s_title" data-name="Title">
+                <div class="s_title o_mail_snippet_general pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
                     <div class="container s_allow_columns">
                         <h1>We're almost there!</h1>
                     </div>
@@ -1255,7 +1257,7 @@
                 <p>Odoo invites you on <span class="font-weight: bolder">[date]</span> at <span class="font-weight: bolder">[time]</span> for their infamous roadshow in <span class="font-weight: bolder">[city]</span>: an event that combines learning and networking in a casual afterwork-like atmosphere.</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>Registration is free, but mandatory:</p>
                 <p style="text-align: center;">
@@ -1268,22 +1270,22 @@
                 </p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>Discover Odoo, the all-in-one management platform, and its apps designed to improve employees' daily tasks. From sales and deliveries, to logistics, marketing and accounting ; learn what are the best available options to digitize your company.</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>[speaker] and [speaker] will rely on a unique demo concept in which YOU lead the demo and choose what you wish to see. They'll show how to tackle the challenge using the best tools, live. You will be amazed!</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>You may then take part in round table discussions with experts who will give you their tips and tricks to help digitize companies. We'll wrap up the event with a networking session including a walking dinner.</p>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general pb0 pt8" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general pb0 pt8" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <div class="row">
                     <div class="offset-md-2 col-md-8">
@@ -1292,10 +1294,10 @@
                 </div>
             </div>
         </section>
-        <div class="s_hr o_mail_snippet_general pb16 pt4" data-snippet="s_hr" data-name="Separator">
+        <div class="s_hr o_mail_snippet_general pb16 pt4" data-vxml="001" data-snippet="s_hr" data-name="Separator">
             <hr class="s_hr_1px s_hr_solid w-50"/>
         </div>
-        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb32" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb32" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <table class="mx-auto">
                     <tr style="vertical-align:top">
@@ -1341,7 +1343,7 @@
                 </table>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb4" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt0 pb4" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>For more information, check the event page : <a href="#" target="_blank" rel="noreferrer">[link]</a>.</p>
                 <p>We're on the starting blocks to prepare an incredible event for you!
@@ -1370,9 +1372,9 @@
                 --link-color: #35979c;
             }
         </style>
-        <section class="s_text_block o_mail_snippet_general px-3 pt40 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt40 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
-                <div class="s_title o_mail_snippet_general pb0 pt0" data-snippet="s_title" data-name="Title">
+                <div class="s_title o_mail_snippet_general pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
                     <div class="container s_allow_columns">
                         <h1>Yesterday's event at [venue] in [city] was incredible!</h1>
                     </div>
@@ -1385,20 +1387,20 @@
                 <p>Don't hesitate to send us more!</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>You had the chance to discover Odoo during a full 3 hours, how great is that?
                     <br/>Now that you've seen Odoo in action and asked some questions, you likely need more information to move forward in your project and to work with us. You'll find additional points just below.
                 </p>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>Do you wish to use Odoo?</h3>
                 <p>If you wish to evaluate Odoo while taking into account your company's specific needs, you can book a free appointment with one of our <a href="https://odoo.com/r/meeting" target="_blank">Odoo Experts</a> or <a href="https://odoo.com/page/tour" target="_blank">watch our videos about the product</a>.</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>Here are the links to our sponsors' websites if you wish to meet them:</p>
                 <ul>
@@ -1410,19 +1412,19 @@
                 <p>You may test Odoo for free by clicking <a href="https://odoo.com/trial" target="_blank">here</a>.</p>
             </div>
         </section>
-        <section class="s_title o_mail_snippet_general pb0 pt0" data-snippet="s_title" data-name="Title">
+        <section class="s_title o_mail_snippet_general pb0 pt0" data-vxml="001" data-snippet="s_title" data-name="Title">
             <div class="container s_allow_columns">
                 <h3>Do you wish to become a partner?</h3>
                 <p>If you wish to become a partner and offer your services in [country], take a look at <a href="https://odoo.com/r/meeting" target="_blank">this page</a>.</p>
                 <p>Learn more about our pricing <a href="https://odoo.com/r/meeting" target="_blank">here</a>.</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>You may then take part in round table discussions with experts who will give you their tips and tricks to help digitize companies. We'll wrap up the event with a networking session including a walking dinner.</p>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general px-3 pt8 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <p>Thank you, once again, for your attendance at yesterday's event.</p>
                 <p>--</p>
@@ -1459,7 +1461,7 @@
                 --separator-border-top-width: 2px;
             }
         </style>
-        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-snippet="s_mail_block_header_logo" data-name="Centered Logo" style="background-color: rgb(220, 234, 255);">
+        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-vxml="001" data-snippet="s_mail_block_header_logo" data-name="Centered Logo" style="background-color: rgb(220, 234, 255);">
             <div class="container">
                 <div class="row">
                     <div class="col-md-4"></div>
@@ -1472,10 +1474,10 @@
                 </div>
             </div>
         </section>
-        <section class="s_picture o_mail_snippet_general pt48 px-3 o_cc o_cc2 pb0" data-snippet="s_picture" data-name="Picture" placeholder="Type &quot;/&quot; for commands" style="background-color: rgb(67, 128, 219);">
+        <section class="s_picture o_mail_snippet_general pt48 px-3 o_cc o_cc2 pb0" data-vxml="001" data-snippet="s_picture" data-name="Picture" placeholder="Type &quot;/&quot; for commands" style="background-color: rgb(67, 128, 219);">
             <img class="img-fluid o_we_custom_image" src="/html_editor/image_shape/mass_mailing_themes.s_default_image_block_image/html_builder/composition/composition_organic_line.svg?c1=%23FF9800" data-shape="html_builder/composition/composition_organic_line" data-file-name="picture-composition_organic_line.svg" data-shape-colors="#FF9800;;;;" data-format-mimetype="image/jpeg"/>
         </section>
-        <section class="s_title o_mail_snippet_general pt32 pb0" data-snippet="s_title" data-name="Title" style="background-color: rgb(67, 128, 219);">
+        <section class="s_title o_mail_snippet_general pt32 pb0" data-vxml="001" data-snippet="s_title" data-name="Title" style="background-color: rgb(67, 128, 219);">
             <div class="container s_allow_columns">
                 <div class="row">
                     <div class="col-md-10 offset-md-1 pb32">
@@ -1484,13 +1486,13 @@
                 </div>
             </div>
         </section>
-        <section class="s_mail_block_event o_mail_snippet_general bg-white o_colored_level" data-snippet="s_event" data-name="Event" contenteditable="false">
+        <section class="s_mail_block_event o_mail_snippet_general bg-white o_colored_level" data-vxml="001" data-snippet="s_event" data-name="Event" contenteditable="false">
             <div class="container" contenteditable="true">
                 <div class="row align-items-center">
                     <div class="o_mail_no_colorpicker pt32 pb0 o_colored_level col-md-10 offset-md-1" style="padding-left: 0px; padding-right: 0px;">
                         <div class="card bg-white h-100 border" style="border-radius: 5px !important; border-color: rgb(233, 236, 239) !important; border-width: 0px !important;">
                             <div class="card-body">
-                                <div class="s_title o_mail_snippet_general pb0 pt0 o_colored_level" data-snippet="s_title" data-name="Title">
+                                <div class="s_title o_mail_snippet_general pb0 pt0 o_colored_level" data-vxml="001" data-snippet="s_title" data-name="Title">
                                     <div class="container">
                                         <div class="row">
                                             <div class="o_colored_level col-md-12 o_draggable">
@@ -1517,7 +1519,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general" data-snippet="s_text_block" data-name="Text">
+        <section class="s_text_block o_mail_snippet_general" data-vxml="001" data-snippet="s_text_block" data-name="Text">
             <div class="container s_allow_columns">
                 <div class="row">
                     <div class="offset-md-1 col-md-10">
@@ -1526,7 +1528,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_cover o_mail_snippet_general" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(220, 234, 255);">
+        <section class="s_cover o_mail_snippet_general" data-vxml="001" data-snippet="s_cover" data-name="Cover" style="background-color: rgb(220, 234, 255);">
             <div class="container">
                 <div class="row">
                     <div class="oe_img_bg o_bg_img_center pb88 pt104 col-md-12" data-original-src="/mass_mailing_themes/static/src/img/theme_training/see_you_soon.svg" style="background-image: url('/mass_mailing_themes/static/src/img/theme_training/see_you_soon.svg');">
@@ -1536,7 +1538,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb0" data-snippet="s_text_block" data-name="Text" style="background-color: rgb(220, 234, 255);">
+        <section class="s_text_block o_mail_snippet_general px-3 pt16 pb0" data-vxml="001" data-snippet="s_text_block" data-name="Text" style="background-color: rgb(220, 234, 255);">
             <div class="container s_allow_columns">
                 <p style="text-align: center">
                     <span style="font-size: 10px;">
@@ -1544,12 +1546,12 @@
                         </font>
                     </span>
                 </p>
-                <div class="s_hr o_mail_snippet_general pt0 pb16" data-snippet="s_hr" data-name="Separator">
+                <div class="s_hr o_mail_snippet_general pt0 pb16" data-vxml="001" data-snippet="s_hr" data-name="Separator">
                     <hr class="s_hr_1px s_hr_solid w-50" contenteditable="false"/>
                 </div>
             </div>
         </section>
-        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general" data-snippet="s_mail_block_footer_social" data-name="Footer Center" style="background-color: rgb(220, 234, 255); text-align: center;">
+        <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general" data-vxml="001" data-snippet="s_mail_block_footer_social" data-name="Footer Center" style="background-color: rgb(220, 234, 255); text-align: center;">
             <div class="container">
                 <div class="row">
                     <div class="col-md o_mail_footer_social pt8 pb8">

From d0439e61b6570e992b46c6bcf67150af73dd4eb9 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Fri, 31 Oct 2025 13:05:31 +0100
Subject: [PATCH 186/673] [FIX] mass_mailing: ensure unknown email format is
 displayed

Prior to this commit, invalid email content format was hidden behind the Theme
Selector. This is problematic for the migration of users on 19.0: we should
display the mail content regardless of whether it's fully compatible with the
new editor implementation.

The Theme Selector is now only displayed if there is no content. Trying to edit
unknown content will create a HtmlBuilder instance which may partially work.

task-5089259

Part-of: odoo/odoo#234057
Related: odoo/enterprise#98631
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../src/fields/html_field/mass_mailing_html_field.js   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
index dc79446b22c53..2d812ad2c85e7 100644
--- a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
@@ -139,15 +139,15 @@ export class MassMailingHtmlField extends HtmlField {
         const state = toRaw(this.state);
         const getThemeName = () => {
             const value = record.data[this.props.name];
-            if (!value) {
+            if (!value || !value.toString()) {
                 return;
             }
             const fragment = parseHTML(document, value);
             const layout = fragment.querySelector(".o_layout");
             if (!layout) {
-                return;
+                return "unknown";
             }
-            return this.themeService.getThemeName(layout.classList);
+            return this.themeService.getThemeName(layout.classList) || "unknown";
         };
         const activeTheme = getThemeName();
         if (state.activeTheme !== activeTheme) {
@@ -162,8 +162,8 @@ export class MassMailingHtmlField extends HtmlField {
         // dependencies to that effect, so it is used raw.
         const state = toRaw(this.state);
         if (!state.activeTheme && !state.showThemeSelector && !props.readonly) {
-            // Show the ThemeSelector when the theme is unknown and the content can be
-            // changed (invalid value).
+            // Show the ThemeSelector when the theme is undefined and the content can be
+            // changed.
             state.showThemeSelector = true;
         } else if ((state.activeTheme && state.showThemeSelector) || props.readonly) {
             state.showThemeSelector = false;

From 17bcf2bc828a3da1b9e3c44c9df0dedd3bb92bd7 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Fri, 31 Oct 2025 13:05:37 +0100
Subject: [PATCH 187/673] [FIX] mass_mailing: ensure codeView commitChanges
 succeeds

Prior to this commit, editing and saving using the codeView was not possible if
an editor was opened beforehand. This issue was introduced by a previous
[commit].

[commit]: https://github.com/odoo/odoo/commit/fc393db4a8e54b1518a1a6a7ed4ba4eb70c889f9

task-5089259

Part-of: odoo/odoo#234057
Related: odoo/enterprise#98631
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../static/src/fields/html_field/mass_mailing_html_field.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
index 2d812ad2c85e7..0d8c33b47830f 100644
--- a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
@@ -305,7 +305,7 @@ export class MassMailingHtmlField extends HtmlField {
                 return;
             }
         }
-        if (this.editor?.isDestroyed) {
+        if (!this.state.showCodeView && this.editor?.isDestroyed) {
             return;
         }
         return super._commitChanges({ urgent });

From 704763e01d57d2a9fbc060e022bb5ee3a8d3dd74 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Fri, 31 Oct 2025 12:50:32 +0100
Subject: [PATCH 188/673] [FIX] mass_mailing: post-fresh-options fixes

This commit fixes issues introduced with the Fresh Option API [changes]:

- Crash when interacting with a snippet using background-image
- Crash when interacting with a product list snippet.

[changes]: https://github.com/odoo/odoo/commit/179480d996a19dff4d56265a610259b1c6e33f99

task-5089259

Part-of: odoo/odoo#234057
Related: odoo/enterprise#98631
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../static/src/builder/plugins/alert_option_plugin.js    | 2 +-
 .../static/src/builder/plugins/border_option_plugin.js   | 3 ++-
 .../src/builder/plugins/colorpicker_option_plugin.js     | 3 ++-
 .../static/src/builder/plugins/design_tab_plugin.js      | 2 +-
 .../src/builder/plugins/image_tool_options_plugin.js     | 9 ++++++---
 .../src/builder/plugins/layout_column_option_plugin.js   | 3 +--
 .../src/builder/plugins/pricelist_boxed_option_plugin.js | 4 +---
 .../src/builder/plugins/reviews_wall_option_plugin.js    | 5 +----
 8 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js
index 918de23e5e965..e10478470afe7 100644
--- a/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/alert_option_plugin.js
@@ -13,7 +13,7 @@ export class AlertOption extends BaseOptionComponent {
 export class BorderOption extends BaseOptionComponent {
     static template = "mass_mailing.BorderOption";
     static selector = ".s_mail_alert .s_alert";
-    static components = {BorderConfigurator}
+    static components = { BorderConfigurator };
 }
 
 class AlertOptionPlugin extends Plugin {
diff --git a/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js
index b1fd196a5ae6b..6c2ab0af3e1f7 100644
--- a/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/border_option_plugin.js
@@ -7,7 +7,8 @@ import { registry } from "@web/core/registry";
 
 export class BorderOption1 extends BaseOptionComponent {
     static template = "mass_mailing.BorderOption";
-    static selector = ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div";
+    static selector =
+        ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div";
     static applyTo = ".card";
     static components = { BorderConfigurator };
 }
diff --git a/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js
index 7e25701dc5588..a1d24c51207b9 100644
--- a/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/colorpicker_option_plugin.js
@@ -16,7 +16,8 @@ export class ColorPickerOption extends BaseOptionComponent {
 
 export class ColorPickerOption2 extends BaseOptionComponent {
     static template = "mass_mailing.ColorPickerOption";
-    static selector = ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div";
+    static selector =
+        ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div";
     static applyTo = ".card-body";
 }
 
diff --git a/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js b/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js
index bb5ad45c72d15..33ef564d5235b 100644
--- a/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/design_tab_plugin.js
@@ -71,7 +71,7 @@ class DesignTabPlugin extends Plugin {
     getDesignOptionBlock(id, options) {
         const Option = class extends BaseOptionComponent {
             static selector = "*";
-        }
+        };
         Object.assign(Option, options);
 
         return {
diff --git a/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js b/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js
index 56b67aa49f371..e32a92a43ab63 100644
--- a/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/image_tool_options_plugin.js
@@ -1,6 +1,9 @@
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
-import { CropImageAction, ImageAndFaOption } from "@html_builder/plugins/image/image_tool_option_plugin";
+import {
+    CropImageAction,
+    ImageAndFaOption,
+} from "@html_builder/plugins/image/image_tool_option_plugin";
 import { IMAGE_TOOL } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { closestElement } from "@html_editor/utils/dom_traversal";
@@ -15,8 +18,8 @@ export class FontAwesomeOption extends BaseOptionComponent {
 }
 
 patch(ImageAndFaOption, {
-    components: {...ImageAndFaOption.components, BorderConfigurator},
-})
+    components: { ...ImageAndFaOption.components, BorderConfigurator },
+});
 
 class ImageToolOptionPlugin extends Plugin {
     static id = "mass_mailing.ImageToolOption";
diff --git a/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js
index 6a5baa6c99db7..22bbfb380c9bc 100644
--- a/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/layout_column_option_plugin.js
@@ -9,8 +9,7 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
 export class MassMailingLayoutColumnOption extends LayoutColumnOption {
     static selector = ".o_mail_snippet_general";
     static exclude = ".s_reviews_wall";
-    static applyTo =
-        ":scope > *:has(> .row:not(.s_nb_column_fixed)), * > .s_allow_columns";
+    static applyTo = ":scope > *:has(> .row:not(.s_nb_column_fixed)), * > .s_allow_columns";
 }
 
 class MassMailingLayoutColumnPlugin extends Plugin {
diff --git a/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js
index 6611ab7d583f1..83179152490ea 100644
--- a/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/pricelist_boxed_option_plugin.js
@@ -12,9 +12,7 @@ export class MassMailingAddProductOption extends BaseAddProductOption {
 export class PricelistBoxedOptionPlugin extends Plugin {
     static id = "mass_mailing.PricelistBoxedOptionPlugin";
     resources = {
-        builder_options: [
-            withSequence(BEGIN, MassMailingAddProductOption),
-        ],
+        builder_options: [withSequence(BEGIN, MassMailingAddProductOption)],
     };
 }
 
diff --git a/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js b/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js
index 8b710f6a7db87..04c535854f45e 100644
--- a/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js
+++ b/addons/mass_mailing/static/src/builder/plugins/reviews_wall_option_plugin.js
@@ -16,10 +16,7 @@ export class MassMailingLayoutColumnOption extends LayoutColumnOption {
 class ReviewsWallOptionPlugin extends Plugin {
     static id = "mass_mailing.ReviewsWallOptionPlugin";
     resources = {
-        builder_options: [
-            CustomerTestimonialsBlockquote,
-            MassMailingLayoutColumnOption,
-        ],
+        builder_options: [CustomerTestimonialsBlockquote, MassMailingLayoutColumnOption],
     };
 }
 

From c001d7e0b04317a815e29dc4a4aed7f7c95ee550 Mon Sep 17 00:00:00 2001
From: "Chrysanthe (chgo)" <chgo@odoo.com>
Date: Mon, 6 Oct 2025 13:15:26 +0200
Subject: [PATCH 189/673] [IMP] web, mail *: improve states of systray items

*: auth_passkey, auth_totp, hr, hr_holidays, website, test_main_flows

This commit improves the different button states within the
`.o_menu_systray element`

Currently, these buttons are either:

- `<button>` elements with only the .btn class, which does not provide
a complete set of CSS properties.

- `.dropdown-toggle` elements with an inherited background-color, which
ends up being the transparent background set on the `<nav>` element.

This commit harmonizes these approaches into a single one, aligned with
the implementation used in .o_menu_sections. This increases
consistency and also improves the accessibility of these items.

While working on the navbar, we also removed the `border-bottom` which is
specific to this bundle, as it was glitchy and does not provide any value.

task-5098241

closes odoo/odoo#227858

Related: odoo/enterprise#95339
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 .../static/tests/passkeys_delete.js           |  4 +-
 .../static/tests/passkeys_login.js            |  2 +-
 .../static/tests/passkeys_registration.js     |  4 +-
 .../static/tests/passkeys_verify.js           |  2 +-
 addons/auth_totp/static/tests/apikeys_flow.js |  6 +-
 addons/auth_totp/static/tests/totp_flow.js    |  8 +--
 .../hr/static/tests/tours/hr_employee_flow.js |  2 +-
 .../static/src/tours/hr_leave_type_tour.js    |  2 +-
 addons/mail/static/src/core/common/core.scss  |  7 --
 .../src/core/web/messaging_menu_patch.xml     | 20 +++---
 .../src/discuss/core/web/user_menu_patch.xml  |  2 +-
 .../tours/user_modify_own_profile_tour.js     |  2 +-
 .../src/webclient/burger_menu/burger_menu.xml | 51 +++++++------
 .../static/src/webclient/navbar/navbar.scss   |  9 ++-
 .../webclient/navbar/navbar.variables.scss    |  9 ++-
 .../switch_company_menu.xml                   | 40 +++++------
 .../src/webclient/user_menu/user_menu.scss    |  4 +-
 .../src/webclient/user_menu/user_menu.xml     | 72 +++++++++----------
 .../static/tests/tours/user_switch_tour.js    |  2 +-
 .../webclient/switch_company_menu.test.js     |  4 +-
 .../publish_website_systray_item.js           |  4 +-
 .../static/src/components/navbar/navbar.scss  |  9 ++-
 .../tours/switch_company_access_error_tour.js |  2 +-
 ...test_company_access_error_redirect_tour.js |  2 +-
 24 files changed, 128 insertions(+), 141 deletions(-)

diff --git a/addons/auth_passkey/static/tests/passkeys_delete.js b/addons/auth_passkey/static/tests/passkeys_delete.js
index 65fae2d9b0b91..cc9159a372e81 100644
--- a/addons/auth_passkey/static/tests/passkeys_delete.js
+++ b/addons/auth_passkey/static/tests/passkeys_delete.js
@@ -5,7 +5,7 @@ registry.category("web_tour.tours").add('passkeys_tour_delete', {
     steps: () => [
         {
             content: 'Open user account menu',
-            trigger: '.o_user_menu .dropdown-toggle',
+            trigger: '.o_user_menu',
             run: 'click',
         }, {
             content: "Open preferences / profile screen",
@@ -49,7 +49,7 @@ registry.category("web_tour.tours").add('passkeys_tour_delete', {
             run: "click",
         }, {
             content: 'Open user account menu',
-            trigger: '.o_user_menu .dropdown-toggle',
+            trigger: '.o_user_menu',
             run: 'click',
         }, {
             content: "Open preferences / profile screen",
diff --git a/addons/auth_passkey/static/tests/passkeys_login.js b/addons/auth_passkey/static/tests/passkeys_login.js
index 9ee5daf3b56c8..a01612a61373a 100644
--- a/addons/auth_passkey/static/tests/passkeys_login.js
+++ b/addons/auth_passkey/static/tests/passkeys_login.js
@@ -36,7 +36,7 @@ registry.category("web_tour.tours").add('passkeys_tour_login', {
             expectUnloadPage: true,
         }, {
             content: 'Check if we are logged in',
-            trigger: '.o_user_menu .dropdown-toggle',
+            trigger: '.o_user_menu',
         },
     ]
 })
diff --git a/addons/auth_passkey/static/tests/passkeys_registration.js b/addons/auth_passkey/static/tests/passkeys_registration.js
index 867e0be7a1f38..38eb09b3476d9 100644
--- a/addons/auth_passkey/static/tests/passkeys_registration.js
+++ b/addons/auth_passkey/static/tests/passkeys_registration.js
@@ -9,7 +9,7 @@ registry.category("web_tour.tours").add('passkeys_tour_registration', {
     steps: () => [
         {
             content: 'Open user account menu',
-            trigger: '.o_user_menu .dropdown-toggle',
+            trigger: '.o_user_menu',
             run: 'click',
         }, {
             content: "Open preferences / profile screen",
@@ -84,7 +84,7 @@ registry.category("web_tour.tours").add('passkeys_tour_registration', {
             run: "click",
         }, {
             content: 'Open user account menu',
-            trigger: '.o_user_menu .dropdown-toggle',
+            trigger: '.o_user_menu',
             run: 'click',
         }, {
             content: "Return startRegistration to original state",
diff --git a/addons/auth_passkey/static/tests/passkeys_verify.js b/addons/auth_passkey/static/tests/passkeys_verify.js
index 263025e7d73f7..6984447ac74e6 100644
--- a/addons/auth_passkey/static/tests/passkeys_verify.js
+++ b/addons/auth_passkey/static/tests/passkeys_verify.js
@@ -9,7 +9,7 @@ registry.category("web_tour.tours").add('passkeys_tour_verify', {
     steps: () => [
         {
             content: 'Open user account menu',
-            trigger: '.o_user_menu .dropdown-toggle',
+            trigger: '.o_user_menu',
             run: 'click',
         }, {
             content: "Open preferences / profile screen",
diff --git a/addons/auth_totp/static/tests/apikeys_flow.js b/addons/auth_totp/static/tests/apikeys_flow.js
index 287ef4675ce45..231d2a3290aa8 100644
--- a/addons/auth_totp/static/tests/apikeys_flow.js
+++ b/addons/auth_totp/static/tests/apikeys_flow.js
@@ -3,7 +3,7 @@ import { registry } from "@web/core/registry";
 
 const openUserPreferenceSecurity = () => [{
     content: 'Open user account menu',
-    trigger: '.o_user_menu .dropdown-toggle',
+    trigger: '.o_user_menu',
     run: 'click',
 }, {
     content: "Open preferences / profile screen",
@@ -71,7 +71,7 @@ registry.category("web_tour.tours").add('apikeys_tour_teardown', {
     url: '/odoo?debug=1', // Needed as API key part is now only displayed in debug mode
     steps: () => [{
     content: 'Open preferences',
-    trigger: '.o_user_menu .dropdown-toggle',
+    trigger: '.o_user_menu',
     run: "click",
 }, {
     trigger: '[data-menu=preferences]',
@@ -98,7 +98,7 @@ registry.category("web_tour.tours").add('apikeys_tour_teardown', {
 },
 {
     content: 'Re-open preferences again',
-    trigger: '.o_user_menu .dropdown-toggle',
+    trigger: '.o_user_menu',
     run: "click",
 }, {
     trigger: '[data-menu=preferences]',
diff --git a/addons/auth_totp/static/tests/totp_flow.js b/addons/auth_totp/static/tests/totp_flow.js
index 3bc23245b47b0..35c256cd8ce32 100644
--- a/addons/auth_totp/static/tests/totp_flow.js
+++ b/addons/auth_totp/static/tests/totp_flow.js
@@ -21,7 +21,7 @@ function openRoot() {
 function openUserPreferencesAtSecurityTab() {
     return [{
         content: 'Open user account menu',
-        trigger: '.o_user_menu .dropdown-toggle',
+        trigger: '.o_user_menu',
         run: 'click',
     }, {
         content: "Open My Preferences",
@@ -199,7 +199,7 @@ registry.category("web_tour.tours").add('totp_login_enabled', {
     expectUnloadPage: true,
 }, {
     content: "check we're logged in",
-    trigger: ".o_user_menu .dropdown-toggle",
+    trigger: ".o_user_menu",
 }]});
 
 registry.category("web_tour.tours").add('totp_login_device', {
@@ -264,7 +264,7 @@ registry.category("web_tour.tours").add('totp_login_device', {
 },
 {
     content: "check we're logged in",
-    trigger: ".o_user_menu .dropdown-toggle",
+    trigger: ".o_user_menu",
     run: 'click',
 }, {
     content: "click the Log out button",
@@ -290,7 +290,7 @@ registry.category("web_tour.tours").add('totp_login_device', {
     expectUnloadPage: true,
 },  {
     content: "check we're logged in without 2FA",
-    trigger: ".o_user_menu .dropdown-toggle",
+    trigger: ".o_user_menu",
 },
 // now go and disable two-factor authentication would be annoying to do in a separate tour
 // because we'd need to login & totp again as HttpCase.authenticate can't
diff --git a/addons/hr/static/tests/tours/hr_employee_flow.js b/addons/hr/static/tests/tours/hr_employee_flow.js
index e94ecb1019fcb..e8104fc0aed7d 100644
--- a/addons/hr/static/tests/tours/hr_employee_flow.js
+++ b/addons/hr/static/tests/tours/hr_employee_flow.js
@@ -17,7 +17,7 @@ registry.category("web_tour.tours").add("hr_employee_tour", {
         },
         {
             content: "Open user account menu",
-            trigger: ".o_user_menu .dropdown-toggle",
+            trigger: ".o_user_menu",
             run: "click",
         },
         {
diff --git a/addons/hr_holidays/static/src/tours/hr_leave_type_tour.js b/addons/hr_holidays/static/src/tours/hr_leave_type_tour.js
index 654f43c59bb08..90bae7e393128 100644
--- a/addons/hr_holidays/static/src/tours/hr_leave_type_tour.js
+++ b/addons/hr_holidays/static/src/tours/hr_leave_type_tour.js
@@ -122,7 +122,7 @@ registry.category("web_tour.tours").add("hr_leave_type_tour", {
                 "Make sure that the leave is approved by checking that the cancel button appears",
         },
         {
-            trigger: ".o_switch_company_menu button",
+            trigger: ".o_switch_company_menu",
             content: "Open the companies selection menu",
             tooltipPosition: "bottom",
             run: "click",
diff --git a/addons/mail/static/src/core/common/core.scss b/addons/mail/static/src/core/common/core.scss
index 2adf1db7aab41..e7cfd71a83ed8 100644
--- a/addons/mail/static/src/core/common/core.scss
+++ b/addons/mail/static/src/core/common/core.scss
@@ -357,13 +357,6 @@ a.o-discuss-mention {
     --border-color: #{$o-gray-300} !important; // cancel custom border color of dropdown
 }
 
-.o-mail-DiscussSystray-class {
-    margin-top: - $o-navbar-padding-v; // cancel navbar padding
-    margin-bottom: - $o-navbar-padding-v; // cancel navbar padding
-    display: flex;
-    align-items: center;
-}
-
 .o-mail-systrayFullscreenDropdownMenu {
     top: $o-navbar-height !important;
     height: calc(100% - #{$o-navbar-height}); // no bottom-0 otherwise performance issue
diff --git a/addons/mail/static/src/core/web/messaging_menu_patch.xml b/addons/mail/static/src/core/web/messaging_menu_patch.xml
index e88a4b75eca28..aefae34192824 100644
--- a/addons/mail/static/src/core/web/messaging_menu_patch.xml
+++ b/addons/mail/static/src/core/web/messaging_menu_patch.xml
@@ -2,17 +2,15 @@
 <templates xml:space="preserve">
     <t t-inherit="mail.MessagingMenu" t-inherit-mode="extension">
         <xpath expr="//*[@t-name='mail.MessagingMenu']" position="inside">
-            <div t-if="!env.inDiscussApp" t-att-class="discussSystray.class">
-                <Dropdown state="dropdown" beforeOpen.bind="beforeOpen" position="'bottom-end'" menuClass="discussSystray.menuClass" bottomSheet="false">
-                    <button class="bg-transparent">
-                        <i class="fa fa-lg fa-comments" role="img" aria-label="Messages" t-on-click="() => store.discuss.activeTab = ui.isSmall and store.discuss.activeTab === 'notification' ? 'notification' : store.discuss.activeTab"></i>
-                        <span t-if="counter" class="o-mail-MessagingMenu-counter badge rounded-pill"><t t-esc="counter"/></span>
-                    </button>
-                    <t t-set-slot="content">
-                        <t t-call="mail.MessagingMenu.content"/>
-                    </t>
-                </Dropdown>
-            </div>
+            <Dropdown t-if="!env.inDiscussApp" state="dropdown" beforeOpen.bind="beforeOpen" position="'bottom-end'" menuClass="discussSystray.menuClass" bottomSheet="false">
+                <button t-att-class="discussSystray.class">
+                    <i class="fa fa-lg fa-comments" role="img" aria-label="Messages" t-on-click="() => store.discuss.activeTab = ui.isSmall and store.discuss.activeTab === 'notification' ? 'notification' : store.discuss.activeTab"></i>
+                    <span t-if="counter" class="o-mail-MessagingMenu-counter badge rounded-pill"><t t-esc="counter"/></span>
+                </button>
+                <t t-set-slot="content">
+                    <t t-call="mail.MessagingMenu.content"/>
+                </t>
+            </Dropdown>
         </xpath>
     </t>
 
diff --git a/addons/mail/static/src/discuss/core/web/user_menu_patch.xml b/addons/mail/static/src/discuss/core/web/user_menu_patch.xml
index 7f260ee027fd3..8549d84f44382 100644
--- a/addons/mail/static/src/discuss/core/web/user_menu_patch.xml
+++ b/addons/mail/static/src/discuss/core/web/user_menu_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">  
     <t t-inherit="web.UserMenu" t-inherit-mode="extension">
         <xpath expr="//img[hasclass('o_user_avatar')]" position="replace">
-            <div class="position-relative d-flex flex-shrink-0 bg-inherit">
+            <div class="position-relative d-flex flex-shrink-0">
                 <t>$0</t>
                 <ImStatus className="'o-web-UserMenu-imStatus position-absolute'" persona="store.self" size="'md'"/>
             </div>
diff --git a/addons/mail/static/tests/tours/user_modify_own_profile_tour.js b/addons/mail/static/tests/tours/user_modify_own_profile_tour.js
index 0a0300696ab00..266922d734c28 100644
--- a/addons/mail/static/tests/tours/user_modify_own_profile_tour.js
+++ b/addons/mail/static/tests/tours/user_modify_own_profile_tour.js
@@ -7,7 +7,7 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/user_modify_own
     steps: () => [
         {
             content: "Open user account menu",
-            trigger: ".o_user_menu button",
+            trigger: ".o_user_menu",
             run: "click",
         },
         {
diff --git a/addons/web/static/src/webclient/burger_menu/burger_menu.xml b/addons/web/static/src/webclient/burger_menu/burger_menu.xml
index 0911a156624cc..10923bbde8d09 100644
--- a/addons/web/static/src/webclient/burger_menu/burger_menu.xml
+++ b/addons/web/static/src/webclient/burger_menu/burger_menu.xml
@@ -3,33 +3,32 @@
 
 <!-- Owl Templates -->
 
-<div t-name="web.BurgerMenu" class="d-flex">
-    <button
-        class="o_mobile_menu_toggle o_nav_entry o-no-caret d-md-none border-0 pe-3"
-        title="Toggle menu" aria-label="Toggle menu"
-        t-on-click="_openBurger">
-        <img class="o_burger_menu_avatar o_image_24_cover rounded" t-att-src="'/web/image?model=res.users&amp;field=avatar_128&amp;id=' + user.userId" alt="Menu"/>
-    </button>
+<t t-name="web.BurgerMenu">
+  <button
+    class="o_mobile_menu_toggle o_nav_entry o-no-caret d-md-none border-0 pe-3"
+    title="Toggle menu" aria-label="Toggle menu"
+    t-on-click="_openBurger">
+    <img class="o_burger_menu_avatar o_image_24_cover rounded" t-att-src="'/web/image?model=res.users&amp;field=avatar_128&amp;id=' + user.userId" alt="Menu"/>
+  </button>
 
-    <t t-portal="'body'">
-      <Transition name="'o-burger-slide'" visible="state.isBurgerOpened" leaveDuration="200" t-slot-scope="transition">
-        <div class="o_burger_menu position-fixed top-0 bottom-0 start-100 d-flex flex-column flex-nowrap" t-att-class="transition.className" t-on-touchstart.stop="_onSwipeStart" t-on-touchend.stop="_onSwipeEnd">
-          <div class="o_sidebar_topbar d-flex align-items-center justify-content-between flex-shrink-0 py-0 fs-4">
-              <small class="d-flex align-items-center justify-content-between ms-2">
-                  <img class="o_burger_menu_avatar o_image_24_cover rounded" t-att-src="'/web/image?model=res.users&amp;field=avatar_128&amp;id=' + user.userId" alt="Menu"/>
-                  <span class="o_burger_menu_username px-2"><t t-esc="user.name"/></span>
-              </small>
-              <button class="o_sidebar_close oi oi-close btn d-flex align-items-center h-100 bg-transparent border-0 fs-2 text-reset" aria-label="Close menu" title="Close menu" t-on-click.stop="_closeBurger"/>
-          </div>
-          <nav class="o_burger_menu_content flex-grow-1 flex-shrink-1 overflow-auto o_burger_menu_app">
-
-            <MobileSwitchCompanyMenu t-if="user.allowedCompanies.length > 1" />
-            <BurgerUserMenu onMenuClicked.bind="_closeBurger"/>
-          </nav>
+  <t t-portal="'body'">
+    <Transition name="'o-burger-slide'" visible="state.isBurgerOpened" leaveDuration="200" t-slot-scope="transition">
+      <div class="o_burger_menu position-fixed top-0 bottom-0 start-100 d-flex flex-column flex-nowrap" t-att-class="transition.className" t-on-touchstart.stop="_onSwipeStart" t-on-touchend.stop="_onSwipeEnd">
+        <div class="o_sidebar_topbar d-flex align-items-center justify-content-between flex-shrink-0 py-0 fs-4">
+            <small class="d-flex align-items-center justify-content-between ms-2">
+              <img class="o_burger_menu_avatar o_image_24_cover rounded" t-att-src="'/web/image?model=res.users&amp;field=avatar_128&amp;id=' + user.userId" alt="Menu"/>
+              <span class="o_burger_menu_username px-2"><t t-esc="user.name"/></span>
+            </small>
+            <button class="o_sidebar_close oi oi-close btn d-flex align-items-center h-100 bg-transparent border-0 fs-2 text-reset" aria-label="Close menu" title="Close menu" t-on-click.stop="_closeBurger"/>
         </div>
-      </Transition>
-      <div t-if="state.isBurgerOpened" class="modal-backdrop show d-block d-md-none" t-on-click.stop="_closeBurger" t-on-touchstart.stop="_onSwipeStart" t-on-touchend.stop="_onSwipeEnd" />
-    </t>
-</div>
+        <nav class="o_burger_menu_content flex-grow-1 flex-shrink-1 overflow-auto o_burger_menu_app">
+          <MobileSwitchCompanyMenu t-if="user.allowedCompanies.length > 1" />
+          <BurgerUserMenu onMenuClicked.bind="_closeBurger"/>
+        </nav>
+      </div>
+    </Transition>
+    <div t-if="state.isBurgerOpened" class="modal-backdrop show d-block d-md-none" t-on-click.stop="_closeBurger" t-on-touchstart.stop="_onSwipeStart" t-on-touchend.stop="_onSwipeEnd" />
+  </t>
+</t>
 
 </templates>
diff --git a/addons/web/static/src/webclient/navbar/navbar.scss b/addons/web/static/src/webclient/navbar/navbar.scss
index b22016e3e2466..ff5e28095d9e7 100644
--- a/addons/web/static/src/webclient/navbar/navbar.scss
+++ b/addons/web/static/src/webclient/navbar/navbar.scss
@@ -10,7 +10,6 @@
     height: var(--o-navbar-height);
     padding-top: $o-navbar-padding-v;
     padding-bottom: $o-navbar-padding-v;
-    border-bottom: $o-navbar-border-bottom;
     background: $o-navbar-background;
     font-size: $o-navbar-font-size;
 
@@ -152,8 +151,12 @@
         border-color: transparent;
     }
 
-    .o_menu_sections {
-        .o_nav_entry, .dropdown-toggle {
+    .o_menu_sections, .o_menu_systray:where(:not(.o_home_menu_background .o_menu_systray)) {
+        .dropdown-toggle:disabled {
+            --NavBar-entry-color--hover: var(--NavBar-entry-color, #{$o-navbar-entry-color});
+        }
+
+        .o_nav_entry, .dropdown-toggle:not(:disabled) {
             background: var(--NavBar-entry-backgroundColor, #{$o-navbar-background});
             border: $border-width solid transparent;
 
diff --git a/addons/web/static/src/webclient/navbar/navbar.variables.scss b/addons/web/static/src/webclient/navbar/navbar.variables.scss
index a4e57420c1914..a1d743f017955 100644
--- a/addons/web/static/src/webclient/navbar/navbar.variables.scss
+++ b/addons/web/static/src/webclient/navbar/navbar.variables.scss
@@ -5,10 +5,9 @@ $o-navbar-padding-v: 0px !default;
 $o-navbar-font-size: $o-font-size-base !default;
 
 $o-navbar-background: $o-brand-odoo !default;
-$o-navbar-border-bottom: 1px solid darken($o-brand-odoo, 10%) !default;
 
 $o-navbar-entry-margin-h: 0 !default;
-$o-navbar-entry-padding-h: .63em !default;
+$o-navbar-entry-padding-h: $o-spacer * .5 !default;
 $o-navbar-entry-border-radius: 0 !default;
 $o-navbar-entry-color: rgba($o-white, .9) !default;
 $o-navbar-entry-color--hover: $o-white !default;
@@ -36,8 +35,8 @@ $o-navbar-badge-text-shadow: 1px 1px 0 rgba($o-black, .3) !default;
     display: flex;
     align-items: center;
     width: auto;
-    height: calc(var(--o-navbar-height) - #{$o-navbar-padding-v * 2});
-    border-radius: $o-navbar-entry-border-radius;
+    height: var(--Navbar-entry-height, calc(var(--o-navbar-height) - #{$o-navbar-padding-v} * 2));
+    border-radius: var(--NavBar-entry-borderRadius, #{$o-navbar-entry-border-radius});
     user-select: none;
     background-color: inherit;
     font-size: $o-navbar-entry-font-size;
@@ -49,7 +48,7 @@ $o-navbar-badge-text-shadow: 1px 1px 0 rgba($o-black, .3) !default;
 }
 
 %-main-navbar-entry-spacing {
-    margin: 0;
+    margin: var(--Navbar-entry-margin, 0);
     margin-left: var(--NavBar-entry-margin-left, #{$o-navbar-entry-margin-h});
     margin-right: var(--NavBar-entry-margin-right, #{$o-navbar-entry-margin-h});
     padding: 0;
diff --git a/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.xml b/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.xml
index 029d519954d2e..ba963a2db4890 100644
--- a/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.xml
+++ b/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.xml
@@ -2,28 +2,26 @@
 <templates xml:space="preserve">
 
 <t t-name="web.SwitchCompanyMenu">
-    <div class="o_switch_company_menu d-none d-md-block">
-        <DropdownGroup group="'web-navbar-group'">
-            <Dropdown
-                position="'bottom-end'"
-                menuRef="containerRef"
-                state="this.dropdown"
-                onStateChanged.bind="handleDropdownChange"
-                navigationOptions="navigationOptions"
-                menuClass="'o_switch_company_menu_dropdown'"
-                disabled="isSingleCompany"
-            >
-                <button data-hotkey="shift+u" t-att-disabled="isSingleCompany" t-att-title="user.activeCompany.name">
-                    <i class="fa fa-building d-lg-none"/>
-                    <span class="oe_topbar_name d-none d-lg-block text-truncate" t-esc="user.activeCompany.name"/>
-                </button>
+    <DropdownGroup group="'web-navbar-group'">
+        <Dropdown
+            position="'bottom-end'"
+            menuRef="containerRef"
+            state="this.dropdown"
+            onStateChanged.bind="handleDropdownChange"
+            navigationOptions="navigationOptions"
+            menuClass="'o_switch_company_menu_dropdown'"
+            disabled="isSingleCompany"
+        >
+            <button data-hotkey="shift+u" t-att-disabled="isSingleCompany" t-att-title="user.activeCompany.name" class="o_switch_company_menu d-none d-md-flex">
+                <i class="fa fa-building d-lg-none"/>
+                <span class="oe_topbar_name d-none d-lg-block text-truncate" t-esc="user.activeCompany.name"/>
+            </button>
 
-                <t t-set-slot="content">
-                    <t t-call="web.SwitchCompanyMenu.Items"/>
-                </t>
-            </Dropdown>
-        </DropdownGroup>
-    </div>
+            <t t-set-slot="content">
+                <t t-call="web.SwitchCompanyMenu.Items"/>
+            </t>
+        </Dropdown>
+    </DropdownGroup>
 </t>
 
 <t t-name="web.SwitchCompanyMenu.Items">
diff --git a/addons/web/static/src/webclient/user_menu/user_menu.scss b/addons/web/static/src/webclient/user_menu/user_menu.scss
index 919169fd44183..3e2af15a7ea56 100644
--- a/addons/web/static/src/webclient/user_menu/user_menu.scss
+++ b/addons/web/static/src/webclient/user_menu/user_menu.scss
@@ -1,5 +1,5 @@
-.o_user_menu .dropdown-toggle {
-    --NavBar-entry-padding-right: #{$o-horizontal-padding};
+.o_user_menu {
+    --NavBar-entry-margin-right: calc(#{$spacer} - var(--NavBar-entry-padding-right));
 
     .o_user_avatar {
         height: calc(var(--o-navbar-height) - 20px);
diff --git a/addons/web/static/src/webclient/user_menu/user_menu.xml b/addons/web/static/src/webclient/user_menu/user_menu.xml
index 376128b0535f1..bedca01356ee4 100644
--- a/addons/web/static/src/webclient/user_menu/user_menu.xml
+++ b/addons/web/static/src/webclient/user_menu/user_menu.xml
@@ -2,45 +2,43 @@
 <templates xml:space="preserve">
 
     <t t-name="web.UserMenu">
-        <div class="o_user_menu d-none d-md-block pe-0 bg-inherit">
-            <DropdownGroup group="'web-navbar-group'">
-                <Dropdown>
-                    <button class="py-1 py-lg-0">
-                        <img class="o_avatar o_user_avatar rounded" t-att-src="source" alt="User"/>
-                        <small class="oe_topbar_name d-none ms-2 text-start smaller lh-1 text-truncate"  t-att-class="{'d-lg-inline-block' : env.debug}" style="max-width: 200px">
-                            <t t-esc="userName"/>
-                            <mark class="d-block font-monospace text-truncate">
-                                <i class="fa fa-database oi-small me-1"/><t t-esc="dbName"/>
-                            </mark>
-                        </small>
-                    </button>
-                    <t t-set-slot="content">
-                        <t t-foreach="getElements()" t-as="element" t-key="element_index">
-                            <t t-if="!element.hide">
-                                <t t-if="element.type === 'component'" t-component="element.contentComponent"/>
-                                <DropdownItem
-                                    t-if="element.type == 'item' || element.type == 'switch'"
-                                    attrs="{ href: element.href, 'data-menu': element.id }"
-                                    onSelected="element.callback"
+        <DropdownGroup group="'web-navbar-group'">
+            <Dropdown>
+                <button class="o_user_menu d-none d-md-flex py-1 py-lg-0">
+                    <img class="o_avatar o_user_avatar rounded" t-att-src="source" alt="User"/>
+                    <small class="oe_topbar_name d-none ms-2 text-start smaller lh-1 text-truncate"  t-att-class="{'d-lg-inline-block' : env.debug}" style="max-width: 200px">
+                        <t t-esc="userName"/>
+                        <mark class="d-block font-monospace text-truncate">
+                            <i class="fa fa-database oi-small me-1"/><t t-esc="dbName"/>
+                        </mark>
+                    </small>
+                </button>
+                <t t-set-slot="content">
+                    <t t-foreach="getElements()" t-as="element" t-key="element_index">
+                        <t t-if="!element.hide">
+                            <t t-if="element.type === 'component'" t-component="element.contentComponent"/>
+                            <DropdownItem
+                                t-if="element.type == 'item' || element.type == 'switch'"
+                                attrs="{ href: element.href, 'data-menu': element.id }"
+                                onSelected="element.callback"
+                            >
+                            <div class="d-flex justify-content-between p-0 w-100">
+                                <t t-out="element.description"/>
+                                <CheckBox
+                                    t-if="element.type == 'switch'"
+                                    value="element.isChecked"
+                                    className="'form-switch ms-2'"
+                                    onChange="element.callback"
                                 >
-                                <div class="d-flex justify-content-between p-0 w-100">
-                                    <t t-out="element.description"/>
-                                    <CheckBox
-                                        t-if="element.type == 'switch'"
-                                        value="element.isChecked"
-                                        className="'form-switch ms-2'"
-                                        onChange="element.callback"
-                                    >
-                                    </CheckBox>
-                                </div>
-                                </DropdownItem>
-                                <div t-if="element.type == 'separator'" role="separator" class="dropdown-divider"/>
-                            </t>
+                                </CheckBox>
+                            </div>
+                            </DropdownItem>
+                            <div t-if="element.type == 'separator'" role="separator" class="dropdown-divider"/>
                         </t>
                     </t>
-                </Dropdown>
-            </DropdownGroup>
-        </div>
+                </t>
+            </Dropdown>
+        </DropdownGroup>
     </t>
 
-</templates>
\ No newline at end of file
+</templates>
diff --git a/addons/web/static/tests/tours/user_switch_tour.js b/addons/web/static/tests/tours/user_switch_tour.js
index 10cb59c883c86..81ec2d5ace497 100644
--- a/addons/web/static/tests/tours/user_switch_tour.js
+++ b/addons/web/static/tests/tours/user_switch_tour.js
@@ -20,7 +20,7 @@ function logout() {
         },
         {
             content: "check we're logged in",
-            trigger: ".o_user_menu .dropdown-toggle",
+            trigger: ".o_user_menu",
             run: "click",
         },
         {
diff --git a/addons/web/static/tests/webclient/switch_company_menu.test.js b/addons/web/static/tests/webclient/switch_company_menu.test.js
index 0b8ccb3f1a817..052f15e3288c4 100644
--- a/addons/web/static/tests/webclient/switch_company_menu.test.js
+++ b/addons/web/static/tests/webclient/switch_company_menu.test.js
@@ -52,8 +52,8 @@ beforeEach(() => {
 test("basic rendering", async () => {
     await createSwitchCompanyMenu();
 
-    expect("div.o_switch_company_menu").toHaveCount(1);
-    expect("div.o_switch_company_menu").toHaveText("Hermit");
+    expect("button.o_switch_company_menu").toHaveCount(1);
+    expect("button.o_switch_company_menu").toHaveText("Hermit");
 
     await openCompanyMenu();
 
diff --git a/addons/website/static/src/client_actions/website_preview/publish_website_systray_item.js b/addons/website/static/src/client_actions/website_preview/publish_website_systray_item.js
index a41484be332b8..f1e3ab862b674 100644
--- a/addons/website/static/src/client_actions/website_preview/publish_website_systray_item.js
+++ b/addons/website/static/src/client_actions/website_preview/publish_website_systray_item.js
@@ -12,8 +12,8 @@ const websiteSystrayRegistry = registry.category("website_systray");
 export class PublishSystrayItem extends Component {
     static template = xml`
         <div t-on-click="publishContent" class="o_menu_systray_item o_website_publish_container d-flex ms-auto" t-att-data-processing="state.processing and 1">
-            <a href="#" class="d-flex align-items-center mx-1 px-2 px-md-0" data-hotkey="p">
-                <span class="o_nav_entry d-none d-md-block mx-0 pe-1" t-esc="this.label"/>
+            <a href="#" class="o_nav_entry d-flex align-items-center mx-1" data-hotkey="p">
+                <span class="d-none d-md-block mx-0 pe-1" t-esc="this.label"/>
                 <CheckBox value="state.published" className="'form-switch d-flex justify-content-center m-0 pe-none'"/>
             </a>
         </div>`;
diff --git a/addons/website/static/src/components/navbar/navbar.scss b/addons/website/static/src/components/navbar/navbar.scss
index 66504d58b03d7..84c56f9958a42 100644
--- a/addons/website/static/src/components/navbar/navbar.scss
+++ b/addons/website/static/src/components/navbar/navbar.scss
@@ -4,13 +4,12 @@
     --NavBar-separator-margin-v: 10px; // equal to $o-navbar-padding-v in web_enterprise
     --border-color: #{darken($primary, 10%)};
 
+    .o_nav_entry,
+    .o_menu_systray_item > a,
+    .o_menu_systray_item > button,
     .o_user_menu {
-        margin: -$o-navbar-padding-v 0;
-        border-right: $border-width solid var(--border-color);
-        padding: $o-navbar-padding-v 0;
-    }
+        --NavBar-entry-borderColor-active: transparent;
 
-    .o_nav_entry, .o_menu_systray_item > a, .o_menu_systray_item > button {
         height: auto;
         margin-top: -$o-navbar-padding-v;
         margin-bottom: -$o-navbar-padding-v;
diff --git a/odoo/addons/test_main_flows/static/tests/tours/switch_company_access_error_tour.js b/odoo/addons/test_main_flows/static/tests/tours/switch_company_access_error_tour.js
index 6bb25a66c5b53..66c02602211e1 100644
--- a/odoo/addons/test_main_flows/static/tests/tours/switch_company_access_error_tour.js
+++ b/odoo/addons/test_main_flows/static/tests/tours/switch_company_access_error_tour.js
@@ -22,7 +22,7 @@ registry.category("web_tour.tours").add("test_company_switch_access_error", {
             trigger: ".o_form_view .o_last_breadcrumb_item:contains(p2)",
         },
         {
-            trigger: ".o_switch_company_menu button",
+            trigger: ".o_switch_company_menu",
             run: "click",
         },
         {
diff --git a/odoo/addons/test_main_flows/static/tests/tours/test_company_access_error_redirect_tour.js b/odoo/addons/test_main_flows/static/tests/tours/test_company_access_error_redirect_tour.js
index 6ede005b34567..900318b01b20a 100644
--- a/odoo/addons/test_main_flows/static/tests/tours/test_company_access_error_redirect_tour.js
+++ b/odoo/addons/test_main_flows/static/tests/tours/test_company_access_error_redirect_tour.js
@@ -17,7 +17,7 @@ registry.category("web_tour.tours").add("test_company_access_error_redirect", {
             trigger: ".o_form_view .o_last_breadcrumb_item:contains(p2)",
         },
         {
-            trigger: ".o_switch_company_menu button",
+            trigger: ".o_switch_company_menu",
             run: "click",
         },
         {

From 79b369a4e01ebfab3a5533f6ec6ce0ec00e5d2fe Mon Sep 17 00:00:00 2001
From: Shrey Mehta <shrm@odoo.com>
Date: Fri, 3 Oct 2025 16:22:54 +0530
Subject: [PATCH 190/673] [IMP] (website_)payment, sale: move onboarding logic
 to res.company

The onboarding logic was originally implemented in `res.config.settings`, but
this transient model does not support all onboarding entry points. Specifically,
when the 'Activate <provider>' button was used in frontend payment forms, such
as the portal or checkout, the transient settings record could not be relied
upon. To work around this limitation, a temporary settings record had to be
generated from a QWeb template, which added unnecessary complexity and risk
of errors.

To resolve this issue, the onboarding logic is moved to `res.company`. The
company record is persistent and accessible in both backend and frontend
contexts. As a result, the 'Activate <provider>' button now reliably triggers
the onboarding process in all scenarios, without requiring temporary records.

task-5081953

closes odoo/odoo#229877

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 .../payment/data/ir_actions_server_data.xml   |  2 +-
 addons/payment/models/res_company.py          | 57 ++++++++++++++++++-
 .../payment/views/payment_form_templates.xml  |  2 +-
 addons/payment/wizards/res_config_settings.py | 52 +----------------
 addons/sale/wizard/res_config_settings.py     |  2 +-
 .../models/res_config_settings.py             |  2 +-
 6 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/addons/payment/data/ir_actions_server_data.xml b/addons/payment/data/ir_actions_server_data.xml
index 9d162cd0861f8..0d960d45347b3 100644
--- a/addons/payment/data/ir_actions_server_data.xml
+++ b/addons/payment/data/ir_actions_server_data.xml
@@ -6,7 +6,7 @@
         <field name="model_id" ref="payment.model_payment_provider"/>
         <field name="state">code</field>
         <field name="code">
-action = env['res.config.settings'].sudo().create({})._start_payment_onboarding()
+action = env.company._start_payment_onboarding()
         </field>
     </record>
 
diff --git a/addons/payment/models/res_company.py b/addons/payment/models/res_company.py
index 6b63cac4faa9d..b45a1baee6262 100644
--- a/addons/payment/models/res_company.py
+++ b/addons/payment/models/res_company.py
@@ -1,11 +1,33 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import api, models
+from odoo import api, fields, models
 
 
 class ResCompany(models.Model):
     _inherit = 'res.company'
 
+    onboarding_payment_module = fields.Selection(
+        string="Onboarding Payment Module",
+        selection=[
+            ('mercado_pago', "Mercado Pago"),
+            ('razorpay', "Razorpay"),
+            ('stripe', "Stripe"),
+        ],
+        compute='_compute_onboarding_payment_module',
+    )
+
+    @api.depends('currency_id', 'country_id')
+    def _compute_onboarding_payment_module(self):
+        for company in self:
+            if company.currency_id.name == 'INR':
+                company.onboarding_payment_module = 'razorpay'
+            elif company.country_id.is_stripe_supported_country:
+                company.onboarding_payment_module = 'stripe'
+            elif company.country_id.is_mercado_pago_supported_country:
+                company.onboarding_payment_module = 'mercado_pago'
+            else:
+                company.onboarding_payment_module = None
+
     @api.model_create_multi
     def create(self, vals_list):
         companies = super().create(vals_list)
@@ -22,3 +44,36 @@ def create(self, vals_list):
                 provider_sudo.copy({'company_id': company.id})
 
         return companies
+
+    def _start_payment_onboarding(self, menu_id=None):
+        """Install the onboarding module, configure the provider and run the onboarding action.
+
+        Note: `self.ensure_one()`
+
+        :param int menu_id: The menu from which the onboarding is started, as an `ir.ui.menu` id.
+        :return: The action returned by `action_start_onboarding`.
+        :rtype: dict
+        """
+        self.ensure_one()
+        if not self.onboarding_payment_module:
+            return False
+
+        # Install the onboarding module if needed.
+        onboarding_module = self.env['ir.module.module'].sudo().search(
+            [('name', '=', f'payment_{self.onboarding_payment_module}')]
+        )  # In sudo mode to search the onboarding module
+        onboarding_module.filtered(lambda m: m.state == 'uninstalled').button_immediate_install()
+
+        # Create a new env including the freshly installed module.
+        new_env = api.Environment(self.env.cr, self.env.uid, self.env.context)
+
+        # Configure the provider.
+        provider_code = self.onboarding_payment_module
+        provider = new_env['payment.provider'].search([
+            ('code', '=', provider_code),
+            *self.env['payment.provider']._check_company_domain(self),
+        ], limit=1)
+        if not provider:
+            return False
+
+        return provider.action_start_onboarding(menu_id=menu_id)
diff --git a/addons/payment/views/payment_form_templates.xml b/addons/payment/views/payment_form_templates.xml
index ed7107b71fc27..49b9f519708dd 100644
--- a/addons/payment/views/payment_form_templates.xml
+++ b/addons/payment/views/payment_form_templates.xml
@@ -417,7 +417,7 @@
                 </p>
                 <t
                     t-set="onboarding_provider"
-                    t-value="request.env['res.config.settings'].sudo().new({}).onboarding_payment_module"
+                    t-value="request.env.company.onboarding_payment_module"
                 />
                 <a
                     t-if="onboarding_provider and not providers_sudo"
diff --git a/addons/payment/wizards/res_config_settings.py b/addons/payment/wizards/res_config_settings.py
index bd7b9d70a6fc6..e97e813354faa 100644
--- a/addons/payment/wizards/res_config_settings.py
+++ b/addons/payment/wizards/res_config_settings.py
@@ -15,15 +15,7 @@ class ResConfigSettings(models.TransientModel):
     has_enabled_provider = fields.Boolean(
         string="Has Enabled Provider", compute='_compute_has_enabled_provider'
     )
-    onboarding_payment_module = fields.Selection(
-        string="Onboarding Payment Module",
-        selection=[
-            ('mercado_pago', "Mercado Pago"),
-            ('razorpay', "Razorpay"),
-            ('stripe', "Stripe"),
-        ],
-        compute='_compute_onboarding_payment_module',
-    )
+    onboarding_payment_module = fields.Selection(related='company_id.onboarding_payment_module')
 
     # === COMPUTE METHODS === #
 
@@ -59,18 +51,6 @@ def _get_active_providers_domain(self, enabled_only=False):
         else:
             return company_domain & Domain('state', '!=', 'disabled')
 
-    @api.depends('company_id.currency_id', 'company_id.country_id.is_stripe_supported_country')
-    def _compute_onboarding_payment_module(self):
-        for config in self:
-            if config.company_id.currency_id.name == 'INR':
-                config.onboarding_payment_module = 'razorpay'
-            elif config.company_id.country_id.is_stripe_supported_country:
-                config.onboarding_payment_module = 'stripe'
-            elif config.company_id.country_id.is_mercado_pago_supported_country:
-                config.onboarding_payment_module = 'mercado_pago'
-            else:
-                config.onboarding_payment_module = None
-
     # === ACTION METHODS === #
 
     def action_view_active_provider(self):
@@ -82,33 +62,3 @@ def action_view_active_provider(self):
             'views': [[False, 'form']],
             'res_id': provider.id,
         }
-
-    def _start_payment_onboarding(self, menu_id=None):
-        """Install the onboarding module, configure the provider and run the onboarding action.
-
-        :param int menu_id: The menu from which the onboarding is started, as an `ir.ui.menu` id.
-        :return: The action returned by `action_start_onboarding`.
-        :rtype: dict
-        """
-        self.ensure_one()
-        if not self.onboarding_payment_module:
-            return False
-
-        # Install the onboarding module if needed.
-        onboarding_module = self.env['ir.module.module'].search(
-            [('name', '=', f'payment_{self.onboarding_payment_module}')]
-        )
-        self._install_modules(onboarding_module)
-        # Create a new env including the freshly installed module.
-        new_env = api.Environment(self.env.cr, self.env.uid, self.env.context)
-
-        # Configure the provider.
-        provider_code = self.onboarding_payment_module
-        provider = new_env['payment.provider'].search([
-            ('code', '=', provider_code),
-            *self.env['payment.provider']._check_company_domain(self.env.company),
-        ], limit=1)
-        if not provider:
-            return False
-
-        return provider.action_start_onboarding(menu_id=menu_id)
diff --git a/addons/sale/wizard/res_config_settings.py b/addons/sale/wizard/res_config_settings.py
index c84d75f808aa6..a3d7d2b58b085 100644
--- a/addons/sale/wizard/res_config_settings.py
+++ b/addons/sale/wizard/res_config_settings.py
@@ -130,4 +130,4 @@ def set_values(self):
     # Unique name to avoid colliding with `website_payment`.
     def action_sale_start_payment_onboarding(self):
         menu = self.env.ref('sale.menu_sale_general_settings', raise_if_not_found=False)
-        return self._start_payment_onboarding(menu and menu.id)
+        return self.company_id._start_payment_onboarding(menu and menu.id)
diff --git a/addons/website_payment/models/res_config_settings.py b/addons/website_payment/models/res_config_settings.py
index 2861c46bd596b..1e57f146faed0 100644
--- a/addons/website_payment/models/res_config_settings.py
+++ b/addons/website_payment/models/res_config_settings.py
@@ -30,4 +30,4 @@ def _get_active_providers_domain(self, *args, **kwargs):
     # Unique name to avoid colliding with `sale`.
     def action_w_payment_start_payment_onboarding(self):
         menu = self.env.ref('website.menu_website_website_settings', raise_if_not_found=False)
-        return self._start_payment_onboarding(menu and menu.id)
+        return self.company_id._start_payment_onboarding(menu and menu.id)

From 84fed7968447f98ff2c1113f051662f2fe121656 Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Wed, 15 Oct 2025 17:38:27 +0200
Subject: [PATCH 191/673] [REM] iot_base: merge iot_base with iot

As it was decided to move all IoT related code to Enterprise,
this commit merges back `iot_base` into `iot`.

odoo/enterprise#97288

closes odoo/odoo#231746

Related: odoo/upgrade#8639
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 addons/iot_base/__init__.py                   |   0
 addons/iot_base/__manifest__.py               |  23 --
 addons/iot_base/i18n/iot_base.pot             |  28 ---
 addons/iot_base/i18n/zh_TW.po                 |  32 ---
 .../iot_base/static/src/@types/services.d.ts  |   7 -
 .../iot_base/static/src/device_controller.js  |  40 ---
 .../iot_base/static/src/network_utils/http.js |  39 ---
 .../static/src/network_utils/longpolling.js   | 229 ------------------
 addons/point_of_sale/__manifest__.py          |   6 +-
 .../static/src/app/services/pos_store.js      |   3 -
 10 files changed, 1 insertion(+), 406 deletions(-)
 delete mode 100644 addons/iot_base/__init__.py
 delete mode 100644 addons/iot_base/__manifest__.py
 delete mode 100644 addons/iot_base/i18n/iot_base.pot
 delete mode 100644 addons/iot_base/i18n/zh_TW.po
 delete mode 100644 addons/iot_base/static/src/@types/services.d.ts
 delete mode 100644 addons/iot_base/static/src/device_controller.js
 delete mode 100644 addons/iot_base/static/src/network_utils/http.js
 delete mode 100644 addons/iot_base/static/src/network_utils/longpolling.js

diff --git a/addons/iot_base/__init__.py b/addons/iot_base/__init__.py
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/addons/iot_base/__manifest__.py b/addons/iot_base/__manifest__.py
deleted file mode 100644
index 65020ce0751ea..0000000000000
--- a/addons/iot_base/__manifest__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-
-{
-    'name': 'IoT Base',
-    'version': '1.0',
-    'category': 'Hidden',
-    'description': """
-Base tools required by all IoT related modules.
-===============================================
-""",
-    'depends': ['web'],
-    'installable': True,
-    'author': 'Odoo S.A.',
-    'license': 'LGPL-3',
-    'assets': {
-        'web.assets_backend': [
-            'iot_base/static/src/network_utils/*',
-            'iot_base/static/src/device_controller.js',
-        ],
-    },
-}
diff --git a/addons/iot_base/i18n/iot_base.pot b/addons/iot_base/i18n/iot_base.pot
deleted file mode 100644
index ba6846c984744..0000000000000
--- a/addons/iot_base/i18n/iot_base.pot
+++ /dev/null
@@ -1,28 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* iot_base
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 19.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-11 13:57+0000\n"
-"PO-Revision-Date: 2025-09-11 13:57+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: iot_base
-#. odoo-javascript
-#: code:addons/iot_base/static/src/network_utils/longpolling.js:0
-msgid "Connection to IoT Box failed"
-msgstr ""
-
-#. module: iot_base
-#. odoo-javascript
-#: code:addons/iot_base/static/src/network_utils/longpolling.js:0
-msgid "Failed to reach IoT Box at %s"
-msgstr ""
diff --git a/addons/iot_base/i18n/zh_TW.po b/addons/iot_base/i18n/zh_TW.po
deleted file mode 100644
index a4ad3b2cc9b92..0000000000000
--- a/addons/iot_base/i18n/zh_TW.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* iot_base
-# 
-# Translators:
-# Wil Odoo, 2025
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~18.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-09 20:36+0000\n"
-"PO-Revision-Date: 2025-05-17 15:02+0000\n"
-"Last-Translator: Wil Odoo, 2025\n"
-"Language-Team: Chinese (Taiwan) (https://app.transifex.com/odoo/teams/41243/zh_TW/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#. module: iot_base
-#. odoo-javascript
-#: code:addons/iot_base/static/src/network_utils/longpolling.js:0
-msgid "Connection to IoT Box failed"
-msgstr "連接到IoT Box失敗"
-
-#. module: iot_base
-#. odoo-javascript
-#: code:addons/iot_base/static/src/network_utils/longpolling.js:0
-msgid "Failed to reach IoT Box at %s"
-msgstr ""
diff --git a/addons/iot_base/static/src/@types/services.d.ts b/addons/iot_base/static/src/@types/services.d.ts
deleted file mode 100644
index 901e489807fc2..0000000000000
--- a/addons/iot_base/static/src/@types/services.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare module "services" {
-    import { iotLongpollingService } from "@iot_base/network_utils/longpolling";
-
-    export interface Services {
-        iot_longpolling: typeof iotLongpollingService
-    }
-}
diff --git a/addons/iot_base/static/src/device_controller.js b/addons/iot_base/static/src/device_controller.js
deleted file mode 100644
index 6724abac2df71..0000000000000
--- a/addons/iot_base/static/src/device_controller.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { uniqueId } from "@web/core/utils/functions";
-
-/**
- * Used to communicate to the iot devices.
- */
-export class DeviceController {
-    /**
-     * @param {import("@iot_base/network_utils/longpolling").IoTLongpolling} iotLongpolling
-     * @param {{ iot_ip: string, identifier: string, iot_id: Object, manual_measurement: string }} deviceInfo - Representation of an iot device
-     */
-    constructor(iotLongpolling, deviceInfo) {
-        this.id = uniqueId('listener-');
-        this.iotIp = deviceInfo.iot_ip;
-        this.identifier = deviceInfo.identifier;
-        this.iotId = deviceInfo.iot_id?.id; // if class is instantiated without providing the full device record, iot_id will be undefined
-        this.manual_measurement = deviceInfo.manual_measurement;
-        this.iotLongpolling = iotLongpolling;
-    }
-
-    /**
-     * Send an action to the device.
-     * @param data - action to send to the device
-     * @param fallback - if true, no notification will be displayed on fail
-     */
-    action(data, fallback = false) {
-        return this.iotLongpolling.action(this.iotIp, this.identifier, data, fallback);
-    }
-
-    /**
-     * Add a listener to the device.
-     * @param callback - function to call when the listener is triggered
-     * @param fallback - if true, no notification will be displayed on fail
-     */
-    addListener(callback, fallback = true) {
-        return this.iotLongpolling.addListener(this.iotIp, [this.identifier], this.id, callback, fallback);
-    }
-    removeListener() {
-        return this.iotLongpolling.removeListener(this.iotIp, this.identifier, this.id);
-    }
-}
diff --git a/addons/iot_base/static/src/network_utils/http.js b/addons/iot_base/static/src/network_utils/http.js
deleted file mode 100644
index f0d70eda653e2..0000000000000
--- a/addons/iot_base/static/src/network_utils/http.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { browser } from "@web/core/browser/browser";
-
-/**
- * Format the endpoint to send the request to
- * Used to ensure the request is sent with the same protocol as the current page
- * (e.g. if the current page is HTTPS, the request will be sent to the IoT Box using HTTPS)
- * @param ip IP Address of the IoT Box
- * @param route Route to send the request to
- * @returns {string} The formatted endpoint
- */
-export function formatEndpoint(ip, route) {
-    const url = new URL(window.location.href);
-    url.search = "";
-    url.hostname = ip;
-    url.pathname = route;
-    if (url.port) url.port = "8069";
-    return url.toString();
-}
-
-/**
- * Send a POST request to the IoT Box
- * @param ip IP Address of the IoT Box
- * @param route Endpoint to send the request to
- * @param params Parameters to send with the request (optional)
- * @param timeout Time before the request times out (default: 6000ms)
- * @param headers HTTP headers to send with the request (optional)
- * @returns {Promise<any>}
- */
-export async function post(ip, route, params = {}, timeout = 6000, headers = {}) {
-    const endpoint = formatEndpoint(ip, route);
-    const response = await browser.fetch(endpoint, {
-        body: JSON.stringify({'params': params}),
-        method: "POST",
-        headers: {"Content-Type": "application/json", ...headers},
-        signal: AbortSignal.timeout(timeout),
-    });
-
-    return response.json();
-}
diff --git a/addons/iot_base/static/src/network_utils/longpolling.js b/addons/iot_base/static/src/network_utils/longpolling.js
deleted file mode 100644
index 249c25f7c0811..0000000000000
--- a/addons/iot_base/static/src/network_utils/longpolling.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import { registry } from '@web/core/registry';
-import { post } from '@iot_base/network_utils/http';
-import { uuid } from "@web/core/utils/strings";
-import { _t } from '@web/core/l10n/translation';
-
-export class IoTLongpolling {
-    static serviceDependencies = ["notification", "orm"];
-    actionRoute = '/iot_drivers/action';
-    pollRoute = '/iot_drivers/event';
-
-    rpcDelay = 1500;
-    maxRpcDelay = 15000;
-
-    _retries = 0;
-    _listeners = {};
-
-    constructor() {
-        this.setup(...arguments);
-    }
-
-    /**
-     * Setup in addition to constructor to allow patching
-     */
-    setup({ notification, orm }) {
-        this._session_id = uuid();
-        this._delayedStartPolling(this.rpcDelay);
-        this.notification = notification;
-        this.orm = orm;
-    }
-
-    /**
-     * Add a device_identifier to listeners[iot_ip] and restart polling
-     *
-     * @param {string} iot_ip
-     * @param {Array} devices list of devices
-     * @param {string} listener_id
-     * @param {boolean} fallback if true, no notification will be displayed on fail
-     * @param {Callback} callback
-     */
-    async addListener(iot_ip, devices, listener_id, callback, fallback = true) {
-        if (!this._listeners[iot_ip]) {
-            this._listeners[iot_ip] = {
-                last_event: 0,
-                devices: {},
-                session_id: this._session_id,
-                rpc: false,
-            };
-        }
-        for (const device of devices) {
-            this._listeners[iot_ip].devices[device] = {
-                listener_id: listener_id,
-                device_identifier: device,
-                callback: callback,
-            };
-        }
-        this.stopPolling(iot_ip);
-        this.startPolling(iot_ip, fallback);
-    }
-
-    /**
-     * Stop listening to iot device with id `device_identifier`
-     * @param {string} iot_ip
-     * @param {string} device_identifier
-     * @param {string} listener_id
-     */
-    removeListener(iot_ip, device_identifier, listener_id) {
-        const device = this._listeners[iot_ip].devices[device_identifier];
-        if (device && device.listener_id === listener_id) {
-            delete this._listeners[iot_ip].devices[device_identifier];
-        }
-    }
-
-    /**
-     * Execute an action on device_identifier
-     * Action depends on the driver that supports the device
-     *
-     * @param {string} iot_ip
-     * @param {string} device_identifier
-     * @param {Object} data contains the information needed to perform an action on this device_identifier
-     * @param {boolean} fallback if true, no notification will be displayed on fail
-     * @param {string} route endpoint to call on the IoT Box (default: /iot_drivers/action)
-     */
-    action(iot_ip, device_identifier, data, fallback = false, route = null) {
-        this.protocol = window.location.protocol;
-        const body = {
-            session_id: this._session_id,
-            device_identifier: device_identifier,
-            data,
-        };
-        return this._rpcIoT(iot_ip, route || this.actionRoute, body, undefined, fallback);
-    }
-
-    /**
-     * Start a long polling, i.e. it continually opens a long poll
-     * connection as long as it is not stopped (@see `stopPolling`)
-     * @param {string} iot_ip
-     * @param {boolean} fallback if true, no notification will be displayed on fail
-     */
-    startPolling(iot_ip, fallback = true) {
-        if (iot_ip) {
-            if (!this._listeners[iot_ip].rpc) {
-                this._poll(iot_ip, fallback);
-            }
-        } else {
-            const self = this;
-            Object.keys(this._listeners).forEach((ip) => {
-                self.startPolling(ip);
-            });
-        }
-    }
-
-    /**
-     * Stops any started long polling
-     *
-     * Aborts a pending long-poll so that we immediately remove ourselves
-     * from listening on notifications on this channel.
-     */
-    stopPolling(iot_ip) {
-        if (this._listeners[iot_ip].rpc) {
-            this._listeners[iot_ip].rpc.abort();
-            this._listeners[iot_ip].rpc = false;
-        }
-    }
-
-    _delayedStartPolling(delay) {
-        // ``fallback: true`` to avoid error notification on longpolling setup
-        setTimeout(() => this.startPolling(null, true), delay);
-    }
-
-    /**
-     * Execute an RPC to the box
-     * Used to do both polling or action
-     *
-     * @param {string} iot_ip IP of the IoT Box
-     * @param {string} route endpoint to call on the IoT Box
-     * @param {Object} params information needed to perform an action or the listener for the polling
-     * @param {number} timeout time before the request times out (undefined to use default timeout from http.js)
-     * @param {boolean} fallback if true, no notification will be displayed on fail
-     * @param {Object} headers headers to send with the request (optional, allows patching)
-     */
-    async _rpcIoT(iot_ip, route, params, timeout = undefined, fallback = false, headers = undefined) {
-        try {
-            const result = await post(iot_ip, route, params, timeout, headers);
-
-            if (this._listeners[iot_ip] && route === this.pollRoute) {
-                this._listeners[iot_ip].rpc = result;
-                return this._listeners[iot_ip].rpc;
-            } else {
-                return result;
-            }
-        } catch {
-            if (!fallback) {
-                this._doWarnFail(iot_ip);
-            }
-            throw new Error("Longpolling action failed");
-        }
-    }
-
-    /**
-     * Make a poll request to an IoT Box
-     *
-     * @param {string} iot_ip
-     * @param {boolean} fallback if true, no notification will be displayed on fail
-     */
-    _poll(iot_ip, fallback = true) {
-        const listener = this._listeners[iot_ip];
-
-        // The backend has a maximum cycle time of 50 seconds so give +10 seconds
-        this._rpcIoT(iot_ip, this.pollRoute, { listener: listener }, 60000, fallback).then(
-            (result) => {
-                this._retries = 0;
-                this._listeners[iot_ip].rpc = false;
-                const remainingDevices = Object.keys(this._listeners[iot_ip].devices || {});
-                if (result.result) {
-                    if (this._session_id === result.result.session_id) {
-                        this._onSuccess(iot_ip, result.result);
-                    }
-                } else if (remainingDevices.length > 0) {
-                    this._poll(iot_ip);
-                }
-            },
-            (e) => {
-                if (e.name === "TimeoutError") {
-                    this._onError();
-                }
-            }
-        );
-    }
-
-    _onSuccess(iot_ip, result) {
-        this._listeners[iot_ip].last_event = result.time;
-
-        const devices = this._listeners[iot_ip].devices;
-        devices[result.device_identifier]?.callback(result);
-
-        if (Object.keys(devices || {}).length > 0) {
-            this._poll(iot_ip);
-        }
-        this._retries = 0;
-    }
-
-    _onError() {
-        this._retries++;
-        this._delayedStartPolling(Math.min(this.rpcDelay * this._retries, this.maxRpcDelay));
-    }
-
-    /**
-     * This method is needed in _poll.
-     * @param {string} url
-     */
-    _doWarnFail(url) {
-        this.notification.add(
-            _t("Failed to reach IoT Box at %s", url),
-            {
-                title: _t("Connection to IoT Box failed"),
-                type: "danger",
-            }
-        );
-    }
-}
-
-export const iotLongpollingService = {
-    dependencies: IoTLongpolling.serviceDependencies,
-    start(_, deps) {
-        return new IoTLongpolling(deps);
-    },
-};
-
-registry.category('services').add('iot_longpolling', iotLongpollingService);
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index 9dc57bccb68a9..b34369fc43e1f 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -7,7 +7,7 @@
     'category': 'Sales/Point of Sale',
     'sequence': 40,
     'summary': 'Handle checkouts and payments for shops and restaurants.',
-    'depends': ['resource', 'stock_account', 'barcodes', 'html_editor', 'digest', 'phone_validation', 'partner_autocomplete', 'iot_base', 'google_address_autocomplete'],
+    'depends': ['resource', 'stock_account', 'barcodes', 'html_editor', 'digest', 'phone_validation', 'partner_autocomplete', 'google_address_autocomplete'],
     'uninstall_hook': 'uninstall_hook',
     'data': [
         'security/point_of_sale_security.xml',
@@ -133,8 +133,6 @@
             'bus/static/src/multi_tab_shared_worker_service.js',
             'bus/static/src/multi_tab_fallback_service.js',
             'bus/static/src/workers/*',
-            'iot_base/static/src/network_utils/*',
-            'iot_base/static/src/device_controller.js',
         ],
 
         # Main PoS assets, they are loaded in the PoS UI
@@ -206,8 +204,6 @@
             "barcodes/static/tests/legacy/helpers.js",
             "web/static/tests/legacy/helpers/utils.js",
             "web/static/tests/legacy/helpers/cleanup.js",
-            'iot_base/static/src/network_utils/*',
-            'iot_base/static/src/device_controller.js',
         ],
         # Bundle that starts the pos, loaded on /pos/ui
         'point_of_sale.assets_prod': [
diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index 097968280aef9..271a743818991 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -77,7 +77,6 @@ export class PosStore extends WithLazyGetterTrap {
         "alert",
         "pos_router",
         "mail.sound_effects",
-        "iot_longpolling",
     ];
     constructor({ traps, env, deps }) {
         super({ traps });
@@ -102,7 +101,6 @@ export class PosStore extends WithLazyGetterTrap {
             action,
             pos_router,
             alert,
-            iot_longpolling,
         }
     ) {
         this.env = env;
@@ -148,7 +146,6 @@ export class PosStore extends WithLazyGetterTrap {
         };
 
         this.hardwareProxy = hardware_proxy;
-        this.iotLongpolling = iot_longpolling;
         this.selectedOrderUuid = null;
         this.selectedPartner = null;
         this.selectedCategory = null;

From 16680fda0df6e582f5b0f7edd9a4a7be8244b2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 3 Nov 2025 12:31:32 +0100
Subject: [PATCH 192/673] [REF] mail: move Rtc.state props to Rtc + add types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move all properties in `Rtc.state` as immediate attributes of `Rtc`.
Also add proper typing to all these attributes.

closes odoo/odoo#234131

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/embed/common/thread_actions.js |   2 +-
 .../static/src/core/common/settings_model.js  |   2 +-
 .../static/src/discuss/call/common/call.js    |  10 +-
 .../static/src/discuss/call/common/call.xml   |   8 +-
 .../discuss/call/common/call_action_list.js   |   2 +-
 .../src/discuss/call/common/call_actions.js   |  26 +-
 .../discuss/call/common/call_context_menu.js  |   6 +-
 .../discuss/call/common/call_context_menu.xml |   8 +-
 .../call/common/call_participant_card.js      |   6 +-
 .../call/common/call_participant_card.xml     |   6 +-
 .../discuss/call/common/chat_window_patch.xml |   2 +-
 .../src/discuss/call/common/rtc_service.js    | 478 ++++++++++--------
 .../discuss/call/common/thread_model_patch.js |   2 +-
 .../discuss/core/common/channel_invitation.js |   2 +-
 .../core/public_web/discuss_content_patch.xml |   2 +-
 .../discuss_core_public_web_service.js        |   4 +-
 .../src/utils/common/media_monitoring.js      |   5 +-
 .../tours/discuss_channel_call_public_tour.js |   2 +-
 18 files changed, 313 insertions(+), 260 deletions(-)

diff --git a/addons/im_livechat/static/src/embed/common/thread_actions.js b/addons/im_livechat/static/src/embed/common/thread_actions.js
index 452d0db69a00b..8d014b12e7026 100644
--- a/addons/im_livechat/static/src/embed/common/thread_actions.js
+++ b/addons/im_livechat/static/src/embed/common/thread_actions.js
@@ -21,7 +21,7 @@ const callSettingsAction = threadActionsRegistry.get("call-settings");
 patch(callSettingsAction, {
     condition({ channel, store }) {
         return channel?.channel_type === "livechat"
-            ? store.rtc.state.channel?.eq(channel)
+            ? store.rtc.localChannel?.eq(channel)
             : super.condition(...arguments);
     },
 });
diff --git a/addons/mail/static/src/core/common/settings_model.js b/addons/mail/static/src/core/common/settings_model.js
index 6d447a7f398a8..5cb29f23da3c4 100644
--- a/addons/mail/static/src/core/common/settings_model.js
+++ b/addons/mail/static/src/core/common/settings_model.js
@@ -110,7 +110,7 @@ export class Settings extends Record {
             if (!rtc || !this.useBlur) {
                 return false;
             }
-            return this.useBlur && rtc.state?.cameraTrack && !hasHardwareAcceleration();
+            return this.useBlur && rtc.cameraTrack && !hasHardwareAcceleration();
         },
     });
     cameraFacingMode = undefined;
diff --git a/addons/mail/static/src/discuss/call/common/call.js b/addons/mail/static/src/discuss/call/common/call.js
index 764eacc0e9e97..f2fb5a0485629 100644
--- a/addons/mail/static/src/discuss/call/common/call.js
+++ b/addons/mail/static/src/discuss/call/common/call.js
@@ -87,7 +87,7 @@ export class Call extends Component {
     }
 
     get isFullSize() {
-        return this.props.isPip || this.rtc.state.isFullscreen;
+        return this.props.isPip || this.rtc.isFullscreen;
     }
 
     get isActiveCall() {
@@ -95,7 +95,7 @@ export class Call extends Component {
     }
 
     get minimized() {
-        if (this.rtc.state.isFullscreen || !this.channel || this.channel.activeRtcSession) {
+        if (this.rtc.isFullscreen || !this.channel || this.channel.activeRtcSession) {
             return false;
         }
         if (!this.isActiveCall || this.channel.videoCount === 0 || this.props.compact) {
@@ -152,7 +152,7 @@ export class Call extends Component {
 
     get hasCallNotifications() {
         return Boolean(
-            (!this.props.compact || this.rtc.state.isFullscreen) &&
+            (!this.props.compact || this.rtc.isFullscreen) &&
                 this.isActiveCall &&
                 this.rtc.notifications.size
         );
@@ -162,12 +162,12 @@ export class Call extends Component {
         return Boolean(
             this.channel.activeRtcSession &&
                 this.state.overlay &&
-                (!this.props.compact || this.rtc.state.isFullscreen)
+                (!this.props.compact || this.rtc.isFullscreen)
         );
     }
 
     get isControllerFloating() {
-        return this.rtc.state.isFullscreen || (this.channel.activeRtcSession && !this.ui.isSmall);
+        return this.rtc.isFullscreen || (this.channel.activeRtcSession && !this.ui.isSmall);
     }
 
     onMouseleaveMain(ev) {
diff --git a/addons/mail/static/src/discuss/call/common/call.xml b/addons/mail/static/src/discuss/call/common/call.xml
index b5634ac81edea..7480d749d7ca2 100644
--- a/addons/mail/static/src/discuss/call/common/call.xml
+++ b/addons/mail/static/src/discuss/call/common/call.xml
@@ -7,8 +7,8 @@
             'o-fullSize': isFullSize,
             'o-compact': props.compact and !isMobileOs,
             'o-minimized': minimized,
-            'position-relative o-mx-0_5 o-mt-0_5 p-1': !rtc.state.isFullscreen and !props.isPip,
-            'rounded-2': !rtc.state.isFullscreen and !props.isPip and isActiveCall,
+            'position-relative o-mx-0_5 o-mt-0_5 p-1': !rtc.isFullscreen and !props.isPip,
+            'rounded-2': !rtc.isFullscreen and !props.isPip and isActiveCall,
             'o-hasVideo': channel.videoCount > 0,
             'o-selfInCall': isActiveCall,
             'border-bottom': !isActiveCall,
@@ -50,8 +50,8 @@
                         <CallActionList thread="channel.thread" compact="props.compact or props.isPip"/>
                     </div>
                 </div>
-                <div t-if="hasCallNotifications" class="position-absolute d-flex flex-column-reverse start-0 bottom-0" t-att-class="{ 'ps-5 pb-5': rtc.state.isFullscreen, 'ps-2 pb-2': !rtc.state.isFullscreen }">
-                    <span class="o-discuss-Call-notification text-bg-800 shadow-lg rounded-1 m-1" t-att-class="{ 'p-4 fs-4': rtc.state.isFullscreen, 'p-2': !rtc.state.isFullscreen }" t-foreach="rtc.notifications.values()" t-as="notification" t-key="notification.id" t-esc="notification.text"/>
+                <div t-if="hasCallNotifications" class="position-absolute d-flex flex-column-reverse start-0 bottom-0" t-att-class="{ 'ps-5 pb-5': rtc.isFullscreen, 'ps-2 pb-2': !rtc.isFullscreen }">
+                    <span class="o-discuss-Call-notification text-bg-800 shadow-lg rounded-1 m-1" t-att-class="{ 'p-4 fs-4': rtc.isFullscreen, 'p-2': !rtc.isFullscreen }" t-foreach="rtc.notifications.values()" t-as="notification" t-key="notification.id" t-esc="notification.text"/>
                 </div>
                 <div class="o-discuss-Call-layoutActions position-absolute bottom-0 end-0">
                     <ActionList actions="layoutActions" inline="true"/>
diff --git a/addons/mail/static/src/discuss/call/common/call_action_list.js b/addons/mail/static/src/discuss/call/common/call_action_list.js
index 470190b901854..9626b5e09ee19 100644
--- a/addons/mail/static/src/discuss/call/common/call_action_list.js
+++ b/addons/mail/static/src/discuss/call/common/call_action_list.js
@@ -66,7 +66,7 @@ export class CallActionList extends Component {
     }
 
     get isSmall() {
-        return Boolean(this.props.compact && this.rtc.state.isFullscreen);
+        return Boolean(this.props.compact && this.rtc.isFullscreen);
     }
 
     get isMobileOS() {
diff --git a/addons/mail/static/src/discuss/call/common/call_actions.js b/addons/mail/static/src/discuss/call/common/call_actions.js
index 743b345d312e7..e3171f1e30409 100644
--- a/addons/mail/static/src/discuss/call/common/call_actions.js
+++ b/addons/mail/static/src/discuss/call/common/call_actions.js
@@ -180,11 +180,11 @@ registerCallAction("fullscreen", {
             ),
         }),
     condition: ({ channel, store }) => channel?.eq(store.rtc?.channel),
-    name: ({ store }) => (store.rtc.state.isFullscreen ? _t("Exit Fullscreen") : _t("Fullscreen")),
-    isActive: ({ store }) => store.rtc.state.isFullscreen,
+    name: ({ store }) => (store.rtc.isFullscreen ? _t("Exit Fullscreen") : _t("Fullscreen")),
+    isActive: ({ store }) => store.rtc.isFullscreen,
     icon: ({ action }) => (action.isActive ? "fa fa-compress" : "fa fa-expand"),
     onSelected: ({ store }) => {
-        if (store.rtc.state.isFullscreen) {
+        if (store.rtc.isFullscreen) {
             store.rtc.exitFullscreen();
         } else {
             store.rtc.closePip();
@@ -201,11 +201,11 @@ registerCallAction("picture-in-picture", {
         !store.env?.isSmall,
     disabledCondition: ({ store }) => store.rtc?.isRemote,
     name: ({ store }) =>
-        store.rtc?.state.isPipMode ? _t("Exit Picture in Picture") : _t("Picture in Picture"),
-    isActive: ({ store }) => store.rtc?.state.isPipMode,
+        store.rtc?.isPipMode ? _t("Exit Picture in Picture") : _t("Picture in Picture"),
+    isActive: ({ store }) => store.rtc?.isPipMode,
     icon: "oi oi-launch",
     onSelected: ({ owner, store }) => {
-        const isPipMode = store.rtc?.state.isPipMode;
+        const isPipMode = store.rtc?.isPipMode;
         if (isPipMode) {
             store.rtc.closePip();
         } else {
@@ -219,7 +219,7 @@ export const acceptWithCamera = {
     condition: ({ thread }) =>
         thread?.self_member_id?.rtc_inviting_session_id?.is_camera_on &&
         typeof thread?.useCameraByDefault !== "boolean",
-    disabledCondition: ({ store }) => store.rtc?.state.hasPendingRequest,
+    disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     name: _t("Accept with camera"),
     icon: "fa fa-video-camera",
     onSelected: ({ channel, store }) => store.rtc.toggleCall(channel, { camera: true }),
@@ -236,7 +236,7 @@ registerCallAction("join-back", {
         }),
     condition: ({ channel, store }) =>
         !channel?.eq(store.rtc?.channel) && typeof channel?.useCameraByDefault === "boolean",
-    disabledCondition: ({ store }) => store.rtc?.state.hasPendingRequest,
+    disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     icon: ({ thread }) => (thread.useCameraByDefault ? "fa fa-video-camera" : "fa fa-phone"),
     inlineName: ({ owner }) => (owner.env.inCallInvitation ? undefined : _t("Join")),
     name: ({ thread }) => (thread.useCameraByDefault ? _t("Join Video Call") : _t("Join Call")),
@@ -252,7 +252,7 @@ registerCallAction("join-with-camera", {
         !channel?.eq(store.rtc?.channel) &&
         !channel?.self_member_id?.rtc_inviting_session_id &&
         typeof channel?.useCameraByDefault !== "boolean",
-    disabledCondition: ({ store }) => store.rtc?.state.hasPendingRequest,
+    disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     name: _t("Join Video Call"),
     icon: "fa fa-video-camera",
     onSelected: ({ channel, store }) => store.rtc.toggleCall(channel, { camera: true }),
@@ -263,7 +263,7 @@ registerCallAction("join-with-camera", {
 export const joinAction = {
     condition: ({ channel, store }) =>
         !channel?.eq(store.rtc?.channel) && typeof channel?.useCameraByDefault !== "boolean",
-    disabledCondition: ({ store }) => store.rtc?.state.hasPendingRequest,
+    disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     name: _t("Join Call"),
     icon: "fa fa-phone",
     onSelected: ({ channel, store }) => store.rtc.toggleCall(channel),
@@ -279,7 +279,7 @@ export const rejectAction = {
             "mx-1": !owner.env.inCallInvitation && typeof thread?.useCameraByDefault === "boolean",
         }),
     condition: ({ thread }) => thread?.self_member_id?.rtc_inviting_session_id,
-    disabledCondition: ({ store }) => store.rtc?.state.hasPendingRequest,
+    disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     icon: "oi oi-close",
     inlineName: ({ owner, thread }) =>
         !owner.env.inCallInvitation && typeof thread?.useCameraByDefault === "boolean"
@@ -287,7 +287,7 @@ export const rejectAction = {
             : undefined,
     name: _t("Reject"),
     onSelected: ({ channel, store }) => {
-        if (store.rtc.state.hasPendingRequest) {
+        if (store.rtc.hasPendingRequest) {
             return;
         }
         store.rtc.leaveCall(channel);
@@ -300,7 +300,7 @@ registerCallAction("reject", rejectAction);
 registerCallAction("disconnect", {
     condition: ({ channel, store }) =>
         channel?.eq(store.rtc?.channel) && !channel?.self_member_id?.rtc_inviting_session_id,
-    disabledCondition: ({ store }) => store.rtc?.state.hasPendingRequest,
+    disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     name: _t("Disconnect"),
     icon: "fa fa-phone",
     onSelected: ({ channel, store }) => store.rtc.toggleCall(channel),
diff --git a/addons/mail/static/src/discuss/call/common/call_context_menu.js b/addons/mail/static/src/discuss/call/common/call_context_menu.js
index e9c251d62fe0e..17bca07ffd882 100644
--- a/addons/mail/static/src/discuss/call/common/call_context_menu.js
+++ b/addons/mail/static/src/discuss/call/common/call_context_menu.js
@@ -14,6 +14,8 @@ export class CallContextMenu extends Component {
 
     updateStatsTimeout;
     rtcConnectionTypes = CONNECTION_TYPES;
+    /** @type {import("models").Rtc} */
+    rtc;
 
     setup() {
         super.setup();
@@ -42,7 +44,7 @@ export class CallContextMenu extends Component {
 
     get inboundConnectionTypeText() {
         const candidateType =
-            this.rtc.state.connectionType === CONNECTION_TYPES.SERVER
+            this.rtc.connectionType === CONNECTION_TYPES.SERVER
                 ? this.state.downloadStats.remoteCandidateType
                 : this.state.peerStats.remoteCandidateType;
         return this.formatProtocol(candidateType);
@@ -50,7 +52,7 @@ export class CallContextMenu extends Component {
 
     get outboundConnectionTypeText() {
         const candidateType =
-            this.rtc.state.connectionType === CONNECTION_TYPES.SERVER
+            this.rtc.connectionType === CONNECTION_TYPES.SERVER
                 ? this.state.uploadStats.localCandidateType
                 : this.state.peerStats.localCandidateType;
         return this.formatProtocol(candidateType);
diff --git a/addons/mail/static/src/discuss/call/common/call_context_menu.xml b/addons/mail/static/src/discuss/call/common/call_context_menu.xml
index f2eb70124de1f..a8df9a474dc5b 100644
--- a/addons/mail/static/src/discuss/call/common/call_context_menu.xml
+++ b/addons/mail/static/src/discuss/call/common/call_context_menu.xml
@@ -10,10 +10,10 @@
                     <output t-esc="`${Math.round(state.rangeVolume * 200)}%`" class="o-mail-CallContextMenu-volumeTooltip fw-bold rounded" t-attf-style="--progress:{{state.rangeVolume * 100}}%;"/>
                 </div>
             </div>
-            <t t-if="env.debug and !isSelf and rtc.state.connectionType === rtcConnectionTypes.P2P">
+            <t t-if="env.debug and !isSelf and rtc.connectionType === rtcConnectionTypes.P2P">
                 <hr class="w-100 border-top"/>
                 <div><span class="fw-bolder">RTC Session ID: </span><t t-out="props.rtcSession.id"/></div>
-                <div><span class="fw-bolder">Connection type: </span><t t-out="rtc.state.connectionType"/></div>
+                <div><span class="fw-bolder">Connection type: </span><t t-out="rtc.connectionType"/></div>
                 <div><span class="fw-bolder">To peer: </span><t t-out="outboundConnectionTypeText"/></div>
                 <div><span class="fw-bolder">From peer: </span><t t-out="inboundConnectionTypeText"/></div>
                 <div><span class="fw-bolder">Connection: </span><t t-out="state.peerStats.connectionState"/></div>
@@ -29,8 +29,8 @@
                 <div><span class="fw-bolder">Packets received: </span><t t-out="state.peerStats.packetsReceived"/></div>
                 <div><span class="fw-bolder">Log step: </span><t t-out="props.rtcSession.logStep"/></div>
             </t>
-            <t t-elif="env.debug and isSelf and rtc.state.connectionType === rtcConnectionTypes.SERVER">
-                <div><span class="fw-bolder">Connection type: </span><t t-out="rtc.state.connectionType"/></div>
+            <t t-elif="env.debug and isSelf and rtc.connectionType === rtcConnectionTypes.SERVER">
+                <div><span class="fw-bolder">Connection type: </span><t t-out="rtc.connectionType"/></div>
                 <div><span class="fw-bolder">RTC Session ID: </span><t t-out="props.rtcSession.id"/></div>
                 <hr class="w-100 border-top"/>
                 <div><span class="fw-bolder">Upload: </span><t t-out="outboundConnectionTypeText"/></div>
diff --git a/addons/mail/static/src/discuss/call/common/call_participant_card.js b/addons/mail/static/src/discuss/call/common/call_participant_card.js
index 0c322566065f2..abcdd339697bc 100644
--- a/addons/mail/static/src/discuss/call/common/call_participant_card.js
+++ b/addons/mail/static/src/discuss/call/common/call_participant_card.js
@@ -25,6 +25,8 @@ export class CallParticipantCard extends Component {
     ];
     static components = { CallParticipantVideo, CallContextMenu, CallDropdown };
     static template = "discuss.CallParticipantCard";
+    /** @type {import("models").Rtc} */
+    rtc;
 
     setup() {
         super.setup();
@@ -62,7 +64,7 @@ export class CallParticipantCard extends Component {
         return (
             this.isOfActiveCall &&
             (this.rtcSession.notEq(this.rtc.selfSession) ||
-                (this.env.debug && this.rtc.state.connectionType === CONNECTION_TYPES.SERVER))
+                (this.env.debug && this.rtc.connectionType === CONNECTION_TYPES.SERVER))
         );
     }
 
@@ -128,7 +130,7 @@ export class CallParticipantCard extends Component {
         ) {
             return false;
         }
-        if (this.rtc.state.connectionType === CONNECTION_TYPES.SERVER) {
+        if (this.rtc.connectionType === CONNECTION_TYPES.SERVER) {
             return this.rtcSession.eq(this.rtc?.selfSession);
         } else {
             return this.rtcSession.notEq(this.rtc?.selfSession);
diff --git a/addons/mail/static/src/discuss/call/common/call_participant_card.xml b/addons/mail/static/src/discuss/call/common/call_participant_card.xml
index b31ec38230c46..37c2fb3400bd3 100644
--- a/addons/mail/static/src/discuss/call/common/call_participant_card.xml
+++ b/addons/mail/static/src/discuss/call/common/call_participant_card.xml
@@ -7,7 +7,7 @@
                 'o-isTalking': !props.minimized and isTalking,
                 'o-isInvitation opacity-50': !rtcSession,
                 'o-inset': props.inset,
-                'pe-none': rtc.state.screenTrack and !rtc.state.screenTrack.enabled,
+                'pe-none': rtc.screenTrack and !rtc.screenTrack.enabled,
                 'o-small': props.inset and (ui.isSmall or props.minimized),
                 'o-active': isActiveRtcSession and !props.inset and props.compact,
                 'p-1 rounded-1': !isActiveRtcSession,
@@ -22,9 +22,9 @@
             t-ref="root"
         >
             <!-- card -->
-            <t t-if="!props.isSidebarItem and props.cardData.type === 'screen' and rtc.state.screenTrack and !rtc.state.screenTrack.enabled">
+            <t t-if="!props.isSidebarItem and props.cardData.type === 'screen' and rtc.screenTrack and !rtc.screenTrack.enabled">
                 <div class="o-text-white display-5 gap-3">
-                    <button class="pe-auto bg-transparent o-text-white border-0 opacity-25 opacity-75-hover" t-ref="resumeStream" t-on-click.stop="() => (this.rtc.state.screenTrack.enabled = true)">
+                    <button class="pe-auto bg-transparent o-text-white border-0 opacity-25 opacity-75-hover" t-ref="resumeStream" t-on-click.stop="() => (this.rtc.screenTrack.enabled = true)">
                         <i class="fa fa-fw" t-att-class="{ 'fa-play-circle-o': resumeStreamHover.isHover, 'fa-pause-circle-o': !resumeStreamHover.isHover }"/> <span><t t-if="resumeStreamHover.isHover">Resume stream</t><t t-else="">Stream paused</t></span>
                     </button>
                 </div>
diff --git a/addons/mail/static/src/discuss/call/common/chat_window_patch.xml b/addons/mail/static/src/discuss/call/common/chat_window_patch.xml
index 54213be215bc6..ffc433fde77d2 100644
--- a/addons/mail/static/src/discuss/call/common/chat_window_patch.xml
+++ b/addons/mail/static/src/discuss/call/common/chat_window_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
     <t t-inherit="mail.ChatWindow" t-inherit-mode="extension">
         <xpath expr="//Thread" position="before">
-            <PipBanner t-if="rtc.state.isPipMode and channel.eq(rtc.channel)" compact="true"/>
+            <PipBanner t-if="rtc.isPipMode and channel.eq(rtc.channel)" compact="true"/>
             <Call t-elif="channel.showCallView" thread="channel.thread" compact="true"/>
         </xpath>
     </t>
diff --git a/addons/mail/static/src/discuss/call/common/rtc_service.js b/addons/mail/static/src/discuss/call/common/rtc_service.js
index 5023423bec047..0a1ba595c310c 100644
--- a/addons/mail/static/src/discuss/call/common/rtc_service.js
+++ b/addons/mail/static/src/discuss/call/common/rtc_service.js
@@ -69,7 +69,13 @@ function subscribe(target, event, f) {
 const SW_MESSAGE_TYPE = {
     POST_RTC_LOGS: "POST_RTC_LOGS",
 };
-export const CONNECTION_TYPES = { P2P: "p2p", SERVER: "server" };
+
+export const CONNECTION_TYPES = {
+    /** @type {"p2p"} */
+    P2P: "p2p",
+    /** @type {"server"} */
+    SERVER: "server",
+};
 const SCREEN_CONFIG = {
     width: { max: 1920 },
     height: { max: 1080 },
@@ -232,7 +238,77 @@ export class Network {
     }
 }
 
+/**
+ * @typedef {Object} SessionSubLogError
+ * @property {string} name
+ * @property {string} message
+ * @property {string} [stack]
+ */
+/**
+ * @typedef {Object} SessionSubLog
+ * @property {string} event
+ * @property {SessionSubLogError} [error]
+ */
+/**
+ * @typedef {Object} SessionLog
+ * @property {string} step
+ * @property {string} state
+ * @property {SessionSubLog[]} logs
+ * @property {boolean} important
+ * @property {string} [cause]
+ * @property {string} [serverInfo]
+ * @property {string} [level]
+ */
+/**
+ * @typedef {Object} RtcLog
+ * @property {Number} channelId
+ * @property {Number} selfSessionId
+ * @property {string} start
+ * @property {string} [end]
+ * @property {boolean} hasTurn
+ * @property {Object<number, SessionLog>} entriesBySessionId
+ */
+
 export class Rtc extends Record {
+    /** @type {typeof CONNECTION_TYPES[keyof typeof CONNECTION_TYPES]} */
+    connectionType;
+    /** @type {ReturnType<debounce>} */
+    updateAndBroadcastDebounce;
+    isSendingCamera = false;
+    isSendingScreen = false;
+    /** @type {MediaStreamTrack} */
+    micAudioTrack;
+    /** @type {MediaStreamTrack} */
+    screenAudioTrack;
+    /** @type {MediaStreamTrack} */
+    audioTrack;
+    /** @type {MediaStreamTrack} */
+    cameraTrack;
+    /** @type {MediaStreamTrack} */
+    screenTrack;
+    /** @type {MediaStream} */
+    sourceCameraStream;
+    /** @type {MediaStream} */
+    sourceScreenStream;
+    hasPendingRequest = false;
+    /**
+     * callback to properly end the audio monitoring.
+     * If set it indicates that we are currently monitoring the local
+     * micAudioTrack for the voice activation feature.
+     *
+     * @type {import("@mail/utils/common/media_monitoring").MonitorAudioReturnType}
+     */
+    disconnectAudioMonitor;
+    /** @type {ReturnType<setTimeout>} */
+    pttReleaseTimeout;
+    /**
+     * Whether the network fell back to p2p mode in a SFU call.
+     */
+    fallbackMode = false;
+    isPipMode = false;
+    isFullscreen = false;
+    /** @type {RtcLog} */
+    logs = {};
     notifications = reactive(new Map());
     /** @type {Map<string, number>} timeoutId by notificationId for call notifications */
     timeouts = new Map();
@@ -271,10 +347,14 @@ export class Rtc extends Record {
             );
         },
     });
+    /**
+     * The DiscussChannel of the current user for the call hosted by this tab.
+     */
+    localChannel = fields.One("discuss.channel");
     channel = fields.One("discuss.channel", {
         compute() {
-            if (this.state.channel) {
-                return this.state.channel;
+            if (this.localChannel) {
+                return this.localChannel;
             }
             return this._remotelyHostedChannelId;
         },
@@ -375,35 +455,6 @@ export class Rtc extends Record {
 
     setup() {
         this.linkVoiceActivationDebounce = debounce(this.linkVoiceActivation, 500);
-        this.state = reactive({
-            connectionType: undefined,
-            hasPendingRequest: false,
-            channel: undefined,
-            logs: {},
-            sendCamera: false,
-            sendScreen: false,
-            updateAndBroadcastDebounce: undefined,
-            micAudioTrack: undefined,
-            screenAudioTrack: undefined,
-            audioTrack: undefined,
-            cameraTrack: undefined,
-            screenTrack: undefined,
-            /**
-             * callback to properly end the audio monitoring.
-             * If set it indicates that we are currently monitoring the local
-             * micAudioTrack for the voice activation feature.
-             */
-            disconnectAudioMonitor: undefined,
-            pttReleaseTimeout: undefined,
-            sourceCameraStream: null,
-            sourceScreenStream: null,
-            /**
-             * Whether the network fell back to p2p mode in a SFU call.
-             */
-            fallbackMode: false,
-            isPipMode: false,
-            isFullscreen: false,
-        });
         this.blurManager = undefined;
     }
 
@@ -423,7 +474,7 @@ export class Rtc extends Record {
          */
         this.p2pService = services["discuss.p2p"];
         onChange(this.store.settings, "useBlur", () => {
-            if (this.state.sendCamera) {
+            if (this.isSendingCamera) {
                 this.toggleVideo("camera", { force: true });
             }
         });
@@ -447,12 +498,12 @@ export class Rtc extends Record {
             }
         });
         onChange(this.store.settings, "cameraInputDeviceId", async () => {
-            if (this.localSession && this.state.cameraTrack) {
+            if (this.localSession && this.cameraTrack) {
                 await this.toggleVideo("camera", { force: true, refreshStream: true });
             }
         });
         this.store.env.bus.addEventListener("RTC-SERVICE:PLAY_MEDIA", () => {
-            const channel = this.state.channel;
+            const channel = this.localChannel;
             if (!channel) {
                 return;
             }
@@ -476,9 +527,9 @@ export class Rtc extends Record {
         );
 
         browser.addEventListener("pagehide", () => {
-            if (this.state.channel) {
+            if (this.localChannel) {
                 const data = JSON.stringify({
-                    params: { channel_id: this.state.channel.id, session_id: this.selfSession.id },
+                    params: { channel_id: this.localChannel.id, session_id: this.selfSession.id },
                 });
                 const blob = new Blob([data], { type: "application/json" });
                 // using sendBeacon allows sending a post request even when the
@@ -497,7 +548,7 @@ export class Rtc extends Record {
          * connections that were established but failed or timed out.
          */
         browser.setInterval(async () => {
-            if (!this.localSession || !this.state.channel) {
+            if (!this.localSession || !this.localChannel) {
                 return;
             }
             this._postToTabs({
@@ -505,7 +556,7 @@ export class Rtc extends Record {
                 hostedSessionId: this.localSession.id,
             });
             await this.ping();
-            if (!this.localSession || !this.state.channel) {
+            if (!this.localSession || !this.localChannel) {
                 return;
             }
             this.call();
@@ -513,7 +564,7 @@ export class Rtc extends Record {
     }
 
     get displaySurface() {
-        return this.state.sourceScreenStream?.getVideoTracks()[0]?.getSettings().displaySurface;
+        return this.sourceScreenStream?.getVideoTracks()[0]?.getSettings().displaySurface;
     }
 
     onKeyDown(ev) {
@@ -525,7 +576,7 @@ export class Rtc extends Record {
 
     onKeyUp(ev) {
         if (
-            !this.state.channel ||
+            !this.localChannel ||
             !this.store.settings.use_push_to_talk ||
             !this.store.settings.isPushToTalkKey(ev) ||
             !this.localSession.isTalking
@@ -536,7 +587,7 @@ export class Rtc extends Record {
     }
 
     showMirroringWarning() {
-        this.state.screenTrack.enabled = false;
+        this.screenTrack.enabled = false;
         const trackEndedFn = () => this.removeMirroringWarning?.();
         this.removeMirroringWarning = this.overlay.add(
             CallInfiniteMirroringWarning,
@@ -550,16 +601,16 @@ export class Rtc extends Record {
                     if (stopScreensharing) {
                         this.toggleVideo("screen", false);
                     }
-                    this.state.screenTrack?.removeEventListener("ended", trackEndedFn);
+                    this.screenTrack?.removeEventListener("ended", trackEndedFn);
                     this.removeMirroringWarning = null;
                 },
             }
         );
-        this.state.screenTrack.addEventListener("ended", trackEndedFn, { once: true });
+        this.screenTrack.addEventListener("ended", trackEndedFn, { once: true });
     }
 
     setPttReleaseTimeout(duration = 200) {
-        this.state.pttReleaseTimeout = browser.setTimeout(() => {
+        this.pttReleaseTimeout = browser.setTimeout(() => {
             this.setTalking(false);
             if (!this.localSession?.isMute) {
                 this.soundEffectsService.play("ptt-release");
@@ -569,13 +620,13 @@ export class Rtc extends Record {
 
     onPushToTalk() {
         if (
-            !this.state.channel ||
+            !this.localChannel ||
             this.store.settings.isRegisteringKey ||
             !this.store.settings.use_push_to_talk
         ) {
             return;
         }
-        browser.clearTimeout(this.state.pttReleaseTimeout);
+        browser.clearTimeout(this.pttReleaseTimeout);
         if (!this.localSession.isTalking && !this.localSession.isMute) {
             this.soundEffectsService.play("ptt-press");
         }
@@ -633,25 +684,25 @@ export class Rtc extends Record {
     /**
      * Notifies the server and does the cleanup of the current call.
      */
-    async leaveCall(channel = this.state.channel) {
+    async leaveCall(channel = this.localChannel) {
         this.store.fullscreenChannel = null;
-        this.state.hasPendingRequest = true;
+        this.hasPendingRequest = true;
         await rpc("/mail/rtc/channel/leave_call", { channel_id: channel.id }, { silent: true });
         this.endCall(channel);
-        this.state.hasPendingRequest = false;
+        this.hasPendingRequest = false;
     }
 
     /**
      * @param {import("models").DiscussChannel} [channel]
      */
-    endCall(channel = this.state.channel) {
+    endCall(channel = this.localChannel) {
         this._endHost();
         if (channel.self_member_id) {
             channel.self_member_id.rtc_inviting_session_id = undefined;
         }
         channel.activeRtcSession = undefined;
-        if (channel.eq(this.state.channel)) {
-            this.state.logs.end = new Date().toISOString();
+        if (channel.eq(this.localChannel)) {
+            this.logs.end = new Date().toISOString();
             this.dumpLogs();
             this.pttExtService.unsubscribe();
             this.network?.disconnect();
@@ -751,12 +802,12 @@ export class Rtc extends Record {
                 () => {}
             )
         );
-        if (this.state.hasPendingRequest) {
+        if (this.hasPendingRequest) {
             return;
         }
-        const isActiveCall = channel.eq(this.state.channel);
-        if (this.state.channel) {
-            await this.leaveCall(this.state.channel);
+        const isActiveCall = channel.eq(this.localChannel);
+        if (this.localChannel) {
+            await this.leaveCall(this.localChannel);
         }
         if (!isActiveCall) {
             const joinCallOpts = { audio, camera };
@@ -868,7 +919,7 @@ export class Rtc extends Record {
             this.showMediaPermissionDialog("microphone");
             return;
         }
-        if (this.state.micAudioTrack) {
+        if (this.micAudioTrack) {
             await this.setMute(false);
         } else {
             await this.resetMicAudioTrack({ force: true });
@@ -905,17 +956,17 @@ export class Rtc extends Record {
     }
 
     updateUpload() {
-        this.network?.updateUpload("audio", this.state.audioTrack);
-        this.network?.updateUpload("camera", this.state.cameraTrack);
-        this.network?.updateUpload("screen", this.state.screenTrack);
+        this.network?.updateUpload("audio", this.audioTrack);
+        this.network?.updateUpload("camera", this.cameraTrack);
+        this.network?.updateUpload("screen", this.screenTrack);
     }
 
     async _initConnection() {
         this.localSession.connectionState = "selecting network type";
-        this.state.connectionType = CONNECTION_TYPES.P2P;
+        this.connectionType = CONNECTION_TYPES.P2P;
         this.network?.disconnect();
         // loading p2p in any case as we may need to receive peer-to-peer connections from users who failed to connect to the SFU.
-        this.p2pService.connect(this.localSession.id, this.state.channel.id, {
+        this.p2pService.connect(this.localSession.id, this.localChannel.id, {
             info: this.formatInfo(),
             iceServers: this.iceServers,
         });
@@ -929,14 +980,14 @@ export class Rtc extends Record {
             this.localSession.connectionState = "loading SFU assets";
             try {
                 await this._loadSfu();
-                this.state.connectionType = CONNECTION_TYPES.SERVER;
+                this.connectionType = CONNECTION_TYPES.SERVER;
                 if (this.network) {
                     this.network.addSfu(this.sfuClient);
                 } else {
                     return; // the call may be ended by the time the sfu is loaded
                 }
             } catch (e) {
-                this.state.fallbackMode = true;
+                this.fallbackMode = true;
                 this.notification.add(
                     _t("Failed to load the SFU server, falling back to peer-to-peer"),
                     {
@@ -960,7 +1011,7 @@ export class Rtc extends Record {
                 this.log(session, message, { step: "p2p", level, important: true });
             }
         });
-        if (this.state.channel) {
+        if (this.localChannel) {
             await this.call();
             this.updateUpload();
         }
@@ -1003,7 +1054,7 @@ export class Rtc extends Record {
     _updateRemoteTabs(changes) {
         this._postToTabs({
             type: CROSS_TAB_HOST_MESSAGE.UPDATE_REMOTE,
-            hostedChannelId: this.state.channel.id,
+            hostedChannelId: this.localChannel.id,
             hostedSessionId: this.localSession.id,
             changes,
         });
@@ -1052,7 +1103,7 @@ export class Rtc extends Record {
                 if (this.isHost) {
                     return;
                 }
-                this.state.isPipMode = changes.isPipMode;
+                this.isPipMode = changes.isPipMode;
                 return;
             }
             case CROSS_TAB_HOST_MESSAGE.PING: {
@@ -1066,7 +1117,7 @@ export class Rtc extends Record {
                 this._updateRemoteTabs({ [this.localSession.id]: toRaw(this.formatInfo()) });
                 this._postToTabs({
                     type: CROSS_TAB_HOST_MESSAGE.PIP_CHANGE,
-                    changes: { isPipMode: this.state.isPipMode },
+                    changes: { isPipMode: this.isPipMode },
                 });
                 return;
             }
@@ -1120,7 +1171,7 @@ export class Rtc extends Record {
                     promises.push(this.raiseHand(value));
                     break;
                 case "pip":
-                    if (value === this.state.isPipMode) {
+                    if (value === this.isPipMode) {
                         break;
                     }
                     if (value) {
@@ -1158,12 +1209,12 @@ export class Rtc extends Record {
             toRaw(session)._raw,
             param2
         );
-        if (!this.state.logs) {
+        if (!this.logs) {
             return;
         }
-        let sessionEntry = this.state.logs.entriesBySessionId[session.id];
+        let sessionEntry = this.logs.entriesBySessionId[session.id];
         if (!sessionEntry) {
-            this.state.logs.entriesBySessionId[session.id] = sessionEntry = {
+            this.logs.entriesBySessionId[session.id] = sessionEntry = {
                 step: "",
                 state: "",
                 logs: [],
@@ -1193,7 +1244,7 @@ export class Rtc extends Record {
      * @param {any} param0.detail.payload
      */
     async _handleNetworkUpdates({ detail: { name, payload } }) {
-        if (!this.state.channel) {
+        if (!this.localChannel) {
             return;
         }
         switch (name) {
@@ -1246,21 +1297,21 @@ export class Rtc extends Record {
                     const session = await this.store["discuss.channel.rtc.session"].getWhenReady(
                         sessionId
                     );
-                    if (!session || !this.state.channel) {
+                    if (!session || !this.localChannel) {
                         this.log(
                             this.selfSession,
-                            `track received for unknown session ${sessionId} (${this.state.connectionType})`
+                            `track received for unknown session ${sessionId} (${this.connectionType})`
                         );
                         return;
                     }
                     if (sequence && sequence < session.sequence) {
                         this.log(
                             session,
-                            `track received for old sequence ${sequence} (${this.state.connectionType})`
+                            `track received for old sequence ${sequence} (${this.connectionType})`
                         );
                         return;
                     }
-                    this.log(session, `${type} track received (${this.state.connectionType})`);
+                    this.log(session, `${type} track received (${this.connectionType})`);
                     try {
                         await this.handleRemoteTrack({ session, track, type, active });
                     } catch {
@@ -1279,8 +1330,8 @@ export class Rtc extends Record {
                 if (
                     this.selfSession?.persona.main_user_id?.share !== false ||
                     this.serverInfo ||
-                    this.state.fallbackMode ||
-                    !session?.channel.eq(this.state.channel)
+                    this.fallbackMode ||
+                    !session?.channel.eq(this.localChannel)
                 ) {
                     return;
                 }
@@ -1306,13 +1357,13 @@ export class Rtc extends Record {
                 this.sfuClient.updateInfo(this.formatInfo(), {
                     needRefresh: true, // asks the server to send the info from all the channel
                 });
-                this.sfuClient.updateUpload("audio", this.state.audioTrack);
-                this.sfuClient.updateUpload("camera", this.state.cameraTrack);
-                this.sfuClient.updateUpload("screen", this.state.screenTrack);
+                this.sfuClient.updateUpload("audio", this.audioTrack);
+                this.sfuClient.updateUpload("camera", this.cameraTrack);
+                this.sfuClient.updateUpload("screen", this.screenTrack);
                 return;
             case this.SFU_CLIENT_STATE.CLOSED:
                 {
-                    if (!this.state.channel) {
+                    if (!this.localChannel) {
                         return;
                     }
                     let text;
@@ -1335,8 +1386,8 @@ export class Rtc extends Record {
     }
 
     async _upgradeConnection() {
-        const channelId = this.state.channel?.id;
-        if (this.serverInfo || this.state.fallbackMode || !channelId) {
+        const channelId = this.localChannel?.id;
+        if (this.serverInfo || this.fallbackMode || !channelId) {
             return;
         }
         await rpc(
@@ -1377,8 +1428,8 @@ export class Rtc extends Record {
 
     async _downgradeConnection() {
         this.serverInfo = undefined;
-        this.state.fallbackMode = true;
-        this.state.connectionType = CONNECTION_TYPES.P2P;
+        this.fallbackMode = true;
+        this.connectionType = CONNECTION_TYPES.P2P;
         this.network.removeSfu();
         await this.call();
         this.updateUpload();
@@ -1393,10 +1444,10 @@ export class Rtc extends Record {
      * @return {Promise<void>}
      */
     async call({ asFallback = false } = {}) {
-        if (asFallback && !this.state.fallbackMode) {
+        if (asFallback && !this.fallbackMode) {
             return;
         }
-        if (this.state.connectionType === CONNECTION_TYPES.SERVER) {
+        if (this.connectionType === CONNECTION_TYPES.SERVER) {
             if (this.sfuClient.state === this.SFU_CLIENT_STATE.DISCONNECTED) {
                 browser.clearTimeout(this.sfuTimeout);
                 this.sfuTimeout = browser.setTimeout(() => {
@@ -1410,11 +1461,11 @@ export class Rtc extends Record {
             }
             return;
         }
-        if (this.state.channel.rtc_session_ids.length === 0) {
+        if (this.localChannel.rtc_session_ids.length === 0) {
             return;
         }
         const sequence = getSequence();
-        for (const session of this.state.channel.rtc_session_ids) {
+        for (const session of this.localChannel.rtc_session_ids) {
             if (session.eq(this.localSession)) {
                 continue;
             }
@@ -1449,7 +1500,7 @@ export class Rtc extends Record {
             return;
         }
         this.pttExtService.subscribe();
-        this.state.hasPendingRequest = true;
+        this.hasPendingRequest = true;
         const data = await rpc(
             "/mail/rtc/channel/join_call",
             {
@@ -1459,13 +1510,13 @@ export class Rtc extends Record {
             },
             { silent: true }
         );
-        this.state.hasPendingRequest = false;
+        this.hasPendingRequest = false;
         // Initializing a new session implies closing the current session.
         this.clear();
-        this.state.channel = channel;
+        this.localChannel = channel;
         this.store.insert(data);
         this.newLogs();
-        this.state.updateAndBroadcastDebounce = debounce(
+        this.updateAndBroadcastDebounce = debounce(
             async () => {
                 if (!this.localSession) {
                     return;
@@ -1488,8 +1539,8 @@ export class Rtc extends Record {
             3000,
             { leading: true, trailing: true }
         );
-        if (this.state.channel.self_member_id) {
-            this.state.channel.self_member_id.rtc_inviting_session_id = undefined;
+        if (this.localChannel.self_member_id) {
+            this.localChannel.self_member_id.rtc_inviting_session_id = undefined;
         }
         if (camera) {
             await this.toggleVideo("camera");
@@ -1499,7 +1550,7 @@ export class Rtc extends Record {
         }
         await this._initConnection();
         await this.resetMicAudioTrack({ force: audio });
-        if (!this.state.channel?.id) {
+        if (!this.localChannel?.id) {
             return;
         }
         this.soundEffectsService.play("call-join");
@@ -1515,8 +1566,8 @@ export class Rtc extends Record {
     }
 
     newLogs() {
-        this.state.logs = {
-            channelId: this.state.channel.id,
+        this.logs = {
+            channelId: this.localChannel.id,
             selfSessionId: this.localSession.id,
             start: new Date().toISOString(),
             hasTurn: hasTurn(this.iceServers),
@@ -1530,14 +1581,14 @@ export class Rtc extends Record {
      */
     dumpLogs({ download = false } = {}) {
         const logs = [];
-        if (this.state.logs) {
+        if (this.logs) {
             logs.push({
                 type: "timeline",
-                entry: this.state.logs.start,
-                value: toRaw(this.state.logs),
+                entry: this.logs.start,
+                value: toRaw(this.logs),
             });
         }
-        if (this.state.channel) {
+        if (this.localChannel) {
             logs.push(this.buildSnapshot());
         }
         if (logs.length || download) {
@@ -1551,12 +1602,12 @@ export class Rtc extends Record {
 
     buildSnapshot() {
         const server = {};
-        if (this.state.connectionType === CONNECTION_TYPES.SERVER) {
+        if (this.connectionType === CONNECTION_TYPES.SERVER) {
             server.info = toRaw(this.serverInfo);
             server.state = this.sfuClient?.state;
             server.errors = this.sfuClient?.errors.map((error) => error.message);
         }
-        const sessions = this.state.channel.rtc_session_ids.map((session) => {
+        const sessions = this.localChannel.rtc_session_ids.map((session) => {
             const sessionInfo = {
                 id: session.id,
                 channelMemberId: session.channel_member_id?.id,
@@ -1593,14 +1644,14 @@ export class Rtc extends Record {
             value: {
                 server,
                 sessions,
-                connectionType: this.state.connectionType,
-                fallback: this.state.fallbackMode,
+                connectionType: this.connectionType,
+                fallback: this.fallbackMode,
             },
         };
     }
 
     logSnapshot() {
-        if (!this.state.channel) {
+        if (!this.localChannel) {
             // a snapshot out of a call would not collect any data
             return;
         }
@@ -1614,8 +1665,8 @@ export class Rtc extends Record {
         const data = await rpc(
             "/discuss/channel/ping",
             {
-                channel_id: this.state.channel.id,
-                check_rtc_session_ids: this.state.channel.rtc_session_ids.map(
+                channel_id: this.localChannel.id,
+                check_rtc_session_ids: this.localChannel.rtc_session_ids.map(
                     (session) => session.id
                 ),
                 rtc_session_id: this.localSession.id,
@@ -1646,8 +1697,8 @@ export class Rtc extends Record {
     }
 
     clear() {
-        if (this.state.channel) {
-            for (const session of this.state.channel.rtc_session_ids) {
+        if (this.localChannel) {
+            for (const session of this.localChannel.rtc_session_ids) {
                 this.removeAudioFromSession(session);
                 this.removeVideoFromSession(session);
                 session.isTalking = false;
@@ -1665,40 +1716,38 @@ export class Rtc extends Record {
         this.audioContext = undefined;
         this._p2pRecoveryCount = 0;
         this.closeCallPermissionDialog?.();
-        this.state.updateAndBroadcastDebounce?.cancel();
-        this.state.disconnectAudioMonitor?.();
-        this.state.micAudioTrack?.stop();
-        this.state.screenAudioTrack?.stop();
-        this.state.audioTrack?.stop();
-        this.state.cameraTrack?.stop();
-        this.state.screenTrack?.stop();
-        this.state.fallbackMode = undefined;
-        this.state.isPipMode = false;
-        closeStream(this.state.sourceCameraStream);
-        this.state.sourceCameraStream = null;
-        closeStream(this.state.sourceScreenStream);
-        this.state.sourceScreenStream = null;
+        this.updateAndBroadcastDebounce?.cancel();
+        this.disconnectAudioMonitor?.();
+        this.micAudioTrack?.stop();
+        this.screenAudioTrack?.stop();
+        this.audioTrack?.stop();
+        this.cameraTrack?.stop();
+        this.screenTrack?.stop();
+        this.fallbackMode = undefined;
+        this.isPipMode = false;
+        closeStream(this.sourceCameraStream);
+        this.sourceCameraStream = null;
+        closeStream(this.sourceScreenStream);
+        this.sourceScreenStream = null;
         if (this.blurManager) {
             this.blurManager.close();
             this.blurManager = undefined;
         }
         this.update({
-            localSession: undefined,
-            serverInfo: undefined,
-        });
-        Object.assign(this.state, {
-            updateAndBroadcastDebounce: undefined,
+            audioTrack: undefined,
+            cameraTrack: undefined,
             connectionType: undefined,
             disconnectAudioMonitor: undefined,
-            cameraTrack: undefined,
-            screenTrack: undefined,
-            screenAudioTrack: undefined,
-            micAudioTrack: undefined,
-            audioTrack: undefined,
-            sendCamera: false,
-            sendScreen: false,
-            channel: undefined,
             fallbackMode: false,
+            isSendingCamera: false,
+            isSendingScreen: false,
+            localChannel: undefined,
+            localSession: undefined,
+            micAudioTrack: undefined,
+            screenAudioTrack: undefined,
+            screenTrack: undefined,
+            serverInfo: undefined,
+            updateAndBroadcastDebounce: undefined,
         });
         this.pipService?.closePip();
     }
@@ -1708,7 +1757,7 @@ export class Rtc extends Record {
      */
     async setDeaf(is_deaf) {
         this.updateAndBroadcast({ is_deaf });
-        for (const session of this.state.channel.rtc_session_ids) {
+        for (const session of this.localChannel.rtc_session_ids) {
             if (!session.audioElement) {
                 continue;
             }
@@ -1719,7 +1768,7 @@ export class Rtc extends Record {
 
     async setOutputDevice(deviceId) {
         const promises = [];
-        for (const session of this.state.channel.rtc_session_ids) {
+        for (const session of this.localChannel.rtc_session_ids) {
             if (!session.audioElement) {
                 continue;
             }
@@ -1744,7 +1793,7 @@ export class Rtc extends Record {
             this._remoteAction({ raisingHand: raise });
             return;
         }
-        if (!this.localSession || !this.state.channel) {
+        if (!this.localSession || !this.localChannel) {
             return;
         }
         this.localSession.raisingHand = raise ? new Date() : undefined;
@@ -1803,26 +1852,30 @@ export class Rtc extends Record {
             });
             return;
         }
-        if (!this.state.channel?.id) {
+        if (!this.localChannel?.id) {
             return;
         }
         switch (type) {
             case "camera": {
-                if (this.cameraPermission === "prompt" && !this.state.cameraTrack) {
+                if (this.cameraPermission === "prompt" && !this.cameraTrack) {
                     this.showMediaPermissionDialog("camera");
                     return;
                 }
-                const track = this.state.cameraTrack;
-                const sendCamera = force ?? !this.state.sendCamera;
-                this.state.sendCamera = false;
-                await this.setVideo(track, type, { activateVideo: sendCamera, env, refreshStream });
+                const track = this.cameraTrack;
+                const isSendingCamera = force ?? !this.isSendingCamera;
+                this.isSendingCamera = false;
+                await this.setVideo(track, type, {
+                    activateVideo: isSendingCamera,
+                    env,
+                    refreshStream,
+                });
                 break;
             }
             case "screen": {
-                const track = this.state.screenTrack;
-                const sendScreen = force ?? !this.state.sendScreen;
-                this.state.sendScreen = false;
-                await this.setVideo(track, type, { activateVideo: sendScreen, env });
+                const track = this.screenTrack;
+                const isSendingScreen = force ?? !this.isSendingScreen;
+                this.isSendingScreen = false;
+                await this.setVideo(track, type, { activateVideo: isSendingScreen, env });
                 break;
             }
         }
@@ -1833,25 +1886,25 @@ export class Rtc extends Record {
                         type: "camera",
                         cleanup: false,
                     });
-                    if (this.state.cameraTrack) {
-                        this.updateStream(this.localSession, this.state.cameraTrack);
+                    if (this.cameraTrack) {
+                        this.updateStream(this.localSession, this.cameraTrack);
                     }
                     break;
                 }
                 case "screen": {
-                    if (!this.state.screenTrack) {
+                    if (!this.screenTrack) {
                         this.removeVideoFromSession(this.localSession, {
                             type: "screen",
                             cleanup: false,
                         });
                     } else {
-                        this.updateStream(this.localSession, this.state.screenTrack);
+                        this.updateStream(this.localSession, this.screenTrack);
                     }
                     break;
                 }
             }
         }
-        const updatedTrack = type === "camera" ? this.state.cameraTrack : this.state.screenTrack;
+        const updatedTrack = type === "camera" ? this.cameraTrack : this.screenTrack;
         await this.network?.updateUpload(type, updatedTrack);
         if (!this.localSession) {
             return;
@@ -1859,13 +1912,13 @@ export class Rtc extends Record {
         switch (type) {
             case "camera": {
                 this.updateAndBroadcast({
-                    is_camera_on: !!this.state.sendCamera,
+                    is_camera_on: !!this.isSendingCamera,
                 });
                 break;
             }
             case "screen": {
                 this.updateAndBroadcast({
-                    is_screen_sharing_on: !!this.state.sendScreen,
+                    is_screen_sharing_on: !!this.isSendingScreen,
                 });
                 break;
             }
@@ -1882,7 +1935,7 @@ export class Rtc extends Record {
     updateAndBroadcast(data) {
         this._updateRemoteTabs({ [this.localSession.id]: data });
         assignDefined(this.localSession, data);
-        this.state.updateAndBroadcastDebounce?.();
+        this.updateAndBroadcastDebounce?.();
     }
 
     /**
@@ -1890,10 +1943,10 @@ export class Rtc extends Record {
      * current session state. And notifies peers of the new audio state.
      */
     async refreshMicAudioStatus() {
-        if (!this.state.micAudioTrack) {
+        if (!this.micAudioTrack) {
             return;
         }
-        this.state.micAudioTrack.enabled = !this.localSession.isMute && this.localSession.isTalking;
+        this.micAudioTrack.enabled = !this.localSession.isMute && this.localSession.isTalking;
         this._updateInfo();
     }
 
@@ -1920,15 +1973,15 @@ export class Rtc extends Record {
             }
             switch (type) {
                 case "camera": {
-                    this.state.cameraTrack = undefined;
-                    closeStream(this.state.sourceCameraStream);
-                    this.state.sourceCameraStream = null;
+                    this.cameraTrack = undefined;
+                    closeStream(this.sourceCameraStream);
+                    this.sourceCameraStream = null;
                     break;
                 }
                 case "screen": {
-                    this.state.screenTrack = undefined;
-                    closeStream(this.state.sourceScreenStream);
-                    this.state.sourceScreenStream = null;
+                    this.screenTrack = undefined;
+                    closeStream(this.sourceScreenStream);
+                    this.sourceScreenStream = null;
                     break;
                 }
             }
@@ -1944,22 +1997,23 @@ export class Rtc extends Record {
             stopVideo();
             return;
         }
+        /** @type {MediaStream} */
         let sourceStream;
         const sourceWindow = env?.pipWindow ?? browser;
         try {
             if (type === "camera") {
-                if (this.state.sourceCameraStream && !options?.refreshStream) {
-                    sourceStream = this.state.sourceCameraStream;
+                if (this.sourceCameraStream && !options?.refreshStream) {
+                    sourceStream = this.sourceCameraStream;
                 } else {
-                    closeStream(this.state.sourceCameraStream);
+                    closeStream(this.sourceCameraStream);
                     sourceStream = await sourceWindow.navigator.mediaDevices.getUserMedia({
                         video: this.store.settings.cameraConstraints,
                     });
                 }
             }
             if (type === "screen") {
-                if (this.state.sourceScreenStream) {
-                    sourceStream = this.state.sourceScreenStream;
+                if (this.sourceScreenStream) {
+                    sourceStream = this.sourceScreenStream;
                 } else {
                     sourceStream = await sourceWindow.navigator.mediaDevices.getDisplayMedia({
                         video: SCREEN_CONFIG,
@@ -2010,32 +2064,30 @@ export class Rtc extends Record {
         }
         switch (type) {
             case "camera": {
-                Object.assign(this.state, {
-                    sourceCameraStream: sourceStream,
+                Object.assign(this, {
                     cameraTrack: outputTrack,
-                    sendCamera: Boolean(outputTrack),
-                    isCameraSourceExternal: Boolean(sourceStream) && env?.pipWindow,
+                    isSendingCamera: Boolean(outputTrack),
+                    sourceCameraStream: sourceStream,
                 });
                 break;
             }
             case "screen": {
-                Object.assign(this.state, {
-                    sourceScreenStream: sourceStream,
-                    screenTrack: outputTrack,
+                Object.assign(this, {
+                    isSendingScreen: Boolean(outputTrack),
                     screenAudioTrack: screenAudioTrack,
-                    sendScreen: Boolean(outputTrack),
-                    isScreenSourceExternal: Boolean(sourceStream) && env?.pipWindow,
+                    screenTrack: outputTrack,
+                    sourceScreenStream: sourceStream,
                 });
                 break;
             }
         }
-        if (this.state.screenAudioTrack) {
+        if (this.screenAudioTrack) {
             this.updateAudioTrack();
         }
     }
 
     async updateAudioTrack() {
-        const { micAudioTrack, screenAudioTrack } = this.state;
+        const { micAudioTrack, screenAudioTrack } = this;
         if (!micAudioTrack && !screenAudioTrack) {
             return;
         }
@@ -2052,19 +2104,19 @@ export class Rtc extends Record {
             const destination = this.audioContext.createMediaStreamDestination();
             micSource.connect(destination);
             screenSource.connect(destination);
-            this.state.audioTrack = destination.stream.getAudioTracks()[0];
+            this.audioTrack = destination.stream.getAudioTracks()[0];
         } else {
-            this.state.audioTrack = micAudioTrack ?? screenAudioTrack;
+            this.audioTrack = micAudioTrack ?? screenAudioTrack;
         }
-        await this.network?.updateUpload("audio", this.state.audioTrack);
+        await this.network?.updateUpload("audio", this.audioTrack);
     }
 
     async resetMicAudioTrack({ force = false }) {
-        this.state.micAudioTrack?.stop();
-        this.state.micAudioTrack = undefined;
-        this.state.audioTrack?.stop();
-        this.state.audioTrack = undefined;
-        if (!this.state.channel) {
+        this.micAudioTrack?.stop();
+        this.micAudioTrack = undefined;
+        this.audioTrack?.stop();
+        this.audioTrack = undefined;
+        if (!this.localChannel) {
             return;
         }
         if (this.localSession) {
@@ -2096,7 +2148,7 @@ export class Rtc extends Record {
                 this.setMute(true);
             });
             micAudioTrack.enabled = !this.localSession.isMute && this.localSession.isTalking;
-            this.state.micAudioTrack = micAudioTrack;
+            this.micAudioTrack = micAudioTrack;
             this.linkVoiceActivationDebounce();
             this.updateAudioTrack();
         }
@@ -2107,21 +2159,17 @@ export class Rtc extends Record {
      * attaches an audio monitor for voice activation if necessary.
      */
     async linkVoiceActivation() {
-        this.state.disconnectAudioMonitor?.();
+        this.disconnectAudioMonitor?.();
         if (!this.localSession) {
             return;
         }
-        if (
-            this.store.settings.use_push_to_talk ||
-            !this.state.channel ||
-            !this.state.micAudioTrack
-        ) {
+        if (this.store.settings.use_push_to_talk || !this.localChannel || !this.micAudioTrack) {
             this.localSession.isTalking = false;
             await this.refreshMicAudioStatus();
             return;
         }
         try {
-            this.state.disconnectAudioMonitor = await monitorAudio(this.state.micAudioTrack, {
+            this.disconnectAudioMonitor = await monitorAudio(this.micAudioTrack, {
                 onThreshold: async (isAboveThreshold) => {
                     this.setTalking(isAboveThreshold);
                 },
@@ -2142,8 +2190,8 @@ export class Rtc extends Record {
     }
 
     formatInfo() {
-        this.localSession.is_camera_on = Boolean(this.state.cameraTrack);
-        this.localSession.is_screen_sharing_on = Boolean(this.state.screenTrack);
+        this.localSession.is_camera_on = Boolean(this.cameraTrack);
+        this.localSession.is_screen_sharing_on = Boolean(this.screenTrack);
         return this.localSession.info;
     }
 
@@ -2175,7 +2223,7 @@ export class Rtc extends Record {
         if (track.kind === "video") {
             videoType = videoType
                 ? videoType
-                : track.id === this.state.cameraTrack?.id
+                : track.id === this.cameraTrack?.id
                 ? "camera"
                 : "screen";
             session.videoStreams.set(videoType, stream);
@@ -2199,9 +2247,9 @@ export class Rtc extends Record {
             session.videoStreams.delete(type);
             if (
                 this.selfSession.videoStreams.size === 0 &&
-                this.selfSession.eq(this.state.channel.activeRtcSession)
+                this.selfSession.eq(this.localChannel.activeRtcSession)
             ) {
-                this.state.channel.activeRtcSession = undefined;
+                this.localChannel.activeRtcSession = undefined;
             }
         } else {
             if (cleanup) {
@@ -2235,10 +2283,10 @@ export class Rtc extends Record {
      * @param {boolean} [parm2.addVideo]
      */
     updateActiveSession(session, videoType, { addVideo = false } = {}) {
-        const activeRtcSession = this.state.channel.activeRtcSession;
+        const activeRtcSession = this.localChannel.activeRtcSession;
         if (addVideo) {
             if (videoType === "screen") {
-                this.state.channel.activeRtcSession = session;
+                this.localChannel.activeRtcSession = session;
                 session.mainVideoStreamType = videoType;
                 return;
             }
@@ -2327,7 +2375,7 @@ export const rtcService = {
             if (!isPipMode) {
                 rtc.channel?.openChatWindow();
             }
-            rtc.state.isPipMode = isPipMode;
+            rtc.isPipMode = isPipMode;
             rtc._postToTabs({
                 type: CROSS_TAB_HOST_MESSAGE.PIP_CHANGE,
                 changes: { isPipMode },
@@ -2335,18 +2383,18 @@ export const rtcService = {
         });
         rtc.fullscreen = services["mail.fullscreen"];
         onChange(rtc.fullscreen, "id", () => {
-            const wasFullscreen = rtc.state.isFullscreen;
-            rtc.state.isFullscreen = rtc.fullscreen.id === CALL_FULLSCREEN_ID;
+            const wasFullscreen = rtc.isFullscreen;
+            rtc.isFullscreen = rtc.fullscreen.id === CALL_FULLSCREEN_ID;
             if (
-                rtc.state.screenTrack &&
+                rtc.screenTrack &&
                 rtc.displaySurface !== "browser" &&
                 rtc.fullscreen.id === CALL_FULLSCREEN_ID
             ) {
                 rtc.showMirroringWarning();
-            } else if (!rtc.state.isFullscreen) {
+            } else if (!rtc.isFullscreen) {
                 rtc.removeMirroringWarning?.();
-                if (wasFullscreen && rtc.state.screenTrack) {
-                    rtc.state.screenTrack.enabled = true;
+                if (wasFullscreen && rtc.screenTrack) {
+                    rtc.screenTrack.enabled = true;
                 }
             }
         });
diff --git a/addons/mail/static/src/discuss/call/common/thread_model_patch.js b/addons/mail/static/src/discuss/call/common/thread_model_patch.js
index 496faa3d806e0..eed35122efe28 100644
--- a/addons/mail/static/src/discuss/call/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/call/common/thread_model_patch.js
@@ -157,7 +157,7 @@ const ThreadPatch = {
         });
     },
     get showCallView() {
-        return !this.store.rtc.state.isFullscreen && this.rtc_session_ids.length > 0;
+        return !this.store.rtc.isFullscreen && this.rtc_session_ids.length > 0;
     },
     focusAvailableVideo() {
         if (this.isDisplayedInDiscussAppDesktop || !this.store.settings.useCallAutoFocus) {
diff --git a/addons/mail/static/src/discuss/core/common/channel_invitation.js b/addons/mail/static/src/discuss/core/common/channel_invitation.js
index db5ff61996f05..c1dae3aeebf8b 100644
--- a/addons/mail/static/src/discuss/core/common/channel_invitation.js
+++ b/addons/mail/static/src/discuss/core/common/channel_invitation.js
@@ -207,7 +207,7 @@ export class ChannelInvitation extends Component {
             invitePromises.push(
                 this.orm.call("discuss.channel", "add_members", [[this.props.thread.id]], {
                     partner_ids: this.selectedPartners.map((partner) => partner.id),
-                    invite_to_rtc_call: this.rtc.state.channel?.eq(this.props.thread?.channel),
+                    invite_to_rtc_call: this.rtc.localChannel?.eq(this.props.thread?.channel),
                 })
             );
         }
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml b/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml
index 55cc77f868fe9..9915a8e4bd50d 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
     <t t-inherit="mail.DiscussContent" t-inherit-mode="extension">
         <xpath expr="//Thread" position="before">
-            <PipBanner t-if="rtc.state.isPipMode and thread.channel?.eq(rtc.channel)"/>
+            <PipBanner t-if="rtc.isPipMode and thread.channel?.eq(rtc.channel)"/>
             <Call t-elif="thread.showCallView" thread="thread"/>
         </xpath>
     </t>
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js b/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js
index 1ddab0f16e492..c37080ff3be01 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js
@@ -35,10 +35,10 @@ export class DiscussCorePublicWeb {
                 if (action === "OPEN_CHANNEL") {
                     const channel = await this.store["discuss.channel"].getOrFetch(data.id);
                     channel?.open({ focus: true });
-                    if (!data.joinCall || !channel || this.store.rtc.state.channel?.eq(channel)) {
+                    if (!data.joinCall || !channel || this.store.rtc.localChannel?.eq(channel)) {
                         return;
                     }
-                    if (this.store.rtc.state.channel) {
+                    if (this.store.rtc.localChannel) {
                         await this.store.rtc.leaveCall();
                     }
                     this.store.rtc.joinCall(channel);
diff --git a/addons/mail/static/src/utils/common/media_monitoring.js b/addons/mail/static/src/utils/common/media_monitoring.js
index 91a8f2841a4bc..e2ab3c46cf51d 100644
--- a/addons/mail/static/src/utils/common/media_monitoring.js
+++ b/addons/mail/static/src/utils/common/media_monitoring.js
@@ -5,6 +5,8 @@ const HUMAN_VOICE_FREQUENCY_RANGE = [80, 1000];
 // Public
 //------------------------------------------------------------------------------
 
+/** @typedef {Function} MonitorAudioReturnType */
+
 /**
  * monitors the activity of an audio mediaStreamTrack
  *
@@ -17,8 +19,7 @@ const HUMAN_VOICE_FREQUENCY_RANGE = [80, 1000];
  * @param {function(boolean):void} [processorOptions.onThreshold] a function to be called when the threshold is passed
  * @param {function(number):void} [processorOptions.onTic] a function to be called at each tics
  * @param {number} [processorOptions.volumeThreshold] the normalized minimum value for audio detection
- * @returns {Object} returnValue
- * @returns {function} returnValue.disconnect callback to cleanly end the monitoring
+ * @returns {Promise<MonitorAudioReturnType>} callback to cleanly end the monitoring
  */
 export async function monitorAudio(track, processorOptions) {
     // cloning the track so it is not affected by the enabled change of the original track.
diff --git a/addons/mail/static/tests/tours/discuss_channel_call_public_tour.js b/addons/mail/static/tests/tours/discuss_channel_call_public_tour.js
index bb4a8313c40cc..f31bba6e12586 100644
--- a/addons/mail/static/tests/tours/discuss_channel_call_public_tour.js
+++ b/addons/mail/static/tests/tours/discuss_channel_call_public_tour.js
@@ -8,7 +8,7 @@ registry.category("web_tour.tours").add("discuss_channel_call_public_tour.js", {
             async run() {
                 await new Promise((r) => setTimeout(r, 250));
                 const rtcService = odoo.__WOWL_DEBUG__.root.env.services["discuss.rtc"];
-                if (rtcService?.selfSession || rtcService?.state.hasPendingRequest) {
+                if (rtcService?.selfSession || rtcService?.hasPendingRequest) {
                     console.error("The call should not have started.");
                 }
             },

From 0e2c946fceac8231c7413c063ca74ae4b4525b7e Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Mon, 3 Nov 2025 13:41:12 +0100
Subject: [PATCH 193/673] [IMP] spreadsheet: update o_spreadsheet to latest
 version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### Contains the following commits:

https://github.com/odoo/o-spreadsheet/commit/d9230f30a [REL] 19.1.0-alpha.11 [Task: 0](https://www.odoo.com/odoo/2328/tasks/0)
https://github.com/odoo/o-spreadsheet/commit/d9428da5c [FIX] RadioSelection: fix input size with huge label [Task: 4079971](https://www.odoo.com/odoo/2328/tasks/4079971)
https://github.com/odoo/o-spreadsheet/commit/564b44833 [IMP] PivotRegistry: Add `isPivotUnused` to extend the condition in Odoo [Task: 4079971](https://www.odoo.com/odoo/2328/tasks/4079971)
https://github.com/odoo/o-spreadsheet/commit/31ba95606 [FIX] composer: fix get/setText of the content editable helper [Task: 5082601](https://www.odoo.com/odoo/2328/tasks/5082601)
https://github.com/odoo/o-spreadsheet/commit/cae1ff82f [IMP] zoom: Implement zoom for the grid [Task: 4606648](https://www.odoo.com/odoo/2328/tasks/4606648)
https://github.com/odoo/o-spreadsheet/commit/4c646a966 [IMP] jest: add custom funs to matcher [](https://www.odoo.com/odoo/2328/tasks/)
https://github.com/odoo/o-spreadsheet/commit/aeb40583e [IMP] formula assistant: Adapt UI for repeatable arguments [Task: 5082027](https://www.odoo.com/odoo/2328/tasks/5082027)
https://github.com/odoo/o-spreadsheet/commit/a74bbfbc8 [IMP] formula formatter : fit repeating args [Task: 5082027](https://www.odoo.com/odoo/2328/tasks/5082027)
https://github.com/odoo/o-spreadsheet/commit/84404874c [IMP] formulas: modify arg repeating pattern [Task: 5082027](https://www.odoo.com/odoo/2328/tasks/5082027)

Part-of: odoo/odoo#234147
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Co-authored-by: Anthony Hendrickx (anhe) <anhe@odoo.com>
Co-authored-by: Alexis Lacroix (laa) <laa@odoo.com>
Co-authored-by: Lucas Lefèvre (lul) <lul@odoo.com>
Co-authored-by: Dhrutik Patel (dhrp) <dhrp@odoo.com>
Co-authored-by: Adrien Minne (adrm) <adrm@odoo.com>
Co-authored-by: Ronak Mukeshbhai Bharadiya <rmbh@odoo.com>
Co-authored-by: Florian Damhaut (flda) <flda@odoo.com>
Co-authored-by: Rémi Rahir (rar) <rar@odoo.com>
Co-authored-by: Pierre Rousseau (pro) <pro@odoo.com>
Co-authored-by: Vincent Schippefilt (vsc) <vsc@odoo.com>
---
 .../src/o_spreadsheet/o_spreadsheet.css       |  60 +-
 .../static/src/o_spreadsheet/o_spreadsheet.js | 987 +++++++++++-------
 .../src/o_spreadsheet/o_spreadsheet.xml       | 157 +--
 3 files changed, 748 insertions(+), 456 deletions(-)

diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
index b1db956424c91..f53ae0494e7ef 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
@@ -2,9 +2,9 @@
 /*
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.1.0-alpha.10
- * @date 2025-10-30T12:28:49.805Z
- * @hash d0b65e9e4
+ * @version 19.1.0-alpha.11
+ * @date 2025-11-03T12:41:11.975Z
+ * @hash d9230f30a
  */
 :root {
   --os-gray-100: #f9fafb;
@@ -1330,6 +1330,7 @@
       border: 1px solid var(--os-gray-300);
       outline: none;
       border-radius: 8px;
+      flex-shrink: 0;
 
       &:checked {
         background: url("data:image/svg+xml,%3Csvg%20xmlns%3D%27http%3A//www.w3.org/2000/svg%27%20viewBox%3D%27-4%20-4%208%208%27%3E%3Ccircle%20r%3D%222%22%20fill%3D%22%23FFF%22/%3E%3C/svg%3E");
@@ -1687,6 +1688,28 @@
   }
 }
 
+/* Originates from src/components/number_editor/number_editor.css */
+.o-spreadsheet {
+  .o-number-editor {
+    width: max-content !important;
+    height: calc(100% - 4px);
+    input.o-font-size {
+      outline: none;
+      height: 20px;
+      width: 31px;
+      text-align: center;
+    }
+  }
+  .o-text-options > div {
+    cursor: pointer;
+    line-height: 26px;
+    padding: 3px 12px;
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.08);
+    }
+  }
+}
+
 /* Originates from src/components/menu_popover/menu_popover.css */
 .o-spreadsheet {
   .o-menu-wrapper {
@@ -2140,28 +2163,6 @@
   }
 }
 
-/* Originates from src/components/font_size_editor/font_size_editor.css */
-.o-spreadsheet {
-  .o-font-size-editor {
-    width: max-content !important;
-    height: calc(100% - 4px);
-    input.o-font-size {
-      outline: none;
-      height: 20px;
-      width: 31px;
-      text-align: center;
-    }
-  }
-  .o-text-options > div {
-    cursor: pointer;
-    line-height: 26px;
-    padding: 3px 12px;
-    &:hover {
-      background-color: rgba(0, 0, 0, 0.08);
-    }
-  }
-}
-
 /* Originates from src/components/filters/filter_menu_value_list/filter_menu_value_list.css */
 .o-spreadsheet .o-filter-menu {
   .o-search-icon {
@@ -2668,12 +2669,9 @@
     font-size: 85%;
   }
   .o-formula-assistant-focus {
-    div:first-child,
-    span {
-      color: var(--os-composer-assistant-color);
-      text-shadow: 0px 0px 1px var(--os-composer-assistant-color);
-    }
-    div:last-child {
+    color: var(--os-composer-assistant-color);
+    text-shadow: 0px 0px 1px var(--os-composer-assistant-color);
+    & + div {
       color: black;
     }
   }
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
index 7bde6eae733c9..8db28a3e3bbf9 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
@@ -1,17 +1,13 @@
-// @odoo-module ignore
-// Transpiled AOT with https://github.com/rrahir/spreadsheet-tools
+
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.1.0-alpha.10
- * @date 2025-10-30T12:28:44.205Z
- * @hash d0b65e9e4
+ * @version 19.1.0-alpha.11
+ * @date 2025-11-03T12:41:02.741Z
+ * @hash d9230f30a
  */
-odoo.define('@spreadsheet/o_spreadsheet/o_spreadsheet', ['@odoo/owl'], function (require) {
-'use strict';
-let __exports = {};
 
-const { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } = require('@odoo/owl');
+import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
 
 const CANVAS_SHIFT = 0.5;
 // Colors
@@ -160,6 +156,8 @@ const MOBILE_WIDTH_BREAKPOINT = 768;
 const MENU_WIDTH = 250;
 const MENU_VERTICAL_PADDING = 6;
 const DESKTOP_MENU_ITEM_HEIGHT = 26;
+// Zoom
+const ZOOM_VALUES = [50, 75, 100, 125, 150, 200];
 // Style
 const DEFAULT_STYLE = {
     align: "left",
@@ -2289,13 +2287,13 @@ function addMetaInfoFromArg(name, addDescr) {
     let optionalArg = 0;
     for (const arg of addDescr.args) {
         countArg++;
-        if (!arg.optional && !arg.repeating && !arg.default) {
+        if (!arg.optional && !arg.default) {
             minArg++;
         }
         if (arg.repeating) {
             repeatingArg++;
         }
-        if (arg.optional || arg.default) {
+        if ((arg.optional || arg.default) && !arg.repeating) {
             optionalArg++;
         }
     }
@@ -2303,7 +2301,7 @@ function addMetaInfoFromArg(name, addDescr) {
     descr.minArgRequired = minArg;
     descr.maxArgPossible = repeatingArg ? Infinity : countArg;
     descr.nbrArgRepeating = repeatingArg;
-    descr.nbrArgOptional = optionalArg;
+    descr.nbrOptionalNonRepeatingArgs = optionalArg;
     descr.hidden = addDescr.hidden || false;
     descr.name = name;
     return descr;
@@ -2331,9 +2329,9 @@ const cacheArgTargeting = {};
  * and rows representing the correspondence with the argument index.
  *
  * The tables are built based on the following conventions:
- * - `m`: Mandatory argument
- * - `o`: Optional argument
- * - `r`: Repeating argument
+ * - `m`: Mandatory argument (count as one argument)
+ * - `o`: Optional argument (count as zero or one argument)
+ * - `r`: Repeating argument (count as one or more arguments)
  *
  *
  * Configuration 1: (m, o) like the CEILING function
@@ -2346,39 +2344,39 @@ const cacheArgTargeting = {};
  *
  * Configuration 2: (m, m, m, r, r) like the SUMIFS function
  *
- * |   | 3 | 5 | 7    | 3 + 2n     |
- * |---|---|---|------|------------|
- * | m | 0 | 0 | 0    | 0          |
- * | m | 1 | 1 | 1    | 1          |
- * | m | 2 | 2 | 2    | 2          |
- * | r |   | 3 | 3, 5 | 3 + 2n     |
- * | r |   | 4 | 4, 6 | 3 + 2n + 1 |
+ * |   | 5 | 7    | 3 + 2n     |
+ * |---|---|------|------------|
+ * | m | 0 | 0    | 0          |
+ * | m | 1 | 1    | 1          |
+ * | m | 2 | 2    | 2          |
+ * | r | 3 | 3, 5 | 3 + 2n     |
+ * | r | 4 | 4, 6 | 3 + 2n + 1 |
  *
  *
  * Configuration 3: (m, m, m, r, r, o) like the SWITCH function
  *
- * |   | 3 | 4 | 5 | 6 | 7    | 8    | 3 + 2n     | 3 + 2n + 1     |
- * |---|---|---|---|---|------|------|------------|----------------|
- * | m | 0 | 0 | 0 | 0 | 0    | 0    | 0          | 0              |
- * | m | 1 | 1 | 1 | 1 | 1    | 1    | 1          | 1              |
- * | m | 2 | 2 | 2 | 2 | 2    | 2    | 2          | 2              |
- * | r |   |   | 3 | 3 | 3, 5 | 3, 5 | 3 + 2n     | 3 + 2n         |
- * | r |   |   | 4 | 4 | 4, 6 | 4, 6 | 3 + 2n + 1 | 3 + 2n + 1     |
- * | o |   | 3 |   | 5 |      | 7    |            | 3 + 2N + 2     |
+ * |   | 5 | 6 | 7    | 8    | 3 + 2n     | 3 + 2n + 1     |
+ * |---|---|---|------|------|------------|----------------|
+ * | m | 0 | 0 | 0    | 0    | 0          | 0              |
+ * | m | 1 | 1 | 1    | 1    | 1          | 1              |
+ * | m | 2 | 2 | 2    | 2    | 2          | 2              |
+ * | r | 3 | 3 | 3, 5 | 3, 5 | 3 + 2n     | 3 + 2n         |
+ * | r | 4 | 4 | 4, 6 | 4, 6 | 3 + 2n + 1 | 3 + 2n + 1     |
+ * | o |   | 5 |      | 7    |            | 3 + 2N + 2     |
  *
  *
  * Configuration 4: (m, o, m, o, r, r, r, m) a complex case to understand subtleties
  *
- * |   | 3 | 4 | 5 | 6 | 7 | 8 | 9    | 10   | 11   | ... |
- * |---|---|---|---|---|---|---|------|------|------|-----|
- * | m | 0 | 0 | 0 | 0 | 0 | 0 | 0    | 0    | 0    | ... |
- * | o |   | 1 | 1 |   | 1 | 1 |      | 1    | 1    | ... |
- * | m | 1 | 2 | 2 | 1 | 2 | 2 | 1    | 2    | 2    | ... |
- * | o |   |   | 3 |   |   | 3 |      |      | 3    | ... |
- * | r |   |   |   | 2 | 3 | 4 | 2, 5 | 3, 6 | 4, 7 | ... |
- * | r |   |   |   | 3 | 4 | 5 | 3, 6 | 4, 7 | 5, 8 | ... |
- * | r |   |   |   | 4 | 5 | 6 | 4, 7 | 5, 8 | 6, 9 | ... |
- * | m | 2 | 3 | 4 | 5 | 6 | 7 | 8    | 9    | 10   | ... |
+ * |   | 6 | 7 | 8 | 9    | 10   | 11   | ... |
+ * |---|---|---|---|------|------|------|-----|
+ * | m | 0 | 0 | 0 | 0    | 0    | 0    | ... |
+ * | o |   | 1 | 1 |      | 1    | 1    | ... |
+ * | m | 1 | 2 | 2 | 1    | 2    | 2    | ... |
+ * | o |   |   | 3 |      |      | 3    | ... |
+ * | r | 2 | 3 | 4 | 2, 5 | 3, 6 | 4, 7 | ... |
+ * | r | 3 | 4 | 5 | 3, 6 | 4, 7 | 5, 8 | ... |
+ * | r | 4 | 5 | 6 | 4, 7 | 5, 8 | 6, 9 | ... |
+ * | m | 5 | 6 | 7 | 8    | 9    | 10   | ... |
  *
  */
 function argTargeting(functionDescription, nbrArgSupplied) {
@@ -2397,30 +2395,31 @@ function argTargeting(functionDescription, nbrArgSupplied) {
 }
 function _argTargeting(functionDescription, nbrArgSupplied) {
     const valueIndexToArgPosition = {};
-    const groupsOfRepeatingValues = functionDescription.nbrArgRepeating
+    const groupsOfOptionalRepeatingValues = functionDescription.nbrArgRepeating
         ? Math.floor((nbrArgSupplied - functionDescription.minArgRequired) / functionDescription.nbrArgRepeating)
         : 0;
-    const nbrValueRepeating = functionDescription.nbrArgRepeating * groupsOfRepeatingValues;
-    const nbrValueOptional = nbrArgSupplied - functionDescription.minArgRequired - nbrValueRepeating;
+    const nbrValueOptionalRepeating = functionDescription.nbrArgRepeating * groupsOfOptionalRepeatingValues;
+    const nbrValueOptional = nbrArgSupplied - functionDescription.minArgRequired - nbrValueOptionalRepeating;
     let countValueSupplied = 0;
     let countValueOptional = 0;
     for (let i = 0; i < functionDescription.args.length; i++) {
         const arg = functionDescription.args[i];
-        if (arg.optional || arg.default) {
+        if ((arg.optional || arg.default) && !arg.repeating) {
             if (countValueOptional < nbrValueOptional) {
-                valueIndexToArgPosition[countValueSupplied] = i;
+                valueIndexToArgPosition[countValueSupplied] = { index: i };
                 countValueSupplied++;
             }
             countValueOptional++;
             continue;
         }
         if (arg.repeating) {
+            const groupOfMandatoryRepeatingValues = arg.optional ? 0 : 1;
             // As we know all repeating arguments are consecutive,
             // --> we will treat all repeating arguments in one go
             // --> the index i will be incremented by the number of repeating values at the end of the loop
-            for (let j = 0; j < groupsOfRepeatingValues; j++) {
+            for (let j = 0; j < groupsOfOptionalRepeatingValues + groupOfMandatoryRepeatingValues; j++) {
                 for (let k = 0; k < functionDescription.nbrArgRepeating; k++) {
-                    valueIndexToArgPosition[countValueSupplied] = i + k;
+                    valueIndexToArgPosition[countValueSupplied] = { index: i + k, repeatingGroupIndex: j };
                     countValueSupplied++;
                 }
             }
@@ -2428,7 +2427,7 @@ function _argTargeting(functionDescription, nbrArgSupplied) {
             continue;
         }
         // End case: it's a required argument
-        valueIndexToArgPosition[countValueSupplied] = i;
+        valueIndexToArgPosition[countValueSupplied] = { index: i };
         countValueSupplied++;
     }
     return (argPosition) => {
@@ -2440,7 +2439,7 @@ function _argTargeting(functionDescription, nbrArgSupplied) {
 //------------------------------------------------------------------------------
 const META_TYPES = ["META", "RANGE<META>"];
 function validateArguments(descr) {
-    if (descr.nbrArgRepeating && descr.nbrArgOptional >= descr.nbrArgRepeating) {
+    if (descr.nbrArgRepeating && descr.nbrOptionalNonRepeatingArgs >= descr.nbrArgRepeating) {
         throw new Error(`Function ${descr.name} has more optional arguments than repeatable ones.`);
     }
     let foundRepeating = false;
@@ -4126,7 +4125,7 @@ function createComputeFunction(descr) {
         const getArgToFocus = argTargeting(descr, args.length);
         //#region Compute vectorisation limits
         for (let i = 0; i < args.length; i++) {
-            const argIndex = getArgToFocus(i) ?? -1;
+            const argIndex = getArgToFocus(i).index ?? -1;
             const argDefinition = descr.args[argIndex];
             const arg = args[i];
             if (!isMatrix(arg) && argDefinition.acceptMatrixOnly) {
@@ -4140,7 +4139,7 @@ function createComputeFunction(descr) {
         for (let i = 0; i < args.length; i++) {
             const arg = args[i];
             const getArgToFocus = argTargeting(descr, args.length);
-            const argDefinition = descr.args[getArgToFocus(i) || i];
+            const argDefinition = descr.args[getArgToFocus(i).index ?? i];
             // Early exit if the argument is an error and the function does not accept errors
             // We only check scalar arguments, not matrix arguments for performance reasons.
             // Casting helpers are responsible for handling errors in matrix arguments.
@@ -4408,8 +4407,7 @@ const CHOOSECOLS = {
     description: _t$1("Creates a new array from the selected columns in the existing range."),
     args: [
         arg("array (any, range<any>)", _t$1("The array that contains the columns to be returned.")),
-        arg("col_num (number, range<number>)", _t$1("The first column index of the columns to be returned.")),
-        arg("col_num2 (number, range<number>, repeating)", _t$1("The columns indexes of the columns to be returned.")),
+        arg("col_num (number, range<number>, repeating)", _t$1("The column index of the column to be returned.")),
     ],
     compute: function (array, ...columns) {
         const _array = toMatrix(array);
@@ -4438,8 +4436,7 @@ const CHOOSEROWS = {
     description: _t$1("Creates a new array from the selected rows in the existing range."),
     args: [
         arg("array (any, range<any>)", _t$1("The array that contains the rows to be returned.")),
-        arg("row_num (number, range<number>)", _t$1("The first row index of the rows to be returned.")),
-        arg("row_num2 (number, range<number>, repeating)", _t$1("The rows indexes of the rows to be returned.")),
+        arg("row_num (number, range<number>, repeating)", _t$1("The row index of the row to be returned.")),
     ],
     compute: function (array, ...rows) {
         const _array = toMatrix(array);
@@ -4489,10 +4486,7 @@ const EXPAND = {
 // -----------------------------------------------------------------------------
 const FLATTEN = {
     description: _t$1("Flattens all the values from one or more ranges into a single column."),
-    args: [
-        arg("range (any, range<any>)", _t$1("The first range to flatten.")),
-        arg("range2 (any, range<any>, repeating)", _t$1("Additional ranges to flatten.")),
-    ],
+    args: [arg("range (any, range<any>, repeating)", _t$1("The range to flatten."))],
     compute: function (...ranges) {
         return [flattenRowFirst(ranges, (val) => (val === undefined ? { value: "" } : val))];
     },
@@ -4550,10 +4544,7 @@ const FREQUENCY = {
 // -----------------------------------------------------------------------------
 const HSTACK = {
     description: _t$1("Appends ranges horizontally and in sequence to return a larger array."),
-    args: [
-        arg("range1 (any, range<any>)", _t$1("The first range to be appended.")),
-        arg("range2 (any, range<any>, repeating)", _t$1("Additional ranges to add to range1.")),
-    ],
+    args: [arg("range (any, range<any>, repeating)", _t$1("The range to be appended."))],
     compute: function (...ranges) {
         const nbRows = Math.max(...ranges.map((r) => r?.[0]?.length ?? 0));
         const result = [];
@@ -4639,8 +4630,7 @@ const MMULT = {
 const SUMPRODUCT = {
     description: _t$1("Calculates the sum of the products of corresponding entries in equal-sized ranges."),
     args: [
-        arg("range1 (number, range<number>)", _t$1("The first range whose entries will be multiplied with corresponding entries in the other ranges.")),
-        arg("range2 (number, range<number>, repeating)", _t$1("The other range whose entries will be multiplied with corresponding entries in the other ranges.")),
+        arg("range (number, range<number>, repeating)", _t$1("The range whose entries will be multiplied with corresponding entries in the other range.")),
     ],
     compute: function (...args) {
         if (!areSameDimensions(...args)) {
@@ -4826,10 +4816,7 @@ const TRANSPOSE = {
 // -----------------------------------------------------------------------------
 const VSTACK = {
     description: _t$1("Appends ranges vertically and in sequence to return a larger array."),
-    args: [
-        arg("range1 (any, range<any>)", _t$1("The first range to be appended.")),
-        arg("range2 (any, range<any>, repeating)", _t$1("Additional ranges to add to range1.")),
-    ],
+    args: [arg("range (any, range<any>, repeating)", _t$1("The range to be appended."))],
     compute: function (...ranges) {
         const nbColumns = Math.max(...ranges.map((range) => toMatrix(range).length));
         const nbRows = ranges.reduce((acc, range) => acc + toMatrix(range)[0].length, 0);
@@ -6396,6 +6383,7 @@ const readonlyAllowedCommands = new Set([
     "COPY",
     "RESIZE_SHEETVIEW",
     "SET_VIEWPORT_OFFSET",
+    "SET_ZOOM",
     "EVALUATE_CELLS",
     "EVALUATE_CHARTS",
     "SET_FORMULA_VISIBILITY",
@@ -7111,8 +7099,7 @@ const COTH = {
 const COUNTBLANK = {
     description: _t$1("Number of empty values."),
     args: [
-        arg("value1 (any, range)", _t$1("The first value or range in which to count the number of blanks.")),
-        arg("value2 (any, range, repeating)", _t$1("Additional values or ranges in which to count the number of blanks.")),
+        arg("value (any, range, repeating)", _t$1("Value or range in which to count the number of blanks.")),
     ],
     compute: function (...args) {
         return reduceAny(args, (acc, a) => {
@@ -7154,10 +7141,8 @@ const COUNTIF = {
 const COUNTIFS = {
     description: _t$1("Count values depending on multiple criteria."),
     args: [
-        arg("criteria_range1 (range)", _t$1("The range to check against criterion1.")),
-        arg("criterion1 (string)", _t$1("The pattern or test to apply to criteria_range1.")),
-        arg("criteria_range2 (any, range, repeating)", _t$1("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
-        arg("criterion2 (string, repeating)", _t$1("Additional criteria to check.")),
+        arg("criteria_range (any, range, repeating)", _t$1("Range over which to evaluate criteria.")),
+        arg("criterion (string, repeating)", _t$1("Criteria to check.")),
     ],
     compute: function (...args) {
         let count = 0;
@@ -7173,10 +7158,7 @@ const COUNTIFS = {
 // -----------------------------------------------------------------------------
 const COUNTUNIQUE = {
     description: _t$1("Counts number of unique values in a range."),
-    args: [
-        arg("value1 (any, range)", _t$1("The first value or range to consider for uniqueness.")),
-        arg("value2 (any, range, repeating)", _t$1("Additional values or ranges to consider for uniqueness.")),
-    ],
+    args: [arg("value (any, range, repeating)", _t$1("Value or range to consider for uniqueness."))],
     compute: function (...args) {
         return countUnique(args);
     },
@@ -7188,10 +7170,8 @@ const COUNTUNIQUEIFS = {
     description: _t$1("Counts number of unique values in a range, filtered by a set of criteria."),
     args: [
         arg("range (range)", _t$1("The range of cells from which the number of unique values will be counted.")),
-        arg("criteria_range1 (range)", _t$1("The range of cells over which to evaluate criterion1.")),
-        arg("criterion1 (string)", _t$1("The pattern or test to apply to criteria_range1, such that each cell that evaluates to TRUE will be included in the filtered set.")),
-        arg("criteria_range2 (any, range, repeating)", _t$1("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
-        arg("criterion2 (string, repeating)", _t$1("The pattern or test to apply to criteria_range2.")),
+        arg("criteria_range (any, range, repeating)", _t$1("Range over which to evaluate criteria.")),
+        arg("criterion (string, repeating)", _t$1("Criteria to check.")),
     ],
     compute: function (range, ...args) {
         const uniqueValues = new Set();
@@ -7547,8 +7527,7 @@ const POWER = {
 const PRODUCT = {
     description: _t$1("Result of multiplying a series of numbers together."),
     args: [
-        arg("factor1 (number, range<number>)", _t$1("The first number or range to calculate for the product.")),
-        arg("factor2 (number, range<number>, repeating)", _t$1("More numbers or ranges to calculate for the product.")),
+        arg("factor (number, range<number>, repeating)", _t$1("Number or range to calculate for the product.")),
     ],
     compute: function (...factors) {
         let count = 0;
@@ -7880,8 +7859,7 @@ const SUBTOTAL = {
             ...subtotalFunctionOptionsIncludeHiddenRows,
             ...subtotalFunctionOptionsExcludeHiddenRows,
         ]),
-        arg("ref1 (meta, range<meta>)", _t$1("The range or reference for which you want the subtotal.")),
-        arg("ref2 (meta, range<meta>, repeating)", _t$1("Additional ranges or references for which you want the subtotal.")),
+        arg("ref (meta, range<meta>, repeating)", _t$1("Range or reference for which you want the subtotal.")),
     ],
     compute: function (functionCode, ...refs) {
         let code = toInteger(functionCode, this.locale);
@@ -7925,10 +7903,7 @@ const SUBTOTAL = {
 // -----------------------------------------------------------------------------
 const SUM = {
     description: _t$1("Sum of a series of numbers and/or cells."),
-    args: [
-        arg("value1 (number, range<number>)", _t$1("The first number or range to add together.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional numbers or ranges to add to value1.")),
-    ],
+    args: [arg("value (number, range<number>, repeating)", _t$1("Number or range to add together."))],
     compute: function (...values) {
         const v1 = values[0];
         return {
@@ -7970,10 +7945,8 @@ const SUMIFS = {
     description: _t$1("Sums a range depending on multiple criteria."),
     args: [
         arg("sum_range (range)", _t$1("The range to sum.")),
-        arg("criteria_range1 (range)", _t$1("The range to check against criterion1.")),
-        arg("criterion1 (string)", _t$1("The pattern or test to apply to criteria_range1.")),
-        arg("criteria_range2 (any, range, repeating)", _t$1("Additional ranges to check.")),
-        arg("criterion2 (string, repeating)", _t$1("Additional criteria to check.")),
+        arg("criteria_range (any, range, repeating)", _t$1("Range to check.")),
+        arg("criterion (string, repeating)", _t$1("Criteria to check.")),
     ],
     compute: function (sumRange, ...criters) {
         let sum = 0;
@@ -8455,8 +8428,7 @@ function centile(data, percent, isInclusive, locale) {
 const AVEDEV = {
     description: _t$1("Average magnitude of deviations from mean."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...values) {
         let count = 0;
@@ -8478,8 +8450,7 @@ const AVEDEV = {
 const AVERAGE = {
     description: _t$1("Numerical average value in a dataset, ignoring text."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range to consider when calculating the average value.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to consider when calculating the average value.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to consider when calculating the average value.")),
     ],
     compute: function (...values) {
         return {
@@ -8497,10 +8468,8 @@ const negativeWeightError = _t$1("[[FUNCTION_NAME]] expects the weight to be pos
 const AVERAGE_WEIGHTED = {
     description: _t$1("Weighted average."),
     args: [
-        arg("values (number, range<number>)", _t$1("Values to average.")),
-        arg("weights (number, range<number>)", _t$1("Weights for each corresponding value.")),
-        arg("additional_values (number, range<number>, repeating)", _t$1("Additional values to average.")),
-        arg("additional_weights (number, range<number>, repeating)", _t$1("Additional weights.")),
+        arg("values (number, range<number>, repeating)", _t$1("Value to average.")),
+        arg("weights (number, range<number>, repeating)", _t$1("Weight for each corresponding value.")),
     ],
     compute: function (...args) {
         let sum = 0;
@@ -8556,8 +8525,7 @@ const AVERAGE_WEIGHTED = {
 const AVERAGEA = {
     description: _t$1("Numerical average value in a dataset."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range to consider when calculating the average value.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to consider when calculating the average value.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to consider when calculating the average value.")),
     ],
     compute: function (...args) {
         let count = 0;
@@ -8610,10 +8578,8 @@ const AVERAGEIFS = {
     description: _t$1("Average of values depending on multiple criteria."),
     args: [
         arg("average_range (range)", _t$1("The range to average.")),
-        arg("criteria_range1 (range)", _t$1("The range to check against criterion1.")),
-        arg("criterion1 (string)", _t$1("The pattern or test to apply to criteria_range1.")),
-        arg("criteria_range2 (any, range, repeating)", _t$1("Additional criteria_range and criterion to check.")),
-        arg("criterion2 (string, repeating)", _t$1("The pattern or test to apply to criteria_range2.")),
+        arg("criteria_range (any, range, repeating)", _t$1("Range to check.")),
+        arg("criterion (string, repeating)", _t$1("Criterion to check.")),
     ],
     compute: function (averageRange, ...args) {
         const _averageRange = toMatrix(averageRange);
@@ -8639,8 +8605,7 @@ const AVERAGEIFS = {
 const COUNT = {
     description: _t$1("The number of numeric values in dataset."),
     args: [
-        arg("value1 (number, any, range<number>)", _t$1("The first value or range to consider when counting.")),
-        arg("value2 (number, any, range<number>, repeating)", _t$1("Additional values or ranges to consider when counting.")),
+        arg("value (number, any, range<number>, repeating)", _t$1("Value or range to consider when counting.")),
     ],
     compute: function (...values) {
         return countNumbers(values, this.locale);
@@ -8652,10 +8617,7 @@ const COUNT = {
 // -----------------------------------------------------------------------------
 const COUNTA = {
     description: _t$1("The number of values in a dataset."),
-    args: [
-        arg("value1 (any, range)", _t$1("The first value or range to consider when counting.")),
-        arg("value2 (any, range, repeating)", _t$1("Additional values or ranges to consider when counting.")),
-    ],
+    args: [arg("value (any, range, repeating)", _t$1("Value or range to consider when counting."))],
     compute: function (...values) {
         return countAny(values);
     },
@@ -8888,8 +8850,7 @@ const MATTHEWS = {
 const MAX = {
     description: _t$1("Maximum value in a numeric dataset."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range to consider when calculating the maximum value.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to consider when calculating the maximum value.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to consider when calculating the maximum value.")),
     ],
     compute: function (...values) {
         return max(values, this.locale);
@@ -8902,8 +8863,7 @@ const MAX = {
 const MAXA = {
     description: _t$1("Maximum numeric value in a dataset."),
     args: [
-        arg("value1 (any, range)", _t$1("The first value or range to consider when calculating the maximum value.")),
-        arg("value2 (any, range, repeating)", _t$1("Additional values or ranges to consider when calculating the maximum value.")),
+        arg("value (any, range, repeating)", _t$1("Value or range to consider when calculating the maximum value.")),
     ],
     compute: function (...args) {
         const maxa = reduceNumbersTextAs0(args, (acc, a) => {
@@ -8920,10 +8880,8 @@ const MAXIFS = {
     description: _t$1("Returns the maximum value in a range of cells, filtered by a set of criteria."),
     args: [
         arg("range (range)", _t$1("The range of cells from which the maximum will be determined.")),
-        arg("criteria_range1 (range)", _t$1("The range of cells over which to evaluate criterion1.")),
-        arg("criterion1 (string)", _t$1("The pattern or test to apply to criteria_range1, such that each cell that evaluates to TRUE will be included in the filtered set.")),
-        arg("criteria_range2 (any, range, repeating)", _t$1("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
-        arg("criterion2 (string, repeating)", _t$1("The pattern or test to apply to criteria_range2.")),
+        arg("criteria_range (any, range, repeating)", _t$1("Range to evaluate criteria.")),
+        arg("criterion (string, repeating)", _t$1("Criteria to check.")),
     ],
     compute: function (range, ...args) {
         let result = -Infinity;
@@ -8943,8 +8901,7 @@ const MAXIFS = {
 const MEDIAN = {
     description: _t$1("Median value in a numeric dataset."),
     args: [
-        arg("value1 (any, range)", _t$1("The first value or range to consider when calculating the median value.")),
-        arg("value2 (any, range, repeating)", _t$1("Additional values or ranges to consider when calculating the median value.")),
+        arg("value (any, range, repeating)", _t$1("Value or range to consider when calculating the median value.")),
     ],
     compute: function (...values) {
         const data = [];
@@ -8964,8 +8921,7 @@ const MEDIAN = {
 const MIN = {
     description: _t$1("Minimum value in a numeric dataset."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range to consider when calculating the minimum value.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to consider when calculating the minimum value.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to consider when calculating the minimum value.")),
     ],
     compute: function (...values) {
         return min(values, this.locale);
@@ -8978,8 +8934,7 @@ const MIN = {
 const MINA = {
     description: _t$1("Minimum numeric value in a dataset."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range to consider when calculating the minimum value.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to consider when calculating the minimum value.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to consider when calculating the minimum value.")),
     ],
     compute: function (...args) {
         const mina = reduceNumbersTextAs0(args, (acc, a) => {
@@ -8996,10 +8951,8 @@ const MINIFS = {
     description: _t$1("Returns the minimum value in a range of cells, filtered by a set of criteria."),
     args: [
         arg("range (range)", _t$1("The range of cells from which the minimum will be determined.")),
-        arg("criteria_range1 (range)", _t$1("The range of cells over which to evaluate criterion1.")),
-        arg("criterion1 (string)", _t$1("The pattern or test to apply to criteria_range1, such that each cell that evaluates to TRUE will be included in the filtered set.")),
-        arg("criteria_range2 (any, range, repeating)", _t$1("Additional ranges over which to evaluate the additional criteria. The filtered set will be the intersection of the sets produced by each criterion-range pair.")),
-        arg("criterion2 (string, repeating)", _t$1("The pattern or test to apply to criteria_range2.")),
+        arg("criteria_range (any, range, repeating)", _t$1("Range to evaluate criteria.")),
+        arg("criterion (string, repeating)", _t$1("Criterion to check.")),
     ],
     compute: function (range, ...args) {
         let result = Infinity;
@@ -9340,8 +9293,7 @@ const SPEARMAN = {
 const STDEV = {
     description: _t$1("Standard deviation."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...args) {
         return Math.sqrt(VAR.compute.bind(this)(...args));
@@ -9354,8 +9306,7 @@ const STDEV = {
 const STDEV_P = {
     description: _t$1("Standard deviation of entire population."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the population.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the population.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the population.")),
     ],
     compute: function (...args) {
         return Math.sqrt(VAR_P.compute.bind(this)(...args));
@@ -9368,8 +9319,7 @@ const STDEV_P = {
 const STDEV_S = {
     description: _t$1("Standard deviation."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...args) {
         return Math.sqrt(VAR_S.compute.bind(this)(...args));
@@ -9382,8 +9332,7 @@ const STDEV_S = {
 const STDEVA = {
     description: _t$1("Standard deviation of sample (text as 0)."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...args) {
         return Math.sqrt(VARA.compute.bind(this)(...args));
@@ -9396,8 +9345,7 @@ const STDEVA = {
 const STDEVP = {
     description: _t$1("Standard deviation of entire population."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the population.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the population.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the population.")),
     ],
     compute: function (...args) {
         return Math.sqrt(VARP.compute.bind(this)(...args));
@@ -9410,8 +9358,7 @@ const STDEVP = {
 const STDEVPA = {
     description: _t$1("Standard deviation of entire population (text as 0)."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the population.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the population.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the population.")),
     ],
     compute: function (...args) {
         return Math.sqrt(VARPA.compute.bind(this)(...args));
@@ -9461,8 +9408,7 @@ const TREND = {
 const VAR = {
     description: _t$1("Variance."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...args) {
         return variance(args, true, false, this.locale);
@@ -9475,8 +9421,7 @@ const VAR = {
 const VAR_P = {
     description: _t$1("Variance of entire population."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the population.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the population.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the population.")),
     ],
     compute: function (...args) {
         return variance(args, false, false, this.locale);
@@ -9489,8 +9434,7 @@ const VAR_P = {
 const VAR_S = {
     description: _t$1("Variance."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...args) {
         return variance(args, true, false, this.locale);
@@ -9503,8 +9447,7 @@ const VAR_S = {
 const VARA = {
     description: _t$1("Variance of sample (text as 0)."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the sample.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the sample.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the sample.")),
     ],
     compute: function (...args) {
         return variance(args, true, true, this.locale);
@@ -9517,8 +9460,7 @@ const VARA = {
 const VARP = {
     description: _t$1("Variance of entire population."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the population.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the population.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the population.")),
     ],
     compute: function (...args) {
         return variance(args, false, false, this.locale);
@@ -9531,8 +9473,7 @@ const VARP = {
 const VARPA = {
     description: _t$1("Variance of entire population (text as 0)."),
     args: [
-        arg("value1 (number, range<number>)", _t$1("The first value or range of the population.")),
-        arg("value2 (number, range<number>, repeating)", _t$1("Additional values or ranges to include in the population.")),
+        arg("value (number, range<number>, repeating)", _t$1("Value or range to include in the population.")),
     ],
     compute: function (...args) {
         return variance(args, false, true, this.locale);
@@ -11436,8 +11377,7 @@ const FILTER = {
     // TODO modify args description when vectorization on formulas is available
     args: [
         arg("range (any, range<any>)", _t$1("The data to be filtered.")),
-        arg("condition1 (boolean, range<boolean>)", _t$1("A column or row containing true or false values corresponding to the first column or row of range.")),
-        arg("condition2 (boolean, range<boolean>, repeating)", _t$1("Additional column or row containing true or false values.")),
+        arg("condition (boolean, range<boolean>, repeating)", _t$1("Column or row containing true or false values corresponding to the range.")),
     ],
     compute: function (range, ...conditions) {
         let _array = toMatrix(range);
@@ -11477,8 +11417,8 @@ const SORT = {
     description: _t$1("Sorts the rows of a given array or range by the values in one or more columns."),
     args: [
         arg("range (range)", _t$1("The data to be sorted.")),
-        arg("sort_column (any, range<number>, repeating)", _t$1("The index of the column in range or a range outside of range containing the values by which to sort.")),
-        arg("is_ascending (boolean, repeating)", _t$1("TRUE or FALSE indicating whether to sort sort_column in ascending order."), [
+        arg("sort_column (any, range<number>, repeating, optional)", _t$1("The index of the column in range or a range outside of range containing the value by which to sort.")),
+        arg("is_ascending (boolean, repeating, optional)", _t$1("TRUE or FALSE indicating whether to sort sort_column in ascending order. FALSE sorts in descending order."), [
             { value: true, label: _t$1("Ascending") },
             { value: false, label: _t$1("Descending") },
         ]),
@@ -11498,8 +11438,8 @@ const SORTN = {
         arg("range (range)", _t$1("The data to be sorted.")),
         arg("n (number)", _t$1("The number of items to return.")),
         arg("display_ties_mode (number, default=0)", _t$1("A number representing the way to display ties.")),
-        arg("sort_column (number, range<number>, repeating)", _t$1("The index of the column in range or a range outside of range containing the values by which to sort.")),
-        arg("is_ascending (boolean, repeating)", _t$1("TRUE or FALSE indicating whether to sort sort_column in ascending order."), [
+        arg("sort_column (number, range<number>, repeating, optional)", _t$1("The index of the column in range or a range outside of range containing the value by which to sort.")),
+        arg("is_ascending (boolean, repeating, optional)", _t$1("TRUE or FALSE indicating whether to sort sort_column in ascending order. FALSE sorts in descending order."), [
             { value: true, label: _t$1("Ascending") },
             { value: false, label: _t$1("Descending") },
         ]),
@@ -12767,8 +12707,7 @@ const NPV = {
     description: _t$1("The net present value of an investment based on a series of periodic cash flows and a discount rate."),
     args: [
         arg("discount (number)", _t$1("The discount rate of the investment over one period.")),
-        arg("cashflow1 (number, range<number>)", _t$1("The first future cash flow.")),
-        arg("cashflow2 (number, range<number>, repeating)", _t$1("Additional future cash flows.")),
+        arg("cashflow (number, range<number>, repeating)", _t$1("The future cash flows.")),
     ],
     // to do: replace by dollar format
     compute: function (discount, ...values) {
@@ -14123,8 +14062,7 @@ function boolOr(args) {
 const AND = {
     description: _t$1("Logical `and` operator."),
     args: [
-        arg("logical_expression1 (boolean, range<boolean>)", _t$1("An expression or reference to a cell containing an expression that represents some logical value, i.e. TRUE or FALSE, or an expression that can be coerced to a logical value.")),
-        arg("logical_expression2 (boolean, range<boolean>, repeating)", _t$1("More expressions that represent logical values.")),
+        arg("logical_expression (boolean, range<boolean>, repeating)", _t$1("Expression or reference to a cell containing a logical value (TRUE/FALSE) or an expression that can be coerced to a logical value.")),
     ],
     compute: function (...logicalExpressions) {
         const { result, foundBoolean } = boolAnd(logicalExpressions);
@@ -14207,10 +14145,8 @@ const IFNA = {
 const IFS = {
     description: _t$1("Returns a value depending on multiple logical expressions."),
     args: [
-        arg("condition1 (boolean, range<boolean>)", _t$1("The first condition to be evaluated. This can be a boolean, a number, an array, or a reference to any of those.")),
-        arg("value1 (any, range)", _t$1("The returned value if condition1 is TRUE.")),
-        arg("condition2 (boolean, any, range, repeating)", _t$1("Additional conditions to be evaluated if the previous ones are FALSE.")),
-        arg("value2 (any, range, repeating)", _t$1("Additional values to be returned if their corresponding conditions are TRUE.")),
+        arg("condition (any, range, repeating)", _t$1("The condition to be evaluated. It can be a boolean, a number, an array, or a reference to any of those.")),
+        arg("value (any, range, repeating)", _t$1("The value to be returned if its corresponding condition is TRUE.")),
     ],
     compute: function (...values) {
         if (values.length % 2 !== 0) {
@@ -14249,8 +14185,7 @@ const NOT = {
 const OR = {
     description: _t$1("Logical `or` operator."),
     args: [
-        arg("logical_expression1 (boolean, range<boolean>)", _t$1("An expression or reference to a cell containing an expression that represents some logical value, i.e. TRUE or FALSE, or an expression that can be coerced to a logical value.")),
-        arg("logical_expression2 (boolean, range<boolean>, repeating)", _t$1("More expressions that evaluate to logical values.")),
+        arg("logical_expression (boolean, range<boolean>, repeating)", _t$1("Expression or reference to a cell containing a logical value (TRUE/FALSE) or an expression that can be coerced to a logical value.")),
     ],
     compute: function (...logicalExpressions) {
         const { result, foundBoolean } = boolOr(logicalExpressions);
@@ -14268,10 +14203,8 @@ const SWITCH = {
     description: _t$1("Returns a value by comparing cases to an expression."),
     args: [
         arg("expression (number, boolean, string)", _t$1("The value to be checked.")),
-        arg("case1 (number, boolean, string)", _t$1("The first case to be checked against expression.")),
-        arg("value1 (any)", _t$1("The corresponding value to be returned if case1 matches expression.")),
-        arg("case2 (any, repeating)", _t$1("Additional cases to try if the previous ones don't match expression.")),
-        arg("value2 (any, repeating)", _t$1("Additional values to be returned if their corresponding cases match expression.")),
+        arg("case (any, repeating)", _t$1("Case to be checked against expression.")),
+        arg("value (any, repeating)", _t$1("Value to be returned if its corresponding case matches expression.")),
         arg(`default (any, default="empty")`, _t$1("An optional default value to be returned if none of the cases match expression.")),
     ],
     compute: function (expression, ...casesAndValues) {
@@ -14306,8 +14239,7 @@ const TRUE = {
 const XOR = {
     description: _t$1("Logical `xor` operator."),
     args: [
-        arg("logical_expression1 (boolean, range<boolean>)", _t$1("An expression or reference to a cell containing an expression that represents some logical value, i.e. TRUE or FALSE, or an expression that can be coerced to a logical value.")),
-        arg("logical_expression2 (boolean, range<boolean>, repeating)", _t$1("More expressions that evaluate to logical values.")),
+        arg("logical_expression (boolean, range<boolean>, repeating)", _t$1("Expression or reference to a cell containing a logical value (TRUE/FALSE) or an expression that can be coerced to a logical value.")),
     ],
     compute: function (...logicalExpressions) {
         let foundBoolean = false;
@@ -15820,8 +15752,8 @@ const PIVOT_VALUE = {
     args: [
         arg("pivot_id (number,string)", _t$1("ID of the pivot.")),
         arg("measure_name (string)", _t$1("Name of the measure.")),
-        arg("domain_field_name (string,repeating)", _t$1("Field name.")),
-        arg("domain_value (number,string,boolean,repeating)", _t$1("Value.")),
+        arg("domain_field_name (string,repeating,optional)", _t$1("Field name.")),
+        arg("domain_value (number,string,boolean,repeating,optional)", _t$1("Value.")),
     ],
     compute: function (formulaId, measureName, ...domainArgs) {
         const _pivotFormulaId = toString(formulaId);
@@ -15856,8 +15788,8 @@ const PIVOT_HEADER = {
     description: _t$1("Get the header of a pivot."),
     args: [
         arg("pivot_id (number,string)", _t$1("ID of the pivot.")),
-        arg("domain_field_name (string,repeating)", _t$1("Field name.")),
-        arg("domain_value (number,string,value,repeating)", _t$1("Value.")),
+        arg("domain_field_name (string,repeating,optional)", _t$1("Field name.")),
+        arg("domain_value (number,string,value,repeating,optional)", _t$1("Value.")),
     ],
     compute: function (pivotId, ...domainArgs) {
         const _pivotFormulaId = toString(pivotId);
@@ -16728,10 +16660,7 @@ const CLEAN = {
 // -----------------------------------------------------------------------------
 const CONCATENATE = {
     description: _t$1("Appends strings to one another."),
-    args: [
-        arg("string1 (string, range<string>)", _t$1("The initial string.")),
-        arg("string2 (string, range<string>, repeating)", _t$1("More strings to append in sequence.")),
-    ],
+    args: [arg("string (string, range<string>, repeating)", _t$1("String to append in sequence."))],
     compute: function (...datas) {
         return reduceAny(datas, (acc, a) => acc + toString(a), "");
     },
@@ -16786,8 +16715,7 @@ const JOIN = {
     description: _t$1("Concatenates elements of arrays with delimiter."),
     args: [
         arg("delimiter (string)", _t$1("The character or string to place between each concatenated value.")),
-        arg("value_or_array1 (string, range<string>)", _t$1("The value or values to be appended using delimiter.")),
-        arg("value_or_array2 (string, range<string>, repeating)", _t$1("More values to be appended using delimiter.")),
+        arg("value_or_array (string, range<string>, repeating)", _t$1("Value to be appended using delimiter.")),
     ],
     compute: function (delimiter, ...valuesOrArrays) {
         const _delimiter = toString(delimiter);
@@ -17078,13 +17006,12 @@ const TEXTJOIN_DEFAULT_IGNORE_EMPTY = true;
 const TEXTJOIN = {
     description: _t$1("Combines text from multiple strings and/or arrays."),
     args: [
-        arg("delimiter (string)", _t$1(" A string, possible empty, or a reference to a valid string. If empty, the text will be simply concatenated.")),
+        arg("delimiter (string)", _t$1("A string, possible empty, or a reference to a valid string. If empty, the text will be simply concatenated.")),
         arg("ignore_empty (boolean)", _t$1("A boolean; if TRUE, empty cells selected in the text arguments won't be included in the result."), [
             { value: true, label: _t$1("Ignore empty cells") },
             { value: false, label: _t$1("Include empty cells (default)") },
         ]),
-        arg("text1 (string, range<string>)", _t$1("Any text item. This could be a string, or an array of strings in a range.")),
-        arg("text2 (string, range<string>, repeating)", _t$1("Additional text item(s).")),
+        arg("texts (string, range<string>, repeating)", _t$1("Text item to join.")),
     ],
     compute: function (delimiter, ignoreEmpty = { value: TEXTJOIN_DEFAULT_IGNORE_EMPTY }, ...textsOrArrays) {
         const _delimiter = toString(delimiter);
@@ -22972,6 +22899,66 @@ class ScorecardChartConfigBuilder {
     }
 }
 
+/**
+ * Return a POJO containing the original event as well as the client position and the client offset
+ * where the event would target if the spreadsheet was not zoomed
+ * @param ev unzoomed mouse event
+ * @param originalTargetRect The original target bounding rect the resulting ZoomedMouseEvent offset must refer to
+ * @returns a ZoomedMouseEvent
+ */
+function withZoom(env, ev, originalTargetRect) {
+    const zoomLevel = env.model.getters.getViewportZoomLevel();
+    if (originalTargetRect === undefined) {
+        originalTargetRect = getZoomTargetBoundingRect(ev);
+    }
+    if (!originalTargetRect)
+        return withNoZoom(ev);
+    const baseOffsetX = ev.clientX - originalTargetRect.left;
+    const baseOffsetY = ev.clientY - originalTargetRect.top;
+    const offsetX = baseOffsetX / zoomLevel;
+    const offsetY = baseOffsetY / zoomLevel;
+    return {
+        ev,
+        clientX: ev.clientX - baseOffsetX + offsetX,
+        clientY: ev.clientY - baseOffsetY + offsetY,
+        offsetX,
+        offsetY,
+    };
+}
+function withNoZoom(ev) {
+    return {
+        ev,
+        clientX: ev.clientX,
+        clientY: ev.clientY,
+        offsetX: ev.offsetX,
+        offsetY: ev.offsetY,
+    };
+}
+/**
+ * Return a Rect with position and size on the zoomed canvas
+ */
+function getZoomedRect(zoom, rect) {
+    return {
+        height: rect.height * zoom,
+        width: rect.width * zoom,
+        x: rect.x * zoom,
+        y: rect.y * zoom,
+    };
+}
+/**
+ * Returns the bounding rect of the closest or self element who is targetable by a ZoomedMouseEvent
+ */
+function getZoomTargetBoundingRect(ev) {
+    const target = ev.target;
+    if (!target || !("classList" in target) || !(target instanceof Element)) {
+        return null;
+    }
+    const targetEl = target.classList.contains("o-zoomable") ? target : target.closest(".o-zoomable");
+    if (!targetEl)
+        return null;
+    return targetEl.getBoundingClientRect();
+}
+
 class ScorecardChart extends Component {
     static template = "o-spreadsheet-ScorecardChart";
     static props = {
@@ -22995,7 +22982,8 @@ class ScorecardChart extends Component {
     }
     createChart() {
         const canvas = this.canvas.el;
-        const config = getScorecardConfiguration(canvas.getBoundingClientRect(), this.runtime);
+        const zoom = this.env.model.getters.getViewportZoomLevel();
+        const config = getScorecardConfiguration(getZoomedRect(1 / zoom, canvas.getBoundingClientRect()), this.runtime);
         drawScoreChart(config, canvas);
     }
 }
@@ -23114,8 +23102,7 @@ function isChildEvent(parent, ev) {
 function gridOverlayPosition() {
     const spreadsheetElement = document.querySelector(".o-grid-overlay");
     if (spreadsheetElement) {
-        const { top, left } = spreadsheetElement.getBoundingClientRect();
-        return { top, left };
+        return spreadsheetElement.getBoundingClientRect();
     }
     throw new Error("Can't find spreadsheet position");
 }
@@ -26257,7 +26244,7 @@ function compileTokensOrThrow(tokens) {
             const compiledArgs = [];
             const argToFocus = argTargeting(functionDefinition, args.length);
             for (let i = 0; i < args.length; i++) {
-                const argDefinition = functionDefinition.args[argToFocus(i) ?? -1];
+                const argDefinition = functionDefinition.args[argToFocus(i).index ?? -1];
                 const currentArg = args[i];
                 const argTypes = argDefinition.type || [];
                 // detect when an argument need to be evaluated as a meta argument
@@ -26436,12 +26423,15 @@ function assertEnoughArgs(ast) {
     }
     if (nbrArgRepeating > 1) {
         const nbrValueRepeating = nbrArgRepeating * Math.floor((nbrArgSupplied - minArgRequired) / nbrArgRepeating);
-        const nbrValueRemaining = nbrArgSupplied - minArgRequired - nbrValueRepeating - functionDefinition.nbrArgOptional;
+        const nbrValueRemaining = nbrArgSupplied -
+            minArgRequired -
+            nbrValueRepeating -
+            functionDefinition.nbrOptionalNonRepeatingArgs;
         if (nbrValueRemaining > 0) {
             throw new BadExpressionError(_t$1("Invalid number of arguments for the %(functionName)s function. Repeatable arguments should be supplied in groups of %(nbrArgRepeating)s, with up to %(nbrArgOptional)s optional. Got %(nbrValueRemaining)s too many.", {
                 functionName,
                 nbrArgRepeating,
-                nbrArgOptional: functionDefinition.nbrArgOptional,
+                nbrArgOptional: functionDefinition.nbrOptionalNonRepeatingArgs,
                 nbrValueRemaining,
             }));
         }
@@ -44838,8 +44828,24 @@ function astToDoc(ast) {
         case "REFERENCE":
             return ast.value;
         case "FUNCALL":
-            const docs = ast.args.map(astToDoc);
-            return wrapInParentheses(concat(docs.map((doc, i) => (i < 1 ? doc : concat([", ", line(), doc])))), ast.value);
+            const functionDescription = functionRegistry.get(ast.value.toUpperCase());
+            const getArgToFocus = argTargeting(functionDescription, ast.args.length);
+            const docs = [];
+            let i = 0;
+            while (i < ast.args.length) {
+                const isRepeating = functionDescription.args[getArgToFocus(i).index ?? -1]?.repeating;
+                if (isRepeating) {
+                    const repeatingArgSeries = ast.args.slice(i, i + functionDescription.nbrArgRepeating);
+                    const docsSeries = repeatingArgSeries.map((arg) => astToDoc(arg));
+                    docs.push(group(concat(splitArgsWithCommas(docsSeries))));
+                    i += functionDescription.nbrArgRepeating;
+                }
+                else {
+                    docs.push(astToDoc(ast.args[i]));
+                    i++;
+                }
+            }
+            return wrapInParentheses(concat(splitArgsWithCommas(docs)), ast.value);
         case "UNARY_OPERATION":
             const operandDoc = astToDoc(ast.operand);
             const needParenthesis = ast.postfix
@@ -44865,6 +44871,14 @@ function astToDoc(ast) {
             return "";
     }
 }
+function splitArgsWithCommas(docs) {
+    const result = docs.length ? [docs[0]] : [];
+    for (let i = 1; i < docs.length; i++) {
+        result.push(", ", line());
+        result.push(docs[i]);
+    }
+    return result;
+}
 /**
  * Wraps a `Doc` in parentheses (with optional function name).
  */
@@ -46472,6 +46486,7 @@ pivotRegistry.add("SPREADSHEET", {
     isMeasureCandidate: (field) => field.type !== "boolean",
     isGroupable: () => true,
     canHaveCustomGroup: (field) => field.type === "char" && !field.isCustomField,
+    isPivotUnused: () => true,
 });
 
 const UNDO_REDO_PIVOT_COMMANDS = ["ADD_PIVOT", "UPDATE_PIVOT", "REMOVE_PIVOT"];
@@ -46490,7 +46505,7 @@ class PivotUIPlugin extends CoreViewPlugin {
         "isSpillPivotFormula",
     ];
     pivots = {};
-    unusedPivots;
+    unusedPivotsInFormulas;
     custom;
     constructor(config) {
         super(config);
@@ -46530,12 +46545,12 @@ class PivotUIPlugin extends CoreViewPlugin {
             }
             case "DELETE_SHEET":
             case "UPDATE_CELL": {
-                this.unusedPivots = undefined;
+                this.unusedPivotsInFormulas = undefined;
                 break;
             }
             case "UNDO":
             case "REDO": {
-                this.unusedPivots = undefined;
+                this.unusedPivotsInFormulas = undefined;
                 const pivotCommands = cmd.commands.filter(isPivotCommand);
                 for (const cmd of pivotCommands) {
                     const pivotId = cmd.pivotId;
@@ -46694,7 +46709,9 @@ class PivotUIPlugin extends CoreViewPlugin {
         return this.pivots[pivotId];
     }
     isPivotUnused(pivotId) {
-        return this._getUnusedPivots().includes(pivotId);
+        const { type } = this.getters.getPivot(pivotId);
+        return (this._getUnusedPivotsInFormulas().includes(pivotId) &&
+            pivotRegistry.get(type).isPivotUnused(this.getters, pivotId));
     }
     getPivotCellSortDirection(position) {
         const pivotId = this.getters.getPivotIdFromPosition(position);
@@ -46730,9 +46747,9 @@ class PivotUIPlugin extends CoreViewPlugin {
             this.pivots[pivotId].onDefinitionChange(definition);
         }
     }
-    _getUnusedPivots() {
-        if (this.unusedPivots !== undefined) {
-            return this.unusedPivots;
+    _getUnusedPivotsInFormulas() {
+        if (this.unusedPivotsInFormulas !== undefined) {
+            return this.unusedPivotsInFormulas;
         }
         const unusedPivots = new Set(this.getters.getPivotIds());
         for (const sheetId of this.getters.getSheetIds()) {
@@ -46742,14 +46759,14 @@ class PivotUIPlugin extends CoreViewPlugin {
                 if (pivotId) {
                     unusedPivots.delete(pivotId);
                     if (!unusedPivots.size) {
-                        this.unusedPivots = [];
+                        this.unusedPivotsInFormulas = [];
                         return [];
                     }
                 }
             }
         }
-        this.unusedPivots = [...unusedPivots];
-        return this.unusedPivots;
+        this.unusedPivotsInFormulas = [...unusedPivots];
+        return this.unusedPivotsInFormulas;
     }
 }
 
@@ -52154,6 +52171,7 @@ class SheetViewPlugin extends UIPlugin {
         "getVisibleFigures",
         "getVisibleRect",
         "getVisibleRectWithoutHeaders",
+        "getVisibleRectWithZoom",
         "getVisibleCellPositions",
         "getColRowOffsetInViewport",
         "getMainViewportCoordinates",
@@ -52169,6 +52187,8 @@ class SheetViewPlugin extends UIPlugin {
         "getFigureUI",
         "getPositionAnchorOffset",
         "getGridOffset",
+        "getViewportZoomLevel",
+        "getScrollBarWidth",
     ];
     viewports = {};
     /**
@@ -52181,6 +52201,7 @@ class SheetViewPlugin extends UIPlugin {
     sheetViewHeight = getDefaultSheetViewSize();
     gridOffsetX = 0;
     gridOffsetY = 0;
+    zoomLevel = 1;
     sheetsWithDirtyViewports = new Set();
     shouldAdjustViewports = false;
     // ---------------------------------------------------------------------------
@@ -52247,6 +52268,9 @@ class SheetViewPlugin extends UIPlugin {
             case "SET_VIEWPORT_OFFSET":
                 this.setSheetViewOffset(cmd.offsetX, cmd.offsetY);
                 break;
+            case "SET_ZOOM":
+                this.zoomLevel = cmd.zoom || 1;
+                break;
             case "SHIFT_VIEWPORT_DOWN":
                 const sheetId = this.getters.getActiveSheetId();
                 const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
@@ -52450,7 +52474,7 @@ class SheetViewPlugin extends UIPlugin {
         for (const i of relevantIndexes) {
             offset += this.getters.getHeaderSize(sheetId, dimension, i);
         }
-        return offset;
+        return offset * this.zoomLevel;
     }
     /**
      * Check if a given position is visible in the viewport.
@@ -52458,6 +52482,9 @@ class SheetViewPlugin extends UIPlugin {
     isVisibleInViewport({ sheetId, col, row }) {
         return this.getSubViewports(sheetId).some((pane) => pane.isVisible(col, row));
     }
+    getScrollBarWidth() {
+        return SCROLLBAR_WIDTH / this.zoomLevel;
+    }
     // => returns the new offset
     getEdgeScrollCol(x, previousX, startingX) {
         let canEdgeScroll = false;
@@ -52536,6 +52563,18 @@ class SheetViewPlugin extends UIPlugin {
         const rect = this.getVisibleRectWithoutHeaders(zone);
         return { ...rect, x: rect.x + this.gridOffsetX, y: rect.y + this.gridOffsetY };
     }
+    /**
+     * Computes the coordinates and size to draw the zone on the canvas after it has been zoomed
+     */
+    getVisibleRectWithZoom(zone) {
+        const zoom = this.getViewportZoomLevel();
+        const rect = this.getVisibleRectWithoutHeaders(zone);
+        rect.width = rect.width * zoom;
+        rect.height = rect.height * zoom;
+        rect.x = rect.x * zoom + this.gridOffsetX * zoom;
+        rect.y = rect.y * zoom + this.gridOffsetY * zoom;
+        return rect;
+    }
     /**
      * Computes the coordinates and size to draw the zone without taking the grid offset into account
      */
@@ -52617,6 +52656,9 @@ class SheetViewPlugin extends UIPlugin {
             };
         });
     }
+    getViewportZoomLevel() {
+        return this.zoomLevel;
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -58264,22 +58306,26 @@ class ZoomableChartJsComponent extends ChartJsComponent {
     }
     onPointerDownInMasterChart(ev) {
         this.removeEventListeners();
-        const position = ev.offsetX;
+        const zoomedEvent = withZoom(this.env, ev, this.masterChartCanvas.el?.getBoundingClientRect());
+        const position = zoomedEvent.offsetX;
         if (!this.masterChart?.chartArea || !this.chart?.scales?.x) {
             return;
         }
         const { left, right, top, bottom } = this.masterChart.chartArea;
         const xMax = this.upperBound ?? right;
         const xMin = this.lowerBound ?? left;
-        if (position < left - 5 || position > right + 5 || ev.offsetY < top || ev.offsetY > bottom) {
+        if (position < left - 5 ||
+            position > right + 5 ||
+            zoomedEvent.offsetY < top ||
+            zoomedEvent.offsetY > bottom) {
             return;
         }
         ev.preventDefault();
         ev.stopPropagation();
         let startingPositionOnChart, windowSize, startX;
-        const startingEventPosition = ev.clientX - (this.masterChartCanvas.el?.getBoundingClientRect().left ?? 0);
+        const startingEventPosition = position;
         if ((xMin !== left || xMax !== right) && position > xMin + 5 && position < xMax - 5) {
-            startingPositionOnChart = ev.offsetX - xMin;
+            startingPositionOnChart = zoomedEvent.offsetX - xMin;
             this.mode = "moveInMaster";
             const currentLimits = this.store.currentAxesLimits[this.chartId]?.x;
             windowSize =
@@ -58328,7 +58374,8 @@ class ZoomableChartJsComponent extends ChartJsComponent {
             return { min: xMin, max: xMax };
         };
         const onDragFromMasterChart = (ev) => {
-            const position = ev.clientX - (this.masterChartCanvas.el?.getBoundingClientRect().left ?? 0);
+            const zoomedEvent = withZoom(this.env, ev, this.masterChartCanvas.el?.getBoundingClientRect());
+            const position = zoomedEvent.offsetX;
             if (Math.abs(position - startingEventPosition) < 5) {
                 return;
             }
@@ -58339,7 +58386,8 @@ class ZoomableChartJsComponent extends ChartJsComponent {
         };
         const onPointerUpInMasterChart = (ev) => {
             this.removeEventListeners();
-            const position = ev.clientX - (this.masterChartCanvas.el?.getBoundingClientRect().left ?? 0);
+            const zoomedEvent = withZoom(this.env, ev, this.masterChartCanvas.el?.getBoundingClientRect());
+            const position = zoomedEvent.offsetX;
             if (Math.abs(position - startingEventPosition) > 5) {
                 let { min: xMin, max: xMax } = computeNewAxisLimits(position);
                 if (xMin !== undefined && xMax !== undefined) {
@@ -58366,7 +58414,7 @@ class ZoomableChartJsComponent extends ChartJsComponent {
         window.addEventListener("pointerup", onPointerUpInMasterChart, true);
     }
     onPointerMoveInMasterChart(ev) {
-        const { offsetX: x, offsetY: y } = ev;
+        const { offsetX: x, offsetY: y } = withZoom(this.env, ev, ev.target?.getBoundingClientRect());
         if (this.mode === undefined) {
             const target = ev.target;
             if (!this.masterChart?.chartArea) {
@@ -58399,7 +58447,8 @@ class ZoomableChartJsComponent extends ChartJsComponent {
     }
     onDoubleClickInMasterChart(ev) {
         this.mode = undefined;
-        const position = ev.offsetX;
+        const zoomedEvent = withZoom(this.env, ev, this.masterChartCanvas.el?.getBoundingClientRect());
+        const position = zoomedEvent.offsetX;
         if (!this.masterChart?.chartArea || !this.chart?.scales.x) {
             return;
         }
@@ -58409,7 +58458,10 @@ class ZoomableChartJsComponent extends ChartJsComponent {
         if (upperBound < lowerBound) {
             [upperBound, lowerBound] = [lowerBound, upperBound];
         }
-        if (position < left - 5 || position > right + 5 || ev.offsetY < top || ev.offsetY > bottom) {
+        if (position < left - 5 ||
+            position > right + 5 ||
+            zoomedEvent.offsetY < top ||
+            zoomedEvent.offsetY > bottom) {
             return;
         }
         ev.preventDefault();
@@ -58844,7 +58896,7 @@ class GaugeChartComponent extends Component {
         });
     }
     drawGaugeWithAnimation() {
-        drawGaugeChart(this.canvasEl, { ...this.runtime, animationValue: 0 });
+        drawGaugeChart(this.canvasEl, { ...this.runtime, animationValue: 0 }, undefined);
         const gaugeValue = this.runtime.gaugeValue?.value || 0;
         const upperBound = this.runtime.maxValue.value;
         const finalValue = Math.sign(gaugeValue) * Math.min(Math.abs(gaugeValue), Math.abs(upperBound));
@@ -58852,7 +58904,7 @@ class GaugeChartComponent extends Component {
             return null;
         }
         const lowerBound = this.runtime.minValue.value;
-        const animation = new Animation(lowerBound, finalValue, ANIMATION_DURATION, (animationValue) => drawGaugeChart(this.canvasEl, { ...this.runtime, animationValue }));
+        const animation = new Animation(lowerBound, finalValue, ANIMATION_DURATION, (animationValue) => drawGaugeChart(this.canvasEl, { ...this.runtime, animationValue }, undefined));
         animation.start();
         return animation;
     }
@@ -60072,7 +60124,13 @@ class FigureComponent extends Component {
     onContextMenu(ev) {
         if (this.env.isDashboard())
             return;
-        this.openContextMenu({ x: ev.clientX, y: ev.clientY, width: 0, height: 0 });
+        const zoomedMouseEvent = withZoom(this.env, ev);
+        this.openContextMenu({
+            x: zoomedMouseEvent.clientX,
+            y: zoomedMouseEvent.clientY,
+            width: 0,
+            height: 0,
+        });
     }
     showMenu() {
         this.openContextMenu(getRefBoundingRect(this.menuButtonRef));
@@ -61908,7 +61966,7 @@ class ContentEditableHelper {
                 else {
                     text += NEWLINE;
                 }
-                emptyParagraph = ["<br>", "<span><br></span>"].includes(current.value.innerHTML);
+                emptyParagraph = isEmptyParagraph(current.value);
                 continue;
             }
             if (!current.value.hasChildNodes()) {
@@ -61929,12 +61987,28 @@ function compareContentToSpanElement(content, node) {
     const sameContent = node.innerText === content.value;
     return sameColor && sameClass && sameContent;
 }
+const doc = new DOMParser();
+const brNode = doc.parseFromString("<br>", "text/html").body.firstChild;
+const spanBrNode = doc.parseFromString("<span><br></span>", "text/html").body.firstChild;
+function isEmptyParagraph(node) {
+    if (node.childNodes.length > 1)
+        return false;
+    const node2 = node.firstChild?.cloneNode(true);
+    if (!node2)
+        return true;
+    if (!(node2 instanceof Element))
+        return false;
+    node2.removeAttribute("class");
+    node2.removeAttribute("style");
+    return node2.isEqualNode(brNode) || node2.isEqualNode(spanBrNode) || false;
+}
 
 class FunctionDescriptionProvider extends Component {
     static template = "o-spreadsheet-FunctionDescriptionProvider";
     static props = {
         functionDescription: Object,
         argsToFocus: Array,
+        repeatingArgGroupIndex: { type: Number, optional: true },
     };
     static components = { Collapse };
     state = useState({
@@ -61946,8 +62020,70 @@ class FunctionDescriptionProvider extends Component {
     getContext() {
         return this.props;
     }
-    get formulaArgSeparator() {
-        return this.env.model.getters.getLocale().formulaArgSeparator + " ";
+    get formulaHeaderContent() {
+        const { functionDescription, repeatingArgGroupIndex, argsToFocus } = this.props;
+        const argSeparator = this.env.model.getters.getLocale().formulaArgSeparator + " ";
+        const result = [
+            { content: functionDescription.name + " ( " },
+        ];
+        for (let i = 0; i < functionDescription.args.length; i++) {
+            const arg = functionDescription.args[i];
+            const isRepeating = arg.repeating;
+            if (i > 0) {
+                result.push({ content: argSeparator });
+            }
+            if (isRepeating) {
+                // treat all repeating args in one go
+                const displayBrackets = arg.optional || (repeatingArgGroupIndex ?? 0) > 0;
+                const repeatingArgNames = functionDescription.args
+                    .slice(i, i + functionDescription.nbrArgRepeating)
+                    .map((arg) => arg.name);
+                if (repeatingArgGroupIndex) {
+                    result.push({ content: "... " + argSeparator });
+                }
+                if (displayBrackets) {
+                    result.push({ content: "[" });
+                }
+                for (let idx = 0; idx < repeatingArgNames.length; idx++) {
+                    const name = repeatingArgNames[idx];
+                    const argIndex = i + idx;
+                    const focused = argsToFocus.includes(argIndex);
+                    result.push({ content: name + ((repeatingArgGroupIndex ?? 0) + 1), focused });
+                    // Add separator after each element except the last
+                    if (idx < repeatingArgNames.length - 1) {
+                        result.push({ content: argSeparator });
+                    }
+                }
+                if (displayBrackets) {
+                    result.push({ content: "]" });
+                }
+                result.push({ content: argSeparator + "[" });
+                for (let idx = 0; idx < repeatingArgNames.length; idx++) {
+                    const name = repeatingArgNames[idx];
+                    result.push({ content: name + ((repeatingArgGroupIndex ?? 0) + 2) });
+                    // Add separator after each element except the last
+                    if (idx < repeatingArgNames.length - 1) {
+                        result.push({ content: argSeparator });
+                    }
+                }
+                result.push({ content: "]" + argSeparator + "... " });
+                // Skip the processed repeating args
+                i += functionDescription.nbrArgRepeating - 1;
+            }
+            else {
+                const displayBrackets = arg.optional || arg.default;
+                const focused = argsToFocus.includes(i);
+                if (displayBrackets) {
+                    result.push({ content: "[" });
+                }
+                result.push({ content: arg.name, focused });
+                if (displayBrackets) {
+                    result.push({ content: "]" });
+                }
+            }
+        }
+        result.push({ content: " )" });
+        return result;
     }
 }
 
@@ -62017,6 +62153,7 @@ class Composer extends Component {
         showDescription: false,
         functionDescription: {},
         argsToFocus: [],
+        repeatingArgGroupIndex: 0,
     });
     assistant = useState({
         forcedClosed: false,
@@ -62555,9 +62692,21 @@ class Composer extends Component {
                 const isParenthesisClosed = this.props.composerStore.currentTokens.some((t) => t.type === "RIGHT_PAREN" && t.parenthesesCode === token.parenthesesCode);
                 this.functionDescriptionState.argsToFocus = this.getArgsToFocus(isParenthesisClosed, description, nbrArgSupplied, argPosition);
                 this.functionDescriptionState.showDescription = true;
+                this.functionDescriptionState.repeatingArgGroupIndex = this.getRepeatingArgGroupIndex(description, nbrArgSupplied, argPosition);
             }
         }
     }
+    getRepeatingArgGroupIndex(description, nbrArgSupplied, argPosition) {
+        const { minArgRequired, maxArgPossible, nbrArgRepeating } = description;
+        if (!nbrArgRepeating) {
+            return undefined;
+        }
+        const groupsOfOptionalRepeatingValues = nbrArgRepeating
+            ? Math.ceil((nbrArgSupplied - minArgRequired) / nbrArgRepeating)
+            : 0;
+        const nbrArgSuppliedRoundedToGroupOfRepeating = groupsOfOptionalRepeatingValues * nbrArgRepeating + minArgRequired;
+        return (argTargeting(description, Math.max(Math.min(maxArgPossible, nbrArgSuppliedRoundedToGroupOfRepeating), minArgRequired))(argPosition).repeatingGroupIndex ?? 0);
+    }
     /**
      * Compute the arguments to focus depending on the current value position.
      *
@@ -62567,11 +62716,11 @@ class Composer extends Component {
      * This function computes all the possible arguments to focus for different numbers of arguments supplied.
      */
     getArgsToFocus(isParenthesisClosed, description, nbrArgSupplied, argPosition) {
-        const { nbrArgRepeating, minArgRequired, nbrArgOptional, maxArgPossible } = description;
+        const { nbrArgRepeating, minArgRequired, nbrOptionalNonRepeatingArgs, maxArgPossible } = description;
         // When the parenthesis is closed, we consider the user is done with the function,
         // so we know exactly the number of arguments supplied.
         if (isParenthesisClosed) {
-            const focusedArg = argTargeting(description, Math.max(Math.min(maxArgPossible, nbrArgSupplied), minArgRequired))(argPosition);
+            const focusedArg = argTargeting(description, Math.max(Math.min(maxArgPossible, nbrArgSupplied), minArgRequired))(argPosition)?.index;
             return focusedArg !== undefined ? [focusedArg] : [];
         }
         // Otherwise, the user is still typing the formula, so we don't know yet how many arguments the user will supply.
@@ -62580,11 +62729,11 @@ class Composer extends Component {
         const maxArgsNumberPossibility = nbrArgRepeating
             ? minArgRequired +
                 Math.ceil((minArgsNumberPossibility - minArgRequired) / nbrArgRepeating) * nbrArgRepeating +
-                nbrArgOptional
+                nbrOptionalNonRepeatingArgs
             : maxArgPossible;
         const argsToFocus = [];
         for (let i = minArgsNumberPossibility; i <= maxArgsNumberPossibility; i++) {
-            const focusedArg = argTargeting(description, i)(argPosition);
+            const focusedArg = argTargeting(description, i)(argPosition)?.index;
             if (focusedArg !== undefined) {
                 argsToFocus.push(focusedArg);
             }
@@ -67489,6 +67638,17 @@ const irregularityMap = {
     isReadonlyAllowed: true,
     icon: "o-spreadsheet-Icon.IRREGULARITY_MAP",
 };
+function zoomAction(zoom) {
+    return {
+        name: _t$1("%(zoom_percentage)s%", { zoom_percentage: zoom }),
+        execute: (env) => {
+            env.model.dispatch("SET_ZOOM", { zoom: zoom / 100 });
+        },
+        isActive: (env) => env.model.getters.getViewportZoomLevel() === zoom / 100,
+        isReadonlyAllowed: true,
+        sequence: zoom,
+    };
+}
 const viewFormulas = {
     name: _t$1("Formulas"),
     isActive: (env) => env.model.getters.shouldShowFormulas(),
@@ -69615,13 +69775,14 @@ function useDragAndDropBeyondTheViewport(env) {
         }
         const sheetId = getters.getActiveSheetId();
         const position = gridOverlayPosition();
+        const zoomedMouseEvent = withZoom(env, currentEv, position);
         const { x: offsetCorrectionX, y: offsetCorrectionY } = getters.getMainViewportCoordinates();
         const { top, left, bottom, right } = getters.getActiveMainViewport();
         let { scrollX, scrollY } = getters.getActiveSheetScrollInfo();
         const { xSplit, ySplit } = getters.getPaneDivisions(sheetId);
         let canEdgeScroll = false;
         let timeoutDelay = MAX_DELAY;
-        const x = currentEv.clientX - position.left;
+        const x = zoomedMouseEvent.clientX - position.left;
         let colIndex = getters.getColIndex(x);
         if (scrollDirection !== "vertical") {
             const previousX = previousEvClientPosition.clientX - position.left;
@@ -69649,7 +69810,7 @@ function useDragAndDropBeyondTheViewport(env) {
                 scrollX = getters.getColDimensions(sheetId, newTarget).start - offsetCorrectionX;
             }
         }
-        const y = currentEv.clientY - position.top;
+        const y = zoomedMouseEvent.clientY - position.top;
         let rowIndex = getters.getRowIndex(y);
         if (scrollDirection !== "horizontal") {
             const previousY = previousEvClientPosition.clientY - position.top;
@@ -69689,7 +69850,10 @@ function useDragAndDropBeyondTheViewport(env) {
                 pointerMoveHandler(currentEv);
             }, Math.round(timeoutDelay));
         }
-        previousEvClientPosition = { clientX: currentEv.clientX, clientY: currentEv.clientY };
+        previousEvClientPosition = {
+            clientX: zoomedMouseEvent.clientX,
+            clientY: zoomedMouseEvent.clientY,
+        };
     };
     const pointerUpHandler = () => {
         pointerUpCallback?.();
@@ -69731,30 +69895,30 @@ class Autofill extends Component {
         isVisible: Boolean,
     };
     state = useState({
-        position: { left: 0, top: 0 },
+        position: { x: 0, y: 0 },
         handler: false,
     });
     dragNDropGrid = useDragAndDropBeyondTheViewport(this.env);
     get style() {
-        const { left, top } = this.props.position;
+        const { x, y } = this.props.position;
         return cssPropertiesToCss({
-            top: `${top}px`,
-            left: `${left}px`,
+            top: `${y}px`,
+            left: `${x}px`,
             visibility: this.props.isVisible ? "visible" : "hidden",
         });
     }
     get handlerStyle() {
-        const { left, top } = this.state.handler ? this.state.position : this.props.position;
+        const { x, y } = this.state.handler ? this.state.position : this.props.position;
         return cssPropertiesToCss({
-            top: `${top}px`,
-            left: `${left}px`,
+            top: `${y}px`,
+            left: `${x}px`,
         });
     }
     get styleNextValue() {
-        const { left, top } = this.state.position;
+        const { x, y } = this.state.position;
         return cssPropertiesToCss({
-            top: `${top + 5}px`,
-            left: `${left + 15}px`,
+            top: `${y + 5}px`,
+            left: `${x + 15}px`,
         });
     }
     getTooltip() {
@@ -69766,11 +69930,13 @@ class Autofill extends Component {
     }
     onMouseDown(ev) {
         this.state.handler = true;
+        const zoomedMouseEvent = withZoom(this.env, ev);
+        const zoom = this.env.model.getters.getViewportZoomLevel();
         let lastCol;
         let lastRow;
         const start = {
-            left: ev.clientX - this.props.position.left,
-            top: ev.clientY - this.props.position.top,
+            x: ev.clientX / zoom - this.props.position.x,
+            y: ev.clientY / zoom - this.props.position.y,
         };
         const onMouseUp = () => {
             this.state.handler = false;
@@ -69779,8 +69945,8 @@ class Autofill extends Component {
         };
         const onMouseMove = (col, row, ev) => {
             this.state.position = {
-                left: ev.clientX - start.left,
-                top: ev.clientY - start.top,
+                x: ev.clientX / zoom - start.x,
+                y: ev.clientY / zoom - start.y,
             };
             if (lastCol !== col || lastRow !== row) {
                 const activeSheetId = this.env.model.getters.getActiveSheetId();
@@ -69793,7 +69959,7 @@ class Autofill extends Component {
                 }
             }
         };
-        this.dragNDropGrid.start(ev, onMouseMove, onMouseUp);
+        this.dragNDropGrid.start(zoomedMouseEvent, onMouseMove, onMouseUp);
     }
     onDblClick() {
         this.env.model.dispatch("AUTOFILL_AUTO");
@@ -70728,7 +70894,8 @@ class FiguresContainer extends Component {
             return;
         }
         const sheetId = this.env.model.getters.getActiveSheetId();
-        const initialMousePosition = { x: ev.clientX, y: ev.clientY };
+        const zoom = this.env.model.getters.getViewportZoomLevel();
+        const initialMousePosition = { x: ev.clientX / zoom, y: ev.clientY / zoom };
         const initialScrollPosition = this.env.model.getters.getActiveSheetScrollInfo();
         const initialFigure = this.toBottomRightViewport(figureUI);
         const maxDimensions = {
@@ -70738,7 +70905,7 @@ class FiguresContainer extends Component {
         let hasStartedDnd = false;
         const onMouseMove = (ev) => {
             const getters = this.env.model.getters;
-            const currentMousePosition = { x: ev.clientX, y: ev.clientY };
+            const currentMousePosition = { x: ev.clientX / zoom, y: ev.clientY / zoom };
             const offsetX = Math.abs(currentMousePosition.x - initialMousePosition.x);
             const offsetY = Math.abs(currentMousePosition.y - initialMousePosition.y);
             if (!hasStartedDnd && offsetX < DRAG_THRESHOLD && offsetY < DRAG_THRESHOLD) {
@@ -70801,17 +70968,18 @@ class FiguresContainer extends Component {
      */
     startResize(figureUI, dirX, dirY, ev) {
         ev.stopPropagation();
-        const initialMousePosition = { x: ev.clientX, y: ev.clientY };
         const initialScrollPosition = this.env.model.getters.getActiveSheetScrollInfo();
         const keepRatio = figureRegistry.get(figureUI.tag).keepRatio || false;
         const minFigSize = figureRegistry.get(figureUI.tag).minFigSize || MIN_FIG_SIZE;
+        const zoom = this.env.model.getters.getViewportZoomLevel();
         const sheetId = this.env.model.getters.getActiveSheetId();
+        const initialMousePosition = { x: ev.clientX / zoom, y: ev.clientY / zoom };
         const maxDimensions = {
             maxX: this.env.model.getters.getColDimensions(sheetId, this.env.model.getters.getNumberCols(sheetId) - 1).end,
             maxY: this.env.model.getters.getRowDimensions(sheetId, this.env.model.getters.getNumberRows(sheetId) - 1).end,
         };
         const onMouseMove = (ev) => {
-            const currentMousePosition = { x: ev.clientX, y: ev.clientY };
+            const currentMousePosition = { x: ev.clientX / zoom, y: ev.clientY / zoom };
             const draggedFigure = dragFigureForResize(figureUI, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize, initialScrollPosition, this.env.model.getters.getActiveSheetScrollInfo(), maxDimensions);
             const otherFigures = this.getOtherFigures(figureUI.id);
             const snapResult = snapForResize(this.env.model.getters, dirX, dirY, draggedFigure, otherFigures);
@@ -71223,11 +71391,11 @@ function useCellHovered(env, gridRef) {
         const row = env.model.getters.getRowIndex(y);
         return { col, row };
     }
-    function getOffsetRelativeToOverlay(ev) {
+    function getOffsetRelativeToOverlay(zoomedMouseEvent) {
         const gridRect = getBoundingRectAsPOJO(gridRef.el);
         return {
-            x: ev.clientX - gridRect.x,
-            y: ev.clientY - gridRect.y,
+            x: zoomedMouseEvent.clientX - gridRect.x,
+            y: zoomedMouseEvent.clientY - gridRect.y,
         };
     }
     const { pause, resume } = useInterval(checkTiming, 200);
@@ -71244,9 +71412,9 @@ function useCellHovered(env, gridRef) {
             setPosition(col, row);
         }
     }
-    function updateMousePosition(e) {
-        if (isChildEvent(gridRef.el, e)) {
-            ({ x, y } = getOffsetRelativeToOverlay(e));
+    function updateMousePosition(zoomedMouseEvent) {
+        if (isChildEvent(gridRef.el, zoomedMouseEvent.ev)) {
+            ({ x, y } = getOffsetRelativeToOverlay(zoomedMouseEvent));
             lastMoved = Date.now();
             hoveredTable.hover(getPosition());
         }
@@ -71258,20 +71426,21 @@ function useCellHovered(env, gridRef) {
         }
     }
     function onMouseLeave(e) {
-        const { x, y } = getOffsetRelativeToOverlay(e);
+        const zoomedMouseEvent = withZoom(env, e);
+        const { x, y } = getOffsetRelativeToOverlay(zoomedMouseEvent);
         const gridRect = getBoundingRectAsPOJO(gridRef.el);
         if (y < 0 || y > gridRect.height || x < 0 || x > gridRect.width) {
-            return updateMousePosition(e);
+            return updateMousePosition(zoomedMouseEvent);
         }
         else {
             return pause();
         }
     }
-    useRefListener(gridRef, "pointermove", (ev) => !env.isMobile() && updateMousePosition(ev));
+    useRefListener(gridRef, "pointermove", (ev) => !env.isMobile() && updateMousePosition(withZoom(env, ev)));
     useRefListener(gridRef, "mouseleave", onMouseLeave);
     useRefListener(gridRef, "mouseenter", resume);
     useRefListener(gridRef, "pointerdown", recompute);
-    useRefListener(gridRef, "pointerdown", (ev) => env.isMobile() && updateMousePosition(ev));
+    useRefListener(gridRef, "pointerdown", (ev) => env.isMobile() && updateMousePosition(withZoom(env, ev)));
     useExternalListener(window, "click", handleGlobalClick);
     function handleGlobalClick(e) {
         const target = e.target;
@@ -71356,7 +71525,7 @@ class GridOverlay extends Component {
         if (this.env.isMobile()) {
             return;
         }
-        const icon = this.getInteractiveIconAtEvent(ev);
+        const icon = this.getInteractiveIconAtEvent(withZoom(this.env, ev));
         const hoveredIcon = icon?.type ? { id: icon.type, position: icon.position } : undefined;
         if (!deepEquals$1(hoveredIcon, this.hoveredIconStore.hoveredIcon)) {
             this.hoveredIconStore.setHoveredIcon(hoveredIcon);
@@ -71367,30 +71536,30 @@ class GridOverlay extends Component {
             // not main button, probably a context menu
             return;
         }
-        this.onCellClicked(ev);
+        this.onCellClicked(withZoom(this.env, ev));
     }
     onClick(ev) {
         if (ev.button > 0 || !this.env.isMobile()) {
             // not main button, probably a context menu
             return;
         }
-        this.onCellClicked(ev);
+        this.onCellClicked(withZoom(this.env, ev));
     }
-    onCellClicked(ev) {
+    onCellClicked(zoomedMouseEvent) {
         const openedPopover = this.cellPopovers.persistentCellPopover;
-        const [col, row] = this.getCartesianCoordinates(ev);
-        const clickedIcon = this.getInteractiveIconAtEvent(ev);
+        const [col, row] = this.getCartesianCoordinates(zoomedMouseEvent);
+        const clickedIcon = this.getInteractiveIconAtEvent(zoomedMouseEvent);
         if (clickedIcon) {
             this.env.model.selection.getBackToDefault();
         }
         this.props.onCellClicked(col, row, {
-            expandZone: ev.shiftKey,
-            addZone: isCtrlKey(ev),
-        }, ev);
+            expandZone: zoomedMouseEvent.ev.shiftKey,
+            addZone: isCtrlKey(zoomedMouseEvent.ev),
+        }, zoomedMouseEvent);
         if (clickedIcon?.onClick) {
             clickedIcon.onClick(clickedIcon.position, this.env);
         }
-        if (ev.target === this.gridOverlay.el &&
+        if (zoomedMouseEvent.ev.target === this.gridOverlay.el &&
             this.cellPopovers.isOpen &&
             deepEquals$1(openedPopover, this.cellPopovers.persistentCellPopover)) {
             // Only close the popover if props.click/icon.click didn't open a new one
@@ -71399,30 +71568,28 @@ class GridOverlay extends Component {
         }
     }
     onDoubleClick(ev) {
-        if (this.getInteractiveIconAtEvent(ev)) {
+        const zoomedMouseEvent = withZoom(this.env, ev);
+        if (this.getInteractiveIconAtEvent(zoomedMouseEvent)) {
             return;
         }
-        const [col, row] = this.getCartesianCoordinates(ev);
+        const [col, row] = this.getCartesianCoordinates(zoomedMouseEvent);
         this.props.onCellDoubleClicked(col, row);
     }
     onContextMenu(ev) {
-        const [col, row] = this.getCartesianCoordinates(ev);
+        const [col, row] = this.getCartesianCoordinates(withZoom(this.env, ev));
         this.props.onCellRightClicked(col, row, { x: ev.clientX, y: ev.clientY });
     }
-    getCartesianCoordinates(ev) {
-        const gridOverLayRect = getRefBoundingRect(this.gridOverlay);
-        const x = ev.clientX - gridOverLayRect.x;
-        const y = ev.clientY - gridOverLayRect.y;
-        const colIndex = this.env.model.getters.getColIndex(x);
-        const rowIndex = this.env.model.getters.getRowIndex(y);
+    getCartesianCoordinates(zoomedMouseEvent) {
+        const colIndex = this.env.model.getters.getColIndex(zoomedMouseEvent.offsetX);
+        const rowIndex = this.env.model.getters.getRowIndex(zoomedMouseEvent.offsetY);
         return [colIndex, rowIndex];
     }
-    getInteractiveIconAtEvent(ev) {
+    getInteractiveIconAtEvent(zoomedMouseEvent) {
         const gridOverLayRect = getRefBoundingRect(this.gridOverlay);
         const gridOffset = this.env.model.getters.getGridOffset();
-        const x = ev.clientX - gridOverLayRect.x + gridOffset.x;
-        const y = ev.clientY - gridOverLayRect.y + gridOffset.y;
-        const [col, row] = this.getCartesianCoordinates(ev);
+        const x = zoomedMouseEvent.clientX - gridOverLayRect.x + gridOffset.x;
+        const y = zoomedMouseEvent.clientY - gridOverLayRect.y + gridOffset.y;
+        const [col, row] = this.getCartesianCoordinates(zoomedMouseEvent);
         const sheetId = this.env.model.getters.getActiveSheetId();
         let position = { col, row, sheetId };
         const merge = this.env.model.getters.getMerge(position);
@@ -71457,7 +71624,8 @@ class GridPopover extends Component {
         if (!popover.isOpen) {
             return { isOpen: false };
         }
-        const anchorRect = popover.anchorRect;
+        const zoom = this.env.model.getters.getViewportZoomLevel();
+        const anchorRect = getZoomedRect(zoom, popover.anchorRect);
         return {
             ...popover,
             // transform from the "canvas coordinate system" to the "body coordinate system"
@@ -71562,8 +71730,8 @@ class AbstractResizer extends Component {
     setup() {
         this.composerFocusStore = useStore(ComposerFocusStore);
     }
-    _computeHandleDisplay(ev) {
-        const position = this._getEvOffset(ev);
+    _computeHandleDisplay(zoomedMouseEvent) {
+        const position = this._getEvOffset(zoomedMouseEvent);
         const elementIndex = this._getElementIndex(position);
         if (elementIndex < 0) {
             return;
@@ -71583,8 +71751,8 @@ class AbstractResizer extends Component {
             this.state.resizerIsActive = false;
         }
     }
-    _computeGrabDisplay(ev) {
-        const index = this._getElementIndex(this._getEvOffset(ev));
+    _computeGrabDisplay(zoomedMouseEvent) {
+        const index = this._getElementIndex(this._getEvOffset(zoomedMouseEvent));
         const activeElements = this._getActiveElements();
         const selectedZoneStart = this._getSelectedZoneStart();
         const selectedZoneEnd = this._getSelectedZoneEnd();
@@ -71600,26 +71768,29 @@ class AbstractResizer extends Component {
         if (this.env.isMobile()) {
             return;
         }
+        const zoomedMouseEvent = withZoom(this.env, ev);
         if (this.state.isResizing || this.state.isMoving || this.state.isSelecting) {
             return;
         }
-        this._computeHandleDisplay(ev);
-        this._computeGrabDisplay(ev);
+        this._computeHandleDisplay(zoomedMouseEvent);
+        this._computeGrabDisplay(zoomedMouseEvent);
     }
     onMouseLeave() {
         this.state.resizerIsActive = this.state.isResizing;
         this.state.waitingForMove = false;
     }
     onDblClick(ev) {
+        const zoomedMouseEvent = withZoom(this.env, ev);
         this._fitElementSize(this.state.activeElement);
         this.state.isResizing = false;
-        this._computeHandleDisplay(ev);
-        this._computeGrabDisplay(ev);
+        this._computeHandleDisplay(zoomedMouseEvent);
+        this._computeGrabDisplay(zoomedMouseEvent);
     }
     onMouseDown(ev) {
         this.state.isResizing = true;
         this.state.delta = 0;
-        const initialPosition = this._getClientPosition(ev);
+        const zoomedMouseEvent = withZoom(this.env, ev);
+        const initialPosition = this._getClientPosition(zoomedMouseEvent);
         const styleValue = this.state.draggerLinePosition;
         const size = this._getElementSize(this.state.activeElement);
         const minSize = styleValue - size + this.MIN_ELEMENT_SIZE;
@@ -71631,7 +71802,7 @@ class AbstractResizer extends Component {
             }
         };
         const onMouseMove = (ev) => {
-            this.state.delta = this._getClientPosition(ev) - initialPosition;
+            this.state.delta = this._getClientPosition(withZoom(this.env, ev)) - initialPosition;
             this.state.draggerLinePosition = styleValue + this.state.delta;
             if (this.state.draggerLinePosition < minSize) {
                 this.state.draggerLinePosition = minSize;
@@ -71652,7 +71823,8 @@ class AbstractResizer extends Component {
             // not main button, probably a context menu
             return;
         }
-        const index = this._getElementIndex(this._getEvOffset(ev));
+        const zoomedMouseEvent = withZoom(this.env, ev);
+        const index = this._getElementIndex(this._getEvOffset(zoomedMouseEvent));
         this._selectElement(index, false);
     }
     select(ev) {
@@ -71663,7 +71835,8 @@ class AbstractResizer extends Component {
             // not main button, probably a context menu
             return;
         }
-        const index = this._getElementIndex(this._getEvOffset(ev));
+        const zoomedMouseEvent = withZoom(this.env, ev);
+        const index = this._getElementIndex(this._getEvOffset(zoomedMouseEvent));
         if (index < 0) {
             return;
         }
@@ -71686,6 +71859,7 @@ class AbstractResizer extends Component {
     startMovement(ev) {
         this.state.waitingForMove = false;
         this.state.isMoving = true;
+        const zoomedMouseEvent = withZoom(this.env, ev);
         const startDimensions = this._getDimensionsInViewport(this._getSelectedZoneStart());
         const endDimensions = this._getDimensionsInViewport(this._getSelectedZoneEnd());
         const defaultPosition = startDimensions.start;
@@ -71722,9 +71896,10 @@ class AbstractResizer extends Component {
             if (this.state.base !== this._getSelectedZoneStart()) {
                 this._moveElements();
             }
-            this._computeGrabDisplay(ev);
+            const zoomedMouseEvent = withZoom(this.env, ev);
+            this._computeGrabDisplay(zoomedMouseEvent);
         };
-        this.dragNDropGrid.start(ev, mouseMoveMovement, mouseUpMovement);
+        this.dragNDropGrid.start(zoomedMouseEvent, mouseMoveMovement, mouseUpMovement);
     }
     startSelection(ev, index) {
         if (this.env.isMobile()) {
@@ -71738,6 +71913,7 @@ class AbstractResizer extends Component {
             this._selectElement(index, isCtrlKey(ev));
         }
         this.lastSelectedElementIndex = index;
+        const zoomedMouseEvent = withZoom(this.env, ev);
         const mouseMoveSelect = (col, row) => {
             const newIndex = this._getType() === "COL" ? col : row;
             if (newIndex !== this.lastSelectedElementIndex && newIndex !== -1) {
@@ -71748,16 +71924,16 @@ class AbstractResizer extends Component {
         const mouseUpSelect = () => {
             this.state.isSelecting = false;
             this.lastSelectedElementIndex = null;
-            this._computeGrabDisplay(ev);
+            this._computeGrabDisplay(zoomedMouseEvent);
         };
-        this.dragNDropGrid.start(ev, mouseMoveSelect, mouseUpSelect);
+        this.dragNDropGrid.start(zoomedMouseEvent, mouseMoveSelect, mouseUpSelect);
     }
     onMouseUp(ev) {
         this.lastSelectedElementIndex = null;
     }
     onContextMenu(ev) {
         ev.preventDefault();
-        const index = this._getElementIndex(this._getEvOffset(ev));
+        const index = this._getElementIndex(this._getEvOffset(withZoom(this.env, ev)));
         if (index < 0)
             return;
         if (!this._getActiveElements().has(index)) {
@@ -71784,14 +71960,14 @@ class ColResizer extends AbstractResizer {
     get sheetId() {
         return this.env.model.getters.getActiveSheetId();
     }
-    _getEvOffset(ev) {
-        return ev.offsetX;
+    _getEvOffset(zoomedMouseEvent) {
+        return zoomedMouseEvent.offsetX;
     }
     _getViewportOffset() {
         return this.env.model.getters.getActiveMainViewport().left;
     }
-    _getClientPosition(ev) {
-        return ev.clientX;
+    _getClientPosition(zoomedMouseEvent) {
+        return zoomedMouseEvent.clientX;
     }
     _getElementIndex(position) {
         return this.env.model.getters.getColIndex(position);
@@ -71926,14 +72102,14 @@ class RowResizer extends AbstractResizer {
     get sheetId() {
         return this.env.model.getters.getActiveSheetId();
     }
-    _getEvOffset(ev) {
-        return ev.offsetY;
+    _getEvOffset(zoomedMouseEvent) {
+        return zoomedMouseEvent.offsetY;
     }
     _getViewportOffset() {
         return this.env.model.getters.getActiveMainViewport().top;
     }
-    _getClientPosition(ev) {
-        return ev.clientY;
+    _getClientPosition(zoomedMouseEvent) {
+        return zoomedMouseEvent.clientY;
     }
     _getElementIndex(position) {
         return this.env.model.getters.getRowIndex(position);
@@ -72882,18 +73058,21 @@ function useGridDrawing(refName, model, canvasSize) {
         const canvas = canvasRef.el;
         const dpr = window.devicePixelRatio || 1;
         const ctx = canvas.getContext("2d", { alpha: false });
+        const zoom = Math.max(model.getters.getViewportZoomLevel(), 1);
         const thinLineWidth = 0.4 * dpr;
         const renderingContext = {
             ctx,
             dpr,
             thinLineWidth,
         };
-        const { width, height } = canvasSize();
+        let { width, height } = canvasSize();
+        width = zoom * width;
+        height = zoom * height;
         canvas.style.width = `${width}px`;
         canvas.style.height = `${height}px`;
         canvas.width = width * dpr;
         canvas.height = height * dpr;
-        canvas.setAttribute("style", `width:${width}px;height:${height}px;`);
+        canvas.setAttribute("style", `width:${width}px;height:${height}px;zoom:${1 / zoom}`);
         if (width === 0 || height === 0) {
             return;
         }
@@ -72904,7 +73083,7 @@ function useGridDrawing(refName, model, canvasSize) {
         // you need to shift the coordinates by 0.5 perpendicular to the line's direction.
         // http://diveintohtml5.info/canvas.html#pixel-madness
         ctx.translate(-CANVAS_SHIFT, -CANVAS_SHIFT);
-        ctx.scale(dpr, dpr);
+        ctx.scale(dpr * zoom, dpr * zoom);
         rendererStore.draw(renderingContext);
     }
 }
@@ -73140,6 +73319,7 @@ class Highlight extends Component {
     }
     onResizeHighlight(ev, dirX, dirY) {
         const activeSheetId = this.env.model.getters.getActiveSheetId();
+        const zoomedMouseEvent = withZoom(this.env, ev);
         this.highlightState.shiftingMode = "isResizing";
         const z = this.props.range.zone;
         const pivotCol = dirX === 1 ? z.left : z.right;
@@ -73178,11 +73358,12 @@ class Highlight extends Component {
         const mouseUp = () => {
             this.highlightState.shiftingMode = "none";
         };
-        this.dragNDropGrid.start(ev, mouseMove, mouseUp, scrollDirection);
+        this.dragNDropGrid.start(zoomedMouseEvent, mouseMove, mouseUp, scrollDirection);
     }
     onMoveHighlight(ev) {
         this.highlightState.shiftingMode = "isMoving";
         const z = this.props.range.zone;
+        const zoomedMouseEvent = withZoom(this.env, ev);
         const position = gridOverlayPosition();
         const activeSheetId = this.env.model.getters.getActiveSheetId();
         const initCol = this.env.model.getters.getColIndex(ev.clientX - position.left);
@@ -73219,7 +73400,7 @@ class Highlight extends Component {
         const mouseUp = () => {
             this.highlightState.shiftingMode = "none";
         };
-        this.dragNDropGrid.start(ev, mouseMove, mouseUp);
+        this.dragNDropGrid.start(zoomedMouseEvent, mouseMove, mouseUp);
     }
 }
 
@@ -73325,11 +73506,12 @@ class HorizontalScrollBar extends Component {
     }
     get position() {
         const { x } = this.env.model.getters.getMainViewportRect();
+        const scrollbarWidth = this.env.model.getters.getScrollBarWidth();
         return {
             left: `${this.props.leftOffset + x}px`,
             bottom: "0px",
-            height: `${SCROLLBAR_WIDTH}px`,
-            right: isBrowserFirefox() ? `${SCROLLBAR_WIDTH}px` : "0",
+            height: `${scrollbarWidth}px`,
+            right: isBrowserFirefox() ? `${scrollbarWidth}px` : "0",
         };
     }
     onScroll(offset) {
@@ -73370,11 +73552,12 @@ class VerticalScrollBar extends Component {
     }
     get position() {
         const { y } = this.env.model.getters.getMainViewportRect();
+        const scrollbarWidth = this.env.model.getters.getScrollBarWidth();
         return {
             top: `${this.props.topOffset + y}px`,
             right: "0px",
-            width: `${SCROLLBAR_WIDTH}px`,
-            bottom: isBrowserFirefox() ? `${SCROLLBAR_WIDTH}px` : "0",
+            width: `${scrollbarWidth}px`,
+            bottom: isBrowserFirefox() ? `${scrollbarWidth}px` : "0",
         };
     }
     onScroll(offset) {
@@ -73583,34 +73766,38 @@ class ColorPickerWidget extends Component {
     }
 }
 
-class FontSizeEditor extends Component {
-    static template = "o-spreadsheet-FontSizeEditor";
+class NumberEditor extends Component {
+    static template = "o-spreadsheet-NumberEditor";
     static props = {
-        currentFontSize: Number,
-        onFontSizeChanged: Function,
+        currentValue: Number,
+        onValueChange: Function,
         onToggle: { type: Function, optional: true },
         onFocusInput: { type: Function, optional: true },
         class: String,
+        valueIcon: { type: String, optional: true },
+        min: Number,
+        max: Number,
+        title: String,
+        valueList: (Array),
     };
     static defaultProps = {
         onFocusInput: () => { },
     };
     static components = { Popover };
-    fontSizes = FONT_SIZES;
     dropdown = useState({ isOpen: false });
-    inputRef = useRef("inputFontSize");
-    rootEditorRef = useRef("FontSizeEditor");
-    fontSizeListRef = useRef("fontSizeList");
+    inputRef = useRef("inputNumber");
+    rootEditorRef = useRef("NumberEditor");
+    valueListRef = useRef("numberList");
     setup() {
         useExternalListener(window, "click", this.onExternalClick, { capture: true });
         onWillUpdateProps((nextProps) => {
             if (this.inputRef.el && document.activeElement !== this.inputRef.el) {
-                this.inputRef.el.value = nextProps.currentFontSize;
+                this.inputRef.el.value = nextProps.currentValue;
             }
         });
         onMounted(() => {
             if (this.inputRef.el) {
-                this.inputRef.el.value = this.props.currentFontSize.toString();
+                this.inputRef.el.value = this.props.currentValue.toString();
             }
         });
     }
@@ -73623,33 +73810,36 @@ class FontSizeEditor extends Component {
         };
     }
     onExternalClick(ev) {
-        if (!isChildEvent(this.fontSizeListRef.el, ev) && !isChildEvent(this.rootEditorRef.el, ev)) {
-            this.closeFontList();
+        if (!isChildEvent(this.valueListRef.el, ev) && !isChildEvent(this.rootEditorRef.el, ev)) {
+            this.closeList();
         }
     }
-    toggleFontList() {
+    toggleList() {
         const isOpen = this.dropdown.isOpen;
         if (!isOpen) {
             this.props.onToggle?.();
             this.inputRef.el.focus();
         }
         else {
-            this.closeFontList();
+            this.closeList();
         }
     }
-    closeFontList() {
+    closeList() {
         this.dropdown.isOpen = false;
     }
-    setSize(fontSizeStr) {
-        const fontSize = clip(Math.floor(parseFloat(fontSizeStr)), 1, 400);
-        this.props.onFontSizeChanged(fontSize);
-        this.closeFontList();
+    setValue(valueStr) {
+        const value = clip(Math.floor(parseFloat(valueStr)), this.props.min, this.props.max);
+        this.props.onValueChange(value);
+        this.closeList();
+    }
+    setValueFromInput(ev) {
+        this.setValue(ev.target.value);
     }
-    setSizeFromInput(ev) {
-        this.setSize(ev.target.value);
+    setValueFromList(valueStr) {
+        this.setValue(valueStr);
     }
-    setSizeFromList(fontSizeStr) {
-        this.setSize(fontSizeStr);
+    get currentValue() {
+        return `${this.props.currentValue}`;
     }
     onInputFocused(ev) {
         this.dropdown.isOpen = true;
@@ -73657,17 +73847,33 @@ class FontSizeEditor extends Component {
     }
     onInputKeydown(ev) {
         if (ev.key === "Enter" || ev.key === "Escape") {
-            this.closeFontList();
+            this.closeList();
             const target = ev.target;
             // In the case of a ESCAPE key, we get the previous font size back
             if (ev.key === "Escape") {
-                target.value = `${this.props.currentFontSize}`;
+                target.value = `${this.props.currentValue}`;
             }
             this.props.onToggle?.();
         }
     }
 }
 
+class FontSizeEditor extends Component {
+    static template = "o-spreadsheet-FontSizeEditor";
+    static components = { NumberEditor };
+    static props = {
+        currentFontSize: Number,
+        onFontSizeChanged: Function,
+        onToggle: { type: Function, optional: true },
+        onFocusInput: { type: Function, optional: true },
+        class: String,
+    };
+    static defaultProps = {
+        onFocusInput: () => { },
+    };
+    fontSizes = FONT_SIZES;
+}
+
 class TextStyler extends Component {
     static template = "o-spreadsheet.TextStyler";
     static components = { ColorPickerWidget, ActionButton, FontSizeEditor };
@@ -80207,6 +80413,7 @@ class TableResizer extends Component {
         const tableZone = this.props.table.range.zone;
         const topLeft = { col: tableZone.left, row: tableZone.top };
         document.body.style.cursor = "nwse-resize";
+        const zoomedMouseEvent = withZoom(this.env, ev);
         const onMouseUp = () => {
             document.body.style.cursor = "";
             const newTableZone = this.state.highlightZone;
@@ -80228,7 +80435,7 @@ class TableResizer extends Component {
                 bottom: Math.max(row, topLeft.row),
             };
         };
-        this.dragNDropGrid.start(ev, onMouseMove, onMouseUp);
+        this.dragNDropGrid.start(zoomedMouseEvent, onMouseMove, onMouseUp);
     }
     get highlights() {
         if (!this.state.highlightZone)
@@ -80303,7 +80510,9 @@ class Grid extends Component {
         this.paintFormatStore = useStore(PaintFormatStore);
         this.clientFocusStore = useStore(ClientFocusStore);
         useStore(ArrayFormulaHighlight);
-        useChildSubEnv({ getPopoverContainerRect: () => this.getGridRect() });
+        useChildSubEnv({
+            getPopoverContainerRect: () => getZoomedRect(this.env.model.getters.getViewportZoomLevel(), this.getGridRect()),
+        });
         useExternalListener(document.body, "cut", this.copy.bind(this, true));
         useExternalListener(document.body, "copy", this.copy.bind(this, false));
         useExternalListener(document.body, "paste", this.paste);
@@ -80329,11 +80538,12 @@ class Grid extends Component {
         return this.highlightStore.highlights;
     }
     get gridOverlayDimensions() {
+        const scrollbarWidth = this.env.model.getters.getScrollBarWidth();
         return cssPropertiesToCss({
             top: `${HEADER_HEIGHT}px`,
             left: `${HEADER_WIDTH}px`,
-            height: `calc(100% - ${HEADER_HEIGHT + SCROLLBAR_WIDTH}px)`,
-            width: `calc(100% - ${HEADER_WIDTH + SCROLLBAR_WIDTH}px)`,
+            height: `calc(100% - ${HEADER_HEIGHT + scrollbarWidth}px)`,
+            width: `calc(100% - ${HEADER_WIDTH + scrollbarWidth}px)`,
         });
     }
     onClosePopover() {
@@ -80539,8 +80749,8 @@ class Grid extends Component {
         const zone = this.env.model.getters.getSelectedZone();
         const rect = this.env.model.getters.getVisibleRect(zone);
         return {
-            left: rect.x + rect.width - AUTOFILL_EDGE_LENGTH / 2,
-            top: rect.y + rect.height - AUTOFILL_EDGE_LENGTH / 2,
+            x: rect.x + rect.width - AUTOFILL_EDGE_LENGTH / 2,
+            y: rect.y + rect.height - AUTOFILL_EDGE_LENGTH / 2,
         };
     }
     get isAutofillVisible() {
@@ -80596,8 +80806,8 @@ class Grid extends Component {
     // ---------------------------------------------------------------------------
     // Zone selection with mouse
     // ---------------------------------------------------------------------------
-    onCellClicked(col, row, modifiers, ev) {
-        ev.preventDefault();
+    onCellClicked(col, row, modifiers, zoomedMouseEvent) {
+        zoomedMouseEvent.ev.preventDefault();
         if (this.composerFocusStore.activeComposer.editionMode === "editing") {
             this.composerFocusStore.activeComposer.stopEdition();
         }
@@ -80631,7 +80841,7 @@ class Grid extends Component {
                 this.paintFormatStore.pasteFormat(this.env.model.getters.getSelectedZones());
             }
         };
-        this.dragNDropGrid.start(ev, onMouseMove, onMouseUp);
+        this.dragNDropGrid.start(zoomedMouseEvent, onMouseMove, onMouseUp);
     }
     onCellDoubleClicked(col, row) {
         const sheetId = this.env.model.getters.getActiveSheetId();
@@ -82706,6 +82916,11 @@ topbarMenuRegistry
     .addChild("view_formulas", ["view", "show"], {
     ...viewFormulas,
     sequence: 10,
+})
+    .addChild("zoom", ["view"], {
+    name: _t$1("Zoom"),
+    sequence: 1,
+    icon: "o-spreadsheet-Icon.ZOOM",
 })
     .addChild("view_irregularity_map", ["view"], {
     ...irregularityMap,
@@ -82994,6 +83209,10 @@ topbarMenuRegistry
 })
     .addChild("reinsert_dynamic_pivot", ["data"], reinsertDynamicPivotMenu)
     .addChild("reinsert_static_pivot", ["data"], reinsertStaticPivotMenu);
+// Zoom
+ZOOM_VALUES.forEach((zoom) => {
+    topbarMenuRegistry.addChild(`zoom${zoom}`, ["view", "zoom"], zoomAction(zoom));
+});
 
 const genericRepeatsTransforms = [
     repeatSheetDependantCommand,
@@ -84024,7 +84243,9 @@ class SpreadsheetDashboard extends Component {
         this.gridRef = useRef("grid");
         this.hoveredCell = useStore(DelayedHoveredCellStore);
         this.clickableCellsStore = useStore(ClickableCellsStore);
-        useChildSubEnv({ getPopoverContainerRect: () => this.getGridRect() });
+        useChildSubEnv({
+            getPopoverContainerRect: () => getZoomedRect(this.env.model.getters.getViewportZoomLevel(), this.getGridRect()),
+        });
         useGridDrawing("canvas", this.env.model, () => this.env.model.getters.getSheetViewDimension());
         this.onMouseWheel = useWheelHandler((deltaX, deltaY) => {
             this.moveCanvas(deltaX, deltaY);
@@ -85090,6 +85311,35 @@ class NumberFormatsTool extends Component {
     }
 }
 
+class ToolBarZoom extends Component {
+    static template = "o-spreadsheet-TopBarZoom";
+    static components = { NumberEditor };
+    static props = { class: String };
+    topBarToolStore;
+    valueList = ZOOM_VALUES;
+    setup() {
+        this.topBarToolStore = useToolBarDropdownStore();
+    }
+    get currentFontSize() {
+        const zoom = this.env.model.getters.getViewportZoomLevel() || 1;
+        return zoom * 100;
+    }
+    setZoom(fontSize) {
+        this.env.model.dispatch("SET_ZOOM", { zoom: fontSize / 100 });
+    }
+    toggle() {
+        if (this.topBarToolStore.isActive) {
+            this.topBarToolStore.closeDropdowns();
+        }
+        else {
+            this.topBarToolStore.openDropdown();
+        }
+    }
+    onFocusInput() {
+        this.topBarToolStore.openDropdown();
+    }
+}
+
 const topBarToolBarRegistry = new ToolBarRegistry();
 topBarToolBarRegistry
     .add("edit")
@@ -85123,6 +85373,13 @@ topBarToolBarRegistry
         class: "o-hoverable-button o-toolbar-button",
     },
     sequence: 4,
+})
+    .addChild("edit", {
+    component: ToolBarZoom,
+    props: {
+        class: "o-menu-item-button o-hoverable-button o-toolbar-button",
+    },
+    sequence: 5,
 })
     .add("numberFormat")
     .addChild("numberFormat", {
@@ -85589,6 +85846,7 @@ class Spreadsheet extends Component {
     }
     getStyle() {
         const properties = {};
+        const scrollbarWidth = this.env.model.getters.getScrollBarWidth();
         if (this.env.isDashboard()) {
             properties["grid-template-rows"] = `auto`;
         }
@@ -85599,6 +85857,7 @@ class Spreadsheet extends Component {
             ? `${this.sidePanel.totalPanelSize || DEFAULT_SIDE_PANEL_SIZE}px`
             : "auto";
         properties["grid-template-columns"] = `auto ${columnWidth}`;
+        properties["--os-scrollbar-width"] = `${scrollbarWidth}px`;
         return cssPropertiesToCss(properties);
     }
     setup() {
@@ -85727,9 +85986,11 @@ class Spreadsheet extends Component {
     get gridContainerStyle() {
         const gridColSize = GROUP_LAYER_WIDTH * this.rowLayers.length;
         const gridRowSize = GROUP_LAYER_WIDTH * this.colLayers.length;
+        const zoom = this.env.model.getters.getViewportZoomLevel();
         return cssPropertiesToCss({
             "grid-template-columns": `${gridColSize ? gridColSize + 2 : 0}px auto`, // +2: margins
             "grid-template-rows": `${gridRowSize ? gridRowSize + 2 : 0}px auto`,
+            zoom: `${zoom}`,
         });
     }
     get rowLayers() {
@@ -85741,6 +86002,8 @@ class Spreadsheet extends Component {
         return this.env.model.getters.getVisibleGroupLayers(sheetId, "COL");
     }
     getGridSize() {
+        const zoom = this.env.model.getters.getViewportZoomLevel();
+        const scrollbarWidth = this.env.model.getters.getScrollBarWidth();
         const topBarHeight = this.spreadsheetRef.el
             ?.querySelector(".o-spreadsheet-topbar-wrapper")
             ?.getBoundingClientRect().height || 0;
@@ -85754,8 +86017,8 @@ class Spreadsheet extends Component {
             topBarHeight -
             bottomBarHeight;
         return {
-            width: Math.max(gridWidth - SCROLLBAR_WIDTH, 0),
-            height: Math.max(gridHeight - SCROLLBAR_WIDTH, 0),
+            width: Math.max(gridWidth / zoom - scrollbarWidth, 0),
+            height: Math.max(gridHeight / zoom - scrollbarWidth, 0),
         };
     }
 }
@@ -88251,12 +88514,10 @@ const constants = {
 };
 const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 
-Object.assign(__exports, { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler,CellErrorType:  CellErrorType$1, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DEFAULT_LOCALE, DEFAULT_LOCALES, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, categories, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, createAutocompleteArgumentsProvider, findCellInNewZone, functionCache, getCaretDownSvg, getCaretUpSvg, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize });
+export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType$1 as CellErrorType, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DEFAULT_LOCALE, DEFAULT_LOCALES, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, categories, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, createAutocompleteArgumentsProvider, findCellInNewZone, functionCache, getCaretDownSvg, getCaretUpSvg, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "19.1.0-alpha.10";
-__info__.date = "2025-10-30T12:28:44.205Z";
-__info__.hash = "d0b65e9e4";
+__info__.version = "19.1.0-alpha.11";
+__info__.date = "2025-11-03T12:41:02.741Z";
+__info__.hash = "d9230f30a";
 //# sourceMappingURL=o_spreadsheet.esm.js.map
-return __exports;
-});
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
index 42c31c62cdcbd..0f767f0d3bd43 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
@@ -1,9 +1,9 @@
 <!--
  This file is generated by o-spreadsheet build tools. Do not edit it.
  @see https://github.com/odoo/o-spreadsheet
- @version 19.1.0-alpha.10
- @date 2025-10-30T12:28:49.303Z
- @hash d0b65e9e4
+ @version 19.1.0-alpha.11
+ @date 2025-11-03T12:41:11.016Z
+ @hash d9230f30a
 -->
 <odoo>
   <t t-name="o-spreadsheet-ValidationMessages">
@@ -153,6 +153,21 @@
     </Popover>
   </t>
 
+  <div t-name="o-spreadsheet-TopBarZoom" t-ref="buttonRef" t-on-click.stop="">
+    <NumberEditor
+      currentValue="currentFontSize"
+      onValueChange.bind="this.setZoom"
+      class="props.class"
+      onToggle.bind="this.toggle"
+      onFocusInput.bind="this.onFocusInput"
+      valueIcon="'%'"
+      min="25"
+      max="300"
+      valueList="valueList"
+      title.translate="Zoom"
+    />
+  </div>
+
   <div t-name="o-spreadsheet-NumberFormatsTool" t-ref="buttonRef" t-on-click.stop="">
     <ActionButton
       action="formatNumberMenuItemSpec"
@@ -4474,6 +4489,43 @@
     />
   </t>
 
+  <t t-name="o-spreadsheet-NumberEditor">
+    <div class="o-dropdown" t-ref="NumberEditor">
+      <div
+        class="o-number-editor d-flex align-items-center"
+        t-att-class="props.class"
+        t-att-title="props.title"
+        t-on-click="this.toggleList">
+        <input
+          type="number"
+          t-att-min="props.min"
+          t-att-max="props.max"
+          class="o-font-size o-number-input bg-transparent border-0"
+          t-on-keydown="onInputKeydown"
+          t-on-wheel.prevent.stop=""
+          t-on-click.stop="props.onFocusInput"
+          t-on-focus.stop="onInputFocused"
+          t-on-change="setValueFromInput"
+          t-ref="inputNumber"
+        />
+        <t t-esc="props.valueIcon"/>
+        <span>
+          <t t-call="o-spreadsheet-Icon.CARET_DOWN"/>
+        </span>
+      </div>
+      <Popover t-if="dropdown.isOpen" t-props="popoverProps">
+        <div class="o-text-options bg-white" t-on-click.stop="" t-ref="numberList">
+          <t t-foreach="props.valueList" t-as="value" t-key="value">
+            <div t-att-data-size="value" t-on-click="() => this.setValueFromList(value)">
+              <t t-esc="value"/>
+              <t t-esc="props.valueIcon"/>
+            </div>
+          </t>
+        </div>
+      </Popover>
+    </div>
+  </t>
+
   <t t-name="o-spreadsheet-Menu-Popover">
     <Popover t-if="props.menuItems" t-props="popoverProps">
       <div t-ref="menu" class="o-menu-wrapper" t-on-mouseover="() => this.onMouseOverMainMenu()">
@@ -5410,6 +5462,11 @@
       <i class="fa fa-search"/>
     </div>
   </t>
+  <t t-name="o-spreadsheet-Icon.ZOOM">
+    <div class="o-icon">
+      <i class="fa fa-search-plus"/>
+    </div>
+  </t>
   <t t-name="o-spreadsheet-Icon.CHECK">
     <svg class="o-icon" viewBox="0 0 24 24">
       <path
@@ -5873,7 +5930,7 @@
 
   <t t-name="o-spreadsheet-RowResizer">
     <div
-      class="o-row-resizer"
+      class="o-row-resizer o-zoomable"
       t-ref="rowResizer"
       t-on-pointermove.self="onMouseMove"
       t-on-mouseleave="onMouseLeave"
@@ -5917,7 +5974,7 @@
 
   <t t-name="o-spreadsheet-ColResizer">
     <div
-      class="o-col-resizer d-flex"
+      class="o-col-resizer d-flex o-zoomable"
       t-ref="colResizer"
       t-on-pointermove.self="onMouseMove"
       t-on-mouseleave="onMouseLeave"
@@ -6076,7 +6133,7 @@
     </div>
     <div
       t-ref="gridOverlay"
-      class="o-grid-overlay overflow-hidden"
+      class="o-grid-overlay overflow-hidden o-zoomable"
       t-att-class="{'o-paint-format-cursor': isPaintingFormat}"
       t-att-style="style"
       t-on-pointerdown="onPointerDown"
@@ -6121,7 +6178,7 @@
 
   <t t-name="o-spreadsheet-Grid">
     <div
-      class="o-grid w-100 h-100"
+      class="o-grid w-100 h-100 o-zoomable"
       tabindex="-1"
       composerFocusableElement="true"
       t-on-click="focusDefaultElement"
@@ -6222,40 +6279,17 @@
   </t>
 
   <t t-name="o-spreadsheet-FontSizeEditor">
-    <div class="o-dropdown" t-ref="FontSizeEditor">
-      <div
-        class=" o-font-size-editor d-flex align-items-center"
-        t-att-class="props.class"
-        title="Font Size"
-        t-on-click="this.toggleFontList">
-        <input
-          type="number"
-          min="1"
-          max="400"
-          class="o-font-size o-number-input bg-transparent border-0"
-          t-on-keydown="onInputKeydown"
-          t-on-wheel.prevent.stop=""
-          t-on-click.stop="props.onFocusInput"
-          t-on-focus.stop="onInputFocused"
-          t-on-change="setSizeFromInput"
-          t-ref="inputFontSize"
-        />
-        <span>
-          <t t-call="o-spreadsheet-Icon.CARET_DOWN"/>
-        </span>
-      </div>
-      <Popover t-if="dropdown.isOpen" t-props="popoverProps">
-        <div class="o-text-options bg-white" t-on-click.stop="" t-ref="fontSizeList">
-          <t t-foreach="fontSizes" t-as="fontSize" t-key="fontSize">
-            <div
-              t-esc="fontSize"
-              t-att-data-size="fontSize"
-              t-on-click="() => this.setSizeFromList(fontSize)"
-            />
-          </t>
-        </div>
-      </Popover>
-    </div>
+    <NumberEditor
+      currentValue="props.currentFontSize"
+      onValueChange="props.onFontSizeChanged"
+      class="props.class"
+      onToggle="props.onToggle"
+      onFocusInput="props.onFocusInput"
+      min="1"
+      max="400"
+      valueList="fontSizes"
+      title.translate="Font Size"
+    />
   </t>
 
   <t t-name="o-spreadsheet-FilterMenuValueList">
@@ -6851,21 +6885,12 @@
       <div class="o-formula-assistant" t-if="context.functionDescription.name">
         <div class="o-formula-assistant-head d-flex flex-row justify-content-between">
           <div>
-            <span t-esc="context.functionDescription.name"/>
-            (
-            <t t-foreach="context.functionDescription.args" t-as="arg" t-key="arg.name">
-              <span t-if="arg_index > '0'" t-esc="formulaArgSeparator"/>
+            <t t-foreach="formulaHeaderContent" t-as="part" t-key="part_index">
               <span
-                t-att-class="{ 'o-formula-assistant-focus': context.argsToFocus.includes(arg_index) }">
-                <span>
-                  <span t-if="arg.optional || arg.repeating || arg.default">[</span>
-                  <span t-esc="arg.name"/>
-                  <span t-if="arg.repeating">, ...</span>
-                  <span t-if="arg.optional || arg.repeating || arg.default">]</span>
-                </span>
-              </span>
+                t-esc="part.content"
+                t-att-class="part.focused ? 'o-formula-assistant-focus' : ''"
+              />
             </t>
-            )
           </div>
           <div
             class="collapsor px-2 d-flex align-items-center rounded"
@@ -6883,22 +6908,29 @@
             <div t-esc="context.functionDescription.description"/>
           </div>
 
+          <t
+            t-set="firstRepeatableGroupOptional"
+            t-value="context.functionDescription.args.some(arg => arg.repeating and arg.optional)"
+          />
+
           <t t-foreach="context.functionDescription.args" t-as="arg" t-key="arg.name">
             <div
               class="o-formula-assistant-arg p-3 pt-0 display-flex flex-column"
-              t-att-class="{
-                  'o-formula-assistant-gray': context.argsToFocus.length > 0,
-                  'o-formula-assistant-focus': context.argsToFocus.includes(arg_index),
-                }">
-              <div>
-                <span t-esc="arg.name"/>
+              t-att-class="{'o-formula-assistant-gray': context.argsToFocus.length > 0}">
+              <div
+                t-att-class="{'o-formula-assistant-focus': context.argsToFocus.includes(arg_index)}">
+                <span t-if="arg.repeating">
+                  <span t-esc="arg.name + (context.repeatingArgGroupIndex + 1)"/>
+                </span>
+                <span t-else="">
+                  <span t-esc="arg.name"/>
+                </span>
                 <span
-                  t-if="arg.optional || arg.repeating || arg.default ">&#xA0;- [optional]&#xA0;</span>
+                  t-if="arg.optional || arg.default || (arg.repeating and (firstRepeatableGroupOptional or context.repeatingArgGroupIndex > 0))">&#xA0;- [optional]&#xA0;</span>
                 <span t-if="arg.default">
                   <span>default:&#xA0;</span>
                   <t t-esc="arg.defaultValue"/>
                 </span>
-                <span t-if="arg.repeating">repeatable</span>
               </div>
               <div class="o-formula-assistant-arg-description" t-esc="arg.description"/>
             </div>
@@ -6976,6 +7008,7 @@
             t-if="functionDescriptionState.showDescription"
             functionDescription="functionDescriptionState.functionDescription"
             argsToFocus="functionDescriptionState.argsToFocus"
+            repeatingArgGroupIndex="functionDescriptionState.repeatingArgGroupIndex"
           />
           <div
             t-if="functionDescriptionState.showDescription and autoCompleteProposals.length"

From 3b74d9f162e399e4cbfa571d5497c21288acf767 Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Mon, 3 Nov 2025 14:27:39 +0100
Subject: [PATCH 194/673] [FIX] spreadsheet: odoo pivot unused
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Part-of: odoo/odoo#234147
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
---
 addons/spreadsheet/static/src/pivot/odoo_pivot.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/spreadsheet/static/src/pivot/odoo_pivot.js b/addons/spreadsheet/static/src/pivot/odoo_pivot.js
index 0386ec88d2adf..3db23824a89e4 100644
--- a/addons/spreadsheet/static/src/pivot/odoo_pivot.js
+++ b/addons/spreadsheet/static/src/pivot/odoo_pivot.js
@@ -662,6 +662,7 @@ pivotRegistry.add("ODOO", {
         !field.name.includes(".") && // relational field path are not supported as measures (e.g. 'company_id.partner_id')
         field.store,
     isGroupable: (field) => field.groupable,
+    isPivotUnused: () => true,
     canHaveCustomGroup: (field) =>
         field.groupable &&
         !field.isCustomField &&

From 366b8a83619d45fcc9b983faa55c8cac2cefd9eb Mon Sep 17 00:00:00 2001
From: Deependra Solanki <deso@odoo.com>
Date: Tue, 4 Nov 2025 16:12:20 +0530
Subject: [PATCH 195/673] [FIX] html_editor: getAdjacentCharacter for
 non-collapsed selection

Before this commit:

getAdjacentCharacter always used focusNode for both previous and next-side
calculations. For non-collapsed selections this could return the wrong
character.

After this commit

Use anchorNode when calculating the previous-side adjacent character. This
ensures the utility returns the correct character for non-collapsed selections.

task-4207610

closes odoo/odoo#230042

Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../static/src/core/selection_plugin.js       | 24 ++++++++++++--
 .../html_editor/static/src/utils/selection.js | 31 +++++++++----------
 .../static/tests/utils/selection.test.js      | 25 +++++++++++----
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/addons/html_editor/static/src/core/selection_plugin.js b/addons/html_editor/static/src/core/selection_plugin.js
index 64665a8b884d4..6c152e631def9 100644
--- a/addons/html_editor/static/src/core/selection_plugin.js
+++ b/addons/html_editor/static/src/core/selection_plugin.js
@@ -18,6 +18,7 @@ import { Plugin } from "../plugin";
 import { DIRECTIONS, leftPos, nodeSize, rightPos } from "../utils/position";
 import {
     getAdjacentCharacter,
+    getCursorDirection,
     normalizeDeepCursorPosition,
     normalizeFakeBR,
     normalizeNotEditableNode,
@@ -966,12 +967,27 @@ export class SelectionPlugin extends Plugin {
             const screenDirection = ev.key === "ArrowLeft" ? "left" : "right";
             const isRtl = closestElement(selection.focusNode, "[dir]")?.dir === "rtl";
             const domDirection = (screenDirection === "left") ^ isRtl ? "previous" : "next";
+            const selectionDirection = getCursorDirection(
+                selection.anchorNode,
+                selection.anchorOffset,
+                selection.focusNode,
+                selection.focusOffset
+            );
+            const [edgeNode, edgeOffset] =
+                mode === "move" &&
+                (domDirection === "previous") ^ (selectionDirection === DIRECTIONS.LEFT)
+                    ? ["anchorNode", "anchorOffset"]
+                    : ["focusNode", "focusOffset"];
 
             // Whether the character next to the cursor should be skipped.
             const shouldSkipCallbacks = this.getResource(
                 "intangible_char_for_keyboard_navigation_predicates"
             );
-            let adjacentCharacter = getAdjacentCharacter(selection, domDirection, this.editable);
+            let adjacentCharacter = getAdjacentCharacter(
+                selection[edgeNode],
+                selection[edgeOffset],
+                domDirection
+            );
             let shouldSkip = shouldSkipCallbacks.some((cb) => cb(ev, adjacentCharacter));
 
             while (shouldSkip) {
@@ -982,7 +998,11 @@ export class SelectionPlugin extends Plugin {
                 const hasSelectionChanged =
                     nodeBefore !== selection.focusNode || offsetBefore !== selection.focusOffset;
                 const lastSkippedChar = adjacentCharacter;
-                adjacentCharacter = getAdjacentCharacter(selection, domDirection, this.editable);
+                adjacentCharacter = getAdjacentCharacter(
+                    selection[edgeNode],
+                    selection[edgeOffset],
+                    domDirection
+                );
 
                 shouldSkip =
                     hasSelectionChanged &&
diff --git a/addons/html_editor/static/src/utils/selection.js b/addons/html_editor/static/src/utils/selection.js
index 0813af38578b3..80a26797f124a 100644
--- a/addons/html_editor/static/src/utils/selection.js
+++ b/addons/html_editor/static/src/utils/selection.js
@@ -239,35 +239,34 @@ export const callbacksForCursorUpdate = {
 };
 
 /**
- * @param {Selection} selection
+ * @param {Node} node
+ * @param {number} offset
  * @param {"previous"|"next"} side
- * @param {HTMLElement} editable
  * @returns {string | undefined}
  */
-export function getAdjacentCharacter(selection, side, editable) {
-    let { focusNode, focusOffset } = selection;
-    [focusNode, focusOffset] = getDeepestPosition(focusNode, focusOffset);
-    const originalBlock = closestBlock(focusNode);
+export function getAdjacentCharacter(node, offset, side) {
+    [node, offset] = getDeepestPosition(node, offset);
+    const originalBlock = closestBlock(node);
     let adjacentCharacter;
-    while (!adjacentCharacter && focusNode) {
+    while (!adjacentCharacter && node) {
         if (side === "previous") {
-            adjacentCharacter = focusOffset > 0 && focusNode.textContent[focusOffset - 1];
+            adjacentCharacter = offset > 0 && node.textContent[offset - 1];
         } else {
-            adjacentCharacter = focusNode.textContent[focusOffset];
+            adjacentCharacter = node.textContent[offset];
         }
         if (!adjacentCharacter) {
             if (side === "previous") {
-                focusNode = previousLeaf(focusNode, editable);
-                focusOffset = focusNode && nodeSize(focusNode);
+                node = previousLeaf(node, originalBlock);
+                offset = node && nodeSize(node);
             } else {
-                focusNode = nextLeaf(focusNode, editable);
-                focusOffset = 0;
+                node = nextLeaf(node, originalBlock);
+                offset = 0;
             }
-            const characterIndex = side === "previous" ? focusOffset - 1 : focusOffset;
-            adjacentCharacter = focusNode && focusNode.textContent[characterIndex];
+            const characterIndex = side === "previous" ? offset - 1 : offset;
+            adjacentCharacter = node && node.textContent[characterIndex];
         }
     }
-    if (!focusNode || !isContentEditable(focusNode) || closestBlock(focusNode) !== originalBlock) {
+    if (!node || !isContentEditable(node)) {
         return undefined;
     }
     return adjacentCharacter;
diff --git a/addons/html_editor/static/tests/utils/selection.test.js b/addons/html_editor/static/tests/utils/selection.test.js
index 2e2e69a6a50cd..4478ae717b720 100644
--- a/addons/html_editor/static/tests/utils/selection.test.js
+++ b/addons/html_editor/static/tests/utils/selection.test.js
@@ -8,7 +8,6 @@ import { describe, expect, test } from "@odoo/hoot";
 import { dispatch } from "@odoo/hoot-dom";
 import { insertText, setupEditor, testEditor } from "../_helpers/editor";
 import { unformat } from "../_helpers/format";
-import { setSelection } from "../_helpers/selection";
 
 describe("ensureFocus", () => {
     // TODO @phoenix: unskipped when ensureFocus is add in the code base
@@ -155,11 +154,25 @@ describe("getCursorDirection", () => {
 
 describe("getAdjacentCharacter", () => {
     test("should return the ZWS character before the cursor", async () => {
-        const { editor, el } = await setupEditor("<p><span>abc</span>\u200b</p>");
+        const { el } = await setupEditor("<p><span>abc</span>\u200b</p>");
         const p = el.firstChild;
-        // Place the cursor at the end of the P (not in a leaf node)
-        setSelection({ anchorNode: p, anchorOffset: nodeSize(p) });
-        const selection = editor.document.getSelection();
-        expect(getAdjacentCharacter(selection, "previous", el)).toBe("\u200b");
+        // From the end of the P (not from the leaf node)
+        expect(getAdjacentCharacter(p, nodeSize(p), "previous", el)).toBe("\u200b");
+    });
+
+    test("should return the correct previous character for multiple nodes", async () => {
+        const { el } = await setupEditor("<p>abc</p>");
+        const p = el.firstChild;
+        const def = document.createTextNode("def");
+        p.appendChild(def);
+        expect(getAdjacentCharacter(def, 0, "previous", el)).toBe("c");
+    });
+
+    test("should return the correct next character for multiple nodes", async () => {
+        const { el } = await setupEditor("<p>abc</p>");
+        const p = el.firstChild;
+        const def = document.createTextNode("def");
+        p.appendChild(def);
+        expect(getAdjacentCharacter(p.firstChild, 3, "next", el)).toBe("d");
     });
 });

From 72ff948761621baeceba700727381f13cfb7e7bc Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Mon, 3 Nov 2025 16:48:34 +0100
Subject: [PATCH 196/673] [FIX] product: pricelist report

Make sure the pricelist report display doesn't fail when there
are no active pricelist (user must enable pricelist and delete/archive
existing pricelists).

Also adds some tests to cover basic cases of pricelist report.

Fixes #233393

closes odoo/odoo#234198

Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 .../report/product_pricelist_report.py        |  7 ++--
 .../product_pricelist_report_templates.xml    |  4 +-
 .../product_pricelist_report.js               |  2 +-
 .../product_pricelist_report.xml              |  4 +-
 addons/product/tests/__init__.py              | 29 +++++++-------
 addons/product/tests/test_pricelist_report.py | 38 +++++++++++++++++++
 6 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100644 addons/product/tests/test_pricelist_report.py

diff --git a/addons/product/report/product_pricelist_report.py b/addons/product/report/product_pricelist_report.py
index 82eff4ea77a8b..ec9c20c0b9450 100644
--- a/addons/product/report/product_pricelist_report.py
+++ b/addons/product/report/product_pricelist_report.py
@@ -3,7 +3,7 @@
 from odoo import api, models
 
 
-class ReportProductReport_Pricelist(models.AbstractModel):
+class ProductPricelistReport(models.AbstractModel):
     _name = 'report.product.report_pricelist'
     _description = 'Pricelist Report'
 
@@ -38,18 +38,19 @@ def _get_report_data(self, data, report_type='html'):
         return {
             'is_html_type': report_type == 'html',
             'is_product_tmpl': is_product_tmpl,
-            'display_pricelist_title': data.get('display_pricelist_title', False) and bool(data['display_pricelist_title']),
+            'display_pricelist_title': bool(data.get('display_pricelist_title', False)),
             'pricelist': pricelist,
             'products': products_data,
             'quantities': quantities,
             'docs': pricelist,
+            'currency': pricelist.currency_id or self.env.company.currency_id,
         }
 
     def _get_product_data(self, is_product_tmpl, product, pricelist, quantities):
         product = product.with_context(display_default_code=False)
         data = {
             'id': product.id,
-            'name': is_product_tmpl and product.name or product.display_name,
+            'name': (is_product_tmpl and product.name) or product.display_name,
             'price': dict.fromkeys(quantities, 0.0),
             'uom': product.uom_id.name,
             'default_code': product.default_code,
diff --git a/addons/product/report/product_pricelist_report_templates.xml b/addons/product/report/product_pricelist_report_templates.xml
index 87df3109ce95b..fd1e92646dd97 100644
--- a/addons/product/report/product_pricelist_report_templates.xml
+++ b/addons/product/report/product_pricelist_report_templates.xml
@@ -47,7 +47,7 @@
                                     <td groups="uom.group_uom" class="px-1" t-out="product['uom']"/>
                                     <t t-foreach="quantities" t-as="qty">
                                         <td class="text-end px-1">
-                                            <span t-out="product['price'][qty]" t-options='{"widget": "monetary", "display_currency": pricelist.currency_id}'>$15.00</span>
+                                            <span t-out="product['price'][qty]" t-options='{"widget": "monetary", "display_currency": currency}'>$15.00</span>
                                         </td>
                                     </t>
                                 </tr>
@@ -63,7 +63,7 @@
                                         <td groups="uom.group_uom" class="px-1" t-out="product['uom']"/>
                                         <t t-foreach="quantities" t-as="qty">
                                             <td class="text-end px-1">
-                                                <span t-out="variant['price'][qty]" t-options='{"widget": "monetary", "display_currency": pricelist.currency_id}'>$14.00</span>
+                                                <span t-out="variant['price'][qty]" t-options='{"widget": "monetary", "display_currency": currency}'>$14.00</span>
                                             </td>
                                         </t>
                                     </tr>
diff --git a/addons/product/static/src/js/pricelist_report/product_pricelist_report.js b/addons/product/static/src/js/pricelist_report/product_pricelist_report.js
index 046fd188b4ca3..2357ad6bccf39 100644
--- a/addons/product/static/src/js/pricelist_report/product_pricelist_report.js
+++ b/addons/product/static/src/js/pricelist_report/product_pricelist_report.js
@@ -110,7 +110,7 @@ export class ProductPricelistReport extends Component {
             active_model: this.activeModel || 'product.template',
             active_ids: this.activeIds || [],
             display_pricelist_title: this.displayPricelistTitle || '',
-            pricelist_id: this.selectedPricelist.id || '',
+            pricelist_id: this.selectedPricelist?.id || '',
             quantities: this.quantities || [1],
         };
     }
diff --git a/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml b/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
index 5623c985af9da..293ecc02b922a 100644
--- a/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
+++ b/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
@@ -17,7 +17,7 @@
                     <form class="o_pricelist_report_form d-flex flex-row gap-1">
                         <div class="d-flex align-items-center gap-3 w-100">
                             <label class="visually-hidden" for="pricelists">Username</label>
-                            <div class="input-group w-auto">
+                            <div t-if="pricelists.length > 0" class="input-group w-auto">
                                 <div class="input-group-text fw-bold">Pricelist</div>
                                 <select
                                     name="pricelists"
@@ -33,7 +33,7 @@
                                     </t>
                                 </select>
                             </div>
-                            <div class="form-check w-auto">
+                            <div t-if="pricelists.length > 0" class="form-check w-auto">
                                 <input class="o_display_pricelist_title form-check-input ms-0 me-2"
                                     id="display_pricelist_title"
                                     type="checkbox"
diff --git a/addons/product/tests/__init__.py b/addons/product/tests/__init__.py
index 834b0f84fa9d1..bb46be086cb2d 100644
--- a/addons/product/tests/__init__.py
+++ b/addons/product/tests/__init__.py
@@ -1,15 +1,18 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import test_barcode
-from . import test_common
-from . import test_import_files
-from . import test_name
-from . import test_pricelist
-from . import test_pricelist_auto_creation
-from . import test_product_attribute_value_config
-from . import test_product_combo
-from . import test_product_pricelist
-from . import test_seller
-from . import test_update_pav_wizard
-from . import test_variants
-from . import test_product_rounding
+from . import (
+    test_barcode,
+    test_common,
+    test_import_files,
+    test_name,
+    test_pricelist,
+    test_pricelist_auto_creation,
+    test_pricelist_report,
+    test_product_attribute_value_config,
+    test_product_combo,
+    test_product_pricelist,
+    test_product_rounding,
+    test_seller,
+    test_update_pav_wizard,
+    test_variants,
+)
diff --git a/addons/product/tests/test_pricelist_report.py b/addons/product/tests/test_pricelist_report.py
new file mode 100644
index 0000000000000..0a8008e4a5e06
--- /dev/null
+++ b/addons/product/tests/test_pricelist_report.py
@@ -0,0 +1,38 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests import tagged
+
+from odoo.addons.product.tests.common import ProductCommon
+
+
+@tagged('post_install', '-at_install')
+class TestPricelistReport(ProductCommon):
+
+    def test_product_template_pricelist_report(self):
+        """Load report for `product.template` records."""
+        self.env['report.product.report_pricelist'].get_html(data={
+            'active_ids': self.env['product.template'].search([]).ids,
+        })
+        # Empty report
+        self.env['report.product.report_pricelist'].get_html(data={})
+
+    def test_product_product_pricelist_report(self):
+        """Load report for `product.product` records."""
+        self.env['report.product.report_pricelist'].get_html(data={
+            'active_ids': self.env['product.product'].search([]).ids,
+            'active_model': self.env['product.product']._name,
+        })
+        # Empty report
+        self.env['report.product.report_pricelist'].get_html(data={
+            'active_model': self.env['product.product']._name,
+        })
+
+    def test_no_pricelist_report(self):
+        """Load report when there is no active pricelist.
+
+        Report should fall back on company currency, and hide pricelist choices.
+        """
+        self.env['product.pricelist'].search([]).action_archive()
+        self.env['report.product.report_pricelist'].get_html(data={
+            'active_ids': self.env['product.template'].search([]).ids,
+        })

From c128c80c3bb72571a9b8e074358a6e46470beb3a Mon Sep 17 00:00:00 2001
From: romc-odoo <romc@odoo.com>
Date: Fri, 17 Oct 2025 09:51:43 +0200
Subject: [PATCH 197/673] [IMP] hr: redirect version fields to correct view

If the version record is a contract template, redirect to the version contract template view.
Otherwise, redirect to the employee form view with the version_id in the context.

task-5082709

closes odoo/odoo#232058

Related: odoo/enterprise#97463
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_version.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/hr/models/hr_version.py b/addons/hr/models/hr_version.py
index 56ee3b5972e34..123ecd48fcc86 100644
--- a/addons/hr/models/hr_version.py
+++ b/addons/hr/models/hr_version.py
@@ -353,6 +353,26 @@ def write(self, vals):
 
         return super(HrVersion, multiple_versions).write(new_vals)
 
+    def get_formview_action(self, access_uid=None):
+        """
+        Override this method in order to redirect many2one towards the right model
+            - Contract template -> hr.version
+            - Employee record -> hr.employee(.public) with version_id in context
+        """
+        res = super().get_formview_action(access_uid=access_uid)
+        context = res.get('context', {})
+        if self.employee_id:
+            user = self.env.user
+            if access_uid:
+                user = self.env['res.users'].browse(access_uid)
+            res['res_model'] = 'hr.employee' if user.has_group('hr.group_hr_user') else 'hr.employee.public'
+            res['res_id'] = self.employee_id.id
+            res['context'] = dict(context, version_id=self.id)
+        else:
+            if not context.get('form_view_ref', False):
+                res['context'] = dict(context, form_view_ref='hr.hr_contract_template_form_view')
+        return res
+
     @api.depends_context('lang')
     @api.depends('date_version')
     def _compute_display_name(self):

From 9f2b9e2d3acd6d248ac0f5a1242ced0d5e62aee4 Mon Sep 17 00:00:00 2001
From: thle-odoo <thle@odoo.com>
Date: Fri, 10 Oct 2025 09:14:28 +0200
Subject: [PATCH 198/673] [IMP] tools: reimplement frozendict

Before this commit, Odoo had two implementations for creating
an immutable dictionary. These two implementations have different
behaviors and coexist for backward compatibility reasons.

The purpose of this commit is to leave only one implementation
for the immutable dictionary, called `frozendict`.

This implementation makes it truly impossible to modify the mapping.

In addition, by default, we don't override internal methods of the
dictionary which improves performance (despite the cost during creation).

Note 1:
Classes `LangData` and `LangDataDict` are adapted as `Mapping` subclasses
instead of `ReadonlyDict`. This simplifies their implementation, which is
not performance-critical.

Note 2:
This change is possible because the `MappingProxyType` class implements
fallback on the `__hash__` method since version 3.12
(thanks to https://github.com/odoo/odoo/commit/d357125e09b8f3613269bb8627972588c20900aa).

task-4808836

closes odoo/odoo#230923

Related: odoo/enterprise#96853
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/account/models/account_move.py         |  5 +-
 .../wizard/account_automatic_entry_wizard.py  |  2 +-
 addons/google_calendar/utils/google_event.py  |  4 +-
 .../utils/microsoft_event.py                  |  4 +-
 addons/rpc/controllers/xmlrpc.py              |  4 +-
 odoo/addons/base/models/ir_qweb.py            |  8 +-
 odoo/addons/base/models/res_lang.py           | 40 ++++++++--
 odoo/addons/base/tests/test_misc.py           |  2 +-
 odoo/orm/fields.py                            |  4 +-
 odoo/orm/fields_selection.py                  |  2 +-
 odoo/tools/json.py                            |  4 +-
 odoo/tools/misc.py                            | 80 +++++--------------
 odoo/tools/translate.py                       |  8 +-
 13 files changed, 82 insertions(+), 85 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 9860031d25091..f914b377e41f4 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -3,6 +3,7 @@
 import ast
 import calendar
 from collections import Counter, defaultdict
+from collections.abc import Mapping
 from contextlib import ExitStack, contextmanager
 from datetime import date, timedelta
 from dateutil.relativedelta import relativedelta
@@ -4848,7 +4849,7 @@ def tax_details_grouping_function(base_line, tax_data):
             for grouping_key, values in aggregated_values.items():
                 if not grouping_key:
                     continue
-                if isinstance(grouping_key, dict):
+                if isinstance(grouping_key, Mapping):
                     values.update(grouping_key)
                 tax_details[grouping_key] = values
 
@@ -4857,7 +4858,7 @@ def tax_details_grouping_function(base_line, tax_data):
         for grouping_key, values in values_per_grouping_key.items():
             if not grouping_key:
                 continue
-            if isinstance(grouping_key, dict):
+            if isinstance(grouping_key, Mapping):
                 values.update(grouping_key)
             tax_details[grouping_key] = values
 
diff --git a/addons/account/wizard/account_automatic_entry_wizard.py b/addons/account/wizard/account_automatic_entry_wizard.py
index 0226c69230ab5..08048242c5e16 100644
--- a/addons/account/wizard/account_automatic_entry_wizard.py
+++ b/addons/account/wizard/account_automatic_entry_wizard.py
@@ -241,7 +241,7 @@ def _get_move_dict_vals_change_account(self):
                     'partner_id': partner.id or None,
                     'currency_id': currency.id,
                     'amount_currency': (account_balance > 0 and -1 or 1) * abs(account_amount_currency),
-                    'analytic_distribution': analytic_distribution,
+                    'analytic_distribution': analytic_distribution and dict(analytic_distribution),
                 })
 
         # Get the lowest child company based on accounts used to avoid access error
diff --git a/addons/google_calendar/utils/google_event.py b/addons/google_calendar/utils/google_event.py
index 0b8d2f74894ba..4117b8180b6d6 100644
--- a/addons/google_calendar/utils/google_event.py
+++ b/addons/google_calendar/utils/google_event.py
@@ -6,7 +6,7 @@
 from typing import Iterator, Mapping
 
 from odoo.tools import email_normalize
-from odoo.tools.misc import ReadonlyDict
+from odoo.tools.misc import frozendict
 
 _logger = logging.getLogger(__name__)
 
@@ -33,7 +33,7 @@ def __init__(self, iterable=()):
                 _events[item.get('id')] = item
             else:
                 raise ValueError("Only %s or iterable of dict are supported" % self.__class__.__name__)
-        self._events = ReadonlyDict(_events)
+        self._events = frozendict(_events)
 
     def __iter__(self) ->  Iterator['GoogleEvent']:
         return iter(GoogleEvent([vals]) for vals in self._events.values())
diff --git a/addons/microsoft_calendar/utils/microsoft_event.py b/addons/microsoft_calendar/utils/microsoft_event.py
index 62501c7e4e641..6f34958a0606d 100644
--- a/addons/microsoft_calendar/utils/microsoft_event.py
+++ b/addons/microsoft_calendar/utils/microsoft_event.py
@@ -5,7 +5,7 @@
 from typing import Iterator, Mapping
 
 from odoo.tools import email_normalize
-from odoo.tools.misc import ReadonlyDict
+from odoo.tools.misc import frozendict
 
 
 class MicrosoftEvent(abc.Set):
@@ -27,7 +27,7 @@ def __init__(self, iterable=()):
                 _events[item.get('id')] = item
             else:
                 raise ValueError("Only %s or iterable of dict are supported" % self.__class__.__name__)
-        self._events = ReadonlyDict(_events)
+        self._events = frozendict(_events)
 
     def __iter__(self) -> Iterator['MicrosoftEvent']:
         return iter(MicrosoftEvent([vals]) for vals in self._events.values())
diff --git a/addons/rpc/controllers/xmlrpc.py b/addons/rpc/controllers/xmlrpc.py
index fbdb658c4cea9..b865672b19872 100644
--- a/addons/rpc/controllers/xmlrpc.py
+++ b/addons/rpc/controllers/xmlrpc.py
@@ -4,6 +4,7 @@
 import xmlrpc.client
 from collections import defaultdict
 from datetime import date, datetime
+from types import MappingProxyType
 
 from markupsafe import Markup
 
@@ -11,7 +12,6 @@
 from odoo.fields import Command, Date, Datetime
 from odoo.http import Controller, Response, dispatch_rpc, request, route
 from odoo.tools import lazy
-from odoo.tools.misc import frozendict
 
 from . import RPC_DEPRECATION_NOTICE, _check_request
 
@@ -99,7 +99,7 @@ def dump_unicode(self, value, write):
         # XML 1.0 disallows control characters, remove them otherwise they break clients
         return super().dump_unicode(value.translate(CONTROL_CHARACTERS), write)
 
-    dispatch[frozendict] = dump_frozen_dict
+    dispatch[MappingProxyType] = dump_frozen_dict
     dispatch[bytes] = dump_bytes
     dispatch[datetime] = dump_datetime
     dispatch[date] = dump_date
diff --git a/odoo/addons/base/models/ir_qweb.py b/odoo/addons/base/models/ir_qweb.py
index f45a95ca743f5..1c6cab00dbfb1 100644
--- a/odoo/addons/base/models/ir_qweb.py
+++ b/odoo/addons/base/models/ir_qweb.py
@@ -637,8 +637,14 @@ def __rmod__(self, other):
 
 
 class QwebJSON(json.JSON):
+
+    def default(self, obj):
+        if isinstance(obj, Mapping):
+            return dict(obj)
+        return obj
+
     def dumps(self, *args, **kwargs):
-        prev_default = kwargs.pop('default', lambda obj: obj)
+        prev_default = kwargs.pop('default', self.default)
         return super().dumps(*args, **kwargs, default=(
             lambda obj: prev_default(str(obj) if isinstance(obj, QwebContent) else obj)
         ))
diff --git a/odoo/addons/base/models/res_lang.py b/odoo/addons/base/models/res_lang.py
index 2cce910d6ce97..a0f05ce493fff 100644
--- a/odoo/addons/base/models/res_lang.py
+++ b/odoo/addons/base/models/res_lang.py
@@ -6,21 +6,37 @@
 import locale
 import logging
 import re
+from collections.abc import Mapping
 from typing import Any, Literal
 
 from odoo import api, fields, models, tools, _
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools import OrderedSet
-from odoo.tools.misc import ReadonlyDict
 
 _logger = logging.getLogger(__name__)
 
-class LangData(ReadonlyDict):
+
+class LangData(Mapping):
     """ A ``dict``-like class which can access field value like a ``res.lang`` record.
     Note: This data class cannot store data for fields with the same name as
     ``dict`` methods, like ``dict.keys``.
     """
-    __slots__ = ()
+    __slots__ = ('__data',)
+
+    def __init__(self, data):
+        self.__data = dict(data)
+
+    def __getitem__(self, key):
+        return self.__data[key]
+
+    def __len__(self):
+        return len(self.__data)
+
+    def __iter__(self):
+        return iter(self.__data)
+
+    def __contains__(self, key):
+        return key in self.__data
 
     def __bool__(self) -> bool:
         return bool(self.id)
@@ -32,19 +48,31 @@ def __getattr__(self, name: str) -> Any:
             raise AttributeError
 
 
-class LangDataDict(ReadonlyDict):
+class LangDataDict(Mapping):
     """ A ``dict`` of :class:`LangData` objects indexed by some key, which returns
     a special dummy :class:`LangData` for missing keys.
     """
-    __slots__ = ()
+    __slots__ = ('__data',)
+
+    def __init__(self, data):
+        self.__data = dict(data)
 
     def __getitem__(self, key: Any) -> LangData:
         try:
-            return self._data__[key]
+            return self.__data[key]
         except KeyError:
             some_lang = next(iter(self.values()))  # should have at least one active language
             return LangData(dict.fromkeys(some_lang, False))
 
+    def __len__(self):
+        return len(self.__data)
+
+    def __iter__(self):
+        return iter(self.__data)
+
+    def __contains__(self, key):
+        return key in self.__data
+
 
 class ResLang(models.Model):
     _name = 'res.lang'
diff --git a/odoo/addons/base/tests/test_misc.py b/odoo/addons/base/tests/test_misc.py
index 0ffb5a078f79e..e2fc96dfad80c 100644
--- a/odoo/addons/base/tests/test_misc.py
+++ b/odoo/addons/base/tests/test_misc.py
@@ -342,7 +342,7 @@ def test_file_open(self):
 @tagged('at_install', '-post_install')  # LEGACY at_install
 class TestDictTools(BaseCase):
     def test_readonly_dict(self):
-        d = misc.ReadonlyDict({'foo': 'bar'})
+        d = misc.frozendict({'foo': 'bar'})
         with self.assertRaises(TypeError):
             d['baz'] = 'xyz'
         with self.assertRaises(AttributeError):
diff --git a/odoo/orm/fields.py b/odoo/orm/fields.py
index 9ea662260b45e..bc3e3826451fa 100644
--- a/odoo/orm/fields.py
+++ b/odoo/orm/fields.py
@@ -19,7 +19,7 @@
 from odoo.exceptions import AccessError, MissingError
 from odoo.tools import SQL, sql
 from odoo.tools.constants import PREFETCH_MAX
-from odoo.tools.misc import SENTINEL, ReadonlyDict, Sentinel, unique
+from odoo.tools.misc import frozendict, SENTINEL, Sentinel, unique
 
 from .domains import Domain
 from .query import Query
@@ -320,7 +320,7 @@ def _read_group_many2one_field(self, records, domain):
     def __init__(self, string: str | Sentinel = SENTINEL, **kwargs):
         kwargs['string'] = string
         self._sequence = next(_global_seq)
-        self._args__ = ReadonlyDict({key: val for key, val in kwargs.items() if val is not SENTINEL})
+        self._args__ = frozendict({key: val for key, val in kwargs.items() if val is not SENTINEL})
 
     def __str__(self):
         if not self.name:
diff --git a/odoo/orm/fields_selection.py b/odoo/orm/fields_selection.py
index 05c6121ce91ad..8e6e103ce1008 100644
--- a/odoo/orm/fields_selection.py
+++ b/odoo/orm/fields_selection.py
@@ -3,7 +3,7 @@
 import typing
 from collections import defaultdict
 
-from odoo.tools.misc import ReadonlyDict, SENTINEL, Sentinel, merge_sequences
+from odoo.tools.misc import SENTINEL, Sentinel, merge_sequences
 from odoo.tools.sql import pg_varchar
 
 from .fields import Field, _logger, determine, resolve_mro
diff --git a/odoo/tools/json.py b/odoo/tools/json.py
index f4def5d7ac706..344475370993a 100644
--- a/odoo/tools/json.py
+++ b/odoo/tools/json.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
+from collections.abc import Mapping
 from datetime import date, datetime
 import json as json_
 import re
 
 import markupsafe
 from .func import lazy
-from .misc import ReadonlyDict
 
 JSON_SCRIPTSAFE_MAPPER = {
     '&': r'\u0026',
@@ -66,7 +66,7 @@ def json_default(obj):
         return fields.Date.to_string(obj)
     if isinstance(obj, lazy):
         return obj._value
-    if isinstance(obj, ReadonlyDict):
+    if isinstance(obj, Mapping):
         return dict(obj)
     if isinstance(obj, bytes):
         return obj.decode()
diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py
index 1445440d16a66..0bc7d50946e28 100644
--- a/odoo/tools/misc.py
+++ b/odoo/tools/misc.py
@@ -32,6 +32,7 @@
 from functools import reduce, wraps
 from itertools import islice, groupby as itergroupby
 from operator import itemgetter
+from types import MappingProxyType
 
 import babel
 import babel.dates
@@ -947,35 +948,6 @@ def clean_context(context: dict[str, typing.Any]) -> dict[str, typing.Any]:
     return {k: v for k, v in context.items() if not k.startswith('default_')}
 
 
-class frozendict(dict[K, T], typing.Generic[K, T]):
-    """ An implementation of an immutable dictionary. """
-    __slots__ = ()
-
-    def __delitem__(self, key):
-        raise NotImplementedError("'__delitem__' not supported on frozendict")
-
-    def __setitem__(self, key, val):
-        raise NotImplementedError("'__setitem__' not supported on frozendict")
-
-    def clear(self):
-        raise NotImplementedError("'clear' not supported on frozendict")
-
-    def pop(self, key, default=None):
-        raise NotImplementedError("'pop' not supported on frozendict")
-
-    def popitem(self):
-        raise NotImplementedError("'popitem' not supported on frozendict")
-
-    def setdefault(self, key, default=None):
-        raise NotImplementedError("'setdefault' not supported on frozendict")
-
-    def update(self, *args, **kwargs):
-        raise NotImplementedError("'update' not supported on frozendict")
-
-    def __hash__(self) -> int:  # type: ignore
-        return hash(frozenset((key, freehash(val)) for key, val in self.items()))
-
-
 class Collector(dict[K, tuple[T, ...]], typing.Generic[K, T]):
     """ A mapping from keys to tuples.  This implements a relation, and can be
         seen as a space optimization for ``defaultdict(tuple)``.
@@ -1640,43 +1612,33 @@ def format_duration(value: float) -> str:
 consteq = hmac_lib.compare_digest
 
 
-class ReadonlyDict(Mapping[K, T], typing.Generic[K, T]):
-    """Helper for an unmodifiable dictionary, not even updatable using `dict.update`.
-
-    This is similar to a `frozendict`, with one drawback and one advantage:
+class _HashDict(dict):
+    """ Simple extension of ``dict`` that provides a hash function.
+        For the hash to be correct, one should not modify the dict's content.
+    """
 
-    - `dict.update` works for a `frozendict` but not for a `ReadonlyDict`.
-    - `json.dumps` works for a `frozendict` by default but not for a `ReadonlyDict`.
+    __slots__ = ()
 
-    This comes from the fact `frozendict` inherits from `dict`
-    while `ReadonlyDict` inherits from `collections.abc.Mapping`.
+    def __hash__(self):
+        return hash(frozenset((key, freehash(val)) for key, val in self.items()))
 
-    So, depending on your needs,
-    whether you absolutely must prevent the dictionary from being updated (e.g., for security reasons)
-    or you require it to be supported by `json.dumps`, you can choose either option.
 
-        E.g.
-          data = ReadonlyDict({'foo': 'bar'})
-          data['baz'] = 'xyz' # raises exception
-          data.update({'baz', 'xyz'}) # raises exception
-          dict.update(data, {'baz': 'xyz'}) # raises exception
+def frozendict(mapping=(), /, **kw) -> MappingProxyType:
+    """ Return an immutable copy of a mapping.
+        This allows the returned proxy mapping to be hashed.
+        The reference to the newly created internal dictionary is not
+        accessible, which guarantees immutability
     """
-    __slots__ = ('_data__',)
-
-    def __init__(self, data):
-        self._data__ = dict(data)
+    return MappingProxyType(_HashDict(mapping, **kw))
 
-    def __contains__(self, key: K):
-        return key in self._data__
 
-    def __getitem__(self, key: K) -> T:
-        return self._data__[key]
-
-    def __len__(self):
-        return len(self._data__)
-
-    def __iter__(self):
-        return iter(self._data__)
+def ReadonlyDict(mapping=(), /, **kw) -> MappingProxyType:
+    warnings.warn(
+        "ReadonlyDict is deprecated starting Odoo 20, use frozendict",
+        category=DeprecationWarning,
+        stacklevel=2,
+    )
+    return frozendict(mapping, **kw)
 
 
 class DotDict(dict):
diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py
index f176f1844b0bf..130fb1a30a0e9 100644
--- a/odoo/tools/translate.py
+++ b/odoo/tools/translate.py
@@ -37,7 +37,7 @@
 from odoo.exceptions import UserError
 from .config import config
 from .i18n import format_list
-from .misc import file_open, file_path, get_iso_codes, split_every, OrderedSet, ReadonlyDict, SKIPPED_ELEMENT_TYPES
+from .misc import file_open, file_path, frozendict, get_iso_codes, split_every, OrderedSet, SKIPPED_ELEMENT_TYPES
 
 if typing.TYPE_CHECKING:
     from odoo.api import Environment
@@ -1839,15 +1839,15 @@ def _load_python_translations(self, module_name, lang):
         def filter_func(row):
             return row.get('value') and PYTHON_TRANSLATION_COMMENT in row['comments']
         translations = CodeTranslations._get_code_translations(module_name, lang, filter_func)
-        self.python_translations[(module_name, lang)] = ReadonlyDict(translations)
+        self.python_translations[module_name, lang] = frozendict(translations)
 
     def _load_web_translations(self, module_name, lang):
         def filter_func(row):
             return row.get('value') and JAVASCRIPT_TRANSLATION_COMMENT in row['comments']
         translations = CodeTranslations._get_code_translations(module_name, lang, filter_func)
-        self.web_translations[(module_name, lang)] = ReadonlyDict({
+        self.web_translations[module_name, lang] = frozendict({
             "messages": tuple(
-                ReadonlyDict({"id": src, "string": value})
+                frozendict({"id": src, "string": value})
                 for src, value in translations.items())
         })
 

From 0b19a0721539f9730b97b8c0d16e12e9506bb2c6 Mon Sep 17 00:00:00 2001
From: h4818 <ayh@odoo.com>
Date: Thu, 30 Oct 2025 18:50:20 +0100
Subject: [PATCH 199/673] [IMP] account: reports text engine POC

Add a simple text engine to reports to be able to add multiple text columns.

This is useful for reports that have box numbers. See the DE/ZA/MK VAT reports.

closes odoo/odoo#233916

Related: odoo/enterprise#98539
Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
---
 addons/account/models/account_report.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/models/account_report.py b/addons/account/models/account_report.py
index 540da5e4aed18..3f525870a682b 100644
--- a/addons/account/models/account_report.py
+++ b/addons/account/models/account_report.py
@@ -588,6 +588,7 @@ class AccountReportExpression(models.Model):
             ('account_codes', "Prefix of Account Codes"),
             ('external', "External Value"),
             ('custom', "Custom Python Function"),
+            ('text', "Plain Text"),
         ],
         required=True
     )

From 585cccc278ef3b7eb37660dc1d731f0f80a45002 Mon Sep 17 00:00:00 2001
From: Zelong Lin <zel@odoo.com>
Date: Tue, 4 Nov 2025 16:58:29 +0100
Subject: [PATCH 200/673] [IMP] mail: introduce BusSyncMixin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, Discuss Channel, Discuss Channel Member, Discuss Category,
have certain fields that need to stay synchronized when updated.

This is currently done with a custom implementation of _sync_field_names
on each model and orm (write) overrides.

Since the synchronization logic is mostly similar across these models,
we want to introduce a way to generalize this solution.

task-5221092

closes odoo/odoo#233654

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/models/discuss/__init__.py        |  1 +
 addons/mail/models/discuss/bus_sync_mixin.py  | 76 +++++++++++++++++++
 .../mail/models/discuss/discuss_category.py   | 22 ++----
 addons/mail/models/discuss/discuss_channel.py | 45 +----------
 .../models/discuss/discuss_channel_member.py  | 61 +++++----------
 5 files changed, 108 insertions(+), 97 deletions(-)
 create mode 100644 addons/mail/models/discuss/bus_sync_mixin.py

diff --git a/addons/mail/models/discuss/__init__.py b/addons/mail/models/discuss/__init__.py
index 46691a26dcb62..f6ae94a509a8f 100644
--- a/addons/mail/models/discuss/__init__.py
+++ b/addons/mail/models/discuss/__init__.py
@@ -4,6 +4,7 @@
 from . import mail_message
 
 # discuss
+from . import bus_sync_mixin
 from . import discuss_call_history
 from . import discuss_category
 from . import discuss_channel_member
diff --git a/addons/mail/models/discuss/bus_sync_mixin.py b/addons/mail/models/discuss/bus_sync_mixin.py
new file mode 100644
index 0000000000000..3ed7d6d462063
--- /dev/null
+++ b/addons/mail/models/discuss/bus_sync_mixin.py
@@ -0,0 +1,76 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from collections import defaultdict
+from odoo import models, api
+from odoo.addons.web.models.models import lazymapping
+from odoo.addons.mail.tools.discuss import Store
+
+
+class BusSyncMixin(models.AbstractModel):
+    _name = "bus.sync.mixin"
+    _description = "Mixin for Bus Sync"
+
+    @api.model
+    def _sync_field_names(self):
+        """
+        Return the field names to sync. Override in specific models.
+        Keys are bus subchannel names, values are lists of field names to sync.
+        """
+        return defaultdict(list)
+
+    @api.model
+    def _sync_extra_field_names(self, target: Store.Target, fields):
+        """
+        Return the extra field names to sync. Override in specific models.
+        :param target: the target to sync to (Store.Target)
+        :param fields: list of field names that have changed
+        """
+        return []
+
+    def write(self, vals):
+        def get_field_name(field_description):
+            if isinstance(field_description, Store.Attr):
+                return field_description.field_name
+            return field_description
+
+        def get_field_value(record, field_description):
+            """Get the value of a field based on its description."""
+            if isinstance(field_description, Store.Attr):
+                if field_description.predicate and not field_description.predicate(record):
+                    return None
+            if isinstance(field_description, Store.Relation):
+                return field_description._get_value(record).records
+            if isinstance(field_description, Store.Attr):
+                return field_description._get_value(record)
+            return record[field_description]
+
+        def get_vals(record):
+            """Get the current values of the fields to sync."""
+            return {
+                subchannel: {
+                    get_field_name(field_description): (
+                        get_field_value(record, field_description),
+                        field_description,
+                    )
+                    for field_description in field_descriptions
+                }
+                for subchannel, field_descriptions in self._sync_field_names().items()
+            }
+
+        old_vals = {record: get_vals(record) for record in self}
+        result = super().write(vals)
+        stores = lazymapping(lambda param: Store(bus_channel=param[0], bus_subchannel=param[1]))
+        for record in self:
+            for subchannel, values in get_vals(record).items():
+                diff = []
+                for field_name, (value, field_description) in values.items():
+                    if value != old_vals[record][subchannel][field_name][0]:
+                        diff.append(field_description)
+                if diff:
+                    for channel in record._bus_channel():
+                        stores[channel, subchannel].add(record, diff)
+                        if extra_fields := record._sync_extra_field_names(stores[channel, subchannel].target, diff):
+                            stores[channel, subchannel].add(record, extra_fields)
+        for store in stores.values():
+            store.bus_send()
+        return result
diff --git a/addons/mail/models/discuss/discuss_category.py b/addons/mail/models/discuss/discuss_category.py
index a1883baba2ca2..41f09c406e681 100644
--- a/addons/mail/models/discuss/discuss_category.py
+++ b/addons/mail/models/discuss/discuss_category.py
@@ -9,6 +9,7 @@
 class DiscussCategory(models.Model):
     _name = "discuss.category"
     _description = "Discussion Category"
+    _inherit = ["bus.sync.mixin"]
 
     # description
     name = fields.Char("Name", required=True)
@@ -17,20 +18,13 @@ class DiscussCategory(models.Model):
     # constraints
     _name_unique = models.Constraint("UNIQUE(name)", "The category name must be unique")
 
-    def write(self, vals):
-        if "name" in vals:
-            old_name_by_category = {category: category.name for category in self}
-            result = super().write(vals)
-            stores = lazymapping(lambda channel: Store(bus_channel=channel))
-            for category in self:
-                if old_name_by_category[category] == vals["name"]:
-                    continue
-                for channel in category.channel_ids:
-                    stores[channel].add(category, ["name"])
-            for store in stores.values():
-                store.bus_send()
-            return result
-        return super().write(vals)
+    def _sync_field_names(self):
+        res = super()._sync_field_names()
+        res[None] += ["name"]
+        return res
+
+    def _bus_channel(self):
+        return self.channel_ids
 
     @api.ondelete(at_uninstall=False)
     def _unlink_sync_to_channel(self):
diff --git a/addons/mail/models/discuss/discuss_channel.py b/addons/mail/models/discuss/discuss_channel.py
index 7bfebfe4167fb..4571311ac6c80 100644
--- a/addons/mail/models/discuss/discuss_channel.py
+++ b/addons/mail/models/discuss/discuss_channel.py
@@ -52,7 +52,7 @@ class DiscussChannel(models.Model):
     _description = 'Discussion Channel'
     _mail_flat_thread = False
     _mail_post_access = 'read'
-    _inherit = ["mail.thread"]
+    _inherit = ["mail.thread", "bus.sync.mixin"]
 
     MAX_BOUNCE_LIMIT = 10
 
@@ -457,55 +457,14 @@ def write(self, vals):
                         channels=failing_channels.mapped("name"),
                     )
                 )
-
-        def get_field_name(field_description):
-            if isinstance(field_description, Store.Attr):
-                return field_description.field_name
-            return field_description
-
-        def get_field_value(channel, field_description):
-            if isinstance(field_description, Store.Attr):
-                if field_description.predicate and not field_description.predicate(channel):
-                    return None
-            if isinstance(field_description, Store.Relation):
-                return field_description._get_value(channel).records
-            if isinstance(field_description, Store.Attr):
-                return field_description._get_value(channel)
-            return channel[field_description]
-
-        def get_vals(channel):
-            return {
-                subchannel: {
-                    get_field_name(field_description): (
-                        get_field_value(channel, field_description),
-                        field_description,
-                    )
-                    for field_description in field_descriptions
-                }
-                for subchannel, field_descriptions in self._sync_field_names().items()
-            }
-
-        old_vals = {channel: get_vals(channel) for channel in self}
         result = super().write(vals)
-        for channel in self:
-            new_subchannel_vals = get_vals(channel)
-            for subchannel, values in new_subchannel_vals.items():
-                diff = []
-                for field_name, (value, field_description) in values.items():
-                    if value != old_vals[channel][subchannel][field_name][0]:
-                        diff.append(field_description)
-                if diff:
-                    Store(
-                        bus_channel=channel,
-                        bus_subchannel=subchannel,
-                    ).add(channel, diff).bus_send()
         if vals.get('group_ids'):
             self._subscribe_users_automatically()
         return result
 
     def _sync_field_names(self):
         # keys are bus subchannel names, values are lists of field names to sync
-        res = defaultdict(list)
+        res = super()._sync_field_names()
         res[None] += [
             Store.Attr("avatar_cache_key", predicate=is_channel_or_group),
             Store.One("discuss_category_id", ["name"], sudo=True),  # sudo: discuss.category - reading name is acceptable
diff --git a/addons/mail/models/discuss/discuss_channel_member.py b/addons/mail/models/discuss/discuss_channel_member.py
index 7b071f519dfdc..236ae1e7cacc1 100644
--- a/addons/mail/models/discuss/discuss_channel_member.py
+++ b/addons/mail/models/discuss/discuss_channel_member.py
@@ -21,7 +21,7 @@
 
 class DiscussChannelMember(models.Model):
     _name = 'discuss.channel.member'
-    _inherit = ["bus.listener.mixin"]
+    _inherit = ["bus.listener.mixin", "bus.sync.mixin"]
     _description = "Channel Member"
     _rec_names_search = ["channel_id", "partner_id", "guest_id"]
     _bypass_create_check = {}
@@ -233,48 +233,12 @@ def write(self, vals):
             for field_name in ['channel_id', 'partner_id', 'guest_id']:
                 if field_name in vals and vals[field_name] != channel_member[field_name].id:
                     raise AccessError(_('You can not write on %(field_name)s.', field_name=field_name))
-
-        def get_field_name(field_description):
-            if isinstance(field_description, Store.Attr):
-                return field_description.field_name
-            return field_description
-
-        def get_vals(member):
-            return {
-                get_field_name(field_description): (
-                    member[get_field_name(field_description)],
-                    field_description,
-                )
-                for field_description in self._sync_field_names()
-            }
-
-        old_vals_by_member = {member: get_vals(member) for member in self}
-        result = super().write(vals)
-        for member in self:
-            new_values = get_vals(member)
-            diff = []
-            for field_name, (new_value, field_description) in new_values.items():
-                old_value = old_vals_by_member[member][field_name][0]
-                if new_value != old_value:
-                    diff.append(field_description)
-            if diff:
-                store = Store(bus_channel=member._bus_channel())
-                diff.extend(
-                    [
-                        Store.One("channel_id", [], as_thread=True),
-                        *self.env["discuss.channel.member"]._to_store_persona(store.target, []),
-                    ]
-                )
-                if "message_unread_counter" in diff:
-                    # sudo: bus.bus: reading non-sensitive last id
-                    bus_last_id = self.env["bus.bus"].sudo()._bus_last_id()
-                    diff.append({"message_unread_counter_bus_id": bus_last_id})
-                store.add(member, diff).bus_send()
-        return result
+        return super().write(vals)
 
     @api.model
     def _sync_field_names(self):
-        return [
+        res = super()._sync_field_names()
+        res[None] += [
             "custom_channel_name",
             "custom_notifications",
             "is_favorite",
@@ -290,6 +254,23 @@ def _sync_field_names(self):
             ),
             "unpin_dt",
         ]
+        return res
+
+    @api.model
+    def _sync_extra_field_names(self, target: Store.Target, fields):
+        res = super()._sync_extra_field_names(target, fields)
+        res += [
+            Store.One("channel_id", [], as_thread=True),
+            *self.env["discuss.channel.member"]._to_store_persona(target, []),
+        ]
+        if "message_unread_counter" in fields:
+            res += [
+                Store.Attr(
+                    "message_unread_counter_bus_id",
+                    value=lambda m: self.env["bus.bus"].sudo()._bus_last_id(),
+                )
+            ]
+        return res
 
     def unlink(self):
         # sudo: discuss.channel.rtc.session - cascade unlink of sessions for self member

From f859f93a83ce6258274a71d1b31205bb4947f743 Mon Sep 17 00:00:00 2001
From: Harrison Hutton <hahu@odoo.com>
Date: Fri, 10 Oct 2025 13:05:20 +0000
Subject: [PATCH 201/673] [FIX] point_of_sale: configurable product access
 rights issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Issue:**
In POS, clicking on a tax-free, inventory-tracked, configurable product
as a non-admin user can throw an Access Rights error when trying to
access it on a branch company's POS config.

**Steps to reproduce:**
- Configure a branching company on a parent company
- Create a new POS restaurant on the child company
- Create a configurable product that has no taxes associated with it
  and add it to a POS category so that it can be chosen from the
  POS screen
- On a non-admin POS user, try to click that product 🐛

**Before this commit:**
The user will get an Access Rights error.

**After this commit:**
The configurator dialog will load successfully.

opw-5145176

closes odoo/odoo#233320

X-original-commit: 689a5230377f3d894d3464c9454d452e1df814ba
Signed-off-by: David Monnom (moda) <moda@odoo.com>
Signed-off-by: Harrison Hutton (hahu) <hahu@odoo.com>
---
 .../point_of_sale/models/product_template.py  |  2 +-
 .../tests/test_pos_products_with_tax.py       | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/models/product_template.py b/addons/point_of_sale/models/product_template.py
index 24d369e026d99..16aff34eb58a2 100644
--- a/addons/point_of_sale/models/product_template.py
+++ b/addons/point_of_sale/models/product_template.py
@@ -333,7 +333,7 @@ def get_product_info_pos(self, price, quantity, pos_config_id, product_variant_i
         while not tax_to_use and company:
             tax_to_use = self.taxes_id.filtered(lambda tax: tax.company_id.id == company.id)
             if not tax_to_use:
-                company = company.parent_id
+                company = company.sudo().parent_id
         taxes = tax_to_use.compute_all(price, config.currency_id, quantity, self)
         grouped_taxes = {}
         for tax in taxes['taxes']:
diff --git a/addons/point_of_sale/tests/test_pos_products_with_tax.py b/addons/point_of_sale/tests/test_pos_products_with_tax.py
index c98d2813ce06c..9689bbc8f40a6 100644
--- a/addons/point_of_sale/tests/test_pos_products_with_tax.py
+++ b/addons/point_of_sale/tests/test_pos_products_with_tax.py
@@ -686,9 +686,32 @@ def test_pos_loaded_product_taxes_on_branch(self):
             []
         )
 
+        pos_user = self.env['res.users'].create({
+            'name': 'Joe Odoo',
+            'login': 'pos_user',
+            'password': 'pos_user',
+            'group_ids': [
+                (4, self.env.ref('base.group_user').id),
+                (4, self.env.ref('point_of_sale.group_pos_user').id),
+                (4, self.env.ref('stock.group_stock_user').id),
+            ],
+            'tz': 'America/New_York',
+            'company_id': branch_xx.id,
+            'company_ids': [Command.set([company.id, branch_x.id, branch_xx.id])],
+        })
+
         def get_taxes_name_popup(product):
             product = product.product_tmpl_id
-            return [tax['name'] for tax in product.get_product_info_pos(product_all_taxes.lst_price, 1, xx_config.id)['all_prices']['tax_details']]
+            # In order to simulate the state of the cache when we run this
+            # function over RPC, we need to fetch the below data first,
+            # invalidate our cache, and then enter `get_product_info_pos`
+            # with the arguments already loaded. This is necessary to test
+            # an access rights issue when trying to load product info.
+            branch_xx_id = branch_xx.id
+            xx_config_id = xx_config.id
+            product_all_taxes_lst_price = product_all_taxes.lst_price
+            self.env.invalidate_all()
+            return [tax['name'] for tax in product.with_user(pos_user).with_context(allowed_company_ids=[branch_xx_id]).get_product_info_pos(product_all_taxes_lst_price, 1, xx_config_id)['all_prices']['tax_details']]
 
         self.assertEqual(get_taxes_name_popup(product_all_taxes), ["Tax XX"])
         self.assertEqual(get_taxes_name_popup(product_no_xx_tax), ["Tax X"])

From 5861759e1f29b7f4ab6082119aa3a60828ff87ec Mon Sep 17 00:00:00 2001
From: "Valeriya (vchu)" <vchu@odoo.com>
Date: Wed, 29 Oct 2025 08:56:32 +0000
Subject: [PATCH 202/673] [FIX] website_sale_collect: subtract the line qty
 only

Steps to reproduce:
1. Add a packaging to the storable product (ex. pack of 6)
2. Uncheck continue selling
3. Update qty of the product in the wh to 20
4. Add 4 units to the cart
5. Add 1 pack
6. Choose pickup in store and go to the checkout

The product is not in stock even though there is enough quantity.

closes odoo/odoo#234353

X-original-commit: 49a62b82582f0b9f57ab36b0b0df04952bf706ac
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
---
 .../website_sale_collect/models/sale_order.py | 14 +++++++------
 .../tests/test_sale_order.py                  | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/addons/website_sale_collect/models/sale_order.py b/addons/website_sale_collect/models/sale_order.py
index 6a9d0bf7c45ac..a5f0cc43c7cca 100644
--- a/addons/website_sale_collect/models/sale_order.py
+++ b/addons/website_sale_collect/models/sale_order.py
@@ -151,16 +151,18 @@ def _get_insufficient_stock_data(self, wh_id):
                 continue
             free_qty = product.with_context(warehouse_id=wh_id).free_qty
             for ol in ols:
-                free_qty_in_uom = max(
-                    int(product.uom_id._compute_quantity(free_qty, ol.product_uom_id)), 0
-                )  # Round down as only integer quantities can be sold.
-                if ol.product_uom_qty > free_qty_in_uom:
+                free_qty_in_uom = max(int(product.uom_id._compute_quantity(
+                    free_qty, ol.product_uom_id, rounding_method="DOWN"
+                )), 0)  # Round down as only integer quantities can be sold.
+                line_qty_in_uom = ol.product_uom_qty
+                if line_qty_in_uom > free_qty_in_uom:  # Not enough stock.
+                    # Set a warning on the order line.
                     insufficient_stock_data[ol] = free_qty_in_uom
                     ol.shop_warning = self.env._(
                         "%(available_qty)s/%(line_qty)s available at this location",
-                        available_qty=free_qty_in_uom, line_qty=int(ol.product_uom_qty),
+                        available_qty=free_qty_in_uom, line_qty=int(line_qty_in_uom),
                     )
-                free_qty -= ol.product_uom_id._compute_quantity(free_qty_in_uom, product.uom_id)
+                free_qty -= ol.product_uom_id._compute_quantity(line_qty_in_uom, product.uom_id)
         return insufficient_stock_data
 
     def _verify_updated_quantity(self, order_line, product_id, new_qty, uom_id, **kwargs):
diff --git a/addons/website_sale_collect/tests/test_sale_order.py b/addons/website_sale_collect/tests/test_sale_order.py
index a8852269b57c2..83808bb2d144c 100644
--- a/addons/website_sale_collect/tests/test_sale_order.py
+++ b/addons/website_sale_collect/tests/test_sale_order.py
@@ -165,6 +165,27 @@ def test_insufficient_stock_with_mixed_uom_order_lines(self):
         # only 4 units are available for the second order line instead of 5
         self.assertEqual(insufficient_stock_data[ol_unit], 4)
 
+    def test_product_in_stock_with_mixed_uom_order_lines_is_available(self):
+        """Test that if there is enough stock for all order lines the insufficient stock is
+        empty."""
+        pack_of_6_id = self.ref('uom.product_uom_pack_6')
+        # 1 pack of 6 + 4 units = 10 units in the cart
+        cart = self._create_in_store_delivery_order(order_line=[
+            Command.create({
+                'product_id': self.storable_product.id,
+                'product_uom_qty': 4.0,
+                'product_uom_id': self.storable_product.uom_id.id,
+            }),
+            Command.create({
+                'product_id': self.storable_product.id,
+                'product_uom_qty': 1.0,
+                'product_uom_id': pack_of_6_id,
+            }),
+        ])
+        # 10 units available, 10 requested
+        insufficient_stock_data = cart._get_insufficient_stock_data(self.warehouse.id)
+        self.assertFalse(insufficient_stock_data)
+
     def test_out_of_stock_product_is_unavailable(self):
         cart = self._create_in_store_delivery_order(
             order_line=[

From 03cae3087fc55835f5a0cada96a01c495c83d38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 3 Nov 2025 18:05:43 +0100
Subject: [PATCH 203/673] [REF] mail, *: simplify code of message confirm
 delete slightly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Share code of message deletion with `msg.showDeleteConfirm()`
- MessageConfirmDialog props are more neutral
- patch `shouldHideFromMessageListOnDelete` once per module

closes odoo/odoo#234214

Related: odoo/enterprise#98793
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../mail/static/src/core/common/composer.js   | 14 +-------
 addons/mail/static/src/core/common/message.js |  4 ---
 .../static/src/core/common/message_actions.js | 22 +------------
 .../src/core/common/message_confirm_dialog.js |  3 +-
 .../static/src/core/common/message_model.js   | 32 +++++++++++++++++++
 .../src/chatter/frontend/composer_patch.js    |  4 ---
 .../chatter/frontend/message_model_patch.js   |  3 ++
 .../src/chatter/frontend/message_patch.js     |  4 ---
 .../project_sharing/chatter/composer_patch.js |  4 ---
 .../chatter/message_model_patch.js            |  8 +++++
 .../project_sharing/chatter/message_patch.js  |  9 ------
 11 files changed, 46 insertions(+), 61 deletions(-)
 create mode 100644 addons/project/static/src/project_sharing/chatter/message_model_patch.js
 delete mode 100644 addons/project/static/src/project_sharing/chatter/message_patch.js

diff --git a/addons/mail/static/src/core/common/composer.js b/addons/mail/static/src/core/common/composer.js
index 658ea32475ee2..0870bf3c0ef15 100644
--- a/addons/mail/static/src/core/common/composer.js
+++ b/addons/mail/static/src/core/common/composer.js
@@ -2,7 +2,6 @@ import { AttachmentList } from "@mail/core/common/attachment_list";
 import { useAttachmentUploader } from "@mail/core/common/attachment_uploader_hook";
 import { useCustomDropzone } from "@web/core/dropzone/dropzone_hook";
 import { MailAttachmentDropzone } from "@mail/core/common/mail_attachment_dropzone";
-import { MessageConfirmDialog } from "@mail/core/common/message_confirm_dialog";
 import { NavigableList } from "@mail/core/common/navigable_list";
 import { MAIL_PLUGINS, MAIL_SMALL_UI_PLUGINS } from "@mail/core/common/plugin/plugin_sets";
 import { useSuggestion } from "@mail/core/common/suggestion_hook";
@@ -808,14 +807,7 @@ export class Composer extends Component {
                 })
             );
         } else {
-            this.env.services.dialog.add(MessageConfirmDialog, {
-                message: composer.message,
-                onConfirm: () =>
-                    this.message.remove({
-                        removeFromThread: this.shouldHideFromMessageListOnDelete,
-                    }),
-                prompt: _t("Are you sure you want to bid farewell to this message forever?"),
-            });
+            composer.message.showDeleteConfirm(this);
         }
         this.suggestion?.clearRawMentions();
     }
@@ -945,8 +937,4 @@ export class Composer extends Component {
             composer.replyToMessage = this.store["mail.message"].insert(config.replyToMessageId);
         }
     }
-
-    get shouldHideFromMessageListOnDelete() {
-        return false;
-    }
 }
diff --git a/addons/mail/static/src/core/common/message.js b/addons/mail/static/src/core/common/message.js
index 1c5bb6b6706f2..c246cb92a4dd9 100644
--- a/addons/mail/static/src/core/common/message.js
+++ b/addons/mail/static/src/core/common/message.js
@@ -488,10 +488,6 @@ export class Message extends Component {
             { context: this }
         );
     }
-
-    get shouldHideFromMessageListOnDelete() {
-        return false;
-    }
 }
 
 discussComponentRegistry.add("Message", Message);
diff --git a/addons/mail/static/src/core/common/message_actions.js b/addons/mail/static/src/core/common/message_actions.js
index 3daa886c78fb5..1317ed5280edb 100644
--- a/addons/mail/static/src/core/common/message_actions.js
+++ b/addons/mail/static/src/core/common/message_actions.js
@@ -3,8 +3,6 @@ import { toRaw } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
 import { download } from "@web/core/network/download";
 import { registry } from "@web/core/registry";
-import { discussComponentRegistry } from "./discuss_component_registry";
-import { Deferred } from "@web/core/utils/concurrency";
 import { Action, ACTION_TAGS, useAction, UseActions } from "@mail/core/common/action";
 import { useEmojiPicker } from "@web/core/emoji_picker/emoji_picker";
 import { QuickReactionMenu } from "@mail/core/common/quick_reaction_menu";
@@ -141,25 +139,7 @@ registerMessageAction("delete", {
     condition: ({ message }) => message.deletable,
     icon: "fa fa-trash",
     name: _t("Delete"),
-    onSelected: async ({ message: msg, owner, store }) => {
-        const message = toRaw(msg);
-        const def = new Deferred();
-        store.env.services.dialog.add(
-            discussComponentRegistry.get("MessageConfirmDialog"),
-            {
-                message,
-                prompt: _t("Are you sure you want to bid farewell to this message forever?"),
-                onConfirm: () => {
-                    def.resolve(true);
-                    message.remove({
-                        removeFromThread: owner.shouldHideFromMessageListOnDelete,
-                    });
-                },
-            },
-            { context: owner, onClose: () => def.resolve(false) }
-        );
-        return def;
-    },
+    onSelected: ({ message, owner }) => toRaw(message).showDeleteConfirm(owner),
     sequence: 120,
     tags: ACTION_TAGS.DANGER,
 });
diff --git a/addons/mail/static/src/core/common/message_confirm_dialog.js b/addons/mail/static/src/core/common/message_confirm_dialog.js
index e93a383431d0a..08a83966d78f2 100644
--- a/addons/mail/static/src/core/common/message_confirm_dialog.js
+++ b/addons/mail/static/src/core/common/message_confirm_dialog.js
@@ -18,9 +18,8 @@ export class MessageConfirmDialog extends Component {
     ];
     static defaultProps = {
         confirmColor: "btn-primary",
-        confirmText: _t("Delete"),
+        confirmText: _t("Confirm"),
         size: "xl",
-        title: _t("Send this message to the great trash can in the sky?"),
     };
     static template = "mail.MessageConfirmDialog";
 
diff --git a/addons/mail/static/src/core/common/message_model.js b/addons/mail/static/src/core/common/message_model.js
index a6b2d039723f2..2a58e0b7d4a9f 100644
--- a/addons/mail/static/src/core/common/message_model.js
+++ b/addons/mail/static/src/core/common/message_model.js
@@ -20,6 +20,7 @@ import { createDocumentFragmentFromContent, createElementWithContent } from "@we
 import { url } from "@web/core/utils/urls";
 
 import { markup } from "@odoo/owl";
+import { discussComponentRegistry } from "./discuss_component_registry";
 
 const { DateTime } = luxon;
 export class Message extends Record {
@@ -651,6 +652,33 @@ export class Message extends Record {
         }
     }
 
+    /**
+     * @param {Object} owner
+     * @param {import("@web/env").OdooEnv} owner.env
+     */
+    showDeleteConfirm(owner) {
+        this.store.env.services.dialog.add(
+            discussComponentRegistry.get("MessageConfirmDialog"),
+            {
+                message: this,
+                confirmText: _t("Delete"),
+                onConfirm: () => this.onShowDeleteConfirm(owner),
+                prompt: _t("Are you sure you want to bid farewell to this message forever?"),
+                size: "xl",
+                title: _t("Send this message to the great trash can in the sky?"),
+            },
+            { context: owner }
+        );
+    }
+
+    /**
+     * @param {Object} owner
+     * @param {import("@web/env").OdooEnv} owner.env
+     */
+    onShowDeleteConfirm(owner) {
+        this.remove({ removeFromThread: this.shouldHideFromMessageListOnDelete(owner.env) });
+    }
+
     /**
      * Provide fallback to displayName in the absence of a thread
      *
@@ -722,6 +750,10 @@ export class Message extends Record {
         ]);
     }
 
+    shouldHideFromMessageListOnDelete(env) {
+        return false;
+    }
+
     async toggleStar() {
         this.store.insert(
             await this.store.env.services.orm.silent.call(
diff --git a/addons/portal/static/src/chatter/frontend/composer_patch.js b/addons/portal/static/src/chatter/frontend/composer_patch.js
index 47a58859fa107..f6c8c2e7f09b0 100644
--- a/addons/portal/static/src/chatter/frontend/composer_patch.js
+++ b/addons/portal/static/src/chatter/frontend/composer_patch.js
@@ -6,8 +6,4 @@ patch(Composer.prototype, {
     get showComposerAvatar() {
         return super.showComposerAvatar || (this.compact && this.props.composer.portalComment);
     },
-
-    get shouldHideFromMessageListOnDelete() {
-        return this.env.inFrontendPortalChatter || super.shouldHideFromMessageListOnDelete;
-    },
 });
diff --git a/addons/portal/static/src/chatter/frontend/message_model_patch.js b/addons/portal/static/src/chatter/frontend/message_model_patch.js
index ad874ed09bbab..07cbd6806351d 100644
--- a/addons/portal/static/src/chatter/frontend/message_model_patch.js
+++ b/addons/portal/static/src/chatter/frontend/message_model_patch.js
@@ -9,4 +9,7 @@ patch(Message.prototype, {
         }
         return result;
     },
+    shouldHideFromMessageListOnDelete(env) {
+        return env.inFrontendPortalChatter || super.shouldHideFromMessageListOnDelete(...arguments);
+    },
 });
diff --git a/addons/portal/static/src/chatter/frontend/message_patch.js b/addons/portal/static/src/chatter/frontend/message_patch.js
index a8a0a6fc60a41..6a40c9a8874ad 100644
--- a/addons/portal/static/src/chatter/frontend/message_patch.js
+++ b/addons/portal/static/src/chatter/frontend/message_patch.js
@@ -12,8 +12,4 @@ patch(Message.prototype, {
         }
         return super.authorAvatarUrl;
     },
-
-    get shouldHideFromMessageListOnDelete() {
-        return this.env.inFrontendPortalChatter || super.shouldHideFromMessageListOnDelete;
-    },
 });
diff --git a/addons/project/static/src/project_sharing/chatter/composer_patch.js b/addons/project/static/src/project_sharing/chatter/composer_patch.js
index e73b7eabe8ca4..9374b8d835140 100644
--- a/addons/project/static/src/project_sharing/chatter/composer_patch.js
+++ b/addons/project/static/src/project_sharing/chatter/composer_patch.js
@@ -24,8 +24,4 @@ patch(Composer.prototype, {
         }
         return super.allowUpload;
     },
-
-    get shouldHideFromMessageListOnDelete() {
-        return true;
-    }
 });
diff --git a/addons/project/static/src/project_sharing/chatter/message_model_patch.js b/addons/project/static/src/project_sharing/chatter/message_model_patch.js
new file mode 100644
index 0000000000000..49785d1479010
--- /dev/null
+++ b/addons/project/static/src/project_sharing/chatter/message_model_patch.js
@@ -0,0 +1,8 @@
+import { patch } from "@web/core/utils/patch";
+import { Message } from "@mail/core/common/message_model";
+
+patch(Message.prototype, {
+    shouldHideFromMessageListOnDelete(env) {
+        return env.projectSharingId || super.shouldHideFromMessageListOnDelete(...arguments);
+    },
+});
diff --git a/addons/project/static/src/project_sharing/chatter/message_patch.js b/addons/project/static/src/project_sharing/chatter/message_patch.js
deleted file mode 100644
index 23d50b3dd0e19..0000000000000
--- a/addons/project/static/src/project_sharing/chatter/message_patch.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Message } from "@mail/core/common/message";
-
-import { patch } from "@web/core/utils/patch";
-
-patch(Message.prototype, {
-    get shouldHideFromMessageListOnDelete() {
-        return true;
-    },
-});

From e8115b77f62b32fafeea062f414cb697e3f0eb3f Mon Sep 17 00:00:00 2001
From: Richard Prosser <prri@odoo.com>
Date: Thu, 16 Oct 2025 13:05:08 +0000
Subject: [PATCH 204/673] [FIX] mrp: update BoM on scrap when product is
 changed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem: When a user changes the product on a scrap order, the bom_id field
does not get updated. If they update the product from a product that has BoM
to a product that doesn’t have one, then the bom_id field is hidden and remains
set. This will cause the scrap quantity to be set to 0 when they validate the scrap.
However, the product move actually happens for the correct quantity causing an
inconsistency.

Purpose: This will either set the bom_id field to False if the new product doesn’t
have a valid BoM, or it will update it to the first available BoM.

Steps to Reproduce on Runbot:

1. Create a scrap order for a product that has a kit type BoM and set the kit field.
2. Change the product to a product without a kit type BoM.
3. Validate the scrap order.
4. Observe the quantity field is set to 0, but there are product moves for the
   correct quantity.

opw-5122880

closes odoo/odoo#234259

X-original-commit: eb4dfbf9ec40f33e336152320341d9f9d23087a4
Signed-off-by: Steve Van Essche <svs@odoo.com>
Signed-off-by: Richard Prosser (prri) <prri@odoo.com>
---
 addons/mrp/models/stock_scrap.py |  7 +++++++
 addons/mrp/tests/test_stock.py   | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/addons/mrp/models/stock_scrap.py b/addons/mrp/models/stock_scrap.py
index 30105da7128b0..95ec1176fe85f 100644
--- a/addons/mrp/models/stock_scrap.py
+++ b/addons/mrp/models/stock_scrap.py
@@ -66,6 +66,13 @@ def _onchange_serial_number(self):
             else:
                 return super()._onchange_serial_number()
 
+    @api.onchange('product_id')
+    def _onchange_product_id(self):
+        if self.product_is_kit:
+            self.bom_id = self.env['mrp.bom']._bom_find(self.product_id, company_id=self.company_id.id, bom_type='phantom')[self.product_id]
+        else:
+            self.bom_id = False
+
     @api.depends('move_ids', 'move_ids.move_line_ids.quantity', 'product_id')
     def _compute_scrap_qty(self):
         self.scrap_qty = 1
diff --git a/addons/mrp/tests/test_stock.py b/addons/mrp/tests/test_stock.py
index 4adaa51ca196e..cb5ce4712fb52 100644
--- a/addons/mrp/tests/test_stock.py
+++ b/addons/mrp/tests/test_stock.py
@@ -727,3 +727,37 @@ def test_search_kit_on_quantity(self):
         self.assertNotIn(self.kit_1, products)  # 12
         self.assertIn(self.kit_2, products)     # 6
         self.assertNotIn(self.kit_3, products)  # 3
+
+    def test_scrap_change_product(self):
+        """ Ensure a scrap order automatically updates the BoM when its product is changed,
+        selecting the product's first BoM if it's a kit or set the field empty otherwise."""
+        bom_a = self.bom_1
+        bom_a.type = 'phantom'
+        product_a = bom_a.product_id
+
+        bom_b = self.bom_3
+        bom_b.type = 'phantom'
+        product_b = bom_b.product_id
+
+        product_c = self.env['product.product'].create({'name': 'product_c', 'is_storable': True})
+
+        form = Form(self.env['stock.scrap'])
+        form.product_id = product_a
+        form.bom_id = bom_a
+        form.scrap_qty = 1
+        scrap = form.save()
+
+        # assert the scrap's bom_id is set to bom_a
+        self.assertEqual(scrap.bom_id, bom_a)
+
+        form.product_id = product_b
+        scrap = form.save()
+
+        # assert the scrap's bom_id is set to bom_b after updating the product
+        self.assertEqual(scrap.bom_id, bom_b)
+
+        form.product_id = product_c
+        scrap = form.save()
+
+        # assert the scrap's bom_id is updated to False after updating the product
+        self.assertFalse(scrap.bom_id)

From 2d35d996387e55a26db22bcd7fc29d22f8da8f77 Mon Sep 17 00:00:00 2001
From: Sherif Gabr <sgab@odoo.com>
Date: Wed, 8 Oct 2025 13:57:26 +0000
Subject: [PATCH 205/673] [FIX] l10n_be,point_of_sale: exclude non-trade
 receivable partners from POS

This commit removes the partners with non-trade receivable
accounts from the POS customer's list. Additionally, 2 new
VAT accounts were added in BE COA to be added on
"Collection Center" partner.

task-5148985

X-original-commit: 63e4e07df2de9bcbe6321802fcd321aba516b105
Part-of: odoo/odoo#234216
Related: odoo/enterprise#98703
Signed-off-by: John Laterre (jol) <jol@odoo.com>
Signed-off-by: Sherif Gabr (sgab) <sgab@odoo.com>
---
 .../data/template/account.account-be.csv        |  2 ++
 addons/point_of_sale/models/__init__.py         |  1 +
 addons/point_of_sale/models/account_account.py  | 17 +++++++++++++++++
 addons/point_of_sale/models/pos_session.py      |  2 +-
 addons/point_of_sale/models/res_partner.py      |  2 +-
 .../app/screens/partner_list/partner_list.js    |  5 ++++-
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 addons/point_of_sale/models/account_account.py

diff --git a/addons/l10n_be/data/template/account.account-be.csv b/addons/l10n_be/data/template/account.account-be.csv
index bbffbc3a43a51..b0cc7700371f2 100644
--- a/addons/l10n_be/data/template/account.account-be.csv
+++ b/addons/l10n_be/data/template/account.account-be.csv
@@ -164,6 +164,7 @@
 "a409","Trade Debtors - Write-Downs (-)","409","asset_current","","False","","Créances commerciales - Réductions de valeur (-)","Handelsvorderingen - Waardeverminderingen (-)","Forderungen aus Lieferungen und Leistungen - Wertminderungen (-)","","","","","",""
 "a411","VAT Recoverable","411","asset_current","","False","","TVA à récupérer","Terug te vorderen btw","Zurück zu erhaltende Mehrwertsteuer","","","","","",""
 "a4112","VAT Recoverable: VAT Current Account (C/A)","4112","asset_receivable","","True","True","TVA à récupérer : Compte courant TVA (C/C)","Terug te vorderen btw: Rekening-courant btw (RC)","Zurück zu erhaltende Mehrwertsteuer: Girokonto-MwSt","","","","","",""
+"a4121","Advance Tax Payment","4121","asset_receivable","","True","True","Paiement anticipé de l'impôt","Vooruitbetaling van belasting","Vorauszahlung von Steuern","","","","","",""
 "a4125","Other Belgian Taxes to Be Recovered","4125","asset_current","","False","","Autres impôts et taxes belges à récupérer","Terug te vorderen andere Belgische belastingen","Zurück zu erhaltende sonstige belgische Steuern","","","","","",""
 "a4128","Foreign Taxes to Be Recovered","4128","asset_current","","False","","Impôts et taxes étrangers à récupérer","Terug te vorderen buitenlandse belastingen","Zurück zu erhaltende ausländische Steuern","","","","","",""
 "a414","Income Receivable","414","asset_current","","False","","Produits à recevoir","Te innen opbrengsten","Zu erhaltende Erträge","","","","","",""
@@ -200,6 +201,7 @@
 "a451800","VAT Payable - Insufficient Taxation","451800","liability_current","","False","","TVA à payer - Taxation insuffisante","Te betalen btw - Ontoereikende heffing","Zu zahlende Mehrwertsteuer - Unzureichende Besteuerung","","","","","",""
 "a451820","VAT Payable - Deduction Revisions","451820","liability_current","","False","","TVA à payer - Révisions des déductions","Te betalen btw - Herzieningen aftrek","Zu zahlende Mehrwertsteuer - Abzugsrevisionen","","","","","",""
 "a451830","VAT Payable - Regularizations","451830","liability_current","","False","","TVA à payer - Régularisations","Te betalen btw - Regularisaties","Zu zahlende Mehrwertsteuer - Regularisierungen","","","","","",""
+"a4521","Advance Tax Payment","4521","liability_payable","","True","True","Paiement anticipé de l'impôt","Vooruitbetaling van belasting","Vorauszahlung von Steuern","","","","","",""
 "a4525","Other Belgian Taxes Payable","4525","liability_current","","False","","Autres impôts et taxes belges à payer","Andere te betalen Belgische belastingen en taksen","Sonstige zu zahlende belgische Steuern und Abgaben","","","","","",""
 "a4528","Foreign Taxes Payable","4528","liability_current","","False","","Impôts et taxes étrangers à payer","Te betalen buitenlandse belastingen en taksen","Zu zahlende ausländische Steuern und Abgaben","","","","","",""
 "a453","Taxes Withheld","453","liability_current","","False","","Précomptes retenus","Ingehouden voorheffingen","Einbehaltene Steuervorhabzüge","","","","","",""
diff --git a/addons/point_of_sale/models/__init__.py b/addons/point_of_sale/models/__init__.py
index 1e9d2db1edfcb..61186f957d572 100644
--- a/addons/point_of_sale/models/__init__.py
+++ b/addons/point_of_sale/models/__init__.py
@@ -2,6 +2,7 @@
 
 from . import account_bank_statement
 from . import pos_load_mixin
+from . import account_account
 from . import account_cash_rounding
 from . import account_payment
 from . import account_journal
diff --git a/addons/point_of_sale/models/account_account.py b/addons/point_of_sale/models/account_account.py
new file mode 100644
index 0000000000000..770834bffe4f4
--- /dev/null
+++ b/addons/point_of_sale/models/account_account.py
@@ -0,0 +1,17 @@
+from odoo import api, models
+
+
+class AccountAccount(models.Model):
+    _name = 'account.account'
+    _inherit = ['account.account', 'pos.load.mixin']
+
+    @api.model
+    def _load_pos_data_fields(self, config):
+        return [
+            'id', 'non_trade',
+        ]
+
+    @api.model
+    def _load_pos_data_domain(self, data, config):
+        property_account_receivable_ids = {partner['property_account_receivable_id'] for partner in data['res.partner']}
+        return [('id', 'in', property_account_receivable_ids)]
diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py
index c2d8612c040cc..a358b9531285a 100644
--- a/addons/point_of_sale/models/pos_session.py
+++ b/addons/point_of_sale/models/pos_session.py
@@ -141,7 +141,7 @@ def _load_pos_data_models(self, config):
             'pos.category', 'pos.bill', 'res.company', 'account.tax', 'account.tax.group', 'product.template', 'product.product', 'product.attribute', 'product.attribute.custom.value',
             'product.template.attribute.line', 'product.template.attribute.value', 'product.combo', 'product.combo.item', 'res.users', 'res.partner', 'product.uom',
             'decimal.precision', 'uom.uom', 'res.country', 'res.country.state', 'res.lang', 'product.category', 'product.pricelist', 'product.pricelist.item',
-            'account.cash.rounding', 'account.fiscal.position', 'stock.picking.type', 'res.currency', 'pos.note', 'product.tag', 'ir.module.module', 'account.move']
+            'account.cash.rounding', 'account.fiscal.position', 'stock.picking.type', 'res.currency', 'pos.note', 'product.tag', 'ir.module.module', 'account.move', 'account.account']
 
     @api.model
     def _load_pos_data_domain(self, data, config):
diff --git a/addons/point_of_sale/models/res_partner.py b/addons/point_of_sale/models/res_partner.py
index f99ba3b9b678a..d1b2aa6d0add3 100644
--- a/addons/point_of_sale/models/res_partner.py
+++ b/addons/point_of_sale/models/res_partner.py
@@ -74,7 +74,7 @@ def _load_pos_data_fields(self, config):
         return [
             'id', 'name', 'street', 'street2', 'city', 'state_id', 'country_id', 'vat', 'lang', 'phone', 'zip', 'email',
             'barcode', 'write_date', 'property_product_pricelist', 'parent_name', 'pos_contact_address',
-            'invoice_emails', 'fiscal_position_id', 'is_company',
+            'invoice_emails', 'fiscal_position_id', 'is_company', 'property_account_receivable_id',
         ]
 
     def _compute_pos_order(self):
diff --git a/addons/point_of_sale/static/src/app/screens/partner_list/partner_list.js b/addons/point_of_sale/static/src/app/screens/partner_list/partner_list.js
index 718f8eb09a341..df9ed2108f93f 100644
--- a/addons/point_of_sale/static/src/app/screens/partner_list/partner_list.js
+++ b/addons/point_of_sale/static/src/app/screens/partner_list/partner_list.js
@@ -29,7 +29,10 @@ export class PartnerList extends Component {
         this.modalRef = useChildRef();
         this.modalContent = null;
         this.state = useState({
-            initialPartners: this.pos.models["res.partner"].getAll(),
+            initialPartners: this.pos.models["res.partner"].filter((p) => {
+                const par = p.property_account_receivable_id;
+                return !par || par.non_trade !== true;
+            }),
             loadedPartners: [],
             query: "",
             loading: false,

From c48e8f77addbe8cfff75fc3e5818757198d17a81 Mon Sep 17 00:00:00 2001
From: Sherif Gabr <sgab@odoo.com>
Date: Thu, 16 Oct 2025 13:54:02 +0200
Subject: [PATCH 206/673] [FIX] account: update reconciliation model data

Previously, new reconciliation models weren't added
when they were defined in other modules. This commit
fixes when the reconciliation model data gets updated.

closes odoo/odoo#234216

Related: odoo/enterprise#98703
Signed-off-by: John Laterre (jol) <jol@odoo.com>
Signed-off-by: Sherif Gabr (sgab) <sgab@odoo.com>
---
 addons/account/models/chart_template.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index f3ebc0e47987a..1d4d04848643f 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -283,7 +283,8 @@ def _pre_reload_data(self, company, template_data, data, force_create=True, forc
         for prop in list(template_data):
             if prop.startswith('property_'):
                 template_data.pop(prop)
-        data.pop('account.reconcile.model', None)
+        if not force_update:
+            data.pop('account.reconcile.model', None)
         if 'res.company' in data and not force_update:
             data['res.company'][company.id].clear()
             data['res.company'][company.id].setdefault('anglo_saxon_accounting', company.anglo_saxon_accounting)

From ab63489d5c0ab4399a3176dba2e3748eac03c3b4 Mon Sep 17 00:00:00 2001
From: karygauss03 <kaom@odoo.com>
Date: Thu, 9 Oct 2025 09:32:41 +0000
Subject: [PATCH 207/673] [FIX] hr_work_entry: Fix work entry type domain in
 multiselect

Reproduce step:
1. Go to work entries
2. Select some work entries to add using the multiselection in the gantt view.
3. Work entry types doesn't include the ones related to the country.

Reason:
The country_id is set to False, so the old domain will retrieve only the work entries which are not related to any country.

Fix:
Update work_entry_type_id domain and make it dynamic which depends on the situation, if we are going to create
work entries in the gantt views in multi company situation, we will display the
work entries types without a specific country only to avoid issues, since it is
possible to select employees from different companies at the same time. In the other
case (single company) we filter the work entry types based on the self.env.company.id

Related task: 5155691.

closes odoo/odoo#234325

X-original-commit: 598be711d8d309d41df691446d38e6e884cc061e
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Karim Omrane (kaom) <kaom@odoo.com>
---
 addons/hr_work_entry/models/hr_work_entry.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/hr_work_entry/models/hr_work_entry.py b/addons/hr_work_entry/models/hr_work_entry.py
index 22dffb09889ff..6dd341d81bada 100644
--- a/addons/hr_work_entry/models/hr_work_entry.py
+++ b/addons/hr_work_entry/models/hr_work_entry.py
@@ -27,7 +27,11 @@ class HrWorkEntry(models.Model):
     resource_calendar_id = fields.Many2one(related='version_id.resource_calendar_id')
     date = fields.Date(required=True)
     duration = fields.Float(string="Duration", default=8)
-    work_entry_type_id = fields.Many2one('hr.work.entry.type', index=True, default=lambda self: self.env['hr.work.entry.type'].search([], limit=1), domain="['|', ('country_id', '=', False), ('country_id', '=', country_id)]")
+    work_entry_type_id = fields.Many2one(
+        'hr.work.entry.type',
+        index=True,
+        default=lambda self: self.env['hr.work.entry.type'].search([], limit=1),
+        domain=lambda self: self._get_work_entry_type_domain())
     display_code = fields.Char(related='work_entry_type_id.display_code')
     code = fields.Char(related='work_entry_type_id.code')
     external_code = fields.Char(related='work_entry_type_id.external_code')
@@ -300,3 +304,8 @@ def _error_checking(self, start=None, stop=None, skip=False, employee_ids=False)
                 # New work entries are handled in the create method,
                 # no need to reload work entries.
                 work_entries.exists()._check_if_error()
+
+    def _get_work_entry_type_domain(self):
+        if len(self.env.companies.country_id.ids) > 1:
+            return [('country_id', '=', False)]
+        return ['|', ('country_id', '=', False), ('country_id', 'in', self.env.companies.country_id.ids)]

From eaaf8d132c1bfac5c3fb8f242ffec043151ea708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=8E=E3=82=A6=E3=83=A9?= <nea@odoo.com>
Date: Wed, 8 Oct 2025 20:41:09 +0000
Subject: [PATCH 208/673] [FIX] stock: fix 230199 PR test

Due to an issue in the runbot, the test associated with the PR: odoo#230199 passed despite underlying conflicts and the PR was merged. This PR addresses and resolves those issues to ensure the test functions correctly.

We also align the PR with the refactoring done in odoo#212679 and replace procurement.group with stock.rule

Impacted versions:

- 19.0
- master

closes odoo/odoo#234324

X-original-commit: 505078913a50ecf4fddeaa2f4ca155e6526afeae
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Noura El Allam (nea) <nea@odoo.com>
---
 addons/stock/tests/test_move2.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/stock/tests/test_move2.py b/addons/stock/tests/test_move2.py
index 74ded8a5526a9..936d6971e381c 100644
--- a/addons/stock/tests/test_move2.py
+++ b/addons/stock/tests/test_move2.py
@@ -3394,6 +3394,7 @@ def setUpClass(cls):
                 "name": "Lot Product",
                 "type": "consu",
                 "is_storable": True,
+                "tracking": "lot",
                 "uom_id": cls.env.ref("uom.product_uom_unit").id,
             }
         )
@@ -3411,7 +3412,8 @@ def setUpClass(cls):
             }
         )
 
-        cls.stock_location = cls.env.ref("stock.stock_location_stock")
+        cls.warehouse = cls.env["stock.warehouse"].search([], limit=1)
+        cls.stock_location = cls.warehouse.out_type_id.default_location_src_id or cls.warehouse.lot_stock_id
 
         cls.env["stock.quant"]._update_available_quantity(
             cls.product_lot, cls.stock_location, 5.0, lot_id=cls.lot1
@@ -3422,31 +3424,30 @@ def setUpClass(cls):
 
     def test_pick_assign_and_backorder(self):
         cust = self.env.ref("stock.stock_location_customers")
-        pg = self.env["procurement.group"].create({"name": "sale order"})
-        warehouse = self.env["stock.warehouse"].search([], limit=1)
-        warehouse.delivery_steps = "pick_ship"
-        self.env["procurement.group"].run(
+        ref = self.env["stock.reference"].create({"name": "sale order"})
+        self.warehouse.delivery_steps = "pick_ship"
+        self.env["stock.rule"].run(
             [
-                pg.Procurement(
+                self.env["stock.rule"].Procurement(
                     self.product_lot,
                     10.0,
                     self.product_lot.uom_id,
                     cust,
                     "sale_order",
-                    "sale_order",
-                    warehouse.company_id,
-                    {"warehouse_id": warehouse, "group_id": pg},
+                    ref.name,
+                    self.warehouse.company_id,
+                    {"warehouse_id": self.warehouse, "reference_ids": ref},
                 )
             ]
         )
-        picking = pg.stock_move_ids.picking_id[0]
+        picking = self.env["stock.picking"].search([("origin", "=", ref.name)], limit=1)
 
         picking.action_confirm()
         picking.action_assign()
 
         move_line_obj = picking.move_ids.move_line_ids
 
-        pack = self.env["stock.quant.package"].create({"name": "Test Package"})
+        pack = self.env["stock.package"].create({"name": "Test Package"})
         move_line_obj[0].write({"quantity": 2.0, "lot_id": self.lot1})
         move_line_obj[1].write({"quantity": 2.0, "lot_id": self.lot2})
         picking.move_ids.move_line_ids = [

From fdc6047aa52f9bfaed50b2a0e39757e389caa65f Mon Sep 17 00:00:00 2001
From: Yash Vaishnav <yava@odoo.com>
Date: Fri, 10 Jan 2025 07:19:06 +0000
Subject: [PATCH 209/673] [FIX] l10n_in_hr_payroll: fixed the sandwich leave
 duration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, if you created a leave of a type that had sandwich leave
enabled on a non-working day, it would show a negative duration.

This commit fixes some issues related to sandwich leave cases

(where Saturday and Sunday are considered non-working days):
- Friday - Monday across weekend - counted (4 days).
- Hour-based leave types: weekend bridging increases hours accordingly
- Public holiday in the middle (Tue-Thu with Wed PH) - counted (3 days).
- Stop/Start exactly on a public holiday
    (Tue-Wed(Public holiday), or Wed(Public holiday)-Thu) - trimmed to 1 day.
- Public holiday only - 0 days.
- Two single-day leaves around a Public holiday
  - When the second leave is created, it bridges via a public holiday (2 days),
  - The first one remains 1 day if it stands alone
- Mixed leave types:
  - If the linked leave type doesn’t have sandwich enabled, no sandwich rules.
  - If both leave enable sandwich (with different types) - sandwich rule applies
- Refusing/canceling a linked leave must immediately adjust the other
    side’s duration (e.g., Monday refused - Friday drops from 3 - 1 day)

Task-4430044

closes odoo/odoo#234193

X-original-commit: 7f7ca3cf704329f30bf4bb0bffb1736e28921c21
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Yash Vaishnav (yava) <yava@odoo.com>
Co-authored-by: mepe-odoo <mepe@odoo.com>
---
 addons/l10n_in_hr_holidays/models/hr_leave.py | 286 ++++++++--
 .../tests/test_sandwich_leave.py              | 502 ++++++++++++++++--
 2 files changed, 686 insertions(+), 102 deletions(-)

diff --git a/addons/l10n_in_hr_holidays/models/hr_leave.py b/addons/l10n_in_hr_holidays/models/hr_leave.py
index cfba61128c749..95a6564f48f80 100644
--- a/addons/l10n_in_hr_holidays/models/hr_leave.py
+++ b/addons/l10n_in_hr_holidays/models/hr_leave.py
@@ -1,11 +1,13 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import datetime, timedelta, time
+import pytz
 
 from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools.date_utils import sum_intervals
 from odoo.tools.intervals import Intervals
+from odoo.tools.float_utils import float_compare
 
 
 class HrLeave(models.Model):
@@ -13,6 +15,30 @@ class HrLeave(models.Model):
 
     l10n_in_contains_sandwich_leaves = fields.Boolean()
 
+    def _l10n_in_get_default_leave_hours(self):
+        self.ensure_one()
+        calendar = self.employee_id.resource_calendar_id or self.env.company.resource_calendar_id
+        if not calendar:
+            return 0.0
+        start_dt = self._to_utc(self.request_date_from, 0.0, self.employee_id)
+        end_dt = self._to_utc(self.request_date_to, 24.0, self.employee_id)
+        work_data = self.employee_id._get_work_days_data_batch(
+            start_dt,
+            end_dt,
+            compute_leaves=False,
+            calendar=calendar,
+        )
+        data = work_data.get(self.employee_id.id)
+        return data.get("hours", 0.0) if data else 0.0
+
+    def _l10n_in_is_full_day_request(self, hours=None, default_hours=None):
+        self.ensure_one()
+        default_hours = default_hours or self._l10n_in_get_default_leave_hours()
+        hours = hours if hours is not None else (self.number_of_hours or 0.0)
+        if not self.request_unit_hours or not default_hours:
+            return True
+        return float_compare(hours, default_hours, precision_digits=2) >= 0
+
     @api.constrains("holiday_status_id", "request_date_from", "request_date_to")
     def _l10n_in_check_optional_holiday_request_dates(self):
         leaves_to_check = self.filtered(lambda leave: leave.holiday_status_id.l10n_in_is_limited_to_optional_days)
@@ -47,67 +73,231 @@ def _l10n_in_check_optional_holiday_request_dates(self):
                 self.env._("The following leaves are not on Optional Holidays:\n - %s", "\n - ".join(invalid_leaves))
             )
 
-    def _l10n_in_apply_sandwich_rule(self, public_holidays, employee_leaves):
-        self.ensure_one()
-        if not self.request_date_from or not self.request_date_to:
-            return
-        date_from = self.request_date_from
-        date_to = self.request_date_to
-        total_leaves = (self.request_date_to - self.request_date_from).days + (0.5 if self.request_unit_half else 1)
+    def _l10n_in_is_working(self, on_date, public_holiday_dates, resource_calendar):
+        return on_date not in public_holiday_dates and resource_calendar._works_on_date(on_date)
 
-        def is_non_working_day(calendar, date):
-            return not calendar._works_on_date(date) or any(
-                datetime.date(holiday['date_from']) <= date <= datetime.date(holiday['date_to']) for holiday in public_holidays
-            )
+    def _l10n_in_count_adjacent_non_working(self, start_date, public_holiday_dates, resource_calendar, reverse=False, include_start=False):
+        step = -1 if reverse else 1
+        current = start_date if include_start else start_date + timedelta(days=step)
+        count = 0
+        while not self._l10n_in_is_working(current, public_holiday_dates, resource_calendar) and count < 30:
+            count += 1
+            current += timedelta(days=step)
+        return count
 
-        def count_sandwich_days(calendar, date, direction):
-            current_date = date + timedelta(days=direction)
-            days_count = 0
-            while is_non_working_day(calendar, current_date):
-                days_count += 1
-                current_date += timedelta(days=direction)
-            for leave in employee_leaves:
-                if leave['request_date_from'] <= current_date <= leave['request_date_to']:
-                    return days_count
-            return 0
+    def _l10n_in_find_linked_leave(self, start_date, public_holiday_dates, resource_calendar, leaves_by_date, reverse=False):
+        step = -1 if reverse else 1
+        current_date = start_date
+        for _ in range(30):
+            current_date += timedelta(days=step)
+            if self._l10n_in_is_working(current_date, public_holiday_dates, resource_calendar):
+                break
+        linked_leave = leaves_by_date.get(current_date, self.env["hr.leave"])
+        if linked_leave and linked_leave.request_unit_half:
+            return self.env["hr.leave"]
+        return linked_leave
 
-        calendar = self.resource_calendar_id
-        total_leaves += count_sandwich_days(calendar, date_from, -1) + count_sandwich_days(calendar, date_to, 1)
-        while is_non_working_day(calendar, date_from):
-            total_leaves -= 1
-            date_from += timedelta(days=1)
-        while is_non_working_day(calendar, date_to):
-            total_leaves -= 1
-            date_to -= timedelta(days=1)
-        return total_leaves
+    def _l10n_in_get_linked_leaves(self, leaves_dates_by_employee, public_holidays_date_by_company):
+        linked_before = self.env["hr.leave"]
+        linked_after = self.env["hr.leave"]
 
-    def _get_durations(self, check_leave_type=True, resource_calendar=None):
-        result = super()._get_durations(check_leave_type, resource_calendar)
-        indian_leaves = self.filtered(lambda c: c.company_id.country_id.code == 'IN')
+        for leave in self:
+            public_holiday_dates = public_holidays_date_by_company.get(leave.company_id, {})
+            leaves_by_date = leaves_dates_by_employee.get(leave.employee_id, {})
+            linked_before |= self._l10n_in_find_linked_leave(
+                leave.request_date_from, public_holiday_dates, leave.resource_calendar_id, leaves_by_date, reverse=True
+            )
+            linked_after |= self._l10n_in_find_linked_leave(
+                leave.request_date_to, public_holiday_dates, leave.resource_calendar_id, leaves_by_date, reverse=False
+            )
+        return linked_before, linked_after
+
+    def _l10n_in_prepare_sandwich_context(self):
+        """
+            Build and return a tuple:
+                (indian_leaves, leaves_by_employee, public_holidays_by_company_id)
+            - Filters Indian, full-day, sandwich-enabled leaves.
+            - Prepares dicts for sibling employee leaves and company public holidays.
+        """
+        indian_leaves = self.filtered(
+            lambda leave: leave.company_id.country_id.code == "IN"
+            and leave.holiday_status_id.l10n_in_is_sandwich_leave
+            and not leave.request_unit_half
+        )
         if not indian_leaves:
-            return result
+            return (indian_leaves, {}, {})
 
-        public_holidays = self.env['resource.calendar.leaves'].search([
-            ('resource_id', '=', False),
-            ('company_id', 'in', indian_leaves.company_id.ids),
-        ])
-        leaves_by_employee = dict(self._read_group(
+        leaves_dates_by_employee = {}
+        grouped_leaves = self._read_group(
             domain=[
                 ('id', 'not in', self.ids),
                 ('employee_id', 'in', self.employee_id.ids),
                 ('state', 'not in', ['cancel', 'refuse']),
-                ('leave_type_request_unit', '=', 'day'),
+                ('request_unit_half', '=', False),
+                ('holiday_status_id.l10n_in_is_sandwich_leave', '=', True),
             ],
             groupby=['employee_id'],
             aggregates=['id:recordset'],
-        ))
+        )
+        for emp_id, recs in grouped_leaves:
+            valid_recs = recs.filtered(lambda leave: leave._l10n_in_is_full_day_request())
+            if not valid_recs:
+                continue
+            leaves_dates_by_employee[emp_id] = {
+                (leave.request_date_from + timedelta(days=offset)): leave
+                for leave in valid_recs
+                for offset in range((leave.request_date_to - leave.request_date_from).days + 1)
+            }
+
+        tz = pytz.timezone(self.env.context.get("tz") or self.env.user.tz or "UTC")
+        public_holidays_dates_by_company = {
+            company_id: {
+                (datetime.date(holiday.date_from.astimezone(tz)) + timedelta(days=offset)): holiday
+                for holiday in recs
+                for offset in range((holiday.date_to.date() - holiday.date_from.date()).days + 1)
+            }
+            for company_id, recs in self.env['resource.calendar.leaves']._read_group(
+                domain=[
+                    ('resource_id', '=', False),
+                    ('company_id', 'in', indian_leaves.company_id.ids),
+                ],
+                groupby=['company_id'],
+                aggregates=['id:recordset'],
+            )
+        }
+
+        return indian_leaves, leaves_dates_by_employee, public_holidays_dates_by_company
+
+    def _l10n_in_apply_sandwich_rule(self, public_holidays_date_by_company, leaves_dates_by_employee):
+        self.ensure_one()
+        if not (self.request_date_from and self.request_date_to):
+            return 0
+
+        date_from = self.request_date_from
+        date_to = self.request_date_to
+        public_holiday_dates = public_holidays_date_by_company.get(self.company_id, {})
+        is_non_working_from = not self._l10n_in_is_working(date_from, public_holiday_dates, self.resource_calendar_id)
+        is_non_working_to = not self._l10n_in_is_working(date_to, public_holiday_dates, self.resource_calendar_id)
+
+        if is_non_working_from and is_non_working_to and not any(
+            self._l10n_in_is_working(date_from + timedelta(days=x), public_holiday_dates, self.resource_calendar_id)
+            for x in range(1, (date_to - date_from).days)
+        ):
+            return 0
+
+        total_leaves = (date_to - date_from).days + 1
+        linked_before, linked_after = self._l10n_in_get_linked_leaves(leaves_dates_by_employee, public_holidays_date_by_company)
+        linked_before_leave = linked_before[:1]
+        linked_after_leave = linked_after[:1]
+        # Only expand the current leave when the linked record starts before it.
+        has_previous_link = bool(linked_before_leave and linked_before_leave.request_date_from < date_from)
+        has_next_link = bool(linked_after_leave and linked_after_leave.request_date_from > date_to)
+
+        if has_previous_link:
+            total_leaves += self._l10n_in_count_adjacent_non_working(
+                date_from, public_holiday_dates, self.resource_calendar_id, reverse=True
+            )
+        elif is_non_working_from:
+            total_leaves -= self._l10n_in_count_adjacent_non_working(
+                date_from, public_holiday_dates, self.resource_calendar_id, include_start=True,
+            )
+
+        if has_next_link:
+            total_leaves += self._l10n_in_count_adjacent_non_working(
+                date_to, public_holiday_dates, self.resource_calendar_id
+            )
+        elif is_non_working_to:
+            total_leaves = total_leaves - self._l10n_in_count_adjacent_non_working(
+                date_to, public_holiday_dates, self.resource_calendar_id, reverse=True, include_start=True,
+            )
+        return total_leaves
+
+    def _get_durations(self, check_leave_type=True, resource_calendar=None):
+        result = super()._get_durations(check_leave_type, resource_calendar)
+
+        indian_leaves, leaves_dates_by_employee, public_holidays_date_by_company = self._l10n_in_prepare_sandwich_context()
+        if not indian_leaves:
+            self.l10n_in_contains_sandwich_leaves = False
+            return result
+
         for leave in indian_leaves:
-            if leave.holiday_status_id.l10n_in_is_sandwich_leave:
-                days, hours = result[leave.id]
-                updated_days = leave._l10n_in_apply_sandwich_rule(public_holidays, leaves_by_employee.get(leave.employee_id, []))
-                result[leave.id] = (updated_days, hours)
-                if updated_days and leave.state not in ['validate', 'validate1']:
-                    leave.l10n_in_contains_sandwich_leaves = updated_days != days
-            elif leave.state not in ['validate', 'validate1']:
+            leave_days, hours = result[leave.id]
+            if not leave_days or (
+                leave.state in ["validate", "validate1"]
+                and not self.env.user.has_group("hr_holidays.group_hr_holidays_user")
+            ):
+                continue
+            default_hours = leave._l10n_in_get_default_leave_hours()
+            if not leave._l10n_in_is_full_day_request(hours=hours, default_hours=default_hours):
+                leave.l10n_in_contains_sandwich_leaves = False
+                continue
+            updated_days = leave._l10n_in_apply_sandwich_rule(public_holidays_date_by_company, leaves_dates_by_employee)
+            if updated_days and updated_days != leave_days:
+                updated_hours = (updated_days * (hours / leave_days)) if leave_days else hours
+                result[leave.id] = (updated_days, updated_hours)
+                leave.l10n_in_contains_sandwich_leaves = True
+            else:
                 leave.l10n_in_contains_sandwich_leaves = False
         return result
+
+    def _l10n_in_update_neighbors_duration_after_change(self):
+        indian_leaves, leaves_dates_by_employee, public_holidays_dates_by_company = self._l10n_in_prepare_sandwich_context()
+        if not indian_leaves:
+            return
+        self.l10n_in_contains_sandwich_leaves = False
+
+        linked_before, linked_after = indian_leaves._l10n_in_get_linked_leaves(
+            leaves_dates_by_employee, public_holidays_dates_by_company
+        )
+        neighbors = (linked_before | linked_after) - self
+        if not neighbors:
+            return
+
+        # Recompute neighbor durations with the baseline (non-sandwich) logic.
+        base_map = super(HrLeave, neighbors)._get_durations(
+            check_leave_type=True,
+            resource_calendar=None,
+        )
+
+        for neighbor in neighbors:
+            base_days, base_hours = base_map.get(neighbor.id, (neighbor.number_of_days, neighbor.number_of_hours))
+            default_hours = neighbor._l10n_in_get_default_leave_hours()
+            if not neighbor._l10n_in_is_full_day_request(hours=base_hours, default_hours=default_hours):
+                neighbor.write({
+                    'number_of_days': base_days,
+                    'number_of_hours': base_hours,
+                    'l10n_in_contains_sandwich_leaves': False,
+                })
+                continue
+            updated_days = neighbor._l10n_in_apply_sandwich_rule(
+                public_holidays_date_by_company=public_holidays_dates_by_company,
+                leaves_dates_by_employee=leaves_dates_by_employee,
+            )
+            if updated_days and updated_days != base_days:
+                new_hours = (updated_days * (base_hours / base_days)) if base_days else base_hours
+                neighbor.write({
+                    'number_of_days': updated_days,
+                    'number_of_hours': new_hours,
+                    'l10n_in_contains_sandwich_leaves': True,
+                })
+            else:
+                neighbor.write({
+                    'number_of_days': base_days,
+                    'number_of_hours': base_hours,
+                    'l10n_in_contains_sandwich_leaves': False,
+                })
+
+    @api.ondelete(at_uninstall=False)
+    def _ondelete_refresh_neighbors(self):
+        """Pre-delete hook: update neighbors as if these records were already deleted"""
+        self._l10n_in_update_neighbors_duration_after_change()
+
+    def action_refuse(self):
+        res = super().action_refuse()
+        self._l10n_in_update_neighbors_duration_after_change()
+        return res
+
+    def _action_user_cancel(self, reason):
+        res = super()._action_user_cancel(reason)
+        self._l10n_in_update_neighbors_duration_after_change()
+        return res
diff --git a/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py b/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py
index e85259e71dd0e..e6adb1f6f67ce 100644
--- a/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py
+++ b/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py
@@ -12,67 +12,56 @@ def setUp(self):
         super().setUp()
         self.indian_company = self.env['res.company'].create({
             'name': 'Test Indian Company',
-            'country_id': self.env.ref('base.in').id
+            'country_id': self.env.ref('base.in').id,
         })
-
+        self.env = self.env(context=dict(self.env.context, allowed_company_ids=self.indian_company.ids))
         self.demo_user = self.env["res.users"].with_company(self.indian_company).create({
-                "login": "piyush",
-                "name": "piyush_demo",
-                "group_ids": [Command.link(self.env.ref("base.group_user").id)]
-            })
+            "login": "piyush",
+            "name": "piyush_demo",
+            "group_ids": [Command.link(self.env.ref("base.group_user").id)]
+        })
 
         self.demo_employee = self.env['hr.employee'].with_company(self.indian_company).create({
             'name': 'Piyush',
             'user_id': self.demo_user.id,
         })
 
-        self.leave_type = self.env['hr.leave.type'].create({
+        self.leave_type_day, self.leave_type_half_day, self.leave_type_hours = self.env['hr.leave.type'].create([{
             'name': 'Test Leave Type',
             'request_unit': 'day',
             'requires_allocation': False,
             'l10n_in_is_sandwich_leave': True,
             'company_id': self.indian_company.id,
+        }, {
+            'name': 'Test Leave Type 2',
+            'request_unit': 'half_day',
+            'requires_allocation': False,
+            'l10n_in_is_sandwich_leave': True,
+            'company_id': self.indian_company.id,
+        }, {
+            'name': 'Test Leave Type 3',
+            'request_unit': 'hour',
+            'requires_allocation': False,
+            'l10n_in_is_sandwich_leave': True,
+            'company_id': self.indian_company.id,
+        }])
+        self.rahul_emp = self.env['hr.employee'].create({
+            'name': 'Rahul',
+            'country_id': self.env.ref('base.in').id,
+            'company_id': self.indian_company.id,
+        })
+        self.wednesday_public_holiday = self.env['resource.calendar.leaves'].create({
+            'name': 'test public holiday',
+            'date_from': '2025-01-29 00:00:00',
+            'date_to': '2025-01-29 23:59:59',
+            'resource_id': False,
         })
-
-    def test_sandwich_leave(self):
-        with freeze_time('2023-08-15'):
-            public_holiday = self.env['resource.calendar.leaves'].create({
-                'name': 'Independence Day',
-                'date_from': '2023-08-15',
-                'date_to': '2023-08-15',
-                'resource_id': False,
-                'company_id': self.indian_company.id,
-            })
-            before_holiday_leave = self.env['hr.leave'].create({
-                'name': 'Test Leave',
-                'employee_id': self.demo_employee.id,
-                'holiday_status_id': self.leave_type.id,
-                'request_date_from': "2023-08-14",
-                'request_date_to': "2023-08-14",
-            })
-            employee_leaves = self.env['hr.leave'].search([
-                ('employee_id', '=', self.demo_employee.id),
-                ('state', 'not in', ['cancel', 'refuse']),
-                ('leave_type_request_unit', '=', 'day'),
-            ])
-            after_holiday_leave = self.env['hr.leave'].create({
-                'name': 'Test Leave',
-                'employee_id': self.demo_employee.id,
-                'holiday_status_id': self.leave_type.id,
-                'request_date_from': "2023-08-16",
-                'request_date_to': "2023-08-16",
-            })
-
-            leave = before_holiday_leave._l10n_in_apply_sandwich_rule(public_holiday, employee_leaves)
-            self.assertEqual(leave, 1, "The total leaves should be 1")
-            sandwiched_leave = after_holiday_leave._l10n_in_apply_sandwich_rule(public_holiday, employee_leaves)
-            self.assertEqual(sandwiched_leave, 2, "The total leaves should be 2 including sandwich leave")
 
     def test_approved_leave_does_not_raise_access_error(self):
         approved_leave = self.env['hr.leave'].create({
             'name': 'Approved Sandwich Leave',
             'employee_id': self.demo_employee.id,
-            'holiday_status_id': self.leave_type.id,
+            'holiday_status_id': self.leave_type_day.id,
             'request_date_from': '2025-08-14',
             'request_date_to': '2025-08-18',
             'state': 'confirm',
@@ -81,7 +70,7 @@ def test_approved_leave_does_not_raise_access_error(self):
         self.assertIsNotNone(approved_leave.with_user(self.demo_user).leave_type_increases_duration)
 
     def test_long_sandwich_leave(self):
-        public_holiday = self.env['resource.calendar.leaves'].create({
+        self.env['resource.calendar.leaves'].create({
             'name': "Independence Day",
             'date_from': "2025-08-15",
             'date_to': "2025-08-15",
@@ -90,23 +79,428 @@ def test_long_sandwich_leave(self):
         })
         holiday_leave = self.env['hr.leave'].create({
             'name': "Test Leave",
-            'employee_id': self.demo_employee.id,
-            'holiday_status_id': self.leave_type.id,
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
             'request_date_from': "2025-08-13",
             'request_date_to': "2025-08-17",
         })
-        leave = holiday_leave._l10n_in_apply_sandwich_rule(public_holiday, holiday_leave)
-        self.assertEqual(leave, 2, "The total leaves should be 2")
+        self.assertEqual(holiday_leave.number_of_days, 2, "The total leaves should be 2")
 
     def test_half_day_leave(self):
-        self.leave_type.request_unit = 'half_day'
         half_leave = self.env['hr.leave'].create({
-                'name': "Half Day Leave",
-                'employee_id': self.demo_employee.id,
-                'holiday_status_id': self.leave_type.id,
-                'request_date_from': "2025-08-29",
-                'request_date_to': "2025-08-29",
-            })
+            'name': "Half Day Leave",
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_half_day.id,
+            'request_date_from': "2025-08-29",
+            'request_date_to': "2025-08-29",
+            'request_date_from_period': 'am',
+            'request_date_to_period': 'am',
+        })
 
         leave = half_leave._get_durations()
         self.assertEqual(leave[half_leave.id][0], 0.5, "The total leaves should be 0.5")
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_friday_monday(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-17",
+            'request_date_to': "2025-01-20",
+        })
+        self.assertTrue(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 4)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_saturday_monday(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-18",
+            'request_date_to': "2025-01-20",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 1)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_friday_sunday(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-17",
+            'request_date_to': "2025-01-19",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 1)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_saturday_sunday(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-18",
+            'request_date_to': "2025-01-19",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 0)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_saturday(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-18",
+            'request_date_to': "2025-01-18",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 0)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_sunday(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-19",
+            'request_date_to': "2025-01-19",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 0)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_3days_with_public_holidays(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-28",
+            'request_date_to': "2025-01-30",
+        })
+        self.assertTrue(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 3)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_2days_stop_with_public_holidays(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-28",
+            'request_date_to': "2025-01-29",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 1)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_2days_start_with_public_holidays(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-29",
+            'request_date_to': "2025-01-30",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 1)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_leave_public_holidays(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-29",
+            'request_date_to': "2025-01-29",
+        })
+        self.assertFalse(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 0)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_in_two_weeks(self):
+        holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-18",
+            'request_date_to': "2025-02-01",
+        })
+        self.assertTrue(holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(holiday_leave.number_of_days, 12)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_in_two_part_1(self):
+        """
+            -- woking days: 28th and 30th January
+            -- non-working days: 29th January (public holiday)
+        """
+        before_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-28",
+            'request_date_to': "2025-01-28",
+        })
+        after_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-30",
+            'request_date_to': "2025-01-30",
+        })
+
+        self.assertFalse(before_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(before_holiday_leave.number_of_days, 1)
+        self.assertTrue(after_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_holiday_leave.number_of_days, 2)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_in_two_part_2(self):
+        """
+            -- woking days: 28th and 30th January
+            -- non-working days: 29th January (public holiday)
+        """
+        before_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-28",
+            'request_date_to': "2025-01-28",
+        })
+        after_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-30",
+            'request_date_to': "2025-01-30",
+        })
+        self.assertFalse(before_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(before_holiday_leave.number_of_days, 1)
+        self.assertTrue(after_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_holiday_leave.number_of_days, 2)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_in_two_weeks_in_two(self):
+        before_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-18",
+            'request_date_to': "2025-01-24",
+        })
+        after_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-27",
+            'request_date_to': "2025-02-01",
+        })
+        self.assertFalse(before_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(before_holiday_leave.number_of_days, 5)
+        self.assertTrue(after_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_holiday_leave.number_of_days, 7)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_for_leave_type_hours(self):
+        """
+            --working days: 24th and 27th January
+            --non-working days: 25th, 26th January
+        """
+        before_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_hours.id,
+            'request_date_from': "2025-01-24",
+            'request_date_to': "2025-01-24",
+        })
+        after_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_hours.id,
+            'request_date_from': "2025-01-27",
+            'request_date_to': "2025-01-27",
+        })
+        self.assertFalse(before_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(before_holiday_leave.number_of_hours, 8)
+        self.assertTrue(after_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_holiday_leave.number_of_hours, 24)
+
+    @freeze_time('2025-01-15')
+    def test_sandwich_for_two_different_leave_type(self):
+        """
+            This test ensure that if we have different leave type around the non-working days and one of them
+            doesn't enabled sandwich leave then it's not calculated as sandwich leave
+            --working days: 24th and 27th January
+            --non-working days: 25th, 26th January
+        """
+        other_leave_type = self.env['hr.leave.type'].create({
+            'name': 'Test Leave Type',
+            'request_unit': 'day',
+            'requires_allocation': False,
+        })
+        before_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': other_leave_type.id,
+            'request_date_from': "2025-01-24",
+            'request_date_to': "2025-01-24",
+        })
+        after_holiday_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-01-27",
+            'request_date_to': "2025-01-27",
+        })
+        self.assertFalse(before_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(before_holiday_leave.number_of_days, 1)
+        self.assertFalse(after_holiday_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_holiday_leave.number_of_days, 1)
+
+        # checking for different leave type with sandwich set as True
+        other_leave_type.l10n_in_is_sandwich_leave = True
+        leave_duration_dict = after_holiday_leave._get_durations()
+        self.assertEqual(leave_duration_dict[after_holiday_leave.id][0], 3)
+
+    @freeze_time('2025-01-15')
+    def test_partial_hour_leave_not_counted(self):
+        """
+            Partial hour leave should not trigger sandwich computations.
+            -- working days: 24th and 27th January
+            -- non-working days: 25th, 26th January
+        """
+        partial_leave = self.env['hr.leave'].create({
+            'name': 'Partial Friday Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_hours.id,
+            'request_date_from': "2025-01-24",
+            'request_date_to': "2025-01-24",
+            'request_hour_from': 10,
+            'request_hour_to': 13,
+        })
+        full_leave = self.env['hr.leave'].create({
+            'name': 'Full Monday Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_hours.id,
+            'request_date_from': "2025-01-27",
+            'request_date_to': "2025-01-27",
+        })
+
+        self.assertFalse(partial_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(partial_leave.number_of_hours, 3)
+        self.assertFalse(full_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(full_leave.number_of_hours, 8)
+
+        partial_leave = self.env['hr.leave'].create({
+            'name': 'Partial Friday Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_hours.id,
+            'request_date_from': "2025-01-17",
+            'request_date_to': "2025-01-17",
+        })
+        full_leave = self.env['hr.leave'].create({
+            'name': 'Full Monday Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_hours.id,
+            'request_date_from': "2025-01-20",
+            'request_date_to': "2025-01-20",
+        })
+
+        self.assertFalse(partial_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(partial_leave.number_of_hours, 8)
+        self.assertTrue(full_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(full_leave.number_of_hours, 24)
+
+    @freeze_time('2025-07-15')
+    def test_bidirectional_sandwich_leave(self):
+        """
+            This test case verifies that if a sandwich leave is created with a before and after linked sandwich leave,
+            -- public holiday: 9th July(wednesday)
+            -- working days: 3th-4th(Thu-Fri) July, 7th-8th(Mon-Tue) July, 10th-11th(Thu-Fri) July
+            -- non-working days: 5th-6th(Sat-Sun) July,
+        """
+        self.env['resource.calendar.leaves'].create({
+            'name': 'Public Holiday',
+            'date_from': '2025-07-09 00:00:00',
+            'date_to': '2025-07-09 23:59:59',
+        })
+        before_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave Before',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-03",
+            'request_date_to': "2025-07-04",
+        })
+        self.assertEqual(before_leave.number_of_days, 2)
+
+        after_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave After',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-10",
+            'request_date_to': "2025-07-11",
+        })
+        self.assertEqual(after_leave.number_of_days, 2)
+
+        middle_sandwich_leave = self.env['hr.leave'].create({
+            'name': 'Test Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-07",
+            'request_date_to': "2025-07-08",
+        })
+        self.assertTrue(middle_sandwich_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(middle_sandwich_leave.number_of_days, 5)
+
+    @freeze_time('2025-07-15')
+    def test_sandwich_when_linked_leave_delete(self):
+        before_leave = self.env['hr.leave'].create({
+            'name': 'Monday Leave',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-11",
+            'request_date_to': "2025-07-11",
+        })
+        self.assertEqual(before_leave.number_of_days, 1)
+
+        after_leave = self.env['hr.leave'].create({
+            'name': 'Friday',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-14",
+            'request_date_to': "2025-07-14",
+        })
+        self.assertTrue(after_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_leave.number_of_days, 3)
+
+        before_leave.unlink()
+        self.assertEqual(after_leave.number_of_days, 1)
+
+    @freeze_time('2025-07-15')
+    def test_sandwich_when_linked_leave_refuse(self):
+        before_leave = self.env['hr.leave'].create({
+            'name': 'Mon',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-11",
+            'request_date_to': "2025-07-11",
+        })
+        self.assertEqual(before_leave.number_of_days, 1)
+
+        after_leave = self.env['hr.leave'].create({
+            'name': 'Fri',
+            'employee_id': self.rahul_emp.id,
+            'holiday_status_id': self.leave_type_day.id,
+            'request_date_from': "2025-07-14",
+            'request_date_to': "2025-07-14",
+        })
+        self.assertTrue(after_leave.l10n_in_contains_sandwich_leaves)
+        self.assertEqual(after_leave.number_of_days, 3)
+
+        # Refuse the linked Monday leave -> Friday should drop back to 1 day
+        before_leave.action_refuse()
+        self.assertEqual(after_leave.number_of_days, 1)

From 374fa4cbb8465d004747dbcfcfde93c2f39c8fa9 Mon Sep 17 00:00:00 2001
From: Odoo <ammu@odoo.com>
Date: Fri, 31 Oct 2025 12:13:15 +0000
Subject: [PATCH 210/673] [FIX] hr_attendance: typo error

There is a typo 'Beetween' in hr_attendance module.

closes odoo/odoo#234429

X-original-commit: a77314e1a5ec923f8fb3adfc402010e697b5cfa5
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
Signed-off-by: Amit M. Muchhala (ammu) <ammu@odoo.com>
---
 .../hr_attendance/views/hr_attendance_overtime_rule_views.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/views/hr_attendance_overtime_rule_views.xml b/addons/hr_attendance/views/hr_attendance_overtime_rule_views.xml
index 019a7fec1f6b1..af0ba5f2c9193 100644
--- a/addons/hr_attendance/views/hr_attendance_overtime_rule_views.xml
+++ b/addons/hr_attendance/views/hr_attendance_overtime_rule_views.xml
@@ -42,7 +42,7 @@
                                 <field name="employer_tolerance" widget="float_time" string="With a tolerance in favor of the employer of"/>
                                 <!-- TIMING -->
                                 <field name="timing_type" widget="radio" string="If the employee works" invisible="base_off != 'timing'"/>
-                                <span class="fw-bold" invisible="base_off != 'timing' or timing_type not in ['work_days', 'non_work_days']">Beetween</span>
+                                <span class="fw-bold" invisible="base_off != 'timing' or timing_type not in ['work_days', 'non_work_days']">Between</span>
                                 <span class="d-flex gap-1" invisible="base_off != 'timing' or timing_type not in ['work_days', 'non_work_days']">
                                     <field nolabel="1" name="timing_start" widget="float_time" style="width:10ch"/>
                                     <label for="expected_hours_from_contract" string="and"/>

From f4a63a35066000f291ed0b383d99daab4dd1f239 Mon Sep 17 00:00:00 2001
From: dere-odoo <dere@odoo.com>
Date: Mon, 3 Nov 2025 06:34:32 +0000
Subject: [PATCH 211/673] [FIX] sale_product_matrix: variant grid combo filter

Steps:
- create a product with attributes of create_variant=never
- set variant selection to order grid entry
- add this product as a combo choice and set extra_price>1
- In sale order form first add the new combo product with
 the previously created product
- add the new product with same selection of attribute values
 as combo

Issue:
- add the product separately should create a new line, but since
 it was added as a part of the combo, the product's price is summed
 with extra price

Cause:
- the grid field that is responsible for adding product using product
 matrix does not filter combo lines

Fix:
- added filter for combo lines when matrix opens and saves

opw-5164789

closes odoo/odoo#234441

X-original-commit: 47c88854e14810c2b832899c4f7ebf3d73ce7e6a
Signed-off-by: Louis Tinel (loti) <loti@odoo.com>
Signed-off-by: Dev Reshamiya (dere) <dere@odoo.com>
---
 addons/sale_product_matrix/models/sale_order.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/sale_product_matrix/models/sale_order.py b/addons/sale_product_matrix/models/sale_order.py
index a2d86285a2db2..4d6db180249c6 100644
--- a/addons/sale_product_matrix/models/sale_order.py
+++ b/addons/sale_product_matrix/models/sale_order.py
@@ -59,6 +59,7 @@ def _apply_grid(self):
                 order_lines = self.order_line.filtered(
                     lambda line: line.product_id.id == product.id
                     and line.product_no_variant_attribute_value_ids.ids == no_variant_attribute_values.ids
+                    and not line.combo_item_id
                 )
 
                 # if product variant already exist in order lines
@@ -142,7 +143,7 @@ def has_ptavs(line, sorted_attr_ids):
                 for cell in line:
                     if not cell.get('name', False):
                         line = order_lines.filtered(lambda line: has_ptavs(line, cell['ptav_ids']))
-                        if line:
+                        if line and not line.combo_item_id:
                             cell.update({
                                 'qty': sum(line.mapped('product_uom_qty'))
                             })

From 1547a3c83e980790c6225065bf80fd74494fff89 Mon Sep 17 00:00:00 2001
From: "Gauthier Wala (gawa)" <gawa@odoo.com>
Date: Thu, 23 Oct 2025 15:03:47 +0000
Subject: [PATCH 212/673] [FIX] l10n_fr_account: put account for rounding
 differences

These accounts were changed by mistake.
Even more, they're of the wrong type.
Re-add account to be consistent with 758

opw-5180702

closes odoo/odoo#233503

X-original-commit: e4e7efffade8542756e9504820ef4e3e419381b4
Signed-off-by: Florian Gilbert (flg) <flg@odoo.com>
---
 addons/l10n_fr_account/data/template/account.account-fr.csv | 1 +
 addons/l10n_fr_account/models/template_fr.py                | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_fr_account/data/template/account.account-fr.csv b/addons/l10n_fr_account/data/template/account.account-fr.csv
index a599e894c171f..fd3dfa845561c 100644
--- a/addons/l10n_fr_account/data/template/account.account-fr.csv
+++ b/addons/l10n_fr_account/data/template/account.account-fr.csv
@@ -525,6 +525,7 @@
 "pcg_6551","Share of profit transferred (accounts of the managing entity)","655100","expense_other","","False","","Part des bénéfices transférés (comptes de l'entité gestionnaire)","","","","True",""
 "pcg_6555","Share of loss (accounts of non-managing partners/associates)","655500","expense_other","","False","","Partage des pertes (comptes des associés/associés non gérants)","","","","True",""
 "pcg_657","Book value of intangible assets and property, plant and equipment sold","657000","expense_other","account.account_tag_investing","False","","Valeur comptable des actifs incorporels et des immobilisations corporelles vendus","","","","True",""
+"pcg_658","Penalties and other expenses","658000","expense_other","account.account_tag_operating","False","","Pénalités et autres charges","","","","True",""
 "pcg_6581","Contract penalties (and discounts paid on purchases and sales)","658100","expense_other","account.account_tag_operating","False","","Pénalités contractuelles (et remises versées sur les achats et les ventes)","","","","True",""
 "pcg_6582","Penalties, tax and criminal fines","658200","expense_other","account.account_tag_operating","False","","Pénalités, impôts et amendes pénales","","","","True",""
 "pcg_6583","Losses resulting from indexation clauses","658300","expense_other","account.account_tag_operating","False","","Pertes résultant des clauses d'indexation","","","tva_normale_encaissement","True",""
diff --git a/addons/l10n_fr_account/models/template_fr.py b/addons/l10n_fr_account/models/template_fr.py
index 7c8ec1c1072be..4a2ab46f16226 100644
--- a/addons/l10n_fr_account/models/template_fr.py
+++ b/addons/l10n_fr_account/models/template_fr.py
@@ -31,8 +31,8 @@ def _get_fr_res_company(self):
                 'account_journal_early_pay_discount_gain_account_id': 'pcg_765',
                 'deferred_expense_account_id': 'pcg_486',
                 'deferred_revenue_account_id': 'pcg_487',
-                'l10n_fr_rounding_difference_loss_account_id': 'pcg_4768',
-                'l10n_fr_rounding_difference_profit_account_id': 'pcg_4778',
+                'l10n_fr_rounding_difference_loss_account_id': 'pcg_658',
+                'l10n_fr_rounding_difference_profit_account_id': 'pcg_758',
                 'account_sale_tax_id': 'tva_normale',
                 'account_purchase_tax_id': 'tva_acq_normale',
                 'expense_account_id': 'pcg_607_account',

From 6974d539d380f836702f7711255121f78bc1795b Mon Sep 17 00:00:00 2001
From: "Pierre Lamotte (pila)" <pila@odoo.com>
Date: Fri, 17 Oct 2025 10:15:50 +0000
Subject: [PATCH 213/673] [FIX] payment_paypal: cny currency removal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Versions
18.0+

## Issue
No payment is possible with PayPal for invoices expressed in Chinese currency.

## Steps to reproduce
**`account` app required**
- Enable "CNY" currency via `Invoicing / Configuration / Accounting / Currencies`;
- Install, setup and publish PayPal payment provider;
- Move to the Invoice app:
  - Create a new invoice in "CNY" currency for any customer with at least 1 product;
  - Confirm and click on the preview button:
    - Click on the "Pay now" button then "Pay" button of the wizard.

## Cause
"CNY" currency is only supported for Chinese PayPal accounts and for transactions occurring in China.
PayPal says:
> Please note that Chinese Renminbi (CNY) is supported as a payment currency (buyer currency) or settlement currency (holding currency) only for in-country PayPal accounts. If the settlement account is based outside of China, PayPal will convert the funds into the account’s primary currency using the applicable currency conversion rate, which includes a spread or fee.

opw-5071893

closes odoo/odoo#234445

X-original-commit: fb67f79a23ad70fe1a3f04f80e14234b83b22fa7
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Pierre Lamotte (pila) <pila@odoo.com>
---
 addons/payment_paypal/const.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/payment_paypal/const.py b/addons/payment_paypal/const.py
index 6ec38bce0a1d9..06a99f3b83bd0 100644
--- a/addons/payment_paypal/const.py
+++ b/addons/payment_paypal/const.py
@@ -2,12 +2,13 @@
 
 # ISO 4217 codes of currencies supported by PayPal
 # See https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies/.
-# Last seen on: 22 September 2022.
+# Last seen on: 04 November 2025.
+
+# CNY removed as it requires in-country PayPal accounts but China mostly uses WeChat and Alipay.
 SUPPORTED_CURRENCIES = (
     'AUD',
     'BRL',
     'CAD',
-    'CNY',
     'CZK',
     'DKK',
     'EUR',

From ace676927fabc0797cecdcce96290f3398e514d4 Mon Sep 17 00:00:00 2001
From: abdelrahmanfawzy <abdh@odoo.com>
Date: Mon, 6 Oct 2025 09:14:16 +0000
Subject: [PATCH 214/673] [FIX] attachment_indexation: Fix PDF/Tabular
 attachment indexation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix indexation of `ir.attachment` of PDF/tabular files to be able
to utilize the index_content in AI features (RAG, semantic search).

- For tabular formats (XLSX/ODS), index data as CSV to preserve
  row–column context for AI-based retrieval (RAG).
- Use `openpyxl` (part of Odoo requirements) for XLSX parsing and
  cell extraction.
- Fix PDF text extraction by applying pdfminer LAParams tuning to
prevent merged or unreadable text in narrow or multi-column layouts.

task-id-5045336

closes odoo/odoo#234390

X-original-commit: ab94f8245dd95203652bcb31413bc4c93d0824d2
Related: odoo/enterprise#98809
Signed-off-by: Raphael Collet <rco@odoo.com>
Signed-off-by: Abdelrahman Shaaban (ABDH) <abdh@odoo.com>
---
 .../models/ir_attachment.py                   | 168 +++++++++++++++---
 .../tests/test_indexation.py                  |   2 +-
 2 files changed, 147 insertions(+), 23 deletions(-)

diff --git a/addons/attachment_indexation/models/ir_attachment.py b/addons/attachment_indexation/models/ir_attachment.py
index d34486b17b37c..3b56c2c665133 100644
--- a/addons/attachment_indexation/models/ir_attachment.py
+++ b/addons/attachment_indexation/models/ir_attachment.py
@@ -2,16 +2,19 @@
 import io
 import importlib.util
 import logging
+import re
+import warnings
 import xml.dom.minidom
 import zipfile
+from lxml import etree
 
 from odoo import api, models
 from odoo.tools.lru import LRU
 
 _logger = logging.getLogger(__name__)
 
-if not importlib.util.find_spec('pdfminer'):
-    _logger.warning("Attachment indexation of PDF documents is unavailable because the 'pdfminer' Python library cannot be found on the system. "
+if not importlib.util.find_spec('pdfminer.high_level'):
+    _logger.warning("Attachment indexation of PDF documents is unavailable because the 'pdfminer.six' Python library cannot be found on the system. "
                     "You may install it from https://pypi.org/project/pdfminer.six/ (e.g. `pip3 install pdfminer.six`)")
 
 FTYPES = ['docx', 'pptx', 'xlsx', 'opendoc', 'pdf']
@@ -29,6 +32,38 @@ def textToString(element):
     return buff
 
 
+def _clean_text_content(buf):
+    """Clean PDF content: remove NULs, normalize whitespace and line breaks."""
+    if not buf:
+        return buf
+    # Remove NULs, normalize CRLF/CR to LF, replace tabs with spaces
+    buf = buf.translate({
+        ord('\x00'): None,
+        ord('\r'): None,
+        ord('\t'): ord(' '),
+    })
+
+    # Collapse runs of whitespace while preserving at most a single blank line
+    def _compact_whitespace(match):
+        chunk = match.group(0)
+        newline_count = chunk.count('\n')
+        if newline_count == 0:
+            return ' '
+        return '\n\n' if newline_count > 1 else '\n'
+
+    buf = re.sub(r'\s{2,}', _compact_whitespace, buf)
+    return buf.strip()
+
+
+def _csv_escape(value):
+    if value is None:
+        return ''
+    value = str(value)
+    if ',' in value or '"' in value or '\n' in value or '\r' in value:
+        return '"' + value.replace('"', '""') + '"'
+    return value
+
+
 class IrAttachment(models.Model):
     _inherit = 'ir.attachment'
 
@@ -68,42 +103,125 @@ def _index_pptx(self, bin_data):
     def _index_xlsx(self, bin_data):
         '''Index Microsoft .xlsx documents'''
 
-        buf = u""
+        try:
+            from openpyxl import load_workbook  # noqa: PLC0415
+            logging.getLogger("openpyxl").setLevel(logging.CRITICAL)
+        except ImportError:
+            _logger.info('openpyxl is not installed.')
+            return ""
+
         f = io.BytesIO(bin_data)
-        if zipfile.is_zipfile(f):
-            try:
-                zf = zipfile.ZipFile(f)
-                content = xml.dom.minidom.parseString(zf.read("xl/sharedStrings.xml"))
-                for val in ["t"]:
-                    for element in content.getElementsByTagName(val):
-                        buf += textToString(element) + "\n"
-            except Exception:
-                pass
-        return buf
+        all_sheets = []
+        try:
+            with warnings.catch_warnings():
+                warnings.simplefilter("ignore")
+                workbook = load_workbook(f, data_only=True, read_only=True)
+                for sheet in workbook.worksheets:
+                    sheet_name = sheet.title
+                    sheet_name_escaped = _csv_escape(sheet_name)
+                    sheet_rows = []
+                    for row in sheet.iter_rows(values_only=True):
+                        if not any(row):
+                            continue
+                        row_cells = [sheet_name_escaped] + [
+                            _csv_escape(str(cell) if cell is not None else '') for cell in row
+                        ]
+                        sheet_rows.append(','.join(row_cells))
+                    sheet_data = '\n'.join(sheet_rows)
+                    if sheet_data:
+                        all_sheets.append(sheet_data)
+        except Exception:  # noqa: BLE001
+            pass
+
+        all_sheets_str = '\n\n'.join(all_sheets)
+        return _clean_text_content(all_sheets_str)
 
     def _index_opendoc(self, bin_data):
         '''Index OpenDocument documents (.odt, .ods...)'''
 
-        buf = u""
         f = io.BytesIO(bin_data)
+        buf = []
+        MAX_COLUMN_REPEAT = 100
+        MAX_ROW_REPEAT = 50
+        main_namespaces = {
+            'office': 'urn:oasis:names:tc:opendocument:xmlns:office:1.0',
+            'text': 'urn:oasis:names:tc:opendocument:xmlns:text:1.0',
+            'table': 'urn:oasis:names:tc:opendocument:xmlns:table:1.0',
+            'manifest': 'urn:oasis:names:tc:opendocument:xmlns:manifest:1.0'
+        }
+
+        def extract_row(row):
+            cells = []
+            for cell in row.xpath('.//table:table-cell | .//table:covered-table-cell', namespaces=main_namespaces):
+                repeat = cell.get(f'{{{main_namespaces["table"]}}}number-columns-repeated')
+                repeat_count = min(int(repeat), MAX_COLUMN_REPEAT) if repeat and repeat.isdigit() else 1
+                text_parts = cell.xpath('.//text:p//text()', namespaces=main_namespaces)
+                cell_text = ' '.join(t.strip() for t in text_parts if t.strip())
+                cells.extend([cell_text] * repeat_count)
+            return cells
+
+        def extract_spreadsheet(content):
+            sheets_csv = []
+            tables = content.xpath('.//table:table', namespaces=main_namespaces)
+            for table in tables:
+                table_rows = []
+                table_name = table.get(f'{{{main_namespaces["table"]}}}name')
+                if not table_name:
+                    table_name = f"Sheet{len(sheets_csv) + 1}"
+                table_name_escaped = _csv_escape(table_name)
+                for row in table.xpath('.//table:table-row', namespaces=main_namespaces):
+                    row_repeat = row.get(f'{{{main_namespaces["table"]}}}number-rows-repeated')
+                    row_repeat_count = min(int(row_repeat), MAX_ROW_REPEAT) if row_repeat and row_repeat.isdigit() else 1
+
+                    cells = extract_row(row)
+                    if not any(cells):
+                        continue
+
+                    while cells and not cells[-1]:
+                        cells.pop()
+
+                    row_str = ','.join([table_name_escaped] + list(map(_csv_escape, cells)))
+                    if row_str.replace(',', '').strip():
+                        table_rows.extend([row_str] * row_repeat_count)
+
+                if table_rows:
+                    sheets_csv.append('\n'.join(table_rows))
+
+            return sheets_csv
+
+        def extract_text(content):
+            lines = []
+            for element in content.xpath('.//text:p | .//text:h | .//text:list-item', namespaces=main_namespaces):
+                text = ''.join(element.xpath('.//text()', namespaces=main_namespaces)).strip()
+                if text:
+                    lines.append(text)
+            return lines
+
         if zipfile.is_zipfile(f):
             try:
                 zf = zipfile.ZipFile(f)
-                content = xml.dom.minidom.parseString(zf.read("content.xml"))
-                for val in ["text:p", "text:h", "text:list"]:
-                    for element in content.getElementsByTagName(val):
-                        buf += textToString(element) + "\n"
+                content = etree.fromstring(zf.read('content.xml'))
+                mime_type = zf.read('mimetype').decode('utf-8').strip()
+                if mime_type and 'spreadsheet' in mime_type:
+                    buf.extend(extract_spreadsheet(content))
+                else:
+                    buf.extend(extract_text(content))
             except Exception:
                 pass
-        return buf
+
+        buf_str = '\n\n'.join(buf)
+        return _clean_text_content(buf_str)
 
     def _index_pdf(self, bin_data):
         '''Index PDF documents'''
         if not bin_data.startswith(b'%PDF-'):
             return ""
         try:
+            if not importlib.util.find_spec('pdfminer.high_level'):
+                return ""
             from pdfminer.pdfinterp import PDFResourceManager, PDFPageInterpreter  # noqa: PLC0415
             from pdfminer.converter import TextConverter  # noqa: PLC0415
+            from pdfminer.layout import LAParams  # noqa: PLC0415
             from pdfminer.pdfpage import PDFPage  # noqa: PLC0415
             logging.getLogger("pdfminer").setLevel(logging.CRITICAL)
         except ImportError:
@@ -112,13 +230,19 @@ def _index_pdf(self, bin_data):
         f = io.BytesIO(bin_data)
         try:
             resource_manager = PDFResourceManager()
-            with io.StringIO() as content, TextConverter(resource_manager, content) as device:
-                interpreter = PDFPageInterpreter(resource_manager, device)
+            laparams = LAParams(detect_vertical=True)
 
+            with io.StringIO() as content, TextConverter(
+                resource_manager,
+                content,
+                laparams=laparams
+            ) as device:
+                interpreter = PDFPageInterpreter(resource_manager, device)
                 for page in PDFPage.get_pages(f):
                     interpreter.process_page(page)
 
-                return content.getvalue()
+                buf = content.getvalue()
+            return _clean_text_content(buf)
         except Exception:  # noqa: BLE001
             return ""
 
diff --git a/addons/attachment_indexation/tests/test_indexation.py b/addons/attachment_indexation/tests/test_indexation.py
index bb7eac8038b76..a14ef2c80e863 100644
--- a/addons/attachment_indexation/tests/test_indexation.py
+++ b/addons/attachment_indexation/tests/test_indexation.py
@@ -21,4 +21,4 @@ def test_attachment_pdf_indexation(self):
         with file_open(os.path.join(directory, 'files', 'test_content.pdf'), 'rb') as file:
             pdf = file.read()
             text = self.env['ir.attachment']._index(pdf, 'application/pdf')
-            self.assertEqual(text, 'TestContent!!\x0c', 'the index content should be correct')
+            self.assertEqual(text, 'TestContent!!', 'the index content should be correct')

From 4068fd3c3e6cd3fd61c0972006abca79ce115740 Mon Sep 17 00:00:00 2001
From: kcv-odoo <kcv@odoo.com>
Date: Mon, 29 Sep 2025 05:22:26 +0000
Subject: [PATCH 215/673] [IMP] payment_iyzico: update field string

This commit update Iyzico related payment provider string
to match with Iyzico dashboard and documentation to not
confuse new user.

task-5067754

X-original-commit: 18fde9d606eb723062e72fe6fd0002116d330728
Part-of: odoo/odoo#234391
Related: odoo/documentation#15134
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 addons/payment_iyzico/models/payment_provider.py       | 4 ++--
 addons/payment_iyzico/views/payment_provider_views.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/payment_iyzico/models/payment_provider.py b/addons/payment_iyzico/models/payment_provider.py
index f95cee89fffe3..6f3d51eab4589 100644
--- a/addons/payment_iyzico/models/payment_provider.py
+++ b/addons/payment_iyzico/models/payment_provider.py
@@ -20,9 +20,9 @@ class PaymentProvider(models.Model):
     code = fields.Selection(
         selection_add=[('iyzico', "Iyzico")], ondelete={'iyzico': 'set default'}
     )
-    iyzico_key_id = fields.Char(string="Iyzico Key Id", required_if_provider='iyzico', copy=False)
+    iyzico_key_id = fields.Char(string="Iyzico API Key", required_if_provider='iyzico', copy=False)
     iyzico_key_secret = fields.Char(
-        string="Iyzico Key Secret",
+        string="Iyzico Secret Key",
         required_if_provider='iyzico',
         copy=False,
         groups='base.group_system',
diff --git a/addons/payment_iyzico/views/payment_provider_views.xml b/addons/payment_iyzico/views/payment_provider_views.xml
index af0e2ccb17173..2d0718c3b590d 100644
--- a/addons/payment_iyzico/views/payment_provider_views.xml
+++ b/addons/payment_iyzico/views/payment_provider_views.xml
@@ -9,12 +9,12 @@
             <group name="provider_credentials" position="inside">
                 <group name="iyzico_credentials" invisible="code != 'iyzico'">
                     <field
-                        string="Key Id"
+                        string="API Key"
                         name="iyzico_key_id"
                         required="code == 'iyzico' and state != 'disabled'"
                     />
                     <field
-                        string="Key Secret"
+                        string="Secret Key"
                         name="iyzico_key_secret"
                         required="code == 'iyzico' and state != 'disabled'"
                         password="True"

From 9a19061be3d9fdf23feb9e4e792da9761451b191 Mon Sep 17 00:00:00 2001
From: kcv-odoo <kcv@odoo.com>
Date: Wed, 15 Oct 2025 12:43:26 +0000
Subject: [PATCH 216/673] [IMP] payment_iyzico: add `paymentSource` param

This commit add `paymentSource` param as `ODOO` in checkout forn intialize
payload to allow iyzico team detect payment is coming from odoo and it
help them in the partnership.

task-5067754

X-original-commit: 32550fc273ab209bb72fd8e19acb54d758c35362
Part-of: odoo/odoo#234391
Related: odoo/documentation#15134
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 addons/payment_iyzico/models/payment_transaction.py     | 1 +
 addons/payment_iyzico/tests/test_payment_transaction.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/payment_iyzico/models/payment_transaction.py b/addons/payment_iyzico/models/payment_transaction.py
index 8ae4f364b50aa..a9c31aeba184e 100644
--- a/addons/payment_iyzico/models/payment_transaction.py
+++ b/addons/payment_iyzico/models/payment_transaction.py
@@ -93,6 +93,7 @@ def _iyzico_prepare_cf_initialize_payload(self):
             'currency': self.currency_id.name,
             'locale': 'tr' if self.env.lang == 'tr_TR' else 'en',
             'paidPrice': self.amount,
+            'paymentSource': 'ODOO',
             'price': self.amount,
         }
 
diff --git a/addons/payment_iyzico/tests/test_payment_transaction.py b/addons/payment_iyzico/tests/test_payment_transaction.py
index e723ec21db914..eb413d9ee3316 100644
--- a/addons/payment_iyzico/tests/test_payment_transaction.py
+++ b/addons/payment_iyzico/tests/test_payment_transaction.py
@@ -54,6 +54,7 @@ def test_no_item_missing_from_cf_initialize_payload(self):
             'currency': tx.currency_id.name,
             'locale': 'tr' if tx.env.lang == 'tr_TR' else 'en',
             'paidPrice': tx.amount,
+            'paymentSource': 'ODOO',
             'price': tx.amount,
         })
 

From 69c8348d5f99e653b31f02b46663dc8ba887bade Mon Sep 17 00:00:00 2001
From: kcv-odoo <kcv@odoo.com>
Date: Fri, 26 Sep 2025 06:02:57 +0000
Subject: [PATCH 217/673] [IMP] payment_iyzico: support webhooks

This commit adds webhook support for the Iyzico payment provider.

task-5067754

closes odoo/odoo#234391

X-original-commit: aae99caebc493f6fada50fe61b825ef11d6422a7
Related: odoo/documentation#15134
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 addons/payment_iyzico/const.py                |  1 +
 addons/payment_iyzico/controllers/main.py     | 19 +++++++++++++++++++
 addons/payment_iyzico/tests/common.py         |  4 ++++
 .../tests/test_processing_flows.py            | 15 +++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/addons/payment_iyzico/const.py b/addons/payment_iyzico/const.py
index b328148c00055..960aabd67102b 100644
--- a/addons/payment_iyzico/const.py
+++ b/addons/payment_iyzico/const.py
@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 PAYMENT_RETURN_ROUTE = '/payment/iyzico/return'
+WEBHOOK_ROUTE = '/payment/iyzico/webhook'
 
 # The currencies supported by Iyzico, in ISO 4217 format.
 SUPPORTED_CURRENCIES = [
diff --git a/addons/payment_iyzico/controllers/main.py b/addons/payment_iyzico/controllers/main.py
index 51e4281c7dde0..45dfc9da674ee 100644
--- a/addons/payment_iyzico/controllers/main.py
+++ b/addons/payment_iyzico/controllers/main.py
@@ -41,6 +41,25 @@ def iyzico_return_from_payment(self, tx_ref='', **data):
 
         return request.redirect('/payment/status')
 
+    @http.route(const.WEBHOOK_ROUTE, type='http', auth='public', methods=['POST'], csrf=False)
+    def iyzico_webhook(self):
+        """Process the payment data sent by Iyzico to the webhook.
+
+        See https://docs.iyzico.com/en/advanced/webhook.
+
+        :return: An empty response to acknowledge the notification.
+        :rtype: odoo.http.Response
+        """
+        data = request.get_json_data()
+        _logger.info("Notification received from Iyzico with data:\n%s", pprint.pformat(data))
+
+        if token := data.get('token'):
+            self._verify_and_process(data['paymentConversationId'], token)
+        else:
+            _logger.warning("Received webhook data with missing token.")
+
+        return request.make_json_response('')  # Acknowledge the notification.
+
     @staticmethod
     def _verify_and_process(tx_ref, token):
         """Verify and process the payment data sent by Iyzico.
diff --git a/addons/payment_iyzico/tests/common.py b/addons/payment_iyzico/tests/common.py
index a78c8edeacdb7..059b05643d130 100644
--- a/addons/payment_iyzico/tests/common.py
+++ b/addons/payment_iyzico/tests/common.py
@@ -25,3 +25,7 @@ def setUpClass(cls):
             'paymentStatus': 'SUCCESS',
             'token': 'dummy_token',
         }
+        cls.webhook_data = {
+            **cls.payment_data,
+            'paymentConversationId': cls.reference,
+        }
diff --git a/addons/payment_iyzico/tests/test_processing_flows.py b/addons/payment_iyzico/tests/test_processing_flows.py
index d6a33ef1cb6e1..58c755aaf77a1 100644
--- a/addons/payment_iyzico/tests/test_processing_flows.py
+++ b/addons/payment_iyzico/tests/test_processing_flows.py
@@ -31,3 +31,18 @@ def test_redirect_notification_triggers_processing(self):
         ) as process_mock:
             self._make_http_post_request(url, data=self.return_data)
         self.assertEqual(process_mock.call_count, 1)
+
+    @mute_logger('odoo.addons.payment_iyzico.controllers.main')
+    def test_webhook_notification_triggers_processing(self):
+        """Test that receiving a valid webhook notification triggers the processing of the
+        payment data."""
+        self._create_transaction('redirect')
+        url = self._build_url(const.WEBHOOK_ROUTE)
+        with patch(
+            'odoo.addons.payment.models.payment_provider.PaymentProvider._send_api_request',
+            return_value=self.payment_data
+        ), patch(
+            'odoo.addons.payment.models.payment_transaction.PaymentTransaction._process'
+        ) as process_mock:
+            self._make_json_request(url, data=self.webhook_data)
+        self.assertEqual(process_mock.call_count, 1)

From 7d101f9ab2d2f3d196309727d4175ee769ae2256 Mon Sep 17 00:00:00 2001
From: Hesham Saleh <hsal@odoo.com>
Date: Mon, 27 Oct 2025 17:04:18 +0000
Subject: [PATCH 218/673] [IMP] account: Add receipts to default filters

This commit Shows by default receipts along side invoices/bills
from customer invoices or vendor bills pages.

task-5187350

closes odoo/odoo#234392

X-original-commit: 4afaf6692d31bbe6beb2e30dda076af2057109f5
Signed-off-by: Habib Ayob (ayh) <ayh@odoo.com>
Signed-off-by: Hesham Saleh (hsal) <hsal@odoo.com>
---
 addons/account/views/account_move_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index ccde0c99aa2a0..0ab96efb2a8bd 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -1941,7 +1941,7 @@
             <field name="view_id" ref="view_out_invoice_tree"/>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="domain">[('move_type', 'in', ['out_invoice', 'out_refund', 'out_receipt'])]</field>
-            <field name="context">{'search_default_out_invoice': 1, 'default_move_type': 'out_invoice'}</field>
+            <field name="context">{'search_default_out_invoice': 1, 'search_default_out_receipt': 1, 'default_move_type': 'out_invoice'}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Create a customer invoice
@@ -1998,7 +1998,7 @@
             <field name="view_id" ref="view_in_invoice_bill_tree"/>
             <field name="search_view_id" ref="view_account_bill_filter"/>
             <field name="domain">[('move_type', 'in', ['in_invoice', 'in_refund', 'in_receipt'])]</field>
-            <field name="context">{'search_default_in_invoice': 1, 'default_move_type': 'in_invoice'}</field>
+            <field name="context">{'search_default_in_invoice': 1, 'search_default_in_receipt': 1, 'default_move_type': 'in_invoice'}</field>
             <field name="help" type="html">
                 <!-- An owl component should be displayed instead -->
                 <p class="o_view_nocontent_smiling_face">

From 5af6b94701bfb239b05d57ee7e2d44ce09890393 Mon Sep 17 00:00:00 2001
From: asno-odoo <asno@odoo.com>
Date: Mon, 23 Jun 2025 12:28:14 +0000
Subject: [PATCH 219/673] [FIX] hr,hr_*: check existence of menu

To Reproduce:
1) make a database in 16.0 and go to developer mode.
2) Delete the menus
3) I mocked the views with upgrade mockcrawler.

it failed for these xmlids:
```
hr_attendance.menu_hr_attendance_attendances_overview
hr_timesheet.timesheet_menu_activity_use
hr.menu_hr_employee
```
but we should have a check anyways.

closes odoo/odoo#234440

X-original-commit: 088643ac61f9aa14c0e308e068c44e336222a060
Signed-off-by: Jurgen Gjini (jugj) <jugj@odoo.com>
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
Signed-off-by: Aslam Noman (asno) <asno@odoo.com>
---
 addons/hr/models/ir_ui_menu.py                 | 13 ++++++-------
 addons/hr_recruitment/models/ir_ui_menu.py     | 18 ++++++++++--------
 addons/hr_timesheet/models/ir_ui_menu.py       |  5 ++---
 .../models/ir_ui_menu.py                       |  5 ++---
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/hr/models/ir_ui_menu.py b/addons/hr/models/ir_ui_menu.py
index 224274be2dc09..83a9c7b701870 100644
--- a/addons/hr/models/ir_ui_menu.py
+++ b/addons/hr/models/ir_ui_menu.py
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import models, api, tools
+from odoo import models
 
 
 class IrUiMenu(models.Model):
@@ -9,12 +8,12 @@ class IrUiMenu(models.Model):
 
     def _load_menus_blacklist(self):
         res = super()._load_menus_blacklist()
-        if self.env.user.has_group('hr.group_hr_user'):
-            res.append(self.env.ref('hr.menu_hr_employee').id)
+        if self.env.user.has_group('hr.group_hr_user') and (emp_menu := self.env.ref('hr.menu_hr_employee', raise_if_not_found=False)):
+            res.append(emp_menu.id)
         else:
             is_department_manager = bool(self.env["hr.department"].search_count([
                 ('manager_id', 'in', self.env.user.employee_ids.ids)
-            ]))
-            if not is_department_manager:
-                res.append(self.env.ref('hr.menu_hr_department_kanban').id)
+            ], limit=1))
+            if not is_department_manager and (dep_menu := self.env.ref('hr.menu_hr_department_kanban', raise_if_not_found=False)):
+                res.append(dep_menu.id)
         return res
diff --git a/addons/hr_recruitment/models/ir_ui_menu.py b/addons/hr_recruitment/models/ir_ui_menu.py
index 2be3ae527f314..25a3e439d7c29 100644
--- a/addons/hr_recruitment/models/ir_ui_menu.py
+++ b/addons/hr_recruitment/models/ir_ui_menu.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import models
@@ -10,11 +9,14 @@ class IrUiMenu(models.Model):
     def _load_menus_blacklist(self):
         res = super()._load_menus_blacklist()
         is_interviewer = self.env.user.has_group('hr_recruitment.group_hr_recruitment_interviewer')
-        is_user = self.env.user.has_group('hr_recruitment.group_hr_recruitment_user')
-        if not is_interviewer:
-            res.append(self.env.ref('hr.menu_view_hr_job').id)
-        elif is_interviewer and not is_user:
-            res.append(self.env.ref('hr_recruitment.menu_hr_job_position').id)
-        else:
-            res.append(self.env.ref('hr_recruitment.menu_hr_job_position_interviewer').id)
+        if not is_interviewer and (job_menu := self.env.ref('hr.menu_view_hr_job', raise_if_not_found=False)):
+            res.append(job_menu.id)
+        elif (
+            is_interviewer
+            and not self.env.user.has_group('hr_recruitment.group_hr_recruitment_user')
+            and (pos_menu := self.env.ref('hr_recruitment.menu_hr_job_position', raise_if_not_found=False))
+        ):
+            res.append(pos_menu.id)
+        elif int_menu := self.env.ref('hr_recruitment.menu_hr_job_position_interviewer', raise_if_not_found=False):
+            res.append(int_menu.id)
         return res
diff --git a/addons/hr_timesheet/models/ir_ui_menu.py b/addons/hr_timesheet/models/ir_ui_menu.py
index 6eddc5e8085a6..3a095db5f0274 100644
--- a/addons/hr_timesheet/models/ir_ui_menu.py
+++ b/addons/hr_timesheet/models/ir_ui_menu.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import models
@@ -9,6 +8,6 @@ class IrUiMenu(models.Model):
 
     def _load_menus_blacklist(self):
         res = super()._load_menus_blacklist()
-        if self.env.user.has_group('hr_timesheet.group_hr_timesheet_approver'):
-            res.append(self.env.ref('hr_timesheet.timesheet_menu_activity_user').id)
+        if self.env.user.has_group('hr_timesheet.group_hr_timesheet_approver') and (time_menu := self.env.ref('hr_timesheet.timesheet_menu_activity_user', raise_if_not_found=False)):
+            res.append(time_menu.id)
         return res
diff --git a/addons/hr_timesheet_attendance/models/ir_ui_menu.py b/addons/hr_timesheet_attendance/models/ir_ui_menu.py
index 78492633193f8..9575005bbe716 100644
--- a/addons/hr_timesheet_attendance/models/ir_ui_menu.py
+++ b/addons/hr_timesheet_attendance/models/ir_ui_menu.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import models
@@ -9,6 +8,6 @@ class IrUiMenu(models.Model):
 
     def _load_menus_blacklist(self):
         res = super()._load_menus_blacklist()
-        if not (self.env.user.has_group('hr_timesheet.group_hr_timesheet_user')):
-            res.append(self.env.ref('hr_timesheet_attendance.menu_hr_timesheet_attendance_report').id)
+        if not self.env.user.has_group('hr_timesheet.group_hr_timesheet_user') and (att_menu := self.env.ref('hr_timesheet_attendance.menu_hr_timesheet_attendance_report', raise_if_not_found=False)):
+            res.append(att_menu.id)
         return res

From 3ebc2c9593c57aee1459d97dfde3c81b7d129d33 Mon Sep 17 00:00:00 2001
From: jayp-odoo <jayp@odoo.com>
Date: Tue, 4 Nov 2025 15:10:31 +0530
Subject: [PATCH 220/673] [IMP] mail, im_livechat : various UI improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- seprate section for audio configuration and live chat username visibility in
settings
- Used `fa-moon-o` icon for away to improve online/away distinction for
color-blind users

task-5227387

closes odoo/odoo#234298

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/im_livechat/views/res_users_views.xml     |  4 ++--
 addons/mail/static/src/core/common/im_status.xml |  2 +-
 .../src/core/common/im_status_dropdown.xml       |  2 +-
 .../src/discuss/call/common/call_settings.xml    | 16 +++++++++-------
 .../discuss/call/call_settings_menu.test.js      |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/im_livechat/views/res_users_views.xml b/addons/im_livechat/views/res_users_views.xml
index 9c83cae722c33..a39ac5751d139 100644
--- a/addons/im_livechat/views/res_users_views.xml
+++ b/addons/im_livechat/views/res_users_views.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='outgoing_mail_server_type']" position="after">
                     <field name="has_access_livechat" invisible="1"/>
-                    <field name="livechat_username" string="Livechat Name" invisible="not has_access_livechat"/>
+                    <field name="livechat_username" string="Live Chat Name" invisible="not has_access_livechat"/>
                     <field name="livechat_lang_ids" string="Spoken Languages"
                            options="{'no_create': True, 'no_edit': True, 'no_create_edit': True}"
                            widget="many2many_tags"
@@ -31,7 +31,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='outgoing_mail_server_type']" position="after">
                     <field name="has_access_livechat" invisible="1"/>
-                    <field name="livechat_username" string="Livechat Name" invisible="not has_access_livechat"/>
+                    <field name="livechat_username" string="Live Chat Name" invisible="not has_access_livechat"/>
                     <field name="livechat_lang_ids" string="Spoken Languages"
                            options="{'no_create': True, 'no_edit': True}"
                            widget="many2many_tags"
diff --git a/addons/mail/static/src/core/common/im_status.xml b/addons/mail/static/src/core/common/im_status.xml
index 74bd25d54a99d..36b017cca3163 100644
--- a/addons/mail/static/src/core/common/im_status.xml
+++ b/addons/mail/static/src/core/common/im_status.xml
@@ -16,7 +16,7 @@
                 <t name="icon">
                     <t t-if="(!props.member or !props.member.isTyping) and persona">
                         <i t-if="persona.im_status === 'online'" class="fa fa-circle text-success" title="Online" role="img" aria-label="User is online"/>
-                        <i t-elif="persona.im_status === 'away'" class="fa fa-circle o-yellow" title="Idle" role="img" aria-label="User is idle"/>
+                        <i t-elif="persona.im_status === 'away'" class="fa fa-adjust o-yellow" title="Idle" role="img" aria-label="User is idle"/>
                         <i t-elif="persona.im_status === 'busy'" class="fa fa-minus-circle text-danger" title="Busy" role="img" aria-label="User is busy"/>
                         <i t-elif="persona.im_status === 'offline'" class="fa fa-circle-o text-700 opacity-75" title="Offline" role="img" aria-label="User is offline"/>
                         <i t-elif="persona.im_status === 'bot'" class="fa fa-heart text-success" title="Bot" role="img" aria-label="User is a bot"/>
diff --git a/addons/mail/static/src/core/common/im_status_dropdown.xml b/addons/mail/static/src/core/common/im_status_dropdown.xml
index 40cdc8e4bb452..8aa304eb1e000 100644
--- a/addons/mail/static/src/core/common/im_status_dropdown.xml
+++ b/addons/mail/static/src/core/common/im_status_dropdown.xml
@@ -6,7 +6,7 @@
             <t t-set-slot="content">
                 <DropdownItem class="{ 'active': this.store.self.im_status.includes('online') }" onSelected="() => this.setManualImStatus('online')"><i class="fa fa-circle text-success me-1" title="Online" role="img"/> Online</DropdownItem>
                 <hr class="my-1"/>
-                <DropdownItem class="{ 'active': this.store.self.im_status.includes('away') }" onSelected="() => this.setManualImStatus('away')"><i class="fa fa-circle o-yellow me-1" title="Away" role="img"/> Away</DropdownItem>
+                <DropdownItem class="{ 'active': this.store.self.im_status.includes('away') }" onSelected="() => this.setManualImStatus('away')"><i class="fa fa-adjust o-yellow me-1" title="Away" role="img"/> Away</DropdownItem>
                 <DropdownItem class="{ 'active': this.store.self.im_status.includes('busy') }" onSelected="() => this.setManualImStatus('busy')">
                     <i class="fa fa-minus-circle text-danger me-1" title="Busy" role="img"/> Do Not Disturb
                     <div class="small text-muted">You will not receive any notifications</div>
diff --git a/addons/mail/static/src/discuss/call/common/call_settings.xml b/addons/mail/static/src/discuss/call/common/call_settings.xml
index ff630d1e7e046..1477cb8a168d6 100644
--- a/addons/mail/static/src/discuss/call/common/call_settings.xml
+++ b/addons/mail/static/src/discuss/call/common/call_settings.xml
@@ -18,13 +18,6 @@
                 <div class="flex-grow-1"/>
                 <DeviceSelect kind="'audioinput'"/>
             </label>
-            <label class="d-flex align-items-baseline mb-2" title="Audio Output" aria-label="Audio Output">
-                <span class="flex-shrink-0 pe-2">
-                    Audio Output
-                </span>
-                <div class="flex-grow-1"/>
-                <DeviceSelect kind="'audiooutput'"/>
-            </label>
             <div class="d-flex flex-column">
                 <button class="btn d-flex my-1" t-att-class="{'bg-300' : !store.settings.use_push_to_talk }" t-on-click="()=>this.store.settings.setPushToTalk(false)">
                     <input class="form-check-input" type="radio" t-att-checked="store.settings.use_push_to_talk ? '' : 'checked'"/>
@@ -82,6 +75,15 @@
                 <span t-if="store.settings.isRegisteringKey">Press a key to register it as the push-to-talk shortcut.</span>
             </div>
             <hr class="o-discuss-separator my-2"/>
+            <h4>Audio</h4>
+            <label class="d-flex align-items-baseline mb-2" title="Speakers" aria-label="Speakers">
+                <span class="flex-shrink-0 pe-2">
+                    Speakers
+                </span>
+                <div class="flex-grow-1"/>
+                <DeviceSelect kind="'audiooutput'"/>
+            </label>
+            <hr class="o-discuss-separator my-2"/>
             <h4>Video</h4>
             <label class="d-flex align-items-baseline mb-2" title="Camera" aria-label="Camera">
                 <span class="flex-shrink-0 pe-2">
diff --git a/addons/mail/static/tests/discuss/call/call_settings_menu.test.js b/addons/mail/static/tests/discuss/call/call_settings_menu.test.js
index 7bcfb0d963b8b..e9a9060044eaf 100644
--- a/addons/mail/static/tests/discuss/call/call_settings_menu.test.js
+++ b/addons/mail/static/tests/discuss/call/call_settings_menu.test.js
@@ -46,7 +46,7 @@ test("Renders the call settings", async () => {
     await contains(".o-discuss-CallSettings");
     await contains("label[aria-label='Camera']");
     await contains("label[aria-label='Microphone']");
-    await contains("label[aria-label='Audio Output']");
+    await contains("label[aria-label='Speakers']");
     await contains("option[value=mockAudioDeviceId]");
     await contains("option[value=mockVideoDeviceId]");
     await contains("button", { text: "Voice Detection" });

From de08c0d31896717586b4bebcbb07216a4ad4f151 Mon Sep 17 00:00:00 2001
From: Deependra Solanki <deso@odoo.com>
Date: Tue, 7 Oct 2025 16:14:20 +0530
Subject: [PATCH 221/673] [FIX] html_editor: splitElement should not lose
 element reference

closes odoo/odoo#234473

Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../html_editor/static/src/core/split_plugin.js  | 16 +++++-----------
 .../static/src/main/link/link_plugin.js          |  4 +++-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/html_editor/static/src/core/split_plugin.js b/addons/html_editor/static/src/core/split_plugin.js
index ca1b82638e3a9..2c2f7ebb85379 100644
--- a/addons/html_editor/static/src/core/split_plugin.js
+++ b/addons/html_editor/static/src/core/split_plugin.js
@@ -168,27 +168,21 @@ export class SplitPlugin extends Plugin {
     }
 
     /**
-     * Split the given element at the given offset. The element will be removed in
-     * the process so caution is advised in dealing with its reference. Returns a
-     * tuple containing the new elements on both sides of the split.
+     * Split the given element at the given offset. Returns a tuple containing
+     * the new elements on both sides of the split.
      *
      * @param {HTMLElement} element
      * @param {number} offset
      * @returns {[HTMLElement, HTMLElement]}
      */
     splitElement(element, offset) {
-        /** @type {HTMLElement} **/
-        const firstPart = element.cloneNode();
         /** @type {HTMLElement} **/
         const secondPart = element.cloneNode();
-        element.before(firstPart);
-        element.after(secondPart);
         const children = childNodes(element);
-        firstPart.append(...children.slice(0, offset));
         secondPart.append(...children.slice(offset));
-        element.remove();
-        this.dispatchTo("after_split_element_handlers", { firstPart, secondPart });
-        return [firstPart, secondPart];
+        element.after(secondPart);
+        this.dispatchTo("after_split_element_handlers", { element, secondPart });
+        return [element, secondPart];
     }
 
     /**
diff --git a/addons/html_editor/static/src/main/link/link_plugin.js b/addons/html_editor/static/src/main/link/link_plugin.js
index 6c6e0de59f984..fbdf20f759d6a 100644
--- a/addons/html_editor/static/src/main/link/link_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_plugin.js
@@ -944,6 +944,7 @@ export class LinkPlugin extends Plugin {
         }
         const startBlock = closestBlock(startLink);
         const endBlock = closestBlock(endLink);
+        const multipleLinks = startLink !== endLink;
         if (
             startLink &&
             startLink.isConnected &&
@@ -962,7 +963,8 @@ export class LinkPlugin extends Plugin {
             endLink &&
             endLink.isConnected &&
             endLink.parentElement.isContentEditable &&
-            !this.isUnremovable(endLink)
+            !this.isUnremovable(endLink) &&
+            multipleLinks
         ) {
             focusNode = this.dependencies.split.splitAroundUntil(focusNode, endLink);
             focusOffset = direction === DIRECTIONS.RIGHT ? nodeSize(focusNode) : 0;

From 0f50c1e466ce6812d163b581fc04a12fe2994fc6 Mon Sep 17 00:00:00 2001
From: "Adrien Guilliams (adgu)" <adgu@odoo.com>
Date: Fri, 26 Sep 2025 12:45:58 +0000
Subject: [PATCH 222/673] [FIX] point_of_sale: cash in/out deletion rights

Before this commit, a user with "account.group_account_invoice" group
could try to delete a cash in/out in the pos but had no feedback.
Actually, his request was refused but we never tell the user why.
We now display the error but also do not give the possibility to the
user to delete a cash in/out if he does not have the right group.

There was also errors appearing when printing the CashMoveReceipt.
We call the ReceiptHeader in the CashMoveReceipt but without giving it
a real order which could cause problems cause in the ReceiptHeader we
consider the order that is given as a real one and we can call methods
and stuff from the model. We now create a dummy order to give to the
ReceiptHeader.

closes odoo/odoo#232403

X-original-commit: f613dfe1bc0fa5a863009e22ee6532b2a685479f
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
---
 addons/point_of_sale/models/pos_config.py     |  1 +
 .../cash_move_list_popup.js                   | 30 ++++++++++++++-----
 .../cash_move_list_popup.xml                  |  2 +-
 .../popups/cash_move_popup/cash_move_popup.js | 19 +++++++-----
 .../pos/tours/utils/cash_move_list_util.js    |  8 +++++
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py
index 199a163255ece..db2c45de42a44 100644
--- a/addons/point_of_sale/models/pos_config.py
+++ b/addons/point_of_sale/models/pos_config.py
@@ -318,6 +318,7 @@ def _load_pos_data_read(self, records, config):
         record['_base_url'] = self.get_base_url()
         record['_data_server_date'] = self.env.context.get('pos_last_server_date') or self.env.cr.now()
         record['_has_cash_move_perm'] = self.env.user.has_group('account.group_account_invoice')
+        record['_has_cash_delete_perm'] = self.env.user.has_group('account.group_account_basic')
         record['_pos_special_products_ids'] = self.env['pos.config']._get_special_products().ids
 
         # Add custom fields for 'formula' taxes.
diff --git a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.js b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.js
index 6469b979dc02c..b129358a0cfbe 100644
--- a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.js
+++ b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.js
@@ -4,6 +4,7 @@ import { useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
 import { usePos } from "@point_of_sale/app/hooks/pos_hook";
 import { Dialog } from "@web/core/dialog/dialog";
 import { _t } from "@web/core/l10n/translation";
+import { AlertDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
 
 export class CashMoveListPopup extends Component {
     static template = "point_of_sale.CashMoveListPopup";
@@ -17,6 +18,7 @@ export class CashMoveListPopup extends Component {
         super.setup();
         this.pos = usePos();
         this.ui = useService("ui");
+        this.dialog = useService("dialog");
         this.callbacks = this.props.cashMoves.reduce(
             (acc, cm) => ({
                 ...acc,
@@ -35,13 +37,25 @@ export class CashMoveListPopup extends Component {
     }
 
     async onDeleteCm(cm) {
-        await this.pos.data.call(
-            "pos.session",
-            "delete_cash_in_out",
-            [[this.pos.session.id], cm.id, this.props.partnerId],
-            {},
-            true
-        );
-        this.props.cashMoves = this.props.cashMoves.filter((cashMove) => cashMove.id !== cm.id);
+        try {
+            await this.pos.data.call(
+                "pos.session",
+                "delete_cash_in_out",
+                [[this.pos.session.id], cm.id, this.props.partnerId],
+                {},
+                true
+            );
+            this.props.cashMoves = this.props.cashMoves.filter((cashMove) => cashMove.id !== cm.id);
+        } catch (error) {
+            this.dialog.add(AlertDialog, {
+                title: _t("Odoo Server Error"),
+                body: error.data.message,
+            });
+            throw error;
+        }
+    }
+
+    get hasCashDeletePerm() {
+        return this.pos.config._has_cash_delete_perm;
     }
 }
diff --git a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.xml b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.xml
index 4e9da413b8896..844785256d41c 100644
--- a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.xml
+++ b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_list_popup/cash_move_list_popup.xml
@@ -27,7 +27,7 @@
                                         <div class="cash-move-amount fw-bolder"><t t-esc="getAmount(cm)"></t></div>
                                     </td>
                                     
-                                    <td class="text-end delete-row">
+                                    <td class="text-end delete-row" t-if="hasCashDeletePerm">
                                         <button t-on-click.stop="callbacks[cm.id].call" class="btn btn-link btn-lg text-danger">
                                             <i t-if="callbacks[cm.id].status != 'loading'" class="fa fa-trash" aria-hidden="true"/>
                                             <i t-else="" class="fa fa-spin fa-circle-o-notch" aria-hidden="true" />
diff --git a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_popup.js b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_popup.js
index 41e5b575225f2..1babf6d8dcf1b 100644
--- a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_popup.js
+++ b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_popup.js
@@ -63,19 +63,24 @@ export class CashMovePopup extends Component {
             `${_t("Cash")} ${translatedType} - ${_t("Amount")}: ${formattedAmount}`,
             "CASH_DRAWER_ACTION"
         );
-        const data = {
-            company: this.pos.company,
-            config: this.pos.config,
-            preset_id: this.pos.config.defualt_preset_id,
-            getCashierName: () => this.pos.getCashier().name,
-        };
+        const order = this.pos.models["pos.order"].create({
+            session_id: this.session,
+            company_id: this.company,
+            config_id: this.config,
+            user_id: this.user,
+            ticket_code: "",
+            tracking_number: "",
+            sequence_number: 0,
+            pos_reference: "",
+        });
         await this.printer.print(CashMoveReceipt, {
             reason,
             translatedType,
-            order: data,
+            order: order,
             formattedAmount,
             date: new Date().toLocaleString(),
         });
+        this.pos.models["pos.order"].delete(order);
 
         this.props.close();
         this.notification.add(
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/cash_move_list_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/cash_move_list_util.js
index c1ebc6f234c64..390f23a8a3b00 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/cash_move_list_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/cash_move_list_util.js
@@ -6,6 +6,14 @@ export function checkCashMoveShown(amount) {
         trigger: `.cash-move-list .cash-move-row .cash-move-amount:contains(${amount})`,
     };
 }
+export function noCashMoveDeleteButton() {
+    return [
+        negateStep({
+            content: `Check that the delete button is not present`,
+            trigger: `.cash-move-list .cash-move-row .delete-row`,
+        }),
+    ];
+}
 export function deleteCashMove(amount) {
     return [
         {

From 032dfcb731f86d047d14e602b86163b2af5e5e60 Mon Sep 17 00:00:00 2001
From: Adnan Saiyed <adsa@odoo.com>
Date: Fri, 19 Sep 2025 17:46:48 +0530
Subject: [PATCH 223/673] [IMP] html_editor: preview on radial gradient type

Currently, when user wants to apply custom radial gradient type
(text or bg), there is no preview. This commit ensures that
user is able to see the preview when hovering the gradient
radial type.

task-5095842

closes odoo/odoo#227883

Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../main/font/color_picker_gradient_tab.xml   |  2 +
 .../font/gradient_picker/gradient_picker.js   |  9 +++
 .../font/gradient_picker/gradient_picker.xml  | 10 ++--
 .../static/tests/color_selector.test.js       | 56 +++++++++++++++++++
 .../src/core/color_picker/color_picker.js     |  6 +-
 .../static/tests/core/color_picker.test.js    | 56 ++++++++++++++++++-
 6 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/addons/html_editor/static/src/main/font/color_picker_gradient_tab.xml b/addons/html_editor/static/src/main/font/color_picker_gradient_tab.xml
index e49088e4d6add..149ade63a38ee 100644
--- a/addons/html_editor/static/src/main/font/color_picker_gradient_tab.xml
+++ b/addons/html_editor/static/src/main/font/color_picker_gradient_tab.xml
@@ -24,6 +24,8 @@
             setOnCloseCallback.bind="props.setOnCloseCallback"
             setOperationCallbacks.bind="props.setOperationCallbacks"
             selectedGradient="getCurrentGradientColor()"
+            onColorPointerOver.bind="props.onColorPointerOver"
+            onColorPointerOut.bind="props.onColorPointerOut"
             noTransparency="props.noTransparency"/>
     </div>
 </t>
diff --git a/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.js b/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.js
index 608dfc063ca21..291163b508325 100644
--- a/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.js
+++ b/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.js
@@ -17,6 +17,8 @@ export class GradientPicker extends Component {
         setOperationCallbacks: { type: Function, optional: true },
         selectedGradient: { type: String, optional: true },
         noTransparency: { type: Boolean, optional: true },
+        onColorPointerOver: { type: Function, optional: true },
+        onColorPointerOut: { type: Function, optional: true },
     };
 
     setup() {
@@ -127,6 +129,13 @@ export class GradientPicker extends Component {
         this.onColorGradientChange();
     }
 
+    getRadialGradient(size) {
+        const gradientColors = this.colors
+            .map((color) => `${color.hex} ${color.percentage}%`)
+            .join(", ");
+        return `radial-gradient(circle ${size} at ${this.positions.x}% ${this.positions.y}%, ${gradientColors})`;
+    }
+
     onColorPercentageChange(colorIndex, ev) {
         this.state.currentColorIndex = colorIndex;
         this.colors[colorIndex].percentage = ev.target.value;
diff --git a/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.xml b/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.xml
index b88bafc31a26a..bc3baa0eebc7d 100644
--- a/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.xml
+++ b/addons/html_editor/static/src/main/font/gradient_picker/gradient_picker.xml
@@ -34,8 +34,8 @@
             </div>
             <div t-else="" class="d-flex flex-column gap-1 mb-1">
                 Size
-                <div class="d-flex align-items-center justify-content-between">
-                    <button t-on-click="() => this.onSizeChange('closest-side')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'closest-side' ? `active` : ''}}" title="Extend to the closest side">
+                <div class="d-flex align-items-center justify-content-between" t-on-mouseover="props.onColorPointerOver" t-on-mouseout="props.onColorPointerOut">
+                    <button t-on-click="() => this.onSizeChange('closest-side')" t-att-data-color="getRadialGradient('closest-side')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'closest-side' ? `active` : ''}}" title="Extend to the closest side">
                         <svg xmlns="http://www.w3.org/2000/svg" width="45" height="45" viewBox="0 0 16 20" fill="none">
                             <rect x="1.5" y="3.5" width="13" height="13" stroke="#AAAAAD"></rect>
                             <path d="M3 4H9V8C9 8.55228 8.55228 9 8 9H4C3.44772 9 3 8.55228 3 8V4Z" fill="#8C8C92"></path>
@@ -44,7 +44,7 @@
                             <rect x="2" y="3" width="12" height="1" fill="white"></rect>
                         </svg>
                     </button>
-                    <button t-on-click="() => this.onSizeChange('closest-corner')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'closest-corner' ? `active` : ''}}" title="Extend to the closest corner">
+                    <button t-on-click="() => this.onSizeChange('closest-corner')" t-att-data-color="getRadialGradient('closest-corner')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'closest-corner' ? `active` : ''}}" title="Extend to the closest corner">
                         <svg xmlns="http://www.w3.org/2000/svg" width="45" height="45" viewBox="0 0 16 20" fill="none">
                             <rect x="1.5" y="3.5" width="13" height="13" stroke="#AAAAAD"></rect>
                             <path d="M2 4H9V7C9 9.20914 7.20914 11 5 11H2V4Z" fill="#8C8C92"></path>
@@ -54,7 +54,7 @@
                             <rect x="1" y="11" width="8" height="1" transform="rotate(-90 1 11)" fill="white"></rect>
                         </svg>
                     </button>
-                    <button t-on-click="() => this.onSizeChange('farthest-side')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'farthest-side' ? `active` : ''}}" title="Extend to the farthest side">
+                    <button t-on-click="() => this.onSizeChange('farthest-side')" t-att-data-color="getRadialGradient('farthest-side')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'farthest-side' ? `active` : ''}}" title="Extend to the farthest side">
                         <svg xmlns="http://www.w3.org/2000/svg" width="45" height="45" viewBox="0 0 16 20" fill="none">
                             <rect x="1.5" y="3.5" width="13" height="13" stroke="#AAAAAD"></rect>
                             <path d="M7 12C10.3137 12 14 10.2091 14 8C14 5.79086 10.3137 4 7 4C3.68629 4 2 5.79086 2 8C2 10.2091 3.68629 12 7 12Z" fill="#8C8C92"></path>
@@ -63,7 +63,7 @@
                             <rect x="14" y="4" width="1" height="12" fill="white"></rect>
                         </svg>
                     </button>
-                    <button t-on-click="() => this.onSizeChange('farthest-corner')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'farthest-corner' ? `active` : ''}}" title="Extend to the farthest corner">
+                    <button t-on-click="() => this.onSizeChange('farthest-corner')" t-att-data-color="getRadialGradient('farthest-corner')" t-attf-class="btn btn-light p-0 {{ this.state.size === 'farthest-corner' ? `active` : ''}}" title="Extend to the farthest corner">
                         <svg xmlns="http://www.w3.org/2000/svg" width="45" height="45" viewBox="0 0 16 20" fill="none">
                             <rect x="1.5" y="3.5" width="13" height="13" stroke="#AAAAAD"></rect>
                             <path d="M2 4H14V10C14 13.3137 11.3137 16 8 16H2V4Z" fill="#8C8C92"></path>
diff --git a/addons/html_editor/static/tests/color_selector.test.js b/addons/html_editor/static/tests/color_selector.test.js
index fec74fcfdcd01..53fd8fc6b62e3 100644
--- a/addons/html_editor/static/tests/color_selector.test.js
+++ b/addons/html_editor/static/tests/color_selector.test.js
@@ -616,6 +616,62 @@ test("should be able to select farthest-corner option in radial gradient", async
     expect("button[title='Extend to the farthest corner']").toHaveClass("active");
 });
 
+test.tags("desktop");
+test("should be able to show preview when hovering radial type button", async () => {
+    const gradientBefore = `radial-gradient(circle closest-side at 25% 25%, rgb(223, 124, 196) 0%, rgb(108, 53, 130) 100%)`;
+    const gradientAfter = `radial-gradient(circle farthest-side at 25% 25%, rgb(223, 124, 196) 0%, rgb(108, 53, 130) 100%)`;
+
+    const { el } = await setupEditor(
+        `<p>a<font style="background-image: ${gradientBefore};">[bcd]</font>e</p>`
+    );
+    await expandToolbar();
+    await click(".o-we-toolbar .o-select-color-background");
+    await animationFrame();
+    expect(".btn:contains('Gradient')").toHaveCount(1);
+    await click(".btn:contains('Gradient')");
+    await animationFrame();
+    await click("button[title='Define a custom gradient']");
+    await animationFrame();
+    expect("button:contains('Radial')").toHaveCount(1);
+    await click(".btn:contains('Radial')");
+    await animationFrame();
+    expect("button[title='Extend to the farthest corner']").toHaveCount(1);
+
+    const gradientButton = queryOne(".o_custom_gradient_button");
+
+    // Hover for preview
+    await hover("button[title='Extend to the farthest side']");
+    await animationFrame();
+    expect(gradientButton.style.backgroundImage).toBe(gradientAfter);
+    expect(getContent(el)).toBe(
+        `<p>a<font style="background-image: ${gradientAfter};">[bcd]</font>e</p>`
+    );
+    expect("button[title='Extend to the farthest side']").toHaveClass("active");
+
+    // Hover out
+    await hover(".o-we-toolbar .o-select-color-foreground");
+    await animationFrame();
+    expect(gradientButton.style.backgroundImage).toBe(gradientBefore);
+    expect(getContent(el)).toBe(
+        `<p>a<font style="background-image: ${gradientBefore};">[bcd]</font>e</p>`
+    );
+    expect("button[title='Extend to the farthest side']").not.toHaveClass("active");
+
+    // Hover again, click and hover out
+    await hover("button[title='Extend to the farthest side']");
+    await animationFrame();
+    await click("button[title='Extend to the farthest side']");
+    await animationFrame();
+    await hover(".o-we-toolbar .o-select-color-foreground");
+    await animationFrame();
+
+    expect(gradientButton.style.backgroundImage).toBe(gradientAfter);
+    expect(getContent(el)).toBe(
+        `<p>a<font style="background-image: ${gradientAfter};">[bcd]</font>e</p>`
+    );
+    expect("button[title='Extend to the farthest side']").toHaveClass("active");
+});
+
 test("solid tab color navigation using keys", async () => {
     const { el } = await setupEditor("<p>[test]</p>");
     await expandToolbar();
diff --git a/addons/web/static/src/core/color_picker/color_picker.js b/addons/web/static/src/core/color_picker/color_picker.js
index 57b0787e9d2a0..65cbee06792de 100644
--- a/addons/web/static/src/core/color_picker/color_picker.js
+++ b/addons/web/static/src/core/color_picker/color_picker.js
@@ -190,14 +190,16 @@ export class ColorPicker extends Component {
     }
 
     onColorHover(ev) {
-        if (!this.isColorButton(this.getTarget(ev))) {
+        const target = this.getTarget(ev);
+        if (!this.isColorButton(target) || target.contains(ev.relatedTarget)) {
             return;
         }
         this.onColorPreview(ev);
     }
 
     onColorHoverOut(ev) {
-        if (!this.isColorButton(this.getTarget(ev))) {
+        const target = this.getTarget(ev);
+        if (!this.isColorButton(target) || target.contains(ev.relatedTarget)) {
             return;
         }
         this.applyColorResetPreview();
diff --git a/addons/web/static/tests/core/color_picker.test.js b/addons/web/static/tests/core/color_picker.test.js
index 9537deae54fd2..50536c1cf0f64 100644
--- a/addons/web/static/tests/core/color_picker.test.js
+++ b/addons/web/static/tests/core/color_picker.test.js
@@ -1,5 +1,5 @@
 import { test, expect } from "@odoo/hoot";
-import { press, click, animationFrame, queryOne } from "@odoo/hoot-dom";
+import { press, click, animationFrame, queryOne, hover } from "@odoo/hoot-dom";
 import { Component, xml } from "@odoo/owl";
 import { defineStyle, mountWithCleanup } from "@web/../tests/web_test_helpers";
 import { ColorPicker, DEFAULT_COLORS } from "@web/core/color_picker/color_picker";
@@ -145,6 +145,60 @@ test("keyboard navigation", async () => {
     ).toBeFocused();
 });
 
+class AdditionalTab extends Component {
+    static template = xml`
+        <div class="container" t-on-mouseover="props.onColorPointerOver" t-on-mouseout="props.onColorPointerOut">
+            <button class="o_color_picker_button btn p-1 m-1" data-color="#FFFF00" style="background-color: #ffff00; width: auto">
+                <div>Hover me</div>
+            </button>
+        </div>
+    `;
+    static props = ["*"];
+}
+
+test.tags("desktop");
+test("should trigger color preview callbacks only once when hovering button having nested elements", async () => {
+    registry.category("color_picker_tabs").add("web.test", {
+        id: "test",
+        name: "Test",
+        component: AdditionalTab,
+    });
+    let pointerHoverCounter = 0;
+    let pointerOutCounter = 0;
+    await mountWithCleanup(ColorPicker, {
+        props: {
+            state: {
+                selectedColor: "#B5D6A5",
+                defaultTab: "test",
+            },
+            getUsedCustomColors: () => [],
+            applyColor() {},
+            applyColorPreview() {
+                pointerHoverCounter++;
+            },
+            applyColorResetPreview() {
+                pointerOutCounter++;
+            },
+            colorPrefix: "",
+            enabledTabs: ["solid", "custom", "test"],
+        },
+    });
+    expect(".o_font_color_selector").toHaveCount(1);
+    expect("button.test-tab").toHaveClass("active");
+
+    // Hover in
+    await hover("div.container");
+    await hover("button[data-color='#FFFF00']");
+    await hover("button[data-color='#FFFF00'] div");
+
+    // Hover out
+    await hover("button[data-color='#FFFF00']");
+    await hover("div.container");
+
+    expect(pointerHoverCounter).toBe(1);
+    expect(pointerOutCounter).toBe(1);
+});
+
 test("colorpicker inside the builder are linked to the builder theme colors", async () => {
     await mountWithCleanup(ColorPicker, {
         props: {

From 8adb2de51b3042ba3ff7ca1ae52df217cf4ea85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yagnik=20=E2=9C=97=20=28yagp=29?= <yagp@odoo.com>
Date: Mon, 4 Aug 2025 11:28:05 +0530
Subject: [PATCH 224/673] [IMP] website_mass_mailing: show all mailing lists in
 newsletter snippet

Previously, the newsletter snippet only displayed mailing lists marked with
'Show in Preferences'. This behavior was misleading, as that setting is meant
for user subscription management, not for restricting availability in the
snippet picker.

This commit removes the restrictive domain from the 'fetchMailingLists's orm
call to ensure all mailing lists are available when configuring the snippet.

This commit also ensure that if a list is non-public, it should not displayed
on 'my' mailing even if a user is subscribed to that mailing list.

Task-4979120

closes odoo/odoo#221909

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/mass_mailing/controllers/main.py                    | 3 ++-
 .../tests/tours/mailing_portal_unsubscribe_from_my.js      | 4 ++++
 addons/mass_mailing/tests/test_mailing_controllers.py      | 7 +++++++
 .../mailing_list_subscribe_option_plugin.js                | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 5653c182c4f52..9639623c8e0ce 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -236,8 +236,9 @@ def _prepare_mailing_subscription_values(self, mailing, document_id, email, hash
         # as there may be several contacts / email -> consider any opt-in overrides
         # opt-out
         contacts = self._fetch_contacts(email)
+        # private mailing lists are managed directly from received emails, with unsubscription links
         lists_optin = contacts.subscription_ids.filtered(
-            lambda sub: not sub.opt_out
+            lambda sub: not sub.opt_out and sub.list_id.is_public
         ).list_id.filtered('active')
         lists_optout = contacts.subscription_ids.filtered(
             lambda sub: sub.opt_out and sub.list_id not in lists_optin
diff --git a/addons/mass_mailing/static/tests/tours/mailing_portal_unsubscribe_from_my.js b/addons/mass_mailing/static/tests/tours/mailing_portal_unsubscribe_from_my.js
index 713d99d9ee916..4e41edd2a1bf2 100644
--- a/addons/mass_mailing/static/tests/tours/mailing_portal_unsubscribe_from_my.js
+++ b/addons/mass_mailing/static/tests/tours/mailing_portal_unsubscribe_from_my.js
@@ -34,6 +34,10 @@ registry.category("web_tour.tours").add("mailing_portal_unsubscribe_from_my", {
             content: "List5 is not proposed (not member and not public)",
             trigger: "body:not(:has(li.list-group-item:contains('List5')))",
         },
+        {
+            content: "List6 is not proposed (member and not public)",
+            trigger: "body:not(:has(li.list-group-item:contains('List6')))",
+        },
         {
             trigger: "div#o_mailing_portal_subscription:not(fieldset)",
         },
diff --git a/addons/mass_mailing/tests/test_mailing_controllers.py b/addons/mass_mailing/tests/test_mailing_controllers.py
index ac00f64c45abc..2707d950db079 100644
--- a/addons/mass_mailing/tests/test_mailing_controllers.py
+++ b/addons/mass_mailing/tests/test_mailing_controllers.py
@@ -496,6 +496,13 @@ def test_mailing_unsubscribe_from_my(self):
         })
         private_list.subscription_ids[0].opt_out = True
 
+        # non-public list should not be displayed even if user is subscribed
+        self.env['mailing.list'].create({
+            'contact_ids': [(0, 0, {'name': 'Déboulonneur User', 'email': 'fleurus@example.com'})],
+            'name': 'List6',
+            'is_public': False,
+        })
+
         # launch 'my' mailing' tour
         self.authenticate(portal_user.login, portal_user.login)
         with freeze_time(self._reference_now):
diff --git a/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js b/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js
index b2af932ce73d6..ef78b83ed6155 100644
--- a/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js
+++ b/addons/website_mass_mailing/static/src/website_builder/mailing_list_subscribe_option_plugin.js
@@ -73,7 +73,7 @@ class MailingListSubscribeOptionPlugin extends Plugin {
             const response = await this.services.orm.call(
                 "mailing.list",
                 "name_search",
-                ["", [["is_public", "=", true]]],
+                [],
                 { context }
             );
             this.mailingLists = [];

From 9d97f7b58dbc0b8554a8aa6a8684c2fea38bb648 Mon Sep 17 00:00:00 2001
From: JF Aubert <ajf@odoo.com>
Date: Tue, 4 Nov 2025 13:58:46 +0000
Subject: [PATCH 225/673] [FIX] mrp: fix postinventory of lot producing mo's

For 'By Lots' manufactured products, producing more than requested gives
the error "You need to supply a Lot/Serial Number for product...".

This occurs from within _post_inventory operations:
- update the finished move line with only the producing quantity
- create a new finished move line with the exceeding quantity & lot
- raise the warning under action_done because one move line has no lot

By inverting the updates ( setting the lot before setting the quantity )
we ensure the lot is correctly propagated.

closes odoo/odoo#234449

Task: 5232544
X-original-commit: 05cf01235d64f00132eea3477ef908ef64258dfe
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
Signed-off-by: Jean-Francois Aubert (ajf) <ajf@odoo.com>
---
 addons/mrp/models/mrp_production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 5aa9e71520369..e198db36a9a69 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -1822,9 +1822,9 @@ def _post_inventory(self, cancel_backorder=False):
             finish_moves = order.move_finished_ids.filtered(lambda m: m.product_id == order.product_id and m.state not in ('done', 'cancel'))
             # the finish move can already be completed by the workorder.
             for move in finish_moves:
-                move.quantity = order.product_uom_id.round(order.qty_producing - order.qty_produced, rounding_method='HALF-UP')
                 if move.has_tracking != 'none' and not move.lot_ids:
                     move.lot_ids = order.lot_producing_ids.ids
+                move.quantity = order.product_uom_id.round(order.qty_producing - order.qty_produced, rounding_method='HALF-UP')
                 extra_vals = order._prepare_finished_extra_vals()
                 if extra_vals:
                     move.move_line_ids.write(extra_vals)

From ef8a1df9500b6528637e2f2da196e9b404b5887b Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Mon, 3 Nov 2025 15:55:42 +0000
Subject: [PATCH 226/673] [FIX] mail: fix list badge rotting color
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Purpose
=======
Fix the rotting variant of the badge selection field in list views
which should properly support the color field option.

Specification
=============
The 'ListBadgeSelectionRotting' widget was inheriting from the
'BadgeSelectionField' which doesn't support any color in badges.
It should inherit from the list variant of the badge selection field
called 'ListBadgeSelectionField' which supports the color field option.

Task-5186979

closes odoo/odoo#234393

X-original-commit: d501e28388d16aa35429bc635fd360f88b4bb6a0
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Amélie Dieudonné (amdi) <amdi@odoo.com>
---
 .../mail/static/src/js/rotting_mixin/rotting_widget.js | 10 +++++-----
 .../static/src/js/rotting_mixin/rotting_widget.xml     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/rotting_mixin/rotting_widget.js b/addons/mail/static/src/js/rotting_mixin/rotting_widget.js
index 7349af966d3c9..aa0d01e7e704e 100644
--- a/addons/mail/static/src/js/rotting_mixin/rotting_widget.js
+++ b/addons/mail/static/src/js/rotting_mixin/rotting_widget.js
@@ -2,9 +2,9 @@ import { Component } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 import {
-    badgeSelectionField,
-    BadgeSelectionField,
-} from "@web/views/fields/badge_selection/badge_selection_field";
+    listBadgeSelectionField,
+    ListBadgeSelectionField,
+} from "@web/views/fields/badge_selection/list_badge_selection_field";
 import { standardFieldProps } from "@web/views/fields/standard_field_props";
 
 export function getRottingDaysTitle(modelName, rotDays) {
@@ -46,7 +46,7 @@ export class KanbanRottingField extends Component {
     }
 }
 
-export class ListBadgeSelectionRotting extends BadgeSelectionField {
+export class ListBadgeSelectionRotting extends ListBadgeSelectionField {
     static template = "mail.ListBadgeSelectionRotting";
     setup() {
         super.setup();
@@ -62,6 +62,6 @@ registry.category("fields").add("kanban.rotting", {
 });
 
 registry.category("fields").add("list.badge_rotting", {
-    ...badgeSelectionField,
+    ...listBadgeSelectionField,
     component: ListBadgeSelectionRotting,
 });
diff --git a/addons/mail/static/src/js/rotting_mixin/rotting_widget.xml b/addons/mail/static/src/js/rotting_mixin/rotting_widget.xml
index 26ddbdd6c52de..ad25129f9578d 100644
--- a/addons/mail/static/src/js/rotting_mixin/rotting_widget.xml
+++ b/addons/mail/static/src/js/rotting_mixin/rotting_widget.xml
@@ -7,7 +7,7 @@
         </div>
     </t>
 
-    <t t-name="mail.ListBadgeSelectionRotting" t-inherit="web.BadgeSelectionField" t-inherit-mode="primary">
+    <t t-name="mail.ListBadgeSelectionRotting" t-inherit="web.ListBadgeSelectionField" t-inherit-mode="primary">
         <t t-else="" position="after">
             <span class="badge rounded-pill o_mail_resource_rotting_bg ms-2" t-if="props.record.data.is_rotting">
                 <t t-out="dayCount"/>

From bb529d436e85dbd529ac598ce8c301296d3f6e08 Mon Sep 17 00:00:00 2001
From: bhna-odoo <bhna@odoo.com>
Date: Tue, 7 Oct 2025 13:05:47 +0000
Subject: [PATCH 227/673] [FIX] hr_recruitment_skills: changed fallback value
 for matching score

- The [PR] added a fallback value for matching score as `100`, whereas in the
  versions `saas-18.4` and before... we had the fallback value as `0` [source].

- Therefore, to maintain consistency this commit changes the fallback value for
  `matching_score` to 0.

- Also added a testcase for the same.

[PR]: https://github.com/odoo/odoo/pull/230323

[source]: https://github.com/odoo/odoo/blob/d13ea53ef64d0281387ad0daf66c90163dded63b/addons/hr_recruitment_skills/models/hr_applicant.py#L47-L51

closes odoo/odoo#234355

X-original-commit: d8bbb9139589730f715964c694f6b0f19cb34800
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
Signed-off-by: Bhavya Ashesh Nanavati (bhna) <bhna@odoo.com>
---
 addons/hr_recruitment_skills/models/hr_applicant.py       | 2 +-
 .../hr_recruitment_skills/tests/test_applicant_skills.py  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment_skills/models/hr_applicant.py b/addons/hr_recruitment_skills/models/hr_applicant.py
index 14852c293d677..236ffedff570a 100644
--- a/addons/hr_recruitment_skills/models/hr_applicant.py
+++ b/addons/hr_recruitment_skills/models/hr_applicant.py
@@ -69,7 +69,7 @@ def _compute_matching_skill_ids(self):
 
             matching_skill_ids = matching_applicant_skills.mapped("skill_id")
             missing_skill_ids = job_skills.mapped("skill_id") - matching_applicant_skills.mapped("skill_id")
-            matching_score = round(applicant_total / job_total * 100) if job_total else 100
+            matching_score = round(applicant_total / job_total * 100) if job_total else 0
 
             applicant.matching_skill_ids = matching_skill_ids
             applicant.missing_skill_ids = missing_skill_ids
diff --git a/addons/hr_recruitment_skills/tests/test_applicant_skills.py b/addons/hr_recruitment_skills/tests/test_applicant_skills.py
index 93116e4e2e223..249d8c2b7a56b 100644
--- a/addons/hr_recruitment_skills/tests/test_applicant_skills.py
+++ b/addons/hr_recruitment_skills/tests/test_applicant_skills.py
@@ -494,3 +494,11 @@ def test_duplicate_certifications_in_the_past_are_not_created(self):
         )
         self.assertEqual(len(self.t_applicant.applicant_skill_ids), 6)
         self.assertEqual(len(self.t_applicant.current_applicant_skill_ids), 4)
+
+    def test_job_with_no_skills_and_degree_with_score_zero(self):
+        self.t_job.expected_degree = self.env["hr.recruitment.degree"].create({
+            "name": "Degree",
+            "score": 0,
+        })
+
+        self.assertEqual(self.t_applicant.matching_score, 0)

From d651427317ff1a955da8497ae04dc37586e63407 Mon Sep 17 00:00:00 2001
From: Tina <liti@odoo.com>
Date: Fri, 17 Oct 2025 00:21:20 +0000
Subject: [PATCH 228/673] [FIX] mail: Detect only email when checking for loop

When detecting loops with _detect_loop_sender if the count of
these messages exceeds the LOOP_THRESHOLD, the next email from
that user is blocked, even if the number of new emails alone
hasn't yet crossed the threshold due to mail messages that
are not email triggering the loop detection. This happens
because it searches for messages in the mail.message model
that share the same model name and author irrespective of
the message type. To correct this, the function's search
criteria must be modified to explicitly filter for messages
where the message_type is set to 'email'.

opw-5122962

closes odoo/odoo#234451

X-original-commit: fcf80a2d71984caca230082d769ac7e01c5e3471
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/mail/models/mail_thread.py           | 2 +-
 addons/test_mail/tests/test_mail_gateway.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 796c5e8b61df7..9d63bcfa5c469 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1064,7 +1064,7 @@ def _detect_loop_sender(self, message, message_dict, routes):
 
             # search messages linked to email -> alias updating records
             if doc_ids and not loop_new:
-                base_msg_domain = Domain([('model', '=', model._name), ('res_id', 'in', doc_ids), ('create_date', '>=', create_date_limit)])
+                base_msg_domain = Domain([('model', '=', model._name), ('res_id', 'in', doc_ids), ('create_date', '>=', create_date_limit), ('message_type', '=', 'email')])
                 if author_id:
                     msg_domain = Domain('author_id', '=', author_id) & base_msg_domain
                 else:
diff --git a/addons/test_mail/tests/test_mail_gateway.py b/addons/test_mail/tests/test_mail_gateway.py
index 6047f785f2153..885e22831710d 100644
--- a/addons/test_mail/tests/test_mail_gateway.py
+++ b/addons/test_mail/tests/test_mail_gateway.py
@@ -2125,6 +2125,7 @@ def test_routing_loop_alias_mix(self):
                 'author_id': self.other_partner.id,
                 'model': test_updates[0]._name,
                 'res_id': test_updates[0].id,
+                'message_type': 'email'
             } for x in range(4)  # 4 + 1 posted before = 5 aka threshold
         ])
         with self.mock_mail_gateway():

From 63a3e9501a74918539382846b3a58c4bb56ce544 Mon Sep 17 00:00:00 2001
From: Julia Elizondo <jue@adhoc.com.ar>
Date: Tue, 27 May 2025 13:34:31 -0300
Subject: [PATCH 229/673] [IMP] l10n_ar: show report amounts in negative for
 special refund invoices.

There are special document types, as 'SALES ACCOUNTS AND LIQUID PRODUCT' (AFIP code 60/61),  were credit notes does not exist in reality because rectification invoices are made by creating a negative invoice directly. In Odoo, we use credit notes for this cases but that leads to some confusion. This is because both invoice and credit note uses the same code (60 for the example) and the reports looks the same. To fix this, I modified the credit note report so it shows the amounts in negative.
This use case is the same for the following document type codes: 99, 186, 188, 189, 60.

closes odoo/odoo#212153

Signed-off-by: Laurent Smet (las) <las@odoo.com>
---
 addons/l10n_ar/models/account_move.py      | 36 ++++++++++++++++-
 addons/l10n_ar/models/account_move_line.py | 11 +++++-
 addons/l10n_ar/tests/test_manual.py        | 45 ++++++++++++++++++++++
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_ar/models/account_move.py b/addons/l10n_ar/models/account_move.py
index 57f6abfc204d7..05dce6de3d28f 100644
--- a/addons/l10n_ar/models/account_move.py
+++ b/addons/l10n_ar/models/account_move.py
@@ -113,6 +113,12 @@ def _get_l10n_ar_codes_used_for_inv_and_ref(self):
         document 61 could not be used as refunds. """
         return ['99', '186', '188', '189', '60']
 
+    def _l10n_ar_is_refund_invoice(self):
+        """ This method is used to check if the document type is in the list of document types that can be used as
+        an invoice and refund and if the move type is 'in_refund' or 'out_refund'. """
+        return self.l10n_latam_document_type_id.code in self._get_l10n_ar_codes_used_for_inv_and_ref() \
+            and self.move_type in ['in_refund', 'out_refund']
+
     def _get_l10n_latam_documents_domain(self):
         self.ensure_one()
         domain = super()._get_l10n_latam_documents_domain()
@@ -360,10 +366,35 @@ def _get_name_invoice_report(self):
             return 'l10n_ar.report_invoice_document'
         return super()._get_name_invoice_report()
 
+    def _apply_refund_adjustments(self, tax_totals):
+        """Helper method to adjust tax totals for refund invoices that share the same AFIP codes as the invoice
+        it is reversing."""
+        for suffix in ('', '_currency'):
+            for prefix in ('base', 'tax', 'total'):
+                field = f'{prefix}_amount{suffix}'
+                if tax_totals[field]:
+                    tax_totals[field] *= -1
+            for subtotal in tax_totals['subtotals']:
+                for prefix in ('base', 'tax'):
+                    field = f'{prefix}_amount{suffix}'
+                    if subtotal[field]:
+                        subtotal[field] *= -1
+                for tax_group in subtotal['tax_groups']:
+                    for prefix in ('display_base', 'base', 'tax'):
+                        field = f'{prefix}_amount{suffix}'
+                        if tax_group[field]:
+                            tax_group[field] *= -1
+
     def _l10n_ar_get_invoice_totals_for_report(self):
-        """If the invoice document type indicates that vat should not be detailed in the printed report (result of _l10n_ar_include_vat()) then we overwrite tax_totals field so that includes taxes in the total amount, otherwise it would be showing amount_untaxed in the amount_total"""
+        """If the invoice document type indicates that vat should not be detailed in the printed report (result of
+        _l10n_ar_include_vat()) then we overwrite tax_totals field so that includes taxes in the total amount, otherwise
+         it would be showing amount_untaxed in the amount_total.
+         Also, if the invoice is a refund and share the same ARCA code as the invoice it is reversing, we apply
+         adjustments to the tax totals to reflect the amounts in negative."""
         self.ensure_one()
         tax_totals = self.tax_totals
+        if self._l10n_ar_is_refund_invoice():
+            self._apply_refund_adjustments(tax_totals)
         include_vat = self._l10n_ar_include_vat()
         if not include_vat:
             return tax_totals
@@ -380,7 +411,10 @@ def _l10n_ar_get_invoice_totals_for_report(self):
                 or self._l10n_ar_is_tax_group_vat(tax_group)
             )).ids
         if tax_group_ids_to_exclude:
+            if self._l10n_ar_is_refund_invoice():
+                self._apply_refund_adjustments(tax_totals)
             tax_totals = self.env['account.tax']._exclude_tax_groups_from_tax_totals_summary(tax_totals, tax_group_ids_to_exclude)
+
         return tax_totals
 
     def _l10n_ar_get_invoice_custom_tax_summary_for_report(self):
diff --git a/addons/l10n_ar/models/account_move_line.py b/addons/l10n_ar/models/account_move_line.py
index 7cba5818b356d..0a1a02dee2f9c 100644
--- a/addons/l10n_ar/models/account_move_line.py
+++ b/addons/l10n_ar/models/account_move_line.py
@@ -12,6 +12,7 @@ def _l10n_ar_prices_and_taxes(self):
 
         AccountTax = self.env['account.tax']
         base_line = invoice._prepare_product_base_line_for_taxes_computation(self)
+
         if include_vat:
             base_line['tax_ids'] = self.tax_ids.filtered('tax_group_id.l10n_ar_vat_afip_code')
         AccountTax._add_tax_details_in_base_line(base_line, self.company_id, rounding_method='round_globally')
@@ -20,6 +21,7 @@ def _l10n_ar_prices_and_taxes(self):
         discount = base_line['discount']
         price_unit = base_line['price_unit']
         quantity = base_line['quantity']
+
         if include_vat:
             raw_total = tax_details['raw_total_included_currency']
         else:
@@ -30,13 +32,18 @@ def _l10n_ar_prices_and_taxes(self):
         else:
             price_subtotal_before_discount = raw_total / (1 - discount / 100.0)
 
+        # Calculate sign multiplier for refund invoices
+        sign = -1 if invoice._l10n_ar_is_refund_invoice() else 1
+
         if quantity:
-            price_unit = price_subtotal_before_discount / quantity
-            price_net = raw_total / quantity
+            price_unit = (price_subtotal_before_discount / quantity) * sign
+            price_net = (raw_total / quantity) * sign
         else:
             price_unit = 0.0
             price_net = 0.0
 
+        raw_total *= sign
+
         return {
             'price_unit': price_unit,
             'price_subtotal': invoice.currency_id.round(raw_total),
diff --git a/addons/l10n_ar/tests/test_manual.py b/addons/l10n_ar/tests/test_manual.py
index 676e712cdef22..999449ed5f97e 100644
--- a/addons/l10n_ar/tests/test_manual.py
+++ b/addons/l10n_ar/tests/test_manual.py
@@ -357,3 +357,48 @@ def test_l10n_ar_vat_with_non_numeric_value(self):
                 partner_form.l10n_latam_identification_type_id = self.env.ref("l10n_ar.it_dni")
                 partner_form.vat = "test"
         self.assertIn('Only numbers allowed for "DNI"', str(e.exception))
+
+    def test_l10n_ar_get_invoice_totals_for_report_refund_with_same_code(self):
+        """Test _l10n_ar_get_invoice_totals_for_report for refund invoices with ARCA codes that can be used for both invoice and refund"""
+        # Create a credit note with document type 60 that can be used as both invoice and refund
+        doc_60_lp_a = self.env.ref('l10n_ar.dc_a_cvl')
+
+        credit_note = self._create_invoice_from_dict({
+            'ref': 'test_credit_note_refund: Credit note with document type 60 for refund test',
+            "move_type": 'out_refund',
+            "partner_id": self.res_partner_adhoc,
+            "company_id": self.company_ri,
+            "invoice_date": "2021-03-20",
+            "invoice_line_ids": [
+                {'product_id': self.product_iva_21, 'price_unit': 100.0, 'quantity': 1,
+                 'tax_ids': [Command.set([self.tax_21.id])]},
+            ],
+        })
+        credit_note.l10n_latam_document_type_id = doc_60_lp_a
+
+        # Verify this is considered a refund invoice with special ARCA code
+        self.assertTrue(credit_note._l10n_ar_is_refund_invoice())
+
+        # Test the _l10n_ar_get_invoice_totals_for_report method
+        self._assert_tax_totals_summary(credit_note._l10n_ar_get_invoice_totals_for_report(), {
+            'same_tax_base': True,
+            'currency_id': self.currency.id,
+            'base_amount_currency': -100.0,
+            'tax_amount_currency': -21.0,
+            'total_amount_currency': -121.0,
+            'subtotals': [
+                {
+                    'name': "Untaxed Amount",
+                    'base_amount_currency': -100.0,
+                    'tax_amount_currency': -21.0,
+                    'tax_groups': [
+                        {
+                            'id': self.tax_21.tax_group_id.id,
+                            'base_amount_currency': -100.0,
+                            'tax_amount_currency': -21.0,
+                            'display_base_amount_currency': -100.0,
+                        },
+                    ],
+                },
+            ],
+        })

From 5df957f84eac9fe0629d5f711719e793eddfebb4 Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Wed, 5 Nov 2025 10:39:07 +0100
Subject: [PATCH 230/673] [FIX] iot_drivers: ensure ramdisks.service script
 path

As `addons/iot_box_image` has been moved to `setup/iot_box_builder`
we now create symlinks to ensure an image where `ramdisks.service`
is pointing to `setup` can still reach the script if it is findable
at the old path.

closes odoo/odoo#234497

Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 addons/iot_drivers/tools/upgrade.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/iot_drivers/tools/upgrade.py b/addons/iot_drivers/tools/upgrade.py
index 55a8ac6a3e72b..c7217c2dcb648 100644
--- a/addons/iot_drivers/tools/upgrade.py
+++ b/addons/iot_drivers/tools/upgrade.py
@@ -162,20 +162,21 @@ def update_packages():
 def misc_migration_updates():
     """Run miscellaneous updates after the code update."""
     _logger.warning("Running version migration updates")
-    if path_file('odoo', 'addons', 'point_of_sale').exists():
-        # TODO: remove this when v18.0 is deprecated (point_of_sale/tools/posbox/ -> iot_box_image/)
-        ramdisks_service = "/root_bypass_ramdisks/etc/systemd/system/ramdisks.service"
-        subprocess.run(
-            ['sudo', 'sed', '-i', 's|iot_box_image|point_of_sale/tools/posbox|g', ramdisks_service], check=False
-        )
-
-        # TODO: Remove this code when v16 is deprecated
-        with open('/home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/odoo.conf', 'r+', encoding='utf-8') as f:
-            if "server_wide_modules" not in f.read():
-                f.write("server_wide_modules=hw_drivers,hw_posbox_homepage,web\n")
 
     if path_file('odoo', 'addons', 'hw_drivers').exists():
         # TODO: remove this when v18.4 is deprecated (hw_drivers/,hw_posbox_homepage/ -> iot_drivers/)
         subprocess.run(
             ['sed', '-i', 's|iot_drivers|hw_drivers,hw_posbox_homepage|g', '/home/pi/odoo.conf'], check=False
         )
+
+    # if ramdisk.service points to `setup/iot_box_builder`, we symlink it to
+    # `iot_box_image` or `point_of_sale/tools/posbox` instead
+    iot_box_builder_path = path_file('odoo', 'setup', 'iot_box_builder')
+    iot_box_image_path = path_file('odoo', 'addons', 'iot_box_image', 'configuration')
+    point_of_sale_path = path_file('odoo', 'addons', 'point_of_sale', 'tools', 'posbox', 'configuration')
+    iot_box_builder_path.mkdir(parents=True, exist_ok=True)
+    iot_box_builder_path /= "configuration"
+    if iot_box_image_path.exists():  # images <= v19.1
+        iot_box_builder_path.symlink_to(iot_box_image_path)
+    elif point_of_sale_path.exists():  # images before <=v18.0
+        iot_box_builder_path.symlink_to(point_of_sale_path)

From 1496e2810af90ae15173fcca2f044c0aaba05c10 Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Thu, 30 Oct 2025 09:36:01 +0100
Subject: [PATCH 231/673] [IMP] iot_drivers: logger on service startup

We previously added a logger on IoT Box service startup
to simplify logs reading.

We updated this logger from `warning` to `info`, to avoid
runbot tests failing.

odoo/enterprise#96760

closes odoo/odoo#233728

Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 addons/iot_drivers/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/iot_drivers/__init__.py b/addons/iot_drivers/__init__.py
index 4f7c76b030b2e..a44cf82342cdc 100644
--- a/addons/iot_drivers/__init__.py
+++ b/addons/iot_drivers/__init__.py
@@ -18,7 +18,7 @@
 from . import webrtc_client
 
 _logger = logging.getLogger(__name__)
-_logger.warning("==== Starting Odoo ====")
+_logger.info("==== Starting Odoo IoT Box service ====")
 
 _get = requests.get
 _post = requests.post

From 02751c7742e7e66e6cd95a98b3111695e81f403b Mon Sep 17 00:00:00 2001
From: hapt-odoo <hapt@odoo.com>
Date: Wed, 6 Aug 2025 18:16:28 +0530
Subject: [PATCH 232/673] [IMP] stock*: show responsible user avatar and
 availability

 *stock_picking_batch

With this commit:
----------------------------------
- Improved the Request a Count form in physical inventory by showing the avatar
  of the selected responsible user, enabling quicker visual identification.
- Applied the same status widget to the Batch/Wave Transfer views, allowing
  users to easily identify employees during transfer and delivery operations.
- These enhancements streamline the assignment process, enabling faster and
  more informed selection of responsible users.

Task Id: 4746426

closes odoo/odoo#223172

Signed-off-by: William Henrotin (whe) <whe@odoo.com>
---
 addons/stock/wizard/stock_request_count.xml                    | 2 +-
 addons/stock_picking_batch/views/stock_picking_batch_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_request_count.xml b/addons/stock/wizard/stock_request_count.xml
index 450cfc0258173..d58b6e273dadf 100644
--- a/addons/stock/wizard/stock_request_count.xml
+++ b/addons/stock/wizard/stock_request_count.xml
@@ -8,7 +8,7 @@
             <form>
                 <group>
                     <field name="quant_ids" invisible="1"/>
-                    <field name="user_id" placeholder="Anyone"/>
+                    <field name="user_id" placeholder="Anyone" widget="many2one_avatar_user"/>
                     <field name="inventory_date"/>
                     <field name="show_expected_quantity"/>
                 </group>
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 9e3f74bb9d033..9066052ff1dda 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -135,7 +135,7 @@
                     </div>
                     <group>
                         <group id="batch_delivery_data">
-                            <field name="user_id" readonly="state not in ['draft', 'in_progress']"/>
+                            <field name="user_id" widget="many2one_avatar_user" readonly="state not in ['draft', 'in_progress']"/>
                             <field name="picking_type_id" readonly="state != 'draft'"/>
                             <field name="scheduled_date" readonly="state in ['cancel', 'done']"/>
                             <field name="description"/>

From 1ae7393f8b472ff1cbeeaaf87f937b367e925670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 5 Nov 2025 11:20:06 +0100
Subject: [PATCH 233/673] [FIX] mail: add 100ms ticks for contains 3 seconds
 timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, contains had 3 seconds timeout to make a final
runOnce.

Some tests could be longer than necessary due to:
- change not observed by DOM mutation, e.g. `:focus` in selector
- some selectors are sometimes not properly observed by mutation
somehow, like discuss badges.

This commit adds 100ms ticks to re-check selector, and the 3 seconds
timeout now happens with calling the ticks 30 times.

closes odoo/odoo#234508

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/tests/mail_test_helpers_contains.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/tests/mail_test_helpers_contains.js b/addons/mail/static/tests/mail_test_helpers_contains.js
index 3947f7bb12d82..b45492c262e9b 100644
--- a/addons/mail/static/tests/mail_test_helpers_contains.js
+++ b/addons/mail/static/tests/mail_test_helpers_contains.js
@@ -532,6 +532,7 @@ afterEach(() => (hasUsedContainsPositively = false));
  * @property {boolean} [visible] if provided, the found element(s) must be (in)visible
  */
 class Contains {
+    timeoutCount = 0;
     /**
      * @param {string} selector
      * @param {ContainsOptions} [options={}]
@@ -599,6 +600,18 @@ class Contains {
         this.executeError = undefined;
     }
 
+    setTickTimeout() {
+        this.timer = setTimeout(() => {
+            this.timeoutCount++;
+            const res = this.runOnce(`Timeout of ${this.timeoutCount * 0.1} seconds`, {
+                crashOnFail: this.timeoutCount > 29,
+            });
+            if (!res) {
+                this.setTickTimeout();
+            }
+        }, 100);
+    }
+
     /**
      * Starts this contains check, either immediately resolving if there is a
      * match, or registering appropriate listeners and waiting until there is a
@@ -617,10 +630,7 @@ class Contains {
         this.onFocus = () => this.runOnce("after focus");
         this.onScroll = () => this.runOnce("after scroll");
         if (!this.runOnce("immediately")) {
-            this.timer = setTimeout(
-                () => this.runOnce("Timeout of 3 seconds", { crashOnFail: true }),
-                3000
-            );
+            this.setTickTimeout();
             this.observer = new MutationObserver((mutations) => {
                 try {
                     this.runOnce("after mutations");

From d5ca2dc98ee983948f53867a17f8ce8d70cfad2a Mon Sep 17 00:00:00 2001
From: "Adrien Guilliams (adgu)" <adgu@odoo.com>
Date: Tue, 21 Oct 2025 08:37:28 +0200
Subject: [PATCH 234/673] [IMP] pos*: convert orderlines to combo in one click

pos*: point_of_sale, pos_restaurant, pos_loyalty

This commit introduces a way to convert orderlines into combo fast.
The pos will automatically propose the possible combo and the user will
just have to click to convert the lines to a combo. There is also a
button to break the combo into orderlines if the users mistakenly
grouped the lines.

This commit also adds a new field to the product.combo model. This field
is 'is_upsell' and allow to tell that the combo can be proposed
as an upsell. It means that, if this combo is in a product.template
and that, in the cart of the user, there is all the combo_items except
the one from the combo which is an upsell, the pos will automatically
propose to convert the lines to the combo to the user.

closes odoo/odoo#232649

Task-id: 5180846
Related: odoo/enterprise#97952
Related: odoo/upgrade#8725
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 addons/point_of_sale/models/product_combo.py  |  16 +-
 .../chose_combo_popup/chose_combo_popup.js    |  98 +++++
 .../chose_combo_popup/chose_combo_popup.xml   |  27 ++
 .../combo_configurator_popup.js               | 124 ++++--
 .../combo_configurator_popup.xml              |  11 +-
 .../components/product_card/product_card.scss |   2 +-
 .../components/product_card/product_card.xml  |   2 +-
 .../static/src/app/models/pos_order.js        |  10 +-
 .../static/src/app/models/pos_order_line.js   |   7 +
 .../src/app/models/utils/order_change.js      |   7 +-
 .../control_buttons/control_buttons.js        |   5 +
 .../control_buttons/control_buttons.xml       |   3 +
 .../order_summary/order_summary.js            |  92 ++++-
 .../order_summary/order_summary.xml           |  10 +-
 .../static/src/app/services/pos_store.js      | 384 ++++++++++++++++--
 .../static/tests/pos/tours/pos_combo_tour.js  |  59 +++
 .../pos/tours/utils/chose_combo_popup_util.js |  27 ++
 .../pos/tours/utils/product_screen_util.js    |  42 ++
 .../popup/chose_combo_popup.test.js           | 135 ++++++
 .../tests/unit/data/product_combo.data.js     |  55 ++-
 .../unit/data/product_combo_item.data.js      |  48 +++
 .../tests/unit/data/product_product.data.js   |  26 +-
 .../tests/unit/data/product_template.data.js  |  68 ++++
 .../tests/unit/services/pos_service.test.js   |   2 +-
 addons/point_of_sale/tests/test_frontend.py   | 204 ++++++++++
 .../views/product_combo_views.xml             |   5 +-
 .../order_summary/order_summary.xml           |   2 +-
 .../order_summary/order_summary.js            |   2 +-
 .../static/src/app/services/pos_store.js      |  16 -
 .../static/tests/unit/pages/cart_page.test.js |   2 +-
 .../pos_self_order/static/tests/unit/utils.js |   2 +-
 31 files changed, 1394 insertions(+), 99 deletions(-)
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.js
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.xml
 create mode 100644 addons/point_of_sale/static/tests/pos/tours/utils/chose_combo_popup_util.js
 create mode 100644 addons/point_of_sale/static/tests/unit/components/popup/chose_combo_popup.test.js

diff --git a/addons/point_of_sale/models/product_combo.py b/addons/point_of_sale/models/product_combo.py
index 38ae66cf8375f..fd5bfc27caabd 100644
--- a/addons/point_of_sale/models/product_combo.py
+++ b/addons/point_of_sale/models/product_combo.py
@@ -10,6 +10,7 @@ class ProductCombo(models.Model):
 
     qty_max = fields.Integer(string="Maximum quantity", default=1, help="Maximum number of items to select in the combo.")
     qty_free = fields.Integer(string="Free quantity", default=1, help="Number of free items included in the combo.")
+    is_upsell = fields.Boolean(string="Is Upsell", default=False, help="Indicates if the combo is an upsell to the customer. This can be compared to a minimum quantity of 0.")
 
     @api.model
     def _load_pos_data_domain(self, data, config):
@@ -17,7 +18,14 @@ def _load_pos_data_domain(self, data, config):
 
     @api.model
     def _load_pos_data_fields(self, config):
-        return ['id', 'name', 'combo_item_ids', 'base_price', 'qty_free', 'qty_max']
+        return ['id', 'name', 'combo_item_ids', 'base_price', 'qty_free', 'qty_max', 'is_upsell', 'sequence']
+
+    @api.onchange('is_upsell')
+    def _onchange_is_upsell(self):
+        if self.is_upsell:
+            self.qty_free = 0
+        if not self.is_upsell and self.qty_free == 0:
+            self.qty_free = 1
 
     @api.constrains('qty_max')
     def _check_qty_max(self):
@@ -26,8 +34,10 @@ def _check_qty_max(self):
 
     @api.constrains('qty_free')
     def _check_qty_free(self):
-        if any(combo.qty_free < 0 for combo in self):
-            raise ValidationError(_("The free quantity of a combo must be greater or equal to 0."))
+        if any(combo.qty_free < 1 and not combo.is_upsell for combo in self):
+            raise ValidationError(_("The free quantity of a combo must be greater or equal to 1."))
+        if any(combo.is_upsell and combo.qty_free != 0 for combo in self):
+            raise ValidationError(_("The free quantity of an upsell combo must be equal to 0."))
 
     @api.constrains('qty_max', 'qty_free')
     def _check_qty_max_greater_than_qty_free(self):
diff --git a/addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.js b/addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.js
new file mode 100644
index 0000000000000..4e699fd19a0b7
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.js
@@ -0,0 +1,98 @@
+import { Dialog } from "@web/core/dialog/dialog";
+import { Component } from "@odoo/owl";
+import { usePos } from "@point_of_sale/app/hooks/pos_hook";
+import { useService } from "@web/core/utils/hooks";
+
+export class ChoseComboPopup extends Component {
+    static template = "point_of_sale.ChoseComboPopup";
+    static components = { Dialog };
+    static props = {
+        potentialCombos: Object,
+        close: Function,
+        getPayload: Function,
+    };
+
+    setup() {
+        super.setup();
+        this.pos = usePos();
+        this.ui = useService("ui");
+    }
+
+    getLines(combo) {
+        const comboItems = {};
+        for (const [comboId, comboChoice] of Object.entries(combo)) {
+            const comboProduct = this.pos.models["product.combo"].get(comboId);
+            const maxQty = comboProduct.qty_max;
+            const totalChosenQty = Object.values(comboChoice).reduce(
+                (sum, line) => (line === true ? sum : sum + line.qty),
+                0
+            );
+            for (const line of Object.values(comboChoice)) {
+                if (line === true) {
+                    // Upsell option
+                    if (totalChosenQty < maxQty) {
+                        // If the upsell option is already full, we do not show it as upsell
+                        comboItems[comboProduct.name] = {
+                            quantity: comboProduct.qty_max - totalChosenQty,
+                            upsell: true,
+                            sequence: comboProduct.sequence,
+                            id: comboProduct.id,
+                        };
+                    }
+                    continue;
+                }
+                if (!comboItems[line.combo_item.product_id.display_name]) {
+                    comboItems[line.combo_item.product_id.display_name] = {
+                        quantity: 0,
+                        upsell: false,
+                        sequence: comboProduct.sequence,
+                        id: comboProduct.id,
+                    };
+                }
+                comboItems[line.combo_item.product_id.display_name].quantity += line.qty;
+            }
+        }
+        return Object.entries(comboItems)
+            .map(([name, { quantity, upsell, sequence, id }]) => ({
+                name,
+                quantity,
+                upsell,
+                sequence,
+                id,
+            }))
+            .sort((a, b) => {
+                if (a.upsell !== b.upsell) {
+                    return a.upsell ? 1 : -1;
+                }
+                if (a.sequence !== b.sequence) {
+                    return a.sequence - b.sequence;
+                }
+                return a.id - b.id;
+            });
+    }
+
+    get allCombos() {
+        const applicableCombos = this.props.potentialCombos.applicable;
+        for (const combo of applicableCombos) {
+            combo.lines = this.getLines(combo.combinations[0]);
+        }
+        const upsellCombos = this.props.potentialCombos.upsell;
+        for (const combo of upsellCombos) {
+            combo.upsell = true;
+            combo.lines = this.getLines(combo.combinations[0]);
+        }
+        return [...applicableCombos, ...upsellCombos];
+    }
+
+    get contentClass() {
+        if (this.ui.isSmall) {
+            return "";
+        }
+        return "mh-75";
+    }
+
+    confirm(combo) {
+        this.props.getPayload(combo);
+        this.props.close();
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.xml b/addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.xml
new file mode 100644
index 0000000000000..bf78b3e9fd204
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/chose_combo_popup/chose_combo_popup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="point_of_sale.ChoseComboPopup">
+        <Dialog footer="false" size="'md'" contentClass="this.contentClass" bodyClass="'d-flex flex-column gap-2 p-3 chose-combo-popup'">
+            <t t-set-slot="header">
+                <span class="section-title fs-3">Chose a combo to apply</span>
+                <button type="button" class="btn-close" aria-label="Close" tabindex="-1" t-on-click="props.close"/>
+            </t>
+            <div class="flex-fill d-flex flex-column overflow-y-auto gap-2 combo-list">
+                <div class="d-flex justify-content-between p-3 combo-item" t-att-class="{'border-top': combo_index > 0}" t-foreach="this.allCombos" t-as="combo" t-key="combo_index">
+                    <div>
+                        <span class="fs-3" t-esc="combo.productTmpl.display_name"/>
+                        <ul class="mb-0 ps-3">
+                            <li t-foreach="combo.lines" t-as="line" t-key="line_index" t-att-class="{'text-info': line.upsell}">
+                                - <t t-if="!line.upsell"><span t-esc="line.quantity"/> x </t><span t-esc="line.name"/><t t-if="line.upsell"> (up to <span t-esc="line.quantity"/> more)</t>
+                            </li>
+                        </ul>
+                    </div>
+                    <button class="apply-combo-btn button btn btn-primary btn-lg align-self-start" t-on-click="() => this.confirm(combo)">
+                        <t t-if="combo.upsell">Choose</t>
+                        <t t-else="">Apply</t>
+                    </button>
+                </div>
+            </div>
+        </Dialog>
+    </t>
+</templates>
diff --git a/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.js b/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.js
index d034112631778..90072e748dc65 100644
--- a/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.js
+++ b/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.js
@@ -1,5 +1,5 @@
 import { Dialog } from "@web/core/dialog/dialog";
-import { Component, useState, onMounted } from "@odoo/owl";
+import { Component, useState, onWillStart } from "@odoo/owl";
 import { usePos } from "@point_of_sale/app/hooks/pos_hook";
 import { ProductCard } from "@point_of_sale/app/components/product_card/product_card";
 import { QuantityButtons } from "@point_of_sale/app/components/buttons/quantity_buttons/quantity_buttons";
@@ -12,44 +12,63 @@ export class ComboConfiguratorPopup extends Component {
         productTemplate: Object,
         getPayload: Function,
         close: Function,
+        title: { type: String, optional: true },
         line: { type: Object, optional: true },
+        values: { type: Object, optional: true },
     };
 
     setup() {
         this.pos = usePos();
         this.ui = useService("ui");
 
-        const selected = this.props.line?.getAllLinesInCombo()?.reduce((acc, value) => {
-            if (!value.combo_item_id) {
-                return acc;
-            }
+        let combo = {};
+        let selected = undefined;
+        let configuration = {};
 
-            acc[value.combo_item_id.id] = 1 + (acc[value.combo_item_id.id] || 0);
-            return acc;
-        }, {});
+        // We either have this.props.line (editing an existing combo line)
+        // or this.props.values (configuring a new combo to add from pre chosen values)
+        // or neither (new combo from scratch)
+        if (this.props.line) {
+            combo = { ...this.props.line?.selectedComboIds };
+            selected = this.props.line?.getAllLinesInCombo()?.reduce((acc, value) => {
+                if (!value.combo_item_id) {
+                    return acc;
+                }
 
-        this.state = useState({
-            combo: { ...this.props.line?.selectedComboIds } || {},
-            configuration:
-                this.props.line?.getAllLinesInCombo().reduce((acc, line) => {
-                    if (!line.combo_item_id) {
+                acc[value.combo_item_id.id] = 1 + (acc[value.combo_item_id.id] || 0);
+                return acc;
+            }, {});
+            configuration = this.props.line?.getAllLinesInCombo().reduce((acc, line) => {
+                if (!line.combo_item_id) {
+                    return acc;
+                }
+
+                acc[line.combo_item_id.id] = {
+                    attribute_value_ids: line.attribute_value_ids.map((a) => a.id),
+                    price_extra: line.extra_price,
+                    attribute_custom_values: line.custom_attribute_value_ids.reduce((acc, val) => {
+                        acc[val.custom_product_template_attribute_value_id.id] = val.custom_value;
                         return acc;
+                    }, {}),
+                };
+                return acc;
+            }, {});
+        } else if (this.props.values) {
+            selected = Object.values(this.props.values).reduce((acc, value) => {
+                for (const [key, val] of Object.entries(value)) {
+                    if (key === "upsell") {
+                        continue;
                     }
+                    acc[val.combo_item.id] = (acc[val.combo_item.id] || 0) + val.qty;
+                }
+                return acc;
+            }, {});
+            configuration = this.configurationFromValues;
+        }
 
-                    acc[line.combo_item_id.id] = {
-                        attribute_value_ids: line.attribute_value_ids.map((a) => a.id),
-                        price_extra: line.extra_price,
-                        attribute_custom_values: line.custom_attribute_value_ids.reduce(
-                            (acc, val) => {
-                                acc[val.custom_product_template_attribute_value_id.id] =
-                                    val.custom_value;
-                                return acc;
-                            },
-                            {}
-                        ),
-                    };
-                    return acc;
-                }, {}) || {},
+        this.state = useState({
+            combo,
+            configuration,
             qty: Object.fromEntries(
                 this.props.productTemplate.combo_ids.map((combo) => [
                     combo.id,
@@ -63,14 +82,53 @@ export class ComboConfiguratorPopup extends Component {
             ),
         });
 
-        onMounted(() => {
+        onWillStart(() => {
             this.autoSelectSingleChoices();
-            if (!this.hasMultipleChoices()) {
+            if (!this.hasMultipleChoices() || this.autoConfirmApplicableCombo) {
                 this.confirm();
             }
         });
     }
 
+    get title() {
+        if (this.props.title) {
+            return this.props.title;
+        }
+        return this.props.productTemplate.display_name;
+    }
+
+    get configurationFromValues() {
+        const values = this.props.values;
+        const conf = {};
+        for (const comboId in values) {
+            for (const lineUuid in values[comboId]) {
+                if (lineUuid === "upsell") {
+                    continue;
+                }
+                const line = this.pos.models["pos.order.line"].getBy("uuid", lineUuid);
+                conf[values[comboId][lineUuid].combo_item.id] = {
+                    attribute_value_ids: line.attribute_value_ids.map((a) => a.id),
+                    attribute_custom_values: Object.fromEntries(
+                        line.custom_attribute_value_ids.map((c) => [
+                            c.custom_product_template_attribute_value_id.id,
+                            c.custom_value,
+                        ])
+                    ),
+                    price_extra: line.price_extra,
+                };
+            }
+        }
+        return conf;
+    }
+
+    get autoConfirmApplicableCombo() {
+        return (
+            this.props.values &&
+            this.isConfirmButtonEnabled() &&
+            !Object.values(this.props.values).some((acc) => Object.keys(acc).includes("upsell"))
+        );
+    }
+
     shouldShowCombo(combo) {
         const items = combo.combo_item_ids;
         return items.length > 1 || combo.qty_max > 1 || items[0]?.product_id?.isConfigurable();
@@ -99,9 +157,11 @@ export class ComboConfiguratorPopup extends Component {
     }
 
     formattedComboPrice(comboItem) {
-        return this.pos.currency.isZero(comboItem.extra_price)
-            ? ""
-            : this.env.utils.formatCurrency(comboItem.extra_price);
+        if (this.pos.currency.isZero(comboItem.extra_price)) {
+            return "";
+        }
+        const priceSign = comboItem.extra_price > 0 ? "+" : "-";
+        return priceSign + " " + this.env.utils.formatCurrency(comboItem.extra_price);
     }
 
     getSelectedComboItems() {
diff --git a/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.xml b/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.xml
index 91ad1a1cbb18e..4caae8350dab7 100644
--- a/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.xml
+++ b/addons/point_of_sale/static/src/app/components/popups/combo_configurator_popup/combo_configurator_popup.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="point_of_sale.ComboConfiguratorPopup">
-        <Dialog t-if="this.hasMultipleChoices()" title="props.productTemplate.display_name" contentClass="'combo-configurator-popup'">
+        <Dialog t-if="this.hasMultipleChoices()" title="this.title" contentClass="'combo-configurator-popup'">
             <div t-foreach="props.productTemplate.combo_ids" t-as="combo" t-key="combo.id" class="d-flex flex-column m-3 mb-4">
                 <div class="d-flex align-items-center mb-3">
                     <h3 class="mb-0" t-esc="combo.name"></h3>
                     <t t-if="combo.qty_free > 0">
                         <h5 class="text-muted ms-2 mb-0">
                             <t t-esc="this.getSelectedComboItemsText(combo)"/>
-                            <span class="fst-italic"> free</span>
+                            <span class="fst-italic"> included</span>
+                        </h5>
+                    </t>
+                    <t t-else="">
+                        <h5 class="text-muted ms-2 mb-0">
+                            <span class="fst-italic">As from <t t-esc="env.utils.formatCurrency(combo.base_price)"/></span>
                         </h5>
                     </t>
                 </div>
@@ -16,7 +21,7 @@
                     <div t-foreach="combo.combo_item_ids" t-as="combo_item" t-key="combo_item.id" t-if="combo_item.product_id">
                         <t t-set="product" t-value="combo_item.product_id"/>
                         <label class="combo-item h-100 w-100 rounded cursor-pointer transition-base"
-                            t-att-class="{ 'selected': state.qty[combo.id][combo_item.id] and combo.qty_max == 1 }"
+                            t-att-class="{ 'selected': state.qty[combo.id][combo_item.id] }"
                             t-attf-for="combo-{{combo.id}}-combo_item-{{combo_item.id}}">
                             <ProductCard name="product.display_name"
                                 class="'flex-column h-100 border'"
diff --git a/addons/point_of_sale/static/src/app/components/product_card/product_card.scss b/addons/point_of_sale/static/src/app/components/product_card/product_card.scss
index 9b63d497383ee..03a9dc0b57c9f 100644
--- a/addons/point_of_sale/static/src/app/components/product_card/product_card.scss
+++ b/addons/point_of_sale/static/src/app/components/product_card/product_card.scss
@@ -45,7 +45,7 @@
     }
 
     > .qty {
-        min-width: 2.5rem;
+        min-width: 1.5rem;
     }
 }
 
diff --git a/addons/point_of_sale/static/src/app/components/product_card/product_card.xml b/addons/point_of_sale/static/src/app/components/product_card/product_card.xml
index 4444d53dde8b1..14d8b45e49bba 100644
--- a/addons/point_of_sale/static/src/app/components/product_card/product_card.xml
+++ b/addons/point_of_sale/static/src/app/components/product_card/product_card.xml
@@ -25,7 +25,7 @@
                     class="product-cart-qty position-absolute bottom-0 end-0 m-1 px-2 rounded bg-black text-white fs-5 fw-bolder"
                     t-att-class="{'text-danger': this.productQty lt 0}"/>
             </div>
-            <span t-if="props.comboExtraPrice" style="font-size: 0.75rem;" class="price-extra px-2 py-0 rounded-pill text-bg-info position-absolute top-0 end-0 mt-1 me-1">
+            <span t-if="props.comboExtraPrice" style="font-size: 0.75rem;" class="price-extra px-2 py-0 rounded-1 text-bg-info position-absolute top-0 end-0 mt-1 me-1">
                 <t t-esc="props.comboExtraPrice"/>
             </span>
             <t t-slot="quantityButtons" />
diff --git a/addons/point_of_sale/static/src/app/models/pos_order.js b/addons/point_of_sale/static/src/app/models/pos_order.js
index 0b9a62092a619..1b4ce6079181f 100644
--- a/addons/point_of_sale/static/src/app/models/pos_order.js
+++ b/addons/point_of_sale/static/src/app/models/pos_order.js
@@ -382,8 +382,14 @@ export class PosOrder extends PosOrderAccounting {
      * @param {Orderline} line
      * @returns {boolean} true if the line was removed, false otherwise
      */
-    removeOrderline(line) {
-        const linesToRemove = line.getAllLinesInCombo();
+    removeOrderline(line, deep = true) {
+        let linesToRemove = [];
+        if (deep) {
+            linesToRemove = line.getAllLinesInCombo();
+        } else {
+            linesToRemove = [line];
+        }
+
         for (const lineToRemove of linesToRemove) {
             if (lineToRemove.refunded_orderline_id?.uuid in this.uiState.lineToRefund) {
                 delete this.uiState.lineToRefund[lineToRemove.refunded_orderline_id.uuid];
diff --git a/addons/point_of_sale/static/src/app/models/pos_order_line.js b/addons/point_of_sale/static/src/app/models/pos_order_line.js
index 51430f28441e1..fbb8490212430 100644
--- a/addons/point_of_sale/static/src/app/models/pos_order_line.js
+++ b/addons/point_of_sale/static/src/app/models/pos_order_line.js
@@ -446,6 +446,13 @@ export class PosOrderline extends PosOrderlineAccounting {
         return Boolean(this.combo_parent_id || this.combo_line_ids?.length);
     }
 
+    get parentLine() {
+        if (this.combo_parent_id) {
+            return this.combo_parent_id.parentLine;
+        }
+        return this;
+    }
+
     get packLotLines() {
         return this.pack_lot_ids.map(
             (l) =>
diff --git a/addons/point_of_sale/static/src/app/models/utils/order_change.js b/addons/point_of_sale/static/src/app/models/utils/order_change.js
index 13bf363cda10a..6eb06c751fc93 100644
--- a/addons/point_of_sale/static/src/app/models/utils/order_change.js
+++ b/addons/point_of_sale/static/src/app/models/utils/order_change.js
@@ -117,12 +117,15 @@ export const getOrderChanges = (order, orderPreparationCategories) => {
         const productCategoryIds = baseProduct.parentPosCategIds.filter((id) =>
             prepaCategoryIds.has(id)
         );
+        const quantity = orderline.getQuantity();
 
-        if (productCategoryIds.length > 0) {
+        if (
+            productCategoryIds.length > 0 &&
+            order.last_order_preparation_change[lineKey]?.ignoreQty !== quantity
+        ) {
             const key = Object.keys(order.last_order_preparation_change.lines).find((k) =>
                 k.startsWith(orderline.uuid)
             ); // find old data but note changed
-            const quantity = orderline.getQuantity();
 
             const relatedKey = key !== lineKey ? key : lineKey; // if note update key would be different
             const quantityDiff =
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.js b/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.js
index c67748953af59..76e8bbf6c721b 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.js
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.js
@@ -146,6 +146,11 @@ export class ControlButtons extends Component {
                 .includes(selectedOrderLine.product_id.product_tmpl_id.id)
         );
     }
+
+    breakSelectedCombo() {
+        const selectedOrderline = this.currentOrder?.getSelectedOrderline();
+        return this.pos.isSelectedLineCombo && this.pos.breakCombo(selectedOrderline.parentLine);
+    }
 }
 
 export class ControlButtonsPopup extends Component {
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.xml b/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.xml
index f4cc4ea17aaa2..a704d111afc0f 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.xml
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/control_buttons/control_buttons.xml
@@ -44,6 +44,9 @@
                 <button t-if="this.displayProductInfoBtn()" t-att-class="buttonClass" t-on-click="() => this.pos.onProductInfoClick(currentOrder.getSelectedOrderline().product_id.product_tmpl_id, currentOrder.getSelectedOrderline().product_id)">
                     <i class="fa fa-info-circle me-1" role="img" aria-label="Product Info" title="Product Info" /> Info
                 </button>
+                <button t-if="this.pos.isSelectedLineCombo" class="break-combo-button" t-att-class="buttonClass" t-on-click="() => this.breakSelectedCombo()">
+                    <i class="fa fa-outdent" role="img" aria-label="Break combo" title="Brean combo" /> Break combo
+                </button>
                 <button t-if="this.pos.cashier._role != 'minimal'" t-att-class="buttonClass" t-on-click="() => this.pos.onDeleteOrder(this.pos.getOrder())">
                     <i class="fa fa-trash me-1" role="img" /> Cancel Order 
                 </button>
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js b/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js
index d1fff9314b0ad..9df8966c5df59 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.js
@@ -1,5 +1,5 @@
 import { usePos } from "@point_of_sale/app/hooks/pos_hook";
-import { Component } from "@odoo/owl";
+import { Component, useEffect, useState } from "@odoo/owl";
 import { Orderline } from "@point_of_sale/app/components/orderline/orderline";
 import { useService } from "@web/core/utils/hooks";
 import { AlertDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
@@ -8,6 +8,7 @@ import { makeAwaitable } from "@point_of_sale/app/utils/make_awaitable_dialog";
 import { NumberPopup } from "@point_of_sale/app/components/popups/number_popup/number_popup";
 import { parseFloat } from "@web/views/fields/parsers";
 import { OrderDisplay } from "@point_of_sale/app/components/order_display/order_display";
+import { ChoseComboPopup } from "@point_of_sale/app/components/popups/chose_combo_popup/chose_combo_popup";
 
 export class OrderSummary extends Component {
     static template = "point_of_sale.OrderSummary";
@@ -22,11 +23,29 @@ export class OrderSummary extends Component {
         this.numberBuffer = useService("number_buffer");
         this.dialog = useService("dialog");
         this.pos = usePos();
+        this.state = useState({
+            potentialCombos: [],
+        });
 
         this.numberBuffer.use({
             triggerAtInput: (...args) => this.updateSelectedOrderline(...args),
             useWithBarcode: true,
         });
+
+        this.updatePotentialCombos();
+
+        useEffect(
+            () => {
+                // We update the potential combos when the order changes
+                // or the quantity of the items changes.
+                this.updatePotentialCombos();
+            },
+            () => [this.currentOrder.totalQuantity, this.currentOrder.id]
+        );
+    }
+
+    updatePotentialCombos() {
+        this.state.potentialCombos = this.pos.getApplicableProductCombo("limited");
     }
 
     get currentOrder() {
@@ -351,4 +370,75 @@ export class OrderSummary extends Component {
         }
         return newLine;
     }
+    get isComboApplicable() {
+        return this.state.potentialCombos.length > 0;
+    }
+    getSortedBestPotentialCombos() {
+        const bestCombos = {
+            applicable: [],
+            upsell: [],
+        };
+        this.pos.getApplicableProductCombo("combinations").forEach((applicable) => {
+            applicable.comboPrice = applicable.productTmpl.getPrice(
+                this.currentOrder.pricelist_id,
+                applicable.combinationsQty
+            );
+            applicable.numberOfUpsell = Object.values(applicable.combinations[0]).reduce(
+                (acc, combo) => {
+                    if (combo.upsell) {
+                        return acc + 1;
+                    }
+                    return acc;
+                },
+                0
+            );
+            if (applicable.numberOfUpsell > 0) {
+                bestCombos.upsell.push(applicable);
+            } else {
+                bestCombos.applicable.push(applicable);
+            }
+        });
+        bestCombos.applicable.sort((a, b) => b.comboPrice - a.comboPrice);
+        bestCombos.upsell.sort((a, b) => {
+            if (a.numberOfUpsell === b.numberOfUpsell) {
+                return b.comboPrice - a.comboPrice;
+            }
+            return a.numberOfUpsell - b.numberOfUpsell;
+        });
+        return bestCombos;
+    }
+    get bestComboName() {
+        let name = `
+            ${this.state.potentialCombos[0].quantity} ${this.state.potentialCombos[0].productTmpl.display_name}`;
+        if (this.state.potentialCombos.length > 1) {
+            name += " + Others";
+        }
+        return name;
+    }
+    async applyBestCombo(keepOpen = false) {
+        let comboToApply = false;
+        const bestPotentialCombos = this.getSortedBestPotentialCombos();
+        if (
+            bestPotentialCombos.upsell.length + bestPotentialCombos.applicable.length >
+            (keepOpen ? 0 : 1)
+        ) {
+            comboToApply = await makeAwaitable(this.dialog, ChoseComboPopup, {
+                potentialCombos: bestPotentialCombos,
+            });
+        } else if (bestPotentialCombos.applicable.length == 1) {
+            comboToApply = bestPotentialCombos.applicable[0];
+        } else if (bestPotentialCombos.upsell.length == 1) {
+            comboToApply = bestPotentialCombos.upsell[0];
+        }
+        if (comboToApply) {
+            // Apply combo
+            comboToApply = this.pos.getApplicableProductCombo("full", comboToApply.productTmpl);
+            await this.pos.createComboFromLines(
+                comboToApply[0].productTmpl,
+                comboToApply[0].combinations
+            );
+            // If more combo applicable left, keep popup opened
+            await this.applyBestCombo(true);
+        }
+    }
 }
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.xml b/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.xml
index 1f3faa0532436..e8992ee97fea8 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.xml
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/order_summary/order_summary.xml
@@ -13,7 +13,15 @@
 						t-attf-title="{{ line.hasValidProductLot() ? 'Valid product lot' : 'Invalid product lot'}}" />
 				</t>
 			</Orderline>
-			<t t-set-slot="details" />
+			<t t-set-slot="details">
+				<div t-if="isComboApplicable" class="combo-proposition d-flex justify-content-between align-items-center p-2 pb-0 ms-1">
+					<t t-esc="bestComboName"/>
+					<button class="button btn btn-primary" t-on-click="() => this.applyBestCombo()">
+						<t t-if="this.state.potentialCombos.length > 1">Choose</t>
+						<t t-else="">Apply</t>
+					</button>
+				</div>
+			</t>
 		</OrderDisplay>
     </t>
 </templates>
diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index 271a743818991..bf9b217f74f8b 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -455,6 +455,7 @@ export class PosStore extends WithLazyGetterTrap {
         const productIds = new Set();
         const productTmplIds = new Set();
         const productByTmplId = {};
+        const productCombos = [];
 
         for (const product of this.models["product.product"].getAll()) {
             if (product.product_template_variant_value_ids.length > 0) {
@@ -467,8 +468,13 @@ export class PosStore extends WithLazyGetterTrap {
 
                 productByTmplId[product.raw.product_tmpl_id].push(product);
             }
+            if (product.product_tmpl_id?.type === "combo") {
+                productCombos.push(product);
+            }
         }
 
+        this.productCombos = productCombos;
+
         if (productIds.size > 0) {
             try {
                 await this.data.searchRead("product.product", [
@@ -822,7 +828,7 @@ export class PosStore extends WithLazyGetterTrap {
             return;
         }
 
-        keepGoing = await this.handleComboProduct(values, order, configure);
+        keepGoing = await this.handleComboProduct(values, order, configure, opts);
         if (keepGoing === false) {
             return;
         }
@@ -992,32 +998,8 @@ export class PosStore extends WithLazyGetterTrap {
     // It will return the combo prices and the selected products
     // ---
     // This actions cannot be handled inside pos_order.js or pos_order_line.js
-    async handleComboProduct(values, order, configure = true, { line } = {}) {
-        if (values.product_tmpl_id.isCombo() && configure) {
-            const payload =
-                values?.payload && Object.keys(values?.payload).length
-                    ? values.payload
-                    : await makeAwaitable(this.dialog, ComboConfiguratorPopup, {
-                          productTemplate: values.product_tmpl_id,
-                          line: line,
-                      });
-
-            if (!payload) {
-                return false;
-            }
-
-            // Product template of combo should not have more than 1 variant.
-            const [childLineConf, comboExtraLines] = payload;
-            const comboPrices = computeComboItems(
-                values.product_tmpl_id.product_variant_ids[0],
-                childLineConf,
-                order.pricelist_id,
-                this.data.models["decimal.precision"].getAll(),
-                this.data.models["product.template.attribute.value"].getAllBy("id"),
-                comboExtraLines,
-                this.currency
-            );
-
+    async handleComboProduct(values, order, configure = true, opts = {}) {
+        const compleValue = (comboPrices) => {
             values.combo_line_ids = comboPrices.map((comboItem) => [
                 "create",
                 {
@@ -1047,6 +1029,35 @@ export class PosStore extends WithLazyGetterTrap {
                     ]),
                 },
             ]);
+        };
+        if (values.product_tmpl_id.isCombo() && configure) {
+            const payload =
+                values?.payload && Object.keys(values?.payload).length
+                    ? values.payload
+                    : await makeAwaitable(this.dialog, ComboConfiguratorPopup, {
+                          productTemplate: values.product_tmpl_id,
+                          line: opts.line,
+                      });
+
+            if (!payload) {
+                return false;
+            }
+
+            // Product template of combo should not have more than 1 variant.
+            const [childLineConf, comboExtraLines] = payload;
+            const comboPrices = computeComboItems(
+                values.product_tmpl_id.product_variant_ids[0],
+                childLineConf,
+                order.pricelist_id,
+                this.data.models["decimal.precision"].getAll(),
+                this.data.models["product.template.attribute.value"].getAllBy("id"),
+                comboExtraLines,
+                this.currency
+            );
+
+            compleValue(comboPrices);
+        } else if (!configure && opts.comboOpts) {
+            compleValue(opts.comboOpts);
         }
 
         return true;
@@ -1116,7 +1127,7 @@ export class PosStore extends WithLazyGetterTrap {
             } else {
                 return false;
             }
-        } else if (values.product_id.product_template_variant_value_ids.length > 0) {
+        } else if (values.product_id?.product_template_variant_value_ids.length > 0) {
             // Verify price extra of variant products
             const priceExtra = values.product_id.product_template_variant_value_ids
                 .filter((attr) => attr.attribute_id.create_variant !== "always")
@@ -2660,6 +2671,323 @@ export class PosStore extends WithLazyGetterTrap {
         });
         await validation.validateOrder(false);
     }
+
+    handlePreparationHistory(srcPrep, destPrep, srcLine, destLine, qty) {
+        const srcKey = srcLine.preparationKey;
+        const destKey = destLine.preparationKey;
+        const srcQty = srcPrep[srcKey]?.quantity;
+
+        if (srcQty) {
+            if (srcQty <= qty) {
+                const newPrep = { ...srcPrep[srcKey], uuid: destLine.uuid };
+                destPrep[destKey] = newPrep;
+                delete srcPrep[srcKey];
+            } else {
+                srcPrep[srcKey].quantity = srcQty - qty;
+                destPrep[destKey] = { ...srcPrep[srcKey], uuid: destLine.uuid, quantity: qty };
+            }
+        }
+    }
+
+    get isSelectedLineCombo() {
+        const selectedOrderline = this.selectedOrder.getSelectedOrderline();
+        return selectedOrderline && selectedOrderline.isPartOfCombo();
+    }
+
+    /**
+     * This method is called in three different contexts.
+     *
+     * 1. Each time `order_summary` is rendered, this method is called in “limited” mode to
+     *    determine whether it is possible to create combos with the order lines.
+     *
+     * 2. When you click on “apply combos,” a popup opens if there are several possibilities, this
+     *    time in “combinations” mode.
+     *
+     * 3. When choosing a combo in the popup, this method is called in “full” mode to get all
+     *    possible combinations.
+     *
+     * Limited mode: this mode returns when more than one combo possibility is
+     * found.
+     *
+     * Combination mode: this mode returns 1 combination for each possible combo. It limits the computation time
+     * while giving all information needed for the popup.
+     *
+     * Full mode: returns all possibilities; this mode is more complex, hence the limited mode for
+     * rendering.
+     *
+     * @param {string} mode: limited | full | combinaison
+     * @param {ProductTemplate} productTmpl: ProductTmpl
+     */
+    getApplicableProductCombo(mode = "limited", productTmpl = null) {
+        const matchingCombos = [];
+        const productInOrder = this.selectedOrder.lines.reduce((acc, line) => {
+            if (line.isPartOfCombo()) {
+                return acc;
+            }
+            const pid = line.product_id.id;
+
+            if (!acc[pid]) {
+                acc[pid] = {
+                    lines: {},
+                    totalQty: 0,
+                };
+            }
+
+            acc[pid].lines[line.uuid] = line.qty;
+            acc[pid].totalQty += line.qty;
+            return acc;
+        }, {});
+        const combos = this.models["product.combo"].getAll();
+        const comboItems = combos.flatMap((combo) => combo.combo_item_ids);
+        const totalQtyAvailable = comboItems.reduce((acc, item) => {
+            const productId = item.product_id.id;
+            if (productInOrder[productId]) {
+                acc[item.combo_id.id] =
+                    (acc[item.combo_id.id] || 0) + productInOrder[productId].totalQty;
+            }
+            return acc;
+        }, {});
+
+        const productTmplsToCheck =
+            mode === "full" && productTmpl
+                ? [productTmpl]
+                : this.productCombos.sort(
+                      (a, b) => a.product_tmpl_id.list_price - b.product_tmpl_id.list_price
+                  );
+
+        for (const comboProduct of productTmplsToCheck) {
+            const combos = comboProduct.combo_ids;
+            const quantityTaken = {};
+            let comboQty = Infinity;
+            let hasUpsell = false;
+
+            for (const combo of combos) {
+                if (combo.is_upsell) {
+                    hasUpsell = true;
+                    continue;
+                }
+                const comboId = combo.id;
+                const minQty = combo.qty_free;
+                quantityTaken[comboId] = {};
+
+                if ((totalQtyAvailable[comboId] || 0) < minQty) {
+                    // Not enough to satisfy qty_free for this combo group
+                    comboQty = 0;
+                    break;
+                }
+                comboQty = Math.min(totalQtyAvailable[comboId] / minQty, comboQty);
+            }
+
+            if (comboQty === 0 || comboQty == Infinity) {
+                // The combo product is either composed of only upsell combo choices (Infinity)
+                // or cannot be completed with current order lines (0).
+                // We do not propose it as applicable or upsell
+                continue;
+            }
+
+            if (mode === "limited") {
+                // In limited mode, we only want the useful information for the UI
+                // We thus want to know if there is a applicable combo or not,
+                // If yes, we want to know if there could be several combos
+                // and the quantity of the first applicable combo
+                matchingCombos.push({
+                    productTmpl: comboProduct,
+                    quantity: comboQty,
+                    hasUpsell,
+                });
+                if (matchingCombos.length > 1) {
+                    break;
+                }
+                continue;
+            }
+
+            const availableQty = JSON.parse(JSON.stringify(productInOrder));
+            const combinations = [];
+
+            let qtyToCheck = Math.min(comboQty, 20); // For performance reasons, we only do 20 combos at a time
+            if (mode === "combinations") {
+                // In combinations mode, we only want to get the first combinations to display to the user
+                qtyToCheck = Math.min(qtyToCheck, 1);
+            }
+
+            for (let i = 0; i < qtyToCheck; i++) {
+                const quantityTaken = {};
+                for (const combo of combos) {
+                    const comboId = combo.id;
+                    let qtyNeeded = Math.min(
+                        Math.ceil(totalQtyAvailable[comboId] / comboQty),
+                        combo.qty_max
+                    );
+                    quantityTaken[comboId] = {};
+
+                    for (const item of combo.combo_item_ids) {
+                        const productId = item.product_id.id;
+                        if (!availableQty[productId]) {
+                            continue;
+                        }
+                        for (const [lUuid, qty] of Object.entries(availableQty[productId].lines)) {
+                            if (qtyNeeded === 0) {
+                                break;
+                            }
+                            const takeQty = Math.min(qty, qtyNeeded);
+                            quantityTaken[comboId][lUuid] = {
+                                qty: takeQty,
+                                combo_item: item,
+                            };
+                            availableQty[productId].lines[lUuid] -= takeQty;
+                            qtyNeeded -= takeQty;
+                        }
+                    }
+                    if (combo.is_upsell) {
+                        quantityTaken[comboId].upsell = true;
+                    }
+                }
+                combinations.push(quantityTaken);
+            }
+
+            matchingCombos.push({
+                productTmpl: comboProduct,
+                combinations,
+                combinationsQty: comboQty,
+            });
+        }
+        return matchingCombos;
+    }
+    async createComboFromLines(productTmpl, combinations) {
+        const concernedLinesQty = {};
+        combinations.forEach((items) => {
+            for (const combo of Object.values(items)) {
+                for (const uuid of Object.keys(combo)) {
+                    const line = this.selectedOrder.lines.find((l) => l.uuid === uuid);
+                    if (!line) {
+                        continue;
+                    }
+                    concernedLinesQty[uuid] = line.qty;
+                }
+            }
+        });
+        let comboLine = null;
+        for (const [index, items] of combinations.entries()) {
+            const props = {
+                productTemplate: productTmpl,
+                values: items,
+            };
+            if (combinations.length > 1) {
+                props.title = productTmpl.display_name + ` ${index + 1}/${combinations.length}`;
+            }
+            const payload = await makeAwaitable(this.dialog, ComboConfiguratorPopup, props);
+            if (!payload) {
+                break;
+            }
+
+            const comboPrices = computeComboItems(
+                productTmpl.product_variant_ids[0],
+                payload[0],
+                this.selectedOrder.pricelist_id,
+                this.data.models["decimal.precision"].getAll(),
+                this.data.models["product.template.attribute.value"].getAllBy("id"),
+                payload[1],
+                this.currency
+            );
+
+            comboLine = await this.addLineToCurrentOrder(
+                { product_tmpl_id: productTmpl },
+                { comboOpts: comboPrices },
+                false
+            );
+
+            const linkOldNewLines = {};
+            comboLine.combo_line_ids.forEach((cl) => {
+                linkOldNewLines[cl.uuid] = 0;
+            });
+
+            const oldLines = this.selectedOrder.lines.filter((l) =>
+                Object.keys(concernedLinesQty).includes(l.uuid)
+            );
+
+            for (const oldLine of oldLines) {
+                const possibleLinkedComboLines = this.findComboLinesByOldLine(oldLine, comboLine);
+                for (const link of possibleLinkedComboLines) {
+                    if (linkOldNewLines[link.uuid] >= link.qty) {
+                        continue;
+                    }
+                    if (link.qty >= concernedLinesQty[oldLine.uuid]) {
+                        this.handlePreparationHistory(
+                            this.selectedOrder.last_order_preparation_change.lines,
+                            this.selectedOrder.last_order_preparation_change.lines,
+                            oldLine,
+                            link,
+                            concernedLinesQty[oldLine.uuid]
+                        );
+                        linkOldNewLines[link.uuid] += concernedLinesQty[oldLine.uuid];
+                        concernedLinesQty[oldLine.uuid] = 0;
+                        break;
+                    } else {
+                        this.handlePreparationHistory(
+                            this.selectedOrder.last_order_preparation_change.lines,
+                            this.selectedOrder.last_order_preparation_change.lines,
+                            oldLine,
+                            link,
+                            link.qty
+                        );
+                        linkOldNewLines[link.uuid] += link.qty;
+                        concernedLinesQty[oldLine.uuid] -= link.qty;
+                    }
+                }
+            }
+
+            // make orderline ignored by preparation printers if at least one child orderline has already been sent to the kitchen
+            if (
+                comboLine.combo_line_ids.some(
+                    (cl) =>
+                        this.selectedOrder.last_order_preparation_change.lines[cl.preparationKey]
+                )
+            ) {
+                this.selectedOrder.last_order_preparation_change[comboLine.preparationKey] = {
+                    ignoreQty: comboLine.qty,
+                };
+            }
+        }
+        for (const [lineUuid, newQty] of Object.entries(concernedLinesQty)) {
+            const line = this.models["pos.order.line"].getBy("uuid", lineUuid);
+            if (newQty > 0) {
+                line.setQuantity(newQty);
+            } else {
+                line.order_id.removeOrderline(line);
+            }
+        }
+        if (comboLine) {
+            this.selectedOrder.selectOrderline(comboLine);
+        }
+        return;
+    }
+    findComboLinesByOldLine(oldLine, comboProduct) {
+        // Link future new lines to old lines for preparation history tracking
+        return comboProduct.combo_line_ids.filter((cl) => {
+            if (cl.product_id.id !== oldLine.product_id.id) {
+                return false;
+            }
+            if (cl.full_product_name !== oldLine.full_product_name) {
+                return false;
+            }
+            return true;
+        });
+    }
+    breakCombo(orderline) {
+        if (!this.isSelectedLineCombo) {
+            return;
+        }
+        const order = this.selectedOrder;
+        for (const line of orderline.combo_line_ids) {
+            line.combo_parent_id = false;
+            line.setUnitPrice(
+                line.product_id.getPrice(order.pricelist_id, line.qty, 0, false, line.product_id)
+            );
+        }
+        const preparationKey = orderline.preparationKey;
+        order.removeOrderline(orderline, false);
+        delete order.last_order_preparation_change.lines[preparationKey];
+    }
 }
 
 export const posService = {
diff --git a/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js b/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
index 2e68bb1aef76f..63ee7dce30d6c 100644
--- a/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
@@ -4,6 +4,7 @@ import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_
 import * as combo from "@point_of_sale/../tests/pos/tours/utils/combo_popup_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
+import * as ProductConfiguratorPopup from "@point_of_sale/../tests/pos/tours/utils/product_configurator_util";
 import { scan_barcode } from "@point_of_sale/../tests/generic_helpers/utils";
 import { inLeftSide } from "@point_of_sale/../tests/pos/tours/utils/common";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
@@ -239,3 +240,61 @@ registry.category("web_tour.tours").add("ProductComboDiscountTour", {
             ProductScreen.isShown(),
         ].flat(),
 });
+
+registry.category("web_tour.tours").add("test_convert_orderlines_to_combo", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+
+            // Add products that can be part of a combo
+            ProductScreen.clickDisplayedProduct("Combo Product 2"),
+            ProductScreen.clickDisplayedProduct("Combo Product 4"),
+            ProductScreen.clickDisplayedProduct("Combo Product 6"),
+
+            // Convert to combo
+            ProductScreen.clickApplyCombo(),
+
+            // Check that orderline is now a combo
+            inLeftSide([
+                { ...ProductScreen.clickLine("Office Combo")[0], isActive: ["mobile"] },
+                ...Order.hasLine({
+                    productName: "Office Combo",
+                    quantity: "1",
+                    withClass: ".selected",
+                }),
+                ...ProductScreen.clickControlButtonMore(),
+                ...ProductScreen.clickBreakCombo(),
+                ...Order.hasLine({ productName: "Combo Product 2", quantity: "1" }),
+                ...Order.hasLine({ productName: "Combo Product 4", quantity: "1" }),
+                ...Order.hasLine({ productName: "Combo Product 6", quantity: "1" }),
+                ...Order.doesNotHaveLine({ productName: "Office Combo" }),
+            ]),
+
+            ProductScreen.clickDisplayedProduct("Second Product 2"),
+            ProductScreen.clickDisplayedProduct("Second Product 4"),
+            ProductScreen.clickDisplayedProduct("Second Product 9"),
+            // Select attributes
+            ProductConfiguratorPopup.pickColor("Blue"),
+            ProductConfiguratorPopup.selectedColor("Blue"),
+            Dialog.confirm(),
+
+            // Convert to combo
+            ProductScreen.clickApplyCombo(
+                true,
+                ["Second Combo Product", "Office Combo"],
+                "Second Combo Product",
+                true
+            ),
+
+            // Check that orderline is now a combo
+            inLeftSide([
+                ...Order.hasLine({ productName: "Second Combo Product", quantity: "1" }),
+                ...Order.hasLine({
+                    productName: "Second Product 9",
+                    quantity: "1",
+                    attributeLine: "Blue",
+                }),
+            ]),
+        ].flat(),
+});
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/chose_combo_popup_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/chose_combo_popup_util.js
new file mode 100644
index 0000000000000..e98b2fdc94444
--- /dev/null
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/chose_combo_popup_util.js
@@ -0,0 +1,27 @@
+export function isShown() {
+    return [
+        {
+            content: "Chose combo popup is shown",
+            trigger: ".chose-combo-popup",
+        },
+    ];
+}
+
+export function apply(option) {
+    return [
+        {
+            content: `Apply combo option ${option}`,
+            trigger: `.chose-combo-popup .combo-list .combo-item:contains("${option}") .apply-combo-btn`,
+            run: "click",
+        },
+    ];
+}
+
+export function isOptionShown(option) {
+    return [
+        {
+            content: `option ${option} is shown`,
+            trigger: `.chose-combo-popup .combo-list .combo-item:contains("${option}")`,
+        },
+    ];
+}
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
index 369fd8f71444c..5ef514dd32d06 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
@@ -5,6 +5,7 @@ import * as PartnerList from "@point_of_sale/../tests/pos/tours/utils/partner_li
 import * as TextInputPopup from "@point_of_sale/../tests/generic_helpers/text_input_popup_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
+import * as ChoseComboPopup from "@point_of_sale/../tests/pos/tours/utils/chose_combo_popup_util";
 import { LONG_PRESS_DURATION } from "@point_of_sale/utils";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 
@@ -1009,3 +1010,44 @@ export function openCartMobile() {
         },
     ];
 }
+
+export function clickApplyCombo(
+    isOptionShown = false,
+    optionsShown = [],
+    optionToChoose = "",
+    dialogStillPresent = false
+) {
+    const steps = [
+        {
+            content: "Check apply combo button is there",
+            trigger: ".combo-proposition",
+        },
+        {
+            content: "Click apply combo button",
+            trigger: ".combo-proposition button.btn",
+            run: "click",
+        },
+    ];
+    if (isOptionShown) {
+        steps.push(ChoseComboPopup.isShown());
+        for (const option of optionsShown) {
+            steps.push(ChoseComboPopup.isOptionShown(option));
+        }
+        steps.push(ChoseComboPopup.apply(optionToChoose));
+    }
+    if (dialogStillPresent) {
+        steps.push(ChoseComboPopup.isShown());
+        steps.push(Dialog.cancel());
+    }
+    return inLeftSide(steps.flat());
+}
+
+export function clickBreakCombo() {
+    return [
+        {
+            content: "Click break combo button",
+            trigger: ".break-combo-button",
+            run: "click",
+        },
+    ];
+}
diff --git a/addons/point_of_sale/static/tests/unit/components/popup/chose_combo_popup.test.js b/addons/point_of_sale/static/tests/unit/components/popup/chose_combo_popup.test.js
new file mode 100644
index 0000000000000..237dfd6681843
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/components/popup/chose_combo_popup.test.js
@@ -0,0 +1,135 @@
+import { test, expect, describe } from "@odoo/hoot";
+import { mountWithCleanup } from "@web/../tests/web_test_helpers";
+import { ChoseComboPopup } from "@point_of_sale/app/components/popups/chose_combo_popup/chose_combo_popup";
+import { setupPosEnv } from "@point_of_sale/../tests/unit/utils";
+import { definePosModels } from "@point_of_sale/../tests/unit/data/generate_model_definitions";
+
+definePosModels();
+
+describe("chose_combo_popup.js", () => {
+    test("allCombos", async () => {
+        const store = await setupPosEnv();
+
+        const addOrderlinesOfComboToCart = async (comboProduct) => {
+            const comboChoices = comboProduct.combo_ids;
+            const qtyTaken = {};
+            for (const comboChoice of comboChoices) {
+                const comboItems = comboChoice.combo_item_ids;
+                const line = await store.addLineToCurrentOrder({
+                    product_tmpl_id: comboItems[0].product_id.product_tmpl_id,
+                    qty: comboChoice.is_upsell ? 1 : comboChoice.qty_free,
+                });
+                qtyTaken[comboChoice.id] = {
+                    [line.uuid]: {
+                        qty: line.qty,
+                        combo_item: comboItems[0],
+                    },
+                };
+                if (comboChoice.is_upsell) {
+                    // Simulate that the upsell option has been chosen
+                    qtyTaken[comboChoice.id].upsell = true;
+                }
+            }
+
+            return qtyTaken;
+        };
+
+        const checkAllCombos = async (comboProduct, potentialCombos) => {
+            const choseComboPopup = await mountWithCleanup(ChoseComboPopup, {
+                props: {
+                    potentialCombos: potentialCombos,
+                    close: () => {},
+                    getPayload: () => {},
+                },
+            });
+            let expectedLines = [];
+            for (const comboChoice of comboProduct.combo_ids) {
+                expectedLines.push({
+                    name: comboChoice.combo_item_ids[0].product_id.display_name,
+                    quantity: comboChoice.qty_free || 1,
+                    upsell: false,
+                    sequence: comboChoice.sequence,
+                    id: comboChoice.id,
+                });
+                if (comboChoice.is_upsell && comboChoice.qty_max > 1) {
+                    expectedLines.push({
+                        name: comboChoice.name,
+                        quantity: comboChoice.qty_max - 1,
+                        upsell: true,
+                        sequence: comboChoice.sequence,
+                        id: comboChoice.id,
+                    });
+                }
+            }
+            expectedLines = expectedLines.sort((a, b) => {
+                if (a.upsell !== b.upsell) {
+                    return a.upsell ? 1 : -1;
+                }
+                if (a.sequence !== b.sequence) {
+                    return a.sequence - b.sequence;
+                }
+                return a.id - b.id;
+            });
+            const combinationsExpected = potentialCombos.applicable.concat(potentialCombos.upsell);
+            const expectedAllCombos = [
+                {
+                    combinations: combinationsExpected[0].combinations,
+                    productTmpl: combinationsExpected[0].productTmpl,
+                    lines: expectedLines,
+                },
+            ];
+            if (potentialCombos.upsell.length > 0) {
+                expectedAllCombos[0].upsell = true;
+            }
+            expect(choseComboPopup.allCombos).toEqual(expectedAllCombos);
+        };
+
+        // Two combo choice, one is upsell, the other is not
+        store.addNewOrder();
+        const comboProduct_1 = store.models["product.template"].get(7);
+        const qtyTaken_1 = await addOrderlinesOfComboToCart(comboProduct_1);
+        const potentialCombos_1 = {
+            applicable: [],
+            upsell: [
+                {
+                    productTmpl: comboProduct_1,
+                    combinations: [qtyTaken_1],
+                },
+            ],
+        };
+
+        await checkAllCombos(comboProduct_1, potentialCombos_1);
+
+        // Two combo choices, none are upsell
+        store.addNewOrder();
+        const comboProduct_2 = store.models["product.template"].get(15);
+        const qtyTaken_2 = await addOrderlinesOfComboToCart(comboProduct_2);
+        const potentialCombos_2 = {
+            applicable: [
+                {
+                    productTmpl: comboProduct_2,
+                    combinations: [qtyTaken_2],
+                },
+            ],
+            upsell: [],
+        };
+
+        await checkAllCombos(comboProduct_2, potentialCombos_2);
+
+        // Two combo choices, both are upsell
+        store.addNewOrder();
+        const comboProduct_3 = store.models["product.template"].get(16);
+        const qtyTaken_3 = await addOrderlinesOfComboToCart(comboProduct_3);
+        const potentialCombos_3 = {
+            applicable: [],
+            upsell: [
+                {
+                    productTmpl: comboProduct_3,
+                    combinations: [qtyTaken_3],
+                },
+            ],
+        };
+
+        await checkAllCombos(comboProduct_3, potentialCombos_3);
+    });
+});
diff --git a/addons/point_of_sale/static/tests/unit/data/product_combo.data.js b/addons/point_of_sale/static/tests/unit/data/product_combo.data.js
index 539c7d3418017..a35327aba61fa 100644
--- a/addons/point_of_sale/static/tests/unit/data/product_combo.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/product_combo.data.js
@@ -4,7 +4,16 @@ export class ProductCombo extends models.ServerModel {
     _name = "product.combo";
 
     _load_pos_data_fields() {
-        return ["id", "name", "combo_item_ids", "base_price", "qty_free", "qty_max"];
+        return [
+            "id",
+            "name",
+            "combo_item_ids",
+            "base_price",
+            "qty_free",
+            "qty_max",
+            "is_upsell",
+            "sequence",
+        ];
     }
 
     _records = [
@@ -13,16 +22,60 @@ export class ProductCombo extends models.ServerModel {
             name: "Chairs Combo",
             combo_item_ids: [1, 2],
             base_price: 100,
+            is_upsell: true,
             qty_free: 0,
             qty_max: 10,
+            sequence: 0,
         },
         {
             id: 2,
             name: "Desks Combo",
             combo_item_ids: [3, 4],
             base_price: 200,
+            is_upsell: false,
             qty_free: 1,
             qty_max: 1,
+            sequence: 1,
+        },
+        {
+            id: 3,
+            name: "Combo 3",
+            combo_item_ids: [5, 6],
+            base_price: 100,
+            is_upsell: false,
+            qty_free: 1,
+            qty_max: 3,
+            sequence: 2,
+        },
+        {
+            id: 4,
+            name: "Combo 4",
+            combo_item_ids: [7, 8],
+            base_price: 200,
+            is_upsell: false,
+            qty_free: 2,
+            qty_max: 4,
+            sequence: 3,
+        },
+        {
+            id: 5,
+            name: "Combo 5",
+            combo_item_ids: [9, 10],
+            base_price: 100,
+            is_upsell: true,
+            qty_free: 0,
+            qty_max: 1,
+            sequence: 4,
+        },
+        {
+            id: 6,
+            name: "Combo 6",
+            combo_item_ids: [11, 12],
+            base_price: 200,
+            is_upsell: true,
+            qty_free: 0,
+            qty_max: 5,
+            sequence: 5,
         },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/unit/data/product_combo_item.data.js b/addons/point_of_sale/static/tests/unit/data/product_combo_item.data.js
index b2c8c32446be2..49c6bd035166d 100644
--- a/addons/point_of_sale/static/tests/unit/data/product_combo_item.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/product_combo_item.data.js
@@ -32,5 +32,53 @@ export class ProductComboItem extends models.ServerModel {
             product_id: 11,
             extra_price: 50,
         },
+        {
+            id: 5,
+            combo_id: 1,
+            product_id: 8,
+            extra_price: 0,
+        },
+        {
+            id: 6,
+            combo_id: 1,
+            product_id: 9,
+            extra_price: 35,
+        },
+        {
+            id: 7,
+            combo_id: 2,
+            product_id: 10,
+            extra_price: 0,
+        },
+        {
+            id: 8,
+            combo_id: 2,
+            product_id: 11,
+            extra_price: 50,
+        },
+        {
+            id: 9,
+            combo_id: 1,
+            product_id: 8,
+            extra_price: 0,
+        },
+        {
+            id: 10,
+            combo_id: 1,
+            product_id: 9,
+            extra_price: 35,
+        },
+        {
+            id: 11,
+            combo_id: 2,
+            product_id: 10,
+            extra_price: 0,
+        },
+        {
+            id: 12,
+            combo_id: 2,
+            product_id: 11,
+            extra_price: 50,
+        },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/unit/data/product_product.data.js b/addons/point_of_sale/static/tests/unit/data/product_product.data.js
index b9d23b89c7156..d6ed9b5d86002 100644
--- a/addons/point_of_sale/static/tests/unit/data/product_product.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/product_product.data.js
@@ -61,7 +61,7 @@ export class ProductProduct extends models.ServerModel {
         {
             id: 7,
             product_tmpl_id: 7,
-            lst_price: 750,
+            lst_price: 100,
             standard_price: 0,
             display_name: "Office combo",
             product_tag_ids: [],
@@ -178,5 +178,29 @@ export class ProductProduct extends models.ServerModel {
             product_template_attribute_value_ids: [],
             product_template_variant_value_ids: [],
         },
+        {
+            id: 17,
+            product_tmpl_id: 17,
+            lst_price: 750,
+            standard_price: 0,
+            display_name: "Product combo (no upsell)",
+            product_tag_ids: [],
+            barcode: false,
+            default_code: false,
+            product_template_attribute_value_ids: [],
+            product_template_variant_value_ids: [],
+        },
+        {
+            id: 18,
+            product_tmpl_id: 18,
+            lst_price: 750,
+            standard_price: 0,
+            display_name: "Product combo (all upsell)",
+            product_tag_ids: [],
+            barcode: false,
+            default_code: false,
+            product_template_attribute_value_ids: [],
+            product_template_variant_value_ids: [],
+        },
     ];
 }
diff --git a/addons/point_of_sale/static/tests/unit/data/product_template.data.js b/addons/point_of_sale/static/tests/unit/data/product_template.data.js
index 3b702f1d7ac6e..858fce6c89105 100644
--- a/addons/point_of_sale/static/tests/unit/data/product_template.data.js
+++ b/addons/point_of_sale/static/tests/unit/data/product_template.data.js
@@ -474,6 +474,74 @@ export class ProductTemplate extends models.ServerModel {
             sequence: 1,
             product_tag_ids: [],
         },
+        {
+            id: 17,
+            display_name: "Product combo (no upsell)",
+            standard_price: 0,
+            categ_id: false,
+            pos_categ_ids: [2],
+            taxes_id: [2],
+            barcode: false,
+            name: "Product combo (no upsell)",
+            list_price: 750,
+            is_favorite: false,
+            default_code: false,
+            to_weight: false,
+            uom_id: 1,
+            description_sale: false,
+            description: false,
+            tracking: "none",
+            type: "combo",
+            service_tracking: "no",
+            is_storable: false,
+            write_date: "2025-07-03 13:04:14",
+            color: 0,
+            pos_sequence: 5,
+            available_in_pos: true,
+            attribute_line_ids: [],
+            active: true,
+            image_128: false,
+            combo_ids: [3, 4],
+            product_variant_ids: [17],
+            public_description: false,
+            pos_optional_product_ids: [],
+            sequence: 1,
+            product_tag_ids: [],
+        },
+        {
+            id: 18,
+            display_name: "Product combo (all upsell)",
+            standard_price: 0,
+            categ_id: false,
+            pos_categ_ids: [2],
+            taxes_id: [2],
+            barcode: false,
+            name: "Product combo (all upsell)",
+            list_price: 750,
+            is_favorite: false,
+            default_code: false,
+            to_weight: false,
+            uom_id: 1,
+            description_sale: false,
+            description: false,
+            tracking: "none",
+            type: "combo",
+            service_tracking: "no",
+            is_storable: false,
+            write_date: "2025-07-03 13:04:14",
+            color: 0,
+            pos_sequence: 5,
+            available_in_pos: true,
+            attribute_line_ids: [],
+            active: true,
+            image_128: false,
+            combo_ids: [5, 6],
+            product_variant_ids: [18],
+            public_description: false,
+            pos_optional_product_ids: [],
+            sequence: 1,
+            product_tag_ids: [],
+        },
     ];
     get_product_info_pos() {
         return {
diff --git a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
index 00b09ba04166a..44f8aeb25100b 100644
--- a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
+++ b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
@@ -341,7 +341,7 @@ describe("pos_store.js", () => {
         let grouped = store.productToDisplayByCateg;
         expect(grouped.length).toBe(1); //Only one group
         expect(grouped[0][0]).toBe(0);
-        expect(grouped[0][1].length).toBe(12); //10 products in same group
+        expect(grouped[0][1].length).toBe(14); //14 products in same group
 
         // Case 2: Grouping enabled
         store.config.iface_group_by_categ = true;
diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py
index 2c66bf7432fd4..99ea9678a58d1 100644
--- a/addons/point_of_sale/tests/test_frontend.py
+++ b/addons/point_of_sale/tests/test_frontend.py
@@ -3109,6 +3109,210 @@ def test_add_money_button_with_different_decimal_separator(self):
         self.pos_user.write({'lang': 'fr_BE'})
         self.start_tour(f"/pos/ui?config_id={self.main_pos_config.id}", 'test_add_money_button_with_different_decimal_separator', login="pos_user")
 
+    def test_convert_orderlines_to_combo(self):
+        setup_product_combo_items(self)
+
+        pos_category_ids = self.desks_combo.combo_item_ids[0].product_id.pos_categ_ids.ids
+
+        # Create a second combo
+        combo_product_1 = self.env["product.product"].create(
+            {
+                "name": "Second Product 1",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 10,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        combo_product_2 = self.env["product.product"].create(
+            {
+                "name": "Second Product 2",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 11,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        combo_product_3 = self.env["product.product"].create(
+            {
+                "name": "Second Product 3",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 16,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        first_combo = self.env["product.combo"].create(
+            {
+                "name": "First Combo",
+                "combo_item_ids": [
+                    Command.create({
+                        "product_id": combo_product_1.id,
+                        "extra_price": 0,
+                    }),
+                    Command.create({
+                        "product_id": combo_product_2.id,
+                        "extra_price": 0,
+                    }),
+                    Command.create({
+                        "product_id": combo_product_3.id,
+                        "extra_price": 2,
+                    }),
+                ],
+            }
+        )
+
+        combo_product_4 = self.env["product.product"].create(
+            {
+                "name": "Second Product 4",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 20,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        combo_product_5 = self.env["product.product"].create(
+            {
+                "name": "Second Product 5",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 25,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        second_combo = self.env["product.combo"].create(
+            {
+                "name": "Second Combo",
+                "combo_item_ids": [
+                    Command.create({
+                        "product_id": combo_product_4.id,
+                        "extra_price": 0,
+                    }),
+                    Command.create({
+                        "product_id": combo_product_5.id,
+                        "extra_price": 2,
+                    }),
+                ],
+            }
+        )
+
+        combo_product_6 = self.env["product.product"].create(
+            {
+                "name": "Second Product 6",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 30,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        combo_product_7 = self.env["product.product"].create(
+            {
+                "name": "Second Product 7",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 32,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        combo_product_8 = self.env["product.product"].create(
+            {
+                "name": "Second Product 8",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 40,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        combo_product_9 = self.env["product.product"].create(
+            {
+                "name": "Second Product 9",
+                "is_storable": True,
+                "available_in_pos": True,
+                "list_price": 50,
+                "taxes_id": [],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        chair_color_attribute = self.env['product.attribute'].create({
+            'name': 'Color',
+            'display_type': 'color',
+            'create_variant': 'no_variant',
+        })
+        chair_color_red = self.env['product.attribute.value'].create({
+            'name': 'Red',
+            'attribute_id': chair_color_attribute.id,
+            'html_color': '#ff0000',
+        })
+        chair_color_blue = self.env['product.attribute.value'].create({
+            'name': 'Blue',
+            'attribute_id': chair_color_attribute.id,
+            'html_color': '#0000ff',
+        })
+        self.env['product.template.attribute.line'].create({
+            'product_tmpl_id': combo_product_9.product_tmpl_id.id,
+            'attribute_id': chair_color_attribute.id,
+            'value_ids': [(6, 0, [chair_color_red.id, chair_color_blue.id])]
+        })
+
+        third_combo = self.env["product.combo"].create(
+            {
+                "name": "Third Combo",
+                "combo_item_ids": [
+                    Command.create({
+                        "product_id": combo_product_6.id,
+                        "extra_price": 0,
+                    }),
+                    Command.create({
+                        "product_id": combo_product_7.id,
+                        "extra_price": 0,
+                    }),
+                    Command.create({
+                        "product_id": combo_product_8.id,
+                        "extra_price": 5,
+                    }),
+                    Command.create({
+                        "product_id": combo_product_9.id,
+                        "extra_price": 0,
+                    }),
+                ],
+            }
+        )
+
+        # Create Office Combo
+        self.office_combo = self.env["product.product"].create(
+            {
+                "available_in_pos": True,
+                "list_price": 50,
+                "name": "Second Combo Product",
+                "type": "combo",
+                "uom_id": self.env.ref("uom.product_uom_unit").id,
+                "combo_ids": [
+                    (6, 0, [first_combo.id, second_combo.id, third_combo.id])
+                ],
+                "pos_categ_ids": [(6, 0, pos_category_ids)],
+            }
+        )
+
+        self.main_pos_config.with_user(self.pos_user).open_ui()
+        self.start_pos_tour('test_convert_orderlines_to_combo', login="pos_user")
+
 
 # This class just runs the same tests as above but with mobile emulation
 class MobileTestUi(TestUi):
diff --git a/addons/point_of_sale/views/product_combo_views.xml b/addons/point_of_sale/views/product_combo_views.xml
index dc5b4bfd40aab..e7ab60ed52929 100644
--- a/addons/point_of_sale/views/product_combo_views.xml
+++ b/addons/point_of_sale/views/product_combo_views.xml
@@ -16,11 +16,12 @@
                         <field name="qty_max" class="text-center" style="width:50px;"/>
                         <label for="qty_max" string="items" class="fw-bolder ps-3" />
                     </div>
-                    <span class="o_form_label oe_inline fw-bolder">Includes</span>
-                    <div>
+                    <span class="o_form_label oe_inline fw-bolder" invisible="is_upsell">Includes</span>
+                    <div invisible="is_upsell">
                         <field name="qty_free" class="text-center" style="width:50px;"/>
                         <label for="qty_free" string="free" class="fw-bolder ps-3" />
                     </div>
+                    <field name="is_upsell"/>
                 </group>
                 <group>
                     <field name="base_price" widget="monetary" options="{'field_digits': True}"/>
diff --git a/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.xml b/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.xml
index 8cee4d677fb5c..52f65a73dc573 100644
--- a/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.xml
+++ b/addons/pos_loyalty/static/src/app/screens/product_screen/order_summary/order_summary.xml
@@ -10,7 +10,7 @@
                 <div t-if="line.gift_code" class="text-wrap" t-esc="line.gift_code"/>
             </t>
         </xpath>
-        <xpath expr="//OrderDisplay/t[@t-set-slot='details']" position="inside">
+        <xpath expr="//OrderDisplay/t[@t-set-slot='details']/div[hasclass('combo-proposition')]" position="before">
             <t t-foreach="pos.getOrder()?.getLoyaltyPoints() or []" t-as="_loyaltyStat" t-key="_loyaltyStat.couponId">
                 <div t-if="_loyaltyStat.points.won || _loyaltyStat.points.spent" class="d-flex justify-content-between px-2 py-2 bg-view">
                     <div t-esc="_loyaltyStat.points.name" class="loyalty-points-title fs-4 fw-bolder"/>
diff --git a/addons/pos_restaurant/static/src/app/screens/product_screen/order_summary/order_summary.js b/addons/pos_restaurant/static/src/app/screens/product_screen/order_summary/order_summary.js
index bae0563ad18a8..d41cddaace606 100644
--- a/addons/pos_restaurant/static/src/app/screens/product_screen/order_summary/order_summary.js
+++ b/addons/pos_restaurant/static/src/app/screens/product_screen/order_summary/order_summary.js
@@ -34,8 +34,8 @@ patch(OrderSummary.prototype, {
     },
     async unbookTable() {
         const order = this.pos.getOrder();
-        await this.pos.deleteOrders([order]);
         this.pos.navigate("FloorScreen");
+        await this.pos.deleteOrders([order]);
     },
     showUnbookButton() {
         if (this.pos.selectedTable) {
diff --git a/addons/pos_restaurant/static/src/app/services/pos_store.js b/addons/pos_restaurant/static/src/app/services/pos_store.js
index f7c82173e010b..c0d6c97036ff9 100644
--- a/addons/pos_restaurant/static/src/app/services/pos_store.js
+++ b/addons/pos_restaurant/static/src/app/services/pos_store.js
@@ -147,22 +147,6 @@ patch(PosStore.prototype, {
 
         return await super.sendOrderInPreparationUpdateLastChange(order, opts);
     },
-    handlePreparationHistory(srcPrep, destPrep, srcLine, destLine, qty) {
-        const srcKey = srcLine.preparationKey;
-        const destKey = destLine.preparationKey;
-        const srcQty = srcPrep[srcKey]?.quantity;
-
-        if (srcQty) {
-            if (srcQty <= qty) {
-                const newPrep = { ...srcPrep[srcKey], uuid: destLine.uuid };
-                destPrep[destKey] = newPrep;
-                delete srcPrep[srcKey];
-            } else {
-                srcPrep[srcKey].quantity = srcQty - qty;
-                destPrep[destKey] = { ...srcPrep[srcKey], uuid: destLine.uuid, quantity: qty };
-            }
-        }
-    },
     async mergeOrders(sourceOrder, destOrder) {
         let whileGuard = 0;
         const mergedCourses = this.mergeCourses(sourceOrder, destOrder);
diff --git a/addons/pos_self_order/static/tests/unit/pages/cart_page.test.js b/addons/pos_self_order/static/tests/unit/pages/cart_page.test.js
index 2955574518eb3..2fd8f942cd1f2 100644
--- a/addons/pos_self_order/static/tests/unit/pages/cart_page.test.js
+++ b/addons/pos_self_order/static/tests/unit/pages/cart_page.test.js
@@ -65,5 +65,5 @@ test("getPrice", async () => {
 
     // For combo parent line
     const parentLine = await addComboProduct(store);
-    expect(comp.getPrice(parentLine)).toBe(2125);
+    expect(comp.getPrice(parentLine)).toBe(500);
 });
diff --git a/addons/pos_self_order/static/tests/unit/utils.js b/addons/pos_self_order/static/tests/unit/utils.js
index c0f4e2a8949b6..14339e52092c6 100644
--- a/addons/pos_self_order/static/tests/unit/utils.js
+++ b/addons/pos_self_order/static/tests/unit/utils.js
@@ -103,6 +103,6 @@ export const addComboProduct = async (store) => {
             qty: 1,
         },
     ];
-    store.addToCart(productCombo, 2, "", {}, {}, comboValues);
+    await store.addToCart(productCombo, 2, "", {}, {}, comboValues);
     return store.currentOrder.lines.find((ol) => ol.combo_line_ids.length); // Parent Combo line
 };

From 8d2a30c7530a02176cfa928db3e502360ecad370 Mon Sep 17 00:00:00 2001
From: gppa_odoo <gppa@odoo.com>
Date: Thu, 27 Mar 2025 16:58:36 +0530
Subject: [PATCH 235/673] [IMP] website: show warning on 301/302 redirects for
 existing pages

Before this commit, users could set 301 and 302 redirects for URLs that
were already assigned to existing pages, leading to ineffective
redirections.

After this commit, a warning message is displayed when attempting to
save 301 or 302 redirects that conflict with existing pages. This
ensures that both dynamic (controller-based) and static (website
builder) pages trigger an alert before saving.

task-3861555

closes odoo/odoo#203701

Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 addons/website/models/website_rewrite.py      | 17 +++++++++++
 .../static/src/components/fields/fields.js    | 28 +++++++++++++++++++
 .../static/src/components/fields/fields.xml   |  6 ++++
 addons/website/views/website_rewrite.xml      | 10 ++++---
 4 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/addons/website/models/website_rewrite.py b/addons/website/models/website_rewrite.py
index 98497341608dd..14a53e0c971f8 100644
--- a/addons/website/models/website_rewrite.py
+++ b/addons/website/models/website_rewrite.py
@@ -70,9 +70,26 @@ class WebsiteRewrite(models.Model):
         404 Not Found: If you want remove a specific page/controller (e.g. Ecommerce is installed, but you don't want /shop on a specific website)
         308 Redirect / Rewrite: If you want rename a controller with a new url. (Eg: /shop -> /garden - Both url will be accessible but /shop will automatically be redirected to /garden)
     ''')
+    is_url_from_exist = fields.Boolean(compute='_compute_is_url_from_exist', default=False)
 
     sequence = fields.Integer()
 
+    @api.depends('url_from', 'redirect_type')
+    def _compute_is_url_from_exist(self):
+        for rewrite in self:
+            exists = False
+            if rewrite.url_from and rewrite.redirect_type in ['301', '302']:
+                url = rewrite.url_from.rstrip('/')
+                exists = self.env['website.page'].search_count([('url', '=', rewrite.url_from)], limit=1) > 0
+                if not exists:
+                    try:
+                        self.env['ir.http']._match(url)
+                        exists = True
+                    except werkzeug.exceptions.NotFound:
+                        exists = False
+
+            rewrite.is_url_from_exist = exists
+
     @api.onchange('route_id')
     def _onchange_route_id(self):
         self.url_from = self.route_id.path
diff --git a/addons/website/static/src/components/fields/fields.js b/addons/website/static/src/components/fields/fields.js
index 12d79f2e3de6b..08dd4079d46b2 100644
--- a/addons/website/static/src/components/fields/fields.js
+++ b/addons/website/static/src/components/fields/fields.js
@@ -4,6 +4,7 @@ import { UrlField, urlField } from "@web/views/fields/url/url_field";
 import { registry } from "@web/core/registry";
 import { _t } from "@web/core/l10n/translation";
 import { Component, useEffect, useRef } from "@odoo/owl";
+import { charField, CharField } from "@web/views/fields/char/char_field";
 
 /**
  * Displays website page dependencies and URL redirect options when the page URL
@@ -111,3 +112,30 @@ export const imageRadioField = {
 };
 
 registry.category("fields").add("image_radio", imageRadioField);
+
+/**
+ * A Char field that updates its value on input.
+ */
+export class UrlWarningBannerVisibilityCharField extends CharField {
+    static template = "website.UrlWarningBannerVisibilityCharField";
+
+    onFocus(ev) {
+        if (this.props.record.data.is_url_from_exist) {
+            this.props.record.update({ is_url_from_exist: false });
+        }
+    }
+
+    onBlur() {
+        this.props.record.update({ [this.props.name]: this.input.el.value });
+        super.onBlur();
+    }
+}
+
+export const urlWarningBannerVisibilityCharField = {
+    ...charField,
+    component: UrlWarningBannerVisibilityCharField,
+};
+
+registry
+    .category("fields")
+    .add("url_warning_banner_visibility", urlWarningBannerVisibilityCharField);
diff --git a/addons/website/static/src/components/fields/fields.xml b/addons/website/static/src/components/fields/fields.xml
index bb0c0650495c7..6caf1755c6e81 100644
--- a/addons/website/static/src/components/fields/fields.xml
+++ b/addons/website/static/src/components/fields/fields.xml
@@ -27,4 +27,10 @@
     </fieldset>
 </t>
 
+<t t-name="website.UrlWarningBannerVisibilityCharField" t-inherit="web.CharField" t-inherit-mode="primary">
+    <xpath expr="//input" position="attributes">
+        <attribute name="t-on-focus">onFocus</attribute>
+    </xpath>
+</t>
+
 </templates>
diff --git a/addons/website/views/website_rewrite.xml b/addons/website/views/website_rewrite.xml
index f9a05fef9492a..5b3be87d924da 100644
--- a/addons/website/views/website_rewrite.xml
+++ b/addons/website/views/website_rewrite.xml
@@ -11,11 +11,14 @@
                                 invisible="redirect_type != '308'"/>
                     </header>
                     <sheet>
+                        <div class="alert alert-warning" role="alert" invisible="not is_url_from_exist">
+                            This redirection will not have any effect since the URL '<field name="url_from" readonly="1"/>' is already in use.
+                        </div>
                         <group>
                             <group>
                                 <field name="name"/>
                                 <field name="redirect_type"/>
-                                <field name="url_from" invisible="redirect_type == '308'"/>
+                                <field name="url_from" invisible="redirect_type == '308'" widget="url_warning_banner_visibility"/>
                                 <field name="route_id" string="URL from" options="{'no_create': True, 'no_open': True}" invisible="redirect_type != '308'"/>
                                 <field name="url_to" invisible="redirect_type == '404'"/>
                             </group>
@@ -34,7 +37,7 @@
             <field name="name">website.rewrite.list</field>
             <field name="model">website.rewrite</field>
             <field name="arch" type="xml">
-                <list string="Website rewrites">
+                <list string="Website rewrites" decoration-warning="is_url_from_exist">
                     <field name="sequence" widget="handle" />
                     <field name="redirect_type"/>
                     <field name="name"/>
@@ -62,8 +65,7 @@
             id="menu_website_rewrite"
             action="action_website_rewrite_list"
             parent="menu_website_global_configuration"
-            sequence="30"
-            groups="base.group_no_one"/>
+            sequence="30"/>
 
         <record id="view_rewrite_search" model="ir.ui.view">
             <field name="name">website.rewrite.search</field>

From 3d6afb85bc117e1edfeec3bac58c3ed4558976e4 Mon Sep 17 00:00:00 2001
From: mano-odoo <mano@odoo.com>
Date: Tue, 4 Nov 2025 17:36:50 +0100
Subject: [PATCH 236/673] [FIX] *: replace `btn-default` for `btn-secondary`

*: portal,project,stock,website,website_blog,website_forum

`btn-default` doesn't exist anymore, this is a dead utility class. This
commit changes it for `btn-secondary` in the backend and `btn-light` in
the frontend.

Note: In blog the buttons didn't work with btn-light, thus we keep the
bg-white and its border. (Also I didn't manage to access the alert
without removing the conditions, so maybe dead code?)

task-5236550

closes odoo/odoo#234401

Related: odoo/enterprise#98817
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/portal/wizard/portal_share_views.xml                   | 2 +-
 addons/project/wizard/project_task_share_wizard_views.xml     | 4 ++--
 addons/stock/wizard/stock_rules_report_views.xml              | 2 +-
 addons/website/wizard/blocked_third_party_domains.xml         | 2 +-
 addons/website/wizard/website_robots.xml                      | 2 +-
 addons/website_blog/views/website_blog_posts_loop.xml         | 4 ++--
 .../static/tests/interactions/website_forum_spam.test.js      | 4 ++--
 .../website_forum/views/forum_forum_templates_moderation.xml  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/portal/wizard/portal_share_views.xml b/addons/portal/wizard/portal_share_views.xml
index e0528c252e938..f6026279ddd3b 100644
--- a/addons/portal/wizard/portal_share_views.xml
+++ b/addons/portal/wizard/portal_share_views.xml
@@ -15,7 +15,7 @@
                 </group>
                 <footer>
                     <button string="Send" name="action_send_mail" invisible="access_warning != ''" type="object" class="btn-primary" data-hotkey="q"/>
-                    <button string="Cancel" class="btn-default" special="cancel" data-hotkey="x" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x" />
                 </footer>
             </form>
         </field>
diff --git a/addons/project/wizard/project_task_share_wizard_views.xml b/addons/project/wizard/project_task_share_wizard_views.xml
index df685dd8a67bc..c7f39b606792e 100644
--- a/addons/project/wizard/project_task_share_wizard_views.xml
+++ b/addons/project/wizard/project_task_share_wizard_views.xml
@@ -7,8 +7,8 @@
         <field name="inherit_id" ref="portal.portal_share_wizard"/>
         <field name="mode">primary</field>
         <field name="arch" type="xml">
-            <xpath expr="//button[hasclass('btn-default')]" position="replace">
-                <button string="Discard" class="btn-default" special="cancel" data-hotkey="x" />
+            <xpath expr="//button[hasclass('btn-secondary')]" position="replace">
+                <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x" />
             </xpath>
             <xpath expr="//button[hasclass('btn-primary')]" position="attributes">
                 <attribute name="invisible">project_privacy_visibility in ['invited_users', 'followers']</attribute>
diff --git a/addons/stock/wizard/stock_rules_report_views.xml b/addons/stock/wizard/stock_rules_report_views.xml
index 055f7604c975f..a34a40a8928c3 100644
--- a/addons/stock/wizard/stock_rules_report_views.xml
+++ b/addons/stock/wizard/stock_rules_report_views.xml
@@ -21,7 +21,7 @@
                         type="object"
                         data-hotkey="q"
                         class="btn-primary"/>
-                    <button string="Cancel" class="btn-default" special="cancel" data-hotkey="x"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/website/wizard/blocked_third_party_domains.xml b/addons/website/wizard/blocked_third_party_domains.xml
index d45447919e959..7550ba48a59a0 100644
--- a/addons/website/wizard/blocked_third_party_domains.xml
+++ b/addons/website/wizard/blocked_third_party_domains.xml
@@ -19,7 +19,7 @@
             </p>
             <footer>
                 <button string="Save" name="action_save" type="object" class="oe_highlight" data-hotkey="q"/>
-                <button string="Cancel" class="btn btn-default" special="cancel" data-hotkey="x"/>
+                <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
             </footer>
         </form>
     </field>
diff --git a/addons/website/wizard/website_robots.xml b/addons/website/wizard/website_robots.xml
index 509cc138e6167..771628dc05c9b 100644
--- a/addons/website/wizard/website_robots.xml
+++ b/addons/website/wizard/website_robots.xml
@@ -18,7 +18,7 @@
                 </small>
                 <footer>
                     <button string="Save" name="action_save" type="object" class="oe_highlight" data-hotkey="q"/>
-                    <button string="Cancel" class="btn btn-default" special="cancel" data-hotkey="x"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
                 </footer>
             </form>
         </field>
diff --git a/addons/website_blog/views/website_blog_posts_loop.xml b/addons/website_blog/views/website_blog_posts_loop.xml
index 1f5be61efda34..63bfb8f8db3ac 100644
--- a/addons/website_blog/views/website_blog_posts_loop.xml
+++ b/addons/website_blog/views/website_blog_posts_loop.xml
@@ -20,12 +20,12 @@ according to the enabled options.
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
                 <span class="me-1">Show:</span>
                 <div class="btn-group btn-group-sm">
-                    <a t-attf-class="btn #{state == 'published' and 'btn-success' or 'btn-default bg-white border'}"
+                    <a t-attf-class="btn #{state == 'published' and 'btn-success' or 'bg-white border'}"
                        t-attf-href="#{state == 'published' and blog_url(state='') or blog_url(state='published')}">
                         <i t-attf-class="fa me-1 #{state == 'published' and 'fa-check-square-o' or 'fa-square-o'}"/>
                         Published (<t t-out="state_info['published']" />)
                     </a>
-                    <a t-attf-class="btn #{state == 'unpublished' and 'btn-success' or 'btn-default bg-white border'}"
+                    <a t-attf-class="btn #{state == 'unpublished' and 'btn-success' or 'bg-white border'}"
                        t-attf-href="#{state == 'unpublished' and blog_url(state='') or blog_url(state='unpublished')}">
                         <i t-attf-class="fa me-1 #{state == 'unpublished' and 'fa-check-square-o' or 'fa-square-o'}"/>
                         Unpublished (<t t-out="state_info['unpublished']" />)
diff --git a/addons/website_forum/static/tests/interactions/website_forum_spam.test.js b/addons/website_forum/static/tests/interactions/website_forum_spam.test.js
index 63594b5d1d34b..b42be7426f18d 100644
--- a/addons/website_forum/static/tests/interactions/website_forum_spam.test.js
+++ b/addons/website_forum/static/tests/interactions/website_forum_spam.test.js
@@ -22,7 +22,7 @@ const template = (options = {}) => `
                 </div>
                 <div class="modal-footer justify-content-start">
                     <button type="button" class="btn btn-primary o_wforum_mark_spam">Mark as spam</button>
-                    <a class="btn btn-sm btn-default o_wforum_select_all_spam" href="#" type="button">Select All</a>
+                    <a class="btn btn-light o_wforum_select_all_spam" href="#" type="button">Select All</a>
                 </div>
             </div>
         </div>
@@ -92,7 +92,7 @@ test("select all checkboxes", async () => {
                     </div>
                     <div class="modal-footer justify-content-start">
                         <button type="button" class="btn btn-primary o_wforum_mark_spam">Mark as spam</button>
-                        <a class="btn btn-sm btn-default o_wforum_select_all_spam" href="#" type="button">Select All</a>
+                        <a class="btn btn-light o_wforum_select_all_spam" href="#" type="button">Select All</a>
                     </div>
                 </div>
             </div>
diff --git a/addons/website_forum/views/forum_forum_templates_moderation.xml b/addons/website_forum/views/forum_forum_templates_moderation.xml
index 2b1e88ae56bc6..ae5bb618278c9 100644
--- a/addons/website_forum/views/forum_forum_templates_moderation.xml
+++ b/addons/website_forum/views/forum_forum_templates_moderation.xml
@@ -133,7 +133,7 @@
                     </div>
                     <div class="modal-footer justify-content-start">
                         <button type="button" class="btn btn-primary o_wforum_mark_spam">Mark as spam</button>
-                        <a class="btn btn-sm btn-default o_wforum_select_all_spam" href="#" type="button">Select All</a>
+                        <a class="btn btn-light o_wforum_select_all_spam" href="#" type="button">Select All</a>
                     </div>
                 </div>
             </div>

From 5ea1ff0068fbd1659acb89e064b950e2869f1273 Mon Sep 17 00:00:00 2001
From: jobl <jobl@odoo.com>
Date: Tue, 1 Jul 2025 19:27:34 +0000
Subject: [PATCH 237/673] [FIX] web: show nested allowed child companies in
 company selector

Issue:
Given a specific configuration, the `SwitchCompanyMenu` will not display
all the companies a user can access. Suppose we have a company hierarchy with
the following: `Company 1 > Company 2 > Company 3` (where 2 is a branch
of 1, and 3 is a branch of 2). If a user has access to C1 and C3, but not
C2, the menu selector will only display C1, rather than a hierarchy of
all 3 companies with C2 disabled.

This menu has been improved between versions, but the logic behind how we
determine which companies to display remains consistent. We loop over each
root company from `companyService.allowedCompaniesWithAncestors`, add it,
and then add its children. Depending on whether the child company is accessible,
it will be disabled (but still displayed) in the hierarchy list.

`companyService` pulls its company information from the `session['user_companies']
dict that is created from `session_info`. For each of the `allowed_companies`,
we build the `child_ids` from the intersection of each `user.company_id.child_ids` and
`user.company_ids`. So we only add the child if it itself is an allowed company, which
C2 would not be. C1 is now considered a root company with no children in our loop,
so C2 is skipped. C2 isn't a root company either, so it will never be seen, and
therefore neither will C3.

Solution:
A similar case was addressed in #138942, where given the same company hierarchy
as above, the user instead has access to C2 and C3, but not C1. This PR adjusted
how we build the `child_ids` for `disallowed_ancestor_companies` (C1 in this case),
properly setting the children for us to loop through. We can use this same logic
for the `child_ids` of `allowed_companies`, ensuring we can properly loop through
the disallowed children of allowed companies. Additionally, we need to adapt the
`CompanySelector` component, which previously grabbed all children even if they
were disallowed.

opw-4880477

closes odoo/odoo#234430

X-original-commit: 3cadaac30eba52743751ebb2b1a22f500475d63b
Signed-off-by: Jorge Pinna Puissant (jpp) <jpp@odoo.com>
Signed-off-by: Bastien Fafchamps (bafa) <bafa@odoo.com>
---
 addons/web/models/ir_http.py                  |  2 +-
 .../switch_company_menu.js                    | 25 +++++++-----
 .../tests/_framework/mock_session.hoot.js     |  1 +
 .../webclient/switch_company_menu.test.js     | 38 +++++++++++++++++++
 addons/web/tests/test_session_info.py         |  6 ++-
 5 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py
index 4a0a50ab55633..f8dad4038979b 100644
--- a/addons/web/models/ir_http.py
+++ b/addons/web/models/ir_http.py
@@ -147,7 +147,7 @@ def session_info(self):
                             'id': comp.id,
                             'name': comp.name,
                             'sequence': comp.sequence,
-                            'child_ids': (comp.child_ids & user_companies).ids,
+                            'child_ids': (comp.child_ids & all_companies_in_hierarchy_sudo).ids,
                             'parent_id': comp.parent_id.id,
                             'currency_id': comp.currency_id.id,
                         } for comp in user_companies
diff --git a/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.js b/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.js
index d0dc17750676c..37a984a4b115d 100644
--- a/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.js
+++ b/addons/web/static/src/webclient/switch_company_menu/switch_company_menu.js
@@ -107,30 +107,37 @@ export class CompanySelector {
     }
 
     _selectCompany(companyId, unshift = false) {
-        if (!this.selectedCompaniesIds.includes(companyId)) {
-            if (unshift) {
+        if (this._isCompanyAllowed(companyId)) {
+            if (!this.selectedCompaniesIds.includes(companyId)) {
+                if (unshift) {
+                    this.selectedCompaniesIds.unshift(companyId);
+                } else {
+                    this.selectedCompaniesIds.push(companyId);
+                }
+            } else if (unshift) {
+                const index = this.selectedCompaniesIds.findIndex((c) => c === companyId);
+                this.selectedCompaniesIds.splice(index, 1);
                 this.selectedCompaniesIds.unshift(companyId);
-            } else {
-                this.selectedCompaniesIds.push(companyId);
             }
-        } else if (unshift) {
-            const index = this.selectedCompaniesIds.findIndex((c) => c === companyId);
-            this.selectedCompaniesIds.splice(index, 1);
-            this.selectedCompaniesIds.unshift(companyId);
         }
+
         this._getBranches(companyId).forEach((companyId) => this._selectCompany(companyId));
     }
 
     _deselectCompany(companyId) {
         if (this.selectedCompaniesIds.includes(companyId)) {
             this.selectedCompaniesIds.splice(this.selectedCompaniesIds.indexOf(companyId), 1);
-            this._getBranches(companyId).forEach((companyId) => this._deselectCompany(companyId));
         }
+        this._getBranches(companyId).forEach((companyId) => this._deselectCompany(companyId));
     }
 
     _getBranches(companyId) {
         return getCompany(companyId).child_ids || [];
     }
+    
+    _isCompanyAllowed(companyId) {
+        return user.allowedCompanies.some((c) => c.id == companyId);
+    }
 
     _isSingleCompanyMode() {
         if (this.selectedCompaniesIds.length === 1) {
diff --git a/addons/web/static/tests/_framework/mock_session.hoot.js b/addons/web/static/tests/_framework/mock_session.hoot.js
index 4997a65838198..12c5ab50c6df7 100644
--- a/addons/web/static/tests/_framework/mock_session.hoot.js
+++ b/addons/web/static/tests/_framework/mock_session.hoot.js
@@ -49,6 +49,7 @@ const makeSession = ({
     user_companies: {
         allowed_companies: Object.fromEntries(companies.map((company) => [company.id, company])),
         current_company: companies[0]?.id,
+        disallowed_ancestor_companies: {},
     },
     user_context: {
         ...userContext,
diff --git a/addons/web/static/tests/webclient/switch_company_menu.test.js b/addons/web/static/tests/webclient/switch_company_menu.test.js
index 052f15e3288c4..3078029a031c3 100644
--- a/addons/web/static/tests/webclient/switch_company_menu.test.js
+++ b/addons/web/static/tests/webclient/switch_company_menu.test.js
@@ -644,3 +644,41 @@ test("de-select only changes visible companies", async () => {
         1
     );
 });
+
+test("disallowed companies in between allowed companies are not enabled", async () => {
+    cookie.set("cids", "3");
+    serverState.companies = [
+        { id: 1, name: "Parent", sequence: 1, parent_id: false, child_ids: [2] },
+        { id: 2, name: "Child A", sequence: 2, parent_id: 1, child_ids: [3] },
+        { id: 3, name: "Child B", sequence: 3, parent_id: 2, child_ids: [] },
+    ];
+
+    patchWithCleanup(user.allowedCompanies, [serverState.companies[0], serverState.companies[2]]);
+
+    await createSwitchCompanyMenu();
+
+    /**
+     *   [ ] Parent
+     *   [ ]    Child A
+     *   [x]        Child B
+     */
+    expect(user.activeCompanies.map((c) => c.id)).toEqual([3]);
+    expect(user.activeCompany.id).toBe(3);
+    await openCompanyMenu();
+    expect("[data-company-id]").toHaveCount(3);
+    expect("[data-company-id] .fa-check-square").toHaveCount(1);
+    expect("[data-company-id] .fa-square-o").toHaveCount(2);
+
+    /**
+     *   [x] Parent -> toggle
+     *   [ ]    Child A
+     *   [x]        Child B
+     */
+    await contains(".log_into:eq(0)").click();
+    expect(cookie.get("cids")).toEqual("1-3");
+
+    await openCompanyMenu();
+    await toggleCompany(0);
+    expect("[data-company-id] .fa-check-square").toHaveCount(0);
+    expect("[data-company-id] .fa-square-o").toHaveCount(3);
+});
diff --git a/addons/web/tests/test_session_info.py b/addons/web/tests/test_session_info.py
index b95344c8f5be7..d36d072eb41cc 100644
--- a/addons/web/tests/test_session_info.py
+++ b/addons/web/tests/test_session_info.py
@@ -16,8 +16,10 @@ def setUpClass(cls):
         cls.company_b = cls.env['res.company'].create({'name': "B"})
         cls.company_c = cls.env['res.company'].create({'name': "C"})
         cls.company_b_branch = cls.env['res.company'].create({'name': "B Branch", 'parent_id': cls.company_b.id})
-        cls.allowed_companies = cls.company_a + cls.company_b_branch + cls.company_c
-        cls.disallowed_ancestor_companies = cls.company_b
+        cls.company_c_branch = cls.env['res.company'].create({'name': "C Branch", 'parent_id': cls.company_c.id})
+        cls.company_c_branch_branch = cls.env['res.company'].create({'name': "C Branch Branch", 'parent_id': cls.company_c_branch.id})
+        cls.allowed_companies = cls.company_a + cls.company_b_branch + cls.company_c + cls.company_c_branch_branch
+        cls.disallowed_ancestor_companies = cls.company_b + cls.company_c_branch
 
         cls.user_password = "info"
         cls.user = common.new_test_user(

From 3bd7a86fac8e6ecc78e968d7a542aedfc44da404 Mon Sep 17 00:00:00 2001
From: "Julien (jdeh)" <jdeh@odoo.com>
Date: Thu, 9 Oct 2025 11:12:46 +0200
Subject: [PATCH 238/673] [IMP] project: kanban substasks redesign

This commit aims to improve the display of substaks in the kanban view,
by changing the position of the label above the title, and by reviewing
the icon associated to substasks in both the parent and child card.

task-5000360

closes odoo/odoo#230738

Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/project/static/src/views/widget/subtask_counter.xml | 2 +-
 addons/project/views/project_task_views.xml                | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/project/static/src/views/widget/subtask_counter.xml b/addons/project/static/src/views/widget/subtask_counter.xml
index c47fd32fb8a82..bdba722322c4f 100644
--- a/addons/project/static/src/views/widget/subtask_counter.xml
+++ b/addons/project/static/src/views/widget/subtask_counter.xml
@@ -6,7 +6,7 @@
         <a t-att-title="counterTitle"
            class="subtask_list_button btn-link text-dark"
            t-on-click.prevent="() => this.onClick()">
-            <span class="fa fa-check-square-o me-1"/>
+            <i class="fa fa-level-down me-1"></i>
             <t t-esc="counterDisplay"/>
         </a>
     </t>
diff --git a/addons/project/views/project_task_views.xml b/addons/project/views/project_task_views.xml
index cb7dff999e4e6..02712cc5067e0 100644
--- a/addons/project/views/project_task_views.xml
+++ b/addons/project/views/project_task_views.xml
@@ -699,9 +699,12 @@
                         </t>
                         <t t-name="card">
                             <main t-att-class="['1_done', '1_canceled'].includes(record.state.raw_value) ? 'opacity-50' : ''">
+                                <a t-if="record.parent_id.raw_value" class="o_kanban_parent mw-100 me-auto pe-3 btn-link o_small-fs text-dark text-truncate" title="See Parent Task" name="action_open_parent_task" type="object" role="button">
+                                    <i class="fa fa-level-down me-1"/>
+                                    <field name="parent_id"/>
+                                </a>
                                 <field name="name" class="fw-bold fs-5"/>
                                 <div class="text-muted d-flex flex-column">
-                                    <field t-if="record.parent_id.raw_value" invisible="context.get('default_parent_id', False)" name="parent_id"/>
                                     <field invisible="context.get('default_project_id', False)" name="project_id" options="{'no_open': True}"/>
                                     <field name="partner_id" invisible="context.get('template_project')"/>
                                     <field t-if="record.allow_milestones.raw_value and record.milestone_id.raw_value" t-att-class="record.has_late_and_unreached_milestone.raw_value and !record.state.raw_value.startsWith('1_') ? 'text-danger' : ''" name="milestone_id" options="{'no_open': True}"/>
@@ -724,7 +727,7 @@
                                         <t t-if="record.project_id.raw_value and record.subtask_count.raw_value">
                                             <widget name="subtask_counter" class="me-1"/>
                                         </t>
-                                        <field name="priority" class="pt-1" widget="priority"/>
+                                        <field name="priority" class="lh-1" widget="priority"/>
                                         <field name="is_rotting" invisible="1"/>
                                         <field name="rotting_days" widget="rotting" class="ms-1 d-flex"/>
                                     </div>

From d56d0ed6ad6d7d34ebf7bcdac0afcba11d8371c1 Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 5 Nov 2025 14:18:55 +0100
Subject: [PATCH 239/673] [IMP] mail,im_livechat: update models.d.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#234551

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../src/core/public_web/@types/models.d.ts    |  7 -------
 .../public_web/discuss_app/@types/models.d.ts |  9 ++++++++
 .../src/core/public_web/@types/models.d.ts    |  9 --------
 .../public_web/discuss_app/@types/models.d.ts | 13 ++++++++++++
 .../discuss/core/common/@types/models.d.ts    |  6 +++---
 .../core/public_web/@types/models.d.ts        | 18 +++++++---------
 .../public_web/discuss_app/@types/models.d.ts | 21 +++++++++++++++++++
 7 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 addons/im_livechat/static/src/core/public_web/discuss_app/@types/models.d.ts
 create mode 100644 addons/mail/static/src/core/public_web/discuss_app/@types/models.d.ts
 create mode 100644 addons/mail/static/src/discuss/core/public_web/discuss_app/@types/models.d.ts

diff --git a/addons/im_livechat/static/src/core/public_web/@types/models.d.ts b/addons/im_livechat/static/src/core/public_web/@types/models.d.ts
index cc302d73df325..d6bf4809322be 100644
--- a/addons/im_livechat/static/src/core/public_web/@types/models.d.ts
+++ b/addons/im_livechat/static/src/core/public_web/@types/models.d.ts
@@ -1,11 +1,4 @@
 declare module "models" {
-    export interface DiscussApp {
-        defaultLivechatCategory: DiscussAppCategory;
-        livechats: DiscussChannel[];
-    }
-    export interface DiscussAppCategory {
-        livechat_channel_id: LivechatChannel;
-    }
     export interface DiscussChannel {
         appAsLivechats: DiscussApp;
     }
diff --git a/addons/im_livechat/static/src/core/public_web/discuss_app/@types/models.d.ts b/addons/im_livechat/static/src/core/public_web/discuss_app/@types/models.d.ts
new file mode 100644
index 0000000000000..8a80b636bfaa7
--- /dev/null
+++ b/addons/im_livechat/static/src/core/public_web/discuss_app/@types/models.d.ts
@@ -0,0 +1,9 @@
+declare module "models" {
+    export interface DiscussApp {
+        defaultLivechatCategory: DiscussAppCategory;
+        livechats: DiscussChannel[];
+    }
+    export interface DiscussAppCategory {
+        livechat_channel_id: LivechatChannel;
+    }
+}
diff --git a/addons/mail/static/src/core/public_web/@types/models.d.ts b/addons/mail/static/src/core/public_web/@types/models.d.ts
index 1eb5eb8c474d6..a3610e09e4dd6 100644
--- a/addons/mail/static/src/core/public_web/@types/models.d.ts
+++ b/addons/mail/static/src/core/public_web/@types/models.d.ts
@@ -1,12 +1,7 @@
 declare module "models" {
-    import { DiscussApp as DiscussAppClass } from "@mail/core/public_web/discuss_app/discuss_app_model";
-
-    export interface DiscussApp extends DiscussAppClass {}
-
     export interface Store {
         action_discuss_id: number|undefined;
         discuss: DiscussApp;
-        DiscussApp: StaticMailRecord<DiscussApp, typeof DiscussAppClass>;
     }
     export interface Thread {
         askLeaveConfirmation: (body: string) => Promise<void>;
@@ -17,8 +12,4 @@ declare module "models" {
         setAsDiscussThread: (pushState: boolean) => void;
         unpin: () => Promise<void>;
     }
-
-    export interface Models {
-        DiscussApp: DiscussApp;
-    }
 }
diff --git a/addons/mail/static/src/core/public_web/discuss_app/@types/models.d.ts b/addons/mail/static/src/core/public_web/discuss_app/@types/models.d.ts
new file mode 100644
index 0000000000000..a73d00f25343c
--- /dev/null
+++ b/addons/mail/static/src/core/public_web/discuss_app/@types/models.d.ts
@@ -0,0 +1,13 @@
+declare module "models" {
+    import { DiscussApp as DiscussAppClass } from "@mail/core/public_web/discuss_app/discuss_app_model";
+
+    export interface DiscussApp extends DiscussAppClass {}
+
+    export interface Store {
+        DiscussApp: StaticMailRecord<DiscussApp, typeof DiscussAppClass>;
+    }
+
+    export interface Models {
+        DiscussApp: DiscussApp;
+    }
+}
diff --git a/addons/mail/static/src/discuss/core/common/@types/models.d.ts b/addons/mail/static/src/discuss/core/common/@types/models.d.ts
index ca54b4d1af838..6e8133ff8c5c5 100644
--- a/addons/mail/static/src/discuss/core/common/@types/models.d.ts
+++ b/addons/mail/static/src/discuss/core/common/@types/models.d.ts
@@ -9,6 +9,7 @@ declare module "models" {
         channelMembers: ChannelMember[];
     }
     export interface Message {
+        channel_id: DiscussChannel;
         channelMemberHaveSeen: Readonly<ChannelMember[]>;
         hasEveryoneSeen: boolean|undefined;
         hasNewMessageSeparator: boolean;
@@ -36,6 +37,7 @@ declare module "models" {
     }
     export interface Thread {
         _computeOfflineMembers: () => ChannelMember[];
+        allow_invite_by_email: Readonly<boolean>;
         allowCalls: Readonly<boolean>;
         allowDescription: Readonly<boolean>;
         allowedToLeaveChannelTypes: Readonly<string[]>;
@@ -61,7 +63,6 @@ declare module "models" {
         firstUnreadMessage: Message;
         group_ids: ResGroups[];
         hasMemberList: Readonly<boolean>;
-        hasOtherMembersTyping: boolean;
         hasSeenFeature: boolean;
         hasSelfAsMember: Readonly<boolean>;
         invitationLink: Readonly<unknown|string>;
@@ -72,6 +73,7 @@ declare module "models" {
         lastMessageSeenByAllId: undefined|number;
         lastSelfMessageSeenByEveryone: Message;
         leaveChannel: () => Promise<void>;
+        leaveChannelRpc: () => void;
         markAsFetched: () => Promise<void>;
         markedAsUnread: boolean;
         markingAsRead: boolean;
@@ -83,7 +85,6 @@ declare module "models" {
         notifyDescriptionToServer: (description: unknown) => Promise<unknown>;
         offlineMembers: ChannelMember[];
         onlineMembers: ChannelMember[];
-        otherTypingMembers: ChannelMember[];
         rename: (name: string) => Promise<void>;
         scrollUnread: boolean;
         self_member_id: ChannelMember;
@@ -91,7 +92,6 @@ declare module "models" {
         showUnreadBanner: Readonly<boolean>;
         toggleBusSubscription: boolean;
         typesAllowingCalls: Readonly<string[]>;
-        typingMembers: ChannelMember[];
         unknownMembersCount: Readonly<number>;
     }
 
diff --git a/addons/mail/static/src/discuss/core/public_web/@types/models.d.ts b/addons/mail/static/src/discuss/core/public_web/@types/models.d.ts
index 96e6af5d06d47..0272bd10eed62 100644
--- a/addons/mail/static/src/discuss/core/public_web/@types/models.d.ts
+++ b/addons/mail/static/src/discuss/core/public_web/@types/models.d.ts
@@ -1,26 +1,22 @@
 declare module "models" {
-    import { DiscussAppCategory as DiscussAppCategoryClass } from "@mail/discuss/core/public_web/discuss_app/discuss_app_category_model";
+    import { DiscussCategory as DiscussCategoryClass } from "@mail/discuss/core/public_web/discuss_category_model";
 
-    export interface DiscussAppCategory extends DiscussAppCategoryClass {}
+    export interface DiscussCategory extends DiscussCategoryClass {}
 
-    export interface DiscussApp {
-        allCategories: DiscussAppCategory[];
-        channelCategory: DiscussAppCategory;
-        chatCategory: DiscussAppCategory;
-        computeChatCategory: () => object;
-        unreadChannels: Thread[];
+    export interface DiscussChannel {
+        discuss_category_id: DiscussCategory;
     }
     export interface Message {
         linkedSubChannel: Thread;
     }
     export interface Store {
         channels: ReturnType<Store['makeCachedFetchData']>;
-        DiscussAppCategory: StaticMailRecord<DiscussAppCategory, typeof DiscussAppCategoryClass>;
+        "discuss.category": StaticMailRecord<DiscussCategory, typeof DiscussCategoryClass>;
         fetchSsearchConversationsSequential: () => Promise<any>;
         searchConversations: (searchValue: string) => Promise<void>;
     }
     export interface Thread {
-        _computeDiscussAppCategory: () => undefined|unknown;
+        _computeDiscussAppCategory: () => unknown;
         appAsUnreadChannels: DiscussApp;
         categoryAsThreadWithCounter: DiscussAppCategory;
         createSubChannel: (param0: { initialMessage: Message, name: string }) => Promise<void>;
@@ -37,6 +33,6 @@ declare module "models" {
     }
 
     export interface Models {
-        DiscussAppCategory: DiscussAppCategory;
+        "discuss.category": DiscussCategory;
     }
 }
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/@types/models.d.ts b/addons/mail/static/src/discuss/core/public_web/discuss_app/@types/models.d.ts
new file mode 100644
index 0000000000000..4f0c0884f34dd
--- /dev/null
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/@types/models.d.ts
@@ -0,0 +1,21 @@
+declare module "models" {
+    import { DiscussAppCategory as DiscussAppCategoryClass } from "@mail/discuss/core/public_web/discuss_app/discuss_app_category_model";
+
+    export interface DiscussAppCategory extends DiscussAppCategoryClass {}
+
+    export interface DiscussApp {
+        allCategories: DiscussAppCategory[];
+        channelCategory: DiscussAppCategory;
+        chatCategory: DiscussAppCategory;
+        computeChatCategory: () => object;
+        favoriteCategory: DiscussAppCategory;
+        unreadChannels: Thread[];
+    }
+    export interface Store {
+        DiscussAppCategory: StaticMailRecord<DiscussAppCategory, typeof DiscussAppCategoryClass>;
+    }
+
+    export interface Models {
+        DiscussAppCategory: DiscussAppCategory;
+    }
+}

From ae4824640665fc639e03a13c341f18e73060349e Mon Sep 17 00:00:00 2001
From: Gorash <chm@odoo.com>
Date: Wed, 1 Oct 2025 08:55:42 +0200
Subject: [PATCH 240/673] [IMP] base: Warning on unused attributes in ir.qweb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds a warning for attributes on `<t>` tags that are not consumed during
QWeb template rendering.

This change helps to:
- Clean up existing code by identifying unused attributes (e.g.,
unnecessary class attributes).
- Fix common errors where developers mistakenly used standard HTML
attributes instead of QWeb directives (e.g., `if` instead of `t-if`).

The `name` attribute is explicitly added to the list of allowed
attributes that will not trigger the warning, as it is heavily used
across Odoo views for inheritance. The inheritance branding attributes
(e.g., `data-oe-model`) are also exempted.

closes odoo/odoo#230718

Related: odoo/enterprise#96704
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/account/views/report_invoice.xml       |  2 +-
 .../data/mail_templates_email_layouts.xml     |  2 +-
 addons/html_editor/models/ir_qweb_fields.py   | 37 ++++++++-------
 .../l10n_gcc_invoice/views/report_invoice.xml |  4 +-
 .../l10n_in_ewaybill/views/edi_pdf_report.xml |  1 -
 addons/l10n_sa/views/report_invoice.xml       |  8 ++--
 .../data/mail_templates_email_layouts.xml     |  6 +--
 addons/payment/views/portal_templates.xml     |  4 +-
 .../views/pos_session_sales_details.xml       |  2 +-
 addons/stock_account/views/report_invoice.xml |  2 +-
 .../survey/views/survey_templates_print.xml   |  4 +-
 .../test_website/data/test_website_data.xml   |  9 ++--
 addons/web/views/webclient_templates.xml      |  4 +-
 addons/website/controllers/main.py            |  9 ++--
 addons/website/models/ir_qweb.py              | 13 +++++
 .../options/dynamic_snippet_option_plugin.js  | 12 ++---
 addons/website/views/snippets/snippets.xml    |  2 -
 addons/website/views/website_templates.xml    |  2 +-
 .../views/snippets/s_blog_posts.xml           | 47 ++++++++++++-------
 .../website_event/views/snippets/s_events.xml | 40 ++++++++++------
 .../views/forum_forum_templates_post.xml      |  2 +-
 .../templates/shop_page_templates.xml         |  2 +-
 .../product_snippet_template_data.xml         | 10 ++--
 odoo/addons/base/models/ir_qweb.py            | 41 +++++++++-------
 odoo/addons/base/tests/test_qweb.py           |  2 +-
 odoo/import_xml.rng                           | 13 +++++
 odoo/tools/convert.py                         | 39 +++++++--------
 odoo/tools/mail.py                            | 25 +++++-----
 28 files changed, 202 insertions(+), 142 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 7b91760e6b6fe..d715cc643a653 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -435,7 +435,7 @@
                                                         <span t-out="term_index + 1">1</span> - Installment of
                                                         <t t-options='{"widget": "monetary", "display_currency": o.currency_id}' t-out="term.get('amount')" class="text-end">31.05</t>
                                                         <span> due on </span>
-                                                        <t t-out="term.get('date')" class="text-start">2024-01-01</t>
+                                                        <t t-out="term.get('date')">2024-01-01</t>
                                                     </div>
                                                 </t>
                                             </div>
diff --git a/addons/account_peppol/data/mail_templates_email_layouts.xml b/addons/account_peppol/data/mail_templates_email_layouts.xml
index 9c26b16533212..b7b3a43235978 100644
--- a/addons/account_peppol/data/mail_templates_email_layouts.xml
+++ b/addons/account_peppol/data/mail_templates_email_layouts.xml
@@ -5,7 +5,7 @@
                   name="Mail: mail notification layout with responsible signature (user_id of the record) and Peppol status"
                   inherit_id="mail.mail_notification_layout_with_responsible_signature"
                   primary="True">
-            <xpath expr="//t[hasclass('o_signature')]" position="after">
+            <xpath expr="//t[@name='o_signature']" position="after">
                 <div id="peppol_status" t-if="peppol_info" style="font-size: 13px;">
                     <br/><br/>
                     <t t-if="peppol_info['is_peppol_sent']">
diff --git a/addons/html_editor/models/ir_qweb_fields.py b/addons/html_editor/models/ir_qweb_fields.py
index 4cd219bafae8d..e5fd593b224fc 100644
--- a/addons/html_editor/models/ir_qweb_fields.py
+++ b/addons/html_editor/models/ir_qweb_fields.py
@@ -39,42 +39,42 @@ class IrQweb(models.AbstractModel):
     """
     _inherit = 'ir.qweb'
 
-    def _compile_node(self, el, compile_context, level):
-        snippet_key = compile_context.get('snippet-key')
+    def _compile_root(self, element, compile_context):
+        snippet_key = compile_context.pop('snippet-key', None)
+        sub_call_key = compile_context.pop('snippet-sub-call-key', None)
 
         template = compile_context['ref_name']
-        sub_call_key = compile_context.get('snippet-sub-call-key')
 
         # We only add the 'data-snippet' & 'data-name' attrib once when
         # compiling the root node of the template.
-        if not template or template not in {snippet_key, sub_call_key} or el.getparent() is not None:
-            return super()._compile_node(el, compile_context, level)
+        if not template or template not in {snippet_key, sub_call_key}:
+            return super()._compile_root(element, compile_context)
 
-        snippet_base_node = el
-        if el.tag == 't':
-            el_children = [child for child in list(el) if isinstance(child.tag, str) and child.tag != 't']
+        snippet_base_node = element
+        if element.tag == 't':
+            el_children = [child for child in list(element) if isinstance(child.tag, str) and child.tag != 't']
             if len(el_children) == 1:
                 snippet_base_node = el_children[0]
             elif not el_children:
                 # If there's not a valid base node we check if the base node is
                 # a t-call to another template. If so the called template's base
                 # node must take the current snippet key.
-                el_children = [child for child in list(el) if isinstance(child.tag, str)]
+                el_children = [child for child in list(element) if isinstance(child.tag, str)]
                 if len(el_children) == 1:
                     sub_call = el_children[0].get('t-call')
                     if sub_call:
                         el_children[0].set('t-options', f"{{'snippet-key': '{snippet_key}', 'snippet-sub-call-key': '{sub_call}'}}")
         # If it already has a data-snippet it is a saved or an
         # inherited snippet. Do not override it.
-        if 'data-snippet' not in snippet_base_node.attrib:
+        if snippet_base_node.tag != 't' and 'data-snippet' not in snippet_base_node.attrib:
             snippet_base_node.attrib['data-snippet'] = \
                 snippet_key.split('.', 1)[-1]
         # If it already has a data-name it is a saved or an
         # inherited snippet. Do not override it.
-        snippet_name = compile_context.get('snippet-name')
-        if snippet_name and 'data-name' not in snippet_base_node.attrib:
+        snippet_name = compile_context.pop('snippet-name', None)
+        if snippet_base_node.tag != 't' and snippet_name and 'data-name' not in snippet_base_node.attrib:
             snippet_base_node.attrib['data-name'] = snippet_name
-        return super()._compile_node(el, compile_context, level)
+        return super()._compile_root(element, compile_context)
 
     def _get_preload_attribute_xmlids(self):
         return super()._get_preload_attribute_xmlids() + ['t-snippet', 't-snippet-call']
@@ -130,19 +130,21 @@ def _compile_directive_install(self, el, compile_context, indent):
         key = el.attrib.pop('t-install')
         thumbnail = el.attrib.pop('t-thumbnail', 'oe-thumbnail')
         image_preview = el.attrib.pop('t-image-preview', None)
+        snippet_group = el.attrib.pop('snippet-group', None)
         group = el.attrib.pop('group', None)
         label = el.attrib.pop('label', None)
+        name = el.attrib.pop('string', 'Snippet')
         if self.env.user.has_group('base.group_system'):
             module = self.env['ir.module.module'].search([('name', '=', key)])
             if not module or module.state == 'installed':
                 return []
-            name = el.attrib.get('string') or 'Snippet'
-            div = Markup('<div name="%s" data-oe-type="snippet" data-module-id="%s" data-module-display-name="%s" data-o-image-preview="%s" data-oe-thumbnail="%s" %s %s><section/></div>') % (
+            div = Markup('<div name="%s" data-oe-type="snippet" data-module-id="%s" data-module-display-name="%s" data-o-image-preview="%s" data-oe-thumbnail="%s" %s %s %s><section/></div>') % (
                 name,
                 module.id,
                 module.display_name,
                 escape_silent(image_preview),
                 thumbnail,
+                Markup('data-o-snippet-group="%s"') % snippet_group if snippet_group else '',
                 Markup('data-o-group="%s"') % group if group else '',
                 Markup('data-o-label="%s"') % label if label else '',
             )
@@ -157,12 +159,15 @@ def _compile_directive_placeholder(self, el, compile_context, indent):
 
     def _directives_eval_order(self):
         directives = super()._directives_eval_order()
+        # Insert before "call" and "options" to use this "call" directive after this one
+        index = directives.index('options') - 1
+        directives.insert(index, 'snippet-call')
+
         # Insert before "att" as those may rely on static attributes like
         # "string" and "att" clears all of those
         index = directives.index('att') - 1
         directives.insert(index, 'placeholder')
         directives.insert(index, 'snippet')
-        directives.insert(index, 'snippet-call')
         directives.insert(index, 'install')
         return directives
 
diff --git a/addons/l10n_gcc_invoice/views/report_invoice.xml b/addons/l10n_gcc_invoice/views/report_invoice.xml
index 0f3d85530921c..3cf87ee9ec8f5 100644
--- a/addons/l10n_gcc_invoice/views/report_invoice.xml
+++ b/addons/l10n_gcc_invoice/views/report_invoice.xml
@@ -177,7 +177,7 @@
                         <span t-out="term_index + 1">1</span> - دفعة من
                         <t t-options='{"widget": "monetary", "display_currency": o_sec.currency_id}' t-out="term.get('amount')" class="text-end">31.05</t>
                         <span> مستحق في </span>
-                        <t t-out="term.get('date')" class="text-start">2024-01-01</t>
+                        <t t-out="term.get('date')">2024-01-01</t>
                     </div>
                 </t>
                 <t name="div_payment_term_en" t-if="len(payment_term_details_sec) > 1 and display_in_en" t-foreach="payment_term_details_sec" t-as="term" t-translation="off">
@@ -185,7 +185,7 @@
                         <span t-out="term_index + 1">1</span> - Installment of
                         <t t-options='{"widget": "monetary", "display_currency": o_sec.currency_id}' t-out="term.get('amount')" class="text-end">31.05</t>
                         <span> due on </span>
-                        <t t-out="term.get('date')" class="text-start">2024-01-01</t>
+                        <t t-out="term.get('date')">2024-01-01</t>
                     </div>
                 </t>
             </xpath>
diff --git a/addons/l10n_in_ewaybill/views/edi_pdf_report.xml b/addons/l10n_in_ewaybill/views/edi_pdf_report.xml
index 835744bd08e67..a6221d1c431a6 100644
--- a/addons/l10n_in_ewaybill/views/edi_pdf_report.xml
+++ b/addons/l10n_in_ewaybill/views/edi_pdf_report.xml
@@ -10,7 +10,6 @@
                 <p t-if="o.l10n_in_ewaybill_name" class="m-0" t-out="o.l10n_in_ewaybill_name"/>
                 Until: 
                 <t t-if="o.l10n_in_ewaybill_expiry_date"
-                   class="m-0"
                    t-out="o.l10n_in_ewaybill_expiry_date"/>
             </div>
         </xpath>
diff --git a/addons/l10n_sa/views/report_invoice.xml b/addons/l10n_sa/views/report_invoice.xml
index 54eb9f62eaa4a..b1d81918b704b 100644
--- a/addons/l10n_sa/views/report_invoice.xml
+++ b/addons/l10n_sa/views/report_invoice.xml
@@ -218,12 +218,12 @@
             <span name="untaxed_amount_en" t-if="display_in_en" t-translation="off" class="text-nowrap">Invoice Taxable Amount</span>
         </span>
         <span t-out="tax_group['group_name']" position="after">
-            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']" class="text-nowrap">
+            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']">
                 / <span t-out="tax_group_sec['group_name']"/>
             </t>
         </span>
         <xpath expr="//tr[hasclass('o_taxes')]/t[@t-else='']//span" position="after">
-            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']" class="text-nowrap">
+            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']">
                 / <span t-out="tax_group_sec['group_name']"/>
             </t>
         </xpath>
@@ -255,12 +255,12 @@
             <span name="untaxed_amount_en" t-if="display_in_en" t-translation="off" class="text-nowrap">Invoice Taxable Amount</span>
         </span>
         <span t-out="tax_group['group_name']" position="after">
-            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']" class="text-nowrap">
+            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']">
                 / <span t-out="tax_group_sec['group_name']"/>
             </t>
         </span>
         <xpath expr="//tr[hasclass('o_taxes')]/t[@t-else='']//span" position="after">
-            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']" class="text-nowrap">
+            <t t-if="display_in_lang_sec and tax_group_sec['group_name'] != tax_group['group_name']">
                 / <span t-out="tax_group_sec['group_name']"/>
             </t>
         </xpath>
diff --git a/addons/mail/data/mail_templates_email_layouts.xml b/addons/mail/data/mail_templates_email_layouts.xml
index 1d1f5d6a96e16..09f8ab196808d 100644
--- a/addons/mail/data/mail_templates_email_layouts.xml
+++ b/addons/mail/data/mail_templates_email_layouts.xml
@@ -67,7 +67,7 @@
         <li><t t-out="tracking[0]"/>: <t t-if="tracking[1]" t-out="tracking[1]"/><em t-else="">None</em> &#8594; <t t-if="tracking[2]" t-out="tracking[2]"/><em t-else="">None</em></li>
     </t>
 </ul>
-<t class="o_signature">
+<t name="o_signature">
     <div t-if="email_add_signature and not is_html_empty(signature)" t-out="signature" class="o_signature" style="font-size: 13px;"/>
 </t>
 <!-- FOOTER -->
@@ -184,8 +184,8 @@
         <template id="mail_notification_layout_with_responsible_signature"
                   name="Mail: mail notification layout with responsible signature (user_id of the record)"
                   inherit_id="mail.mail_notification_layout" primary="True">
-            <xpath expr="//t[hasclass('o_signature')]" position="replace">
-                <t class="o_signature">
+            <xpath expr="//t[@name='o_signature']" position="replace">
+                <t name="o_signature">
                     <div t-if="email_add_signature and record and 'user_id' in record and record.user_id and not record.env.user._is_superuser() and not is_html_empty(record.user_id.sudo().signature)"
                          t-out="record.user_id.sudo().signature" class="o_signature" style="font-size: 13px;"/>
                 </t>
diff --git a/addons/payment/views/portal_templates.xml b/addons/payment/views/portal_templates.xml
index 86b0b189a5b84..eb30f8fef6b8c 100644
--- a/addons/payment/views/portal_templates.xml
+++ b/addons/payment/views/portal_templates.xml
@@ -351,8 +351,8 @@
             </div>
             <div id="o_payment_status_message" class="w-100">
                 <h5 t-if="status_heading" t-out="status_heading" class="alert-heading mb-0"/>
-                <t t-if="status_message" t-out="status_message" class="mb-0"/>
-                <t t-if="tx.state_message" t-out="tx.state_message" class="mb-0"/>
+                <t t-if="status_message" t-out="status_message"/>
+                <t t-if="tx.state_message" t-out="tx.state_message"/>
             </div>
             <a t-if="is_processing"
                t-att-href="tx.landing_route"
diff --git a/addons/point_of_sale/views/pos_session_sales_details.xml b/addons/point_of_sale/views/pos_session_sales_details.xml
index 859e295e61cd8..68806400d948b 100644
--- a/addons/point_of_sale/views/pos_session_sales_details.xml
+++ b/addons/point_of_sale/views/pos_session_sales_details.xml
@@ -328,7 +328,7 @@
                     <h6 class="bg-secondary p-1 fw-bold">Invoices</h6>
                     <table  class="table table-sm table-borderless" >
                         <tbody>
-                        <t t-foreach="invoiceList" t-as="invoiceSession" class="border-bottom border-secondary">
+                        <t t-foreach="invoiceList" t-as="invoiceSession">
                             <t t-if="invoiceSession['invoices']">
                                 <tr t-foreach='invoiceSession["invoices"]' t-as='invoice'>
                                     <td class="ps-2 fw-bold"><span t-out="invoice['name']">Invoice Name</span></td>
diff --git a/addons/stock_account/views/report_invoice.xml b/addons/stock_account/views/report_invoice.xml
index 02f9264856fcd..b6e40b6994314 100644
--- a/addons/stock_account/views/report_invoice.xml
+++ b/addons/stock_account/views/report_invoice.xml
@@ -20,7 +20,7 @@
                             <t t-out="snln_line['quantity']">6.00</t>
                             <t t-out="snln_line['uom_name']" groups="uom.group_uom">units</t>
                         </td>
-                        <td><t class="text-end" t-out="snln_line['lot_name']">BC46282798</t></td>
+                        <td><t t-out="snln_line['lot_name']">BC46282798</t></td>
                     </tr>
                 </tbody>
             </table>
diff --git a/addons/survey/views/survey_templates_print.xml b/addons/survey/views/survey_templates_print.xml
index 4350d6998dda9..ac32272e6bfdb 100644
--- a/addons/survey/views/survey_templates_print.xml
+++ b/addons/survey/views/survey_templates_print.xml
@@ -75,9 +75,7 @@
                                                 </t>
                                                 <t t-else="">
                                                     <t t-if="question.question_type == 'text_box'" t-call="survey.question_text_box"/>
-                                                    <t t-if="question.question_type == 'char_box'" class="o_survey_print o_survey_comment_container p-0">
-                                                        <span t-out="answer_lines[0].value_char_box or None"/>
-                                                    </t>
+                                                    <span t-if="question.question_type == 'char_box'" t-out="answer_lines[0].value_char_box or None" class="o_survey_print o_survey_comment_container p-0"/>
                                                     <t t-if="question.question_type == 'numerical_box'" t-call="survey.question_numerical_box"/>
                                                     <t t-if="question.question_type == 'date'" t-call="survey.question_date"/>
                                                     <t t-if="question.question_type == 'datetime'" t-call="survey.question_datetime"/>
diff --git a/addons/test_website/data/test_website_data.xml b/addons/test_website/data/test_website_data.xml
index d12df03f9c3de..b36be3642e7c5 100644
--- a/addons/test_website/data/test_website_data.xml
+++ b/addons/test_website/data/test_website_data.xml
@@ -42,8 +42,9 @@
             <field name="name">Test View</field>
             <field name="type">qweb</field>
             <field name="key">test_website.test_view</field>
+            <field name="priority">29</field>
             <field name="arch" type="xml">
-                <t name="Test View" priority="29" t-name="test_website.test_view">
+                <t name="Test View" t-name="test_website.test_view">
                     <t t-call="website.layout">
                         <p>Test View</p>
                         <p>placeholder</p>
@@ -55,8 +56,9 @@
             <field name="name">Test Page View</field>
             <field name="type">qweb</field>
             <field name="key">test_website.test_page_view</field>
+            <field name="priority">29</field>
             <field name="arch" type="xml">
-                <t name="Test Page View" priority="29" t-name="test_website.test_page_view">
+                <t name="Test Page View" t-name="test_website.test_page_view">
                     <t t-call="website.layout">
                         <div id="oe_structure_test_website_page" class="oe_structure oe_empty"/>
                         <p>Test Page View</p>
@@ -111,8 +113,9 @@
             <field name="name">Test View To Be t-called</field>
             <field name="type">qweb</field>
             <field name="key">test_website.test_view_to_be_t_called</field>
+            <field name="priority">29</field>
             <field name="arch" type="xml">
-                <t name="Test View To Be t-called" priority="29" t-name="test_website.test_view_to_be_t_called">
+                <t name="Test View To Be t-called" t-name="test_website.test_view_to_be_t_called">
                     <p>Test View To Be t-called</p>
                     <p>placeholder</p>
                 </t>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 62524d83a7f93..bb6b33d2b8280 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -300,9 +300,9 @@
                 <t t-else="">
                     <t t-call-assets="web.assets_web" media="screen" t-js="false"/>
                 </t>
-                <t t-call="web.conditional_assets_tests" media="screen"/>
+                <t t-call="web.conditional_assets_tests"/>
             </t>
-            <t t-set="head" t-value="head_web + (head or '')" media="screen"/>
+            <t t-set="head" t-value="head_web + (head or '')"/>
             <t t-set="body_classname" t-value="'o_web_client'"/>
         </t>
     </template>
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 55d9ef64f26f5..98a541a9e627d 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -450,11 +450,10 @@ def get_dynamic_snippet_templates(self, filter_name=False):
         templates = request.env['ir.ui.view'].sudo().search_read(domain, ['key', 'name', 'arch_db'])
 
         for t in templates:
-            children = etree.fromstring(t.pop('arch_db')).getchildren()
-            attribs = children and children[0].attrib or {}
-            t['numOfEl'] = attribs.get('data-number-of-elements')
-            t['numOfElSm'] = attribs.get('data-number-of-elements-sm')
-            t['numOfElFetch'] = attribs.get('data-number-of-elements-fetch')
+            attribs = etree.fromstring(t.pop('arch_db')).attrib or {}
+            t['numberOfElements'] = attribs.get('data-number-of-elements')
+            t['numberOfElementsSmallDevices'] = attribs.get('data-number-of-elements-sm')
+            t['numberOfRecords'] = attribs.get('data-number-of-elements-fetch')
             t['rowPerSlide'] = attribs.get('data-row-per-slide')
             t['arrowPosition'] = attribs.get('data-arrow-position')
             t['extraClasses'] = attribs.get('data-extra-classes')
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index c68c7f5f6fad7..b0010e26762b1 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -28,6 +28,19 @@ class IrQweb(models.AbstractModel):
         'img': 'src',
     }
 
+    def _compile_root(self, element, compile_context):
+        # Removes the attributes used by the "/website/snippet/filter_templates"
+        # controller and used only to be filtered without using irQweb rendering
+        for data_filter in [
+                'data-number-of-elements', 'data-number-of-elements-sm',
+                'data-number-of-elements-fetch', 'data-row-per-slide',
+                'data-arrow-position', 'data-extra-classes',
+                'data-extra-snippet-classes', 'data-container-classes',
+                'data-content-classes', 'data-column-classes', 'data-thumb',
+            ]:
+            element.attrib.pop(data_filter, None)
+        return super()._compile_root(element, compile_context)
+
     def _get_template(self, template):
         element, document, ref = super()._get_template(template)
         if self.env.context.get('website_id'):
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
index d2eb06d4999fa..baa2e519fb65b 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
@@ -140,18 +140,18 @@ class DynamicSnippetOptionPlugin extends Plugin {
         }
         el.classList.add(this.getTemplateClass(newTemplateKey));
 
-        if (template.numOfEl) {
-            el.dataset.numberOfElements = template.numOfEl;
+        if (template.numberOfElements) {
+            el.dataset.numberOfElements = template.numberOfElements;
         } else {
             delete el.dataset.numberOfElements;
         }
-        if (template.numOfElSm) {
-            el.dataset.numberOfElementsSmallDevices = template.numOfElSm;
+        if (template.numberOfElementsSmallDevices) {
+            el.dataset.numberOfElementsSmallDevices = template.numberOfElementsSmallDevices;
         } else {
             delete el.dataset.numberOfElementsSmallDevices;
         }
-        if (template.numOfElFetch) {
-            el.dataset.numberOfRecords = template.numOfElFetch;
+        if (template.numberOfRecords) {
+            el.dataset.numberOfRecords = template.numberOfRecords;
         }
         if (template.extraClasses) {
             el.dataset.extraClasses = template.extraClasses;
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 8655a660eb964..df5e4892a73fd 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -458,8 +458,6 @@
                 t-image-preview="/website/static/src/img/snippets_previews/s_facebook_preview.webp">
                 <keywords>social media, fb, feed</keywords>
             </t>
-            <!-- TODO: remove 'snippet_google_map_hook', it does not seem to be used -->
-            <t id="snippet_google_map_hook"/>
             <t t-set="google_maps_api_key" t-value="request.env['website'].get_current_website().google_maps_api_key"/>
             <t t-if="debug or not google_maps_api_key" t-snippet="website.s_map" string="Map"
                 t-thumbnail="/website/static/src/img/snippets_thumbs/s_map.svg" group="social"
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 1181a6c90fda5..340039ff38d55 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1919,7 +1919,7 @@
                                     <a href="#">Terms of Services</a>
                                 </li>
                                 <t t-set="configurator_footer_links" t-value="[]"/>
-                                <t t-foreach="configurator_footer_links" t-as="link" class="list-inline-item">
+                                <t t-foreach="configurator_footer_links" t-as="link">
                                     <li class="list-inline-item">•</li>
                                     <li class="list-inline-item">
                                         <a t-att-href="link['href']" t-out="link['text']"/>
diff --git a/addons/website_blog/views/snippets/s_blog_posts.xml b/addons/website_blog/views/snippets/s_blog_posts.xml
index 000b08a54f7d9..876eb71e35331 100644
--- a/addons/website_blog/views/snippets/s_blog_posts.xml
+++ b/addons/website_blog/views/snippets/s_blog_posts.xml
@@ -68,8 +68,10 @@
 
 <!-- Multi record "Load-time" templates (rendered in JS on page load) -->
 <!-- List layout -->
-<template id="dynamic_filter_template_blog_post_list" name="List">
-    <div t-foreach="records" t-as="data" class="s_blog_posts_post border-0 rounded-3" data-extra-classes="g-4" data-column-classes="col-12 col-sm-6 col-lg-4">
+<template id="dynamic_filter_template_blog_post_list" name="List"
+        data-extra-classes="g-4"
+        data-column-classes="col-12 col-sm-6 col-lg-4">
+    <div t-foreach="records" t-as="data" class="s_blog_posts_post border-0 rounded-3">
         <t t-set="record" t-value="data['_record']"/>
         <div class="d-flex flex-wrap mb-2 small">
             <span class="w-100 w-sm-auto">
@@ -90,8 +92,11 @@
     </div>
 </template>
 <!-- Big picture layout -->
-<template id="dynamic_filter_template_blog_post_big_picture" name="Big picture">
-    <div t-foreach="records" t-as="data" class="s_blog_posts_post position-relative w-100" data-extra-classes="g-3" data-column-classes="col-12 col-sm-6 col-lg-4" data-extra-snippet-classes="s_blog_posts_effect_marley s_blog_posts_post_picture_size_default">
+<template id="dynamic_filter_template_blog_post_big_picture" name="Big picture"
+        data-extra-classes="g-3"
+        data-column-classes="col-12 col-sm-6 col-lg-4"
+        data-extra-snippet-classes="s_blog_posts_effect_marley s_blog_posts_post_picture_size_default">
+    <div t-foreach="records" t-as="data" class="s_blog_posts_post position-relative w-100">
         <t t-set="record" t-value="data['_record']"/>
         <a class="s_blog_posts_post_cover position-relative d-block h-100 rounded shadow-sm overflow-hidden text-decoration-none text-reset ratio ratio-1x1" t-att-title="'Read ' + data['name']" t-att-href="data['call_to_action_url']">
             <t t-call="website.record_cover">
@@ -114,8 +119,9 @@
     </div>
 </template>
 <!-- Horizontal layout -->
-<template id="dynamic_filter_template_blog_post_horizontal" name="Horizontal">
-    <div t-foreach="records" t-as="data" class="s_blog_posts_post w-100" data-number-of-elements="1">
+<template id="dynamic_filter_template_blog_post_horizontal" name="Horizontal"
+        data-number-of-elements="1">
+    <div t-foreach="records" t-as="data" class="s_blog_posts_post w-100">
         <t t-set="record" t-value="data['_record']"/>
         <div t-attf-class="pb-4 {{not data_last and 'border-bottom'}}">
             <div class="row flex-md-nowrap">
@@ -150,8 +156,10 @@
     </div>
 </template>
 <!-- Card layout -->
-<template id="dynamic_filter_template_blog_post_card" name="Card">
-    <div t-foreach="records" t-as="data" class="s_blog_posts_post w-100" data-extra-classes="g-3" data-column-classes="col-12 col-sm-6 col-lg-4 col-xxl-3">
+<template id="dynamic_filter_template_blog_post_card" name="Card"
+        data-extra-classes="g-3"
+        data-column-classes="col-12 col-sm-6 col-lg-4 col-xxl-3">
+    <div t-foreach="records" t-as="data" class="s_blog_posts_post w-100">
         <t t-set="record" t-value="data['_record']"/>
         <div class="card h-100">
             <a class="text-decoration-none text-reset" t-att-href="data['call_to_action_url']" t-att-title="'Read ' + data['name']">
@@ -182,8 +190,10 @@
 
 <!-- Single record templates -->
 <!-- Full Layout -->
-<template id="dynamic_filter_template_blog_post_single_full" name="Solo Full">
-    <t t-if="len(records)" class="s_blog_posts_post" data-extra-snippet-classes="o_cc o_cc5" data-column-classes="col-lg-12">
+<template id="dynamic_filter_template_blog_post_single_full" name="Solo Full"
+        data-extra-snippet-classes="o_cc o_cc5"
+        data-column-classes="col-lg-12">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <div t-if="is_sample" class="position-absolute bottom-0 end-0 px-4 py-2 text-bg-info rounded-pill">Sample</div>
@@ -208,8 +218,9 @@
     </t>
 </template>
 <!-- Aside Layout -->
-<template id="dynamic_filter_template_blog_post_single_aside" name="Solo Aside">
-    <t t-if="len(records)" class="s_blog_posts_post" data-column-classes="col-lg-12">
+<template id="dynamic_filter_template_blog_post_single_aside" name="Solo Aside"
+        data-column-classes="col-lg-12">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <div t-if="is_sample" class="position-absolute bottom-0 end-0 px-4 py-2 text-bg-info rounded-pill">Sample</div>
@@ -240,8 +251,11 @@
     </t>
 </template>
 <!-- Circle Layout -->
-<template id="dynamic_filter_template_blog_post_single_circle" name="Solo Circle">
-    <t t-if="len(records)" class="s_blog_posts_post" data-extra-snippet-classes="o_cc o_cc2" data-column-classes="col-lg-12" data-container-classes="o_container_small">
+<template id="dynamic_filter_template_blog_post_single_circle" name="Solo Circle"
+        data-extra-snippet-classes="o_cc o_cc2"
+        data-column-classes="col-lg-12"
+        data-container-classes="o_container_small">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <div t-if="is_sample" class="position-absolute bottom-0 end-0 px-4 py-2 text-bg-info rounded-pill">Sample</div>
@@ -270,8 +284,9 @@
     </t>
 </template>
 <!-- CTA Badge Layout -->
-<template id="dynamic_filter_template_blog_post_single_badge" name="Solo Badge">
-    <t t-if="len(records)" class="s_blog_posts_post" data-column-classes="col-lg-12 text-center">
+<template id="dynamic_filter_template_blog_post_single_badge" name="Solo Badge"
+        data-column-classes="col-lg-12 text-center">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <div t-if="is_sample" class="position-absolute bottom-0 end-0 px-4 py-2 text-bg-info rounded-pill">Sample</div>
diff --git a/addons/website_event/views/snippets/s_events.xml b/addons/website_event/views/snippets/s_events.xml
index f469eb319c2f8..bd5f0bc0acee7 100644
--- a/addons/website_event/views/snippets/s_events.xml
+++ b/addons/website_event/views/snippets/s_events.xml
@@ -65,8 +65,10 @@
 
 <!-- Multi record templates-->
 <!-- Picture Layout -->
-<template id="dynamic_filter_template_event_event_picture" name="Picture Layout" priority="5">
-    <div t-foreach="records" t-as="data" class="s_events_event w-100" data-extra-classes="g-3" data-column-classes="col-12 col-sm-6 col-lg-4">
+<template id="dynamic_filter_template_event_event_picture" name="Picture Layout" priority="5"
+        data-extra-classes="g-3"
+        data-column-classes="col-12 col-sm-6 col-lg-4">
+    <div t-foreach="records" t-as="data" class="s_events_event w-100">
         <t t-set="record" t-value="data['_record']._set_tz_context()"/>
         <a class="s_events_event_cover position-relative d-flex align-items-center rounded overflow-hidden text-decoration-none ratio ratio-1x1"
            t-att-href="data['call_to_action_url']">
@@ -95,8 +97,10 @@
     </div>
 </template>
 <!-- Card Layout -->
-<template id="dynamic_filter_template_event_event_card" name="Card Layout" priority="10">
-    <t t-foreach="records" t-as="data" data-extra-classes="g-3" data-column-classes="col-12 col-sm-6 col-lg-4 col-xxl-3">
+<template id="dynamic_filter_template_event_event_card" name="Card Layout" priority="10"
+        data-extra-classes="g-3"
+        data-column-classes="col-12 col-sm-6 col-lg-4 col-xxl-3">
+    <t t-foreach="records" t-as="data">
         <t t-set="record" t-value="data['_record']._set_tz_context()"/>
         <a t-att-href="data['call_to_action_url']" class="s_events_event card h-100 text-decoration-none">
             <div class="s_events_event_cover">
@@ -131,8 +135,10 @@
 
 <!-- Single record templates -->
 <!-- Offset Layout -->
-<template id="dynamic_filter_template_event_event_single_offset" name="Solo Offset">
-    <t t-if="len(records)" class="s_events_event" data-column-classes="col-lg-12" data-content-classes="o_cc o_cc5 bg-transparent">
+<template id="dynamic_filter_template_event_event_single_offset" name="Solo Offset"
+        data-column-classes="col-lg-12"
+        data-content-classes="o_cc o_cc5 bg-transparent">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <t t-set="bg" t-value="record._get_background()"/>
@@ -172,8 +178,10 @@
     </t>
 </template>
 <!-- Entry Layout -->
-<template id="dynamic_filter_template_event_event_single_entry" name="Solo Entry">
-    <t t-if="len(records)" class="s_events_event" data-column-classes="col-lg-12" data-content-classes="o_cc o_cc5 bg-transparent">
+<template id="dynamic_filter_template_event_event_single_entry" name="Solo Entry"
+        data-column-classes="col-lg-12"
+        data-content-classes="o_cc o_cc5 bg-transparent">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <t t-set="bg" t-value="record._get_background()"/>
@@ -205,8 +213,10 @@
     </t>
 </template>
 <!-- Card Layout -->
-<template id="dynamic_filter_template_event_event_single_card" name="Solo Card">
-    <t t-if="len(records)" class="s_events_event" data-column-classes="col-lg-12" data-content-classes="o_cc o_cc5 bg-transparent">
+<template id="dynamic_filter_template_event_event_single_card" name="Solo Card"
+        data-column-classes="col-lg-12"
+        data-content-classes="o_cc o_cc5 bg-transparent">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <t t-set="bg" t-value="record._get_background()"/>
@@ -241,8 +251,9 @@
     </t>
 </template>
 <!-- CTA Badge Layout -->
-<template id="dynamic_filter_template_event_event_single_badge" name="Solo Badge">
-    <t t-if="len(records)" class="s_events_event" data-column-classes="col-lg-12 text-center">
+<template id="dynamic_filter_template_event_event_single_badge" name="Solo Badge"
+        data-column-classes="col-lg-12 text-center">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <div t-if="is_sample" class="position-absolute bottom-0 end-0 px-4 py-2 text-bg-info rounded-pill">Sample</div>
@@ -267,8 +278,9 @@
     </t>
 </template>
 <!-- Aside Layout -->
-<template id="dynamic_filter_template_event_event_single_aside" name="Solo Aside">
-    <t t-if="len(records)" class="s_events_event" data-column-classes="col-lg-12">
+<template id="dynamic_filter_template_event_event_single_aside" name="Solo Aside"
+        data-column-classes="col-lg-12">
+    <t t-if="len(records)">
         <t t-set="data" t-value="records[0]"/>
         <t t-set="record" t-value="data['_record']"/>
         <div t-if="is_sample" class="position-absolute bottom-0 end-0 px-4 py-2 text-bg-info rounded-pill">Sample</div>
diff --git a/addons/website_forum/views/forum_forum_templates_post.xml b/addons/website_forum/views/forum_forum_templates_post.xml
index b3944f473b56a..6d5edbdb21a04 100644
--- a/addons/website_forum/views/forum_forum_templates_post.xml
+++ b/addons/website_forum/views/forum_forum_templates_post.xml
@@ -31,7 +31,7 @@
     </div>
 
     <div t-if="not is_profile" t-attf-class="o_wforum_index_entry_tags mb-lg-1">
-        <t if="tag.posts_count and not hide_tags" t-foreach="question.tag_ids" t-as="question_tag">
+        <t t-foreach="question.tag_ids" t-as="question_tag" t-if="question_tag.posts_count and not hide_tags">
 
             <!-- Toggle Tags on click -->
             <t t-if="tag and tag.name == question_tag.name" t-set="click_action"
diff --git a/addons/website_sale/templates/shop_page_templates.xml b/addons/website_sale/templates/shop_page_templates.xml
index 201f9684893dc..cab951c2d8486 100644
--- a/addons/website_sale/templates/shop_page_templates.xml
+++ b/addons/website_sale/templates/shop_page_templates.xml
@@ -1589,7 +1589,7 @@
     </template>
 
     <template id="website_sale.filter_products_tags_list">
-        <t t-foreach="all_tags" t-as="tag" class="list-group-item border-0 ps-0 pb-0">
+        <t t-foreach="all_tags" t-as="tag">
             <div class="form-check mb-1">
                 <input type="checkbox"
                        name="tags"
diff --git a/addons/website_sale/templates/snippets/product_snippet_template_data.xml b/addons/website_sale/templates/snippets/product_snippet_template_data.xml
index 040ab228af198..91e062663d756 100644
--- a/addons/website_sale/templates/snippets/product_snippet_template_data.xml
+++ b/addons/website_sale/templates/snippets/product_snippet_template_data.xml
@@ -6,14 +6,10 @@
         <template
             id="website_sale.dynamic_filter_template_product_product_products_item"
             name="Generic Product Template (customizable)"
+            data-number-of-elements="4"
+            data-number-of-elements-sm="2"
         >
-            <t
-                t-foreach="records"
-                t-as="data"
-                data-number-of-elements="4"
-                data-number-of-elements-sm="2"
-            >
-
+            <t t-foreach="records" t-as="data">
                 <t t-set="record" t-value="data['_record']"/>
                 <t t-set="product" t-value="record"/>
                 <t t-set="product_template_id" t-value="record.id if not record.is_product_variant else record.product_tmpl_id.id"/>
diff --git a/odoo/addons/base/models/ir_qweb.py b/odoo/addons/base/models/ir_qweb.py
index 1c6cab00dbfb1..a4d277ff97173 100644
--- a/odoo/addons/base/models/ir_qweb.py
+++ b/odoo/addons/base/models/ir_qweb.py
@@ -397,6 +397,7 @@
 from odoo.exceptions import UserError, MissingError
 
 from odoo.addons.base.models.assetsbundle import AssetsBundle
+from odoo.addons.base.models.ir_ui_view import MOVABLE_BRANDING
 from odoo.tools.constants import SCRIPT_EXTENSIONS, STYLE_EXTENSIONS, TEMPLATE_EXTENSIONS, FONT_EXTENSIONS
 
 _logger = logging.getLogger(__name__)
@@ -464,7 +465,12 @@
 VARNAME_REGEXP = re.compile(r'^[A-Za-z_][A-Za-z0-9_]*$')
 TO_VARNAME_REGEXP = re.compile(r'[^A-Za-z0-9_]+')
 # Attribute name used outside the context of the QWeb.
-SPECIAL_DIRECTIVES = {'t-translation', 't-ignore', 't-title'}
+# When importing data, the <template> generate a root <t> with the `t-name` of
+# the template (equal to the xmlid). This is deprecated. It was used when
+# multiple templates were sent in the same etree.
+# Inside the template, `id` could be used as anchor for xpath. Actually `name`
+# is also used as anchor but is depreciated.
+SPECIAL_DIRECTIVES = {'t-translation', 't-ignore', 't-title', 'id', 'name'} | set(MOVABLE_BRANDING)
 # Name of the variable to insert the content in t-call in the template.
 # The slot will be replaced by the `t-call` tag content of the caller.
 T_CALL_SLOT = '0'
@@ -1026,7 +1032,7 @@ def _generate_code(self, template: int | str | etree._Element):
 
         compile_context.pop('raise_if_not_found', None)
 
-        ref_name = element.attrib.pop('t-name', None)
+        ref_name = element.attrib.get('t-name')
         if isinstance(ref, int) or (isinstance(template, str) and '<' not in template):
             ref_name = self._get_template_info(ref)['key'] or ref_name
 
@@ -1068,9 +1074,6 @@ def _generate_code(self, template: int | str | etree._Element):
         name_gen = count()
         compile_context['make_name'] = lambda prefix: f"{def_name}_{prefix}_{next(name_gen)}"
 
-        if element.text:
-            element.text = FIRST_RSTRIP_REGEXP.sub(r'\2', element.text)
-
         compile_context['template_functions'] = {}
 
         compile_context['_text_concat'] = []
@@ -1078,7 +1081,7 @@ def _generate_code(self, template: int | str | etree._Element):
         compile_context['template_functions'][f'{def_name}_content'] = (
             [f"def {def_name}_content(self, values):"]
             + [indent_code('attrs = None', 1)]
-            + self._compile_node(element, compile_context, 1)
+            + self._compile_root(element, compile_context)
             + self._flush_text(compile_context, 1, rstrip=True))
 
         compile_context['template_functions'][def_name] = [indent_code(f"""
@@ -1624,6 +1627,12 @@ def _directives_eval_order(self):
 
     # compile
 
+    def _compile_root(self, element, compile_context):
+        element.attrib.pop('t-name', None)
+        if element.text:
+            element.text = FIRST_RSTRIP_REGEXP.sub(r'\2', element.text)
+        return self._compile_node(element, compile_context, 1)
+
     def _compile_node(self, el, compile_context, level):
         """ Compile the given element into python code.
 
@@ -1868,6 +1877,14 @@ def _compile_directive_att(self, el, compile_context, level):
             expression.
         """
         code = []
+        if (not el.nsmap and el.tag == 't') or (el.nsmap and etree.QName(el.tag).localname == 't'):
+            # if it's an invisible element <t>
+            if not el.get('t-out') and not el.get('t-esc') and not el.get('t-raw') and el.getparent() is not None:
+                # if this invisible doesn't generate content, attributes will never be consumed
+                return code
+            if el.attrib.get('t-consumed-options') != 'True':
+                # If the content is inserted without using a widget, attributes will never be consumed
+                return code
 
         # Compile the introduced new namespaces of the given element.
         #
@@ -1920,15 +1937,6 @@ def _compile_directive_att(self, el, compile_context, level):
                         attrs.update(dict(atts_value))
                     """, level))
 
-        if (not el.nsmap and el.tag == 't') or (el.nsmap and etree.QName(el.tag).localname == 't'):
-            # if it's an invisible element <t>
-            if not el.get('t-out') and el.getparent() is not None:
-                # if this invisible doesn't generate content, attributes will never be consumed
-                return []
-            if el.attrib.get('t-consumed-options') != 'True':
-                # If the content is inserted without using a widget, attributes will never be consumed
-                return []
-
         if code:
             code = [indent_code("attrs = {}", level)] + code
             compile_context['qweb_attrs_created'] = True
@@ -2502,9 +2510,6 @@ def _compile_directive_call(self, el, compile_context, level):
         if el_tag != 't':
             raise SyntaxError(f"t-call must be on a <t> element (actually on <{el_tag}>).")
 
-        if el.attrib.get('t-call-options'): # retro-compatibility
-            el.attrib.set('t-options', el.attrib.pop('t-call-options'))
-
         nsmap = compile_context.get('nsmap')
 
         code = self._flush_text(compile_context, level, rstrip=el.tag.lower() == 't')
diff --git a/odoo/addons/base/tests/test_qweb.py b/odoo/addons/base/tests/test_qweb.py
index 0c9ace607e02b..5561d1e7da7b1 100644
--- a/odoo/addons/base/tests/test_qweb.py
+++ b/odoo/addons/base/tests/test_qweb.py
@@ -949,7 +949,7 @@ def test_att_no_propagation_1(self):
             'type': 'qweb',
             'arch_db': '''<t t-name="bibi">
                 <div t-foreach="[1, 2]" t-as="v" class="toto"/>
-                <t class="remove_me" t-set="data">a</t>
+                <t id="remove_me" t-set="data">a</t>
                 <div t-out="data"/>
             </t>'''
         })
diff --git a/odoo/import_xml.rng b/odoo/import_xml.rng
index 034a3bc89f0c9..6de956a08a071 100644
--- a/odoo/import_xml.rng
+++ b/odoo/import_xml.rng
@@ -208,6 +208,19 @@
                 <rng:optional><rng:attribute name="active"></rng:attribute></rng:optional>
                 <rng:optional><rng:attribute name="customize_show"></rng:attribute></rng:optional>
             </rng:group>
+            <rng:group>
+                <rng:optional><rng:attribute name="data-number-of-elements"/></rng:optional>
+                <rng:optional><rng:attribute name="data-number-of-elements-sm"/></rng:optional>
+                <rng:optional><rng:attribute name="data-number-of-elements-fetch"/></rng:optional>
+                <rng:optional><rng:attribute name="data-row-per-slide"/></rng:optional>
+                <rng:optional><rng:attribute name="data-arrow-position"/></rng:optional>
+                <rng:optional><rng:attribute name="data-extra-classes"/></rng:optional>
+                <rng:optional><rng:attribute name="data-extra-snippet-classes"/></rng:optional>
+                <rng:optional><rng:attribute name="data-container-classes"/></rng:optional>
+                <rng:optional><rng:attribute name="data-content-classes"/></rng:optional>
+                <rng:optional><rng:attribute name="data-column-classes"/></rng:optional>
+                <rng:optional><rng:attribute name="data-thumb"/></rng:optional>
+            </rng:group>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:text/>
diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py
index 9fcc0bd032a99..bc7dbe25067e9 100644
--- a/odoo/tools/convert.py
+++ b/odoo/tools/convert.py
@@ -475,6 +475,7 @@ def _tag_template(self, el):
         # This helper transforms a <template> element into a <record> and forwards it
         tpl_id = el.get('id', el.get('t-name'))
         full_tpl_id = tpl_id
+        attrib = el.attrib
         if '.' not in full_tpl_id:
             full_tpl_id = '%s.%s' % (self.module, tpl_id)
         # set the full template name for qweb <module>.<id>
@@ -483,7 +484,7 @@ def _tag_template(self, el):
             el.tag = 't'
         else:
             el.tag = 'data'
-        el.attrib.pop('id', None)
+        attrib.pop('id', None)
 
         if self.module.startswith('theme_'):
             model = 'theme.ir.ui.view'
@@ -495,8 +496,8 @@ def _tag_template(self, el):
             'model': model,
         }
         for att in ['forcecreate', 'context']:
-            if att in el.attrib:
-                record_attrs[att] = el.attrib.pop(att)
+            if att in attrib:
+                record_attrs[att] = attrib.pop(att)
 
         Field = builder.E.field
         name = el.get('name', tpl_id)
@@ -505,27 +506,27 @@ def _tag_template(self, el):
         record.append(Field(name, name='name'))
         record.append(Field(full_tpl_id, name='key'))
         record.append(Field("qweb", name='type'))
-        if 'track' in el.attrib:
-            record.append(Field(el.get('track'), name='track'))
-        if 'priority' in el.attrib:
-            record.append(Field(el.get('priority'), name='priority'))
-        if 'inherit_id' in el.attrib:
-            record.append(Field(name='inherit_id', ref=el.get('inherit_id')))
-        if 'website_id' in el.attrib:
-            record.append(Field(name='website_id', ref=el.get('website_id')))
-        if 'key' in el.attrib:
-            record.append(Field(el.get('key'), name='key'))
-        if el.get('active') in ("True", "False"):
+        if 'track' in attrib:
+            record.append(Field(attrib.pop('track'), name='track'))
+        if 'priority' in attrib:
+            record.append(Field(attrib.pop('priority'), name='priority'))
+        if 'inherit_id' in attrib:
+            record.append(Field(name='inherit_id', ref=attrib.pop('inherit_id')))
+        if 'website_id' in attrib:
+            record.append(Field(name='website_id', ref=attrib.pop('website_id')))
+        if 'key' in attrib:
+            record.append(Field(attrib.pop('key'), name='key'))
+        if (active := attrib.pop('active', None)) in ("True", "False"):
             view_id = self.id_get(tpl_id, raise_if_not_found=False)
             if self.mode != "update" or not view_id:
-                record.append(Field(name='active', eval=el.get('active')))
-        if el.get('customize_show') in ("True", "False"):
-            record.append(Field(name='customize_show', eval=el.get('customize_show')))
-        groups = el.attrib.pop('groups', None)
+                record.append(Field(name='active', eval=active))
+        if (customize_show := attrib.pop('customize_show', None)) in ("True", "False"):
+            record.append(Field(name='customize_show', eval=customize_show))
+        groups = attrib.pop('groups', None)
         if groups:
             grp_lst = [("ref('%s')" % x) for x in groups.split(',')]
             record.append(Field(name="group_ids", eval="[Command.set(["+', '.join(grp_lst)+"])]"))
-        if el.get('primary') == 'True':
+        if attrib.pop('primary', None) == 'True':
             # Pseudo clone mode, we'll set the t-name to the full canonical xmlid
             el.append(
                 builder.E.xpath(
diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py
index 98dd8006691c8..4ce40b226c8b3 100644
--- a/odoo/tools/mail.py
+++ b/odoo/tools/mail.py
@@ -207,14 +207,16 @@ def _tag_matching_regex_in_text(regex, node, tag='span', attrs=None):
     # gmail or yahoo // # outlook, html // # msoffice
     if 'gmail_extra' in el_class or \
             ('SkyDrivePlaceholder' in el_class or 'SkyDrivePlaceholder' in el_class):
-        el.set('data-o-mail-quote', '1')
-        if el.getparent() is not None:
+        if el.tag != 't':
+            el.set('data-o-mail-quote', '1')
+        if el.getparent() is not None and el.getparent().tag != 't':
             el.getparent().set('data-o-mail-quote-container', '1')
 
     if (el.tag == 'hr' and ('stopSpelling' in el_class or 'stopSpelling' in el_id)) or \
        'yahoo_quoted' in el_class:
         # Quote all elements after this one
-        el.set('data-o-mail-quote', '1')
+        if el.tag != 't':
+            el.set('data-o-mail-quote', '1')
         for sibling in el.itersiblings(preceding=False):
             sibling.set('data-o-mail-quote', '1')
 
@@ -225,7 +227,7 @@ def _tag_matching_regex_in_text(regex, node, tag='span', attrs=None):
     is_outlook_reply_quote = 'divRplyFwdMsg' in el_id
     is_gmail_quote = 'gmail_quote' in el_class
     is_quote_wrapper = is_signature_wrapper or is_gmail_quote or is_outlook_reply_quote
-    if is_quote_wrapper:
+    if is_quote_wrapper and el.tag != 't':
         el.set('data-o-mail-quote-container', '1')
         el.set('data-o-mail-quote', '1')
 
@@ -235,11 +237,11 @@ def _tag_matching_regex_in_text(regex, node, tag='span', attrs=None):
         reply_quote = el.getnext()
         if hr is not None and hr.tag == 'hr':
             hr.set('data-o-mail-quote', '1')
-        if reply_quote is not None:
+        if reply_quote is not None and reply_quote.tag != 't':
             reply_quote.set('data-o-mail-quote-container', '1')
             reply_quote.set('data-o-mail-quote', '1')
 
-    if is_outlook_auto_message:
+    if is_outlook_auto_message and el.tag != 't':
         if not el.text or not el.text.strip():
             el.set('data-o-mail-quote-container', '1')
             el.set('data-o-mail-quote', '1')
@@ -247,8 +249,9 @@ def _tag_matching_regex_in_text(regex, node, tag='span', attrs=None):
     # html signature (-- <br />blah)
     signature_begin = re.compile(r"((?:(?:^|\n)[-]{2}[\s]?$))")
     if el.text and el.find('br') is not None and re.search(signature_begin, el.text):
-        el.set('data-o-mail-quote', '1')
-        if el.getparent() is not None:
+        if el.tag != 't':
+            el.set('data-o-mail-quote', '1')
+        if el.getparent() is not None and el.getparent().tag != 't':
             el.getparent().set('data-o-mail-quote-container', '1')
 
     # text-based quotes (>, >>) and signatures (-- Signature)
@@ -261,7 +264,7 @@ def _tag_matching_regex_in_text(regex, node, tag='span', attrs=None):
         el.set('data-o-mail-quote-node', '1')
         el.set('data-o-mail-quote', '1')
     if el.getparent() is not None and not el.getparent().get('data-o-mail-quote-node'):
-        if el.getparent().get('data-o-mail-quote'):
+        if el.getparent().get('data-o-mail-quote') and el.tag != 't':
             el.set('data-o-mail-quote', '1')
         # only quoting the elements following the first quote in the container
         # avoids issues with repeated calls to html_normalize
@@ -270,9 +273,9 @@ def _tag_matching_regex_in_text(regex, node, tag='span', attrs=None):
                 siblings = el.getparent().getchildren()
                 quote_index = siblings.index(first_sibling_quote)
                 element_index = siblings.index(el)
-                if quote_index < element_index:
+                if quote_index < element_index and el.tag != 't':
                     el.set('data-o-mail-quote', '1')
-    if el.getprevious() is not None and el.getprevious().get('data-o-mail-quote') and not el.text_content().strip():
+    if el.getprevious() is not None and el.getprevious().get('data-o-mail-quote') and not el.text_content().strip() and el.tag != 't':
         el.set('data-o-mail-quote', '1')
 
 

From 730492c06d164b789e6979b704c4eeee992c2001 Mon Sep 17 00:00:00 2001
From: "Claire (clbr)" <clbr@odoo.com>
Date: Mon, 29 Sep 2025 11:01:20 +0000
Subject: [PATCH 241/673] [FIX] l10n_fr_facturx_chorus_pro: fixes for Peppol
 Chorus Pro invoicing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. We didn't met one of the specific requirement of the BIS3 invoices
to be sent through Chorus Pro.

> The SIRET number for the final recipient, behind Chorus Pro should always be sent in the following tag:
Invoice/cac:AccountingCustomerParty/PartyLegalEntity/CompanyID

2. One of the attributes of the CompanyID was set to schemeName which is not a valid
attribute of the Peppol BIS3 specification. -> fixed in 18.0+
https://github.com/odoo/odoo/commit/c3ae4b29c51c7b0cff11aac5f4bf4aab5fad16c9

3. Rename "Service exécutant" to "Code de Service" to better match the naming
from Chorus Pro.

Source: https://www.pagero.com/onboarding/aife/aife-en

task-none (possible opw-4972189, but might not be the only problem)

closes odoo/odoo#234618

X-original-commit: 4155257dbfb73f28ccc0cae5b2302fc8acde3826
Signed-off-by: Antoine Dupuis (andu) <andu@odoo.com>
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
---
 addons/account/models/partner.py              |  5 +-
 .../__manifest__.py                           |  4 +-
 addons/l10n_fr_facturx_chorus_pro/i18n/fr.po  |  6 +-
 .../i18n/l10n_fr_facturx_chorus_pro.pot       |  2 +-
 .../models/account_edi_xml_ubl_bis3.py        | 63 ++++++++++---------
 .../models/account_move.py                    |  2 +-
 6 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index 3df6694e49215..9746140a50d4e 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -342,7 +342,10 @@ class ResPartner(models.Model):
     def _compute_fiscal_country_codes(self):
         for record in self:
             allowed_companies = record.company_id or self.env.companies
-            record.fiscal_country_codes = ",".join(allowed_companies.mapped('account_fiscal_country_id.code'))
+            country_codes = allowed_companies.mapped('account_fiscal_country_id.code')
+            if record.country_code:
+                country_codes.append(record.country_code)
+            record.fiscal_country_codes = ",".join(country_codes)
 
     @api.depends('company_id')
     @api.depends_context('allowed_company_ids')
diff --git a/addons/l10n_fr_facturx_chorus_pro/__manifest__.py b/addons/l10n_fr_facturx_chorus_pro/__manifest__.py
index 1303c696168ee..f657b93387b4d 100644
--- a/addons/l10n_fr_facturx_chorus_pro/__manifest__.py
+++ b/addons/l10n_fr_facturx_chorus_pro/__manifest__.py
@@ -2,12 +2,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'France - Factur-X integration with Chorus Pro',
+    'name': 'France - BIS3 integration for Chorus Pro',
     'countries': ['fr'],
     'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
-Add support to fill three optional fields used when using Chorus Pro, especially when invoicing public services.
+Add support to fill three fields used when using Chorus Pro, especially when invoicing public services.
 """,
     'depends': [
         'account',
diff --git a/addons/l10n_fr_facturx_chorus_pro/i18n/fr.po b/addons/l10n_fr_facturx_chorus_pro/i18n/fr.po
index ba592b26af5af..df8a4c73cd3fe 100644
--- a/addons/l10n_fr_facturx_chorus_pro/i18n/fr.po
+++ b/addons/l10n_fr_facturx_chorus_pro/i18n/fr.po
@@ -31,14 +31,14 @@ msgstr "'Numéro de marché' dans Chorus PRO."
 #. module: l10n_fr_facturx_chorus_pro
 #: model:ir.model.fields,help:l10n_fr_facturx_chorus_pro.field_account_bank_statement_line__buyer_reference
 #: model:ir.model.fields,help:l10n_fr_facturx_chorus_pro.field_account_move__buyer_reference
-msgid "'Service Exécutant' in Chorus PRO."
-msgstr "'Service exécutant' dans Chorus PRO."
+msgid "'Code de Service' in Chorus PRO."
+msgstr "'Code de Service' dans Chorus PRO."
 
 #. module: l10n_fr_facturx_chorus_pro
 #: model:ir.model.fields,field_description:l10n_fr_facturx_chorus_pro.field_account_bank_statement_line__buyer_reference
 #: model:ir.model.fields,field_description:l10n_fr_facturx_chorus_pro.field_account_move__buyer_reference
 msgid "Buyer Reference"
-msgstr "Service exécutant"
+msgstr "Code de Service"
 
 #. module: l10n_fr_facturx_chorus_pro
 #: model_terms:ir.ui.view,arch_db:l10n_fr_facturx_chorus_pro.view_move_form_inherit_chorus_pro
diff --git a/addons/l10n_fr_facturx_chorus_pro/i18n/l10n_fr_facturx_chorus_pro.pot b/addons/l10n_fr_facturx_chorus_pro/i18n/l10n_fr_facturx_chorus_pro.pot
index 22fe4e9b868c6..229ad79751407 100644
--- a/addons/l10n_fr_facturx_chorus_pro/i18n/l10n_fr_facturx_chorus_pro.pot
+++ b/addons/l10n_fr_facturx_chorus_pro/i18n/l10n_fr_facturx_chorus_pro.pot
@@ -30,7 +30,7 @@ msgstr ""
 #. module: l10n_fr_facturx_chorus_pro
 #: model:ir.model.fields,help:l10n_fr_facturx_chorus_pro.field_account_bank_statement_line__buyer_reference
 #: model:ir.model.fields,help:l10n_fr_facturx_chorus_pro.field_account_move__buyer_reference
-msgid "'Service Exécutant' in Chorus PRO."
+msgid "'Code de Service' in Chorus PRO."
 msgstr ""
 
 #. module: l10n_fr_facturx_chorus_pro
diff --git a/addons/l10n_fr_facturx_chorus_pro/models/account_edi_xml_ubl_bis3.py b/addons/l10n_fr_facturx_chorus_pro/models/account_edi_xml_ubl_bis3.py
index 42422010ceaff..87da0da63d7cf 100644
--- a/addons/l10n_fr_facturx_chorus_pro/models/account_edi_xml_ubl_bis3.py
+++ b/addons/l10n_fr_facturx_chorus_pro/models/account_edi_xml_ubl_bis3.py
@@ -1,9 +1,6 @@
-from odoo import models, _
-from odoo.addons.account_edi_ubl_cii.models.account_edi_common import EAS_MAPPING
-
+from odoo import api, models, _
 
 CHORUS_PRO_PEPPOL_ID = "0009:11000201100044"
-FR_SCHEME_IDS = {v: k for k, v in EAS_MAPPING['FR'].items()}
 
 
 class AccountEdiXmlUbl_Bis3(models.AbstractModel):
@@ -14,19 +11,29 @@ class AccountEdiXmlUbl_Bis3(models.AbstractModel):
     Chorus Pro documentation: https://communaute.chorus-pro.gouv.fr/wp-content/uploads/2017/07/Specifications_Externes_Annexe_EDI_V4.22.pdf
     """
 
+    @api.model
+    def _is_customer_behind_chorus_pro(self, customer):
+        return customer.peppol_eas and customer.peppol_endpoint and f"{customer.peppol_eas}:{customer.peppol_endpoint}" == CHORUS_PRO_PEPPOL_ID
+
     def _export_invoice_constraints(self, invoice, vals):
         constraints = super()._export_invoice_constraints(invoice, vals)
         customer, supplier = vals['customer'].commercial_partner_id, vals['supplier']
-        if customer.peppol_eas and customer.peppol_endpoint and customer.peppol_eas + ":" + customer.peppol_endpoint == CHORUS_PRO_PEPPOL_ID:
-            if customer.company_registry:
-                constraints['chorus_customer'] = _("The company_registry is mandatory for the customer when invoicing to Chorus Pro.")
-            if supplier.company_registry:
-                constraints['chorus_supplier'] = _("The company_registry is mandatory for french suppliers when invoicing to Chorus Pro.")
+        if self._is_customer_behind_chorus_pro(customer):
+            if not customer.company_registry:
+                constraints['chorus_customer'] = _("The Company Registry (Siret) of the final recipient is mandatory for the customer when invoicing through Chorus Pro.")
+            if supplier.country_code == 'FR' and not supplier.company_registry:
+                constraints['chorus_supplier_fr'] = _("The Company Registry (Siret) is mandatory for french suppliers when invoicing through Chorus Pro.")
+            if supplier.country_code != 'FR' and not supplier.vat:
+                constraints['chorus_supplier_not_fr'] = _("The VAT is mandatory for non-french suppliers when invoicing through Chorus Pro.")
         return constraints
 
     def _add_invoice_header_nodes(self, document_node, vals):
         super()._add_invoice_header_nodes(document_node, vals)
 
+        customer = vals['customer'].commercial_partner_id
+        if not self._is_customer_behind_chorus_pro(customer):
+            return
+
         invoice = vals['invoice']
 
         if invoice.buyer_reference:
@@ -45,27 +52,27 @@ def _get_party_node(self, vals):
         # * Chorus Pro doc states that french suppliers should mention their siret, and european non-french suppliers
         # should put their VAT
         party_node = super()._get_party_node(vals)
-
         customer = vals['customer'].commercial_partner_id
-        partner = vals['partner']
-        commercial_partner = partner.commercial_partner_id
+        if not self._is_customer_behind_chorus_pro(customer):
+            return party_node
 
-        if (
-            customer.peppol_eas and
-            customer.peppol_endpoint and
-            customer.peppol_eas + ":" + customer.peppol_endpoint == CHORUS_PRO_PEPPOL_ID
-        ):
-            party_node['cac:PartyIdentification'] = {
-                'cbc:ID': {
-                    '_text': (
-                        commercial_partner.company_registry
-                        if partner.company_registry and partner.country_code == 'FR'
-                        else commercial_partner.vat
-                    ),
-                    'schemeID': (
-                        FR_SCHEME_IDS['company_registry'] if partner.company_registry and partner.country_code == 'FR' else FR_SCHEME_IDS['vat']
-                    ),
-                }
+        partner = vals['partner'].commercial_partner_id
+        party_node['cac:PartyIdentification'] = {
+            'cbc:ID': {
+                '_text': (
+                    partner.company_registry
+                    if partner.company_registry and partner.country_code == 'FR'
+                    else partner.vat
+                ),
+                'schemeID': (
+                    '0009' if partner.company_registry and partner.country_code == 'FR' else None
+                ),
+            },
+        }
+        if partner.company_registry and partner.country_code == 'FR':
+            party_node['cac:PartyLegalEntity']['cbc:CompanyID'] = {
+                '_text': partner.company_registry,
+                'schemeID': '0009',
             }
 
         return party_node
diff --git a/addons/l10n_fr_facturx_chorus_pro/models/account_move.py b/addons/l10n_fr_facturx_chorus_pro/models/account_move.py
index 9f50b5973a452..5d7b92d94a174 100644
--- a/addons/l10n_fr_facturx_chorus_pro/models/account_move.py
+++ b/addons/l10n_fr_facturx_chorus_pro/models/account_move.py
@@ -5,6 +5,6 @@
 class AccountMove(models.Model):
     _inherit = "account.move"
 
-    buyer_reference = fields.Char(help="'Service Exécutant' in Chorus PRO.")
+    buyer_reference = fields.Char(help="'Code de Service' in Chorus PRO.")
     contract_reference = fields.Char(help="'Numéro de Marché' in Chorus PRO.")
     purchase_order_reference = fields.Char(help="'Engagement Juridique' in Chorus PRO.")

From 82df4fbc5f4fbd39183cd81c0c343d4f4bb77d02 Mon Sep 17 00:00:00 2001
From: lebm-odoo <lebm@odoo.com>
Date: Tue, 28 Oct 2025 12:35:28 +0000
Subject: [PATCH 242/673] [FIX] hr_attendance: access right issues

Problem
----------
Ruleset can't be read if the user is not an attendance manager.
The ruleset_id on employee have the group `group_hr_manager`but it doesn't imply attendance manager.
Wrong computation of `is_manager` on overtime line if the user has only attendance officer rights and the employee with overtime has this user as attendance manager.

Solution
----------
Make the ruleset readonly for hr manager.
Fix the is_manager compute

task-5180810

closes odoo/odoo#234431

X-original-commit: f987e32282f6c3456596adb3aa06353c0c2c13ae
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Mathias Lebel (lebm) <lebm@odoo.com>
---
 .../models/hr_attendance_overtime.py          |  2 +-
 .../security/ir.model.access.csv              |  3 +-
 .../tests/test_hr_attendance_rulesets.py      | 30 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/addons/hr_attendance/models/hr_attendance_overtime.py b/addons/hr_attendance/models/hr_attendance_overtime.py
index 27aa4cb18407b..952ca4502faca 100644
--- a/addons/hr_attendance/models/hr_attendance_overtime.py
+++ b/addons/hr_attendance/models/hr_attendance_overtime.py
@@ -78,7 +78,7 @@ def _compute_is_manager(self):
                 has_manager_right or
                 (
                     has_officer_right
-                    and overtime.employee_id.attendance_maneger_id == self.env.user
+                    and overtime.employee_id.attendance_manager_id == self.env.user
                 )
             )
 
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 673193a0cc90b..201d615e5bf9a 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -5,5 +5,6 @@ access_hr_attendance_officer,hr.attendance.officer,model_hr_attendance,group_hr_
 access_hr_attendance_own_reader,hr.attendance.own.reader,model_hr_attendance,group_hr_attendance_own_reader,1,0,0,0
 access_hr_attendance_overtime_rule_admin,hr.attendance.admin.overtime.rule,model_hr_attendance_overtime_rule,group_hr_attendance_manager,1,1,1,1
 access_hr_attendance_overtime_ruleset_admin,hr.attendance.admin.overtime.ruleset,model_hr_attendance_overtime_ruleset,group_hr_attendance_manager,1,1,1,1
-access_hr_attendance_overtime_rule_user,hr.attendance.admin.overtime.rule,model_hr_attendance_overtime_rule,base.group_user,1,0,0,0
+access_hr_attendance_overtime_rule_user,hr.attendance.admin.overtime.rule,model_hr_attendance_overtime_rule,hr.group_hr_manager,1,0,0,0
 access_hr_attendance_overtime_line_officer,hr.attendance.officer.overtime.line,model_hr_attendance_overtime_line,group_hr_attendance_officer,1,1,1,1
+access_hr_attendance_overtime_ruleset_hr_manager,hr.attendance.admin.overtime.ruleset,model_hr_attendance_overtime_ruleset,hr.group_hr_manager,1,0,0,0
diff --git a/addons/hr_attendance/tests/test_hr_attendance_rulesets.py b/addons/hr_attendance/tests/test_hr_attendance_rulesets.py
index d07a4d6f8af46..6279fc161ee8f 100644
--- a/addons/hr_attendance/tests/test_hr_attendance_rulesets.py
+++ b/addons/hr_attendance/tests/test_hr_attendance_rulesets.py
@@ -3,7 +3,7 @@
 from freezegun import freeze_time
 
 from odoo import Command
-from odoo.tests import new_test_user
+from odoo.tests import new_test_user, Form
 from odoo.tests.common import tagged, TransactionCase
 
 
@@ -156,3 +156,31 @@ def test_partial_week(self):
             ]
 
             self.assertAlmostEqual(self.employee.total_overtime, 12.0, 2, msg="3 days of 2 hours overtime at 200% should yield 12 hours total overtime")
+
+    def test_access_ruleset_on_employee(self):
+        """
+        Test the access rights of the ruleset on the employee
+        Only the employee admin should be able to see and change the ruleset on the employee
+        """
+        user = new_test_user(self.env, login='usr', groups='hr.group_hr_user', company_id=self.company.id).with_company(self.company)
+        employee = self.env['hr.employee'].with_company(self.company).create({'name': "Employee Test"})
+        with Form(employee.with_user(user)) as employee_form:
+            self.assertFalse("ruleset_id" in employee_form._view['fields'])
+
+        # HR Mangers should be able to see the ruleset on the employee
+        user.group_ids |= self.env.ref('hr.group_hr_manager')
+        # fix le truc chelou de pas pouvoir ecrire la surrement les access rule
+        with Form(employee.with_user(user)) as employee_form:
+            self.assertTrue("ruleset_id" in employee_form._view['fields'])
+            employee_form.record.ruleset_id = self.ruleset.id
+
+    def test_is_manager_with_overtime(self):
+        """ Test the computation of is_manager with overtime """
+        user = new_test_user(self.env, login='usr', groups='hr_attendance.group_hr_attendance_officer', company_id=self.company.id).with_company(self.company)
+        self.employee.attendance_manager_id = user.id
+        attendance = self.env['hr.attendance'].with_company(self.company).create({
+            'employee_id': self.employee.id,
+            'check_in': datetime(2021, 1, 4, 8, 0),
+            'check_out': datetime(2021, 1, 4, 20, 0)
+        })
+        self.assertTrue(attendance.with_user(user).linked_overtime_ids.is_manager)

From 3763848c4c33f60d4fbe83165639273b9ffc9cf2 Mon Sep 17 00:00:00 2001
From: "Victor Piryns (pivi)" <pivi@odoo.com>
Date: Mon, 3 Nov 2025 15:07:00 +0000
Subject: [PATCH 243/673] [PERF] hr{,_holiday,_work_entry}: Speed-up offer
 template onchange

Description
-----------
- Fix performance regressions due to breaking the prefetcher via `[0]`
indexing of `hr.version` and batch `write`.
- Evaluate only the current employees contracts in
`_get_contract_versions` for an *onchange* context, else the `hr.
version` for all employees are fetched and evaluated, leading to
significant overhead downstream.
- Add missing index for `_remove_work_entries`

Benchmark
---------
On a database in 19.0, with ~10k employees, ~30k versions and ~5M
work-entries, the onchange triggered when changing the contract
template on a pending offer for a new lambda employee took:

|             | Before | After  |
|-------------|--------|--------|
| Query Count | 107k   | 349    |
| Time        | 2.9min | ~300ms |

closes odoo/odoo#234450

X-original-commit: ae315e8de9decce79de9dee07502361146edf32c
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
Signed-off-by: Piryns Victor (pivi) <pivi@odoo.com>
---
 addons/hr/models/hr_employee.py              |  5 ++++-
 addons/hr/models/hr_version.py               | 18 ++++++++++++------
 addons/hr_holidays/models/hr_version.py      |  7 ++++---
 addons/hr_work_entry/models/hr_work_entry.py |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 47abf750bb025..df513deebfd29 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -755,6 +755,8 @@ def _get_contract_versions(self, date_start=None, date_end=None, domain=None):
         version_domain = Domain('contract_date_start', '!=', False)
         if self.ids:
             version_domain &= Domain('employee_id', 'in', self.ids)
+        elif not any(self._ids):  # onchange
+            version_domain &= Domain('employee_id', 'in', self._origin.ids)
         if date_start:
             version_domain &= Domain('contract_date_end', '=', False) | Domain('contract_date_end', '>=', date_start)
         if date_end:
@@ -768,7 +770,8 @@ def _get_contract_versions(self, date_start=None, date_end=None, domain=None):
         )
         contract_versions_by_employee = defaultdict(lambda: defaultdict(lambda: self.env["hr.version"]))
         for employee, _date_version, version in all_versions:
-            contract_versions_by_employee[employee.id][version[0].contract_date_start] |= version
+            first_version = next(iter(version), version)
+            contract_versions_by_employee[employee.id][first_version.contract_date_start] |= version
         return contract_versions_by_employee
 
     def _get_all_contract_dates(self):
diff --git a/addons/hr/models/hr_version.py b/addons/hr/models/hr_version.py
index 123ecd48fcc86..fbf844cebf1fa 100644
--- a/addons/hr/models/hr_version.py
+++ b/addons/hr/models/hr_version.py
@@ -331,23 +331,29 @@ def write(self, vals):
         for employee, versions in multiple_versions.grouped('employee_id').items():
 
             dates_vals = {}
+            first_version = next(iter(versions), versions)
 
             if "contract_date_start" in vals:
                 dates_vals["contract_date_start"] = fields.Date.to_date(vals.get('contract_date_start'))
             else:
-                dates_vals["contract_date_start"] = versions[0].contract_date_start
+                dates_vals["contract_date_start"] = first_version.contract_date_start
             if "contract_date_end" in vals:
                 dates_vals["contract_date_end"] = fields.Date.to_date(vals.get('contract_date_end'))
             else:
-                dates_vals["contract_date_end"] = versions[0].contract_date_end
+                dates_vals["contract_date_end"] = first_version.contract_date_end
 
-            if versions[0].contract_date_start:
+            if first_version.contract_date_start:
                 versions_to_sync = employee._get_contract_versions(
-                    date_start=versions[0].contract_date_start,
-                    date_end=versions[0].contract_date_end,
+                    date_start=first_version.contract_date_start,
+                    date_end=first_version.contract_date_end,
                 )
+                all_versions_to_sync = self.env['hr.version']
                 for contract_versions in versions_to_sync.values():
-                    next(iter(contract_versions.values())).with_context(sync_contract_dates=True).write(dates_vals)
+                    all_versions_to_sync |= next(iter(contract_versions.values()))
+
+                if all_versions_to_sync:
+                    all_versions_to_sync.with_context(sync_contract_dates=True).write(dates_vals)
+
             else:
                 versions.with_context(sync_contract_dates=True).write(dates_vals)
 
diff --git a/addons/hr_holidays/models/hr_version.py b/addons/hr_holidays/models/hr_version.py
index bf75fab8f7c6b..85c7129935724 100644
--- a/addons/hr_holidays/models/hr_version.py
+++ b/addons/hr_holidays/models/hr_version.py
@@ -122,9 +122,10 @@ def _check_overlapping_contract(self, leave):
         overlapping_contracts = leave._get_overlapping_contracts().sorted(
             key=lambda c: c.contract_date_start)
         if len(overlapping_contracts.resource_calendar_id) <= 1:
-            if overlapping_contracts and leave.resource_calendar_id != overlapping_contracts[
-                0].resource_calendar_id:
-                leave.resource_calendar_id = overlapping_contracts[0].resource_calendar_id
+            if overlapping_contracts:
+                first_overlapping_contract = next(iter(overlapping_contracts), overlapping_contracts)
+                if leave.resource_calendar_id != first_overlapping_contract.resource_calendar_id:
+                    leave.resource_calendar_id = first_overlapping_contract.resource_calendar_id
             return False
         return overlapping_contracts
 
diff --git a/addons/hr_work_entry/models/hr_work_entry.py b/addons/hr_work_entry/models/hr_work_entry.py
index 6dd341d81bada..b279434d82137 100644
--- a/addons/hr_work_entry/models/hr_work_entry.py
+++ b/addons/hr_work_entry/models/hr_work_entry.py
@@ -22,7 +22,7 @@ class HrWorkEntry(models.Model):
     name = fields.Char("Description")
     active = fields.Boolean(default=True)
     employee_id = fields.Many2one('hr.employee', required=True, domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", index=True)
-    version_id = fields.Many2one('hr.version', string="Employee Record", required=True)
+    version_id = fields.Many2one('hr.version', string="Employee Record", required=True, index=True)
     work_entry_source = fields.Selection(related='version_id.work_entry_source')
     resource_calendar_id = fields.Many2one(related='version_id.resource_calendar_id')
     date = fields.Date(required=True)

From b5e760d1b3cbd050f44dacbb0f0c8ef258c2b2d6 Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Wed, 29 Oct 2025 14:46:01 +0000
Subject: [PATCH 244/673] [FIX] point_of_sale: allow making invoices linked to
 PoS orders draft

After this commit, it becomes possible to make an invoice linked to a
PoS order draft, showing only a warning notification instead of
blocking the action.

This is required in some localizations where invoices must be modified
before being sent to the government.

opw-5218715

closes odoo/odoo#234463

X-original-commit: 840da3f79ccb57fb4193167eefab7f415cc2e153
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 addons/point_of_sale/models/account_move.py         | 12 +++++++++++-
 .../point_of_sale/tests/test_point_of_sale_flow.py  | 13 +++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/models/account_move.py b/addons/point_of_sale/models/account_move.py
index a3897a150693c..98732e500dd42 100644
--- a/addons/point_of_sale/models/account_move.py
+++ b/addons/point_of_sale/models/account_move.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import fields, models, api
+from odoo import fields, models, api, _
 
 
 class AccountMove(models.Model):
@@ -109,6 +109,16 @@ def action_view_source_pos_orders(self):
             action['domain'] = [('id', 'in', self.pos_order_ids.ids)]
         return action
 
+    def button_draft(self):
+        if self.sudo().pos_order_ids.filtered(lambda o: o.session_id.state != 'closed'):
+            self.env.user._bus_send("simple_notification", {
+                'type': 'warning',
+                'title': _("Warning: Invoice Reset Risk"),
+                'message': _("This invoice is linked to a POS Order, resetting it to draft prevents closing the session. You should rather refund the order or create a credit note."),
+                'sticky': True,
+            })
+        return super().button_draft()
+
     @api.model
     def _load_pos_data_fields(self, config):
         result = super()._load_pos_data_fields(config)
diff --git a/addons/point_of_sale/tests/test_point_of_sale_flow.py b/addons/point_of_sale/tests/test_point_of_sale_flow.py
index 43ae33f62e58a..c8cbc0ece232b 100644
--- a/addons/point_of_sale/tests/test_point_of_sale_flow.py
+++ b/addons/point_of_sale/tests/test_point_of_sale_flow.py
@@ -442,6 +442,19 @@ def test_order_to_invoice_no_tax(self):
         invoice = self.env['account.move'].browse(res['res_id'])
         if invoice.state != 'posted':
             invoice.action_post()
+
+        # Making the invoice draft should send a warning notification to the user
+        with patch.object(self.env.registry['bus.bus'], '_sendone') as mock_send:
+            invoice.button_draft()
+            mock_send.assert_called_with(self.env.user.partner_id, 'simple_notification', {
+                'type': 'warning',
+                'title': "Warning: Invoice Reset Risk",
+                'message': "This invoice is linked to a POS Order, resetting it to draft prevents closing the session. You should rather refund the order or create a credit note.",
+                'sticky': True,
+            })
+
+        invoice.action_post()
+
         self.assertAlmostEqual(invoice.amount_total, order.amount_total, places=2)
 
         for iline in invoice.invoice_line_ids:

From a9ce9f7586900e6371b43ba1f3b1935584de04eb Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 16 Oct 2025 08:23:37 +0200
Subject: [PATCH 245/673] [FIX] stock_account: move revalaution to valuation
 test file

They both share the common setup and use the same mechanism.
The test_stockvaluation.py will be rework in the future since a lot
of tests are similar and probably useless. But until them we keep
them at the same place

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/tests/__init__.py        |   1 -
 .../test_stock_valuation_layer_revaluation.py | 370 ------------------
 .../tests/test_stockvaluation.py              | 339 ++++++++++++++++
 3 files changed, 339 insertions(+), 371 deletions(-)
 delete mode 100644 addons/stock_account/tests/test_stock_valuation_layer_revaluation.py

diff --git a/addons/stock_account/tests/__init__.py b/addons/stock_account/tests/__init__.py
index 81a5a4be3238f..e151fef434902 100644
--- a/addons/stock_account/tests/__init__.py
+++ b/addons/stock_account/tests/__init__.py
@@ -4,4 +4,3 @@
 from . import test_product
 from . import test_stockvaluation
 from . import test_stockvaluationlayer
-from . import test_stock_valuation_layer_revaluation
diff --git a/addons/stock_account/tests/test_stock_valuation_layer_revaluation.py b/addons/stock_account/tests/test_stock_valuation_layer_revaluation.py
deleted file mode 100644
index 62a37dc5ccbc8..0000000000000
--- a/addons/stock_account/tests/test_stock_valuation_layer_revaluation.py
+++ /dev/null
@@ -1,370 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from unittest import skip
-
-from odoo import Command
-from odoo.exceptions import UserError
-from odoo.tests import tagged, Form
-from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
-from odoo.addons.stock_account.tests.test_stockvaluationlayer import TestStockValuationCommon
-
-
-@skip('Temporary to fast merge new valuation')
-@tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockValuationLayerRevaluation(TestStockValuationCommon):
-    @classmethod
-    def setUpClass(cls):
-        super(TestStockValuationLayerRevaluation, cls).setUpClass()
-        cls.stock_input_account, cls.stock_output_account, cls.stock_valuation_account, cls.expense_account, cls.income_account, cls.stock_journal = _create_accounting_data(cls.env)
-        cls.product1.write({
-            'property_account_expense_id': cls.expense_account.id,
-        })
-        cls.product1.categ_id.write({
-            'property_valuation': 'real_time',
-            'property_stock_account_input_categ_id': cls.stock_input_account.id,
-            'property_stock_account_output_categ_id': cls.stock_output_account.id,
-            'property_stock_valuation_account_id': cls.stock_valuation_account.id,
-            'property_stock_journal': cls.stock_journal.id,
-        })
-
-        cls.product1.categ_id.property_valuation = 'real_time'
-
-    def test_stock_valuation_layer_revaluation_avco(self):
-        self.product1.categ_id.property_cost_method = 'average'
-        context = {
-            'default_product_id': self.product1.id,
-            'default_company_id': self.env.company.id,
-            'default_added_value': 0.0
-        }
-        # Quantity of product1 is zero, raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
-
-        self._make_in_move(self.product1, 10, unit_cost=2)
-        self._make_in_move(self.product1, 10, unit_cost=4)
-
-        self.assertEqual(self.product1.standard_price, 3)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
-
-        self.assertEqual(len(old_layers), 2)
-        self.assertEqual(old_layers[0].remaining_value, 40)
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
-        revaluation_wizard.added_value = 20
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
-
-        # Check standard price change
-        self.assertEqual(self.product1.standard_price, 4)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 20)
-
-        # Check the remaing value of current layers
-        self.assertEqual(old_layers[0].remaining_value, 50)
-        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80)
-
-        # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
-
-    def test_stock_valuation_layer_revaluation_avco_rounding(self):
-        self.product1.categ_id.property_cost_method = 'average'
-        context = {
-            'default_product_id': self.product1.id,
-            'default_company_id': self.env.company.id,
-            'default_added_value': 0.0
-        }
-        # Quantity of product1 is zero, raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
-
-        self._make_in_move(self.product1, 1, unit_cost=1)
-        self._make_in_move(self.product1, 1, unit_cost=1)
-        self._make_in_move(self.product1, 1, unit_cost=1)
-
-        self.assertEqual(self.product1.standard_price, 1)
-        self.assertEqual(self.product1.quantity_svl, 3)
-
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
-
-        self.assertEqual(len(old_layers), 3)
-        self.assertEqual(old_layers[0].remaining_value, 1)
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
-        revaluation_wizard.added_value = 1
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
-
-        # Check standard price change
-        self.assertEqual(self.product1.standard_price, 1.33)
-        self.assertEqual(self.product1.quantity_svl, 3)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 1)
-
-        # Check the remaing value of current layers
-        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 4)
-        self.assertTrue(1.34 in old_layers.mapped("remaining_value"))
-
-        # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 1)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 1)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
-
-    def test_stock_valuation_layer_revaluation_avco_rounding_2_digits(self):
-        """
-        Check that the rounding of the new price (cost) is equivalent to the rounding of the standard price (cost)
-        The check is done indirectly via the layers valuations.
-        If correct => rounding method is correct too
-        """
-        self.product1.categ_id.property_cost_method = 'average'
-
-        self.env['decimal.precision'].search([
-            ('name', '=', 'Product Price'),
-        ]).digits = 2
-        self.product1.write({'standard_price': 0})
-
-        # First Move
-        self.product1.write({'standard_price': 0.022})
-        self._make_in_move(self.product1, 10000)
-
-        self.assertEqual(self.product1.standard_price, 0.02)
-        self.assertEqual(self.product1.quantity_svl, 10000)
-
-        layer = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layer.value, 200)
-
-        # Second Move
-        self.product1.write({'standard_price': 0.053})
-
-        self.assertEqual(self.product1.standard_price, 0.05)
-        self.assertEqual(self.product1.quantity_svl, 10000)
-
-        layers = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layers[0].value, 200)
-        self.assertEqual(layers[1].value, 300)
-
-    def test_stock_valuation_layer_revaluation_avco_rounding_5_digits(self):
-        """
-        Check that the rounding of the new price (cost) is equivalent to the rounding of the standard price (cost)
-        The check is done indirectly via the layers valuations.
-        If correct => rounding method is correct too
-        """
-        self.product1.categ_id.property_cost_method = 'average'
-
-        self.env['decimal.precision'].search([
-            ('name', '=', 'Product Price'),
-        ]).digits = 5
-
-        # First Move
-        self.product1.write({'standard_price': 0.00875})
-        self._make_in_move(self.product1, 10000)
-
-        self.assertEqual(self.product1.standard_price, 0.00875)
-        self.assertEqual(self.product1.quantity_svl, 10000)
-
-        layer = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layer.value, 87.5)
-
-        # Second Move
-        self.product1.write({'standard_price': 0.00975})
-
-        self.assertEqual(self.product1.standard_price, 0.00975)
-        self.assertEqual(self.product1.quantity_svl, 10000)
-
-        layers = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layers[0].value, 87.5)
-        self.assertEqual(layers[1].value, 10)
-
-    def test_stock_valuation_layer_revaluation_fifo(self):
-        self.product1.categ_id.property_cost_method = 'fifo'
-        context = {
-            'default_product_id': self.product1.id,
-            'default_company_id': self.env.company.id,
-            'default_added_value': 0.0
-        }
-        # Quantity of product1 is zero, raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
-
-        self._make_in_move(self.product1, 10, unit_cost=2)
-        self._make_in_move(self.product1, 10, unit_cost=4)
-
-        self.assertEqual(self.product1.standard_price, 3)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
-
-        self.assertEqual(len(old_layers), 2)
-        self.assertEqual(old_layers[0].remaining_value, 40)
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
-        revaluation_wizard.added_value = 20
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
-
-        self.assertEqual(self.product1.standard_price, 4)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 20)
-
-        # Check the remaing value of current layers
-        self.assertEqual(old_layers[0].remaining_value, 50)
-        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80)
-
-        # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertTrue(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-
-    def test_stock_valuation_layer_revaluation_partial(self):
-        """ Only adjust the valuation on some of the layers for a product """
-        self.product1.categ_id.property_cost_method = 'fifo'
-
-        product2 = self.env['product.product'].create({
-            'name': 'product2',
-            'is_storable': True,
-        })
-
-        self._make_in_move(self.product1, 5, unit_cost=4)
-        self._make_in_move(self.product1, 10, unit_cost=4)
-        self._make_in_move(self.product1, 5, unit_cost=8)
-        self._make_in_move(product2, 10, unit_cost=4)
-
-        self.assertEqual(self.product1.standard_price, 5)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
-
-        self.assertEqual(len(old_layers), 3)
-        self.assertEqual(old_layers.mapped("remaining_value"), [40, 40, 20])
-
-        # Adjusting layers for multiple products at once: raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context({
-                'active_ids': self.env['stock.valuation.layer'].search([]).ids,
-                'active_model': 'stock.valuation.layer'
-            })).save()
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context({
-            'active_ids': old_layers[0:2].ids,
-            'active_model': 'stock.valuation.layer'
-        }))
-        revaluation_wizard.added_value = 30
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
-
-        # Check standard price change
-        self.assertEqual(self.product1.standard_price, 6.5)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 30)
-
-        # Check the remaing value of current layers: only the adjusted layers should have changed
-        # the added value should be impacted proportionally to the qty of each layer (+10 and +20)
-        self.assertEqual(old_layers.mapped("remaining_value"), [50, 60, 20])
-
-        # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 30)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 30)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
-
-        self.assertIn(
-            f"Affected valuation layers: {old_layers[1].reference} (id: {old_layers[1].id}) and {old_layers[0].reference} (id: {old_layers[0].id})",
-            new_layer.account_move_id.line_ids[0].name
-        )
-
-        # Adjusting an adjustment layer: raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context({
-                'active_ids': [new_layer.id],
-                'active_model': 'stock.valuation.layer'
-            })).save()
-
-        # remove all products from the oldest layer
-        self._make_out_move(self.product1, 5)
-        self.assertEqual(old_layers[2].remaining_qty, 0)
-
-        # Adjusting a layer with no remaining quantity: raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context({
-                'active_ids': [old_layers[2].id],
-                'active_model': 'stock.valuation.layer'
-            })).save()
-
-    def test_multi_company_fifo_svl_negative_revaluation(self):
-        """
-        Check that the journal entries and stock valuation layers are created for the company related
-        to the stock move even if the picking is validated using a different one.
-        """
-        company1 = self.env.company
-        company2 = self.env['res.company'].create({
-            'name': 'Lovely Company',
-        })
-        self.env.companies = company1 | company2
-
-        product = self.product1
-        product.categ_id.write({
-            'property_cost_method': 'fifo',
-            'property_valuation': 'real_time',
-        })
-        # Modify valuation to manual_periodic for company2
-        product.categ_id.with_company(company2).property_valuation = 'periodic'
-
-        # Create moves to revaluate for company1
-        self._make_in_move(product, 10, unit_cost=10, create_picking=True)
-        self._make_out_move(product, 15, create_picking=True)
-
-        receipt = self.env['stock.picking'].create({
-            'picking_type_id': self.picking_type_in.id,
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'move_ids': [Command.create({
-                'product_id': product.id,
-                'location_id': self.supplier_location.id,
-                'location_dest_id': self.stock_location.id,
-                'product_uom': self.uom_unit.id,
-                'product_uom_qty': 10,
-                'price_unit': 7,
-            })]
-        }).with_company(company2)
-        receipt.action_confirm()
-        receipt.button_validate()
-
-        svls = self.env['stock.valuation.layer'].search([('product_id', '=', product.id)])
-        self.assertEqual(len(svls), 4, "Expected 4 valuation layers")
-        self.assertTrue(all(svl.account_move_id for svl in svls), "All SVLs should be linked to a journal entry")
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index b762f7bf0580b..661bc92b9262d 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -2829,6 +2829,345 @@ def test_valuation_rounding_method(self):
         self.assertEqual(move_out.product_qty, 0.01)
         self.assertEqual(self.product1.qty_available, 0.00)
 
+    def test_stock_valuation_layer_revaluation_avco(self):
+        self.product1.categ_id.property_cost_method = 'average'
+        context = {
+            'default_product_id': self.product1.id,
+            'default_company_id': self.env.company.id,
+            'default_added_value': 0.0
+        }
+        # Quantity of product1 is zero, raise
+        with self.assertRaises(UserError):
+            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
+
+        self._make_in_move(self.product1, 10, unit_cost=2)
+        self._make_in_move(self.product1, 10, unit_cost=4)
+
+        self.assertEqual(self.product1.standard_price, 3)
+        self.assertEqual(self.product1.quantity_svl, 20)
+
+        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+
+        self.assertEqual(len(old_layers), 2)
+        self.assertEqual(old_layers[0].remaining_value, 40)
+
+        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
+        revaluation_wizard.added_value = 20
+        revaluation_wizard.account_id = self.stock_valuation_account
+        revaluation_wizard.save().action_validate_revaluation()
+
+        # Check standard price change
+        self.assertEqual(self.product1.standard_price, 4)
+        self.assertEqual(self.product1.quantity_svl, 20)
+
+        # Check the creation of stock.valuation.layer
+        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
+        self.assertEqual(new_layer.value, 20)
+
+        # Check the remaing value of current layers
+        self.assertEqual(old_layers[0].remaining_value, 50)
+        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80)
+
+        # Check account move
+        self.assertTrue(bool(new_layer.account_move_id))
+        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
+
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20)
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20)
+
+        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
+        self.assertEqual(len(credit_lines), 1)
+        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
+
+    def test_stock_valuation_layer_revaluation_avco_rounding(self):
+        self.product1.categ_id.property_cost_method = 'average'
+        context = {
+            'default_product_id': self.product1.id,
+            'default_company_id': self.env.company.id,
+            'default_added_value': 0.0
+        }
+        # Quantity of product1 is zero, raise
+        with self.assertRaises(UserError):
+            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
+
+        self._make_in_move(self.product1, 1, unit_cost=1)
+        self._make_in_move(self.product1, 1, unit_cost=1)
+        self._make_in_move(self.product1, 1, unit_cost=1)
+
+        self.assertEqual(self.product1.standard_price, 1)
+        self.assertEqual(self.product1.quantity_svl, 3)
+
+        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+
+        self.assertEqual(len(old_layers), 3)
+        self.assertEqual(old_layers[0].remaining_value, 1)
+
+        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
+        revaluation_wizard.added_value = 1
+        revaluation_wizard.account_id = self.stock_valuation_account
+        revaluation_wizard.save().action_validate_revaluation()
+
+        # Check standard price change
+        self.assertEqual(self.product1.standard_price, 1.33)
+        self.assertEqual(self.product1.quantity_svl, 3)
+
+        # Check the creation of stock.valuation.layer
+        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
+        self.assertEqual(new_layer.value, 1)
+
+        # Check the remaing value of current layers
+        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 4)
+        self.assertTrue(1.34 in old_layers.mapped("remaining_value"))
+
+        # Check account move
+        self.assertTrue(bool(new_layer.account_move_id))
+        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
+
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 1)
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 1)
+
+        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
+        self.assertEqual(len(credit_lines), 1)
+        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
+
+    def test_stock_valuation_layer_revaluation_avco_rounding_2_digits(self):
+        """
+        Check that the rounding of the new price (cost) is equivalent to the rounding of the standard price (cost)
+        The check is done indirectly via the layers valuations.
+        If correct => rounding method is correct too
+        """
+        self.product1.categ_id.property_cost_method = 'average'
+
+        self.env['decimal.precision'].search([
+            ('name', '=', 'Product Price'),
+        ]).digits = 2
+        self.product1.write({'standard_price': 0})
+
+        # First Move
+        self.product1.write({'standard_price': 0.022})
+        self._make_in_move(self.product1, 10000)
+
+        self.assertEqual(self.product1.standard_price, 0.02)
+        self.assertEqual(self.product1.quantity_svl, 10000)
+
+        layer = self.product1.stock_valuation_layer_ids
+        self.assertEqual(layer.value, 200)
+
+        # Second Move
+        self.product1.write({'standard_price': 0.053})
+
+        self.assertEqual(self.product1.standard_price, 0.05)
+        self.assertEqual(self.product1.quantity_svl, 10000)
+
+        layers = self.product1.stock_valuation_layer_ids
+        self.assertEqual(layers[0].value, 200)
+        self.assertEqual(layers[1].value, 300)
+
+    def test_stock_valuation_layer_revaluation_avco_rounding_5_digits(self):
+        """
+        Check that the rounding of the new price (cost) is equivalent to the rounding of the standard price (cost)
+        The check is done indirectly via the layers valuations.
+        If correct => rounding method is correct too
+        """
+        self.product1.categ_id.property_cost_method = 'average'
+
+        self.env['decimal.precision'].search([
+            ('name', '=', 'Product Price'),
+        ]).digits = 5
+
+        # First Move
+        self.product1.write({'standard_price': 0.00875})
+        self._make_in_move(self.product1, 10000)
+
+        self.assertEqual(self.product1.standard_price, 0.00875)
+        self.assertEqual(self.product1.quantity_svl, 10000)
+
+        layer = self.product1.stock_valuation_layer_ids
+        self.assertEqual(layer.value, 87.5)
+
+        # Second Move
+        self.product1.write({'standard_price': 0.00975})
+
+        self.assertEqual(self.product1.standard_price, 0.00975)
+        self.assertEqual(self.product1.quantity_svl, 10000)
+
+        layers = self.product1.stock_valuation_layer_ids
+        self.assertEqual(layers[0].value, 87.5)
+        self.assertEqual(layers[1].value, 10)
+
+    def test_stock_valuation_layer_revaluation_fifo(self):
+        self.product1.categ_id.property_cost_method = 'fifo'
+        context = {
+            'default_product_id': self.product1.id,
+            'default_company_id': self.env.company.id,
+            'default_added_value': 0.0
+        }
+        # Quantity of product1 is zero, raise
+        with self.assertRaises(UserError):
+            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
+
+        self._make_in_move(self.product1, 10, unit_cost=2)
+        self._make_in_move(self.product1, 10, unit_cost=4)
+
+        self.assertEqual(self.product1.standard_price, 3)
+        self.assertEqual(self.product1.quantity_svl, 20)
+
+        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+
+        self.assertEqual(len(old_layers), 2)
+        self.assertEqual(old_layers[0].remaining_value, 40)
+
+        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
+        revaluation_wizard.added_value = 20
+        revaluation_wizard.account_id = self.stock_valuation_account
+        revaluation_wizard.save().action_validate_revaluation()
+
+        self.assertEqual(self.product1.standard_price, 4)
+
+        # Check the creation of stock.valuation.layer
+        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
+        self.assertEqual(new_layer.value, 20)
+
+        # Check the remaing value of current layers
+        self.assertEqual(old_layers[0].remaining_value, 50)
+        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80)
+
+        # Check account move
+        self.assertTrue(bool(new_layer.account_move_id))
+        self.assertTrue(len(new_layer.account_move_id.line_ids), 2)
+
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20)
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20)
+
+        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
+        self.assertEqual(len(credit_lines), 1)
+
+    def test_stock_valuation_layer_revaluation_partial(self):
+        """ Only adjust the valuation on some of the layers for a product """
+        self.product1.categ_id.property_cost_method = 'fifo'
+
+        product2 = self.env['product.product'].create({
+            'name': 'product2',
+            'is_storable': True,
+        })
+
+        self._make_in_move(self.product1, 5, unit_cost=4)
+        self._make_in_move(self.product1, 10, unit_cost=4)
+        self._make_in_move(self.product1, 5, unit_cost=8)
+        self._make_in_move(product2, 10, unit_cost=4)
+
+        self.assertEqual(self.product1.standard_price, 5)
+        self.assertEqual(self.product1.quantity_svl, 20)
+
+        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+
+        self.assertEqual(len(old_layers), 3)
+        self.assertEqual(old_layers.mapped("remaining_value"), [40, 40, 20])
+
+        # Adjusting layers for multiple products at once: raise
+        with self.assertRaises(UserError):
+            Form(self.env['stock.valuation.layer.revaluation'].with_context({
+                'active_ids': self.env['stock.valuation.layer'].search([]).ids,
+                'active_model': 'stock.valuation.layer'
+            })).save()
+
+        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context({
+            'active_ids': old_layers[0:2].ids,
+            'active_model': 'stock.valuation.layer'
+        }))
+        revaluation_wizard.added_value = 30
+        revaluation_wizard.account_id = self.stock_valuation_account
+        revaluation_wizard.save().action_validate_revaluation()
+
+        # Check standard price change
+        self.assertEqual(self.product1.standard_price, 6.5)
+        self.assertEqual(self.product1.quantity_svl, 20)
+
+        # Check the creation of stock.valuation.layer
+        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
+        self.assertEqual(new_layer.value, 30)
+
+        # Check the remaing value of current layers: only the adjusted layers should have changed
+        # the added value should be impacted proportionally to the qty of each layer (+10 and +20)
+        self.assertEqual(old_layers.mapped("remaining_value"), [50, 60, 20])
+
+        # Check account move
+        self.assertTrue(bool(new_layer.account_move_id))
+        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
+
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 30)
+        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 30)
+
+        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
+        self.assertEqual(len(credit_lines), 1)
+        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
+
+        self.assertIn(
+            f"Affected valuation layers: {old_layers[1].reference} (id: {old_layers[1].id}) and {old_layers[0].reference} (id: {old_layers[0].id})",
+            new_layer.account_move_id.line_ids[0].name
+        )
+
+        # Adjusting an adjustment layer: raise
+        with self.assertRaises(UserError):
+            Form(self.env['stock.valuation.layer.revaluation'].with_context({
+                'active_ids': [new_layer.id],
+                'active_model': 'stock.valuation.layer'
+            })).save()
+
+        # remove all products from the oldest layer
+        self._make_out_move(self.product1, 5)
+        self.assertEqual(old_layers[2].remaining_qty, 0)
+
+        # Adjusting a layer with no remaining quantity: raise
+        with self.assertRaises(UserError):
+            Form(self.env['stock.valuation.layer.revaluation'].with_context({
+                'active_ids': [old_layers[2].id],
+                'active_model': 'stock.valuation.layer'
+            })).save()
+
+    def test_multi_company_fifo_svl_negative_revaluation(self):
+        """
+        Check that the journal entries and stock valuation layers are created for the company related
+        to the stock move even if the picking is validated using a different one.
+        """
+        company1 = self.env.company
+        company2 = self.env['res.company'].create({
+            'name': 'Lovely Company',
+        })
+        self.env.companies = company1 | company2
+
+        product = self.product1
+        product.categ_id.write({
+            'property_cost_method': 'fifo',
+            'property_valuation': 'real_time',
+        })
+        # Modify valuation to manual_periodic for company2
+        product.categ_id.with_company(company2).property_valuation = 'periodic'
+
+        # Create moves to revaluate for company1
+        self._make_in_move(product, 10, unit_cost=10, create_picking=True)
+        self._make_out_move(product, 15, create_picking=True)
+
+        receipt = self.env['stock.picking'].create({
+            'picking_type_id': self.picking_type_in.id,
+            'location_id': self.supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'move_ids': [Command.create({
+                'product_id': product.id,
+                'location_id': self.supplier_location.id,
+                'location_dest_id': self.stock_location.id,
+                'product_uom': self.uom_unit.id,
+                'product_uom_qty': 10,
+                'price_unit': 7,
+            })]
+        }).with_company(company2)
+        receipt.action_confirm()
+        receipt.button_validate()
+
+        svls = self.env['stock.valuation.layer'].search([('product_id', '=', product.id)])
+        self.assertEqual(len(svls), 4, "Expected 4 valuation layers")
+        self.assertTrue(all(svl.account_move_id for svl in svls), "All SVLs should be linked to a journal entry")
+
     def test_stock_move_value_with_different_uom(self):
         """ Ensure that the stock move value is correctly computed
         when the move's UoM differs from the product's UoM.

From b448a805476c1736c6efe5b4b376341344721cb6 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:41:37 +0200
Subject: [PATCH 246/673] [IMP] stock_account: Prepare common class

The common class has been created for test_stockvaluationlayer.py in the
first place. However we would like to have common class that are
complete and could be used by override later. We also try to keep a
minimun setup and suggest a lot of helpers for duplicated code

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/tests/common.py | 201 +++++++++++++++++++++------
 1 file changed, 162 insertions(+), 39 deletions(-)

diff --git a/addons/stock_account/tests/common.py b/addons/stock_account/tests/common.py
index 6e94b8df35871..09470b50baa86 100644
--- a/addons/stock_account/tests/common.py
+++ b/addons/stock_account/tests/common.py
@@ -1,14 +1,56 @@
 from odoo import Command
+from odoo.tools.misc import clean_context
 from odoo.tests import Form
-from odoo.tests.common import TransactionCase
+from odoo.addons.base.tests.common import BaseCommon
 
 
-class TestStockValuationCommon(TransactionCase):
+class TestStockValuationCommon(BaseCommon):
+    # Override
+    @classmethod
+    def _create_company(cls, **create_values):
+        company = super()._create_company(**create_values)
+        cls.env["account.chart.template"]._load(
+            "generic_coa", company, install_demo=False
+        )
+        return company
+
+    # HELPER
+    def _create_invoice(self, move_type, product, quantity=1.0, price_unit=1.0):
+        invoice = self.env["account.move"].create(
+            {
+                "partner_id": self.vendor.id,
+                "move_type": move_type,
+                "invoice_line_ids": [],
+            }
+        )
+        self.env["account.move.line"].create({
+            "move_id": invoice.id,
+             "display_type": "product",
+             "name": "test line",
+             "price_unit": price_unit,
+             "quantity": quantity,
+             "product_id": product.id,
+             "product_uom_id": product.uom_id.id,
+             "tax_ids": [(5, 0, 0)],
+        })
+        invoice.action_post()
+        return invoice
 
     def _close(self, auto_post=True, at_date=None):
         action = self.company.action_close_stock_valuation(at_date=at_date, auto_post=auto_post)
         return action['res_id'] and self.env['account.move'].browse(action['res_id'])
 
+    def _use_inventory_location_accounting(self):
+        self.account_inventory = self.env['account.account'].create({
+            'name': 'Inventory Account',
+            'code': '100101',
+            'account_type': 'asset_current',
+        })
+        inventory_locations = self.env['stock.location'].search([('usage', '=', 'inventory'), ('company_id', '=', self.company.id)])
+        inventory_locations.valuation_account_id = self.account_inventory.id
+        return  self.account_inventory
+
+    # Moves
     def _make_in_move(self,
             product,
             quantity,
@@ -31,16 +73,21 @@ def _make_in_move(self,
             ''owner_id: Consignment owner
         """
         unit_cost = unit_cost or product.standard_price
-        in_move = self.env['stock.move'].create({
+        product_qty = quantity
+        if kwargs.get('uom_id'):
+            uom = self.env['uom.uom'].browse(kwargs.get('uom_id'))
+            product_qty = uom._compute_quantity(quantity, product.uom_id)
+        move_vals = {
             'product_id': product.id,
             'location_id': kwargs.get('location_id', self.supplier_location.id),
             'location_dest_id': kwargs.get('location_dest_id', self.stock_location.id),
-            'product_uom': kwargs.get('uom_id', self.uom_id.id),
+            'product_uom': kwargs.get('uom_id', self.uom.id),
             'product_uom_qty': quantity,
-            'price_unit': unit_cost,
             'picking_type_id': kwargs.get('picking_type_id', self.picking_type_in.id),
-            'value_manual': unit_cost * quantity,
-        })
+        }
+        if unit_cost:
+            move_vals['value_manual'] = unit_cost * product_qty
+        in_move = self.env['stock.move'].create(move_vals)
 
         if create_picking:
             picking = self.env['stock.picking'].create({
@@ -65,6 +112,9 @@ def _make_in_move(self,
         else:
             in_move._action_assign()
 
+        if not create_picking and kwargs.get('owner_id'):
+            in_move.move_line_ids.owner_id = kwargs.get('owner_id')
+
         in_move.picked = True
         in_move._action_done()
 
@@ -95,7 +145,7 @@ def _make_out_move(self,
             'product_id': product.id,
             'location_id': kwargs.get('location_id', self.stock_location.id),
             'location_dest_id': kwargs.get('location_dest_id', self.customer_location.id),
-            'product_uom': kwargs.get('uom_id', self.uom_id.id),
+            'product_uom': kwargs.get('uom_id', self.uom.id),
             'product_uom_qty': quantity,
             'picking_type_id': kwargs.get('picking_type_id', self.picking_type_out.id),
         })
@@ -132,7 +182,7 @@ def _make_dropship_move(self, product, quantity, unit_cost=None, lot_ids=None):
             'product_id': product.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_uom': self.uom_id.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': quantity,
             'picking_type_id': self.picking_type_out.id,
         })
@@ -167,26 +217,17 @@ def _make_return(self, move, quantity_to_return):
         return_pick._action_done()
         return return_pick.move_ids
 
-    def _create_invoice(self, move_type, product, quantity=1.0, price_unit=1.0):
-        invoice = self.env["account.move"].create(
-            {
-                "partner_id": self.vendor.id,
-                "move_type": move_type,
-                "invoice_line_ids": [],
-            }
-        )
-        self.env["account.move.line"].create({
-            "move_id": invoice.id,
-             "display_type": "product",
-             "name": "test line",
-             "price_unit": price_unit,
-             "quantity": quantity,
-             "product_id": product.id,
-             "product_uom_id": product.uom_id.id,
-             "tax_ids": [(5, 0, 0)],
-        })
-        invoice.action_post()
-        return invoice
+    # Post move processing
+    def _add_move_line(self, move, **kwargs):
+        old_price_unit = move._get_price_unit()
+        self.env['stock.move.line'].create({
+            'move_id': move.id,
+            'product_id': move.product_id.id,
+            'product_uom_id': move.product_uom.id,
+            'location_id': move.location_id.id,
+            'location_dest_id': move.location_dest_id.id,
+        } | kwargs)
+        move.value_manual = old_price_unit * move.quantity
 
     def _set_quantity(self, move, quantity):
         """Helper function to retroactively change the quantity of a move.
@@ -196,15 +237,17 @@ def _set_quantity(self, move, quantity):
         move.quantity = quantity
         move.value_manual = price_unit * quantity
 
-    def _add_move_line(self, move, **kwargs):
-        self.env['stock.move.line'].create({
-            'move_id': move.id,
-            'product_id': move.product_id.id,
-            'product_uom_id': move.product_uom.id,
-            'location_id': move.location_id.id,
-            'location_dest_id': move.location_dest_id.id,
-        } | kwargs)
-        move.value_manual = move.price_unit * move.quantity
+    # GETTER
+    def _get_stock_valuation_move_lines(self):
+        return self.env['account.move.line'].search([
+            ('account_id', '=', self.account_stock_valuation.id),
+        ], order='date, id')
+
+    def _get_expense_move_lines(self):
+        return self.env['account.move.line'].search([
+            ('account_id', '=', self.account_expense.id),
+        ], order='date, id')
+
 
     @classmethod
     def setUpClass(cls):
@@ -214,6 +257,8 @@ def setUpClass(cls):
             "generic_coa", cls.company, install_demo=False
         )
         cls.env.user.company_id = cls.company
+        cls.inventory_user = cls._create_new_internal_user(name='Pauline Poivraisselle', login= 'pauline', groups='stock.group_stock_user')
+        cls.owner = cls._create_partner(name='Consignment Owner')
         cls.warehouse = cls.env['stock.warehouse'].create({
             'name': 'Test Warehouse',
             'code': 'TW',
@@ -223,11 +268,89 @@ def setUpClass(cls):
         cls.customer_location = cls.env.ref('stock.stock_location_customers')
         cls.supplier_location = cls.env.ref('stock.stock_location_suppliers')
 
+        cls.account_expense = cls.company.expense_account_id
+        cls.account_stock_valuation = cls.company.account_stock_valuation_id
+        cls.account_stock_variation = cls.account_stock_valuation.account_stock_variation_id
+
         cls.picking_type_in = cls.warehouse.in_type_id
         cls.picking_type_out = cls.warehouse.out_type_id
-        cls.uom_id = cls.env.ref('uom.product_uom_unit')
+        cls.uom = cls.env.ref('uom.product_uom_unit')
 
         cls.vendor = cls.env['res.partner'].create({
             'name': 'Test Vendor',
             'company_id': cls.company.id,
         })
+        cls.other_company = cls._create_company(name="Other Company")
+        cls.branch = cls._create_company(name="Branch Company", parent_id=cls.company.id)
+        cls.other_currency = cls.setup_other_currency(code="EUR", rates=[
+            ('1900-01-01', 1.0),
+            ('2016-01-01', 3.0),
+            ('2017-01-01', 2.0),
+        ])
+
+        cls.category_standard = cls.env['product.category'].create({
+            'name': 'Standard',
+            'property_valuation': 'periodic',
+            'property_cost_method': 'standard',
+        })
+        cls.category_standard_auto = cls.category_standard.copy({
+            'name': 'Standard Auto',
+            'property_valuation': 'real_time',
+        })
+        cls.category_fifo = cls.env['product.category'].create({
+            'name': 'Fifo',
+            'property_valuation': 'periodic',
+            'property_cost_method': 'fifo',
+        })
+        cls.category_fifo_auto = cls.category_fifo.copy({
+            'name': 'Fifo Auto',
+            'property_valuation': 'real_time',
+        })
+        cls.category_avco = cls.env['product.category'].create({
+            'name': 'Avco',
+            'property_valuation': 'periodic',
+            'property_cost_method': 'average',
+        })
+        cls.category_avco_auto = cls.category_avco.copy({
+            'name': 'Avco Auto',
+            'property_valuation': 'real_time',
+        })
+
+        # Clean context to avoid magic behavior later (e.g. copy with create_product_product to false)
+        product_common_vals = {
+            "standard_price": 10.0,
+            "list_price": 20.0,
+            "uom_id": cls.uom.id,
+            "is_storable": True,
+        }
+        cls.product_standard = cls.env['product.product'].create({
+            **product_common_vals,
+            'name': 'Standard Product',
+            'categ_id': cls.category_standard.id,
+        }).with_context(clean_context(cls.env.context))
+        cls.product_standard_auto = cls.env['product.product'].create({
+            **product_common_vals,
+            'name': 'Standard Product Auto',
+            'categ_id': cls.category_standard_auto.id,
+        }).with_context(clean_context(cls.env.context))
+        cls.product_fifo = cls.env['product.product'].create({
+            **product_common_vals,
+            'name': 'Fifo Product',
+            'categ_id': cls.category_fifo.id,
+        }).with_context(clean_context(cls.env.context))
+        cls.product_fifo_auto = cls.env['product.product'].create({
+            **product_common_vals,
+            'name': 'Fifo Product Auto',
+            'categ_id': cls.category_fifo_auto.id,
+        }).with_context(clean_context(cls.env.context))
+        cls.product_avco = cls.env['product.product'].create({
+            **product_common_vals,
+            'name': 'Avco Product',
+            'categ_id': cls.category_avco.id,
+        }).with_context(clean_context(cls.env.context))
+        cls.product_avco_auto = cls.env['product.product'].create({
+            **product_common_vals,
+            'name': 'Avco Product Auto',
+            'categ_id': cls.category_avco_auto.id,
+        }).with_context(clean_context(cls.env.context))
+

From e3921865b739460499501816d0c91cc6723214ef Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:42:23 +0200
Subject: [PATCH 247/673] [IMP] stock_account: Remove product file

It test the variant creation. It should be a post install of product tests instead.
Nothing related to stock_account

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/tests/__init__.py     |  1 -
 addons/stock_account/tests/test_product.py | 59 ----------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 addons/stock_account/tests/test_product.py

diff --git a/addons/stock_account/tests/__init__.py b/addons/stock_account/tests/__init__.py
index e151fef434902..4f6c92c0d07ad 100644
--- a/addons/stock_account/tests/__init__.py
+++ b/addons/stock_account/tests/__init__.py
@@ -1,6 +1,5 @@
 from . import test_account_move
 from . import test_anglo_saxon_valuation_reconciliation_common
 from . import test_lot_valuation
-from . import test_product
 from . import test_stockvaluation
 from . import test_stockvaluationlayer
diff --git a/addons/stock_account/tests/test_product.py b/addons/stock_account/tests/test_product.py
deleted file mode 100644
index 035d635766ae4..0000000000000
--- a/addons/stock_account/tests/test_product.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from unittest import skip
-
-from odoo.addons.stock_account.tests.test_stockvaluationlayer import TestStockValuationCommon
-from odoo.tests import tagged
-
-from odoo.fields import Command
-
-
-@skip('Temporary to fast merge new valuation')
-@tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockAccountProduct(TestStockValuationCommon):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.fifo_category = cls.env['product.category'].create({
-            'name': 'All/Saleable FIFO',
-            'parent_id': cls.env.ref('product.product_category_goods').id,
-            'property_cost_method': 'fifo',
-        })
-        cls.attribute_legs = cls.env['product.attribute'].create({
-            'name': 'Legs',
-            'value_ids': [
-                Command.create({'name': 'Steel'}),
-                Command.create({'name': 'Aluminium'}),
-                Command.create({'name': 'Custom'}),
-            ],
-        })
-
-    def test_update_categ_and_add_attributes(self):
-        """ Check that one can adapt the `property_cost_method` of a product with variants."""
-        template = self.env['product.template'].create({
-            'name': 'Table',
-            'type': 'consu',
-            'is_storable': True,
-            'categ_id': self.env.ref('product.product_category_goods').id,
-            'attribute_line_ids': [
-                Command.create({
-                    'attribute_id': self.attribute_legs.id,
-                    'value_ids': [
-                        Command.link(self.attribute_legs.value_ids[0].id),  # Add Steel
-                        Command.link(self.attribute_legs.value_ids[1].id),  # Add Aluminium
-                ]}),
-            ],
-        })
-        initial_variants = template.product_variant_ids
-        self.assertEqual(len(initial_variants), 2, "Expected 2 initial variants.")
-        template.write({
-            'categ_id': self.fifo_category.id,
-            'attribute_line_ids': [Command.update(template.attribute_line_ids[0].id, {
-                'value_ids': [
-                    Command.unlink(self.attribute_legs.value_ids[0].id),  # Remove Steel
-                    Command.link(self.attribute_legs.value_ids[2].id),  # Add Custom
-                ]
-            })]
-        })
-        final_variants = template.product_variant_ids
-        self.assertEqual(len(final_variants), 2, "Expected 2 product variants after attribute change.")

From 7f67ad3461275f2bd92ff70a45dec53516ddae52 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:43:26 +0200
Subject: [PATCH 248/673] [IMP] stock_account: stock.move.line date readonly

The date field of stock.move.line is editable but only when the move is
done. It's a strange behavior and the initial purpose to the fix was to
block people from import sml in past and expect the valuation to be also
backdated. It's an edge case and we don't block anymore for that

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock/views/stock_move_line_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index 166c06d69dbff..fa6b660c6bae2 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -82,7 +82,7 @@
                     <field name="picked" invisible="1"/>
                     <group>
                         <group>
-                            <field name="date" readonly="state != 'done'"/>
+                            <field name="date"/>
                             <field name="reference" string="Reference"/>
                             <field name="origin"/>
                             <field name="product_id" readonly="context.get('default_product_id')"/>

From 352fb7a9e8a95dbd2f139042fcaf7a2a51e57d48 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:44:13 +0200
Subject: [PATCH 249/673] [FIX] stock_account: empty COGS without delivery

Currently when we do an invoice without stock. `_get_cogs_value`
is base on the existing `stock.move` and their price unit. However
we don't have any move and it returns 0. Instead we take the value
for the incoming move in the FIFO stack.

It you do multiple invoice without deliveries between the FIFO value
will always be the same (since the FIFO stack is not impacted). But
during the closing the delta between the real stock value and the
accounting will be check and corrected.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/account_move_line.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock_account/models/account_move_line.py b/addons/stock_account/models/account_move_line.py
index 81f42a2d4f658..3f56bbf981583 100644
--- a/addons/stock_account/models/account_move_line.py
+++ b/addons/stock_account/models/account_move_line.py
@@ -66,6 +66,8 @@ def _get_cogs_value(self):
 
         # FIFO
         moves = self._get_stock_moves()
+        if not moves:
+            return self.product_id._run_fifo(self.quantity)
         return moves._get_price_unit()
 
     def _get_stock_moves(self):

From 9ed8c6455edf419734abcb1a0968f930a2990826 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:45:21 +0200
Subject: [PATCH 250/673] [FIX] stock_account: Remove consignement from
 inventory value

`qty_available` use the quants under the warehouse. A first fix exists
to take all the valued locations. But in case of consignement. The
product is in our stock but don't belong to the company. So the
inventory value should not count it.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock/models/product.py         | 6 ++++++
 addons/stock_account/models/product.py | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index afef66e511ef1..b6635b28b83d0 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -177,6 +177,12 @@ def _compute_quantities_dict(self, lot_id, owner_id, package_id, from_date=False
             domain_quant += [('owner_id', '=', owner_id)]
             domain_move_in += [('restrict_partner_id', '=', owner_id)]
             domain_move_out += [('restrict_partner_id', '=', owner_id)]
+        if 'owners' in self.env.context:
+            owners = self.env.context['owners']
+            if owners:
+                domain_quant += [('owner_id', 'in', self.env.context['owners'])]
+            else:
+                domain_quant += [('owner_id', '=', False)]
         if package_id is not None:
             domain_quant += [('package_id', '=', package_id)]
         if dates_in_the_past:
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 00fc828f01dd7..be9d08691fc82 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -226,8 +226,15 @@ def _get_value_from_lots(self):
         return sum(lots.mapped('total_value'))
 
     def _with_valuation_context(self):
+        self_with_context = self
         valued_locations = self.env['stock.location'].search([('is_valued_internal', '=', True)])
-        return self.with_context(location=valued_locations.ids)
+        self_with_context = self.with_context(location=valued_locations.ids)
+        # In FIFO, the stack in on stock.move and their value is already computed base on the owner
+        if self.cost_method != 'fifo':
+            self_with_context = self_with_context.with_context(
+                owners=[False, self.env.company.partner_id.id]
+            )
+        return self_with_context
 
     def _get_remaining_moves(self):
         moves_qty_by_product = {}

From 8995d68a8c25a9e6dfa54a167e3b1cd28d5a70d9 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:46:25 +0200
Subject: [PATCH 251/673] [FIX] stock_account: remaining value depend on
 remaining quantity

The computed field is not recomputed when the remaining_qty has been
modified. It's a not a big issue since the field is not store and only
in a single view but for the testing, it's good to make it works.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/stock_move.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_account/models/stock_move.py b/addons/stock_account/models/stock_move.py
index 0d99674842e24..c64b2f2b5fb1b 100644
--- a/addons/stock_account/models/stock_move.py
+++ b/addons/stock_account/models/stock_move.py
@@ -87,7 +87,7 @@ def _compute_remaining_qty(self):
         for move in self:
             move.remaining_qty = remaining_by_product.get(move.product_id, {}).get(move, 0)
 
-    @api.depends('value')
+    @api.depends('value', 'remaining_qty')
     def _compute_remaining_value(self):
         for move in self:
             if not move.is_in:

From 5fe3bd215d90a3948c5b9cf468dc3a40e2bbf9d2 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:47:07 +0200
Subject: [PATCH 252/673] [FIX] stock_account: valued quantity is wrong with
 sml in a specific UoM

By default the `stock.move.line` use the UoM of the `stock.move`.
However when the user set a different UoM then the valued quantity
is not converted and the move's value is wrong

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/purchase_stock/models/stock_move.py | 3 ++-
 addons/stock_account/models/stock_move.py  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/purchase_stock/models/stock_move.py b/addons/purchase_stock/models/stock_move.py
index bfa7989c08089..255fa8d212571 100644
--- a/addons/purchase_stock/models/stock_move.py
+++ b/addons/purchase_stock/models/stock_move.py
@@ -185,7 +185,8 @@ def _get_value_from_quotation(self, quantity, at_date=None):
         if not self.purchase_line_id:
             return super()._get_value_from_quotation(quantity, at_date)
         price_unit = self.purchase_line_id._get_stock_move_price_unit()
-        quantity = min(quantity, self.quantity)
+        uom_quantity = self.product_uom._compute_quantity(quantity, self.product_id.uom_id)
+        quantity = min(quantity, uom_quantity)
         return {
             'value': price_unit * quantity,
             'quantity': quantity,
diff --git a/addons/stock_account/models/stock_move.py b/addons/stock_account/models/stock_move.py
index c64b2f2b5fb1b..1a16e4aa33f6b 100644
--- a/addons/stock_account/models/stock_move.py
+++ b/addons/stock_account/models/stock_move.py
@@ -328,7 +328,7 @@ def _get_valued_qty(self, lot=None):
         if self.is_dropship:
             if lot:
                 return sum(self.move_line_ids.filtered(lambda ml: ml.lot_id == lot).mapped('quantity_product_uom'))
-            return self.product_qty
+            return self.product_uom._compute_quantity(self.quantity, self.product_id.uom_id)
         return 0
 
     def _get_manual_value(self, quantity, at_date=None):

From ed3483d00da14df52d4daba4ef8ed76865a73463 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:47:47 +0200
Subject: [PATCH 253/673] [IMP] stock_account: Tests refactoring

Use the helper defined in common.py and adapt to the new
valuation system.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/mrp_account/tests/test_mrp_account.py  |    4 +-
 .../tests/test_valuation_layers.py            |    5 +-
 .../tests/test_anglo_saxon_valuation.py       |   26 +-
 .../tests/test_sale_stock_margin.py           |   21 +-
 addons/stock_account/tests/common.py          |   38 +-
 .../stock_account/tests/test_account_move.py  |  270 +--
 .../stock_account/tests/test_lot_valuation.py |    4 +-
 .../tests/test_stockvaluation.py              | 1818 +++++++----------
 .../tests/test_stockvaluationlayer.py         | 1071 ++++------
 .../tests/test_stock_landed_costs_purchase.py |    1 -
 10 files changed, 1224 insertions(+), 2034 deletions(-)

diff --git a/addons/mrp_account/tests/test_mrp_account.py b/addons/mrp_account/tests/test_mrp_account.py
index 8ce00bbb5ea53..30c1ddde5dbda 100644
--- a/addons/mrp_account/tests/test_mrp_account.py
+++ b/addons/mrp_account/tests/test_mrp_account.py
@@ -4,8 +4,8 @@
 from datetime import timedelta
 from unittest import skip
 
+from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 from odoo.addons.mrp.tests.common import TestMrpCommon
-from odoo.addons.stock_account.tests.test_account_move import TestAccountMoveStockCommon
 from odoo.tests import Form, tagged
 from odoo.tests.common import new_test_user
 from odoo import fields, Command
@@ -382,7 +382,7 @@ def test_labor_cost_posting_is_not_rounded_incorrectly(self):
 
 @tagged("post_install", "-at_install")
 @skip('Temporary to fast merge new valuation')
-class TestMrpAccountMove(TestAccountMoveStockCommon):
+class TestMrpAccountMove(TestStockValuationCommon):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/mrp_account/tests/test_valuation_layers.py b/addons/mrp_account/tests/test_valuation_layers.py
index 76983ae7d9fe9..46d79e22cd416 100644
--- a/addons/mrp_account/tests/test_valuation_layers.py
+++ b/addons/mrp_account/tests/test_valuation_layers.py
@@ -4,8 +4,7 @@
 from unittest import skip
 
 from odoo.fields import Command
-from odoo.addons.stock_account.tests.test_stockvaluationlayer import TestStockValuationCommon
-from odoo.addons.stock_account.tests.test_stockvaluation import TestStockValuationBase
+from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 from odoo.tests import Form
 from odoo.tests.common import tagged
 
@@ -459,7 +458,7 @@ def test_average_cost_unbuild_with_byproducts(self):
 
 @tagged("post_install", "-at_install")
 @skip('Temporary to fast merge new valuation')
-class TestMrpStockValuation(TestStockValuationBase):
+class TestMrpStockValuation(TestStockValuationCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
diff --git a/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py b/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py
index a1eb6ddd0dd33..b267d0ccf3278 100644
--- a/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py
+++ b/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py
@@ -3,34 +3,12 @@
 from odoo.fields import Date, Datetime
 from odoo.tools import float_is_zero, mute_logger
 from odoo.tests import Form, tagged
-from odoo.addons.account.tests.common import AccountTestInvoicingCommon
-from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
+from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 
 
 @tagged('post_install', '-at_install')
 @skip('Temporary to fast merge new valuation')
-class TestAngloSaxonValuationPurchaseMRP(AccountTestInvoicingCommon):
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.vendor01 = cls.env['res.partner'].create({'name': "Super Vendor"})
-
-        cls.stock_input_account, cls.stock_output_account, cls.stock_valuation_account, cls.expense_account, cls.income_account, cls.stock_journal = _create_accounting_data(cls.env)
-        cls.avco_category = cls.env['product.category'].create({
-            'name': 'AVCO',
-            'property_cost_method': 'average',
-            'property_valuation': 'real_time',
-            'property_stock_account_input_categ_id': cls.stock_input_account.id,
-            'property_stock_account_output_categ_id': cls.stock_output_account.id,
-            'property_stock_journal': cls.stock_journal.id,
-            'property_stock_valuation_account_id': cls.stock_valuation_account.id,
-        })
-
-        currency_grp = cls.env.ref('base.group_multi_currency')
-        cls.env.user.write({'group_ids': [(4, currency_grp.id)]})
-
-        cls.env.company.anglo_saxon_accounting = True
+class TestAngloSaxonValuationPurchaseMRP(TestStockValuationCommon):
 
     def test_kit_anglo_saxo_price_diff(self):
         """
diff --git a/addons/sale_stock_margin/tests/test_sale_stock_margin.py b/addons/sale_stock_margin/tests/test_sale_stock_margin.py
index ac6ce01d1a51e..67ffc480efb78 100644
--- a/addons/sale_stock_margin/tests/test_sale_stock_margin.py
+++ b/addons/sale_stock_margin/tests/test_sale_stock_margin.py
@@ -4,11 +4,11 @@
 from odoo import fields
 
 from odoo.tests import Form, tagged
-from odoo.addons.stock_account.tests.test_stockvaluation import TestStockValuationBase
+from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 
 
 @tagged('post_install', '-at_install')
-class TestSaleStockMargin(TestStockValuationBase):
+class TestSaleStockMargin(TestStockValuationCommon):
 
     @classmethod
     def setUpClass(cls):
@@ -174,16 +174,17 @@ def test_sale_stock_margin_5(self):
 
     def test_sale_stock_margin_6(self):
         """ Test that the purchase price doesn't change when there is a service product in the SO"""
+        product = self.product_standard
         service = self.env['product.product'].create({
             'name': 'Service',
             'type': 'service',
             'list_price': 100.0,
             'standard_price': 50.0})
-        self.product1.list_price = 80.0
-        self.product1.standard_price = 40.0
+        product.list_price = 80.0
+        product.standard_price = 40.0
         sale_order = self._create_sale_order()
         order_line_1 = self._create_sale_order_line(sale_order, service, 1, 100)
-        order_line_2 = self._create_sale_order_line(sale_order, self.product1, 1, 80)
+        order_line_2 = self._create_sale_order_line(sale_order, product, 1, 80)
 
         self.assertEqual(order_line_1.purchase_price, 50, "Sales order line cost should be 50.00")
         self.assertEqual(order_line_2.purchase_price, 40, "Sales order line cost should be 40.00")
@@ -355,7 +356,8 @@ def test_add_product_on_delivery_price_unit_on_sale(self):
 
     def test_add_standard_product_on_delivery_cost_on_sale_order(self):
         """ test that if product with standard cost method is added in delivery, the cost is computed."""
-        self.product1.write({
+        product = self.product_standard
+        product.write({
                 'standard_price': 20,
                 'list_price': 25,
                 'invoice_policy': 'order',
@@ -369,7 +371,7 @@ def test_add_standard_product_on_delivery_cost_on_sale_order(self):
             'invoice_policy': 'order',
         })
         sale_order = self._create_sale_order()
-        self._create_sale_order_line(sale_order, self.product1, 10, self.product1.list_price)
+        self._create_sale_order_line(sale_order, product, 10, product.list_price)
         sale_order.action_confirm()
         delivery = sale_order.picking_ids[0]
         with Form(delivery) as delivery_form:
@@ -386,7 +388,8 @@ def test_add_avco_product_on_delivery_cost_on_sale_order(self):
             'name': 'AVERAGE',
             'property_cost_method': 'average'
         })
-        self.product1.write({
+        self.product = self.product_avco
+        self.product.write({
                 'standard_price': 20,
                 'list_price': 25,
                 'invoice_policy': 'order',
@@ -401,7 +404,7 @@ def test_add_avco_product_on_delivery_cost_on_sale_order(self):
             'invoice_policy': 'order',
         })
         sale_order = self._create_sale_order()
-        self._create_sale_order_line(sale_order, self.product1, 10, self.product1.list_price)
+        self._create_sale_order_line(sale_order, self.product, 10, self.product.list_price)
         sale_order.action_confirm()
         delivery = sale_order.picking_ids[0]
         with Form(delivery) as delivery_form:
diff --git a/addons/stock_account/tests/common.py b/addons/stock_account/tests/common.py
index 09470b50baa86..812dab92f2d90 100644
--- a/addons/stock_account/tests/common.py
+++ b/addons/stock_account/tests/common.py
@@ -15,14 +15,15 @@ def _create_company(cls, **create_values):
         return company
 
     # HELPER
-    def _create_invoice(self, move_type, product, quantity=1.0, price_unit=1.0):
-        invoice = self.env["account.move"].create(
-            {
-                "partner_id": self.vendor.id,
-                "move_type": move_type,
-                "invoice_line_ids": [],
-            }
-        )
+    def _create_account_move(self, move_type, product, quantity=1.0, price_unit=1.0, post=True, **kwargs):
+        invoice_vals = {
+            "partner_id": self.vendor.id,
+            "move_type": move_type,
+            "invoice_line_ids": [],
+        }
+        if kwargs.get('reversed_entry_id'):
+            invoice_vals["reversed_entry_id"] = kwargs['reversed_entry_id']
+        invoice = self.env["account.move"].create(invoice_vals)
         self.env["account.move.line"].create({
             "move_id": invoice.id,
              "display_type": "product",
@@ -33,9 +34,20 @@ def _create_invoice(self, move_type, product, quantity=1.0, price_unit=1.0):
              "product_uom_id": product.uom_id.id,
              "tax_ids": [(5, 0, 0)],
         })
-        invoice.action_post()
+        if post:
+            invoice.action_post()
         return invoice
 
+    def _create_invoice(self, product, quantity=1.0, price_unit=None, post=True, **kwargs):
+        return self._create_account_move("out_invoice", product, quantity, price_unit, post, **kwargs)
+
+    def _create_bill(self, product, quantity=1.0, price_unit=None, post=True, **kwargs):
+        return self._create_account_move("in_invoice", product, quantity, price_unit, post, **kwargs)
+
+    def _create_credit_note(self, product, quantity=1.0, price_unit=1.0, post=True, **kwargs):
+        move_type = kwargs.pop("move_type", "out_refund")
+        return self._create_account_move(move_type, product, quantity, price_unit, post, **kwargs)
+
     def _close(self, auto_post=True, at_date=None):
         action = self.company.action_close_stock_valuation(at_date=at_date, auto_post=auto_post)
         return action['res_id'] and self.env['account.move'].browse(action['res_id'])
@@ -48,7 +60,7 @@ def _use_inventory_location_accounting(self):
         })
         inventory_locations = self.env['stock.location'].search([('usage', '=', 'inventory'), ('company_id', '=', self.company.id)])
         inventory_locations.valuation_account_id = self.account_inventory.id
-        return  self.account_inventory
+        return self.account_inventory
 
     # Moves
     def _make_in_move(self,
@@ -248,7 +260,6 @@ def _get_expense_move_lines(self):
             ('account_id', '=', self.account_expense.id),
         ], order='date, id')
 
-
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -257,7 +268,7 @@ def setUpClass(cls):
             "generic_coa", cls.company, install_demo=False
         )
         cls.env.user.company_id = cls.company
-        cls.inventory_user = cls._create_new_internal_user(name='Pauline Poivraisselle', login= 'pauline', groups='stock.group_stock_user')
+        cls.inventory_user = cls._create_new_internal_user(name='Pauline Poivraisselle', login='pauline', groups='stock.group_stock_user')
         cls.owner = cls._create_partner(name='Consignment Owner')
         cls.warehouse = cls.env['stock.warehouse'].create({
             'name': 'Test Warehouse',
@@ -271,6 +282,8 @@ def setUpClass(cls):
         cls.account_expense = cls.company.expense_account_id
         cls.account_stock_valuation = cls.company.account_stock_valuation_id
         cls.account_stock_variation = cls.account_stock_valuation.account_stock_variation_id
+        cls.account_payable = cls.company.partner_id.property_account_payable_id
+        cls.account_receivable = cls.company.partner_id.property_account_receivable_id
 
         cls.picking_type_in = cls.warehouse.in_type_id
         cls.picking_type_out = cls.warehouse.out_type_id
@@ -353,4 +366,3 @@ def setUpClass(cls):
             'name': 'Avco Product Auto',
             'categ_id': cls.category_avco_auto.id,
         }).with_context(clean_context(cls.env.context))
-
diff --git a/addons/stock_account/tests/test_account_move.py b/addons/stock_account/tests/test_account_move.py
index 950ea1a73455f..a974be7a526ba 100644
--- a/addons/stock_account/tests/test_account_move.py
+++ b/addons/stock_account/tests/test_account_move.py
@@ -1,132 +1,80 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from unittest import skip
-
-from odoo.addons.account.tests.common import AccountTestInvoicingCommon
-from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
+from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 from odoo.tests import Form, tagged
 from odoo import fields, Command
 
 
-@skip('Temporary to fast merge new valuation')
-class TestAccountMoveStockCommon(AccountTestInvoicingCommon):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-
-        cls.other_currency = cls.setup_other_currency('EUR')
-
-        (
-            cls.stock_input_account,
-            cls.stock_output_account,
-            cls.stock_valuation_account,
-            cls.expense_account,
-            cls.income_account,
-            cls.stock_journal,
-        ) = _create_accounting_data(cls.env)
-
-        # `all_categ` should not be altered, so we can test the `post_init` hook of `stock_account`
-        cls.all_categ = cls.env.ref('product.product_category_goods')
-
-        cls.auto_categ = cls.env['product.category'].create({
-            'name': 'child_category',
-            'parent_id': cls.all_categ.id,
-            "property_stock_account_input_categ_id": cls.stock_input_account.id,
-            "property_stock_account_output_categ_id": cls.stock_output_account.id,
-            "property_stock_valuation_account_id": cls.stock_valuation_account.id,
-            "property_stock_journal": cls.stock_journal.id,
-            "property_valuation": "real_time",
-            "property_cost_method": "standard",
-        })
-        cls.product_A = cls.env["product.product"].create(
-            {
-                "name": "Product A",
-                "is_storable": True,
-                "default_code": "prda",
-                "categ_id": cls.auto_categ.id,
-                "taxes_id": [(5, 0, 0)],
-                "supplier_taxes_id": [(5, 0, 0)],
-                "lst_price": 100.0,
-                "standard_price": 10.0,
-                "property_account_income_id": cls.company_data["default_account_revenue"].id,
-                "property_account_expense_id": cls.company_data["default_account_expense"].id,
-            }
-        )
-
-        cls.branch_a = cls.setup_other_company(name="Branch A", parent_id=cls.env.company.id)
-
-
 @tagged("post_install", "-at_install")
-@skip('Temporary to fast merge new valuation')
-class TestAccountMove(TestAccountMoveStockCommon):
+class TestAccountMove(TestStockValuationCommon):
     def test_standard_perpetual_01_mc_01(self):
+        product = self.product_standard_auto
         rate = self.other_currency.rate_ids.sorted()[0].rate
 
         move_form = Form(self.env["account.move"].with_context(default_move_type="out_invoice"))
-        move_form.partner_id = self.partner_a
+        move_form.partner_id = self.partner
         move_form.currency_id = self.other_currency
         with move_form.invoice_line_ids.new() as line_form:
-            line_form.product_id = self.product_A
+            line_form.product_id = product
             line_form.tax_ids.clear()
         invoice = move_form.save()
 
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_total)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_total)
         self.assertEqual(len(invoice.mapped("line_ids")), 2)
         self.assertEqual(len(invoice.mapped("line_ids.currency_id")), 1)
 
         invoice._post()
 
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_total)
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_residual)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_total)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_residual)
         self.assertEqual(len(invoice.mapped("line_ids")), 4)
         self.assertEqual(len(invoice.mapped("line_ids").filtered(lambda l: l.display_type == 'cogs')), 2)
         self.assertEqual(len(invoice.mapped("line_ids.currency_id")), 2)
 
     def test_fifo_perpetual_01_mc_01(self):
-        self.product_A.categ_id.property_cost_method = "fifo"
+        product = self.product_fifo_auto
         rate = self.other_currency.rate_ids.sorted()[0].rate
 
         move_form = Form(self.env["account.move"].with_context(default_move_type="out_invoice"))
-        move_form.partner_id = self.partner_a
+        move_form.partner_id = self.partner
         move_form.currency_id = self.other_currency
         with move_form.invoice_line_ids.new() as line_form:
-            line_form.product_id = self.product_A
+            line_form.product_id = product
             line_form.tax_ids.clear()
         invoice = move_form.save()
 
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_total)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_total)
         self.assertEqual(len(invoice.mapped("line_ids")), 2)
         self.assertEqual(len(invoice.mapped("line_ids.currency_id")), 1)
 
         invoice._post()
-
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_total)
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_residual)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_total)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_residual)
         self.assertEqual(len(invoice.mapped("line_ids")), 4)
         self.assertEqual(len(invoice.mapped("line_ids").filtered(lambda l: l.display_type == 'cogs')), 2)
         self.assertEqual(len(invoice.mapped("line_ids.currency_id")), 2)
 
     def test_average_perpetual_01_mc_01(self):
-        self.product_A.categ_id.property_cost_method = "average"
+        product = self.product_avco_auto
         rate = self.other_currency.rate_ids.sorted()[0].rate
 
         move_form = Form(self.env["account.move"].with_context(default_move_type="out_invoice"))
-        move_form.partner_id = self.partner_a
+        move_form.partner_id = self.partner
         move_form.currency_id = self.other_currency
         with move_form.invoice_line_ids.new() as line_form:
-            line_form.product_id = self.product_A
+            line_form.product_id = product
             line_form.tax_ids.clear()
         invoice = move_form.save()
 
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_total)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_total)
         self.assertEqual(len(invoice.mapped("line_ids")), 2)
         self.assertEqual(len(invoice.mapped("line_ids.currency_id")), 1)
 
         invoice._post()
 
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_total)
-        self.assertAlmostEqual(self.product_A.lst_price * rate, invoice.amount_residual)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_total)
+        self.assertAlmostEqual(product.lst_price * rate, invoice.amount_residual)
         self.assertEqual(len(invoice.mapped("line_ids")), 4)
         self.assertEqual(len(invoice.mapped("line_ids").filtered(lambda l: l.display_type == 'cogs')), 2)
         self.assertEqual(len(invoice.mapped("line_ids.currency_id")), 2)
@@ -135,37 +83,40 @@ def test_storno_accounting(self):
         """Storno accounting uses negative numbers on debit/credit to cancel other moves.
         This test checks that we do the same for the anglosaxon lines when storno is enabled.
         """
+        product = self.product_standard_auto
         self.env.company.account_storno = True
         self.env.company.anglo_saxon_accounting = True
 
         move = self.env['account.move'].create({
             'move_type': 'out_refund',
             'invoice_date': fields.Date.from_string('2019-01-01'),
-            'partner_id': self.partner_a.id,
+            'partner_id': self.partner.id,
             'currency_id': self.other_currency.id,
             'invoice_line_ids': [
-                (0, None, {'product_id': self.product_A.id}),
+                (0, None, {'product_id': product.id}),
             ]
         })
         move.action_post()
 
-        stock_output_line = move.line_ids.filtered(lambda l: l.account_id == self.stock_output_account)
+        stock_output_line = move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
         self.assertEqual(stock_output_line.debit, 0)
         self.assertEqual(stock_output_line.credit, -10)
 
-        expense_line = move.line_ids.filtered(lambda l: l.account_id == self.product_A.property_account_expense_id)
+        expense_line = move.line_ids.filtered(lambda l: l.account_id == product._get_product_accounts()['expense'])
         self.assertEqual(expense_line.debit, -10)
         self.assertEqual(expense_line.credit, 0)
 
     def test_standard_manual_tax_edit(self):
         ''' Test manually editing tax amount, cogs creation should not reset tax amount '''
+        product = self.product_standard_auto
+        product.lst_price = 100
         move_form = Form(self.env["account.move"].with_context(default_move_type="out_invoice"))
-        move_form.partner_id = self.partner_a
-        self.company_data["default_account_revenue"].write({
+        move_form.partner_id = self.partner
+        self.company.income_account_id.write({
             'tax_ids': [(6, 0, [self.env.company.account_sale_tax_id.id])]
         })
         with move_form.invoice_line_ids.new() as line_form:
-            line_form.product_id = self.product_A
+            line_form.product_id = product
         invoice = move_form.save()
 
         self.assertEqual(invoice.amount_total, 115)
@@ -198,123 +149,24 @@ def test_basic_bill(self):
         the post-install hook)
         - One created after the module installation
         """
-        first_company = self.env['res.company'].browse(1)
-        self.env.user.company_ids |= first_company
-        basic_product = self.env['product.product'].create({
-            'name': 'SuperProduct',
-            'is_storable': True,
-            'categ_id': self.all_categ.id,
-        })
+        self.env.user.company_ids |= self.other_company
 
-        for company in (self.env.company | first_company):
+        for company in (self.company | self.other_company):
             bill_form = Form(self.env['account.move'].with_company(company.id).with_context(default_move_type='in_invoice'))
-            bill_form.partner_id = self.partner_a
+            bill_form.partner_id = self.partner
             bill_form.invoice_date = fields.Date.today()
             with bill_form.invoice_line_ids.new() as line:
-                line.product_id = basic_product
+                line.product_id = self.product_standard
                 line.price_unit = 100
             bill = bill_form.save()
             bill.action_post()
 
-            product_accounts = basic_product.product_tmpl_id.with_company(company.id).get_product_accounts()
+            product_accounts = self.product_standard.product_tmpl_id.with_company(company.id).get_product_accounts()
             self.assertEqual(bill.invoice_line_ids.account_id, product_accounts['expense'])
 
-    def test_product_valuation_method_change_to_automated_negative_on_hand_qty(self):
-        """ We have a product whose category has manual valuation and on-hand quantity is negative:
-        Upon switching to an automated valuation method for the product category, the following
-        entries should be generated in the stock journal:
-            1. CREDIT to valuation account
-            2. DEBIT to stock output account
-        """
-        stock_location = self.env['stock.warehouse'].search([
-            ('company_id', '=', self.env.company.id),
-        ], limit=1).lot_stock_id
-        categ = self.env['product.category'].create({'name': 'categ'})
-        product = self.product_a
-        product.write({
-            'is_storable': True,
-            'categ_id': categ.id,
-        })
-
-        out_picking = self.env['stock.picking'].create({
-            'location_id': stock_location.id,
-            'location_dest_id': self.ref('stock.stock_location_customers'),
-            'picking_type_id': stock_location.warehouse_id.out_type_id.id,
-        })
-        sm = self.env['stock.move'].create({
-            'product_id': product.id,
-            'product_uom_qty': 1,
-            'product_uom': product.uom_id.id,
-            'location_id': out_picking.location_id.id,
-            'location_dest_id': out_picking.location_dest_id.id,
-            'picking_id': out_picking.id,
-        })
-        out_picking.action_confirm()
-        sm.quantity = 1
-        out_picking.button_validate()
-
-        categ.write({
-            'property_valuation': 'real_time',
-            'property_stock_account_input_categ_id': self.stock_input_account.id,
-            'property_stock_account_output_categ_id': self.stock_output_account.id,
-            'property_stock_valuation_account_id': self.stock_valuation_account.id,
-            'property_stock_journal': self.stock_journal.id,
-        })
-
-        amls = self.env['account.move.line'].search([('product_id', '=', product.id)]).sorted(
-            # ensure the aml with the stock_valuation_account is the first one
-            lambda amls: amls.account_id != self.stock_valuation_account
-        )
-
-        expected_valuation_line = {
-            'account_id': self.stock_valuation_account.id,
-            'credit': product.standard_price,
-            'debit': 0,
-        }
-        expected_output_line = {
-            'account_id': self.stock_output_account.id,
-            'credit': 0,
-            'debit': product.standard_price,
-        }
-        self.assertRecordValues(amls, [expected_valuation_line, expected_output_line])
-
-    def test_stock_account_move_automated_not_standard_with_branch_company(self):
-        """
-        Test that the validation of a stock picking does not fail `_check_company`
-        at the creation of the account move with sub company
-        """
-        branch_a = self.branch_a['company']
-        self.env.user.company_id = branch_a
-
-        self.auto_categ.write({'property_cost_method': 'average', 'property_valuation': 'real_time'})
-        product = self.product_A
-        product.write({'categ_id': self.auto_categ.id, 'standard_price': 300, 'company_id': branch_a.id})
-
-        stock_location = self.env['stock.warehouse'].search([
-            ('company_id', '=', self.env.company.id),
-        ], limit=1).lot_stock_id
-
-        in_picking = self.env['stock.picking'].create({
-            'location_id': stock_location.id,
-            'location_dest_id': self.ref('stock.stock_location_customers'),
-            'picking_type_id': stock_location.warehouse_id.in_type_id.id,
-        })
-
-        sm = self.env['stock.move'].create({
-            'product_id': product.id,
-            'product_uom_qty': 1,
-            'product_uom': product.uom_id.id,
-            'location_id': in_picking.location_id.id,
-            'location_dest_id': in_picking.location_dest_id.id,
-            'picking_id': in_picking.id,
-        })
-        in_picking.button_validate()
-        self.assertEqual(sm.state, 'done')
-        self.assertEqual(sm.account_move_ids.company_id, self.env.company)
-
     def test_cogs_analytic_accounting(self):
         """Check analytic distribution is correctly propagated to COGS lines"""
-        self.env.company.anglo_saxon_accounting = True
+        product = self.product_standard_auto
         default_plan = self.env['account.analytic.plan'].create({
             'name': 'Default',
         })
@@ -327,10 +179,10 @@ def test_cogs_analytic_accounting(self):
         move = self.env['account.move'].create({
             'move_type': 'out_refund',
             'invoice_date': fields.Date.from_string('2019-01-01'),
-            'partner_id': self.partner_a.id,
+            'partner_id': self.partner.id,
             'invoice_line_ids': [
                 Command.create({
-                    'product_id': self.product_A.id,
+                    'product_id': product.id,
                     'analytic_distribution': {
                         analytic_account.id: 100,
                     },
@@ -339,55 +191,57 @@ def test_cogs_analytic_accounting(self):
         })
         move.action_post()
 
-        cogs_line = move.line_ids.filtered(lambda l: l.account_id == self.product_A.property_account_expense_id)
+        cogs_line = move.line_ids.filtered(lambda l: l.account_id == product._get_product_accounts()['expense'])
         self.assertEqual(cogs_line.analytic_distribution, {str(analytic_account.id): 100})
 
     def test_cogs_account_branch_company(self):
         """Check branch company accounts are selected"""
-        branch = self.branch_a['company']
+        product = self.product_standard_auto
+        branch = self.branch
         test_account = self.env['account.account'].with_company(branch.id).create({
-            'name': '10001 Test Account',
-            'code': 'STCKIN',
+            'name': 'STCK Test Account',
+            'code': '100119',
             'reconcile': True,
             'account_type': 'asset_current',
         })
-        self.auto_categ.with_company(branch.id).property_valuation = "real_time"
-        self.auto_categ.with_company(branch.id).property_stock_account_input_categ_id = test_account
+        self.category_standard_auto.with_company(branch.id).property_valuation = "real_time"
+        self.category_standard_auto.with_company(branch.id).property_stock_valuation_account_id = test_account
 
         bill = self.env['account.move'].with_company(branch.id).with_context(default_move_type='in_invoice').create({
-            'partner_id': self.partner_a.id,
+            'partner_id': self.partner.id,
             'invoice_date': fields.Date.today(),
             'invoice_line_ids': [
                 Command.create({
-                    'product_id': self.product_A.id,
+                    'product_id': product.id,
                     'price_unit': 100,
                 }),
             ],
         })
-
         self.assertEqual(bill.invoice_line_ids.account_id, test_account)
 
     def test_apply_inventory_adjustment_on_multiple_quants_simultaneously(self):
-        products = self.product_a + self.product_b
-        products.write({'is_storable': True, 'categ_id': self.auto_categ.id})
-        stock_loc = self.env['stock.warehouse'].search([
-            ('company_id', '=', self.env.company.id),
-        ], limit=1).lot_stock_id
-        self.env['stock.quant']._update_available_quantity(self.product_a, stock_loc, 5)
-        self.env['stock.quant']._update_available_quantity(self.product_b, stock_loc, 15)
+        product = self.product_standard_auto
+        product_b = product.copy()
+        products = product + product_b
+
+        self._use_inventory_location_accounting()
+
+        self.env['stock.quant']._update_available_quantity(product, self.stock_location, 5)
+        self.env['stock.quant']._update_available_quantity(product_b, self.stock_location, 15)
+
         quants = products.stock_quant_ids
         quants.inventory_quantity = 10.0
         wizard = self.env['stock.inventory.adjustment.name'].create({'quant_ids': quants})
         wizard.action_apply()
         inv_adjustment_journal_items = self.env['account.move.line'].search([('product_id', 'in', products.ids)], order='id asc', limit=4)
-        prod_a_accounts = self.product_a.product_tmpl_id.get_product_accounts()
-        prod_b_accounts = self.product_b.product_tmpl_id.get_product_accounts()
+        prod_a_accounts = product.product_tmpl_id.get_product_accounts()
+        prod_b_accounts = product_b.product_tmpl_id.get_product_accounts()
         self.assertRecordValues(
             inv_adjustment_journal_items,
             [
-                {'account_id': prod_a_accounts['income'].id, 'product_id': self.product_a.id},
-                {'account_id': prod_a_accounts['stock_valuation'].id, 'product_id': self.product_a.id},
-                {'account_id': prod_b_accounts['stock_valuation'].id, 'product_id': self.product_b.id},
-                {'account_id': prod_b_accounts['expense'].id, 'product_id': self.product_b.id},
+                {'account_id': self.account_inventory.id, 'product_id': product.id},
+                {'account_id': prod_a_accounts['stock_valuation'].id, 'product_id': product.id},
+                {'account_id': prod_b_accounts['stock_valuation'].id, 'product_id': product_b.id},
+                {'account_id': self.account_inventory.id, 'product_id': product_b.id},
             ]
         )
diff --git a/addons/stock_account/tests/test_lot_valuation.py b/addons/stock_account/tests/test_lot_valuation.py
index 04759caaa182d..23f67cabf9159 100644
--- a/addons/stock_account/tests/test_lot_valuation.py
+++ b/addons/stock_account/tests/test_lot_valuation.py
@@ -2,8 +2,7 @@
 
 from unittest import skip
 
-from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
-from odoo.addons.stock_account.tests.test_stockvaluationlayer import TestStockValuationCommon
+from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 from odoo.exceptions import UserError
 from odoo.tests import tagged, Form
 from odoo import Command
@@ -88,7 +87,6 @@ def test_lot_normal_3(self):
 
     def test_real_time_valuation(self):
         """ Test account move lines contains lot """
-        self.stock_input_account, self.stock_output_account, self.stock_valuation_account, self.expense_account, self.income_account, self.stock_journal = _create_accounting_data(self.env)
         self.product1.categ_id.write({
             'property_stock_account_input_categ_id': self.stock_input_account.id,
             'property_stock_account_output_categ_id': self.stock_output_account.id,
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 661bc92b9262d..d3f0fd6983f0f 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -12,146 +12,50 @@
 from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 
 
-def _create_accounting_data(env):
-    """Create the accounts and journals used in stock valuation.
-
-    :param env: environment used to create the records
-    :return: an input account, an output account, a valuation account, an expense account, a stock journal
-    """
-    stock_valuation_account = env['account.account'].create({
-        'name': 'Stock Valuation',
-        'code': 'StockValuation',
-        'account_type': 'asset_current',
-        'reconcile': True,
-    })
-    expense_account = env['account.account'].create({
-        'name': 'Expense Account',
-        'code': 'ExpenseAccount',
-        'account_type': 'expense',
-        'reconcile': True,
-    })
-    income_account = env['account.account'].create({
-        'name': 'Income Account',
-        'code': 'IncomeAccount',
-        'account_type': 'income',
-        'reconcile': True,
-    })
-    stock_journal = env['account.journal'].create({
-        'name': 'Stock Journal',
-        'code': 'STJTEST',
-        'type': 'general',
-    })
-    return stock_valuation_account, expense_account, income_account, stock_journal
-
-
-class TestStockValuationBase(TestStockValuationCommon):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.env.ref('base.EUR').active = True
-        cls.stock_location = cls.warehouse.lot_stock_id
-        cls.customer_location = cls.env.ref('stock.stock_location_customers')
-        cls.supplier_location = cls.env.ref('stock.stock_location_suppliers')
-        cls.partner = cls.env['res.partner'].create({'name': 'xxx'})
-        cls.owner1 = cls.env['res.partner'].create({'name': 'owner1'})
-        cls.uom_unit = cls.env.ref('uom.product_uom_unit')
-        cls.product1 = cls.env['product.product'].create({
-            'name': 'Product A',
-            'is_storable': True,
-            'default_code': 'prda',
-            'categ_id': cls.env.ref('product.product_category_goods').id,
-        })
-        cls.product2 = cls.env['product.product'].create({
-            'name': 'Product B',
-            'is_storable': True,
-            'categ_id': cls.env.ref('product.product_category_goods').id,
-        })
-        cls.inventory_user = cls.env['res.users'].create({
-            'name': 'Pauline Poivraisselle',
-            'login': 'pauline',
-            'email': 'p.p@example.com',
-            'notification_type': 'inbox',
-            'group_ids': [(6, 0, [cls.env.ref('stock.group_stock_user').id])]
-        })
-
-        cls.stock_valuation_account, cls.expense_account, cls.income_account, cls.stock_journal = _create_accounting_data(cls.env)
-        cls.stock_valuation_account.account_stock_variation_id = cls.expense_account
-        cls.env.company.account_stock_journal_id = cls.stock_journal
-        cls.product1.property_account_expense_id = cls.expense_account.id
-        cls.inventory_loss_location = cls.env['stock.location'].search(
-            [('usage', '=', 'inventory'), ('company_id', '=', cls.env.company.id)
-        ], limit=1)
-        cls.inventory_adjustment_account = cls.env['account.account'].create({
-            'name': 'Inventory Adjustment Account',
-            'code': 'INVADJ',
-            'account_type': 'expense',
-            'reconcile': True,
-        })
-        cls.inventory_loss_location.valuation_account_id = cls.inventory_adjustment_account
-        cls.product1.categ_id.write({
-            'property_stock_valuation_account_id': cls.stock_valuation_account.id,
-            'property_stock_journal': cls.stock_journal.id,
-        })
-        cls.product1.categ_id.property_valuation = 'real_time'
-        cls.product2.categ_id.property_valuation = 'real_time'
-        cls.product1.write({
-            'property_account_income_id': cls.income_account.id,
-            'property_account_expense_id': cls.expense_account.id,
-        })
-
-    def _get_stock_valuation_move_lines(self):
-        return self.env['account.move.line'].search([
-            ('account_id', '=', self.stock_valuation_account.id),
-        ], order='date, id')
-
-    def _get_expense_move_lines(self):
-        return self.env['account.move.line'].search([
-            ('account_id', '=', self.expense_account.id),
-        ], order='date, id')
-
-
 @tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockValuation(TestStockValuationBase):
+class TestStockValuation(TestStockValuationCommon):
     def test_realtime(self):
         """ Stock moves update stock value with product x cost price,
         price change updates the stock value based on current stock level.
         """
         # Enter 10 products while price is 5.0
-        self.product1.standard_price = 5.0
-        move1 = self._make_in_move(self.product1, 10, 5)
+        product = self.product_standard_auto
+        product.standard_price = 5.0
+        move1 = self._make_in_move(product, 10, 5)
 
         closing_move = self._close()
         debit_line = closing_move.line_ids.filtered(lambda l: l.debit > 0)
         self.assertEqual(len(debit_line), 1)
         self.assertEqual(debit_line.debit, 50.0)
         self.assertEqual(debit_line.credit, 0)
-        self.product1._invalidate_cache()
+        product._invalidate_cache()
 
         # Set price to 6.0
-        self.product1.standard_price = 6.0
+        product.standard_price = 6.0
         closing_move = self._close()
         debit_line = closing_move.line_ids.filtered(lambda l: l.debit > 0)
         self.assertEqual(len(debit_line), 1)
         self.assertEqual(debit_line.debit, 10.0)
         self.assertEqual(debit_line.credit, 0)
-        self.assertEqual(move1.product_id, self.product1)
+        self.assertEqual(move1.product_id, product)
 
     def test_realtime_consumable(self):
         """ An automatic consumable product should not create any account move entries"""
         # Enter 10 products while price is 5.0
-        self.product1.standard_price = 5.0
-        self.product1.is_storable = False
-        self._make_in_move(self.product1, 10, 5)
+        product = self.product_standard_auto
+        product.standard_price = 5.0
+        product.is_storable = False
+        self._make_in_move(product, 10, 5)
         with self.assertRaises(UserError):
             self._close()
 
     def test_fifo_perpetual_1(self):
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # ---------------------------------------------------------------------
         # receive 10 units @ 10.00 per unit
         # ---------------------------------------------------------------------
-        move1 = self._make_in_move(self.product1, 10, 10)
+        move1 = self._make_in_move(product, 10, 10)
 
         # stock_account values for move1
         self.assertEqual(move1._get_price_unit(), 10.0)
@@ -161,7 +65,7 @@ def test_fifo_perpetual_1(self):
         # ---------------------------------------------------------------------
         # receive 10 units @ 8.00 per unit
         # ---------------------------------------------------------------------
-        move2 = self._make_in_move(self.product1, 10, 8)
+        move2 = self._make_in_move(product, 10, 8)
 
         # stock_account values for move2
         self.assertEqual(move2.remaining_qty, 10.0)
@@ -170,7 +74,7 @@ def test_fifo_perpetual_1(self):
         # ---------------------------------------------------------------------
         # sale 3 units
         # ---------------------------------------------------------------------
-        move3 = self._make_out_move(self.product1, 3)
+        move3 = self._make_out_move(product, 3)
 
         # stock_account values for move3
         self.assertEqual(move3.value, 30.0)  # took 3 items from move 1 @ 10.00 per unit
@@ -190,7 +94,7 @@ def test_fifo_perpetual_1(self):
         # Sale 9 units, the units available from the previous increase are not sent
         # immediately as the new layer is at the top of the queue.
         # ---------------------------------------------------------------------
-        move4 = self._make_out_move(self.product1, 9)
+        move4 = self._make_out_move(product, 9)
 
         # stock_account values for move4
         self.assertEqual(move4.value, 90.0)  # took 9 items from move 1 @ 10.00 per unit
@@ -199,18 +103,18 @@ def test_fifo_perpetual_1(self):
         # Sale 20 units, we fall in negative stock for 10 units. Theses are
         # valued at the last FIFO cost and the total is negative.
         # ---------------------------------------------------------------------
-        move5 = self._make_out_move(self.product1, 20)
+        move5 = self._make_out_move(product, 20)
 
         # stock_account values for move5
         self.assertEqual(move5.value, 160.0)
         closing_move = self._close()
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 0, 'credit': 80},
-                {'account_id': self.expense_account.id, 'debit': 80, 'credit': 0},
+                {'account_id': self.account_stock_valuation.id, 'debit': 0, 'credit': 80},
+                {'account_id': self.account_expense.id, 'debit': 80, 'credit': 0},
             ]
         )
 
@@ -218,17 +122,17 @@ def test_fifo_perpetual_1(self):
         # Receive 10 units @ 12.00 to counterbalance the negative, the vacuum
         # will be called directly: 10@10 should be revalued 10@12
         # ---------------------------------------------------------------------
-        move6 = self._make_in_move(self.product1, 10, 12)
+        move6 = self._make_in_move(product, 10, 12)
 
         self.assertEqual(move6.value, 120.0)
         closing_move = self._close()
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 80, 'credit': 0},
-                {'account_id': self.expense_account.id, 'debit': 0, 'credit': 80},
+                {'account_id': self.account_stock_valuation.id, 'debit': 80, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 80},
             ]
         )
         self.assertEqual(sum(self._get_stock_valuation_move_lines().mapped('balance')), 0)
@@ -243,25 +147,25 @@ def test_fifo_perpetual_1(self):
         # -----------------------------------------------------------
         # receive 4 to counterbalance now
         # -----------------------------------------------------------
-        self._make_in_move(self.product1, 4, 15)
+        self._make_in_move(product, 4, 15)
         self._close()
-        self.assertEqual(self.product1.total_value, 30)
+        self.assertEqual(product.total_value, 30)
         self.assertEqual(sum(self._get_stock_valuation_move_lines().mapped('balance')), 30)
 
     def test_fifo_perpetual_2(self):
         """ Normal fifo flow (no negative handling) """
         # http://accountingexplained.com/financial/inventories/fifo-method
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # Beginning Inventory: 68 units @ 15.00 per unit
-        move1 = self._make_in_move(self.product1, 68, 15)
+        move1 = self._make_in_move(product, 68, 15)
 
         self.assertEqual(move1.value, 1020.0)
 
         self.assertEqual(move1.remaining_qty, 68.0)
 
         # Purchase 140 units @ 15.50 per unit
-        move2 = self._make_in_move(self.product1, 140, 15.5)
+        move2 = self._make_in_move(product, 140, 15.5)
 
         self.assertEqual(move2.value, 2170.0)
 
@@ -269,7 +173,7 @@ def test_fifo_perpetual_2(self):
         self.assertEqual(move2.remaining_qty, 140.0)
 
         # Sale 94 units @ 19.00 per unit
-        move3 = self._make_out_move(self.product1, 94)
+        move3 = self._make_out_move(product, 94)
 
         # note: it' ll have to get 68 units from the first batch and 26 from the second one
         # so its value should be -((68*15) + (26*15.5)) = -1423
@@ -280,7 +184,7 @@ def test_fifo_perpetual_2(self):
         self.assertEqual(move3.remaining_qty, 0.0)  # unused in out moves
 
         # Purchase 40 units @ 16.00 per unit
-        move4 = self._make_in_move(self.product1, 40, 16)
+        move4 = self._make_in_move(product, 40, 16)
 
         self.assertEqual(move4.value, 640.0)
 
@@ -290,7 +194,7 @@ def test_fifo_perpetual_2(self):
         self.assertEqual(move4.remaining_qty, 40.0)
 
         # Purchase 78 units @ 16.50 per unit
-        move5 = self._make_in_move(self.product1, 78, 16.5)
+        move5 = self._make_in_move(product, 78, 16.5)
 
         self.assertEqual(move5.value, 1287.0)
 
@@ -301,7 +205,7 @@ def test_fifo_perpetual_2(self):
         self.assertEqual(move5.remaining_qty, 78.0)
 
         # Sale 116 units @ 19.50 per unit
-        move6 = self._make_out_move(self.product1, 116)
+        move6 = self._make_out_move(product, 116)
 
         # note: it' ll have to get 114 units from the move2 and 2 from move4
         # so its value should be -((114*15.5) + (2*16)) = 1735
@@ -315,7 +219,7 @@ def test_fifo_perpetual_2(self):
         self.assertEqual(move6.remaining_qty, 0.0)  # unused in out moves
 
         # Sale 62 units @ 21 per unit
-        move7 = self._make_out_move(self.product1, 62)
+        move7 = self._make_out_move(product, 62)
 
         # note: it' ll have to get 38 units from the move4 and 24 from move5
         # so its value should be -((38*16) + (24*16.5)) = 608 + 396
@@ -339,8 +243,8 @@ def test_fifo_perpetual_2(self):
         move8 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': transit_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
         })
         move8._action_confirm()
@@ -361,7 +265,7 @@ def test_fifo_perpetual_2(self):
         self.assertEqual(move8.remaining_qty, 0.0)  # unused in internal moves
 
         # Sale 10 units @ 16.5 per unit
-        move9 = self._make_out_move(self.product1, 10)
+        move9 = self._make_out_move(product, 10)
 
         # note: it' ll have to get 10 units from move5 so its value should
         # be -(10*16.50) = -165
@@ -381,37 +285,37 @@ def test_fifo_negative_1(self):
         """ Send products that you do not have. Value the first outgoing move to the standard
         price, receive in multiple times the delivered quantity and run _fifo_vacuum to compensate.
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # We expect the user to set manually set a standard price to its products if its first
         # transfer is sending products that he doesn't have.
         with freeze_time(Datetime.now() - timedelta(seconds=1)):
-            self.product1.product_tmpl_id.standard_price = 8.0
+            product.product_tmpl_id.standard_price = 8.0
 
         # ---------------------------------------------------------------------
         # Send 50 units you don't have
         # ---------------------------------------------------------------------
-        move1 = self._make_out_move(self.product1, 50)
+        move1 = self._make_out_move(product, 50)
 
         # stock values for move1
         self.assertEqual(move1.value, 400.0)
         self.assertEqual(move1.remaining_qty, 0.0)  # normally unused in out moves, but as it moved negative stock we mark it
 
         closing_move = self._close()
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 0, 'credit': 400},
-                {'account_id': self.expense_account.id, 'debit': 400, 'credit': 0},
+                {'account_id': self.account_stock_valuation.id, 'debit': 0, 'credit': 400},
+                {'account_id': self.account_expense.id, 'debit': 400, 'credit': 0},
             ]
         )
 
         # ---------------------------------------------------------------------
         # Receive 40 units @ 15
         # ---------------------------------------------------------------------
-        move2 = self._make_in_move(self.product1, 40, 15)
+        move2 = self._make_in_move(product, 40, 15)
 
         # stock values for move2
         self.assertEqual(move2.value, 600.0)
@@ -423,23 +327,23 @@ def test_fifo_negative_1(self):
 
         closing_move = self._close()
         valuation_aml = closing_move.line_ids.filtered(
-            lambda l: l.account_id == self.stock_valuation_account
+            lambda l: l.account_id == self.account_stock_valuation
         )
         expense_aml = closing_move.line_ids.filtered(
-            lambda l: l.account_id == self.expense_account
+            lambda l: l.account_id == self.account_expense
         )
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {"account_id": self.stock_valuation_account.id, "debit": 250, "credit": 0},
-                {"account_id": self.expense_account.id, "debit": 0, "credit": 250},
+                {"account_id": self.account_stock_valuation.id, "debit": 250, "credit": 0},
+                {"account_id": self.account_expense.id, "debit": 0, "credit": 250},
             ],
         )
 
         # ---------------------------------------------------------------------
         # Receive 20 units @ 25
         # ---------------------------------------------------------------------
-        self._make_in_move(self.product1, 20, 25)
+        self._make_in_move(product, 20, 25)
 
         # ---------------------------------------------------------------------
         # The vacuum ran
@@ -447,24 +351,24 @@ def test_fifo_negative_1(self):
 
         closing_move = self._close()
         valuation_aml = closing_move.line_ids.filtered(
-            lambda l: l.account_id == self.stock_valuation_account
+            lambda l: l.account_id == self.account_stock_valuation
         )
         expense_aml = closing_move.line_ids.filtered(
-            lambda l: l.account_id == self.expense_account
+            lambda l: l.account_id == self.account_expense
         )
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {"account_id": self.stock_valuation_account.id, "debit": 400, "credit": 0},
-                {"account_id": self.expense_account.id, "debit": 0, "credit": 400},
+                {"account_id": self.account_stock_valuation.id, "debit": 400, "credit": 0},
+                {"account_id": self.account_expense.id, "debit": 0, "credit": 400},
             ],
         )
 
         # ---------------------------------------------------------------------
         # Ending
         # ---------------------------------------------------------------------
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.total_value, 250)
+        self.assertEqual(product.qty_available, 10)
+        self.assertEqual(product.total_value, 250)
         self.assertEqual(sum(self._get_stock_valuation_move_lines().mapped('balance')), 250)
         self.assertEqual(sum(self._get_expense_move_lines().mapped('balance')), -250)
 
@@ -472,12 +376,12 @@ def test_fifo_negative_2(self):
         """ Receives 10 units, send 10 units, then send more: the extra quantity should be valued
         at the last fifo price, running the vacuum should not do anything.
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # ---------------------------------------------------------------------
         # Receive 10@10
         # ---------------------------------------------------------------------
-        move1 = self._make_in_move(self.product1, 10, 10)
+        move1 = self._make_in_move(product, 10, 10)
 
         # stock values for move1
         self.assertEqual(move1.value, 100.0)
@@ -486,7 +390,7 @@ def test_fifo_negative_2(self):
         # ---------------------------------------------------------------------
         # Send 10
         # ---------------------------------------------------------------------
-        move2 = self._make_out_move(self.product1, 10, 10)
+        move2 = self._make_out_move(product, 10, 10)
 
         # stock values for move2
         self.assertEqual(move2.value, 100.0)
@@ -498,7 +402,7 @@ def test_fifo_negative_2(self):
         # ---------------------------------------------------------------------
         # Send 21
         # ---------------------------------------------------------------------
-        move3 = self._make_out_move(self.product1, 21)
+        move3 = self._make_out_move(product, 21)
 
         # stock values for move3
         self.assertEqual(move3.value, 210.0)
@@ -506,31 +410,31 @@ def test_fifo_negative_2(self):
         # account values for move3
         closing_move = self._close()
         valuation_aml = closing_move.line_ids.filtered(
-            lambda l: l.account_id == self.stock_valuation_account
+            lambda l: l.account_id == self.account_stock_valuation
         )
         expense_aml = closing_move.line_ids.filtered(
-            lambda l: l.account_id == self.expense_account
+            lambda l: l.account_id == self.account_expense
         )
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {"account_id": self.stock_valuation_account.id, "debit": 0, "credit": 210},
-                {"account_id": self.expense_account.id, "debit": 210, "credit": 0},
+                {"account_id": self.account_stock_valuation.id, "debit": 0, "credit": 210},
+                {"account_id": self.account_expense.id, "debit": 210, "credit": 0},
             ],
         )
 
         # ---------------------------------------------------------------------
         # Ending
         # ---------------------------------------------------------------------
-        self.assertEqual(self.product1.qty_available, -21)
-        self.assertEqual(self.product1.total_value, -210)
+        self.assertEqual(product.qty_available, -21)
+        self.assertEqual(product.total_value, -210)
         self.assertEqual(sum(self._get_stock_valuation_move_lines().mapped('balance')), -210)
 
     def test_fifo_add_move_in_done_picking_1(self):
         """ The flow is:
 
         product2 std price = 20
-        IN01 10@10 product1
+        IN01 10@10 product
         IN01 10@20 product2
         IN01 correction 10@20 -> 11@20 (product2)
         DO01 11 product2
@@ -539,37 +443,36 @@ def test_fifo_add_move_in_done_picking_1(self):
         IN03 2@30 product2
         vacuum
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
+        product2 = self.product_fifo.copy()
 
         # ---------------------------------------------------------------------
         # Receive 10@10
         # ---------------------------------------------------------------------
-        move1 = self._make_in_move(self.product1, 10, 10, create_picking=True)
+        move1 = self._make_in_move(product, 10, 10, create_picking=True)
         receipt = move1.picking_id
 
         # stock values for move1
         self.assertEqual(move1.value, 100.0)
         self.assertEqual(move1.remaining_qty, 10.0)
-        self.assertEqual(move1.price_unit, 10.0)
 
         # ---------------------------------------------------------------------
         # Add a stock move, receive 10@20 of another product
         # ---------------------------------------------------------------------
-        self.product2.categ_id.property_cost_method = 'fifo'
-        self.product2.standard_price = 20
+        product2.standard_price = 20
         move2 = self.env['stock.move'].create({
             'picking_id': receipt.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product2.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product2.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'value_manual': 200.0,
             'move_line_ids': [(0, 0, {
-                'product_id': self.product2.id,
+                'product_id': product2.id,
                 'location_id': self.supplier_location.id,
                 'location_dest_id': self.stock_location.id,
-                'product_uom_id': self.uom_unit.id,
+                'product_uom_id': self.uom.id,
                 'quantity': 10.0,
             })]
         })
@@ -577,21 +480,21 @@ def test_fifo_add_move_in_done_picking_1(self):
         self.assertEqual(move2.state, 'done')
         self.assertEqual(move2.value, 200.0)
         self.assertEqual(move2.remaining_qty, 10.0)
-        self.assertEqual(self.product2.standard_price, 20.0)
+        self.assertEqual(product2.standard_price, 20.0)
 
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product2.qty_available, 10)
-        self.assertEqual(self.product2.total_value, 200)
+        self.assertEqual(product.qty_available, 10)
+        self.assertEqual(product.total_value, 100)
+        self.assertEqual(product2.qty_available, 10)
+        self.assertEqual(product2.total_value, 200)
 
         closing_move = self.env['account.move'].browse(move2.company_id.action_close_stock_valuation()['res_id'])
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 300, 'credit': 0},
-                {'account_id': self.expense_account.id, 'debit': 0, 'credit': 300},
+                {'account_id': self.account_stock_valuation.id, 'debit': 300, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 300},
             ]
         )
 
@@ -602,55 +505,54 @@ def test_fifo_add_move_in_done_picking_1(self):
 
         self.assertEqual(move2.value, 220.0)  # after correction, the move should be valued at 11@20
         self.assertEqual(move2.quantity, 11.0)
-        self.product2._invalidate_cache()
-        self.product2.standard_price = 20.0
+        product2._invalidate_cache()
+        product2.standard_price = 20.0
 
         closing_move = self.env['account.move'].browse(move2.company_id.action_close_stock_valuation()['res_id'])
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 320, 'credit': 0},
-                {'account_id': self.expense_account.id, 'debit': 0, 'credit': 320},
+                {'account_id': self.account_stock_valuation.id, 'debit': 320, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 320},
             ]
         )
 
         # ---------------------------------------------------------------------
         # Send 11 product 2
         # ---------------------------------------------------------------------
-        move3 = self._make_out_move(self.product2, 11, create_picking=True)
+        move3 = self._make_out_move(product2, 11, create_picking=True)
 
         self.assertEqual(move3.value, 220.0)
         self.assertEqual(move3.remaining_qty, 0.0)
-        self.assertEqual(self.product2.standard_price, 20.0)
-        self.assertEqual(self.product2.qty_available, 0)
-        self.product2._invalidate_cache()
-        self.product2.standard_price = 20.0
+        self.assertEqual(product2.standard_price, 20.0)
+        self.assertEqual(product2.qty_available, 0)
+        product2._invalidate_cache()
+        product2.standard_price = 20.0
 
         closing_move = self.env['account.move'].browse(move2.company_id.action_close_stock_valuation()['res_id'])
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 100, 'credit': 0},
-                {'account_id': self.expense_account.id, 'debit': 0, 'credit': 100},
+                {'account_id': self.account_stock_valuation.id, 'debit': 100, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 100},
             ]
         )
 
     def test_fifo_add_moveline_in_done_move_1(self):
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # ---------------------------------------------------------------------
         # Receive 10@10
         # ---------------------------------------------------------------------
-        move1 = self._make_in_move(self.product1, 10, 10)
+        move1 = self._make_in_move(product, 10, 10)
 
         # stock values for move1
         self.assertEqual(move1.value, 100.0)
         self.assertEqual(move1.remaining_qty, 10.0)
-        self.assertEqual(move1.price_unit, 10.0)
 
         # ---------------------------------------------------------------------
         # Add a new move line to receive 10 more
@@ -661,8 +563,8 @@ def test_fifo_add_moveline_in_done_move_1(self):
         self.assertEqual(move1.remaining_qty, 20.0)
         self.assertEqual(len(move1.move_line_ids), 2)
 
-        self.assertEqual(self.product1.qty_available, 20)
-        self.assertEqual(self.product1.total_value, 200)
+        self.assertEqual(product.qty_available, 20)
+        self.assertEqual(product.total_value, 200)
 
         closing_move = self.env['account.move'].browse(move1.company_id.action_close_stock_valuation()['res_id'])
         credit_line = closing_move.line_ids.filtered(lambda l: l.credit > 0)
@@ -678,73 +580,73 @@ def test_fifo_add_moveline_in_done_move_1(self):
     def test_fifo_edit_done_move1(self):
         """ Increase OUT done move while quantities are available.
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # ---------------------------------------------------------------------
         # Receive 10@10
         # ---------------------------------------------------------------------
-        move1 = self._make_in_move(self.product1, 10, 10)
+        move1 = self._make_in_move(product, 10, 10)
 
         # stock values for move1
         self.assertEqual(move1.value, 100.0)
         self.assertEqual(move1.remaining_qty, 10.0)
-        self.assertAlmostEqual(self.product1.qty_available, 10.0)
-        self.assertEqual(self.product1.total_value, 100)
+        self.assertAlmostEqual(product.qty_available, 10.0)
+        self.assertEqual(product.total_value, 100)
 
         closing_move = self._close()
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 100, 'credit': 0},
-                {'account_id': self.expense_account.id, 'debit': 0, 'credit': 100},
+                {'account_id': self.account_stock_valuation.id, 'debit': 100, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 100},
             ]
         )
 
         # ---------------------------------------------------------------------
         # Receive 10@12
         # ---------------------------------------------------------------------
-        move2 = self._make_in_move(self.product1, 10, 12)
+        move2 = self._make_in_move(product, 10, 12)
 
         # stock values for move2
         self.assertEqual(move2.value, 120.0)
         self.assertEqual(move2.remaining_qty, 10.0)
         self.assertEqual(move2._get_price_unit(), 12.0)
-        self.assertAlmostEqual(self.product1.qty_available, 20.0)
-        self.assertAlmostEqual(self.product1.qty_available, 20.0)
-        self.assertEqual(self.product1.total_value, 220)
+        self.assertAlmostEqual(product.qty_available, 20.0)
+        self.assertAlmostEqual(product.qty_available, 20.0)
+        self.assertEqual(product.total_value, 220)
 
         closing_move = self._close()
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {"account_id": self.stock_valuation_account.id, "debit": 120, "credit": 0},
-                {"account_id": self.expense_account.id, "debit": 0, "credit": 120},
+                {"account_id": self.account_stock_valuation.id, "debit": 120, "credit": 0},
+                {"account_id": self.account_expense.id, "debit": 0, "credit": 120},
             ],
         )
 
         # ---------------------------------------------------------------------
         # Send 8
         # ---------------------------------------------------------------------
-        move3 = self._make_out_move(self.product1, 8)
+        move3 = self._make_out_move(product, 8)
 
         # stock values for move3
         self.assertEqual(move3.value, 80.0)
         self.assertEqual(move3.remaining_qty, 0.0)
-        self.assertAlmostEqual(self.product1.qty_available, 12.0)
-        self.assertAlmostEqual(self.product1.qty_available, 12.0)
-        self.assertEqual(self.product1.total_value, 140)
+        self.assertAlmostEqual(product.qty_available, 12.0)
+        self.assertAlmostEqual(product.qty_available, 12.0)
+        self.assertEqual(product.total_value, 140)
         closing_move = self._close()
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {"account_id": self.stock_valuation_account.id, "debit": 0, "credit": 80},
-                {"account_id": self.expense_account.id, "debit": 80, "credit": 0},
+                {"account_id": self.account_stock_valuation.id, "debit": 0, "credit": 80},
+                {"account_id": self.account_expense.id, "debit": 80, "credit": 0},
             ],
         )
 
@@ -759,36 +661,36 @@ def test_fifo_edit_done_move1(self):
         # estimated value: -140 => -(14@10)
         self.assertEqual(move3.value, 140)
 
-        self.assertEqual(self.product1.total_value, 72)
+        self.assertEqual(product.total_value, 72)
         closing_move = self._close()
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
         # The closing is correct despite an incorrect out move value
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {"account_id": self.stock_valuation_account.id, "debit": 0, "credit": 68},
-                {"account_id": self.expense_account.id, "debit": 68, "credit": 0},
+                {"account_id": self.account_stock_valuation.id, "debit": 0, "credit": 68},
+                {"account_id": self.account_expense.id, "debit": 68, "credit": 0},
             ],
         )
 
         # ---------------------------------------------------------------------
         # Ending
         # ---------------------------------------------------------------------
-        self.assertEqual(self.product1.qty_available, 6)
-        self.assertAlmostEqual(self.product1.qty_available, 6.0)
-        self.assertEqual(self.product1.total_value, 72)
+        self.assertEqual(product.qty_available, 6)
+        self.assertAlmostEqual(product.qty_available, 6.0)
+        self.assertEqual(product.total_value, 72)
         self.assertEqual(sum(self._get_stock_valuation_move_lines().mapped('balance')), 72)
 
     def test_fifo_edit_done_move2(self):
         """ Decrease, then increase OUT done move while quantities are available.
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # ---------------------------------------------------------------------
         # Receive 10@10
         # ---------------------------------------------------------------------
-        move1 = self._make_in_move(self.product1, 10, 10)
+        move1 = self._make_in_move(product, 10, 10)
 
         # stock values for move1
         self.assertEqual(move1.value, 100.0)
@@ -797,7 +699,7 @@ def test_fifo_edit_done_move2(self):
         # ---------------------------------------------------------------------
         # Send 10
         # ---------------------------------------------------------------------
-        move2 = self._make_out_move(self.product1, 10)
+        move2 = self._make_out_move(product, 10)
 
         # stock values for move2
         self.assertEqual(move2.value, 100.0)
@@ -810,7 +712,7 @@ def test_fifo_edit_done_move2(self):
 
         self.assertEqual(move2.value, 80.0)  # the move actually sent 8@10
 
-        self.assertEqual(self.product1.qty_available, 2)
+        self.assertEqual(product.qty_available, 2)
 
         # ---------------------------------------------------------------------
         # Actually, send 10 in the last move
@@ -818,16 +720,11 @@ def test_fifo_edit_done_move2(self):
         move2.quantity = 10
 
         self.assertEqual(move2.value, 100.0)  # the move actually sent 10@10
-        self.assertEqual(self.product1.qty_available, 0)
-        self.assertEqual(self.product1.total_value, 0)
+        self.assertEqual(product.qty_available, 0)
+        self.assertEqual(product.total_value, 0)
 
     def test_fifo_standard_price_upate_1(self):
-        product = self.env['product.product'].create({
-            'name': 'product1',
-            'is_storable': True,
-            'categ_id': self.env.ref('product.product_category_goods').id,
-        })
-        product.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
         self._make_in_move(product, 3, unit_cost=17)
         self._make_in_move(product, 1, unit_cost=23)
         self.assertEqual(product.standard_price, 18.5)
@@ -835,12 +732,7 @@ def test_fifo_standard_price_upate_1(self):
         self.assertEqual(product.standard_price, 23)
 
     def test_fifo_standard_price_upate_2(self):
-        product = self.env['product.product'].create({
-            'name': 'product1',
-            'is_storable': True,
-            'categ_id': self.env.ref('product.product_category_goods').id,
-        })
-        product.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
         self._make_in_move(product, 5, unit_cost=17)
         self._make_in_move(product, 1, unit_cost=23)
         self.assertEqual(product.standard_price, 18)
@@ -849,12 +741,7 @@ def test_fifo_standard_price_upate_2(self):
 
     def test_fifo_standard_price_upate_3(self):
         """Standard price must be set on move in if no product and if first move."""
-        product = self.env['product.product'].create({
-            'name': 'product1',
-            'is_storable': True,
-            'categ_id': self.env.ref('product.product_category_goods').id,
-        })
-        product.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
         self._make_in_move(product, 5, unit_cost=17)
         self._make_in_move(product, 1, unit_cost=23)
         self.assertEqual(product.standard_price, 18)
@@ -869,38 +756,38 @@ def test_fifo_standard_price_upate_3(self):
 
     def test_create_done_move(self):
         """Stock Move created directly in Done state must impact de valuation."""
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 8.0,
             'price_unit': 1,
             'state': 'done',
             'move_line_ids': [(0, 0, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'location_id': self.supplier_location.id,
                 'location_dest_id': self.stock_location.id,
-                'product_uom_id': self.uom_unit.id,
+                'product_uom_id': self.uom.id,
                 'quantity': 8.0,
                 'state': 'done',
             })]
         })
         move1.value_manual = 8.0
-        self.assertEqual(self.product1.qty_available, 8.0)
-        self.assertEqual(self.product1.total_value, 8.0)
+        self.assertEqual(product.qty_available, 8.0)
+        self.assertEqual(product.total_value, 8.0)
 
     def test_average_perpetual_1(self):
         # http://accountingexplained.com/financial/inventories/avco-method
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         # Beginning Inventory: 60 units @ 15.00 per unit
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 60.0,
             'price_unit': 15,
         })
@@ -917,8 +804,8 @@ def test_average_perpetual_1(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 140.0,
             'price_unit': 15.50,
         })
@@ -935,8 +822,8 @@ def test_average_perpetual_1(self):
         move3 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 190.0,
         })
         move3._action_confirm()
@@ -951,8 +838,8 @@ def test_average_perpetual_1(self):
         move4 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 70.0,
             'price_unit': 16.00,
         })
@@ -969,8 +856,8 @@ def test_average_perpetual_1(self):
         move5 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 30.0,
         })
         move5._action_confirm()
@@ -985,14 +872,14 @@ def test_average_perpetual_1(self):
         move6 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 99,
         })
         move6._action_confirm()
         move6._action_assign()
-        move6.move_line_ids.owner_id = self.owner1.id
+        move6.move_line_ids.owner_id = self.owner.id
         move6.move_line_ids.quantity = 10.0
         move6.picked = True
         move6._action_done()
@@ -1004,8 +891,8 @@ def test_average_perpetual_1(self):
         move7 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 50.0,
         })
         move7._action_confirm()
@@ -1015,40 +902,40 @@ def test_average_perpetual_1(self):
         move7._action_done()
 
         self.assertEqual(move7.value, 796.0)
-        self.assertAlmostEqual(self.product1.qty_available, 10)
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.qty_available, 10)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_average_perpetual_2(self):
-        self.product1.categ_id.property_cost_method = 'average'
-        self._make_in_move(self.product1, 10, 10)
-        self.assertEqual(self.product1.standard_price, 10)
+        product = self.product_avco
+        self._make_in_move(product, 10, 10)
+        self.assertEqual(product.standard_price, 10)
 
-        move2 = self._make_in_move(self.product1, 10, 15)
-        self.assertEqual(self.product1.standard_price, 12.5)
+        move2 = self._make_in_move(product, 10, 15)
+        self.assertEqual(product.standard_price, 12.5)
 
-        self._make_out_move(self.product1, 15)
-        self.assertEqual(self.product1.standard_price, 12.5)
+        self._make_out_move(product, 15)
+        self.assertEqual(product.standard_price, 12.5)
 
-        self._make_out_move(self.product1, 10)
+        self._make_out_move(product, 10)
         # note: 5 units were sent estimated at 12.5 (negative stock)
-        self.assertEqual(self.product1.standard_price, 12.5)
-        self.assertEqual(self.product1.qty_available, -5)
-        self.assertEqual(self.product1.total_value, -62.5)
+        self.assertEqual(product.standard_price, 12.5)
+        self.assertEqual(product.qty_available, -5)
+        self.assertEqual(product.total_value, -62.5)
 
         self._set_quantity(move2, 20)
 
-        self.assertEqual(self.product1.qty_available, 5)
-        self.assertEqual(self.product1.total_value, 66.67)
-        self.assertEqual(self.product1.standard_price, 13.33)
+        self.assertEqual(product.qty_available, 5)
+        self.assertEqual(product.total_value, 66.67)
+        self.assertEqual(product.standard_price, 13.33)
 
     def test_average_perpetual_3(self):
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 10,
         })
@@ -1059,15 +946,15 @@ def test_average_perpetual_3(self):
         move1._action_done()
         move1.value_manual = 100.0
 
-        self.assertEqual(self.product1.qty_available, 10.0)
-        self.assertEqual(self.product1.total_value, 100.0)
-        self.product1._invalidate_cache()
+        self.assertEqual(product.qty_available, 10.0)
+        self.assertEqual(product.total_value, 100.0)
+        product._invalidate_cache()
 
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 15,
         })
@@ -1078,15 +965,15 @@ def test_average_perpetual_3(self):
         move2._action_done()
         move2.value_manual = 150.0
 
-        self.assertEqual(self.product1.qty_available, 20.0)
-        self.assertEqual(self.product1.total_value, 250.0)
-        self.product1._invalidate_cache()
+        self.assertEqual(product.qty_available, 20.0)
+        self.assertEqual(product.total_value, 250.0)
+        product._invalidate_cache()
 
         move3 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 15.0,
         })
         move3._action_confirm()
@@ -1095,15 +982,15 @@ def test_average_perpetual_3(self):
         move3.picked = True
         move3._action_done()
 
-        self.assertEqual(self.product1.qty_available, 5.0)
-        self.assertEqual(self.product1.total_value, 62.5)
-        self.product1._invalidate_cache()
+        self.assertEqual(product.qty_available, 5.0)
+        self.assertEqual(product.total_value, 62.5)
+        product._invalidate_cache()
 
         move4 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
         })
         move4._action_confirm()
@@ -1112,22 +999,22 @@ def test_average_perpetual_3(self):
         move4.picked = True
         move4._action_done()
 
-        self.assertEqual(self.product1.qty_available, -5.0)
-        self.assertEqual(self.product1.total_value, -62.5)
-        self.product1._invalidate_cache()
+        self.assertEqual(product.qty_available, -5.0)
+        self.assertEqual(product.total_value, -62.5)
+        product._invalidate_cache()
 
         move2.move_line_ids.quantity = 0
-        self.assertEqual(self.product1.qty_available, -15.0)
+        self.assertEqual(product.qty_available, -15.0)
 
     def test_average_perpetual_4(self):
         """receive 1@10, receive 1@5 insteadof 3@5"""
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1.0,
             'price_unit': 10,
         })
@@ -1141,8 +1028,8 @@ def test_average_perpetual_4(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 3.0,
             'price_unit': 5,
         })
@@ -1153,42 +1040,42 @@ def test_average_perpetual_4(self):
         move2._action_done()
         move2.value_manual = 5.0
 
-        self.assertAlmostEqual(self.product1.qty_available, 2.0)
-        self.assertAlmostEqual(self.product1.standard_price, 7.5)
+        self.assertAlmostEqual(product.qty_available, 2.0)
+        self.assertAlmostEqual(product.standard_price, 7.5)
 
     def test_average_perpetual_5(self):
         ''' Set owner on incoming move => no valuation '''
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1.0,
             'price_unit': 10,
         })
         move1._action_confirm()
         move1._action_assign()
         move1.move_line_ids.quantity = 1.0
-        move1.move_line_ids.owner_id = self.owner1.id
+        move1.move_line_ids.owner_id = self.owner.id
         move1.picked = True
         move1._action_done()
         move1.value_manual = 10.0
 
         self.assertAlmostEqual(move1.remaining_qty, 0.0)
-        self.assertAlmostEqual(self.product1.qty_available, 1.0)
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.qty_available, 1.0)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_average_perpetual_6(self):
         """ Batch validation of moves """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1.0,
             'price_unit': 10,
         })
@@ -1200,8 +1087,8 @@ def test_average_perpetual_6(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1.0,
             'price_unit': 5,
         })
@@ -1215,21 +1102,21 @@ def test_average_perpetual_6(self):
         move1.value_manual = 10.0
         move2.value_manual = 5.0
 
-        self.assertAlmostEqual(self.product1.standard_price, 7.5)
-        self.assertEqual(self.product1.qty_available, 2)
-        self.assertEqual(self.product1.total_value, 15)
+        self.assertAlmostEqual(product.standard_price, 7.5)
+        self.assertEqual(product.qty_available, 2)
+        self.assertEqual(product.total_value, 15)
 
     def test_average_perpetual_7(self):
         """ Test edit in the past. Receive 5@10, receive 10@20, edit the first move to receive
         15 instead.
         """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 5,
             'price_unit': 10,
         })
@@ -1239,17 +1126,17 @@ def test_average_perpetual_7(self):
         move1._action_done()
         move1.value_manual = 50.0
 
-        self.assertAlmostEqual(self.product1.standard_price, 10)
+        self.assertAlmostEqual(product.standard_price, 10)
         self.assertAlmostEqual(move1.value, 50)
-        self.assertAlmostEqual(self.product1.qty_available, 5)
-        self.assertAlmostEqual(self.product1.total_value, 50)
-        self.product1._invalidate_cache()
+        self.assertAlmostEqual(product.qty_available, 5)
+        self.assertAlmostEqual(product.total_value, 50)
+        product._invalidate_cache()
 
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10,
             'price_unit': 20,
         })
@@ -1259,29 +1146,29 @@ def test_average_perpetual_7(self):
         move2._action_done()
         move2.value_manual = 200.0
 
-        self.assertAlmostEqual(self.product1.standard_price, 16.67)
+        self.assertAlmostEqual(product.standard_price, 16.67)
         self.assertAlmostEqual(move2.value, 200)
-        self.assertAlmostEqual(self.product1.qty_available, 15)
-        self.assertAlmostEqual(self.product1.total_value, 250)
-        self.product1._invalidate_cache()
+        self.assertAlmostEqual(product.qty_available, 15)
+        self.assertAlmostEqual(product.total_value, 250)
+        product._invalidate_cache()
 
         self._set_quantity(move1, 15)
 
-        self.assertAlmostEqual(self.product1.standard_price, 14.0)
-        self.assertAlmostEqual(self.product1.qty_available, 25)
-        self.assertAlmostEqual(self.product1.total_value, 350)
+        self.assertAlmostEqual(product.standard_price, 14.0)
+        self.assertAlmostEqual(product.qty_available, 25)
+        self.assertAlmostEqual(product.total_value, 350)
 
     def test_average_perpetual_8(self):
         """ Receive 1@10, then dropship 1@20, finally return the dropship. Dropship should not
             impact the price.
         """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1,
             'price_unit': 10,
         })
@@ -1291,13 +1178,13 @@ def test_average_perpetual_8(self):
         move1._action_done()
         move1.value_manual = 10.0
 
-        self.assertAlmostEqual(self.product1.standard_price, 10)
+        self.assertAlmostEqual(product.standard_price, 10)
 
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1,
             'price_unit': 20,
         })
@@ -1306,13 +1193,13 @@ def test_average_perpetual_8(self):
         move2.picked = True
         move2._action_done()
 
-        self.assertAlmostEqual(self.product1.standard_price, 10.0)
+        self.assertAlmostEqual(product.standard_price, 10.0)
 
         move3 = self.env['stock.move'].create({
             'location_id': self.customer_location.id,
             'location_dest_id': self.supplier_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1,
             'price_unit': 20,
         })
@@ -1321,19 +1208,19 @@ def test_average_perpetual_8(self):
         move3.picked = True
         move3._action_done()
 
-        self.assertAlmostEqual(self.product1.standard_price, 10.0)
+        self.assertAlmostEqual(product.standard_price, 10.0)
 
     def test_average_perpetual_9(self):
         """ When a product has an available quantity of -5, edit an incoming shipment and increase
         the received quantity by 5 units.
         """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
         # receive 10
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10,
             'price_unit': 10,
         })
@@ -1346,8 +1233,8 @@ def test_average_perpetual_9(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 15.0,
         })
         move2._action_confirm()
@@ -1361,13 +1248,13 @@ def test_average_perpetual_9(self):
 
     def test_average_stock_user(self):
         """ deliver an average product as a stock user. """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
         # receive 10
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10,
             'price_unit': 10,
         })
@@ -1379,8 +1266,8 @@ def test_average_stock_user(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 15.0,
         })
         move2._action_confirm()
@@ -1391,13 +1278,13 @@ def test_average_stock_user(self):
 
     def test_average_negative_1(self):
         """ Test edit in the past. Receive 10, send 20, edit the second move to only send 10."""
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco_auto
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 10,
         })
@@ -1408,13 +1295,13 @@ def test_average_negative_1(self):
         move1._action_done()
         move1.value_manual = 100.0
 
-        self._create_invoice('in_invoice', self.product1, 10, 10)
+        self._create_bill(product, 10, 10)
 
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 20.0,
         })
         move2._action_confirm()
@@ -1423,7 +1310,7 @@ def test_average_negative_1(self):
         move2.picked = True
         move2._action_done()
 
-        self._create_invoice('out_invoice', self.product1, 20, 10)
+        self._create_invoice(product, 20, 10)
         valuation_aml = self._get_stock_valuation_move_lines()
         move2_valuation_aml = valuation_aml[-1]
         self.assertEqual(len(valuation_aml), 2)
@@ -1431,7 +1318,7 @@ def test_average_negative_1(self):
         self.assertEqual(move2_valuation_aml.credit, 200)
 
         self._set_quantity(move2, 10.0)
-        self._create_invoice('in_invoice', self.product1, 10, 10)
+        self._create_bill(product, 10, 10)
 
         valuation_aml = self._get_stock_valuation_move_lines()
         move2_valuation_aml = valuation_aml[-1]
@@ -1440,7 +1327,7 @@ def test_average_negative_1(self):
         self.assertEqual(move2_valuation_aml.credit, 0)
 
         self._set_quantity(move2, 11.0)
-        self._create_invoice('out_invoice', self.product1, 1, 10)
+        self._create_invoice(product, 1, 10)
 
         valuation_aml = self._get_stock_valuation_move_lines()
         move2_valuation_aml = valuation_aml[-1]
@@ -1451,91 +1338,59 @@ def test_average_negative_1(self):
     def test_average_negative_2(self):
         """ Send goods that you don't have in stock and never received any unit.
         """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         # set a standard price
-        self.product1.standard_price = 99
+        product.standard_price = 99
 
         # send 10 units that we do not have
-        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product1, self.stock_location), 0)
-        move1 = self._make_out_move(self.product1, 10, force_assign=True)
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(product, self.stock_location), 0)
+        move1 = self._make_out_move(product, 10, force_assign=True)
         self.assertEqual(move1.value, 990)
-        self.assertEqual(self.product1.qty_available, -10)
-        self.assertEqual(self.product1.total_value, -990.0)
+        self.assertEqual(product.qty_available, -10)
+        self.assertEqual(product.total_value, -990.0)
 
     def test_average_negative_3(self):
         """ Send goods that you don't have in stock but received and send some units before.
         """
-        self.product1.categ_id.property_cost_method= 'average'
+        product = self.product_avco_auto
 
         # set a standard price
-        self.product1.standard_price = 99
+        with freeze_time(Datetime.now() - timedelta(days=10)):
+            product.standard_price = 99
 
-        # Receives 10 produts at 10
-        move1 = self.env['stock.move'].create({
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 10.0,
-            'price_unit': 10,
-        })
-        move1._action_confirm()
-        move1._action_assign()
-        move1.move_line_ids.quantity = 10.0
-        move1.picked = True
-        move1._action_done()
-        move1.value_manual = 100
+        # Receives 10 products at 10
+        move1 = self._make_in_move(product, 10, 10)
 
         self.assertEqual(move1.value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.total_value, 100)
+        self.assertEqual(product.qty_available, 10)
+        self.assertEqual(product.total_value, 100)
 
         # send 10 products
-        move2 = self.env['stock.move'].create({
-            'location_id': self.stock_location.id,
-            'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 10.0,
-        })
-        move2._action_confirm()
-        move2._action_assign()
-        move2.move_line_ids.quantity = 10.0
-        move2.picked = True
-        move2._action_done()
+        move2 = self._make_out_move(product, 10)
 
         self.assertEqual(move2.value, 100.0)
         self.assertEqual(move2.remaining_qty, 0.0)  # unused in average move
-        self.product1._invalidate_cache()
+        product._invalidate_cache()
 
         # send 10 products again
-        move3 = self.env['stock.move'].create({
-            'location_id': self.stock_location.id,
-            'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 10.0,
-        })
-        move3._action_confirm()
-        move3.quantity = 10.0
-        move3.picked = True
+        move3 = self._make_out_move(product, 10)
         move3._action_done()
 
-        self.assertEqual(move3.value, 0.0)
+        self.assertEqual(move3.value, 100.0)
 
     def test_average_negative_4(self):
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         # set a standard price
-        self.product1.standard_price = 99
+        product.standard_price = 99
 
         # Receives 10 produts at 10
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 10,
         })
@@ -1549,14 +1404,14 @@ def test_average_negative_4(self):
         self.assertEqual(move1.value, 100.0)
 
     def test_average_negative_5(self):
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         # in 10 @ 10
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 10,
         })
@@ -1568,14 +1423,14 @@ def test_average_negative_5(self):
         move1.value_manual = 100.0
 
         self.assertEqual(move1.value, 100.0)
-        self.assertEqual(self.product1.standard_price, 10)
+        self.assertEqual(product.standard_price, 10)
 
         # in 10 @ 20
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 20,
         })
@@ -1587,14 +1442,14 @@ def test_average_negative_5(self):
         move2.value_manual = 200.0
 
         self.assertEqual(move2.value, 200.0)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(product.standard_price, 15)
 
         # send 5
         move3 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 5.0,
         })
         move3._action_confirm()
@@ -1603,14 +1458,14 @@ def test_average_negative_5(self):
         move3._action_done()
 
         self.assertEqual(move3.value, 75.0)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(product.standard_price, 15)
 
         # send 30
         move4 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 30.0,
         })
         move4._action_confirm()
@@ -1619,14 +1474,14 @@ def test_average_negative_5(self):
         move4._action_done()
 
         self.assertEqual(move4.value, 450.0)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(product.standard_price, 15)
 
         # in 20 @ 20
         move5 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 20.0,
             'price_unit': 20,
         })
@@ -1644,16 +1499,16 @@ def test_average_negative_5(self):
         self.assertEqual(move4.value, 450)
 
         # So we have 5@20 in stock.
-        self.assertEqual(self.product1.qty_available, 5)
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.standard_price, 20)
+        self.assertEqual(product.qty_available, 5)
+        self.assertEqual(product.total_value, 100)
+        self.assertEqual(product.standard_price, 20)
 
         # send 5 products to empty the inventory, the average price should not go to 0
         move6 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 5.0,
         })
         move6._action_confirm()
@@ -1662,14 +1517,14 @@ def test_average_negative_5(self):
         move6._action_done()
 
         self.assertEqual(move6.value, 100.0)
-        self.assertEqual(self.product1.standard_price, 20)
+        self.assertEqual(product.standard_price, 20)
 
         # in 10 @ 10, the new average price should be 10
         move7 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
             'price_unit': 10,
         })
@@ -1681,36 +1536,36 @@ def test_average_negative_5(self):
         move7.value_manual = 100.0
 
         self.assertEqual(move7.value, 100.0)
-        self.assertEqual(self.product1.standard_price, 10)
+        self.assertEqual(product.standard_price, 10)
 
     def test_average_automated_with_cost_change(self):
         """ Test of the handling of a cost change with a negative stock quantity with FIFO+AVCO costing method"""
-        self.product1.categ_id.property_cost_method = 'average'
-        self.product1.categ_id.property_valuation = 'real_time'
+        product = self.product_avco
+        product.categ_id.property_valuation = 'real_time'
 
         # Step 1: Sell (and confirm) 10 units we don't have @ 100
-        self.product1.standard_price = 100
-        move1 = self._make_out_move(self.product1, 10, force_assign=True)
+        product.standard_price = 100
+        move1 = self._make_out_move(product, 10, force_assign=True)
 
-        self.assertAlmostEqual(self.product1.qty_available, -10.0)
+        self.assertAlmostEqual(product.qty_available, -10.0)
         self.assertEqual(move1.value, 1000.0)
-        self.assertAlmostEqual(self.product1.total_value, -1000.0)
+        self.assertAlmostEqual(product.total_value, -1000.0)
 
         # Step2: Change product cost from 100 to 10 -> Nothing should appear in inventory
         # valuation as the quantity is negative
-        self.product1.standard_price = 10
-        self.assertEqual(self.product1.total_value, -100.0)
+        product.standard_price = 10
+        self.assertEqual(product.total_value, -100.0)
 
         # Step 3: Make an inventory adjustment to set to total counted value at 0 -> Inventory
         # valuation should be at 0 with a compensation layer at 900 (1000 - 100)
-        inventory_location = self.product1.property_stock_inventory
+        inventory_location = product.property_stock_inventory
         inventory_location.company_id = self.env.company.id
 
         move2 = self.env['stock.move'].create({
             'location_id': inventory_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
         })
         move2._action_confirm()
@@ -1720,95 +1575,79 @@ def test_average_automated_with_cost_change(self):
         move2._action_done()
 
         # Check if the move adjustment has correctly been done
-        self.assertAlmostEqual(self.product1.qty_available, 0.0)
+        self.assertAlmostEqual(product.qty_available, 0.0)
         self.assertAlmostEqual(move2.value, 100.0)
 
         # Check if the compensation layer is as expected, with final inventory value being 0
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_average_manual_1(self):
         ''' Set owner on incoming move => no valuation '''
-        self.product1.categ_id.property_cost_method = 'average'
-        self.product1.categ_id.property_valuation = 'periodic'
+        product = self.product_avco
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1.0,
             'price_unit': 10,
         })
         move1._action_confirm()
         move1._action_assign()
         move1.move_line_ids.quantity = 1.0
-        move1.move_line_ids.owner_id = self.owner1.id
+        move1.move_line_ids.owner_id = self.owner.id
         move1.picked = True
         move1._action_done()
 
         self.assertAlmostEqual(move1.remaining_qty, 0.0)
-        self.assertAlmostEqual(self.product1.qty_available, 1.0)
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.qty_available, 1.0)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_standard_perpetual_1(self):
         ''' Set owner on incoming move => no valuation '''
-        self.product1.categ_id.property_cost_method = 'standard'
+        product = self.product_standard_auto
 
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 1.0,
             'price_unit': 10,
         })
         move1._action_confirm()
         move1._action_assign()
         move1.move_line_ids.quantity = 1.0
-        move1.move_line_ids.owner_id = self.owner1.id
+        move1.move_line_ids.owner_id = self.owner.id
         move1.picked = True
         move1._action_done()
 
         self.assertAlmostEqual(move1.remaining_qty, 0.0)
-        self.assertAlmostEqual(self.product1.qty_available, 1.0)
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.qty_available, 1.0)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_standard_manual_1(self):
         ''' Set owner on incoming move => no valuation '''
-        self.product1.categ_id.property_cost_method = 'standard'
-        self.product1.categ_id.property_valuation = 'periodic'
+        product = self.product_standard
 
-        move1 = self.env['stock.move'].create({
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
-            'product_uom_qty': 1.0,
-            'price_unit': 10,
-        })
-        move1._action_confirm()
-        move1._action_assign()
-        move1.move_line_ids.quantity = 1.0
-        move1.move_line_ids.owner_id = self.owner1.id
-        move1.picked = True
-        move1._action_done()
+        move1 = self._make_in_move(product, 1, 10, owner_id=self.owner.id)
 
         self.assertAlmostEqual(move1.remaining_qty, 0.0)
-        self.assertAlmostEqual(self.product1.qty_available, 1.0)
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.qty_available, 1.0)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_standard_manual_2(self):
         """Validate a receipt as a regular stock user."""
-        self.product1.categ_id.property_cost_method = 'standard'
-        self.product1.categ_id.property_valuation = 'periodic'
+        product = self.product_standard
 
-        self.product1.standard_price = 10.0
+        product.standard_price = 10.0
 
         move1 = self.env['stock.move'].with_user(self.inventory_user).create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
         })
         move1._action_confirm()
@@ -1819,16 +1658,16 @@ def test_standard_manual_2(self):
 
     def test_standard_perpetual_2(self):
         """Validate a receipt as a regular stock user."""
-        self.product1.categ_id.property_cost_method = 'standard'
-        self.product1.categ_id.property_valuation = 'real_time'
+        product = self.product_standard
+        product.categ_id.property_valuation = 'real_time'
 
-        self.product1.standard_price = 10.0
+        product.standard_price = 10.0
 
         move1 = self.env['stock.move'].with_user(self.inventory_user).create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
         })
         move1._action_confirm()
@@ -1843,30 +1682,30 @@ def test_change_cost_method_1(self):
         # ---------------------------------------------------------------------
         # Use FIFO, make some operations
         # ---------------------------------------------------------------------
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # receive 10@10
-        self._make_in_move(self.product1, 10, 10)
+        self._make_in_move(product, 10, 10)
 
         # receive 10@15
-        self._make_in_move(self.product1, 10, 15)
+        self._make_in_move(product, 10, 15)
 
         # sell 1
-        self._make_out_move(self.product1, 1)
+        self._make_out_move(product, 1)
 
-        self.assertAlmostEqual(self.product1.qty_available, 19)
-        self.assertEqual(self.product1.total_value, 240)
+        self.assertAlmostEqual(product.qty_available, 19)
+        self.assertEqual(product.total_value, 240)
 
         # ---------------------------------------------------------------------
         # Change the production valuation to AVCO
         # ---------------------------------------------------------------------
-        self.product1.categ_id.property_cost_method = 'average'
+        self.category_fifo.property_cost_method = 'average'
 
         # valuation should stay to ~240
-        self.assertAlmostEqual(self.product1.qty_available, 19)
-        self.assertAlmostEqual(self.product1.total_value, 237.5)
+        self.assertAlmostEqual(product.qty_available, 19)
+        self.assertAlmostEqual(product.total_value, 237.5)
 
-        self.assertEqual(self.product1.standard_price, 12.5)
+        self.assertEqual(product.standard_price, 12.5)
 
     def test_change_cost_method_2(self):
         """ Change the cost method from FIFO to standard.
@@ -1874,30 +1713,30 @@ def test_change_cost_method_2(self):
         # ---------------------------------------------------------------------
         # Use FIFO, make some operations
         # ---------------------------------------------------------------------
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         # receive 10@10
-        self._make_in_move(self.product1, 10, 10)
+        self._make_in_move(product, 10, 10)
 
         # receive 10@15
-        self._make_in_move(self.product1, 10, 15)
+        self._make_in_move(product, 10, 15)
 
         # sell 1
-        self._make_out_move(self.product1, 1)
+        self._make_out_move(product, 1)
 
-        self.assertAlmostEqual(self.product1.qty_available, 19)
-        self.assertEqual(self.product1.total_value, 240)
+        self.assertAlmostEqual(product.qty_available, 19)
+        self.assertEqual(product.total_value, 240)
 
         # ---------------------------------------------------------------------
         # Change the production valuation to Standard
         # ---------------------------------------------------------------------
-        self.product1.categ_id.property_cost_method = 'standard'
+        product.categ_id = self.category_standard
 
         # valuation should stay to ~240
-        self.assertAlmostEqual(self.product1.total_value, 240, delta=0.04)
-        self.assertAlmostEqual(self.product1.qty_available, 19)
+        self.assertAlmostEqual(product.total_value, 240, delta=0.04)
+        self.assertAlmostEqual(product.qty_available, 19)
 
-        self.assertEqual(self.product1.standard_price, 12.63)
+        self.assertEqual(product.standard_price, 12.63)
 
     def test_fifo_sublocation_valuation_1(self):
         """ Set the main stock as a view location. Receive 2 units of a
@@ -1907,8 +1746,8 @@ def test_fifo_sublocation_valuation_1(self):
         quants to a customer, only the one in the internal location
         should be valued.
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
-        self.product1.standard_price = 10
+        product = self.product_fifo
+        product.standard_price = 10
 
         view_location = self.env['stock.location'].create({'name': 'view', 'usage': 'view'})
         subloc1 = self.env['stock.location'].create({
@@ -1926,8 +1765,8 @@ def test_fifo_sublocation_valuation_1(self):
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 2.0,
         })
         move1._action_confirm()
@@ -1935,32 +1774,32 @@ def test_fifo_sublocation_valuation_1(self):
         move1.write({'move_line_ids': [
             (5, 0, 0),
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': self.supplier_location.id,
                 'location_dest_id': subloc1.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': self.supplier_location.id,
                 'location_dest_id': subloc2.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
         ]})
         move1.picked = True
         move1._action_done()
         self.assertEqual(move1.value, 10)
         self.assertEqual(move1.remaining_qty, 1)
-        self.assertAlmostEqual(self.product1._with_valuation_context().qty_available, 1.0)
-        self.assertEqual(self.product1.total_value, 10)
+        self.assertAlmostEqual(product._with_valuation_context().qty_available, 1.0)
+        self.assertEqual(product.total_value, 10)
 
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 2.0,
         })
         move2._action_confirm()
@@ -1969,26 +1808,26 @@ def test_fifo_sublocation_valuation_1(self):
         move2.write({'move_line_ids': [
             (5, 0, 0),
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': subloc1.id,
                 'location_dest_id': self.supplier_location.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': subloc2.id,
                 'location_dest_id': self.supplier_location.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
         ]})
         move2.picked = True
         move2._action_done()
         self.assertEqual(move2.value, 10)
         self.assertEqual(move1.remaining_qty, 0)
-        self.assertAlmostEqual(self.product1.qty_available, 0.0)
-        self.assertEqual(self.product1.total_value, 0)
+        self.assertAlmostEqual(product.qty_available, 0.0)
+        self.assertEqual(product.total_value, 0)
 
     def test_move_in_or_out(self):
         """ Test a few combination of move and their move lines and
@@ -1997,6 +1836,7 @@ def test_move_in_or_out(self):
         """
         # an internal move should be considered as OUT if any of its move line
         # is moved in a scrap location
+        product = self.product_standard
         scrap = self.env['stock.location'].create({
             'name': 'scrap',
             'usage': 'inventory',
@@ -2006,26 +1846,26 @@ def test_move_in_or_out(self):
         move1 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 2.0,
         })
         move1._action_confirm()
         move1._action_assign()
         move1.write({'move_line_ids': [
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': self.stock_location.id,
                 'location_dest_id': self.stock_location.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': self.stock_location.id,
                 'location_dest_id': scrap.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
         ]})
         move1.picked = True
@@ -2046,26 +1886,26 @@ def test_move_in_or_out(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 2.0,
         })
         move2._action_confirm()
         move2._action_assign()
         move2.write({'move_line_ids': [
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': customer1.id,
                 'location_dest_id': self.stock_location.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
             (0, None, {
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'quantity': 1,
                 'location_id': self.stock_location.id,
                 'location_dest_id': customer1.id,
-                'product_uom_id': self.uom_unit.id
+                'product_uom_id': self.uom.id
             }),
         ]})
         move2.picked = True
@@ -2073,7 +1913,7 @@ def test_move_in_or_out(self):
         self.assertEqual(move2._is_out(), True)
 
     def test_at_date_standard_1(self):
-        self.product1.categ_id.property_cost_method = 'standard'
+        product = self.product_standard
 
         now = Datetime.now()
         date1 = now - timedelta(days=8)
@@ -2086,80 +1926,82 @@ def test_at_date_standard_1(self):
         date8 = now - timedelta(days=1)
 
         # set the standard price to 10
+        with freeze_time(date1 - timedelta(hours=1)):
+            product.standard_price = 5.0
         with freeze_time(date1):
-            self.product1.standard_price = 10.0
+            product.standard_price = 10.0
 
         # receive 10
         with freeze_time(date2):
-            self._make_in_move(self.product1, 10)
+            self._make_in_move(product, 10)
 
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.total_value, 100)
+        self.assertEqual(product.qty_available, 10)
+        self.assertEqual(product.total_value, 100)
 
         # receive 20
         with freeze_time(date3):
-            self._make_in_move(self.product1, 20)
+            self._make_in_move(product, 20)
 
-        self.assertEqual(self.product1.qty_available, 30)
-        self.assertEqual(self.product1.total_value, 300)
+        self.assertEqual(product.qty_available, 30)
+        self.assertEqual(product.total_value, 300)
 
         # send 15
         with freeze_time(date4):
-            self._make_out_move(self.product1, 15)
+            self._make_out_move(product, 15)
 
-        self.assertEqual(self.product1.qty_available, 15)
-        self.assertEqual(self.product1.total_value, 150)
+        self.assertEqual(product.qty_available, 15)
+        self.assertEqual(product.total_value, 150)
 
         # set the standard price to 5
         with freeze_time(date5):
-            self.product1.standard_price = 5
+            product.standard_price = 5
 
-        self.assertEqual(self.product1.qty_available, 15)
-        self.assertEqual(self.product1.total_value, 75)
+        self.assertEqual(product.qty_available, 15)
+        self.assertEqual(product.total_value, 75)
 
         # send 10
         with freeze_time(date6):
-            self._make_out_move(self.product1, 10)
+            self._make_out_move(product, 10)
 
-        self.assertEqual(self.product1.qty_available, 5)
-        self.assertEqual(self.product1.total_value, 25.0)
+        self.assertEqual(product.qty_available, 5)
+        self.assertEqual(product.total_value, 25.0)
 
         # set the standard price to 7.5
         with freeze_time(date7):
-            self.product1.standard_price = 7.5
+            product.standard_price = 7.5
 
         # receive 90
         with freeze_time(date8):
-            self._make_in_move(self.product1, 90)
+            self._make_in_move(product, 90)
 
-        self.assertEqual(self.product1.qty_available, 95)
-        self.assertEqual(self.product1.total_value, 712.5)
+        self.assertEqual(product.qty_available, 95)
+        self.assertEqual(product.total_value, 712.5)
 
         # Quantity available at date
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).qty_available, 0)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).qty_available, 10)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date3)).qty_available, 30)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date4)).qty_available, 15)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date5)).qty_available, 15)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date6)).qty_available, 5)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date7)).qty_available, 5)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date8)).qty_available, 95)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).qty_available, 0)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).qty_available, 10)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date3)).qty_available, 30)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date4)).qty_available, 15)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date5)).qty_available, 15)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date6)).qty_available, 5)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date7)).qty_available, 5)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date8)).qty_available, 95)
 
         # Valuation at date
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).total_value, 0)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).total_value, 100)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date3)).total_value, 300)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date4)).total_value, 150)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date5)).total_value, 75)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date6)).total_value, 25)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date8)).total_value, 712.5)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).total_value, 0)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).total_value, 100)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date3)).total_value, 300)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date4)).total_value, 150)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date5)).total_value, 75)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date6)).total_value, 25)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date8)).total_value, 712.5)
 
     def test_at_date_fifo_1(self):
         """ Make some operations at different dates, check that the results of the valuation at
         date wizard are consistent. Afterwards, edit the done quantity of some operations. The
         valuation at date results should take these changes into account.
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         now = Datetime.now()
         date1 = now - timedelta(days=8)
@@ -2171,84 +2013,84 @@ def test_at_date_fifo_1(self):
 
         # receive 10@10
         with freeze_time(date1):
-            move1 = self._make_in_move(self.product1, 10, 10)
+            move1 = self._make_in_move(product, 10, 10)
 
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.total_value, 100)
+        self.assertEqual(product.qty_available, 10)
+        self.assertEqual(product.total_value, 100)
 
         # receive 10@12
         with freeze_time(date2):
-            self._make_in_move(self.product1, 10, 12)
+            self._make_in_move(product, 10, 12)
 
-        self.assertAlmostEqual(self.product1.qty_available, 20)
-        self.assertEqual(self.product1.total_value, 220)
+        self.assertAlmostEqual(product.qty_available, 20)
+        self.assertEqual(product.total_value, 220)
 
         # send 15
         with freeze_time(date3):
-            self._make_out_move(self.product1, 15)
+            self._make_out_move(product, 15)
 
-        self.assertAlmostEqual(self.product1.qty_available, 5.0)
-        self.assertEqual(self.product1.total_value, 60)
+        self.assertAlmostEqual(product.qty_available, 5.0)
+        self.assertEqual(product.total_value, 60)
 
         # send 20
         with freeze_time(date4):
-            self._make_out_move(self.product1, 20)
+            self._make_out_move(product, 20)
 
-        self.assertAlmostEqual(self.product1.qty_available, -15.0)
-        self.assertEqual(self.product1.total_value, -180)
+        self.assertAlmostEqual(product.qty_available, -15.0)
+        self.assertEqual(product.total_value, -180)
 
         # receive 100@15
         with freeze_time(date5):
-            self._make_in_move(self.product1, 100, 15)
-
-        self.assertEqual(self.product1.qty_available, 85)
-        self.assertEqual(self.product1.total_value, 1275)
-
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).qty_available, 10)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).total_value, 100)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).qty_available, 20)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).total_value, 220)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date3)).qty_available, 5)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date3)).total_value, 60)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date4)).qty_available, -15)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date4)).total_value, -180)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date5)).qty_available, 85)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date5)).total_value, 1275)
+            self._make_in_move(product, 100, 15)
+
+        self.assertEqual(product.qty_available, 85)
+        self.assertEqual(product.total_value, 1275)
+
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).qty_available, 10)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).total_value, 100)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).qty_available, 20)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).total_value, 220)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date3)).qty_available, 5)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date3)).total_value, 60)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date4)).qty_available, -15)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date4)).total_value, -180)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date5)).qty_available, 85)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date5)).total_value, 1275)
 
         # Edit the quantity done of move1, increase it.
         # Test a limitation, you can keep the old value but you can't keep the quantity in past
         with freeze_time(date6):
             self._set_quantity(move1, 20)
-        self.assertEqual(self.product1.qty_available, 95)
-        self.assertEqual(self.product1.total_value, 1425)
-
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).qty_available, 20)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).total_value, 100)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).qty_available, 30)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).total_value, 220)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date3)).qty_available, 15)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date3)).total_value, 145)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date4)).qty_available, -5)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date4)).total_value, -60)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date5)).qty_available, 95)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date5)).total_value, 1425)
+        self.assertEqual(product.qty_available, 95)
+        self.assertEqual(product.total_value, 1425)
+
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).qty_available, 20)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).total_value, 100)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).qty_available, 30)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).total_value, 220)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date3)).qty_available, 15)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date3)).total_value, 145)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date4)).qty_available, -5)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date4)).total_value, -60)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date5)).qty_available, 95)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date5)).total_value, 1425)
 
     def test_inventory_fifo_1(self):
         """ Make an inventory from a location with a company set, and ensure the product has a stock
         value. When the product is sold, ensure there is no remaining quantity on the original move
         and no stock value.
         """
-        self.product1.standard_price = 15
-        self.product1.categ_id.property_cost_method = 'fifo'
-        inventory_location = self.product1.property_stock_inventory
+        product = self.product_fifo
+        product.standard_price = 15
+        inventory_location = product.property_stock_inventory
         inventory_location.company_id = self.env.company.id
 
         # Start Inventory: 12 units
         move1 = self.env['stock.move'].create({
             'location_id': inventory_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 12.0,
         })
         move1._action_confirm()
@@ -2260,15 +2102,15 @@ def test_inventory_fifo_1(self):
 
         self.assertAlmostEqual(move1.value, 180.0)
         self.assertAlmostEqual(move1.remaining_qty, 12.0)
-        self.assertAlmostEqual(self.product1.total_value, 180.0)
-        self.product1._invalidate_cache()
+        self.assertAlmostEqual(product.total_value, 180.0)
+        product._invalidate_cache()
 
         # Sell the 12 units
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 12.0,
         })
         move2._action_confirm()
@@ -2279,7 +2121,7 @@ def test_inventory_fifo_1(self):
 
         move1._invalidate_cache()
         self.assertAlmostEqual(move1.remaining_qty, 0.0)
-        self.assertAlmostEqual(self.product1.total_value, 0.0)
+        self.assertAlmostEqual(product.total_value, 0.0)
 
     def test_at_date_average_1(self):
         """ Set a company on the inventory loss, take items from there then put items there, check
@@ -2289,16 +2131,17 @@ def test_at_date_average_1(self):
         date1 = now - timedelta(days=8)
         date2 = now - timedelta(days=7)
 
-        self.product1.standard_price = 10
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
-        inventory_location = self.product1.property_stock_inventory
+        product = self.product_avco
+        product.standard_price = 10
+        product = self.product_avco
+        inventory_location = product.property_stock_inventory
         inventory_location.company_id = self.env.company.id
 
         move1 = self.env['stock.move'].create({
             'location_id': inventory_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 10.0,
         })
         move1._action_confirm()
@@ -2311,8 +2154,8 @@ def test_at_date_average_1(self):
         move2 = self.env['stock.move'].create({
             'location_id': self.stock_location.id,
             'location_dest_id': inventory_location.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 5.0,
         })
         move2._action_confirm()
@@ -2322,10 +2165,10 @@ def test_at_date_average_1(self):
         move2._action_done()
         move2.date = date2
 
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).qty_available, 10)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date1)).total_value, 100)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).qty_available, 5)
-        self.assertEqual(self.product1.with_context(to_date=Datetime.to_string(date2)).total_value, 50)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).qty_available, 10)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date1)).total_value, 100)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).qty_available, 5)
+        self.assertEqual(product.with_context(to_date=Datetime.to_string(date2)).total_value, 50)
 
     def test_forecast_report_value(self):
         """ Create a SVL for two companies using different currency, and open
@@ -2333,7 +2176,7 @@ def test_forecast_report_value(self):
         display the product's valuation.
         """
         # Settings
-        self.product1.categ_id.property_valuation = 'periodic'
+        product = self.product_standard
         # Creates two new currencies.
         currency_1 = self.env['res.currency'].create({
             'name': 'UNF',
@@ -2368,8 +2211,8 @@ def test_forecast_report_value(self):
         self.env.user.company_ids += company_1
         self.env.user.company_ids += company_2
         # Updates the product's value.
-        self.product1.with_company(company_1).standard_price = 10
-        self.product1.with_company(company_2).standard_price = 12
+        product.with_company(company_1).standard_price = 10
+        product.with_company(company_2).standard_price = 12
 
         # ---------------------------------------------------------------------
         # Receive 5 units @ 10.00 per unit (company_1)
@@ -2377,8 +2220,8 @@ def test_forecast_report_value(self):
         move_1 = self.env['stock.move'].with_company(company_1).create({
             'location_id': self.supplier_location.id,
             'location_dest_id': stock_1.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 5.0,
         })
         move_1._action_confirm()
@@ -2392,8 +2235,8 @@ def test_forecast_report_value(self):
         move_2 = self.env['stock.move'].with_company(company_2).create({
             'location_id': self.supplier_location.id,
             'location_dest_id': stock_2.id,
-            'product_id': self.product1.id,
-            'product_uom': self.uom_unit.id,
+            'product_id': product.id,
+            'product_uom': self.uom.id,
             'product_uom_qty': 4.0,
         })
         move_2._action_confirm()
@@ -2405,8 +2248,8 @@ def test_forecast_report_value(self):
         report = self.env['stock.forecasted_product_product']
         report_for_company_1 = report.with_company(company_1).with_context(warehouse_id=warehouse_1.id)
         report_for_company_2 = report.with_company(company_2).with_context(warehouse_id=warehouse_2.id)
-        report_value_1 = report_for_company_1.get_report_values(docids=self.product1.ids)
-        report_value_2 = report_for_company_2.get_report_values(docids=self.product1.ids)
+        report_value_1 = report_for_company_1.get_report_values(docids=product.ids)
+        report_value_2 = report_for_company_2.get_report_values(docids=product.ids)
         self.assertEqual(report_value_1['docs']['value'], "U 50.00")
         self.assertEqual(report_value_2['docs']['value'], "48.00 DD")
 
@@ -2415,7 +2258,7 @@ def test_fifo_and_sml_owned_by_company(self):
         When receiving a FIFO product, if the picking is owned by the company,
         there should be a SVL and an account move linked to the product SM
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
         receipt = self.env['stock.picking'].create({
             'location_id': self.supplier_location.id,
@@ -2425,7 +2268,7 @@ def test_fifo_and_sml_owned_by_company(self):
             'state': 'draft',
         })
 
-        move = self._make_in_move(self.product1, 1, 10, create_picking=True, owner=self.env.company.partner_id)
+        move = self._make_in_move(product, 1, 10, create_picking=True, owner=self.env.company.partner_id)
 
         closing_move = self.env['account.move'].browse(move.company_id.action_close_stock_valuation()['res_id'])
         self.assertEqual(move.value, 10)
@@ -2437,6 +2280,7 @@ def test_create_receipts_different_uom(self):
         the one set on the product form and ensure that when the qty done is changed
         and the picking is already validated, an svl is created in the uom set in the product.
         """
+        product = self.product_standard
         uom_dozen = self.env.ref('uom.product_uom_dozen')
         receipt = self.env['stock.picking'].create({
             'location_id': self.supplier_location.id,
@@ -2450,7 +2294,7 @@ def test_create_receipts_different_uom(self):
             'picking_id': receipt.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'product_uom': uom_dozen.id,
             'product_uom_qty': 1.0,
             'price_unit': 10,
@@ -2460,10 +2304,10 @@ def test_create_receipts_different_uom(self):
         move.picked = True
         receipt.button_validate()
 
-        self.assertEqual(self.product1.uom_name, 'Units')
-        self.assertEqual(self.product1.qty_available, 12)
+        self.assertEqual(product.uom_name, 'Units')
+        self.assertEqual(product.qty_available, 12)
         move.quantity = 2
-        self.assertEqual(self.product1.qty_available, 24)
+        self.assertEqual(product.qty_available, 24)
 
     def test_average_manual_price_change(self):
         """
@@ -2472,9 +2316,9 @@ def test_average_manual_price_change(self):
         To do so, we create 2 In moves, which result in a standard price rounded at $5.29, the non-rounded value ≃ 5.2857.
         Then we update the standard price to $7
         """
-        self.product1.categ_id.property_cost_method = 'average'
-        self._make_in_move(self.product1, 5, unit_cost=5)
-        self._make_in_move(self.product1, 2, unit_cost=6)
+        product = self.product_avco
+        self._make_in_move(product, 5, unit_cost=5)
+        self._make_in_move(product, 2, unit_cost=6)
 
         # make sure field 'value' is flagged as aggregatable
         self.assertEqual(
@@ -2483,101 +2327,72 @@ def test_average_manual_price_change(self):
             "Field 'value' must be aggregatable.",
         )
 
-        res = self.env['stock.quant']._read_group([('product_id', '=', self.product1.id)], aggregates=['value:sum'])
+        res = self.env['stock.quant']._read_group([('product_id', '=', product.id)], aggregates=['value:sum'])
         self.assertEqual(res[0][0], 5 * 5 + 2 * 6)
         # Avoid inderterminism since product.value and stock.move could have the same datetime in _run_avco
         with freeze_time(Datetime.now() + timedelta(minutes=1)):
-            self.product1.standard_price = 7
-        self.assertEqual(self.product1.total_value, 49)
+            product.standard_price = 7
+        self.assertEqual(product.total_value, 49)
 
     def test_average_manual_revaluation(self):
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
-        move1 = self._make_in_move(self.product1, 1, unit_cost=20)
+        move1 = self._make_in_move(product, 1, unit_cost=20)
         move1.value_manual = 20
-        move2 = self._make_in_move(self.product1, 1, unit_cost=30)
+        move2 = self._make_in_move(product, 1, unit_cost=30)
         move2.value_manual = 30
-        self.assertEqual(self.product1.standard_price, 25)
+        self.assertEqual(product.standard_price, 25)
 
         move2.value_manual = 20
-        self.assertEqual(self.product1.standard_price, 20)
+        self.assertEqual(product.standard_price, 20)
 
     def test_fifo_manual_revaluation(self):
+        product = self.product_fifo
         revaluation_vals = {
-            'default_product_id': self.product1.id,
+            'default_product_id': product.id,
             'default_company_id': self.env.company.id,
-            'default_account_id': self.stock_valuation_account,
+            'default_account_id': self.account_stock_valuation,
         }
-        self.product1.categ_id.property_cost_method = 'fifo'
+        product = self.product_fifo
 
-        move1 = self._make_in_move(self.product1, 1, unit_cost=15)
+        move1 = self._make_in_move(product, 1, unit_cost=15)
         move1.value_manual = 15
-        move2 = self._make_in_move(self.product1, 1, unit_cost=30)
+        move2 = self._make_in_move(product, 1, unit_cost=30)
         move2.value_manual = 30
-        self.assertEqual(self.product1.standard_price, 22.5)
+        self.assertEqual(product.standard_price, 22.5)
 
         move2.value_manual = 20
-        self.assertEqual(self.product1.standard_price, 17.5)
+        self.assertEqual(product.standard_price, 17.5)
 
     def test_manual_revaluation_statement(self):
-        self.product1.categ_id.property_cost_method = 'fifo'
-        self.product1.categ_id.property_valuation = 'real_time'
+        product = self.product_fifo
+        product.categ_id.property_valuation = 'real_time'
 
-        move1 = self._make_in_move(self.product1, 1, unit_cost=15)
+        move1 = self._make_in_move(product, 1, unit_cost=15)
         move1.value_manual = 15
         move1.value_manual = 25
-        self.assertEqual(self.product1.standard_price, 25.0)
+        self.assertEqual(product.standard_price, 25.0)
 
     def test_journal_entries_from_change_product_cost_method(self):
         """ Changing between non-standard cost methods when an underlying product has real_time
         accounting and a negative on hand quantity should result in journal entries with offsetting
         debit/credits for the stock valuation and stock output accounts (inverse of positive qty).
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
-        move1 = self.env['stock.move'].create({
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom_qty': 10.0,
-            'price_unit': 7.2,
-        })
-        move2 = self.env['stock.move'].create({
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
-            'product_uom_qty': 20.0,
-            'price_unit': 15.3,
-        })
-        (move1 + move2)._action_confirm()
-        (move1 + move2)._action_assign()
-        move1.quantity = 10
-        move2.quantity = 20
-        (move1 + move2).picked = True
-        (move1 + move2)._action_done()
-        move1.value_manual = 72.0
-        move2.value_manual = 306.0
-        move3 = self.env['stock.move'].create({
-            'product_id': self.product1.id,
-            'product_uom_qty': 100,
-            'location_id': self.stock_location.id,
-            'location_dest_id': self.customer_location.id,
-        })
-        move3._action_confirm()
-        move3._action_assign()
-        move3.quantity = 100
-        move3.picked = True
-        move3._action_done()
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_fifo_auto
+        self._make_in_move(product, 10, 7.2)
+        self._make_in_move(product, 20, 15.3)
+        self._make_out_move(product, 100)
+        product.categ_id = self.category_avco
 
-        closing_move = self.env['account.move'].browse(move3.company_id.action_close_stock_valuation()['res_id'])
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        closing_move = self._close()
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
 
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 0.0, 'credit': 882.0},
-                {'account_id': self.expense_account.id, 'debit': 882.0, 'credit': 0.0},
+                {'account_id': self.account_stock_valuation.id, 'debit': 0.0, 'credit': 882.0},
+                {'account_id': self.account_expense.id, 'debit': 882.0, 'credit': 0.0},
             ]
         )
 
@@ -2586,23 +2401,21 @@ def test_journal_entries_from_change_category(self):
         accounting and a negative on hand quantity should result in journal entries with offsetting
         debit/credits for the stock valuation and stock output accounts (inverse of positive qty).
         """
-        self.product1.categ_id.property_cost_method = 'fifo'
-        other_categ = self.product1.categ_id.copy({
+        product = self.product_fifo
+        other_categ = product.categ_id.copy({
             'property_cost_method': 'average',
-            'property_stock_valuation_account_id': self.stock_valuation_account.id,
-            'property_stock_journal': self.stock_journal.id,
         })
         move1 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'product_uom_qty': 10.0,
             'price_unit': 7.2,
         })
         move2 = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'product_uom_qty': 20.0,
             'price_unit': 15.3,
         })
@@ -2615,7 +2428,7 @@ def test_journal_entries_from_change_category(self):
         move1.value_manual = 72.0
         move2.value_manual = 306.0
         move3 = self.env['stock.move'].create({
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'product_uom_qty': 100,
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,
@@ -2625,37 +2438,36 @@ def test_journal_entries_from_change_category(self):
         move3.quantity = 100
         move3.picked = True
         move3._action_done()
-        self.product1.product_tmpl_id.categ_id = other_categ
+        product.product_tmpl_id.categ_id = other_categ
 
         closing_move = self.env['account.move'].browse(move3.company_id.action_close_stock_valuation()['res_id'])
-        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.stock_valuation_account)
-        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.expense_account)
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
 
         self.assertRecordValues(
             valuation_aml + expense_aml,
             [
-                {'account_id': self.stock_valuation_account.id, 'debit': 0.0, 'credit': 882.0},
-                {'account_id': self.expense_account.id, 'debit': 882.0, 'credit': 0.0},
+                {'account_id': self.account_stock_valuation.id, 'debit': 0.0, 'credit': 882.0},
+                {'account_id': self.account_expense.id, 'debit': 882.0, 'credit': 0.0},
             ]
         )
 
     def test_diff_uom_quantity_update_after_done(self):
         """Test that when the UoM of the stock.move.line is different from the stock.move,
         the quantity update after done (unlocked) use the correct UoM"""
-        unit_uom = self.env.ref('uom.product_uom_unit')
+        product = self.product_standard
+        unit_uom = self.uom
         dozen_uom = self.env.ref('uom.product_uom_dozen')
         move = self.env['stock.move'].create({
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'location_id': self.env.ref('stock.stock_location_suppliers').id,
             'location_dest_id': self.stock_location.id,
             'product_uom': unit_uom.id,
             'product_uom_qty': 12,
-            'price_unit': 1,
             'picking_type_id': self.picking_type_in.id,
         })
         move._action_confirm()
         move._action_assign()
-
         # Change from 12 Units to 1 Dozen (aka: same quantity)
         move.move_line_ids = [
             Command.update(
@@ -2667,6 +2479,7 @@ def test_diff_uom_quantity_update_after_done(self):
         move._action_done()
 
         self.assertEqual(move.quantity, 12)
+        self.assertEqual(move.value, 120)
 
         move.picking_id.action_toggle_is_locked()
         # Change from 1 Dozen to 2 Dozens (12 -> 24)
@@ -2676,6 +2489,7 @@ def test_diff_uom_quantity_update_after_done(self):
 
     def test_internal_location_with_no_company(self):
         """ An internal location without a company should not be valued """
+        product = self.product_standard
         location = self.env['stock.location'].create({
             'name': 'Internal no company',
             'usage': 'internal',
@@ -2684,7 +2498,7 @@ def test_internal_location_with_no_company(self):
         self.assertFalse(location._should_be_valued())
 
         move = self.env['stock.move'].create({
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': location.id,
             'product_uom_qty': 1,
@@ -2697,18 +2511,17 @@ def test_internal_location_with_no_company(self):
         move._action_done()
 
         self.assertEqual(move.state, "done")
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(product.qty_available, 0)
 
     def test_stock_valuation_layer_revaluation_with_branch_company(self):
-        """
-        Test that the product price is updated in the branch company
+        """Test that the product price is updated in the branch company
         by taking into account only the stock valuation layer of the branch company.
         """
-        self.assertEqual(self.product1.standard_price, 0)
-        self.product1.categ_id.property_cost_method = 'average'
-        move1 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move1.value_manual = 20
-        self.assertEqual(self.product1.standard_price, 20)
+        product = self.product_avco
+
+        self.assertEqual(product.standard_price, 10)
+        self._make_in_move(product, 1, unit_cost=20)
+        self.assertEqual(product.standard_price, 20)
         # create a branch company
         branch = self.env['res.company'].create({
             'name': "Branch A",
@@ -2716,22 +2529,24 @@ def test_stock_valuation_layer_revaluation_with_branch_company(self):
         })
         # Create a move in the branch company
         self.patch(self, 'env', branch.with_company(branch).env)
-        self.product1.with_company(branch).categ_id.property_cost_method = 'average'
+        product.with_company(branch).categ_id.property_cost_method = 'average'
         warehouse = self.env['stock.warehouse'].search([('company_id', '=', branch.id)], limit=1)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=30, location_dest_id=warehouse.lot_stock_id.id, picking_type_id=warehouse.in_type_id.id)
-        move2.value_manual = 30
-        self.assertEqual(self.product1.with_company(branch).standard_price, 30)
+        self._make_in_move(product, 1, unit_cost=30, location_dest_id=warehouse.lot_stock_id.id, picking_type_id=warehouse.in_type_id.id)
+        self.assertEqual(product.with_company(branch).standard_price, 30)
+        self.assertEqual(product.with_company(self.company).total_value, 20)
+        self.assertEqual(product.with_company(branch).total_value, 30)
 
     def test_action_done_with_state_already_done(self):
         """ This test ensure that calling _action_done on a move already done
         has no effect on the valuation.
         """
-        self.product1.standard_price = 10
+        product = self.product_standard
+        product.standard_price = 10
 
         in_move = self.env['stock.move'].create({
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'product_uom_qty': 10.0,
             'picked': True,
             'quantity': 10,
@@ -2745,14 +2560,13 @@ def test_action_done_with_state_already_done(self):
         self.assertEqual(in_move.quantity, 10)
 
     def test_scrap_reception_valuation(self):
-        product = self.product1
-        product.categ_id.property_cost_method = 'fifo'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        receipt = self._make_in_move(self.product1, 10, 15, create_picking=True).picking_id
+        product = self.product_fifo
+        product.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        receipt = self._make_in_move(product, 10, 15, create_picking=True).picking_id
         scrap_location = self.env['stock.location'].search(
             [('name', '=', 'Scrap'), ('company_id', '=', self.env.company.id)], limit=1
         )
-        scrap_location.valuation_account_id = self.inventory_adjustment_account
+        scrap_location.valuation_account_id = self.account_stock_variation
         scrap_form = Form(self.env['stock.scrap'].with_context(default_picking_id=receipt.id))
         scrap_form.product_id = product
         scrap_form.scrap_qty = 2
@@ -2767,13 +2581,14 @@ def test_scrap_reception_valuation(self):
         )
 
     def test_positive_stock_adjustment_valuation(self):
-        accounts_data = self.product1.product_tmpl_id.get_product_accounts()
+        product = self.product_standard_auto
+        accounts_data = product.product_tmpl_id.get_product_accounts()
         inventory_adjustment_loc = self.env['stock.location'].search(
             [('usage', '=', 'inventory'), ('company_id', '=', self.env.company.id)], limit=1
         )
-        inventory_adjustment_loc.valuation_account_id = self.stock_valuation_account
-        self.product1.standard_price = 10
-        inventory_gain_move = self._make_in_move(self.product1, 10, location_id=inventory_adjustment_loc.id)
+        inventory_adjustment_loc.valuation_account_id = self.account_stock_valuation
+        product.standard_price = 10
+        inventory_gain_move = self._make_in_move(product, 10, location_id=inventory_adjustment_loc.id)
 
         amls = inventory_gain_move.account_move_id.line_ids
         self.assertEqual(len(amls), 2)
@@ -2783,14 +2598,15 @@ def test_positive_stock_adjustment_valuation(self):
         self.assertEqual(credit_line.account_id, accounts_data['stock_valuation'])
 
     def test_negative_stock_adjustment_valuation(self):
-        accounts_data = self.product1.product_tmpl_id.get_product_accounts()
+        product = self.product_standard_auto
+        accounts_data = product.product_tmpl_id.get_product_accounts()
         inventory_adjustment_loc = self.env['stock.location'].search(
             [('usage', '=', 'inventory'), ('company_id', '=', self.env.company.id)], limit=1
         )
-        inventory_adjustment_loc.valuation_account_id = self.stock_valuation_account
-        self.product1.standard_price = 10
-        self._make_in_move(self.product1, 10)
-        inventory_loss_move = self._make_out_move(self.product1, 5, location_dest_id=inventory_adjustment_loc.id)
+        inventory_adjustment_loc.valuation_account_id = self.account_stock_valuation
+        product.standard_price = 10
+        self._make_in_move(product, 10)
+        inventory_loss_move = self._make_out_move(product, 5, location_dest_id=inventory_adjustment_loc.id)
 
         amls = inventory_loss_move.account_move_id.line_ids
         self.assertEqual(len(amls), 2)
@@ -2802,14 +2618,15 @@ def test_negative_stock_adjustment_valuation(self):
     def test_valuation_rounding_method(self):
         uom_g = self.env.ref('uom.product_uom_gram')
         uom_kg = self.env.ref('uom.product_uom_kgm')
-        self.product1.uom_id = uom_kg
+        product = self.product_standard
+        product.uom_id = uom_kg
 
         receipt = self.env['stock.picking'].create({
             'picking_type_id': self.picking_type_in.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': self.stock_location.id,
             'move_ids': [Command.create({
-                'product_id': self.product1.id,
+                'product_id': product.id,
                 'product_uom': uom_g.id,
                 'product_uom_qty': 11,
                 'quantity': 11,
@@ -2821,397 +2638,206 @@ def test_valuation_rounding_method(self):
 
         self.assertEqual(receipt.move_ids.quantity, 11)
         self.assertEqual(receipt.move_ids.product_qty, 0.01)
-        self.assertEqual(self.product1.qty_available, 0.01)
+        self.assertEqual(product.qty_available, 0.01)
 
-        move_out = self._make_out_move(self.product1, 11, uom_id=uom_g.id)
+        move_out = self._make_out_move(product, 11, uom_id=uom_g.id)
 
         self.assertEqual(move_out.quantity, 11)
         self.assertEqual(move_out.product_qty, 0.01)
-        self.assertEqual(self.product1.qty_available, 0.00)
+        self.assertEqual(product.qty_available, 0.00)
 
-    def test_stock_valuation_layer_revaluation_avco(self):
-        self.product1.categ_id.property_cost_method = 'average'
-        context = {
-            'default_product_id': self.product1.id,
-            'default_company_id': self.env.company.id,
-            'default_added_value': 0.0
-        }
-        # Quantity of product1 is zero, raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
+    def test_stock_valuation_revaluation_avco(self):
+        product = self.product_avco
 
-        self._make_in_move(self.product1, 10, unit_cost=2)
-        self._make_in_move(self.product1, 10, unit_cost=4)
+        move_in_1 = self._make_in_move(product, 10, unit_cost=2)
+        move_in_2 = self._make_in_move(product, 10, unit_cost=4)
 
-        self.assertEqual(self.product1.standard_price, 3)
-        self.assertEqual(self.product1.quantity_svl, 20)
+        self.assertEqual(product.standard_price, 3)
+        self.assertEqual(product.qty_available, 20)
 
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+        moves_in = (move_in_1 | move_in_2)
+        self.assertEqual(sum(moves_in.mapped('remaining_value')), 60)
 
-        self.assertEqual(len(old_layers), 2)
-        self.assertEqual(old_layers[0].remaining_value, 40)
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
-        revaluation_wizard.added_value = 20
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
+        # Avoid conflict with moves in and product.value at same date
+        with freeze_time(Datetime.now() + timedelta(seconds=1)):
+            product.standard_price = 4
 
         # Check standard price change
-        self.assertEqual(self.product1.standard_price, 4)
-        self.assertEqual(self.product1.quantity_svl, 20)
+        self.assertEqual(product.standard_price, 4)
+        self.assertEqual(product.qty_available, 20)
 
         # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 20)
+        std_price_history = self.env['product.value'].search([('product_id', '=', product.id)], order="create_date desc, id desc", limit=1)
+        self.assertEqual(std_price_history.value, 4)
 
         # Check the remaing value of current layers
-        self.assertEqual(old_layers[0].remaining_value, 50)
-        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80)
+        self.assertEqual(sum(moves_in.mapped('remaining_value')), 80)
 
         # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
-
-    def test_stock_valuation_layer_revaluation_avco_rounding(self):
-        self.product1.categ_id.property_cost_method = 'average'
-        context = {
-            'default_product_id': self.product1.id,
-            'default_company_id': self.env.company.id,
-            'default_added_value': 0.0
-        }
-        # Quantity of product1 is zero, raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
+        closing_move = self._close()
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
+        self.assertRecordValues(
+            valuation_aml + expense_aml,
+            [
+                {'account_id': self.account_stock_valuation.id, 'debit': 80, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 80},
+            ]
+        )
 
-        self._make_in_move(self.product1, 1, unit_cost=1)
-        self._make_in_move(self.product1, 1, unit_cost=1)
-        self._make_in_move(self.product1, 1, unit_cost=1)
+    def test_stock_valuation_revaluation_avco_rounding(self):
+        product = self.product_avco
 
-        self.assertEqual(self.product1.standard_price, 1)
-        self.assertEqual(self.product1.quantity_svl, 3)
+        move1 = self._make_in_move(product, 1, unit_cost=1)
+        move2 = self._make_in_move(product, 1, unit_cost=1)
+        move3 = self._make_in_move(product, 1, unit_cost=1)
+        moves = move1 | move2 | move3
 
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+        self.assertEqual(product.standard_price, 1)
+        self.assertEqual(product.qty_available, 3)
 
-        self.assertEqual(len(old_layers), 3)
-        self.assertEqual(old_layers[0].remaining_value, 1)
+        self.assertEqual(move1.remaining_value, 1)
 
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
-        revaluation_wizard.added_value = 1
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
+        move1.value_manual = 2
 
         # Check standard price change
-        self.assertEqual(self.product1.standard_price, 1.33)
-        self.assertEqual(self.product1.quantity_svl, 3)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 1)
+        self.assertEqual(product.standard_price, 1.33)
+        self.assertEqual(product.qty_available, 3)
+        self.assertEqual(product.total_value, 4)
 
-        # Check the remaing value of current layers
-        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 4)
-        self.assertTrue(1.34 in old_layers.mapped("remaining_value"))
+        # Check the remaining value of moves (3.99 is expected since std is truncated to 2 digits)
+        self.assertEqual(sum(moves.mapped('remaining_value')), 3.99)
+        self.assertEqual(move1.remaining_value, 1.33)
 
         # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 1)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 1)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
+        closing_move = self._close()
+        valuation_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_stock_valuation)
+        expense_aml = closing_move.line_ids.filtered(lambda l: l.account_id == self.account_expense)
+        self.assertRecordValues(
+            valuation_aml + expense_aml,
+            [
+                {'account_id': self.account_stock_valuation.id, 'debit': 4, 'credit': 0},
+                {'account_id': self.account_expense.id, 'debit': 0, 'credit': 4},
+            ]
+        )
 
-    def test_stock_valuation_layer_revaluation_avco_rounding_2_digits(self):
+    def test_stock_valuation_revaluation_avco_rounding_2_digits(self):
         """
         Check that the rounding of the new price (cost) is equivalent to the rounding of the standard price (cost)
         The check is done indirectly via the layers valuations.
         If correct => rounding method is correct too
         """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         self.env['decimal.precision'].search([
             ('name', '=', 'Product Price'),
         ]).digits = 2
-        self.product1.write({'standard_price': 0})
+        product.write({'standard_price': 0})
 
         # First Move
-        self.product1.write({'standard_price': 0.022})
-        self._make_in_move(self.product1, 10000)
-
-        self.assertEqual(self.product1.standard_price, 0.02)
-        self.assertEqual(self.product1.quantity_svl, 10000)
+        product.write({'standard_price': 0.022})
+        self._make_in_move(product, 10000)
 
-        layer = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layer.value, 200)
+        self.assertEqual(product.standard_price, 0.02)
+        self.assertEqual(product.qty_available, 10000)
 
         # Second Move
-        self.product1.write({'standard_price': 0.053})
+        with freeze_time(Datetime.now() + timedelta(seconds=1)):
+            product.write({'standard_price': 0.053})
 
-        self.assertEqual(self.product1.standard_price, 0.05)
-        self.assertEqual(self.product1.quantity_svl, 10000)
+        self.assertEqual(product.standard_price, 0.05)
+        self.assertEqual(product.qty_available, 10000)
+        self.assertEqual(product.total_value, 500)
 
-        layers = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layers[0].value, 200)
-        self.assertEqual(layers[1].value, 300)
-
-    def test_stock_valuation_layer_revaluation_avco_rounding_5_digits(self):
+    def test_stock_valuation_revaluation_avco_rounding_5_digits(self):
         """
         Check that the rounding of the new price (cost) is equivalent to the rounding of the standard price (cost)
         The check is done indirectly via the layers valuations.
         If correct => rounding method is correct too
         """
-        self.product1.categ_id.property_cost_method = 'average'
+        product = self.product_avco
 
         self.env['decimal.precision'].search([
             ('name', '=', 'Product Price'),
         ]).digits = 5
+        self.env.company.currency_id.rounding = 0.00001
 
         # First Move
-        self.product1.write({'standard_price': 0.00875})
-        self._make_in_move(self.product1, 10000)
+        with freeze_time(Datetime.now() - timedelta(seconds=1)):
+            product.write({'standard_price': 0.00875})
+        move1 = self._make_in_move(product, 10000)
 
-        self.assertEqual(self.product1.standard_price, 0.00875)
-        self.assertEqual(self.product1.quantity_svl, 10000)
+        self.assertEqual(product.standard_price, 0.00875)
+        self.assertEqual(product.qty_available, 10000)
 
-        layer = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layer.value, 87.5)
+        self.assertEqual(product.total_value, 87.5)
 
         # Second Move
-        self.product1.write({'standard_price': 0.00975})
-
-        self.assertEqual(self.product1.standard_price, 0.00975)
-        self.assertEqual(self.product1.quantity_svl, 10000)
-
-        layers = self.product1.stock_valuation_layer_ids
-        self.assertEqual(layers[0].value, 87.5)
-        self.assertEqual(layers[1].value, 10)
-
-    def test_stock_valuation_layer_revaluation_fifo(self):
-        self.product1.categ_id.property_cost_method = 'fifo'
-        context = {
-            'default_product_id': self.product1.id,
-            'default_company_id': self.env.company.id,
-            'default_added_value': 0.0
-        }
-        # Quantity of product1 is zero, raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context(context)).save()
-
-        self._make_in_move(self.product1, 10, unit_cost=2)
-        self._make_in_move(self.product1, 10, unit_cost=4)
-
-        self.assertEqual(self.product1.standard_price, 3)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
-
-        self.assertEqual(len(old_layers), 2)
-        self.assertEqual(old_layers[0].remaining_value, 40)
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context(context))
-        revaluation_wizard.added_value = 20
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
-
-        self.assertEqual(self.product1.standard_price, 4)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 20)
-
-        # Check the remaing value of current layers
-        self.assertEqual(old_layers[0].remaining_value, 50)
-        self.assertEqual(sum(slv.remaining_value for slv in old_layers), 80)
+        with freeze_time(Datetime.now() + timedelta(seconds=1)):
+            product.standard_price = 0.00975
 
-        # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertTrue(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 20)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 20)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-
-    def test_stock_valuation_layer_revaluation_partial(self):
-        """ Only adjust the valuation on some of the layers for a product """
-        self.product1.categ_id.property_cost_method = 'fifo'
-
-        product2 = self.env['product.product'].create({
-            'name': 'product2',
-            'is_storable': True,
-        })
-
-        self._make_in_move(self.product1, 5, unit_cost=4)
-        self._make_in_move(self.product1, 10, unit_cost=4)
-        self._make_in_move(self.product1, 5, unit_cost=8)
-        self._make_in_move(product2, 10, unit_cost=4)
+        self.assertEqual(product.standard_price, 0.00975)
+        self.assertEqual(product.qty_available, 10000)
 
-        self.assertEqual(self.product1.standard_price, 5)
-        self.assertEqual(self.product1.quantity_svl, 20)
+        self.assertEqual(move1.value, 87.5)
+        product_value = self.env['product.value'].search([('product_id', '=', product.id)], order="create_date desc, id desc", limit=1)
+        self.assertEqual(product_value.value, 0.00975)
 
-        old_layers = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc")
+    def test_stock_valuation_revaluation_fifo(self):
+        product = self.product_fifo
 
-        self.assertEqual(len(old_layers), 3)
-        self.assertEqual(old_layers.mapped("remaining_value"), [40, 40, 20])
-
-        # Adjusting layers for multiple products at once: raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context({
-                'active_ids': self.env['stock.valuation.layer'].search([]).ids,
-                'active_model': 'stock.valuation.layer'
-            })).save()
-
-        revaluation_wizard = Form(self.env['stock.valuation.layer.revaluation'].with_context({
-            'active_ids': old_layers[0:2].ids,
-            'active_model': 'stock.valuation.layer'
-        }))
-        revaluation_wizard.added_value = 30
-        revaluation_wizard.account_id = self.stock_valuation_account
-        revaluation_wizard.save().action_validate_revaluation()
-
-        # Check standard price change
-        self.assertEqual(self.product1.standard_price, 6.5)
-        self.assertEqual(self.product1.quantity_svl, 20)
-
-        # Check the creation of stock.valuation.layer
-        new_layer = self.env['stock.valuation.layer'].search([('product_id', '=', self.product1.id)], order="create_date desc, id desc", limit=1)
-        self.assertEqual(new_layer.value, 30)
-
-        # Check the remaing value of current layers: only the adjusted layers should have changed
-        # the added value should be impacted proportionally to the qty of each layer (+10 and +20)
-        self.assertEqual(old_layers.mapped("remaining_value"), [50, 60, 20])
-
-        # Check account move
-        self.assertTrue(bool(new_layer.account_move_id))
-        self.assertEqual(len(new_layer.account_move_id.line_ids), 2)
-
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("debit")), 30)
-        self.assertEqual(sum(new_layer.account_move_id.line_ids.mapped("credit")), 30)
-
-        credit_lines = [l for l in new_layer.account_move_id.line_ids if l.credit > 0]
-        self.assertEqual(len(credit_lines), 1)
-        self.assertEqual(credit_lines[0].account_id.id, self.stock_valuation_account.id)
-
-        self.assertIn(
-            f"Affected valuation layers: {old_layers[1].reference} (id: {old_layers[1].id}) and {old_layers[0].reference} (id: {old_layers[0].id})",
-            new_layer.account_move_id.line_ids[0].name
-        )
-
-        # Adjusting an adjustment layer: raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context({
-                'active_ids': [new_layer.id],
-                'active_model': 'stock.valuation.layer'
-            })).save()
-
-        # remove all products from the oldest layer
-        self._make_out_move(self.product1, 5)
-        self.assertEqual(old_layers[2].remaining_qty, 0)
-
-        # Adjusting a layer with no remaining quantity: raise
-        with self.assertRaises(UserError):
-            Form(self.env['stock.valuation.layer.revaluation'].with_context({
-                'active_ids': [old_layers[2].id],
-                'active_model': 'stock.valuation.layer'
-            })).save()
+        move1 = self._make_in_move(product, 10, unit_cost=2)
+        move2 = self._make_in_move(product, 10, unit_cost=4)
 
-    def test_multi_company_fifo_svl_negative_revaluation(self):
-        """
-        Check that the journal entries and stock valuation layers are created for the company related
-        to the stock move even if the picking is validated using a different one.
-        """
-        company1 = self.env.company
-        company2 = self.env['res.company'].create({
-            'name': 'Lovely Company',
-        })
-        self.env.companies = company1 | company2
+        self.assertEqual(product.standard_price, 3)
+        self.assertEqual(product.qty_available, 20)
 
-        product = self.product1
-        product.categ_id.write({
-            'property_cost_method': 'fifo',
-            'property_valuation': 'real_time',
-        })
-        # Modify valuation to manual_periodic for company2
-        product.categ_id.with_company(company2).property_valuation = 'periodic'
+        self.assertEqual(product.total_value, 60)
+        self.assertEqual(move1.remaining_value, 20)
+        self.assertEqual(move2.remaining_value, 40)
 
-        # Create moves to revaluate for company1
-        self._make_in_move(product, 10, unit_cost=10, create_picking=True)
-        self._make_out_move(product, 15, create_picking=True)
+        move2.value_manual = 60
+        self.assertEqual(product.standard_price, 4)
+        self.assertEqual(move1.remaining_value, 20)
+        self.assertEqual(move2.remaining_value, 60)
 
-        receipt = self.env['stock.picking'].create({
-            'picking_type_id': self.picking_type_in.id,
-            'location_id': self.supplier_location.id,
-            'location_dest_id': self.stock_location.id,
-            'move_ids': [Command.create({
-                'product_id': product.id,
-                'location_id': self.supplier_location.id,
-                'location_dest_id': self.stock_location.id,
-                'product_uom': self.uom_unit.id,
-                'product_uom_qty': 10,
-                'price_unit': 7,
-            })]
-        }).with_company(company2)
-        receipt.action_confirm()
-        receipt.button_validate()
+        self._make_out_move(product, 10)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.remaining_value, 60)
+        self.assertEqual(product.standard_price, 6)
 
-        svls = self.env['stock.valuation.layer'].search([('product_id', '=', product.id)])
-        self.assertEqual(len(svls), 4, "Expected 4 valuation layers")
-        self.assertTrue(all(svl.account_move_id for svl in svls), "All SVLs should be linked to a journal entry")
+        self._make_out_move(product, 10)
+        self.assertEqual(move1.remaining_value, 0)
+        self.assertEqual(move2.remaining_value, 0)
+        self.assertEqual(product.standard_price, 6)
 
     def test_stock_move_value_with_different_uom(self):
         """ Ensure that the stock move value is correctly computed
         when the move's UoM differs from the product's UoM.
         """
-        picking = self.env['stock.picking'].create({
-            'picking_type_id': self.picking_type_out.id,
-            'location_id': self.stock_location.id,
-            'location_dest_id': self.supplier_location.id,
-            'move_ids': [Command.create({
-                'product_id': self.product1.id,
-                'product_uom': self.env.ref('uom.product_uom_dozen').id,
-                'location_id': self.stock_location.id,
-                'location_dest_id': self.supplier_location.id,
-            })]
-        })
-        self.product1.standard_price = 10
-        self.assertEqual(self.product1.uom_id, self.env.ref('uom.product_uom_unit'))
-        picking.action_confirm()
-        move = picking.move_ids
-        move.quantity = 1
-        move.picked = True
-        picking.button_validate()
-        self.assertEqual(picking.state, 'done')
+        move = self._make_in_move(self.product_standard, 1, uom_id=self.env.ref('uom.product_uom_dozen').id)
         self.assertEqual(move.value, 120, "The move value should match the price in the correct UoM (12 * 10$).")
 
     def test_product_valuation_scrap_different_uom(self):
-        self.product1.standard_price = 8
+        product = self.product_avco
+        product.standard_price = 8
         uom_pack_6 = self.env.ref('uom.product_uom_pack_6')
-        self.product1.uom_ids = uom_pack_6
-        self.product1.categ_id.property_cost_method = 'average'
-        self._make_in_move(self.product1, 10)
-        self.assertEqual(self.product1.total_value, 80)
-        self._make_out_move(self.product1, 1, uom_id=uom_pack_6.id)
-        self.assertEqual(self.product1.total_value, 32)
+        product.uom_ids = uom_pack_6
+        self._make_in_move(product, 10)
+        self.assertEqual(product.total_value, 80)
+        self._make_out_move(product, 1, uom_id=uom_pack_6.id)
+        self.assertEqual(product.total_value, 32)
 
     def test_journal_entry_created_with_given_accounting_date(self):
-        """
-        Test that the journal entry is created with the specified
+        """ Test that the journal entry is created with the specified
         accounting date from the inventory adjustment.
         """
+        product = self.product_standard_auto
+        self._use_inventory_location_accounting()
         past_accounting_date = Date.today() - timedelta(days=7)
         inventory_quant = self.env['stock.quant'].create({
             'location_id': self.stock_location.id,
-            'product_id': self.product1.id,
+            'product_id': product.id,
             'inventory_quantity': 10,
             'accounting_date': past_accounting_date,
         })
diff --git a/addons/stock_account/tests/test_stockvaluationlayer.py b/addons/stock_account/tests/test_stockvaluationlayer.py
index 1952c0b7852f4..2fab098c6715b 100644
--- a/addons/stock_account/tests/test_stockvaluationlayer.py
+++ b/addons/stock_account/tests/test_stockvaluationlayer.py
@@ -2,80 +2,48 @@
 
 from odoo import Command
 from odoo.addons.account.tests.common import AccountTestInvoicingCommon
-from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
 from odoo.addons.stock_account.tests.common import TestStockValuationCommon
 from odoo.exceptions import ValidationError
 from odoo.tests import Form, tagged
 
 
-class TestStockValuationBaseCommon(TestStockValuationCommon):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.uom_unit = cls.env.ref('uom.product_uom_unit')
-        cls.product1 = cls.env['product.product'].create({
-            'name': 'product1',
-            'is_storable': True,
-            'categ_id': cls.env.ref('product.product_category_goods').id,
-        })
-        cls.picking_type_in = cls.warehouse.in_type_id
-        cls.picking_type_out = cls.warehouse.out_type_id
-        cls.env.ref('base.EUR').active = True
-        cls.stock_journal = cls.env['account.journal'].create({
-            'name': 'Stock Journal',
-            'code': 'StockJurnal',
-            'type': 'general',
-            'company_id': cls.company.id,
-        })
-        cls.env.company.account_stock_journal_id = cls.stock_journal
-
-
 @tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockValuationStandard(TestStockValuationBaseCommon):
+class TestStockValuationStandard(TestStockValuationCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        cls.product1.product_tmpl_id.standard_price = 10
+        cls.product = cls.product_standard
 
     def test_normal_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 15)
+        self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 15)
 
-        self.assertEqual(self.product1.total_value, 50)
-        self.assertEqual(self.product1.qty_available, 5)
+        self.assertEqual(self.product.total_value, 50)
+        self.assertEqual(self.product.qty_available, 5)
 
     def test_change_in_past_increase_in_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 15)
         move1.move_line_ids.quantity = 15
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_change_in_past_decrease_in_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 15)
         move1.move_line_ids.quantity = 5
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_change_in_past_add_ml_in_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 15)
         self.env['stock.move.line'].create({
             'move_id': move1.id,
             'product_id': move1.product_id.id,
@@ -85,48 +53,40 @@ def test_change_in_past_add_ml_in_1(self):
             'location_dest_id': move1.location_dest_id.id,
         })
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_change_in_past_increase_out_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10)
+        move2 = self._make_out_move(self.product, 1)
         move2.move_line_ids.quantity = 5
 
-        self.assertEqual(self.product1.total_value, 50)
-        self.assertEqual(self.product1.qty_available, 5)
+        self.assertEqual(self.product.total_value, 50)
+        self.assertEqual(self.product.qty_available, 5)
 
     def test_change_in_past_decrease_out_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_out_move(self.product1, 5)
+        self._make_in_move(self.product, 10)
+        move2 = self._make_out_move(self.product, 5)
         move2.move_line_ids.quantity = 1
 
-        self.assertEqual(self.product1.total_value, 90)
-        self.assertEqual(self.product1.qty_available, 9)
+        self.assertEqual(self.product.total_value, 90)
+        self.assertEqual(self.product.qty_available, 9)
 
     def test_change_standard_price_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 15)
+        self._make_out_move(self.product, 15)
+        self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
 
         # change cost from 10 to 15
-        self.product1.standard_price = 15.0
+        self.product.standard_price = 15.0
 
-        self.assertEqual(self.product1.total_value, 75)
-        self.assertEqual(self.product1.qty_available, 5)
-        self.assertEqual(self.product1.avg_cost, 15)
+        self.assertEqual(self.product.total_value, 75)
+        self.assertEqual(self.product.qty_available, 5)
+        self.assertEqual(self.product.avg_cost, 15)
 
     def test_negative_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 15)
         self.env['stock.move.line'].create({
             'move_id': move1.id,
             'product_id': move1.product_id.id,
@@ -136,25 +96,21 @@ def test_negative_1(self):
             'location_dest_id': move1.location_dest_id.id,
         })
 
-        self.assertEqual(self.product1.total_value, 50)
-        self.assertEqual(self.product1.qty_available, 5)
+        self.assertEqual(self.product.total_value, 50)
+        self.assertEqual(self.product.qty_available, 5)
 
     def test_dropship_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self._make_dropship_move(self.product, 10)
 
-        move1 = self._make_dropship_move(self.product1, 10)
-
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_change_in_past_increase_dropship_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-
-        move1 = self._make_dropship_move(self.product1, 10)
+        move1 = self._make_dropship_move(self.product, 10)
         move1.move_line_ids.quantity = 15
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_empty_stock_move_valuation(self):
         product1 = self.env['product.product'].create({
@@ -178,7 +134,7 @@ def test_empty_stock_move_valuation(self):
                 'product_id': product.id,
                 'location_id': self.supplier_location.id,
                 'location_dest_id': self.stock_location.id,
-                'product_uom': self.uom_unit.id,
+                'product_uom': self.uom.id,
                 'product_uom_qty': 2,
                 'price_unit': 10,
                 'picking_type_id': self.picking_type_in.id,
@@ -211,7 +167,7 @@ def test_currency_precision_and_standard_value(self):
         try:
             self.env.user.company_id = new_company
             warehouse = self.env['stock.warehouse'].search([('company_id', '=', new_company.id)])
-            product = self.product1.with_company(new_company)
+            product = self.product.with_company(new_company)
             product.standard_price = 3
 
             self._make_in_move(product, 0.5, location_dest_id=warehouse.lot_stock_id.id, picking_type_id=warehouse.in_type_id.id)
@@ -228,435 +184,417 @@ def test_change_qty_and_locations_of_done_sml(self):
             'location_id': self.stock_location.id,
         })
 
-        move_in = self._make_in_move(self.product1, 25)
-        self.assertEqual(self.product1.total_value, 250)
-        self.assertEqual(self.product1.qty_available, 25)
+        move_in = self._make_in_move(self.product, 25)
+        self.assertEqual(self.product.total_value, 250)
+        self.assertEqual(self.product.qty_available, 25)
 
         move_in.move_line_ids.write({
             'location_dest_id': sub_stock_loc.id,
             'quantity': 30,
         })
-        self.assertEqual(self.product1.total_value, 300)
-        self.assertEqual(self.product1.qty_available, 30)
+        self.assertEqual(self.product.total_value, 300)
+        self.assertEqual(self.product.qty_available, 30)
 
-        sub_loc_quant = self.product1.stock_quant_ids.filtered(lambda q: q.location_id == sub_stock_loc)
+        sub_loc_quant = self.product.stock_quant_ids.filtered(lambda q: q.location_id == sub_stock_loc)
         self.assertEqual(sub_loc_quant.quantity, 30)
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockValuationAVCO(TestStockValuationBaseCommon):
+class TestStockValuationAVCO(TestStockValuationCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
+        cls.product = cls.product_avco
 
     def test_normal_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self.assertEqual(self.product.standard_price, 10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self.assertEqual(self.product.standard_price, 15)
+        self._make_out_move(self.product, 15)
+        self.assertEqual(self.product.standard_price, 15)
 
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        self.assertEqual(self.product1.standard_price, 10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        self.assertEqual(self.product1.standard_price, 15)
-        move3 = self._make_out_move(self.product1, 15)
-        self.assertEqual(self.product1.standard_price, 15)
-
-        self.assertEqual(self.product1.total_value, 75)
-        self.assertEqual(self.product1.qty_available, 5)
+        self.assertEqual(self.product.total_value, 75)
+        self.assertEqual(self.product.qty_available, 5)
 
     def test_change_in_past_increase_in_1(self):
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 15)
         self._set_quantity(move1, 15)
 
-        self.assertEqual(self.product1.total_value, 140)
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.standard_price, 14)
+        self.assertEqual(self.product.total_value, 140)
+        self.assertEqual(self.product.qty_available, 10)
+        self.assertEqual(self.product.standard_price, 14)
 
     def test_change_in_past_decrease_in_1(self):
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 15)
         self._set_quantity(move1, 5)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_change_in_past_add_ml_in_1(self):
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 15)
         self._add_move_line(move1, quantity=5)
 
-        self.assertEqual(self.product1.total_value, 140)
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.standard_price, 14)
+        self.assertEqual(self.product.total_value, 140)
+        self.assertEqual(self.product.qty_available, 10)
+        self.assertEqual(self.product.standard_price, 14)
 
     def test_change_in_past_add_move_in_1(self):
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10, create_picking=True)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10, create_picking=True)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 15)
         self._add_move_line(move1, quantity=5, state='done', picking_id=move1.picking_id.id)
 
-        self.assertEqual(self.product1.total_value, 140)
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.standard_price, 14)
+        self.assertEqual(self.product.total_value, 140)
+        self.assertEqual(self.product.qty_available, 10)
+        self.assertEqual(self.product.standard_price, 14)
 
     def test_change_in_past_increase_out_1(self):
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        move3 = self._make_out_move(self.product, 15)
         self._set_quantity(move3, 20)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_change_in_past_decrease_out_1(self):
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        move3 = self._make_out_move(self.product, 15)
         self._set_quantity(move3, 10)
 
-        self.assertEqual(self.product1.total_value, 150)
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 150)
+        self.assertEqual(self.product.qty_available, 10)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_negative_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 30)
-        move4 = self._make_in_move(self.product1, 10, unit_cost=30)
-        move5 = self._make_in_move(self.product1, 10, unit_cost=40)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 30)
+        self._make_in_move(self.product, 10, unit_cost=30)
+        self._make_in_move(self.product, 10, unit_cost=40)
 
-        self.assertEqual(self.product1.total_value, 400)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 400)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_negative_2(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self.product1.standard_price = 10
-        move1 = self._make_out_move(self.product1, 1, force_assign=True)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=15)
+        self.product.standard_price = 10
+        self._make_out_move(self.product, 1, force_assign=True)
+        self._make_in_move(self.product, 1, unit_cost=15)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_return_receipt_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10, create_picking=True)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
-        move4 = self._make_return(move1, 1)
+        move1 = self._make_in_move(self.product, 1, unit_cost=10, create_picking=True)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        self._make_out_move(self.product, 1)
+        self._make_return(move1, 1)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_return_delivery_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1, create_picking=True)
-        move4 = self._make_return(move3, 1)
+        self._make_in_move(self.product, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        move3 = self._make_out_move(self.product, 1, create_picking=True)
+        self._make_return(move3, 1)
 
-        self.assertEqual(self.product1.total_value, 30)
-        self.assertEqual(self.product1.qty_available, 2)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 30)
+        self.assertEqual(self.product.qty_available, 2)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_rereturn_receipt_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10, create_picking=True)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
+        move1 = self._make_in_move(self.product, 1, unit_cost=10, create_picking=True)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        self._make_out_move(self.product, 1)
         move4 = self._make_return(move1, 1)  # -15, current avco
-        move5 = self._make_return(move4, 1)  # +10, original move's price unit
+        self._make_return(move4, 1)  # +10, original move's price unit
 
-        self.assertEqual(self.product1.total_value, 15)
-        self.assertEqual(self.product1.qty_available, 1)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 15)
+        self.assertEqual(self.product.qty_available, 1)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_rereturn_delivery_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1, create_picking=True)
+        self._make_in_move(self.product, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        move3 = self._make_out_move(self.product, 1, create_picking=True)
         move4 = self._make_return(move3, 1)
-        move5 = self._make_return(move4, 1)
+        self._make_return(move4, 1)
 
-        self.assertEqual(self.product1.total_value, 15)
-        self.assertEqual(self.product1.qty_available, 1)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 15)
+        self.assertEqual(self.product.qty_available, 1)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_dropship_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_dropship_move(self.product1, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        self._make_dropship_move(self.product, 1, unit_cost=10)
 
-        self.assertEqual(self.product1.total_value, 30)
-        self.assertEqual(self.product1.qty_available, 2)
-        self.assertEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 30)
+        self.assertEqual(self.product.qty_available, 2)
+        self.assertEqual(self.product.standard_price, 15)
 
     def test_rounding_1(self):
-        self._make_in_move(self.product1, 1, unit_cost=1.00)
-        self._make_in_move(self.product1, 1, unit_cost=1.00)
-        self._make_in_move(self.product1, 1, unit_cost=1.01)
+        self._make_in_move(self.product, 1, unit_cost=1.00)
+        self._make_in_move(self.product, 1, unit_cost=1.00)
+        self._make_in_move(self.product, 1, unit_cost=1.01)
 
-        self.assertAlmostEqual(self.product1.total_value, 3.01)
+        self.assertAlmostEqual(self.product.total_value, 3.01)
 
-        move_out = self._make_out_move(self.product1, 3, create_picking=True)
+        self._make_out_move(self.product, 3, create_picking=True)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
-        self.assertEqual(self.product1.standard_price, 1.00)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
+        self.assertEqual(self.product.standard_price, 1.00)
 
     def test_rounding_2(self):
-        self._make_in_move(self.product1, 1, unit_cost=1.02)
-        self._make_in_move(self.product1, 1, unit_cost=1.00)
-        self._make_in_move(self.product1, 1, unit_cost=1.00)
+        self._make_in_move(self.product, 1, unit_cost=1.02)
+        self._make_in_move(self.product, 1, unit_cost=1.00)
+        self._make_in_move(self.product, 1, unit_cost=1.00)
 
-        self.assertAlmostEqual(self.product1.total_value, 3.02)
+        self.assertAlmostEqual(self.product.total_value, 3.02)
 
-        move_out = self._make_out_move(self.product1, 3, create_picking=True)
+        self._make_out_move(self.product, 3, create_picking=True)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
-        self.assertEqual(self.product1.standard_price, 1.01)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
+        self.assertEqual(self.product.standard_price, 1.01)
 
     def test_rounding_3(self):
-        self._make_in_move(self.product1, 1000, unit_cost=0.17)
-        self._make_in_move(self.product1, 800, unit_cost=0.23)
+        self._make_in_move(self.product, 1000, unit_cost=0.17)
+        self._make_in_move(self.product, 800, unit_cost=0.23)
 
-        self.assertEqual(self.product1.standard_price, 0.20)
+        self.assertEqual(self.product.standard_price, 0.20)
 
-        self._make_out_move(self.product1, 1000, create_picking=True)
-        self._make_out_move(self.product1, 800, create_picking=True)
+        self._make_out_move(self.product, 1000, create_picking=True)
+        self._make_out_move(self.product, 800, create_picking=True)
 
-        self.assertEqual(self.product1.total_value, 0)
+        self.assertEqual(self.product.total_value, 0)
 
     def test_rounding_4(self):
         """
         The first 2 In moves result in a rounded standard_price at 3.4943, which is rounded at 3.49.
         This test ensures that no rounding error is generated with small out quantities.
         """
-        self.product1.categ_id.property_cost_method = 'average'
-        self._make_in_move(self.product1, 2, unit_cost=4.63)
-        self._make_in_move(self.product1, 5, unit_cost=3.04)
-        self.assertEqual(self.product1.standard_price, 3.49)
+        self._make_in_move(self.product, 2, unit_cost=4.63)
+        self._make_in_move(self.product, 5, unit_cost=3.04)
+        self.assertEqual(self.product.standard_price, 3.49)
 
         for _ in range(70):
-            self._make_out_move(self.product1, 0.1)
+            self._make_out_move(self.product, 0.1)
 
-        self.assertEqual(self.product1.qty_available, 0)
-        self.assertEqual(self.product1.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
 
     def test_rounding_5(self):
-        self.product1.categ_id.property_cost_method = 'average'
-        self._make_in_move(self.product1, 10, unit_cost=16.83)
-        self._make_in_move(self.product1, 10, unit_cost=20)
-        self.assertEqual(self.product1.standard_price, 18.42)
+        self._make_in_move(self.product, 10, unit_cost=16.83)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self.assertEqual(self.product.standard_price, 18.42)
 
-        self._make_out_move(self.product1, 10)
-        out_move = self._make_out_move(self.product1, 9)
+        self._make_out_move(self.product, 10)
+        out_move = self._make_out_move(self.product, 9)
         self.assertEqual(out_move.value, 165.78)
 
-        self.assertEqual(self.product1.total_value, 18.42)
-        self.assertEqual(self.product1.qty_available, 1)
+        self.assertEqual(self.product.total_value, 18.42)
+        self.assertEqual(self.product.qty_available, 1)
 
-        self._make_out_move(self.product1, 1)
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self._make_out_move(self.product, 1)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_return_delivery_2(self):
-        self.product1.standard_price = 1
-        move1 = self._make_out_move(self.product1, 10, create_picking=True, force_assign=True)
-        self._make_in_move(self.product1, 10, unit_cost=2)
+        self.product.standard_price = 1
+        move1 = self._make_out_move(self.product, 10, create_picking=True, force_assign=True)
+        self._make_in_move(self.product, 10, unit_cost=2)
         self._make_return(move1, 10)
 
-        self.assertEqual(self.product1.total_value, 10)
-        self.assertEqual(self.product1.qty_available, 10)
-        self.assertEqual(self.product1.standard_price, 1)
+        self.assertEqual(self.product.total_value, 10)
+        self.assertEqual(self.product.qty_available, 10)
+        self.assertEqual(self.product.standard_price, 1)
 
     def test_return_delivery_rounding(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self._make_in_move(self.product1, 1, unit_cost=13.13)
-        self._make_in_move(self.product1, 1, unit_cost=12.20)
-        move3 = self._make_out_move(self.product1, 2, create_picking=True)
+        self._make_in_move(self.product, 1, unit_cost=13.13)
+        self._make_in_move(self.product, 1, unit_cost=12.20)
+        move3 = self._make_out_move(self.product, 2, create_picking=True)
         move4 = self._make_return(move3, 2)
 
         self.assertAlmostEqual(abs(move3.value), abs(move4.value))
-        self.assertAlmostEqual(self.product1.total_value, 25.34)
-        self.assertEqual(self.product1.qty_available, 2)
+        self.assertAlmostEqual(self.product.total_value, 25.34)
+        self.assertEqual(self.product.qty_available, 2)
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockValuationFIFO(TestStockValuationBaseCommon):
+class TestStockValuationFIFO(TestStockValuationCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        cls.product = cls.product_fifo
 
     def test_normal_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 15)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 15)
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 5)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 5)
 
     def test_negative_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 30)
-        self.assertEqual(self.product1.qty_available, -10)
-        move4 = self._make_in_move(self.product1, 10, unit_cost=30)
-        self.assertEqual(self.product1.qty_available, 0)
-        move5 = self._make_in_move(self.product1, 10, unit_cost=40)
-
-        self.assertEqual(self.product1.total_value, 400)
-        self.assertEqual(self.product1.qty_available, 10)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 30)
+        self.assertEqual(self.product.qty_available, -10)
+        self._make_in_move(self.product, 10, unit_cost=30)
+        self.assertEqual(self.product.qty_available, 0)
+        self._make_in_move(self.product, 10, unit_cost=40)
+
+        self.assertEqual(self.product.total_value, 400)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_change_in_past_decrease_in_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 20, unit_cost=10)
-        move2 = self._make_out_move(self.product1, 10)
+        move1 = self._make_in_move(self.product, 20, unit_cost=10)
+        self._make_out_move(self.product, 10)
         self._set_quantity(move1, 10)
 
-        self.assertEqual(self.product1.total_value, 0)
-        self.assertEqual(self.product1.qty_available, 0)
+        self.assertEqual(self.product.total_value, 0)
+        self.assertEqual(self.product.qty_available, 0)
 
     def test_change_in_past_decrease_in_2(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 20, unit_cost=10)
-        move2 = self._make_out_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 10)
+        move1 = self._make_in_move(self.product, 20, unit_cost=10)
+        self._make_out_move(self.product, 10)
+        self._make_out_move(self.product, 10)
         self._set_quantity(move1, 10)
-        move4 = self._make_in_move(self.product1, 20, unit_cost=15)
+        self._make_in_move(self.product, 20, unit_cost=15)
 
-        self.assertEqual(self.product1.total_value, 150)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 150)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_change_in_past_increase_in_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=15)
-        move3 = self._make_out_move(self.product1, 20)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=15)
+        self._make_out_move(self.product, 20)
         self._set_quantity(move1, 20)
 
-        self.assertEqual(self.product1.total_value, 150)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 150)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_change_in_past_increase_in_2(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=12)
-        move3 = self._make_out_move(self.product1, 15)
-        move4 = self._make_out_move(self.product1, 20)
-        move5 = self._make_in_move(self.product1, 100, unit_cost=15)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=12)
+        self._make_out_move(self.product, 15)
+        self._make_out_move(self.product, 20)
+        self._make_in_move(self.product, 100, unit_cost=15)
         self._set_quantity(move1, 20)
 
-        self.assertEqual(self.product1.total_value, 1425)
-        self.assertEqual(self.product1.qty_available, 95)
+        self.assertEqual(self.product.total_value, 1425)
+        self.assertEqual(self.product.qty_available, 95)
 
     def test_change_in_past_increase_out_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 20, unit_cost=10)
-        move2 = self._make_out_move(self.product1, 10)
-        move3 = self._make_in_move(self.product1, 20, unit_cost=15)
+        self._make_in_move(self.product, 20, unit_cost=10)
+        move2 = self._make_out_move(self.product, 10)
+        self._make_in_move(self.product, 20, unit_cost=15)
         self._set_quantity(move2, 25)
 
-        self.assertEqual(self.product1.total_value, 225)
-        self.assertEqual(self.product1.qty_available, 15)
+        self.assertEqual(self.product.total_value, 225)
+        self.assertEqual(self.product.qty_available, 15)
 
     def test_change_in_past_decrease_out_1(self):
         """ Decrease the quantity of an outgoing stock.move.line will act like
         an inventory adjustement and not a return. It will take the move value
         in order to set the value and not the standard price of the product.
         """
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 20, unit_cost=10)
-        move2 = self._make_out_move(self.product1, 15)
-        move3 = self._make_in_move(self.product1, 20, unit_cost=15)
+        self._make_in_move(self.product, 20, unit_cost=10)
+        move2 = self._make_out_move(self.product, 15)
+        self._make_in_move(self.product, 20, unit_cost=15)
         self._set_quantity(move2, 5)
 
-        self.assertEqual(self.product1.total_value, 450)
-        self.assertEqual(self.product1.qty_available, 35)
+        self.assertEqual(self.product.total_value, 450)
+        self.assertEqual(self.product.qty_available, 35)
 
     def test_change_in_past_add_ml_out_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 20, unit_cost=10)
-        move2 = self._make_out_move(self.product1, 10)
-        move3 = self._make_in_move(self.product1, 20, unit_cost=15)
+        self._make_in_move(self.product, 20, unit_cost=10)
+        move2 = self._make_out_move(self.product, 10)
+        self._make_in_move(self.product, 20, unit_cost=15)
         self._add_move_line(move2, quantity=5)
 
-        self.assertEqual(self.product1.total_value, 350)
-        self.assertEqual(self.product1.qty_available, 25)
+        self.assertEqual(self.product.total_value, 350)
+        self.assertEqual(self.product.qty_available, 25)
 
     def test_return_delivery_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_out_move(self.product1, 10, create_picking=True)
-        move3 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move4 = self._make_return(move2, 10)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        move2 = self._make_out_move(self.product, 10, create_picking=True)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_return(move2, 10)
 
-        self.assertEqual(self.product1.total_value, 300)
-        self.assertEqual(self.product1.qty_available, 20)
+        self.assertEqual(self.product.total_value, 300)
+        self.assertEqual(self.product.qty_available, 20)
 
     def test_return_receipt_1(self):
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10, create_picking=True)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_return(move1, 2)
+        move1 = self._make_in_move(self.product, 10, unit_cost=10, create_picking=True)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_return(move1, 2)
 
-        self.assertEqual(self.product1.total_value, 280)
-        self.assertEqual(self.product1.qty_available, 18)
+        self.assertEqual(self.product.total_value, 280)
+        self.assertEqual(self.product.qty_available, 18)
 
     def test_rereturn_receipt_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10, create_picking=True)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
+        move1 = self._make_in_move(self.product, 1, unit_cost=10, create_picking=True)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        self._make_out_move(self.product, 1)
         move4 = self._make_return(move1, 1)
-        move5 = self._make_return(move4, 1)
+        self._make_return(move4, 1)
 
-        self.assertEqual(self.product1.total_value, 20)
-        self.assertEqual(self.product1.qty_available, 1)
+        self.assertEqual(self.product.total_value, 20)
+        self.assertEqual(self.product.qty_available, 1)
 
     def test_rereturn_delivery_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1, create_picking=True)
+        self._make_in_move(self.product, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        move3 = self._make_out_move(self.product, 1, create_picking=True)
         move4 = self._make_return(move3, 1)
-        move5 = self._make_return(move4, 1)
+        self._make_return(move4, 1)
 
-        self.assertEqual(self.product1.total_value, 10)
-        self.assertEqual(self.product1.qty_available, 1)
+        self.assertEqual(self.product.total_value, 10)
+        self.assertEqual(self.product.qty_available, 1)
 
     def test_dropship_1(self):
-        move1 = self._make_in_move(self.product1, 1, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 1, unit_cost=20)
-        move3 = self._make_dropship_move(self.product1, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=10)
+        self._make_in_move(self.product, 1, unit_cost=20)
+        self._make_dropship_move(self.product, 1, unit_cost=10)
 
-        self.assertEqual(self.product1.total_value, 30)
-        self.assertEqual(self.product1.qty_available, 2)
-        self.assertAlmostEqual(self.product1.standard_price, 15)
+        self.assertEqual(self.product.total_value, 30)
+        self.assertEqual(self.product.qty_available, 2)
+        self.assertAlmostEqual(self.product.standard_price, 15)
 
     def test_return_delivery_2(self):
-        self._make_in_move(self.product1, 1, unit_cost=10)
-        self.product1.standard_price = 0
-        self._make_in_move(self.product1, 1, unit_cost=0)
+        self._make_in_move(self.product, 1, unit_cost=10)
+        self.product.standard_price = 0
+        self._make_in_move(self.product, 1, unit_cost=0)
 
-        self._make_out_move(self.product1, 1)
-        out_move02 = self._make_out_move(self.product1, 1, create_picking=True)
+        self._make_out_move(self.product, 1)
+        out_move02 = self._make_out_move(self.product, 1, create_picking=True)
 
         returned = self._make_return(out_move02, 1)
         self.assertEqual(returned.value, 0)
 
     def test_return_delivery_3(self):
-        self.product1.standard_price = 1
-        move1 = self._make_out_move(self.product1, 10, create_picking=True, force_assign=True)
-        self._make_in_move(self.product1, 10, unit_cost=2)
+        self.product.standard_price = 1
+        move1 = self._make_out_move(self.product, 10, create_picking=True, force_assign=True)
+        self._make_in_move(self.product, 10, unit_cost=2)
         self._make_return(move1, 10)
 
-        self.assertEqual(self.product1.total_value, 10)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 10)
+        self.assertEqual(self.product.qty_available, 10)
 
     def test_currency_precision_and_fifo_value(self):
         currency = self.env['res.currency'].create({
@@ -672,7 +610,7 @@ def test_currency_precision_and_fifo_value(self):
         old_company = self.env.user.company_id
         try:
             self.env.user.company_id = new_company
-            product = self.product1.with_company(new_company)
+            product = self.product.with_company(new_company)
             product.product_tmpl_id.categ_id.property_cost_method = 'fifo'
             warehouse = self.env['stock.warehouse'].search([('company_id', '=', new_company.id)])
 
@@ -685,346 +623,214 @@ def test_currency_precision_and_fifo_value(self):
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
-class TestStockValuationChangeCostMethod(TestStockValuationBaseCommon):
+class TestStockValuationChangeCostMethod(TestStockValuationCommon):
     def test_standard_to_fifo_1(self):
         """ The accounting impact of this cost method change is neutral.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self.product1.product_tmpl_id.standard_price = 10
+        self.product = self.product_standard
+        self.product.product_tmpl_id.standard_price = 10
 
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 1)
 
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
-        self.assertEqual(self.product1.total_value, 190)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.product.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        self.assertEqual(self.product.total_value, 190)
+        self.assertEqual(self.product.qty_available, 19)
 
     def test_standard_to_fifo_2(self):
         """ We want the same result as `test_standard_to_fifo_1` but by changing the category of
-        `self.product1` to another one, not changing the current one.
+        `self.product` to another one, not changing the current one.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self.product1.product_tmpl_id.standard_price = 10
+        self.product = self.product_standard
+        self.product.product_tmpl_id.standard_price = 10
 
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 1)
 
         cat2 = self.env['product.category'].create({'name': 'fifo', 'property_cost_method': 'fifo'})
-        self.product1.product_tmpl_id.categ_id = cat2
-        self.assertEqual(self.product1.total_value, 190)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.product.product_tmpl_id.categ_id = cat2
+        self.assertEqual(self.product.total_value, 190)
+        self.assertEqual(self.product.qty_available, 19)
 
     def test_avco_to_fifo(self):
         """ The accounting impact of this cost method change is neutral.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self.product = self.product_avco
 
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 1)
 
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
-        self.assertEqual(self.product1.total_value, 290)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.product.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        self.assertEqual(self.product.total_value, 290)
+        self.assertEqual(self.product.qty_available, 19)
 
     def test_fifo_to_standard(self):
         """ The accounting impact of this cost method change is not neutral as we will use the last
         fifo price as the new standard price.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self.product = self.product_fifo
 
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 1)
 
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
+        self.product.product_tmpl_id.categ_id.property_cost_method = 'standard'
         # last std price = 15.26 (290/19). Due to rounding, 15.26 * 19 = 289.94
-        self.assertEqual(self.product1.total_value, 289.94)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.assertEqual(self.product.total_value, 289.94)
+        self.assertEqual(self.product.qty_available, 19)
 
     def test_fifo_to_avco(self):
         """ The accounting impact of this cost method change is not neutral as we will use the last
         fifo price as the new AVCO.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self.product = self.product_fifo
 
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 1)
 
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
-        self.assertEqual(self.product1.total_value, 285)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.product.product_tmpl_id.categ_id.property_cost_method = 'average'
+        self.assertEqual(self.product.total_value, 285)
+        self.assertEqual(self.product.qty_available, 19)
 
     def test_avco_to_standard(self):
         """ The accounting impact of this cost method change is neutral.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self.product = self.product_avco
 
-        move1 = self._make_in_move(self.product1, 10, unit_cost=10)
-        move2 = self._make_in_move(self.product1, 10, unit_cost=20)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        self._make_in_move(self.product, 10, unit_cost=20)
+        self._make_out_move(self.product, 1)
 
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.assertEqual(self.product1.total_value, 285)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.product.product_tmpl_id.categ_id.property_cost_method = 'standard'
+        self.assertEqual(self.product.total_value, 285)
+        self.assertEqual(self.product.qty_available, 19)
 
     def test_standard_to_avco(self):
         """ The accounting impact of this cost method change is neutral.
         """
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self.product1.product_tmpl_id.standard_price = 10
+        self.product = self.product_standard
+        self.product.product_tmpl_id.standard_price = 10
 
-        move1 = self._make_in_move(self.product1, 10)
-        move2 = self._make_in_move(self.product1, 10)
-        move3 = self._make_out_move(self.product1, 1)
+        self._make_in_move(self.product, 10)
+        self._make_in_move(self.product, 10)
+        self._make_out_move(self.product, 1)
 
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'average'
-        self.assertEqual(self.product1.total_value, 190)
-        self.assertEqual(self.product1.qty_available, 19)
+        self.product.product_tmpl_id.categ_id.property_cost_method = 'average'
+        self.assertEqual(self.product.total_value, 190)
+        self.assertEqual(self.product.qty_available, 19)
 
 
 @tagged('post_install', '-at_install', 'change_valuation')
-class TestStockValuationChangeValuation(TestStockValuationBaseCommon):
+class TestStockValuationChangeValuation(TestStockValuationCommon):
     @classmethod
     def setUpClass(cls):
         super(TestStockValuationChangeValuation, cls).setUpClass()
-        (cls.stock_valuation_account,
-         cls.expense_account, cls.income_account, cls.stock_journal) = _create_accounting_data(cls.env)
-        cls.product1.property_account_expense_id = cls.expense_account.id
-        cls.stock_valuation_account.account_stock_variation_id = cls.stock_valuation_account
-        cls.product1.categ_id.write({
-            'property_valuation': 'real_time',
-            'property_stock_valuation_account_id': cls.stock_valuation_account.id,
-            'property_stock_journal': cls.stock_journal.id,
-        })
-        cls.env.company.account_stock_valuation_id = cls.stock_valuation_account
+        cls.product = cls.product_standard
 
     def test_standard_manual_to_auto_1(self):
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self.product1.product_tmpl_id.standard_price = 10
-        move1 = self._make_in_move(self.product1, 10)
+        self.product.product_tmpl_id.standard_price = 10
+        self._make_in_move(self.product, 10)
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
-        self.product1.product_tmpl_id.categ_id.write({
+        self.product.product_tmpl_id.categ_id.write({
             'property_valuation': 'real_time',
-            'property_stock_valuation_account_id': self.stock_valuation_account.id,
+            'property_stock_valuation_account_id': self.account_stock_valuation.id,
         })
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
         account_move_line = self.env['account.move'].browse(self.env.company.action_close_stock_valuation()['res_id']).line_ids
         self.assertEqual(len(account_move_line), 2)
 
     def test_standard_manual_to_auto_2(self):
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
-        self.product1.product_tmpl_id.standard_price = 10
-        move1 = self._make_in_move(self.product1, 10)
+        self.product.product_tmpl_id.standard_price = 10
+        self._make_in_move(self.product, 10)
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
-
-        cat2 = self.env['product.category'].create({
-            'name': 'standard auto',
-            'property_cost_method': 'standard',
-            'property_valuation': 'real_time',
-            'property_stock_valuation_account_id': self.stock_valuation_account.id,
-            'property_stock_journal': self.stock_journal.id,
-        })
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
         # Try to change the product category with a `default_type` key in the context and
         # check it doesn't break the account move generation.
-        self.product1.with_context(default_is_storable=True).categ_id = cat2
-        self.assertEqual(self.product1.categ_id, cat2)
+        self.product.with_context(default_is_storable=True).categ_id = self.category_standard_auto
+        self.assertEqual(self.product.categ_id, self.category_standard_auto)
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
         account_move_line = self.env['account.move'].browse(self.env.company.action_close_stock_valuation()['res_id']).line_ids
         self.assertEqual(len(account_move_line), 2)
 
     def test_standard_auto_to_manual_1(self):
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
-        self.product1.product_tmpl_id.standard_price = 10
-        move1 = self._make_in_move(self.product1, 10)
+        self.product = self.product_standard_auto
+        self.product.product_tmpl_id.standard_price = 10
+        self._make_in_move(self.product, 10)
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'periodic'
+        self.product.product_tmpl_id.categ_id.property_valuation = 'periodic'
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
         # An accounting entry should only be created for the emptying now that the category is manual.
         account_move_line = self.env['account.move'].browse(self.env.company.action_close_stock_valuation()['res_id']).line_ids
         self.assertEqual(len(account_move_line), 2)
 
     def test_standard_auto_to_manual_2(self):
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'standard'
-        self.product1.product_tmpl_id.categ_id.property_valuation = 'real_time'
-        self.product1.product_tmpl_id.standard_price = 10
-        move1 = self._make_in_move(self.product1, 10)
-
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
-
-        cat2 = self.env['product.category'].create({
-            'name': 'fifo',
-            'property_cost_method': 'standard',
-            'property_valuation': 'periodic',
-        })
-        self.product1.with_context(debug=True).categ_id = cat2
+        self.product = self.product_standard_auto
+        self.product.product_tmpl_id.standard_price = 10
+        self._make_in_move(self.product, 10)
 
-        self.assertEqual(self.product1.total_value, 100)
-        self.assertEqual(self.product1.qty_available, 10)
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
+
+        self.product.with_context(debug=True).categ_id = self.category_standard
+
+        self.assertEqual(self.product.total_value, 100)
+        self.assertEqual(self.product.qty_available, 10)
 
         # account_move_line = self.env['account.move'].browse(self.env.company.action_close_stock_valuation()['res_id']).line_ids
         # self.assertEqual(len(account_move_line), 2)
 
     def test_return_delivery_fifo(self):
-        self.product1.product_tmpl_id.categ_id.property_cost_method = 'fifo'
+        self.product = self.product_fifo
         self.env['decimal.precision'].search([
             ('name', '=', 'Product Price'),
         ]).digits = 4
-        self.product1.standard_price = 280.8475
+        self.product.standard_price = 280.8475
 
-        move1 = self._make_out_move(self.product1, 4, create_picking=True, force_assign=True)
+        move1 = self._make_out_move(self.product, 4, create_picking=True, force_assign=True)
         move2 = self._make_return(move1, 4)
 
         for move in [move1, move2]:
-            self.assertAlmostEqual(move._get_price_unit(), self.product1.standard_price)
+            self.assertAlmostEqual(move._get_price_unit(), self.product.standard_price)
             self.assertAlmostEqual(abs(move.value), 1123.39)
 
 
-@tagged('post_install', '-at_install')
-class TestAngloSaxonAccounting(AccountTestInvoicingCommon, TestStockValuationBaseCommon):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.env.ref('base.EUR').active = True
-        cls.company_data['company'].anglo_saxon_accounting = True
-        (cls.stock_valuation_account,
-         cls.expense_account, cls.income_account, cls.stock_journal) = _create_accounting_data(cls.env)
-        cls.stock_location = cls.env['stock.location'].create({
-            'name': 'stock location',
-            'usage': 'internal',
-        })
-        cls.customer_location = cls.env['stock.location'].create({
-            'name': 'customer location',
-            'usage': 'customer',
-        })
-        cls.supplier_location = cls.env['stock.location'].create({
-            'name': 'supplier location',
-            'usage': 'supplier',
-        })
-        cls.warehouse_in = cls.env['stock.warehouse'].create({
-            'name': 'warehouse in',
-            'company_id': cls.company_data['company'].id,
-            'code': '1',
-        })
-        cls.warehouse_out = cls.env['stock.warehouse'].create({
-            'name': 'warehouse out',
-            'company_id': cls.company_data['company'].id,
-            'code': '2',
-        })
-        cls.picking_type_in = cls.env['stock.picking.type'].create({
-            'name': 'pick type in',
-            'sequence_code': '1',
-            'code': 'incoming',
-            'company_id': cls.company_data['company'].id,
-            'warehouse_id': cls.warehouse_in.id,
-        })
-        cls.picking_type_out = cls.env['stock.picking.type'].create({
-            'name': 'pick type in',
-            'sequence_code': '2',
-            'code': 'outgoing',
-            'company_id': cls.company_data['company'].id,
-            'warehouse_id': cls.warehouse_out.id,
-        })
-        cls.uom_unit = cls.env.ref('uom.product_uom_unit')
-        cls.product1 = cls.env['product.product'].create({
-            'name': 'product1',
-            'is_storable': True,
-            'categ_id': cls.env.ref('product.product_category_goods').id,
-            'property_account_expense_id': cls.expense_account.id,
-        })
-        cls.product1.categ_id.write({
-            'property_valuation': 'real_time',
-            'property_stock_valuation_account_id': cls.stock_valuation_account.id,
-            'property_stock_journal': cls.company_data['default_journal_misc'].id,
-        })
-        cls.stock_valuation_account.account_stock_variation_id = cls.stock_valuation_account
-
-    def _create_invoice_stock(self, move_type, product, quantity=1.0, price_unit=1.0):
-        rslt = self.env['account.move'].create({
-            'partner_id': self.partner_a.id,
-            'move_type': move_type,
-            'invoice_line_ids': [(0, 0, {
-                'name': 'test line',
-                'price_unit': price_unit,
-                'quantity': quantity,
-                'product_id': product.id,
-                'tax_ids': [(5, 0, 0)]
-            })],
-        })
-        rslt.action_post()
-        return rslt
-
-    def _create_credit_note(self, move_id, product, quantity=1.0, price_unit=1.0):
-        rslt = self.env['account.move'].create({
-            'partner_id': self.partner_a.id,
-            'move_type': 'out_refund',
-            'reversed_entry_id': move_id.id,
-            'ref': "broken product",
-            'invoice_line_ids': [Command.create({
-                'product_id': product.id,
-                'quantity': quantity,
-                'price_unit': price_unit,
-                'tax_ids': [(5, 0, 0)],
-            })]
-        })
-        rslt.action_post()
-        return rslt
-
+@tagged('at_install', '-post_install')  # LEGACY at_install
+class TestAngloSaxonAccounting(TestStockValuationCommon):
     def test_avco_and_credit_note(self):
         """
         When reversing an invoice that contains some anglo-saxo AML, the new anglo-saxo AML should have the same value
         """
         # Required for `account_id` to be visible in the view
         self.env.user.group_ids += self.env.ref('account.group_account_readonly')
-        self.product1.categ_id.property_cost_method = 'average'
+        self.product = self.product_avco_auto
 
-        self._make_in_move(self.product1, 2, unit_cost=10)
+        self._make_in_move(self.product, 2, unit_cost=10)
 
-        invoice_form = Form(self.env['account.move'].with_context(default_move_type='out_invoice'))
-        invoice_form.partner_id = self.env['res.partner'].create({'name': 'Super Client'})
-        with invoice_form.invoice_line_ids.new() as invoice_line_form:
-            invoice_line_form.product_id = self.product1
-            invoice_line_form.quantity = 2
-            invoice_line_form.price_unit = 25
-            invoice_line_form.account_id = self.company_data['default_journal_purchase'].default_account_id
-            invoice_line_form.tax_ids.clear()
-        invoice = invoice_form.save()
-        invoice.action_post()
+        invoice = self._create_invoice(self.product, 2, 25)
 
-        self._make_in_move(self.product1, 2, unit_cost=20)
-        # self.assertEqual(self.product1.standard_price, 15)
+        self._make_in_move(self.product, 2, unit_cost=20)
+        # self.assertEqual(self.product.standard_price, 15)
 
         refund_wizard = self.env['account.move.reversal'].with_context(active_model="account.move", active_ids=invoice.ids).create({
             'journal_id': invoice.journal_id.id,
@@ -1045,14 +851,14 @@ def test_return_delivery_storno(self):
         """ When using STORNO accounting, reverse accounting moves should have negative values for credit/debit.
         """
         self.env.company.account_storno = True
-        self.product1.categ_id.property_cost_method = 'fifo'
+        self.product = self.product_fifo
 
-        self._make_in_move(self.product1, 10, unit_cost=10)
-        out_move = self._make_out_move(self.product1, 10, create_picking=True)
-        return_move = self._make_return(out_move, 10)
+        self._make_in_move(self.product, 10, unit_cost=10)
+        out_move = self._make_out_move(self.product, 10, create_picking=True)
+        self._make_return(out_move, 10)
 
-        out_invoice = self._create_invoice_stock('out_invoice', self.product1, 10, 10)
-        return_credit_note = self._create_credit_note(out_invoice, self.product1, 10, 10)
+        out_invoice = self._create_invoice(self.product, 10, 10)
+        return_credit_note = self._create_credit_note(self.product, 10, 10, reversed_entry_id=out_invoice.id)
 
         out_move_line_ids = out_invoice.line_ids
 
@@ -1067,88 +873,3 @@ def test_return_delivery_storno(self):
         self.assertEqual(return_line_ids[0].debit, 0)
         self.assertEqual(return_line_ids[1].credit, 0)
         self.assertEqual(return_line_ids[1].debit, -100)
-
-    def test_dropship_return_accounts_1(self):
-        """
-        When returning a dropshipped move, make sure the correct accounts are used
-        """
-        # pylint: disable=bad-whitespace
-        self.product1.categ_id.property_cost_method = 'fifo'
-        move1 = self._make_dropship_move(self.product1, 2, unit_cost=10)
-        move2 = self._make_return(move1, 2)
-
-        in_invoice = self._create_invoice_stock('in_invoice', self.product1, 2, 10)
-        out_invoice = self._create_invoice_stock('out_invoice', self.product1, 2, 10)
-        return_in_credit_note = self._create_credit_note(in_invoice, self.product1, 2, 10)
-        return_out_credit_note = self._create_credit_note(out_invoice, self.product1, 2, 10)
-
-        acc_valuation = self.stock_valuation_account
-        acc_ap = self.company_data['default_account_payable']
-        acc_re = self.company_data['default_account_receivable']
-        acc_reve = self.company_data['default_account_revenue']
-
-        # Dropshipping should be:
-        self.assertRecordValues(in_invoice.line_ids, [
-            {'account_id': acc_valuation.id, 'debit': 20, 'credit': 0},
-            {'account_id': acc_ap.id, 'debit': 0, 'credit': 20},
-        ])
-        self.assertRecordValues(out_invoice.line_ids, [
-            {'account_id': acc_reve.id, 'debit': 0, 'credit': 20},
-            {'account_id': acc_re.id, 'debit': 20, 'credit': 0},
-        ])
-        # Return should be:
-        self.assertRecordValues(return_in_credit_note.line_ids, [
-            {'account_id': acc_reve.id, 'debit': 20, 'credit': 0},
-            {'account_id': acc_re.id, 'debit': 0, 'credit': 20},
-        ])
-        self.assertRecordValues(return_out_credit_note.line_ids, [
-            {'account_id': acc_reve.id, 'debit': 20, 'credit': 0},
-            {'account_id': acc_re.id, 'debit': 0, 'credit': 20},
-        ])
-
-    def test_dropship_return_accounts_2(self):
-        """
-        When returning a dropshipped move, make sure the correct accounts are used
-        """
-        # pylint: disable=bad-whitespace
-        self.product1.categ_id.property_cost_method = 'fifo'
-
-        move1 = self._make_dropship_move(self.product1, 2, unit_cost=10)
-
-        # return to WH/Stock
-        stock_return_picking = Form(self.env['stock.return.picking']\
-            .with_context(active_ids=[move1.picking_id.id], active_id=move1.picking_id.id, active_model='stock.picking'))
-        stock_return_picking = stock_return_picking.save()
-        stock_return_picking.product_return_moves.quantity = 2
-        stock_return_picking_action = stock_return_picking.action_create_returns()
-        return_pick = self.env['stock.picking'].browse(stock_return_picking_action['res_id'])
-        return_pick.location_dest_id = self.stock_location
-        return_pick.move_ids[0].move_line_ids[0].quantity = 2
-        return_pick.move_ids[0].picked = True
-        return_pick._action_done()
-
-        in_invoice = self._create_invoice_stock('in_invoice', self.product1, 2, 10)
-        out_invoice = self._create_invoice_stock('out_invoice', self.product1, 2, 10)
-        return_in_credit_note = self._create_credit_note(in_invoice, self.product1, 2, 10)
-        return_out_credit_note = self._create_credit_note(out_invoice, self.product1, 2, 10)
-
-        acc_valuation, acc_ap, acc_re, acc_reve = self.stock_valuation_account, self.company_data['default_account_payable'], self.company_data['default_account_receivable'], self.company_data['default_account_revenue']
-
-        # Dropshipping should be:
-        self.assertRecordValues(in_invoice.line_ids, [
-            {'account_id': acc_valuation.id, 'debit': 20, 'credit': 0},
-            {'account_id': acc_ap.id, 'debit': 0, 'credit': 20},
-        ])
-        self.assertRecordValues(out_invoice.line_ids, [
-            {'account_id': acc_reve.id, 'debit': 0, 'credit': 20},
-            {'account_id': acc_re.id, 'debit': 20, 'credit': 0},
-        ])
-        # Return should be:
-        self.assertRecordValues(return_in_credit_note.line_ids, [
-            {'account_id': acc_reve.id, 'debit': 20, 'credit': 0},
-            {'account_id': acc_re.id, 'debit': 0, 'credit': 20},
-        ])
-        self.assertRecordValues(return_out_credit_note.line_ids, [
-            {'account_id': acc_reve.id, 'debit': 20, 'credit': 0},
-            {'account_id': acc_re.id, 'debit': 0, 'credit': 20},
-        ])
diff --git a/addons/stock_landed_costs/tests/test_stock_landed_costs_purchase.py b/addons/stock_landed_costs/tests/test_stock_landed_costs_purchase.py
index 01f0587833d57..7a822ce0493ce 100644
--- a/addons/stock_landed_costs/tests/test_stock_landed_costs_purchase.py
+++ b/addons/stock_landed_costs/tests/test_stock_landed_costs_purchase.py
@@ -4,7 +4,6 @@
 
 from odoo.addons.stock_landed_costs.tests.common import TestStockLandedCostsCommon
 from odoo.addons.stock_landed_costs.tests.test_stockvaluationlayer import TestStockValuationLCCommon
-from odoo.addons.stock_account.tests.test_stockvaluation import _create_accounting_data
 
 from odoo import fields
 from odoo.fields import Command, Date

From 8b0a0fb7f6429dc635e9d91dfe63df924e092c8a Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Thu, 23 Oct 2025 14:49:50 +0200
Subject: [PATCH 254/673] [FIX] stock_account: method never call

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/product.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index be9d08691fc82..7ea21cf994353 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -248,11 +248,6 @@ def _get_remaining_moves(self):
             moves_qty_by_product[product] = qty_by_move
         return moves_qty_by_product
 
-    def _get_cogs_value(self, quantity):
-        if self.cost_method in ['standard', 'average']:
-            return self.standard_price * quantity
-        return self._run_fifo(quantity)
-
     def _run_avco(self, at_date=None, lot=None, method="realtime"):
         """ Recompute the average cost of the product base on the last closing
         inventory value and all the incoming moves during the period."""

From e171124e49d0abc06da8bb6cb59ebda03a40ecd9 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Mon, 27 Oct 2025 09:42:38 +0100
Subject: [PATCH 255/673] [FIX] stock_account: dropship as consumable

Currently the dropship use the same stack than inventory product.
However it's difficult to use them with FIFO since the stack doens't
exist. Anyway for dropshipping the expense could be register at the
bill since the product is directly delivered to the customer and doesn't
go through inventory. (same way than consumable)

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/account_move_line.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock_account/models/account_move_line.py b/addons/stock_account/models/account_move_line.py
index 3f56bbf981583..d7e1b23ed85d7 100644
--- a/addons/stock_account/models/account_move_line.py
+++ b/addons/stock_account/models/account_move_line.py
@@ -15,10 +15,7 @@ def _compute_account_id(self):
         for line in self:
             if not line.move_id.is_purchase_document():
                 continue
-            if not line.product_id.is_storable:
-                continue
-            # Periodic with expense account
-            if line.product_id.valuation == 'periodic':
+            if not line._eligible_for_stock_account():
                 continue
             fiscal_position = line.move_id.fiscal_position_id
             accounts = line.with_company(line.company_id).product_id.product_tmpl_id.get_product_accounts(fiscal_pos=fiscal_position)
@@ -32,7 +29,10 @@ def _inverse_product_id(self):
 
     def _eligible_for_stock_account(self):
         self.ensure_one()
-        return self.product_id.is_storable
+        if not self.product_id.is_storable:
+            return False
+        moves = self._get_stock_moves()
+        return all(not m.is_dropship for m in moves)
 
     def _get_gross_unit_price(self):
         if self.product_uom_id.is_zero(self.quantity):

From eeafe47022829f47173176b808078b204188215b Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Tue, 28 Oct 2025 11:40:18 +0100
Subject: [PATCH 256/673] [FIX] stock_account: UI simplification for user

Try to limit the possible configuration and give as much as visual
feedback to the user, in order to help with the configuration.

- Clean valaution help message
- Add a related of stock varition on product.category to indicate if a
  variation account is set.
- Add currency in views for unit cost and total cost justification
- Hide the expense account on account.account since it's only used in
  perpetual continental. Since it's not the common method to use we
prefer to hide it. People will probably prefer a periodic approach with
automated closing.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/product.py                |  7 +++++--
 addons/stock_account/models/stock_location.py         |  7 +------
 .../stock_account/report/stock_avco_audit_report.py   |  1 +
 .../report/stock_avco_audit_report_views.xml          | 11 ++++++-----
 .../stock_account/report/stock_valuation_report.xml   |  2 +-
 addons/stock_account/views/account_account_views.xml  |  4 ++--
 addons/stock_account/views/product_views.xml          |  1 +
 addons/stock_account/views/stock_location_views.xml   |  2 +-
 addons/stock_account/views/stock_move_views.xml       | 11 ++++++-----
 9 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 7ea21cf994353..4d3fb8f5f7b88 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -456,8 +456,8 @@ class ProductCategory(models.Model):
             ('real_time', 'Perpetual (at invoicing)'),
         ],
         company_dependent=True, copy=True, tracking=True,
-        help="""Manual: The accounting entries to value the inventory are not posted automatically.
-        Automated: An accounting entry is automatically created to value the inventory when a product enters or leaves the company.
+        help="""Periodic: The accounting entries are suggested manually in the inventory valuation report.
+        Perpetual: An accounting entry is automatically created to value the inventory when a product is billed or invoiced.
         """)
     property_cost_method = fields.Selection(
         string="Costing Method",
@@ -485,6 +485,9 @@ class ProductCategory(models.Model):
         'account.account', 'Price Difference Account', company_dependent=True, ondelete='restrict',
         check_company=True,
         help="""With perpetual valuation, this account will hold the price difference between the standard price and the bill price.""")
+    account_stock_variation_id = fields.Many2one(
+        'account.account', string="Stock Variation Account", readonly=False,
+        related="property_stock_valuation_account_id.account_stock_variation_id")
 
     @api.depends_context('company')
     def _compute_anglo_saxon_accounting(self):
diff --git a/addons/stock_account/models/stock_location.py b/addons/stock_account/models/stock_location.py
index f460e7e9aecf1..e6c9d6011af8c 100644
--- a/addons/stock_account/models/stock_location.py
+++ b/addons/stock_account/models/stock_location.py
@@ -11,12 +11,7 @@ class StockLocation(models.Model):
     valuation_account_id = fields.Many2one(
         'account.account', 'Stock Valuation Account',
         domain=[('account_type', 'not in', ('asset_receivable', 'liability_payable', 'asset_cash', 'liability_credit_card'))],
-        help="Used for inventory valuation. When set on a virtual location (non internal type), "
-             "this account will be used to hold the value of products "
-             "into this location, instead of the generic Stock Account set on the product. "
-             "This has no effect for internal locations."
-             "In real-time: The product's account will be used as counterparty account."
-             "During closing: The company's stock valuation account will be used as counterparty account.")
+        help="Expense account used to re-qualify products removed from stock and sent to this location")
     is_valued_internal = fields.Boolean('Is valued inside the company', compute="_compute_is_valued", search="_search_is_valued")
     is_valued_external = fields.Boolean('Is valued outside the company', compute="_compute_is_valued")
 
diff --git a/addons/stock_account/report/stock_avco_audit_report.py b/addons/stock_account/report/stock_avco_audit_report.py
index e9440b3d961b7..13794b0fe54e9 100644
--- a/addons/stock_account/report/stock_avco_audit_report.py
+++ b/addons/stock_account/report/stock_avco_audit_report.py
@@ -10,6 +10,7 @@ class StockAverageCostReport(models.AbstractModel):
     date = fields.Date(string='Date', required=True)
     user_id = fields.Many2one('res.users', string='User', required=True)
     company_id = fields.Many2one('res.company', string='Company', required=True)
+    currency_id = fields.Many2one('res.currency', related='company_id.currency_id', string='Currency')
 
     product_id = fields.Many2one('product.product', string='Product', required=True)
 
diff --git a/addons/stock_account/report/stock_avco_audit_report_views.xml b/addons/stock_account/report/stock_avco_audit_report_views.xml
index 1d4f85bb23c7d..d8124559ea97f 100644
--- a/addons/stock_account/report/stock_avco_audit_report_views.xml
+++ b/addons/stock_account/report/stock_avco_audit_report_views.xml
@@ -4,22 +4,23 @@
         <field name="model">stock.avco.report</field>
         <field name="arch" type="xml">
             <list>
+                <field name="currency_id" column_invisible="1"/>
                 <field name="reference"/>
                 <field name="product_id"/>
                 <field name="date"/>
                 <field name="description"/>
                 <field name="quantity" column_invisible="context.get('cost_method') == 'standard'"/>
-                <field name="added_value" column_invisible="context.get('cost_method') == 'standard'"/>
-                <field name="value" string="Unit Cost" column_invisible="context.get('cost_method') != 'standard'"/>
-                <field name="total_value" column_invisible="context.get('cost_method') == 'standard'"/>
+                <field name="added_value" widget="monetary" options="{'currency_field': 'currency_id'}" column_invisible="context.get('cost_method') == 'standard'"/>
+                <field name="value" string="Unit Cost" widget="monetary" options="{'currency_field': 'currency_id'}" column_invisible="context.get('cost_method') != 'standard'"/>
+                <field name="total_value" widget="monetary" options="{'currency_field': 'currency_id'}" column_invisible="context.get('cost_method') == 'standard'"/>
                 <field name="total_quantity" column_invisible="context.get('cost_method') == 'standard'"/>
-                <field name="avco_value" column_invisible="context.get('cost_method') == 'standard'"/>
+                <field name="avco_value" widget="monetary" options="{'currency_field': 'currency_id'}" column_invisible="context.get('cost_method') == 'standard'"/>
             </list>
         </field>
     </record>
     
     <record id="stock_avco_report_action" model="ir.actions.act_window">
-        <field name="name">AVCO Justification</field>
+        <field name="name">Unit Cost History</field>
         <field name="res_model">stock.avco.report</field>
         <field name="view_mode">list</field>
         <field name="domain">[("product_id", "=", active_id)]</field>
diff --git a/addons/stock_account/report/stock_valuation_report.xml b/addons/stock_account/report/stock_valuation_report.xml
index c6cec0dfc7372..bce298345b316 100644
--- a/addons/stock_account/report/stock_valuation_report.xml
+++ b/addons/stock_account/report/stock_valuation_report.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <record id="action_report_stock_valuation" model="ir.actions.client">
-        <field name="name">Stock Valuation</field>
+        <field name="name">Inventory Valuation</field>
         <field name="tag">stock_valuation_report</field>
         <field name="res_model">stock_account.stock.valuation.report</field>
         <field name="path">stock-valuation-closing</field>
diff --git a/addons/stock_account/views/account_account_views.xml b/addons/stock_account/views/account_account_views.xml
index 950d97a08c0a0..9f168d3044b6b 100644
--- a/addons/stock_account/views/account_account_views.xml
+++ b/addons/stock_account/views/account_account_views.xml
@@ -6,8 +6,8 @@
         <field name="inherit_id" ref="account.view_account_form"/>
         <field name="arch" type="xml">
             <field name="tag_ids" position="after">
-                <field name="account_stock_expense_id" invisible="account_type != 'asset_current'" placeholder="From company"/>
-                <field name="account_stock_variation_id" invisible="account_type != 'asset_current'" placeholder="None (only useful for continental)"/>
+                <field name="account_stock_variation_id" invisible="account_type != 'asset_current'"/>
+                <field name="account_stock_expense_id" invisible="account_type != 'asset_current'" placeholder="For Perpetual Continental Only" groups="base.group_no_one"/>
             </field>
         </field>
     </record>
diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 4dc310c17d90c..90fddd72508a4 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -33,6 +33,7 @@
             <field name="arch" type="xml">
                 <field name="property_account_expense_categ_id" position="after">
                     <field name="property_stock_valuation_account_id" string="Stock Account" options="{'no_create': True}"/>
+                    <field name="account_stock_variation_id" string="Stock Variation" options="{'no_create': True}"/>
                     <field name="property_price_difference_account_id" options="{'no_create': True}" invisible="not (property_cost_method == 'standard' and property_valuation == 'real_time')"/>
                 </field>
             </field>
diff --git a/addons/stock_account/views/stock_location_views.xml b/addons/stock_account/views/stock_location_views.xml
index bfc291dc4827d..82da8089e732b 100644
--- a/addons/stock_account/views/stock_location_views.xml
+++ b/addons/stock_account/views/stock_location_views.xml
@@ -10,7 +10,7 @@
                     <div>
                         <group string="Accounting Information" invisible="usage not in ('inventory', 'production')">
                             <label for="valuation_account_id" string="Cost of Production" invisible="usage != 'production'"/>
-                            <label for="valuation_account_id" string="Inventory Variation" invisible="usage != 'inventory'"/>
+                            <label for="valuation_account_id" string="Loss Account" invisible="usage != 'inventory'"/>
                             <field name="valuation_account_id" nolabel="1" options="{'no_create': True}"/>
                         </group>
                     </div>
diff --git a/addons/stock_account/views/stock_move_views.xml b/addons/stock_account/views/stock_move_views.xml
index c92181aec3017..f50d26db03c4a 100644
--- a/addons/stock_account/views/stock_move_views.xml
+++ b/addons/stock_account/views/stock_move_views.xml
@@ -19,15 +19,16 @@
         <field name="priority">1000</field>
         <field name="arch" type="xml">
             <list>
-                <field name="reference"/>
+                <field name="company_currency_id" column_invisible="1"/>
+                <field name="reference" width="300px"/>
                 <field name="date"/>
                 <field name="quantity"/>
                 <field name="product_uom" groups="uom.group_uom"/>
                 <field name="lot_ids" widget="many2many_tags" column_invisible="context.get('tracking') == 'none'"/>
-                <field name="value" column_invisible="context.get('cost_method') != 'fifo'"/>
-                <field name="standard_price" string="Unit Cost" column_invisible="context.get('cost_method') == 'fifo'"/>
-                <field name="remaining_qty" sum="Total Remaining Qty"/>
-                <field name="remaining_value" sum="Total Remaining Value"/>
+                <field name="value" widget="monetary" options="{'currency_field': 'company_currency_id'}" column_invisible="context.get('cost_method') != 'fifo'"/>
+                <field name="standard_price" widget="monetary" options="{'currency_field': 'company_currency_id'}" string="Unit Cost" column_invisible="context.get('cost_method') == 'fifo'"/>
+                <field name="remaining_qty" sum="Total Remaining Qty" width="200px"/>
+                <field name="remaining_value" widget="monetary" options="{'currency_field': 'company_currency_id'}" sum="Total Remaining Value" width="200px"/>
             </list>
         </field>
     </record>

From 494f885b52a11de763c1a672a31b71dcef88603a Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Tue, 28 Oct 2025 11:41:01 +0100
Subject: [PATCH 257/673] [FIX] stock_account: Fix continental entry

The closing entry in continentl should impact the expense account.
Since there is a specific entry just after that check the inventory
variation on the period and record it.

Also update the localization to always use the stock variation acc.
by default

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/res_company.py          | 3 +++
 addons/stock_account/models/template_generic_coa.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/stock_account/models/res_company.py b/addons/stock_account/models/res_company.py
index 128ebc73e7a58..2922ce6395ed5 100644
--- a/addons/stock_account/models/res_company.py
+++ b/addons/stock_account/models/res_company.py
@@ -231,6 +231,9 @@ def _get_stock_valuation_account_vals(self, accounts_by_product, at_date=None, e
         accounts = inventory_data.keys() | accounting_data.keys()
         for account in accounts:
             account_variation = False
+            # Continental accounting
+            if account.account_stock_variation_id and account.account_stock_expense_id:
+                account_variation = account.account_stock_expense_id
             if account.account_stock_variation_id:
                 account_variation = account.account_stock_variation_id
             if not account_variation and account.account_stock_expense_id:
diff --git a/addons/stock_account/models/template_generic_coa.py b/addons/stock_account/models/template_generic_coa.py
index ea2054ad8dc09..379d016e81fcd 100644
--- a/addons/stock_account/models/template_generic_coa.py
+++ b/addons/stock_account/models/template_generic_coa.py
@@ -7,7 +7,7 @@ class AccountChartTemplate(models.AbstractModel):
 
     def _post_load_data(self, template_code, company, template_data):
         res = super()._post_load_data(template_code, company, template_data)
-        company.account_stock_valuation_id.account_stock_expense_id = company.expense_account_id
+        company.account_stock_valuation_id.account_stock_variation_id = company.expense_account_id
         return res
 
     @template('generic_coa', 'res.company')

From 80ae07089845be4f908b57193eeb870bdc809ddf Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Tue, 28 Oct 2025 11:53:07 +0100
Subject: [PATCH 258/673] [FIX] stock_account: backdating conditions

Allow to backdate a picking/move in the past. But only if the
period is not locked

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock/models/stock_move.py            |  8 +++++++
 addons/stock/models/stock_picking.py         |  9 ++++++++
 addons/stock/views/stock_move_line_views.xml |  2 +-
 addons/stock/views/stock_move_views.xml      |  4 +++-
 addons/stock/views/stock_picking_views.xml   |  4 ++--
 addons/stock_account/models/stock_picking.py | 22 +++++++++++++++++++-
 6 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 812f094426b9a..fc88b2c7911d9 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -175,6 +175,7 @@ class StockMove(models.Model):
     additional = fields.Boolean("Whether the move was added after the picking's confirmation", default=False)
     is_locked = fields.Boolean(compute='_compute_is_locked', readonly=True)
     is_initial_demand_editable = fields.Boolean('Is initial demand editable', compute='_compute_is_initial_demand_editable')
+    is_date_editable = fields.Boolean("Is Date Editable", compute="_compute_is_date_editable")
     is_quantity_done_editable = fields.Boolean('Is quantity done editable', compute='_compute_is_quantity_done_editable')
     reference = fields.Char(compute='_compute_reference', string="Reference", store=True)
     move_lines_count = fields.Integer(compute='_compute_move_lines_count')
@@ -304,6 +305,13 @@ def _compute_is_locked(self):
             else:
                 move.is_locked = False
 
+    def _compute_is_date_editable(self):
+        for move in self:
+            if move.picking_id:
+                move.is_date_editable = move.picking_id.is_date_editable
+            else:
+                move.is_date_editable = True
+
     @api.depends('product_id', 'has_tracking', 'move_line_ids')
     def _compute_show_details_visible(self):
         """ According to this field, the button that calls `action_show_details` will be displayed
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 7317089abb601..afa0890b42c72 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -654,6 +654,8 @@ def _default_picking_type_id(self):
     is_locked = fields.Boolean(default=True, copy=False, help='When the picking is not done this allows changing the '
                                'initial demand. When the picking is done this allows '
                                'changing the done quantities.')
+    is_date_editable = fields.Boolean(
+        'Is Scheduled Date Editable', compute='_compute_is_date_editable')
 
     weight_bulk = fields.Float(
         'Bulk Weight', compute='_compute_bulk_weight', help="Total weight of products which are not in a package.")
@@ -740,6 +742,13 @@ def _compute_is_signed(self):
         for picking in self:
             picking.is_signed = picking.signature
 
+    def _compute_is_date_editable(self):
+        for picking in self:
+            if picking.state in ['done', 'cancel']:
+                picking.is_date_editable = not picking.is_locked
+            else:
+                picking.is_date_editable = True
+
     @api.depends('state', 'picking_type_code', 'scheduled_date', 'move_ids', 'move_ids.forecast_availability', 'move_ids.forecast_expected_date')
     def _compute_products_availability(self):
         pickings = self.filtered(lambda picking:
diff --git a/addons/stock/views/stock_move_line_views.xml b/addons/stock/views/stock_move_line_views.xml
index fa6b660c6bae2..238c841aae769 100644
--- a/addons/stock/views/stock_move_line_views.xml
+++ b/addons/stock/views/stock_move_line_views.xml
@@ -82,7 +82,7 @@
                     <field name="picked" invisible="1"/>
                     <group>
                         <group>
-                            <field name="date"/>
+                            <field name="date" readonly="1"/>
                             <field name="reference" string="Reference"/>
                             <field name="origin"/>
                             <field name="product_id" readonly="context.get('default_product_id')"/>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 9c03ceedff3a8..9ddc51460f7ea 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -30,7 +30,9 @@
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <list string="Moves" create="0" editable="bottom" default_order="date desc" duplicate="0">
-                    <field name="date" groups="base.group_no_one" decoration-danger="(state not in ('cancel','done')) and date > current_date"/>
+                    <field name="date" groups="base.group_no_one"
+                           decoration-danger="(state not in ('cancel','done')) and date > current_date"
+                            readonly="1"/>
                     <field name="reference"/>
                     <field name="picking_type_id" column_invisible="True" readonly="1"/>
                     <field name="location_usage" column_invisible="True" readonly="1"/>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 98ed18821f73c..efbadaba8f320 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -236,7 +236,7 @@
                         <group>
                             <label for="scheduled_date"/>
                             <div class="o_row">
-                                <field name="scheduled_date" readonly="state in ['cancel', 'done']" required="id"
+                                <field name="scheduled_date" readonly="not is_date_editable" required="id"
                                     decoration-warning="state not in ('done', 'cancel') and scheduled_date &lt; now"
                                     decoration-danger="state not in ('done', 'cancel') and scheduled_date &lt; current_date"
                                     decoration-bf="state not in ('done', 'cancel') and (scheduled_date &lt; current_date or scheduled_date &lt; now)"/>
@@ -252,7 +252,7 @@
                                 decoration-success="state == 'assigned' or products_availability_state == 'available'"
                                 decoration-warning="state != 'assigned' and products_availability_state in ('expected', 'available')"
                                 decoration-danger="state != 'assigned' and products_availability_state == 'late'"/>
-                            <field name="date_done" string="Effective Date" invisible="state != 'done'"/>
+                            <field name="date_done" string="Effective Date" invisible="state != 'done'" readonly="not is_date_editable"/>
                             <field name="origin" placeholder="e.g. PO0032" readonly="state in ['cancel', 'done']"/>
                             <field name="owner_id" groups="stock.group_tracking_owner"
                                    invisible="picking_type_code != 'incoming'"
diff --git a/addons/stock_account/models/stock_picking.py b/addons/stock_account/models/stock_picking.py
index cd5e697762d0d..14aa1290dbd10 100644
--- a/addons/stock_account/models/stock_picking.py
+++ b/addons/stock_account/models/stock_picking.py
@@ -1,10 +1,30 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import models, fields
+from odoo import api, models, fields
+from odoo.exceptions import ValidationError
 
 
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
     country_code = fields.Char(related="company_id.account_fiscal_country_id.code")
+
+    @api.constrains("scheduled_date", "date_done")
+    def _check_backdate_allowed(self):
+        for picking in self:
+            if picking._is_date_in_lock_period():
+                raise ValidationError(self.env._("You cannot modify the scheduled date of this operation because it falls within a locked fiscal period."))
+
+    def _compute_is_date_editable(self):
+        super()._compute_is_date_editable()
+        for picking in self:
+            if picking.is_date_editable and picking.state in ['done', 'cancel'] and picking.ids:
+                picking.is_date_editable = not picking._is_date_in_lock_period()
+
+    def _is_date_in_lock_period(self):
+        self.ensure_one()
+        lock = self.company_id._get_lock_date_violations(self.scheduled_date.date(), fiscalyear=True)
+        if self.date_done:
+            lock += self.company_id._get_lock_date_violations(self.date_done.date(), fiscalyear=True)
+        return bool(lock)

From 55a91f43d8536734a4c2b84da6f9ee2e67947c92 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Tue, 28 Oct 2025 11:53:59 +0100
Subject: [PATCH 259/673] [FIX] stock_account: Move description logic to
 stock.move

The valuation description was done in the product.value object. However
it's very specific to the stock.move and it could be call by different
object. This just move the logic to the appropriate place.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/product_value.py |  9 ++-------
 addons/stock_account/models/stock_move.py    | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/addons/stock_account/models/product_value.py b/addons/stock_account/models/product_value.py
index c91f0f2edf3bb..81e51f962a2f4 100644
--- a/addons/stock_account/models/product_value.py
+++ b/addons/stock_account/models/product_value.py
@@ -66,13 +66,8 @@ def _compute_value_description(self):
                 product_value.current_value_description = False
                 product_value.computed_value_description = False
                 continue
-            product_value.current_value_description = product_value.move_id._get_value_data()['description']
-            computed_value_data = product_value.move_id._get_value_data(ignore_manual_update=True)
-            if computed_value_data['description'] == product_value.current_value_description:
-                product_value.computed_value_description = False
-            else:
-                value = product_value.currency_id.format(computed_value_data['value'])
-                product_value.computed_value_description = _('Computed value: %(value)s\n%(description)s', value=value, description=computed_value_data['description'])
+            product_value.current_value_description = product_value.move_id.value_justification
+            product_value.computed_value_description = product_value.move_id.value_computed_justification
 
     @api.model_create_multi
     def create(self, vals_list):
diff --git a/addons/stock_account/models/stock_move.py b/addons/stock_account/models/stock_move.py
index 1a16e4aa33f6b..219941f2dfa2c 100644
--- a/addons/stock_account/models/stock_move.py
+++ b/addons/stock_account/models/stock_move.py
@@ -24,6 +24,10 @@ class StockMove(models.Model):
     value = fields.Monetary(
         "Value", currency_field='company_currency_id',
         help="The current value of the move. It's zero if the move is not valued.")
+    value_justification = fields.Text(
+        "Value Description", compute="_compute_value_justification")
+    value_computed_justification = fields.Text(
+        "Computed Value Description", compute="_compute_value_justification")
     # Useful for testing and custom valuation
     value_manual = fields.Monetary(
         "Manual Value", currency_field='company_currency_id',
@@ -79,6 +83,22 @@ def _compute_value_manual(self):
         for move in self:
             move.value_manual = move.value
 
+    def _compute_value_justification(self):
+        self.value_justification = False
+        self.value_computed_justification = False
+        for move in self:
+            if not move.is_in:
+                continue
+            move.value_justification = move._get_value_data()['description']
+            computed_value_data = move._get_value_data(ignore_manual_update=True)
+            if computed_value_data['description'] == move.value_justification:
+                move.value_computed_justification = False
+            else:
+                value = move.currency_id.format(computed_value_data['value'])
+                move.value_computed_justification = self.env._(
+                    'Computed value: %(value)s\n%(description)s',
+                    value=value, description=computed_value_data['description'])
+
     @api.depends('quantity', 'product_id.stock_move_ids.value')
     def _compute_remaining_qty(self):
         products = self.product_id

From 965a6ebd98ab7905c8489bb0343a3bb4d0e62da1 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Tue, 28 Oct 2025 11:55:52 +0100
Subject: [PATCH 260/673] [FIX] stock_account: Clean logic for move value

Currently the landed costs need to override both
`_get_value_from_account_move`, _get_value_from_quotation` and
`_get_value_from_production`. The purpose is always the same, add
an extra value to the `stock.move`. So instead of doing 3 overrides
we create a new method `_get_value_from_extra` to easily add value to
a `stock.move`

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/mrp_account/models/stock_move.py   | 26 +++++++-------------
 addons/stock_account/models/stock_move.py | 29 +++++++++++++++++++++--
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/addons/mrp_account/models/stock_move.py b/addons/mrp_account/models/stock_move.py
index 3998e84c6ccc3..ddabeb8643e3c 100644
--- a/addons/mrp_account/models/stock_move.py
+++ b/addons/mrp_account/models/stock_move.py
@@ -1,29 +1,21 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import _, models
+from odoo import models
 
 
 class StockMove(models.Model):
     _inherit = "stock.move"
 
-    def _get_value_data(self,
-        forced_std_price=False,
-        at_date=False,
-        ignore_manual_update=False):
-        self.ensure_one()
-        if self.production_id:
-            valued_qty = self._get_valued_qty()
-            return {
-                'value': self._get_value_from_production(valued_qty),
-                'quantity': valued_qty,
-                'description': _('From Production Order %(reference)s', reference=self.production_id.name),
-            }
-        return super()._get_value_data(forced_std_price, at_date, ignore_manual_update)
-
-    def _get_value_from_production(self, quantity):
+    def _get_value_from_production(self, quantity, at_date=None):
         # TODO: Maybe move _cal_price here
         self.ensure_one()
-        return quantity * self.price_unit
+        if not self.production_id:
+            return super()._get_value_from_production(quantity, at_date)
+        return {
+            'value': quantity * self.price_unit,
+            'quantity': quantity,
+            'description': self.env._('Manufactured %(production)s', production=self.production_id.display_name),
+        }
 
     def _get_all_related_sm(self, product):
         moves = super()._get_all_related_sm(product)
diff --git a/addons/stock_account/models/stock_move.py b/addons/stock_account/models/stock_move.py
index 219941f2dfa2c..30ad7b85eba56 100644
--- a/addons/stock_account/models/stock_move.py
+++ b/addons/stock_account/models/stock_move.py
@@ -271,10 +271,13 @@ def _set_value(self, correction_quantity=None):
     def _get_value(self, forced_std_price=False, at_date=False, ignore_manual_update=False):
         return self._get_value_data(forced_std_price, at_date, ignore_manual_update)['value']
 
-    def _get_value_data(self,
+    def _get_value_data(
+        self,
         forced_std_price=False,
         at_date=False,
-        ignore_manual_update=False):
+        ignore_manual_update=False,
+        add_extra_value=True,
+    ):
         """Returns the value and the quantity valued on the move
         In priority order:
         - Take value from accounting documents (invoices, bills)
@@ -298,6 +301,9 @@ def _get_value_data(self,
         if not ignore_manual_update:
             manual_data = self._get_manual_value(
                 remaining_qty, at_date)
+            # In case of manual update we will skip extra cost
+            if manual_data['quantity']:
+                add_extra_value = False
             value += manual_data['value']
             remaining_qty -= manual_data['quantity']
             if manual_data.get('description'):
@@ -311,6 +317,13 @@ def _get_value_data(self,
             if account_data.get('description'):
                 descriptions.append(account_data['description'])
 
+        if remaining_qty:
+            production_data = self._get_value_from_production(remaining_qty, at_date)
+            value += production_data["value"]
+            remaining_qty -= production_data["quantity"]
+            if production_data.get("description"):
+                descriptions.append(production_data["description"])
+
         # 2. from SO/PO lines
         if remaining_qty:
             quotation_data = self._get_value_from_quotation(remaining_qty, at_date)
@@ -333,6 +346,12 @@ def _get_value_data(self,
             value += std_price_data['value']
             descriptions.append(std_price_data.get('description'))
 
+        if add_extra_value:
+            extra_data = self._get_value_from_extra(valued_qty, at_date)
+            value += extra_data['value']
+            if extra_data.get('description'):
+                descriptions.append(extra_data['description'])
+
         return {
             'value': value,
             'quantity': valued_qty,
@@ -372,6 +391,9 @@ def _get_manual_value(self, quantity, at_date=None):
     def _get_value_from_account_move(self, quantity, at_date=None):
         return dict(VALUATION_DICT)
 
+    def _get_value_from_production(self, quantity, at_date=None):
+        return dict(VALUATION_DICT)
+
     def _get_value_from_quotation(self, quantity, at_date=None):
         return dict(VALUATION_DICT)
 
@@ -399,6 +421,9 @@ def _get_value_from_std_price(self, quantity, std_price=False, at_date=None):
             ),
         }
 
+    def _get_value_from_extra(self, quantity, at_date=None):
+        return dict(VALUATION_DICT)
+
     def _get_move_directions(self):
         move_in_ids = set()
         move_out_ids = set()

From 9d8203cae1692bb6676616dfbebaa4cb316af818 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Tue, 28 Oct 2025 11:57:04 +0100
Subject: [PATCH 261/673] [FIX] stock_account: Clean valuation description + LC

Use a standard string to display the value justification to get
a clean rendering for the user.

Part-of: odoo/odoo#234327
Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/mrp_account/models/stock_move.py       |  7 +++--
 addons/purchase_stock/models/stock_move.py    | 13 +++++---
 addons/stock_account/models/stock_move.py     |  2 +-
 .../stock_landed_costs/models/stock_move.py   | 31 ++++++++++++++-----
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/addons/mrp_account/models/stock_move.py b/addons/mrp_account/models/stock_move.py
index ddabeb8643e3c..937221bd43300 100644
--- a/addons/mrp_account/models/stock_move.py
+++ b/addons/mrp_account/models/stock_move.py
@@ -11,10 +11,13 @@ def _get_value_from_production(self, quantity, at_date=None):
         self.ensure_one()
         if not self.production_id:
             return super()._get_value_from_production(quantity, at_date)
+        value = quantity * self.price_unit
         return {
-            'value': quantity * self.price_unit,
+            'value': value,
             'quantity': quantity,
-            'description': self.env._('Manufactured %(production)s', production=self.production_id.display_name),
+            'description': self.env._('%(value)s for %(quantity)s %(unit)s from %(production)s',
+                value=self.company_currency_id.format(value), quantity=quantity, unit=self.product_id.uom_id.name,
+                production=self.production_id.display_name),
         }
 
     def _get_all_related_sm(self, product):
diff --git a/addons/purchase_stock/models/stock_move.py b/addons/purchase_stock/models/stock_move.py
index 255fa8d212571..ef62a0c8315f0 100644
--- a/addons/purchase_stock/models/stock_move.py
+++ b/addons/purchase_stock/models/stock_move.py
@@ -175,9 +175,9 @@ def _get_value_from_account_move(self, quantity, at_date=None):
             valuation_data['quantity'] = quantity
             valuation_data['value'] = quantity * value / aml_quantity
         account_moves = self.env['account.move.line'].browse(aml_ids).move_id
-        valuation_data['description'] = _('%(value)s for %(quantity)s %(unit)s from %(bills)s',
-            value=value, quantity=quantity, unit=self.product_id.uom_id.name,
-            bills=', '.join(account_move.name for account_move in account_moves))
+        valuation_data['description'] = self.env._('%(value)s for %(quantity)s %(unit)s from %(bills)s',
+            value=self.company_currency_id.format(value), quantity=aml_quantity, unit=self.product_id.uom_id.name,
+            bills=account_moves.mapped('display_name'))
         return valuation_data
 
     def _get_value_from_quotation(self, quantity, at_date=None):
@@ -187,10 +187,13 @@ def _get_value_from_quotation(self, quantity, at_date=None):
         price_unit = self.purchase_line_id._get_stock_move_price_unit()
         uom_quantity = self.product_uom._compute_quantity(quantity, self.product_id.uom_id)
         quantity = min(quantity, uom_quantity)
+        value = price_unit * quantity
         return {
-            'value': price_unit * quantity,
+            'value': value,
             'quantity': quantity,
-            'description': _('From %(quotation)s', quotation=self.purchase_line_id.order_id.name),
+            'description': self.env._('%(value)s for %(quantity)s %(unit)s from %(quotation)s (not billed)',
+                value=self.company_currency_id.format(value), quantity=quantity, unit=self.product_id.uom_id.name,
+                quotation=self.purchase_line_id.order_id.display_name),
         }
 
     def _get_related_invoices(self):
diff --git a/addons/stock_account/models/stock_move.py b/addons/stock_account/models/stock_move.py
index 30ad7b85eba56..5f389ebda6809 100644
--- a/addons/stock_account/models/stock_move.py
+++ b/addons/stock_account/models/stock_move.py
@@ -355,7 +355,7 @@ def _get_value_data(
         return {
             'value': value,
             'quantity': valued_qty,
-            'description': ', '.join(descriptions),
+            'description': '\n'.join(descriptions),
         }
 
     def _get_valued_qty(self, lot=None):
diff --git a/addons/stock_landed_costs/models/stock_move.py b/addons/stock_landed_costs/models/stock_move.py
index 03f8c6b1e145c..471d4331568f0 100644
--- a/addons/stock_landed_costs/models/stock_move.py
+++ b/addons/stock_landed_costs/models/stock_move.py
@@ -11,13 +11,30 @@ def _get_landed_cost(self, at_date=None):
         landed_cost_group = self.env['stock.valuation.adjustment.lines']._read_group(domain, ['move_id'], ['id:recordset'])
         return dict(landed_cost_group)
 
-    def _get_value_from_account_move(self, quantity, at_date=None):
+    def _get_value_from_extra(self, quantity, at_date=None):
         self.ensure_one()
-        accounting_data = super()._get_value_from_account_move(quantity, at_date=at_date)
+        accounting_data = super()._get_value_from_extra(quantity, at_date=at_date)
         # Add landed costs value
-        lc = self._get_landed_cost(at_date=at_date)
-        extra_value = 0
-        if lc.get(self):
-            extra_value = sum(lc[self].mapped('additional_landed_cost'))
-        accounting_data['value'] += extra_value
+        lcs = self._get_landed_cost(at_date=at_date)
+        lcs = lcs.get(self)
+        if not lcs:
+            return accounting_data
+        lcs_desc = []
+        for lc in lcs:
+            accounting_data["value"] += lc.additional_landed_cost
+            landed_cost = lc.cost_id
+            value = lc.additional_landed_cost
+            vendor_bill = landed_cost.vendor_bill_id
+            if vendor_bill:
+                desc = self.env._("+ %(value)s from %(vendor_bill)s (Landed Cost: %(landed_cost)s)",
+                    value=self.company_currency_id.format(value), vendor_bill=vendor_bill.display_name, landed_cost=landed_cost.display_name)
+            else:
+                desc = self.env._("+ %(value)s (Landed Cost: %(landed_cost)s)",
+                    value=self.company_currency_id.format(value), landed_cost=landed_cost.display_name)
+            lcs_desc.append(desc)
+        description = self.env._("including landed costs:\n%(landed_cost)s", landed_cost='\n'.join(lcs_desc))
+        if not accounting_data['description']:
+            accounting_data['description'] = description
+        else:
+            accounting_data['description'] += '\n' + description
         return accounting_data

From 18b884eb9d714bb5e0ea80d4bd26db6ebdf61a71 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Mon, 3 Nov 2025 09:40:10 +0100
Subject: [PATCH 262/673] [FIX] stock_account: better search valuation error

On product the search operator only works with '=' and selection
value. However the UserError just returns a common message without
explanation that hide the miss usage

closes odoo/odoo#234327

Related: odoo/enterprise#98769
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock_account/models/product.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 4d3fb8f5f7b88..7482c85a7f6b3 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -41,8 +41,10 @@ class ProductTemplate(models.Model):
         help="""With perpetual valuation, this account will hold the price difference between the standard price and the bill price.""")
 
     def _search_valuation(self, operator, value):
-        if operator != '=' or value not in ['periodic', 'real_time']:
-            raise UserError(_("Invalid search on valuation"))
+        if operator != '=':
+            raise UserError(self.env._("You can only use the '=' operator to search on valuation field."))
+        if value not in ['periodic', 'real_time']:
+            raise UserError(self.env._("Only the value 'periodic' and 'real_time' are accepted to search on valuation field."))
         domain_categ = Domain([('categ_id.property_valuation', operator, value)])
         domain_company = Domain(['|', ('categ_id.property_valuation', '=', False), ('categ_id', '=', False), ('company_id.inventory_valuation', operator, value)])
         return domain_company | domain_categ

From d03e2a8084746221e5cffcea96b32cd1ef126f32 Mon Sep 17 00:00:00 2001
From: Maryam Kia <maki@odoo.com>
Date: Mon, 18 Aug 2025 13:38:34 +0000
Subject: [PATCH 263/673] [IMP] mail, *: treat messages with a rating as
 non-empty in portal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: portal, portal_rating, rating, website_slides

task-5016995

closes odoo/odoo#234356

X-original-commit: 49a48183faaac156eea2c666f3d1fdb3097cd07f
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Maryam Kia (maki) <maki@odoo.com>
---
 .../mail/static/src/core/common/composer.js   | 25 ++++++++----
 addons/portal/controllers/portal_thread.py    | 10 +++--
 .../src/chatter/frontend/composer_patch.js    | 14 +++++--
 .../interactions/portal_rating_composer.js    |  4 +-
 addons/rating/controllers/__init__.py         |  1 +
 addons/rating/controllers/portal_thread.py    | 10 +++++
 addons/rating/models/mail_message.py          |  5 ++-
 .../chatter/frontend/message_model_patch.js   |  4 +-
 .../slides_course_review_modification.js      | 39 +++++++++++++++++++
 9 files changed, 93 insertions(+), 19 deletions(-)
 create mode 100644 addons/rating/controllers/portal_thread.py

diff --git a/addons/mail/static/src/core/common/composer.js b/addons/mail/static/src/core/common/composer.js
index 0870bf3c0ef15..57bf581dd9b64 100644
--- a/addons/mail/static/src/core/common/composer.js
+++ b/addons/mail/static/src/core/common/composer.js
@@ -130,6 +130,7 @@ export class Composer extends Component {
             active: true,
             isFullComposerOpen: false,
         });
+        this.root = useRef("root");
         this.fullComposerBus = new EventBus();
         this.selection = useSelection({
             refName: "textarea",
@@ -701,16 +702,11 @@ export class Composer extends Component {
     }
 
     async processMessage(cb) {
-        const attachments = this.props.composer.attachments;
-        if (attachments.some(({ uploading }) => uploading)) {
+        if (this.props.composer.attachments.some(({ uploading }) => uploading)) {
             this.env.services.notification.add(_t("Please wait while the file is uploading."), {
                 type: "warning",
             });
-        } else if (
-            !isHtmlEmpty(this.props.composer.composerHtml) ||
-            attachments.length > 0 ||
-            (this.message && this.message.attachment_ids.length > 0)
-        ) {
+        } else if (this.canProcessMessage) {
             if (!this.state.active) {
                 return;
             }
@@ -725,6 +721,14 @@ export class Composer extends Component {
         }
     }
 
+    get canProcessMessage() {
+        return (
+            !isHtmlEmpty(this.props.composer.composerHtml) ||
+            this.props.composer.attachments.length > 0 ||
+            (this.message && this.message.attachment_ids.length > 0)
+        );
+    }
+
     async sendMessage() {
         const composer = toRaw(this.props.composer);
         this.composerActions.activePicker?.close?.();
@@ -798,7 +802,7 @@ export class Composer extends Component {
 
     async editMessage() {
         const composer = toRaw(this.props.composer);
-        if (composer.composerText || composer.message.attachment_ids.length > 0) {
+        if (!this.askDeleteFromEdit) {
             await this.processMessage(async (value) =>
                 composer.message.edit(value, composer.attachments, {
                     mentionedChannels: composer.mentionedChannels,
@@ -812,6 +816,11 @@ export class Composer extends Component {
         this.suggestion?.clearRawMentions();
     }
 
+    get askDeleteFromEdit() {
+        const composer = toRaw(this.props.composer);
+        return !composer.composerText && composer.message.attachment_ids.length === 0;
+    }
+
     onClickInsertCannedResponse(ev) {
         markEventHandled(ev, "composer.clickInsertCannedResponse");
         const composer = toRaw(this.props.composer);
diff --git a/addons/portal/controllers/portal_thread.py b/addons/portal/controllers/portal_thread.py
index 23a979286d5be..f23e0b4539b4c 100644
--- a/addons/portal/controllers/portal_thread.py
+++ b/addons/portal/controllers/portal_thread.py
@@ -79,10 +79,7 @@ def portal_message_fetch(self, thread_model, thread_id, fetch_params=None, **kw)
             & Domain(field.get_comodel_domain(model))
             & Domain("res_id", "=", thread_id)
             & Domain("subtype_id", "=", request.env.ref("mail.mt_comment").id)
-            & (
-                Domain("body", "not in", [False, '<span class="o-mail-Message-edited"></span>'])
-                | Domain("attachment_ids", "!=", False)
-            )
+            & self._get_non_empty_message_domain()
         )
 
         # Check access
@@ -111,6 +108,11 @@ def portal_message_fetch(self, thread_model, thread_id, fetch_params=None, **kw)
             "messages": messages.ids,
         }
 
+    def _get_non_empty_message_domain(self):
+        return Domain(
+            "body", "not in", [False, '<span class="o-mail-Message-edited"></span>']
+        ) | Domain("attachment_ids", "!=", False)
+
     def _setup_portal_message_fetch_extra_domain(self, data) -> Domain:
         return Domain.TRUE
 
diff --git a/addons/portal_rating/static/src/chatter/frontend/composer_patch.js b/addons/portal_rating/static/src/chatter/frontend/composer_patch.js
index 4ef538bf4f132..3f91ee4cab122 100644
--- a/addons/portal_rating/static/src/chatter/frontend/composer_patch.js
+++ b/addons/portal_rating/static/src/chatter/frontend/composer_patch.js
@@ -17,12 +17,12 @@ patch(Composer.prototype, {
         return super.allowUpload && !this.props.composer.portalComment;
     },
 
-    editMessage() {
+    async editMessage() {
         if (this.props.composer.portalComment) {
-            this.savePublisherComment();
+            await this.savePublisherComment();
             return;
         }
-        super.editMessage();
+        await super.editMessage();
     },
 
     async savePublisherComment() {
@@ -38,6 +38,14 @@ patch(Composer.prototype, {
         this.props.onPostCallback();
     },
 
+    get canProcessMessage() {
+        return super.canProcessMessage || (this.message && this.message.rating_value);
+    },
+
+    get askDeleteFromEdit() {
+        return super.askDeleteFromEdit && !this.message.rating_value;
+    },
+
     onMoveStar(ev) {
         const index = parseInt(ev.currentTarget.getAttribute("index"));
         this.portalState.starValue = index + 1;
diff --git a/addons/portal_rating/static/src/interactions/portal_rating_composer.js b/addons/portal_rating/static/src/interactions/portal_rating_composer.js
index 9910a6ca45a68..de9ecff4645ca 100644
--- a/addons/portal_rating/static/src/interactions/portal_rating_composer.js
+++ b/addons/portal_rating/static/src/interactions/portal_rating_composer.js
@@ -117,11 +117,11 @@ export class RatingPopupComposer extends Interaction {
         const message = data["mail.message"] && data["mail.message"][0];
         const defaultOptions = {
             default_message:
-                data.default_message || (message && message.body[1].replace(/<[^>]+>/g, "")),
+                data.default_message || (message && message.body && message.body[1].replace(/<[^>]+>/g, "")),
             default_message_id:
                 data.default_message_id ||
                 (message &&
-                    (message.body[1].replace(/<[^>]+>/g, "") ||
+                    (message.body && message.body[1].replace(/<[^>]+>/g, "") ||
                         message.attachment_ids.length ||
                         message.rating_id) &&
                     message.id),
diff --git a/addons/rating/controllers/__init__.py b/addons/rating/controllers/__init__.py
index 80ee4da1c5ecc..6384e97317d8c 100644
--- a/addons/rating/controllers/__init__.py
+++ b/addons/rating/controllers/__init__.py
@@ -1,3 +1,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import main
+from . import portal_thread
diff --git a/addons/rating/controllers/portal_thread.py b/addons/rating/controllers/portal_thread.py
new file mode 100644
index 0000000000000..17a75e96e7a02
--- /dev/null
+++ b/addons/rating/controllers/portal_thread.py
@@ -0,0 +1,10 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.portal.controllers import portal_thread
+from odoo.fields import Domain
+
+
+class PortalChatter(portal_thread.PortalChatter):
+
+    def _get_non_empty_message_domain(self):
+        return super()._get_non_empty_message_domain() | Domain("rating_value", "!=", False)
diff --git a/addons/rating/models/mail_message.py b/addons/rating/models/mail_message.py
index 94dc64e262e1a..31a2008ea9f5c 100644
--- a/addons/rating/models/mail_message.py
+++ b/addons/rating/models/mail_message.py
@@ -34,7 +34,10 @@ def _search_rating_value(self, operator, operand):
             ('message_id', '!=', False),
             ('consumed', '=', True),
         ])
-        return [('id', 'in', ratings.subselect('message_id'))]
+        domain = Domain("id", "in", ratings.subselect("message_id"))
+        if operator == "in" and 0 in operand:
+            return domain | Domain("rating_ids", "=", False)
+        return domain
 
     def _to_store_defaults(self, target):
         # sudo: mail.message - guest and portal user can receive rating of accessible message
diff --git a/addons/website_slides/static/src/chatter/frontend/message_model_patch.js b/addons/website_slides/static/src/chatter/frontend/message_model_patch.js
index 247d645907fcd..c1b3d95d51be2 100644
--- a/addons/website_slides/static/src/chatter/frontend/message_model_patch.js
+++ b/addons/website_slides/static/src/chatter/frontend/message_model_patch.js
@@ -11,7 +11,9 @@ const messagePatch = {
 
     async edit() {
         const data = await super.edit(...arguments);
-        this.store.env.bus.trigger("reload_rating_popup_composer", data);
+        if (data) {
+            this.store.env.bus.trigger("reload_rating_popup_composer", data);
+        }
         return data;
     },
 };
diff --git a/addons/website_slides/static/tests/tours/slides_course_review_modification.js b/addons/website_slides/static/tests/tours/slides_course_review_modification.js
index eaf1297aeae1f..8ef3e9410ccce 100644
--- a/addons/website_slides/static/tests/tours/slides_course_review_modification.js
+++ b/addons/website_slides/static/tests/tours/slides_course_review_modification.js
@@ -184,5 +184,44 @@ registry.category("web_tour.tours").add("course_review_modification", {
         {
             trigger: ".modal.modal_shown.show .o-mail-Composer-starCard:has(input[value='4'])",
         },
+        {
+            trigger:
+                ".modal.modal_shown.show button.o_portal_chatter_composer_btn:contains(Post review)",
+            run: "click",
+        },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Message:not(:has(.o-mail-Message-body)) .o_website_rating_static[title='4 stars on 5']",
+            run: "hover && click #chatterRoot:shadow .o-mail-Message [title='Edit']",
+        },
+        {
+            trigger: "#chatterRoot:shadow .o-mail-Message .o-mail-Composer-input",
+            run: "edit Fill the message body",
+        },
+        {
+            trigger: "#chatterRoot:shadow .o-mail-Message button:contains(save)",
+            run: "click",
+        },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Message[data-persistent] .o-mail-Message-body:contains(Fill the message body)",
+        },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Message .o-mail-Message-body:contains(Fill the message body)",
+            run: "hover && click #chatterRoot:shadow .o-mail-Message [title='Edit']",
+        },
+        {
+            trigger: "#chatterRoot:shadow .o-mail-Message .o-mail-Composer-input",
+            run: "edit",
+        },
+        {
+            trigger: "#chatterRoot:shadow .o-mail-Message button:contains(save)",
+            run: "click",
+        },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Message .o-mail-Message-body:not(:has(Fill the message body)):contains( (edited))",
+        },
     ],
 });

From f85a2899b3511bba5795d077363eab7b75f898ef Mon Sep 17 00:00:00 2001
From: "David Van Droogenbroeck (DROD)" <drod@odoo.com>
Date: Fri, 10 Oct 2025 14:19:11 +0000
Subject: [PATCH 264/673] [FIX] web: use full query for search

Issue
-----
When scanning a barcode in the product view, the search is made using only part
of the barcode.

Steps to reproduce
-----
- Open the product view
- Scan a barcode (eg 1234567890)

> The search might only contain 12345678, 123456 or actually the full barcode

Cause
-----
When scanning a barcode, we receive all of the barcode characters followed by
newline. When we receive the newline, we select the first item in the dropdown.
The problem is that the search input changed but it hasn't been reflected yet in
the items (a rendering is scheduled but hasn't been applied to the DOM yet).

-----
Ticket:
opw-4874425

closes odoo/odoo#234365

X-original-commit: 965478b2a9b232cfcf75c4072d71326074a2910d
Signed-off-by: Mathieu Duckerts-Antoine (dam) <dam@odoo.com>
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: David Van Droogenbroeck (drod) <drod@odoo.com>
Co-authored-by: Aaron Bohy <aab@odoo.com>
---
 .../src/search/search_bar/search_bar.js       | 51 +++++++++++++------
 .../static/tests/search/search_bar.test.js    | 18 +++++++
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/search/search_bar/search_bar.js b/addons/web/static/src/search/search_bar/search_bar.js
index 3a477a39e6ce8..85f8e4ce4705c 100644
--- a/addons/web/static/src/search/search_bar/search_bar.js
+++ b/addons/web/static/src/search/search_bar/search_bar.js
@@ -16,6 +16,24 @@ import { useNavigation } from "@web/core/navigation/navigation";
 
 const parsers = registry.category("parsers");
 
+const parseValue = (value, fieldType) => {
+    const parser = parsers.contains(fieldType) ? parsers.get(fieldType) : (str) => str;
+    switch (fieldType) {
+        case "date": {
+            return serializeDate(parser(value));
+        }
+        case "datetime": {
+            return serializeDateTime(parser(value));
+        }
+        case "many2one": {
+            return value;
+        }
+        default: {
+            return parser(value);
+        }
+    }
+};
+
 const CHAR_FIELDS = ["char", "html", "many2many", "many2one", "one2many", "text", "properties"];
 const FOLDABLE_TYPES = ["properties", "many2one", "many2many"];
 
@@ -195,6 +213,7 @@ export class SearchBar extends Component {
                 if (fuzzyTest(trimmedQuery.toLowerCase(), label.toLowerCase())) {
                     items.push({
                         id: nextItemId++,
+                        fieldType,
                         searchItemDescription: searchItem.description,
                         preposition,
                         searchItemId: searchItem.id,
@@ -209,29 +228,16 @@ export class SearchBar extends Component {
             return items;
         }
 
-        const parser = parsers.contains(fieldType) ? parsers.get(fieldType) : (str) => str;
         let value;
         try {
-            switch (fieldType) {
-                case "date":
-                    value = serializeDate(parser(trimmedQuery));
-                    break;
-                case "datetime":
-                    value = serializeDateTime(parser(trimmedQuery));
-                    break;
-                case "selection":
-                case "many2one":
-                    value = trimmedQuery;
-                    break;
-                default:
-                    value = parser(trimmedQuery);
-            }
+            value = parseValue(trimmedQuery, fieldType);
         } catch {
             return [];
         }
 
         const item = {
             id: nextItemId++,
+            fieldType,
             searchItemDescription: searchItem.description,
             preposition,
             searchItemId: searchItem.id,
@@ -424,7 +430,20 @@ export class SearchBar extends Component {
         }
 
         if (!item.unselectable) {
-            const { searchItemId, label, operator, value } = item;
+            const { searchItemId, fieldType, operator } = item;
+            let { label, value } = item;
+            if (
+                !["selection", "boolean", "tags"].includes(fieldType) &&
+                this.state.query !== label &&
+                !item.isChild
+            ) {
+                // The query (the search input) changed but it hasn't been reflected yet in the
+                // items (a rendering is scheduled but hasn't been applied to the DOM yet), so select
+                // the item but use the current query. Typical usecase is when scanning a barcode,
+                // as the keystrokes are closer than when a user uses a regular keyboard.
+                label = this.state.query;
+                value = parseValue(this.state.query.trim(), fieldType);
+            }
             this.env.searchModel.addAutoCompletionValues(searchItemId, { label, operator, value });
         }
 
diff --git a/addons/web/static/tests/search/search_bar.test.js b/addons/web/static/tests/search/search_bar.test.js
index 2e2fe2af45db4..1ae317f6d0274 100644
--- a/addons/web/static/tests/search/search_bar.test.js
+++ b/addons/web/static/tests/search/search_bar.test.js
@@ -1939,3 +1939,21 @@ test("no crash when search component is destroyed with input", async () => {
     await runAllTimers();
     expect(".o_form_view").toHaveCount(1);
 });
+
+test("search on full query without waiting for display synchronisation", async () => {
+    /* Typically a barcode scan where the dropdown display doesn't have the time to update */
+    const searchBar = await mountWithSearch(SearchBar, {
+        resModel: "partner",
+        searchMenuTypes: [],
+        searchViewId: false,
+    });
+
+    await editSearch("01234");
+    expect(".o-dropdown-item:first").toHaveText("Search Foo for: 01234");
+    await press("5");
+    expect(".o-dropdown-item:first").toHaveText("Search Foo for: 01234");
+    await press("6");
+    expect(".o-dropdown-item:first").toHaveText("Search Foo for: 01234");
+    await keyDown("Enter");
+    expect(searchBar.env.searchModel.domain).toEqual([["foo", "ilike", "0123456"]]);
+});

From 5f9397136f96c0f9596fef53956e60d27e562892 Mon Sep 17 00:00:00 2001
From: Manav Shah <sham@odoo.com>
Date: Fri, 31 Oct 2025 11:09:31 +0000
Subject: [PATCH 265/673] [FIX] l10n_tr_nilvera_einvoice_extended: Tax Amount
 in Withholding invoices

Before this commit:
For withholding invoices, the VAT percentage was not included inside
the <cac:TaxTotals> node, due to this, the VAT amount was not
displayed in the PDF in Nilvera.

After this commit:
The VAT amount is shown correctly in the <cbc:Percent> node inside
the <cac:TaxTotals> node and percent amount appears correctly in
the PDF.

task-5225600

closes odoo/odoo#234301

X-original-commit: 28d9d5ee340b4e75536622ff050c968b9e773985
Signed-off-by: Ali Alfie (alal) <alal@odoo.com>
Signed-off-by: Manav Shah (sham) <sham@odoo.com>
---
 .../models/account_edi_xml_ubl_tr.py                            | 2 +-
 .../tests/expected_xmls/invoice_basic_withholding_einvoice.xml  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
index 5f61de7961ea2..af4585b5fc920 100644
--- a/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
@@ -440,7 +440,7 @@ def get_total_tax_subtotal_amount(details):
                     },
                     'cbc:Percent': {
                         # The percentatge can't be a float as it is expected to return as an integer
-                        '_text': grouping_key['percent_withheld'] if is_withholding else False,
+                        '_text': grouping_key['percent_withheld'] if is_withholding else grouping_key['amount'],
                     },
                     'cac:TaxCategory': self._get_tax_category_node({**vals, 'grouping_key': grouping_key}),
                 }
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml
index 3fc934585623d..c70977df70659 100644
--- a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_withholding_einvoice.xml
@@ -106,6 +106,7 @@
     <cac:TaxSubtotal>
       <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
       <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+      <cbc:Percent>20.0</cbc:Percent>
       <cac:TaxCategory>
         <cac:TaxScheme>
           <cbc:Name>Gerçek Usulde KDV</cbc:Name>
@@ -149,6 +150,7 @@
       <cac:TaxSubtotal>
         <cbc:TaxableAmount currencyID="TRY">132.00</cbc:TaxableAmount>
         <cbc:TaxAmount currencyID="TRY">26.40</cbc:TaxAmount>
+        <cbc:Percent>20.0</cbc:Percent>
         <cac:TaxCategory>
           <cac:TaxScheme>
             <cbc:Name>Gerçek Usulde KDV</cbc:Name>

From 4c826cb1039e5abef90fb91a832e94bba3245978 Mon Sep 17 00:00:00 2001
From: Mohamed Ben-Tahri <mobt@odoo.com>
Date: Fri, 24 Oct 2025 14:03:48 +0000
Subject: [PATCH 266/673] [IMP] product info : reduce timeout of longpress

closes odoo/odoo#233434

X-original-commit: d6a1f4d239e6020462c2b2996f077ea2e7f26b2f
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Mohamed Ben-Tahri (mobt) <mobt@odoo.com>
---
 addons/point_of_sale/static/src/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/utils.js b/addons/point_of_sale/static/src/utils.js
index d4bf3ade4bb7e..4eeb98bd675ac 100644
--- a/addons/point_of_sale/static/src/utils.js
+++ b/addons/point_of_sale/static/src/utils.js
@@ -176,7 +176,7 @@ export function isValidEmail(email) {
     return email && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
 }
 
-export const LONG_PRESS_DURATION = session.test_mode ? 100 : 1000;
+export const LONG_PRESS_DURATION = session.test_mode ? 100 : 500;
 
 export async function getImageDataUrl(imageUrl) {
     const res = await fetch(imageUrl);

From 4255e164dada3571b1845620cf9d7c6a07c43787 Mon Sep 17 00:00:00 2001
From: zorbmax <orma@odoo.com>
Date: Tue, 4 Nov 2025 14:58:02 +0000
Subject: [PATCH 267/673] [FIX] hw_drivers: cert_end_date offset-aware

Before this commit, datetime.now() was compared to cert.not_valid_after_utc, leading to an error because we compare offset-naive and offset-aware datetimes

After this commit, we set an offset-aware datetime.now() if we use not_valid_after_utc

Issue introduced in #234005

opw-5237595

closes odoo/odoo#234499

X-original-commit: acf9b418079b8c2c08f51c2f40ac818224b528d8
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 addons/iot_drivers/tools/certificate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/iot_drivers/tools/certificate.py b/addons/iot_drivers/tools/certificate.py
index 3f6215caca90b..2a1b10e91463f 100644
--- a/addons/iot_drivers/tools/certificate.py
+++ b/addons/iot_drivers/tools/certificate.py
@@ -55,7 +55,7 @@ def get_certificate_end_date():
     cert_end_date = cert.not_valid_after_utc
     if (
         common_name == 'OdooTempIoTBoxCertificate'
-        or datetime.datetime.now() > cert_end_date - datetime.timedelta(days=10)
+        or datetime.datetime.now(datetime.timezone.utc) > cert_end_date - datetime.timedelta(days=10)
     ):
         _logger.debug("SSL certificate '%s' must be updated.", common_name)
         return None

From 8ac99501a2d9abd256da41a7f0233a608d389181 Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Mon, 27 Oct 2025 13:13:35 +0000
Subject: [PATCH 268/673] [FIX] website, html_editor: refresh gallery
 thumbnails
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:

- Drag and drop an "Image Gallery" snippet onto the page.
- Set the indicators to "Squared Miniatures".
- Replace an image using the media dialog.
- Look at the carousel indicators. They didn’t update.
- Same issue if you change any other image options (filter, etc.)

Before this commit, the edited image was updated but the small
thumbnails under the gallery still showed the old picture.

After this commit, the gallery listens to media updates and the
thumbnails now refresh to match the edited image.

task-5189020

closes odoo/odoo#234192

X-original-commit: 1f9c94e925229ae98a6cb7c81681a7811bce9858
Signed-off-by: Robin Lejeune (role) <role@odoo.com>
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 .../main/media/image_post_process_plugin.js   |  1 +
 .../src/main/media/image_save_plugin.js       |  1 +
 .../options/image_gallery_option_plugin.js    | 10 ++++
 .../tests/tours/snippet_image_gallery.js      | 54 ++++++++++++++++++-
 addons/website/tests/test_snippets.py         |  1 +
 5 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/addons/html_editor/static/src/main/media/image_post_process_plugin.js b/addons/html_editor/static/src/main/media/image_post_process_plugin.js
index 6890df10084b8..6ea5bc517fb90 100644
--- a/addons/html_editor/static/src/main/media/image_post_process_plugin.js
+++ b/addons/html_editor/static/src/main/media/image_post_process_plugin.js
@@ -269,6 +269,7 @@ export class ImagePostProcessPlugin extends Plugin {
                 delete el.dataset[key];
             }
         }
+        this.dispatchTo("on_image_updated_handlers", { imageEl: el });
     }
 }
 
diff --git a/addons/html_editor/static/src/main/media/image_save_plugin.js b/addons/html_editor/static/src/main/media/image_save_plugin.js
index 14d79d85caa91..19472a3e4ee4c 100644
--- a/addons/html_editor/static/src/main/media/image_save_plugin.js
+++ b/addons/html_editor/static/src/main/media/image_save_plugin.js
@@ -195,6 +195,7 @@ export class ImageSavePlugin extends Plugin {
         } else {
             el.setAttribute("src", newAttachmentSrc);
         }
+        this.dispatchTo("on_image_saved_handlers", { imageEl: el });
     }
 
     getRecordInfo(editableEl = null) {
diff --git a/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js b/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
index ffc67338e1a93..66513a94b2c27 100644
--- a/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
@@ -9,6 +9,7 @@ import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC, SNIPPET_SPECIFIC_END } from "@html_builder/utils/option_sequence";
 import { uniqueId } from "@web/core/utils/functions";
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { forwardToThumbnail } from "@html_builder/utils/utils_css";
 
 export class ImageGalleryImagesOption extends BaseOptionComponent {
     static template = "website.ImageGalleryImagesOption";
@@ -44,6 +45,9 @@ class ImageGalleryOption extends Plugin {
         reorder_items_handlers: this.reorderGalleryItems.bind(this),
         on_will_remove_handlers: this.onWillRemove.bind(this),
         on_removed_handlers: this.onRemoved.bind(this),
+        on_replaced_media_handlers: ({ newMediaEl }) => this.updateCarouselThumbnail(newMediaEl),
+        on_image_updated_handlers: ({ imageEl }) => this.updateCarouselThumbnail(imageEl),
+        on_image_saved_handlers: ({ imageEl }) => this.updateCarouselThumbnail(imageEl),
         on_snippet_dropped_handlers: ({ snippetEl }) => {
             const carousels = snippetEl.querySelectorAll(".s_image_gallery .carousel");
             this.addCarouselListener(carousels);
@@ -422,6 +426,12 @@ class ImageGalleryOption extends Plugin {
             this.imageRemovedGalleryElement = undefined;
         }
     }
+
+    updateCarouselThumbnail(mediaEl) {
+        if (mediaEl.matches(".s_image_gallery img")) {
+            forwardToThumbnail(mediaEl);
+        }
+    }
 }
 
 export class AddImageAction extends BuilderAction {
diff --git a/addons/website/static/tests/tours/snippet_image_gallery.js b/addons/website/static/tests/tours/snippet_image_gallery.js
index 4aef8899b66f2..0b23288e1eada 100644
--- a/addons/website/static/tests/tours/snippet_image_gallery.js
+++ b/addons/website/static/tests/tours/snippet_image_gallery.js
@@ -6,6 +6,7 @@ import {
     insertSnippet,
     registerWebsitePreviewTour,
     changeOptionInPopover,
+    clickOnEditAndWaitEditMode,
 } from "@website/js/tours/tour_utils";
 
 registerWebsitePreviewTour(
@@ -176,6 +177,7 @@ registerWebsitePreviewTour(
             id: "s_image_gallery",
             name: "Image Gallery",
         }),
+        ...changeOptionInPopover("Image Gallery", "Indicators", "Squared Miniatures"),
         changeOption("Image Gallery", "addImage"),
         {
             content: "Click on the default image",
@@ -185,12 +187,62 @@ registerWebsitePreviewTour(
         addMedia(),
         {
             content: "Check that the new image has been added",
-            trigger: ":iframe .s_image_gallery:has(img[data-index='3'])",
+            trigger: ":iframe .s_image_gallery_indicators_squared:has(img[data-index='3'])",
         },
         {
             content: "Check that the thumbnail of the first image has not been changed",
             trigger:
                 ":iframe .s_image_gallery div.carousel-indicators button:first-child[style='background-image: url(/web/image/website.library_image_08)']",
         },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check that the thumbnail of the new image is displayed",
+            trigger:
+                ":iframe .s_image_gallery div.carousel-indicators button:nth-child(4)[style*='s_default_image']",
+        },
+        {
+            content: "Select the first image in the gallery",
+            trigger: ":iframe .s_image_gallery .carousel-item:first-child img",
+            run: "click",
+        },
+        {
+            content: "Open the replace media dialog",
+            trigger: "[data-action-id='replaceMedia']",
+            run: "click",
+        },
+        {
+            content: "Pick another image to replace the first one",
+            trigger: ".o_select_media_dialog .o_button_area[aria-label='s_default_image_2.jpg']",
+            run: "click",
+        },
+        ...clickOnSave(),
+        ...clickOnEditAndWaitEditMode(),
+        {
+            content: "Check that the first image has been replaced",
+            trigger:
+                ":iframe .s_image_gallery .carousel-item:first-child img[src*='s_default_image_2']",
+        },
+        {
+            content: "Check that the thumbnail of the first image is updated",
+            trigger:
+                ":iframe .s_image_gallery div.carousel-indicators button:first-child[style*='s_default_image_2']",
+        },
+        {
+            content: "Select the second image in the gallery",
+            trigger: ":iframe .s_image_gallery .carousel-control-next-icon",
+            run: "click",
+        },
+        changeOption("Image", "[data-label='Shape'] .dropdown-toggle"),
+        {
+            content: "Click on the first image shape",
+            trigger: "[data-action-id='setImageShape']",
+            run: "click",
+        },
+        {
+            content: "Check that the thumbnail of the second image is an SVG",
+            trigger:
+                ":iframe .s_image_gallery div.carousel-indicators button:nth-child(2)[style*='data:image/svg+xml']",
+        },
     ]
 );
diff --git a/addons/website/tests/test_snippets.py b/addons/website/tests/test_snippets.py
index 6d6f65fbf0681..25d9fa95f49a5 100644
--- a/addons/website/tests/test_snippets.py
+++ b/addons/website/tests/test_snippets.py
@@ -127,6 +127,7 @@ def test_snippet_image_gallery_reorder(self):
 
     def test_snippet_image_gallery_thumbnail_update(self):
         create_image_attachment(self.env, '/web/image/website.s_banner_default_image', 's_default_image.jpg')
+        create_image_attachment(self.env, '/web/image/website.s_banner_default_image_2', 's_default_image_2.jpg')
         self.start_tour(self.env['website'].get_client_action_url('/'), 'snippet_image_gallery_thumbnail_update', login='admin')
 
     def test_dropdowns_and_header_hide_on_scroll(self):

From 05e9adc7e45871c220b245f6b4a8cddc8d337b71 Mon Sep 17 00:00:00 2001
From: Sarah Bellefroid <sbel@odoo.com>
Date: Tue, 16 Sep 2025 06:38:06 +0000
Subject: [PATCH 269/673] [FIX] pos_self_order: make cancel button conditional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, it is possible to cancel orders that have
been sent to the kitchen display. However when doing so,
the kitchen displayd does not receive any information
about the cancellation.

Steps to reproduce:
-------------------
- Modify restaurant and enable self ordering
- Open self an place an order (not paid but sent to kitchen)
- Go back to "My orders" and cancel it
> Order is cancelled in backend but not in the kitchen display

Why the fix:
------------
When an order is sent to the kitchen the customer should not
be allowed to cancel it on its own. If it's the case we now
warn the customer that their order cannot be cancelled.

Also, we remove the reset table function as by raising the
user error we fall into this part of the code and it seems
like the function does not exist anymore.

opw-5030223

closes odoo/odoo#234428

X-original-commit: f721b98f5e358abb90bf1585ada961306fc4ef6e
Related: odoo/enterprise#98822
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: Sarah Bellefroid (sbel) <sbel@odoo.com>
---
 .../static/tests/tours/utils/cart_page_util.js              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/pos_self_order/static/tests/tours/utils/cart_page_util.js b/addons/pos_self_order/static/tests/tours/utils/cart_page_util.js
index e2ba1ce0a5181..7a976ee11dc11 100644
--- a/addons/pos_self_order/static/tests/tours/utils/cart_page_util.js
+++ b/addons/pos_self_order/static/tests/tours/utils/cart_page_util.js
@@ -151,3 +151,9 @@ export function checkSlotUnavailable(slotValue) {
         },
     };
 }
+
+export function isShown() {
+    return {
+        trigger: `.o_self_cart_page`,
+    };
+}

From 17a6054b1fd7a740d05eddfe11e4c454d53d3f37 Mon Sep 17 00:00:00 2001
From: Bastien PIERRE <ipb@odoo.com>
Date: Tue, 21 Oct 2025 09:40:32 +0000
Subject: [PATCH 270/673] [FIX] base: fix thousand separator for Slovenian

closes odoo/odoo#233489

Task-id: 5183221
X-original-commit: 9523c566b67ccc2b4189e519fe54643a28f72fa8
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 odoo/addons/base/data/res.lang.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo/addons/base/data/res.lang.csv b/odoo/addons/base/data/res.lang.csv
index dad2be058aae2..c7b637063f3f8 100644
--- a/odoo/addons/base/data/res.lang.csv
+++ b/odoo/addons/base/data/res.lang.csv
@@ -65,7 +65,7 @@
 "base.lang_sr@Cyrl","Serbian (Cyrillic) / српски","sr@Cyrl","sr@Cyrl","Left-to-Right","[3,0]",",","","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_sr@latin","Serbian (Latin) / srpski","sr@latin","sr@latin","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_sk","Slovak / Slovenský jazyk","sk_SK","sk","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
-"base.lang_sl_SI","Slovenian / Slovenščina","sl_SI","sl","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","1"
+"base.lang_sl_SI","Slovenian / Slovenščina","sl_SI","sl","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_es_419","Spanish (Latin America) / Español (América Latina)","es_419","es_419","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"
 "base.lang_es_AR","Spanish (AR) / Español (AR)","es_AR","es_AR","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","7"
 "base.lang_es_BO","Spanish (BO) / Español (BO)","es_BO","es_BO","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","1"

From eb4db6d7685ad0a7d2614db855c833e1c28f3e9a Mon Sep 17 00:00:00 2001
From: "Maruan Aguerdouh (magm)" <magm@odoo.com>
Date: Fri, 26 Sep 2025 14:34:55 +0000
Subject: [PATCH 271/673] [FIX] survey: fix table conflict with matrix question
 in survey

A conflict occurs if a matrix question is set to "Mandatory answer"
(questionRequired = True) and a table is also added to its description.

The issue is that when the system evaluates a required matrix, it gets
the subQuestionsIds by looking for the first table within the question's
wrapper. If a table exists in the description, the system incorrectly
tries to retrieve the IDs from that table. This action throws a
traceback because the descriptive table does not contain any
sub-question data.

This commit fixes the issue by being more specific when looking for the
table containing the subQuestionsIds. We will use the $input data to
retrieve the subQuestionsIds instead of searching for a table within the
question's wrapper.

opw-4931881

closes odoo/odoo#233463

X-original-commit: 59a5a2806fd00984fd997300823f2e9aceebb2a5
Signed-off-by: Florian Charlier (flch) <flch@odoo.com>
Signed-off-by: Maruan Aguerdouh Mohtar (magm) <magm@odoo.com>
---
 addons/survey/static/src/interactions/survey_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/static/src/interactions/survey_form.js b/addons/survey/static/src/interactions/survey_form.js
index 420a7e67109dd..64cf526c43e03 100644
--- a/addons/survey/static/src/interactions/survey_form.js
+++ b/addons/survey/static/src/interactions/survey_form.js
@@ -844,7 +844,7 @@ export class SurveyForm extends Interaction {
                 case "matrix":
                     if (questionRequired) {
                         const subQuestionsIds = JSON.parse(
-                            questionWrapperEl.querySelector("table").dataset.subQuestions
+                            inputEl.dataset.subQuestions
                         );
                         // Highlight unanswered rows' header
                         const questionBodySelector = `div[id="${questionId}"] > .o_survey_question_matrix > tbody`;

From 250dc90170947203aa12ced8af8121d5f646e4d7 Mon Sep 17 00:00:00 2001
From: Arnold Moyaux <arm@odoo.com>
Date: Wed, 15 Oct 2025 12:37:09 +0000
Subject: [PATCH 272/673] [FIX] stock: Quant balanced without serial number

Uecase to reproduce:
- Create a quant with a product and 10 lot A
- Create a delivery order
- Open barcode
- In barcode, deliver the product with lot C

Current behavior:
You have 2 quants:
- 10 lot A
- -1 without lot

Expected behavior:
- 10 lot A
- -1 lot C

It happens because the code try to balance negative quant for lot/sn
in a stack of quants without lot/sn for the product. However in this
case the barcode create a quant without quantity and without lot. In
this case the system wants to update it due to an incorrect condition.

It's an issue since in later receit with the correct lot. The quant
will never be balanced and it will result with
- -1 without
- 1 lot C

closes odoo/odoo#234588

X-original-commit: 2695c7f90caf675ad7cf1f0d28b97e20639342c0
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock/models/stock_quant.py |  8 ++++++--
 addons/stock/tests/test_move.py    | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index 26263598dd040..ce46416d95175 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -1041,8 +1041,12 @@ def _update_available_quantity(self, product_id, location_id, quantity=False, re
             raise ValidationError(_('Quantity or Reserved Quantity should be set.'))
         self = self.sudo()
         quants = self._gather(product_id, location_id, lot_id=lot_id, package_id=package_id, owner_id=owner_id, strict=True)
-        if lot_id and quantity > 0:
-            quants = quants.filtered(lambda q: q.lot_id)
+        if lot_id:
+            if product_id.uom_id.compare(quantity, 0) > 0:
+                quants = quants.filtered(lambda q: q.lot_id)
+            else:
+                # Don't remove quantity from a negative quant without lot
+                quants = quants.filtered(lambda q: product_id.uom_id.compare(q.quantity, 0) > 0 or q.lot_id)
 
         if location_id.should_bypass_reservation():
             incoming_dates = []
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index ea9d12f93fe3e..18bab77c44b52 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -723,6 +723,28 @@ def test_mixed_tracking_reservation_8(self):
         self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product_serial, self.stock_location, strict=True), 1.0)
         self.assertEqual(self.env['stock.quant']._get_available_quantity(self.product_serial, self.stock_location, lot_id=lot1, strict=False), 2.0)
 
+    def test_mixed_tracking_reservation_9(self):
+        lot1 = self.env["stock.lot"].create({"name": "lot1", "product_id": self.product_serial.id})
+        lot2 = self.env["stock.lot"].create({"name": "lot2", "product_id": self.product_serial.id})
+        self.env["stock.quant"]._update_available_quantity(self.product_serial, self.stock_location, 10, lot_id=lot1)
+        self.env["stock.quant"]._update_available_quantity(self.product_serial, self.stock_location, 1)
+        self.env["stock.quant"]._update_available_quantity(self.product_serial, self.stock_location, -1)
+        move_out = self.env['stock.move'].create({
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.customer_location.id,
+            'product_id': self.product_serial.id,
+            'product_uom': self.uom_unit.id,
+            'product_uom_qty': 1.0,
+        })
+        move_out._action_confirm()
+        move_out._action_assign()
+        move_out.move_line_ids.lot_id = lot2
+        move_out.picked = True
+        move_out._action_done()
+        quants = self.gather_relevant(self.product_serial, self.stock_location)
+        self.assertEqual(quants.filtered(lambda q: q.lot_id == lot1).quantity, 10)
+        self.assertEqual(quants.filtered(lambda q: q.lot_id == lot2).quantity, -1)
+
     def test_putaway_1(self):
         """ Receive products from a supplier. Check that putaway rules are rightly applied on
         the receipt move line.

From 95c3245978c53f21a2844507fab0cf49c2aeef62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Dieudonn=C3=A9?= <adr@odoo.com>
Date: Mon, 3 Nov 2025 14:45:52 +0000
Subject: [PATCH 273/673] [FIX] web: close picker after selecting value in
 datepicker

Before this commit, the date picker would reopen after selecting a value.
This was caused by `activeInput` being reset after the close, which took
time when the `onChange` RPC was slow. As a result, `useEffect` was
triggered before `activeInput` had been reset, causing the picker to
reopen.

To fix this, we've reduced the number of `useEffect` calls.
It will no longer be triggered when the input value changes.

Steps to reproduce:
- Open Customer Invoice
- Set the invoice date
=> the picker will stay instead of being closed.

Note that this is a date field with an onChange

closes odoo/odoo#234645

X-original-commit: c8fd5f84f210678f25e08576a98694d47b31878f
Signed-off-by: Romeo Fragomeli (rfr) <rfr@odoo.com>
---
 .../views/fields/datetime/datetime_field.js   | 19 ++++++++++-------
 .../tests/views/fields/date_field.test.js     | 21 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/views/fields/datetime/datetime_field.js b/addons/web/static/src/views/fields/datetime/datetime_field.js
index e7c83c3d6fe59..d6fff7a1b35f8 100644
--- a/addons/web/static/src/views/fields/datetime/datetime_field.js
+++ b/addons/web/static/src/views/fields/datetime/datetime_field.js
@@ -202,14 +202,17 @@ export class DateTimeField extends Component {
         this.startDate = useRef("start-date");
         this.endDate = useRef("end-date");
 
-        useEffect(() => {
-            [this.startDate, this.endDate].forEach((ref, index) => {
-                if (ref.el?.getAttribute("data-field") === this.picker.activeInput) {
-                    ref.el.focus();
-                    this.openPicker(index);
-                }
-            });
-        });
+        useEffect(
+            () => {
+                [this.startDate, this.endDate].forEach((ref, index) => {
+                    if (ref.el?.getAttribute("data-field") === this.picker.activeInput) {
+                        ref.el.focus();
+                        this.openPicker(index);
+                    }
+                });
+            },
+            () => [this.startDate.el?.tagName, this.endDate.el?.tagName, this.picker.activeInput]
+        );
 
         onWillRender(() => this.triggerIsDirty());
 
diff --git a/addons/web/static/tests/views/fields/date_field.test.js b/addons/web/static/tests/views/fields/date_field.test.js
index ccf79a6ef84fa..898d251b220c4 100644
--- a/addons/web/static/tests/views/fields/date_field.test.js
+++ b/addons/web/static/tests/views/fields/date_field.test.js
@@ -1,6 +1,6 @@
 import { expect, queryFirst, test } from "@odoo/hoot";
 import { click, edit, press, queryAllTexts, queryOne, scroll } from "@odoo/hoot-dom";
-import { animationFrame, mockDate, mockTimeZone } from "@odoo/hoot-mock";
+import { Deferred, animationFrame, mockDate, mockTimeZone } from "@odoo/hoot-mock";
 import {
     assertDateTimePicker,
     getPickerCell,
@@ -61,6 +61,25 @@ test("toggle datepicker", async () => {
     expect(".o_datetime_picker").toHaveCount(0);
 });
 
+test("datepicker is automatically closed after selecting a value", async () => {
+    Partner._onChanges.date = () => {};
+    const def = new Deferred();
+    onRpc("onchange", () => def);
+
+    await mountView({ type: "form", resModel: "res.partner", resId: 1 });
+
+    expect(".o_datetime_picker").toHaveCount(0);
+    await contains(".o_field_date button").click();
+    await animationFrame();
+    expect(".o_datetime_picker").toHaveCount(1);
+
+    await contains(getPickerCell(22)).click();
+    await animationFrame();
+    // The picker shouldn't be reopened, even if the onChange RPC is slow.
+    expect(".o_datetime_picker").toHaveCount(0);
+    def.resolve();
+});
+
 test("Ensure only one datepicker is open", async () => {
     Partner._fields.date_start = fields.Date();
 

From 8d7b39907179acb716a2b7b459b770bde9e05d3b Mon Sep 17 00:00:00 2001
From: hatr-odoo <hatr@odoo.com>
Date: Mon, 27 Oct 2025 10:37:29 +0000
Subject: [PATCH 274/673] [FIX] l10n_tw_edi_ecpay: correct JSON data handling
 for downpayment invoices

When an invoice is created from a sale order with a downpayment, the invoice
line for the downpayment typically has a negative quantity and a positive unit
price. However, ECPay does not accept negative quantities, and this also leads
to incorrect price values being sent in the JSON payload.

To address this, when an invoice line has a negative quantity, it is inverted
to ensure the data sent to ECPay is valid and consistent.

task-5211264

closes odoo/odoo#234665

X-original-commit: de7cd91a02ebd35892ddd584734d698567cce8d8
Signed-off-by: John Laterre (jol) <jol@odoo.com>
Signed-off-by: Harsh Trivedi (hatr) <hatr@odoo.com>
---
 .../l10n_tw_edi_ecpay/models/account_move.py  | 13 +++---
 addons/l10n_tw_edi_ecpay/tests/test_edi.py    | 42 +++++++++++++++++++
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_tw_edi_ecpay/models/account_move.py b/addons/l10n_tw_edi_ecpay/models/account_move.py
index 319a9f34b918b..9685fc30aa492 100644
--- a/addons/l10n_tw_edi_ecpay/models/account_move.py
+++ b/addons/l10n_tw_edi_ecpay/models/account_move.py
@@ -471,23 +471,24 @@ def _l10n_tw_edi_prepare_item_list(self, json_data, is_allowance=False):
 
             twd_excluded_amount = base_line['tax_details']['raw_total_excluded']
             twd_included_amount = base_line['tax_details']['raw_total_included']
+            quantity = abs(line.quantity)
 
             if self.l10n_tw_edi_is_b2b:
-                item_price = float_round(twd_excluded_amount / line.quantity, precision_rounding=0.01)
+                item_price = float_round(twd_excluded_amount / quantity, precision_rounding=0.01)
                 item_amount = float_round(twd_excluded_amount, precision_rounding=0.01)
             else:
                 if not is_allowance and line.tax_ids and not line.tax_ids[0].price_include:
-                    item_price = float_round(twd_excluded_amount / line.quantity, precision_rounding=0.01)
+                    item_price = float_round(twd_excluded_amount / quantity, precision_rounding=0.01)
                     item_amount = float_round(twd_excluded_amount, precision_rounding=0.01)
                 else:
-                    item_price = float_round(twd_included_amount / line.quantity, precision_rounding=0.01)
+                    item_price = float_round(twd_included_amount / quantity, precision_rounding=0.01)
                     item_amount = float_round(twd_included_amount, precision_rounding=0.01)
 
                 item_amount_taxed = float_round(twd_included_amount, precision_rounding=0.01)
 
             # For special tax, we use twd_included_amount
             if tax_type == "4":
-                item_price = float_round(twd_included_amount / line.quantity, precision_rounding=0.01)
+                item_price = float_round(twd_included_amount / quantity, precision_rounding=0.01)
                 item_amount = float_round(twd_included_amount, precision_rounding=0.01)
 
             # Set item sequence for each invoice line, the sequence cannot start from 0
@@ -500,7 +501,7 @@ def _l10n_tw_edi_prepare_item_list(self, json_data, is_allowance=False):
                     "OriginalInvoiceDate": self.l10n_tw_edi_invoice_create_date.strftime("%Y-%m-%d"),
                     "OriginalSequenceNumber": line.l10n_tw_edi_ecpay_item_sequence,
                     "ItemName": line.name[:100],
-                    "ItemCount": line.quantity,
+                    "ItemCount": quantity,
                     "ItemPrice": item_price,
                     "ItemAmount": item_amount,
                 })
@@ -508,7 +509,7 @@ def _l10n_tw_edi_prepare_item_list(self, json_data, is_allowance=False):
                 item_list.append({
                     "ItemSeq": line.l10n_tw_edi_ecpay_item_sequence,
                     "ItemName": line.name[:100],
-                    "ItemCount": line.quantity,
+                    "ItemCount": quantity,
                     "ItemWord": line.product_uom_id.name[:6] if line.product_uom_id else False,
                     "ItemPrice": item_price,
                     "ItemTaxType": line.tax_ids[0].l10n_tw_edi_tax_type if tax_type != "4" and line.tax_ids else "",
diff --git a/addons/l10n_tw_edi_ecpay/tests/test_edi.py b/addons/l10n_tw_edi_ecpay/tests/test_edi.py
index 263aeb31107b3..eb77a2ed2135e 100644
--- a/addons/l10n_tw_edi_ecpay/tests/test_edi.py
+++ b/addons/l10n_tw_edi_ecpay/tests/test_edi.py
@@ -6,6 +6,7 @@
 
 from freezegun import freeze_time
 
+from odoo import Command
 from odoo.addons.account.tests.test_account_move_send import TestAccountMoveSendCommon
 from odoo.exceptions import UserError
 from odoo.tests import tagged
@@ -236,6 +237,47 @@ def test_07_fail_data_validation(self):
         with self.assertRaises(UserError):
             send_and_print.action_send_and_print()
 
+    def test_08_invoice_with_downpayment(self):
+        """Ensure downpayment with -ve quantity is normalized for ECPay JSON."""
+        invoice = self.init_invoice(
+            'out_invoice', partner=self.partner_a, products=self.product_a,
+        )
+        invoice.write({
+            "invoice_line_ids": [
+                Command.create({
+                    "name": "Downpayment",
+                    "price_unit": 10.0,
+                    "quantity": -1.0,
+                    "tax_ids": self.tax_sale_a,
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        self.assertListEqual(
+            invoice._l10n_tw_edi_generate_invoice_json()['Items'],
+            [
+                {
+                    'ItemSeq': 1,
+                    'ItemName': 'product_a',
+                    'ItemCount': 1.0,
+                    'ItemWord': 'Units',
+                    'ItemPrice': 1000.0,
+                    'ItemTaxType': '1',
+                    'ItemAmount': 1000.0
+                },
+                {
+                    'ItemSeq': 2,
+                    'ItemName': 'Downpayment',
+                    'ItemCount': 1.0,
+                    'ItemWord': False,
+                    'ItemPrice': -10.0,
+                    'ItemTaxType': '1',
+                    'ItemAmount': -10.0
+                },
+            ],
+        )
+
     # -------------------------------------------------------------------------
     # Patched methods
     # -------------------------------------------------------------------------

From a7f8211235a5d2d3440c2c19bdd8e7a43c837941 Mon Sep 17 00:00:00 2001
From: sbbh-odoo <sbbh@odoo.com>
Date: Wed, 8 Oct 2025 09:11:56 +0000
Subject: [PATCH 275/673] [FIX] html_editor: image toolbar not opening after
 editable loses focus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description of the issue:

- The image toolbar failed to open when the editable had lost focus.
- Previously, focusEditable() exited early if the active element was inside
  the editable, even when the actual document selection wasn’t.

Solution:

- Updated the condition in focusEditable() to also check whether the document
  selection is inside the editable.
- Now it only returns early when both the active element and the selection are
  within the editable.

task-5117272

closes odoo/odoo#234562

X-original-commit: 3cdd4f9d577938d79ac10f676c0841d9245aa3dd
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Samit Bharatbhai Bhadiyadra (sbbh) <sbbh@odoo.com>
---
 .../static/src/core/selection_plugin.js        |  7 +++----
 addons/html_editor/static/tests/image.test.js  | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/addons/html_editor/static/src/core/selection_plugin.js b/addons/html_editor/static/src/core/selection_plugin.js
index 6c152e631def9..f2fea38e606c6 100644
--- a/addons/html_editor/static/src/core/selection_plugin.js
+++ b/addons/html_editor/static/src/core/selection_plugin.js
@@ -1054,13 +1054,12 @@ export class SelectionPlugin extends Plugin {
     }
 
     focusEditable() {
-        if (this.editable.contains(this.document.activeElement)) {
+        const { editableSelection, currentSelectionIsInEditable } = this.getSelectionData();
+        if (this.editable.contains(this.document.activeElement) && currentSelectionIsInEditable) {
             // Editor has focus — nothing to do.
             return;
         }
 
-        const { editableSelection, documentSelectionIsInEditable } = this.getSelectionData();
-
         const closestNonEditable = (node) => closestElement(node, (el) => !el.isContentEditable);
         // If selection includes a non-editable element, focusing editor will move cursor to different position.
         if (
@@ -1071,7 +1070,7 @@ export class SelectionPlugin extends Plugin {
             this.editable.focus({ preventScroll: true });
         }
 
-        if (!documentSelectionIsInEditable) {
+        if (!currentSelectionIsInEditable) {
             // Selection is outside the editor — restore it.
             const { anchorNode, anchorOffset, focusNode, focusOffset } = editableSelection;
             const selection = this.document.getSelection();
diff --git a/addons/html_editor/static/tests/image.test.js b/addons/html_editor/static/tests/image.test.js
index 0e26e3668da8c..d4e27235d84ec 100644
--- a/addons/html_editor/static/tests/image.test.js
+++ b/addons/html_editor/static/tests/image.test.js
@@ -1,9 +1,9 @@
 import { expect, test } from "@odoo/hoot";
-import { click, dblclick, press, queryOne, waitFor, waitForNone } from "@odoo/hoot-dom";
+import { click, dblclick, pointerUp, press, queryOne, waitFor, waitForNone } from "@odoo/hoot-dom";
 import { animationFrame } from "@odoo/hoot-mock";
 import { contains } from "@web/../tests/web_test_helpers";
 import { base64Img, setupEditor } from "./_helpers/editor";
-import { getContent, setContent } from "./_helpers/selection";
+import { getContent, moveSelectionOutsideEditor, setContent } from "./_helpers/selection";
 import { insertText, undo } from "./_helpers/user_actions";
 import { expectElementCount } from "./_helpers/ui_expectations";
 
@@ -590,6 +590,20 @@ test("can undo link removing of an image", async () => {
     expect(img.parentElement.tagName).toBe("A");
 });
 
+test("image toolbar should open on click even if selection is not in editable", async () => {
+    const { el, editor } = await setupEditor(`
+        <img src="${base64Img}">
+    `);
+
+    el.focus();
+    moveSelectionOutsideEditor();
+    const selectionData = editor.shared.selection.getSelectionData();
+    expect(document.activeElement).toBe(el);
+    expect(selectionData.documentSelectionIsInEditable).toBe(false);
+    await pointerUp("img");
+    await expectElementCount(".o-we-toolbar", 1);
+});
+
 test.tags("desktop");
 test("Preview an image on dblclick", async () => {
     await setupEditor(`

From e5dcba9c6833c70b2c5997c3a67065a1022197fe Mon Sep 17 00:00:00 2001
From: pajo <pajo@odoo.com>
Date: Tue, 30 Sep 2025 05:37:16 +0000
Subject: [PATCH 276/673] [FIX] portal: prevent portal users changing account
 holder name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to Reproduce:
-------------------------
1. Install the Website and Employees modules.
2. Create a Test User and It's Employee.
3. On the Employee record, go to Private Information, create a Bank Account
with a custom Account Holder Name.
4. Log in to the Website using the Test User.
5. Navigate to My Account and click Edit Information.
6. Fill in the address details (without changing the Name) and click Save.
7. Go back to the Employee’s Bank Account and check the Account Holder Name.

Observation:
-------------------------
The Account Holder Name was overwritten to the partner's name.

Issue:
-------------------------
In `_compute_account_holder_name` method,
https://github.com/odoo/odoo/blob/c3b543631bde96260082484a3baac19d942f6b9f/odoo/addons/base/models/res_bank.py#L104-L107
The Account Holder Name is always recomputed using the Partner’s name.
When submitting the form from the frontend, the name field is included in the
values sent to update the Partner, even if the user did not actually change
the name.
https://github.com/odoo/odoo/blob/be3a4283c383d187570f5a73f337030e6ae9d05c/addons/portal/controllers/portal.py#L196-L205
which re-triggers this compute and as a result, the Partner’s name overwrites
the Account Holder Name on the linked Bank Account

Solution:
--------------------------
Prevent the Account Holder Name compute method from being triggered when
updating information from the frontend if the Partner’s name has not been
changed.

opw-5059247

closes odoo/odoo#234669

X-original-commit: 0110668521beadb366485f98322c58e8c7164f6d
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Joyal Patel (pajo) <pajo@odoo.com>
---
 addons/portal/controllers/portal.py |  3 +++
 addons/portal/tests/test_portal.py  | 41 +++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/addons/portal/controllers/portal.py b/addons/portal/controllers/portal.py
index 686719f4d0b32..dce8945068d75 100644
--- a/addons/portal/controllers/portal.py
+++ b/addons/portal/controllers/portal.py
@@ -554,6 +554,9 @@ def _create_or_update_address(
                 # The `phone_validation` module is installed.
                 partner_sudo._onchange_phone_validation()
         elif not self._are_same_addresses(address_values, partner_sudo):
+            # If name is not changed then pop it from the address_values, as it affects the bank account holder name
+            if address_values['name'].strip() == partner_sudo.name.strip():
+                address_values.pop('name')
             partner_sudo.write(address_values)  # Keep the same partner if nothing changed.
             if 'phone' in address_values and hasattr(partner_sudo, '_onchange_phone_validation'):
                 # The `phone_validation` module is installed.
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 6b2e3e69544bf..a3f9be9bb11c7 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -2,12 +2,53 @@
 
 from odoo import Command
 from odoo.http import Request
+from odoo.addons.mail.tests.common import mail_new_test_user
 from odoo.tests.common import HttpCase, tagged
 
 
 @tagged('-at_install', 'post_install')
 class TestUsersHttp(HttpCase):
 
+    def test_account_holder_name_update(self):
+        """Test that bank account holder name updates when partner name changes via /my/account route."""
+        login = 'test_portal_user'
+        portal_user = mail_new_test_user(
+            self.env,
+            login,
+            name='Partner A',
+        )
+
+        bank_account = self.env['res.partner.bank'].create({
+            'acc_number': '123456789',
+            'partner_id': portal_user.partner_id.id,
+            'acc_holder_name': 'Partner A Holder',
+            'acc_type': 'bank',
+        })
+
+        common_data = {
+            'phone': '1234567890',
+            'email': portal_user.partner_id.email,
+            'street': '123 Main St',
+            'city': 'Anytown',
+            'zipcode': '12345',
+            'country_id': self.env.ref('base.us').id,
+            'state_id': self.env.ref('base.state_us_5').id,
+        }
+
+        self.authenticate(login, login)
+        # request without changing partner name
+        response = self.url_open(
+            url='/my/address/submit',
+            data={
+                **common_data,
+                'name': portal_user.partner_id.name,
+                'partner_id': str(portal_user.partner_id.id),
+                'csrf_token': Request.csrf_token(self)
+            }
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(bank_account.acc_holder_name, 'Partner A Holder')
+
     def test_deactivate_portal_user(self):
         # Create a portal user with data which should be removed on deactivation
         login = 'portal_user'

From c51b62d5ea2dade1932ed32804d8d2d54f5921c5 Mon Sep 17 00:00:00 2001
From: maap-odoo <maap@odoo.com>
Date: Tue, 28 Oct 2025 11:40:13 +0000
Subject: [PATCH 277/673] [FIX] project: disable stage editing in project
 sharing kanban view

Steps to reproduce:
1. Install the Project module.
2. Create a new project and share it with a user.
3. Log in as that user.
4. Open the shared project Kanban view and try to edit a stage.
5. Try to search for more projects.

Issue:
A traceback occurs when clicking on 'Search More'.

Fix:
Prevent stage editing in shared project Kanban view.

task-5176630

closes odoo/odoo#234664

X-original-commit: a83e8fdc94788120063c36380734e4f586f12392
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
Signed-off-by: Maan Pankajbhai Patel (maap) <maap@odoo.com>
---
 addons/project/views/project_sharing_project_task_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/views/project_sharing_project_task_views.xml b/addons/project/views/project_sharing_project_task_views.xml
index eff12d87fb23c..41c3d04e04ee6 100644
--- a/addons/project/views/project_sharing_project_task_views.xml
+++ b/addons/project/views/project_sharing_project_task_views.xml
@@ -29,6 +29,7 @@
                 archivable="0"
                 import="0"
                 groups_draggable="0"
+                group_edit="0"
                 default_order="priority desc, sequence, state, date_deadline asc, id desc"
             >
                 <field name="state"/>

From 564a4d0a8ae82c13f065be45fe2d83513e32006e Mon Sep 17 00:00:00 2001
From: Pierre Pulinckx <pipu@odoo.com>
Date: Wed, 5 Nov 2025 07:48:11 +0000
Subject: [PATCH 278/673] [FIX] web: datetimepicker_service:
 updateValueFromInputs

How to reproduce
================
Write an operation or calculation in datetime field like +1d or +=1d
or copy/paste a value in field. As the focus is lost, button reappears
in the field. Then, the getInputs method in useDateTimePicker hook
must (as this name suggests it) return input elements.

The fix
=======
We filter on tagName === 'input' elements

closes odoo/odoo#234611

X-original-commit: 0d5c98bf3483d2a7b024657b6a5e0b379215881c
Signed-off-by: Bastien Pierre (ipb) <ipb@odoo.com>
Signed-off-by: Pierre Pulinckx (pipu) <pipu@odoo.com>
---
 .../tours/tour_calendar_with_recurrence.js    | 12 +++---
 .../core/datetime/datetimepicker_service.js   |  2 +-
 .../static/tests/views/list/list_view.test.js | 38 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/addons/maintenance/static/tests/tours/tour_calendar_with_recurrence.js b/addons/maintenance/static/tests/tours/tour_calendar_with_recurrence.js
index 8e181f1d00689..11596671226ff 100644
--- a/addons/maintenance/static/tests/tours/tour_calendar_with_recurrence.js
+++ b/addons/maintenance/static/tests/tours/tour_calendar_with_recurrence.js
@@ -35,13 +35,15 @@ registry.category("web_tour.tours").add("test_dblclick_event_from_calendar", {
         {
             content: "Change Scheduled End",
             trigger: "button#schedule_end_0",
-            run() {
-                const input = document.querySelector("button#schedule_end_0");
-                input.value = luxon.DateTime
-                    .fromFormat(input.value, "MM/dd/yyyy hh:mm:ss a")
+            run: "click",
+        },
+        {
+            trigger: "input#schedule_end_0",
+            async run({ edit, anchor }) {
+                const value = luxon.DateTime.fromFormat(anchor.value, "MM/dd/yyyy hh:mm:ss a")
                     .plus({ hours: 1 })
                     .toFormat("MM/dd/yyyy hh:mm:ss a");
-                input.dispatchEvent(new Event("change"));
+                await edit(value);
             },
         },
         {
diff --git a/addons/web/static/src/core/datetime/datetimepicker_service.js b/addons/web/static/src/core/datetime/datetimepicker_service.js
index 172ed5bd0e69d..afdf042431563 100644
--- a/addons/web/static/src/core/datetime/datetimepicker_service.js
+++ b/addons/web/static/src/core/datetime/datetimepicker_service.js
@@ -400,7 +400,7 @@ export const datetimePickerService = {
                         getInputs(),
                         ensureArray(pickerProps.value),
                         (el, currentValue) => {
-                            if (!el) {
+                            if (!el || el.tagName?.toLowerCase() !== "input") {
                                 return currentValue;
                             }
                             const [parsedValue, error] = safeConvert("parse", el.value);
diff --git a/addons/web/static/tests/views/list/list_view.test.js b/addons/web/static/tests/views/list/list_view.test.js
index 851b304595e21..7aa207aee3a22 100644
--- a/addons/web/static/tests/views/list/list_view.test.js
+++ b/addons/web/static/tests/views/list/list_view.test.js
@@ -7903,7 +7903,7 @@ test(`edit button does not trigger fold group`, async () => {
                 </groupby>
             </list>
         `,
-        groupBy: ['currency_id']
+        groupBy: ["currency_id"],
     });
     expect(`.o_group_open`).toHaveCount(0);
     await contains(`.o_group_header:eq(0)`).click();
@@ -19299,6 +19299,42 @@ test(`multi edition: many2many_tags add few tags in one time`, async () => {
     });
 });
 
+test.tags("desktop");
+test("multi_edit: must work for copy/paster or operation", async () => {
+    Foo._records[1].datetime = "1989-05-03 12:51:35";
+    Foo._records[2].datetime = "1987-11-13 12:12:34";
+    Foo._records[3].datetime = "2019-04-09 03:21:35";
+    await mountView({
+        resModel: "foo",
+        type: "list",
+        arch: `
+            <list multi_edit="1">
+                <field name="foo"/>
+                <field name="datetime"/>
+            </list>
+        `,
+    });
+
+    await contains(`.o_list_record_selector`).click();
+    await contains(`.o_data_cell[name=datetime]`).click();
+    await animationFrame();
+    await waitFor(`.o_datetime_picker`);
+    await contains(`input[data-field=datetime]`).edit("+125d", { confirm: "tab" });
+    expect(`tbody tr:eq(0) td[name=datetime]`).toHaveText("Jul 14, 11:30 AM");
+    await contains(`.modal button:contains(update)`).click();
+    expect(".modal").toHaveCount(0);
+    expect(queryAllTexts(`.o_data_cell`)).toEqual([
+        "yop",
+        "Jul 14, 11:30 AM",
+        "blip",
+        "Jul 14, 11:30 AM",
+        "gnap",
+        "Jul 14, 11:30 AM",
+        "blip",
+        "Jul 14, 11:30 AM",
+    ]);
+});
+
 test.tags("mobile");
 test("scroll position is restored when coming back to list view", async () => {
     Foo._views = {

From 040d735785204908905c099bab7b9667d6e8f069 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Fri, 24 Oct 2025 17:27:34 +0200
Subject: [PATCH 279/673] [FIX] html_editor: ensure qweb plugin normalizes
 early

The util function `isBlock` caches the display style of elements it
tests so it doesn't test them twice. But the qweb plugin's normalize
handler modifies some elements to give them the `data-oe-t-inline`
attribute, which in turn makes them inline whereas they were blocks
before. This means that if `isBlock` is called on these elements before
the attribute is set, it will cache the wrong value. This ensures that
the attribute is set before other normalize handlers call `isBlock`.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 addons/html_editor/static/src/others/qweb_plugin.js | 2 +-
 addons/html_editor/static/tests/qweb.test.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/html_editor/static/src/others/qweb_plugin.js b/addons/html_editor/static/src/others/qweb_plugin.js
index e799b98aa20d8..b387a77f3228e 100644
--- a/addons/html_editor/static/src/others/qweb_plugin.js
+++ b/addons/html_editor/static/src/others/qweb_plugin.js
@@ -45,7 +45,7 @@ export class QWebPlugin extends Plugin {
                 delete element.dataset.oeProtected;
             }
         },
-        normalize_handlers: this.normalize.bind(this),
+        normalize_handlers: withSequence(0, this.normalize.bind(this)),
 
         system_attributes: QWEB_DATA_ATTRIBUTES,
         unremovable_node_predicates: isUnremovableQWebElement,
diff --git a/addons/html_editor/static/tests/qweb.test.js b/addons/html_editor/static/tests/qweb.test.js
index 30a50068338e3..171d1a5f3e8c6 100644
--- a/addons/html_editor/static/tests/qweb.test.js
+++ b/addons/html_editor/static/tests/qweb.test.js
@@ -318,7 +318,7 @@ test("cleaning does not remove t-out links", async () => {
         { config }
     );
     expect(el.innerHTML.trim().replace(/\s+/g, " ")).toBe(
-        `<ul> <li> <a href="xyz" t-out="xyz" data-oe-protected="true" contenteditable="false"> </a> </li> </ul>`
+        `<ul> <li><a href="xyz" t-out="xyz" data-oe-protected="true" contenteditable="false"></a></li> </ul>`
     );
     expect(editor.getContent().trim().replace(/\s+/g, " ")).toBe(
         '<ul> <li><a href="xyz" t-out="xyz"></a></li> </ul>'

From af767754ea71976732dc6d2e39fa64b2ca71c93c Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Fri, 24 Oct 2025 17:43:24 +0200
Subject: [PATCH 280/673] [REF] html_editor, html_builder, website: add
 system_node_selectors

This introduces the `system_node_selectors` resource, which represents
nodes that should be ignored by the editor. In other words, if the
editor had a VDOM, it would be absent from it. It allows us to refactor
a little bit by better separating concerns, and paves the way for the
selection placeholder plugin.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../static/src/core/remove_plugin.js          | 20 +++++++------------
 .../background_image_option_plugin.js         |  1 +
 .../background_shape_option_plugin.js         |  1 +
 .../static/src/core/delete_plugin.js          |  6 ++++++
 .../options/background_option_plugin.js       |  1 +
 .../plugins/options/parallax_option_plugin.js |  1 +
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/addons/html_builder/static/src/core/remove_plugin.js b/addons/html_builder/static/src/core/remove_plugin.js
index c9d680dc96553..bd90e54e1be18 100644
--- a/addons/html_builder/static/src/core/remove_plugin.js
+++ b/addons/html_builder/static/src/core/remove_plugin.js
@@ -4,6 +4,7 @@ import { _t } from "@web/core/l10n/translation";
 import { unremovableNodePredicates as deletePluginPredicates } from "@html_editor/core/delete_plugin";
 import { isUnremovableQWebElement as qwebPluginPredicate } from "@html_editor/others/qweb_plugin";
 import { isEditable } from "@html_builder/utils/utils";
+import { closestElement } from "@html_editor/utils/dom_traversal";
 
 const unremovableNodePredicates = [
     (node) => !isEditable(node.parentNode),
@@ -16,15 +17,6 @@ export function isRemovable(el) {
     return !unremovableNodePredicates.some((p) => p(el));
 }
 
-const layoutElementsSelector = [
-    ".o_we_shape",
-    ".o_we_bg_filter",
-    // Website only
-    ".s_parallax_bg", // Kept for compatibility.
-    ".s_parallax_bg_wrap",
-    ".o_bg_video_container",
-].join(",");
-
 export class RemovePlugin extends Plugin {
     static id = "remove";
     static dependencies = ["builderOptions", "visibility"];
@@ -77,13 +69,15 @@ export class RemovePlugin extends Plugin {
             childrenEls.length === 1 &&
             childrenEls[0].matches("figcaption");
 
+        const systemNodeSelectors = this.getResource("system_node_selectors").join(",");
         const isEmpty =
             isEmptyFigureEl ||
             (el.textContent.trim() === "" &&
-                childrenEls.every((el) =>
-                    // Consider layout-only elements (like bg-shapes) as empty
-                    el.matches(layoutElementsSelector)
-                ));
+                (!systemNodeSelectors ||
+                    childrenEls.every((el) =>
+                        // Consider layout-only elements (like bg-shapes) as empty
+                        closestElement(el, systemNodeSelectors)
+                    )));
 
         return (
             isEmpty &&
diff --git a/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
index c3045c1c5cb66..7fded20a3bd09 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
@@ -26,6 +26,7 @@ export class BackgroundImageOptionPlugin extends Plugin {
             DynamicColorAction,
         },
         content_not_editable_selectors: ".o_we_bg_filter",
+        system_node_selectors: ".o_we_bg_filter",
         get_target_element_providers: withSequence(5, (el) => el),
     };
     /**
diff --git a/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
index 05a9b27a11c74..dfcd49fe00137 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
@@ -28,6 +28,7 @@ export class BackgroundShapeOptionPlugin extends Plugin {
             editingElement.querySelector(":scope > .o_we_bg_filter")
         ),
         content_not_editable_selectors: ".o_we_shape",
+        system_node_selectors: ".o_we_shape",
     };
     static shared = [
         "getShapeStyleUrl",
diff --git a/addons/html_editor/static/src/core/delete_plugin.js b/addons/html_editor/static/src/core/delete_plugin.js
index 92673265265d0..be6ca4c223b7c 100644
--- a/addons/html_editor/static/src/core/delete_plugin.js
+++ b/addons/html_editor/static/src/core/delete_plugin.js
@@ -1172,6 +1172,12 @@ export class DeletePlugin extends Plugin {
     }
 
     shouldSkip(leaf, blockSwitch) {
+        // A system node is a node that should be ignored by the editor. In
+        // other words, if the editor had a VDOM, it would be absent from it.
+        const systemNodeSelectors = this.getResource("system_node_selectors").join(",");
+        if (systemNodeSelectors && closestElement(leaf, systemNodeSelectors)) {
+            return true;
+        }
         if (leaf.nodeType === Node.TEXT_NODE) {
             return false;
         }
diff --git a/addons/website/static/src/builder/plugins/options/background_option_plugin.js b/addons/website/static/src/builder/plugins/options/background_option_plugin.js
index 382a60d5ea356..7eaf222244428 100644
--- a/addons/website/static/src/builder/plugins/options/background_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/background_option_plugin.js
@@ -41,6 +41,7 @@ class WebsiteBackgroundVideoPlugin extends Plugin {
             ToggleBgVideoAction,
             ReplaceBgVideoAction,
         },
+        system_node_selectors: ".o_bg_video_container",
     };
     loadReplaceBackgroundVideo() {
         return new Promise((resolve) => {
diff --git a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
index 59054bf8ce383..7bcbba6e9d948 100644
--- a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
@@ -15,6 +15,7 @@ class WebsiteParallaxPlugin extends Plugin {
         },
         on_bg_image_hide_handlers: this.onBgImageHide.bind(this),
         content_not_editable_selectors: ".s_parallax_bg, section.s_parallax > .oe_structure",
+        system_node_selectors: ".s_parallax_bg, .s_parallax_bg_wrap",
         get_target_element_providers: withSequence(1, this.getTargetElement),
     };
     setup() {

From 3f87b4a145caee0854c7d6178e76a398acd81c31 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Tue, 21 Oct 2025 09:44:22 +0200
Subject: [PATCH 281/673] [REF] html_editor, html_builder: add
 empty_node_predicates

This introduces the `empty_node_predicates` resource, which makes use of
the previously added `system_node_selectors` to further separate
concerns and refactor the remove plugin.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../static/src/core/remove_plugin.js          | 29 ++++++-------------
 .../plugins/caption_plugin/caption_plugin.js  |  7 +++++
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/addons/html_builder/static/src/core/remove_plugin.js b/addons/html_builder/static/src/core/remove_plugin.js
index bd90e54e1be18..68efca651d0f7 100644
--- a/addons/html_builder/static/src/core/remove_plugin.js
+++ b/addons/html_builder/static/src/core/remove_plugin.js
@@ -24,6 +24,14 @@ export class RemovePlugin extends Plugin {
         get_overlay_buttons: withSequence(3, {
             getButtons: this.getActiveOverlayButtons.bind(this),
         }),
+        empty_node_predicates: (el) => {
+            const systemNodeSelectors = this.getResource("system_node_selectors").join(",");
+            return (
+                el.textContent.trim() === "" &&
+                (!systemNodeSelectors ||
+                    [...el.children].every((child) => closestElement(child, systemNodeSelectors)))
+            );
+        },
     };
     static shared = ["removeElement"];
 
@@ -60,27 +68,8 @@ export class RemovePlugin extends Plugin {
     }
 
     isEmptyAndRemovable(el, optionsTargetEls) {
-        const childrenEls = [...el.children];
-        // Consider a <figure> element as empty if it only contains a
-        // <figcaption> element (e.g. when its image has just been
-        // removed).
-        const isEmptyFigureEl =
-            el.matches("figure") &&
-            childrenEls.length === 1 &&
-            childrenEls[0].matches("figcaption");
-
-        const systemNodeSelectors = this.getResource("system_node_selectors").join(",");
-        const isEmpty =
-            isEmptyFigureEl ||
-            (el.textContent.trim() === "" &&
-                (!systemNodeSelectors ||
-                    childrenEls.every((el) =>
-                        // Consider layout-only elements (like bg-shapes) as empty
-                        closestElement(el, systemNodeSelectors)
-                    )));
-
         return (
-            isEmpty &&
+            this.getResource("empty_node_predicates").some((predicate) => predicate(el)) &&
             !el.classList.contains("oe_structure") &&
             !el.parentElement.classList.contains("carousel-item") &&
             (!optionsTargetEls.includes(el) ||
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
index 413f92ffb5e26..fac090abaf2de 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
@@ -49,6 +49,13 @@ export class CaptionPlugin extends Plugin {
         ],
         image_name_predicates: [this.getImageName.bind(this)],
         link_compatible_selection_predicates: [this.isLinkAllowedOnSelection.bind(this)],
+        // Consider a <figure> element as empty if it only contains a
+        // <figcaption> element (e.g. when its image has just been
+        // removed).
+        empty_node_predicates: (el) =>
+            el.matches?.("figure") &&
+            el.children.length === 1 &&
+            el.children[0].matches("figcaption"),
         move_node_whitelist_selectors: "figure",
     };
 

From e1c80d71dc44c0b47c3e3e019df55edb2570fcf0 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Thu, 9 Oct 2025 08:48:03 +0200
Subject: [PATCH 282/673] [IMP] html_editor: remove paragraph insertion on
 click edges of editable

With the introduction of selection placeholders in the next commit,
inserting paragraphs when clicking on the edges of the editable will not
be necessary anymore.

The tests that are affected were skipped so they can be unskipped when
the placeholders are introduced.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../static/src/core/no_inline_root_plugin.js  | 39 +------------------
 .../static/tests/mouse/click.test.js          | 14 +++----
 2 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/addons/html_editor/static/src/core/no_inline_root_plugin.js b/addons/html_editor/static/src/core/no_inline_root_plugin.js
index 1aec395c6a04c..0404bce1de1d6 100644
--- a/addons/html_editor/static/src/core/no_inline_root_plugin.js
+++ b/addons/html_editor/static/src/core/no_inline_root_plugin.js
@@ -46,10 +46,7 @@ export class NoInlineRootPlugin extends Plugin {
         if (key?.startsWith("Arrow")) {
             return this.fixSelectionOnEditableRootArrowKeys(nodeAfterCursor, nodeBeforeCursor, key);
         }
-        return (
-            this.fixSelectionOnEditableRootGeneric(nodeAfterCursor, nodeBeforeCursor) ||
-            this.fixSelectionOnEditableRootCreateP(nodeAfterCursor, nodeBeforeCursor)
-        );
+        return this.fixSelectionOnEditableRootGeneric(nodeAfterCursor, nodeBeforeCursor);
     }
     /**
      * @param {Node} nodeAfterCursor
@@ -92,38 +89,4 @@ export class NoInlineRootPlugin extends Plugin {
         }
         return false;
     }
-    /**
-     * Handle cursor not next to a 'P'.
-     * Insert a new 'P' if selection resulted from a mouse click.
-     *
-     * In some situations (notably around tables and horizontal
-     * separators), the cursor could be placed having its anchorNode at
-     * the editable root, allowing the user to insert inlined text at
-     * it.
-     *
-     * @param {Node} nodeAfterCursor
-     * @param {Node} nodeBeforeCursor
-     * @returns {boolean} Whether the selection was fixed
-     */
-    fixSelectionOnEditableRootCreateP(nodeAfterCursor, nodeBeforeCursor) {
-        if (!this.isPointerDown) {
-            return false;
-        }
-
-        const baseContainer = this.dependencies.baseContainer.createBaseContainer();
-        baseContainer.append(this.document.createElement("br"));
-        if (!nodeAfterCursor) {
-            // Cursor is at the end of the editable.
-            this.editable.append(baseContainer);
-        } else if (!nodeBeforeCursor) {
-            // Cursor is at the beginning of the editable.
-            this.editable.prepend(baseContainer);
-        } else {
-            // Cursor is between two non-p blocks
-            nodeAfterCursor.before(baseContainer);
-        }
-        this.dependencies.selection.setCursorStart(baseContainer);
-        this.dependencies.history.addStep();
-        return true;
-    }
 }
diff --git a/addons/html_editor/static/tests/mouse/click.test.js b/addons/html_editor/static/tests/mouse/click.test.js
index d9d4e41f1bc54..6d0da2962bfbc 100644
--- a/addons/html_editor/static/tests/mouse/click.test.js
+++ b/addons/html_editor/static/tests/mouse/click.test.js
@@ -24,7 +24,7 @@ async function simulateMouseClick(node, before = false) {
     await pointerUp(node);
 }
 
-test("should insert a paragraph at end of editable and place cursor in it (hr)", async () => {
+test.skip("should insert a paragraph at end of editable and place cursor in it (hr)", async () => {
     await testEditor({
         contentBefore: '<hr contenteditable="false">',
         stepFunction: async (editor) => {
@@ -35,7 +35,7 @@ test("should insert a paragraph at end of editable and place cursor in it (hr)",
     });
 });
 
-test("should insert a paragraph at end of editable and place cursor in it (table)", async () => {
+test.skip("should insert a paragraph at end of editable and place cursor in it (table)", async () => {
     await testEditor({
         contentBefore: "<table></table>",
         stepFunction: async (editor) => {
@@ -46,7 +46,7 @@ test("should insert a paragraph at end of editable and place cursor in it (table
     });
 });
 
-test("should insert a paragraph at beginning of editable and place cursor in it (1)", async () => {
+test.skip("should insert a paragraph at beginning of editable and place cursor in it (1)", async () => {
     await testEditor({
         contentBefore: '<hr contenteditable="false">',
         stepFunction: async (editor) => {
@@ -56,7 +56,7 @@ test("should insert a paragraph at beginning of editable and place cursor in it
         contentAfter: "<p>[]<br></p><hr>",
     });
 });
-test("should insert a paragraph at beginning of editable and place cursor in it (2)", async () => {
+test.skip("should insert a paragraph at beginning of editable and place cursor in it (2)", async () => {
     await testEditor({
         contentBefore: "<table></table>",
         stepFunction: async (editor) => {
@@ -67,7 +67,7 @@ test("should insert a paragraph at beginning of editable and place cursor in it
     });
 });
 
-test("should insert a paragraph between the two non-P blocks and place cursor in it (1)", async () => {
+test.skip("should insert a paragraph between the two non-P blocks and place cursor in it (1)", async () => {
     await testEditor({
         contentBefore: '<hr contenteditable="false"><hr contenteditable="false">',
         stepFunction: async (editor) => {
@@ -77,7 +77,7 @@ test("should insert a paragraph between the two non-P blocks and place cursor in
         contentAfter: "<hr><p>[]<br></p><hr>",
     });
 });
-test("should insert a paragraph between the two non-P blocks and place cursor in it (2)", async () => {
+test.skip("should insert a paragraph between the two non-P blocks and place cursor in it (2)", async () => {
     await testEditor({
         contentBefore: "<table></table><table></table>",
         stepFunction: async (editor) => {
@@ -88,7 +88,7 @@ test("should insert a paragraph between the two non-P blocks and place cursor in
     });
 });
 
-test("should insert a paragraph before the table, then one after it", async () => {
+test.skip("should insert a paragraph before the table, then one after it", async () => {
     const { el } = await setupEditor("<table></table>");
     const table = el.querySelector("table");
     await simulateMouseClick(table, true);

From d63136dd0f19698e9edda733688d6daabe408ba2 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Tue, 21 Oct 2025 16:32:48 +0200
Subject: [PATCH 283/673] [IMP] html_editor: selection placeholder to counter
 selection blockers

Currently, there is no way to put our cursor between two
`contenteditable=false` blocks, between two tables, before the first
block in the editable or after the last one.

This introduces placeholder blocks with no height in these places, in
which the user can put their selection (which will show as a horizontal
blinking line). They can then start typing and the placeholder will be
persisted. At the end of the document, this is bypassed and the
placeholder will be persisted as soon as the selection is in it.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../static/src/core/drop_zone_plugin.js       |  12 +-
 .../plugins/layout_column_option_plugin.js    |  10 +
 addons/html_editor/__manifest__.py            |   1 +
 .../src/main/selection_placeholder_plugin.js  | 248 ++++++++
 .../main/selection_placeholder_plugin.scss    |  23 +
 .../static/src/main/table/table_plugin.js     |  10 +
 .../src/others/embedded_component_plugin.js   |   3 +-
 .../toggle_block_plugin.js                    |   6 +
 addons/html_editor/static/src/plugin_sets.js  |   2 +
 addons/html_editor/static/tests/align.test.js |   8 +-
 .../html_editor/static/tests/banner.test.js   |  25 +-
 .../static/tests/collaboration.test.js        | 110 +++-
 .../static/tests/color_selector.test.js       |  16 +-
 .../static/tests/columnize.test.js            |  30 +-
 addons/html_editor/static/tests/copy.test.js  |   6 +-
 .../static/tests/data-oe/protected.test.js    |  81 ++-
 .../static/tests/delete/backward.test.js      |  87 ++-
 .../static/tests/delete/delete_range.test.js  |   8 +-
 .../delete/find_adjacent_position.test.js     |   4 +
 .../tests/delete/fix_base_container.test.js   |   6 +
 .../static/tests/delete/forward.test.js       |  81 ++-
 .../static/tests/embedded_components.test.js  |  25 +-
 .../static/tests/format/bold.test.js          |   4 +-
 .../static/tests/format/italic.test.js        |   4 +-
 .../static/tests/format/remove_format.test.js |   6 +-
 .../tests/format/strike_through.test.js       |   4 +-
 .../static/tests/format/underline.test.js     |   4 +-
 addons/html_editor/static/tests/hint.test.js  |   6 +-
 .../static/tests/html_field.test.js           |  12 +-
 .../static/tests/html_migrations.test.js      |   3 +-
 addons/html_editor/static/tests/icon.test.js  |   4 +-
 .../static/tests/insert/html.test.js          |   4 +-
 .../tests/insert/paragraph_break.test.js      |  34 +-
 .../static/tests/insert/separator.test.js     |   4 +-
 .../static/tests/keyboard/arrow.test.js       |  65 +-
 .../list/automatic_list_detection.test.js     |   1 +
 .../static/tests/list/toggle_cl.test.js       |   4 +
 .../static/tests/list/toggle_ol.test.js       |   4 +
 .../static/tests/list/toggle_ul.test.js       |   4 +
 addons/html_editor/static/tests/media.test.js |   6 +-
 addons/html_editor/static/tests/misc.test.js  |  14 +-
 .../static/tests/mouse/click.test.js          |  61 +-
 .../html_editor/static/tests/movenode.test.js |   1 +
 .../static/tests/normalize.test.js            |   4 +
 .../html_editor/static/tests/powerbox.test.js |   4 +-
 .../html_editor/static/tests/sanitize.test.js |   2 +-
 .../static/tests/selection.test.js            |   2 +-
 .../tests/selection_placeholder.test.js       | 582 ++++++++++++++++++
 .../static/tests/syntax_highlighting.test.js  | 285 ++++++---
 .../static/tests/table/children.test.js       |  34 +-
 .../static/tests/table/selection.test.js      | 241 ++++++--
 .../html_editor/static/tests/table/ui.test.js | 170 +++--
 addons/html_editor/static/tests/tags.test.js  |   6 +-
 .../html_editor/static/tests/toolbar.test.js  |  12 +
 .../unbreakable/split_element_block.test.js   |   8 +-
 .../static/tests/utils/dom.test.js            |   8 +-
 .../tests/builder/builder_overlay.test.js     |   2 +-
 .../builder/invisibility_options.test.js      |   2 +-
 .../static/tests/tours/edit_link_popover.js   |   2 +-
 .../tours/snippet_editor_panel_options.js     |  20 +-
 60 files changed, 2051 insertions(+), 384 deletions(-)
 create mode 100644 addons/html_editor/static/src/main/selection_placeholder_plugin.js
 create mode 100644 addons/html_editor/static/src/main/selection_placeholder_plugin.scss
 create mode 100644 addons/html_editor/static/tests/selection_placeholder.test.js

diff --git a/addons/html_builder/static/src/core/drop_zone_plugin.js b/addons/html_builder/static/src/core/drop_zone_plugin.js
index 5db6d7137b424..91c136ae7fd1c 100644
--- a/addons/html_builder/static/src/core/drop_zone_plugin.js
+++ b/addons/html_builder/static/src/core/drop_zone_plugin.js
@@ -1,6 +1,7 @@
 import { isVisible } from "@html_builder/utils/utils";
 import { Plugin } from "@html_editor/plugin";
 import { isElement } from "@html_editor/utils/dom_info";
+import { closestElement } from "@html_editor/utils/dom_traversal";
 import { _t } from "@web/core/l10n/translation";
 
 export class DropZonePlugin extends Plugin {
@@ -25,6 +26,11 @@ export class DropZonePlugin extends Plugin {
             }
             return true;
         },
+        selection_placeholder_container_predicates: (container) => {
+            if (container.classList.contains("oe_structure")) {
+                return false;
+            }
+        },
     };
 
     setup() {
@@ -437,13 +443,17 @@ export class DropZonePlugin extends Plugin {
         { toInsertInline, isContentInIframe = true } = {}
     ) {
         const isIgnored = (el) => el.matches(".o_we_no_overlay") || !isVisible(el);
-        const hookEls = [];
+        let hookEls = [];
         for (const parentEl of selectorChildren) {
             const validChildrenEls = [...parentEl.children].filter((el) => !isIgnored(el));
             hookEls.push(...validChildrenEls);
             parentEl.prepend(this.createDropzone(parentEl));
         }
         hookEls.push(...selectorSiblings);
+        const systemNodeSelectors = this.getResource("system_node_selectors").join(",");
+        if (systemNodeSelectors) {
+            hookEls = hookEls.filter((el) => !closestElement(el, systemNodeSelectors));
+        }
 
         // Inserting the normal dropzones.
         for (const hookEl of hookEls) {
diff --git a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
index a6f3d17bb4cd8..3c1b31bfe762b 100644
--- a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
@@ -15,6 +15,16 @@ class LayoutColumnOptionPlugin extends Plugin {
         builder_actions: {
             ChangeColumnCountAction,
         },
+        selection_placeholder_container_predicates: (container) => {
+            if (container.nodeName === "DIV" && container.parentElement.classList.contains("row")) {
+                return true;
+            }
+        },
+        selection_blocker_predicates: (blocker) => {
+            if (blocker.classList.contains("row")) {
+                return false;
+            }
+        },
     };
     onCloned({ cloneEl }) {
         const cloneElClassList = cloneEl.classList;
diff --git a/addons/html_editor/__manifest__.py b/addons/html_editor/__manifest__.py
index fd357d61de619..2783518f8f749 100644
--- a/addons/html_editor/__manifest__.py
+++ b/addons/html_editor/__manifest__.py
@@ -29,6 +29,7 @@
             'html_editor/static/src/scss/html_editor.common.scss',
             'html_editor/static/src/scss/html_editor.frontend.scss',
             'html_editor/static/src/scss/base_style.scss',
+            'html_editor/static/src/main/selection_placeholder_plugin.scss',
         ],
         'web.assets_backend': [
             ('include', 'html_editor.assets_editor'),
diff --git a/addons/html_editor/static/src/main/selection_placeholder_plugin.js b/addons/html_editor/static/src/main/selection_placeholder_plugin.js
new file mode 100644
index 0000000000000..ef1f1e4dd77a1
--- /dev/null
+++ b/addons/html_editor/static/src/main/selection_placeholder_plugin.js
@@ -0,0 +1,248 @@
+import { Plugin } from "@html_editor/plugin";
+import { closestBlock, isBlock } from "@html_editor/utils/blocks";
+import { fillEmpty } from "@html_editor/utils/dom";
+import {
+    allowsParagraphRelatedElements,
+    isEmpty,
+    isNotEditableNode,
+} from "@html_editor/utils/dom_info";
+import {
+    closestElement,
+    getAdjacentNextSiblings,
+    getAdjacentPreviousSiblings,
+} from "@html_editor/utils/dom_traversal";
+import { withSequence } from "@html_editor/utils/resource";
+
+const BLINKER_CLASS = "o-horizontal-caret";
+const PLACEHOLDER_ATTRIBUTE = "data-selection-placeholder";
+const PLACEHOLDER_SELECTOR = `[${PLACEHOLDER_ATTRIBUTE}]`;
+
+export class SelectionPlaceholderPlugin extends Plugin {
+    static id = "selectionPlaceholder";
+    static dependencies = ["baseContainer", "history", "selection"];
+    resources = {
+        external_history_step_handlers: this.updatePlaceholders.bind(this),
+        normalize_handlers: this.updatePlaceholders.bind(this),
+        step_added_handlers: this.updatePlaceholders.bind(this),
+        selectionchange_handlers: (selectionData) => this.onSelectionChange(selectionData),
+        clean_for_save_handlers: withSequence(0, ({ root }) => {
+            for (const placeholder of root.querySelectorAll(PLACEHOLDER_SELECTOR)) {
+                placeholder.remove();
+            }
+        }),
+        split_element_block_overrides: ({ blockToSplit }) => {
+            if (blockToSplit.hasAttribute(PLACEHOLDER_ATTRIBUTE)) {
+                this.persistPlaceholder(blockToSplit);
+                return true;
+            }
+        },
+        selection_blocker_predicates: (blocker) => {
+            if (blocker.hasAttribute(PLACEHOLDER_ATTRIBUTE) || !isBlock(blocker)) {
+                return false;
+            } else if (isNotEditableNode(blocker)) {
+                return true;
+            }
+        },
+        selection_placeholder_container_predicates: (container) => {
+            if (!container.isContentEditable || !allowsParagraphRelatedElements(container)) {
+                return false;
+            } else if (container.getAttribute("contenteditable") === "true") {
+                return true;
+            }
+        },
+        power_buttons_visibility_predicates: ({ anchorNode }) =>
+            !closestElement(anchorNode, PLACEHOLDER_SELECTOR),
+        move_node_blacklist_selectors: PLACEHOLDER_SELECTOR,
+        system_node_selectors: PLACEHOLDER_SELECTOR,
+        system_classes: BLINKER_CLASS,
+    };
+
+    setup() {
+        this.addDomListener(
+            this.editable,
+            "focusout",
+            () => this.editable.querySelectorAll(`.${BLINKER_CLASS}`).forEach(this.cleanBlinker),
+            { isGlobal: true }
+        );
+        this.addDomListener(this.editable, "focusin", () => this.resetBlinkerClasses(), {
+            isGlobal: true,
+        });
+    }
+
+    /**
+     * Update all placeholders and blinker classes so they are present
+     * everywhere we need them, and absent wherever they are not useful.
+     */
+    updatePlaceholders() {
+        const checkPredicate = (resourceId, node) => {
+            const results = this.getResource(resourceId)
+                .map((p) => p(node))
+                .filter((result) => result !== undefined);
+            return !!results.length && results.every(Boolean);
+        };
+        const isSelectionBlocker = (node) => checkPredicate("selection_blocker_predicates", node);
+        const placeholderParents = [this.editable, ...this.editable.querySelectorAll("*")].filter(
+            (container) => checkPredicate("selection_placeholder_container_predicates", container)
+        );
+
+        // 1. Update current placeholders.
+        for (const placeholder of this.editable.querySelectorAll(PLACEHOLDER_SELECTOR)) {
+            const siblings = ["before", "after"].map((side) =>
+                getNonWhitespaceSibling(side, placeholder)
+            );
+            if (!isEmpty(placeholder) || !siblings.filter(Boolean).length) {
+                // Persist non-empty placeholders and any suddenly lonely placeholder.
+                this.persistPlaceholder(placeholder);
+            } else if (
+                !placeholderParents.includes(placeholder.parentElement) ||
+                !siblings.every((sibling) => !sibling || isSelectionBlocker(sibling))
+            ) {
+                // Remove illegitimate placeholders.
+                placeholder.remove();
+            } else {
+                // Update the margins.
+                this.applyMargin(placeholder, ...siblings);
+            }
+        }
+
+        // Get the blocks to check.
+        const blockers = [
+            ...new Set(placeholderParents.flatMap((element) => [...element.children])),
+        ].filter((element) => isSelectionBlocker(element));
+
+        // 2. Add placeholders before and after every blocker where necessary.
+        for (const blocker of blockers) {
+            for (const side of ["before", "after"]) {
+                // Get the first non-whitespace sibling.
+                const sibling = getNonWhitespaceSibling(side, blocker);
+                // Insert a placeholder if there is no such sibling or if it's a
+                // selection blocker.
+                if (!sibling || isSelectionBlocker(sibling)) {
+                    // Create the placeholder.
+                    const placeholder = this.dependencies.baseContainer.createBaseContainer();
+                    fillEmpty(placeholder);
+                    placeholder.setAttribute(PLACEHOLDER_ATTRIBUTE, "");
+                    // Position the placeholder.
+                    const siblings = side === "before" ? [sibling, blocker] : [blocker, sibling];
+                    this.applyMargin(placeholder, ...siblings);
+                    // Insert the placeholder.
+                    blocker[side](placeholder);
+                }
+            }
+        }
+        // 3. Reset blinker classes.
+        this.resetBlinkerClasses();
+    }
+
+    /**
+     * Position a placeholder between its siblings.
+     *
+     * @param {Element} placeholder
+     * @param {Element} previous
+     * @param {Element} next
+     */
+    applyMargin(placeholder, previous, next) {
+        const marginBefore = previous ? getMargin(previous, "bottom") : 0;
+        const marginAfter = next ? getMargin(next, "top") : 0;
+        const middleMargin = Math.abs(marginBefore - marginAfter) / 2;
+        if (middleMargin) {
+            const positiveMargin = Math.abs(
+                middleMargin - (marginAfter >= marginBefore ? marginAfter : marginBefore)
+            );
+            const negativeMargin = -1 - middleMargin;
+            const marginTop = marginAfter >= marginBefore ? positiveMargin : negativeMargin;
+            const marginBottom = marginAfter >= marginBefore ? negativeMargin : positiveMargin;
+            placeholder.style.margin = `${marginTop}px 0 ${marginBottom}px`;
+        }
+    }
+
+    /**
+     * Turn a selection placeholder into a real block.
+     *
+     * @param {Element} placeholder
+     */
+    persistPlaceholder(placeholder) {
+        placeholder.removeAttribute(PLACEHOLDER_ATTRIBUTE);
+        this.cleanBlinker(placeholder);
+        placeholder.removeAttribute("style");
+    }
+
+    /**
+     * Remove the horizontal caret class from a placeholder element.
+     *
+     * @param {Element} blinker
+     */
+    cleanBlinker(blinker) {
+        if (blinker.className === BLINKER_CLASS) {
+            blinker.removeAttribute("class");
+        } else {
+            blinker.classList.remove(BLINKER_CLASS);
+        }
+    }
+
+    /**
+     * Remove any irrelevant blinker class (horizontal caret) and make sure
+     * there is one on the placeholder in collapsed selection, if any.
+     *
+     * @param {import("@html_editor/core/selection_plugin").EditorSelection} selection
+     */
+    resetBlinkerClasses(selection = this.dependencies.selection.getEditableSelection()) {
+        const anchorPlaceholder =
+            selection.isCollapsed && closestElement(selection.anchorNode, PLACEHOLDER_SELECTOR);
+        if (anchorPlaceholder && this.document.activeElement.contains(anchorPlaceholder)) {
+            anchorPlaceholder.classList.add(BLINKER_CLASS);
+        }
+        for (const blinker of this.editable.querySelectorAll(`.${BLINKER_CLASS}`)) {
+            if (blinker !== anchorPlaceholder || !this.document.activeElement.contains(blinker)) {
+                this.cleanBlinker(blinker);
+            }
+        }
+    }
+
+    /**
+     * Update the placeholders' states in function of the selection, by
+     * potentially persisting one, and by reseting the blinker classes.
+     *
+     * @param {import("@html_editor/core/selection_plugin").SelectionData} selectionData
+     */
+    onSelectionChange(selectionData) {
+        const selection = selectionData.editableSelection;
+        this.resetBlinkerClasses(selection);
+        if (selection.isCollapsed) {
+            const anchor = closestElement(selection.anchorNode);
+            if (
+                closestBlock(anchor.parentElement) === this.editable &&
+                anchor?.hasAttribute(PLACEHOLDER_ATTRIBUTE) &&
+                !getNonWhitespaceSibling("next", anchor)
+            ) {
+                // If it's at the bottom of the document, just persist immediately.
+                this.persistPlaceholder(anchor);
+                this.dependencies.history.addStep();
+            }
+        }
+    }
+}
+
+/**
+ * @param {"before"|"after"} side
+ * @param {Node} node
+ * @returns {Node|undefined}
+ */
+const getNonWhitespaceSibling = (side, node) => {
+    const siblings =
+        side === "before" ? getAdjacentPreviousSiblings(node) : getAdjacentNextSiblings(node);
+    return siblings.find(
+        (sibling) => !(sibling.nodeType === Node.TEXT_NODE && !sibling.textContent.trim())
+    );
+};
+/**
+ * Get an element's top or bottom margin as a number.
+ *
+ * @param {Element} element
+ * @param {"top"|"bottom"} side
+ * @returns {Number}
+ */
+const getMargin = (element, side) =>
+    +element.ownerDocument.defaultView
+        .getComputedStyle(element)
+        [side === "top" ? "marginTop" : "marginBottom"].replace("px", "");
diff --git a/addons/html_editor/static/src/main/selection_placeholder_plugin.scss b/addons/html_editor/static/src/main/selection_placeholder_plugin.scss
new file mode 100644
index 0000000000000..c7c09b08ab9fb
--- /dev/null
+++ b/addons/html_editor/static/src/main/selection_placeholder_plugin.scss
@@ -0,0 +1,23 @@
+@keyframes blink-caret {
+    0%, 49% { opacity: 1; }
+    50%, 100% { opacity: 0; }
+}
+
+*[data-selection-placeholder] {
+    height: 0;
+    margin: 0 0 -1px; // Compensate for the border.
+    border-top: solid transparent 1px;
+    caret-color: transparent;
+    position: relative;
+
+    &.o-horizontal-caret {
+        border-top-color: gray;
+        z-index: 1;
+        animation: blink-caret 1.3s infinite;
+    }
+
+    // Disable hints:
+    &:after {
+        content: none !important;
+    }
+}
diff --git a/addons/html_editor/static/src/main/table/table_plugin.js b/addons/html_editor/static/src/main/table/table_plugin.js
index 6a483705cdec8..02e337268a827 100644
--- a/addons/html_editor/static/src/main/table/table_plugin.js
+++ b/addons/html_editor/static/src/main/table/table_plugin.js
@@ -130,6 +130,16 @@ export class TablePlugin extends Plugin {
         move_node_whitelist_selectors: "table",
         collapsed_selection_toolbar_predicate: (selectionData) =>
             !!closestElement(selectionData.editableSelection.anchorNode, ".o_selected_td"),
+        selection_blocker_predicates: (node) => {
+            if (node.nodeName === "TABLE") {
+                return true;
+            }
+        },
+        selection_placeholder_container_predicates: (container) => {
+            if (container.nodeName === "TABLE") {
+                return false;
+            }
+        },
         normalize_handlers: this.distributeTableColorsToAllCells.bind(this),
     };
 
diff --git a/addons/html_editor/static/src/others/embedded_component_plugin.js b/addons/html_editor/static/src/others/embedded_component_plugin.js
index f1d2aa032cda4..de110d4bf5c9f 100644
--- a/addons/html_editor/static/src/others/embedded_component_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_component_plugin.js
@@ -1,5 +1,6 @@
 import { nodeToTree } from "@html_editor/core/history_plugin";
 import { Plugin } from "@html_editor/plugin";
+import { withSequence } from "@html_editor/utils/resource";
 import { memoize } from "@web/core/utils/functions";
 
 /**
@@ -11,7 +12,7 @@ export class EmbeddedComponentPlugin extends Plugin {
     static dependencies = ["history", "protectedNode"];
     resources = {
         /** Handlers */
-        normalize_handlers: this.normalize.bind(this),
+        normalize_handlers: withSequence(0, this.normalize.bind(this)),
         clean_for_save_handlers: ({ root }) => this.cleanForSave(root),
         attribute_change_handlers: this.onChangeAttribute.bind(this),
         restore_savepoint_handlers: () => this.handleComponents(this.editable),
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
index 7caa1cf96e863..9bfc9bb1b7a8a 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
@@ -51,6 +51,12 @@ export class ToggleBlockPlugin extends Plugin {
             ),
         ],
         move_node_blacklist_selectors: `${toggleSelector} ${titleSelector} *`,
+        selection_blocker_predicates: (blocker) => {
+            // Prevent the insertion of selection placeholders around toggle blocks.
+            if (blocker.dataset.embedded === "toggleBlock") {
+                return false;
+            }
+        },
         powerbox_items: [
             {
                 commandId: "insertToggleBlock",
diff --git a/addons/html_editor/static/src/plugin_sets.js b/addons/html_editor/static/src/plugin_sets.js
index d15e29e145e16..0caa4baa97ac5 100644
--- a/addons/html_editor/static/src/plugin_sets.js
+++ b/addons/html_editor/static/src/plugin_sets.js
@@ -77,6 +77,7 @@ import { ImagePostProcessPlugin } from "./main/media/image_post_process_plugin";
 import { DoubleClickImagePreviewPlugin } from "./main/media/dblclick_image_preview_plugin";
 import { StylePlugin } from "./core/style_plugin";
 import { ContentEditablePlugin } from "./core/content_editable_plugin";
+import { SelectionPlaceholderPlugin } from "./main/selection_placeholder_plugin";
 
 /**
  * @typedef { Object } SharedMethods
@@ -191,6 +192,7 @@ export const MAIN_PLUGINS = [
     InlineCodePlugin,
     TableResizePlugin,
     PlaceholderPlugin,
+    SelectionPlaceholderPlugin,
 ];
 
 export const COLLABORATION_PLUGINS = [
diff --git a/addons/html_editor/static/tests/align.test.js b/addons/html_editor/static/tests/align.test.js
index 38837a0e3fa1c..66bb62607dcd0 100644
--- a/addons/html_editor/static/tests/align.test.js
+++ b/addons/html_editor/static/tests/align.test.js
@@ -36,9 +36,13 @@ describe("left", () => {
     test("should not align left a non-editable node", async () => {
         await testEditor({
             contentBefore: '<p>ab</p><div contenteditable="false"><p>c[]d</p></div>',
-            contentBeforeEdit: '<p>ab</p><div contenteditable="false"><p>c[]d</p></div>',
+            contentBeforeEdit:
+                '<p>ab</p><div contenteditable="false"><p>c[]d</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             stepFunction: alignLeft,
-            contentAfterEdit: '<p>ab</p><div contenteditable="false"><p>c[]d</p></div>',
+            contentAfterEdit:
+                '<p>ab</p><div contenteditable="false"><p>c[]d</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: '<p>ab</p><div contenteditable="false"><p>c[]d</p></div>',
         });
     });
diff --git a/addons/html_editor/static/tests/banner.test.js b/addons/html_editor/static/tests/banner.test.js
index 38d6d1c4ef8f7..e056bbabf8a6e 100644
--- a/addons/html_editor/static/tests/banner.test.js
+++ b/addons/html_editor/static/tests/banner.test.js
@@ -1,5 +1,5 @@
 import { expect, test } from "@odoo/hoot";
-import { click, manuallyDispatchProgrammaticEvent, press, waitFor } from "@odoo/hoot-dom";
+import { click, manuallyDispatchProgrammaticEvent, press, tick, waitFor } from "@odoo/hoot-dom";
 import { animationFrame } from "@odoo/hoot-mock";
 import { setupEditor } from "./_helpers/editor";
 import { getContent, setSelection } from "./_helpers/selection";
@@ -16,9 +16,10 @@ test("should insert a banner with focus inside followed by a paragraph", async (
     expect(".active .o-we-command-name").toHaveText("Banner Info");
 
     await press("enter");
+    await tick(); // Wait for selectionchange to update hints.
     expect(unformat(getContent(el))).toBe(
         unformat(
-            `<p><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                     <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>Test[]</p>
@@ -51,7 +52,7 @@ test("press 'ctrl+a' inside a banner should select all the banner content", asyn
     await press(["ctrl", "a"]);
     expect(unformat(getContent(el))).toBe(
         unformat(
-            `<p><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                     <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>[Test</p><p>Test1</p><p>Test2]</p>
@@ -76,7 +77,7 @@ test("remove all content should preserve the first paragraph tag inside the bann
     await press(["ctrl", "a"]);
     expect(unformat(getContent(el))).toBe(
         unformat(
-            `<p><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                     <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>[Test</p><p>Test1</p><p>Test2]</p>
@@ -88,7 +89,7 @@ test("remove all content should preserve the first paragraph tag inside the bann
     await press("Backspace");
     expect(unformat(getContent(el))).toBe(
         unformat(
-            `<p><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+            `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                     <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true"><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></div>
                 </div><p><br></p>`
@@ -100,9 +101,10 @@ test("Inserting a banner at the top of the editable also inserts a paragraph abo
     const { el, editor } = await setupEditor("<p>test[]</p>");
     await insertText(editor, "/bannerinfo");
     await press("enter");
+    await tick(); // Wait for selectionchange to update hints.
     expect(unformat(getContent(el))).toBe(
         unformat(
-            `<p><br></p>
+            `<p data-selection-placeholder=""><br></p>
             <div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                 <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                 <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
@@ -126,8 +128,8 @@ test("Everything gets selected with ctrl+a, including a contenteditable=false as
     await press(["ctrl", "a"]);
     await animationFrame();
     expect(getContent(el)).toBe(
-        `<div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
-                <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">[💡</i>
+        `<p data-selection-placeholder="">[<br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+                <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                 <div class="w-100 px-3" contenteditable="true">
                     <p><br></p>
                 </div>
@@ -148,7 +150,7 @@ test("Everything gets selected with ctrl+a, including a banner", async () => {
     await insertText(editor, "Test2");
     await press(["ctrl", "a"]);
     expect(getContent(el)).toBe(
-        `<p>[<br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+        `<p data-selection-placeholder="">[<br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                 <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                 <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                     <p>test</p>
@@ -168,7 +170,7 @@ test("Everything gets selected with ctrl+a, including a contenteditable=false as
     );
     await press(["ctrl", "a"]);
     expect(getContent(el)).toBe(
-        '<div data-oe-role="status" contenteditable="false" role="status">[a</div><div data-oe-role="status" contenteditable="false" role="status">b</div><p>cd]</p>'
+        '<p data-selection-placeholder="">[<br></p><div data-oe-role="status" contenteditable="false" role="status">a</div><p data-selection-placeholder=""><br></p><div data-oe-role="status" contenteditable="false" role="status">b</div><p>cd]</p>'
     );
 
     await press("Backspace");
@@ -274,8 +276,9 @@ test("should move heading element inside the banner, with paragraph element afte
     expect(".active .o-we-command-name").toHaveText("Banner Info");
 
     await press("enter");
+    await tick(); // Wait for selectionchange to update hints.
     expect(getContent(el)).toBe(
-        `<p><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
+        `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                 <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                 <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                     <h1>Test[]</h1>
diff --git a/addons/html_editor/static/tests/collaboration.test.js b/addons/html_editor/static/tests/collaboration.test.js
index 0ef527866db19..0b02b6ce02f6d 100644
--- a/addons/html_editor/static/tests/collaboration.test.js
+++ b/addons/html_editor/static/tests/collaboration.test.js
@@ -648,6 +648,7 @@ describe("data-oe-protected", () => {
                 await animationFrame();
                 expect(getContent(peerInfos.c1.editor.editable, { sortAttrs: true })).toBe(
                     unformat(`
+                        <p data-selection-placeholder=""><br></p>
                         <div contenteditable="false" data-oe-protected="true">
                             <p id="true">a<br></p>
                             <div contenteditable="true" data-oe-protected="false">
@@ -659,6 +660,7 @@ describe("data-oe-protected", () => {
                 );
                 expect(getContent(peerInfos.c2.editor.editable, { sortAttrs: true })).toBe(
                     unformat(`
+                        <p data-selection-placeholder=""><br></p>
                         <div contenteditable="false" data-oe-protected="true">
                             <p id="true"><br></p>
                             <div contenteditable="true" data-oe-protected="false">
@@ -695,6 +697,7 @@ describe("data-oe-protected", () => {
         mergePeersSteps(peerInfos);
         expect(getContent(e1.editable, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-oe-protected="true">
                     <div contenteditable="true" data-oe-protected="false">
                         <p>d</p>
@@ -705,6 +708,7 @@ describe("data-oe-protected", () => {
         );
         expect(getContent(e2.editable, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-oe-protected="true">
                     <div contenteditable="true" data-oe-protected="false">
                         <p>d</p>
@@ -784,13 +788,14 @@ describe("Collaboration with embedded components", () => {
         validateSameHistory(peerInfos);
         cleanHints(e2);
         expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-            `<div contenteditable="false" data-embedded="counter" data-oe-protected="true"></div><p>[]<br></p>`
+            `<p data-selection-placeholder=""><br></p><div contenteditable="false" data-embedded="counter" data-oe-protected="true"></div><p>[]<br></p>`
         );
         await animationFrame();
         cleanHints(e1);
         cleanHints(e2);
         expect(getContent(e1.editable, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-embedded="counter" data-oe-protected="true">
                     <span class="counter">Counter:0</span>
                 </div>
@@ -799,6 +804,7 @@ describe("Collaboration with embedded components", () => {
         );
         expect(getContent(e2.editable, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-embedded="counter" data-oe-protected="true">
                     <span class="counter">Counter:0</span>
                 </div>
@@ -962,6 +968,7 @@ describe("Collaboration with embedded components", () => {
         mergePeersSteps(peerInfos);
         // Before mount:
         let editable = unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                 <div contenteditable="true" data-embedded-editable="deep" data-oe-protected="false">
                     <p>deep12</p>
@@ -974,6 +981,7 @@ describe("Collaboration with embedded components", () => {
         await animationFrame();
         // After mount:
         editable = unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                 <div>
                     <div class="deep">
@@ -994,6 +1002,7 @@ describe("Collaboration with embedded components", () => {
         e2.shared.history.addStep();
         mergePeersSteps(peerInfos);
         editable = unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                 <div>
                     <div class="deep">
@@ -1063,6 +1072,7 @@ describe("Collaboration with embedded components", () => {
         mergePeersSteps(peerInfos);
         expect(getContent(e1.editable, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                     <div>
                         <div class="switched">
@@ -1079,6 +1089,7 @@ describe("Collaboration with embedded components", () => {
         );
         expect(getContent(e2.editable, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                     <div>
                         <div class="deep">
@@ -1139,6 +1150,7 @@ describe("Collaboration with embedded components", () => {
         e2.shared.history.addStep();
         mergePeersSteps(peerInfos);
         const editable = unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                 <div class="deep">
                     <div contenteditable="true" data-embedded-editable="deep" data-oe-protected="false">
@@ -1203,6 +1215,7 @@ describe("Collaboration with embedded components", () => {
         e2.shared.history.addStep();
         mergePeersSteps(peerInfos);
         const editable = unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                 <div class="deep">
                     <div contenteditable="true" data-embedded-editable="deep" data-oe-protected="false">
@@ -1214,6 +1227,7 @@ describe("Collaboration with embedded components", () => {
                                 </div>
                             </div>
                         </div>
+                        <p data-selection-placeholder=""><br></p>
                     </div>
                 </div>
             </div>
@@ -1381,20 +1395,20 @@ describe("Collaboration with embedded components", () => {
             const obj2 = [...peerInfos.c2.plugins.get("embeddedComponents").components][0].root.node
                 .component;
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-oe-protected="true"><div class="obj">1_1</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-oe-protected="true"><div class="obj">1_1</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-oe-protected="true"><div class="obj">1_1</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-oe-protected="true"><div class="obj">1_1</div></div><p data-selection-placeholder=""><br></p>`
             );
             obj2.embeddedState.obj["2"] = 2;
             await animationFrame();
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":1,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":1,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":1,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":1,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             const savepoint = e1.shared.history.makeSavePoint();
             delete obj2.embeddedState.obj["1"];
@@ -1402,10 +1416,10 @@ describe("Collaboration with embedded components", () => {
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             obj1.embeddedState.obj["3"] = 3;
             await animationFrame();
@@ -1416,10 +1430,10 @@ describe("Collaboration with embedded components", () => {
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":4,"previous":{"obj":{"2":2,"3":3}},"next":{"obj":{"2":2,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,3_3,4_4</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":4,"previous":{"obj":{"2":2,"3":3}},"next":{"obj":{"2":2,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,3_3,4_4</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":4,"previous":{"obj":{"2":2,"3":3}},"next":{"obj":{"2":2,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,3_3,4_4</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":4,"previous":{"obj":{"2":2,"3":3}},"next":{"obj":{"2":2,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,3_3,4_4</div></div><p data-selection-placeholder=""><br></p>`
             );
             savepoint();
             await animationFrame();
@@ -1435,10 +1449,10 @@ describe("Collaboration with embedded components", () => {
             // {2, 3, 4} to {2, 4}, and that is why it is applied correctly
             // for both users.
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"4":4}}' data-embedded-state='{"stateChangeId":9,"previous":{"obj":{"2":2}},"next":{"obj":{"2":2,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,4_4</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"4":4}}' data-embedded-state='{"stateChangeId":9,"previous":{"obj":{"2":2}},"next":{"obj":{"2":2,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,4_4</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"4":4}}' data-embedded-state='{"stateChangeId":9,"previous":{"obj":{"2":2}},"next":{"obj":{"2":2,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,4_4</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2,"4":4}}' data-embedded-state='{"stateChangeId":9,"previous":{"obj":{"2":2}},"next":{"obj":{"2":2,"4":4}}}' data-oe-protected="true"><div class="obj">2_2,4_4</div></div><p data-selection-placeholder=""><br></p>`
             );
         });
 
@@ -1506,20 +1520,20 @@ describe("Collaboration with embedded components", () => {
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3,4_4</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3,4_4</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3,4_4</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3,"4":4}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3,"4":4}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3,4_4</div></div><p data-selection-placeholder=""><br></p>`
             );
             undo(e2);
             await animationFrame();
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2,"3":3,"4":4}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2,"3":3,"4":4}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2,"3":3,"4":4}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2,"3":3,"4":4}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
         });
 
@@ -1550,10 +1564,10 @@ describe("Collaboration with embedded components", () => {
             // When steps were merged, both users updated their state with
             // both changes, even if the component was outside of the dom.
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2,"3":3}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"3":3}}}' data-oe-protected="true"><div class="obj">1_1,2_2,3_3</div></div><p data-selection-placeholder=""><br></p>`
             );
         });
 
@@ -1696,10 +1710,10 @@ describe("Collaboration with embedded components", () => {
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"1":1}}}' data-oe-protected="true"><div class="obj">1_1</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"1":1}}}' data-oe-protected="true"><div class="obj">1_1</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"1":1}}}' data-oe-protected="true"><div class="obj">1_1</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"1":1}}}' data-oe-protected="true"><div class="obj">1_1</div></div><p data-selection-placeholder=""><br></p>`
             );
         });
 
@@ -1769,21 +1783,71 @@ describe("Collaboration with embedded components", () => {
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"1":1,"2":2}}' data-embedded-state='{"stateChangeId":2,"previous":{"obj":{"1":1}},"next":{"obj":{"1":1,"2":2}}}' data-oe-protected="true"><div class="obj">1_1,2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             undo(e1);
             await animationFrame();
             mergePeersSteps(peerInfos);
             await animationFrame();
             expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div>`
+                `<p>a[]</p><div contenteditable="false" data-embedded="obj" data-embedded-props='{"obj":{"2":2}}' data-embedded-state='{"stateChangeId":3,"previous":{"obj":{"1":1,"2":2}},"next":{"obj":{"2":2}}}' data-oe-protected="true"><div class="obj">2_2</div></div><p data-selection-placeholder=""><br></p>`
             );
         });
     });
+
+    test("Should not duplicate selection placeholders", async () => {
+        const peerInfos = await setupMultiEditor({
+            peerIds: ["c1", "c2"],
+            contentBefore: '<p>a[c1}{c1][c2}{c2]</p><div data-embedded="obj"></div>',
+            Plugins: [EmbeddedComponentPlugin],
+            resources: {
+                embedded_components: [collaborativeObject],
+            },
+        });
+        const e1 = peerInfos.c1.editor;
+        const e2 = peerInfos.c2.editor;
+        const contentBefore =
+            '<p>a[]</p><div data-embedded="obj" data-oe-protected="true" contenteditable="false"><div class="obj"></div></div>' +
+            '<p data-selection-placeholder=""><br></p>';
+        await animationFrame();
+        expect(getContent(e1.editable)).toBe(contentBefore);
+        expect(getContent(e2.editable)).toBe(contentBefore);
+        e1.shared.dom.insert("b");
+        addStep(e1);
+        await animationFrame();
+        expect(getContent(e1.editable)).toBe(contentBefore.replace("a[]", "ab[]"));
+        expect(getContent(e2.editable)).toBe(contentBefore);
+        await animationFrame();
+        mergePeersSteps(peerInfos);
+        expect(getContent(e1.editable)).toBe(contentBefore.replace("a[]", "ab[]"));
+        expect(getContent(e2.editable)).toBe(contentBefore.replace("a[]", "a[]b"));
+    });
+});
+
+test("Should not duplicate selection placeholders", async () => {
+    const peerInfos = await setupMultiEditor({
+        peerIds: ["c1", "c2"],
+        contentBefore: '<p>a[c1}{c1][c2}{c2]</p><div contenteditable="false">c</div>',
+    });
+    const e1 = peerInfos.c1.editor;
+    const e2 = peerInfos.c2.editor;
+    const contentBefore =
+        '<p>a[]</p><div contenteditable="false">c</div>' +
+        '<p data-selection-placeholder=""><br></p>';
+    expect(getContent(e1.editable)).toBe(contentBefore);
+    expect(getContent(e2.editable)).toBe(contentBefore);
+    e1.shared.dom.insert("b");
+    addStep(e1);
+    expect(getContent(e1.editable)).toBe(contentBefore.replace("a[]", "ab[]"));
+    expect(getContent(e2.editable)).toBe(contentBefore);
+    await animationFrame();
+    mergePeersSteps(peerInfos);
+    expect(getContent(e1.editable)).toBe(contentBefore.replace("a[]", "ab[]"));
+    expect(getContent(e2.editable)).toBe(contentBefore.replace("a[]", "a[]b"));
 });
diff --git a/addons/html_editor/static/tests/color_selector.test.js b/addons/html_editor/static/tests/color_selector.test.js
index 53fd8fc6b62e3..0c634ad55645a 100644
--- a/addons/html_editor/static/tests/color_selector.test.js
+++ b/addons/html_editor/static/tests/color_selector.test.js
@@ -1026,7 +1026,7 @@ describe("color preview", () => {
         // Hover a color
         await hover(queryOne("button[data-color='#CE0000']"));
         expect(getContent(el)).toBe(`
-            <table class="table table-bordered o_table o_selected_table">
+            <p data-selection-placeholder=""><br></p><table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
                         <td class="o_selected_td o_selected_td_bg_color_preview" style="background-color: rgba(206, 0, 0, 0.6); ${defaultTextColor}">
@@ -1039,13 +1039,13 @@ describe("color preview", () => {
                         </td>
                     </tr>
                 </tbody>
-            </table>
+            </table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `);
         // Hover out
         await hover(queryOne(".o-we-toolbar .o-select-color-foreground"));
         await animationFrame();
         expect(getContent(el)).toBe(`
-            <table class="table table-bordered o_table o_selected_table">
+            <p data-selection-placeholder=""><br></p><table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
                         <td class="o_selected_td">
@@ -1058,7 +1058,7 @@ describe("color preview", () => {
                         </td>
                     </tr>
                 </tbody>
-            </table>
+            </table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `);
         await expectElementCount(".o-we-toolbar", 1);
     });
@@ -1094,7 +1094,7 @@ describe("color preview", () => {
         // Hover a color
         await hover(queryOne("button[data-color='black']"));
         expect(getContent(el)).toBe(`
-            <table class="table table-bordered o_table o_selected_table">
+            <p data-selection-placeholder=""><br></p><table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
                         <td class="o_selected_td o_selected_td_bg_color_preview bg-black" style="${defaultTextColor}">
@@ -1107,13 +1107,13 @@ describe("color preview", () => {
                         </td>
                     </tr>
                 </tbody>
-            </table>
+            </table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `);
         // Hover out
         await hover(queryOne(".o-we-toolbar .o-select-color-foreground"));
         await animationFrame();
         expect(getContent(el)).toBe(`
-            <table class="table table-bordered o_table o_selected_table">
+            <p data-selection-placeholder=""><br></p><table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
                         <td class="o_selected_td">
@@ -1126,7 +1126,7 @@ describe("color preview", () => {
                         </td>
                     </tr>
                 </tbody>
-            </table>
+            </table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `);
         await expectElementCount(".o-we-toolbar", 1);
     });
diff --git a/addons/html_editor/static/tests/columnize.test.js b/addons/html_editor/static/tests/columnize.test.js
index 098ecc3ba0d85..ca0f6afb0755a 100644
--- a/addons/html_editor/static/tests/columnize.test.js
+++ b/addons/html_editor/static/tests/columnize.test.js
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "@odoo/hoot";
-import { press, queryAllTexts } from "@odoo/hoot-dom";
+import { press, queryAllTexts, tick } from "@odoo/hoot-dom";
 import { animationFrame } from "@odoo/hoot-mock";
 import { setupEditor, testEditor } from "./_helpers/editor";
 import { getContent, setSelection } from "./_helpers/selection";
@@ -16,7 +16,7 @@ function column(size, contents) {
 }
 
 function columsDuringEditContainer(contents) {
-    return `<div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row">${contents}</div></div>`;
+    return `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row">${contents}</div></div>`;
 }
 
 function columnDuringEdit(size, contents) {
@@ -42,7 +42,7 @@ describe("2 columns", () => {
                 columsDuringEditContainer(
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint">[]<br></p>`) +
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ),
+                ) + '<p data-selection-placeholder=""><br></p>',
             /* eslint-enable */
         });
     });
@@ -57,9 +57,9 @@ describe("2 columns", () => {
                 ),
             contentAfterEdit:
                 columsDuringEditContainer(
-                    columnDuringEdit(6, `<table><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td></tr></tbody></table>`) +
+                    columnDuringEdit(6, `<p data-selection-placeholder=""><br></p><table><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td></tr></tbody></table><p data-selection-placeholder=""><br></p>`) +
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ),
+                ) + '<p data-selection-placeholder=""><br></p>',
             /* eslint-enable */
         });
     });
@@ -134,7 +134,7 @@ describe("2 columns", () => {
 
         await press("enter");
         expect(getContent(el)).toBe(
-            `<div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
         );
 
         await insertText(editor, "/columns");
@@ -158,7 +158,7 @@ describe("3 columns", () => {
                     columnDuringEdit(4, "<p>abcd</p>") +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint">[]<br></p>`)
-                ),
+                ) + '<p data-selection-placeholder=""><br></p>',
             /* eslint-enable */
             stepFunction: columnize(3),
             contentAfter: columnsContainer(
@@ -227,7 +227,7 @@ describe("3 columns", () => {
 
         await press("enter");
         expect(getContent(el)).toBe(
-            `<div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-4 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-4 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
         );
 
         await insertText(editor, "/columns");
@@ -313,7 +313,7 @@ describe("4 columns", () => {
 
         await press("enter");
         expect(getContent(el)).toBe(
-            `<div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-3 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-3 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
         );
 
         await insertText(editor, "/columns");
@@ -383,7 +383,7 @@ describe("remove columns", () => {
         // add 2 columns
         await press("enter");
         expect(getContent(el)).toBe(
-            `<div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
         );
 
         await insertText(editor, "/removecolumns");
@@ -473,6 +473,7 @@ describe("selection", () => {
                 const lastP = children[children.length - 1];
                 lastP.innerHTML = "ab";
                 setSelection({ anchorNode: lastP.firstChild, anchorOffset: 0 });
+                await tick(); // wait for trailing placeholder to be persisted via selectionchange
                 await press(["shift", "arrowUp"]);
             },
             contentAfter:
@@ -490,6 +491,9 @@ describe("selection", () => {
                 const children = editable.querySelectorAll("p");
                 const lastP = children[children.length - 1];
                 lastP.innerHTML = "ab";
+                // Persist the trailing placeholder
+                setSelection({ anchorNode: lastP.lastChild, anchorOffset: nodeSize(lastP) });
+                await tick();
                 const firstP = children[0];
                 setSelection({ anchorNode: firstP.lastChild, anchorOffset: nodeSize(firstP) });
                 await press(["shift", "arrowDown"]);
@@ -517,7 +521,7 @@ describe("helper hint", () => {
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint">[]<br></p>`) +
                     columnDuringEdit(4, `<h1 o-we-hint-text="Heading 1" class="o-we-hint"><br></h1>` + "<h2><br></h2>") +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ),
+                ) + '<p data-selection-placeholder=""><br></p>',
             /* eslint-enable */
         });
     });
@@ -536,7 +540,7 @@ describe("helper hint", () => {
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, "<h1><br></h1>" + `<h2 o-we-hint-text="Heading 2" class="o-we-hint">[]<br></h2>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ),
+                ) + '<p data-selection-placeholder=""><br></p>',
             /* eslint-enable */
         });
     });
@@ -555,7 +559,7 @@ describe("helper hint", () => {
                     columnDuringEdit(4, "<p><br></p>" + `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ),
+                ) + '<p data-selection-placeholder=""><br></p>',
             /* eslint-enable */
         });
     });
diff --git a/addons/html_editor/static/tests/copy.test.js b/addons/html_editor/static/tests/copy.test.js
index 97175b05340de..cf643e8e516f8 100644
--- a/addons/html_editor/static/tests/copy.test.js
+++ b/addons/html_editor/static/tests/copy.test.js
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "@odoo/hoot";
 import { press } from "@odoo/hoot-dom";
 import { setupEditor } from "./_helpers/editor";
+import { MAIN_PLUGINS } from "@html_editor/plugin_sets";
 
 describe("range collapsed", () => {
     test("should ignore copying an empty selection with empty clipboardData", async () => {
@@ -43,7 +44,10 @@ describe("range not collapsed", () => {
     test.tags("focus required");
     test("should copy a selection as text/plain, text/html and application/vnd.odoo.odoo-editor in table", async () => {
         await setupEditor(
-            `]<table><tbody><tr><td><ul><li>a[</li><li>b</li><li>c</li></ul></td><td><br></td></tr></tbody></table>`
+            `]<table><tbody><tr><td><ul><li>a[</li><li>b</li><li>c</li></ul></td><td><br></td></tr></tbody></table>`,
+            // Exclude the selection placeholder plugin so we have a DOM that
+            // really starts with a table.
+            { config: { Plugins: MAIN_PLUGINS.filter((p) => p.id !== "selectionPlaceholder") } }
         );
         const clipboardData = new DataTransfer();
         await press(["ctrl", "c"], { dataTransfer: clipboardData });
diff --git a/addons/html_editor/static/tests/data-oe/protected.test.js b/addons/html_editor/static/tests/data-oe/protected.test.js
index 2904b6a4055bf..39feb4d2191e6 100644
--- a/addons/html_editor/static/tests/data-oe/protected.test.js
+++ b/addons/html_editor/static/tests/data-oe/protected.test.js
@@ -27,6 +27,7 @@ test("should ignore protected elements children mutations (true)", async () => {
         contentAfterEdit: unformat(`
                 <div><p>ab[]</p></div>
                 <div data-oe-protected="true" contenteditable="false"><p>ab</p></div>
+                <p data-selection-placeholder=""><br></p>
                 `),
     });
 });
@@ -49,6 +50,7 @@ test("should not ignore unprotected elements children mutations (false)", async
         contentAfterEdit: unformat(`
                 <div><p>abc</p></div>
                 <div data-oe-protected="true" contenteditable="false"><div data-oe-protected="false" contenteditable="true"><p>ab[]</p></div></div>
+                <p data-selection-placeholder=""><br></p>
                 `),
     });
 });
@@ -92,6 +94,7 @@ test("should not normalize protected elements children (true)", async () => {
                     <p><i class="fa"></i></p>
                     <ul><li>abc<p><br></p></li></ul>
                 </div>
+                <p data-selection-placeholder=""><br></p>
                 `),
     });
 });
@@ -122,8 +125,9 @@ test("should normalize unprotected elements children (false)", async () => {
                     </div>
                 </div>
                 `),
-        contentAfterEdit: unformat(`
-                <div data-oe-protected="true" contenteditable="false">
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <div data-oe-protected="true" contenteditable="false">
                     <p><i class="fa"></i></p>
                     <ul><li>abc<p><br></p></li></ul>
                     <div data-oe-protected="false" contenteditable="true">
@@ -131,7 +135,8 @@ test("should normalize unprotected elements children (false)", async () => {
                         <ul><li><p>abc</p><p><br></p></li></ul>
                     </div>
                 </div>
-                `),
+                <p data-selection-placeholder=""><br></p>`
+        ),
     });
 });
 
@@ -142,11 +147,13 @@ test("should not handle table selection in protected elements children (true)",
                     <p>a[bc</p><table><tbody><tr><td>a]b</td><td>cd</td><td>ef</td></tr></tbody></table>
                 </div>
                 `),
-        contentAfterEdit: unformat(`
-                <div data-oe-protected="true" contenteditable="false">
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <div data-oe-protected="true" contenteditable="false">
                     <p>a[bc</p><table><tbody><tr><td>a]b</td><td>cd</td><td>ef</td></tr></tbody></table>
                 </div>
-                `),
+                <p data-selection-placeholder=""><br></p>`
+        ),
     });
 });
 
@@ -159,8 +166,9 @@ test("should handle table selection in unprotected elements", async () => {
                     </div>
                 </div>
                 `),
-        contentAfterEdit: unformat(`
-                <div data-oe-protected="true" contenteditable="false">
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <div data-oe-protected="true" contenteditable="false">
                     <div data-oe-protected="false" contenteditable="true">
                         <p>a[bc</p>
                         <table class="o_selected_table"><tbody><tr>
@@ -168,9 +176,11 @@ test("should handle table selection in unprotected elements", async () => {
                             <td class="o_selected_td">cd</td>
                             <td class="o_selected_td">ef]</td>
                         </tr></tbody></table>
+                        <p data-selection-placeholder=""><br></p>
                     </div>
                 </div>
-                `),
+                <p data-selection-placeholder=""><br></p>`
+        ),
     });
 });
 
@@ -187,8 +197,9 @@ test("should not remove contenteditable attribute of a protected node", async ()
                     </div>
                 </div>
             `),
-        contentAfterEdit: unformat(`
-                <div data-oe-protected="true" contenteditable="false">
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <div data-oe-protected="true" contenteditable="false">
                     <p contenteditable="true">content</p>
                     <table contenteditable="true">
                         <tbody><tr><td>ab</td></tr></tbody>
@@ -197,7 +208,8 @@ test("should not remove contenteditable attribute of a protected node", async ()
                         <p>content</p>
                     </div>
                 </div>
-            `),
+                <p data-selection-placeholder=""><br></p>`
+        ),
     });
 });
 
@@ -215,8 +227,9 @@ test("should not select a protected table even if it is contenteditable='true'",
                     </tr></tbody></table>
                 </div>
             `),
-        contentAfterEdit: unformat(`
-                <div data-oe-protected="true" contenteditable="false">
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <div data-oe-protected="true" contenteditable="false">
                     <table contenteditable="true"><tbody><tr>
                         <td>[ab</td>
                     </tr></tbody></table>
@@ -224,7 +237,8 @@ test("should not select a protected table even if it is contenteditable='true'",
                         <td>cd]</td>
                     </tr></tbody></table>
                 </div>
-            `),
+                <p data-selection-placeholder=""><br></p>`
+        ),
     });
 });
 
@@ -247,9 +261,14 @@ test("select a protected element shouldn't open the toolbar", async () => {
     await expectElementCount(".o-we-toolbar", 1);
 });
 
+const configWithoutSelectionPlaceholder = {
+    config: { Plugins: MAIN_PLUGINS.filter((p) => p.id !== "selectionPlaceholder") },
+};
+
 test("should protect disconnected nodes", async () => {
     const { editor, el, plugins } = await setupEditor(
-        `<div data-oe-protected="true"><p>a</p></div><p>a</p>`
+        `<div data-oe-protected="true"><p>a</p></div><p>a</p>`,
+        configWithoutSelectionPlaceholder
     );
     const div = el.querySelector("div");
     const protectedP = div.querySelector("p");
@@ -266,7 +285,8 @@ test("should protect disconnected nodes", async () => {
 
 test("should not crash when changing attributes and removing a protecting anchor", async () => {
     const { editor, el, plugins } = await setupEditor(
-        `<div data-oe-protected="true" data-attr="value"><p>a</p></div><p>a</p>`
+        `<div data-oe-protected="true" data-attr="value"><p>a</p></div><p>a</p>`,
+        configWithoutSelectionPlaceholder
     );
     const div = el.querySelector("div");
     div.dataset.attr = "other";
@@ -291,7 +311,7 @@ test("removing a protected node should be undo-able", async () => {
     expect(getContent(el)).toBe(`<p>[]a</p>`);
     undo(editor);
     expect(getContent(el)).toBe(
-        `<div data-oe-protected="true" contenteditable="false"><p>a</p></div><p>[]a</p>`
+        `<p data-selection-placeholder=""><br></p><div data-oe-protected="true" contenteditable="false"><p>a</p></div><p>[]a</p>`
     );
 });
 
@@ -336,6 +356,7 @@ test("removing a recursively protected then unprotected node should be undo-able
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <p>a</p>
                 <div data-oe-protected="false" contenteditable="true">
@@ -376,7 +397,9 @@ test("removing a protected node and then removing its protected parent should be
     editor.shared.history.addStep();
     expect(editor.shared.history.getHistorySteps().length).toBe(1);
     expect(historyPlugin.currentStep.mutations).toEqual([]);
-    expect(getContent(el)).toBe(`<div data-oe-protected="true" contenteditable="false"></div>`);
+    expect(getContent(el)).toBe(
+        `<p data-selection-placeholder=""><br></p><div data-oe-protected="true" contenteditable="false"></div><p data-selection-placeholder=""><br></p>`
+    );
 });
 
 test("removing a protected ancestor, then a protected descendant, then its protected parent should be ignored", async () => {
@@ -403,7 +426,9 @@ test("removing a protected ancestor, then a protected descendant, then its prote
     editor.shared.history.addStep();
     expect(editor.shared.history.getHistorySteps().length).toBe(1);
     expect(historyPlugin.currentStep.mutations).toEqual([]);
-    expect(getContent(el)).toBe(`<div data-oe-protected="true" contenteditable="false"></div>`);
+    expect(getContent(el)).toBe(
+        `<p data-selection-placeholder=""><br></p><div data-oe-protected="true" contenteditable="false"></div><p data-selection-placeholder=""><br></p>`
+    );
 });
 
 test("moving a protected node at an unprotected location, only remove should be ignored", async () => {
@@ -432,12 +457,15 @@ test("moving a protected node at an unprotected location, only remove should be
     expect(historyPlugin.nodeMap.getNode(lastStep.mutations[0].nodeId)).toBe(a);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <div class="b" data-oe-protected="false" contenteditable="true">
                     <p class="a"></p>
                 </div>
             </div>
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false"></div>
+            <p data-selection-placeholder=""><br></p>
         `)
     );
 });
@@ -468,12 +496,15 @@ test("moving an unprotected node at a protected location, only add should be ign
     expect(historyPlugin.nodeMap.getNode(lastStep.mutations[0].nodeId)).toBe(a);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <div data-oe-protected="false" contenteditable="true"></div>
             </div>
+            <p data-selection-placeholder=""><br></p>
             <div class="b" data-oe-protected="true" contenteditable="false">
                 <p class="a">content</p>
             </div>
+            <p data-selection-placeholder=""><br></p>
         `)
     );
 });
@@ -498,20 +529,24 @@ test("sequentially added nodes under a protecting parent are correctly protected
     expect(protectedPlugin.protectedNodes.has(node)).toBe(true);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <div>a</div>
                 content
             </div>
+            <p data-selection-placeholder=""><br></p>
         `)
     );
     node.remove();
     editor.shared.history.addStep();
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <div></div>
                 content
             </div>
+            <p data-selection-placeholder=""><br></p>
         `)
     );
     expect(editor.shared.history.getHistorySteps().length).toBe(1);
@@ -541,6 +576,7 @@ test("don't protect a node under data-oe-protected='false' through delete and un
     expect(protectedPlugin.protectedNodes.has(node)).toBe(false);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <div data-oe-protected="false" contenteditable="true">
                     <p>b</p>
@@ -554,6 +590,7 @@ test("don't protect a node under data-oe-protected='false' through delete and un
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <div data-oe-protected="true" contenteditable="false">
                 <div data-oe-protected="false" contenteditable="true">
                     <p>b</p>
@@ -606,5 +643,7 @@ test("protected plugin is robust against other plugins which can filter mutation
     editor.shared.history.addStep();
     expect(editor.shared.history.getHistorySteps().length).toBe(1);
     expect(historyPlugin.currentStep.mutations).toEqual([]);
-    expect(getContent(el)).toBe(`<div data-oe-protected="true" contenteditable="false"></div>`);
+    expect(getContent(el)).toBe(
+        `<p data-selection-placeholder=""><br></p><div data-oe-protected="true" contenteditable="false"></div><p data-selection-placeholder=""><br></p>`
+    );
 });
diff --git a/addons/html_editor/static/tests/delete/backward.test.js b/addons/html_editor/static/tests/delete/backward.test.js
index 85ed9861d76fc..78fb84d5d9efc 100644
--- a/addons/html_editor/static/tests/delete/backward.test.js
+++ b/addons/html_editor/static/tests/delete/backward.test.js
@@ -848,9 +848,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>abcd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "abcd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(2),
-                    contentAfterEdit: highlightedPre({ value: "acd", textareaRange: 1 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "acd", textareaRange: 1 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">acd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -860,9 +866,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     abcd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     abcd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     abcd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // ab[]cd
-                    contentAfterEdit: highlightedPre({ value: "     acd", textareaRange: 6 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     acd", textareaRange: 6 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     acd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -872,9 +884,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>abcd     </pre>",
-                    contentBeforeEdit: highlightedPre({ value: "abcd     " }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd     " }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(2),
-                    contentAfterEdit: highlightedPre({ value: "acd     ", textareaRange: 1 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "acd     ", textareaRange: 1 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">acd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -884,9 +902,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     abcd     </pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     abcd     " }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     abcd     " }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // ab[]cd
-                    contentAfterEdit: highlightedPre({ value: "     acd     ", textareaRange: 6 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     acd     ", textareaRange: 6 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     acd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -896,9 +920,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     ab</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     ab" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     ab" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(3), // "   []  ab"
-                    contentAfterEdit: highlightedPre({ value: "    ab", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "    ab", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">    ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -908,9 +938,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>ab\ncd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "ab\ncd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab\ncd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(3), // ab\n[]cd
-                    contentAfterEdit: highlightedPre({ value: "abcd", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -920,7 +956,10 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     ab</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     ab" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     ab" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(5)(editor); // "     []ab"
                         await testDeleteInCodeBlock(4)(editor); // "    []ab"
@@ -928,7 +967,10 @@ describe("Selection collapsed", () => {
                         await testDeleteInCodeBlock(2)(editor); // "  []ab"
                         await testDeleteInCodeBlock(1)(editor); // " []ab"
                     },
-                    contentAfterEdit: highlightedPre({ value: "ab", textareaRange: 0 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab", textareaRange: 0 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -938,7 +980,10 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>ab     </pre>",
-                    contentBeforeEdit: highlightedPre({ value: "ab     " }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab     " }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(7)(editor); // "ab     []"
                         await testDeleteInCodeBlock(6)(editor); // "ab    []"
@@ -946,7 +991,10 @@ describe("Selection collapsed", () => {
                         await testDeleteInCodeBlock(4)(editor); // "ab  []"
                         await testDeleteInCodeBlock(3)(editor); // "ab []"
                     },
-                    contentAfterEdit: highlightedPre({ value: "ab", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -1274,6 +1322,7 @@ describe("Selection collapsed", () => {
         test("should remove the uneditable nesting zone from the outside", async () => {
             await testEditor({
                 contentBefore: unformat(`
+                        <p data-selection-placeholder=""><br></p>
                         <div contenteditable="false">
                             <div contenteditable="true">
                                 <p>content</p>
@@ -2025,10 +2074,12 @@ describe("Selection not collapsed", () => {
                 </tbody></table>`
             ),
             contentBeforeEdit: unformat(
-                `[<table class="o_selected_table"><tbody>
+                `[<p data-selection-placeholder=""><br></p>
+                <table class="o_selected_table"><tbody>
                     <tr><td class="o_selected_td"><br></td><td class="o_selected_td"><br></td></tr>
                     <tr><td class="o_selected_td"><br></td><td class="o_selected_td">]<br></td></tr>
-                </tbody></table>`
+                </tbody></table>
+                <p data-selection-placeholder=""><br></p>`
             ),
             stepFunction: deleteBackward,
             contentAfter: unformat("<p>[]<br></p>"),
diff --git a/addons/html_editor/static/tests/delete/delete_range.test.js b/addons/html_editor/static/tests/delete/delete_range.test.js
index b1f2a1a5d4a40..c7b6cc6011b63 100644
--- a/addons/html_editor/static/tests/delete/delete_range.test.js
+++ b/addons/html_editor/static/tests/delete/delete_range.test.js
@@ -245,7 +245,8 @@ describe("deleteRange method", () => {
                 `[<table><tbody>
                     <tr><td><br></td><td><br></td></tr>
                     <tr><td>]<br></td><td><br></td></tr>
-                </tbody></table>`
+                </tbody></table>
+                <p data-selection-placeholder=""><br></p>`
             );
             expect(getContent(el)).toBe(contentAfter);
         });
@@ -254,7 +255,7 @@ describe("deleteRange method", () => {
         test("should not fill a HR with BR", async () => {
             const { editor, el } = await setupEditor("<hr><p>abc[</p><p>]def</p>");
             deleteRange(editor);
-            const hr = el.firstElementChild;
+            const hr = el.querySelector("hr");
             expect(hr.childNodes.length).toBe(0);
         });
     });
@@ -408,7 +409,8 @@ describe("deleteSelection", () => {
                     ),
                     stepFunction: deleteSelection,
                     contentAfterEdit: unformat(
-                        `<div class="container o_text_columns o-contenteditable-false" contenteditable="false">
+                        `<p data-selection-placeholder=""><br></p>
+                        <div class="container o_text_columns o-contenteditable-false" contenteditable="false">
                             <div class="row">
                                 <div class="col-6 o-contenteditable-true" contenteditable="true">a[]</div>
                                 <div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div>
diff --git a/addons/html_editor/static/tests/delete/find_adjacent_position.test.js b/addons/html_editor/static/tests/delete/find_adjacent_position.test.js
index b0d07307fef65..7d499d782540a 100644
--- a/addons/html_editor/static/tests/delete/find_adjacent_position.test.js
+++ b/addons/html_editor/static/tests/delete/find_adjacent_position.test.js
@@ -140,6 +140,7 @@ describe("findAdjacentPosition method", () => {
     describe("Different editable zones", () => {
         test("should find adjacent character", async () => {
             const previous = unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false">
                     <p>abc</p>
                     <p contenteditable="true">[]def</p>
@@ -147,6 +148,7 @@ describe("findAdjacentPosition method", () => {
                 <p>fgh</p>
             `);
             const next = unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false">
                     <p>abc</p>
                     <p contenteditable="true">d[]ef</p>
@@ -201,6 +203,7 @@ describe("findAdjacentPosition method", () => {
                 // it's the desirable one to compose a range for deletion,
                 // allowing to remove the div with deleteBackward
                 unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     []<div contenteditable="false">
                         <p>abc</p>
                         <p contenteditable="true">def</p>
@@ -231,6 +234,7 @@ describe("findAdjacentPosition method", () => {
                         <p>abc</p>
                         <p contenteditable="true">def</p>
                     </div>[]
+                    <p data-selection-placeholder=""><br></p>
                 `)
             );
         });
diff --git a/addons/html_editor/static/tests/delete/fix_base_container.test.js b/addons/html_editor/static/tests/delete/fix_base_container.test.js
index 039c28e541b4d..bcceadb725675 100644
--- a/addons/html_editor/static/tests/delete/fix_base_container.test.js
+++ b/addons/html_editor/static/tests/delete/fix_base_container.test.js
@@ -141,11 +141,13 @@ describe("Adjust base container on delete", () => {
             },
             // The P is added by the deletion, not by `cleanEmptyStructuralContainers`.
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false">
                     <div contenteditable="true">
                         <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -162,11 +164,13 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false">
                     <div contenteditable="true">
                         <div class="o-paragraph o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></div>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -253,11 +257,13 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false">
                     <div contenteditable="true">
                         <div class="o-paragraph o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></div>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
diff --git a/addons/html_editor/static/tests/delete/forward.test.js b/addons/html_editor/static/tests/delete/forward.test.js
index 9e921053830b3..d9656225dc431 100644
--- a/addons/html_editor/static/tests/delete/forward.test.js
+++ b/addons/html_editor/static/tests/delete/forward.test.js
@@ -752,9 +752,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>abcd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "abcd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "ab[]cd"
-                    contentAfterEdit: highlightedPre({ value: "abd", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abd", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -764,9 +770,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     abcd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     abcd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     abcd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // "     ab[]cd"
-                    contentAfterEdit: highlightedPre({ value: "     abd", textareaRange: 7 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     abd", textareaRange: 7 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     abd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -776,9 +788,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>abcd     </pre>",
-                    contentBeforeEdit: highlightedPre({ value: "abcd     " }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd     " }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "ab[]cd     "
-                    contentAfterEdit: highlightedPre({ value: "abd     ", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abd     ", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -788,9 +806,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     abcd     </pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     abcd     " }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     abcd     " }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // "     ab[]cd     "
-                    contentAfterEdit: highlightedPre({ value: "     abd     ", textareaRange: 7 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     abd     ", textareaRange: 7 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     abd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -800,9 +824,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     ab</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     ab" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     ab" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "  []   ab"
-                    contentAfterEdit: highlightedPre({ value: "    ab", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "    ab", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">    ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -812,9 +842,15 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>ab\ncd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "ab\ncd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab\ncd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "ab[]\ncd"
-                    contentAfterEdit: highlightedPre({ value: "abcd", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -824,7 +860,10 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>     ab</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "     ab" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "     ab" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(0)(editor); // "[]     ab"
                         await testDeleteInCodeBlock(0)(editor); // "[]    ab"
@@ -832,7 +871,10 @@ describe("Selection collapsed", () => {
                         await testDeleteInCodeBlock(0)(editor); // "[]  ab"
                         await testDeleteInCodeBlock(0)(editor); // "[] ab"
                     },
-                    contentAfterEdit: highlightedPre({ value: "ab", textareaRange: 0 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab", textareaRange: 0 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -842,7 +884,10 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>ab     </pre>",
-                    contentBeforeEdit: highlightedPre({ value: "ab     " }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab     " }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(2)(editor); // "ab[]     "
                         await testDeleteInCodeBlock(2)(editor); // "ab[]    "
@@ -850,7 +895,10 @@ describe("Selection collapsed", () => {
                         await testDeleteInCodeBlock(2)(editor); // "ab[]  "
                         await testDeleteInCodeBlock(2)(editor); // "ab[] "
                     },
-                    contentAfterEdit: highlightedPre({ value: "ab", textareaRange: 2 }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "ab", textareaRange: 2 }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -1131,6 +1179,7 @@ describe("Selection collapsed", () => {
                                 <p>content</p>
                             </div>
                         </div>
+                        <p data-selection-placeholder=""><br></p>
                     `),
                 stepFunction: deleteForward,
                 contentAfter: unformat(`
diff --git a/addons/html_editor/static/tests/embedded_components.test.js b/addons/html_editor/static/tests/embedded_components.test.js
index cefed6a094005..8c82201613fce 100644
--- a/addons/html_editor/static/tests/embedded_components.test.js
+++ b/addons/html_editor/static/tests/embedded_components.test.js
@@ -385,16 +385,19 @@ describe("Mount and Destroy embedded components", () => {
         expect.verifySteps(["mount 1", "mount 2", "mount 3"]);
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false">
                     <div>
                         <div class="click count-2">Count:2</div>
                         <div class="innerEditable-2">
                             <div data-prop-name="innerValue" data-oe-protected="false" contenteditable="true">
+                                <p data-selection-placeholder=""><br></p>
                                 <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false">
                                     <div>
                                         <div class="click count-1">Count:1</div>
                                         <div class="innerEditable-1">
                                             <div data-prop-name="innerValue" data-oe-protected="false" contenteditable="true">
+                                                <p data-selection-placeholder=""><br></p>
                                                 <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false">
                                                     <div>
                                                         <div class="click count-3">Count:3</div>
@@ -405,10 +408,12 @@ describe("Mount and Destroy embedded components", () => {
                                                         </div>
                                                     </div>
                                                 </div>
+                                                <p data-selection-placeholder=""><br></p>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
+                                <p data-selection-placeholder=""><br></p>
                             </div>
                         </div>
                     </div>
@@ -438,6 +443,7 @@ describe("Mount and Destroy embedded components", () => {
         // outermost host.
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false"></div>
                 <p class="target o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></p>
             `)
@@ -579,6 +585,7 @@ describe("Selection after embedded component insertion", () => {
         cleanHints(editor);
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div>
                 <p>[]<br></p>`)
         );
@@ -608,6 +615,7 @@ describe("Selection after embedded component insertion", () => {
         cleanHints(editor);
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div>
                 <p>[]a</p>`)
         );
@@ -930,7 +938,7 @@ describe("In-editor manipulations", () => {
         );
         cleanHints(editor);
         expect(getContent(el)).toBe(
-            `<div><p>a</p></div><div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div>`
+            `<div><p>a</p></div><div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div><p data-selection-placeholder=""><br></p>`
         );
     });
 
@@ -944,7 +952,7 @@ describe("In-editor manipulations", () => {
         const historyPlugin = plugins.get("history");
         const node = historyPlugin._unserializeNode(historyPlugin.serializeNode(el))[0];
         expect(getContent(node, { sortAttrs: true })).toBe(
-            `<div><p>a</p></div><div contenteditable="false" data-embedded="counter" data-oe-protected="true"></div>`
+            `<div><p>a</p></div><div contenteditable="false" data-embedded="counter" data-oe-protected="true"></div><p data-selection-placeholder=""><br></p>`
         );
     });
 
@@ -1001,6 +1009,7 @@ describe("editable descendants", () => {
         );
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
                     <div class="shallow">
                         <div data-embedded-editable="shallow" data-oe-protected="false" contenteditable="true">
@@ -1015,6 +1024,7 @@ describe("editable descendants", () => {
                         </div>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
     });
@@ -1048,9 +1058,11 @@ describe("editable descendants", () => {
         await animationFrame();
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
                     <div class="deep">
                         <div data-embedded-editable="deep" data-oe-protected="false" contenteditable="true">
+                            <p data-selection-placeholder=""><br></p>
                             <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
                                 <div class="deep">
                                     <div data-embedded-editable="deep" data-oe-protected="false" contenteditable="true">
@@ -1058,6 +1070,7 @@ describe("editable descendants", () => {
                                     </div>
                                 </div>
                             </div>
+                            <p data-selection-placeholder=""><br></p>
                         </div>
                     </div>
                 </div>
@@ -1105,6 +1118,7 @@ describe("editable descendants", () => {
         expect.verifySteps(["patched"]);
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
                     <div class="shallow">
                         <div data-embedded-editable="shallow" data-oe-protected="false" contenteditable="true">
@@ -1121,6 +1135,7 @@ describe("editable descendants", () => {
                         </div>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
         // No mutation should be added to the next step
@@ -1191,6 +1206,7 @@ describe("editable descendants", () => {
         const node = historyPlugin._unserializeNode(historyPlugin.serializeNode(el))[0];
         expect(getContent(node, { sortAttrs: true })).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div contenteditable="false" data-embedded="wrapper" data-oe-protected="true">
                     <div contenteditable="true" data-embedded-editable="shallow" data-oe-protected="false">
                         <p>shallow</p>
@@ -1199,6 +1215,7 @@ describe("editable descendants", () => {
                         <p>deep</p>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
     });
@@ -1233,9 +1250,11 @@ describe("editable descendants", () => {
         );
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
                     <div class="shallow">
                         <div data-embedded-editable="shallow" data-oe-protected="false" contenteditable="true">
+                            <p data-selection-placeholder=""><br></p>
                             <div data-embedded="simpleWrapper" data-oe-protected="true" contenteditable="false">
                                 <div class="deep">
                                     <div data-embedded-editable="deep" data-oe-protected="false" contenteditable="true">
@@ -1243,6 +1262,7 @@ describe("editable descendants", () => {
                                     </div>
                                 </div>
                             </div>
+                            <p data-selection-placeholder=""><br></p>
                         </div>
                     </div>
                     <div>
@@ -1253,6 +1273,7 @@ describe("editable descendants", () => {
                         </div>
                     </div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
         const wrapper = el.querySelector(`[data-embedded="wrapper"]`);
diff --git a/addons/html_editor/static/tests/format/bold.test.js b/addons/html_editor/static/tests/format/bold.test.js
index 0260211f50eac..8cc01ed08a382 100644
--- a/addons/html_editor/static/tests/format/bold.test.js
+++ b/addons/html_editor/static/tests/format/bold.test.js
@@ -213,6 +213,7 @@ test("should make a few characters bold inside table (bold)", async () => {
             </table>`),
         stepFunction: bold,
         contentAfterEdit: unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
@@ -231,7 +232,8 @@ test("should make a few characters bold inside table (bold)", async () => {
                         <td><p><br></p></td>
                     </tr>
             </tbody>
-            </table>`),
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`),
     });
 });
 
diff --git a/addons/html_editor/static/tests/format/italic.test.js b/addons/html_editor/static/tests/format/italic.test.js
index 24df5eb393e85..25faa8e076409 100644
--- a/addons/html_editor/static/tests/format/italic.test.js
+++ b/addons/html_editor/static/tests/format/italic.test.js
@@ -213,6 +213,7 @@ test("should make a few characters italic inside table (italic)", async () => {
             </table>`),
         stepFunction: italic,
         contentAfterEdit: unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
@@ -231,7 +232,8 @@ test("should make a few characters italic inside table (italic)", async () => {
                         <td><p><br></p></td>
                     </tr>
                 </tbody>
-            </table>`),
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`),
     });
 });
 
diff --git a/addons/html_editor/static/tests/format/remove_format.test.js b/addons/html_editor/static/tests/format/remove_format.test.js
index 89c3620db4940..27e875df00b21 100644
--- a/addons/html_editor/static/tests/format/remove_format.test.js
+++ b/addons/html_editor/static/tests/format/remove_format.test.js
@@ -973,7 +973,7 @@ describe("Toolbar", () => {
         );
         await removeFormatClick();
         expect(getContent(el)).toBe(
-            `<table class="table table-bordered o_table o_selected_table"><tbody><tr><td class="o_selected_td"><p>[abc</p></td><td class="o_selected_td"><p>\u200b</p></td></tr></tbody></table><p>]\u200b</p>`
+            `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table o_selected_table"><tbody><tr><td class="o_selected_td"><p>[abc</p></td><td class="o_selected_td"><p>\u200b</p></td></tr></tbody></table><p>]\u200b</p>`
         );
     });
 
@@ -983,7 +983,7 @@ describe("Toolbar", () => {
         );
         await removeFormatClick();
         expect(getContent(el)).toBe(
-            `<table class="table table-bordered o_table o_selected_table"><tbody><tr><td style="" class="o_selected_td"><p>[\u200b</p></td><td style="" class="o_selected_td"><p>]\u200b</p></td></tr></tbody></table>`
+            `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table o_selected_table"><tbody><tr><td style="" class="o_selected_td"><p>[\u200b</p></td><td style="" class="o_selected_td"><p>]\u200b</p></td></tr></tbody></table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -1007,6 +1007,7 @@ describe("Toolbar", () => {
         await removeFormatClick();
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <table class="table table-bordered o_table o_selected_table">
                     <tbody>
                         <tr style="height: 100px;">
@@ -1019,6 +1020,7 @@ describe("Toolbar", () => {
                         </tr>
                     </tbody>
                 </table>
+                <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
             `)
         );
     });
diff --git a/addons/html_editor/static/tests/format/strike_through.test.js b/addons/html_editor/static/tests/format/strike_through.test.js
index 06bed4e0eadfc..7c61d7ba3d9a7 100644
--- a/addons/html_editor/static/tests/format/strike_through.test.js
+++ b/addons/html_editor/static/tests/format/strike_through.test.js
@@ -231,6 +231,7 @@ test("should make a few characters strikeThrough inside table (strikeThrough)",
             </table>`),
         stepFunction: strikeThrough,
         contentAfterEdit: unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
@@ -249,7 +250,8 @@ test("should make a few characters strikeThrough inside table (strikeThrough)",
                         <td><p><br></p></td>
                     </tr>
                 </tbody>
-            </table>`),
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`),
     });
 });
 
diff --git a/addons/html_editor/static/tests/format/underline.test.js b/addons/html_editor/static/tests/format/underline.test.js
index 14aad533bf140..b3c689ac5e582 100644
--- a/addons/html_editor/static/tests/format/underline.test.js
+++ b/addons/html_editor/static/tests/format/underline.test.js
@@ -199,6 +199,7 @@ test("should make a few characters underline inside table (underline)", async ()
             </table>`),
         stepFunction: underline,
         contentAfterEdit: unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr>
@@ -217,7 +218,8 @@ test("should make a few characters underline inside table (underline)", async ()
                         <td><p><br></p></td>
                     </tr>
                 </tbody>
-            </table>`),
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`),
     });
 });
 
diff --git a/addons/html_editor/static/tests/hint.test.js b/addons/html_editor/static/tests/hint.test.js
index 563428850e8c8..cc2c9c7a489fb 100644
--- a/addons/html_editor/static/tests/hint.test.js
+++ b/addons/html_editor/static/tests/hint.test.js
@@ -76,7 +76,11 @@ test("should not display hint in a non-editable paragraph", async () => {
     const content = '<div contenteditable="false"><p>[]</p></div>';
     const { el } = await setupEditor(content);
     // Unchanged, no empty paragraph hint.
-    expect(getContent(el)).toBe(content);
+    expect(getContent(el)).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            content +
+            '<p data-selection-placeholder=""><br></p>'
+    );
 });
 
 test("should not lose track of temporary hints on split block", async () => {
diff --git a/addons/html_editor/static/tests/html_field.test.js b/addons/html_editor/static/tests/html_field.test.js
index a617ad799d708..ef457b4276382 100644
--- a/addons/html_editor/static/tests/html_field.test.js
+++ b/addons/html_editor/static/tests/html_field.test.js
@@ -640,10 +640,18 @@ test("edit a html field with `o-contenteditable-true` or `o-contenteditable-fals
             </form>`,
     });
     expect.verifySteps(["setup_wysiwyg"]);
-    expect(`[name="txt"] .odoo-editor-editable`).toHaveInnerHTML(getTxtValue("inside", true));
+    expect(`[name="txt"] .odoo-editor-editable`).toHaveInnerHTML(
+        '<div class="o-paragraph" data-selection-placeholder=""><br></div>' +
+            getTxtValue("inside", true) +
+            '<div class="o-paragraph" data-selection-placeholder=""><br></div>'
+    );
     setSelectionInHtmlField();
     pasteOdooEditorHtml(htmlEditor, "addon");
-    expect(`[name="txt"] .odoo-editor-editable`).toHaveInnerHTML(getTxtValue("addoninside", true));
+    expect(`[name="txt"] .odoo-editor-editable`).toHaveInnerHTML(
+        '<div class="o-paragraph" data-selection-placeholder=""><br></div>' +
+            getTxtValue("addoninside", true) +
+            '<div class="o-paragraph" data-selection-placeholder=""><br></div>'
+    );
     await clickSave();
     expect.verifySteps(["update_value", "web_save"]);
 });
diff --git a/addons/html_editor/static/tests/html_migrations.test.js b/addons/html_editor/static/tests/html_migrations.test.js
index 2d94a9b8e1dc7..c072d086ca953 100644
--- a/addons/html_editor/static/tests/html_migrations.test.js
+++ b/addons/html_editor/static/tests/html_migrations.test.js
@@ -81,7 +81,8 @@ describe("test the migration process", () => {
                     <div class="w-100 px-3 o_editor_banner_content o-contenteditable-true" contenteditable="true">
                         <p>content</p>
                     </div>
-                </div>`
+                </div>
+                <div class="o-paragraph" data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></div>`
             );
             expect(htmlFieldComponent.editor.getContent()).toBe(
                 `<p data-oe-version="${CURRENT_VERSION}">test</p>
diff --git a/addons/html_editor/static/tests/icon.test.js b/addons/html_editor/static/tests/icon.test.js
index f3767f0eea72e..d9f0e8485bbb1 100644
--- a/addons/html_editor/static/tests/icon.test.js
+++ b/addons/html_editor/static/tests/icon.test.js
@@ -422,7 +422,9 @@ describe("selection", () => {
         setSelection({ anchorNode: icon, anchorOffset: 0 });
         await tick();
         expect(getContent(el)).toBe(
-            `<p contenteditable="false">abc[<span class="fa fa-glass" contenteditable="false">\u200b</span>]def</p>`
+            '<p data-selection-placeholder=""><br></p>' +
+                '<p contenteditable="false">abc[<span class="fa fa-glass" contenteditable="false">\u200b</span>]def</p>' +
+                '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>'
         );
     });
 });
diff --git a/addons/html_editor/static/tests/insert/html.test.js b/addons/html_editor/static/tests/insert/html.test.js
index a87692da9a6ce..e3d8c32d0155c 100644
--- a/addons/html_editor/static/tests/insert/html.test.js
+++ b/addons/html_editor/static/tests/insert/html.test.js
@@ -161,7 +161,7 @@ describe("collapsed selection", () => {
         const { editor } = await setupEditor(`<p class="oe_unbreakable">cont[]ent</p>`, {});
         insertHTML("<table><tbody><tr><td/></tr></tbody></table>")(editor);
         expect(getContent(editor.editable)).toBe(
-            `<p class="oe_unbreakable">content[]</p><table><tbody><tr><td></td></tr></tbody></table>`
+            `<p class="oe_unbreakable">content[]</p><table><tbody><tr><td></td></tr></tbody></table><p data-selection-placeholder=""><br></p>`
         );
     });
 
@@ -259,7 +259,7 @@ describe("collapsed selection", () => {
         editor.shared.history.addStep();
         cleanHints(editor);
         expect(getContent(editor.editable, { sortAttrs: true })).toBe(
-            `<p contenteditable="false" data-oe-protected="true">in</p><p>[]<br></p>`
+            `<p data-selection-placeholder=""><br></p><p contenteditable="false" data-oe-protected="true">in</p><p>[]<br></p>`
         );
     });
 
diff --git a/addons/html_editor/static/tests/insert/paragraph_break.test.js b/addons/html_editor/static/tests/insert/paragraph_break.test.js
index 580b2669307d8..071e0049a77fc 100644
--- a/addons/html_editor/static/tests/insert/paragraph_break.test.js
+++ b/addons/html_editor/static/tests/insert/paragraph_break.test.js
@@ -143,12 +143,18 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>abcd</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "abcd" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abcd" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testEnterInCodeBlock(2), // "ab[]cd"
-                    contentAfterEdit: highlightedPre({
-                        value: "ab\ncd",
-                        textareaRange: 3, // "ab\n[]cd"
-                    }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({
+                            value: "ab\ncd",
+                            textareaRange: 3, // "ab\n[]cd"
+                        }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab<br>cd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -157,13 +163,19 @@ describe("Selection collapsed", () => {
                 await testEditor({
                     compareFunction: compareHighlightedContent,
                     contentBefore: "<pre>abc</pre>",
-                    contentBeforeEdit: highlightedPre({ value: "abc" }),
+                    contentBeforeEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({ value: "abc" }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     stepFunction: testEnterInCodeBlock(3), // "abc[]"
-                    contentAfterEdit: highlightedPre({
-                        value: "abc\n",
-                        preHtml: "abc<br><br>",
-                        textareaRange: 4, // "abc\n[]"
-                    }),
+                    contentAfterEdit:
+                        '<p data-selection-placeholder=""><br></p>' +
+                        highlightedPre({
+                            value: "abc\n",
+                            preHtml: "abc<br><br>",
+                            textareaRange: 4, // "abc\n[]"
+                        }) +
+                        '<p data-selection-placeholder=""><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abc<br><br></pre>[]`,
                     config: configWithEmbeddings,
                 });
diff --git a/addons/html_editor/static/tests/insert/separator.test.js b/addons/html_editor/static/tests/insert/separator.test.js
index 075a2b718ca72..2a59469505a8c 100644
--- a/addons/html_editor/static/tests/insert/separator.test.js
+++ b/addons/html_editor/static/tests/insert/separator.test.js
@@ -14,7 +14,7 @@ describe("insert separator", () => {
         await testEditor({
             contentBefore: "<p>[]<br></p>",
             stepFunction: insertSeparator,
-            contentAfterEdit: `<hr contenteditable="false"><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`,
+            contentAfterEdit: `<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p><hr contenteditable="false"><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`,
             contentAfter: "<hr><p>[]<br></p>",
         });
     });
@@ -23,7 +23,7 @@ describe("insert separator", () => {
         await testEditor({
             contentBefore: "<p>[]abc<br></p>",
             stepFunction: insertSeparator,
-            contentAfterEdit: `<hr contenteditable="false"><p>[]abc<br></p>`,
+            contentAfterEdit: `<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p><hr contenteditable="false"><p>[]abc<br></p>`,
             contentAfter: "<hr><p>[]abc<br></p>",
         });
     });
diff --git a/addons/html_editor/static/tests/keyboard/arrow.test.js b/addons/html_editor/static/tests/keyboard/arrow.test.js
index b132953f67432..87e7eb457749c 100644
--- a/addons/html_editor/static/tests/keyboard/arrow.test.js
+++ b/addons/html_editor/static/tests/keyboard/arrow.test.js
@@ -10,6 +10,7 @@ const keyPress = (keys) => async (editor) => {
     await simulateArrowKeyPress(editor, keys);
     // Allow onselectionchange handler to run.
     await tick();
+    await tick();
 };
 
 describe("Around ZWS", () => {
@@ -428,27 +429,41 @@ describe("Around icons", () => {
 });
 
 describe("Selection correction when it lands at the editable root", () => {
-    test("should place cursor in the table below", async () => {
+    test("should place cursor between two tables (1)", async () => {
         await testEditor({
             contentBefore:
                 "<table><tbody><tr><td><p>a</p><p>b[]</p></td></tr></tbody></table>" +
                 "<table><tbody><tr><td><p>c</p><p>d</p></td></tr></tbody></table>",
             stepFunction: keyPress("ArrowRight"),
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p>' +
+                "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
+                `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+                "<table><tbody><tr><td><p>c</p><p>d</p></td></tr></tbody></table>" +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter:
                 "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
-                "<table><tbody><tr><td><p>[]c</p><p>d</p></td></tr></tbody></table>",
+                "[]" +
+                "<table><tbody><tr><td><p>c</p><p>d</p></td></tr></tbody></table>",
         });
     });
 
     test.tags("focus required");
-    test("should place cursor in the table above", async () => {
+    test("should place cursor between two tables (2)", async () => {
         await testEditor({
             contentBefore:
                 "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
                 "<table><tbody><tr><td><p>[]c</p><p>d</p></td></tr></tbody></table>",
             stepFunction: keyPress("ArrowLeft"),
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p>' +
+                "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
+                `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+                "<table><tbody><tr><td><p>c</p><p>d</p></td></tr></tbody></table>" +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter:
-                "<table><tbody><tr><td><p>a</p><p>b[]</p></td></tr></tbody></table>" +
+                "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
+                "[]" +
                 "<table><tbody><tr><td><p>c</p><p>d</p></td></tr></tbody></table>",
         });
     });
@@ -477,28 +492,42 @@ describe("Selection correction when it lands at the editable root", () => {
         });
     });
 
-    test("should keep cursor at the same position (avoid reaching the editable root) (1)", async () => {
+    test("should move cursor to safe space (avoid reaching the editable root) (1)", async () => {
         await testEditor({
             contentBefore: "<table><tbody><tr><td><p>a</p><p>b[]</p></td></tr></tbody></table>",
             stepFunction: keyPress("ArrowRight"),
-            contentAfter: "<table><tbody><tr><td><p>a</p><p>b[]</p></td></tr></tbody></table>",
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p>' +
+                "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
+                `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`,
         });
     });
-    test("should keep cursor at the same position (avoid reaching the editable root) (2)", async () => {
+    test("should move cursor to safe space (avoid reaching the editable root) (2)", async () => {
         await testEditor({
             contentBefore: "<table><tbody><tr><td><p>[]a</p><p>b</p></td></tr></tbody></table>",
             stepFunction: keyPress("ArrowLeft"),
-            contentAfter: "<table><tbody><tr><td><p>[]a</p><p>b</p></td></tr></tbody></table>",
+            contentAfterEdit:
+                `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+                "<table><tbody><tr><td><p>a</p><p>b</p></td></tr></tbody></table>" +
+                '<p data-selection-placeholder=""><br></p>',
         });
     });
 
     test("should place cursor after the second separator", async () => {
         await testEditor({
             contentBefore:
-                '<p>[]<br></p><hr contenteditable="false">' +
-                '<hr contenteditable="false"><p><br></p>',
+                "<p>[]<br></p>" +
+                '<hr contenteditable="false">' +
+                '<hr contenteditable="false">' +
+                "<p><br></p>",
             stepFunction: keyPress("ArrowRight"),
-            contentAfter: "<p><br></p><hr>" + "<hr><p>[]<br></p>",
+            contentAfterEdit:
+                "<p><br></p>" +
+                '<hr contenteditable="false">' +
+                `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+                '<hr contenteditable="false">' +
+                "<p><br></p>",
+            contentAfter: "<p><br></p><hr>[]<hr><p><br></p>",
         });
     });
 
@@ -506,10 +535,18 @@ describe("Selection correction when it lands at the editable root", () => {
     test("should place cursor before the first separator", async () => {
         await testEditor({
             contentBefore:
-                '<p><br></p><hr contenteditable="false">' +
-                '<hr contenteditable="false"><p>[]<br></p>',
+                "<p><br></p>" +
+                '<hr contenteditable="false">' +
+                '<hr contenteditable="false">' +
+                "<p>[]<br></p>",
             stepFunction: keyPress("ArrowLeft"),
-            contentAfter: "<p>[]<br></p><hr>" + "<hr><p><br></p>",
+            contentAfterEdit:
+                "<p><br></p>" +
+                '<hr contenteditable="false">' +
+                `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+                '<hr contenteditable="false">' +
+                "<p><br></p>",
+            contentAfter: "<p><br></p><hr>[]<hr><p><br></p>",
         });
     });
 });
diff --git a/addons/html_editor/static/tests/list/automatic_list_detection.test.js b/addons/html_editor/static/tests/list/automatic_list_detection.test.js
index ba6b98a8c380f..36db9906d6a28 100644
--- a/addons/html_editor/static/tests/list/automatic_list_detection.test.js
+++ b/addons/html_editor/static/tests/list/automatic_list_detection.test.js
@@ -95,6 +95,7 @@ test("creating list directly inside table column (td)", async () => {
     await insertText(editor, "A. ");
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table">
                 <tbody>
                     <tr>
diff --git a/addons/html_editor/static/tests/list/toggle_cl.test.js b/addons/html_editor/static/tests/list/toggle_cl.test.js
index cb3ae9cb9e578..6bc63fc247440 100644
--- a/addons/html_editor/static/tests/list/toggle_cl.test.js
+++ b/addons/html_editor/static/tests/list/toggle_cl.test.js
@@ -201,6 +201,7 @@ describe("Range collapsed", () => {
                 `),
                 stepFunction: toggleCheckList,
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="table table-bordered o_selected_table">
                         <tbody>
                             <tr>
@@ -215,6 +216,7 @@ describe("Range collapsed", () => {
                             </tr>
                         </tbody>
                     </table>
+                    <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
                 `),
                 contentAfter: unformat(`
                     <table class="table table-bordered">
@@ -366,6 +368,7 @@ describe("Range collapsed", () => {
                 `),
                 stepFunction: toggleCheckList,
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="table table-bordered o_selected_table">
                         <tbody>
                             <tr>
@@ -380,6 +383,7 @@ describe("Range collapsed", () => {
                             </tr>
                         </tbody>
                     </table>
+                    <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
                 `),
                 contentAfter: unformat(`
                     <table class="table table-bordered">
diff --git a/addons/html_editor/static/tests/list/toggle_ol.test.js b/addons/html_editor/static/tests/list/toggle_ol.test.js
index 99989d2f72aa9..eab5094838688 100644
--- a/addons/html_editor/static/tests/list/toggle_ol.test.js
+++ b/addons/html_editor/static/tests/list/toggle_ol.test.js
@@ -93,6 +93,7 @@ describe("Range collapsed", () => {
                 `),
                 stepFunction: toggleOrderedList,
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="table table-bordered o_selected_table">
                         <tbody>
                             <tr>
@@ -107,6 +108,7 @@ describe("Range collapsed", () => {
                             </tr>
                         </tbody>
                     </table>
+                    <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
                 `),
                 contentAfter: unformat(`
                     <table class="table table-bordered">
@@ -224,6 +226,7 @@ describe("Range collapsed", () => {
                 `),
                 stepFunction: toggleOrderedList,
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="table table-bordered o_selected_table">
                         <tbody>
                             <tr>
@@ -238,6 +241,7 @@ describe("Range collapsed", () => {
                             </tr>
                         </tbody>
                     </table>
+                    <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
                 `),
                 contentAfter: unformat(`
                     <table class="table table-bordered">
diff --git a/addons/html_editor/static/tests/list/toggle_ul.test.js b/addons/html_editor/static/tests/list/toggle_ul.test.js
index af7d1ec32a5d0..6cce30927705d 100644
--- a/addons/html_editor/static/tests/list/toggle_ul.test.js
+++ b/addons/html_editor/static/tests/list/toggle_ul.test.js
@@ -101,6 +101,7 @@ describe("Range collapsed", () => {
                 `),
                 stepFunction: toggleUnorderedList,
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="table table-bordered o_selected_table">
                         <tbody>
                             <tr>
@@ -115,6 +116,7 @@ describe("Range collapsed", () => {
                             </tr>
                         </tbody>
                     </table>
+                    <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
                 `),
                 contentAfter: unformat(`
                     <table class="table table-bordered">
@@ -265,6 +267,7 @@ describe("Range collapsed", () => {
                 `),
                 stepFunction: toggleUnorderedList,
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="table table-bordered o_selected_table">
                         <tbody>
                             <tr>
@@ -279,6 +282,7 @@ describe("Range collapsed", () => {
                             </tr>
                         </tbody>
                     </table>
+                    <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
                 `),
                 contentAfter: unformat(`
                     <table class="table table-bordered">
diff --git a/addons/html_editor/static/tests/media.test.js b/addons/html_editor/static/tests/media.test.js
index 3928593fe0596..ff31d74f87585 100644
--- a/addons/html_editor/static/tests/media.test.js
+++ b/addons/html_editor/static/tests/media.test.js
@@ -177,7 +177,7 @@ describe("(non-)editable media", () => {
             await animationFrame();
             await expectElementCount(".o-we-toolbar", 0);
             expect(getContent(editor.editable)).toBe(
-                `<div contenteditable="false">[<img src="${base64Img}">]</div>`
+                `<p data-selection-placeholder=""><br></p><div contenteditable="false">[<img src="${base64Img}">]</div><p data-selection-placeholder=""><br></p>`
             );
         });
         test("toolbar should open when clicking on an editable image in a non-editable context", async () => {
@@ -189,7 +189,9 @@ describe("(non-)editable media", () => {
             await expectElementCount(".o-we-toolbar", 1);
             // Now pressing the delete button should remove the image.
             await click(".o-we-toolbar button[name='image_delete']");
-            expect(getContent(editor.editable)).toBe(`<div contenteditable="false">[]<br></div>`);
+            expect(getContent(editor.editable)).toBe(
+                `<p data-selection-placeholder=""><br></p><div contenteditable="false">[]<br></div><p data-selection-placeholder=""><br></p>`
+            );
         });
     });
     describe("delete", () => {
diff --git a/addons/html_editor/static/tests/misc.test.js b/addons/html_editor/static/tests/misc.test.js
index 66b556816f9c2..598a7c6ec3048 100644
--- a/addons/html_editor/static/tests/misc.test.js
+++ b/addons/html_editor/static/tests/misc.test.js
@@ -1,7 +1,7 @@
 import { Plugin } from "@html_editor/plugin";
 import { MAIN_PLUGINS } from "@html_editor/plugin_sets";
 import { expect, test } from "@odoo/hoot";
-import { click, waitFor } from "@odoo/hoot-dom";
+import { click, tick, waitFor } from "@odoo/hoot-dom";
 import { setupEditor, testEditor } from "./_helpers/editor";
 import { getContent, setContent } from "./_helpers/selection";
 import { withSequence } from "@html_editor/utils/resource";
@@ -78,11 +78,21 @@ test("with an empty selector and a <br>", async () => {
 test("no arrow key press or mouse click should keep selection near a contenteditable='false'", async () => {
     await testEditor({
         contentBefore: '[]<hr contenteditable="false">',
+        contentAfterEdit:
+            `<p data-selection-placeholder="" style="margin: 8px 0px -9px;" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+            '<hr contenteditable="false">' +
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: "[]<hr>",
     });
     await testEditor({
         contentBefore: '<hr contenteditable="false">[]',
-        contentAfter: "<hr>[]",
+        // Wait for selectionchange listener:
+        stepFunction: async () => await tick(),
+        contentAfterEdit:
+            '<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p>' +
+            '<hr contenteditable="false">' +
+            `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`,
+        contentAfter: "<hr><p>[]<br></p>",
     });
 });
 
diff --git a/addons/html_editor/static/tests/mouse/click.test.js b/addons/html_editor/static/tests/mouse/click.test.js
index 6d0da2962bfbc..6539da7c00491 100644
--- a/addons/html_editor/static/tests/mouse/click.test.js
+++ b/addons/html_editor/static/tests/mouse/click.test.js
@@ -4,6 +4,7 @@ import { animationFrame, pointerDown, pointerUp, waitForNone } from "@odoo/hoot-
 import { tick } from "@odoo/hoot-mock";
 import { setupEditor, testEditor } from "../_helpers/editor";
 import { getContent, setSelection } from "../_helpers/selection";
+import { unformat } from "../_helpers/format";
 
 /**
  * Simulates placing the cursor at the editable root after a mouse click.
@@ -22,82 +23,116 @@ async function simulateMouseClick(node, before = false) {
     });
     await tick();
     await pointerUp(node);
+    await tick();
 }
 
-test.skip("should insert a paragraph at end of editable and place cursor in it (hr)", async () => {
+test("should insert a paragraph at end of editable and place cursor in it (hr)", async () => {
     await testEditor({
         contentBefore: '<hr contenteditable="false">',
         stepFunction: async (editor) => {
             const hr = editor.editable.querySelector("hr");
             await simulateMouseClick(hr);
         },
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p>
+            <hr contenteditable="false">
+            <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
+        ),
         contentAfter: "<hr><p>[]<br></p>",
     });
 });
 
-test.skip("should insert a paragraph at end of editable and place cursor in it (table)", async () => {
+test("should insert a paragraph at end of editable and place cursor in it (table)", async () => {
     await testEditor({
         contentBefore: "<table></table>",
         stepFunction: async (editor) => {
             const table = editor.editable.querySelector("table");
             await simulateMouseClick(table);
         },
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <table></table>
+            <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
+        ),
         contentAfter: "<table></table><p>[]<br></p>",
     });
 });
 
-test.skip("should insert a paragraph at beginning of editable and place cursor in it (1)", async () => {
+test("should insert a paragraph at beginning of editable and place cursor in it (1)", async () => {
     await testEditor({
         contentBefore: '<hr contenteditable="false">',
         stepFunction: async (editor) => {
             const hr = editor.editable.querySelector("hr");
             await simulateMouseClick(hr, true);
         },
-        contentAfter: "<p>[]<br></p><hr>",
+        contentAfterEdit: unformat(`
+            <p data-selection-placeholder="" style="margin: 8px 0px -9px;" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+            <hr contenteditable="false">
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`),
+        contentAfter: "[]<hr>",
     });
 });
-test.skip("should insert a paragraph at beginning of editable and place cursor in it (2)", async () => {
+test("should insert a paragraph at beginning of editable and place cursor in it (2)", async () => {
     await testEditor({
         contentBefore: "<table></table>",
         stepFunction: async (editor) => {
             const table = editor.editable.querySelector("table");
             await simulateMouseClick(table, true);
         },
-        contentAfter: "<p>[]<br></p><table></table>",
+        contentAfterEdit: unformat(`
+            <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+            <table></table>
+            <p data-selection-placeholder=""><br></p>
+        `),
+        contentAfter: "[]<table></table>",
     });
 });
 
-test.skip("should insert a paragraph between the two non-P blocks and place cursor in it (1)", async () => {
+test("should insert a paragraph between the two non-P blocks and place cursor in it (1)", async () => {
     await testEditor({
         contentBefore: '<hr contenteditable="false"><hr contenteditable="false">',
         stepFunction: async (editor) => {
             const firstHR = editor.editable.querySelector("hr");
             await simulateMouseClick(firstHR);
         },
-        contentAfter: "<hr><p>[]<br></p><hr>",
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p>
+            <hr contenteditable="false">
+            <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+            <hr contenteditable="false">
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
+        ),
+        contentAfter: "<hr>[]<hr>",
     });
 });
-test.skip("should insert a paragraph between the two non-P blocks and place cursor in it (2)", async () => {
+test("should insert a paragraph between the two non-P blocks and place cursor in it (2)", async () => {
     await testEditor({
         contentBefore: "<table></table><table></table>",
         stepFunction: async (editor) => {
             const firstTable = editor.editable.querySelector("table");
             await simulateMouseClick(firstTable);
         },
-        contentAfter: "<table></table><p>[]<br></p><table></table>",
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <table></table>
+            <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+            <table></table>
+            <p data-selection-placeholder=""><br></p>`
+        ),
+        contentAfter: "<table></table>[]<table></table>",
     });
 });
 
-test.skip("should insert a paragraph before the table, then one after it", async () => {
+test("should insert a paragraph before the table, then one after it", async () => {
     const { el } = await setupEditor("<table></table>");
     const table = el.querySelector("table");
     await simulateMouseClick(table, true);
     expect(getContent(el)).toBe(
-        `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p><table></table>`
+        `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p><table></table><p data-selection-placeholder=""><br></p>`
     );
     await simulateMouseClick(table);
     expect(getContent(el)).toBe(
-        `<p><br></p><table></table><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
+        `<p data-selection-placeholder=""><br></p><table></table><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
     );
 });
 
diff --git a/addons/html_editor/static/tests/movenode.test.js b/addons/html_editor/static/tests/movenode.test.js
index 35fed75167a57..d12ebd3e52d68 100644
--- a/addons/html_editor/static/tests/movenode.test.js
+++ b/addons/html_editor/static/tests/movenode.test.js
@@ -314,6 +314,7 @@ describe("click", () => {
         await animationFrame();
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <table class="o_selected_table">
                     <tbody>
                         <tr>
diff --git a/addons/html_editor/static/tests/normalize.test.js b/addons/html_editor/static/tests/normalize.test.js
index 9b4614bba5be1..fdf570a56eb9a 100644
--- a/addons/html_editor/static/tests/normalize.test.js
+++ b/addons/html_editor/static/tests/normalize.test.js
@@ -19,12 +19,14 @@ test("should remove `style.color` from table and apply it to tds", async () => {
                 </tbody></table>
             `),
         contentBeforeEdit: unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table style="" class="o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td" style="color: red;">ab</td></tr>
                     <tr><td style="color: red;">ab</td></tr>
                 </tbody>
             </table>
+            <p data-selection-placeholder=""><br></p>
         `),
     });
 });
@@ -38,12 +40,14 @@ test("should remove `style.color` from table and apply it to td without `style.c
                 </tbody></table>
             `),
         contentBeforeEdit: unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table style="">
                 <tbody>
                     <tr><td style="color: red;">ab</td></tr>
                     <tr><td style="color: green;">ab</td></tr>
                 </tbody>
             </table>
+            <p data-selection-placeholder=""><br></p>
         `),
     });
 });
diff --git a/addons/html_editor/static/tests/powerbox.test.js b/addons/html_editor/static/tests/powerbox.test.js
index 815cb38c93bcc..1ec210d51e568 100644
--- a/addons/html_editor/static/tests/powerbox.test.js
+++ b/addons/html_editor/static/tests/powerbox.test.js
@@ -507,7 +507,7 @@ test("should insert a 3x3 table on type `/table`", async () => {
     await press("Enter");
     await tick();
     expect(getContent(el)).toBe(
-        `<table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p><br></p>`
+        `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p><br></p>`
     );
 });
 
@@ -519,7 +519,7 @@ test("should insert a 3x3 table on type `/table` in mobile view", async () => {
     await press("Enter");
     await tick();
     expect(getContent(el)).toBe(
-        `<table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p><br></p>`
+        `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p><br></p>`
     );
 });
 
diff --git a/addons/html_editor/static/tests/sanitize.test.js b/addons/html_editor/static/tests/sanitize.test.js
index 8243f2c584883..0ceefcaa41fe7 100644
--- a/addons/html_editor/static/tests/sanitize.test.js
+++ b/addons/html_editor/static/tests/sanitize.test.js
@@ -32,7 +32,7 @@ test("sanitize should leave t-field, t-out, t-esc as is", async () => {
 test("sanitize plugin should handle contenteditable attribute with o-contenteditable-[true/false] class", async () => {
     await testEditor({
         contentBefore: `<p class="o-contenteditable-true">a[]</p><p class="o-contenteditable-false">b</p>`,
-        contentAfterEdit: `<p class="o-contenteditable-true" contenteditable="true">a[]</p><p class="o-contenteditable-false" contenteditable="false">b</p>`,
+        contentAfterEdit: `<p class="o-contenteditable-true" contenteditable="true">a[]</p><p class="o-contenteditable-false" contenteditable="false">b</p><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`,
         contentAfter: `<p class="o-contenteditable-true">a[]</p><p class="o-contenteditable-false">b</p>`,
     });
 });
diff --git a/addons/html_editor/static/tests/selection.test.js b/addons/html_editor/static/tests/selection.test.js
index e5a9a9338cad5..3d0d6beeb34f0 100644
--- a/addons/html_editor/static/tests/selection.test.js
+++ b/addons/html_editor/static/tests/selection.test.js
@@ -188,7 +188,7 @@ test("press 'ctrl+a' in 'contenteditable' should only select his content", async
     );
     await press(["ctrl", "a"]);
     expect(getContent(el)).toBe(
-        `<div contenteditable="false"><p contenteditable="true">[ab]</p><p contenteditable="true">cd</p></div>`
+        `<p data-selection-placeholder=""><br></p><div contenteditable="false"><p contenteditable="true">[ab]</p><p contenteditable="true">cd</p></div><p data-selection-placeholder=""><br></p>`
     );
 });
 
diff --git a/addons/html_editor/static/tests/selection_placeholder.test.js b/addons/html_editor/static/tests/selection_placeholder.test.js
new file mode 100644
index 0000000000000..0be05d954bf56
--- /dev/null
+++ b/addons/html_editor/static/tests/selection_placeholder.test.js
@@ -0,0 +1,582 @@
+import { expect, test } from "@odoo/hoot";
+import { testEditor } from "./_helpers/editor";
+import { unformat } from "./_helpers/format";
+import { animationFrame, press, tick } from "@odoo/hoot-dom";
+import { insertText, simulateArrowKeyPress, splitBlock } from "./_helpers/user_actions";
+import { getContent } from "./_helpers/selection";
+import { closestElement } from "@html_editor/utils/dom_traversal";
+import { isTableCell } from "@html_editor/utils/dom_info";
+import { parseHTML } from "@html_editor/utils/html";
+
+const pressArrowKey = async (editor, key) => {
+    const selection = editor.shared.selection.getSelectionData().deepEditableSelection;
+    if (
+        !key.includes("Shift") &&
+        selection.isCollapsed &&
+        closestElement(selection.anchorNode, isTableCell)
+    ) {
+        // Since the selection is in a table, the table plugin handles the
+        // arrow key so we use `press` instead of `simulateArrowKeyPress`
+        // (which would then change the selection twice).
+        // TODO: detect this without relying on implementation if possible.
+        await press(key);
+    } else {
+        await simulateArrowKeyPress(editor, key);
+        // Wait an extra tick in case of selection in root correction, so the
+        // extra selectionchange event is triggered.
+        await tick();
+    }
+    // Wait for selectionchange event.
+    await tick();
+};
+
+test("a selection placeholder is inserted before a contenteditable=false as first element, and removed on clean", async () => {
+    await testEditor({
+        contentBefore: `<div contenteditable="false">a</div><p>b</p>`,
+        contentBeforeEdit: `<p data-selection-placeholder=""><br></p><div contenteditable="false">a</div><p>b</p>`,
+        contentAfter: `<div contenteditable="false">a</div><p>b</p>`,
+    });
+});
+
+test("a selection placeholder is inserted before a table as first element, and removed on clean", async () => {
+    await testEditor({
+        contentBefore: `<table><tbody><tr><td>a</td></tr></tbody></table><p>b</p>`,
+        contentBeforeEdit: `<p data-selection-placeholder=""><br></p><table><tbody><tr><td>a</td></tr></tbody></table><p>b</p>`,
+        contentAfter: `<table><tbody><tr><td>a</td></tr></tbody></table><p>b</p>`,
+    });
+});
+
+test("a selection placeholder is inserted after a contenteditable=false as last element, and removed on clean", async () => {
+    await testEditor({
+        contentBefore: `<p>a</p><div contenteditable="false">b</div>`,
+        contentBeforeEdit: `<p>a</p><div contenteditable="false">b</div><p data-selection-placeholder=""><br></p>`,
+        contentAfter: `<p>a</p><div contenteditable="false">b</div>`,
+    });
+});
+
+test("a selection placeholder is inserted after a table as last element, and removed on clean", async () => {
+    await testEditor({
+        contentBefore: `<p>a</p><table><tbody><tr><td>b</td></tr></tbody></table>`,
+        contentBeforeEdit: `<p>a</p><table><tbody><tr><td>b</td></tr></tbody></table><p data-selection-placeholder=""><br></p>`,
+        contentAfter: `<p>a</p><table><tbody><tr><td>b</td></tr></tbody></table>`,
+    });
+});
+
+test("a selection placeholder is inserted between two tables, and removed on clean", async () => {
+    await testEditor({
+        contentBefore: unformat(
+            `<table><tbody><tr><td>a</td></tr></tbody></table>
+            <table><tbody><tr><td>b</td></tr></tbody></table>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>a</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>`
+        ),
+        contentAfter: unformat(
+            `<table><tbody><tr><td>a</td></tr></tbody></table>
+            <table><tbody><tr><td>b</td></tr></tbody></table>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("can navigate in and out of selection placeholders", async () => {
+    await testEditor({
+        contentBefore: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowDown");
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p>a</p>
+                    <table><tbody><tr><td>b</td></tr></tbody></table>
+                    <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+                    <table><tbody><tr><td>d</td></tr></tbody></table>
+                    <p>e</p>`
+                ),
+                { message: "Stepped down into the placeholder." }
+            );
+            await pressArrowKey(editor, "ArrowRight");
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p>a</p>
+                    <table><tbody><tr><td>b</td></tr></tbody></table>
+                    <p data-selection-placeholder=""><br></p>
+                    <table><tbody><tr><td>[]d</td></tr></tbody></table>
+                    <p>e</p>`
+                ),
+                { message: "Stepped down out of the placeholder." }
+            );
+            await pressArrowKey(editor, "ArrowUp");
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p>a</p>
+                    <table><tbody><tr><td>b</td></tr></tbody></table>
+                    <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+                    <table><tbody><tr><td>d</td></tr></tbody></table>
+                    <p>e</p>`
+                ),
+                { message: "Stepped up into the placeholder." }
+            );
+            await pressArrowKey(editor, "ArrowLeft");
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p>a</p>
+                    <table><tbody><tr><td>b[]</td></tr></tbody></table>
+                    <p data-selection-placeholder=""><br></p>
+                    <table><tbody><tr><td>d</td></tr></tbody></table>
+                    <p>e</p>`
+                ),
+                { message: "Stepped up out of the placeholder." }
+            );
+        },
+        contentAfterEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+        contentAfter: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("moving the caret into a selection placeholder shows a horizontal caret", async () => {
+    const focusedResult = unformat(
+        `<p data-selection-placeholder=""><br></p>
+        <table><tbody><tr><td>a</td></tr></tbody></table>
+        <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+        <table><tbody><tr><td><textarea></textarea></td></tr></tbody></table>
+        <p data-selection-placeholder=""><br></p>`
+    );
+    await testEditor({
+        contentBefore: unformat(
+            `<table><tbody><tr><td>a[]</td></tr></tbody></table>
+            <table><tbody><tr><td><textarea></textarea></td></tr></tbody></table>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>a[]</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td><textarea></textarea></td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>`
+        ),
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowDown");
+            expect(getContent(editor.editable)).toBe(focusedResult, {
+                message: "The placeholder was selected.",
+            });
+            // Blur the editable.
+            editor.editable.blur();
+            await animationFrame();
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p data-selection-placeholder=""><br></p>
+                    <table><tbody><tr><td>a</td></tr></tbody></table>
+                    <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>
+                    <table><tbody><tr><td><textarea></textarea></td></tr></tbody></table>
+                    <p data-selection-placeholder=""><br></p>`
+                ),
+                {
+                    message: "The placeholder stopped blinking when taking the focus out.",
+                }
+            );
+            // Focus the editable.
+            editor.editable.focus();
+            await animationFrame();
+            expect(getContent(editor.editable)).toBe(focusedResult, {
+                message: "The placeholder started blinking again when taking the focus back in.",
+            });
+            // Focus the textarea, blurring the editable.
+            editor.editable.querySelector("textarea").focus();
+            await animationFrame();
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p data-selection-placeholder=""><br></p>
+                    <table><tbody><tr><td>a</td></tr></tbody></table>
+                    <p data-selection-placeholder=""><br></p>
+                    <table><tbody><tr><td>[]<textarea></textarea></td></tr></tbody></table>
+                    <p data-selection-placeholder=""><br></p>`
+                ),
+                {
+                    message:
+                        "The placeholder stopped blinking when taking the focus into the textarea.",
+                }
+            );
+            // Refocus the editable.
+            editor.editable.focus();
+            await animationFrame();
+            // Focus again, it should start blinking again.
+        },
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder="" class="o-horizontal-caret o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></p>
+            <table><tbody><tr><td>a</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td><textarea></textarea></td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>`
+        ),
+        contentAfter: unformat(
+            `[]<table><tbody><tr><td>a</td></tr></tbody></table>
+            <table><tbody><tr><td><textarea></textarea></td></tr></tbody></table>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("typing in a selection placeholder persists it", async () => {
+    await testEditor({
+        contentBefore: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowDown");
+            await insertText(editor, "c");
+        },
+        contentAfterEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p>c[]</p>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+        contentAfter: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p>c[]</p>
+            <table><tbody><tr><td>d</td></tr></tbody></table>
+            <p>e</p>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("moving the caret into a trailing selection placeholder in the root persists it", async () => {
+    await testEditor({
+        contentBefore: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>`
+        ),
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowDown");
+            await animationFrame(); // wait for selectionchange
+        },
+        contentAfterEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
+        ),
+        contentAfter: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p>[]<br></p>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("moving the caret into a trailing selection placeholder not in the root doesn't persist it", async () => {
+    await testEditor({
+        contentBefore: unformat(
+            `<p>a</p>
+            <div contenteditable="true">
+                <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            </div>
+            <p>c</p>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p>a</p>
+            <div contenteditable="true">
+                <p data-selection-placeholder=""><br></p>
+                <table><tbody><tr><td>b[]</td></tr></tbody></table>
+                <p data-selection-placeholder=""><br></p>
+            </div>
+            <p>c</p>`
+        ),
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowDown");
+            await animationFrame(); // wait for selectionchange
+        },
+        contentAfterEdit: unformat(
+            `<p>a</p>
+            <div contenteditable="true">
+                <p data-selection-placeholder=""><br></p>
+                <table><tbody><tr><td>b</td></tr></tbody></table>
+                <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+            </div>
+            <p>c</p>`
+        ),
+        contentAfter: unformat(
+            `<p>a</p>
+            <div contenteditable="true">
+                <table><tbody><tr><td>b</td></tr></tbody></table>
+                []
+            </div>
+            <p>c</p>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("enter in a selection placeholder persists it", async () => {
+    await testEditor({
+        contentBefore: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <table><tbody><tr><td>c</td></tr></tbody></table>
+            <p>d</p>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b[]</td></tr></tbody></table>
+            <p data-selection-placeholder=""><br></p>
+            <table><tbody><tr><td>c</td></tr></tbody></table>
+            <p>d</p>`
+        ),
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowDown");
+            expect(getContent(editor.editable)).toBe(
+                unformat(
+                    `<p>a</p>
+                    <table><tbody><tr><td>b</td></tr></tbody></table>
+                    <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+                    <table><tbody><tr><td>c</td></tr></tbody></table>
+                    <p>d</p>`
+                ),
+                { message: "The placeholder was selected." }
+            );
+            splitBlock(editor);
+            await tick();
+        },
+        contentAfterEdit: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>
+            <table><tbody><tr><td>c</td></tr></tbody></table>
+            <p>d</p>`
+        ),
+        contentAfter: unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>b</td></tr></tbody></table>
+            <p>[]<br></p>
+            <table><tbody><tr><td>c</td></tr></tbody></table>
+            <p>d</p>`
+        ),
+    });
+});
+
+test.tags("focus required");
+test("can undo/redo the persiting of selection placeholders", async () => {
+    const makeContent = (inTable = "", placeholder = "") =>
+        unformat(
+            `<p>a</p>
+            <table><tbody><tr><td>${inTable}</td></tr></tbody></table>
+            ${placeholder}
+            <table><tbody><tr><td>e</td></tr></tbody></table><p>f</p>`
+        );
+    const [undo, redo] = ["Z", "Y"].map((key) => async () => {
+        await press(["Ctrl", key]);
+        await tick();
+    });
+    await testEditor({
+        contentBefore: makeContent("b[]"),
+        contentBeforeEdit: makeContent("b[]", '<p data-selection-placeholder=""><br></p>'),
+        stepFunction: async (editor) => {
+            await insertText(editor, "c");
+            expect(getContent(editor.editable)).toBe(
+                makeContent("bc[]", '<p data-selection-placeholder=""><br></p>'),
+                {
+                    message: 'The letter "c" was inserted.',
+                }
+            );
+            await pressArrowKey(editor, "ArrowDown");
+            await insertText(editor, "d");
+            expect(getContent(editor.editable)).toBe(makeContent("bc", "<p>d[]</p>"), {
+                message: "The placeholder was persisted.",
+            });
+            await undo();
+            expect(getContent(editor.editable)).toBe(
+                makeContent(
+                    "bc",
+                    `<p data-selection-placeholder="" class="o-horizontal-caret o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></p>`
+                ),
+                { message: "Undo un-persisted the placeholder." }
+            );
+            await redo();
+            expect(getContent(editor.editable)).toBe(makeContent("bc", "<p>d[]</p>"), {
+                message: "Redo re-persisted the placeholder.",
+            });
+            await undo();
+            expect(getContent(editor.editable)).toBe(
+                makeContent(
+                    "bc",
+                    `<p data-selection-placeholder="" class="o-horizontal-caret o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></p>`
+                ),
+                { message: "Undo un-persisted the placeholder again." }
+            );
+            await undo();
+            expect(getContent(editor.editable)).toBe(
+                makeContent("b[]", '<p data-selection-placeholder=""><br></p>'),
+                {
+                    message: 'Undo removed the letter "c".',
+                }
+            );
+            await undo();
+            expect(getContent(editor.editable)).toBe(
+                makeContent("b[]", '<p data-selection-placeholder=""><br></p>'),
+                {
+                    message: "Undo did nothing.",
+                }
+            );
+        },
+        contentAfter: makeContent("b[]"),
+    });
+});
+
+test("a selection placeholder is restored after deletion from within", async () => {
+    await testEditor({
+        contentBefore: `<table><tbody><tr><td>[]a</td></tr></tbody></table>`,
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            `<table><tbody><tr><td>[]a</td></tr></tbody></table>` +
+            '<p data-selection-placeholder=""><br></p>',
+        stepFunction: async (editor) => {
+            await pressArrowKey(editor, "ArrowUp");
+            expect(getContent(editor.editable)).toBe(
+                `<p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>` +
+                    `<table><tbody><tr><td>a</td></tr></tbody></table>` +
+                    '<p data-selection-placeholder=""><br></p>',
+                { message: "The top placeholder was selected." }
+            );
+            await press("Delete");
+            await tick();
+        },
+        contentAfterEdit: `<p data-selection-placeholder=""><br></p><table><tbody><tr><td>[]a</td></tr></tbody></table><p data-selection-placeholder=""><br></p>`,
+        contentAfter: `<table><tbody><tr><td>[]a</td></tr></tbody></table>`,
+    });
+});
+
+test("a selection placeholder is restored after deletion from without", async () => {
+    await testEditor({
+        contentBefore: `<table><tbody><tr><td>[]a</td></tr></tbody></table>`,
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            `<table><tbody><tr><td>[]a</td></tr></tbody></table>` +
+            '<p data-selection-placeholder=""><br></p>',
+        stepFunction: async () => {
+            await press("Backspace");
+            await tick();
+        },
+        contentAfterEdit: `<p data-selection-placeholder=""><br></p><table><tbody><tr><td>[]a</td></tr></tbody></table><p data-selection-placeholder=""><br></p>`,
+        contentAfter: `<table><tbody><tr><td>[]a</td></tr></tbody></table>`,
+    });
+});
+
+test("selection placeholders are vertically positioned in the middle between it and its blocker", async () => {
+    const style = document.createElement("style");
+    await testEditor({
+        contentBefore: unformat(
+            `<table style="margin: 50px"><tbody><tr><td>a</td></tr></tbody></table>
+            <table style="margin: 10px"><tbody><tr><td>[]a</td></tr></tbody></table>`
+        ),
+        contentBeforeEdit: unformat(
+            `<p data-selection-placeholder="" style="margin: 25px 0px -26px;"><br></p>
+            <table style="margin: 50px"><tbody><tr><td>a</td></tr></tbody></table>
+            <p data-selection-placeholder="" style="margin: -21px 0px 30px;"><br></p>
+            <table style="margin: 10px"><tbody><tr><td>[]a</td></tr></tbody></table>
+            <p data-selection-placeholder="" style="margin: -6px 0px 5px;"><br></p>`
+        ),
+        stepFunction: async (editor) => {
+            style.innerText = `
+                *[contenteditable=true] {
+                    border: 1px solid blue;
+                }
+                table {
+                    border: 1px solid green;
+                }
+                p[data-selection-placeholder] {
+                    border-top: 1px solid red;
+                }
+            `;
+            editor.document.head.append(style);
+        },
+    });
+    // Comment this to make it easier to debug visually.
+    style.remove();
+});
+
+test("selection placeholder margins remain correct when an element gets added", async () => {
+    const style = document.createElement("style");
+    await testEditor({
+        contentBefore: unformat(
+            `<table style="margin: 50px"><tbody><tr><td>a</td></tr></tbody></table>
+            <table style="margin: 10px"><tbody><tr><td>[]a</td></tr></tbody></table>`
+        ),
+        stepFunction: async (editor) => {
+            style.innerText = `
+                *[contenteditable=true] {
+                    border: 1px solid blue;
+                }
+                table {
+                    border: 1px solid green;
+                }
+                p[data-selection-placeholder] {
+                    border-top: 1px solid red;
+                }
+            `;
+            editor.document.head.append(style);
+            const table = parseHTML(
+                editor.document,
+                `<table style="margin: 100px"><tbody><tr><td>[]a</td></tr></tbody></table>`
+            ).firstChild;
+            editor.editable.append(table);
+            editor.shared.history.addStep();
+            await animationFrame();
+        },
+        contentAfterEdit: unformat(
+            `<p data-selection-placeholder="" style="margin: 25px 0px -26px;"><br></p>
+            <table style="margin: 50px"><tbody><tr><td>a</td></tr></tbody></table>
+            <p data-selection-placeholder="" style="margin: -21px 0px 30px;"><br></p>
+            <table style="margin: 10px"><tbody><tr><td>[]a</td></tr></tbody></table>
+            <p data-selection-placeholder="" style="margin: 55px 0px -46px;"><br></p>
+            <table style="margin: 100px"><tbody><tr><td>[]a</td></tr></tbody></table>
+            <p data-selection-placeholder="" style="margin: -51px 0px 50px;"><br></p>`
+        ),
+    });
+    // Comment this to make it easier to debug visually.
+    style.remove();
+});
diff --git a/addons/html_editor/static/tests/syntax_highlighting.test.js b/addons/html_editor/static/tests/syntax_highlighting.test.js
index eaf008babf95c..1e3eef2ec9a15 100644
--- a/addons/html_editor/static/tests/syntax_highlighting.test.js
+++ b/addons/html_editor/static/tests/syntax_highlighting.test.js
@@ -46,9 +46,15 @@ test("starting edition with a pre activates syntax highlighting", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>some code</pre>",
-        contentBeforeEdit: highlightedPre({ value: "some code" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "some code" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async () => press(["ctrl", "z"]),
-        contentAfterEdit: highlightedPre({ value: "some code" }), // Undo did nothing.
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "some code" }) +
+            '<p data-selection-placeholder=""><br></p>', // Undo did nothing.
         contentAfter: `<pre data-language-id="plaintext">some code</pre>`,
         config: configWithEmbeddings,
     });
@@ -60,12 +66,17 @@ test("starting edition with a pre activates syntax highlighting (with dataset va
         contentBefore: `<pre data-language-id="javascript">Hello world!</pre>`,
         // The DIV should now be filled with a highlighted pre and a textarea,
         // the respective values of which match the dataset.
-        contentBeforeEdit: highlightedPre({ value: "Hello world!", language: "javascript" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "Hello world!", language: "javascript" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async (editor) => {
             await press(["ctrl", "z"]);
             await compareHighlightedContent(
                 getContent(editor.editable),
-                highlightedPre({ value: "Hello world!", language: "javascript" }),
+                '<p data-selection-placeholder=""><br></p>' +
+                    highlightedPre({ value: "Hello world!", language: "javascript" }) +
+                    '<p data-selection-placeholder=""><br></p>',
                 "Undo should have done nothing.",
                 editor
             );
@@ -73,22 +84,27 @@ test("starting edition with a pre activates syntax highlighting (with dataset va
             await press("a");
             await compareHighlightedContent(
                 getContent(editor.editable),
-                highlightedPre({
-                    value: "Hello world!a",
-                    language: "javascript",
-                    textareaRange: 13, // "Hello world!a[]"
-                }),
+                '<p data-selection-placeholder=""><br></p>' +
+                    highlightedPre({
+                        value: "Hello world!a",
+                        language: "javascript",
+                        textareaRange: 13, // "Hello world!a[]"
+                    }) +
+                    '<p data-selection-placeholder=""><br></p>',
                 "Should have written at the end of the textarea.",
                 editor
             );
             await press(["ctrl", "z"]);
             await press(["ctrl", "z"]);
         },
-        contentAfterEdit: highlightedPre({
-            value: "Hello world!",
-            language: "javascript",
-            textareaRange: 12, // "Hello world![]"
-        }), // Undo did nothing.
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({
+                value: "Hello world!",
+                language: "javascript",
+                textareaRange: 12, // "Hello world![]"
+            }) +
+            '<p data-selection-placeholder=""><br></p>', // Undo did nothing.
         contentAfter: `<pre data-language-id="javascript">Hello world!</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -102,13 +118,18 @@ test("inserting a code block activates syntax highlighting plugin, typing trigge
             await insertPre(editor);
             await compareHighlightedContent(
                 getContent(editor.editable),
-                highlightedPre({ value: "abc", textareaRange: 3 }),
+                '<p data-selection-placeholder=""><br></p>' +
+                    highlightedPre({ value: "abc", textareaRange: 3 }) +
+                    '<p data-selection-placeholder=""><br></p>',
                 "The syntax highlighting wrapper was inserted, the paragraph's content is its value and the selection in at the end of the textarea.",
                 editor
             );
             await press("d");
         },
-        contentAfterEdit: highlightedPre({ value: "abcd", textareaRange: 4 }), // The change of value in the textarea is reflected in the pre.
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "abcd", textareaRange: 4 }) +
+            '<p data-selection-placeholder=""><br></p>', // The change of value in the textarea is reflected in the pre.
         contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -119,7 +140,10 @@ test("inserting an empty code block activates syntax highlighting plugin with an
         compareFunction: compareHighlightedContent,
         contentBefore: "<p><br>[]</p>",
         stepFunction: insertPre,
-        contentAfterEdit: highlightedPre({ value: "", textareaRange: 0 }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "", textareaRange: 0 }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="plaintext"><br></pre>[]`,
         config: configWithEmbeddings,
     });
@@ -148,7 +172,8 @@ test("inserting a code block in an empty paragraph with a style placeholder acti
             ${highlightedPre({
                 value: "", // There should be no content (the zws is stripped)
                 textareaRange: 0,
-            })}`
+            })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         contentAfter: `<p><br></p><pre data-language-id="plaintext"><br></pre>[]`,
         config: configWithEmbeddings,
@@ -160,15 +185,21 @@ test("changing languages in a code block changes its highlighting", async () =>
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>some code</pre>",
-        contentBeforeEdit: highlightedPre({ value: "some code", language: "plaintext" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "some code", language: "plaintext" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async () => {
             await changeLanguage(queryOne("textarea"), "Plain Text", "Javascript");
         },
-        contentAfterEdit: highlightedPre({
-            value: "some code",
-            language: "javascript",
-            textareaRange: 9,
-        }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({
+                value: "some code",
+                language: "javascript",
+                textareaRange: 9,
+            }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="javascript">some code</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -178,14 +209,20 @@ test("should fill an empty pre", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>abc</pre>",
-        contentBeforeEdit: highlightedPre({ value: "abc" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "abc" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async () => {
             const textarea = queryOne("textarea");
             await click(textarea);
             textarea.select();
             await press("backspace");
         },
-        contentAfterEdit: highlightedPre({ value: "", textareaRange: 0 }), // Note: the BR is outside the highlight.
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "", textareaRange: 0 }) +
+            '<p data-selection-placeholder=""><br></p>', // Note: the BR is outside the highlight.
         contentAfter: `<pre data-language-id="plaintext"><br></pre>[]`,
         config: configWithEmbeddings,
     });
@@ -195,12 +232,18 @@ test("the textarea should never contains zws", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>a\u200bb\ufeffc</pre>",
-        contentBeforeEdit: highlightedPre({ value: "abc" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "abc" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async () => {
             const textarea = queryOne("textarea");
             await click(textarea);
         },
-        contentAfterEdit: highlightedPre({ value: "abc", textareaRange: 3 }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "abc", textareaRange: 3 }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="plaintext">abc</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -216,7 +259,10 @@ test("can copy content with the copy button", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>abc</pre>",
-        contentBeforeEdit: highlightedPre({ value: "abc" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "abc" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async (editor) => {
             const textarea = queryOne("textarea");
             await click(textarea);
@@ -236,7 +282,10 @@ test("can copy content with the copy button", async () => {
             expect.verifySteps(["abcd"]);
             textarea.focus();
         },
-        contentAfterEdit: highlightedPre({ value: "abcd", textareaRange: 4 }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "abcd", textareaRange: 4 }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -246,17 +295,23 @@ test("tab in code block inserts 4 spaces", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>code</pre>",
-        contentBeforeEdit: highlightedPre({ value: "code" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "code" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async () => {
             await click("textarea");
             const textarea = queryOne("textarea");
             textarea.setSelectionRange(2, 2); // "co[]de"
             await press("tab");
         },
-        contentAfterEdit: highlightedPre({
-            value: "co    de",
-            textareaRange: 6, // "co    []de"
-        }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({
+                value: "co    de",
+                textareaRange: 6, // "co    []de"
+            }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="plaintext">co    de</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -267,17 +322,23 @@ test("tab in selection in code block indents each selected line", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>a<br>b c<br> d</pre>",
-        contentBeforeEdit: highlightedPre({ value: "a\nb c\n d" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "a\nb c\n d" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async (editor) => {
             await click("textarea");
             const textarea = queryOne("textarea");
             textarea.setSelectionRange(1, 7); // "a[\nb c\n ]d"
             await press("tab");
         },
-        contentAfterEdit: highlightedPre({
-            value: valueAfter,
-            textareaRange: [5, 19], // "    a[\n    b c\n     ]d"
-        }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({
+                value: valueAfter,
+                textareaRange: [5, 19], // "    a[\n    b c\n     ]d"
+            }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="plaintext">${valueAfter.replaceAll(
             "\n",
             "<br>"
@@ -291,7 +352,10 @@ test("shift+tab in code block outdents the current line", async () => {
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>    some<br>       co    de<br>    for you</pre>",
-        contentBeforeEdit: highlightedPre({ value: "    some\n       co    de\n    for you" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "    some\n       co    de\n    for you" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async (editor) => {
             await click("textarea");
             const textarea = queryOne("textarea");
@@ -299,19 +363,24 @@ test("shift+tab in code block outdents the current line", async () => {
             await press(["shift", "tab"]);
             await compareHighlightedContent(
                 getContent(editor.editable),
-                highlightedPre({
-                    value: "    some\n   co    de\n    for you",
-                    textareaRange: 18, // "    some\n   co    []de\n    for you"
-                }),
+                '<p data-selection-placeholder=""><br></p>' +
+                    highlightedPre({
+                        value: "    some\n   co    de\n    for you",
+                        textareaRange: 18, // "    some\n   co    []de\n    for you"
+                    }) +
+                    '<p data-selection-placeholder=""><br></p>',
                 "The content was outdented a first time.",
                 editor
             );
             await press(["shift", "tab"]);
         },
-        contentAfterEdit: highlightedPre({
-            value: valueAfter,
-            textareaRange: 15, // "    some\nco    []de\n    for you"
-        }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({
+                value: valueAfter,
+                textareaRange: 15, // "    some\nco    []de\n    for you"
+            }) +
+            '<p data-selection-placeholder=""><br></p>',
         contentAfter: `<pre data-language-id="plaintext">${valueAfter.replaceAll(
             "\n",
             "<br>"
@@ -324,7 +393,10 @@ test("shift+tab in selection in code block outdents each selected line", async (
     await testEditor({
         compareFunction: compareHighlightedContent,
         contentBefore: "<pre>    a<br>    b c<br>     d</pre>",
-        contentBeforeEdit: highlightedPre({ value: "    a\n    b c\n     d" }),
+        contentBeforeEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({ value: "    a\n    b c\n     d" }) +
+            '<p data-selection-placeholder=""><br></p>',
         stepFunction: async (editor) => {
             await click("textarea");
             const textarea = queryOne("textarea");
@@ -332,20 +404,25 @@ test("shift+tab in selection in code block outdents each selected line", async (
             await press(["shift", "tab"]);
             await compareHighlightedContent(
                 getContent(editor.editable),
-                highlightedPre({
-                    value: "a\nb c\n d",
-                    textareaRange: [1, 7], // "a[\nb c\n ]d"
-                }),
+                '<p data-selection-placeholder=""><br></p>' +
+                    highlightedPre({
+                        value: "a\nb c\n d",
+                        textareaRange: [1, 7], // "a[\nb c\n ]d"
+                    }) +
+                    '<p data-selection-placeholder=""><br></p>',
                 "The content was outdented a first time.",
                 editor
             );
             // Remove the last remaining leading space.
             await press(["shift", "tab"]);
         },
-        contentAfterEdit: highlightedPre({
-            value: "a\nb c\nd",
-            textareaRange: [1, 6], // "a[\nb c\n]d"
-        }),
+        contentAfterEdit:
+            '<p data-selection-placeholder=""><br></p>' +
+            highlightedPre({
+                value: "a\nb c\nd",
+                textareaRange: [1, 6], // "a[\nb c\n]d"
+            }) +
+            '<p data-selection-placeholder=""><br></p>',
         config: configWithEmbeddings,
         contentAfter: `<pre data-language-id="plaintext">a<br>b c<br>d</pre>[]`,
     });
@@ -362,7 +439,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jk" })}`
+            ${highlightedPre({ value: "jk" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         "The content was highlighted",
         editor
@@ -380,7 +458,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl", textareaRange: 3 })}`
+            ${highlightedPre({ value: "jkl", textareaRange: 3 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `1. Inserted "l" into the second pre and highlighted it.`,
         editor
@@ -395,7 +474,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "def", textareaRange: 3 })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `2. Inserted "f" into the first pre and highlighted it.`,
         editor
@@ -410,7 +490,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc[]</p>
             ${highlightedPre({ value: "def" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `3. Inserted "c" into the first paragraph.`,
         editor
@@ -425,7 +506,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def" })}
             <p>ghi[]</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `4. Inserted "i" into the second paragraph.`,
         editor
@@ -438,7 +520,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", language: "javascript", textareaRange: 3 })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `5. Changed the language of the first textarea to "javascript".`,
         editor
@@ -451,7 +534,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}`
+            ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `6. Changed the language of the second textarea to "python".`,
         editor
@@ -468,7 +552,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl", textareaRange: 3 })}`
+            ${highlightedPre({ value: "jkl", textareaRange: 3 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         // TODO: is it correct to not move the focus?
         `Undo 6 changed back the language of the second textarea to "plaintext" (without losing the current focus, editor).`,
@@ -482,7 +567,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", textareaRange: 3 })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         // TODO: is it correct to move the focus?
         `Undo 5 changed back the language of the first textarea to "plaintext" (and move the focus to the last focused textarea, editor).`,
@@ -496,7 +582,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def" })}
             <p>gh[]</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Undo 4 removed the "i" from the second paragraph.`,
         editor
@@ -509,7 +596,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab[]</p>
             ${highlightedPre({ value: "def" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Undo 3 removed the "c" from the first paragraph.`,
         editor
@@ -522,7 +610,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "de", textareaRange: 2 })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Undo 2 removed the "f" from the first pre and un-highlighted it.`,
         editor
@@ -535,7 +624,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jk", textareaRange: 2 })}`
+            ${highlightedPre({ value: "jk", textareaRange: 2 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Undo 1 removed the "l" from the second pre and un-highlighted it.`,
         editor
@@ -548,7 +638,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jk", textareaRange: 2 })}`
+            ${highlightedPre({ value: "jk", textareaRange: 2 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         "Undo did nothing.",
         editor
@@ -565,7 +656,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl", textareaRange: 3 })}`
+            ${highlightedPre({ value: "jkl", textareaRange: 3 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Redo 1 reinserted "l" into the second pre and re-highlighted it.`,
         editor
@@ -578,7 +670,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>ab</p>
             ${highlightedPre({ value: "def", textareaRange: 3 })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Redo 2 reinserted "f" into the first pre and re-highlighted it.`,
         editor
@@ -591,7 +684,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc[]</p>
             ${highlightedPre({ value: "def" })}
             <p>gh</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Redo 3 reinserted "c" into the first paragraph.`,
         editor
@@ -604,7 +698,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def" })}
             <p>ghi[]</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Redo 4 reinserted "i" into the second paragraph.`,
         editor
@@ -617,7 +712,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", language: "javascript", textareaRange: 3 })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl" })}`
+            ${highlightedPre({ value: "jkl" })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Redo 5 changed back the language of the first textarea to "javascript".`,
         editor
@@ -630,7 +726,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}`
+            ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         `Redo 6 changed back the language of the second textarea to "python".`,
         editor
@@ -643,7 +740,8 @@ test("can switch between code blocks without issues", async () => {
             `<p>abc</p>
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
-            ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}`
+            ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}
+            <p data-selection-placeholder=""><br></p>`
         ),
         "Redo did nothing.",
         editor
@@ -674,6 +772,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code" })}
             <p>hello![]</p>
         `),
@@ -687,6 +786,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code", language: "javascript", textareaRange: 9 })}
             <p>hello!</p>
         `),
@@ -701,6 +801,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeno", language: "javascript", textareaRange: 11 })}
             <p>hello!</p>
         `),
@@ -722,6 +823,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyes", language: "javascript", textareaRange: 12 })}
             <p>hello!</p>
         `),
@@ -730,12 +832,14 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     );
     // Write in the P again.
     actions.push("type: insert 'o' into the paragraph", "type: insert 'k' into the paragraph");
-    editor.shared.selection.setCursorEnd(queryOne("p"));
-    await pointerUp("p");
+    const p = queryOne("p:not([data-selection-placeholder])");
+    editor.shared.selection.setCursorEnd(p);
+    await pointerUp(p);
     await insertText(editor, "ok"); // <wrapper><highlight><pre>some codeyes</pre></highlight></wrapper><p>hello!ok[]</p>
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyes", language: "javascript" })}
             <p>hello!ok[]</p>
         `),
@@ -749,6 +853,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyesh", language: "javascript", textareaRange: 13 })}
             <p>hello!ok</p>
         `),
@@ -763,6 +868,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyes", language: "javascript", textareaRange: 12 })}
             <p>hello!ok</p>
         `),
@@ -774,6 +880,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyes", language: "javascript" })}
             <p>hello![]</p>
         `),
@@ -786,6 +893,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code", language: "javascript", textareaRange: 9 })}
             <p>hello!</p>
         `),
@@ -797,6 +905,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeno", language: "javascript", textareaRange: 11 })}
             <p>hello!</p>
         `),
@@ -808,6 +917,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code", language: "javascript", textareaRange: 9 })}
             <p>hello!</p>
         `),
@@ -818,6 +928,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code", textareaRange: 9 })}
             <p>hello!</p>
         `),
@@ -829,6 +940,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code" })}
             <p>hell[]</p>
         `),
@@ -839,6 +951,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code" })}
             <p>hell[]</p>
         `),
@@ -854,7 +967,8 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(
-            `${highlightedPre({ value: "some code" })}
+            `<p data-selection-placeholder=""><br></p>
+            ${highlightedPre({ value: "some code" })}
             <p>hello![]</p>`
         ),
         `redo:\n${listActions(1, 2)}`,
@@ -864,6 +978,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code", language: "javascript", textareaRange: 9 })}
             <p>hello!</p>
         `),
@@ -875,6 +990,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeno", language: "javascript", textareaRange: 11 })}
             <p>hello!</p>
         `),
@@ -886,6 +1002,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some code", language: "javascript", textareaRange: 9 })}
             <p>hello!</p>
         `),
@@ -898,6 +1015,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyes", language: "javascript", textareaRange: 12 })}
             <p>hello!</p>
         `),
@@ -909,6 +1027,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyes", language: "javascript" })}
             <p>hello!ok[]</p>
         `),
@@ -919,6 +1038,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyesh", language: "javascript", textareaRange: 13 })}
             <p>hello!ok</p>
         `),
@@ -930,6 +1050,7 @@ test("multiple ctrl+z in a highlighted code block undo changes in the block and
     await compareHighlightedContent(
         getContent(editor.editable),
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             ${highlightedPre({ value: "some codeyesh", language: "javascript", textareaRange: 13 })}
             <p>hello!ok</p>
         `),
diff --git a/addons/html_editor/static/tests/table/children.test.js b/addons/html_editor/static/tests/table/children.test.js
index 8219ba3d0a532..111b37c470984 100644
--- a/addons/html_editor/static/tests/table/children.test.js
+++ b/addons/html_editor/static/tests/table/children.test.js
@@ -413,6 +413,17 @@ describe("row", () => {
                         </tbody>
                     </table>
                 `),
+                contentBeforeEdit: unformat(
+                    `<p data-selection-placeholder=""><br></p>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td>[]ab</td> <td>cd</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`
+                ),
                 stepFunction: removeRow(),
                 contentAfter: "<p>[]<br></p>",
             });
@@ -702,6 +713,16 @@ describe("column", () => {
                         </tbody>
                     </table>
                 `),
+                contentBeforeEdit: unformat(
+                    `<p data-selection-placeholder=""><br></p>
+                    <table>
+                        <tbody>
+                            <tr> <td>[]ab</td> </tr>
+                            <tr> <td>cd</td> </tr>
+                        </tbody>
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`
+                ),
                 stepFunction: removeColumn(),
                 contentAfter: "<p>[]<br></p>",
             });
@@ -723,7 +744,8 @@ describe("tab", () => {
 
         await press("Tab");
 
-        const expectedContent = unformat(`
+        const expectedContent = unformat(
+            `<p data-selection-placeholder=""><br></p>
             <table><tbody>
                 <tr style="height: 20px;">
                     <td style="width: 20px;">ab</td>
@@ -735,13 +757,19 @@ describe("tab", () => {
                     <td><p><br></p></td>
                     <td><p><br></p></td>
                 </tr>
-            </tbody></table>`);
+            </tbody></table>
+            <p data-selection-placeholder=""><br></p>`
+        );
 
         expect(getContent(el)).toBe(expectedContent);
 
         // Check that it was registed as a history step.
         undo(editor);
-        expect(getContent(el)).toBe(contentBefore);
+        expect(getContent(el)).toBe(
+            '<p data-selection-placeholder=""><br></p>' +
+                contentBefore +
+                '<p data-selection-placeholder=""><br></p>'
+        );
     });
 
     test("should not select whole text of the next cell", async () => {
diff --git a/addons/html_editor/static/tests/table/selection.test.js b/addons/html_editor/static/tests/table/selection.test.js
index eddd6bdaf7df8..89ee201ed2d87 100644
--- a/addons/html_editor/static/tests/table/selection.test.js
+++ b/addons/html_editor/static/tests/table/selection.test.js
@@ -27,7 +27,8 @@ describe("custom selection", () => {
         );
         expect(getContent(el)).toBe(
             unformat(`
-            <table class="o_selected_table">
+                <p data-selection-placeholder=""><br></p>
+                <table class="o_selected_table">
                 <tbody>
                     <tr>
                         <td>ab</td>
@@ -35,7 +36,8 @@ describe("custom selection", () => {
                         <td class="o_selected_td">e]f</td>
                     </tr>
                 </tbody>
-            </table>`)
+            </table>
+            <p data-selection-placeholder=""><br></p>`)
         );
         const overlayColorTDs = queryAll("table td").map(
             (td) => getComputedStyle(td)["box-shadow"]
@@ -60,7 +62,8 @@ describe("select a full table on cross over", () => {
                     '<td class="o_selected_td">ab</td>' +
                     '<td class="o_selected_td">cd</td>' +
                     '<td class="o_selected_td">ef]</td>' +
-                    "</tr></tbody></table>",
+                    "</tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -69,6 +72,7 @@ describe("select a full table on cross over", () => {
                 contentBefore:
                     "<table><tbody><tr><td>ab</td><td>cd</td><td>e[f</td></tr></tbody></table><p>a]bc</p>",
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td">ab</td>' +
                     '<td class="o_selected_td">cd</td>' +
@@ -100,7 +104,8 @@ describe("select a full table on cross over", () => {
                     '<p>abc</p><table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td">ab</td>' +
                     '<td class="o_selected_td">cd</td>' +
-                    '<td class="o_selected_td">ef]</td></tr></tbody></table>',
+                    '<td class="o_selected_td">ef]</td></tr></tbody></table>' +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -137,7 +142,8 @@ describe("select a full table on cross over", () => {
                     '<td class="o_selected_td"><strong>ab</strong></td>' +
                     '<td class="o_selected_td"><strong>cd</strong></td>' +
                     '<td class="o_selected_td"><strong>ef]</strong></td>' +
-                    "</tr></tbody></table>",
+                    "</tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -151,6 +157,7 @@ describe("select a full table on cross over", () => {
                     "</tr></tbody></table><p>a]bc</p>",
                 stepFunction: bold,
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td"><strong>[ab</strong></td>' +
                     '<td class="o_selected_td"><strong>cd</strong></td>' +
@@ -210,7 +217,8 @@ describe("select a full table on cross over", () => {
                     '<td class="o_selected_td"><strong>ab</strong></td>' +
                     '<td class="o_selected_td"><strong>cd</strong></td>' +
                     '<td class="o_selected_td"><strong>ef]</strong></td>' +
-                    "</tr></tbody></table>",
+                    "</tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -287,7 +295,8 @@ describe("select a full table on cross over", () => {
                                 </td>
                             </tr>
                         </tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
 
@@ -301,6 +310,7 @@ describe("select a full table on cross over", () => {
                     "</tr></tbody></table><p>a]bc</p>",
                 stepFunction: setColor("aquamarine", "color"),
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="o_selected_table">
                         <tbody><tr>
                             <td class="o_selected_td">
@@ -407,7 +417,8 @@ describe("select a full table on cross over", () => {
                                 <font style="color: aquamarine;">ef]</font>
                             </td>
                         </tr></tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
 
@@ -472,11 +483,13 @@ describe("select columns on cross over", () => {
                 contentBefore:
                     "<table><tbody><tr><td>a[b</td><td>c]d</td><td>ef</td></tr></tbody></table>",
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td">a[b</td>' +
                     '<td class="o_selected_td">c]d</td>' +
                     "<td>ef</td>" +
-                    "</tr></tbody></table>",
+                    "</tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -485,11 +498,13 @@ describe("select columns on cross over", () => {
                 contentBefore:
                     "<table><tbody><tr><td>a[b</td><td>cd</td><td>e]f</td></tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>",
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td">a[b</td>' +
                     '<td class="o_selected_td">cd</td>' +
                     '<td class="o_selected_td">e]f</td>' +
-                    "</tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>",
+                    "</tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -502,6 +517,7 @@ describe("select columns on cross over", () => {
                     "<tr><td>a]b</td><td>cd</td><td>ef</td></tr>" +
                     "</tbody></table>",
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody>' +
                     "<tr>" +
                     '<td class="o_selected_td">a[b</td>' +
@@ -518,7 +534,8 @@ describe("select columns on cross over", () => {
                     "<td>cd</td>" +
                     "<td>ef</td>" +
                     "</tr>" +
-                    "</tbody></table>",
+                    "</tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -531,6 +548,7 @@ describe("select columns on cross over", () => {
                     "<tr><td>ab</td><td>cd</td><td>ef</td></tr>" +
                     "</tbody></table>",
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody>' +
                     "<tr>" +
                     '<td class="o_selected_td">a[b</td>' +
@@ -547,7 +565,8 @@ describe("select columns on cross over", () => {
                     "<td>cd</td>" +
                     "<td>ef</td>" +
                     "</tr>" +
-                    "</tbody></table>",
+                    "</tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -560,6 +579,7 @@ describe("select columns on cross over", () => {
                     "<tr><td>ab</td><td>cd</td><td>e]f</td></tr>" +
                     "</tbody></table>",
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody>' +
                     "<tr>" +
                     '<td class="o_selected_td">a[b</td>' +
@@ -576,7 +596,8 @@ describe("select columns on cross over", () => {
                     '<td class="o_selected_td">cd</td>' +
                     '<td class="o_selected_td">e]f</td>' +
                     "</tr>" +
-                    "</tbody></table>",
+                    "</tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
     });
@@ -592,11 +613,13 @@ describe("select columns on cross over", () => {
                     "</tr></tbody></table>",
                 stepFunction: bold,
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td"><strong>[ab</strong></td>' +
                     '<td class="o_selected_td"><strong>cd]</strong></td>' +
                     "<td>ef</td>" +
-                    "</tr></tbody></table>",
+                    "</tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -610,11 +633,13 @@ describe("select columns on cross over", () => {
                     "</tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>",
                 stepFunction: bold,
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody><tr>' +
                     '<td class="o_selected_td"><strong>[ab</strong></td>' +
                     '<td class="o_selected_td"><strong>cd</strong></td>' +
                     '<td class="o_selected_td"><strong>ef]</strong></td>' +
-                    "</tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>",
+                    "</tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -640,6 +665,7 @@ describe("select columns on cross over", () => {
                     "</tbody></table>",
                 stepFunction: bold,
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody>' +
                     "<tr>" +
                     '<td class="o_selected_td"><strong>[ab</strong></td>' +
@@ -656,7 +682,8 @@ describe("select columns on cross over", () => {
                     "<td>cd</td>" +
                     "<td>ef</td>" +
                     "</tr>" +
-                    "</tbody></table>",
+                    "</tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -682,6 +709,7 @@ describe("select columns on cross over", () => {
                     "</tbody></table>",
                 stepFunction: bold,
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody>' +
                     "<tr>" +
                     '<td class="o_selected_td"><strong>[ab</strong></td>' +
@@ -698,7 +726,8 @@ describe("select columns on cross over", () => {
                     "<td>cd</td>" +
                     "<td>ef</td>" +
                     "</tr>" +
-                    "</tbody></table>",
+                    "</tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
 
@@ -724,6 +753,7 @@ describe("select columns on cross over", () => {
                     "</tbody></table>",
                 stepFunction: bold,
                 contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
                     '<table class="o_selected_table"><tbody>' +
                     "<tr>" +
                     '<td class="o_selected_td"><strong>[ab</strong></td>' +
@@ -740,7 +770,8 @@ describe("select columns on cross over", () => {
                     '<td class="o_selected_td"><strong>cd</strong></td>' +
                     '<td class="o_selected_td"><strong>ef]</strong></td>' +
                     "</tr>" +
-                    "</tbody></table>",
+                    "</tbody></table>" +
+                    '<p data-selection-placeholder=""><br></p>',
             });
         });
     });
@@ -910,6 +941,7 @@ describe("select columns on cross over", () => {
                     "</tr></tbody></table>",
                 stepFunction: setColor("aquamarine", "color"),
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="o_selected_table">
                         <tbody><tr>
                             <td class="o_selected_td">
@@ -920,7 +952,8 @@ describe("select columns on cross over", () => {
                             </td>
                             <td>ef</td>
                         </tr></tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
 
@@ -934,6 +967,7 @@ describe("select columns on cross over", () => {
                     "</tr><tr><td>ab</td><td>cd</td><td>ef</td></tr></tbody></table>",
                 stepFunction: setColor("aquamarine", "color"),
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="o_selected_table">
                         <tbody><tr>
                             <td class="o_selected_td">
@@ -951,7 +985,8 @@ describe("select columns on cross over", () => {
                             <td>cd</td>
                             <td>ef</td>
                         </tr></tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
 
@@ -977,6 +1012,7 @@ describe("select columns on cross over", () => {
                     "</tbody></table>",
                 stepFunction: setColor("aquamarine", "color"),
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="o_selected_table">
                         <tbody><tr>
                             <td class="o_selected_td">
@@ -999,7 +1035,8 @@ describe("select columns on cross over", () => {
                             <td>cd</td>
                             <td>ef</td>
                         </tr></tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
 
@@ -1025,6 +1062,7 @@ describe("select columns on cross over", () => {
                     "</tbody></table>",
                 stepFunction: setColor("aquamarine", "color"),
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="o_selected_table">
                         <tbody><tr>
                             <td class="o_selected_td">
@@ -1049,7 +1087,8 @@ describe("select columns on cross over", () => {
                             <td>cd</td>
                             <td>ef</td>
                         </tr></tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
 
@@ -1075,6 +1114,7 @@ describe("select columns on cross over", () => {
                     "</tbody></table>",
                 stepFunction: setColor("aquamarine", "color"),
                 contentAfterEdit: unformat(`
+                    <p data-selection-placeholder=""><br></p>
                     <table class="o_selected_table">
                         <tbody><tr>
                             <td class="o_selected_td">
@@ -1109,7 +1149,8 @@ describe("select columns on cross over", () => {
                                 <font style="color: aquamarine;">e]f</font>
                             </td>
                         </tr></tbody>
-                    </table>`),
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`),
             });
         });
     });
@@ -1255,7 +1296,7 @@ describe("move cursor with arrow keys", () => {
                 `),
             });
         });
-        test("should move cursor to the end cell of sibling table", async () => {
+        test("should move cursor between two tables", async () => {
             await testEditor({
                 contentBefore: unformat(`
                     <table>
@@ -1283,7 +1324,39 @@ describe("move cursor with arrow keys", () => {
                         </tbody>
                     </table>
                 `),
-                stepFunction: async () => press("ArrowUp"),
+                stepFunction: async () => {
+                    await press("ArrowUp");
+                    await tick();
+                },
+                contentAfterEdit: unformat(
+                    `<p data-selection-placeholder=""><br></p>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`
+                ),
                 contentAfter: unformat(`
                     <table>
                         <tbody>
@@ -1293,10 +1366,11 @@ describe("move cursor with arrow keys", () => {
                             </tr>
                             <tr>
                                 <td><br></td>
-                                <td>[]<br></td>
+                                <td><br></td>
                             </tr>
                         </tbody>
                     </table>
+                    []
                     <table>
                         <tbody>
                             <tr>
@@ -1453,7 +1527,7 @@ describe("move cursor with arrow keys", () => {
                 `),
             });
         });
-        test("should move cursor to the first cell of sibling table", async () => {
+        test("should move cursor between two tables", async () => {
             await testEditor({
                 contentBefore: unformat(`
                     <table>
@@ -1481,7 +1555,39 @@ describe("move cursor with arrow keys", () => {
                         </tbody>
                     </table>
                 `),
-                stepFunction: async () => press("ArrowDown"),
+                stepFunction: async () => {
+                    await press("ArrowDown");
+                    await tick();
+                },
+                contentAfterEdit: unformat(
+                    `<p data-selection-placeholder=""><br></p>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <p data-selection-placeholder="" o-we-hint-text='Type "/" for commands' class="o-we-hint o-horizontal-caret">[]<br></p>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                            <tr>
+                                <td><br></td>
+                                <td><br></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <p data-selection-placeholder=""><br></p>`
+                ),
                 contentAfter: unformat(`
                     <table>
                         <tbody>
@@ -1495,10 +1601,11 @@ describe("move cursor with arrow keys", () => {
                             </tr>
                         </tbody>
                     </table>
+                    []
                     <table>
                         <tbody>
                             <tr>
-                                <td>[]<br></td>
+                                <td><br></td>
                                 <td><br></td>
                             </tr>
                             <tr>
@@ -1532,12 +1639,14 @@ describe("symmetrical selection", () => {
         // Select single empty cell
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[]<br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
 
         press(["Shift", "ArrowRight"]);
@@ -1546,12 +1655,14 @@ describe("symmetrical selection", () => {
         // Select two cells consecutively
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[<br></td><td class="o_selected_td">]<br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
 
         press(["Shift", "ArrowDown"]);
@@ -1560,12 +1671,14 @@ describe("symmetrical selection", () => {
         // Extend selection from two cells to four cells
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[<br></td><td class="o_selected_td"><br></td><td><br></td></tr>
                     <tr><td class="o_selected_td"><br></td><td class="o_selected_td">]<br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
 
         press(["Shift", "ArrowLeft"]);
@@ -1574,12 +1687,14 @@ describe("symmetrical selection", () => {
         // Shrink selection from four cells to two cells
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[<br></td><td><br></td><td><br></td></tr>
                     <tr><td class="o_selected_td">]<br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
 
         press(["Shift", "ArrowUp"]);
@@ -1588,12 +1703,14 @@ describe("symmetrical selection", () => {
         // Shrink selection from two cells to single cell
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[]<br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -1613,12 +1730,14 @@ describe("symmetrical selection", () => {
 
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table">
                 <tbody>
                     <tr><td>ab[]</td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
         const firstTd = el.querySelector("td");
         setSelection({
@@ -1633,12 +1752,14 @@ describe("symmetrical selection", () => {
 
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[ab]</td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 });
@@ -1658,7 +1779,7 @@ describe("single cell selection", () => {
 
         const BORDER_SENSITIVITY = 5;
         const firstTd = el.querySelector("td");
-        const offset = BORDER_SENSITIVITY + 1;
+        const offset = BORDER_SENSITIVITY + 2;
 
         manuallyDispatchProgrammaticEvent(firstTd, "mousedown", {
             detail: 2,
@@ -1676,12 +1797,14 @@ describe("single cell selection", () => {
 
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[]<br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -1699,7 +1822,7 @@ describe("single cell selection", () => {
 
         const BORDER_SENSITIVITY = 5;
         const firstTd = el.querySelector("td");
-        const offset = BORDER_SENSITIVITY + 1;
+        const offset = BORDER_SENSITIVITY + 2;
 
         manuallyDispatchProgrammaticEvent(firstTd, "mousedown", {
             detail: 3,
@@ -1717,12 +1840,14 @@ describe("single cell selection", () => {
 
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table o_selected_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr><td class="o_selected_td">[abc]<br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -1747,12 +1872,14 @@ describe("single cell selection", () => {
 
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table">
                 <tbody>
                     <tr><td>ab[]c<br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -1778,12 +1905,14 @@ describe("single cell selection", () => {
 
         expectContentToBe(
             el,
-            `<table class="table table-bordered o_table">
+            `<p data-selection-placeholder=""><br></p>
+            <table class="table table-bordered o_table">
                 <tbody>
                     <tr><td>[]<br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -1875,7 +2004,8 @@ describe("deselecting table", () => {
                         <tr><td class="o_selected_td"><br></td><td class="o_selected_td"><br></td><td class="o_selected_td"><br></td></tr>
                         <tr><td class="o_selected_td"><br></td><td class="o_selected_td"><br></td><td class="o_selected_td">]<br></td></tr>
                     </tbody>
-                </table>`
+                </table>
+                <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
 
         press(["Shift", "ArrowUp"]);
@@ -1889,7 +2019,8 @@ describe("deselecting table", () => {
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                     <tr><td><br></td><td><br></td><td><br></td></tr>
                 </tbody>
-            </table>`
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 });
diff --git a/addons/html_editor/static/tests/table/ui.test.js b/addons/html_editor/static/tests/table/ui.test.js
index 0098ea154c105..825494a4c914a 100644
--- a/addons/html_editor/static/tests/table/ui.test.js
+++ b/addons/html_editor/static/tests/table/ui.test.js
@@ -394,23 +394,27 @@ test("basic delete column operation", async () => {
     // not sure about selection...
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">[]1</td></tr>
                 <tr><td class="c">3</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -439,23 +443,27 @@ test("basic clear column content operation", async () => {
     // not sure about selection...
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a"><p>1[]</p></td><td class="b"><p><br></p></td></tr>
                 <tr><td class="c"><p>3</p></td><td class="d"><p><br></p></td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a"><p>1[]</p></td><td class="b"><p>2</p></td></tr>
                 <tr><td class="c"><p>3</p></td><td class="d"><h1>4</h1></td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -484,22 +492,26 @@ test("basic delete row operation", async () => {
     // not sure about selection...
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">[]1</td><td class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -528,23 +540,27 @@ test("basic clear row content operation", async () => {
     // not sure about selection...
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a"><p>1[]</p></td><td class="b"><p>2</p></td></tr>
                 <tr><td class="c"><p><br></p></td><td class="d"><p><br></p></td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a"><p>1[]</p></td><td class="b"><p>2</p></td></tr>
                 <tr><td class="c"><p>3</p></td><td class="d"><h2>4</h2></td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -572,6 +588,7 @@ test("insert column left operation", async () => {
     await click("div[name='insert_left']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -585,18 +602,21 @@ test("insert column left operation", async () => {
                     <td class="d">4</td>
                 </tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -624,6 +644,7 @@ test("insert column right operation", async () => {
     await click("div[name='insert_right']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -637,18 +658,21 @@ test("insert column right operation", async () => {
                     <td class="d">4</td>
                 </tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -676,6 +700,7 @@ test("insert column right operation when table header exists", async () => {
     await click("div[name='insert_right']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -689,7 +714,8 @@ test("insert column right operation when table header exists", async () => {
                     <td class="d">4</td>
                 </tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -717,6 +743,7 @@ test("insert row above operation", async () => {
     await click("div[name='insert_above']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -732,18 +759,21 @@ test("insert row above operation", async () => {
                     <td class="d">4</td>
                 </tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -771,6 +801,7 @@ test("insert row above operation should not retain height and width styles", asy
     await click("div[name='insert_above']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -786,7 +817,8 @@ test("insert row above operation should not retain height and width styles", asy
                     <td class="d">4</td>
                 </tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -814,6 +846,7 @@ test("insert row below operation", async () => {
     await click("div[name='insert_below']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -829,18 +862,21 @@ test("insert row below operation", async () => {
                     <td class="d">4</td>
                 </tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -868,23 +904,27 @@ test("move column left operation", async () => {
     await click("div[name='move_left']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
             <tr><td class="b">2[]</td><td class="a">1</td></tr>
             <tr><td class="d">4</td><td class="c">3</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1</td><td class="b">2[]</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -912,23 +952,27 @@ test("move column right operation", async () => {
     await click("div[name='move_right']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
             <tr><td class="b">2[]</td><td class="a">1</td></tr>
             <tr><td class="d">4</td><td class="c">3</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1</td><td class="b">2[]</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -956,23 +1000,27 @@ test("move row above operation", async () => {
     await click("div[name='move_up']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
             <tr><td class="c">3</td><td class="d">4</td></tr>
             <tr><td class="a">1[]</td><td class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1000,12 +1048,14 @@ test("move second row to top when first row is header row", async () => {
     await click("div[name='move_up']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><th class="o_table_header">3</th><th class="o_table_header">4</th></tr>
                 <tr><td>1[]</td><td>2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1034,13 +1084,15 @@ test("preserve table rows width on move row above operation", async () => {
     await click("div[name='move_up']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td style="width: 100px;" class="c">3</td><td style="width: 200px;" class="d">4</td></tr>
                 <tr><td style="width: 100px;" class="a">1[]</td><td style="width: 200px;" class="b">2</td></tr>
                 <tr><td style="width: 150px;" class="e">5</td><td style="width: 150px;" class="f">6</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1068,23 +1120,27 @@ test("move row below operation", async () => {
     await click("div[name='move_down']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
             <tr><td class="c">3</td><td class="d">4</td></tr>
             <tr><td class="a">1[]</td><td class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td class="a">1[]</td><td class="b">2</td></tr>
                 <tr><td class="c">3</td><td class="d">4</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1112,12 +1168,14 @@ test("move header row below operation", async () => {
     await click("div[name='move_down']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><th class="o_table_header">3</th><th class="o_table_header">4</th></tr>
                 <tr><td>1[]</td><td>2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1146,13 +1204,15 @@ test("preserve table rows width on move row below operation", async () => {
     await click("div[name='move_down']");
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td style="width: 100px;" class="c">3</td><td style="width: 200px;" class="d">4</td></tr>
                 <tr><td style="width: 100px;" class="a">1[]</td><td style="width: 200px;" class="b">2</td></tr>
                 <tr><td style="width: 150px;" class="e">5</td><td style="width: 150px;" class="f">6</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1177,23 +1237,28 @@ test("reset table size to remove custom width", async () => {
     await click(queryOne(".dropdown-menu [name='reset_table_size']"));
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr><td style="" class="a">1[]</td></tr>
                 <tr><td style="" class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
-        unformat(`
-        <table style="width: 150px;">
+        unformat(
+            `<p data-selection-placeholder=""><br></p>
+            <table style="width: 150px;">
             <tbody>
             <tr><td style="width: 100px;" class="a">1[]</td></tr>
             <tr><td style="width: 50px;" class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`
+        )
     );
 });
 
@@ -1218,23 +1283,27 @@ test("reset table size to remove custom height", async () => {
     await click(queryOne(".dropdown-menu [name='reset_table_size']"));
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr style=""><td class="a">1[]</td></tr>
                 <tr style=""><td class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 
     undo(editor);
     expect(getContent(el)).toBe(
         unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
             <tr style="height: 100px;"><td class="a">1[]</td></tr>
             <tr style="height: 50px;"><td class="b">2</td></tr>
             </tbody>
-        </table>`)
+        </table>
+        <p data-selection-placeholder=""><br></p>`)
     );
 });
 
@@ -1271,7 +1340,8 @@ test("reset row size to remove custom height", async () => {
     await waitFor(".dropdown-menu", { timeout: 1000 });
     await click(queryOne(".dropdown-menu [name='reset_row_size']"));
     expect(getContent(el)).toBe(
-        unformat(`
+        unformat(
+            `<p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table">
                 <tbody>
                     <tr style="">
@@ -1290,7 +1360,9 @@ test("reset row size to remove custom height", async () => {
                         <td class="i">9</td>
                     </tr>
                 </tbody>
-            </table>`)
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
+        )
     );
 });
 
@@ -1326,7 +1398,8 @@ test("should redistribute excess width from current column to smaller columns",
     await waitFor(".dropdown-menu", { timeout: 1000 });
     await click(queryOne(".dropdown-menu [name='reset_column_size']"));
     expect(getContent(el)).toBe(
-        unformat(`
+        unformat(
+            `<p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table" style="width: 500px">
                 <tbody>
                     <tr>
@@ -1344,7 +1417,9 @@ test("should redistribute excess width from current column to smaller columns",
                         <td style="" class="j">10</td>
                     </tr>
                 </tbody>
-            </table>`)
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
+        )
     );
 });
 
@@ -1384,7 +1459,8 @@ test("should redistribute excess width from larger columns to current column", a
     await waitFor(".dropdown-menu", { timeout: 1000 });
     await click(queryOne(".dropdown-menu [name='reset_column_size']"));
     expect(getContent(el)).toBe(
-        unformat(`
+        unformat(
+            `<p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table" style="width: 700px">
                 <tbody>
                     <tr>
@@ -1406,7 +1482,9 @@ test("should redistribute excess width from larger columns to current column", a
                         <td style="width: 120px;" class="n">14</td>
                     </tr>
                 </tbody>
-            </table>`)
+            </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
+        )
     );
 });
 
@@ -1440,6 +1518,7 @@ test("applies alternating row colors when 'Insert Alternate Colors' option is cl
     await click("div[name='toggle_alternating_rows'");
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="o_alternating_rows">
                 <tbody>
                     <tr><td class="a">1[]</td></tr>
@@ -1447,7 +1526,8 @@ test("applies alternating row colors when 'Insert Alternate Colors' option is cl
                     <tr><td>3</td></tr>
                     <tr><td>4</td></tr>
                 </tbody>
-            </table>`)
+            </table>
+            <p data-selection-placeholder=""><br></p>`)
     );
     expect(getComputedStyle(cells[2]).backgroundColor).toBe(firstRowCellColor);
     const secondRowCellColor = getComputedStyle(cells[1]).backgroundColor;
@@ -1487,6 +1567,7 @@ test("removes alternating row colors when 'Clear Alternate Colors' option is cli
     await click("div[name='toggle_alternating_rows'");
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="">
                 <tbody>
                     <tr><td class="a">1[]</td></tr>
@@ -1494,7 +1575,8 @@ test("removes alternating row colors when 'Clear Alternate Colors' option is cli
                     <tr><td>3</td></tr>
                     <tr><td>4</td></tr>
                 </tbody>
-            </table>`)
+            </table>
+            <p data-selection-placeholder=""><br></p>`)
     );
     expect(
         cells.every((cell) => getComputedStyle(cell).backgroundColor === firstRowCellColor)
diff --git a/addons/html_editor/static/tests/tags.test.js b/addons/html_editor/static/tests/tags.test.js
index 79bbb9ba4f60c..a336b9a137f2a 100644
--- a/addons/html_editor/static/tests/tags.test.js
+++ b/addons/html_editor/static/tests/tags.test.js
@@ -676,14 +676,16 @@ describe("transform", () => {
         const { el, editor } = await setupEditor("<p>[]<br></p>");
         await insertText(editor, "--- ");
         expect(getContent(el)).toBe(
-            `<hr contenteditable="false"><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
+            `<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p><hr contenteditable="false"><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
         );
     });
 
     test("should transform three dashes at the start of text to separator before the block", async () => {
         const { el, editor } = await setupEditor("<p>[]abc</p>");
         await insertText(editor, "--- ");
-        expect(getContent(el)).toBe(`<hr contenteditable="false"><p>[]abc</p>`);
+        expect(getContent(el)).toBe(
+            `<p data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></p><hr contenteditable="false"><p>[]abc</p>`
+        );
     });
 
     test("should transform space preceding by greater-than symbol to blockquote", async () => {
diff --git a/addons/html_editor/static/tests/toolbar.test.js b/addons/html_editor/static/tests/toolbar.test.js
index 8d4cacd011806..1a251a86ee9a5 100644
--- a/addons/html_editor/static/tests/toolbar.test.js
+++ b/addons/html_editor/static/tests/toolbar.test.js
@@ -573,6 +573,7 @@ test("toolbar should not open on keypress tab inside table", async () => {
         </table>
     `);
     const contentAfter = unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -581,6 +582,7 @@ test("toolbar should not open on keypress tab inside table", async () => {
                 </tr>
             </tbody>
         </table>
+        <p data-selection-placeholder=""><br></p>
     `);
 
     const { el } = await setupEditor(contentBefore);
@@ -719,6 +721,7 @@ test("toolbar should close on keypress tab inside table", async () => {
         </table>
     `);
     const contentAfter = unformat(`
+        <p data-selection-placeholder=""><br></p>
         <table>
             <tbody>
                 <tr>
@@ -727,6 +730,7 @@ test("toolbar should close on keypress tab inside table", async () => {
                 </tr>
             </tbody>
         </table>
+        <p data-selection-placeholder=""><br></p>
     `);
 
     const { el } = await setupEditor(contentBefore);
@@ -764,6 +768,7 @@ test("toolbar works: show the correct vertical alignment", async () => {
     expect(".dropdown-menu button.active svg[name='vertical_align_middle']").toHaveCount(1);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr style="height: 100px;">
@@ -778,6 +783,7 @@ test("toolbar works: show the correct vertical alignment", async () => {
                     </tr>
                 </tbody>
             </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `)
     );
 });
@@ -808,6 +814,7 @@ test("toolbar works: show the correct vertical alignment after undo/redo", async
     expect(".dropdown-menu button.active svg[name='vertical_align_bottom']").toHaveCount(1);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr style="height: 100px;">
@@ -820,6 +827,7 @@ test("toolbar works: show the correct vertical alignment after undo/redo", async
                     </tr>
                 </tbody>
             </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `)
     );
     await press(["ctrl", "z"]);
@@ -827,6 +835,7 @@ test("toolbar works: show the correct vertical alignment after undo/redo", async
     expect("button[name='vertical_align'] svg[name='vertical_align_top']").toHaveCount(1);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table">
                 <tbody>
                     <tr style="height: 100px;">
@@ -839,6 +848,7 @@ test("toolbar works: show the correct vertical alignment after undo/redo", async
                     </tr>
                 </tbody>
             </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `)
     );
     await press(["ctrl", "y"]);
@@ -847,6 +857,7 @@ test("toolbar works: show the correct vertical alignment after undo/redo", async
     expect(".dropdown-menu button.active svg[name='vertical_align_bottom']").toHaveCount(1);
     expect(getContent(el)).toBe(
         unformat(`
+            <p data-selection-placeholder=""><br></p>
             <table class="table table-bordered o_table o_selected_table">
                 <tbody>
                     <tr style="height: 100px;">
@@ -859,6 +870,7 @@ test("toolbar works: show the correct vertical alignment after undo/redo", async
                     </tr>
                 </tbody>
             </table>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
         `)
     );
 });
diff --git a/addons/html_editor/static/tests/unbreakable/split_element_block.test.js b/addons/html_editor/static/tests/unbreakable/split_element_block.test.js
index 39cfad72db346..b3284cf5fa10f 100644
--- a/addons/html_editor/static/tests/unbreakable/split_element_block.test.js
+++ b/addons/html_editor/static/tests/unbreakable/split_element_block.test.js
@@ -26,9 +26,13 @@ test("should replace splitElementBlock with insertLineBreak (selection end)", as
 });
 test("should not split a contenteditable='false'", async () => {
     const { editor, el } = await setupEditor(`<p contenteditable="false">ab</p>`);
-    const p = el.querySelector("p");
+    const p = el.querySelector("p[contenteditable=false]");
     editor.shared.split.splitBlockNode({ targetNode: p, targetOffset: 0 });
-    expect(getContent(el)).toBe(`<p contenteditable="false">ab</p>`);
+    expect(getContent(el)).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            '<p contenteditable="false">ab</p>' +
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>'
+    );
 });
 test("should split an explicit contenteditable='true' if its ancestor isContentEditable", async () => {
     await testEditor({
diff --git a/addons/html_editor/static/tests/utils/dom.test.js b/addons/html_editor/static/tests/utils/dom.test.js
index 638bd3277b706..62af15303241f 100644
--- a/addons/html_editor/static/tests/utils/dom.test.js
+++ b/addons/html_editor/static/tests/utils/dom.test.js
@@ -391,10 +391,14 @@ describe("wrapInlinesInBlocks", () => {
 describe("fillEmpty", () => {
     test("should not add fill a shrunk protected block, nor add a ZWS to it", async () => {
         const { el } = await setupEditor('<div data-oe-protected="true"></div>');
-        expect(el.innerHTML).toBe('<div data-oe-protected="true" contenteditable="false"></div>');
+        expect(el.innerHTML).toBe(
+            '<p data-selection-placeholder=""><br></p><div data-oe-protected="true" contenteditable="false"></div><p data-selection-placeholder=""><br></p>'
+        );
         const div = el.firstChild;
         fillEmpty(div);
-        expect(el.innerHTML).toBe('<div data-oe-protected="true" contenteditable="false"></div>');
+        expect(el.innerHTML).toBe(
+            '<p data-selection-placeholder=""><br></p><div data-oe-protected="true" contenteditable="false"></div><p data-selection-placeholder=""><br></p>'
+        );
     });
     test("should not fill a block containing a canvas", async () => {
         const { el } = await setupEditor("<div><canvas></canvas></div>");
diff --git a/addons/website/static/tests/builder/builder_overlay.test.js b/addons/website/static/tests/builder/builder_overlay.test.js
index 2ab289542a0f3..eaaf55c76f800 100644
--- a/addons/website/static/tests/builder/builder_overlay.test.js
+++ b/addons/website/static/tests/builder/builder_overlay.test.js
@@ -189,7 +189,7 @@ test("Mouse move on throttleForAnimation", async () => {
 
     const keyDownEvent = new KeyboardEvent("keydown", { bubbles: true });
     const mouseMoveEvent = new KeyboardEvent("mousemove", { bubbles: true });
-    const p = queryOne(":iframe p");
+    const p = queryOne(":iframe p:not([data-selection-placeholder])");
 
     p.dispatchEvent(keyDownEvent);
     expect(".oe_overlay.oe_active.o_overlay_hidden").toHaveCount(1);
diff --git a/addons/website/static/tests/builder/invisibility_options.test.js b/addons/website/static/tests/builder/invisibility_options.test.js
index 0015b97f7a466..151e9523bcb9f 100644
--- a/addons/website/static/tests/builder/invisibility_options.test.js
+++ b/addons/website/static/tests/builder/invisibility_options.test.js
@@ -187,7 +187,7 @@ test("Show conditionally hidden elements should not be tracked in history", asyn
     expect(":iframe section").toHaveAttribute("data-invisible", "1");
     expect(".o_we_invisible_el_panel .o_we_invisible_entry i").toHaveClass("fa-eye-slash");
 
-    setSelection({ anchorNode: queryOne(":iframe p"), anchorOffset: 1 });
+    setSelection({ anchorNode: queryOne(":iframe p:not([data-selection-placeholder])"), anchorOffset: 1 });
     await insertText(getEditor(), "x"); // something to undo
     undo(getEditor());
     expect(":iframe section.o_snippet_invisible").toHaveClass("o_conditional_hidden");
diff --git a/addons/website/static/tests/tours/edit_link_popover.js b/addons/website/static/tests/tours/edit_link_popover.js
index 27caa7bae55a2..1b400e77260d0 100644
--- a/addons/website/static/tests/tours/edit_link_popover.js
+++ b/addons/website/static/tests/tours/edit_link_popover.js
@@ -7,7 +7,7 @@ import {
 import { browser } from "@web/core/browser/browser";
 import { patch } from "@web/core/utils/patch";
 
-const FIRST_PARAGRAPH = ":iframe #wrap .s_text_image p:nth-child(2)";
+const FIRST_PARAGRAPH = ":iframe #wrap .s_text_image p:not([data-selection-placeholder]):nth-child(2)";
 
 const clickEditLink = {
     content: "Click on Edit Link in Popover",
diff --git a/addons/website/static/tests/tours/snippet_editor_panel_options.js b/addons/website/static/tests/tours/snippet_editor_panel_options.js
index aa72615187ee8..7a37a4b31e812 100644
--- a/addons/website/static/tests/tours/snippet_editor_panel_options.js
+++ b/addons/website/static/tests/tours/snippet_editor_panel_options.js
@@ -39,8 +39,8 @@ registerWebsitePreviewTour(
             groupName: "Content",
         }),
         // Test keeping the text selection when using the width option.
-        selectFullText("first paragraph", ".s_text_image p"),
-        checkIfParagraphSelected(":iframe .s_text_image p"),
+        selectFullText("first paragraph", ".s_text_image p:not([data-selection-placeholder])"),
+        checkIfParagraphSelected(":iframe .s_text_image p:not([data-selection-placeholder])"),
         checkIfTextToolbarVisible,
         {
             content: "Click on the width option.",
@@ -51,7 +51,7 @@ registerWebsitePreviewTour(
             content: "The snippet should have the correct class.",
             trigger: ":iframe .s_text_image > .o_container_small",
         },
-        checkIfParagraphSelected(":iframe .s_text_image p"),
+        checkIfParagraphSelected(":iframe .s_text_image p:not([data-selection-placeholder])"),
         // Test the anchor option.
         {
             content: "Click on the anchor option",
@@ -99,20 +99,20 @@ registerWebsitePreviewTour(
             name: "Text",
             groupName: "Text",
         }),
-        selectFullText("first paragraph", ".s_text_block p"),
-        checkIfParagraphSelected(":iframe .s_text_block p"),
+        selectFullText("first paragraph", ".s_text_block p:not([data-selection-placeholder])"),
+        checkIfParagraphSelected(":iframe .s_text_block p:not([data-selection-placeholder])"),
         checkIfTextToolbarVisible,
         ...changeOptionInPopover("Text", "Layout", "[data-action-value='3']"),
         {
             content: "The snippet should have the correct number of columns.",
             trigger: ":iframe .s_text_block .container > .row .col-lg-4:eq(3)",
             run() {
-                if (this.anchor.childElementCount !== 3) {
+                if ([...this.anchor.children].filter(child => !child.hasAttribute("data-selection-placeholder")).length !== 3) {
                     console.error("The snippet does not have the correct number of columns");
                 }
             },
         },
-        checkIfParagraphSelected(":iframe .s_text_block p"),
+        checkIfParagraphSelected(":iframe .s_text_block p:not([data-selection-placeholder])"),
         // Test keeping the text selection when removing all columns of a
         // snippet.
         ...changeOptionInPopover("Text", "Layout", "[data-action-value='0']"),
@@ -120,21 +120,21 @@ registerWebsitePreviewTour(
             content: "The snippet should have the correct number of columns.",
             trigger: ":iframe .s_text_block .container:not(:has(.row))",
         },
-        checkIfParagraphSelected(":iframe .s_text_block p"),
+        checkIfParagraphSelected(":iframe .s_text_block p:not([data-selection-placeholder])"),
         // Test keeping the text selection when toggling the grid mode.
         changeOption("Text", "[data-action-id='setGridLayout']"),
         {
             content: "The snippet row should have the grid mode class.",
             trigger: ":iframe .s_text_block .row.o_grid_mode",
         },
-        checkIfParagraphSelected(":iframe .s_text_block p"),
+        checkIfParagraphSelected(":iframe .s_text_block p:not([data-selection-placeholder])"),
         // Test keeping the text selection when toggling back the column mode.
         changeOption("Text", "[data-action-id='setColumnLayout']"),
         {
             content: "The snippet row should not have the grid mode class anymore.",
             trigger: ":iframe .s_text_block .row:not(.o_grid_mode)",
         },
-        checkIfParagraphSelected(":iframe .s_text_block p"),
+        checkIfParagraphSelected(":iframe .s_text_block p:not([data-selection-placeholder])"),
         ...clickOnSave(),
     ]
 );

From ce3cf3241079fa8c81cc585c2ec6bb3b48afc2cb Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Thu, 9 Oct 2025 08:43:01 +0200
Subject: [PATCH 284/673] [IMP] html_editor: remove paragraph paddings around
 banners

Since the introduction of selection placeholders, inserting paragraphs
before and after banners is not necessary anymore.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../static/src/main/banner_plugin.js            | 12 +++++-------
 addons/html_editor/static/tests/banner.test.js  | 17 +++++++----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/addons/html_editor/static/src/main/banner_plugin.js b/addons/html_editor/static/src/main/banner_plugin.js
index 62eecf2bed113..aa8da9cf603c3 100644
--- a/addons/html_editor/static/src/main/banner_plugin.js
+++ b/addons/html_editor/static/src/main/banner_plugin.js
@@ -1,5 +1,5 @@
 import { Plugin } from "@html_editor/plugin";
-import { fillShrunkPhrasingParent, fixNonEditableFirstChild } from "@html_editor/utils/dom";
+import { fillShrunkPhrasingParent } from "@html_editor/utils/dom";
 import { closestElement } from "@html_editor/utils/dom_traversal";
 import { parseHTML } from "@html_editor/utils/html";
 import { withSequence } from "@html_editor/utils/resource";
@@ -133,15 +133,13 @@ export class BannerPlugin extends Plugin {
             </div>`
         ).childNodes[0];
         this.dependencies.dom.insert(bannerElement);
-        const baseContainerNodeName = this.dependencies.baseContainer.getDefaultNodeName();
-        const nextNode = this.dependencies.baseContainer.isCandidateForBaseContainer(blockEl)
-            ? blockEl.nodeName
-            : baseContainerNodeName;
-        this.dependencies.dom.setBlock({ tagName: nextNode });
-        fixNonEditableFirstChild(this.editable, bannerElement, baseContainerNodeName);
         this.dependencies.selection.setCursorEnd(
             bannerElement.querySelector(`.o_editor_banner_content > ${baseContainer.tagName}`)
         );
+        // Remove the old element.
+        if (bannerElement.nextSibling?.nodeName === blockEl.nodeName) {
+            bannerElement.nextSibling.remove();
+        }
         this.dependencies.history.addStep();
     }
 
diff --git a/addons/html_editor/static/tests/banner.test.js b/addons/html_editor/static/tests/banner.test.js
index e056bbabf8a6e..d14db8746cea8 100644
--- a/addons/html_editor/static/tests/banner.test.js
+++ b/addons/html_editor/static/tests/banner.test.js
@@ -1,5 +1,5 @@
 import { expect, test } from "@odoo/hoot";
-import { click, manuallyDispatchProgrammaticEvent, press, tick, waitFor } from "@odoo/hoot-dom";
+import { click, manuallyDispatchProgrammaticEvent, press, waitFor } from "@odoo/hoot-dom";
 import { animationFrame } from "@odoo/hoot-mock";
 import { setupEditor } from "./_helpers/editor";
 import { getContent, setSelection } from "./_helpers/selection";
@@ -16,7 +16,6 @@ test("should insert a banner with focus inside followed by a paragraph", async (
     expect(".active .o-we-command-name").toHaveText("Banner Info");
 
     await press("enter");
-    await tick(); // Wait for selectionchange to update hints.
     expect(unformat(getContent(el))).toBe(
         unformat(
             `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
@@ -24,7 +23,7 @@ test("should insert a banner with focus inside followed by a paragraph", async (
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>Test[]</p>
                     </div>
-                </div><p><br></p>`
+                </div><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         )
     );
 
@@ -57,7 +56,7 @@ test("press 'ctrl+a' inside a banner should select all the banner content", asyn
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>[Test</p><p>Test1</p><p>Test2]</p>
                     </div>
-                </div><p><br></p>`
+                </div><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         )
     );
 });
@@ -82,7 +81,7 @@ test("remove all content should preserve the first paragraph tag inside the bann
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>[Test</p><p>Test1</p><p>Test2]</p>
                     </div>
-                </div><p><br></p>`
+                </div><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         )
     );
 
@@ -92,7 +91,7 @@ test("remove all content should preserve the first paragraph tag inside the bann
             `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                     <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true"><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></div>
-                </div><p><br></p>`
+                </div><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         )
     );
 });
@@ -101,7 +100,6 @@ test("Inserting a banner at the top of the editable also inserts a paragraph abo
     const { el, editor } = await setupEditor("<p>test[]</p>");
     await insertText(editor, "/bannerinfo");
     await press("enter");
-    await tick(); // Wait for selectionchange to update hints.
     expect(unformat(getContent(el))).toBe(
         unformat(
             `<p data-selection-placeholder=""><br></p>
@@ -111,7 +109,7 @@ test("Inserting a banner at the top of the editable also inserts a paragraph abo
                     <p>test[]</p>
                 </div>
             </div>
-            <p><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         )
     );
 });
@@ -276,13 +274,12 @@ test("should move heading element inside the banner, with paragraph element afte
     expect(".active .o-we-command-name").toHaveText("Banner Info");
 
     await press("enter");
-    await tick(); // Wait for selectionchange to update hints.
     expect(getContent(el)).toBe(
         `<p data-selection-placeholder=""><br></p><div class="o_editor_banner user-select-none o-contenteditable-false lh-1 d-flex align-items-center alert alert-info pb-0 pt-3" data-oe-role="status" contenteditable="false" role="status">
                 <i class="o_editor_banner_icon mb-3 fst-normal" data-oe-aria-label="Banner Info" aria-label="Banner Info">💡</i>
                 <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                     <h1>Test[]</h1>
                 </div>
-            </div><p><br></p>`
+            </div><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
     );
 });

From 6544d3bd13c5131a0c40749c8c22dd28fc988c83 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Thu, 9 Oct 2025 08:45:33 +0200
Subject: [PATCH 285/673] [IMP] html_editor: remove paragraph paddings around
 captions

Since the introduction of selection placeholders, inserting paragraphs
before and after captions is not necessary anymore.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../plugins/caption_plugin/caption_plugin.js  | 30 +++-----
 .../html_editor/static/tests/caption.test.js  | 69 +++++++------------
 2 files changed, 34 insertions(+), 65 deletions(-)

diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
index fac090abaf2de..4b3cd6bdef1db 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
@@ -1,10 +1,10 @@
 import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
-import { closestBlock } from "@html_editor/utils/blocks";
+import { closestBlock, isBlock } from "@html_editor/utils/blocks";
 import { renderToElement } from "@web/core/utils/render";
-import { fillEmpty, unwrapContents } from "@html_editor/utils/dom";
+import { unwrapContents } from "@html_editor/utils/dom";
 import { closestElement } from "@html_editor/utils/dom_traversal";
-import { EDITABLE_MEDIA_CLASS, isShrunkBlock } from "@html_editor/utils/dom_info";
+import { EDITABLE_MEDIA_CLASS, isVisible } from "@html_editor/utils/dom_info";
 import { boundariesOut, rightPos } from "@html_editor/utils/position";
 import { findInSelection } from "@html_editor/utils/selection";
 import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
@@ -124,7 +124,13 @@ export class CaptionPlugin extends Plugin {
             closestBlock(image) !== this.editable
         ) {
             // <p>wx<img/>yz</p> => <p>wx</p><p><img/></p><p>yz</p>
-            this.dependencies.split.splitAroundUntil(image, closestBlock(image));
+            const block = this.dependencies.split.splitAroundUntil(image, closestBlock(image));
+            if (isBlock(block.previousSibling) && !isVisible(block.previousSibling)) {
+                block.previousSibling.remove();
+            }
+            if (isBlock(block.nextSibling) && !isVisible(block.nextSibling)) {
+                block.nextSibling.remove();
+            }
         }
         // => <p><figure><img/></figure></p>
         // or <p><a><figure><img/></figure></a></p>
@@ -143,22 +149,6 @@ export class CaptionPlugin extends Plugin {
         // Ensure it's not possible to write inside the figure.
         figure.setAttribute("contenteditable", "false");
         image.classList.add(EDITABLE_MEDIA_CLASS);
-        // Ensure it's possible to write before and after the figure.
-        const block = closestBlock(link || image);
-        if (!block.previousSibling) {
-            const baseContainer = this.dependencies.baseContainer.createBaseContainer();
-            block.before(baseContainer);
-            fillEmpty(baseContainer);
-        } else if (isShrunkBlock(block.previousSibling)) {
-            fillEmpty(block.previousSibling);
-        }
-        if (!block.nextSibling) {
-            const baseContainer = this.dependencies.baseContainer.createBaseContainer();
-            block.after(baseContainer);
-            fillEmpty(baseContainer);
-        } else if (isShrunkBlock(block.nextSibling)) {
-            fillEmpty(block.nextSibling);
-        }
         // Add the caption component.
         // => <p><figure><img/><figcaption>...</figcaption></figure></p>
         // or <p><a><figure><img/><figcaption>...</figcaption></figure></a></p>
diff --git a/addons/html_editor/static/tests/caption.test.js b/addons/html_editor/static/tests/caption.test.js
index 90e71c68fe6e8..e43abca1ab575 100644
--- a/addons/html_editor/static/tests/caption.test.js
+++ b/addons/html_editor/static/tests/caption.test.js
@@ -121,14 +121,14 @@ test("add a caption to an image and focus it", async () => {
             cleanHints(editor);
         },
         contentAfterEdit: unformat(
-            `<p><br></p>
+            `<p data-selection-placeholder=""><br></p>
             <figure contenteditable="false">
                 <img class="img-fluid test-image o_editable_media" src="${base64Img}" data-caption-id="${captionId}" data-caption="">
                 <figcaption ${getFigcaptionAttributes(captionId, "", true)}>
                     <input ${CAPTION_INPUT_ATTRIBUTES}>
                 </figcaption>
             </figure>
-            <p><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
     });
 });
@@ -175,37 +175,34 @@ test("saving an image with a caption replaces the input with plain text", async
             </figure>`
         ),
         contentBeforeEdit: unformat(
-            // Paragraphs get added to ensure we can write before/after the figure.
-            `<p><br></p>
+            `<p data-selection-placeholder=""><br></p>
             <figure contenteditable="false">
                 <img class="img-fluid test-image o_editable_media" src="${base64Img}" data-caption-id="${captionId}" data-caption="${caption}">
                 <figcaption ${getFigcaptionAttributes(captionId, caption)}>
                     <input ${CAPTION_INPUT_ATTRIBUTES}>
                 </figcaption>
             </figure>
-            <p><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         // Unchanged.
         contentAfterEdit: unformat(
-            `<p><br></p>
+            `<p data-selection-placeholder=""><br></p>
             <figure contenteditable="false">
                 <img class="img-fluid test-image o_editable_media" src="${base64Img}" data-caption-id="${captionId}" data-caption="${caption}">
                 <figcaption ${getFigcaptionAttributes(captionId, caption)}>
                     <input ${CAPTION_INPUT_ATTRIBUTES}>
                 </figcaption>
             </figure>
-            <p><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         // Cleaned up for screen readers.
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 <img class="img-fluid test-image" src="${base64Img}">
                 <figcaption>
                     ${caption}
                 </figcaption>
-            </figure>
-            <p><br></p>`
+            </figure>`
         ),
     });
 });
@@ -244,15 +241,11 @@ test("clicking the caption button on an image with a caption removes the caption
             await expectElementCount(".o-we-toolbar", 1);
         },
         contentAfterEdit: unformat(
-            `<p><br></p>
-            <p>[<img class="img-fluid test-image" src="${base64Img}" data-caption="${caption}">]</p>
-            <p><br></p>`
+            `<p>[<img class="img-fluid test-image" src="${base64Img}" data-caption="${caption}">]</p>`
         ),
         // Unchanged
         contentAfter: unformat(
-            `<p><br></p>
-            <p>[<img class="img-fluid test-image" src="${base64Img}" data-caption="${caption}">]</p>
-            <p><br></p>`
+            `<p>[<img class="img-fluid test-image" src="${base64Img}" data-caption="${caption}">]</p>`
         ),
     });
 });
@@ -281,7 +274,7 @@ test("leaving the caption persists its value", async () => {
             await animationFrame(); // Wait for the selection to change.
         },
         contentAfterEdit: unformat(
-            `<p><br></p>
+            `<p data-selection-placeholder=""><br></p>
             <figure contenteditable="false">
                 <img class="img-fluid test-image o_editable_media" src="${base64Img}" data-caption="${caption}ab" data-caption-id="${captionId}">
                 <figcaption ${getFigcaptionAttributes(captionId, caption + "ab", true)}>
@@ -291,8 +284,7 @@ test("leaving the caption persists its value", async () => {
             <h1>[]Heading</h1>`
         ),
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 <img class="img-fluid test-image" src="${base64Img}">
                 <figcaption>
                     ${caption}ab
@@ -321,8 +313,7 @@ test("can't use the powerbox in a caption", async () => {
             await animationFrame(); // Wait for the selection to change.
         },
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 <img class="img-fluid test-image" src="${base64Img}">
                 <figcaption>
                     /
@@ -356,8 +347,7 @@ test("can't use the toolbar in a caption", async () => {
             editor.shared.selection.setCursorStart(queryOne("h1"));
         },
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 <img class="img-fluid test-image" src="${base64Img}">
                 <figcaption>a</figcaption>
             </figure>
@@ -488,10 +478,7 @@ test("remove an image with a caption", async () => {
             await waitFor(".o-we-toolbar button[name='image_delete']");
             await click(".o-we-toolbar button[name='image_delete']");
         },
-        contentAfter: unformat(
-            `<p><br></p>
-            <h1>[]Heading</h1>`
-        ),
+        contentAfter: "<h1>[]Heading</h1>",
     });
 });
 
@@ -511,7 +498,7 @@ const getDeleteImageTestData = () => {
             // Check that we indeed have a proper figure structure.
             expect(getContent(editor.editable).replace("[]", "")).toBe(
                 unformat(
-                    `<p><br></p>
+                    `<p data-selection-placeholder=""><br></p>
                             <figure contenteditable="false">
                             <img class="img-fluid test-image o_editable_media" data-caption="${caption}" src="${base64Img}" data-caption-id="${captionId}">
                             <figcaption ${getFigcaptionAttributes(
@@ -530,10 +517,7 @@ const getDeleteImageTestData = () => {
             await click("h1");
             await click("img");
         },
-        contentAfter: unformat(
-            `<p><br></p>
-            <h1>[]Heading</h1>`
-        ),
+        contentAfter: "<h1>[]Heading</h1>",
     };
 };
 
@@ -599,8 +583,7 @@ test("replace an image with a caption", async () => {
         },
         // TODO: fix the weird final selection
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 <img src="/web/static/img/logo2.png" alt="" data-attachment-id="1" class="img img-fluid o_we_custom_image">
                 <figcaption>Hello</figcaption>
             </figure>
@@ -650,8 +633,7 @@ test("edit caption after replacing image", async () => {
             await animationFrame();
         },
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 [<img src="/web/static/img/logo2.png" alt="" data-attachment-id="1" class="img img-fluid o_we_custom_image">]
                 <figcaption>abc</figcaption>
             </figure>
@@ -697,8 +679,7 @@ test("after replacing a captioned image, undo should revert to the original imag
             expect("img[src='/web/static/img/logo2.png']").toHaveCount(0);
         },
         contentAfter: unformat(
-            `<p><br></p>
-            <figure>
+            `<figure>
                 [<img src="/web/static/img/logo.png" class="img-fluid test-image">]
                 <figcaption></figcaption>
             </figure>
@@ -723,8 +704,7 @@ test("add a link to an image with a caption", async () => {
             await expectElementCount(".o-we-toolbar", 1);
         },
         contentAfter: unformat(
-            `<p><br></p>
-            <p>
+            `<p>
                 <a href="https://odoo.com">
                     <figure>
                         [<img class="img-fluid test-image" src="${base64Img}">]
@@ -758,8 +738,7 @@ test("add a caption to an image with a link", async () => {
             selection.removeAllRanges();
         },
         contentAfter: unformat(
-            `<p><br></p>
-            <div>
+            `<div>
                 <a href="https://odoo.com">
                     <figure>
                         <img class="img-fluid test-image" src="${base64Img}">
@@ -984,14 +963,14 @@ test("should properly parse figure without fig caption", async () => {
             </figure>`
         ),
         contentBeforeEdit: unformat(
-            `<p><br></p>
+            `<p data-selection-placeholder=""><br></p>
             <figure contenteditable="false">
                 <img class="img-fluid test-image o_editable_media" src="${base64Img}" data-caption-id="1" data-caption="">
                 <figcaption data-embedded="caption" data-oe-protected="true" contenteditable="false" class="mt-2" data-embedded-props='{"id":"1","focusInput":false}'>
                 <input type="text" maxlength="100" class="border-0 p-0" placeholder="Write your caption here">
                 </figcaption>
             </figure>
-            <p><br></p>
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>
             `
         ),
     });

From 7f1e319aaec36934e79dc380928d57a5d6da0621 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Thu, 9 Oct 2025 08:45:52 +0200
Subject: [PATCH 286/673] [IMP] html_editor: remove paragraph paddings around
 columns

Since the introduction of selection placeholders, inserting paragraphs
before and after columns is not necessary anymore.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../static/src/main/column_plugin.js          | 19 +++----
 .../static/tests/columnize.test.js            | 56 +++++++++----------
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/addons/html_editor/static/src/main/column_plugin.js b/addons/html_editor/static/src/main/column_plugin.js
index 834c0146a657d..67d6fdd0f4a98 100644
--- a/addons/html_editor/static/src/main/column_plugin.js
+++ b/addons/html_editor/static/src/main/column_plugin.js
@@ -50,7 +50,7 @@ export class ColumnPlugin extends Plugin {
                 categoryId: "structure",
                 isAvailable: columnIsAvailable(2),
                 commandId: "columnize",
-                commandParams: { numberOfColumns: 2 },
+                commandParams: 2,
             },
             {
                 title: _t("3 columns"),
@@ -58,7 +58,7 @@ export class ColumnPlugin extends Plugin {
                 categoryId: "structure",
                 isAvailable: columnIsAvailable(3),
                 commandId: "columnize",
-                commandParams: { numberOfColumns: 3 },
+                commandParams: 3,
             },
             {
                 title: _t("4 columns"),
@@ -66,7 +66,7 @@ export class ColumnPlugin extends Plugin {
                 categoryId: "structure",
                 isAvailable: columnIsAvailable(4),
                 commandId: "columnize",
-                commandParams: { numberOfColumns: 4 },
+                commandParams: 4,
             },
             {
                 title: _t("Remove columns"),
@@ -75,7 +75,7 @@ export class ColumnPlugin extends Plugin {
                 isAvailable: (selection) =>
                     !!closestElement(selection.anchorNode, ".o_text_columns .row"),
                 commandId: "columnize",
-                commandParams: { numberOfColumns: 0 },
+                commandParams: 0,
             },
         ],
         hints: [
@@ -110,7 +110,7 @@ export class ColumnPlugin extends Plugin {
         },
     };
 
-    columnize({ numberOfColumns, addParagraphAfter = true } = {}) {
+    columnize(numberOfColumns) {
         const selectionToRestore = this.dependencies.selection.getEditableSelection();
         const anchor = selectionToRestore.anchorNode;
         const hasColumns = !!closestElement(anchor, ".o_text_columns");
@@ -121,7 +121,7 @@ export class ColumnPlugin extends Plugin {
                 this.removeColumns(anchor);
             }
         } else if (numberOfColumns) {
-            this.createColumns(anchor, numberOfColumns, addParagraphAfter);
+            this.createColumns(anchor, numberOfColumns);
         }
         this.dependencies.selection.setSelection(selectionToRestore);
         this.dependencies.history.addStep();
@@ -142,7 +142,7 @@ export class ColumnPlugin extends Plugin {
         }
     }
 
-    createColumns(anchor, numberOfColumns, addParagraphAfter) {
+    createColumns(anchor, numberOfColumns) {
         const container = this.document.createElement("div");
         if (!closestElement(anchor, ".container")) {
             container.classList.add("container");
@@ -161,11 +161,6 @@ export class ColumnPlugin extends Plugin {
             row.append(column);
             columns.push(column);
         }
-        if (addParagraphAfter) {
-            const baseContainer = this.dependencies.baseContainer.createBaseContainer();
-            baseContainer.append(this.document.createElement("br"));
-            block.after(baseContainer);
-        }
         columns.shift().append(block);
         for (const column of columns) {
             const baseContainer = this.dependencies.baseContainer.createBaseContainer();
diff --git a/addons/html_editor/static/tests/columnize.test.js b/addons/html_editor/static/tests/columnize.test.js
index ca0f6afb0755a..7f4fad0438573 100644
--- a/addons/html_editor/static/tests/columnize.test.js
+++ b/addons/html_editor/static/tests/columnize.test.js
@@ -16,7 +16,7 @@ function column(size, contents) {
 }
 
 function columsDuringEditContainer(contents) {
-    return `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row">${contents}</div></div>`;
+    return `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row">${contents}</div></div><p data-selection-placeholder=""><br></p>`;
 }
 
 function columnDuringEdit(size, contents) {
@@ -25,7 +25,7 @@ function columnDuringEdit(size, contents) {
 
 function columnize(numberOfColumns) {
     return (editor) => {
-        execCommand(editor, "columnize", { numberOfColumns });
+        execCommand(editor, "columnize", numberOfColumns);
     };
 }
 
@@ -42,7 +42,7 @@ describe("2 columns", () => {
                 columsDuringEditContainer(
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint">[]<br></p>`) +
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) + '<p data-selection-placeholder=""><br></p>',
+                ),
             /* eslint-enable */
         });
     });
@@ -59,7 +59,7 @@ describe("2 columns", () => {
                 columsDuringEditContainer(
                     columnDuringEdit(6, `<p data-selection-placeholder=""><br></p><table><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td></tr></tbody></table><p data-selection-placeholder=""><br></p>`) +
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) + '<p data-selection-placeholder=""><br></p>',
+                ),
             /* eslint-enable */
         });
     });
@@ -85,14 +85,12 @@ describe("2 columns", () => {
                 columsDuringEditContainer(
                     columnDuringEdit(6, "<p>[]abcd</p>") +
                     columnDuringEdit(6, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) +
-                "<p><br></p>",
+                ),
             contentAfter:
                 columnsContainer(
                     column(6, "<p>[]abcd</p>") +
                     column(6, "<p><br></p>")
-                ) +
-                "<p><br></p>",
+                )
             /* eslint-enable */
         });
     });
@@ -134,7 +132,7 @@ describe("2 columns", () => {
 
         await press("enter");
         expect(getContent(el)).toBe(
-            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p data-selection-placeholder=""><br></p>`
         );
 
         await insertText(editor, "/columns");
@@ -158,7 +156,7 @@ describe("3 columns", () => {
                     columnDuringEdit(4, "<p>abcd</p>") +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint">[]<br></p>`)
-                ) + '<p data-selection-placeholder=""><br></p>',
+                ),
             /* eslint-enable */
             stepFunction: columnize(3),
             contentAfter: columnsContainer(
@@ -177,13 +175,13 @@ describe("3 columns", () => {
                     columnDuringEdit(4, "<p>ab[]cd</p>") +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) + "<p><br></p>",
+                ),
             contentAfter:
                 columnsContainer(
                     column(4, "<p>ab[]cd</p>") +
                     column(4, "<p><br></p>") +
                     column(4, "<p><br></p>")
-                ) + "<p><br></p>",
+                ),
             /* eslint-enable */
         });
     });
@@ -227,7 +225,7 @@ describe("3 columns", () => {
 
         await press("enter");
         expect(getContent(el)).toBe(
-            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-4 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-4 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-4 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p data-selection-placeholder=""><br></p>`
         );
 
         await insertText(editor, "/columns");
@@ -263,13 +261,12 @@ describe("4 columns", () => {
         await testEditor({
             contentBefore: "<p>abcd[]</p>",
             stepFunction: columnize(4),
-            contentAfter:
-                columnsContainer(
-                    column(3, "<p>abcd[]</p>") +
-                        column(3, "<p><br></p>") +
-                        column(3, "<p><br></p>") +
-                        column(3, "<p><br></p>")
-                ) + "<p><br></p>",
+            contentAfter: columnsContainer(
+                column(3, "<p>abcd[]</p>") +
+                    column(3, "<p><br></p>") +
+                    column(3, "<p><br></p>") +
+                    column(3, "<p><br></p>")
+            ),
         });
     });
 
@@ -313,7 +310,7 @@ describe("4 columns", () => {
 
         await press("enter");
         expect(getContent(el)).toBe(
-            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-3 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-3 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div><div class="col-3 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p data-selection-placeholder=""><br></p>`
         );
 
         await insertText(editor, "/columns");
@@ -383,14 +380,14 @@ describe("remove columns", () => {
         // add 2 columns
         await press("enter");
         expect(getContent(el)).toBe(
-            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p><br></p>`
+            `<p data-selection-placeholder=""><br></p><div class="container o_text_columns o-contenteditable-false" contenteditable="false"><div class="row"><div class="col-6 o-contenteditable-true" contenteditable="true"><p>ab[]cd</p></div><div class="col-6 o-contenteditable-true" contenteditable="true"><p o-we-hint-text="Empty column" class="o-we-hint"><br></p></div></div></div><p data-selection-placeholder=""><br></p>`
         );
 
         await insertText(editor, "/removecolumns");
         await animationFrame();
         expect(".active .o-we-command-name").toHaveText("Remove columns");
         await press("enter");
-        expect(getContent(el)).toBe(`<p>ab[]cd</p><p><br></p><p><br></p>`);
+        expect(getContent(el)).toBe(`<p>ab[]cd</p><p><br></p>`);
     });
 });
 
@@ -408,7 +405,7 @@ describe("complex", () => {
             },
             // A paragraph was created for each column + after them and
             // they were all kept.
-            contentAfter: "<p>ab[]cd</p><p><br></p><p><br></p><p><br></p><p><br></p>",
+            contentAfter: "<p>ab[]cd</p><p><br></p><p><br></p><p><br></p>",
         });
     });
 
@@ -427,7 +424,6 @@ describe("complex", () => {
                 "</div>" +
                 '<div class="col-6 o-contenteditable-true"><p><br></p></div>' +
                 "</div></div>" +
-                "<p><br></p>" +
                 "</div></div></div>",
         });
     });
@@ -455,9 +451,7 @@ describe("undo", () => {
                 redo(editor);
                 await insertText(editor, "x");
             },
-            contentAfter:
-                columnsContainer(column(6, "<p>x[]</p>") + column(6, "<p><br></p>")) +
-                "<p><br></p>",
+            contentAfter: columnsContainer(column(6, "<p>x[]</p>") + column(6, "<p><br></p>")),
         });
     });
 });
@@ -521,7 +515,7 @@ describe("helper hint", () => {
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint">[]<br></p>`) +
                     columnDuringEdit(4, `<h1 o-we-hint-text="Heading 1" class="o-we-hint"><br></h1>` + "<h2><br></h2>") +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) + '<p data-selection-placeholder=""><br></p>',
+                ),
             /* eslint-enable */
         });
     });
@@ -540,7 +534,7 @@ describe("helper hint", () => {
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, "<h1><br></h1>" + `<h2 o-we-hint-text="Heading 2" class="o-we-hint">[]<br></h2>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) + '<p data-selection-placeholder=""><br></p>',
+                ),
             /* eslint-enable */
         });
     });
@@ -559,7 +553,7 @@ describe("helper hint", () => {
                     columnDuringEdit(4, "<p><br></p>" + `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`) +
                     columnDuringEdit(4, `<p o-we-hint-text="Empty column" class="o-we-hint"><br></p>`)
-                ) + '<p data-selection-placeholder=""><br></p>',
+                ),
             /* eslint-enable */
         });
     });

From f9a2002b41b7273f89fe63d1503b49a7429bd3b7 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Thu, 9 Oct 2025 08:47:30 +0200
Subject: [PATCH 287/673] [IMP] html_editor: remove paragraph paddings around
 table of contents

Since the introduction of selection placeholders, inserting paragraphs
before and after tables of contents is not necessary anymore.

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../table_of_content_plugin.js                | 15 +------------
 addons/html_editor/static/src/utils/dom.js    | 21 -------------------
 .../static/tests/html_field.test.js           |  6 ++++--
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js
index 531ba07350d02..f4f149e21a6a2 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js
@@ -6,18 +6,10 @@ import {
     TableOfContentManager,
 } from "@html_editor/others/embedded_components/core/table_of_content/table_of_content_manager";
 import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
-import { fixNonEditableFirstChild } from "@html_editor/utils/dom";
 
 export class TableOfContentPlugin extends Plugin {
     static id = "tableOfContent";
-    static dependencies = [
-        "dom",
-        "selection",
-        "embeddedComponents",
-        "link",
-        "history",
-        "baseContainer",
-    ];
+    static dependencies = ["dom", "selection", "embeddedComponents", "link", "history"];
     resources = {
         user_commands: [
             {
@@ -59,11 +51,6 @@ export class TableOfContentPlugin extends Plugin {
     insertTableOfContent() {
         const tableOfContentBlueprint = renderToElement("html_editor.TableOfContentBlueprint");
         this.dependencies.dom.insert(tableOfContentBlueprint);
-        fixNonEditableFirstChild(
-            this.editable,
-            tableOfContentBlueprint,
-            this.dependencies.baseContainer.getDefaultNodeName()
-        );
         this.dependencies.history.addStep();
     }
 
diff --git a/addons/html_editor/static/src/utils/dom.js b/addons/html_editor/static/src/utils/dom.js
index 61e87aa0820c6..8b2a70df0dca9 100644
--- a/addons/html_editor/static/src/utils/dom.js
+++ b/addons/html_editor/static/src/utils/dom.js
@@ -300,24 +300,3 @@ export function splitTextNode(textNode, offset, originalNodeSide = DIRECTIONS.RI
     }
     return parentOffset;
 }
-
-/**
- * Ensures that the first child of the editable container is editable.
- *
- * A Chromium bug prevents selecting the container if editable's first child
- * is contenteditable= false element. To avoid this, a base container is
- * inserted before the non-editable node so it no longer appears as
- * the first child.
- *
- * @param {HTMLElement} editable
- * @param {Node} node The non-editable first child of the editable container.
- * @param {string} baseContainerNodeName
- */
-export function fixNonEditableFirstChild(editable, node, baseContainerNodeName) {
-    if (editable.firstChild === node) {
-        const ownerDocument = node.ownerDocument;
-        const firstBaseContainer = createBaseContainer(baseContainerNodeName, ownerDocument);
-        firstBaseContainer.append(ownerDocument.createElement("br"));
-        node.before(firstBaseContainer);
-    }
-}
diff --git a/addons/html_editor/static/tests/html_field.test.js b/addons/html_editor/static/tests/html_field.test.js
index ef457b4276382..731fadc4d767e 100644
--- a/addons/html_editor/static/tests/html_field.test.js
+++ b/addons/html_editor/static/tests/html_field.test.js
@@ -2574,7 +2574,7 @@ describe("codeview enabled", () => {
     });
 });
 
-test("should never insert Table of Contents as the first child of the editable", async () => {
+test("should always have a block before a Table of Contents", async () => {
     Partner._records = [
         {
             id: 1,
@@ -2598,5 +2598,7 @@ test("should never insert Table of Contents as the first child of the editable",
     await animationFrame();
     const firstChild = htmlEditor.editable.firstChild;
     expect(firstChild.getAttribute("data-embedded")).not.toBe("tableOfContent");
-    expect(firstChild).toHaveOuterHTML('<div class="o-paragraph"><br></div>');
+    expect(firstChild).toHaveOuterHTML(
+        '<div class="o-paragraph" data-selection-placeholder="" style="margin: 8px 0px -9px;"><br></div>'
+    );
 });

From 0778d56957b1ea1be8623b565917142dc7751de5 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Tue, 30 Sep 2025 15:58:48 +0200
Subject: [PATCH 288/673] [IMP] html_editor: prevent empty block after split on
 insert

When inserting one or more blocks with `dom.insert`, we split the
current block, which can result in an empty block after the one(s) we
inserted. Since before the introduction of selection placeholders, it
was impossible to create a new block after a trailing unsplittable
element, a `[contenteditable=false]` or a table, we were keeping these
empty blocks (see commit [1]).

For example:

```html
<p>abc[]</p>
```
-> insert a table
->
```html
<p>abc</p>
<table>...</table>
<p><br></p>
```

That trailing paragraph is unexpected and is now removed.

Commit [1]: https://github.com/odoo/odoo/commit/4147fbbf53e0edf7db9da4985f5e03a322aff631

task-4129699

Part-of: odoo/odoo#234185
Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../html_editor/static/src/core/dom_plugin.js | 34 +------
 .../static/src/core/split_plugin.js           |  5 ++
 .../html_editor/static/tests/banner.test.js   |  4 +-
 .../static/tests/collaboration.test.js        | 20 +++--
 addons/html_editor/static/tests/color.test.js |  4 +-
 .../static/tests/data-oe/protected.test.js    |  6 ++
 .../static/tests/delete/backward.test.js      | 36 ++++++--
 .../static/tests/delete/delete_range.test.js  |  3 +-
 .../delete/find_adjacent_position.test.js     | 10 ++-
 .../tests/delete/fix_base_container.test.js   | 14 +++
 .../html_editor/static/tests/editor.test.js   |  4 +-
 .../static/tests/embedded_components.test.js  | 34 +++----
 .../static/tests/font_awesome.test.js         |  4 +-
 .../static/tests/format/bold.test.js          |  4 +-
 .../static/tests/html_field.test.js           |  5 +-
 .../static/tests/insert/html.test.js          | 38 +++++---
 .../static/tests/insert/separator.test.js     |  2 +-
 .../list/automatic_list_detection.test.js     |  2 +-
 addons/html_editor/static/tests/misc.test.js  | 24 ++++-
 .../html_editor/static/tests/movenode.test.js |  4 +-
 addons/html_editor/static/tests/paste.test.js | 24 +++--
 .../html_editor/static/tests/powerbox.test.js |  4 +-
 addons/html_editor/static/tests/qweb.test.js  | 88 ++++++++++++++-----
 .../static/tests/selection.test.js            | 28 ++++--
 .../static/tests/table/adding_table.test.js   |  4 +-
 .../static/tests/utils/dom.test.js            |  7 +-
 26 files changed, 273 insertions(+), 139 deletions(-)

diff --git a/addons/html_editor/static/src/core/dom_plugin.js b/addons/html_editor/static/src/core/dom_plugin.js
index 4cc60d7443966..4c1aaea6fd172 100644
--- a/addons/html_editor/static/src/core/dom_plugin.js
+++ b/addons/html_editor/static/src/core/dom_plugin.js
@@ -347,9 +347,7 @@ export class DomPlugin extends Plugin {
                             fillShrunkPhrasingParent(otherNode);
                         }
                         // After the content insertion, the right-part of a
-                        // split is evaluated for removal, if it is unnecessary
-                        // (to guarantee a paragraph-related element
-                        // after the last unsplittable inserted element).
+                        // split is evaluated for removal.
                         candidatesForRemoval.push(right);
                     } else {
                         if (isBlock(currentNode)) {
@@ -410,41 +408,16 @@ export class DomPlugin extends Plugin {
                 !(isProtected(parent) && !isUnprotecting(parent)) &&
                 parent.isContentEditable
             ) {
-                cleanTrailingBR(parent, [
-                    (node) => {
-                        // Don't remove the last BR in cases where the
-                        // previous sibling is an unsplittable block
-                        // (i.e. a table, a non-editable div, ...)
-                        // to allow placing the cursor after that unsplittable
-                        // element. This can be removed when the cursor
-                        // is properly handled around these elements.
-                        const previousSibling = node.previousSibling;
-                        return (
-                            previousSibling &&
-                            isBlock(previousSibling) &&
-                            this.dependencies.split.isUnsplittable(previousSibling)
-                        );
-                    },
-                ]);
+                cleanTrailingBR(parent);
             }
         }
         for (const candidateForRemoval of candidatesForRemoval) {
-            // Ensure that a paragraph related element is present after the last
-            // unsplittable inserted element
             if (
                 candidateForRemoval.isConnected &&
                 (isParagraphRelatedElement(candidateForRemoval) ||
                     isListItemElement(candidateForRemoval)) &&
                 candidateForRemoval.parentElement.isContentEditable &&
-                isEmptyBlock(candidateForRemoval) &&
-                ((candidateForRemoval.previousElementSibling &&
-                    !this.dependencies.split.isUnsplittable(
-                        candidateForRemoval.previousElementSibling
-                    )) ||
-                    (candidateForRemoval.nextElementSibling &&
-                        !this.dependencies.split.isUnsplittable(
-                            candidateForRemoval.nextElementSibling
-                        )))
+                isEmptyBlock(candidateForRemoval)
             ) {
                 candidateForRemoval.remove();
             }
@@ -467,6 +440,7 @@ export class DomPlugin extends Plugin {
             // Correct the position if it happens to be in the editable root.
             lastPosition = getDeepestPosition(...lastPosition);
         }
+        // TODO: check if position is editable?
         this.dependencies.selection.setSelection(
             { anchorNode: lastPosition[0], anchorOffset: lastPosition[1] },
             { normalize: false }
diff --git a/addons/html_editor/static/src/core/split_plugin.js b/addons/html_editor/static/src/core/split_plugin.js
index 2c2f7ebb85379..62619d15f8cb8 100644
--- a/addons/html_editor/static/src/core/split_plugin.js
+++ b/addons/html_editor/static/src/core/split_plugin.js
@@ -70,6 +70,11 @@ export class SplitPlugin extends Plugin {
             },
             (node) => node.nodeName === "SECTION",
         ],
+        selection_blocker_predicates: (blocker) => {
+            if (this.isUnsplittable(blocker)) {
+                return true;
+            }
+        },
     };
 
     // --------------------------------------------------------------------------
diff --git a/addons/html_editor/static/tests/banner.test.js b/addons/html_editor/static/tests/banner.test.js
index d14db8746cea8..2def498f0352a 100644
--- a/addons/html_editor/static/tests/banner.test.js
+++ b/addons/html_editor/static/tests/banner.test.js
@@ -245,7 +245,7 @@ test("add banner inside empty list", async () => {
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>
                     </div>
-                </div><br></li></ul>`
+                </div></li></ul>`
         )
     );
 });
@@ -262,7 +262,7 @@ test("add banner inside non-empty list", async () => {
                     <div class="o_editor_banner_content o-contenteditable-true w-100 px-3" contenteditable="true">
                         <p>Test[]</p>
                     </div>
-                </div><br></li></ul>`
+                </div></li></ul>`
         )
     );
 });
diff --git a/addons/html_editor/static/tests/collaboration.test.js b/addons/html_editor/static/tests/collaboration.test.js
index 0b02b6ce02f6d..44027b133fbc1 100644
--- a/addons/html_editor/static/tests/collaboration.test.js
+++ b/addons/html_editor/static/tests/collaboration.test.js
@@ -261,10 +261,14 @@ test("wrapInlinesInBlocks should not create impossible mutations in a collaborat
     e1.shared.history.addStep();
     mergePeersSteps(peerInfos);
     expect(getContent(e1.editable, { sortAttrs: true })).toBe(
-        `<div class="oe_unbreakable"><p>myNode[]</p></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            '<div class="oe_unbreakable"><p>myNode[]</p></div>' +
+            '<p data-selection-placeholder=""><br></p>'
     );
     expect(getContent(e2.editable, { sortAttrs: true })).toBe(
-        `<div class="oe_unbreakable"><p>myNode[]</p></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            '<div class="oe_unbreakable"><p>myNode[]</p></div>' +
+            '<p data-selection-placeholder=""><br></p>'
     );
 });
 test("should reset from snapshot", async () => {
@@ -730,14 +734,17 @@ describe("serialize/unserialize", () => {
                 const divA = editor.document.createElement("div");
                 divA.textContent = "a";
                 editor.editable.append(divA);
-                const p = editor.editable.querySelector("p");
+                const p = editor.editable.querySelector("p:not([data-selection-placeholder])");
                 divA.append(p);
                 editor.shared.history.addStep();
             },
         });
         mergePeersSteps(peerInfos);
         validateSameHistory(peerInfos);
-        validateContent(peerInfos, "<div>a<p>x</p></div>");
+        validateContent(
+            peerInfos,
+            '<p data-selection-placeholder=""><br></p><div>a<p>x</p></div><p data-selection-placeholder=""><br></p>'
+        );
     });
     test("Should add a new node that contain another node created in the same mutation stack", async () => {
         const peerInfos = await setupMultiEditor({
@@ -758,7 +765,10 @@ describe("serialize/unserialize", () => {
         });
         mergePeersSteps(peerInfos);
         validateSameHistory(peerInfos);
-        validateContent(peerInfos, `<p>x</p><div>b<div class="o-paragraph">a</div></div>`);
+        validateContent(
+            peerInfos,
+            `<p>x</p><div>b<div class="o-paragraph">a</div></div><p data-selection-placeholder=""><br></p>`
+        );
     });
 });
 
diff --git a/addons/html_editor/static/tests/color.test.js b/addons/html_editor/static/tests/color.test.js
index ed03f4f344a70..b0c95c8dc1f9c 100644
--- a/addons/html_editor/static/tests/color.test.js
+++ b/addons/html_editor/static/tests/color.test.js
@@ -919,10 +919,10 @@ test("doesn't change the color of the whole section when there's an icon next to
         </section>`,
         stepFunction: setColor("rgb(0, 0, 255)", "color"),
         contentAfterEdit: `
-        <section style="color: rgb(255, 0, 0);">
+        <p data-selection-placeholder=""><br></p><section style="color: rgb(255, 0, 0);">
             <p>a<font style="color: rgb(0, 0, 255);">[bc]</font>d</p>
             <span class="fa fa-glass" contenteditable="false">\u200b</span>
-        </section>`,
+        </section><p data-selection-placeholder=""><br></p>`,
         contentAfter: `
         <section style="color: rgb(255, 0, 0);">
             <p>a<font style="color: rgb(0, 0, 255);">[bc]</font>d</p>
diff --git a/addons/html_editor/static/tests/data-oe/protected.test.js b/addons/html_editor/static/tests/data-oe/protected.test.js
index 39feb4d2191e6..628a338b16c28 100644
--- a/addons/html_editor/static/tests/data-oe/protected.test.js
+++ b/addons/html_editor/static/tests/data-oe/protected.test.js
@@ -25,7 +25,9 @@ test("should ignore protected elements children mutations (true)", async () => {
             execCommand(editor, "historyUndo");
         },
         contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div><p>ab[]</p></div>
+                <p data-selection-placeholder=""><br></p>
                 <div data-oe-protected="true" contenteditable="false"><p>ab</p></div>
                 <p data-selection-placeholder=""><br></p>
                 `),
@@ -48,7 +50,9 @@ test("should not ignore unprotected elements children mutations (false)", async
             execCommand(editor, "historyUndo");
         },
         contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div><p>abc</p></div>
+                <p data-selection-placeholder=""><br></p>
                 <div data-oe-protected="true" contenteditable="false"><div data-oe-protected="false" contenteditable="true"><p>ab[]</p></div></div>
                 <p data-selection-placeholder=""><br></p>
                 `),
@@ -86,10 +90,12 @@ test("should not normalize protected elements children (true)", async () => {
                 </div>
                 `),
         contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <p>\ufeff<i class="fa" contenteditable="false">\u200B</i>\ufeff</p>
                     <ul><li><p>abc</p><p><br></p></li></ul>
                 </div>
+                <p data-selection-placeholder=""><br></p>
                 <div data-oe-protected="true" contenteditable="false">
                     <p><i class="fa"></i></p>
                     <ul><li>abc<p><br></p></li></ul>
diff --git a/addons/html_editor/static/tests/delete/backward.test.js b/addons/html_editor/static/tests/delete/backward.test.js
index 78fb84d5d9efc..dcc8cce27aa5f 100644
--- a/addons/html_editor/static/tests/delete/backward.test.js
+++ b/addons/html_editor/static/tests/delete/backward.test.js
@@ -109,14 +109,18 @@ describe("Selection collapsed", () => {
                 contentBefore: "<div><p>ab</p><br><i>c[]</i></div>",
                 stepFunction: deleteBackward,
                 contentAfterEdit:
-                    '<div><p>ab</p><br><i data-oe-zws-empty-inline="">[]\u200B</i></div>',
+                    '<p data-selection-placeholder=""><br></p>' +
+                    '<div><p>ab</p><br><i data-oe-zws-empty-inline="">[]\u200B</i></div>' +
+                    '<p data-selection-placeholder=""><br></p>',
                 contentAfter: "<div><p>ab</p><br><br>[]</div>",
             });
             await testEditor({
                 contentBefore: '<div><p>uv</p><br><span class="style">w[]</span></div>',
                 stepFunction: deleteBackward,
                 contentAfterEdit:
-                    '<div><p>uv</p><br><span class="style" data-oe-zws-empty-inline="">[]\u200B</span></div>',
+                    '<p data-selection-placeholder=""><br></p>' +
+                    '<div><p>uv</p><br><span class="style" data-oe-zws-empty-inline="">[]\u200B</span></div>' +
+                    '<p data-selection-placeholder=""><br></p>',
                 contentAfter: '<div><p>uv</p><br><span class="style">[]\u200B</span></div>',
             });
             await testEditor({
@@ -125,7 +129,10 @@ describe("Selection collapsed", () => {
                     deleteBackward(editor);
                     await insertText(editor, "x");
                 },
-                contentAfterEdit: '<div><p>cd</p><br><span class="a">x[]</span></div>',
+                contentAfterEdit:
+                    '<p data-selection-placeholder=""><br></p>' +
+                    '<div><p>cd</p><br><span class="a">x[]</span></div>' +
+                    '<p data-selection-placeholder=""><br></p>',
                 contentAfter: '<div><p>cd</p><br><span class="a">x[]</span></div>',
             });
         });
@@ -1584,7 +1591,9 @@ describe("Selection not collapsed", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit:
-                '<div><p>ab <span class="style" data-oe-zws-empty-inline="">[]\u200B</span> d</p></div>',
+                '<p data-selection-placeholder=""><br></p>' +
+                '<div><p>ab <span class="style" data-oe-zws-empty-inline="">[]\u200B</span> d</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: '<div><p>ab <span class="style">[]\u200B</span> d</p></div>',
         });
         await testEditor({
@@ -1593,7 +1602,10 @@ describe("Selection not collapsed", () => {
                 deleteBackward(editor);
                 await insertText(editor, "x");
             },
-            contentAfterEdit: '<div><p>ab <span class="style">x[]</span> d</p></div>',
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p>' +
+                '<div><p>ab <span class="style">x[]</span> d</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: '<div><p>ab <span class="style">x[]</span> d</p></div>',
         });
         await testEditor({
@@ -1602,7 +1614,9 @@ describe("Selection not collapsed", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit:
-                '<div><p>ab <span data-oe-zws-empty-inline="">[]\u200B</span> d</p></div>',
+                '<p data-selection-placeholder=""><br></p>' +
+                '<div><p>ab <span data-oe-zws-empty-inline="">[]\u200B</span> d</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: "<div><p>ab []&nbsp;d</p></div>",
         });
         await testEditor({
@@ -1611,7 +1625,10 @@ describe("Selection not collapsed", () => {
                 deleteBackward(editor);
                 await insertText(editor, "x");
             },
-            contentAfterEdit: '<div><p>ab<span class="style">x[]</span>d</p></div>',
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p>' +
+                '<div><p>ab<span class="style">x[]</span>d</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: '<div><p>ab<span class="style">x[]</span>d</p></div>',
         });
         await testEditor({
@@ -1620,7 +1637,10 @@ describe("Selection not collapsed", () => {
                 deleteBackward(editor);
                 await insertText(editor, "x");
             },
-            contentAfterEdit: '<div><p>ab <span class="style">x[]</span> f</p></div>',
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p>' +
+                '<div><p>ab <span class="style">x[]</span> f</p></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: '<div><p>ab <span class="style">x[]</span> f</p></div>',
         });
     });
diff --git a/addons/html_editor/static/tests/delete/delete_range.test.js b/addons/html_editor/static/tests/delete/delete_range.test.js
index c7b6cc6011b63..971d76801fb0d 100644
--- a/addons/html_editor/static/tests/delete/delete_range.test.js
+++ b/addons/html_editor/static/tests/delete/delete_range.test.js
@@ -264,7 +264,8 @@ describe("deleteRange method", () => {
             await testEditor({
                 contentBefore: `[<div class="container o_text_columns"><div class="row"><div class="col-4"><p>a</p></div><div class="col-4"><p>b</p></div><div class="col-4"><p>c</p></div></div></div>]`,
                 stepFunction: deleteRange,
-                contentAfter: `[]<p><br></p>`,
+                // TODO: should an empty editable be allowed without allowInlineAtRoot?
+                contentAfter: `[]`,
             });
         });
         test("should delete columns when all selected along with text from an outer node", async () => {
diff --git a/addons/html_editor/static/tests/delete/find_adjacent_position.test.js b/addons/html_editor/static/tests/delete/find_adjacent_position.test.js
index 7d499d782540a..43ab0e2f670dc 100644
--- a/addons/html_editor/static/tests/delete/find_adjacent_position.test.js
+++ b/addons/html_editor/static/tests/delete/find_adjacent_position.test.js
@@ -92,7 +92,15 @@ describe("findAdjacentPosition method", () => {
                 const previous = '<div><p>a[]</p><span contenteditable="false">b</span></div>';
                 const next = '<div><p>a</p>[]<span contenteditable="false">b</span></div>';
                 const { editor } = await setupEditor(previous);
-                assertAdjacentPositions(editor, previous, next);
+                assertAdjacentPositions(
+                    editor,
+                    '<p data-selection-placeholder=""><br></p>' +
+                        previous +
+                        '<p data-selection-placeholder=""><br></p>',
+                    '<p data-selection-placeholder=""><br></p>' +
+                        next +
+                        '<p data-selection-placeholder=""><br></p>'
+                );
             });
             test("Should find position before filebox", async () => {
                 const content = `<div>\ufeff<span contenteditable="false" class="o_file_box"></span>\ufeff[]</div>`;
diff --git a/addons/html_editor/static/tests/delete/fix_base_container.test.js b/addons/html_editor/static/tests/delete/fix_base_container.test.js
index bcceadb725675..a459f2b5d96c1 100644
--- a/addons/html_editor/static/tests/delete/fix_base_container.test.js
+++ b/addons/html_editor/static/tests/delete/fix_base_container.test.js
@@ -29,9 +29,11 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <div class="o-paragraph o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
             config: { cleanEmptyStructuralContainers: false },
         });
@@ -79,7 +81,9 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div><div class="o-paragraph o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></div></div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -108,7 +112,9 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div class="oe_unremovable">[]<br></div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -123,9 +129,11 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div class="oe_unremovable">
                     <p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -187,9 +195,11 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <div class="o-paragraph o-we-hint" o-we-hint-text='Type "/" for commands'>[]</div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -205,9 +215,11 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <div class="o-paragraph o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
@@ -222,9 +234,11 @@ describe("Adjust base container on delete", () => {
                 deleteBackward(editor);
             },
             contentAfterEdit: unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <div class="o-paragraph">[]text</div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `),
         });
     });
diff --git a/addons/html_editor/static/tests/editor.test.js b/addons/html_editor/static/tests/editor.test.js
index aa2e8a3031de5..8cf3e5faf03bd 100644
--- a/addons/html_editor/static/tests/editor.test.js
+++ b/addons/html_editor/static/tests/editor.test.js
@@ -154,7 +154,9 @@ test("Convert self closing t elements to opening/closing tags", async () => {
         </div>
     `);
     expect(el.innerHTML.trim().replace(/\s+/g, " ")).toBe(
-        `<div> <t t-out="object.partner_id" data-oe-t-inline="true" contenteditable="false"></t> </div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div> <t t-out="object.partner_id" data-oe-t-inline="true" contenteditable="false"></t> </div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
     expect(editor.getContent().trim().replace(/\s+/g, " ")).toBe(
         '<div> <t t-out="object.partner_id" data-oe-t-inline="true" contenteditable="false"></t> </div>'
diff --git a/addons/html_editor/static/tests/embedded_components.test.js b/addons/html_editor/static/tests/embedded_components.test.js
index 8c82201613fce..87c0a59616842 100644
--- a/addons/html_editor/static/tests/embedded_components.test.js
+++ b/addons/html_editor/static/tests/embedded_components.test.js
@@ -387,7 +387,7 @@ describe("Mount and Destroy embedded components", () => {
             unformat(`
                 <p data-selection-placeholder=""><br></p>
                 <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false">
-                    <div>
+                    []<div>
                         <div class="click count-2">Count:2</div>
                         <div class="innerEditable-2">
                             <div data-prop-name="innerValue" data-oe-protected="false" contenteditable="true">
@@ -418,7 +418,7 @@ describe("Mount and Destroy embedded components", () => {
                         </div>
                     </div>
                 </div>
-                <p class="target o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></p>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
         for (const index of indexOrder) {
@@ -444,8 +444,8 @@ describe("Mount and Destroy embedded components", () => {
         expect(getContent(el)).toBe(
             unformat(`
                 <p data-selection-placeholder=""><br></p>
-                <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false"></div>
-                <p class="target o-we-hint" o-we-hint-text='Type "/" for commands'>[]<br></p>
+                <div data-embedded="recursiveComponent" data-oe-protected="true" contenteditable="false">[]</div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
         // Verify that there is no potential host outside of the editable,
@@ -586,8 +586,8 @@ describe("Selection after embedded component insertion", () => {
         expect(getContent(el)).toBe(
             unformat(`
                 <p data-selection-placeholder=""><br></p>
-                <div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div>
-                <p>[]<br></p>`)
+                <div data-embedded="counter" data-oe-protected="true" contenteditable="false">[]<span class="counter">Counter:0</span></div>
+                <p data-selection-placeholder=""><br></p>`)
         );
     });
     test("block at the end of paragraph", async () => {
@@ -601,8 +601,8 @@ describe("Selection after embedded component insertion", () => {
         expect(getContent(el)).toBe(
             unformat(`
                 <p>a</p>
-                <div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div>
-                <p>[]<br></p>`)
+                <div data-embedded="counter" data-oe-protected="true" contenteditable="false">[]<span class="counter">Counter:0</span></div>
+                <p data-selection-placeholder=""><br></p>`)
         );
     });
     test("block at the start of paragraph", async () => {
@@ -846,7 +846,9 @@ describe("Mount processing", () => {
         // "unknown" data-embedded should be considered once during the first
         // mounting wave.
         expect.verifySteps(["unknown handled"]);
-        expect(getContent(el)).toBe(`<div data-embedded="unknown"><p>UNKNOWN</p></div>`);
+        expect(getContent(el)).toBe(
+            `<p data-selection-placeholder=""><br></p><div data-embedded="unknown"><p>UNKNOWN</p></div><p data-selection-placeholder=""><br></p>`
+        );
     });
     test("Mount a component with a plugin that modifies the Component's env", async () => {
         let setSelection;
@@ -904,7 +906,7 @@ describe("In-editor manipulations", () => {
         await animationFrame();
         await expectElementCount(".o-we-toolbar", 1);
         expect(getContent(el)).toBe(
-            `<div><p>[a]</p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></span></div>`
+            `<p data-selection-placeholder=""><br></p><div><p>[a]</p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></span></div><p data-selection-placeholder=""><br></p>`
         );
 
         const node = queryFirst(".counter", {}).firstChild;
@@ -912,7 +914,7 @@ describe("In-editor manipulations", () => {
         await tick();
         await animationFrame();
         expect(getContent(el)).toBe(
-            `<div><p>a</p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">C[ou]nter:0</span></span></div>`
+            `<p data-selection-placeholder=""><br></p><div><p>a</p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">C[ou]nter:0</span></span></div><p data-selection-placeholder=""><br></p>`
         );
         await expectElementCount(".o-we-toolbar", 0);
     });
@@ -938,7 +940,7 @@ describe("In-editor manipulations", () => {
         );
         cleanHints(editor);
         expect(getContent(el)).toBe(
-            `<div><p>a</p></div><div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div><p data-selection-placeholder=""><br></p>`
+            `<p data-selection-placeholder=""><br></p><div><p>a</p></div><p data-selection-placeholder=""><br></p><div data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></div><p data-selection-placeholder=""><br></p>`
         );
     });
 
@@ -952,7 +954,7 @@ describe("In-editor manipulations", () => {
         const historyPlugin = plugins.get("history");
         const node = historyPlugin._unserializeNode(historyPlugin.serializeNode(el))[0];
         expect(getContent(node, { sortAttrs: true })).toBe(
-            `<div><p>a</p></div><div contenteditable="false" data-embedded="counter" data-oe-protected="true"></div><p data-selection-placeholder=""><br></p>`
+            `<p data-selection-placeholder=""><br></p><div><p>a</p></div><p data-selection-placeholder=""><br></p><div contenteditable="false" data-embedded="counter" data-oe-protected="true"></div><p data-selection-placeholder=""><br></p>`
         );
     });
 
@@ -972,7 +974,9 @@ describe("In-editor manipulations", () => {
         );
         const historyPlugin = plugins.get("history");
         const node = historyPlugin._unserializeNode(historyPlugin.serializeNode(el))[0];
-        expect(getContent(node)).toBe(`<div data-embedded="unknown"><p>UNKNOWN</p></div>`);
+        expect(getContent(node)).toBe(
+            `<p data-selection-placeholder=""><br></p><div data-embedded="unknown"><p>UNKNOWN</p></div><p data-selection-placeholder=""><br></p>`
+        );
     });
 
     test("Don't remove empty inline-block data-embedded elements during initElementForEdition, but wrap them in div instead", async () => {
@@ -981,7 +985,7 @@ describe("In-editor manipulations", () => {
             { config: getConfig([embedding("counter", Counter)]) }
         );
         expect(getContent(el, { sortAttrs: true })).toBe(
-            `<div><div contenteditable="false" data-embedded="counter" data-oe-protected="true" style="display:inline-block;"><span class="counter">Counter:0</span></div></div>`
+            `<p data-selection-placeholder=""><br></p><div><div contenteditable="false" data-embedded="counter" data-oe-protected="true" style="display:inline-block;"><span class="counter">Counter:0</span></div></div><p data-selection-placeholder=""><br></p>`
         );
     });
 });
diff --git a/addons/html_editor/static/tests/font_awesome.test.js b/addons/html_editor/static/tests/font_awesome.test.js
index c428a9d444d09..3c5979c757901 100644
--- a/addons/html_editor/static/tests/font_awesome.test.js
+++ b/addons/html_editor/static/tests/font_awesome.test.js
@@ -161,7 +161,9 @@ describe("parse/render", () => {
         await testEditor({
             contentBefore: '<div><i class="fa fa-pastafarianism"></i><div><p>abc</p></div></div>',
             contentBeforeEdit:
-                '<div><i class="fa fa-pastafarianism" contenteditable="false">\u200b</i><div><p>abc</p></div></div>',
+                '<p data-selection-placeholder=""><br></p>' +
+                '<div><i class="fa fa-pastafarianism" contenteditable="false">\u200b</i><div><p>abc</p></div></div>' +
+                '<p data-selection-placeholder=""><br></p>',
             contentAfter: '<div><i class="fa fa-pastafarianism"></i><div><p>abc</p></div></div>',
         });
     });
diff --git a/addons/html_editor/static/tests/format/bold.test.js b/addons/html_editor/static/tests/format/bold.test.js
index 8cc01ed08a382..1fe12be5ea1d6 100644
--- a/addons/html_editor/static/tests/format/bold.test.js
+++ b/addons/html_editor/static/tests/format/bold.test.js
@@ -69,7 +69,9 @@ test("should make qweb tag bold and create a step even with partial selection in
     );
     bold(editor);
     expect(getContent(el)).toBe(
-        `<div>[<p t-esc="'Test'" contenteditable="false" style="font-weight: bolder;">Test</p>]</div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>[<p t-esc="'Test'" contenteditable="false" style="font-weight: bolder;">Test</p>]</div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
     expect(queryOne(`p[contenteditable="false"]`).childNodes.length).toBe(1);
     const historySteps = editor.shared.history.getHistorySteps();
diff --git a/addons/html_editor/static/tests/html_field.test.js b/addons/html_editor/static/tests/html_field.test.js
index 731fadc4d767e..9e131462129ba 100644
--- a/addons/html_editor/static/tests/html_field.test.js
+++ b/addons/html_editor/static/tests/html_field.test.js
@@ -469,7 +469,8 @@ test("edit and save a html field containing JSON as some attribute values should
     pasteOdooEditorHtml(htmlEditor, `<div data-value=${value}><p>content</p></div>`);
     const txtField = queryOne('.o_field_html[name="txt"] .odoo-editor-editable');
     expect(txtField).toHaveInnerHTML(
-        `<div data-value="{&quot;myString&quot;:&quot;myString&quot;}"><p>content</p></div><p>first</p>`
+        '<div class="o-paragraph" data-selection-placeholder=""><br></div>' +
+            `<div data-value="{&quot;myString&quot;:&quot;myString&quot;}"><p>content</p></div><p>first</p>`
     );
     expect.verifySteps(["Setup Wysiwyg"]);
 
@@ -930,7 +931,7 @@ test("Embed video by pasting video URL", async () => {
     await animationFrame();
     const videoIframe = queryOne("div.media_iframe_video");
     expect(videoIframe.nextElementSibling).toHaveOuterHTML(
-        `<p o-we-hint-text='Type "/" for commands' class="o-we-hint"><br></p>`
+        '<div class="o-paragraph" data-selection-placeholder=""><br></div>'
     );
     expect(
         `div.media_iframe_video iframe[data-src="https://www.youtube.com/embed/${videoId}"]`
diff --git a/addons/html_editor/static/tests/insert/html.test.js b/addons/html_editor/static/tests/insert/html.test.js
index e3d8c32d0155c..1ecaf8d2953ac 100644
--- a/addons/html_editor/static/tests/insert/html.test.js
+++ b/addons/html_editor/static/tests/insert/html.test.js
@@ -72,11 +72,13 @@ describe("collapsed selection", () => {
         });
     });
 
-    test("should keep a paragraph after a div block", async () => {
+    test("should wrap a div block in selection placeholders", async () => {
         await testEditor({
             contentBefore: "<p>[]<br></p>",
             stepFunction: insertHTML("<div><p>content</p></div>"),
-            contentAfter: "<div><p>content</p></div><p>[]<br></p>",
+            contentAfterEdit:
+                '<p data-selection-placeholder=""><br></p><div><p>content[]</p></div><p data-selection-placeholder=""><br></p>',
+            contentAfter: "<div><p>content[]</p></div>",
         });
     });
 
@@ -160,8 +162,9 @@ describe("collapsed selection", () => {
         // https://developer.mozilla.org/en-US/docs/Web/HTML/Content_categories#phrasing_content
         const { editor } = await setupEditor(`<p class="oe_unbreakable">cont[]ent</p>`, {});
         insertHTML("<table><tbody><tr><td/></tr></tbody></table>")(editor);
+        await tick();
         expect(getContent(editor.editable)).toBe(
-            `<p class="oe_unbreakable">content[]</p><table><tbody><tr><td></td></tr></tbody></table><p data-selection-placeholder=""><br></p>`
+            `<p data-selection-placeholder=""><br></p><p class="oe_unbreakable">content</p><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p><table><tbody><tr><td></td></tr></tbody></table><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p>`
         );
     });
 
@@ -177,7 +180,9 @@ describe("collapsed selection", () => {
 
         insertHTML("<table><tbody><tr><td/></tr></tbody></table>")(editor);
         expect(getContent(editor.editable)).toBe(
-            `<div><p class="oe_unbreakable" contenteditable="true"><b class="oe_unbreakable">content[]</b><table><tbody><tr><td></td></tr></tbody></table></p></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><p class="oe_unbreakable" contenteditable="true"><b class="oe_unbreakable">content[]</b><table><tbody><tr><td></td></tr></tbody></table></p></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
     });
 
@@ -185,7 +190,8 @@ describe("collapsed selection", () => {
         const { editor } = await setupEditor(`<p>cont[]</p>`, {});
         insertHTML(`<p class="oe_unbreakable">1</p>`)(editor);
         expect(getContent(editor.editable)).toBe(
-            `<p>cont</p><p class="oe_unbreakable">1[]</p><p><br></p>`
+            `<p>cont</p><p class="oe_unbreakable">1[]</p>` +
+                '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>'
         );
     });
 
@@ -205,8 +211,12 @@ describe("collapsed selection", () => {
                 `<p class="oe_unbreakable">1</p><p class="oe_unbreakable">2</p>`
             )
         );
+        editor.shared.history.addStep();
         expect(getContent(editor.editable)).toBe(
-            `<p>cont</p><p class="oe_unbreakable">1</p><p class="oe_unbreakable">2[]</p><p><br></p>`
+            `<p>cont</p><p class="oe_unbreakable">1</p>` +
+                `<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>` +
+                `<p class="oe_unbreakable">2[]</p>` +
+                `<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -259,7 +269,7 @@ describe("collapsed selection", () => {
         editor.shared.history.addStep();
         cleanHints(editor);
         expect(getContent(editor.editable, { sortAttrs: true })).toBe(
-            `<p data-selection-placeholder=""><br></p><p contenteditable="false" data-oe-protected="true">in</p><p>[]<br></p>`
+            `<p data-selection-placeholder=""><br></p><p contenteditable="false" data-oe-protected="true">in[]</p><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         );
     });
 
@@ -291,20 +301,28 @@ describe("collapsed selection", () => {
         const { el, editor } = await setupEditor(`<p>[]<br></p>`);
         insertHTML(`<div class="oe_unbreakable">a</div>`)(editor);
         cleanHints(editor);
-        expect(getContent(el)).toBe(`<div class="oe_unbreakable">a</div><p>[]<br></p>`);
+        expect(getContent(el)).toBe(
+            '<p data-selection-placeholder=""><br></p>' +
+                '<div class="oe_unbreakable">a[]</div>' +
+                '<p data-selection-placeholder=""><br></p>'
+        );
     });
 
     test("insert block at the end of a paragraph", async () => {
         const { el, editor } = await setupEditor(`<p>b[]</p>`);
         insertHTML(`<div class="oe_unbreakable">a</div>`)(editor);
         cleanHints(editor);
-        expect(getContent(el)).toBe(`<p>b</p><div class="oe_unbreakable">a</div><p>[]<br></p>`);
+        expect(getContent(el)).toBe(
+            `<p>b</p><div class="oe_unbreakable">a[]</div><p data-selection-placeholder=""><br></p>`
+        );
     });
 
     test("insert block at the start of a paragraph", async () => {
         const { el, editor } = await setupEditor(`<p>[]b</p>`);
         insertHTML(`<div class="oe_unbreakable">a</div>`)(editor);
-        expect(getContent(el)).toBe(`<div class="oe_unbreakable">a</div><p>[]b</p>`);
+        expect(getContent(el)).toBe(
+            `<p data-selection-placeholder=""><br></p><div class="oe_unbreakable">a</div><p>[]b</p>`
+        );
     });
 
     test("insert block at the middle of a paragraph", async () => {
diff --git a/addons/html_editor/static/tests/insert/separator.test.js b/addons/html_editor/static/tests/insert/separator.test.js
index 2a59469505a8c..07fb123c62f86 100644
--- a/addons/html_editor/static/tests/insert/separator.test.js
+++ b/addons/html_editor/static/tests/insert/separator.test.js
@@ -111,7 +111,7 @@ describe("insert separator", () => {
         el.append(div);
         editor.shared.history.addStep();
         expect(getContent(el)).toBe(
-            `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p><div><hr contenteditable="false"></div>`
+            `<p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p><div><hr contenteditable="false"></div><p data-selection-placeholder=""><br></p>`
         );
     });
 
diff --git a/addons/html_editor/static/tests/list/automatic_list_detection.test.js b/addons/html_editor/static/tests/list/automatic_list_detection.test.js
index 36db9906d6a28..ea6ef8bd28d53 100644
--- a/addons/html_editor/static/tests/list/automatic_list_detection.test.js
+++ b/addons/html_editor/static/tests/list/automatic_list_detection.test.js
@@ -115,7 +115,7 @@ test("creating list directly inside table column (td)", async () => {
                     </tr>
                 </tbody>
             </table>
-            <p><br></p>`)
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`)
     );
 });
 
diff --git a/addons/html_editor/static/tests/misc.test.js b/addons/html_editor/static/tests/misc.test.js
index 598a7c6ec3048..5a34623f6f97d 100644
--- a/addons/html_editor/static/tests/misc.test.js
+++ b/addons/html_editor/static/tests/misc.test.js
@@ -58,14 +58,30 @@ test("with an empty selector", async () => {
 
 test("with a part of the selector in an empty HTMLElement", async () => {
     const { el } = await setupEditor("<div>a[bc<div>]</div></div>", {});
-    expect(el.innerHTML).toBe(`<div>abc<div class="o-paragraph"><br></div></div>`);
-    expect(getContent(el)).toBe(`<div>a[bc<div class="o-paragraph">]<br></div></div>`);
+    expect(el.innerHTML).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>abc<div class="o-paragraph"><br></div></div>` +
+            '<p data-selection-placeholder=""><br></p>'
+    );
+    expect(getContent(el)).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>a[bc<div class="o-paragraph">]<br></div></div>` +
+            '<p data-selection-placeholder=""><br></p>'
+    );
 });
 
 test("inverse selection", async () => {
     const { el } = await setupEditor("<div>a]bc<div>[</div></div>", {});
-    expect(el.innerHTML).toBe(`<div>abc<div class="o-paragraph"><br></div></div>`);
-    expect(getContent(el)).toBe(`<div>a]bc<div class="o-paragraph">[<br></div></div>`);
+    expect(el.innerHTML).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>abc<div class="o-paragraph"><br></div></div>` +
+            '<p data-selection-placeholder=""><br></p>'
+    );
+    expect(getContent(el)).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>a]bc<div class="o-paragraph">[<br></div></div>` +
+            '<p data-selection-placeholder=""><br></p>'
+    );
 });
 
 test("with an empty selector and a <br>", async () => {
diff --git a/addons/html_editor/static/tests/movenode.test.js b/addons/html_editor/static/tests/movenode.test.js
index d12ebd3e52d68..f07d9bf4aed0e 100644
--- a/addons/html_editor/static/tests/movenode.test.js
+++ b/addons/html_editor/static/tests/movenode.test.js
@@ -117,7 +117,7 @@ describe("drag", () => {
         expect(".oe-dropzone-box-side").toHaveCount(8);
         await drop(".oe-dropzone-box-side:eq(2)");
         expect(getContent(el)).toBe(
-            `<div class="oe_unbreakable"><br></div><p>a[]</p><div class="o-paragraph">d</div><p>b</p><p>c</p>`
+            `<p data-selection-placeholder=""><br></p><div class="oe_unbreakable"><br></div><p>a[]</p><div class="o-paragraph">d</div><p>b</p><p>c</p>`
         );
     });
     test("should drop after the next baseContainer", async () => {
@@ -136,7 +136,7 @@ describe("drag", () => {
         expect(".oe-dropzone-box-side").toHaveCount(8);
         await drop(".oe-dropzone-box-side:eq(3)");
         expect(getContent(el)).toBe(
-            `<div class="oe_unbreakable"><br></div><div class="o-paragraph">d</div><p>a[]</p><p>b</p><p>c</p>`
+            `<p data-selection-placeholder=""><br></p><div class="oe_unbreakable"><br></div><div class="o-paragraph">d</div><p>a[]</p><p>b</p><p>c</p>`
         );
     });
     test("should drop LI at correct position within list", async () => {
diff --git a/addons/html_editor/static/tests/paste.test.js b/addons/html_editor/static/tests/paste.test.js
index f809c68ead097..cef2f13ed39e8 100644
--- a/addons/html_editor/static/tests/paste.test.js
+++ b/addons/html_editor/static/tests/paste.test.js
@@ -101,11 +101,10 @@ describe("Html Paste cleaning - whitelist", () => {
                 <table class="table table-bordered o_table">
                     <tbody>
                         <tr>
-                            <td><p><br></p></td>
+                            <td><p>[]<br></p></td>
                         </tr>
                     </tbody>
                 </table>
-                <p>[]<br></p>
             `),
         });
     });
@@ -3896,9 +3895,9 @@ ${"            "}
             </tr>
             <tr>
                 <td>14pt MONO TEXT
-                </td>
+                []</td>
             </tr>
-        </tbody></table><p>[]<br></p>`,
+        </tbody></table>`,
         });
     });
 
@@ -4006,10 +4005,10 @@ ${"        "}
                     text on color background</td>
             </tr>
             <tr>
-                <td>14pt MONO TEXT</td>
+                <td>14pt MONO TEXT[]</td>
             </tr>
         </tbody>
-    </table><p>[]<br></p>`,
+    </table>`,
         });
     });
 
@@ -4135,10 +4134,10 @@ ${"        "}
         </tr>
         <tr>
             <td>
-                14pt MONO TEXT
+                14pt MONO TEXT[]
             </td>
         </tr>
-    </tbody></table><p>[]<br></p>`,
+    </tbody></table>`,
         });
     });
     test("should apply default table classes (table, table-bordered, o_table) on paste", async () => {
@@ -4164,11 +4163,10 @@ ${"        "}
                 <table class="table table-bordered o_table">
                     <tbody>
                         <tr>
-                            <td><p><br></p></td>
+                            <td><p>[]<br></p></td>
                         </tr>
                     </tbody>
                 </table>
-                <p>[]<br></p>
             `),
         });
     });
@@ -4213,11 +4211,10 @@ ${"        "}
                                 </tr>
                                 <tr>
                                     <td>1</td>
-                                    <td>2</td>
+                                    <td>2[]</td>
                                 </tr>
                             </tbody>
                         </table>
-                        <p>[]<br></p>
                     `),
         });
     });
@@ -4244,11 +4241,10 @@ ${"        "}
                             <tbody>
                                 <tr>
                                     <th>1</th>
-                                    <th>2</th>
+                                    <th>2[]</th>
                                 </tr>
                             </tbody>
                         </table>
-                        <p>[]<br></p>
                     `),
         });
     });
diff --git a/addons/html_editor/static/tests/powerbox.test.js b/addons/html_editor/static/tests/powerbox.test.js
index 1ec210d51e568..2bcb4120eb0dd 100644
--- a/addons/html_editor/static/tests/powerbox.test.js
+++ b/addons/html_editor/static/tests/powerbox.test.js
@@ -507,7 +507,7 @@ test("should insert a 3x3 table on type `/table`", async () => {
     await press("Enter");
     await tick();
     expect(getContent(el)).toBe(
-        `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p><br></p>`
+        `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
     );
 });
 
@@ -519,7 +519,7 @@ test("should insert a 3x3 table on type `/table` in mobile view", async () => {
     await press("Enter");
     await tick();
     expect(getContent(el)).toBe(
-        `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p><br></p>`
+        `<p data-selection-placeholder=""><br></p><table class="table table-bordered o_table"><tbody><tr><td><p o-we-hint-text='Type "/" for commands' class="o-we-hint">[]<br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr><tr><td><p><br></p></td><td><p><br></p></td><td><p><br></p></td></tr></tbody></table><p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
     );
 });
 
diff --git a/addons/html_editor/static/tests/qweb.test.js b/addons/html_editor/static/tests/qweb.test.js
index 171d1a5f3e8c6..33b28994eb405 100644
--- a/addons/html_editor/static/tests/qweb.test.js
+++ b/addons/html_editor/static/tests/qweb.test.js
@@ -15,7 +15,9 @@ describe("qweb picker", () => {
             { config }
         );
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
         await click(queryOne(`[data-oe-t-group-active="true"]`));
         await animationFrame();
@@ -29,7 +31,9 @@ describe("qweb picker", () => {
         expect(".o-we-qweb-picker").toHaveCount(1);
         expect(".o-we-qweb-picker select option:selected").toHaveText("else");
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">no</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">no</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
 
         dispatchCleanForSave(editor, { root: el });
@@ -53,7 +57,9 @@ describe("qweb picker", () => {
             config,
         });
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
         await click(queryOne(`[data-oe-t-group-active="true"]`));
         await animationFrame();
@@ -67,7 +73,9 @@ describe("qweb picker", () => {
         expect(".o-we-qweb-picker").toHaveCount(1);
         expect(".o-we-qweb-picker select option:selected").toHaveText("if: test");
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
     });
 
@@ -77,7 +85,9 @@ describe("qweb picker", () => {
             { config }
         );
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">else</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">else</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
         await click(queryOne(`[data-oe-t-group-active="true"]`));
         await animationFrame();
@@ -96,7 +106,9 @@ describe("qweb picker", () => {
         expect(".o-we-qweb-picker").toHaveCount(1);
         expect(".o-we-qweb-picker select option:selected").toHaveText("elif: test2");
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">else</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">else</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
 
         await click(".o-we-qweb-picker select");
@@ -105,7 +117,9 @@ describe("qweb picker", () => {
         expect(".o-we-qweb-picker").toHaveCount(1);
         expect(".o-we-qweb-picker select option:selected").toHaveText("elif: test3");
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">else</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">else</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
 
         await click(".o-we-qweb-picker select");
@@ -114,7 +128,9 @@ describe("qweb picker", () => {
         expect(".o-we-qweb-picker").toHaveCount(1);
         expect(".o-we-qweb-picker select option:selected").toHaveText("else");
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">else</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true">if</t><t t-elif="test2" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif</t><t t-elif="test3" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">elif 3</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0" data-oe-t-group-active="true">else</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
     });
 
@@ -124,7 +140,9 @@ describe("qweb picker", () => {
             { config }
         );
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t><t t-if="test2" data-oe-t-inline="true" data-oe-t-group="1" data-oe-t-selectable="true" data-oe-t-group-active="true">hello</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="1">bye</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t><t t-if="test2" data-oe-t-inline="true" data-oe-t-group="1" data-oe-t-selectable="true" data-oe-t-group-active="true">hello</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="1">bye</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
         expect('[data-oe-t-group-active="true"]').toHaveCount(2);
 
@@ -140,7 +158,9 @@ describe("qweb picker", () => {
         expect(".o-we-qweb-picker").toHaveCount(1);
         expect(".o-we-qweb-picker select option:selected").toHaveText("else");
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t><t t-if="test2" data-oe-t-inline="true" data-oe-t-group="1" data-oe-t-selectable="true">hello</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="1" data-oe-t-group-active="true">bye</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t><t t-if="test2" data-oe-t-inline="true" data-oe-t-group="1" data-oe-t-selectable="true">hello</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="1" data-oe-t-group-active="true">bye</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
     });
 
@@ -149,7 +169,9 @@ describe("qweb picker", () => {
             config,
         });
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true">yes</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">no</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
 
         // Open picker
@@ -171,7 +193,9 @@ describe("qweb picker", () => {
             }
         );
         expect(getContent(el)).toBe(
-            `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true"><t t-if="sub-test" data-oe-t-inline="true" data-oe-t-group="1" data-oe-t-selectable="true" data-oe-t-group-active="true">Sub if</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="1">Sub Else</t></t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">Else</t></div>`
+            '<p data-selection-placeholder=""><br></p>' +
+                `<div><t t-if="test" data-oe-t-inline="true" data-oe-t-group="0" data-oe-t-selectable="true" data-oe-t-group-active="true"><t t-if="sub-test" data-oe-t-inline="true" data-oe-t-group="1" data-oe-t-selectable="true" data-oe-t-group-active="true">Sub if</t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="1">Sub Else</t></t><t t-else="" data-oe-t-inline="true" data-oe-t-selectable="true" data-oe-t-group="0">Else</t></div>` +
+                '<p data-selection-placeholder=""><br></p>'
         );
 
         // Open picker on sub condition
@@ -223,18 +247,24 @@ test("select text inside t-out", async () => {
         config,
     });
     expect(getContent(el)).toBe(
-        `<div><t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div><t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t></div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
 
     setSelection({ anchorNode: el.querySelector("t[t-out]").childNodes[0], anchorOffset: 1 });
 
     await tick();
     expect(getContent(el)).toBe(
-        `<div><t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">H[]ello</t></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div><t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">H[]ello</t></div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
     await dblclick("t");
     expect(getContent(el)).toBe(
-        `<div>[<t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>]</div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>[<t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>]</div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
 });
 
@@ -243,18 +273,24 @@ test("select text inside t-esc", async () => {
         config,
     });
     expect(getContent(el)).toBe(
-        `<div><t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div><t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t></div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
 
     setSelection({ anchorNode: el.querySelector("t[t-esc]").childNodes[0], anchorOffset: 1 });
 
     await tick();
     expect(getContent(el)).toBe(
-        `<div><t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">H[]ello</t></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div><t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">H[]ello</t></div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
     await dblclick("t");
     expect(getContent(el)).toBe(
-        `<div>[<t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>]</div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>[<t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>]</div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
 });
 
@@ -263,18 +299,24 @@ test("select text inside t-field", async () => {
         config,
     });
     expect(getContent(el)).toBe(
-        `<div><t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div><t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t></div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
 
     setSelection({ anchorNode: el.querySelector("t[t-field]").childNodes[0], anchorOffset: 1 });
 
     await tick();
     expect(getContent(el)).toBe(
-        `<div><t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">H[]ello</t></div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div><t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">H[]ello</t></div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
     await dblclick("t");
     expect(getContent(el)).toBe(
-        `<div>[<t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>]</div>`
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div>[<t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>]</div>` +
+            '<p data-selection-placeholder=""><br></p>'
     );
 });
 
@@ -292,12 +334,12 @@ test("cleaning removes content editable", async () => {
         }
     );
     expect(getContent(el)).toBe(`
-        <div>
+        <p data-selection-placeholder=""><br></p><div>
             <t t-field="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>
             <t t-out="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>
             <t t-esc="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>
             <t t-raw="test" data-oe-t-inline="true" data-oe-protected="true" contenteditable="false">Hello</t>
-        </div>`);
+        </div><p data-selection-placeholder=""><br></p>`);
 
     expect(editor.getContent()).toBe(`
         <div>
diff --git a/addons/html_editor/static/tests/selection.test.js b/addons/html_editor/static/tests/selection.test.js
index 3d0d6beeb34f0..15705606cf671 100644
--- a/addons/html_editor/static/tests/selection.test.js
+++ b/addons/html_editor/static/tests/selection.test.js
@@ -75,8 +75,12 @@ test("correct selection after triple click with bold", async () => {
 test.tags("desktop");
 test("selection on triple click should be contained in the paragraph", async () => {
     const { el } = await setupEditor("<div><p>[]abc</p><br><br><h2>def</h2></div>");
-    await tripleClick(el.querySelector("p"));
-    expect(getContent(el)).toBe("<div><p>[abc]</p><br><br><h2>def</h2></div>");
+    await tripleClick(el.querySelector("p:not([data-selection-placeholder])"));
+    expect(getContent(el)).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            "<div><p>[abc]</p><br><br><h2>def</h2></div>" +
+            '<p data-selection-placeholder=""><br></p>'
+    );
 });
 
 test.tags("desktop");
@@ -89,7 +93,7 @@ test("correct selection after triple click in multi-line block (1)", async () =>
 test.tags("desktop");
 test("correct selection after triple click in multi-line block (2)", async () => {
     const { el } = await setupEditor("<p>block1</p><p>[]block2<br>block2</p><p>block3</p>", {});
-    await tripleClick(queryFirst("p").nextSibling.firstChild); // we triple click inside block2
+    await tripleClick(queryFirst("p:not([data-selection-placeholder])").nextSibling.firstChild); // we triple click inside block2
     expect(getContent(el)).toBe("<p>block1</p><p>[block2<br>block2]</p><p>block3</p>");
 });
 
@@ -179,7 +183,11 @@ test("setSelection should not set the selection outside the editable", async ()
 test("press 'ctrl+a' in 'oe_structure' child should only select his content", async () => {
     const { el } = await setupEditor(`<div class="oe_structure"><p>a[]b</p><p>cd</p></div>`);
     await press(["ctrl", "a"]);
-    expect(getContent(el)).toBe(`<div class="oe_structure"><p>[ab]</p><p>cd</p></div>`);
+    expect(getContent(el)).toBe(
+        '<p data-selection-placeholder=""><br></p>' +
+            `<div class="oe_structure"><p>[ab]</p><p>cd</p></div>` +
+            '<p data-selection-placeholder=""><br></p>'
+    );
 });
 
 test("press 'ctrl+a' in 'contenteditable' should only select his content", async () => {
@@ -388,12 +396,14 @@ describe("getTargetedNodes", () => {
                 const { el: editable, editor } = await setupEditor(
                     "<div><p>a[bc</p><div>d]ef</div></div>"
                 );
-                const outerDiv = editable.firstChild;
+                const outerDiv = editable.querySelector("div");
                 const p1 = outerDiv.firstChild; // The selection crossed `</p>` -> include it.
                 const abc = p1.firstChild;
                 const innerDiv = p1.nextSibling; // The selection crossed `<div>` -> include it.
                 const def = innerDiv.firstChild;
-                const result = editor.shared.selection.getTargetedNodes();
+                const result = editor.shared.selection
+                    .getTargetedNodes()
+                    .filter((node) => !node.hasAttribute?.("data-selection-placeholder"));
                 expect(result).toEqual([p1, abc, innerDiv, def]);
             });
 
@@ -420,14 +430,16 @@ describe("getTargetedNodes", () => {
                 const span1 = p1.firstChild; // The selection crossed `</span>` -> include it.
                 // "ab" isn't included because no part of it is selected.
                 const cd = p1.lastChild;
-                const div = editable.lastChild;
+                const div = editable.querySelector("div");
                 const p2 = div.firstChild;
                 const span2 = p2.firstChild; // The selection crossed `<span class="b">` -> include it.
                 const b = span2.firstChild;
                 const e = b.firstChild;
                 const i = b.nextSibling; // The selection crossed `<i>` -> include it.
                 const fg = i.firstChild;
-                const result = editor.shared.selection.getTargetedNodes();
+                const result = editor.shared.selection
+                    .getTargetedNodes()
+                    .filter((node) => !node.hasAttribute?.("data-selection-placeholder"));
                 expect(result).toEqual([p1, span1, cd, div, p2, span2, b, e, i, fg]);
             });
         });
diff --git a/addons/html_editor/static/tests/table/adding_table.test.js b/addons/html_editor/static/tests/table/adding_table.test.js
index 5b7596b51a047..6b4c0dfd6f4ca 100644
--- a/addons/html_editor/static/tests/table/adding_table.test.js
+++ b/addons/html_editor/static/tests/table/adding_table.test.js
@@ -58,7 +58,7 @@ test("can add a table using the powerbox and keyboard", async () => {
                 </tr>
             </tbody>
         </table>
-        <p><br></p>`
+        <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
     );
 });
 
@@ -195,7 +195,6 @@ test("add table inside empty list", async () => {
                         </tr>
                     </tbody>
                 </table>
-                <br>
             </li>
         </ul>`
     );
@@ -248,7 +247,6 @@ test("add table inside non-empty list", async () => {
                         </tr>
                     </tbody>
                 </table>
-                <br>
             </li>
         </ul>`
     );
diff --git a/addons/html_editor/static/tests/utils/dom.test.js b/addons/html_editor/static/tests/utils/dom.test.js
index 62af15303241f..a8a0490093408 100644
--- a/addons/html_editor/static/tests/utils/dom.test.js
+++ b/addons/html_editor/static/tests/utils/dom.test.js
@@ -301,13 +301,15 @@ describe("wrapInlinesInBlocks", () => {
         // element).
         expect(getContent(el)).toBe(
             unformat(`
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <div contenteditable="false" style="display: inline;">inline</div>[]
                 </div>
-                <div class="o-paragraph"><br></div>
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     <div contenteditable="false" style="display: inline;">inline</div>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
     });
@@ -335,12 +337,13 @@ describe("wrapInlinesInBlocks", () => {
                 <div>
                     <div contenteditable="false" style="display: inline;">inline</div><span class="a">span</span>[]
                 </div>
-                <div class="o-paragraph"><br></div>
+                <p data-selection-placeholder=""><br></p>
                 <div>
                     text
                     <div contenteditable="false" style="display: inline;">inline</div>
                     <span class="a">span</span>
                 </div>
+                <p data-selection-placeholder=""><br></p>
             `)
         );
     });

From 40cdbdbc0ace8a5e13f5fe443f432b28bdb0d484 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Tue, 14 Oct 2025 11:06:56 +0200
Subject: [PATCH 289/673] [FIX] html_editor: apply syntax_highlighting margin
 to container

The syntax highlighting embedded component has no margin, but the `pre`
it contains does. Since selection placeholders position themselves based
on the margins of their neighbors, they appeared wrongly positioned in
this case. This applies the `pre`'s margin to its container instead, to
make things easier.

task-4129699

closes odoo/odoo#234185

Related: odoo/enterprise#98693
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
---
 .../html_editor/static/src/core/dom_plugin.js |  1 -
 .../syntax_highlighting_plugin.scss           |  4 +-
 .../static/tests/delete/backward.test.js      | 32 +++---
 .../static/tests/delete/forward.test.js       | 32 +++---
 .../tests/insert/paragraph_break.test.js      |  9 +-
 .../static/tests/syntax_highlighting.test.js  | 98 +++++++++----------
 6 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/addons/html_editor/static/src/core/dom_plugin.js b/addons/html_editor/static/src/core/dom_plugin.js
index 4c1aaea6fd172..6406b0a996c1b 100644
--- a/addons/html_editor/static/src/core/dom_plugin.js
+++ b/addons/html_editor/static/src/core/dom_plugin.js
@@ -440,7 +440,6 @@ export class DomPlugin extends Plugin {
             // Correct the position if it happens to be in the editable root.
             lastPosition = getDeepestPosition(...lastPosition);
         }
-        // TODO: check if position is editable?
         this.dependencies.selection.setSelection(
             { anchorNode: lastPosition[0], anchorOffset: lastPosition[1] },
             { normalize: false }
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.scss b/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.scss
index 2bb62bbeffa83..7ca29f6c2838e 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.scss
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.scss
@@ -1,12 +1,12 @@
 .o_syntax_highlighting {
     position: relative;
     padding: 0;
-    margin: 0;
+    margin: 0 0 16px;
     tab-size: 4;
     font: 13px / 19.5px SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 
     pre, textarea.o_prism_source {
-        margin: 0px 0px 16px;
+        margin: 0;
         padding: 8px 16px;
     }
 
diff --git a/addons/html_editor/static/tests/delete/backward.test.js b/addons/html_editor/static/tests/delete/backward.test.js
index dcc8cce27aa5f..3d6c1434e4f54 100644
--- a/addons/html_editor/static/tests/delete/backward.test.js
+++ b/addons/html_editor/static/tests/delete/backward.test.js
@@ -858,12 +858,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(2),
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "acd", textareaRange: 1 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">acd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -876,12 +876,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     abcd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // ab[]cd
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     acd", textareaRange: 6 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     acd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -894,12 +894,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd     " }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(2),
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "acd     ", textareaRange: 1 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">acd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -912,12 +912,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     abcd     " }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // ab[]cd
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     acd     ", textareaRange: 6 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     acd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -930,12 +930,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     ab" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(3), // "   []  ab"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "    ab", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">    ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -948,12 +948,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab\ncd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(3), // ab\n[]cd
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -966,7 +966,7 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     ab" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(5)(editor); // "     []ab"
                         await testDeleteInCodeBlock(4)(editor); // "    []ab"
@@ -977,7 +977,7 @@ describe("Selection collapsed", () => {
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab", textareaRange: 0 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -990,7 +990,7 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab     " }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(7)(editor); // "ab     []"
                         await testDeleteInCodeBlock(6)(editor); // "ab    []"
@@ -1001,7 +1001,7 @@ describe("Selection collapsed", () => {
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
diff --git a/addons/html_editor/static/tests/delete/forward.test.js b/addons/html_editor/static/tests/delete/forward.test.js
index d9656225dc431..d0bca068ff720 100644
--- a/addons/html_editor/static/tests/delete/forward.test.js
+++ b/addons/html_editor/static/tests/delete/forward.test.js
@@ -755,12 +755,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "ab[]cd"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abd", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -773,12 +773,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     abcd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // "     ab[]cd"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     abd", textareaRange: 7 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     abd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -791,12 +791,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd     " }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "ab[]cd     "
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abd     ", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -809,12 +809,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     abcd     " }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(7), // "     ab[]cd     "
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     abd     ", textareaRange: 7 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">     abd     </pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -827,12 +827,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     ab" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "  []   ab"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "    ab", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">    ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -845,12 +845,12 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab\ncd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testDeleteInCodeBlock(2), // "ab[]\ncd"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -863,7 +863,7 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "     ab" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(0)(editor); // "[]     ab"
                         await testDeleteInCodeBlock(0)(editor); // "[]    ab"
@@ -874,7 +874,7 @@ describe("Selection collapsed", () => {
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab", textareaRange: 0 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -887,7 +887,7 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab     " }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: async (editor) => {
                         await testDeleteInCodeBlock(2)(editor); // "ab[]     "
                         await testDeleteInCodeBlock(2)(editor); // "ab[]    "
@@ -898,7 +898,7 @@ describe("Selection collapsed", () => {
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "ab", textareaRange: 2 }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab</pre>[]`,
                     config: configWithEmbeddings,
                 });
diff --git a/addons/html_editor/static/tests/insert/paragraph_break.test.js b/addons/html_editor/static/tests/insert/paragraph_break.test.js
index 071e0049a77fc..49c8e65eadc88 100644
--- a/addons/html_editor/static/tests/insert/paragraph_break.test.js
+++ b/addons/html_editor/static/tests/insert/paragraph_break.test.js
@@ -137,6 +137,7 @@ describe("Selection collapsed", () => {
                 // highlighted and the focus is in the textarea.
                 await animationFrame();
             };
+
             beforeEach(patchPrism);
 
             test("should insert a line break within the pre", async () => {
@@ -146,7 +147,7 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abcd" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testEnterInCodeBlock(2), // "ab[]cd"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
@@ -154,7 +155,7 @@ describe("Selection collapsed", () => {
                             value: "ab\ncd",
                             textareaRange: 3, // "ab\n[]cd"
                         }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">ab<br>cd</pre>[]`,
                     config: configWithEmbeddings,
                 });
@@ -166,7 +167,7 @@ describe("Selection collapsed", () => {
                     contentBeforeEdit:
                         '<p data-selection-placeholder=""><br></p>' +
                         highlightedPre({ value: "abc" }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     stepFunction: testEnterInCodeBlock(3), // "abc[]"
                     contentAfterEdit:
                         '<p data-selection-placeholder=""><br></p>' +
@@ -175,7 +176,7 @@ describe("Selection collapsed", () => {
                             preHtml: "abc<br><br>",
                             textareaRange: 4, // "abc\n[]"
                         }) +
-                        '<p data-selection-placeholder=""><br></p>',
+                        '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                     contentAfter: `<pre data-language-id="plaintext">abc<br><br></pre>[]`,
                     config: configWithEmbeddings,
                 });
diff --git a/addons/html_editor/static/tests/syntax_highlighting.test.js b/addons/html_editor/static/tests/syntax_highlighting.test.js
index 1e3eef2ec9a15..68fe77572a613 100644
--- a/addons/html_editor/static/tests/syntax_highlighting.test.js
+++ b/addons/html_editor/static/tests/syntax_highlighting.test.js
@@ -49,12 +49,12 @@ test("starting edition with a pre activates syntax highlighting", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "some code" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async () => press(["ctrl", "z"]),
         contentAfterEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "some code" }) +
-            '<p data-selection-placeholder=""><br></p>', // Undo did nothing.
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>', // Undo did nothing.
         contentAfter: `<pre data-language-id="plaintext">some code</pre>`,
         config: configWithEmbeddings,
     });
@@ -69,14 +69,14 @@ test("starting edition with a pre activates syntax highlighting (with dataset va
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "Hello world!", language: "javascript" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async (editor) => {
             await press(["ctrl", "z"]);
             await compareHighlightedContent(
                 getContent(editor.editable),
                 '<p data-selection-placeholder=""><br></p>' +
                     highlightedPre({ value: "Hello world!", language: "javascript" }) +
-                    '<p data-selection-placeholder=""><br></p>',
+                    '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                 "Undo should have done nothing.",
                 editor
             );
@@ -90,7 +90,7 @@ test("starting edition with a pre activates syntax highlighting (with dataset va
                         language: "javascript",
                         textareaRange: 13, // "Hello world!a[]"
                     }) +
-                    '<p data-selection-placeholder=""><br></p>',
+                    '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                 "Should have written at the end of the textarea.",
                 editor
             );
@@ -104,7 +104,7 @@ test("starting edition with a pre activates syntax highlighting (with dataset va
                 language: "javascript",
                 textareaRange: 12, // "Hello world![]"
             }) +
-            '<p data-selection-placeholder=""><br></p>', // Undo did nothing.
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>', // Undo did nothing.
         contentAfter: `<pre data-language-id="javascript">Hello world!</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -120,7 +120,7 @@ test("inserting a code block activates syntax highlighting plugin, typing trigge
                 getContent(editor.editable),
                 '<p data-selection-placeholder=""><br></p>' +
                     highlightedPre({ value: "abc", textareaRange: 3 }) +
-                    '<p data-selection-placeholder=""><br></p>',
+                    '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                 "The syntax highlighting wrapper was inserted, the paragraph's content is its value and the selection in at the end of the textarea.",
                 editor
             );
@@ -129,7 +129,7 @@ test("inserting a code block activates syntax highlighting plugin, typing trigge
         contentAfterEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "abcd", textareaRange: 4 }) +
-            '<p data-selection-placeholder=""><br></p>', // The change of value in the textarea is reflected in the pre.
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>', // The change of value in the textarea is reflected in the pre.
         contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -143,7 +143,7 @@ test("inserting an empty code block activates syntax highlighting plugin with an
         contentAfterEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "", textareaRange: 0 }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="plaintext"><br></pre>[]`,
         config: configWithEmbeddings,
     });
@@ -173,7 +173,7 @@ test("inserting a code block in an empty paragraph with a style placeholder acti
                 value: "", // There should be no content (the zws is stripped)
                 textareaRange: 0,
             })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         contentAfter: `<p><br></p><pre data-language-id="plaintext"><br></pre>[]`,
         config: configWithEmbeddings,
@@ -188,7 +188,7 @@ test("changing languages in a code block changes its highlighting", async () =>
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "some code", language: "plaintext" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async () => {
             await changeLanguage(queryOne("textarea"), "Plain Text", "Javascript");
         },
@@ -199,7 +199,7 @@ test("changing languages in a code block changes its highlighting", async () =>
                 language: "javascript",
                 textareaRange: 9,
             }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="javascript">some code</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -212,7 +212,7 @@ test("should fill an empty pre", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "abc" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async () => {
             const textarea = queryOne("textarea");
             await click(textarea);
@@ -222,7 +222,7 @@ test("should fill an empty pre", async () => {
         contentAfterEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "", textareaRange: 0 }) +
-            '<p data-selection-placeholder=""><br></p>', // Note: the BR is outside the highlight.
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>', // Note: the BR is outside the highlight.
         contentAfter: `<pre data-language-id="plaintext"><br></pre>[]`,
         config: configWithEmbeddings,
     });
@@ -235,7 +235,7 @@ test("the textarea should never contains zws", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "abc" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async () => {
             const textarea = queryOne("textarea");
             await click(textarea);
@@ -243,7 +243,7 @@ test("the textarea should never contains zws", async () => {
         contentAfterEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "abc", textareaRange: 3 }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="plaintext">abc</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -262,7 +262,7 @@ test("can copy content with the copy button", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "abc" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async (editor) => {
             const textarea = queryOne("textarea");
             await click(textarea);
@@ -285,7 +285,7 @@ test("can copy content with the copy button", async () => {
         contentAfterEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "abcd", textareaRange: 4 }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="plaintext">abcd</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -298,7 +298,7 @@ test("tab in code block inserts 4 spaces", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "code" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async () => {
             await click("textarea");
             const textarea = queryOne("textarea");
@@ -311,7 +311,7 @@ test("tab in code block inserts 4 spaces", async () => {
                 value: "co    de",
                 textareaRange: 6, // "co    []de"
             }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="plaintext">co    de</pre>[]`,
         config: configWithEmbeddings,
     });
@@ -325,7 +325,7 @@ test("tab in selection in code block indents each selected line", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "a\nb c\n d" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async (editor) => {
             await click("textarea");
             const textarea = queryOne("textarea");
@@ -338,7 +338,7 @@ test("tab in selection in code block indents each selected line", async () => {
                 value: valueAfter,
                 textareaRange: [5, 19], // "    a[\n    b c\n     ]d"
             }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="plaintext">${valueAfter.replaceAll(
             "\n",
             "<br>"
@@ -355,7 +355,7 @@ test("shift+tab in code block outdents the current line", async () => {
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "    some\n       co    de\n    for you" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async (editor) => {
             await click("textarea");
             const textarea = queryOne("textarea");
@@ -368,7 +368,7 @@ test("shift+tab in code block outdents the current line", async () => {
                         value: "    some\n   co    de\n    for you",
                         textareaRange: 18, // "    some\n   co    []de\n    for you"
                     }) +
-                    '<p data-selection-placeholder=""><br></p>',
+                    '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                 "The content was outdented a first time.",
                 editor
             );
@@ -380,7 +380,7 @@ test("shift+tab in code block outdents the current line", async () => {
                 value: valueAfter,
                 textareaRange: 15, // "    some\nco    []de\n    for you"
             }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         contentAfter: `<pre data-language-id="plaintext">${valueAfter.replaceAll(
             "\n",
             "<br>"
@@ -396,7 +396,7 @@ test("shift+tab in selection in code block outdents each selected line", async (
         contentBeforeEdit:
             '<p data-selection-placeholder=""><br></p>' +
             highlightedPre({ value: "    a\n    b c\n     d" }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         stepFunction: async (editor) => {
             await click("textarea");
             const textarea = queryOne("textarea");
@@ -409,7 +409,7 @@ test("shift+tab in selection in code block outdents each selected line", async (
                         value: "a\nb c\n d",
                         textareaRange: [1, 7], // "a[\nb c\n ]d"
                     }) +
-                    '<p data-selection-placeholder=""><br></p>',
+                    '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
                 "The content was outdented a first time.",
                 editor
             );
@@ -422,7 +422,7 @@ test("shift+tab in selection in code block outdents each selected line", async (
                 value: "a\nb c\nd",
                 textareaRange: [1, 6], // "a[\nb c\n]d"
             }) +
-            '<p data-selection-placeholder=""><br></p>',
+            '<p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>',
         config: configWithEmbeddings,
         contentAfter: `<pre data-language-id="plaintext">a<br>b c<br>d</pre>[]`,
     });
@@ -440,7 +440,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
             ${highlightedPre({ value: "jk" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         "The content was highlighted",
         editor
@@ -459,7 +459,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl", textareaRange: 3 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `1. Inserted "l" into the second pre and highlighted it.`,
         editor
@@ -475,7 +475,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", textareaRange: 3 })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `2. Inserted "f" into the first pre and highlighted it.`,
         editor
@@ -491,7 +491,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def" })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `3. Inserted "c" into the first paragraph.`,
         editor
@@ -507,7 +507,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def" })}
             <p>ghi[]</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `4. Inserted "i" into the second paragraph.`,
         editor
@@ -521,7 +521,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", language: "javascript", textareaRange: 3 })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `5. Changed the language of the first textarea to "javascript".`,
         editor
@@ -535,7 +535,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `6. Changed the language of the second textarea to "python".`,
         editor
@@ -553,7 +553,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl", textareaRange: 3 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         // TODO: is it correct to not move the focus?
         `Undo 6 changed back the language of the second textarea to "plaintext" (without losing the current focus, editor).`,
@@ -568,7 +568,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", textareaRange: 3 })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         // TODO: is it correct to move the focus?
         `Undo 5 changed back the language of the first textarea to "plaintext" (and move the focus to the last focused textarea, editor).`,
@@ -583,7 +583,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def" })}
             <p>gh[]</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Undo 4 removed the "i" from the second paragraph.`,
         editor
@@ -597,7 +597,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def" })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Undo 3 removed the "c" from the first paragraph.`,
         editor
@@ -611,7 +611,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "de", textareaRange: 2 })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Undo 2 removed the "f" from the first pre and un-highlighted it.`,
         editor
@@ -625,7 +625,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
             ${highlightedPre({ value: "jk", textareaRange: 2 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Undo 1 removed the "l" from the second pre and un-highlighted it.`,
         editor
@@ -639,7 +639,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
             ${highlightedPre({ value: "jk", textareaRange: 2 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         "Undo did nothing.",
         editor
@@ -657,7 +657,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "de" })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl", textareaRange: 3 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Redo 1 reinserted "l" into the second pre and re-highlighted it.`,
         editor
@@ -671,7 +671,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", textareaRange: 3 })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Redo 2 reinserted "f" into the first pre and re-highlighted it.`,
         editor
@@ -685,7 +685,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def" })}
             <p>gh</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Redo 3 reinserted "c" into the first paragraph.`,
         editor
@@ -699,7 +699,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def" })}
             <p>ghi[]</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Redo 4 reinserted "i" into the second paragraph.`,
         editor
@@ -713,7 +713,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", language: "javascript", textareaRange: 3 })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl" })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Redo 5 changed back the language of the first textarea to "javascript".`,
         editor
@@ -727,7 +727,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         `Redo 6 changed back the language of the second textarea to "python".`,
         editor
@@ -741,7 +741,7 @@ test("can switch between code blocks without issues", async () => {
             ${highlightedPre({ value: "def", language: "javascript" })}
             <p>ghi</p>
             ${highlightedPre({ value: "jkl", language: "python", textareaRange: 3 })}
-            <p data-selection-placeholder=""><br></p>`
+            <p data-selection-placeholder="" style="margin: -9px 0px 8px;"><br></p>`
         ),
         "Redo did nothing.",
         editor

From 3d4d6474e62f0fe87233778fa2c7e9bc29a9c21a Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 5 Nov 2025 11:06:11 +0100
Subject: [PATCH 290/673] [IMP] mail: move channel_member_ids to
 discuss.channel

closes odoo/odoo#234502

Signed-off-by: Didier Debondt (did) <did@odoo.com>
---
 .../static/src/discuss/call/common/channel_member_patch.js  | 6 +++---
 .../mail/static/src/discuss/core/common/@types/models.d.ts  | 1 -
 .../static/src/discuss/core/common/channel_member_model.js  | 6 +++---
 .../static/src/discuss/core/common/discuss_channel_model.js | 5 +++++
 .../static/src/discuss/core/common/thread_model_patch.js    | 5 -----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/channel_member_patch.js b/addons/mail/static/src/discuss/call/common/channel_member_patch.js
index 0e18d2a773947..1c3eb80cb5314 100644
--- a/addons/mail/static/src/discuss/call/common/channel_member_patch.js
+++ b/addons/mail/static/src/discuss/call/common/channel_member_patch.js
@@ -16,9 +16,9 @@ const ChannelMemberPatch = {
                     return;
                 }
                 this.channel_id.rtc_session_ids.add(r);
-                this.store.ringingThreads.add(this.channel_id);
+                this.store.ringingThreads.add(this.channel_id.thread);
                 this.channel_id.cancelRtcInvitationTimeout = browser.setTimeout(() => {
-                    this.store.env.services["discuss.rtc"].leaveCall(this.channel_id.channel);
+                    this.store.env.services["discuss.rtc"].leaveCall(this.channel_id);
                 }, ChannelMember.CANCEL_CALL_INVITE_DELAY);
             },
             /** @this {import("models").ChannelMember} */
@@ -27,7 +27,7 @@ const ChannelMemberPatch = {
                     return;
                 }
                 browser.clearTimeout(this.channel_id.cancelRtcInvitationTimeout);
-                this.store.ringingThreads.delete(this.channel_id);
+                this.store.ringingThreads.delete(this.channel_id.thread);
             },
         });
         this.rtcSession = fields.One("discuss.channel.rtc.session");
diff --git a/addons/mail/static/src/discuss/core/common/@types/models.d.ts b/addons/mail/static/src/discuss/core/common/@types/models.d.ts
index 6e8133ff8c5c5..6da5c59ec04ab 100644
--- a/addons/mail/static/src/discuss/core/common/@types/models.d.ts
+++ b/addons/mail/static/src/discuss/core/common/@types/models.d.ts
@@ -47,7 +47,6 @@ declare module "models" {
         canLeave: Readonly<boolean>;
         canUnpin: Readonly<boolean>;
         channel: DiscussChannel;
-        channel_member_ids: ChannelMember[];
         channel_name_member_ids: ChannelMember[];
         channel_type: string;
         computeCorrespondent: () => ChannelMember;
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_model.js b/addons/mail/static/src/discuss/core/common/channel_member_model.js
index b5e3bdba7a997..cf92d189aca6a 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_model.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_model.js
@@ -46,11 +46,11 @@ export class ChannelMember extends Record {
     get persona() {
         return this.partner_id || this.guest_id;
     }
-    channel_id = fields.One("mail.thread", { inverse: "channel_member_ids" });
+    channel_id = fields.One("discuss.channel", { inverse: "channel_member_ids" });
     threadAsSelf = fields.One("mail.thread", {
         compute() {
             if (this.store.self?.eq(this.persona)) {
-                return this.channel_id;
+                return this.channel_id?.thread;
             }
         },
     });
@@ -103,7 +103,7 @@ export class ChannelMember extends Record {
     });
     channelAsTyping = fields.One("discuss.channel", {
         compute() {
-            return this.isTyping ? this.channel_id.channel : undefined;
+            return this.isTyping ? this.channel_id : undefined;
         },
         eager: true,
         onDelete() {
diff --git a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
index 2c4f9c4360301..b8c43ecf66485 100644
--- a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
+++ b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
@@ -47,6 +47,11 @@ export class DiscussChannel extends Record {
         return def;
     }
 
+    channel_member_ids = fields.Many("discuss.channel.member", {
+        inverse: "channel_id",
+        onDelete: (r) => r?.delete(),
+        sort: (m1, m2) => m1.id - m2.id,
+    });
     chatWindow = fields.One("ChatWindow", {
         inverse: "channel",
     });
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index 2a3fcdeef14d8..f78fbc7b32a43 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -26,11 +26,6 @@ const threadPatch = {
                 return this.model === "discuss.channel" ? this.id : undefined;
             },
         });
-        this.channel_member_ids = fields.Many("discuss.channel.member", {
-            inverse: "channel_id",
-            onDelete: (r) => r?.delete(),
-            sort: (m1, m2) => m1.id - m2.id,
-        });
         /** @type {string} */
         this.channel_type = undefined;
         this.correspondent = fields.One("discuss.channel.member", {

From d7cc4b27808970adb6c84f2b33ae4f0cfd4391a5 Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Tue, 4 Nov 2025 07:10:28 +0000
Subject: [PATCH 291/673] [REV] website_blog, website_slides: revert bot filter

This reverts [1] because the is_a_bot check is not reliable.
Many crawlers spoof user agents or ignore robots rules, so they still
index every tag combination and overload tag clouds.
We revert while we look for a better protection.

[1]: 1d07b74ea525f874c0f8b39a957eb37d38f27581

closes odoo/odoo#234649

X-original-commit: f06d58e9d8707b013b9c70807ca46b3f7f6c040c
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 addons/website_blog/controllers/main.py   | 13 ++-----------
 addons/website_slides/controllers/main.py | 14 ++------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index b4aa7e423a26a..d6d104e724ed7 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -185,20 +185,11 @@ def blog(self, blog=None, tag=None, page=1, search=None, **opt):
 
         date_begin, date_end = opt.get('date_begin'), opt.get('date_end')
 
-        # Checking referrer and search to see if the GET request is from
-        # a SEO bot, in which case every tag but one should be removed to
-        # avoid combinatorial explosion
-        if tag and request.httprequest.method == 'GET' and request.env['ir.http'].is_a_bot():
-            # Redirect `tag-1,tag-2` to `tag-1` to disallow multi tags
-            # in GET request for proper bot indexation;
+        if tag and request.httprequest.method == 'GET':
+            # redirect get tag-1,tag-2 -> get tag-1
             tags = tag.split(',')
             if len(tags) > 1:
                 url = QueryURL('' if blog else '/blog', ['blog', 'tag'], blog=blog, tag=tags[0], date_begin=date_begin, date_end=date_end, search=search)()
-                # The vast majority of bots will follow the links in the
-                # client side, which are protected by the nofollow
-                # attribute of the tags links
-                # This redirect is used to stop combinatorial explosions
-                # from bots that send direct requests
                 return request.redirect(url, code=302)
 
         values = self._prepare_blog_values(blogs=blogs, blog=blog, tags=tag, page=page, search=search, **opt)
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 26fca595d2bc0..8ba9dda3c177a 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -405,24 +405,14 @@ def _has_slide_channel_search(self, my=None, slug_tags=None, slide_category=None
                 list_as_website_content=_lt("eLearning"))
     def slides_channel(self, slide_category=None, slug_tags=None, my=0, page=1, **post):
         my = 1 if str(my) == '1' else 0  # if in the URL parameters, it will be a string instead of a number
-        if slug_tags and slug_tags.count(',') > 0 and request.httprequest.method == 'GET' and not post.get('prevent_redirect') and request.env['ir.http'].is_a_bot():
+        if slug_tags and slug_tags.count(',') > 0 and request.httprequest.method == 'GET' and not post.get('prevent_redirect'):
             # Previously, the tags were searched using GET, which caused issues with crawlers (too many hits)
             # We replaced those with POST to avoid that, but it's not sufficient as bots "remember" crawled pages for a while
             # This permanent redirect is placed to instruct the bots that this page is no longer valid
             # TODO: remove in a few stable versions (v19?), including the "prevent_redirect" param in templates
             # Note: We allow a single tag to be GET, to keep crawlers & indexes on those pages
             # What we really want to avoid is combinatorial explosions
-            # Redirect `tag-1,tag-2` to `tag-1` to disallow multi tags
-            # in GET request for proper bot indexation;
-            tag_list = slug_tags.split(',')
-            if len(tag_list) > 1:
-                url = QueryURL('/slides/all', ['tag'], tag=tag_list[0], my=my, slide_category=slide_category)()
-                # The vast majority of bots will follow the links in the
-                # client side, which are protected by the nofollow
-                # attribute of the tags links
-                # This redirect is used to stop combinatorial explosions
-                # from bots that send direct requests
-                return request.redirect(url, code=302)
+            return request.redirect('/slides', code=301)
 
         render_values = self.slides_channel_values(
             slide_category=slide_category, slug_tags=slug_tags, my=my, page=page, **post)

From d50b158eb7064b244877c1e2ddee6cffd25d4ca3 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Tue, 28 Oct 2025 09:57:29 +0000
Subject: [PATCH 292/673] [FIX] event_product: add ticket currency symbol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add missing currency symbol next to the event ticket price
in the event form view.

Task-5114075

closes odoo/odoo#234632

X-original-commit: 16e889bf5885c4d827b8c2c5dce102f98aad689f
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Amélie Dieudonné (amdi) <amdi@odoo.com>
---
 addons/event_product/views/event_ticket_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/event_product/views/event_ticket_views.xml b/addons/event_product/views/event_ticket_views.xml
index 0c31b81f2b781..623a7fe3bea77 100644
--- a/addons/event_product/views/event_ticket_views.xml
+++ b/addons/event_product/views/event_ticket_views.xml
@@ -61,6 +61,7 @@
                 />
             </field>
             <field name="description" position="after">
+                <field name="currency_id" column_invisible="True"/> <!-- Used to get the currency symbol on the ticket price. -->
                 <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
             </field>
         </field>

From 971946094be30e107614d0cd0e62e23e96fd5213 Mon Sep 17 00:00:00 2001
From: "Pierre Lamotte (pila)" <pila@odoo.com>
Date: Fri, 17 Oct 2025 15:39:33 +0000
Subject: [PATCH 293/673] [FIX] payment: disable boleto tokenization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Versions
17.0+

## Issue
Boleto is an offline, one-time-use payment method and cannot be tokenized with most payment providers (e.g., Adyen: https://docs.adyen.com/payment-methods/boleto-bancario/, Nuvei: https://www.nuvei.com/apm/boleto).

## Exception
Stripe allows a form of tokenization by storing the customer's billing information and regenerating a new Boleto for each payment (cf. https://docs.stripe.com/payments/boleto). Technically, the Boleto itself is not reusable — Stripe simulates tokenization by associating customer info with new Boleto transactions.

## Fix
To maintain consistent behavior and avoid provider-specific edge cases, tokenization is disabled for Boleto payments globally.

opw-5156718

closes odoo/odoo#234672

X-original-commit: 02e8f160dd2634d74cc256bbfe6205256a37d048
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Pierre Lamotte (pila) <pila@odoo.com>
---
 addons/payment/data/payment_method_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/payment/data/payment_method_data.xml b/addons/payment/data/payment_method_data.xml
index 61fc57ecceb8f..0fed5300bc63d 100644
--- a/addons/payment/data/payment_method_data.xml
+++ b/addons/payment/data/payment_method_data.xml
@@ -757,7 +757,7 @@
         <field name="sequence">1000</field>
         <field name="active">False</field>
         <field name="image" type="base64" file="payment/static/img/boleto.png"/>
-        <field name="support_tokenization">True</field>
+        <field name="support_tokenization">False</field>
         <field name="support_express_checkout">False</field>
         <field name="support_manual_capture">none</field>
         <field name="support_refund">none</field>

From 5bb97960478d3af9930c36db85d1c8dc94b54dae Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Wed, 5 Nov 2025 11:56:32 +0000
Subject: [PATCH 294/673] [FIX] bus: implement application level connection
 checks

When a TCP connection is not closed cleanly, it can take
minutes to detect a closed WebSocket connection. During this
time, no messages are received. This can happen in slow or
unstable network conditions.

Browsers do not expose WebSocket ping/pong mechanisms. To detect
dead connections quickly, periodic application level messages are sent
if no messages were either sent or received within a minute.

This approach ensures quicker detection compared to relying on the OS
TCP timeout, which is typically set to a high value.

closes odoo/odoo#234647

X-original-commit: e9ae6c64dbbafc01aba04ec2c341acb2d88f2995
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 .../static/src/workers/websocket_worker.js    | 25 ++++++++++
 addons/bus/static/tests/mock_websocket.js     | 11 +++++
 .../bus/static/tests/websocket_worker.test.js | 49 ++++++++++++++++++-
 addons/bus/websocket.py                       |  5 +-
 4 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/addons/bus/static/src/workers/websocket_worker.js b/addons/bus/static/src/workers/websocket_worker.js
index 1f928c1919132..095de5574c3ed 100644
--- a/addons/bus/static/src/workers/websocket_worker.js
+++ b/addons/bus/static/src/workers/websocket_worker.js
@@ -50,6 +50,7 @@ const logger = new Logger("bus_websocket_worker");
 export class WebsocketWorker {
     INITIAL_RECONNECT_DELAY = 1000;
     RECONNECT_JITTER = 1000;
+    CONNECTION_CHECK_DELAY = 60_000;
 
     constructor(name) {
         this.name = name;
@@ -348,6 +349,7 @@ export class WebsocketWorker {
      * closed.
      */
     _onWebsocketClose({ code, reason }) {
+        clearInterval(this._connectionCheckInterval);
         this._logDebug("_onWebsocketClose", code, reason);
         this._updateState(WORKER_STATE.DISCONNECTED);
         this.lastChannelSubscription = null;
@@ -395,6 +397,7 @@ export class WebsocketWorker {
      * @param {MessageEvent} messageEv
      */
     _onWebsocketMessage(messageEv) {
+        this._restartConnectionCheckInterval();
         const notifications = JSON.parse(messageEv.data);
         this._logDebug("_onWebsocketMessage", notifications);
         this.lastNotificationId = notifications[notifications.length - 1].id;
@@ -435,6 +438,27 @@ export class WebsocketWorker {
             this.messageWaitQueue.forEach((msg) => this.websocket.send(msg));
             this.messageWaitQueue = [];
         });
+        this._restartConnectionCheckInterval();
+    }
+
+    /**
+     * Sends a custom application-level message to perform a connection check
+     * on the WebSocket.
+     *
+     * Browsers rely on the OS's TCP mechanism, which can take minutes or
+     * hours to detect a dead connection. Sending data triggers an immediate
+     * I/O operation, quickly revealing any network-level failure. This must be
+     * implemented at the application level because the browser WebSocket API
+     * does not expose the built-in ping/pong mechanism.
+     */
+    _restartConnectionCheckInterval() {
+        clearInterval(this._connectionCheckInterval);
+        this._connectionCheckInterval = setInterval(() => {
+            if (this._isWebsocketConnected()) {
+                this.websocket.send(new Uint8Array([0x00]));
+                this._logDebug("connection_checked");
+            }
+        }, this.CONNECTION_CHECK_DELAY);
     }
 
     /**
@@ -474,6 +498,7 @@ export class WebsocketWorker {
             } else {
                 this.firstSubscribeDeferred.then(() => this.websocket.send(payload));
             }
+            this._restartConnectionCheckInterval();
         }
     }
 
diff --git a/addons/bus/static/tests/mock_websocket.js b/addons/bus/static/tests/mock_websocket.js
index cddfec3515400..7aa2903caaac6 100644
--- a/addons/bus/static/tests/mock_websocket.js
+++ b/addons/bus/static/tests/mock_websocket.js
@@ -92,6 +92,17 @@ patch(MockServer.prototype, {
 patch(WebsocketWorker.prototype, {
     INITIAL_RECONNECT_DELAY: 0,
     RECONNECT_JITTER: 5,
+    // `runAllTimers` advances time based on the longest registered timeout.
+    // Some tests rely on the fragile assumption that time won’t advance too much.
+    // Disable the interval until those tests are rewritten to be more robust.
+    enableCheckInterval: false,
+
+    _restartConnectionCheckInterval() {
+        if (this.enableCheckInterval) {
+            super._restartConnectionCheckInterval(...arguments);
+        }
+    },
+
     _sendToServer(message) {
         const { env } = MockServer;
         if (!env) {
diff --git a/addons/bus/static/tests/websocket_worker.test.js b/addons/bus/static/tests/websocket_worker.test.js
index 9693e0edbc56d..6daf23c5cf4d4 100644
--- a/addons/bus/static/tests/websocket_worker.test.js
+++ b/addons/bus/static/tests/websocket_worker.test.js
@@ -1,9 +1,9 @@
 import { getWebSocketWorker } from "@bus/../tests/mock_websocket";
-import { describe, expect, test } from "@odoo/hoot";
+import { advanceTime, describe, expect, test } from "@odoo/hoot";
 import { runAllTimers } from "@odoo/hoot-dom";
 import { makeMockServer, MockServer, patchWithCleanup } from "@web/../tests/web_test_helpers";
 
-import { WEBSOCKET_CLOSE_CODES } from "@bus/workers/websocket_worker";
+import { WEBSOCKET_CLOSE_CODES, WebsocketWorker } from "@bus/workers/websocket_worker";
 
 describe.current.tags("headless");
 
@@ -99,3 +99,48 @@ test("disconnect event is sent when stopping the worker", async () => {
     await runAllTimers();
     await expect.waitForSteps(["broadcast BUS:DISCONNECT"]);
 });
+
+test("check connection health during inactivity", async () => {
+    const ogSocket = window.WebSocket;
+    let waitingForCheck = true;
+    patchWithCleanup(window, {
+        WebSocket: function () {
+            const ws = new ogSocket(...arguments);
+            ws.send = (message) => {
+                if (waitingForCheck && message instanceof Uint8Array) {
+                    expect.step("check_connection_health_sent");
+                    waitingForCheck = false;
+                }
+            };
+            return ws;
+        },
+    });
+    patchWithCleanup(WebsocketWorker.prototype, {
+        enableCheckInterval: true,
+        _restartConnectionCheckInterval() {
+            expect.step("_restartConnectionCheckInterval");
+            super._restartConnectionCheckInterval();
+        },
+        _sendToServer(payload) {
+            if (payload.event_name === "foo") {
+                super._sendToServer(payload);
+            }
+        },
+    });
+    const worker = await startWebSocketWorker((type) => {
+        if (type === "BUS:CONNECT") {
+            expect.step(`broadcast ${type}`);
+        }
+    });
+    await expect.waitForSteps(["broadcast BUS:CONNECT", "_restartConnectionCheckInterval"]);
+    worker.websocket.dispatchEvent(
+        new MessageEvent("message", {
+            data: JSON.stringify([{ id: 70, message: { type: "foo" } }]),
+        })
+    );
+    await expect.waitForSteps(["_restartConnectionCheckInterval"]);
+    worker._sendToServer({ event_name: "foo" });
+    await expect.waitForSteps(["_restartConnectionCheckInterval"]);
+    await advanceTime(worker.CONNECTION_CHECK_DELAY + 1000);
+    await expect.waitForSteps(["check_connection_health_sent"]);
+});
diff --git a/addons/bus/websocket.py b/addons/bus/websocket.py
index 2661c5a6774b5..2a4f4ae3ab8b9 100644
--- a/addons/bus/websocket.py
+++ b/addons/bus/websocket.py
@@ -962,7 +962,7 @@ class WebsocketConnectionHandler:
     # Latest version of the websocket worker. This version should be incremented
     # every time `websocket_worker.js` is modified to force the browser to fetch
     # the new worker bundle.
-    _VERSION = "19.0-1"
+    _VERSION = "19.0-2"
 
     @classmethod
     def websocket_allowed(cls, request):
@@ -1105,6 +1105,9 @@ def _serve_forever(cls, websocket, db, httprequest, version):
             # worker version.
             websocket.close(CloseCode.CLEAN, "OUTDATED_VERSION")
         for message in websocket.get_messages():
+            if message == b'\x00':
+                # Ignore internal sentinel message used to detect dead/idle connections.
+                continue
             with WebsocketRequest(db, httprequest, websocket) as req:
                 try:
                     req.serve_websocket_message(message)

From 57ed0b012a7962a315fd0ddb1ffa362457cbfdeb Mon Sep 17 00:00:00 2001
From: "Mahdi Alijani (malj)" <malj@odoo.com>
Date: Fri, 10 Oct 2025 10:08:07 +0000
Subject: [PATCH 295/673] [FIX] hr_attendance: barcode scanner disabled in
 barcode_manual kiosk mode

Issue:

In this bug, barcode scanner is disabled in barcode_manual
kiosk mode.

To reproduce:
1- Create a db with hr_attendance installed
2- Set `Kiosk Mode` to `Barcode / RFID AND Manual Selection`
3- Open `Kiosk Mode`. As you see the scanner is disabled.

`t-att-disabled` shouldn't be set to `barcode_manual` as it
should not be disabled in `barcode_manual` mode.

Also there is no need of `t-att-disabled` attribute at all as:
https://github.com/odoo/odoo/blob/f6b430245b98fb55cac7c8303b7f5bd8a3e1c84e/addons/hr_attendance/static/src/public_kiosk/public_kiosk_app.xml#L113-L114
the `KioskBarcodeScanner` will not be mounted if the mode is
manual.

opw-5153954

closes odoo/odoo#234643

X-original-commit: 0e7c06841bb30bae8abcb874824f96a893ddd942
Signed-off-by: Jurgen Gjini (jugj) <jugj@odoo.com>
Signed-off-by: Mohammadmahdi Alijani (malj) <malj@odoo.com>
---
 .../hr_attendance/static/src/public_kiosk/public_kiosk_app.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_attendance/static/src/public_kiosk/public_kiosk_app.xml b/addons/hr_attendance/static/src/public_kiosk/public_kiosk_app.xml
index 9808f90749313..f43a12d432321 100644
--- a/addons/hr_attendance/static/src/public_kiosk/public_kiosk_app.xml
+++ b/addons/hr_attendance/static/src/public_kiosk/public_kiosk_app.xml
@@ -8,7 +8,7 @@
 <t t-name="hr_attendance.BarcodeScanner" t-inherit="barcodes.BarcodeScanner" t-inherit-mode="primary">
     <xpath expr="//div[hasclass('o_barcode_mobile_container')]" position="replace">
         <div class="o_hr_attendance_kiosk d-flex justify-content-around" t-att-class="{'position-relative' : !isDisplayStandalone}">
-            <button t-if="isBarcodeScannerSupported" t-att-disabled="props.kioskMode === 'barcode_manual'"  t-on-click="openMobileScanner" class="o_mobile_barcode btn btn-light btn-lg p-5 rounded-3" t-att-class="{'position-absolute' : !isDisplayStandalone}">
+            <button t-if="isBarcodeScannerSupported" t-on-click="openMobileScanner" class="o_mobile_barcode btn btn-light btn-lg p-5 rounded-3" t-att-class="{'position-absolute' : !isDisplayStandalone}">
                 <i class="fa fa-3x fa-barcode mb-3"/>
                 <span class="d-block">Scan your badge</span>
             </button>

From 5f5a1c1148da6fdd225a4a8f6e69618c048e1d34 Mon Sep 17 00:00:00 2001
From: Max Whale <mawh@odoo.com>
Date: Wed, 5 Nov 2025 11:41:15 +0000
Subject: [PATCH 296/673] [FIX] iot_drivers: no event returned for 'status'
 printer action

Steps to reproduce:
1. Connect a receipt printer to an IoT box, and pair the IoT box with
   Odoo.
2. In the device form for the receipt printer, click the 'Test' button.

Expected behaviour:
- Status receipt is printed and a 'Test page printed' notification is
  shown on the screen.

Actual behaviour:
- Status receipt is printed but no notification is shown on the screen.

In odoo/odoo#229731, a QR code was added to the test status receipt
printer action. This was achieved by directly sending commands to the
printer with the `escpos` library, bypassing the `print_raw` method.

However, by bypassing the `print_raw` method it also bypassed the status
events that are normally sent to inform the Odoo user of the outcome of
the print.

This commit adds back these events to the receipt test print action.

closes odoo/odoo#234629

X-original-commit: b6c23da658f66efe565da5498b25648f1eafb072
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 addons/iot_drivers/iot_handlers/drivers/printer_driver_L.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/iot_drivers/iot_handlers/drivers/printer_driver_L.py b/addons/iot_drivers/iot_handlers/drivers/printer_driver_L.py
index b64912d53e2b0..e20770f371a12 100644
--- a/addons/iot_drivers/iot_handlers/drivers/printer_driver_L.py
+++ b/addons/iot_drivers/iot_handlers/drivers/printer_driver_L.py
@@ -148,6 +148,8 @@ def print_status_receipt(self):
 
         commands = self.RECEIPT_PRINTER_COMMANDS[self.receipt_protocol]
         if self.escpos_device:
+            if not self.check_printer_status():
+                return
             try:
                 with EscposIO(self.escpos_device) as dev:
                     dev.printer.set(align='center', double_height=True, double_width=True)
@@ -155,6 +157,7 @@ def print_status_receipt(self):
                     dev.printer.set_with_default(align='center', double_height=False, double_width=False)
                     dev.writelines(body.decode())
                     dev.printer.qr(f"http://{system.get_ip()}", size=6)
+                self.send_status(status='success')
                 return
             except (escpos.exceptions.Error, OSError, AssertionError):
                 _logger.warning("Failed to print QR status receipt, falling back to simple receipt")

From b066d2c9d78bf2a696cf8eb76f693baf3ee762fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20=28blse=29?= <blse@odoo.com>
Date: Fri, 3 Oct 2025 14:22:34 +0000
Subject: [PATCH 297/673] [FIX] website: always add plugin with test helper
 addPlugin and similar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit is repeating caafc9a8e356a8693d9c4a20fa29e6ace8359a39, but
after the merge of 179480d996a19dff4d56265a610259b1c6e33f99 that undid
parts of it

task-5176469

closes odoo/odoo#234644

X-original-commit: e41b19c97d8707cabde407088f8a74bbb4f4326c
Signed-off-by: Colin Louis (loco) <loco@odoo.com>
Signed-off-by: Sébastien Blondiau (blse) <blse@odoo.com>
---
 .../website/static/tests/builder/website_helpers.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/website/static/tests/builder/website_helpers.js b/addons/website/static/tests/builder/website_helpers.js
index a592730c02405..c0f0a4d885e0b 100644
--- a/addons/website/static/tests/builder/website_helpers.js
+++ b/addons/website/static/tests/builder/website_helpers.js
@@ -10,7 +10,7 @@ import { SetupEditorPlugin } from "@html_builder/core/setup_editor_plugin";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { defineMailModels, startServer } from "@mail/../tests/mail_test_helpers";
-import { after, describe } from "@odoo/hoot";
+import { describe } from "@odoo/hoot";
 import { advanceTime, animationFrame, click, queryOne, tick, waitFor } from "@odoo/hoot-dom";
 import {
     contains,
@@ -36,6 +36,7 @@ import { mockImageRequests } from "./image_test_helpers";
 import { getWebsiteSnippets } from "./snippets_getter.hoot";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { WebsiteBuilder } from "@website/builder/website_builder";
 
 class Website extends models.Model {
     _name = "website";
@@ -285,10 +286,12 @@ async function openBuilderSidebar(editAssetsLoaded) {
     await animationFrame();
 }
 
-export function addPlugin(Plugin) {
-    registry.category("website-plugins").add(Plugin.id, Plugin);
-    after(() => {
-        registry.category("website-plugins").remove(Plugin.id);
+export function addPlugin(...Plugin) {
+    patchWithCleanup(WebsiteBuilder.prototype, {
+        get builderProps() {
+            const props = super.builderProps;
+            return { ...props, Plugins: [...props.Plugins, ...Plugin] };
+        },
     });
 }
 

From b48ae2d94f2a2baad4b583f3a93dcf6f080a7fc0 Mon Sep 17 00:00:00 2001
From: luvi <luvi@odoo.com>
Date: Fri, 27 Jun 2025 14:37:38 +0200
Subject: [PATCH 298/673] [IMP] web, *: make calendar swipe transition smoother
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit reworks entirely the ActionSwiper component with the 'forwards'
animationType. This has been done to create a more engaging animation, with
the content area being moved following the user's finger on the screen. Each state
value implying a rerender has been replaced by non state dependent alternatives
to avoid unnnecessary redraws of the swiper content.

The commit also allows to set custom content in surrounding areas, such as a
preview of the item nearby that replaces the current content when the animation
is done. This is used to create a continued experience in the calendar, showing
other instances of the calendar arround the current period being visible instead
of a blank screen. By default, no content is set (settings app for example).

By improving the 'forwards' animation with a more natural UX, the props associated
with a fixed swipable experience has be removed. It is also no longer useful to
support a custom distance ratio before expecting the content to change, so the
dedicated props has been dropped as well.

Also, the 'hasTouch' check to determine whether or not the component has a true
purpose or if we can simply render the main content has been directly moved
inside of the component. This reduces the need of duplicated code to check the
same thing.

Tests have been added or adapted to assert the newest scenarios and behaviors.
- Calendar helpers have been improved and now wait for fullcalendar to be interactive
before dragging elements.
- A few patches were previously made to disable the swiping feature, which didn't
allow to test fully the standard calendar behavior, and meant the feature wasn't
entirely tested.
- A test verifies that the range is enlarged when the model loads
- A test checks the rerender count of the controller when loading the data (after a
search or a date change)

A new variable value is now exported from views utils, since the same value is being
used at multiple locations in the codebase, for the same use case: enabling selection
after a delay when touch starts. This will improve the consistency accross views by
using the same value.

task-4800846

Part-of: odoo/odoo#231638
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 .../tests/attendee_calendar_views.test.js     |   2 +-
 .../common/calendar_common_renderer.js        |   2 +-
 addons/mail/static/src/core/common/message.js |   3 +-
 .../mail/static/src/core/common/message.xml   |   2 +-
 .../static/tests/microsoft_calendar.test.js   |   2 +-
 .../src/core/action_swiper/action_swiper.js   | 205 +++++++------
 .../src/core/action_swiper/action_swiper.scss |   5 +-
 .../src/core/action_swiper/action_swiper.xml  |  28 +-
 .../calendar_common_renderer.js               |  79 +++--
 .../calendar_common_renderer.xml              |   2 +-
 .../src/views/calendar/calendar_controller.js |  24 +-
 .../views/calendar/calendar_controller.scss   |  11 +
 .../src/views/calendar/calendar_model.js      |  20 ++
 .../src/views/calendar/calendar_renderer.js   |  32 +-
 .../src/views/calendar/calendar_renderer.xml  |   3 +-
 .../calendar_year/calendar_year_renderer.js   |  72 +++--
 .../calendar_year/calendar_year_renderer.xml  |   2 +-
 addons/web/static/src/views/utils.js          |   2 +
 .../settings/settings_page.js                 |  15 +-
 .../settings/settings_page.xml                |   8 +-
 .../static/tests/core/action_swiper.test.js   | 106 +++----
 .../calendar/calendar_common_renderer.test.js |   1 +
 .../views/calendar/calendar_test_helpers.js   |  56 ++--
 .../views/calendar/calendar_view.test.js      | 279 ++++++++----------
 .../calendar/calendar_year_renderer.test.js   |   1 +
 25 files changed, 507 insertions(+), 455 deletions(-)

diff --git a/addons/calendar/static/tests/attendee_calendar_views.test.js b/addons/calendar/static/tests/attendee_calendar_views.test.js
index d53b105b0a5bd..c2a761b648900 100644
--- a/addons/calendar/static/tests/attendee_calendar_views.test.js
+++ b/addons/calendar/static/tests/attendee_calendar_views.test.js
@@ -117,7 +117,7 @@ test("Linked record rendering", async () => {
         res_model_id: modelId,
     });
     await mountView({ type: "calendar", resModel: "calendar.event", arch });
-    expect(".o_calendar_renderer .fc-view").toHaveCount(1);
+    expect(".o_calendar_renderer .o_calendar_current .fc-view").toHaveCount(1);
 
     await changeScale("week");
     await clickEvent(eventId);
diff --git a/addons/hr_homeworking_calendar/static/src/calendar/common/calendar_common_renderer.js b/addons/hr_homeworking_calendar/static/src/calendar/common/calendar_common_renderer.js
index 6d1cbc99a3644..f23c9acef5a99 100644
--- a/addons/hr_homeworking_calendar/static/src/calendar/common/calendar_common_renderer.js
+++ b/addons/hr_homeworking_calendar/static/src/calendar/common/calendar_common_renderer.js
@@ -105,7 +105,7 @@ patch(AttendeeCalendarCommonRenderer.prototype, {
         const showLine = ["week", "month"].includes(this.props.model.scale);
         let worklocation = this.props.model.worklocations[parsedDate];
         const workLocationSetForCurrentUser =
-            multiCalendar ?
+            multiCalendar && worklocation ?
             Object.keys(worklocation).some(key => worklocation[key].some(wlItem => wlItem.userId === user.userId)
             ) : worklocation?.userId === user.userId;
 
diff --git a/addons/mail/static/src/core/common/message.js b/addons/mail/static/src/core/common/message.js
index c246cb92a4dd9..282efb4ee8a48 100644
--- a/addons/mail/static/src/core/common/message.js
+++ b/addons/mail/static/src/core/common/message.js
@@ -24,7 +24,7 @@ import {
 } from "@odoo/owl";
 
 import { ActionSwiper } from "@web/core/action_swiper/action_swiper";
-import { hasTouch, isMobileOS } from "@web/core/browser/feature_detection";
+import { isMobileOS } from "@web/core/browser/feature_detection";
 import { Dropdown } from "@web/core/dropdown/dropdown";
 import { useDropdownState } from "@web/core/dropdown/dropdown_hooks";
 import { _t } from "@web/core/l10n/translation";
@@ -112,7 +112,6 @@ export class Message extends Component {
             });
         }
         useForwardRefsToParent("messageRefs", (props) => props.message.id, this.root);
-        this.hasTouch = hasTouch;
         this.messageBody = useRef("body");
         this.messageActions = useMessageActions({
             message: () => this.message,
diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index a7e351f7dd2a1..0115cb4624f1d 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="mail.Message">
-        <ActionSwiper onRightSwipe="hasTouch() and props.thread?.eq(store.inbox) ? { action: () => this.message.setDone(), bgColor: 'bg-success', icon: 'fa-check-circle' } : undefined">
+        <ActionSwiper onRightSwipe="props.thread?.eq(store.inbox) ? { action: () => this.message.setDone(), bgColor: 'bg-success', icon: 'fa-check-circle' } : undefined">
             <t t-set="dummy" t-value="computeActions()"/>
             <div class="o-mail-Message position-relative rounded-0 bg-inherit"
                 t-att-data-starred="message.starred"
diff --git a/addons/microsoft_calendar/static/tests/microsoft_calendar.test.js b/addons/microsoft_calendar/static/tests/microsoft_calendar.test.js
index b160c89519ae9..2a3d3bc080caa 100644
--- a/addons/microsoft_calendar/static/tests/microsoft_calendar.test.js
+++ b/addons/microsoft_calendar/static/tests/microsoft_calendar.test.js
@@ -121,5 +121,5 @@ test(`component is destroyed while sync microsoft calendar`, async () => {
 
     deferred.resolve();
     await animationFrame();
-    expect.verifySteps(["search_read"]);
+    await expect.waitForSteps(["search_read"]);
 });
diff --git a/addons/web/static/src/core/action_swiper/action_swiper.js b/addons/web/static/src/core/action_swiper/action_swiper.js
index 138726af4e80c..8a9edc208a0c5 100644
--- a/addons/web/static/src/core/action_swiper/action_swiper.js
+++ b/addons/web/static/src/core/action_swiper/action_swiper.js
@@ -1,18 +1,16 @@
 import { browser } from "@web/core/browser/browser";
 import { localization } from "@web/core/l10n/localization";
 import { clamp } from "@web/core/utils/numbers";
+import { hasTouch } from "@web/core/browser/feature_detection";
 
-import { Component, onMounted, onWillUnmount, useRef, useState } from "@odoo/owl";
-import { Deferred } from "@web/core/utils/concurrency";
+import { Component, onMounted, onWillUnmount, useRef } from "@odoo/owl";
 
-const isScrollSwipable = (scrollables) => {
-    return {
-        left: !scrollables.filter((e) => e.scrollLeft !== 0).length,
-        right: !scrollables.filter(
-            (e) => e.scrollLeft + Math.round(e.getBoundingClientRect().width) !== e.scrollWidth
-        ).length,
-    };
-};
+const isScrollSwipable = (scrollables) => ({
+    left: !scrollables.filter((e) => e.scrollLeft !== 0).length,
+    right: !scrollables.filter(
+        (e) => e.scrollLeft + Math.round(e.getBoundingClientRect().width) !== e.scrollWidth
+    ).length,
+});
 
 /**
  * Action Swiper
@@ -32,6 +30,7 @@ export class ActionSwiper extends Component {
                 action: Function,
                 icon: String,
                 bgColor: String,
+                slot: Object,
             },
             optional: true,
         },
@@ -41,127 +40,118 @@ export class ActionSwiper extends Component {
                 action: Function,
                 icon: String,
                 bgColor: String,
+                slot: Object,
             },
             optional: true,
         },
+        enabledDuration: {
+            type: Number,
+            optional: true
+        },
         slots: Object,
-        animationOnMove: { type: Boolean, optional: true },
         animationType: { type: String, optional: true },
-        swipeDistanceRatio: { type: Number, optional: true },
-        swipeInvalid: { type: Function, optional: true },
     };
-
     static defaultProps = {
         onLeftSwipe: undefined,
         onRightSwipe: undefined,
-        animationOnMove: true,
         animationType: "bounce",
-        swipeDistanceRatio: 2,
     };
+    static swipeDistanceRatio = 2;
+    static swipeEffectiveThreshold = 20;
+    static animationLength = 400;
 
     setup() {
         this.actionTimeoutId = null;
         this.resetTimeoutId = null;
-        this.defaultState = {
-            containerStyle: "",
-            isSwiping: false,
-            width: undefined,
-        };
         this.root = useRef("root");
         this.targetContainer = useRef("targetContainer");
-        this.state = useState({ ...this.defaultState });
+        this.leftPanel = useRef("leftPanel");
+        this.rightPanel = useRef("rightPanel");
+        this.isSwipeEnabled = false;
         this.scrollables = undefined;
         this.startX = undefined;
         this.swipedDistance = 0;
-        this.isScrollValidated = false;
+        this.isSwipeStarted = false;
+        const _onTouchMove = (ev) => this._onTouchMoveSwipe(ev);
+        const _onTouchEnd = (ev) => this._onTouchEndSwipe(ev);
         onMounted(() => {
-            if (this.targetContainer.el) {
-                this.state.width = this.targetContainer.el.getBoundingClientRect().width;
-            }
-            // Forward classes set on component to slot, as we only want to wrap an
-            // existing component without altering the DOM structure any more than
-            // strictly necessary
-            if (this.props.onLeftSwipe || this.props.onRightSwipe) {
-                const classes = new Set(this.root.el.classList);
-                classes.delete("o_actionswiper");
-                for (const className of classes) {
-                    this.targetContainer.el.firstChild.classList.add(className);
-                    this.root.el.classList.remove(className);
-                }
+            if (this.localizedProps) {
+                this.root.el.addEventListener("touchmove", _onTouchMove, { capture: true });
+                this.root.el.addEventListener("touchend", _onTouchEnd, { capture: true });
             }
         });
         onWillUnmount(() => {
             browser.clearTimeout(this.actionTimeoutId);
             browser.clearTimeout(this.resetTimeoutId);
+            browser.clearTimeout(this.enabledTimeoutId);
         });
     }
     get localizedProps() {
-        return {
-            onLeftSwipe:
-                localization.direction === "rtl" ? this.props.onRightSwipe : this.props.onLeftSwipe,
-            onRightSwipe:
-                localization.direction === "rtl" ? this.props.onLeftSwipe : this.props.onRightSwipe,
-        };
+        const onLeftSwipe = localization.direction === "rtl" ? this.props.onRightSwipe : this.props.onLeftSwipe;
+        const onRightSwipe = localization.direction === "rtl" ? this.props.onLeftSwipe : this.props.onRightSwipe;
+        if (!hasTouch() || (!onRightSwipe && !onLeftSwipe)) {
+            return;
+        }
+        return { onLeftSwipe, onRightSwipe };
     }
 
     /**
      * @private
      * @param {TouchEvent} ev
      */
-    _onTouchEndSwipe() {
-        if (this.state.isSwiping) {
-            this.state.isSwiping = false;
-            if (
-                this.localizedProps.onRightSwipe &&
-                this.swipedDistance > this.state.width / this.props.swipeDistanceRatio
-            ) {
-                this.swipedDistance = this.state.width;
+    _onTouchEndSwipe(ev) {
+        this.isSwipeEnabled = false;
+        this.targetContainer.el.classList.add("o_actionswiper_transition_enabled");
+        if (this.isSwipeStarted) {
+            ev.stopPropagation();
+            ev.preventDefault();
+            if (this.localizedProps.onRightSwipe && this.swipedDistance > this.containerWidth / this.constructor.swipeDistanceRatio) {
+                this.swipedDistance = this.containerWidth;
                 this.handleSwipe(this.localizedProps.onRightSwipe.action);
+                return;
             } else if (
                 this.localizedProps.onLeftSwipe &&
-                this.swipedDistance < -this.state.width / this.props.swipeDistanceRatio
+                this.swipedDistance < -this.containerWidth / this.constructor.swipeDistanceRatio
             ) {
-                this.swipedDistance = -this.state.width;
+                this.swipedDistance = -this.containerWidth;
                 this.handleSwipe(this.localizedProps.onLeftSwipe.action);
-            } else {
-                this.state.containerStyle = "";
+                return;
             }
         }
+        this.targetContainer.el.style.transform = "translateX(0)";
+        this.resetTimeoutId = browser.setTimeout(() => this._reset(), this.constructor.animationLength);
     }
     /**
      * @private
      * @param {TouchEvent} ev
      */
     _onTouchMoveSwipe(ev) {
-        if (this.state.isSwiping) {
-            if (this.props.swipeInvalid && this.props.swipeInvalid()) {
-                this.state.isSwiping = false;
-                return;
-            }
+        if (this.isSwipeEnabled) {
+            browser.clearTimeout(this.enabledTimeoutId);
             const { onLeftSwipe, onRightSwipe } = this.localizedProps;
             this.swipedDistance = clamp(
                 ev.touches[0].clientX - this.startX,
-                onLeftSwipe ? -this.state.width : 0,
-                onRightSwipe ? this.state.width : 0
+                onLeftSwipe ? -this.containerWidth : 0,
+                onRightSwipe ? this.containerWidth : 0
             );
-            // Prevent the browser to navigate back/forward when using swipe
-            // gestures while still allowing to scroll vertically.
-            if (Math.abs(this.swipedDistance) > 40) {
+            ev.stopPropagation();
+            if (this.isSwipeStarted) {
+                // Prevent the browser to navigate back/forward when using swipe
+                // gestures while still allowing to scroll vertically.
                 ev.preventDefault();
-            }
-            // If there are scrollable elements under touch pressure,
-            // they must be at their limits to allow swiping.
-            if (
-                !this.isScrollValidated &&
-                this.scrollables &&
-                !isScrollSwipable(this.scrollables)[this.swipedDistance > 0 ? "left" : "right"]
-            ) {
-                return this._reset();
-            }
-            this.isScrollValidated = true;
-
-            if (this.props.animationOnMove) {
-                this.state.containerStyle = `transform: translateX(${this.swipedDistance}px)`;
+                this.applyStyle(this.swipedDistance);
+            } else {
+                // If there are scrollable elements under touch pressure,
+                // they must be at their limits to allow swiping.
+                if (
+                    this.scrollables &&
+                    !isScrollSwipable(this.scrollables)[this.swipedDistance > 0 ? "left" : "right"]
+                ) {
+                    return this._reset();
+                }
+                if (Math.abs(this.swipedDistance) > this.constructor.swipeEffectiveThreshold) {
+                    this.isSwipeStarted = true;
+                }
             }
         }
     }
@@ -170,6 +160,9 @@ export class ActionSwiper extends Component {
      * @param {TouchEvent} ev
      */
     _onTouchStartSwipe(ev) {
+        if (this.isSwipeStarted) {
+            return;
+        }
         this.scrollables = ev
             .composedPath()
             .filter(
@@ -179,47 +172,53 @@ export class ActionSwiper extends Component {
                     e.scrollWidth > e.getBoundingClientRect().width &&
                     ["auto", "scroll"].includes(window.getComputedStyle(e)["overflow-x"])
             );
-        if (!this.state.width) {
-            this.state.width =
+        if (!this.containerWidth) {
+            this.containerWidth =
                 this.targetContainer && this.targetContainer.el.getBoundingClientRect().width;
         }
-        this.state.isSwiping = true;
-        this.isScrollValidated = false;
+        this.isSwipeEnabled = true;
+        this.targetContainer.el.classList.remove("o_actionswiper_transition_enabled");
         this.startX = ev.touches[0].clientX;
+        if (this.props.enabledDuration) {
+            this.enabledTimeoutId = browser.setTimeout(() => this._reset(), this.props.enabledDuration);
+        }
     }
 
     /**
      * @private
      */
     _reset() {
-        Object.assign(this.state, { ...this.defaultState });
         this.scrollables = undefined;
         this.startX = undefined;
         this.swipedDistance = 0;
-        this.isScrollValidated = false;
+        this.isSwipeEnabled = false;
+        this.isSwipeStarted = false;
+        this.applyStyle(0);
+        if (this.targetContainer.el) {
+            this.targetContainer.el.classList.add("o_actionswiper_transition_enabled");
+        }
     }
 
     handleSwipe(action) {
-        if (this.props.animationType === "bounce") {
-            this.state.containerStyle = `transform: translateX(${this.swipedDistance}px)`;
-            this.actionTimeoutId = browser.setTimeout(async () => {
-                await action(Promise.resolve());
+        this.applyStyle(this.swipedDistance);
+        this.actionTimeoutId = browser.setTimeout(async () => {
+            if (this.props.animationType === "bounce") {
+                await action();
                 this._reset();
-            }, 500);
-        } else if (this.props.animationType === "forwards") {
-            this.state.containerStyle = `transform: translateX(${this.swipedDistance}px)`;
-            this.actionTimeoutId = browser.setTimeout(async () => {
-                const prom = new Deferred();
-                await action(prom);
-                this.state.isSwiping = true;
-                this.state.containerStyle = `transform: translateX(${-this.swipedDistance}px)`;
-                this.resetTimeoutId = browser.setTimeout(() => {
-                    prom.resolve();
-                    this._reset();
-                }, 100);
-            }, 100);
-        } else {
-            return action(Promise.resolve());
+            } else if (this.props.animationType === "forwards") {
+                await action();
+                this.targetContainer.el.classList.remove("o_actionswiper_transition_enabled");
+                this.applyStyle(0);
+                browser.requestAnimationFrame(() => this._reset());
+            }
+        }, this.constructor.animationLength);
+    }
+
+    applyStyle(distance) {
+        if (this.targetContainer.el) {
+            this.targetContainer.el.style.transform = distance ? `translateX(${distance}px)` : "";
         }
+        if (this.leftPanel.el) { this.leftPanel.el.style.maxWidth = `${distance}px` };
+        if (this.rightPanel.el) { this.rightPanel.el.style.maxWidth = `${-distance}px` };
     }
 }
diff --git a/addons/web/static/src/core/action_swiper/action_swiper.scss b/addons/web/static/src/core/action_swiper/action_swiper.scss
index b681dc39fe555..69b37e2cb794e 100644
--- a/addons/web/static/src/core/action_swiper/action_swiper.scss
+++ b/addons/web/static/src/core/action_swiper/action_swiper.scss
@@ -2,12 +2,9 @@
     position: relative;
     touch-action: pan-y;
 }
-.o_actionswiper_target_container {
+.o_actionswiper_target_container.o_actionswiper_transition_enabled {
     transition: transform 0.4s;
 }
-.o_actionswiper_swiping {
-    transition: none;
-}
 .o_actionswiper_right_swipe_area {
     /*rtl:ignore*/
     transform: translateX(-100%);
diff --git a/addons/web/static/src/core/action_swiper/action_swiper.xml b/addons/web/static/src/core/action_swiper/action_swiper.xml
index b2281aa7998bb..65081a653ede4 100644
--- a/addons/web/static/src/core/action_swiper/action_swiper.xml
+++ b/addons/web/static/src/core/action_swiper/action_swiper.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
     <t t-name="web.ActionSwiper">
-        <t t-if="props.onRightSwipe || props.onLeftSwipe">
-            <div class="o_actionswiper" t-on-touchend="_onTouchEndSwipe" t-on-touchmove="_onTouchMoveSwipe" t-on-touchstart="_onTouchStartSwipe" t-ref="root">
+        <t t-if="localizedProps">
+            <div class="o_actionswiper" t-on-touchstart="_onTouchStartSwipe" t-ref="root">
                 <div class="o_actionswiper_overflow_container position-relative overflow-hidden">
-                    <div class="o_actionswiper_target_container" t-ref="targetContainer" t-att-style="state.containerStyle" t-att-class="{ o_actionswiper_swiping: state.isSwiping }">
+                    <div class="o_actionswiper_target_container" t-ref="targetContainer">
                         <t t-slot="default"/>
-                        <t t-if="localizedProps.onRightSwipe and (localizedProps.onRightSwipe.icon or localizedProps.onRightSwipe.bgColor)">
-                            <div t-att-style="'max-width: ' + swipedDistance + 'px;'" class="o_actionswiper_right_swipe_area position-absolute overflow-hidden w-100 h-100 d-flex align-items-center justify-content-center rounded-end" t-att-class="localizedProps.onRightSwipe.bgColor">
-                                <span><i class="fa fa-2x" t-att-class="localizedProps.onRightSwipe.icon"/></span>
+                        <t t-if="localizedProps.onRightSwipe">
+                            <div t-ref="leftPanel" class="o_actionswiper_right_swipe_area position-absolute overflow-hidden w-100 h-100">
+                                <t t-if="this.props.animationType === 'forwards'">
+                                    <t t-if="localizedProps.onRightSwipe.slot" t-component="localizedProps.onRightSwipe.slot.component" t-props="localizedProps.onRightSwipe.slot.props" />
+                                </t>
+                                <div t-else="" class="h-100 w-100 d-flex align-items-center justify-content-center rounded-end" t-att-class="localizedProps.onRightSwipe.bgColor">
+                                    <i class="fa fa-2x" t-att-class="localizedProps.onRightSwipe.icon"/>
+                                </div>
                             </div>
                         </t>
-                        <t t-if="localizedProps.onLeftSwipe and (localizedProps.onLeftSwipe.icon or localizedProps.onLeftSwipe.bgColor)">
-                            <div t-att-style="'max-width: ' + -swipedDistance + 'px;'" class="o_actionswiper_left_swipe_area position-absolute overflow-hidden w-100 h-100 d-flex align-items-center justify-content-center rounded-start" t-att-class="localizedProps.onLeftSwipe.bgColor">
-                                <span><i class="fa fa-2x" t-att-class="localizedProps.onLeftSwipe.icon"/></span>
+                        <t t-if="localizedProps.onLeftSwipe">
+                            <div t-ref="rightPanel" class="o_actionswiper_left_swipe_area position-absolute overflow-hidden w-100 h-100">
+                                <t t-if="this.props.animationType === 'forwards'">
+                                    <t t-if="localizedProps.onLeftSwipe.slot" t-component="localizedProps.onLeftSwipe.slot.component" t-props="localizedProps.onLeftSwipe.slot.props" />
+                                </t>
+                                <div t-else="" class="h-100 w-100 d-flex align-items-center justify-content-center rounded-start" t-att-class="localizedProps.onLeftSwipe.bgColor">
+                                    <i class="fa fa-2x" t-att-class="localizedProps.onLeftSwipe.icon"/>
+                                </div>
                             </div>
                         </t>
                     </div>
diff --git a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
index 148694267d88f..e89d3577003cc 100644
--- a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
+++ b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.js
@@ -11,6 +11,7 @@ import { convertRecordToEvent, getColor } from "@web/views/calendar/utils";
 import { useCalendarPopover } from "@web/views/calendar/hooks/calendar_popover_hook";
 import { useFullCalendar } from "@web/views/calendar/hooks/full_calendar_hook";
 import { useSquareSelection } from "@web/views/calendar/hooks/square_selection_hook";
+import { TOUCH_SELECTION_THRESHOLD } from "@web/views/utils";
 
 import { Component, useEffect, useRef } from "@odoo/owl";
 
@@ -54,6 +55,8 @@ export class CalendarCommonRenderer extends Component {
     static headerTemplate = "web.CalendarCommonRendererHeader";
     static props = {
         model: Object,
+        initialDate: Object,
+        isDisabled: { type: Boolean, optional: true },
         isWeekendVisible: { type: Boolean, optional: true },
         createRecord: Function,
         editRecord: Function,
@@ -65,7 +68,7 @@ export class CalendarCommonRenderer extends Component {
     };
 
     setup() {
-        this.fc = useFullCalendar("fullCalendar", this.options);
+        this.fc = useFullCalendar("fullCalendar", this.props.isDisabled ? this.disabledOptions : this.interactiveOptions);
         this.clickTimeoutId = null;
         this.popover = useCalendarPopover(this.constructor.components.Popover);
         this.timeFormat = is24HourFormat() ? "HH:mm" : "hh:mm a";
@@ -92,27 +95,26 @@ export class CalendarCommonRenderer extends Component {
         });
     }
 
-    get options() {
+    get disabledOptions() {
         return {
-            allDaySlot: true,
-            allDayContent: "",
-            dayHeaderFormat: this.env.isSmall
-                ? SHORT_SCALE_TO_HEADER_FORMAT[this.props.model.scale]
-                : SCALE_TO_HEADER_FORMAT[this.props.model.scale],
-            // we must handle clicks differently in multicreate mode:
-            // fc is blocked by safePrevent in onPointerDown (draggable_hook_builder.js)
-            dateClick: this.props.model.hasMultiCreate ? () => {} : this.onDateClick,
-            dayCellClassNames: this.getDayCellClassNames,
-            initialDate: this.props.model.date.toISO(),
-            initialView: SCALE_TO_FC_VIEW[this.props.model.scale],
-            direction: localization.direction,
+            ...this.options,
+            editable: false,
+            selectable: false,
+            eventStartEditable: false,
+            eventDurationEditable: false,
+            droppable: false,
+        }
+    }
+
+     get interactiveOptions() {
+        return {
+            ...this.options,
+            dayMaxEventRows: this.props.model.eventLimit,
             droppable: true,
             editable: this.props.model.canEdit,
             eventClick: this.onEventClick,
             eventDragStart: this.onEventDragStart,
             eventDrop: this.onEventDrop,
-            dayMaxEventRows: this.props.model.eventLimit,
-            moreLinkClick: this.onEventLimitClick,
             eventMouseEnter: this.onEventMouseEnter,
             eventMouseLeave: this.onEventMouseLeave,
             eventClassNames: this.eventClassNames,
@@ -121,12 +123,34 @@ export class CalendarCommonRenderer extends Component {
             eventResizableFromStart: true,
             eventResize: this.onEventResize,
             eventResizeStart: this.onEventResizeStart,
+            longPressDelay: TOUCH_SELECTION_THRESHOLD,
+            moreLinkClick: this.onEventLimitClick,
+            select: this.onSelect,
+            selectAllow: this.isSelectionAllowed,
+            selectMinDistance: 5, // needed to not trigger select when click
+            selectMirror: true,
+            selectable: !this.props.model.hasMultiCreate && this.props.model.canCreate,
+            unselectAuto: false,
+        }
+     }
+
+    get options() {
+        return {
+            allDaySlot: true,
+            allDayContent: "",
+            dayHeaderFormat: this.env.isSmall
+                ? SHORT_SCALE_TO_HEADER_FORMAT[this.props.model.scale]
+                : SCALE_TO_HEADER_FORMAT[this.props.model.scale],
+            dateClick: this.handleDateClick,
+            dayCellClassNames: this.getDayCellClassNames,
             events: (_, successCb) => successCb(this.mapRecordsToEvents()),
+            initialDate: this.props.initialDate.toISO(),
+            initialView: SCALE_TO_FC_VIEW[this.props.model.scale],
+            direction: localization.direction,
             firstDay: this.props.model.firstDayOfWeek,
             headerToolbar: false,
             height: "100%",
             locale: luxon.Settings.defaultLocale,
-            longPressDelay: 500,
             navLinks: false,
             nowIndicator: true,
             nowIndicatorContent: {
@@ -134,16 +158,10 @@ export class CalendarCommonRenderer extends Component {
                     <div class="o_calendar_time_indicator_now"></div>
                 `,
             },
-            select: this.onSelect,
-            selectAllow: this.isSelectionAllowed,
-            selectMinDistance: 5, // needed to not trigger select when click
-            selectMirror: true,
-            selectable: !this.props.model.hasMultiCreate && this.props.model.canCreate,
             showNonCurrentDates: this.props.model.monthOverflow,
             slotLabelFormat: is24HourFormat() ? HOUR_FORMATS[24] : HOUR_FORMATS[12],
             snapDuration: { minutes: 15 },
             timeZone: luxon.Settings.defaultZone.name,
-            unselectAuto: false,
             weekNumberFormat: {
                 week: this.props.model.scale === "month" || this.env.isSmall ? "numeric" : "long",
             },
@@ -185,6 +203,15 @@ export class CalendarCommonRenderer extends Component {
     computeEventSelector(event) {
         return `[data-event-id="${event.id}"]`;
     }
+    handleDateClick(info) {
+        if (!info.jsEvent || info.jsEvent.defaultPrevented) {
+            // The event might be fired after a touch pointerup without any jsEvent
+            return;
+        }
+        if (!this.props.model.hasMultiCreate) {
+            this.onDateClick(info)
+        };
+    }
     highlightEvent(event, className) {
         for (const el of this.fc.el.querySelectorAll(this.computeEventSelector(event))) {
             el.classList.add(className);
@@ -196,7 +223,8 @@ export class CalendarCommonRenderer extends Component {
         }
     }
     mapRecordsToEvents() {
-        return Object.values(this.props.model.records).map((r) => this.convertRecordToEvent(r));
+        const { records } = this.props.model.data;
+        return Object.values(records).map((r) => this.convertRecordToEvent(r))
     }
     convertRecordToEvent(record) {
         return convertRecordToEvent(record);
@@ -224,9 +252,6 @@ export class CalendarCommonRenderer extends Component {
         this.highlightEvent(info.event, "o_cw_custom_highlight");
     }
     onDateClick(info) {
-        if (info.jsEvent.defaultPrevented) {
-            return;
-        }
         this.props.createRecord(this.fcEventToRecord(info));
     }
     getDayCellClassNames(info) {
diff --git a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.xml b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.xml
index c385958ce0f34..b7808bb513aa8 100644
--- a/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.xml
+++ b/addons/web/static/src/views/calendar/calendar_common/calendar_common_renderer.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="web.CalendarCommonRenderer">
-        <div class="o_calendar_widget" t-att-class="{ o_multi_create_mode: this.props.model.hasMultiCreate }" t-ref="fullCalendar" />
+        <div class="o_calendar_widget" t-att-class="{ o_multi_create_mode: this.props.model.hasMultiCreate, 'o_calendar_current': !this.props.isDisabled }" t-ref="fullCalendar" />
     </t>
 
     <t t-name="web.CalendarCommonRenderer.event">
diff --git a/addons/web/static/src/views/calendar/calendar_controller.js b/addons/web/static/src/views/calendar/calendar_controller.js
index 4859127aecf44..8b882c51e9838 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.js
+++ b/addons/web/static/src/views/calendar/calendar_controller.js
@@ -21,6 +21,7 @@ import { MultiSelectionButtons } from "@web/views/view_components/multi_selectio
 import { getLocalYearAndWeek } from "@web/core/l10n/dates";
 
 import { Component, reactive, useState } from "@odoo/owl";
+import { hasTouch } from "@web/core/browser/feature_detection";
 
 const { DateTime } = luxon;
 
@@ -105,6 +106,7 @@ export class CalendarController extends Component {
             domain: this.props.domain,
             fields: this.props.fields,
             date: this.props.state?.date,
+            loadSurroundings: hasTouch()
         };
     }
 
@@ -148,17 +150,17 @@ export class CalendarController extends Component {
     }
 
     get weekHeader() {
-        const { rangeStart, rangeEnd } = this.model;
-        if (rangeStart.year != rangeEnd.year) {
-            return `${rangeStart.toFormat("MMMM")} ${rangeStart.year} - ${rangeEnd.toFormat(
+        const { start, end } = this.model.visibleRange;
+        if (start.year != end.year) {
+            return `${start.toFormat("MMMM")} ${start.year} - ${end.toFormat(
                 "MMMM"
-            )} ${rangeEnd.year}`;
-        } else if (rangeStart.month != rangeEnd.month) {
-            return `${rangeStart.toFormat("MMMM")} - ${rangeEnd.toFormat("MMMM")} ${
-                rangeStart.year
+            )} ${end.year}`;
+        } else if (start.month != end.month) {
+            return `${start.toFormat("MMMM")} - ${end.toFormat("MMMM")} ${
+                start.year
             }`;
         }
-        return `${rangeStart.toFormat("MMMM")} ${rangeStart.year}`;
+        return `${start.toFormat("MMMM")} ${start.year}`;
     }
 
     get currentMonth() {
@@ -166,7 +168,7 @@ export class CalendarController extends Component {
     }
 
     get currentWeek() {
-        return getLocalYearAndWeek(this.model.rangeStart).week;
+        return getLocalYearAndWeek(this.model.visibleRange.start).week;
     }
 
     get rendererProps() {
@@ -407,7 +409,7 @@ export class CalendarController extends Component {
         return this.model.unlinkRecords(ids);
     }
 
-    async setDate(move) {
+    setDate(move) {
         let date = null;
         switch (move) {
             case "next":
@@ -423,7 +425,7 @@ export class CalendarController extends Component {
                 }
                 break;
         }
-        await this.model.load({ date });
+        this.model.load({ date });
     }
 
     get scales() {
diff --git a/addons/web/static/src/views/calendar/calendar_controller.scss b/addons/web/static/src/views/calendar/calendar_controller.scss
index 205bd2709dcc7..c201c4bbc39b6 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.scss
+++ b/addons/web/static/src/views/calendar/calendar_controller.scss
@@ -36,6 +36,17 @@ $o-cw-filter-avatar-size: 20px;
             }
         }
     }
+
+    .o_actionswiper_right_swipe_area, .o_actionswiper_left_swipe_area {
+        max-width: unset !important;
+        .o_calendar_widget {
+            width: 100%;
+        }
+    }
+
+    .o_actionswiper, .o_actionswiper_overflow_container , .o_actionswiper_target_container {
+        height: 100%;
+    }
 }
 
 .o_calendar_sidebar_container {
diff --git a/addons/web/static/src/views/calendar/calendar_model.js b/addons/web/static/src/views/calendar/calendar_model.js
index 28f1ac40b7b72..cb7a8a5c8aa2c 100644
--- a/addons/web/static/src/views/calendar/calendar_model.js
+++ b/addons/web/static/src/views/calendar/calendar_model.js
@@ -75,6 +75,8 @@ export class CalendarModel extends Model {
         }
         browser.localStorage.setItem(this.storageKey, this.meta.scale);
         const data = { ...this.data };
+        // notify with basic data to render a simple calendar before updating them
+        this.notify();
         await this.keepLast.add(this.updateData(data));
         this.data = data;
         this.notify();
@@ -195,6 +197,18 @@ export class CalendarModel extends Model {
     get defaultFilterLabel() {
         return _t("Undefined");
     }
+    get visibleRange() {
+        if (this.meta.loadSurroundings) {
+            return {
+                start: this.rangeStart.plus({[`${this.scale}s`]: 1}),
+                end: this.rangeEnd.minus({[`${this.scale}s`]: 1}),
+            }
+        }
+        return {
+            start: this.rangeStart,
+            end: this.rangeEnd,
+        }
+    }
 
     //--------------------------------------------------------------------------
 
@@ -419,6 +433,12 @@ export class CalendarModel extends Model {
     async updateData(data) {
         data.range = this.computeRange();
         let unusualDaysProm;
+        if (this.meta.loadSurroundings) {
+            data.range = {
+                start: data.range.start.minus({[`${this.scale}s`]: 1}),
+                end: data.range.end.plus({[`${this.scale}s`]: 1}),
+            }
+        }
         if (this.meta.showUnusualDays) {
             unusualDaysProm = this.loadUnusualDays(data).then((unusualDays) => {
                 data.unusualDays = unusualDays;
diff --git a/addons/web/static/src/views/calendar/calendar_renderer.js b/addons/web/static/src/views/calendar/calendar_renderer.js
index 77409348767da..d21063196faaf 100644
--- a/addons/web/static/src/views/calendar/calendar_renderer.js
+++ b/addons/web/static/src/views/calendar/calendar_renderer.js
@@ -1,4 +1,5 @@
 import { ActionSwiper } from "@web/core/action_swiper/action_swiper";
+import { TOUCH_SELECTION_THRESHOLD } from "@web/views/utils";
 import { CalendarCommonRenderer } from "./calendar_common/calendar_common_renderer";
 import { CalendarYearRenderer } from "./calendar_year/calendar_year_renderer";
 
@@ -31,29 +32,40 @@ export class CalendarRenderer extends Component {
         if (this.props.model.scale === "year") {
             return {
                 model: this.props.model,
+                initialDate: this.props.model.date,
                 isWeekendVisible: this.props.isWeekendVisible,
                 createRecord: this.props.createRecord,
                 editRecord: this.props.editRecord,
                 deleteRecord: this.props.deleteRecord,
             };
         }
-        return this.props;
+        return {
+            ...this.props,
+            initialDate: this.props.model.date,
+        };
     }
     get calendarKey() {
         return `${this.props.model.scale}_${this.props.model.date.valueOf()}`;
     }
     get actionSwiperProps() {
         return {
-            onLeftSwipe: this.env.isSmall
-                ? { action: () => this.props.setDate("next") }
-                : undefined,
-            onRightSwipe: this.env.isSmall
-                ? { action: () => this.props.setDate("previous") }
-                : undefined,
-            animationOnMove: false,
+            onLeftSwipe: this.getSwiperProps("next"),
+            onRightSwipe: this.getSwiperProps("previous"),
             animationType: "forwards",
-            swipeDistanceRatio: 6,
-            swipeInvalid: () => Boolean(document.querySelector(".o_event.fc-mirror")),
+            enabledDuration: TOUCH_SELECTION_THRESHOLD
+        };
+    }
+    getSwiperProps(direction) {
+        return {
+            action: () => this.props.setDate(direction),
+            slot: {
+                component: this.concreteRenderer,
+                props: {
+                    ...this.concreteRendererProps,
+                    initialDate: this.props.model.date[direction === "next" ? "plus" : "minus"]({[`${this.props.model.scale}s`]: 1}),
+                    isDisabled: true
+                },
+            },
         };
     }
 }
diff --git a/addons/web/static/src/views/calendar/calendar_renderer.xml b/addons/web/static/src/views/calendar/calendar_renderer.xml
index 4641a8abf0867..b3485c7eb394f 100644
--- a/addons/web/static/src/views/calendar/calendar_renderer.xml
+++ b/addons/web/static/src/views/calendar/calendar_renderer.xml
@@ -3,11 +3,10 @@
 
     <t t-name="web.CalendarRenderer">
         <div class="o_calendar_renderer h-100 flex-grow-1">
-            <ActionSwiper t-props="actionSwiperProps">
+            <ActionSwiper t-props="actionSwiperProps" t-key="calendarKey">
                 <t
                     t-component="concreteRenderer"
                     t-props="concreteRendererProps"
-                    t-key="calendarKey"
                 />
             </ActionSwiper>
         </div>
diff --git a/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js b/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js
index 37571df1f1fbd..2d0d0822cd440 100644
--- a/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js
+++ b/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.js
@@ -5,6 +5,7 @@ import { useCalendarPopover } from "@web/views/calendar/hooks/calendar_popover_h
 import { useFullCalendar } from "@web/views/calendar/hooks/full_calendar_hook";
 import { makeWeekColumn } from "@web/views/calendar/calendar_common/calendar_common_week_column";
 import { CalendarYearPopover } from "@web/views/calendar/calendar_year/calendar_year_popover";
+import { TOUCH_SELECTION_THRESHOLD } from "@web/views/utils";
 
 import { Component, useEffect, useRef } from "@odoo/owl";
 
@@ -15,9 +16,11 @@ export class CalendarYearRenderer extends Component {
     static template = "web.CalendarYearRenderer";
     static props = {
         model: Object,
+        initialDate: Object,
         createRecord: Function,
         editRecord: Function,
         deleteRecord: Function,
+        isDisabled: { type: Boolean, optional: true },
         isWeekendVisible: { type: Boolean, optional: true },
     };
 
@@ -38,43 +41,60 @@ export class CalendarYearRenderer extends Component {
         });
     }
 
-    get options() {
+    get disabledOptions() {
         return {
-            dayHeaderFormat: "EEEEE",
-            dateClick: this.onDateClick,
-            dayCellClassNames: this.getDayCellClassNames,
-            initialDate: this.props.model.date.toISO(),
-            initialView: "dayGridMonth",
-            direction: localization.direction,
+            ...this.options,
+            editable: false,
+            selectable: false,
+            eventStartEditable: false,
+            eventDurationEditable: false,
+            droppable: false,
+        }
+    }
+
+    get interactiveOptions() {
+        return {
+            ...this.options,
+            dateClick: this.handleDateClick,
+            dayMaxEventRows: this.props.model.eventLimit,
             droppable: true,
             editable: this.props.model.canEdit,
-            dayMaxEventRows: this.props.model.eventLimit,
             eventClassNames: this.eventClassNames,
             eventDidMount: this.onEventDidMount,
             eventResizableFromStart: true,
+            longPressDelay: TOUCH_SELECTION_THRESHOLD,
+            select: this.onSelect,
+            selectMinDistance: 5, // needed to not trigger select when click
+            selectMirror: true,
+            selectable: this.props.model.canCreate,
+            unselectAuto: false,
+            windowResize: this.onWindowResize,
+            eventContent: this.onEventContent,
+            weekends: this.props.isWeekendVisible,
+        }
+    }
+
+    get options() {
+        return {
+            dayHeaderFormat: "EEEEE",
+            dayCellClassNames: this.getDayCellClassNames,
+            initialDate: this.props.initialDate.toISO(),
+            initialView: "dayGridMonth",
+            direction: localization.direction,
             events: (_, successCb) => successCb(this.mapRecordsToEvents()),
             firstDay: this.props.model.firstDayOfWeek,
             headerToolbar: { start: false, center: "title", end: false },
             height: "auto",
             locale: luxon.Settings.defaultLocale,
-            longPressDelay: 500,
             navLinks: false,
             nowIndicator: true,
-            select: this.onSelect,
-            selectMinDistance: 5, // needed to not trigger select when click
-            selectMirror: true,
-            selectable: this.props.model.canCreate,
             showNonCurrentDates: false,
             timeZone: luxon.Settings.defaultZone.name,
             titleFormat: { month: "long", year: "numeric" },
-            unselectAuto: false,
+            viewDidMount: this.viewDidMount,
             weekNumberCalculation: (date) => getLocalYearAndWeek(date).week,
             weekNumbers: false,
             weekNumberFormat: { week: "numeric" },
-            windowResize: this.onWindowResize,
-            eventContent: this.onEventContent,
-            viewDidMount: this.viewDidMount,
-            weekends: this.props.isWeekendVisible,
             fixedWeekCount: false,
         };
     }
@@ -93,9 +113,9 @@ export class CalendarYearRenderer extends Component {
             makeWeekColumn({ el, weekText });
         }
     }
-
     mapRecordsToEvents() {
-        return Object.values(this.props.model.records).map((r) => this.convertRecordToEvent(r));
+        const { records } = this.props.model.data;
+        return Object.values(records).map((r) => this.convertRecordToEvent(r))
     }
     convertRecordToEvent(record) {
         return {
@@ -104,11 +124,12 @@ export class CalendarYearRenderer extends Component {
         };
     }
     getDateWithMonth(month) {
-        return this.props.model.date.set({ month: this.months.indexOf(month) + 1 }).toISO();
+        return this.props.initialDate.set({ month: this.months.indexOf(month) + 1 }).toISO();
     }
     getOptionsForMonth(month) {
+        const options = this.props.isDisabled ? this.disabledOptions : this.interactiveOptions;
         return {
-            ...this.options,
+            ...options,
             initialDate: this.getDateWithMonth(month),
         };
     }
@@ -122,6 +143,13 @@ export class CalendarYearRenderer extends Component {
             editRecord: this.props.editRecord,
         };
     }
+    handleDateClick(info) {
+        if (!info.jsEvent || info.jsEvent.defaultPrevented) {
+            // The event might be fired after a touch pointerup without any jsEvent
+            return;
+        }
+        this.onDateClick(info)
+    }
     openPopover(target, date, records) {
         this.popover.open(target, this.getPopoverProps(date, records), "o_cw_popover");
     }
diff --git a/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.xml b/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.xml
index 8610f6bad289c..b1bbe1f539fe3 100644
--- a/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.xml
+++ b/addons/web/static/src/views/calendar/calendar_year/calendar_year_renderer.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
 
     <t t-name="web.CalendarYearRenderer">
-        <div class="o_calendar_widget overflow-y-auto" t-ref="root">
+        <div class="o_calendar_widget overflow-y-auto" t-att-class="{'o_calendar_current': !this.props.isDisabled}" t-ref="root">
             <div class="fc-view-container">
                 <div class="fc fc-dayGridYear-view d-flex flex-wrap justify-content-evenly gap-3 px-2 py-3">
                     <t t-foreach="months" t-as="month" t-key="month">
diff --git a/addons/web/static/src/views/utils.js b/addons/web/static/src/views/utils.js
index 48e9c70aac5fa..d98d7b83e1624 100644
--- a/addons/web/static/src/views/utils.js
+++ b/addons/web/static/src/views/utils.js
@@ -4,6 +4,8 @@ import { unique } from "@web/core/utils/arrays";
 import { exprToBoolean } from "@web/core/utils/strings";
 import { combineModifiers } from "@web/model/relational_model/utils";
 
+export const TOUCH_SELECTION_THRESHOLD = 400;
+
 export const X2M_TYPES = ["one2many", "many2many"];
 const NUMERIC_TYPES = ["integer", "float", "monetary"];
 
diff --git a/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js b/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js
index fbbdedf99ff6a..431046ba09107 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js
+++ b/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js
@@ -2,6 +2,7 @@ import { ActionSwiper } from "@web/core/action_swiper/action_swiper";
 
 import { Component, useState, useRef, useEffect } from "@odoo/owl";
 import { browser } from "@web/core/browser/browser";
+import { Deferred } from "@web/core/utils/concurrency";
 
 export class SettingsPage extends Component {
     static template = "web.SettingsPage";
@@ -47,6 +48,8 @@ export class SettingsPage extends Component {
 
                 const { scrollTop } = this.scrollMap[currentTab] || 0;
                 settingsEl.scrollTop = scrollTop;
+                this.scrollToSelectedTab();
+                this.tabChangeProm?.resolve();
             },
             () => [this.settingsRef.el, this.state.selectedTab]
         );
@@ -70,15 +73,15 @@ export class SettingsPage extends Component {
             this.getCurrentIndex() !== this.props.modules.length - 1
         );
     }
-    async onRightSwipe(prom) {
+    onRightSwipe() {
+        this.tabChangeProm = new Deferred();
         this.state.selectedTab = this.props.modules[this.getCurrentIndex() - 1].key;
-        await prom;
-        this.scrollToSelectedTab();
+        return this.tabChangeProm;
     }
-    async onLeftSwipe(prom) {
+    onLeftSwipe() {
+        this.tabChangeProm = new Deferred();
         this.state.selectedTab = this.props.modules[this.getCurrentIndex() + 1].key;
-        await prom;
-        this.scrollToSelectedTab();
+        return this.tabChangeProm;
     }
 
     scrollToSelectedTab() {
diff --git a/addons/web/static/src/webclient/settings_form_view/settings/settings_page.xml b/addons/web/static/src/webclient/settings_form_view/settings/settings_page.xml
index 15988e5098c76..5314c44d46cbf 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings/settings_page.xml
+++ b/addons/web/static/src/webclient/settings_form_view/settings/settings_page.xml
@@ -15,15 +15,13 @@
                 </div>
             </div>
             <ActionSwiper
-                    onRightSwipe = " hasRightSwipe() ? {
+                    onRightSwipe="hasRightSwipe() ? {
                         action: onRightSwipe.bind(this),
                     } : undefined"
-                    onLeftSwipe = " hasLeftSwipe() ? {
+                    onLeftSwipe="hasLeftSwipe() ? {
                         action: onLeftSwipe.bind(this),
                     } : undefined"
-                    animationOnMove="false"
-                    animationType="'forwards'"
-                    swipeDistanceRatio="6">
+                    animationType="'forwards'">
                 <div class="settings" t-ref="settings">
                     <t t-slot="NoContentHelper" t-if="props.slots['NoContentHelper'].isVisible"/>
                     <t t-slot="default" selectedTab="state.selectedTab"/>
diff --git a/addons/web/static/tests/core/action_swiper.test.js b/addons/web/static/tests/core/action_swiper.test.js
index 625c871227387..2e4a12f62f1f7 100644
--- a/addons/web/static/tests/core/action_swiper.test.js
+++ b/addons/web/static/tests/core/action_swiper.test.js
@@ -2,8 +2,8 @@
 
 import { beforeEach, expect, test } from "@odoo/hoot";
 import { hover, queryFirst } from "@odoo/hoot-dom";
-import { advanceTime, animationFrame, mockTouch } from "@odoo/hoot-mock";
-import { Component, onPatched, xml } from "@odoo/owl";
+import { mockTouch } from "@odoo/hoot-mock";
+import { Component, xml } from "@odoo/owl";
 import {
     contains,
     defineParams,
@@ -13,9 +13,15 @@ import {
     swipeRight,
 } from "@web/../tests/web_test_helpers";
 import { ActionSwiper } from "@web/core/action_swiper/action_swiper";
+import { browser } from "@web/core/browser/browser";
 import { Deferred } from "@web/core/utils/concurrency";
 
-beforeEach(() => mockTouch(true));
+beforeEach(() => {
+    mockTouch(true);
+    patchWithCleanup(ActionSwiper, {
+       animationLength: 0, 
+    })
+});
 
 // Tests marked as will fail on browsers that don't support
 // TouchEvent by default. It might be an option to activate on some browser.
@@ -37,6 +43,28 @@ test("render only its target if no props is given", async () => {
     expect("div.target-component").toHaveCount(1);
 });
 
+test("render only its target on non-touch devices", async () => {
+    mockTouch(false);
+    // mockTouch(false) don't work well with hasTouch() because browser.ontouchstart is null
+    patchWithCleanup(browser, {
+        ontouchstart: undefined
+    })
+    class Parent extends Component {
+        static props = ["*"];
+        static components = { ActionSwiper };
+        static template = xml`
+                <div class="d-flex">
+                    <ActionSwiper onLeftSwipe="{action: () => {}, icon: 'fa-circle', bgColor: 'bg-warning'}">
+                        <div class="target-component"/>
+                    </ActionSwiper>
+                </div>
+            `;
+    }
+    await mountWithCleanup(Parent);
+    expect("div.o_actionswiper").toHaveCount(0);
+    expect("div.target-component").toHaveCount(1);
+});
+
 test("only render the necessary divs", async () => {
     await mountWithCleanup(ActionSwiper, {
         props: {
@@ -141,7 +169,6 @@ test("can perform actions by swiping to the right", async () => {
         },
     });
     await dragHelper.drop();
-    await animationFrame();
     expect(targetContainer.style.transform).not.toInclude("translateX", {
         message: "target does not have a translate value",
     });
@@ -266,11 +293,9 @@ test("invert the direction of swipes when language is rtl", async () => {
     await mountWithCleanup(Parent);
     // Touch ends once the half of the distance has been crossed to the left
     await swipeLeft(".o_actionswiper");
-    await advanceTime(500);
     // In rtl languages, actions are permuted
     expect.verifySteps(["onRightSwipe"]);
     await swipeRight(".o_actionswiper");
-    await advanceTime(500);
     // In rtl languages, actions are permuted
     expect.verifySteps(["onLeftSwipe"]);
 });
@@ -390,7 +415,6 @@ test("swiping when the swiper contains scrollable areas", async () => {
             "the swiper has swiped to the right because the scrollable element couldn't scroll anymore to the left",
     });
     await dragHelper.drop();
-    await advanceTime(500);
     expect.verifySteps(["onRightSwipe"]);
 
     dragHelper = await contains(largeText).drag({
@@ -436,7 +460,6 @@ test("swiping when the swiper contains scrollable areas", async () => {
             "the swiper has swiped to the left because the scrollable element couldn't scroll anymore to the right",
     });
     await dragHelper.drop();
-    await advanceTime(500);
     expect.verifySteps(["onLeftSwipe"]);
 });
 
@@ -538,7 +561,6 @@ test("preventing swipe on scrollable areas when language is rtl", async () => {
             "the swiper has swiped to the right because the scrollable element couldn't scroll anymore to the left",
     });
     await dragHelper.drop();
-    await advanceTime(500);
     // In rtl languages, actions are permuted
     expect.verifySteps(["onLeftSwipe"]);
     // LEFT => RIGHT trigger
@@ -590,63 +612,14 @@ test("preventing swipe on scrollable areas when language is rtl", async () => {
             "the swiper has swiped to the left because the scrollable element couldn't scroll anymore to the right",
     });
     await dragHelper.drop();
-    await advanceTime(500);
 
     // In rtl languages, actions are permuted
     expect.verifySteps(["onRightSwipe"]);
 });
 
-test("swipeInvalid prop prevents swiping", async () => {
-    expect.assertions(2);
-
-    class Parent extends Component {
-        static props = ["*"];
-        static components = { ActionSwiper };
-        static template = xml`
-                <div class="d-flex">
-                    <ActionSwiper onRightSwipe = "{
-                        action: () => this.onRightSwipe(),
-                        icon: 'fa-circle',
-                        bgColor: 'bg-warning',
-                    }" swipeInvalid = "swipeInvalid">
-                        <div class="target-component" style="width: 200px; height: 80px">Test</div>
-                    </ActionSwiper>
-                </div>
-            `;
-        onRightSwipe() {
-            expect.step("onRightSwipe");
-        }
-        swipeInvalid() {
-            expect.step("swipeInvalid");
-            return true;
-        }
-    }
-    await mountWithCleanup(Parent);
-    const targetContainer = queryFirst(".o_actionswiper_target_container");
-    // Touch ends once the half of the distance has been crossed
-    await swipeRight(".o_actionswiper");
-
-    expect(targetContainer.style.transform).not.toInclude("translateX", {
-        message: "target doesn't have translateX after action is performed",
-    });
-    expect.verifySteps(["swipeInvalid"]);
-});
-
-test("action should be done before a new render", async () => {
-    let executingAction = false;
-    const prom = new Deferred();
-
-    patchWithCleanup(ActionSwiper.prototype, {
-        setup() {
-            super.setup();
-            onPatched(() => {
-                if (executingAction) {
-                    expect.step("ActionSwiper patched");
-                }
-            });
-        },
-    });
-
+test("an async action is awaited before being executed", async () => {
+const prom = new Deferred();
+    
     class Parent extends Component {
         static props = [];
         static components = { ActionSwiper };
@@ -663,16 +636,15 @@ test("action should be done before a new render", async () => {
             `;
 
         async onRightSwipe() {
-            await animationFrame();
+            expect.step("action started")
+            await prom;
             expect.step("action done");
-            prom.resolve();
         }
     }
 
     await mountWithCleanup(Parent);
     await swipeRight(".o_actionswiper");
-    executingAction = true;
-    await prom;
-    await animationFrame();
-    expect.verifySteps(["action done", "ActionSwiper patched"]);
+    expect.verifySteps(["action started"]);
+    prom.resolve();
+    await expect.waitForSteps(["action done"]);
 });
diff --git a/addons/web/static/tests/views/calendar/calendar_common_renderer.test.js b/addons/web/static/tests/views/calendar/calendar_common_renderer.test.js
index 9f9345490a184..3421140fb32ea 100644
--- a/addons/web/static/tests/views/calendar/calendar_common_renderer.test.js
+++ b/addons/web/static/tests/views/calendar/calendar_common_renderer.test.js
@@ -15,6 +15,7 @@ import { CallbackRecorder } from "@web/search/action_hook";
 
 const FAKE_PROPS = {
     model: FAKE_MODEL,
+    initialDate: FAKE_MODEL.date,
     createRecord() {},
     deleteRecord() {},
     editRecord() {},
diff --git a/addons/web/static/tests/views/calendar/calendar_test_helpers.js b/addons/web/static/tests/views/calendar/calendar_test_helpers.js
index a94bff13a66be..c134e7266264d 100644
--- a/addons/web/static/tests/views/calendar/calendar_test_helpers.js
+++ b/addons/web/static/tests/views/calendar/calendar_test_helpers.js
@@ -3,9 +3,11 @@ import { advanceFrame, advanceTime, animationFrame } from "@odoo/hoot-mock";
 import { EventBus } from "@odoo/owl";
 import { contains, getMockEnv, swipeLeft, swipeRight } from "@web/../tests/web_test_helpers";
 
+import { hasTouch } from "@web/core/browser/feature_detection";
 import { createElement } from "@web/core/utils/xml";
 import { CalendarModel } from "@web/views/calendar/calendar_model";
 import { Field } from "@web/views/fields/field";
+import { TOUCH_SELECTION_THRESHOLD } from "@web/views/utils";
 
 export const DEFAULT_DATE = luxon.DateTime.local(2021, 7, 16, 8, 0, 0, 0);
 
@@ -165,6 +167,12 @@ export const FAKE_MODEL = {
     canCreate: true,
     canDelete: true,
     canEdit: true,
+    data: {
+        filterSections: {},
+        range: null,
+        records: FAKE_RECORDS,
+        unusualDays: [],
+    },
     date: DEFAULT_DATE,
     fieldMapping: {
         date_start: "start_date",
@@ -200,6 +208,10 @@ export const FAKE_MODEL = {
     },
     rangeEnd: DEFAULT_DATE.endOf("month"),
     rangeStart: DEFAULT_DATE.startOf("month"),
+    visibleRange: {
+        start: DEFAULT_DATE.startOf("month"),
+        end: DEFAULT_DATE.endOf("month"),
+    },
     records: FAKE_RECORDS,
     resModel: "event",
     scale: "month",
@@ -224,6 +236,13 @@ function instantScrollTo(element) {
     element.scrollIntoView({ behavior: "instant", block: "center" });
 }
 
+async function waitForSelection() {
+    if (hasTouch()) {
+        await advanceTime(TOUCH_SELECTION_THRESHOLD);
+    }
+    await animationFrame();
+};
+
 /**
  * @param {string} date
  * @returns {HTMLElement}
@@ -376,12 +395,13 @@ export async function selectTimeRange(startDateTime, endDateTime) {
     const optionStart = {
         relative: true,
         position: { y: 1, x: startColumnRect.left },
+        pointerDownDuration: TOUCH_SELECTION_THRESHOLD,
     };
 
     await hover(startRow, optionStart);
     await animationFrame();
     const { drop } = await drag(startRow, optionStart);
-    await animationFrame();
+    await waitForSelection();
     await drop(endRow, {
         position: { y: -1, x: endColumnRect.left },
         relative: true,
@@ -404,8 +424,8 @@ export async function selectDateRange(startDate, endDate) {
     await hover(startCell);
     await animationFrame();
 
-    const { moveTo, drop } = await drag(startCell);
-    await animationFrame();
+    const { moveTo, drop } = await drag(startCell, {pointerDownDuration: TOUCH_SELECTION_THRESHOLD});
+    await waitForSelection();
 
     await moveTo(endCell);
     await animationFrame();
@@ -428,8 +448,8 @@ export async function selectAllDayRange(startDate, endDate) {
     await hover(start);
     await animationFrame();
 
-    const { drop } = await drag(start);
-    await animationFrame();
+    const { drop } = await drag(start, {pointerDownDuration: TOUCH_SELECTION_THRESHOLD});
+    await waitForSelection();
 
     await drop(end);
     await animationFrame();
@@ -456,8 +476,8 @@ export async function moveEventToDate(eventId, date, options) {
     await hover(eventEl);
     await animationFrame();
 
-    const { drop, moveTo } = await drag(eventEl);
-    await animationFrame();
+    const { drop, moveTo } = await drag(eventEl, {pointerDownDuration: TOUCH_SELECTION_THRESHOLD});
+    await waitForSelection();
 
     await moveTo(cell);
     await animationFrame();
@@ -490,13 +510,9 @@ export async function moveEventToTime(eventId, dateTime) {
     const { drop, moveTo } = await drag(eventEl, {
         position: { y: 1 },
         relative: true,
+        pointerDownDuration: TOUCH_SELECTION_THRESHOLD
     });
-
-    if (getMockEnv().isSmall) {
-        await advanceTime(500);
-    }
-
-    await animationFrame();
+    await waitForSelection();
 
     await moveTo(row, {
         position: {
@@ -534,13 +550,9 @@ export async function moveEventToAllDaySlot(eventId, date) {
     const { drop, moveTo } = await drag(eventEl, {
         position: { y: 1 },
         relative: true,
+        pointerDownDuration: TOUCH_SELECTION_THRESHOLD
     });
-
-    if (getMockEnv().isSmall) {
-        await advanceTime(500);
-    }
-
-    await animationFrame();
+    await waitForSelection();
 
     await moveTo(slot, {
         position: {
@@ -659,11 +671,11 @@ export async function hideCalendarPanel() {
  * @returns {Promise<void>}
  */
 export async function navigate(direction) {
-    if (getMockEnv().isSmall) {
+    if (hasTouch()) {
         if (direction === "next") {
-            await swipeLeft(".o_calendar_widget");
+            await swipeLeft(".o_calendar_widget", {pointerDownDuration: 200});
         } else {
-            await swipeRight(".o_calendar_widget");
+            await swipeRight(".o_calendar_widget", {pointerDownDuration: 200});
         }
         await advanceFrame(16);
     } else {
diff --git a/addons/web/static/tests/views/calendar/calendar_view.test.js b/addons/web/static/tests/views/calendar/calendar_view.test.js
index f2dcb576d7f42..1c9c9403f67e0 100644
--- a/addons/web/static/tests/views/calendar/calendar_view.test.js
+++ b/addons/web/static/tests/views/calendar/calendar_view.test.js
@@ -4,9 +4,6 @@ import {
     advanceTime,
     animationFrame,
     click,
-    hover,
-    pointerDown,
-    pointerUp,
     press,
     queryAllRects,
     queryAllTexts,
@@ -15,7 +12,7 @@ import {
     queryRect,
     runAllTimers,
 } from "@odoo/hoot-dom";
-import { mockDate, mockTimeZone } from "@odoo/hoot-mock";
+import { mockDate, mockTimeZone, mockTouch } from "@odoo/hoot-mock";
 import { Component, onRendered, onWillStart, xml } from "@odoo/owl";
 import {
     MockServer,
@@ -62,10 +59,12 @@ import {
     toggleSectionFilter,
 } from "./calendar_test_helpers";
 
+import { hasTouch } from "@web/core/browser/feature_detection";
 import { registry } from "@web/core/registry";
 import { zip } from "@web/core/utils/arrays";
 import { CalendarCommonRenderer } from "@web/views/calendar/calendar_common/calendar_common_renderer";
 import { CalendarController } from "@web/views/calendar/calendar_controller";
+import { CalendarModel } from "@web/views/calendar/calendar_model";
 import { CalendarRenderer } from "@web/views/calendar/calendar_renderer";
 import { calendarView } from "@web/views/calendar/calendar_view";
 import { CalendarYearRenderer } from "@web/views/calendar/calendar_year/calendar_year_renderer";
@@ -261,78 +260,31 @@ defineModels([Event, EventType, CalendarUsers, CalendarPartner, FilterPartner]);
 preloadBundle("web.fullcalendar_lib");
 beforeEach(() => {
     mockDate("2016-12-12T08:00:00", 1);
-    const patchFullCalendarOptions = () => ({
-        get options() {
-            return Object.assign({}, super.options, {
-                longPressDelay: 0,
-                selectLongPressDelay: 0,
-            });
-        },
+    patchWithCleanup(CalendarController.prototype, {
+        get modelParams() {
+            const params = super.modelParams;
+            // avoid to change the range on the model between 'desktop' and 'mobile' tests
+            params.loadSurroundings = false;
+            return params;
+        }
     });
-    patchWithCleanup(CalendarYearRenderer.prototype, patchFullCalendarOptions());
-    patchWithCleanup(CalendarCommonRenderer.prototype, patchFullCalendarOptions());
 });
 
-onRpc("has_group", () => true);
-
-/**
- * @param {import("@odoo/hoot-dom").Target} from
- * @param {import("@odoo/hoot-dom").Target} to
- * @param {{
- *  start: "top" | "center" | "bottom";
- *  end: "top" | "center" | "bottom";
- * }} [positions] specify where the touches will occur in the start and end elements
- *  (default: `"center"` for both)
- * @returns {Promise<void>}
- */
-async function selectRange(from, to, positions) {
-    const startTarget = queryFirst(from);
-
-    const startRect = queryRect(startTarget);
-    const startPosition = {
-        x: startRect.width / 2,
-        y: 0,
-    };
-    if (positions?.start === "top") {
-        startPosition.y += 1;
-    } else if (positions?.start === "bottom") {
-        startPosition.y += startRect.height - 1;
-    } else {
-        startPosition.y += startRect.height / 2;
-    }
-
-    const endRect = queryRect(to);
-    const endPosition = {
-        x: endRect.width / 2,
-        y: 0,
-    };
-    if (positions?.end === "top") {
-        endPosition.y += 1;
-    } else if (positions?.end === "bottom") {
-        endPosition.y += endRect.height - 1;
-    } else {
-        endPosition.y += endRect.height / 2;
-    }
-
-    await pointerDown(startTarget, {
-        position: startPosition,
-        relative: true,
-    });
-    await animationFrame();
-
-    await hover(to, {
-        position: endPosition,
-        relative: true,
-    });
-    await animationFrame();
-
-    await pointerUp(to, {
-        position: endPosition,
-        relative: true,
+function enableLoadSurroundingsInTest() {
+    patchWithCleanup(CalendarController.prototype, {
+        get modelParams() {
+            const params = super.modelParams;
+            if (hasTouch()) {
+                // this parameter must be set to true for the test
+                params.loadSurroundings = true;
+            }
+            return params;
+        }
     });
-    await animationFrame();
 }
 
+onRpc("has_group", () => true);
+
 function expectEventToBeOver(eventSelector, ranges) {
     const eventRects = queryAllRects(eventSelector);
     expect(eventRects.length).toBe(ranges.length);
@@ -499,7 +451,8 @@ test(`simple calendar rendering on mobile`, async () => {
     });
 
     // test events in different scale
-    expect(`.o_calendar_renderer .fc-view`).toHaveCount(1);
+    expect(`.o_calendar_renderer .fc-view`).toHaveCount(3);
+    expect(`.o_calendar_renderer .o_calendar_current`).toHaveCount(1);
     expect(`.o_event`).toHaveCount(0, {
         message: "By default, only the events of the current user are displayed (0 in this case)",
     });
@@ -1226,7 +1179,7 @@ test(`create and change events on mobile`, async () => {
         type: "calendar",
         arch: `<calendar event_open_popup="1" date_start="start" date_stop="stop" all_day="is_all_day" mode="month"/>`,
     });
-    expect(`.fc-dayGridMonth-view`).toHaveCount(1);
+    expect(`.fc-dayGridMonth-view`).toHaveCount(3);
 
     // click on an existing event to open the formViewDialog
     await clickEvent(4);
@@ -1463,8 +1416,8 @@ test(`create multi day event in week mode`, async () => {
     mockTimeZone(2);
 
     patchWithCleanup(CalendarCommonRenderer.prototype, {
-        get options() {
-            return { ...super.options, selectAllow: () => true };
+        get interactiveOptions() {
+            return { ...super.interactiveOptions, selectAllow: () => true };
         },
     });
     await mountView({
@@ -1816,8 +1769,8 @@ test(`fetch event when being in timezone`, async () => {
         `,
     });
     expect.verifySteps(["event.search_read"]);
-    expect(`.fc-col-header-cell .o_cw_day_number:eq(0)`).toHaveText("11");
-    expect(`.fc-col-header-cell .o_cw_day_number:eq(-1)`).toHaveText("17");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number:eq(0)`).toHaveText("11");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number:eq(-1)`).toHaveText("17");
 });
 
 test(`check calendar week column time format`, async () => {
@@ -3651,7 +3604,7 @@ test(`set event as all day when field is datetime (without all_day mapping)`, as
         type: "calendar",
         arch: `<calendar date_start="start" date_stop="stop" mode="week"/>`,
     });
-    expect(`.fc-daygrid-body .fc-event`).toHaveCount(1, {
+    expect(`.o_calendar_current .fc-daygrid-body .fc-event`).toHaveCount(1, {
         message: "should be one event in the all day row",
     });
 });
@@ -3750,14 +3703,6 @@ test(`timezone does not affect drag and drop on desktop`, async () => {
 test.tags("mobile");
 test(`timezone does not affect drag and drop on mobile`, async () => {
     mockTimeZone(-40);
-    patchWithCleanup(CalendarRenderer.prototype, {
-        get actionSwiperProps() {
-            const props = super.actionSwiperProps;
-            props.onLeftSwipe = undefined;
-            props.onRightSwipe = undefined;
-            return props;
-        },
-    });
     onRpc("write", ({ args }) => {
         expect.step("write");
         expect(args[0]).toEqual([6]);
@@ -3844,14 +3789,6 @@ test.tags("mobile");
 test(`timezone does not affect calendar with date field on mobile`, async () => {
     Event._fields.start_date = fields.Date();
     mockTimeZone(2);
-    patchWithCleanup(CalendarRenderer.prototype, {
-        get actionSwiperProps() {
-            const props = super.actionSwiperProps;
-            props.onLeftSwipe = undefined;
-            props.onRightSwipe = undefined;
-            return props;
-        },
-    });
     onRpc("create", ({ args }) => {
         expect.step(`create ${args[0][0].start_date}`);
     });
@@ -3907,7 +3844,7 @@ test(`drag and drop on month mode`, async () => {
     await contains(`.modal-body .o_field_widget[name=name] input`).edit("An event");
     await contains(`.modal .o_form_button_save`).click();
     await moveEventToDate(1, "2016-12-19", { disableDrop: true });
-    expect(`.o_event[data-event-id="1"]`).toHaveClass("dayGridMonth");
+    expect(`.o_event[data-event-id="1"].fc-event-dragging`).toHaveClass("dayGridMonth");
 
     await moveEventToDate(8, "2016-12-19");
     await clickEvent(8);
@@ -4050,7 +3987,7 @@ test(`fullcalendar initializes with right locale`, async () => {
         type: "calendar",
         arch: `<calendar date_start="start" date_stop="stop" mode="week"/>`,
     });
-    expect(queryAllTexts`.fc-col-header-cell`).toEqual([
+    expect(queryAllTexts`.o_calendar_current .fc-col-header-cell`).toEqual([
         "DIM.\n11",
         "LUN.\n12",
         "MAR.\n13",
@@ -4079,8 +4016,8 @@ test(`initial_date given in the context`, async () => {
     await mountWithCleanup(WebClient);
     await getService("action").doAction(1);
     expect(`.o_breadcrumb`).toHaveText("context initial date");
-    expect(`.o_calendar_renderer .fc-col-header-cell .o_cw_day_name`).toHaveText("Saturday");
-    expect(`.o_calendar_renderer .fc-col-header-cell .o_cw_day_number`).toHaveText("30");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name`).toHaveText("Saturday");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number`).toHaveText("30");
 });
 
 test.tags("desktop");
@@ -4128,13 +4065,13 @@ test(`default week start (US) month mode on mobile`, async () => {
         arch: `<calendar date_start="start" date_stop="stop" mode="month"/>`,
     });
     expect.verifySteps(["event.search_read"]);
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("SUN");
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("SAT");
-    expect(`.o-fc-week:eq(0)`).toHaveText("36");
-    expect(`.fc-daygrid-day:eq(0) .fc-daygrid-day-number`).toHaveText("1");
-    expect(`.fc-daygrid-day:eq(0)`).toHaveAttribute("data-date", "2019-09-01");
-    expect(`.fc-daygrid-day:eq(-1) .fc-daygrid-day-number`).toHaveText("5");
-    expect(`.fc-daygrid-day:eq(-1)`).toHaveAttribute("data-date", "2019-10-05");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("SUN");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("SAT");
+    expect(`.o_calendar_current .o-fc-week:eq(0)`).toHaveText("36");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(0) .fc-daygrid-day-number`).toHaveText("1");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(0)`).toHaveAttribute("data-date", "2019-09-01");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(-1) .fc-daygrid-day-number`).toHaveText("5");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(-1)`).toHaveAttribute("data-date", "2019-10-05");
 });
 
 test.tags("desktop");
@@ -4184,13 +4121,13 @@ test(`European week start month mode on mobile`, async () => {
         arch: `<calendar date_start="start" date_stop="stop" mode="month"/>`,
     });
     expect.verifySteps(["event.search_read"]);
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("MON");
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("SUN");
-    expect(`.o-fc-week:eq(0)`).toHaveText("35");
-    expect(`.fc-daygrid-day:eq(0) .fc-daygrid-day-number`).toHaveText("26");
-    expect(`.fc-daygrid-day:eq(0)`).toHaveAttribute("data-date", "2019-08-26");
-    expect(`.fc-daygrid-day:eq(-1) .fc-daygrid-day-number`).toHaveText("6");
-    expect(`.fc-daygrid-day:eq(-1)`).toHaveAttribute("data-date", "2019-10-06");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("MON");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("SUN");
+    expect(`.o_calendar_current .o-fc-week:eq(0)`).toHaveText("35");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(0) .fc-daygrid-day-number`).toHaveText("26");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(0)`).toHaveAttribute("data-date", "2019-08-26");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(-1) .fc-daygrid-day-number`).toHaveText("6");
+    expect(`.o_calendar_current .fc-daygrid-day:eq(-1)`).toHaveAttribute("data-date", "2019-10-06");
 });
 
 test.tags("desktop");
@@ -4222,6 +4159,7 @@ test(`Monday week start week mode on desktop`, async () => {
 
 test.tags("mobile");
 test(`Monday week start week mode on mobile`, async () => {
+    enableLoadSurroundingsInTest();
     mockDate("2019-09-15 08:00:00");
     // the week start depends on the locale
     defineParams({ lang_parameters: { week_start: 1 } });
@@ -4229,8 +4167,8 @@ test(`Monday week start week mode on mobile`, async () => {
     onRpc("event", "search_read", ({ kwargs }) => {
         expect.step("event.search_read");
         expect(kwargs.domain).toEqual([
-            ["start", "<=", "2019-09-15 22:59:59"],
-            ["stop", ">=", "2019-09-08 23:00:00"],
+            ["start", "<=", "2019-09-22 22:59:59"],
+            ["stop", ">=", "2019-09-01 23:00:00"],
         ]);
     });
     await mountView({
@@ -4239,12 +4177,12 @@ test(`Monday week start week mode on mobile`, async () => {
         arch: `<calendar date_start="start" date_stop="stop" mode="week"/>`,
     });
     expect.verifySteps(["event.search_read"]);
-    expect(`.fc-timeGridWeek-view .fc-daygrid-body`).toHaveCount(1);
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("MON");
-    expect(`.fc-col-header-cell .o_cw_day_number:eq(0)`).toHaveText("9");
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("SUN");
-    expect(`.fc-col-header-cell .o_cw_day_number:eq(-1)`).toHaveText("15");
-    expect(`.fc-timegrid-axis-cushion:eq(0)`).toHaveText("37");
+    expect(`.o_calendar_current .fc-timeGridWeek-view .fc-daygrid-body`).toHaveCount(1);
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("MON");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number:eq(0)`).toHaveText("9");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("SUN");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number:eq(-1)`).toHaveText("15");
+    expect(`.o_calendar_current .fc-timegrid-axis-cushion:eq(0)`).toHaveText("37");
     expect(`.o_calendar_header .badge`).toHaveText("Week 37");
 });
 
@@ -4294,12 +4232,12 @@ test(`Saturday week start week mode on mobile`, async () => {
         arch: `<calendar date_start="start" date_stop="stop" mode="week"/>`,
     });
     expect.verifySteps(["event.search_read"]);
-    expect(`.fc-timeGridWeek-view .fc-daygrid-body`).toHaveCount(1);
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("SAT");
-    expect(`.fc-col-header-cell .o_cw_day_number:eq(0)`).toHaveText("7");
-    expect(`.fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("FRI");
-    expect(`.fc-col-header-cell .o_cw_day_number:eq(-1)`).toHaveText("13");
-    expect(`.fc-timegrid-axis-cushion:eq(0)`).toHaveText("37");
+    expect(`.o_calendar_current .fc-timeGridWeek-view .fc-daygrid-body`).toHaveCount(1);
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(0)`).toHaveText("SAT");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number:eq(0)`).toHaveText("7");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_name:eq(-1)`).toHaveText("FRI");
+    expect(`.o_calendar_current .fc-col-header-cell .o_cw_day_number:eq(-1)`).toHaveText("13");
+    expect(`.o_calendar_current .fc-timegrid-axis-cushion:eq(0)`).toHaveText("37");
     expect(`.o_calendar_header .badge`).toHaveText("Week 37");
 });
 
@@ -4459,7 +4397,7 @@ test(`attempt to create multiples events and the same day and check the ordering
         type: "calendar",
         arch: `<calendar date_start="start" date_stop="stop" all_day="is_all_day" mode="month"/>`,
     });
-    expect(`.o_calendar_renderer .fc-view`).toHaveCount(1);
+    expect(`.o_calendar_current .fc-view`).toHaveCount(1);
     expect(queryAllTexts`.o_event_title`).toEqual(["First event", "Second event", "Third event"]);
 });
 
@@ -4623,6 +4561,14 @@ test(`correctly display year view`, async () => {
 });
 
 test(`toggle filters in year view`, async () => {
+    patchWithCleanup(CalendarRenderer.prototype, {
+        get actionSwiperProps() {
+            const props = super.actionSwiperProps;
+            props.onLeftSwipe = undefined;
+            props.onRightSwipe = undefined;
+            return props;
+        },
+    });
     await mountView({
         resModel: "event",
         type: "calendar",
@@ -4771,7 +4717,7 @@ test(`select events and discard create`, async () => {
         type: "calendar",
         arch: `<calendar event_open_popup="1" date_start="start" date_stop="stop" all_day="is_all_day" mode="year"/>`,
     });
-    expect(`.fc-dayGridMonth-view`).toHaveCount(12);
+    expect(`.o_calendar_current .fc-dayGridMonth-view`).toHaveCount(12);
 
     await selectDateRange("2016-11-13", "2016-11-19");
     expect(`.o-calendar-quick-create`).toHaveCount(1);
@@ -4972,7 +4918,7 @@ test(`calendar with option month_overflow set to false`, async () => {
         `,
     });
     expect(".o_event").toHaveCount(1);
-    expect(".fc-day-disabled").toHaveCount(4);
+    expect(".o_calendar_current .fc-day-disabled").toHaveCount(4);
     expect.verifySteps(["search_read"]);
 });
 
@@ -5427,14 +5373,6 @@ test(`check if active fields are fetched in addition to field names in record da
 });
 
 test("update time while drag and drop on month mode", async () => {
-    patchWithCleanup(CalendarRenderer.prototype, {
-        get actionSwiperProps() {
-            const props = super.actionSwiperProps;
-            props.onLeftSwipe = undefined;
-            props.onRightSwipe = undefined;
-            return props;
-        },
-    });
     await mountView({
         resModel: "event",
         type: "calendar",
@@ -5650,12 +5588,7 @@ test('calendar: select range on "Free Zone" opens quick create', async () => {
         arch: `<calendar mode="day" date_start="start" date_stop="stop"/>`,
     });
     expandCalendarView();
-
-    await selectRange(
-        ".fc-timegrid-slot-lane[data-time='08:00:00']",
-        ".fc-timegrid-slot-lane[data-time='08:30:00']",
-        { start: "top", end: "bottom" }
-    );
+    await selectTimeRange("2016-12-12 08:00:00", "2016-12-12 09:00:00");
 
     // should open a Quick create modal view in mobile on short tap
     expect(".modal").toHaveCount(1);
@@ -5684,10 +5617,7 @@ test("calendar (year): select date range opens quick create", async () => {
     expandCalendarView();
 
     // Tap on a date
-    await selectRange(
-        ".fc-daygrid-day[data-date='2016-02-02']",
-        ".fc-daygrid-day[data-date='2016-02-05']"
-    );
+    await selectDateRange("2016-02-02", "2016-02-05");
 
     // should open a Quick create modal view in mobile on short tap
     expect(".modal").toHaveCount(1);
@@ -5704,29 +5634,29 @@ test("calendar (year): tap on date switch to day scale", async () => {
     expandCalendarView();
 
     // Should display year view
-    expect(".fc-dayGridYear-view").toHaveCount(1);
-    expect(".fc-month-container").toHaveCount(12);
+    expect(".o_calendar_current .fc-dayGridYear-view").toHaveCount(1);
+    expect(".o_calendar_current .fc-month-container").toHaveCount(12);
 
     // Tap on a date
-    await click(".fc-daygrid-day[data-date='2016-02-05']");
+    await click(".o_calendar_current .fc-daygrid-day[data-date='2016-02-05']");
     await animationFrame(); // switch renderer
     await animationFrame(); // await breadcrumb update
     expect(".o_calendar_container .o_calendar_header h5").toHaveText("5 February 2016");
 
     // Should display day view
-    expect(".fc-dayGridYear-view").toHaveCount(0);
-    expect(".fc-timeGridDay-view").toHaveCount(1);
-    expect(queryFirst(".fc-col-header-cell[data-date]").dataset.date).toBe("2016-02-05");
+    expect(".o_calendar_current .fc-dayGridYear-view").toHaveCount(0);
+    expect(".o_calendar_current .fc-timeGridDay-view").toHaveCount(1);
+    expect(queryFirst(".o_calendar_current .fc-col-header-cell[data-date]").dataset.date).toBe("2016-02-05");
 
     // Change scale to month
     await changeScale("month");
     expect(".o_calendar_container .o_calendar_header h5").toHaveCount(1);
     expect(".o_calendar_container .o_calendar_header h5").toHaveText("February 2016");
-    expect(".fc-timeGridDay-view").toHaveCount(0);
-    expect(".fc-dayGridMonth-view").toHaveCount(1);
+    expect(".o_calendar_current .fc-timeGridDay-view").toHaveCount(0);
+    expect(".o_calendar_current .fc-dayGridMonth-view").toHaveCount(1);
 
     // Tap on a date
-    await click(".fc-daygrid-day[data-date='2016-02-10']");
+    await click(".o_calendar_current .fc-daygrid-day[data-date='2016-02-10']");
     await animationFrame(); // await reload & render
     await animationFrame(); // await breadcrumb update
     expect(".o_calendar_container .o_calendar_header h5").toHaveText("February 2016");
@@ -5815,14 +5745,20 @@ test(`calendar view with show_unusual_days`, async () => {
     ]);
 });
 
-test.tags("desktop");
-test(`calendar renderer is rendered once after search refresh`, async () => {
+test(`calendar renderer is rendered again after search refresh`, async () => {
     patchWithCleanup(CalendarRenderer.prototype, {
         setup() {
             super.setup();
             onRendered(() => expect.step("rendered"));
         },
     });
+    patchWithCleanup(CalendarModel.prototype, {
+        async load(params) {
+            expect.step("before load");
+            await super.load(params);
+            expect.step("after load");
+        },
+    });
     await mountView({
         resModel: "event",
         type: "calendar",
@@ -5832,9 +5768,13 @@ test(`calendar renderer is rendered once after search refresh`, async () => {
             </calendar>
         `,
     });
-    expect.verifySteps(["rendered"]);
+    expect.verifySteps(["before load", "after load", "rendered"], {
+        message: "model trigger two notify before the initial render"
+    });
     await validateSearch();
-    expect.verifySteps(["rendered"]);
+    expect.verifySteps(["before load", "rendered", "after load", "rendered"], {
+        message: "model trigger two rerender, one the load"
+    });
 });
 
 test.tags("desktop");
@@ -5902,3 +5842,24 @@ test(`Hour format mirror event`, async () => {
     expect(`.o_event[data-event-id="8"] .fc-event-main .o_event_title`).toHaveText("mirror_event");
     expect(`.o_event[data-event-id="8"] .fc-event-main .fc-time`).toHaveText("11:00");
 });
+
+test(`three calendars are rendered in the ActionSwiper on touch devices`, async () => {
+    mockTouch(true);
+    enableLoadSurroundingsInTest();
+    // if not given any option, default week start is on Sunday
+    mockTimeZone(-7);
+    onRpc("event", "search_read", ({ kwargs }) => {
+        expect.step("event.search_read");
+    });
+    await mountView({
+        resModel: "event",
+        type: "calendar",
+        arch: `<calendar date_start="start" date_stop="stop" mode="week"/>`,
+    });
+    expect.verifySteps(["event.search_read"]);
+    expect(".o_calendar_widget").toHaveCount(3);
+    expect(".o_actionswiper_left_swipe_area .fc-event").toHaveCount(2, {
+        message: "events are displayed on the following month"
+    });
+    expect(".o_actionswiper_left_swipe_area .fc-daygrid-body .fc-event").toHaveText("event 5");
+});
diff --git a/addons/web/static/tests/views/calendar/calendar_year_renderer.test.js b/addons/web/static/tests/views/calendar/calendar_year_renderer.test.js
index dbb962a86b55d..65ba53f3740e9 100644
--- a/addons/web/static/tests/views/calendar/calendar_year_renderer.test.js
+++ b/addons/web/static/tests/views/calendar/calendar_year_renderer.test.js
@@ -13,6 +13,7 @@ import { CalendarYearRenderer } from "@web/views/calendar/calendar_year/calendar
 
 const FAKE_PROPS = {
     model: FAKE_MODEL,
+    initialDate: FAKE_MODEL.date,
     createRecord() {},
     deleteRecord() {},
     editRecord() {},

From a4ee35bad232138258e5b4e25a2f21d9c08635c5 Mon Sep 17 00:00:00 2001
From: luvi <luvi@odoo.com>
Date: Wed, 29 Oct 2025 13:25:04 +0100
Subject: [PATCH 299/673] [REF] web: use the same exported value has touch
 selection toggler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit makes the value being used for enabling touch selection more
consistent, since we now export the same 400ms value from the views utils.
It will avoid the risk of changes in behavior, by using a common value.

closes odoo/odoo#231638

Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 addons/web/static/src/views/kanban/kanban_record.js      | 4 ++--
 addons/web/static/src/views/list/list_renderer.js        | 6 +++---
 addons/web/static/tests/views/kanban/kanban_view.test.js | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/views/kanban/kanban_record.js b/addons/web/static/src/views/kanban/kanban_record.js
index ba2cfa8862a1b..ffa59aea66aae 100644
--- a/addons/web/static/src/views/kanban/kanban_record.js
+++ b/addons/web/static/src/views/kanban/kanban_record.js
@@ -14,7 +14,7 @@ import { fileTypeMagicWordMap } from "@web/views/fields/image/image_field";
 import { ViewButton } from "@web/views/view_button/view_button";
 import { useViewCompiler } from "@web/views/view_compiler";
 import { Widget } from "@web/views/widgets/widget";
-import { getFormattedValue } from "../utils";
+import { TOUCH_SELECTION_THRESHOLD, getFormattedValue } from "../utils";
 import { KANBAN_CARD_ATTRIBUTE, KANBAN_MENU_ATTRIBUTE } from "./kanban_arch_parser";
 import { KanbanCompiler } from "./kanban_compiler";
 import { KanbanCoverImageDialog } from "./kanban_cover_image_dialog";
@@ -182,7 +182,7 @@ export class KanbanRecord extends Component {
     static template = "web.KanbanRecord";
 
     setup() {
-        this.LONG_TOUCH_THRESHOLD = this.props.canResequence ? 600 : 400;
+        this.LONG_TOUCH_THRESHOLD = this.props.canResequence ? 600 : TOUCH_SELECTION_THRESHOLD;
         this.evaluateBooleanExpr = evaluateBooleanExpr;
         this.action = useService("action");
         this.dialog = useService("dialog");
diff --git a/addons/web/static/src/views/list/list_renderer.js b/addons/web/static/src/views/list/list_renderer.js
index 2509a5440faa4..3121b86d15a17 100644
--- a/addons/web/static/src/views/list/list_renderer.js
+++ b/addons/web/static/src/views/list/list_renderer.js
@@ -14,6 +14,7 @@ import { AGGREGATABLE_FIELD_TYPES, combineModifiers } from "@web/model/relationa
 import { Field, getPropertyFieldInfo } from "@web/views/fields/field";
 import { getTooltipInfo } from "@web/views/fields/field_tooltip";
 import {
+    TOUCH_SELECTION_THRESHOLD,
     computeAggregatedValue,
     getClassNameFromDecoration,
     getFormattedValue,
@@ -104,7 +105,6 @@ export class ListRenderer extends Component {
     static recordRowTemplate = "web.ListRenderer.RecordRow";
     static groupRowTemplate = "web.ListRenderer.GroupRow";
     static useMagicColumnWidths = true;
-    static LONG_TOUCH_THRESHOLD = 400;
     static components = {
         DropdownItem,
         Field,
@@ -2204,7 +2204,7 @@ export class ListRenderer extends Component {
             this.longTouchTimer = browser.setTimeout(() => {
                 this.toggleRecordSelection(record);
                 this.resetLongTouchTimer();
-            }, this.constructor.LONG_TOUCH_THRESHOLD);
+            }, TOUCH_SELECTION_THRESHOLD);
         }
     }
 
@@ -2213,7 +2213,7 @@ export class ListRenderer extends Component {
      */
     onRowTouchEnd(_record) {
         const elapsedTime = Date.now() - this.touchStartMs;
-        if (elapsedTime < this.constructor.LONG_TOUCH_THRESHOLD) {
+        if (elapsedTime < TOUCH_SELECTION_THRESHOLD) {
             this.resetLongTouchTimer();
         }
     }
diff --git a/addons/web/static/tests/views/kanban/kanban_view.test.js b/addons/web/static/tests/views/kanban/kanban_view.test.js
index 51796323f7a7a..60aee79d79df4 100644
--- a/addons/web/static/tests/views/kanban/kanban_view.test.js
+++ b/addons/web/static/tests/views/kanban/kanban_view.test.js
@@ -88,6 +88,7 @@ import { KanbanRenderer } from "@web/views/kanban/kanban_renderer";
 import { kanbanView } from "@web/views/kanban/kanban_view";
 import { ViewButton } from "@web/views/view_button/view_button";
 import { AnimatedNumber } from "@web/views/view_components/animated_number";
+import { TOUCH_SELECTION_THRESHOLD } from "@web/views/utils";
 import { WebClient } from "@web/webclient/webclient";
 
 const { IrAttachment } = webModels;
@@ -8400,7 +8401,7 @@ test("selection can be enabled by long touch", async () => {
     });
     expect(".o_selection_box").toHaveCount(0);
     await drag(".o_kanban_record:nth-of-type(2)");
-    await advanceTime(400);
+    await advanceTime(TOUCH_SELECTION_THRESHOLD);
     expect(".o_selection_box").toHaveCount(1);
 });
 
@@ -8422,7 +8423,7 @@ test("selection can be enabled by long touch with drag & drop enabled", async ()
     });
     expect(".o_selection_box").toHaveCount(0);
     const { drop } = await drag(".o_kanban_record:nth-of-type(1)");
-    await advanceTime(400);
+    await advanceTime(TOUCH_SELECTION_THRESHOLD);
     expect(".o_selection_box").toHaveCount(0, {
         message: "touch delay is longer when drag & drop is enabled",
     });

From a993348a0754c0f629c6d3b2d0af0d30d51a5667 Mon Sep 17 00:00:00 2001
From: "Lionel Piraux (lipi)" <lipi@odoo.com>
Date: Thu, 30 Oct 2025 11:17:28 +0000
Subject: [PATCH 300/673] [FIX] sale: portal report studio edit

Versions
--------
- 17.0+

Steps
-----
1. Edit the `sale.report_saleorder` report using `web_studio`.
2. Add the `amount_untaxed` field next to the "Untaxed Amount" subtitle.
3. Create or navigate to a quotation and click on the "Preview" action.

Issue
-----
A traceback occurs during the rendering of the
`sale.sale_order_portal_template` template.
```
Error while render the template
KeyError: 'doc'
Template: sale.document_tax_totals
Path: /t/t/tr/td[1]/span
Node: <span t-field="doc.amount_untaxed"/>
The error occurred while rendering the template sale.document_tax_totals and evaluating the following expression: <span t-field="doc.amount_untaxed"/>
```

Cause
-----
In the `sale.report_saleorder_document` template, `doc` is used as the
variable name for the current sale order. Consequently, the studio edit
uses this variable name to modify the `sale.document_tax_totals`
template called within `sale.report_saleorder_document`. However, the
`sale.sale_order_portal_template` template, used for the portal preview,
also calls `sale.document_tax_totals` but uses `sale_order` as the
variable name for the current order.

Solution
--------
Add an alias `doc` for `sale_order` during the rendering of
`sale.document_tax_totals` when called in the portal report preview.

opw-5136553

closes odoo/odoo#234458

X-original-commit: fa070bc28d6c997bc341375de1e2db9e6e77da11
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Signed-off-by: Lionel Piraux (lipi) <lipi@odoo.com>
---
 addons/sale/views/sale_portal_templates.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 9b37b72f065f9..ddf85f1d7826c 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -992,6 +992,7 @@
             <t t-call="#{sale_order._get_name_tax_totals_view()}">
                 <t t-set="tax_totals" t-value="sale_order.tax_totals"/>
                 <t t-set="currency" t-value="sale_order.currency_id"/>
+                <t t-set="doc" t-value="sale_order"/>
             </t>
         </table>
     </template>

From b0f6b3c88a8e2e6d221d031b3e793bff500c1012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 5 Nov 2025 11:57:13 +0000
Subject: [PATCH 301/673] [FIX] mail: can search and jump to messages in
 mailboxes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, we could not jump to messages in mailboxes.

This happens because the `useMessageHighlight()` hook prevented
jumping to messages in thread that were not their origin thread.

This commit fixes the issue by removing this limitation specifically
for mailboxes.

opw-4948798
opw-5087102

closes odoo/odoo#234668

X-original-commit: 23ab6546b3476f00587cba709068012369f9480d
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/utils/common/hooks.js                   | 3 +++
 addons/mail/static/tests/discuss/search_messages_panel.test.js | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/mail/static/src/utils/common/hooks.js b/addons/mail/static/src/utils/common/hooks.js
index b3a377875a1bb..a974ba898fb7b 100644
--- a/addons/mail/static/src/utils/common/hooks.js
+++ b/addons/mail/static/src/utils/common/hooks.js
@@ -341,6 +341,9 @@ export function useMessageScrolling(duration = 2000) {
          * @param {import("models").Thread} thread
          */
         async highlightMessage(message, thread) {
+            if (thread.model !== "mail.box" && thread.notEq(message.thread)) {
+                return;
+            }
             state.initiated = true;
             let messageScrollDirection;
             if (message.notIn(thread.messages)) {
diff --git a/addons/mail/static/tests/discuss/search_messages_panel.test.js b/addons/mail/static/tests/discuss/search_messages_panel.test.js
index 9cf25c593e8a3..379a38fd588d1 100644
--- a/addons/mail/static/tests/discuss/search_messages_panel.test.js
+++ b/addons/mail/static/tests/discuss/search_messages_panel.test.js
@@ -173,6 +173,8 @@ test("Search a message in history (desktop)", async () => {
     await insertText(".o_searchview_input", "message");
     triggerHotkey("Enter");
     await contains(".o-mail-SearchMessagesPanel .o-mail-Message");
+    await click(".o-mail-SearchMessagesPanel .o-mail-MessageCard-jump");
+    await contains(".o-mail-Thread .o-mail-Message.o-highlighted");
 });
 
 test.tags("mobile");

From db8dff9fd4c8f8b20038289c0b92f5c56d275f7a Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Tue, 21 Oct 2025 13:34:42 +0000
Subject: [PATCH 302/673] [FIX] sale_stock: adapt move sale_line_id when
 changing picking sale_id

Steps to reproduce:
- Create a Sale Order with at least one product line & confirm it.
- Open the delivery
- Change the picking's SO to another one

Issue:
A traceback will happen, as the `Command` expects an id, not a record

Aside from the traceback, we need to think of what it implies to change
the SO on a picking like this. If the move have a sale_line_id, it
doesn't make sense to have some still related to one SO while the
picking itself is linked to another one.

Now tries to do a basic matching of the moves based on their product
within the newly set Sale Order.

sentry-6921046230

closes odoo/odoo#234610

X-original-commit: 763400a4e6bed7dc32d9e68928437569d53d61c7
Signed-off-by: Steve Van Essche <svs@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/sale_stock/models/stock.py          | 34 ++++++++++-
 addons/sale_stock/tests/test_sale_stock.py | 71 ++++++++++++++++++++++
 2 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/addons/sale_stock/models/stock.py b/addons/sale_stock/models/stock.py
index 06e70e92eb793..043bb83e3476c 100644
--- a/addons/sale_stock/models/stock.py
+++ b/addons/sale_stock/models/stock.py
@@ -128,6 +128,27 @@ def _prepare_procurement_values(self):
             res['sale_line_id'] = self.sale_line_id.id
         return res
 
+    def _reassign_sale_lines(self, sale_order):
+        current_order = self.sale_line_id.order_id
+        if len(current_order) <= 1 and current_order != sale_order:
+            ids_to_reset = set()
+            if not sale_order:
+                ids_to_reset.update(self.ids)
+            else:
+                line_ids_by_product = dict(self.env['sale.order.line']._read_group(
+                    domain=[('order_id', '=', sale_order.id), ('product_id', 'in', self.product_id.ids)],
+                    aggregates=['id:array_agg'],
+                    groupby=['product_id']
+                ))
+                for move in self:
+                    if line_id := line_ids_by_product.get(move.product_id, [])[:1]:
+                        move.sale_line_id = line_id[0]
+                    else:
+                        ids_to_reset.add(move.id)
+
+            if ids_to_reset:
+                self.env['stock.move'].browse(ids_to_reset).sale_line_id = False
+
 
 class StockMoveLine(models.Model):
     _inherit = "stock.move.line"
@@ -169,14 +190,21 @@ def _compute_move_type(self):
                     picking.move_type = "one"
 
     def _set_sale_id(self):
-        if self.reference_ids and self.sale_id:
-            self.reference_ids.sale_ids = Command.link(self.sale_id)
+        if self.reference_ids:
+            if self.sale_id:
+                self.reference_ids.sale_ids = [Command.link(self.sale_id.id)]
+            else:
+                sale_order = self.move_ids.sale_line_id.order_id
+                if len(sale_order) == 1:
+                    self.reference_ids.sale_ids = [Command.unlink(sale_order.id)]
         else:
             if self.sale_id:
-                self.env['stock.reference'].create({
+                reference = self.env['stock.reference'].create({
                     'sale_ids': [Command.link(self.sale_id.id)],
                     'name': self.sale_id.name,
                 })
+                self._add_reference(reference)
+        self.move_ids._reassign_sale_lines(self.sale_id)
 
     def _auto_init(self):
         """
diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py
index 4702e1430967f..df0638a1705eb 100644
--- a/addons/sale_stock/tests/test_sale_stock.py
+++ b/addons/sale_stock/tests/test_sale_stock.py
@@ -2283,3 +2283,74 @@ def test_create_route_update_so_quantity(self):
             {'location_id': loc_perso.id, 'location_dest_id': out_location.id, 'quantity': 1},
             {'location_id': stock_location.id, 'location_dest_id': pack_location.id, 'quantity': 1},
         ])
+
+    def test_update_picking_sale_order(self):
+        """ Checks that updating the SO directly on the picking form properly updates the move as well.
+        """
+        self.new_product.is_storable = False
+        sale_order = self.env['sale.order'].create({
+            'partner_id': self.partner_a.id,
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_uom_qty': 1,
+                })
+            ]
+        })
+        sale_order.action_confirm()
+        so_delivery = sale_order.picking_ids
+        self.assertEqual(so_delivery.move_ids.sale_line_id, sale_order.order_line)
+
+        new_delivery = self.env['stock.picking'].create({
+            'picking_type_id': so_delivery.picking_type_id.id,
+            'location_id': so_delivery.location_id.id,
+            'location_dest_id': so_delivery.location_dest_id.id,
+            'move_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_uom_qty': 2,
+                    'location_id': so_delivery.location_id.id,
+                    'location_dest_id': so_delivery.location_dest_id.id,
+                }),
+                Command.create({
+                    'product_id': self.new_product.id,
+                    'product_uom_qty': 3,
+                    'location_id': so_delivery.location_id.id,
+                    'location_dest_id': so_delivery.location_dest_id.id,
+                }),
+            ],
+        })
+        new_delivery.action_confirm()
+        self.assertFalse(new_delivery.sale_id)
+        self.assertRecordValues(new_delivery.move_ids, [
+            {'product_id': self.product_a.id, 'sale_line_id': False},
+            {'product_id': self.new_product.id, 'sale_line_id': False},
+        ])
+
+        new_delivery.sale_id = sale_order
+        # Only corresponding lines should be set, but missing SO line will be created at picking's validation.
+        self.assertRecordValues(new_delivery.move_ids, [
+            {'product_id': self.product_a.id, 'sale_line_id': sale_order.order_line.id},
+            {'product_id': self.new_product.id, 'sale_line_id': False},
+        ])
+
+        new_delivery.button_validate()
+        self.assertRecordValues(new_delivery.move_ids, [
+            {'product_id': self.product_a.id, 'sale_line_id': sale_order.order_line[0].id},
+            {'product_id': self.new_product.id, 'sale_line_id': sale_order.order_line[1].id},
+        ])
+        self.assertRecordValues(sale_order.order_line, [
+            {'product_id': self.product_a.id, 'product_uom_qty': 1, 'qty_delivered': 2},
+            {'product_id': self.new_product.id, 'product_uom_qty': 0, 'qty_delivered': 3},
+        ])
+
+        # Remove sale order from the original delivery. Its validation should no longer impact the sale order.
+        so_delivery.sale_id = False
+        self.assertRecordValues(so_delivery.move_ids, [
+            {'product_id': self.product_a.id, 'sale_line_id': False},
+        ])
+        so_delivery.button_validate()
+        self.assertRecordValues(sale_order.order_line, [
+            {'product_id': self.product_a.id, 'product_uom_qty': 1, 'qty_delivered': 2},
+            {'product_id': self.new_product.id, 'product_uom_qty': 0, 'qty_delivered': 3},
+        ])

From d9bc80676f952916a1d04625ae6a9b438773fe05 Mon Sep 17 00:00:00 2001
From: Zelong Lin <zel@odoo.com>
Date: Wed, 5 Nov 2025 16:30:17 +0100
Subject: [PATCH 303/673] [IMP] mail: add sequence in discuss category

Add a sequence field to the discuss category model to allow for ordering
of categories.

Add a menu item to access discuss categories from the Discuss
configuration menu.

Add views to category configuration, including a list view with drag-and-drop
reordering based on the sequence field.

task-5227503

closes odoo/odoo#234388

Signed-off-by: Zelong Lin (zel) <zel@odoo.com>
---
 addons/mail/__manifest__.py                   |  1 +
 .../mail/models/discuss/discuss_category.py   |  6 ++-
 addons/mail/models/discuss/discuss_channel.py |  6 ++-
 .../discuss_app/discuss_app_model_patch.js    | 22 +++++++--
 .../core/public_web/discuss_category_model.js |  2 +
 .../static/tests/discuss_app/sidebar.test.js  | 10 ++--
 addons/mail/views/discuss_category_views.xml  | 47 +++++++++++++++++++
 addons/mail/views/mail_menus.xml              |  6 +++
 8 files changed, 88 insertions(+), 12 deletions(-)
 create mode 100644 addons/mail/views/discuss_category_views.xml

diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 9da5d6fa64c71..1a5641875322c 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -80,6 +80,7 @@
         'views/mail_mail_views.xml',
         'views/mail_followers_views.xml',
         'views/mail_ice_server_views.xml',
+        'views/discuss_category_views.xml',
         'views/discuss_channel_member_views.xml',
         'views/discuss_channel_rtc_session_views.xml',
         'views/mail_link_preview_views.xml',
diff --git a/addons/mail/models/discuss/discuss_category.py b/addons/mail/models/discuss/discuss_category.py
index 41f09c406e681..c1ffb9b11245e 100644
--- a/addons/mail/models/discuss/discuss_category.py
+++ b/addons/mail/models/discuss/discuss_category.py
@@ -11,16 +11,20 @@ class DiscussCategory(models.Model):
     _description = "Discussion Category"
     _inherit = ["bus.sync.mixin"]
 
+    def _default_sequence(self):
+        return (self.search([], order="sequence desc", limit=1).sequence or 0) + 1
+
     # description
     name = fields.Char("Name", required=True)
     channel_ids = fields.One2many("discuss.channel", "discuss_category_id", string="Channels")
+    sequence = fields.Integer("Sequence", default=_default_sequence)
 
     # constraints
     _name_unique = models.Constraint("UNIQUE(name)", "The category name must be unique")
 
     def _sync_field_names(self):
         res = super()._sync_field_names()
-        res[None] += ["name"]
+        res[None] += ["name", "sequence"]
         return res
 
     def _bus_channel(self):
diff --git a/addons/mail/models/discuss/discuss_channel.py b/addons/mail/models/discuss/discuss_channel.py
index 4571311ac6c80..57dd677a90cd2 100644
--- a/addons/mail/models/discuss/discuss_channel.py
+++ b/addons/mail/models/discuss/discuss_channel.py
@@ -467,7 +467,8 @@ def _sync_field_names(self):
         res = super()._sync_field_names()
         res[None] += [
             Store.Attr("avatar_cache_key", predicate=is_channel_or_group),
-            Store.One("discuss_category_id", ["name"], sudo=True),  # sudo: discuss.category - reading name is acceptable
+            # sudo: discuss.category - guests can read categories of accessible channels
+            Store.One("discuss_category_id", ["name", "sequence"], sudo=True),
             "channel_type",
             "create_uid",
             "default_display_mode",
@@ -1191,7 +1192,8 @@ def _to_store_defaults(self, target: Store.Target):
         bus_last_id = self.env["bus.bus"].sudo()._bus_last_id()
         res = [
             Store.Attr("avatar_cache_key", predicate=is_channel_or_group),
-            Store.One("discuss_category_id", ["name"], sudo=True),  # sudo: discuss.category - reading name is acceptable
+            # sudo: discuss.category - guests can read categories of accessible channels
+            Store.One("discuss_category_id", ["name", "sequence"], sudo=True),
             "channel_type",
             "create_uid",
             Store.Many(
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
index 19dc2dc2f9920..7c1349675cbc6 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_app/discuss_app_model_patch.js
@@ -9,10 +9,24 @@ const discussAppPatch = {
         super.setup(...arguments);
         this.allCategories = fields.Many("DiscussAppCategory", {
             inverse: "app",
-            sort: (c1, c2) =>
-                c1.sequence !== c2.sequence
-                    ? c1.sequence - c2.sequence
-                    : c1.name.localeCompare(c2.name),
+            sort: (c1, c2) => {
+                // Favorites category always first
+                if (c1.id === "favorites" || c2.id === "favorites") {
+                    return c1.id === "favorites" ? -1 : 1;
+                }
+                // Categories linked to discuss.category come before others
+                const c1HasDiscussCategory = !!c1.discussCategoryAsAppCategory;
+                const c2HasDiscussCategory = !!c2.discussCategoryAsAppCategory;
+                if (c1HasDiscussCategory !== c2HasDiscussCategory) {
+                    return c1HasDiscussCategory ? -1 : 1;
+                }
+                // Finally sort by sequence then name if they are both linked or both not linked to discuss.category
+                const c1Sequence = c1.discussCategoryAsAppCategory?.sequence ?? c1.sequence;
+                const c2Sequence = c2.discussCategoryAsAppCategory?.sequence ?? c2.sequence;
+                return c1Sequence !== c2Sequence
+                    ? c1Sequence - c2Sequence
+                    : c1.name.localeCompare(c2.name);
+            },
         });
         this.channelCategory = fields.One("DiscussAppCategory", {
             compute() {
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js b/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js
index b588db4d652fb..89c26e5db5fbf 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_category_model.js
@@ -21,6 +21,8 @@ export class DiscussCategory extends Record {
     id;
     /** @type {string} */
     name;
+    /** @type {number} */
+    sequence;
 
     delete() {
         this.appCategory?.delete();
diff --git a/addons/mail/static/tests/discuss_app/sidebar.test.js b/addons/mail/static/tests/discuss_app/sidebar.test.js
index c1e4e5326b4b0..cc986682d3261 100644
--- a/addons/mail/static/tests/discuss_app/sidebar.test.js
+++ b/addons/mail/static/tests/discuss_app/sidebar.test.js
@@ -55,11 +55,6 @@ test("Display discuss categories", async () => {
     await contains(".o-mail-DiscussSidebarCategory", { text: "Channels" });
     await contains(".o-mail-DiscussSidebarCategory", { text: "rd" });
     await contains(".o-mail-DiscussSidebarCategory", { text: "services" });
-    await contains(".o-mail-DiscussSidebarChannel", {
-        text: "general",
-        after: [".o-mail-DiscussSidebarCategory", { text: "Channels" }],
-        before: [".o-mail-DiscussSidebarCategory", { text: "rd" }],
-    });
     await contains(".o-mail-DiscussSidebarChannel", {
         text: "rd-Discuss",
         after: [".o-mail-DiscussSidebarCategory", { text: "rd" }],
@@ -67,6 +62,11 @@ test("Display discuss categories", async () => {
     });
     await contains(".o-mail-DiscussSidebarChannel", {
         text: "office",
+        after: [".o-mail-DiscussSidebarCategory", { text: "rd" }],
+        before: [".o-mail-DiscussSidebarCategory", { text: "Channels" }],
+    });
+    await contains(".o-mail-DiscussSidebarChannel", {
+        text: "general",
         after: [".o-mail-DiscussSidebarCategory", { text: "services" }],
     });
 });
diff --git a/addons/mail/views/discuss_category_views.xml b/addons/mail/views/discuss_category_views.xml
new file mode 100644
index 0000000000000..92978f6f47f27
--- /dev/null
+++ b/addons/mail/views/discuss_category_views.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="discuss_category_view_tree" model="ir.ui.view">
+            <field name="name">discuss.category.list</field>
+            <field name="model">discuss.category</field>
+            <field name="arch" type="xml">
+                <list string="Discuss Categories" editable="bottom" sample="1">
+                    <field name="sequence" widget="handle"/>
+                    <field name="name" placeholder="e.g. Service"/>
+                    <field name="channel_ids" widget="many2many_tags" domain="[('discuss_category_id', '=', False), ('channel_type', '=', 'channel')]"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="discuss_category_view_form" model="ir.ui.view">
+            <field name="name">discuss.category.form</field>
+            <field name="model">discuss.category</field>
+            <field name="arch" type="xml">
+                <form string="Discuss Categories">
+                    <sheet>
+                        <group>
+                            <field name="name" placeholder="e.g. Service"/>
+                            <field name="channel_ids" widget="many2many_tags" domain="[('discuss_category_id', '=', False), ('channel_type', '=', 'channel')]"/>
+                            <field name="sequence"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="discuss_category_settings_action" model="ir.actions.act_window">
+            <field name="name">Discuss Categories</field>
+            <field name="res_model">discuss.category</field>
+            <field name="view_mode">list,form</field>
+            <field name="help" type="html">
+                <p class="o_view_nocontent_smiling_face">
+                    No discuss category found. Let's create one!
+                </p><p>
+                    Use discuss categories to organize the channels.
+                </p>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/addons/mail/views/mail_menus.xml b/addons/mail/views/mail_menus.xml
index be8c5c4b1e038..a5552fc146adc 100644
--- a/addons/mail/views/mail_menus.xml
+++ b/addons/mail/views/mail_menus.xml
@@ -40,6 +40,12 @@
         action="mail.discuss_call_settings_action"
         sequence="5"
     />
+    <menuitem name="Categories"
+        id="mail.menu_discuss_category"
+        parent="mail.menu_configuration"
+        action="mail.discuss_category_settings_action"
+        sequence="10"
+    />
     <menuitem name="Canned Responses"
         id="mail.menu_canned_responses"
         parent="mail.menu_configuration"

From c5d3c0cacb9e981cf6bc4032071d7a2823563559 Mon Sep 17 00:00:00 2001
From: Florian Malfroid <flmal@odoo.com>
Date: Wed, 1 Oct 2025 14:50:04 +0200
Subject: [PATCH 304/673] [IMP] payment: prevent deletion of payment methods
 linked to providers

Purpose:
- Prevent deletion of payment methods linked to providers

Specification:
- Raise a UserError when trying to delete a payment method that is linked to providers
- Modify the Open Banking payment method to add FR, DE, FI to supported countries and EUR to the currencies

Task-5082049

closes odoo/odoo#229520

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 addons/payment/data/payment_method_data.xml |  4 ++++
 addons/payment/models/payment_method.py     |  5 +++++
 addons/payment/tests/test_payment_method.py | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/addons/payment/data/payment_method_data.xml b/addons/payment/data/payment_method_data.xml
index 0fed5300bc63d..425c87f837aee 100644
--- a/addons/payment/data/payment_method_data.xml
+++ b/addons/payment/data/payment_method_data.xml
@@ -2306,11 +2306,15 @@
         <field name="support_refund">partial</field>
         <field name="supported_country_ids"
                eval="[Command.set([
+                         ref('base.de'),
+                         ref('base.fi'),
+                         ref('base.fr'),
                          ref('base.uk'),
                      ])]"
         />
         <field name="supported_currency_ids"
                eval="[Command.set([
+                         ref('base.EUR'),
                          ref('base.GBP'),
                      ])]"
         />
diff --git a/addons/payment/models/payment_method.py b/addons/payment/models/payment_method.py
index 451db26890ff5..5c3056e638555 100644
--- a/addons/payment/models/payment_method.py
+++ b/addons/payment/models/payment_method.py
@@ -225,6 +225,11 @@ def _unlink_if_not_default_payment_method(self):
         if payment_method_unknown in self:
             raise UserError(_("You cannot delete the default payment method."))
 
+    @api.ondelete(at_uninstall=False)
+    def _unlink_if_not_linked_to_providers(self):
+        if any(record.provider_ids for record in self):
+            raise UserError(_("You cannot delete a payment method linked to a provider."))
+
     # === BUSINESS METHODS === #
 
     def _get_compatible_payment_methods(
diff --git a/addons/payment/tests/test_payment_method.py b/addons/payment/tests/test_payment_method.py
index faf32e55a78d1..101de33a961c4 100644
--- a/addons/payment/tests/test_payment_method.py
+++ b/addons/payment/tests/test_payment_method.py
@@ -43,6 +43,25 @@ def test_brand_compatible_with_manual_capture(self):
         self._assert_does_not_raise(ValidationError, brand_payment_method.action_unarchive)
         self.assertTrue(brand_payment_method.active)
 
+    def test_unlink_not_allowed_when_linked_to_providers(self):
+        """Test that the payment method cannot be deleted if it is linked to providers."""
+        payment_method_with_provider = self.env['payment.method'].create({
+            'name': "Dummy Method",
+            'code': 'dummymethod',
+            'provider_ids': self.provider.ids,
+        })  # self.payment_method is already checked by _unlink_if_not_default_payment_method.
+        with self.assertRaises(UserError):
+            payment_method_with_provider.unlink()
+
+    def test_unlink_allowed_when_not_linked_providers(self):
+        """Test that the payment method can be deleted if it is not linked to providers."""
+        payment_method_without_provider = self.env['payment.method'].create({
+            'name': "Dummy Method",
+            'code': 'dummymethod',
+            'provider_ids': [],
+        })  # self.payment_method is already checked by _unlink_if_not_default_payment_method.
+        self._assert_does_not_raise(UserError, payment_method_without_provider.unlink)
+
     def test_payment_method_compatible_when_provider_is_enabled(self):
         """ Test that a payment method is available when it is supported by an enabled provider. """
         compatible_payment_methods = self.env['payment.method']._get_compatible_payment_methods(

From ea471da79bce365f37d0e9f7c70b6d2f10075c2f Mon Sep 17 00:00:00 2001
From: mojem <mojem@odoo.com>
Date: Tue, 14 Oct 2025 08:51:13 +0000
Subject: [PATCH 305/673] [FIX] l10n_ro_edi: Use state for bank instead of
 state_id

Issue:
When setting up a payment reference and linking a bank to an invoice, sending an E-Factura (SPV) triggers an exception: state_id not defined for res.bank.

Repro Steps:
1- Create invoice for romanian localization.
2- Link payment account to invoice.
3- Add bank to payment account.
4- Confirm and send invoice with "Send E-Factura SPV" checked.
Video:
https://drive.google.com/file/d/1rweJgknjbKrpouJRTQ2cluKHsIXNZtSz/view?usp=drive_link

Cause:
The state field is defined differently for res.bank and res.partner. res.partner uses state_id, while res.bank uses state. The code that retrieves addresses assumes the same field for both, leading to an exception when accessing state for res.bank.

Fix:
The fix checks the type of the input and selects the appropriate field (state or state_id) accordingly.

Test:
Linked the bank in the test suite. The test fails without this fix, confirming the issue is resolved.

opw-5099816

closes odoo/odoo#234637

X-original-commit: ff9497a631d69b5ac5e470783bee968c9da9f7ae
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Mohamed Jemai (mojem) <mojem@odoo.com>
---
 .../l10n_ro_edi/models/account_edi_xml_ubl_ciusro.py  | 11 ++++++++---
 addons/l10n_ro_edi/tests/test_xml_ubl_ro.py           | 10 ++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_ro_edi/models/account_edi_xml_ubl_ciusro.py b/addons/l10n_ro_edi/models/account_edi_xml_ubl_ciusro.py
index aac20eab8de98..fa3563a980055 100644
--- a/addons/l10n_ro_edi/models/account_edi_xml_ubl_ciusro.py
+++ b/addons/l10n_ro_edi/models/account_edi_xml_ubl_ciusro.py
@@ -43,11 +43,16 @@ def _get_address_node(self, vals):
         address_node = super()._get_address_node(vals)
         partner = vals['partner']
 
-        if partner.state_id:
-            address_node['cbc:CountrySubentity']['_text'] = partner.country_code + '-' + partner.state_id.code
+        if partner._name == 'res.bank':
+            state = partner.state
+        else:
+            state = partner.state_id
+
+        if state:
+            address_node['cbc:CountrySubentity']['_text'] = partner.country_code + '-' + state.code
 
             # Romania requires the CityName to be in the format of "SECTORX" if the address state is in Bucharest.
-            if partner.state_id.code == 'B' and partner.city:
+            if state.code == 'B' and partner.city:
                 address_node['cbc:CityName']['_text'] = get_formatted_sector_ro(partner.city)
 
         return address_node
diff --git a/addons/l10n_ro_edi/tests/test_xml_ubl_ro.py b/addons/l10n_ro_edi/tests/test_xml_ubl_ro.py
index 993465f9df030..4a8cf3ca675bd 100644
--- a/addons/l10n_ro_edi/tests/test_xml_ubl_ro.py
+++ b/addons/l10n_ro_edi/tests/test_xml_ubl_ro.py
@@ -154,10 +154,20 @@ def setUpClass(cls):
             'street': "Strada Kunst, 3",
         })
 
+        cls.bank = cls.env['res.bank'].create({
+            'name': 'Banca Trimitere EDI Global',
+            'country': cls.env.ref('base.ro').id,
+            'state': cls.env.ref('base.RO_CJ').id,
+            'city': 'Cluj-Napoca',
+            'zip': '400000',
+            'street': 'Strada Global EDI Test',
+        })
+
         cls.env['res.partner.bank'].create({
             'acc_type': 'iban',
             'partner_id': cls.company_data['company'].partner_id.id,
             'acc_number': 'RO98RNCB1234567890123456',
+            'bank_id': cls.bank.id,
         })
 
         cls.partner_a = cls.env['res.partner'].create({

From cc376c7adb8d7195678bda9afb3e23e60519b2a2 Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Mon, 13 Oct 2025 08:39:36 +0000
Subject: [PATCH 306/673] [FIX] account, sale_stock: protect moves on line
 create
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Versions
--------
- 17.0+

Steps
-----
1. Enable anglo-saxon accounting;
2. have a product category with automated AVCO;
3. assign category to a deliverable product;
4. set product to invoice on delivery;
5. add product to a sales order;
6. confirm order & delivery;
7. create invoice;
8. change the delivery on the invoice;
7. confirm the invoice.

Issue
-----
The delivery date gets reset.

Cause
-----
Commit 818cf04f05767 added `delivery_date` as a permanently protected
field when modifying moves or move lines, protecting the records
on `write`. With anglo-saxon accounting however, new move lines are
created when confirming an invoice, which in turn recalculate the
delivery date, as `_get_protected_vals` isn't used for their move on
`create`.

Solution
--------
Add `self.env['account.move'].protecting(_get_protected_vals({}, moves))`
when creating new lines for a move, to avoid recomputing fields that
should always be protected.

opw-4965036

closes odoo/odoo#234592

X-original-commit: 84828f1cf43089145a0628087d37bc8d1979ea7a
Signed-off-by: William André (wan) <wan@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 addons/account/models/account_move_line.py       |  1 +
 addons/sale_stock/tests/test_sale_order_dates.py | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/account/models/account_move_line.py b/addons/account/models/account_move_line.py
index 386531765ca20..71e59c5ddf6f6 100644
--- a/addons/account/models/account_move_line.py
+++ b/addons/account/models/account_move_line.py
@@ -1646,6 +1646,7 @@ def create(self, vals_list):
         move_container = {'records': moves}
         with moves._check_balanced(move_container),\
              ExitStack() as exit_stack,\
+             self.env.protecting(self.env['account.move']._get_protected_vals({}, moves)), \
              moves._sync_dynamic_lines(move_container),\
              self._sync_invoice(container):
             lines = super().create([self._sanitize_vals(vals) for vals in vals_list])
diff --git a/addons/sale_stock/tests/test_sale_order_dates.py b/addons/sale_stock/tests/test_sale_order_dates.py
index 601be5afb31ce..d3b0bfadcc6da 100644
--- a/addons/sale_stock/tests/test_sale_order_dates.py
+++ b/addons/sale_stock/tests/test_sale_order_dates.py
@@ -183,6 +183,7 @@ def test_invoice_delivery_date(self):
             25.0,
         )
         with freeze_time(effective_date + timedelta(days=3)):
+            custom_delivery_date = fields.Date.today()
             picking_2 = (order.picking_ids - picking_1).ensure_one()
             picking_2.move_ids.write({'quantity': 25.0, 'picked': True})
             picking_2._action_done()
@@ -192,11 +193,16 @@ def test_invoice_delivery_date(self):
             )
             product_line = invoice.line_ids[0]
             invoice.write({
-                'delivery_date': fields.Date.today(),
+                'delivery_date': custom_delivery_date,
                 'line_ids': [Command.update(product_line.id, {'quantity': 0.0})],
             })
             product_line.quantity += 75.0
             self.assertEqual(
-                invoice.delivery_date, fields.Date.today(),
+                invoice.delivery_date, custom_delivery_date,
                 "Custom invoice delivery shouldn't change after line change",
             )
+            invoice.action_post()
+            self.assertEqual(
+                invoice.delivery_date, custom_delivery_date,
+                "Custom invoice delivery shouldn't change posting invoice",
+            )

From b5aba76b6f0570baed611ffa48c64cc859e6f07b Mon Sep 17 00:00:00 2001
From: "Thomas Becquevort (thbe)" <thbe@odoo.com>
Date: Wed, 8 Oct 2025 17:15:09 +0100
Subject: [PATCH 307/673] [FIX] calendar: calendar attendee access token
 missing groups

The access_token fields on calendar.attendee is missing a group attribute
leading to some user not having access to the field.

task-5221273
---
 addons/calendar/data/mail_template_data.xml | 18 +++++++++---------
 addons/calendar/models/calendar_attendee.py |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/calendar/data/mail_template_data.xml b/addons/calendar/data/mail_template_data.xml
index 0413e5d19887c..a69318809bd98 100644
--- a/addons/calendar/data/mail_template_data.xml
+++ b/addons/calendar/data/mail_template_data.xml
@@ -37,13 +37,13 @@
 
     </p>
     <div style="text-align: center; padding: 16px 0px 16px 0px;">
-        <a t-attf-href="/calendar/meeting/accept?token={{object.access_token}}&amp;id={{object.event_id.id}}"
+        <a t-attf-href="/calendar/meeting/accept?token={{object.sudo().access_token}}&amp;id={{object.event_id.id}}"
             t-attf-style="display: inline-block; padding: 7px 14px; color: {{object.event_id.user_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none; background-color: {{object.event_id.user_id.company_id.email_secondary_color or '#875A7B'}}; border-radius: 3px;">
             Accept</a>
-        <a t-attf-href="/calendar/meeting/decline?token={{object.access_token}}&amp;id={{object.event_id.id}}"
+        <a t-attf-href="/calendar/meeting/decline?token={{object.sudo().access_token}}&amp;id={{object.event_id.id}}"
             t-attf-style="display: inline-block; margin-left: 6px; padding: 7px 14px; color: {{object.event_id.user_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none; background-color: {{object.event_id.user_id.company_id.email_secondary_color or '#875A7B'}}; border-radius: 3px;">
             Decline</a>
-        <a t-attf-href="/calendar/meeting/view?token={{object.access_token}}&amp;id={{object.event_id.id}}"
+        <a t-attf-href="/calendar/meeting/view?token={{object.sudo().access_token}}&amp;id={{object.event_id.id}}"
             t-attf-style="display: inline-block; margin-left: 12px; padding: 7px 14px; color: #111827; text-decoration: none; background-color: #E7E9ED; border-radius: 3px;">
             View</a>
     </div>
@@ -167,13 +167,13 @@
         </t>
     </p>
     <div style="text-align: center; padding: 16px 0px 16px 0px;">
-        <a t-attf-href="/calendar/meeting/accept?token={{ object.access_token }}&amp;id={{ object.event_id.id }}"
+        <a t-attf-href="/calendar/meeting/accept?token={{ object.sudo().access_token }}&amp;id={{ object.event_id.id }}"
             t-attf-style="display: inline-block; padding: 7px 14px; color: {{organizer.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none; background-color: {{organizer.company_id.email_secondary_color or '#875A7B'}}; border-radius: 3px;">
             Accept</a>
-        <a t-attf-href="/calendar/meeting/decline?token={{ object.access_token }}&amp;id={{ object.event_id.id }}"
+        <a t-attf-href="/calendar/meeting/decline?token={{ object.sudo().access_token }}&amp;id={{ object.event_id.id }}"
             t-attf-style="display: inline-block; margin-left: 6px; padding: 7px 14px; color: {{organizer.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none; background-color: {{organizer.company_id.email_secondary_color or '#875A7B'}}; border-radius: 3px;">
             Decline</a>
-        <a t-attf-href="/calendar/meeting/view?token={{ object.access_token }}&amp;id={{ object.event_id.id }}"
+        <a t-attf-href="/calendar/meeting/view?token={{ object.sudo().access_token }}&amp;id={{ object.event_id.id }}"
             t-attf-style="display: inline-block; margin-left: 12px; padding: 7px 14px; color: #111827; text-decoration: none; background-color: #E7E9ED; border-radius: 3px;">
             View</a>
     </div>
@@ -274,13 +274,13 @@
         <span style="display: block; margin-top: 8px;">This is a reminder for the event below.</span>
     </p>
     <div style="text-align: center; padding: 16px 0px 16px 0px;">
-        <a t-attf-href="/calendar/{{ 'recurrence' if recurrent else 'meeting' }}/accept?token={{ object.access_token }}&amp;id={{ object.event_id.id }}"
+        <a t-attf-href="/calendar/{{ 'recurrence' if recurrent else 'meeting' }}/accept?token={{ object.sudo().access_token }}&amp;id={{ object.event_id.id }}"
             t-attf-style="display: inline-block; padding: 7px 14px; color: {{object.event_id.user_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none; background-color: {{object.event_id.user_id.company_id.email_secondary_color or '#875A7B'}}; border-radius: 3px;">
             Accept</a>
-        <a t-attf-href="/calendar/{{ 'recurrence' if recurrent else 'meeting' }}/decline?token={{ object.access_token }}&amp;id={{ object.event_id.id }}"
+        <a t-attf-href="/calendar/{{ 'recurrence' if recurrent else 'meeting' }}/decline?token={{ object.sudo().access_token }}&amp;id={{ object.event_id.id }}"
             t-attf-style="display: inline-block; margin-left: 6px; padding: 7px 14px; color: {{object.event_id.user_id.company_id.email_primary_color or '#FFFFFF'}}; text-decoration: none; background-color: {{object.event_id.user_id.company_id.email_secondary_color or '#875A7B'}}; border-radius: 3px;">
             Decline</a>
-        <a t-attf-href="/calendar/meeting/view?token={{ object.access_token }}&amp;id={{ object.event_id.id }}" 
+        <a t-attf-href="/calendar/meeting/view?token={{ object.sudo().access_token }}&amp;id={{ object.event_id.id }}"
             t-attf-style="display: inline-block; margin-left: 12px; padding: 7px 14px; color: #111827; text-decoration: none; background-color: #E7E9ED; border-radius: 3px;">
             View</a>
     </div>
diff --git a/addons/calendar/models/calendar_attendee.py b/addons/calendar/models/calendar_attendee.py
index 7faef8ea26b45..15c16c43d3cd5 100644
--- a/addons/calendar/models/calendar_attendee.py
+++ b/addons/calendar/models/calendar_attendee.py
@@ -38,7 +38,7 @@ def _default_access_token(self):
     email = fields.Char('Email', related='partner_id.email')
     phone = fields.Char('Phone', related='partner_id.phone')
     common_name = fields.Char('Common name', compute='_compute_common_name', store=True)
-    access_token = fields.Char('Invitation Token', default=_default_access_token)
+    access_token = fields.Char('Invitation Token', default=_default_access_token, groups="base.group_system")
     mail_tz = fields.Selection(_tz_get, compute='_compute_mail_tz', help='Timezone used for displaying time in the mail template')
     # state
     state = fields.Selection(STATE_SELECTION, string='Status', default='needsAction')

From 1b0b8d0d530631391eadb41357574aca6198db2c Mon Sep 17 00:00:00 2001
From: "Augustin (duau)" <duau@odoo.com>
Date: Thu, 16 Oct 2025 14:51:10 +0200
Subject: [PATCH 308/673] [MOV] html_editor, html_builder: move IrQweb
 builder-specific methods

Following website refactoring [1], and web_editor deletion, models were
moved to html_editor [2].
This commit is moving `IrQweb` builder-specific methods to html_builder.

[1]: https://github.com/odoo/odoo/commit/9fe45e2b7ddbbfd0445ffe25a859e67a316d02b2
[2]: https://github.com/odoo/odoo/commit/867d9a2f923a55c0bd6a281e2dea1f524fa04445

task-5176673

Part-of: odoo/odoo#231929
Signed-off-by: Denis Rygaert <dery@odoo.com>
---
 addons/html_builder/__init__.py             |   1 +
 addons/html_builder/models/__init__.py      |   1 +
 addons/html_builder/models/ir_qweb.py       | 141 ++++++++++++++++++++
 addons/html_editor/models/ir_qweb_fields.py | 122 -----------------
 4 files changed, 143 insertions(+), 122 deletions(-)
 create mode 100644 addons/html_builder/models/__init__.py
 create mode 100644 addons/html_builder/models/ir_qweb.py

diff --git a/addons/html_builder/__init__.py b/addons/html_builder/__init__.py
index e69de29bb2d1d..0650744f6bc69 100644
--- a/addons/html_builder/__init__.py
+++ b/addons/html_builder/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/addons/html_builder/models/__init__.py b/addons/html_builder/models/__init__.py
new file mode 100644
index 0000000000000..33ac73eece1da
--- /dev/null
+++ b/addons/html_builder/models/__init__.py
@@ -0,0 +1 @@
+from . import ir_qweb
diff --git a/addons/html_builder/models/ir_qweb.py b/addons/html_builder/models/ir_qweb.py
new file mode 100644
index 0000000000000..721681348518e
--- /dev/null
+++ b/addons/html_builder/models/ir_qweb.py
@@ -0,0 +1,141 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from markupsafe import Markup, escape_silent
+
+from odoo import models
+
+
+class IrQweb(models.AbstractModel):
+    """ IrQweb object for rendering builder stuff
+    """
+    _inherit = 'ir.qweb'
+
+    def _compile_root(self, element, compile_context):
+        snippet_key = compile_context.pop('snippet-key', None)
+        sub_call_key = compile_context.pop('snippet-sub-call-key', None)
+
+        template = compile_context['ref_name']
+
+        # We only add the 'data-snippet' & 'data-name' attrib once when
+        # compiling the root node of the template.
+        if not template or template not in {snippet_key, sub_call_key}:
+            return super()._compile_root(element, compile_context)
+
+        snippet_base_node = element
+        if element.tag == 't':
+            el_children = [child for child in list(element) if isinstance(child.tag, str) and child.tag != 't']
+            if len(el_children) == 1:
+                snippet_base_node = el_children[0]
+            elif not el_children:
+                # If there's not a valid base node we check if the base node is
+                # a t-call to another template. If so the called template's base
+                # node must take the current snippet key.
+                el_children = [child for child in list(element) if isinstance(child.tag, str)]
+                if len(el_children) == 1:
+                    sub_call = el_children[0].get('t-call')
+                    if sub_call:
+                        el_children[0].set('t-options', f"{{'snippet-key': '{snippet_key}', 'snippet-sub-call-key': '{sub_call}'}}")
+        # If it already has a data-snippet it is a saved or an
+        # inherited snippet. Do not override it.
+        if snippet_base_node.tag != 't' and 'data-snippet' not in snippet_base_node.attrib:
+            snippet_base_node.attrib['data-snippet'] = \
+                snippet_key.split('.', 1)[-1]
+        # If it already has a data-name it is a saved or an
+        # inherited snippet. Do not override it.
+        snippet_name = compile_context.pop('snippet-name', None)
+        if snippet_base_node.tag != 't' and snippet_name and 'data-name' not in snippet_base_node.attrib:
+            snippet_base_node.attrib['data-name'] = snippet_name
+        return super()._compile_root(element, compile_context)
+
+    def _get_preload_attribute_xmlids(self):
+        return super()._get_preload_attribute_xmlids() + ['t-snippet', 't-snippet-call']
+
+    # compile directives
+
+    def _compile_directive_snippet(self, el, compile_context, indent):
+        key = el.attrib.pop('t-snippet')
+        el.set('t-call', key)
+        snippet_lang = self.env.context.get('snippet_lang')
+        if snippet_lang:
+            el.set('t-lang', f"'{snippet_lang}'")
+
+        el.set('t-options', f"{{'snippet-key': {key!r}}}")
+        view = self.env['ir.ui.view']._get_template_view(key)
+        name = el.attrib.pop('string', view.name)
+        thumbnail = el.attrib.pop('t-thumbnail', "oe-thumbnail")
+        image_preview = el.attrib.pop('t-image-preview', None)
+        # Forbid sanitize contains the specific reason:
+        # - "true": always forbid
+        # - "form": forbid if forms are sanitized
+        forbid_sanitize = el.attrib.pop('t-forbid-sanitize', None)
+        grid_column_span = el.attrib.pop('t-grid-column-span', None)
+        snippet_group = el.attrib.pop('snippet-group', None)
+        group = el.attrib.pop('group', None)
+        label = el.attrib.pop('label', None)
+        div = Markup('<div name="%s" data-oe-type="snippet" data-o-image-preview="%s" data-oe-thumbnail="%s" data-oe-snippet-id="%s" data-oe-snippet-key="%s" data-oe-keywords="%s" %s %s %s %s %s>') % (
+            name,
+            escape_silent(image_preview),
+            thumbnail,
+            view.id,
+            key.split('.')[-1],
+            escape_silent(el.findtext('keywords')),
+            Markup('data-oe-forbid-sanitize="%s"') % forbid_sanitize if forbid_sanitize else '',
+            Markup('data-o-grid-column-span="%s"') % grid_column_span if grid_column_span else '',
+            Markup('data-o-snippet-group="%s"') % snippet_group if snippet_group else '',
+            Markup('data-o-group="%s"') % group if group else '',
+            Markup('data-o-label="%s"') % label if label else '',
+        )
+        self._append_text(div, compile_context)
+        code = self._compile_node(el, compile_context, indent)
+        self._append_text('</div>', compile_context)
+        return code
+
+    def _compile_directive_snippet_call(self, el, compile_context, indent):
+        key = el.attrib.pop('t-snippet-call')
+        snippet_name = el.attrib.pop('string', None)
+        el.set('t-call', key)
+        el.set('t-options', f"{{'snippet-key': {key!r}, 'snippet-name': {snippet_name!r}}}")
+        return self._compile_node(el, compile_context, indent)
+
+    def _compile_directive_install(self, el, compile_context, indent):
+        key = el.attrib.pop('t-install')
+        thumbnail = el.attrib.pop('t-thumbnail', 'oe-thumbnail')
+        image_preview = el.attrib.pop('t-image-preview', None)
+        snippet_group = el.attrib.pop('snippet-group', None)
+        group = el.attrib.pop('group', None)
+        label = el.attrib.pop('label', None)
+        name = el.attrib.pop('string', 'Snippet')
+        if self.env.user.has_group('base.group_system'):
+            module = self.env['ir.module.module'].search([('name', '=', key)])
+            if not module or module.state == 'installed':
+                return []
+            div = Markup('<div name="%s" data-oe-type="snippet" data-module-id="%s" data-module-display-name="%s" data-o-image-preview="%s" data-oe-thumbnail="%s" %s %s %s><section/></div>') % (
+                name,
+                module.id,
+                module.display_name,
+                escape_silent(image_preview),
+                thumbnail,
+                Markup('data-o-snippet-group="%s"') % snippet_group if snippet_group else '',
+                Markup('data-o-group="%s"') % group if group else '',
+                Markup('data-o-label="%s"') % label if label else '',
+            )
+            self._append_text(div, compile_context)
+        return []
+
+    # order and ignore
+
+    def _directives_eval_order(self):
+        directives = super()._directives_eval_order()
+        # Insert before "call" and "options" to use this "call" directive after this one
+        index = directives.index('options') - 1
+        directives.insert(index, 'snippet-call')
+
+        # Insert before "att" as those may rely on static attributes like
+        # "string" and "att" clears all of those
+        index = directives.index('att') - 1
+        directives.insert(index, 'snippet')
+        directives.insert(index, 'install')
+        return directives
+
+    def _get_template_cache_keys(self):
+        return super()._get_template_cache_keys() + ['snippet_lang']
diff --git a/addons/html_editor/models/ir_qweb_fields.py b/addons/html_editor/models/ir_qweb_fields.py
index e5fd593b224fc..c6b364563ecd6 100644
--- a/addons/html_editor/models/ir_qweb_fields.py
+++ b/addons/html_editor/models/ir_qweb_fields.py
@@ -19,7 +19,6 @@
 import pytz
 import requests
 from lxml import etree, html
-from markupsafe import Markup, escape_silent
 from PIL import Image as I
 from werkzeug import urls
 
@@ -39,118 +38,6 @@ class IrQweb(models.AbstractModel):
     """
     _inherit = 'ir.qweb'
 
-    def _compile_root(self, element, compile_context):
-        snippet_key = compile_context.pop('snippet-key', None)
-        sub_call_key = compile_context.pop('snippet-sub-call-key', None)
-
-        template = compile_context['ref_name']
-
-        # We only add the 'data-snippet' & 'data-name' attrib once when
-        # compiling the root node of the template.
-        if not template or template not in {snippet_key, sub_call_key}:
-            return super()._compile_root(element, compile_context)
-
-        snippet_base_node = element
-        if element.tag == 't':
-            el_children = [child for child in list(element) if isinstance(child.tag, str) and child.tag != 't']
-            if len(el_children) == 1:
-                snippet_base_node = el_children[0]
-            elif not el_children:
-                # If there's not a valid base node we check if the base node is
-                # a t-call to another template. If so the called template's base
-                # node must take the current snippet key.
-                el_children = [child for child in list(element) if isinstance(child.tag, str)]
-                if len(el_children) == 1:
-                    sub_call = el_children[0].get('t-call')
-                    if sub_call:
-                        el_children[0].set('t-options', f"{{'snippet-key': '{snippet_key}', 'snippet-sub-call-key': '{sub_call}'}}")
-        # If it already has a data-snippet it is a saved or an
-        # inherited snippet. Do not override it.
-        if snippet_base_node.tag != 't' and 'data-snippet' not in snippet_base_node.attrib:
-            snippet_base_node.attrib['data-snippet'] = \
-                snippet_key.split('.', 1)[-1]
-        # If it already has a data-name it is a saved or an
-        # inherited snippet. Do not override it.
-        snippet_name = compile_context.pop('snippet-name', None)
-        if snippet_base_node.tag != 't' and snippet_name and 'data-name' not in snippet_base_node.attrib:
-            snippet_base_node.attrib['data-name'] = snippet_name
-        return super()._compile_root(element, compile_context)
-
-    def _get_preload_attribute_xmlids(self):
-        return super()._get_preload_attribute_xmlids() + ['t-snippet', 't-snippet-call']
-
-    # compile directives
-
-    def _compile_directive_snippet(self, el, compile_context, indent):
-        key = el.attrib.pop('t-snippet')
-        el.set('t-call', key)
-        snippet_lang = self.env.context.get('snippet_lang')
-        if snippet_lang:
-            el.set('t-lang', f"'{snippet_lang}'")
-
-        el.set('t-options', f"{{'snippet-key': {key!r}}}")
-        view = self.env['ir.ui.view']._get_template_view(key)
-        name = el.attrib.pop('string', view.name)
-        thumbnail = el.attrib.pop('t-thumbnail', "oe-thumbnail")
-        image_preview = el.attrib.pop('t-image-preview', None)
-        # Forbid sanitize contains the specific reason:
-        # - "true": always forbid
-        # - "form": forbid if forms are sanitized
-        forbid_sanitize = el.attrib.pop('t-forbid-sanitize', None)
-        grid_column_span = el.attrib.pop('t-grid-column-span', None)
-        snippet_group = el.attrib.pop('snippet-group', None)
-        group = el.attrib.pop('group', None)
-        label = el.attrib.pop('label', None)
-        div = Markup('<div name="%s" data-oe-type="snippet" data-o-image-preview="%s" data-oe-thumbnail="%s" data-oe-snippet-id="%s" data-oe-snippet-key="%s" data-oe-keywords="%s" %s %s %s %s %s>') % (
-            name,
-            escape_silent(image_preview),
-            thumbnail,
-            view.id,
-            key.split('.')[-1],
-            escape_silent(el.findtext('keywords')),
-            Markup('data-oe-forbid-sanitize="%s"') % forbid_sanitize if forbid_sanitize else '',
-            Markup('data-o-grid-column-span="%s"') % grid_column_span if grid_column_span else '',
-            Markup('data-o-snippet-group="%s"') % snippet_group if snippet_group else '',
-            Markup('data-o-group="%s"') % group if group else '',
-            Markup('data-o-label="%s"') % label if label else '',
-        )
-        self._append_text(div, compile_context)
-        code = self._compile_node(el, compile_context, indent)
-        self._append_text('</div>', compile_context)
-        return code
-
-    def _compile_directive_snippet_call(self, el, compile_context, indent):
-        key = el.attrib.pop('t-snippet-call')
-        snippet_name = el.attrib.pop('string', None)
-        el.set('t-call', key)
-        el.set('t-options', f"{{'snippet-key': {key!r}, 'snippet-name': {snippet_name!r}}}")
-        return self._compile_node(el, compile_context, indent)
-
-    def _compile_directive_install(self, el, compile_context, indent):
-        key = el.attrib.pop('t-install')
-        thumbnail = el.attrib.pop('t-thumbnail', 'oe-thumbnail')
-        image_preview = el.attrib.pop('t-image-preview', None)
-        snippet_group = el.attrib.pop('snippet-group', None)
-        group = el.attrib.pop('group', None)
-        label = el.attrib.pop('label', None)
-        name = el.attrib.pop('string', 'Snippet')
-        if self.env.user.has_group('base.group_system'):
-            module = self.env['ir.module.module'].search([('name', '=', key)])
-            if not module or module.state == 'installed':
-                return []
-            div = Markup('<div name="%s" data-oe-type="snippet" data-module-id="%s" data-module-display-name="%s" data-o-image-preview="%s" data-oe-thumbnail="%s" %s %s %s><section/></div>') % (
-                name,
-                module.id,
-                module.display_name,
-                escape_silent(image_preview),
-                thumbnail,
-                Markup('data-o-snippet-group="%s"') % snippet_group if snippet_group else '',
-                Markup('data-o-group="%s"') % group if group else '',
-                Markup('data-o-label="%s"') % label if label else '',
-            )
-            self._append_text(div, compile_context)
-        return []
-
     def _compile_directive_placeholder(self, el, compile_context, indent):
         el.set('t-att-placeholder', el.attrib.pop('t-placeholder'))
         return []
@@ -159,21 +46,12 @@ def _compile_directive_placeholder(self, el, compile_context, indent):
 
     def _directives_eval_order(self):
         directives = super()._directives_eval_order()
-        # Insert before "call" and "options" to use this "call" directive after this one
-        index = directives.index('options') - 1
-        directives.insert(index, 'snippet-call')
-
         # Insert before "att" as those may rely on static attributes like
         # "string" and "att" clears all of those
         index = directives.index('att') - 1
         directives.insert(index, 'placeholder')
-        directives.insert(index, 'snippet')
-        directives.insert(index, 'install')
         return directives
 
-    def _get_template_cache_keys(self):
-        return super()._get_template_cache_keys() + ['snippet_lang']
-
 
 # ------------------------------------------------------
 # QWeb fields

From 81c390f144cba91cbeb21a9e2a18d82d6c2f9a10 Mon Sep 17 00:00:00 2001
From: "Augustin (duau)" <duau@odoo.com>
Date: Fri, 17 Oct 2025 11:27:20 +0200
Subject: [PATCH 309/673] [REM] html_editor: remove unused IrQwebFieldRelative
 and IrQwebFieldQweb

This commit is removing two classes that became empty and non-functional
after successive refactoring and code movement.

closes odoo/odoo#231929

Signed-off-by: Denis Rygaert <dery@odoo.com>
---
 addons/html_editor/models/ir_qweb_fields.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/addons/html_editor/models/ir_qweb_fields.py b/addons/html_editor/models/ir_qweb_fields.py
index c6b364563ecd6..8455366e34a77 100644
--- a/addons/html_editor/models/ir_qweb_fields.py
+++ b/addons/html_editor/models/ir_qweb_fields.py
@@ -473,20 +473,6 @@ def from_html(self, model, field, element):
         return float(value)
 
 
-class IrQwebFieldRelative(models.AbstractModel):
-    _name = 'ir.qweb.field.relative'
-    _description = 'Qweb Field Relative'
-    _inherit = ['ir.qweb.field.relative']
-
-    # get formatting from ir.qweb.field.relative but edition/save from datetime
-
-
-class IrQwebFieldQweb(models.AbstractModel):
-    _name = 'ir.qweb.field.qweb'
-    _description = 'Qweb Field qweb'
-    _inherit = ['ir.qweb.field.qweb']
-
-
 def html_to_text(element):
     """ Converts HTML content with HTML-specified line breaks (br, p, div, ...)
     in roughly equivalent textual content.

From c337d97a3e06db37a316c4020261a797df4c6a1d Mon Sep 17 00:00:00 2001
From: "Ahmad (alah)" <alah@odoo.com>
Date: Tue, 23 Sep 2025 10:47:00 +0200
Subject: [PATCH 310/673] [IMP] account_accountant: show analytic distribution
 warning

When setting the account on a bank statement line,
analytic distribution might be required due to a mandatory plan.

Before this commit, the user had no idea if the analytic is
required or not.

After this commit, lines that required analytic distribution
will have a warning directing the user to set it.

task-5055351

closes odoo/odoo#228110

Related: odoo/enterprise#95266
Signed-off-by: Wala Gauthier (gawa) <gawa@odoo.com>
---
 addons/account/models/account_move_line.py | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/addons/account/models/account_move_line.py b/addons/account/models/account_move_line.py
index 71e59c5ddf6f6..75f78e06feaf2 100644
--- a/addons/account/models/account_move_line.py
+++ b/addons/account/models/account_move_line.py
@@ -418,6 +418,7 @@ class AccountMoveLine(models.Model):
     analytic_distribution = fields.Json(
         inverse="_inverse_analytic_distribution",
     ) # add the inverse function used to trigger the creation/update of the analytic lines accordingly (field originally defined in the analytic mixin)
+    has_invalid_analytics = fields.Boolean(compute='_compute_has_invalid_analytics')
 
     # === Early Pay fields === #
     discount_date = fields.Date(
@@ -1905,6 +1906,31 @@ def _compute_display_name(self):
         for line in self:
             line.display_name = line._format_aml_name(line.name or line.product_id.display_name, line.ref, line.move_id.name)
 
+    @api.depends('account_id', 'company_id', 'move_id', 'product_id', 'display_type', 'analytic_distribution')
+    def _compute_has_invalid_analytics(self):
+        SKIPPED_ACCOUNT_TYPES = {'asset_receivable', 'liability_payable', 'asset_cash', 'liability_credit_card'}
+        lines_to_validate = self.filtered(lambda line: (
+            line.display_type == 'product' and
+            line.account_id.account_type not in SKIPPED_ACCOUNT_TYPES
+        ))
+        (self - lines_to_validate).has_invalid_analytics = False
+        for line in lines_to_validate:
+            line.has_invalid_analytics = False
+            try:
+                business_domain = (
+                    'invoice' if line.move_id.is_sale_document(True)
+                    else 'bill' if line.move_id.is_purchase_document(True)
+                    else 'general'
+                )
+                line.with_context(validate_analytic=True)._validate_distribution(
+                    company_id=line.company_id.id,
+                    product=line.product_id.id,
+                    account=line.account_id.id,
+                    business_domain=business_domain,
+                )
+            except ValidationError:
+                line.has_invalid_analytics = True
+
     def copy_data(self, default=None):
         vals_list = super().copy_data(default=default)
 

From e4daecb8ee2fc7b89d1472353136a0899bc42d88 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Mon, 3 Nov 2025 16:49:42 +0000
Subject: [PATCH 311/673] [IMP] orm: stop invalidating inverses of o2m fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Whe invalidating o2m_ids, we should not invalidate inverses as these can
still be valid. When you invalidate a o2m, the m2o value should remain
in cache as o2m is only based on it. For m2m relationships, invalidating
the relation, invalidates both ends.

For example, in mail, `_invalidate_documents` will invalidate x2m files
pointing to the created message. If we invalidate inverses, we will just
invalidate res_id which just have been set.

closes odoo/odoo#234313

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/account/models/account_full_reconcile.py | 8 ++++----
 odoo/addons/test_orm/tests/test_fields.py       | 9 ---------
 odoo/orm/models.py                              | 5 ++++-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/account/models/account_full_reconcile.py b/addons/account/models/account_full_reconcile.py
index 2a65f3a6462a8..3b00eea15930a 100644
--- a/addons/account/models/account_full_reconcile.py
+++ b/addons/account/models/account_full_reconcile.py
@@ -23,23 +23,23 @@ def get_ids(commands):
         partial_ids = [list(get_ids(vals.pop('partial_reconcile_ids'))) for vals in vals_list]
         fulls = super(AccountFullReconcile, self.with_context(tracking_disable=True)).create(vals_list)
 
+        self.env['account.move.line'].invalidate_model(['full_reconcile_id'])
+        fulls.invalidate_recordset(['reconciled_line_ids'], flush=False)
         self.env.cr.execute_values("""
             UPDATE account_move_line line
                SET full_reconcile_id = source.full_id
               FROM (VALUES %s) AS source(full_id, line_ids)
              WHERE line.id = ANY(source.line_ids)
         """, [(full.id, line_ids) for full, line_ids in zip(fulls, move_line_ids)], page_size=1000)
-        fulls.reconciled_line_ids.invalidate_recordset(['full_reconcile_id'], flush=False)
-        fulls.invalidate_recordset(['reconciled_line_ids'], flush=False)
 
+        self.env['account.partial.reconcile'].invalidate_model(['full_reconcile_id'])
+        fulls.invalidate_recordset(['partial_reconcile_ids'], flush=False)
         self.env.cr.execute_values("""
             UPDATE account_partial_reconcile partial
                SET full_reconcile_id = source.full_id
               FROM (VALUES %s) AS source(full_id, partial_ids)
              WHERE partial.id = ANY(source.partial_ids)
         """, [(full.id, line_ids) for full, line_ids in zip(fulls, partial_ids)], page_size=1000)
-        fulls.partial_reconcile_ids.invalidate_recordset(['full_reconcile_id'], flush=False)
-        fulls.invalidate_recordset(['partial_reconcile_ids'], flush=False)
 
         self.env['account.partial.reconcile']._update_matching_number(fulls.reconciled_line_ids)
         return fulls
diff --git a/odoo/addons/test_orm/tests/test_fields.py b/odoo/addons/test_orm/tests/test_fields.py
index dc9ebffdf4c2a..0fc47001b6736 100644
--- a/odoo/addons/test_orm/tests/test_fields.py
+++ b/odoo/addons/test_orm/tests/test_fields.py
@@ -5220,16 +5220,7 @@ def test_modified_trigger_recursive_partial_invalidate(self):
                    "test_orm_modified_line"."create_date"
             FROM "test_orm_modified_line"
             WHERE "test_orm_modified_line"."id" IN %s
-        """, """
-            SELECT "test_orm_modified_line"."id",
-                   "test_orm_modified_line"."parent_id"
-            FROM "test_orm_modified_line"
-            WHERE "test_orm_modified_line"."id" IN %s
         """], flush=False):
-            # Two requests:
-            # - one for fetch modified_line_a_child_child data (invalidate just before)
-            # - one because modified_line_a_child.parent_id (invalidate just before because we invalidate inverse in `_invalidate_cache`,
-            # see TODO) -> We should change that
             self.modified_line_a_child_child.price = 4
         self.assertEqual(self.modified_line_a_child_child.total_price_quantity, 20)
         self.assertEqual(self.modified_line_a_child.total_price_quantity, 30)
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index a4b3be07645d1..461cfef904312 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -6111,7 +6111,10 @@ def _invalidate_cache(self, fnames: Collection[str] | None = None, ids: Sequence
         env = self.env
         for field in fields:
             field._invalidate_cache(env, ids)
-            # TODO VSC: used to remove the inverse of many_to_one from the cache, though we might not need it anymore
+            if field.type == 'one2many':
+                # skip invalidation of inverse for o2m fields
+                # (o2m is "computed" from m2o)
+                continue
             for invf in self.pool.field_inverses[field]:
                 self.env[invf.model_name].flush_model([invf.name])
                 invf._invalidate_cache(env)

From 29134220cd0d7f3065a8f90704c39848ab0952a9 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Mon, 3 Nov 2025 15:24:00 +0000
Subject: [PATCH 312/673] [FIX] rpc: xmlrpc dump of Domain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add Domain in the XMLRPC marshaller.

Part-of: odoo/odoo#234210
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/rpc/controllers/xmlrpc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/rpc/controllers/xmlrpc.py b/addons/rpc/controllers/xmlrpc.py
index b865672b19872..773e0ad3fe1a4 100644
--- a/addons/rpc/controllers/xmlrpc.py
+++ b/addons/rpc/controllers/xmlrpc.py
@@ -9,7 +9,7 @@
 from markupsafe import Markup
 
 import odoo.exceptions
-from odoo.fields import Command, Date, Datetime
+from odoo.fields import Command, Domain, Date, Datetime
 from odoo.http import Controller, Response, dispatch_rpc, request, route
 from odoo.tools import lazy
 
@@ -106,6 +106,7 @@ def dump_unicode(self, value, write):
     dispatch[lazy] = dump_lazy
     dispatch[str] = dump_unicode
     dispatch[Command] = dispatch[int]
+    dispatch[Domain] = lambda self, value, write: self.dispatch[list](self, list(value), write)
     dispatch[defaultdict] = dispatch[dict]
     dispatch[Markup] = lambda self, value, write: self.dispatch[str](self, str(value), write)
 

From ee9b3bc9b7e99334f5abdb9585809c80014d6ed7 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Fri, 31 Oct 2025 15:45:20 +0000
Subject: [PATCH 313/673] [REF] web: use Domain object
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove `AND`/`OR` functions. Building the final '__extra_domain' is
handled directly using the Domain object instead of converting all the
time to lists.

closes odoo/odoo#234210

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/web/models/models.py                   | 134 +++++++-----------
 .../tests/test_read_group_formatted.py        |  14 +-
 .../test_web/tests/test_web_read_group.py     |   2 +-
 3 files changed, 56 insertions(+), 94 deletions(-)

diff --git a/addons/web/models/models.py b/addons/web/models/models.py
index 695b04bb6bfc4..397513ad570c9 100644
--- a/addons/web/models/models.py
+++ b/addons/web/models/models.py
@@ -36,15 +36,6 @@ def __missing__(self, key):
         return value
 
 
-def AND(domains):
-    return list(Domain.AND(domains))
-
-
-def OR(domains):
-    return list(Domain.OR(domains))
-
-
-
 class Base(models.AbstractModel):
     _inherit = 'base'
 
@@ -650,7 +641,7 @@ def formatted_read_grouping_sets(
         aggregates: Sequence[str] = (),
         *,
         order: str | None = None,
-    ):
+    ) -> list[list[dict]]:
         """
         A method similar to :meth:`_read_grouping_set` but with all the
         formatting needed by the webclient.
@@ -1101,7 +1092,7 @@ def _web_read_group_format(
 
         # Reconstruct groups domain part
         for dict_group in result:
-            dict_group['__extra_domain'] = AND(dict_group.pop('__extra_domains'))
+            dict_group['__extra_domain'] = list(Domain.AND(dict_group.pop('__extra_domains')) or [])
 
         for aggregate_spec, values in zip(aggregates, column_iterator, strict=True):
             for value, dict_group in zip(values, result, strict=True):
@@ -1123,8 +1114,8 @@ def _web_read_group_groupby_formatter(self, groupby_spec, values):
             def formatter_follow_many2one(value):
                 value, domain = sub_formatter(value)
                 if not value:
-                    return value, ['|', (field_name, 'not any', []), (field_name, 'any', domain)]
-                return value, [(field_name, 'any', domain)]
+                    return value, Domain(field_name, 'not any', []) | Domain(field_name, 'any', domain)
+                return value, Domain(field_name, 'any', domain)
 
             return formatter_follow_many2one
 
@@ -1135,7 +1126,7 @@ def formatter_many2many(value):
                 if not value:
                     return False, [(field_name, 'not any', [])]
                 id_ = value.id
-                return (id_, value.sudo().display_name), [(field_name, '=', id_)]
+                return (id_, value.sudo().display_name), Domain(field_name, '=', id_)
 
             return formatter_many2many
 
@@ -1145,7 +1136,7 @@ def formatter_many2one(value):
                 if not value:
                     return False, [(field_name, '=', False)]
                 id_ = value.id
-                return (id_, value.sudo().display_name), [(field_name, '=', id_)]
+                return (id_, value.sudo().display_name), Domain(field_name, '=', id_)
 
             return formatter_many2one
 
@@ -1189,10 +1180,10 @@ def formatter_time_granularity(value):
                         )
                         label = f"W{week} {year:04}"
 
-                    additional_domain = ['&',
-                        (field_name, '>=', range_start.strftime(fmt)),
-                        (field_name, '<', range_end.strftime(fmt)),
-                    ]
+                    additional_domain = (
+                        Domain(field_name, '>=', range_start.strftime(fmt))
+                        & Domain(field_name, '<', range_end.strftime(fmt))
+                    )
                     # TODO: date label should be created by the webclient.
                     return (range_start.strftime(fmt), label), additional_domain
 
@@ -1203,7 +1194,7 @@ def formatter_time_granularity(value):
                 def formatter_date_number_granularity(value):
                     if value is None:
                         return [(field_name, '=', value)]
-                    return value, [(f"{field_name}.{granularity}", '=', value)]
+                    return value, Domain(f"{field_name}.{granularity}", '=', value)
 
                 return formatter_date_number_granularity
 
@@ -1212,7 +1203,7 @@ def formatter_date_number_granularity(value):
         if field.type == "properties":
             return self._web_read_group_groupby_properties_formatter(groupby_spec, values)
 
-        return lambda value: (value, [(field_name, '=', value)])
+        return lambda value: (value, Domain(field_name, '=', value))
 
     def _web_read_group_groupby_properties_formatter(self, groupby_spec, values):
         if '.' not in groupby_spec:
@@ -1230,7 +1221,7 @@ def formatter_property_selection(value):
                     # can not do ('selection', '=', False) because we might have
                     # option in database that does not exist anymore
                     return value, ['|', (fullname, '=', False), (fullname, 'not in', options)]
-                return value, [(fullname, '=', value)]
+                return value, Domain(fullname, '=', value)
 
             return formatter_property_selection
 
@@ -1244,7 +1235,7 @@ def formatter_property_many2one(value):
                     # record in database that does not exist anymore
                     return value, ['|', (fullname, '=', False), (fullname, 'not in', all_groups)]
                 record = self.env[comodel].browse(value).with_prefetch(all_groups)
-                return (value, record.display_name), [(fullname, '=', value)]
+                return (value, record.display_name), Domain(fullname, '=', value)
 
             return formatter_property_many2one
 
@@ -1254,12 +1245,11 @@ def formatter_property_many2one(value):
 
             def formatter_property_many2many(value):
                 if not value:
-                    return value, OR([
-                        [(fullname, '=', False)],
-                        AND([[(fullname, 'not in', group)] for group in all_groups]),
-                    ]) if all_groups else []
+                    return value, ['|', (fullname, '=', False), *Domain.AND(
+                        Domain(fullname, 'not in', group) for group in all_groups
+                    )] if all_groups else []
                 record = self.env[comodel].browse(value).with_prefetch(all_groups)
-                return (value, record.display_name), [(fullname, 'in', value)]
+                return (value, record.display_name), Domain(fullname, 'in', value)
 
             return formatter_property_many2many
 
@@ -1269,13 +1259,12 @@ def formatter_property_many2many(value):
 
             def formatter_property_tags(value):
                 if not value:
-                    return value, OR([
-                        [(fullname, '=', False)],
-                        AND([[(fullname, 'not in', tag)] for tag in tags]),
-                    ]) if tags else []
+                    return value, ['|', (fullname, '=', False), *Domain.AND(
+                        Domain(fullname, 'not in', tag) for tag in tags
+                    )] if tags else []
 
                 # replace tag raw value with list of raw value, label and color
-                return tags.get(value), [(fullname, 'in', value)]
+                return tags.get(value), Domain(fullname, 'in', value)
 
             return formatter_property_tags
 
@@ -1283,7 +1272,7 @@ def formatter_property_tags(value):
 
             def formatter_property_datetime(value):
                 if not value:
-                    return False, [(fullname, '=', False)]
+                    return False, Domain(fullname, '=', False)
 
                 # Date / Datetime are not JSONifiable, so they are stored as raw text
                 db_format = '%Y-%m-%d' if property_type == 'date' else '%Y-%m-%d %H:%M:%S'
@@ -1302,12 +1291,11 @@ def formatter_property_datetime(value):
                     format=READ_GROUP_DISPLAY_FORMAT[func],
                     locale=get_lang(self.env).code,
                 )
-                return (value.strftime(fmt), label), [(fullname, '>=', start), (fullname, '<', end)]
+                return (value.strftime(fmt), label), Domain(fullname, '>=', start) & Domain(fullname, '<', end)
 
             return formatter_property_datetime
 
-        return lambda value: (value, [(fullname, '=', value)])
-
+        return lambda value: (value, Domain(fullname, '=', value))
 
     @api.model
     @api.readonly
@@ -1369,9 +1357,9 @@ def _search_panel_field_image(self, field_name, **kwargs):
 
         enable_counters = kwargs.get('enable_counters')
         only_counters = kwargs.get('only_counters')
-        extra_domain = Domain(kwargs.get('extra_domain', []))
+        extra_domain = Domain(kwargs.get('extra_domain', Domain.TRUE))
         no_extra = extra_domain.is_true()
-        model_domain = Domain(kwargs.get('model_domain', []))
+        model_domain = Domain(kwargs.get('model_domain', Domain.TRUE))
         count_domain = model_domain & extra_domain
 
         limit = kwargs.get('limit')
@@ -1422,10 +1410,7 @@ def group_id_name(value):
             def group_id_name(value):
                 return value, field_name_selection[value]
 
-        domain = AND([
-            domain,
-            [(field_name, '!=', False)],
-        ])
+        domain = Domain(domain) & Domain(field_name, '!=', False)
         groups = self.with_context(read_group_expand=True).formatted_read_group(
             domain, [field_name], ['__count'], limit=limit)
 
@@ -1442,7 +1427,6 @@ def group_id_name(value):
 
         return domain_image
 
-
     @api.model
     def _search_panel_global_counters(self, values_range, parent_name):
         """
@@ -1628,11 +1612,11 @@ def search_panel_select_range(self, field_name, **kwargs):
                 field_type=types[field.type],
             ))
 
-        model_domain = kwargs.get('search_domain', [])
-        extra_domain = AND([
-            kwargs.get('category_domain', []),
-            kwargs.get('filter_domain', []),
-        ])
+        true = Domain.TRUE
+        model_domain = Domain(kwargs.get('search_domain', true))
+        extra_domain = Domain(kwargs.get('category_domain', true)) & Domain(kwargs.get('filter_domain', true))
+        model_domain = model_domain.optimize(self)
+        extra_domain = extra_domain.optimize(self)
 
         if field.type == 'selection':
             return {
@@ -1656,7 +1640,7 @@ def get_parent_id(record):
         else:
             hierarchize = False
 
-        comodel_domain = kwargs.get('comodel_domain', [])
+        comodel_domain = Domain(kwargs.get('comodel_domain', true))
         enable_counters = kwargs.get('enable_counters')
         expand = kwargs.get('expand')
         limit = kwargs.get('limit')
@@ -1680,10 +1664,10 @@ def get_parent_id(record):
         if not expand:
             image_element_ids = list(domain_image.keys())
             if hierarchize:
-                condition = [('id', 'parent_of', image_element_ids)]
+                condition = Domain('id', 'parent_of', image_element_ids)
             else:
-                condition = [('id', 'in', image_element_ids)]
-            comodel_domain = AND([comodel_domain, condition])
+                condition = Domain('id', 'in', image_element_ids)
+            comodel_domain &= condition
         comodel_records = Comodel.search_read(comodel_domain, field_names, limit=limit)
 
         if hierarchize:
@@ -1769,11 +1753,11 @@ def search_panel_select_multi_range(self, field_name, **kwargs):
                 'Only types %(supported_types)s are supported for filter (found type %(field_type)s)',
                 supported_types=supported_types, field_type=field.type))
 
-        model_domain = kwargs.get('search_domain', [])
-        extra_domain = AND([
-            kwargs.get('category_domain', []),
-            kwargs.get('filter_domain', []),
-        ])
+        true = Domain.TRUE
+        model_domain = Domain(kwargs.get('search_domain', true))
+        extra_domain = (Domain(kwargs.get('category_domain', true)) & Domain(kwargs.get('filter_domain', true)))
+        model_domain = model_domain.optimize(self)
+        extra_domain = extra_domain.optimize(self)
 
         if field.type == 'selection':
             return {
@@ -1807,18 +1791,14 @@ def group_id_name(value):
                 def group_id_name(value):
                     return (value, value) if value else (False, self.env._("Not Set"))
 
-        comodel_domain = kwargs.get('comodel_domain', [])
+        comodel_domain = Domain(kwargs.get('comodel_domain', true))
         enable_counters = kwargs.get('enable_counters')
         expand = kwargs.get('expand')
 
         if field.type == 'many2many':
             if not expand:
                 domain_image = self._search_panel_domain_image(field_name, model_domain, limit=limit)
-                image_element_ids = list(domain_image.keys())
-                comodel_domain = AND([
-                    comodel_domain,
-                    [('id', 'in', image_element_ids)],
-                ])
+                comodel_domain &= Domain('id', 'in', list(domain_image))
 
             comodel_records = Comodel.search_read(comodel_domain, field_names, limit=limit)
             if limit and len(comodel_records) == limit:
@@ -1838,20 +1818,9 @@ def group_id_name(value):
                     values['group_name'] = group_name
 
                 if enable_counters:
-                    search_domain = AND([
-                            model_domain,
-                            [(field_name, 'in', record_id)],
-                        ])
-                    local_extra_domain = extra_domain
+                    search_count_domain = model_domain & Domain(field_name, 'in', record_id) & extra_domain
                     if group_by and group_domain:
-                        local_extra_domain = AND([
-                            local_extra_domain,
-                            group_domain.get(json.dumps(group_id), []),
-                        ])
-                    search_count_domain = AND([
-                        search_domain,
-                        local_extra_domain
-                    ])
+                        search_count_domain &= Domain(group_domain.get(json.dumps(group_id), true))
                     values['__count'] = self.search_count(search_count_domain)
                 field_range.append(values)
 
@@ -1859,10 +1828,7 @@ def group_id_name(value):
 
         if field.type == 'many2one':
             if enable_counters or not expand:
-                extra_domain = AND([
-                    extra_domain,
-                    kwargs.get('group_domain', []),
-                ])
+                extra_domain &= Domain(kwargs.get('group_domain', true))
                 domain_image = self._search_panel_field_image(field_name,
                                     model_domain=model_domain, extra_domain=extra_domain,
                                     only_counters=expand,
@@ -1876,11 +1842,7 @@ def group_id_name(value):
                 return {'values': values, }
 
             if not expand:
-                image_element_ids = list(domain_image.keys())
-                comodel_domain = AND([
-                    comodel_domain,
-                    [('id', 'in', image_element_ids)],
-                ])
+                comodel_domain &= Domain('id', 'in', list(domain_image))
             comodel_records = Comodel.search_read(comodel_domain, field_names, limit=limit)
             if limit and len(comodel_records) == limit:
                 return {'error_msg': str(SEARCH_PANEL_ERROR_MESSAGE)}
diff --git a/odoo/addons/test_web/tests/test_read_group_formatted.py b/odoo/addons/test_web/tests/test_read_group_formatted.py
index 890c88f280338..b6ad37409f84f 100644
--- a/odoo/addons/test_web/tests/test_read_group_formatted.py
+++ b/odoo/addons/test_web/tests/test_read_group_formatted.py
@@ -187,7 +187,7 @@ def test_falsy_domain(self):
                 [
                     {
                         '__count': 0,
-                        '__extra_domain': [(1, '=', 1)],
+                        '__extra_domain': [],
                         'partner_id:count': 0,
                         'partner_id:count_distinct': 0,
                     },
@@ -255,12 +255,12 @@ def test_count_read_groups(self):
 
         self.assertEqual(
             Model.formatted_read_group([], aggregates=['key:count']),
-            [{'__extra_domain': [(1, '=', 1)], 'key:count': 2}]
+            [{'__extra_domain': [], 'key:count': 2}]
         )
 
         self.assertEqual(
             Model.formatted_read_group([], aggregates=['key:count_distinct']),
-            [{'__extra_domain': [(1, '=', 1)], 'key:count_distinct': 1}]
+            [{'__extra_domain': [], 'key:count_distinct': 1}]
         )
 
     def test_malformed_params(self):
@@ -1425,7 +1425,7 @@ def test_related(self):
 
         self.assertEqual(
             RelatedBase.formatted_read_group([], aggregates=['foo_id_bar_id_name:count_distinct']),
-            [{'__extra_domain': [(1, '=', 1)], 'foo_id_bar_id_name:count_distinct': 1}],
+            [{'__extra_domain': [], 'foo_id_bar_id_name:count_distinct': 1}],
         )
 
         # Cannot groupby on foo_names_sudo because it traverse One2many
@@ -2181,7 +2181,7 @@ def test_sum_monetary_rated_us(self):
                         'currency_id:array_agg_distinct': (self.usd + self.eur + self.stn).ids + [None],
                         # 3 $ + 3 euro + 1 Db + 1 no currency = 7.8 $
                         'total_in_currency_id:sum_currency': 3 + 3 * 1.25 + 0.05 + 1,
-                        '__extra_domain': [(1, '=', 1)],
+                        '__extra_domain': [],
                     },
                 ]
             )
@@ -2291,7 +2291,7 @@ def test_sum_monetary_rated_eur_company(self):
                         # 3 $ + 3 euro + 1 Db + 1 no currency = 6.44 euro
                         (3 * 0.8) + 3 + (1 * 0.05 * 0.8) +
                         1,  # Do nothing, if no currency is set
-                    '__extra_domain': [(1, '=', 1)],
+                    '__extra_domain': [],
                 }],
             )
 
@@ -2335,6 +2335,6 @@ def test_multi_currency_related(self):
                     # 7 $ + 4 euro + 1 Db + 1 no currency = 13.05 euro
                     7 + (4 * 1.25) + 0.05 + 1,  # Do nothing, if no currency is set
 
-                '__extra_domain': [(1, '=', 1)],
+                '__extra_domain': [],
             }],
         )
diff --git a/odoo/addons/test_web/tests/test_web_read_group.py b/odoo/addons/test_web/tests/test_web_read_group.py
index 58311d3439f79..97c25919ebf75 100644
--- a/odoo/addons/test_web/tests/test_web_read_group.py
+++ b/odoo/addons/test_web/tests/test_web_read_group.py
@@ -1251,4 +1251,4 @@ def test_query_non_int_read_group(self):
         result = self.env["test_orm.view.str.id"].formatted_read_group([], ["name"], ["__count"])
         self.assertEqual(result, [{"name": "test", "__count": 1, "__extra_domain": [("name", "=", "test")]}])
         result = self.env["test_orm.view.str.id"].formatted_read_group([], [], ["name:count"])
-        self.assertEqual(result, [{"name:count": 1, "__extra_domain": [(1, "=", 1)]}])
+        self.assertEqual(result, [{"name:count": 1, "__extra_domain": []}])

From f350c54556de850e42f014fa7706d09baf70cc44 Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Mon, 3 Nov 2025 14:28:34 +0000
Subject: [PATCH 314/673] [FIX] point_of_sale: correct price calculation for
 lot-tracked products

Before this commit, when a product had multiple variants with different
prices and was tracked by lot, adding different variants in the PoS
would incorrectly update all product prices.

opw-5228830

closes odoo/odoo#234698

X-original-commit: 29dd50d78f413503360de2af52d2f7818b04f2f9
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
---
 .../app/models/accounting/product_template_accounting.js    | 6 ++----
 .../static/tests/pos/tours/product_screen_tour.js           | 4 ++++
 addons/point_of_sale/tests/test_frontend.py                 | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js
index c610545c2c9c3..55a0a2c778174 100644
--- a/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js
+++ b/addons/point_of_sale/static/src/app/models/accounting/product_template_accounting.js
@@ -75,11 +75,9 @@ export class ProductTemplateAccounting extends Base {
             return price;
         }
 
-        if (original_line && original_line.isLotTracked()) {
+        if (original_line && original_line.isLotTracked() && product) {
             related_lines.push(
-                ...original_line.order_id.lines.filter(
-                    (line) => line.product_id.product_tmpl_id.id == this.id
-                )
+                ...original_line.order_id.lines.filter((line) => line.product_id.id == product.id)
             );
             quantity = related_lines.reduce((sum, line) => sum + line.getQuantity(), 0);
         }
diff --git a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
index f7bef4f28aea6..684a9c6a538ab 100644
--- a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
@@ -367,11 +367,15 @@ registry.category("web_tour.tours").add("limitedProductPricelistLoading", {
             ProductScreen.selectedOrderlineHas("Test Product 1", "1", "80.0"),
 
             scan_barcode("0100201"),
+            ProductScreen.enterLotNumber("1", "lot"),
             ProductScreen.selectedOrderlineHas("Test Product 2", "1", "100.0", "White"),
 
             scan_barcode("0100202"),
+            ProductScreen.enterLotNumber("1", "lot"),
             ProductScreen.selectedOrderlineHas("Test Product 2", "1", "120.0", "Red"),
 
+            ProductScreen.totalAmountIs("300.0"),
+
             refresh(),
             inLeftSide([
                 ...ProductScreen.clickLine("Test Product 1"),
diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py
index 99ea9678a58d1..b484e76d83231 100644
--- a/addons/point_of_sale/tests/test_frontend.py
+++ b/addons/point_of_sale/tests/test_frontend.py
@@ -1318,6 +1318,7 @@ def test_limited_product_pricelist_loading(self):
             'taxes_id': False,
             'available_in_pos': True,
             'pos_categ_ids': [(4, limited_category.id)],
+            'tracking': 'lot',
             'attribute_line_ids': [(0, 0, {
                 'attribute_id': color_attribute.id,
                 'value_ids': [(6, 0, color_attribute.value_ids.ids)]

From c21cdc1d884adc403df23eda21b223cc7ebec782 Mon Sep 17 00:00:00 2001
From: alap-odoo <alap@odoo.com>
Date: Mon, 22 Sep 2025 07:50:01 +0000
Subject: [PATCH 315/673] [FIX] html_builder: ensure custom text in gradient
 picker is visible

Steps to Reproduce:
1. Go to Website and enter edit mode.
2. Drop any text snippet.
3. Select the text.
4. Open color picker from the toolbar and switch to gradient tab.

Issue:
The custom text in the gradient tab of the color picker was not
clearly visible in dark mode.

Reason:
The background is already light, and in dark mode the text color was
also light. This resulted in insufficient contrast, making the text
hard to read.

Fix:
Set the text color to black when button has no background image. In case
of button containing style of background-image, the text color will be
same as earlier.

closes odoo/odoo#234617

X-original-commit: 0632395804bf2f3534303ffcab0dd8cc9790865d
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 .../src/core/building_blocks/builder_colorpicker.scss  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/html_builder/static/src/core/building_blocks/builder_colorpicker.scss b/addons/html_builder/static/src/core/building_blocks/builder_colorpicker.scss
index 89eddabe4b560..55ffdabdfb42d 100644
--- a/addons/html_builder/static/src/core/building_blocks/builder_colorpicker.scss
+++ b/addons/html_builder/static/src/core/building_blocks/builder_colorpicker.scss
@@ -3,6 +3,16 @@
     --popover-border-color: #{$o-we-bg-darker};
 }
 
+.o_custom_gradient_button {
+    &, &:hover, &:focus {
+        color: #000000;
+    }
+
+    &[style*="background-image"] {
+        color: $o-we-item-clickable-color;
+    }
+}
+
 .o-hb-colorpicker {
     --o-color-picker-active-color: var(--o-hb-select-item-active-color, #{$o-we-sidebar-content-field-toggle-active-bg});
 

From 430505578ce64d926799b44f5137c9526d7fb0d3 Mon Sep 17 00:00:00 2001
From: Louis Gobert <loug@odoo.com>
Date: Wed, 22 Oct 2025 11:09:10 +0000
Subject: [PATCH 316/673] =?UTF-8?q?[FIX]=20stock,=20mrp:=20don=E2=80=99t?=
 =?UTF-8?q?=20clean=20reservations=20for=20Kit=20products?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since this commit: 766ec99

We try to clean reservations because, for some reason, there could be
a discrepancy between the sum of “stock.move.line” and the
quantity/reserved quantity on “stock.quant”.
However, there are cases where a user creates a storable product,
updates its quantity, and then uses it in a “stock.move.line”, confirms
it, and later changes the product type to a kit. So, when trying to
clean the reservations for these “stock.move.line”, a user error occurs
because the system attempts to create a quant for a kit-type product:
https://github.com/odoo/odoo/blob/c07778bbce4311c142bd8e2ce3013998d4f126ae/addons/mrp/models/stock_quant.py#L6-L11
As a result, each time users try to access the quant list,
clean_reservation is triggered, causing a user error that prevents
them from modifying the quantity of any quant.

Solution:
For kits, we can skip cleaning their quant to avoid unnecessary errors.

This is a manual forward-port of #200595

opw-4625002
opw-4624008
opw-4621175
opw-4625465
opw-4621504
opw-4623523
opw-4621508
opw-4623329
opw-4629386
opw-5179369

closes odoo/odoo#234696

X-original-commit: 204d65ce4924a6041045c3b355093c83b368054d
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Louis Gobert (loug) <loug@odoo.com>
---
 addons/mrp/models/stock_quant.py   |  3 ++
 addons/mrp/tests/__init__.py       |  1 +
 addons/mrp/tests/test_quant.py     | 55 ++++++++++++++++++++++++++++++
 addons/stock/models/stock_quant.py |  6 +++-
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 addons/mrp/tests/test_quant.py

diff --git a/addons/mrp/models/stock_quant.py b/addons/mrp/models/stock_quant.py
index 9806de47d80c0..10f2ccf3a6b29 100644
--- a/addons/mrp/models/stock_quant.py
+++ b/addons/mrp/models/stock_quant.py
@@ -9,3 +9,6 @@ class StockQuant(models.Model):
     def _check_kits(self):
         if self.sudo().product_id.filtered("is_kits"):
             raise UserError(_('You should update the components quantity instead of directly updating the quantity of the kit product.'))
+
+    def _should_bypass_product(self, product=False, location=False, reserved_quantity=0, lot_id=False, package_id=False, owner_id=False):
+        return super()._should_bypass_product(product, location, reserved_quantity, lot_id, package_id, owner_id) or (product and product.is_kits)
diff --git a/addons/mrp/tests/__init__.py b/addons/mrp/tests/__init__.py
index 452448a852035..25bb23045230b 100644
--- a/addons/mrp/tests/__init__.py
+++ b/addons/mrp/tests/__init__.py
@@ -4,6 +4,7 @@
 from . import test_byproduct
 from . import test_cancel_mo
 from . import test_order
+from . import test_quant
 from . import test_stock
 from . import test_stock_report
 from . import test_warehouse_multistep_manufacturing
diff --git a/addons/mrp/tests/test_quant.py b/addons/mrp/tests/test_quant.py
new file mode 100644
index 0000000000000..03a0845eb5236
--- /dev/null
+++ b/addons/mrp/tests/test_quant.py
@@ -0,0 +1,55 @@
+from odoo import Command
+from odoo.exceptions import UserError
+
+from odoo.addons.mrp.tests.common import TestMrpCommon
+
+
+class TestMrpQuant(TestMrpCommon):
+
+    def test_kit_product_reservation_flow(self):
+        """Test that kit products are not cleaned"""
+
+        product_kit = self.env['product.product'].create({
+            'name': 'This product will be a kit',
+            'type': 'consu',
+            'is_storable': True
+        })
+
+        delivery = self.env['stock.picking'].create({
+            'location_id': self.shelf_1.id,
+            'location_dest_id': self.warehouse_1.lot_stock_id.id,
+            'picking_type_id': self.picking_type_out.id,
+            'move_line_ids': [Command.create({
+                'product_id': product_kit.id,
+                'quantity_product_uom': 1,
+                'location_dest_id': self.warehouse_1.lot_stock_id.id,
+            })]
+        })
+
+        delivery.action_confirm()
+        self.env['mrp.bom'].create({
+            'product_tmpl_id': product_kit.product_tmpl_id.id,
+            'product_id': product_kit.id,
+            'product_qty': 1,
+            'type': 'phantom',  # type kit
+        })
+
+        # Force recomputation of is_kits, since it's currently not recomputed automatically when BOM is created
+        product_kit._compute_is_kits()
+        delivery.move_ids.quantity = 1
+        product_normal = self.env['product.product'].create({
+            'name': 'Normal Product Test',
+            'type': 'consu',
+            'is_storable': True
+        })
+
+        # Should work without error
+        product_normal.action_open_quants()
+
+        # Ensure it's raise an error if we try to update quantity of kit product directly
+        with self.assertRaises(UserError, msg="You should update the components quantity instead of directly updating the quantity of the kit product."):
+            self.env['stock.quant']._update_available_quantity(
+                product_kit,
+                self.warehouse_1.lot_stock_id,
+                10,
+            )
diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index ce46416d95175..c6af261eb6e5d 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -1155,7 +1155,8 @@ def _clean_reservations(self):
                 del reserved_move_lines[(product, location, lot, package, owner)]
 
         for (product, location, lot, package, owner), reserved_quantity in reserved_move_lines.items():
-            if location.should_bypass_reservation():
+            if location.should_bypass_reservation() or\
+                self.env['stock.quant']._should_bypass_product(product, location, reserved_quantity, lot, package, owner):
                 continue
             else:
                 self.env['stock.quant']._update_reserved_quantity(product, location, reserved_quantity, lot_id=lot, package_id=package, owner_id=owner)
@@ -1544,3 +1545,6 @@ def set_parent_package(all_quants, package, limit_ids):
                 result_package_id))
         moves = self.env['stock.move'].create(move_vals)
         moves._action_done()
+
+    def _should_bypass_product(self, product=False, location=False, reserved_quantity=0, lot_id=False, package_id=False, owner_id=False):
+        return False

From b0cc6cec68ad0a3129a83e68df5ee8079c5470a9 Mon Sep 17 00:00:00 2001
From: sjai-odoo <sjai@odoo.com>
Date: Mon, 22 Sep 2025 09:09:44 +0000
Subject: [PATCH 317/673] [IMP] pos: generic customer account settlement in
 tour.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In this commit:
---------------
- We now pass `getPayload` function so that whenever the
dialog is closed before opening other customer account
operations we can pass payload otherwise if we discard
the popup in between the customers were not set.
- We have introduced a common function for settlement of
customer accounts and replaced it in existing tours.

closes odoo/odoo#234695

Task: 5028009
X-original-commit: b2d3c139ac3550be4f498ada572dddb1e92bfb43
Related: odoo/enterprise#98991
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: Jainam Shah (sjai) <sjai@odoo.com>
---
 .../static/tests/tours/spanish_pos_tour.js    |  4 +-
 .../pos/tours/utils/partner_list_util.js      | 40 ++++++++++++++++++-
 .../static/tests/tours/pos_loyalty_tour.js    |  5 +--
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js b/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js
index ad0b63d9f4974..d45ddc33741bf 100644
--- a/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js
+++ b/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js
@@ -64,9 +64,7 @@ registry.category("web_tour.tours").add("l10n_es_pos_settle_account_due", {
             Chrome.startPoS(),
             Dialog.confirm("Open Register"),
             ProductScreen.clickPartnerButton(),
-            PartnerList.clickPartnerOptions("Partner Test 1"),
-            PartnerList.clickDropDownItemText("Settle invoices"),
-            PartnerList.clickSettleOrderName("TSJ/", "/00001", true),
+            PartnerList.settleCustomerAccount("Partner Test 1", "10.0", "TSJ/", "/00001", true),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/partner_list_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/partner_list_util.js
index 8f9e527784eaa..68d4e0e789041 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/partner_list_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/partner_list_util.js
@@ -1,3 +1,5 @@
+import { negateStep } from "@point_of_sale/../tests/generic_helpers/utils";
+
 export function clickPartner(name = "", { expectUnloadPage = false } = {}) {
     return {
         content: `click partner '${name}' from partner list screen`,
@@ -29,7 +31,12 @@ export function clickDropDownItemText(text) {
     };
 }
 
-export function clickSettleOrderName(prefix, suffix = "", checkCurrentYear = false) {
+export function clickSettleOrderName(
+    prefix,
+    suffix = "",
+    checkCurrentYear = false,
+    availability = true
+) {
     let trigger = `tr.o_data_row td[name='name']:contains("${prefix}")`;
     if (checkCurrentYear) {
         trigger += `:contains("${new Date().getFullYear()}")`;
@@ -37,11 +44,40 @@ export function clickSettleOrderName(prefix, suffix = "", checkCurrentYear = fal
     if (suffix) {
         trigger += `:contains("${suffix}")`;
     }
-    return {
+    const step = {
         content: "Check the settle due account line is present",
         trigger,
         run: "click",
     };
+    if (!availability) {
+        return negateStep(step);
+    }
+    return step;
+}
+
+export function settleCustomerAccount(
+    partner,
+    dueAmount,
+    orderPrefix,
+    orderSuffix = "",
+    checkYear = false,
+    orderSettlement = false,
+    availability = true
+) {
+    const steps = [
+        {
+            trigger: `tr:contains(${partner}) .partner-due:contains(${dueAmount})`,
+        },
+        clickPartnerOptions(`${partner}`),
+    ];
+    const buttonText = orderSettlement ? "Settle orders" : "Settle invoices";
+    steps.push(
+        ...[
+            clickDropDownItemText(buttonText),
+            clickSettleOrderName(orderPrefix, orderSuffix, checkYear, availability),
+        ]
+    );
+    return steps;
 }
 
 export function checkContactValues(name, address = "", phone = "", email = "") {
diff --git a/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js b/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js
index c103bf8c91dec..31c89576769ab 100644
--- a/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js
+++ b/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js
@@ -610,10 +610,7 @@ registry.category("web_tour.tours").add("test_settle_dont_give_points_again", {
             Chrome.startPoS(),
             Dialog.confirm("Open Register"),
             ProductScreen.clickPartnerButton(),
-            PartnerList.clickPartnerOptions("AAA Partner"),
-            PartnerList.clickDropDownItemText("Settle invoices"),
-            PartnerList.clickSettleOrderName("TSJ/"),
-            ProductScreen.totalAmountIs("10.00"),
+            PartnerList.settleCustomerAccount("AAA Partner", "10.00", "TSJ/"),
         ].flat(),
 });
 

From 9e98850a279decfe61fb3b1374ecb96a2bdc976a Mon Sep 17 00:00:00 2001
From: "Lionel Piraux (lipi)" <lipi@odoo.com>
Date: Fri, 31 Oct 2025 14:18:00 +0000
Subject: [PATCH 318/673] [FIX] website_sale: fix `remove_main_product_image*`
 tours

Versions
--------
18.0+

Issue
-----
The `test_website_sale_add_and_remove_main_product_image_no_variant` and
`test_website_sale_remove_main_product_image_with_variant` tours fail
because the main product image is not removed as expected after the tour
completes.

Cause
-----
Both tours assume that once the product `<img>` element is removed from
the DOM, the action is fully completed. The tour then ends, and the
remaining Python code verifies the result. However, this assumption can
lead to issues. If the save request takes longer than expected, the
Python code may execute prematurely and fail.

Solution
--------
Add a step at the end of both tours to wait for the `<img>` element to
be fully saved and updated in the preview DOM.

Additionally, during debugging, it was observed that using an alias URL
(i.e., a redirect) to an `ir.attachment` could introduce further issues
or slow down the test due to the server fetching the image with a remote
call. To address this, this commit replaces the alias URL with a simple
binary attachment.

opw-5159593
runbot-163025
runbot-163615

closes odoo/odoo#234630

X-original-commit: e6ea7dfcf1c9c59ffac11420949d6dac0cb0fa03
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
Signed-off-by: Lionel Piraux (lipi) <lipi@odoo.com>
---
 .../website_sale/tests/test_product_image.py  | 66 +++++++------------
 1 file changed, 25 insertions(+), 41 deletions(-)

diff --git a/addons/website_sale/tests/test_product_image.py b/addons/website_sale/tests/test_product_image.py
index c2dc7e76625eb..effd1bbe46748 100644
--- a/addons/website_sale/tests/test_product_image.py
+++ b/addons/website_sale/tests/test_product_image.py
@@ -11,6 +11,13 @@
 from odoo.addons.website.tests.common import HttpCaseWithWebsiteUser
 
 
+def _create_image(color='black', dims=(1920, 1080), format='JPEG'):
+    f = io.BytesIO()
+    Image.new('RGB', dims, color).save(f, format)  # type: ignore
+    f.seek(0)
+    return base64.b64encode(f.read())
+
+
 @tagged('post_install', '-at_install')
 class TestWebsiteSaleImage(HttpCaseWithWebsiteUser):
 
@@ -52,43 +59,25 @@ def test_01_admin_shop_zoom_tour(self):
         })
 
         # first image (blue) for the template
-        f = io.BytesIO()
-        Image.new('RGB', (1920, 1080), color_blue).save(f, 'JPEG')
-        f.seek(0)
-        blue_image = base64.b64encode(f.read())
+        blue_image = _create_image(color=color_blue)
 
         # second image (red) for the variant 1, small image (no zoom)
-        f = io.BytesIO()
-        Image.new('RGB', (800, 500), color_red).save(f, 'JPEG')
-        f.seek(0)
-        red_image = base64.b64encode(f.read())
+        red_image = _create_image(color=color_red, dims=(800, 500))
 
         # second image (green) for the variant 2, big image (zoom)
-        f = io.BytesIO()
-        Image.new('RGB', (1920, 1080), color_green).save(f, 'JPEG')
-        f.seek(0)
-        green_image = base64.b64encode(f.read())
+        green_image = _create_image(color=color_green)
 
         # Template Extra Image 1
-        f = io.BytesIO()
-        Image.new('RGB', (124, 147)).save(f, 'GIF')
-        f.seek(0)
-        image_gif = base64.b64encode(f.read())
+        image_gif = _create_image(dims=(124, 147), format='GIF')
 
         # Template Extra Image 2
         image_svg = base64.b64encode(b'<svg></svg>')
 
         # Red Variant Extra Image 1
-        f = io.BytesIO()
-        Image.new('RGB', (767, 247)).save(f, 'BMP')
-        f.seek(0)
-        image_bmp = base64.b64encode(f.read())
+        image_bmp = _create_image(dims=(767, 247), format='BMP')
 
         # Green Variant Extra Image 1
-        f = io.BytesIO()
-        Image.new('RGB', (2147, 3251)).save(f, 'PNG')
-        f.seek(0)
-        image_png = base64.b64encode(f.read())
+        image_png = _create_image(dims=(2147, 3251), format='PNG')
 
         # create the template, without creating the variants
         template = self.env['product.template'].create({
@@ -275,10 +264,7 @@ def test_01_admin_shop_zoom_tour(self):
         self.assertEqual(variant_image.product_variant_id.id, product.id)
 
     def test_02_image_holder(self):
-        f = io.BytesIO()
-        Image.new('RGB', (800, 500), '#FF0000').save(f, 'JPEG')
-        f.seek(0)
-        image = base64.b64encode(f.read())
+        image = _create_image(color='#FF0000', dims=(800, 500))
 
         # create the color attribute
         product_attribute = self.env['product.attribute'].create({
@@ -342,20 +328,22 @@ class TestWebsiteSaleRemoveImage(HttpCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        # Attachment needed for the replacement of images
-        cls.env['ir.attachment'].create({
-            'public': True,
-            'name': 's_default_image.jpg',
-            'type': 'url',
-            'url': f'{cls.base_url()}/web/image/website.s_banner_default_image.jpg',
-        })
-
         # First image (blue) for the template.
         color_blue = '#4169E1'
         name_blue = 'Royal Blue'
         # Red for the variant.
         color_red = '#CD5C5C'
         name_red = 'Indian Red'
+        # Green for the replacement
+        color_green = '#228B22'
+
+        # Attachment needed for the replacement of images
+        cls.env['ir.attachment'].create({
+            'public': True,
+            'name': 'green.jpg',
+            'type': 'binary',
+            'datas': _create_image(color=color_green)
+        })
 
         # Create the color attribute.
         cls.product_attribute = cls.env['product.attribute'].create({
@@ -376,14 +364,10 @@ def setUpClass(cls):
             'sequence': 2,
         },
         ])
-        f = io.BytesIO()
-        Image.new('RGB', (1920, 1080), color_blue).save(f, 'JPEG')
-        f.seek(0)
-        blue_image = base64.b64encode(f.read())
 
         cls.template = cls.env['product.template'].with_context(create_product_product=False).create({
             'name': 'Test Remove Image',
-            'image_1920': blue_image,
+            'image_1920': _create_image(color=color_blue),
         })
 
     def test_website_sale_add_and_remove_main_product_image_no_variant(self):

From cc265fe88a95d931efc06492e0b5a4ad17260f3c Mon Sep 17 00:00:00 2001
From: Dhrumil Shah <dhrs@odoo.com>
Date: Tue, 15 Jul 2025 14:56:09 +0530
Subject: [PATCH 319/673] [FIX] crm: fix membership description to use Levels
 instead of Grades

This commit updates the description shown when the "Membership / Partnership"
setting is enabled. The term Grades was previously used, but the actual model
is named Level, so we have replaced Grades with Levels for consistency

Task-4945715

closes odoo/odoo#219029

Signed-off-by: Renaud Thiry (reth) <reth@odoo.com>
---
 addons/crm/views/res_config_settings_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 149aa1163c66c..b3bbdbf10962f 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -31,7 +31,7 @@
                                 Install Extension
                             </a>
                         </setting>
-                        <setting id="partnership_settings" help="Manage members or partners. Members get grades and pricelists, partners allow lead assignment and commission plans.">
+                        <setting id="partnership_settings" help="Manage members or partners. Members get levels and pricelists, partners allow lead assignment and commission plans.">
                             <field name="module_partnership"/>
                         </setting>
                     </block>

From d23141d2dc4af872b6aa815fd8cfe205e6a8640a Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 21 Oct 2025 15:35:30 +0200
Subject: [PATCH 320/673] [IMP] web: only save once on tab hide

Edit a record in form view s.t. the record is invalid. This could
be for 2 reasons:
  (a) there's empty required field, or
  (b) saving would trigger a server error.
Then switch to another tab. There will be an attempt to save the
record, which will result in
  (a) a invalid field notification being displayed, or
  (b) an error dialog.

Before this commit, if the user came back to the tab and then hid
it again, the attempt to save was done again, resulting in another
notification/dialog to be displayed.

With this commit, we do not try to automatically save on tab
visibility change until the user makes a change on the record.

task~5184626

closes odoo/odoo#232523

Related: odoo/enterprise#97879
Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
---
 .../static/src/views/form/form_controller.js  |  31 ++-
 .../static/tests/views/form/auto_save.test.js | 176 ++++++++++++++++++
 2 files changed, 203 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/views/form/form_controller.js b/addons/web/static/src/views/form/form_controller.js
index da1cef3589c69..457b41bb278b9 100644
--- a/addons/web/static/src/views/form/form_controller.js
+++ b/addons/web/static/src/views/form/form_controller.js
@@ -179,6 +179,8 @@ export class FormController extends Component {
         useBus(this.env.bus, "FORM-CONTROLLER:FORM-IN-DIALOG:ADD", () => this.formInDialog++);
         useBus(this.env.bus, "FORM-CONTROLLER:FORM-IN-DIALOG:REMOVE", () => this.formInDialog--);
 
+        this.disableSaveOnVisibilityChange = false;
+
         // Wait to be mounted before displaying dialog/notification for onchange warnings returned
         // by the first onchange, for 2 reasons:
         //  1) we don't want to show twice the warning if the component is destroyed before being
@@ -371,6 +373,7 @@ export class FormController extends Component {
             hooks: {
                 onWillLoadRoot: this.onWillLoadRoot.bind(this),
                 onWillSaveRecord: this.onWillSaveRecord.bind(this),
+                onRecordChanged: this.onRecordChanged.bind(this),
                 onRecordSaved: this.onRecordSaved.bind(this),
                 onWillDisplayOnchangeWarning: this.onWillDisplayOnchangeWarning.bind(this),
             },
@@ -387,6 +390,10 @@ export class FormController extends Component {
         this.duplicateId = undefined;
     }
 
+    onRecordChanged() {
+        this.disableSaveOnVisibilityChange = false;
+    }
+
     /**
      * onRecordSaved is a callBack that will be executed after the save
      * if it was done. It will therefore not be executed if the record
@@ -486,9 +493,21 @@ export class FormController extends Component {
         }
     }
 
-    beforeVisibilityChange() {
+    async beforeVisibilityChange() {
         if (document.visibilityState === "hidden" && this.formInDialog === 0) {
-            return this.model.root.save();
+            // calling isDirty forces all fields to commit their changes
+            const isDirty = await this.model.root.isDirty();
+            if (isDirty && !this.disableSaveOnVisibilityChange) {
+                const saved = await this.model.root.save({
+                    onError: (e) => {
+                        this.disableSaveOnVisibilityChange = true;
+                        throw e;
+                    },
+                });
+                if (!saved) {
+                    this.disableSaveOnVisibilityChange = true;
+                }
+            }
         }
     }
 
@@ -516,10 +535,14 @@ export class FormController extends Component {
                 isAvailable: () => activeActions.addPropertyFieldValue,
                 sequence: 10,
                 icon: "fa fa-cogs",
-                description: this.propertiesState.editable ? _t("Save Properties") : _t("Edit Properties"),
+                description: this.propertiesState.editable
+                    ? _t("Save Properties")
+                    : _t("Edit Properties"),
                 callback: () => {
                     this.propertiesState.editable = !this.propertiesState.editable;
-                    this.model.bus.trigger("PROPERTY_FIELD:EDIT", { editable: this.propertiesState.editable });
+                    this.model.bus.trigger("PROPERTY_FIELD:EDIT", {
+                        editable: this.propertiesState.editable,
+                    });
                 },
             },
             duplicate: {
diff --git a/addons/web/static/tests/views/form/auto_save.test.js b/addons/web/static/tests/views/form/auto_save.test.js
index b84aee1ff8244..099a3ae731ae6 100644
--- a/addons/web/static/tests/views/form/auto_save.test.js
+++ b/addons/web/static/tests/views/form/auto_save.test.js
@@ -96,6 +96,182 @@ test("save only once when hiding tab several times quickly", async () => {
     expect.verifySteps(["save"]);
 });
 
+test("hiding tab multiple times (server error)", async () => {
+    expect.errors(1);
+    onRpc("web_save", () => {
+        expect.step("save");
+        throw makeServerError({ message: "Cannot save" });
+    });
+    await mountView({
+        type: "form",
+        resModel: "partner",
+        arch: `<form><field name="name"/></form>`,
+        resId: 1,
+    });
+    expect(".o_field_widget[name=name] input").toHaveValue("Xavier Lancer");
+    await contains(".o_field_widget[name=name] input").edit("Mathiew Brown");
+
+    // simulate a tab switch
+    await hideTab();
+    await animationFrame();
+    expect(".o_dialog").toHaveCount(1);
+    expect(".o_dialog .modal-body").toHaveText("Cannot save");
+    expect.verifySteps(["save"]);
+    expect.verifyErrors(["Cannot save"]);
+
+    // simulate another tab switch => should not try to save again
+    await hideTab();
+    await animationFrame();
+    expect(".o_dialog").toHaveCount(1);
+    expect.verifySteps([]);
+    expect.verifyErrors([]);
+});
+
+test("hiding tab multiple times (server error) + make another change", async () => {
+    expect.errors(2);
+    onRpc("web_save", () => {
+        expect.step("save");
+        throw makeServerError({ message: "Cannot save" });
+    });
+    await mountView({
+        type: "form",
+        resModel: "partner",
+        arch: `<form><field name="name"/></form>`,
+        resId: 1,
+    });
+    expect(".o_field_widget[name=name] input").toHaveValue("Xavier Lancer");
+    await contains(".o_field_widget[name=name] input").edit("Mathiew Brown");
+
+    // simulate a tab switch
+    await hideTab();
+    await animationFrame();
+    expect(".o_dialog").toHaveCount(1);
+    expect(".o_dialog .modal-body").toHaveText("Cannot save");
+    expect.verifySteps(["save"]);
+    expect.verifyErrors(["Cannot save"]);
+
+    // close the dialog and simulate another tab switch
+    await contains(".o_dialog .btn-primary").click();
+    expect(".o_dialog").toHaveCount(0);
+    await hideTab();
+    await animationFrame();
+    expect.verifySteps([]);
+    expect.verifyErrors([]);
+
+    // make change and simulate another tab switch
+    await contains(".o_field_widget[name=name] input").edit("Mathiew Brown 2");
+    await hideTab();
+    await animationFrame();
+    expect(".o_dialog").toHaveCount(1);
+    expect(".o_dialog .modal-body").toHaveText("Cannot save");
+    expect.verifySteps(["save"]);
+    expect.verifyErrors(["Cannot save"]);
+});
+
+test("hiding tab multiple times (invalid fields)", async () => {
+    onRpc("web_save", () => {
+        expect.step("save"); // should not be called
+    });
+    await mountView({
+        type: "form",
+        resModel: "partner",
+        arch: `<form><field name="name" required="1"/></form>`,
+        resId: 1,
+    });
+    expect(".o_field_widget[name=name] input").toHaveValue("Xavier Lancer");
+    await contains(".o_field_widget[name=name] input").edit("");
+
+    // simulate a tab switch
+    await hideTab();
+    await animationFrame();
+    expect(".o_notification").toHaveCount(1);
+    expect.verifySteps([]);
+
+    // simulate another tab switch => should not display the notification again
+    await hideTab();
+    await animationFrame();
+    expect(".o_notification").toHaveCount(1);
+    expect.verifySteps([]);
+});
+
+test("hiding tab multiple times (invalid fields, without bluring)", async () => {
+    onRpc("web_save", () => {
+        expect.step("save"); // should not be called
+    });
+    await mountView({
+        type: "form",
+        resModel: "partner",
+        arch: `<form><field name="name" required="1"/></form>`,
+        resId: 1,
+    });
+    expect(".o_field_widget[name=name] input").toHaveValue("Xavier Lancer");
+    await contains(".o_field_widget[name=name] input").edit("", { confirm: false });
+
+    // simulate a tab switch
+    await hideTab();
+    await animationFrame();
+    expect(".o_notification").toHaveCount(1);
+    expect.verifySteps([]);
+
+    // simulate another tab switch => should not display the notification again
+    await hideTab();
+    await animationFrame();
+    expect(".o_notification").toHaveCount(1);
+    expect.verifySteps([]);
+});
+
+test("hiding tab multiple times (invalid field) + make another change", async () => {
+    onRpc("web_save", () => {
+        expect.step("save"); // should not be called
+    });
+    await mountView({
+        type: "form",
+        resModel: "partner",
+        arch: `<form><field name="name" required="1"/></form>`,
+        resId: 1,
+    });
+    expect(".o_field_widget[name=name] input").toHaveValue("Xavier Lancer");
+    await contains(".o_field_widget[name=name] input").edit("");
+
+    // simulate a tab switch
+    await hideTab();
+    await animationFrame();
+    expect(".o_notification").toHaveCount(1);
+    expect.verifySteps([]);
+
+    // make change and simulate another tab switch
+    await contains(".o_field_widget[name=name] input").edit("Jean-Claude Dusse");
+    await hideTab();
+    await animationFrame();
+    expect.verifySteps(["save"]);
+});
+
+test("hiding tab multiple times (invalid field) + make another change (no blur)", async () => {
+    onRpc("web_save", () => {
+        expect.step("save"); // should not be called
+    });
+    await mountView({
+        type: "form",
+        resModel: "partner",
+        arch: `<form><field name="name" required="1"/></form>`,
+        resId: 1,
+    });
+    expect(".o_field_widget[name=name] input").toHaveValue("Xavier Lancer");
+    await contains(".o_field_widget[name=name] input").edit("");
+
+    // simulate a tab switch
+    await hideTab();
+    await animationFrame();
+    expect(".o_notification").toHaveCount(1);
+    expect.verifySteps([]);
+
+    // make change and simulate another tab switch
+    await contains(".o_field_widget[name=name] input").edit("Jean-Claude", { confirm: false });
+    await hideTab();
+    await animationFrame();
+    expect.verifySteps(["save"]);
+});
+
 test.tags("desktop");
 test(`save when page changed`, async () => {
     defineActions([

From b062a89c93018e0a644b5b9226c0fc74bf483003 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 17 Oct 2025 14:29:39 +0200
Subject: [PATCH 321/673] [IMP] web: list: use sendBeacon to save urgently

In form views, we faced the issue that sometimes, when closing the
browser, changes weren't properly saved (despite being valid). This
especially happened when the payload was large (e.g. a lot of
changes in an html field), or on specific devices, or on slow
networks... PR [1] fixed the issue by using sendBeacon instead of
a regular xhr, as sendBeacon provides an API that guarantees to
reach the server. More details are available in [1].

However, we only applied that sendBeacon strategy in form views,
which were the most likely to be exposed to the issue. Recently [2],
we improved the kanban quick create feature and started using
sendBeacon as well, thus only leaving the list (among the 3
major views) as not using sendBeacon.

As the similar situation could occur in lists as well, this commit
thus enables it there.

Note that sendBeacon is only used when closing the browser while
there're pending changes in the UI. In other times, we still use
classical xhr.

[1] https://github.com/odoo/odoo/pull/149944
[2] https://github.com/odoo/odoo/pull/228632

Task~3537838

closes odoo/odoo#232118

Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
---
 .../static/src/views/list/list_controller.js  |  1 +
 .../static/tests/views/list/list_view.test.js | 64 ++++++++++++++-----
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/views/list/list_controller.js b/addons/web/static/src/views/list/list_controller.js
index b4e57a47a7a4d..061cf51326082 100644
--- a/addons/web/static/src/views/list/list_controller.js
+++ b/addons/web/static/src/views/list/list_controller.js
@@ -231,6 +231,7 @@ export class ListController extends Component {
                 onAskMultiSaveConfirmation: this.onAskMultiSaveConfirmation.bind(this),
                 onWillSetInvalidField: this.onWillSetInvalidField.bind(this),
             },
+            useSendBeaconToSaveUrgently: true,
         };
     }
 
diff --git a/addons/web/static/tests/views/list/list_view.test.js b/addons/web/static/tests/views/list/list_view.test.js
index 7aa207aee3a22..3eafcd7aeca7b 100644
--- a/addons/web/static/tests/views/list/list_view.test.js
+++ b/addons/web/static/tests/views/list/list_view.test.js
@@ -1,4 +1,4 @@
-import { expect, getFixture, test } from "@odoo/hoot";
+import { expect, getFixture, mockSendBeacon, test } from "@odoo/hoot";
 import {
     clear,
     click,
@@ -15809,9 +15809,17 @@ test(`Auto save: save on closing tab/browser`, async () => {
 });
 
 test(`Auto save: save on closing tab/browser (pending changes)`, async () => {
-    onRpc("foo", "web_save", ({ args }) => {
-        expect.step("web_save");
-        expect(args).toEqual([[1], { foo: "test" }]);
+    const sendBeaconDeferred = new Deferred();
+    mockSendBeacon((_, blob) => {
+        expect.step("sendBeacon");
+        blob.text().then((r) => {
+            const { params } = JSON.parse(r);
+            if (params.method === "web_save" && params.model === "foo") {
+                expect(params.args).toEqual([[1], { foo: "test" }]);
+            }
+            sendBeaconDeferred.resolve();
+        });
+        return true;
     });
 
     await mountView({
@@ -15822,12 +15830,16 @@ test(`Auto save: save on closing tab/browser (pending changes)`, async () => {
     await contains(`.o_data_cell`).click();
     await contains(`.o_data_cell [name=foo] input`).edit("test", { confirm: false });
 
-    await unload();
-    await animationFrame();
-    expect.verifySteps(["web_save"]);
+    const [event] = await unload();
+    await sendBeaconDeferred;
+    expect.verifySteps(["sendBeacon"]);
+    expect(event.defaultPrevented).toBe(false);
 });
 
 test(`Auto save: save on closing tab/browser (invalid field)`, async () => {
+    mockSendBeacon(() => {
+        expect.step("sendBeacon"); // should not be called
+    });
     onRpc("foo", "web_save", () => {
         expect.step("save"); // should not be called
     });
@@ -15856,9 +15868,18 @@ test(`Auto save: save on closing tab/browser (onchanges + pending changes)`, asy
 
     const deferred = new Deferred();
     onRpc("foo", "onchange", () => deferred);
-    onRpc("foo", "web_save", ({ args }) => {
-        expect.step("web_save");
-        expect(args).toEqual([[1], { int_field: 2021 }]);
+
+    const sendBeaconDeferred = new Deferred();
+    mockSendBeacon((_, blob) => {
+        expect.step("sendBeacon");
+        blob.text().then((r) => {
+            const { params } = JSON.parse(r);
+            if (params.method === "web_save" && params.model === "foo") {
+                expect(params.args).toEqual([[1], { int_field: 2021 }]);
+            }
+            sendBeaconDeferred.resolve();
+        });
+        return true;
     });
 
     await mountView({
@@ -15875,8 +15896,8 @@ test(`Auto save: save on closing tab/browser (onchanges + pending changes)`, asy
     await contains(`.o_data_cell [name="int_field"] input`).edit("2021", { confirm: "blur" });
 
     await unload();
-    await animationFrame();
-    expect.verifySteps(["web_save"]);
+    await sendBeaconDeferred;
+    expect.verifySteps(["sendBeacon"]);
 });
 
 test(`Auto save: save on closing tab/browser (onchanges)`, async () => {
@@ -15888,9 +15909,18 @@ test(`Auto save: save on closing tab/browser (onchanges)`, async () => {
 
     const deferred = new Deferred();
     onRpc("foo", "onchange", () => deferred);
-    onRpc("foo", "web_save", ({ args }) => {
-        expect.step("web_save");
-        expect(args).toEqual([[1], { foo: "test", int_field: 2021 }]);
+
+    const sendBeaconDeferred = new Deferred();
+    mockSendBeacon((_, blob) => {
+        expect.step("sendBeacon");
+        blob.text().then((r) => {
+            const { params } = JSON.parse(r);
+            if (params.method === "web_save" && params.model === "foo") {
+                expect(params.args).toEqual([[1], { foo: "test", int_field: 2021 }]);
+            }
+            sendBeaconDeferred.resolve();
+        });
+        return true;
     });
 
     await mountView({
@@ -15908,8 +15938,8 @@ test(`Auto save: save on closing tab/browser (onchanges)`, async () => {
     await contains(`.o_data_cell [name="foo"] input`).edit("test", { confirm: "blur" });
 
     await unload();
-    await animationFrame();
-    expect.verifySteps(["web_save"]);
+    await sendBeaconDeferred;
+    expect.verifySteps(["sendBeacon"]);
 });
 
 test.tags("desktop");

From 07a65ff345f75d03f1aa2a11d1e52fb3f06e127d Mon Sep 17 00:00:00 2001
From: chha-odoo <chha@odoo.com>
Date: Thu, 31 Jul 2025 18:55:11 +0530
Subject: [PATCH 322/673] [IMP] stock_account: add sum of total value column

- added the `sum` of column `total_value` in `product_product_view_list_at_date`
  view which opens from `inventory at date`.
- helps user to view the total valuation with sum till specific date directly
  from the `inventory at date` without any manual calculation.

TaskId : 4910031

closes odoo/odoo#221523

Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock_account/views/product_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 90fddd72508a4..25d9e5634b264 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -95,7 +95,7 @@
                     }"/>
                     <field name="total_value" string="Total Value" optional="hide" options="{
                         'currency_field': 'company_currency_id',
-                    }"/>
+                    }" sum="Total Value"/>
                 </field>
             </field>
         </record>

From e7ca99443f0366834af01d32fcddf27d467c19c1 Mon Sep 17 00:00:00 2001
From: Mahmoudk3m <kmah@odoo.com>
Date: Wed, 5 Nov 2025 12:32:01 +0000
Subject: [PATCH 323/673] [IMP] hr: update employee view layout for better
 responsiveness

Replace the generic col class with explicit col-12 col-sm-6 col-md-7 col-lg-8
so the right-hand panel spans full width on mobile but leaves room for the avatar on bigger screens

task-5238383

closes odoo/odoo#234718

X-original-commit: a1a2e11c35506485ea4335efac0354e278335c4c
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
Signed-off-by: Mahmoud Khaled (kmah) <kmah@odoo.com>
---
 addons/hr/views/hr_employee_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index 77604d2e6fa6c..74465ae2c9dfe 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -135,8 +135,8 @@
                                 <field name="image_1920" widget='image' class="m-0" options='{"size": [128,158], "zoom": true, "preview_image":"avatar_128"}'/>
                                 <field name="show_hr_icon_display" invisible="1" />
                             </div>
-                            <div class="col px-4">
-                                <div class="oe_title ps-0 pe-sm-2">
+                            <div class="col-12 col-sm-6 col-md-7 col-lg-8 px-4">
+                                <div class="oe_title mw-100 ps-0 pe-sm-2">
                                     <h1 class="d-flex flex-row align-items-center">
                                         <field name="name" placeholder="Employee's Name"
                                             required="True" style="font-size: min(4vw, 2.6rem);"/>

From 9eed6c81e170348c1b7790f1bc4bc003b8835a61 Mon Sep 17 00:00:00 2001
From: Agustin Castro Bugallo <agcb@odoo.com>
Date: Mon, 20 Oct 2025 12:36:38 +0000
Subject: [PATCH 324/673] [FIX] uom: Cap the value of uom.sequence to prevent
 out of range
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The default value of uom.sequence is calculated as uom.relative_factor * 100.
If the value of relative_factor is big enough, it can be bigger than what the
int column can handle and trigger
```
ERROR: integer out of range
```
So we just cap it at an arbitrary value.

To reproduce:
- Create an uom with relative factor bigger than 2147483647.

closes odoo/odoo#234721

X-original-commit: b36b4316d9d16ad26531ed21a67b3a5ce63ff720
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
Signed-off-by: Agustín Castro Bugallo (agcb) <agcb@odoo.com>
---
 addons/uom/models/uom_uom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/uom/models/uom_uom.py b/addons/uom/models/uom_uom.py
index 40813c525a073..87b768bb3ce21 100644
--- a/addons/uom/models/uom_uom.py
+++ b/addons/uom/models/uom_uom.py
@@ -57,7 +57,7 @@ def _compute_sequence(self):
                 # Only set a default sequence before the record creation, or on module update if
                 # there is no value.
                 continue
-            uom.sequence = int(uom.relative_factor * 100.0)
+            uom.sequence = min(int(uom.relative_factor * 100.0), 1000)
 
     def _compute_rounding(self):
         """ All Units of Measure share the same rounding precision defined in 'Product Unit'.

From bd5aa5afc6e0da172de0b37db7d55f02a6ff4969 Mon Sep 17 00:00:00 2001
From: nsirjacobs <nosir@odoo.com>
Date: Mon, 27 Oct 2025 14:59:49 +0000
Subject: [PATCH 325/673] [FIX] mrp_account: allow for inventory valuation when
 no valuation account in set

Behavior:
Current:
When generating the inventory valuation report, if the default stock valuation account is removed in the company settings, the system assumes that there will be an account linked to the debit/credit and will attempt to access it without any other check which will lead to an IndexError.

Expected:
We want to avoid blocking users as much as we can, so we will allow users to generate the report without the account and later fallback to stopping them with a warning if they try to generate an accounting entry from the valuation. Since we are now checking that there is an account before trying to access it, it doesnt matter if it is empty.

Steps to reproduce:

- Enable warehouse locations
- Make sure the Production location has a 'Cost of Production' account.
- Create two products with costs and prices
- Create a bom and manufacture one of the products.
- Go to Settings/Inventory Valuation and remove the Valuation Account
- When trying to generate the Inventory Valuation, you should get a traceback

opw-5184300

closes odoo/odoo#234720

X-original-commit: 6e9016e856d109a20e8bdaa9d45126e76228464e
Signed-off-by: Adrien Widart (awt) <awt@odoo.com>
Signed-off-by: Noam Sirjacobs (nosir) <nosir@odoo.com>
---
 addons/mrp_account/report/stock_valuation_report.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_account/report/stock_valuation_report.py b/addons/mrp_account/report/stock_valuation_report.py
index 7fe302b125939..2fb158a73f41b 100644
--- a/addons/mrp_account/report/stock_valuation_report.py
+++ b/addons/mrp_account/report/stock_valuation_report.py
@@ -24,8 +24,9 @@ def _get_report_data(self, date=False, product_category=False, warehouse=False):
         })
         for vals in production_locations_valuation_vals:
             account = self.env['account.account'].browse(vals['account_id'])
-            account_vals = account.read(['name', 'code', 'display_name'])[0]
-            report_data['accounts_by_id'][account.id] = account_vals
+            if account:
+                account_vals = account.read(['name', 'code', 'display_name'])[0]
+                report_data['accounts_by_id'][account.id] = account_vals
             cost_of_production['value'] -= vals['debit']
             lines_by_account_id[account.id]['debit'] += vals['debit']
             lines_by_account_id[account.id]['credit'] += vals['credit']

From afd213935f31138164cc946842616480753c55ec Mon Sep 17 00:00:00 2001
From: omra-odoo <omra@odoo.com>
Date: Tue, 4 Nov 2025 09:25:48 +0000
Subject: [PATCH 326/673] [FIX] web: display the provided no content helper
 when no matching data

Before this commit:
In the graph view, when performing a search that yields no matching data, the
default no content helper is shown even if a custom no content helper has been
provided for that action window.

After this commit:
The provided no content helper for the action window is displayed instead.

task-5136801

closes odoo/odoo#234738

X-original-commit: 5b911a97a3885283d2f21ac30abb96cb10fe39d9
Signed-off-by: Elliot Cosneau (elco) <elco@odoo.com>
---
 .../src/views/graph/graph_controller.xml      |  2 +-
 .../tests/views/graph/graph_view.test.js      | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/views/graph/graph_controller.xml b/addons/web/static/src/views/graph/graph_controller.xml
index 791dd47d682e3..10b1aab9810db 100644
--- a/addons/web/static/src/views/graph/graph_controller.xml
+++ b/addons/web/static/src/views/graph/graph_controller.xml
@@ -65,7 +65,7 @@
                 </t>
                 <t t-if="model.isReady and model.data">
 					<t t-if="!model.hasData() or model.useSampleModel and props.info.noContentHelp">
-						<ActionHelper noContentHelp="props.noContentHelp" showRibbon="model.useSampleModel"/>
+						<ActionHelper noContentHelp="props.info.noContentHelp" showRibbon="model.useSampleModel"/>
                     </t>
                     <t t-component="props.Renderer" model="model" buttonTemplate="props.buttonTemplate" />
                 </t>
diff --git a/addons/web/static/tests/views/graph/graph_view.test.js b/addons/web/static/tests/views/graph/graph_view.test.js
index 36859382306b0..8ddf29b33d0b1 100644
--- a/addons/web/static/tests/views/graph/graph_view.test.js
+++ b/addons/web/static/tests/views/graph/graph_view.test.js
@@ -1255,6 +1255,27 @@ test("no content helper after update", async () => {
     expect(".abc").toHaveCount(0);
 });
 
+test("display the provided no content helper when search has no matching data", async () => {
+    Foo._records = [];
+
+    await mountView({
+        type: "graph",
+        resModel: "foo",
+        noContentHelp: /* xml */ `
+            <p class="abc">This helper should be displayed</p>
+        `,
+    });
+
+    expect(".o_graph_canvas_container canvas").toHaveCount(1);
+    expect(".o_view_nocontent").toHaveCount(0);
+
+    await toggleSearchBarMenu();
+    await toggleMenuItem("color");
+
+    expect(".o_graph_canvas_container canvas").toHaveCount(0);
+    expect(".o_nocontent_help:contains(This helper should be displayed)").toHaveCount(1);
+});
+
 test("can reload with other group by", async () => {
     const view = await mountView({
         type: "graph",

From 28f96806a832be484bdcb3a485fe9eaaec6cdc6c Mon Sep 17 00:00:00 2001
From: ELCO <elco@odoo.com>
Date: Wed, 5 Nov 2025 12:30:38 +0000
Subject: [PATCH 327/673] [FIX] test_lint: TestDocstring panics when checking
 types

This commit fixes a bug in `TestDocstring` when a method has type hint
specified both in the docstring and as a type hint.

Example:
```
def example(a: list[int]) -> int:
    """
    :param list[int] a: a list
    :rtype: int
    """
    return len(a)
```

the `_test_docstring_params` method will break twice:
- the `rtype` check raises `AssertionError: <class 'int'> != 'int'`
- the `type` check raises `AssertionError: list[int] != 'list[int]'`

closes odoo/odoo#234646

X-original-commit: 5913acbcb331e3ca2236fcb10a8e4e79daee2414
Signed-off-by: Julien Castiaux (juc) <juc@odoo.com>
Signed-off-by: Elliot Cosneau (elco) <elco@odoo.com>
---
 odoo/addons/test_lint/tests/test_docstring.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/odoo/addons/test_lint/tests/test_docstring.py b/odoo/addons/test_lint/tests/test_docstring.py
index 3beb6811ab528..8e20fbd86d678 100644
--- a/odoo/addons/test_lint/tests/test_docstring.py
+++ b/odoo/addons/test_lint/tests/test_docstring.py
@@ -303,7 +303,7 @@ def _test_docstring_params(self, method, doctree):
         sign_rtype = signature.return_annotation
 
         if sign_rtype != signature.empty and doc_rtype != signature.empty:
-            self.assertEqual(sign_rtype, doc_rtype)
+            self.assertEqual(self._stringify_annotation(sign_rtype), doc_rtype)
 
         try:
             m = "the docstring is documenting non-existing parameters"
@@ -326,6 +326,9 @@ def _test_docstring_params(self, method, doctree):
         for param, doc_type in doc_types.items():
             sign_type = sign_types.get(param, signature.empty)
             if sign_type != signature.empty:
-                if isinstance(sign_type, type):
-                    sign_type = sign_type.__name__
-                self.assertEqual(sign_type, doc_type)
+                self.assertEqual(self._stringify_annotation(sign_type), doc_type)
+
+    def _stringify_annotation(self, sign_type):
+        if isinstance(sign_type, type):
+            sign_type = sign_type.__name__
+        return str(sign_type)

From e0a0dbcf72c39a576f1296fb92f1b570ab78f58b Mon Sep 17 00:00:00 2001
From: Odoo <ammu@odoo.com>
Date: Tue, 14 Oct 2025 18:35:07 +0000
Subject: [PATCH 328/673] [FIX] purchase: Fix purchase warning text

When creating a purchase order for a partner without a name, a traceback occurs.

Steps to reproduce the error:

- Install purchase with demo data
- Enable purchase warning from settings
- Open Azure Interior Contact > In Contact, Add Contact > Type: invoice >
Save & close
- Add warning in newly created contact
- Create a purchase order with the newly created partner and create an invoice
with the newly created partner

Traceback:
TypeError: unsupported operand type(s) for +: 'bool' and 'str'

https://github.com/odoo/odoo/blob/96887e0b9e7a9b01482b9dc1fcf99040e9de6b2c/addons/purchase/models/purchase_order.py#L298

https://github.com/odoo/odoo/blob/96887e0b9e7a9b01482b9dc1fcf99040e9de6b2c/addons/purchase/models/account_invoice.py#L131

Here, "partner_id.name" is "False," which leads to string concatenation with
a boolean in purchase warning messages and results in the above traceback.

closes odoo/odoo#234760

X-original-commit: 9beffff2b27f8453ad235bb60ad35732a3068c28
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/purchase/models/account_invoice.py |  2 +-
 addons/purchase/models/purchase_order.py  |  2 +-
 addons/purchase/tests/test_purchase.py    | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index aa8b6a8857676..299ce17ea5095 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -128,7 +128,7 @@ def _compute_purchase_warning_text(self):
                 continue
             warnings = OrderedSet()
             if partner_msg := move.partner_id.purchase_warn_msg:
-                warnings.add(move.partner_id.name + ' - ' + partner_msg)
+                warnings.add((move.partner_id.name or move.partner_id.display_name) + ' - ' + partner_msg)
             for product in move.invoice_line_ids.product_id:
                 if product_msg := product.purchase_line_warn_msg:
                     warnings.add(product.display_name + ' - ' + product_msg)
diff --git a/addons/purchase/models/purchase_order.py b/addons/purchase/models/purchase_order.py
index 17b28edaede18..20438c13791ec 100644
--- a/addons/purchase/models/purchase_order.py
+++ b/addons/purchase/models/purchase_order.py
@@ -296,7 +296,7 @@ def _compute_purchase_warning_text(self):
         for order in self:
             warnings = OrderedSet()
             if partner_msg := order.partner_id.purchase_warn_msg:
-                warnings.add(order.partner_id.name + ' - ' + partner_msg)
+                warnings.add((order.partner_id.name or order.partner_id.display_name) + ' - ' + partner_msg)
             for line in order.order_line:
                 if product_msg := line.purchase_line_warn_msg:
                     warnings.add(line.product_id.display_name + ' - ' + product_msg)
diff --git a/addons/purchase/tests/test_purchase.py b/addons/purchase/tests/test_purchase.py
index f7f4e415bba2c..61466ac13062e 100644
--- a/addons/purchase/tests/test_purchase.py
+++ b/addons/purchase/tests/test_purchase.py
@@ -874,7 +874,10 @@ def test_purchase_warnings(self):
         """Test warnings when partner/products with purchase warnings are used."""
         partner_with_warning = self.env['res.partner'].create({
             'name': 'Test Partner', 'purchase_warn_msg': 'Highly infectious disease'})
+        child_partner = self.env['res.partner'].create({
+            'type': 'invoice', 'parent_id': partner_with_warning.id, 'purchase_warn_msg': 'Slightly infectious disease'})
         purchase_order = self.env['purchase.order'].create({'partner_id': partner_with_warning.id})
+        purchase_order2 = self.env['purchase.order'].create({'partner_id': child_partner.id})
 
         product_with_warning1 = self.env['product.product'].create({
             'name': 'Test Product 1', 'purchase_line_warn_msg': 'Highly corrosive'})
@@ -894,12 +897,23 @@ def test_purchase_warnings(self):
                 'order_id': purchase_order.id,
                 'product_id': product_with_warning1.id,
             },
+            {
+                'order_id': purchase_order2.id,
+                'product_id': product_with_warning2.id,
+            },
         ])
+        purchase_order2.button_confirm()
+        purchase_order2.action_create_invoice()
+        invoice = Form(purchase_order2.invoice_ids[0])
 
         expected_warnings = ('Test Partner - Highly infectious disease',
                              'Test Product 1 - Highly corrosive',
                              'Test Product 2 - Toxic pollutant')
+        expected_warnings_for_purchase_order2 = ('Test Partner, Invoice - Slightly infectious disease',
+                                             'Test Product 2 - Toxic pollutant')
         self.assertEqual(purchase_order.purchase_warning_text, '\n'.join(expected_warnings))
+        self.assertEqual(purchase_order2.purchase_warning_text, '\n'.join(expected_warnings_for_purchase_order2))
+        self.assertEqual(invoice.purchase_warning_text, '\n'.join(expected_warnings_for_purchase_order2))
 
     def test_bill_in_purchase_matching_individual(self):
         """

From 8d270158f4d20f533297ba0e2a5ca9b7a0810189 Mon Sep 17 00:00:00 2001
From: Enric Tobella <enric.tobella@dixmit.com>
Date: Mon, 29 Sep 2025 10:09:24 +0000
Subject: [PATCH 329/673] [IMP] l10n_es: add extra IGIC Data

We have splitted purchase taxes in goods and services
because there are different mappings according to the scope.

It has a similar functionality with spanish mainland taxes

+ add DUA taxes for Canary Islands

closes odoo/odoo#234394

X-original-commit: 96264f88e6ea2dc61ba6c546f9f1a03d49df55ea
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
---
 ...count.fiscal.position-es_canary_common.csv |   5 +-
 .../template/account.tax-es_canary_common.csv | 930 ++++++++++--------
 .../template/account.tax.group-es_common.csv  |   2 +
 .../account.tax.group-es_common_mainland.csv  |   2 -
 4 files changed, 498 insertions(+), 441 deletions(-)

diff --git a/addons/l10n_es/data/template/account.fiscal.position-es_canary_common.csv b/addons/l10n_es/data/template/account.fiscal.position-es_canary_common.csv
index c77c310c57fd9..d908435c8a548 100644
--- a/addons/l10n_es/data/template/account.fiscal.position-es_canary_common.csv
+++ b/addons/l10n_es/data/template/account.fiscal.position-es_canary_common.csv
@@ -1,10 +1,11 @@
 "id","sequence","name","name@es","auto_apply","vat_required","state_ids","country_id"
 "fp_canary_1","1","Canary Islands","Régimen Islas Canarias","1","0","base.state_es_tf,base.state_es_gc","base.es"
-"fp_nacional_canary_ns","2","National Regime Not subject","Régimen Nacional No sujeto","1","","","base.es"
+"fp_nacional_canary_ns","2","National Regime Not subject","Régimen Nacional No sujeto","","","","base.es"
 "fp_extra_canary","4","Non-EU Regime Canary Islands","Régimen Extracomunitario Islas Canarias","1","","",""
 "fp_recargo_canary","","Canary Islands Equivalence Surcharge (Import)","Recargo de Equivalencia Islas Canarias (Importación)","","","",""
 "fp_irpf9_canary","","Personal Income Tax Withholding 9% Canary Islands","Retención IRPF 9% Islas Canarias","","","",""
 "fp_irpf15_canary","","Personal Income Tax Withholding 15% Canary Islands","Retención IRPF 15% Islas Canarias","","","",""
 "fp_irpf19a_canary","","Retention 19% leases Canary Islands","Retención 19% arrendamientos Islas Canarias","","","",""
-"fp_ispn_canary","","Investment of the Passive Person Canary Islands","Inversion del Sujeto Pasivo Islas Canarias","","","",""
+"fp_ispn_canary","","Reverse Charge Canary Islands","Inversion del Sujeto Pasivo Islas Canarias","","","",""
 "fp_retailer_canary","","Canary Islands Retail Regime","Régimen Minoristas Islas Canarias","","","",""
+"fp_dua","","DUA","DUA","","","",""
diff --git a/addons/l10n_es/data/template/account.tax-es_canary_common.csv b/addons/l10n_es/data/template/account.tax-es_canary_common.csv
index 7278c6d5e6294..6c1acc1494170 100644
--- a/addons/l10n_es/data/template/account.tax-es_canary_common.csv
+++ b/addons/l10n_es/data/template/account.tax-es_canary_common.csv
@@ -1,437 +1,493 @@
-"id","sequence","active","type_tax_use","description","description@es","name","name@es","amount","amount_type","tax_group_id","price_include_override","repartition_line_ids/repartition_type","repartition_line_ids/document_type","repartition_line_ids/account_id","repartition_line_ids/factor_percent","repartition_line_ids/tag_ids","fiscal_position_ids","original_tax_ids","l10n_es_type"
-"account_tax_template_igic_r_7","0","True","sale","IGIC 7%","IGIC 7%","7%","7%","7","percent","tax_group_igic_7","","base","invoice","","","mod420[7]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_7",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[9]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","",""
-"account_tax_template_igic_r_0","1","True","sale","IGIC 0%","IGIC 0%","0%","0%","0","percent","tax_group_igic_0","","base","invoice","","","mod420[1]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_0",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_r_3","1","True","sale","IGIC 3%","IGIC 3%","3%","3%","3","percent","tax_group_igic_3","","base","invoice","","","mod420[4]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_3",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[6]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","",""
-"account_tax_template_igic_r_5","1","True","sale","IGIC 5%","IGIC 5%","5%","5%","3","percent","tax_group_igic_3","","base","invoice","","","mod420[4]","fp_canary_1","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[6]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","",""
-"account_tax_template_igic_r_9_5","1","True","sale","IGIC 9.5%","IGIC 9,5%","9.5%","9.5%","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[10]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_9_5",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[12]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","",""
-"account_tax_template_igic_r_15","1","True","sale","IGIC 15%","IGIC 15%","15%","15%","15","percent","tax_group_igic_15","","base","invoice","","","mod420[13]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_15",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[15]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","",""
-"account_tax_template_igic_r_20","1","True","sale","IGIC 20%","IGIC 20%","20%","20%","20","percent","tax_group_igic_20","","base","invoice","","","mod420[16]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_20",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[18]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[21]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","",""
-"account_tax_template_igic_s_ISP0","1","True","sale","IGIC 0% Sale Reverse Charge","IGIC 0% Venta con Inversión del Sujeto Pasivo","0% Sale RC","0% Venta ISP","0","percent","tax_group_igic_0","","base","invoice","","","","fp_ispn_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_ex_0","1","True","sale","IGIC 0% (Exports)","IGIC 0% (Exportaciones)","0% EX","0% EX","0","percent","tax_group_igic_0","","base","invoice","","","","fp_extra_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_re_ex","1","True","sale","IGIC Exempt Passed On","IGIC Exento Repercutido","EXEMPT PO","EXEMPT REP","0","percent","tax_group_igic_ex","","base","invoice","","","","fp_canary_1","",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_cmino","1","True","sale","Exempt for Retail Trade","Exento por Comercio minorista","EXEMPT RT","EXEMPT CM","0","percent","tax_group_igic_cmino","","base","invoice","","","","fp_retailer_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_sop_cmino","1","True","purchase","Exempt for Retail Trade","Exento por Comercio minorista","EXEMPT RT","EXEMPT CM","0","percent","tax_group_igic_cmino","","base","invoice","","","mod420[26]","fp_retailer_canary","",""
-"","","","","","","","","","","","","tax","invoice","","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","","","mod420[35]","","",""
-"account_tax_template_igic_sop_3_cmino","1","True","purchase","IGIC 3% (Retail trade)","IGIC 3% (Comercio minorista)","3% RT","3% CM","2.1","percent","tax_group_igic_cmino","tax_included","base","invoice","","","mod420[26]","fp_retailer_canary","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_7_cmino","0","True","purchase","IGIC 7% (Retail trade)","IGIC 7% (Comercio minorista)","7% RT","7% CM","4.9","percent","tax_group_igic_cmino","tax_included","base","invoice","","","mod420[26]","fp_retailer_canary","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_9_5_cmino","1","True","purchase","IGIC 9.5% (Retail trade)","IGIC 9,5% (Comercio minorista)","9.5% RT","9.5% CM","6.65","percent","tax_group_igic_cmino","tax_included","base","invoice","","","mod420[26]","fp_retailer_canary","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_15_cmino","1","True","purchase","IGIC 15% (Retail trade)","IGIC 15% (Comercio minorista)","15% RT","15% CM","10.5","percent","tax_group_igic_cmino","tax_included","base","invoice","","","mod420[26]","fp_retailer_canary","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_20_cmino","1","True","purchase","IGIC 20% (Retail trade)","IGIC 20% (Comercio minorista)","20% RT","20% CM","14","percent","tax_group_igic_cmino","tax_included","base","invoice","","","mod420[26]","fp_retailer_canary","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_s_igic_ns","1","True","sale","IGIC Not subject Passed on","IGIC No sujeto Repercutido","NS","NSR","0","percent","tax_group_igic_0","","base","invoice","","","","fp_nacional_canary_ns","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_p_ex","1","True","purchase","IGIC Exempt Supported","IGIC Exento Soportado","EXEMPT S","EXENTO S","0","percent","tax_group_igic_ex","","base","invoice","","","","fp_canary_1","",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_sop_0","1","True","purchase","IGIC 0% (Goods)","IGIC 0% (Bienes corrientes)","0% G","0% B","0","percent","tax_group_igic_0","","base","invoice","","","","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_0",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_sop_3","1","True","purchase","IGIC 3% (Goods)","IGIC 3% (Bienes corrientes)","3% G","3% B","3","percent","tax_group_igic_3","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_3",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_5","1","True","purchase","IGIC 5% (Goods)","IGIC 5% (Bienes corrientes)","5% G","5% B","5","percent","tax_group_igic_3","","base","invoice","","","mod420[26]","fp_canary_1","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_7","1","True","purchase","IGIC 7% (Goods)","IGIC 7% (Bienes corrientes)","7% G","7% B","7","percent","tax_group_igic_7","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_7",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_9_5","1","True","purchase","IGIC 9.5% (Goods)","IGIC 9,5% (Bienes corrientes)","9.5% G","9.5% B","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_9_5",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_15","1","True","purchase","IGIC 15% (Goods)","IGIC 15% (Bienes corrientes)","15% G","15% B","15","percent","tax_group_igic_15","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_15",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_20","1","True","purchase","IGIC 20% (Goods)","IGIC 20% (Bienes corrientes)","20% G","20% B","20","percent","tax_group_igic_20","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_20",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_0_inv","1","True","purchase","IGIC 0% (Investment goods)","IGIC 0% (Bienes de inversión)","0% IG","0% BI","0","percent","tax_group_igic_0","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_0_inv",""
-"","","","","","","","","","","","","tax","invoice","","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","","","mod420[35]","","",""
-"account_tax_template_igic_sop_3_inv","1","True","purchase","IGIC 3% (Investment goods)","IGIC 3% (Bienes de inversión)","3% IG","3% BI","3","percent","tax_group_igic_3","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_3_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_5_inv","1","True","purchase","IGIC 5% (Investment goods)","IGIC 5% (Bienes de inversión)","5% IG","3% BI","3","percent","tax_group_igic_3","","base","invoice","","","mod420[28]","fp_canary_1","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_7_inv","1","True","purchase","IGIC 7% (Investment goods)","IGIC 7% (Bienes de inversión)","7% IG","7% BI","7","percent","tax_group_igic_7","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_7_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_9_5_inv","1","True","purchase","IGIC 9.5% (Investment goods)","IGIC 9,5% (Bienes de inversión)","9.5% IG","9.5% BI","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_9_5_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_15_inv","1","True","purchase","IGIC 15% (Investment goods)","IGIC 15% (Bienes de inversión)","15% IG","15% BI","15","percent","tax_group_igic_15","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_15_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_20_inv","1","True","purchase","IGIC 20% (Investment goods)","IGIC 20% (Bienes de inversión)","20% IG","20% BI","20","percent","tax_group_igic_20","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_20_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_0","1","True","purchase","IGIC 0% Imports (Goods)","IGIC 0% Importaciones (Bienes corrientes)","0% G Import","0% B Import","0","percent","tax_group_igic_0","","base","invoice","","","","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_0",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_sop_i_3","1","True","purchase","IGIC 3% Imports (Goods)","IGIC 3% Importaciones (Bienes corrientes)","3% G Import","3% B Import","3","percent","tax_group_igic_3","","base","invoice","","","mod420[30]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_3",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_7","1","True","purchase","IGIC 7% Imports (Goods)","IGIC 7% Importaciones (Bienes corrientes)","7% G Import","7% B Import","7","percent","tax_group_igic_7","","base","invoice","","","mod420[30]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_7",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_9_5","1","True","purchase","IGIC 9.5% Imports (Goods)","IGIC 9,5% Importaciones (Bienes corrientes)","9.5% G Import","9.5% B Import","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[30]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_9_5",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_15","1","True","purchase","IGIC 15% Imports (Goods)","IGIC 15% Importaciones (Bienes corrientes)","15% G Import","15% B Import","15","percent","tax_group_igic_15","","base","invoice","","","mod420[30]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_15",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_20","1","True","purchase","IGIC 20% Imports (Goods)","IGIC 20% Importaciones (Bienes corrientes)","20% G Import","20% B Import","20","percent","tax_group_igic_20","","base","invoice","","","mod420[30]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_20",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_0_inv","1","True","purchase","IGIC 0% Imports (Investment goods)","IGIC 0% Importaciones (Bienes de inversión)","0% IG Import","0% BI Import","0","percent","tax_group_igic_0","","base","invoice","","","","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_0_inv",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_igic_sop_i_3_inv","1","True","purchase","IGIC 3% Imports (Investment goods)","IGIC 3% Importaciones (Bienes de inversión)","3% IG Import","3% BI Import","3","percent","tax_group_igic_3","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_3_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_7_inv","1","True","purchase","IGIC 7% Imports (Investment goods)","IGIC 7% Importaciones (Bienes de inversión)","7% IG Import","7% BI Import","7","percent","tax_group_igic_7","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_7_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_9_5_inv","1","True","purchase","IGIC 9.5% Imports (Investment goods)","IGIC 9,5% Importaciones (Bienes de inversión)","9.5% IG Import","9.5% BI Import","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_9_5_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_15_inv","1","True","purchase","IGIC 15% Imports (Investment goods)","IGIC 15% Importaciones (Bienes de inversión)","15% IG Import","15% BI Import","15","percent","tax_group_igic_15","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_15_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_sop_i_20_inv","1","True","purchase","IGIC 20% Imports (Investment goods)","IGIC 20% Importaciones (Bienes de inversión)","20% IG Import","20% BI Import","20","percent","tax_group_igic_20","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_20_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_ISP0","1","True","purchase","IGIC 0% Reverse Charge","IGIC 0% con Inversión del Sujeto Pasivo","0% RC","0% ISP","0","percent","tax_group_igic_0","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0",""
-"","","","","","","","","","","","","tax","invoice","","","mod420[20]||mod420[27]","","",""
-"","","","","","","","","","","","","tax","invoice","","-100","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","","","mod420[20]||mod420[35]","","",""
-"","","","","","","","","","","","","tax","refund","","-100","","","",""
-"account_tax_template_igic_ISP3","1","True","purchase","IGIC 3% Reverse Charge","IGIC 3% con Inversión del Sujeto Pasivo","3% RC","3% ISP","3","percent","tax_group_igic_3","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary","account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","",""
-"account_tax_template_igic_ISP7","1","True","purchase","IGIC 7% Reverse Charge","IGIC 7% con Inversión del Sujeto Pasivo","7% RC","7% ISP","7","percent","tax_group_igic_7","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary","account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","",""
-"account_tax_template_igic_ISP95","1","True","purchase","IGIC 9.5% Reverse Charge","IGIC 9,5% con Inversión del Sujeto Pasivo","9.5% RC","9.5% ISP","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary","account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","",""
-"account_tax_template_igic_ISP15","1","True","purchase","IGIC 15% Reverse Charge","IGIC 15% con Inversión del Sujeto Pasivo","15% RC","15% ISP","15","percent","tax_group_igic_15","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary","account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","",""
-"account_tax_template_igic_ISP20","1","True","purchase","IGIC 20% Reverse Charge","IGIC 20% con Inversión del Sujeto Pasivo","20% RC","20% ISP","20","percent","tax_group_igic_20","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary","account_tax_template_igic_sop_20,account_tax_template_igic_sop_20_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","",""
-"account_tax_template_igic_p_re0","1","True","purchase","IGIC 0% (Import surcharge)","IGIC 0%  (Recargo a la importación)","0% IS","0% RI","0","percent","tax_group_igic_re_0","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0",""
-"","","","","","","","","","","","","tax","invoice","","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","","","mod420[35]","","",""
-"account_tax_template_igic_p_re03","1","True","purchase","IGIC 0.30% (Import surcharge)","IGIC 0,30%  (Recargo a la importación)","3% IS","3% RI","0.3","percent","tax_group_igic_re_03","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_p_re07","1","True","purchase","IGIC 0.7% (Import surcharge)","IGIC 0,7%  (Recargo a la importación)","7% IS","7% RI","0.7","percent","tax_group_igic_re_07","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_p_re095","1","True","purchase","IGIC 0.95% (Import surcharge)","IGIC 0,95%  (Recargo a la importación)","9.5% IS","9.5% RI","0.95","percent","tax_group_igic_re_095","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_p_re15","1","True","purchase","IGIC 1.5% (Import surcharge)","IGIC 1,5%  (Recargo a la importación)","15% IS","15% RI","1.5","percent","tax_group_igic_re_15","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_igic_p_re20","1","True","purchase","IGIC 2% (Import surcharge)","IGIC 2%  (Recargo a la importación)","20% IS","20% RI","2","percent","tax_group_igic_re_20","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_20,account_tax_template_igic_sop_20_inv",""
-"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","",""
-"","","","","","","","","","","","","base","refund","","","mod420[34]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","",""
-"account_tax_template_p_igic_ns","1","True","purchase","IGIC not subject","IGIC no sujeto","NS","NS","0","percent","tax_group_igic_0","","base","invoice","","","","fp_nacional_canary_ns","account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_3,account_tax_template_igic_sop_15,account_tax_template_igic_sop_0,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_20",""
-"","","","","","","","","","","","","tax","invoice","","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","","","","","",""
-"account_tax_template_s_irpf9","1000","True","sale","9% Withholding income tax ","Retenciones a cuenta IRPF 9%","9% WHI","Retención 9%","-9.0","percent","tax_group_retenciones_9","","base","invoice","","","","fp_irpf9_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_3,account_tax_template_igic_r_7,account_tax_template_igic_r_9_5,account_tax_template_igic_r_15,account_tax_template_igic_r_20","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf18","1000","True","sale","18% Withholding income tax","Retenciones a cuenta IRPF 18%","18% WHI","Retención 18%","-18.0","percent","tax_group_retenciones_18","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf19","1000","True","sale","19% Withholding income tax","Retenciones a cuenta IRPF 19%","19% WHI","Retención 19%","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf19a","1000","True","sale","19% Withholding (leases)","Retenciones a cuenta 19% (Arrendamientos)","19% WH lease","Retención 19% (Arrend.)","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","","fp_irpf19a_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_3,account_tax_template_igic_r_7,account_tax_template_igic_r_9_5,account_tax_template_igic_r_15,account_tax_template_igic_r_20","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf195a","1000","True","sale","19.5% Withholding (leases)","Retenciones a cuenta 19,5% (Arrendamientos)","19.5% WH lease","Retención 19,5% (Arrend.)","-19.5","percent","tax_group_retenciones_19-5","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_p_irpf19","1000","True","purchase","19% Withholding income tax","Retenciones IRPF 19%","19% WHI","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf20a","1000","True","purchase","20% Withholding (leases)","Retenciones 20% (Arrendamientos)","20% WH lease","","-20.0","percent","tax_group_retenciones_20","","base","invoice","","","mod115[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod115[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","",""
-"account_tax_template_p_irpf18","1000","True","purchase","18% Withholding income tax","Retenciones IRPF 18%","18% WHI","","-18.0","percent","tax_group_retenciones_18","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf19a","1000","True","purchase","19% Withholding (leases)","Retenciones 19% (Arrendamientos)","19% WH lease","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","mod115[02]","fp_irpf19a_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_20","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod115[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","",""
-"account_tax_template_p_irpf195a","1000","True","purchase","19.5% Withholding (leases)","Retenciones 19,5% (Arrendamientos)","19.5% WH lease","","-19.5","percent","tax_group_retenciones_19-5","","base","invoice","","","mod115[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod115[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","",""
-"account_tax_template_p_irpf7","1000","True","purchase","7% Withholding income tax","Retenciones IRPF 7%","7% WHI","","-7.0","percent","tax_group_retenciones_7","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf9","1000","True","purchase","9% Withholding income tax","Retenciones IRPF 9%","9% WHI","","-9.0","percent","tax_group_retenciones_9","","base","invoice","","","mod111[08]","fp_irpf9_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_20","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf24","1000","True","purchase","24% Withholding income tax","Retenciones IRPF 24%","24% WHI","","-24.0","percent","tax_group_retenciones_24","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf24_rdc","1000","True","purchase","24% Withholding on capital","Retenciones IRPF 24% (Rendimientos del capital)","24% WH RDC","","-24.0","percent","tax_group_retenciones_24","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_s_irpf20","1000","True","sale","20% Withholding income tax","Retenciones a cuenta IRPF 20%","20% WHI","Retención 20%","-20.0","percent","tax_group_retenciones_20","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf20a","1000","True","sale","20% Withholding (leases)","Retenciones a cuenta 20% (Arrendamientos)","20% WH lease","Retención 20% (Arrend.)","-20.0","percent","tax_group_retenciones_20","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf24","1000","True","sale","24% Withholding income tax","Retenciones a cuenta IRPF 24%","24% WHI","Retención 24%","-24.0","percent","tax_group_retenciones_24","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf24_rdc","1000","True","sale","24% Withholding on Capital","Retención 24% (Rendimientos del capital)","24% WH RDC","Retención 24%","-24.0","percent","tax_group_retenciones_24","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf1","1000","True","sale","1% Withholding income tax","Retenciones a cuenta IRPF 1%","1% WHI","Retención 1%","-1.0","percent","tax_group_retenciones_1","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf2","1000","True","sale","2% Withholding income tax","Retenciones a cuenta IRPF 2%","2% WHI","Retención 2%","-2.0","percent","tax_group_retenciones_2","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf21","1000","True","sale","21% Withholding income tax","Retenciones a cuenta IRPF 21%","21% WHI","Retención 21%","-21.0","percent","tax_group_retenciones_21","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf21a","1000","True","sale","21% Withholding (leases)","Retenciones a cuenta 21% (Arrendamientos)","21% WH lease","Retención 21% (Arrend.)","-21.0","percent","tax_group_retenciones_21","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf7","1000","True","sale","7% Withholding income tax","Retenciones a cuenta IRPF 7%","7% WHI","Retención 7%","-7.0","percent","tax_group_retenciones_7","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_s_irpf15","1000","True","sale","15% Withholding income tax","Retenciones a cuenta IRPF 15%","15% WHI","Retención 15%","-15.0","percent","tax_group_retenciones_15","","base","invoice","","","","fp_irpf15_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_3,account_tax_template_igic_r_7,account_tax_template_igic_r_9_5,account_tax_template_igic_r_15,account_tax_template_igic_r_20","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","",""
-"account_tax_template_p_irpf1","1000","True","purchase","1% Withholding income tax","Retenciones IRPF 1%","1% WHI","","-1.0","percent","tax_group_retenciones_1","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf15","1000","True","purchase","15% Withholding income tax","Retenciones IRPF 15%","15% WHI","","-15.0","percent","tax_group_retenciones_15","","base","invoice","","","mod111[08]","fp_irpf15_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_20","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf21t","1000","True","purchase","15% Withholding income tax (workers)","Retenciones IRPF (Trabajadores)","15% WHI worker","","-15.0","percent","tax_group_retenciones_15","","base","invoice","","","mod111[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","",""
-"account_tax_template_p_irpf21te","1000","True","purchase","15% Withholding income tax (workers) in cash","Retenciones IRPF (Trabajadores) en especie","15% WHI worker cash","","-15.0","percent","tax_group_retenciones_15","","base","invoice","","","mod111[05]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[06]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[05]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[06]","","",""
-"account_tax_template_p_irpf15e","1000","True","purchase","15% Withholding income tax in cash","Retenciones IRPF 15% en especie","15% WHI cash","","-15.0","percent","tax_group_retenciones_15","","base","invoice","","","mod111[11]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[12]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[11]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[12]","","",""
-"account_tax_template_p_irpf7e","1000","True","purchase","7% Withholding income tax in cash","Retenciones IRPF 7% en especie","7% WHI cash","","-7.0","percent","tax_group_retenciones_7","","base","invoice","","","mod111[11]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[12]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[11]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[12]","","",""
-"account_tax_template_p_irpf20","1000","True","purchase","20% Withholding income tax","Retenciones IRPF 20%","20% WHI","","-20.0","percent","tax_group_retenciones_20","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf21a","1000","True","purchase","21% Withholding (leases)","Retenciones 21% (Arrendamientos)","21% WH lease","","-21.0","percent","tax_group_retenciones_21","","base","invoice","","","mod115[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod115[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","",""
-"account_tax_template_p_irpf21p","1000","True","purchase","21% Withholding income tax","Retenciones IRPF 21%","21% WHI","","-21.0","percent","tax_group_retenciones_21","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_irpf21td","1000","True","purchase","15% Withholding income tax (workers)","Retenciones IRPF (Trabajadores) dinerarios","15% WHI monies","","-15.0","percent","tax_group_retenciones_15","","base","invoice","","","mod111[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","",""
-"account_tax_template_p_irpf2","1000","True","purchase","2% Withholding income tax","Retenciones IRPF 2%","2% WHI","","-2.0","percent","tax_group_retenciones_2","","base","invoice","","","mod111[08]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[08]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","",""
-"account_tax_template_p_rp19","1000","True","purchase","19% Withholding (loans)","Retenciones 19% (préstamos)","19% WH L","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","","","",""
-"account_tax_template_p_rrD19","1000","True","purchase","19% Withholding (dividend distribution)","Retenciones 19% (reparto de dividendos)","19% WH DD","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","","","",""
-"","","","","","","","","","","","","base","refund","","","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","","","",""
-"account_tax_template_p_irpf19ca","1000","True","purchase","19% Withholding Directors and Administrators (Purchase natural person director)","Retenciones IRPF 19% Consejeros y administradores (Compra consejero de persona física)","19% WH CA NP","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","mod111[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","",""
-"account_tax_template_p_irpf19cs","1000","True","purchase","19% Withholding Directors and Administrators (Purchase company director)","Retenciones IRPF 19% Consejeros y administradores (Compra consejero de sociedad)","19% WH CA S","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","","mod111[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","",""
-"account_tax_template_p_irpf35cya","1000","True","purchase","35% Withholding Directors and Administrators","Retenciones IRPF 35% Consejeros y administradores","35% WH CA","","-35.0","percent","tax_group_retenciones_35","","base","invoice","","","mod111[02]","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","",""
-"","","","","","","","","","","","","base","refund","","","mod111[02]","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","",""
-"account_tax_template_s_irpfnrnue24","1000","True","sale","24% Withholding Non-EU residents","Retenciones a cuenta IRPF No residentes no-UE 24%","24% WH Not EU","","-24.0","percent","tax_group_retenciones_24","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","",""
-"account_tax_template_p_irpfnrnue24p","1000","True","purchase","24% Withholding Non-EU residents","Retenciones IRPF No residentes no-UE 24%","24% WH Not EU","","-24.0","percent","tax_group_retenciones_24","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","",""
-"account_tax_template_s_irpfnrue19","1000","True","sale","19% Withholding Non-EU residents","Retenciones a cuenta IRPF No residentes UE 19%","19% WH Not EU","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","",""
-"account_tax_template_p_irpfnrue19p","1000","True","purchase","19% Withholding Non-EU residents","Retenciones IRPF No residentes UE 19%","19% WH Not EU","","-19.0","percent","tax_group_retenciones_19","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","",""
-"account_tax_template_s_irpfnrnue0","1000","True","sale","Exempt Withholding Non-EU residents","Retenciones a cuenta IRPF No residentes no-UE exento por convenio","Exempt WH Not EU","","0.0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","",""
-"account_tax_template_p_irpfnrnue0p","1000","True","purchase","Exempt Withholding Non-EU residents","Retenciones IRPF No residentes no-UE exento por convenio","Exempt WH Not EU","","0.0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","",""
-"account_tax_template_s_irpfnrue0","1000","True","sale","Exempt Withholding EU residents","Retenciones a cuenta IRPF No residentes UE exento por convenio","Exempt WH EU","","0.0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","",""
-"account_tax_template_p_irpfnrue0p","1000","True","purchase","Exempt Withholding EU residents","Retenciones IRPF No residentes UE exento por convenio","Exempt WH EU","","0.0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion"
-"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","",""
-"","","","","","","","","","","","","base","refund","","100","","","",""
-"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","",""
+"id","sequence","active","type_tax_use","description","description@es","name","name@es","amount","amount_type","tax_group_id","price_include","repartition_line_ids/repartition_type","repartition_line_ids/document_type","repartition_line_ids/account_id","repartition_line_ids/factor_percent","repartition_line_ids/tag_ids","fiscal_position_ids","original_tax_ids","l10n_es_type","tax_scope","l10n_es_bien_inversion","children_tax_ids"
+"account_tax_template_igic_r_7","0","True","sale","IGIC 7%","IGIC 7%","7%","7%","7","percent","tax_group_igic_7","","base","invoice","","","mod420[7]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_7","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[9]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","","","","",""
+"account_tax_template_igic_r_0","1","True","sale","IGIC 0%","IGIC 0%","0%","0%","0","percent","tax_group_igic_0","","base","invoice","","","mod420[1]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_0","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_r_3","1","True","sale","IGIC 3%","IGIC 3%","3%","3%","3","percent","tax_group_igic_3","","base","invoice","","","mod420[4]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_3","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[6]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","","","","",""
+"account_tax_template_igic_r_5","1","True","sale","IGIC 5%","IGIC 5%","5%","5%","3","percent","tax_group_igic_3","","base","invoice","","","mod420[4]","fp_canary_1","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[6]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","","","","",""
+"account_tax_template_igic_r_9_5","1","True","sale","IGIC 9.5%","IGIC 9,5%","9.5%","9.5%","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[10]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_9_5","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[12]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","","","","",""
+"account_tax_template_igic_r_15","1","True","sale","IGIC 15%","IGIC 15%","15%","15%","15","percent","tax_group_igic_15","","base","invoice","","","mod420[13]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_15","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[15]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","","","","",""
+"account_tax_template_igic_r_20","1","True","sale","IGIC 20%","IGIC 20%","20%","20%","20","percent","tax_group_igic_20","","base","invoice","","","mod420[16]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_r_20","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","","mod420[18]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[21]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","","mod420[22]","","","","","",""
+"account_tax_template_igic_s_ISP0","1","True","sale","IGIC 0% Sale Reverse Charge","IGIC 0% Venta con Inversión del Sujeto Pasivo","0% Sale RC","0% Venta ISP","0","percent","tax_group_igic_0","","base","invoice","","","","fp_ispn_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_ex_0","1","True","sale","IGIC 0% (Exports)","IGIC 0% (Exportaciones)","0% EX","0% EX","0","percent","tax_group_igic_0","","base","invoice","","","","fp_extra_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_re_ex","1","True","sale","IGIC Exempt Passed On","IGIC Exento Repercutido","EXEMPT PO","EXEMPT REP","0","percent","tax_group_igic_ex","","base","invoice","","","","fp_canary_1","","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_cmino","1","True","sale","Exempt for Retail Trade","Exento por Comercio minorista","EXEMPT RT","EXEMPT CM","0","percent","tax_group_igic_cmino","","base","invoice","","","","fp_retailer_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_cmino","1","True","purchase","Exempt for Retail Trade","Exento por Comercio minorista","EXEMPT RT","EXEMPT CM","0","percent","tax_group_igic_cmino","","base","invoice","","","mod420[26]","fp_retailer_canary","","","","",""
+"","","","","","","","","","","","","tax","invoice","","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_3_cmino","1","True","purchase","IGIC 3% (Retail trade)","IGIC 3% (Comercio minorista)","3% RT","3% CM","2.1","percent","tax_group_igic_cmino","True","base","invoice","","","mod420[26]","fp_retailer_canary","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_7_cmino","0","True","purchase","IGIC 7% (Retail trade)","IGIC 7% (Comercio minorista)","7% RT","7% CM","4.9","percent","tax_group_igic_cmino","True","base","invoice","","","mod420[26]","fp_retailer_canary","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_9_5_cmino","1","True","purchase","IGIC 9.5% (Retail trade)","IGIC 9,5% (Comercio minorista)","9.5% RT","9.5% CM","6.65","percent","tax_group_igic_cmino","True","base","invoice","","","mod420[26]","fp_retailer_canary","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_15_cmino","1","True","purchase","IGIC 15% (Retail trade)","IGIC 15% (Comercio minorista)","15% RT","15% CM","10.5","percent","tax_group_igic_cmino","True","base","invoice","","","mod420[26]","fp_retailer_canary","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_20_cmino","1","True","purchase","IGIC 20% (Retail trade)","IGIC 20% (Comercio minorista)","20% RT","20% CM","14","percent","tax_group_igic_cmino","True","base","invoice","","","mod420[26]","fp_retailer_canary","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_s_igic_ns","1","True","sale","IGIC Not subject Passed on","IGIC No sujeto Repercutido","NS","NSR","0","percent","tax_group_igic_0","","base","invoice","","","","fp_nacional_canary_ns","account_tax_template_igic_r_0,account_tax_template_igic_r_9_5,account_tax_template_igic_r_7,account_tax_template_igic_r_20,account_tax_template_igic_r_15,account_tax_template_igic_r_3","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_p_ex","1","True","purchase","IGIC Exempt Supported","IGIC Exento Soportado","EXEMPT S","EXENTO S","0","percent","tax_group_igic_ex","","base","invoice","","","","fp_canary_1","","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_0","1","True","purchase","IGIC 0% (Goods)","IGIC 0% (Bienes corrientes)","0% G","0% B","0","percent","tax_group_igic_0","","base","invoice","","","","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_0","","consu","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_3","1","True","purchase","IGIC 3% (Goods)","IGIC 3% (Bienes corrientes)","3% G","3% B","3","percent","tax_group_igic_3","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_3","","consu","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_5","1","True","purchase","IGIC 5% (Goods)","IGIC 5% (Bienes corrientes)","5% G","5% B","5","percent","tax_group_igic_3","","base","invoice","","","mod420[26]","fp_canary_1","","","consu","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_7","1","True","purchase","IGIC 7% (Goods)","IGIC 7% (Bienes corrientes)","7% G","7% B","7","percent","tax_group_igic_7","0","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_7","","consu","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_9_5","1","True","purchase","IGIC 9.5% (Goods)","IGIC 9,5% (Bienes corrientes)","9.5% G","9.5% B","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_9_5","","consu","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_15","1","True","purchase","IGIC 15% (Goods)","IGIC 15% (Bienes corrientes)","15% G","15% B","15","percent","tax_group_igic_15","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_15","","consu","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_20","1","True","purchase","IGIC 20% (Goods)","IGIC 20% (Bienes corrientes)","20% G","20% B","20","percent","tax_group_igic_20","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_20","","consu","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_0_s","1","True","purchase","IGIC 0% (Services)","IGIC 0% (Servicios)","0% G","0% B","0","percent","tax_group_igic_0","","base","invoice","","","","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_0","","service","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_3_s","1","True","purchase","IGIC 3% (Services)","IGIC 3% (Servicios)","3% S","3% S","3","percent","tax_group_igic_3","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_3","","service","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_5_s","1","True","purchase","IGIC 5% (Services)","IGIC 5% (Servicios)","5% S","5% S","5","percent","tax_group_igic_3","","base","invoice","","","mod420[26]","fp_canary_1","","","service","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_7_s","1","True","purchase","IGIC 7% (Services)","IGIC 7% (Servicios)","7% S","7% S","7","percent","tax_group_igic_7","0","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_7","","service","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_9_5_s","1","True","purchase","IGIC 9.5% (Services)","IGIC 9,5% (Servicios)","9.5% S","9.5% S","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_9_5","","service","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_15_s","1","True","purchase","IGIC 15% (Services)","IGIC 15% (Servicios)","15% S","15% S","15","percent","tax_group_igic_15","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_15","","service","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_20_s","1","True","purchase","IGIC 20% (Services)","IGIC 20% (Servicios)","20% S","20% S","20","percent","tax_group_igic_20","","base","invoice","","","mod420[26]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_20","","service","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_0_inv","1","True","purchase","IGIC 0% (Investment goods)","IGIC 0% (Bienes de inversión)","0% IG","0% BI","0","percent","tax_group_igic_0","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_0_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_3_inv","1","True","purchase","IGIC 3% (Investment goods)","IGIC 3% (Bienes de inversión)","3% IG","3% BI","3","percent","tax_group_igic_3","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_3_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_5_inv","1","True","purchase","IGIC 5% (Investment goods)","IGIC 5% (Bienes de inversión)","5% IG","3% BI","3","percent","tax_group_igic_3","","base","invoice","","","mod420[28]","fp_canary_1","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_7_inv","1","True","purchase","IGIC 7% (Investment goods)","IGIC 7% (Bienes de inversión)","7% IG","7% BI","7","percent","tax_group_igic_7","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_7_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_9_5_inv","1","True","purchase","IGIC 9.5% (Investment goods)","IGIC 9,5% (Bienes de inversión)","9.5% IG","9.5% BI","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_9_5_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_15_inv","1","True","purchase","IGIC 15% (Investment goods)","IGIC 15% (Bienes de inversión)","15% IG","15% BI","15","percent","tax_group_igic_15","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_15_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_20_inv","1","True","purchase","IGIC 20% (Investment goods)","IGIC 20% (Bienes de inversión)","20% IG","20% BI","20","percent","tax_group_igic_20","","base","invoice","","","mod420[28]","fp_irpf9_canary,fp_canary_1,fp_irpf19a_canary,fp_irpf15_canary","account_tax_template_igic_sop_20_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[29]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_0","1","True","purchase","IGIC 0% Imports (Goods)","IGIC 0% Importaciones (Bienes corrientes)","0% G Import","0% B Import","0","percent","tax_group_igic_0","","base","invoice","","","","fp_recargo_canary","account_tax_template_igic_sop_0","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_3","1","True","purchase","IGIC 3% Imports (Goods)","IGIC 3% Importaciones (Bienes corrientes)","3% G Import","3% B Import","3","percent","tax_group_igic_3","","base","invoice","","","mod420[30]","fp_recargo_canary","account_tax_template_igic_sop_3","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_7","1","True","purchase","IGIC 7% Imports (Goods)","IGIC 7% Importaciones (Bienes corrientes)","7% G Import","7% B Import","7","percent","tax_group_igic_7","","base","invoice","","","mod420[30]","fp_recargo_canary","account_tax_template_igic_sop_7","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_9_5","1","True","purchase","IGIC 9.5% Imports (Goods)","IGIC 9,5% Importaciones (Bienes corrientes)","9.5% G Import","9.5% B Import","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[30]","fp_recargo_canary","account_tax_template_igic_sop_9_5","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_15","1","True","purchase","IGIC 15% Imports (Goods)","IGIC 15% Importaciones (Bienes corrientes)","15% G Import","15% B Import","15","percent","tax_group_igic_15","","base","invoice","","","mod420[30]","fp_recargo_canary","account_tax_template_igic_sop_15","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_20","1","True","purchase","IGIC 20% Imports (Goods)","IGIC 20% Importaciones (Bienes corrientes)","20% G Import","20% B Import","20","percent","tax_group_igic_20","","base","invoice","","","mod420[30]","fp_recargo_canary","account_tax_template_igic_sop_20","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[31]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_0_inv","1","True","purchase","IGIC 0% Imports (Investment goods)","IGIC 0% Importaciones (Bienes de inversión)","0% IG Import","0% BI Import","0","percent","tax_group_igic_0","","base","invoice","","","","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_0_inv","","consu","1",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_3_inv","1","True","purchase","IGIC 3% Imports (Investment goods)","IGIC 3% Importaciones (Bienes de inversión)","3% IG Import","3% BI Import","3","percent","tax_group_igic_3","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_3_inv","","consu","1",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_7_inv","1","True","purchase","IGIC 7% Imports (Investment goods)","IGIC 7% Importaciones (Bienes de inversión)","7% IG Import","7% BI Import","7","percent","tax_group_igic_7","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_7_inv","","consu","1",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_9_5_inv","1","True","purchase","IGIC 9.5% Imports (Investment goods)","IGIC 9,5% Importaciones (Bienes de inversión)","9.5% IG Import","9.5% BI Import","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_9_5_inv","","consu","1",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_15_inv","1","True","purchase","IGIC 15% Imports (Investment goods)","IGIC 15% Importaciones (Bienes de inversión)","15% IG Import","15% BI Import","15","percent","tax_group_igic_15","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_15_inv","","consu","1",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_sop_i_20_inv","1","True","purchase","IGIC 20% Imports (Investment goods)","IGIC 20% Importaciones (Bienes de inversión)","20% IG Import","20% BI Import","20","percent","tax_group_igic_20","","base","invoice","","","mod420[32]","fp_extra_canary,fp_recargo_canary","account_tax_template_igic_sop_20_inv","","consu","1",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[33]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_ISP0","1","True","purchase","IGIC 0% Reverse Charge","IGIC 0% con Inversión del Sujeto Pasivo","0% RC","0% ISP","0","percent","tax_group_igic_0","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary,fp_extra_canary","account_tax_template_igic_sop_0_s","","","",""
+"","","","","","","","","","","","","tax","invoice","","","mod420[20]||mod420[27]","","","","","",""
+"","","","","","","","","","","","","tax","invoice","","-100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","mod420[20]||mod420[35]","","","","","",""
+"","","","","","","","","","","","","tax","refund","","-100","","","","","","",""
+"account_tax_template_igic_ISP3","1","True","purchase","IGIC 3% Reverse Charge","IGIC 3% con Inversión del Sujeto Pasivo","3% RC","3% ISP","3","percent","tax_group_igic_3","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary,fp_extra_canary","account_tax_template_igic_sop_3_s","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","","","","",""
+"account_tax_template_igic_ISP7","1","True","purchase","IGIC 7% Reverse Charge","IGIC 7% con Inversión del Sujeto Pasivo","7% RC","7% ISP","7","percent","tax_group_igic_7","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary,fp_extra_canary","account_tax_template_igic_sop_7_s","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","","","","",""
+"account_tax_template_igic_ISP95","1","True","purchase","IGIC 9.5% Reverse Charge","IGIC 9,5% con Inversión del Sujeto Pasivo","9.5% RC","9.5% ISP","9.5","percent","tax_group_igic_95","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary,fp_extra_canary","account_tax_template_igic_sop_9_5_s","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","","","","",""
+"account_tax_template_igic_ISP15","1","True","purchase","IGIC 15% Reverse Charge","IGIC 15% con Inversión del Sujeto Pasivo","15% RC","15% ISP","15","percent","tax_group_igic_15","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary,fp_extra_canary","account_tax_template_igic_sop_15_s","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","","","","",""
+"account_tax_template_igic_ISP20","1","True","purchase","IGIC 20% Reverse Charge","IGIC 20% con Inversión del Sujeto Pasivo","20% RC","20% ISP","20","percent","tax_group_igic_20","","base","invoice","","","mod420[19]||mod420[26]","fp_ispn_canary,fp_extra_canary","account_tax_template_igic_sop_20_s","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[20]||mod420[27]","","","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4777","-100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[19]||mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[20]||mod420[35]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4777","-100","","","","","","",""
+"account_tax_template_igic_p_re0","1","True","purchase","IGIC 0% (Import surcharge)","IGIC 0%  (Recargo a la importación)","0% IS","0% RI","0","percent","tax_group_igic_re_0","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0","","","",""
+"","","","","","","","","","","","","tax","invoice","","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","mod420[35]","","","","","",""
+"account_tax_template_igic_p_re03","1","True","purchase","IGIC 0.30% (Import surcharge)","IGIC 0,30%  (Recargo a la importación)","3% IS","3% RI","0.3","percent","tax_group_igic_re_03","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_p_re07","1","True","purchase","IGIC 0.7% (Import surcharge)","IGIC 0,7%  (Recargo a la importación)","7% IS","7% RI","0.7","percent","tax_group_igic_re_07","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_p_re095","1","True","purchase","IGIC 0.95% (Import surcharge)","IGIC 0,95%  (Recargo a la importación)","9.5% IS","9.5% RI","0.95","percent","tax_group_igic_re_095","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_p_re15","1","True","purchase","IGIC 1.5% (Import surcharge)","IGIC 1,5%  (Recargo a la importación)","15% IS","15% RI","1.5","percent","tax_group_igic_re_15","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_igic_p_re20","1","True","purchase","IGIC 2% (Import surcharge)","IGIC 2%  (Recargo a la importación)","20% IS","20% RI","2","percent","tax_group_igic_re_20","","base","invoice","","","mod420[26]","fp_recargo_canary","account_tax_template_igic_sop_20,account_tax_template_igic_sop_20_inv","","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_canary_4727","","mod420[27]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod420[34]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_canary_4727","","mod420[35]","","","","","",""
+"account_tax_template_p_igic_ns","1","True","purchase","IGIC not subject","IGIC no sujeto","NS","NS","0","percent","tax_group_igic_0","","base","invoice","","","","fp_nacional_canary_ns","account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_3,account_tax_template_igic_sop_15,account_tax_template_igic_sop_0,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_20,account_tax_template_igic_sop_0_s,account_tax_template_igic_sop_3_s,account_tax_template_igic_sop_7_s,account_tax_template_igic_sop_9_5_s,account_tax_template_igic_sop_15_s,account_tax_template_igic_sop_20_s","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_3_group","1","True","purchase","IGIC 3% Imports DUA","IGIC 3% Importaciones DUA","3% G Import DUA","3% B Import DUA","0","group","tax_group_igic_3","","base","invoice","","","","fp_dua","account_tax_template_igic_sop_3","","consu","0","account_tax_template_p_iva_isub,account_tax_template_igic_sop_i_3"
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_7_group","1","True","purchase","IGIC 7% Imports DUA","IGIC 7% Importaciones DUA","7% G Import DUA","7% B Import DUA","0","group","tax_group_igic_7","","base","invoice","","","","fp_dua","account_tax_template_igic_sop_7","","consu","0","account_tax_template_p_iva_isub,account_tax_template_igic_sop_i_7"
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_9_5_group","1","True","purchase","IGIC 9.5% Imports DUA","IGIC 9,5% Importaciones DUA","9.5% G Import DUA","9,5% B Import DUA","0","group","tax_group_igic_95","","base","invoice","","","","fp_dua","account_tax_template_igic_sop_9_5","","consu","0","account_tax_template_p_iva_isub,account_tax_template_igic_sop_i_9_5"
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_15_group","1","True","purchase","IGIC 15% Imports DUA","IGIC 15% Importaciones DUA","15% G Import DUA","15% B Import DUA","0","group","tax_group_igic_15","","base","invoice","","","","fp_dua","account_tax_template_igic_sop_15","","consu","0","account_tax_template_p_iva_isub,account_tax_template_igic_sop_i_15"
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_igic_sop_i_20_group","1","True","purchase","IGIC 20% Imports DUA","IGIC 20% Importaciones DUA","20% G Import DUA","20% B Import DUA","0","group","tax_group_igic_20","","base","invoice","","","","fp_dua","account_tax_template_igic_sop_20","","consu","0","account_tax_template_p_iva_isub,account_tax_template_igic_sop_i_20"
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_p_iva_isub","1","True","none","Tax Only","Subtract Base","DUA No Base","DUA No Base","-100","percent","tax_group_no_base","","base","invoice","","","","fp_dua","","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_p_dua_exempt","1","True","purchase","Exempt DUA","DUA exento","DUA exempt","DUA exempt","0","percent","tax_group_dua_exempt","","base","invoice","","","","fp_extra_canary","account_tax_template_igic_sop_0,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20","","","",""
+"","","","","","","","","","","","","tax","invoice","","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","","","","","","","","",""
+"account_tax_template_s_irpf9","1000","True","sale","9% Withholding income tax ","Retenciones a cuenta IRPF 9%","9% WHI","Retención 9%","-9","percent","tax_group_retenciones_9","","base","invoice","","","","fp_irpf9_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_3,account_tax_template_igic_r_7,account_tax_template_igic_r_9_5,account_tax_template_igic_r_15,account_tax_template_igic_r_20","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf18","1000","True","sale","18% Withholding income tax","Retenciones a cuenta IRPF 18%","18% WHI","Retención 18%","-18","percent","tax_group_retenciones_18","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf19","1000","True","sale","19% Withholding income tax","Retenciones a cuenta IRPF 19%","19% WHI","Retención 19%","-19","percent","tax_group_retenciones_19","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf19a","1000","True","sale","19% Withholding (leases)","Retenciones a cuenta 19% (Arrendamientos)","19% WH lease","Retención 19% (Arrend.)","-19","percent","tax_group_retenciones_19","","base","invoice","","","","fp_irpf19a_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_3,account_tax_template_igic_r_7,account_tax_template_igic_r_9_5,account_tax_template_igic_r_15,account_tax_template_igic_r_20","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf195a","1000","True","sale","19.5% Withholding (leases)","Retenciones a cuenta 19,5% (Arrendamientos)","19.5% WH lease","Retención 19,5% (Arrend.)","-19.5","percent","tax_group_retenciones_19-5","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_p_irpf19","1000","True","purchase","19% Withholding income tax","Retenciones IRPF 19%","19% WHI","","-19","percent","tax_group_retenciones_19","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf20a","1000","True","purchase","20% Withholding (leases)","Retenciones 20% (Arrendamientos)","20% WH lease","","-20","percent","tax_group_retenciones_20","","base","invoice","","","mod115[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod115[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","","","","",""
+"account_tax_template_p_irpf18","1000","True","purchase","18% Withholding income tax","Retenciones IRPF 18%","18% WHI","","-18","percent","tax_group_retenciones_18","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf19a","1000","True","purchase","19% Withholding (leases)","Retenciones 19% (Arrendamientos)","19% WH lease","","-19","percent","tax_group_retenciones_19","","base","invoice","","","mod115[02]","fp_irpf19a_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_20","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod115[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","","","","",""
+"account_tax_template_p_irpf195a","1000","True","purchase","19.5% Withholding (leases)","Retenciones 19,5% (Arrendamientos)","19.5% WH lease","","-19.5","percent","tax_group_retenciones_19-5","","base","invoice","","","mod115[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod115[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","","","","",""
+"account_tax_template_p_irpf7","1000","True","purchase","7% Withholding income tax","Retenciones IRPF 7%","7% WHI","","-7","percent","tax_group_retenciones_7","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf9","1000","True","purchase","9% Withholding income tax","Retenciones IRPF 9%","9% WHI","","-9","percent","tax_group_retenciones_9","","base","invoice","","","mod111[08]","fp_irpf9_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_20","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf24","1000","True","purchase","24% Withholding income tax","Retenciones IRPF 24%","24% WHI","","-24","percent","tax_group_retenciones_24","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf24_rdc","1000","True","purchase","24% Withholding on capital","Retenciones IRPF 24% (Rendimientos del capital)","24% WH RDC","","-24","percent","tax_group_retenciones_24","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_s_irpf20","1000","True","sale","20% Withholding income tax","Retenciones a cuenta IRPF 20%","20% WHI","Retención 20%","-20","percent","tax_group_retenciones_20","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf20a","1000","True","sale","20% Withholding (leases)","Retenciones a cuenta 20% (Arrendamientos)","20% WH lease","Retención 20% (Arrend.)","-20","percent","tax_group_retenciones_20","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf24","1000","True","sale","24% Withholding income tax","Retenciones a cuenta IRPF 24%","24% WHI","Retención 24%","-24","percent","tax_group_retenciones_24","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf24_rdc","1000","True","sale","24% Withholding on Capital","Retención 24% (Rendimientos del capital)","24% WH RDC","Retención 24%","-24","percent","tax_group_retenciones_24","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf1","1000","True","sale","1% Withholding income tax","Retenciones a cuenta IRPF 1%","1% WHI","Retención 1%","-1","percent","tax_group_retenciones_1","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf2","1000","True","sale","2% Withholding income tax","Retenciones a cuenta IRPF 2%","2% WHI","Retención 2%","-2","percent","tax_group_retenciones_2","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf21","1000","True","sale","21% Withholding income tax","Retenciones a cuenta IRPF 21%","21% WHI","Retención 21%","-21","percent","tax_group_retenciones_21","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf21a","1000","True","sale","21% Withholding (leases)","Retenciones a cuenta 21% (Arrendamientos)","21% WH lease","Retención 21% (Arrend.)","-21","percent","tax_group_retenciones_21","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf7","1000","True","sale","7% Withholding income tax","Retenciones a cuenta IRPF 7%","7% WHI","Retención 7%","-7","percent","tax_group_retenciones_7","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_s_irpf15","1000","True","sale","15% Withholding income tax","Retenciones a cuenta IRPF 15%","15% WHI","Retención 15%","-15","percent","tax_group_retenciones_15","","base","invoice","","","","fp_irpf15_canary","account_tax_template_igic_r_0,account_tax_template_igic_r_3,account_tax_template_igic_r_7,account_tax_template_igic_r_9_5,account_tax_template_igic_r_15,account_tax_template_igic_r_20","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","","mod130[06]","","","","","",""
+"account_tax_template_p_irpf1","1000","True","purchase","1% Withholding income tax","Retenciones IRPF 1%","1% WHI","","-1","percent","tax_group_retenciones_1","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf15","1000","True","purchase","15% Withholding income tax","Retenciones IRPF 15%","15% WHI","","-15","percent","tax_group_retenciones_15","","base","invoice","","","mod111[08]","fp_irpf15_canary","account_tax_template_igic_sop_0_inv,account_tax_template_igic_sop_0,account_tax_template_igic_sop_3_inv,account_tax_template_igic_sop_3,account_tax_template_igic_sop_7_inv,account_tax_template_igic_sop_7,account_tax_template_igic_sop_9_5_inv,account_tax_template_igic_sop_9_5,account_tax_template_igic_sop_15_inv,account_tax_template_igic_sop_15,account_tax_template_igic_sop_20_inv,account_tax_template_igic_sop_20","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf21t","1000","True","purchase","15% Withholding income tax (workers)","Retenciones IRPF (Trabajadores)","15% WHI worker","","-15","percent","tax_group_retenciones_15","","base","invoice","","","mod111[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","","","","",""
+"account_tax_template_p_irpf21te","1000","True","purchase","15% Withholding income tax (workers) in cash","Retenciones IRPF (Trabajadores) en especie","15% WHI worker cash","","-15","percent","tax_group_retenciones_15","","base","invoice","","","mod111[05]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[05]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[06]","","","","","",""
+"account_tax_template_p_irpf15e","1000","True","purchase","15% Withholding income tax in cash","Retenciones IRPF 15% en especie","15% WHI cash","","-15","percent","tax_group_retenciones_15","","base","invoice","","","mod111[11]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[12]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[11]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[12]","","","","","",""
+"account_tax_template_p_irpf7e","1000","True","purchase","7% Withholding income tax in cash","Retenciones IRPF 7% en especie","7% WHI cash","","-7","percent","tax_group_retenciones_7","","base","invoice","","","mod111[11]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[12]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[11]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[12]","","","","","",""
+"account_tax_template_p_irpf20","1000","True","purchase","20% Withholding income tax","Retenciones IRPF 20%","20% WHI","","-20","percent","tax_group_retenciones_20","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf21a","1000","True","purchase","21% Withholding (leases)","Retenciones 21% (Arrendamientos)","21% WH lease","","-21","percent","tax_group_retenciones_21","","base","invoice","","","mod115[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod115[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod115[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod115[03]","","","","","",""
+"account_tax_template_p_irpf21p","1000","True","purchase","21% Withholding income tax","Retenciones IRPF 21%","21% WHI","","-21","percent","tax_group_retenciones_21","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_irpf21td","1000","True","purchase","15% Withholding income tax (workers)","Retenciones IRPF (Trabajadores) dinerarios","15% WHI monies","","-15","percent","tax_group_retenciones_15","","base","invoice","","","mod111[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","","","","",""
+"account_tax_template_p_irpf2","1000","True","purchase","2% Withholding income tax","Retenciones IRPF 2%","2% WHI","","-2","percent","tax_group_retenciones_2","","base","invoice","","","mod111[08]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[09]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[08]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[09]","","","","","",""
+"account_tax_template_p_rp19","1000","True","purchase","19% Withholding (loans)","Retenciones 19% (préstamos)","19% WH L","","-19","percent","tax_group_retenciones_19","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","","","","","","",""
+"account_tax_template_p_rrD19","1000","True","purchase","19% Withholding (dividend distribution)","Retenciones 19% (reparto de dividendos)","19% WH DD","","-19","percent","tax_group_retenciones_19","","base","invoice","","","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","","","","","","",""
+"","","","","","","","","","","","","base","refund","","","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","","","","","","",""
+"account_tax_template_p_irpf19ca","1000","True","purchase","19% Withholding Directors and Administrators (Purchase natural person director)","Retenciones IRPF 19% Consejeros y administradores (Compra consejero de persona física)","19% WH CA NP","","-19","percent","tax_group_retenciones_19","","base","invoice","","","mod111[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","","","","",""
+"account_tax_template_p_irpf19cs","1000","True","purchase","19% Withholding Directors and Administrators (Purchase company director)","Retenciones IRPF 19% Consejeros y administradores (Compra consejero de sociedad)","19% WH CA S","","-19","percent","tax_group_retenciones_19","","base","invoice","","","mod111[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","","","","",""
+"account_tax_template_p_irpf35cya","1000","True","purchase","35% Withholding Directors and Administrators","Retenciones IRPF 35% Consejeros y administradores","35% WH CA","","-35","percent","tax_group_retenciones_35","","base","invoice","","","mod111[02]","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","","mod111[03]","","","","","",""
+"","","","","","","","","","","","","base","refund","","","mod111[02]","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","","mod111[03]","","","","","",""
+"account_tax_template_s_irpfnrnue24","1000","True","sale","24% Withholding Non-EU residents","Retenciones a cuenta IRPF No residentes no-UE 24%","24% WH Not EU","","-24","percent","tax_group_retenciones_24","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","","","","",""
+"account_tax_template_p_irpfnrnue24p","1000","True","purchase","24% Withholding Non-EU residents","Retenciones IRPF No residentes no-UE 24%","24% WH Not EU","","-24","percent","tax_group_retenciones_24","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","","","","",""
+"account_tax_template_s_irpfnrue19","1000","True","sale","19% Withholding Non-EU residents","Retenciones a cuenta IRPF No residentes UE 19%","19% WH Not EU","","-19","percent","tax_group_retenciones_19","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","","","","",""
+"account_tax_template_p_irpfnrue19p","1000","True","purchase","19% Withholding Non-EU residents","Retenciones IRPF No residentes UE 19%","19% WH Not EU","","-19","percent","tax_group_retenciones_19","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","","","","",""
+"account_tax_template_s_irpfnrnue0","1000","True","sale","Exempt Withholding Non-EU residents","Retenciones a cuenta IRPF No residentes no-UE exento por convenio","Exempt WH Not EU","","0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","","","","",""
+"account_tax_template_p_irpfnrnue0p","1000","True","purchase","Exempt Withholding Non-EU residents","Retenciones IRPF No residentes no-UE exento por convenio","Exempt WH Not EU","","0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","","","","",""
+"account_tax_template_s_irpfnrue0","1000","True","sale","Exempt Withholding EU residents","Retenciones a cuenta IRPF No residentes UE exento por convenio","Exempt WH EU","","0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_473","100","mod130[06]","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_473","100","mod130[06]","","","","","",""
+"account_tax_template_p_irpfnrue0p","1000","True","purchase","Exempt Withholding EU residents","Retenciones IRPF No residentes UE exento por convenio","Exempt WH EU","","0","percent","tax_group_retenciones_0","","base","invoice","","100","","","","retencion","","",""
+"","","","","","","","","","","","","tax","invoice","account_common_4751","100","","","","","","",""
+"","","","","","","","","","","","","base","refund","","100","","","","","","",""
+"","","","","","","","","","","","","tax","refund","account_common_4751","100","","","","","","",""
diff --git a/addons/l10n_es/data/template/account.tax.group-es_common.csv b/addons/l10n_es/data/template/account.tax.group-es_common.csv
index 8ecf7ccea0fd3..c9e31bcd3764d 100644
--- a/addons/l10n_es/data/template/account.tax.group-es_common.csv
+++ b/addons/l10n_es/data/template/account.tax.group-es_common.csv
@@ -12,3 +12,5 @@
 "tax_group_retenciones_21","Withholding 21%","Retenciones 21%","Retencions 21%","base.es","account_common_4750","account_common_4700"
 "tax_group_retenciones_24","Withholding 24%","Retenciones 24%","Retencions 24%","base.es","account_common_4750","account_common_4700"
 "tax_group_retenciones_35","Withholding 35%","Retenciones 35%","Retencions 35%","base.es","account_common_4750","account_common_4700"
+"tax_group_dua_exempt","Exempt DUA","DUA exento","DUA exempt","base.es","account_common_4750","account_common_4700"
+"tax_group_no_base","Subtract Base Amount","Resta Base","Resta Base","base.es","account_common_4750","account_common_4700"
\ No newline at end of file
diff --git a/addons/l10n_es/data/template/account.tax.group-es_common_mainland.csv b/addons/l10n_es/data/template/account.tax.group-es_common_mainland.csv
index 3bd9d2d5d84df..fea42dd3c7487 100644
--- a/addons/l10n_es/data/template/account.tax.group-es_common_mainland.csv
+++ b/addons/l10n_es/data/template/account.tax.group-es_common_mainland.csv
@@ -16,5 +16,3 @@
 "tax_group_iva_21","VAT 21%","IVA 21%","IVA 21%","base.es","account_common_4750","account_common_4700"
 "tax_group_iva_10-5","VAT 10,5% REAGYP","IVA 10,5% REAGYP","IVA 10,5% REAGYP","base.es","account_common_4750","account_common_4700"
 "tax_group_iva_nd","VAT exempt","IVA no deducible","IVA no deduible","base.es","account_common_4750","account_common_4700"
-"tax_group_no_base","Subtract Base Amount","Resta Base","Resta Base","base.es","account_common_4750","account_common_4700"
-"tax_group_dua_exempt","Exempt DUA","DUA exento","DUA exempt","base.es","account_common_4750","account_common_4700"

From 55f0472ef27c78b2cf59461cc78ae2d0215ba87f Mon Sep 17 00:00:00 2001
From: "David Van Droogenbroeck (DROD)" <drod@odoo.com>
Date: Tue, 19 Nov 2024 15:36:19 +0000
Subject: [PATCH 330/673] [ADD] l10n_din5008_expense: add bridge module for
 din5008 expense reports

Issue:
Expense title is duplicated when printing an expense report for localizations using the DIN5008 standard.

Steps to reproduce:
- Install German localization
- Create a new expense report
- Print the expense report PDF
-> Title is duplicated

Cause:
DIN5008 reports tries to load a value `din5008_document_title` in their header
and fallbacks to report's name

With this commit, we add a bridge module to extend the expense sheet
report and set the `din5008_document_title` to `Expenses Report`.

opw-4314414

closes odoo/odoo#234834

X-original-commit: 05cff0855fd1e06f6411a896f63353140ec0ea30
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
Signed-off-by: Guillaume Vanleynseele (guva) <guva@odoo.com>
---
 addons/l10n_din5008_expense/__init__.py       |  0
 addons/l10n_din5008_expense/__manifest__.py   | 15 +++++++++++++
 addons/l10n_din5008_expense/i18n/de.po        | 21 +++++++++++++++++++
 addons/l10n_din5008_expense/i18n/fr.po        | 21 +++++++++++++++++++
 addons/l10n_din5008_expense/i18n/it.po        | 21 +++++++++++++++++++
 .../i18n/l10n_din5008_expense.pot             | 21 +++++++++++++++++++
 .../report/hr_expense_report.xml              | 12 +++++++++++
 7 files changed, 111 insertions(+)
 create mode 100644 addons/l10n_din5008_expense/__init__.py
 create mode 100644 addons/l10n_din5008_expense/__manifest__.py
 create mode 100644 addons/l10n_din5008_expense/i18n/de.po
 create mode 100644 addons/l10n_din5008_expense/i18n/fr.po
 create mode 100644 addons/l10n_din5008_expense/i18n/it.po
 create mode 100644 addons/l10n_din5008_expense/i18n/l10n_din5008_expense.pot
 create mode 100644 addons/l10n_din5008_expense/report/hr_expense_report.xml

diff --git a/addons/l10n_din5008_expense/__init__.py b/addons/l10n_din5008_expense/__init__.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/addons/l10n_din5008_expense/__manifest__.py b/addons/l10n_din5008_expense/__manifest__.py
new file mode 100644
index 0000000000000..83091a19354f0
--- /dev/null
+++ b/addons/l10n_din5008_expense/__manifest__.py
@@ -0,0 +1,15 @@
+{
+    'name': 'DIN 5008 - Expenses',
+    'category': 'Accounting/Localizations',
+    'version': '1.0',
+    'depends': [
+        'l10n_din5008',
+        'hr_expense',
+    ],
+    'auto_install': True,
+    'author': 'Odoo S.A.',
+    'data': [
+        'report/hr_expense_report.xml',
+    ],
+    'license': 'LGPL-3',
+}
diff --git a/addons/l10n_din5008_expense/i18n/de.po b/addons/l10n_din5008_expense/i18n/de.po
new file mode 100644
index 0000000000000..1c4bbca425b62
--- /dev/null
+++ b/addons/l10n_din5008_expense/i18n/de.po
@@ -0,0 +1,21 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_din5008_expense
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-06-03 12:03+0000\n"
+"PO-Revision-Date: 2025-06-03 12:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_din5008_expense
+#: model_terms:ir.ui.view,arch_db:l10n_din5008_expense.report_expense
+msgid "Expenses Report"
+msgstr "Spesenabrechnung"
diff --git a/addons/l10n_din5008_expense/i18n/fr.po b/addons/l10n_din5008_expense/i18n/fr.po
new file mode 100644
index 0000000000000..9f196165a0d60
--- /dev/null
+++ b/addons/l10n_din5008_expense/i18n/fr.po
@@ -0,0 +1,21 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_din5008_expense
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-06-03 12:03+0000\n"
+"PO-Revision-Date: 2025-06-03 12:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_din5008_expense
+#: model_terms:ir.ui.view,arch_db:l10n_din5008_expense.report_expense
+msgid "Expenses Report"
+msgstr "Rapport de dépenses"
diff --git a/addons/l10n_din5008_expense/i18n/it.po b/addons/l10n_din5008_expense/i18n/it.po
new file mode 100644
index 0000000000000..5936c375c74a9
--- /dev/null
+++ b/addons/l10n_din5008_expense/i18n/it.po
@@ -0,0 +1,21 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_din5008_expense
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-06-03 12:03+0000\n"
+"PO-Revision-Date: 2025-06-03 12:03+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_din5008_expense
+#: model_terms:ir.ui.view,arch_db:l10n_din5008_expense.report_expense
+msgid "Expenses Report"
+msgstr "Nota spese"
diff --git a/addons/l10n_din5008_expense/i18n/l10n_din5008_expense.pot b/addons/l10n_din5008_expense/i18n/l10n_din5008_expense.pot
new file mode 100644
index 0000000000000..f101314724d4c
--- /dev/null
+++ b/addons/l10n_din5008_expense/i18n/l10n_din5008_expense.pot
@@ -0,0 +1,21 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_din5008_expense
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-06-03 12:02+0000\n"
+"PO-Revision-Date: 2025-06-03 12:02+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_din5008_expense
+#: model_terms:ir.ui.view,arch_db:l10n_din5008_expense.report_expense
+msgid "Expenses Report"
+msgstr ""
diff --git a/addons/l10n_din5008_expense/report/hr_expense_report.xml b/addons/l10n_din5008_expense/report/hr_expense_report.xml
new file mode 100644
index 0000000000000..497d2621ac132
--- /dev/null
+++ b/addons/l10n_din5008_expense/report/hr_expense_report.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="report_expense" inherit_id="hr_expense.report_expense">
+        <xpath expr="//div[hasclass('page', 'o_content_pdf')]" position="before">
+            <t t-set="din5008_document_title">
+                <span t-if="o and o._name == 'hr.expense'">
+                        <t>Expenses Report</t>
+                </span>
+            </t>
+        </xpath>
+    </template>
+</odoo>

From 6ca0824a23207107ca8ea6405ad15ac8025a09f0 Mon Sep 17 00:00:00 2001
From: erle <erle@odoo.com>
Date: Wed, 27 Aug 2025 01:57:27 +0000
Subject: [PATCH 331/673] [ADD] l10n_lk

Implement a basic accounting package for Sri Lanka including:

- COA
- Tax groups
- Taxes
- Fiscal Positions
- Tax reports (VAT001, WHT001)

task-4352802

closes odoo/odoo#234694

X-original-commit: 05052b13ad76ad8e6594bae5f6923497b13241fe
Related: odoo/enterprise#98989
Signed-off-by: Nicolas Viseur (vin) <vin@odoo.com>
Signed-off-by: Eric Lem (erle) <erle@odoo.com>
---
 addons/l10n_lk/__init__.py                    |   2 +
 addons/l10n_lk/__manifest__.py                |  36 +
 addons/l10n_lk/data/form_vat001.xml           | 856 ++++++++++++++++++
 addons/l10n_lk/data/form_wht001.xml           | 556 ++++++++++++
 .../data/template/account.account-lk.csv      | 101 +++
 .../template/account.fiscal.position-lk.csv   |   3 +
 .../l10n_lk/data/template/account.tax-lk.csv  | 237 +++++
 .../data/template/account.tax.group-lk.csv    |   6 +
 addons/l10n_lk/demo/demo_company.xml          |  35 +
 addons/l10n_lk/i18n/l10n_lk.pot               | 464 ++++++++++
 addons/l10n_lk/models/__init__.py             |   3 +
 addons/l10n_lk/models/template_lk.py          |  53 ++
 12 files changed, 2352 insertions(+)
 create mode 100644 addons/l10n_lk/__init__.py
 create mode 100644 addons/l10n_lk/__manifest__.py
 create mode 100644 addons/l10n_lk/data/form_vat001.xml
 create mode 100644 addons/l10n_lk/data/form_wht001.xml
 create mode 100644 addons/l10n_lk/data/template/account.account-lk.csv
 create mode 100644 addons/l10n_lk/data/template/account.fiscal.position-lk.csv
 create mode 100644 addons/l10n_lk/data/template/account.tax-lk.csv
 create mode 100644 addons/l10n_lk/data/template/account.tax.group-lk.csv
 create mode 100644 addons/l10n_lk/demo/demo_company.xml
 create mode 100644 addons/l10n_lk/i18n/l10n_lk.pot
 create mode 100644 addons/l10n_lk/models/__init__.py
 create mode 100644 addons/l10n_lk/models/template_lk.py

diff --git a/addons/l10n_lk/__init__.py b/addons/l10n_lk/__init__.py
new file mode 100644
index 0000000000000..d581b39cea771
--- /dev/null
+++ b/addons/l10n_lk/__init__.py
@@ -0,0 +1,2 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from . import models
diff --git a/addons/l10n_lk/__manifest__.py b/addons/l10n_lk/__manifest__.py
new file mode 100644
index 0000000000000..34a74e1249992
--- /dev/null
+++ b/addons/l10n_lk/__manifest__.py
@@ -0,0 +1,36 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    "name": "Sri Lanka - Accounting",
+    "icon": "/account/static/description/l10n.png",
+    "countries": ["lk"],
+    "summary": "Provides accounting localizations for Sri Lanka.",
+    "description": """
+Sri Lankan Accounting module
+============================
+- Chart of Accounts
+- Fiscal Position
+- Taxes & Tax Groups
+
+Forms
+=====
+- VAT001
+- WHT001
+    """,
+    "version": "1.0",
+    "author": "Odoo S.A.",
+    "category": "Accounting/Localizations/Account Charts",
+    "website": "https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html",
+    "depends": [
+        "account",
+        "l10n_account_withholding_tax",
+    ],
+    "auto_install": ["account"],
+    "data": [
+        "data/form_vat001.xml",
+        "data/form_wht001.xml",
+    ],
+    "demo": [
+        "demo/demo_company.xml",
+    ],
+    "license": "LGPL-3",
+}
diff --git a/addons/l10n_lk/data/form_vat001.xml b/addons/l10n_lk/data/form_vat001.xml
new file mode 100644
index 0000000000000..d2b64d220c8dd
--- /dev/null
+++ b/addons/l10n_lk/data/form_vat001.xml
@@ -0,0 +1,856 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="l10n_lk_vat001" model="account.report">
+        <field name="name">VAT Return Form VAT-001</field>
+        <field name="root_report_id" ref="account.generic_tax_report" />
+        <field name="sequence">10</field>
+        <field name="country_id" ref="base.lk" />
+        <field name="column_ids">
+            <record id="l10n_lk_vat001_balance_a" model="account.report.column">
+                <field name="name">Balance A</field>
+                <field name="expression_label">balance_a</field>
+            </record>
+            <record id="l10n_lk_vat001_balance_b" model="account.report.column">
+                <field name="name">Balance B</field>
+                <field name="expression_label">balance_b</field>
+            </record>
+            <record id="l10n_lk_vat001_balance_c" model="account.report.column">
+                <field name="name">Balance C</field>
+                <field name="expression_label">balance_c</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="l10n_lk_vat001_lk_vat_001e_ot" model="account.report.line">
+                <field name="name">Part (I) - Output tax</field>
+                <field name="code">LK_VAT_001E_OT</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_a" model="account.report.line">
+                        <field name="name">A, 0: Taxable Supplies</field>
+                        <field name="code">LK_VAT_001E_A</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_a_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_A</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_a_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_0</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_a1" model="account.report.line">
+                        <field name="name">A1, 1: Deemed Taxable Supplies (Specified Projects)</field>
+                        <field name="code">LK_VAT_001E_A1</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_a1_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_A1</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_a1_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_1</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_a2" model="account.report.line">
+                        <field name="name">A2, 1A: Deemed Taxable Supplies (Strategic Development Projects)</field>
+                        <field name="code">LK_VAT_001E_A2</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_a2_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_A2</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_a2_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_1A</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_b" model="account.report.line">
+                        <field name="name">B, 2: Wholesale and Retail Taxable Supplies</field>
+                        <field name="code">LK_VAT_001E_B</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_b_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_B</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_b_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_2</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_c" model="account.report.line">
+                        <field name="name">C, 2A: VAT Suspended Taxable Supplies</field>
+                        <field name="code">LK_VAT_001E_C</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_c_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_C</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_c_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_2A</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_tot" model="account.report.line">
+                        <field name="name">3: Total Output Tax (0+1+1A+2+2A)</field>
+                        <field name="code">LK_VAT_001E_TOT</field>
+                        <field name="hierarchy_level">3</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_tot_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_A.balance_b + LK_VAT_001E_A1.balance_b + LK_VAT_001E_A2.balance_b + LK_VAT_001E_B.balance_b + LK_VAT_001E_C.balance_b</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_d" model="account.report.line">
+                        <field name="name">D: Zero Rated Supplies (Goods)</field>
+                        <field name="code">LK_VAT_001E_D</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_d_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_d1" model="account.report.line">
+                        <field name="name">D1: Zero Rated Supplies (Services)</field>
+                        <field name="code">LK_VAT_001E_D1</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_d1_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_D1</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_e" model="account.report.line">
+                        <field name="name">E: Exempt Supplies</field>
+                        <field name="code">LK_VAT_001E_E</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_e_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_E</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_e1" model="account.report.line">
+                        <field name="name">E1: Excluded Supplies</field>
+                        <field name="code">LK_VAT_001E_E1</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_e1_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-VAT_E1</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_f" model="account.report.line">
+                        <field name="name">F, F1: Local Supply of Garments</field>
+                        <field name="code">LK_VAT_001E_F</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_f_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">external</field>
+                                <field name="formula">most_recent</field>
+                                <field name="subformula">editable;rounding=2</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_f_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">external</field>
+                                <field name="formula">most_recent</field>
+                                <field name="subformula">editable;rounding=2</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_g" model="account.report.line">
+                        <field name="name">G, G1: Local Supply of Fabrics</field>
+                        <field name="code">LK_VAT_001E_G</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_g_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">external</field>
+                                <field name="formula">most_recent</field>
+                                <field name="subformula">editable;rounding=2</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_g_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">external</field>
+                                <field name="formula">most_recent</field>
+                                <field name="subformula">editable;rounding=2</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_it" model="account.report.line">
+                <field name="name">Part (II) - Input tax</field>
+                <field name="code">LK_VAT_001E_IT</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_h" model="account.report.line">
+                        <field name="name">H, 4, 5: Imports</field>
+                        <field name="code">LK_VAT_001E_H</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_h_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_H</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_h_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_4</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_h_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_5</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_i" model="account.report.line">
+                        <field name="name">I, 6: Local Purchases</field>
+                        <field name="code">LK_VAT_001E_I</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_i_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_I</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_i_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_6</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_tit" model="account.report.line">
+                        <field name="name">7: Total Input Tax (4+5+6)</field>
+                        <field name="code">LK_VAT_001E_TIT</field>
+                        <field name="hierarchy_level">3</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_tit_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_H.balance_b + LK_VAT_001E_H.balance_c + LK_VAT_001E_I.balance_c</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_j" model="account.report.line">
+                        <field name="name">J, K: VAT Suspended Purchases</field>
+                        <field name="code">LK_VAT_001E_J</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_j_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_J</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_j_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_K</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_j1" model="account.report.line">
+                        <field name="name">J1, K1: Non-Foreign Exchange Purchases</field>
+                        <field name="code">LK_VAT_001E_J1</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_j1_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_J1</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_j1_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_K1</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_j2" model="account.report.line">
+                        <field name="name">J2: Imports on which VAT is not charged</field>
+                        <field name="code">LK_VAT_001E_J2</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_j2_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_J2</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_j3" model="account.report.line">
+                        <field name="name">J3: Local Purchases on which VAT is not charged</field>
+                        <field name="code">LK_VAT_001E_J3</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_j3_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_J3</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_j4" model="account.report.line">
+                        <field name="name">J4: Goods Purchased from Non VAT Registered Persons</field>
+                        <field name="code">LK_VAT_001E_J4</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_j4_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_J4</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_8" model="account.report.line">
+                        <field name="name">8: Disallowable Input Tax on Imports, other Purchases and Adjustments</field>
+                        <field name="code">LK_VAT_001E_8</field>
+                        <field name="hierarchy_level">3</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_8_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_8</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_8a" model="account.report.line">
+                        <field name="name">8A: Disallowable Input Tax on Suspended Purchases</field>
+                        <field name="code">LK_VAT_001E_8A</field>
+                        <field name="hierarchy_level">3</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_8a_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">VAT_8A</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_9" model="account.report.line">
+                        <field name="name">9: Allowable Input Tax excluding B/F Amounts (7–8)</field>
+                        <field name="code">LK_VAT_001E_9</field>
+                        <field name="hierarchy_level">3</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_9_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_TIT.balance_c - LK_VAT_001E_8.balance_c - LK_VAT_001E_8A.balance_c</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_10" model="account.report.line">
+                        <field name="name">10: Brought Forward Input Tax</field>
+                        <field name="code">LK_VAT_001E_10</field>
+                        <field name="hierarchy_level">3</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_10_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">external</field>
+                                <field name="formula">most_recent</field>
+                                <field name="subformula">editable;rounding=2</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_ait" model="account.report.line">
+                <field name="name">Part (III) - Allowable Input tax</field>
+                <field name="code">LK_VAT_001E_AIT</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_11" model="account.report.line">
+                        <field name="name">11: Zero Rated Supplies/Suspended Supplies/22(7) {Cage 9*(C+D+D1)/(A+A1+A2+B+C+D+D1)}</field>
+                        <field name="code">LK_VAT_001E_11</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_11_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_9.balance_c * (LK_VAT_001E_C.balance_a + LK_VAT_001E_D.balance_a + LK_VAT_001E_D1.balance_a) / (LK_VAT_001E_A.balance_a + LK_VAT_001E_A1.balance_a + LK_VAT_001E_A2.balance_a + LK_VAT_001E_B.balance_a + LK_VAT_001E_C.balance_a + LK_VAT_001E_D.balance_a + LK_VAT_001E_D1.balance_a)</field>
+                                <field name="subformula">ignore_zero_division</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_12" model="account.report.line">
+                        <field name="name">12: Not belongs to above {(9+10-11) or 100% of cage 0+1+1A+2 whichever is lower} </field>
+                        <field name="code">LK_VAT_001E_12</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_12_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_12.sub_balance_a + LK_VAT_001E_12.sub_balance_b</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_12_check_balance" model="account.report.expression">
+                                <field name="label">check_balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">(LK_VAT_001E_9.balance_c + LK_VAT_001E_10.balance_c - LK_VAT_001E_11.balance_c) - (LK_VAT_001E_A.balance_b + LK_VAT_001E_A1.balance_b + LK_VAT_001E_A2.balance_b + LK_VAT_001E_B.balance_b)</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_12_sub_balance_a" model="account.report.expression">
+                                <field name="label">sub_balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_9.balance_c + LK_VAT_001E_10.balance_c - LK_VAT_001E_11.balance_c</field>
+                                <field name="subformula">if_other_expr_below(LK_VAT_001E_12.check_balance, LKR(0.01))</field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_12_sub_balance_b" model="account.report.expression">
+                                <field name="label">sub_balance_b</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_A.balance_b + LK_VAT_001E_A1.balance_b + LK_VAT_001E_A2.balance_b + LK_VAT_001E_B.balance_b</field>
+                                <field name="subformula">if_other_expr_above(LK_VAT_001E_12.check_balance, LKR(0))</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_13" model="account.report.line">
+                        <field name="name">13: Allowable Input (11+12)</field>
+                        <field name="code">LK_VAT_001E_13</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_13_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_11.balance_c + LK_VAT_001E_12.balance_c</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_14" model="account.report.line">
+                        <field name="name">14: Unabsorbed Excess Input Tax C/F to next Quarter (9+10-13)</field>
+                        <field name="code">LK_VAT_001E_14</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_14_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_9.balance_c + LK_VAT_001E_10.balance_c - LK_VAT_001E_13.balance_c</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_tpr" model="account.report.line">
+                <field name="name">Part (IV) - Tax Payable/Refundable</field>
+                <field name="code">LK_VAT_001E_TPR</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_15" model="account.report.line">
+                        <field name="name">15: Gross Refund Due if (13-3-8A) &gt; 0</field>
+                        <field name="code">LK_VAT_001E_15</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_15_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_13.balance_c - LK_VAT_001E_TOT.balance_c - LK_VAT_001E_8A.balance_c</field>
+                                <field name="subformula">if_above(LKR(0))</field>
+                            </record>
+                        </field>
+                        <field name="children_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_l" model="account.report.line">
+                                <field name="name">L: Unabsorbed VAT as at 31/12/2010</field>
+                                <field name="code">LK_VAT_001E_L</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_l_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">external</field>
+                                        <field name="formula">recent</field>
+                                        <field name="subformula">editable;rounding=2</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_m" model="account.report.line">
+                                <field name="name">M: The aggregate Input Tax set off against VAT after 01/01/2011</field>
+                                <field name="code">LK_VAT_001E_M</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_m_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">external</field>
+                                        <field name="formula">recent</field>
+                                        <field name="subformula">editable;rounding=2</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_n" model="account.report.line">
+                                <field name="name">N: The aggregate Input Tax set off against other taxes payable to CGIR</field>
+                                <field name="code">LK_VAT_001E_N</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_n_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">external</field>
+                                        <field name="formula">recent</field>
+                                        <field name="subformula">editable;rounding=2</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_o" model="account.report.line">
+                                <field name="name">O: The aggregate input Tax set off against taxes payable to DGC</field>
+                                <field name="code">LK_VAT_001E_O</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_o_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">external</field>
+                                        <field name="formula">recent</field>
+                                        <field name="subformula">editable;rounding=2</field>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_16" model="account.report.line">
+                        <field name="name">16: Tax Payable if (3-13+8A) &gt; 0</field>
+                        <field name="code">LK_VAT_001E_16</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_16_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_VAT_001E_TOT.balance_c - LK_VAT_001E_13.balance_c + LK_VAT_001E_8A.balance_c</field>
+                                <field name="subformula">if_above(LKR(0))</field>
+                            </record>
+                        </field>
+                        <field name="children_ids">
+                            <record id="l10n_lk_vat001_lk_vat_001e_q" model="account.report.line">
+                                <field name="name">Q: Monthly Payment</field>
+                                <field name="code">LK_VAT_001E_Q</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_q_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">external</field>
+                                        <field name="formula">sum</field>
+                                        <field name="subformula">editable;rounding=2</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_r" model="account.report.line">
+                                <field name="name">R: Deemed Tax Credit (Specified Projects)</field>
+                                <field name="code">LK_VAT_001E_R</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">tax_tags</field>
+                                        <field name="formula">-VAT_R</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_r1" model="account.report.line">
+                                <field name="name">R1: Deemed Tax Credit (Strategic Development Project)</field>
+                                <field name="code">LK_VAT_001E_R1</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r1_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">tax_tags</field>
+                                        <field name="formula">-VAT_R1</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_r2" model="account.report.line">
+                                <field name="name">R2: Tax Credit based on SVAT Credit Voucher</field>
+                                <field name="code">LK_VAT_001E_R2</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r2_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">tax_tags</field>
+                                        <field name="formula">-VAT_R2</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_r3" model="account.report.line">
+                                <field name="name">R3: Allowed Deemed Input Credit on Wholesale and Retail R2 R3=(R3B+R3F) = Lesser amount of cage 2 or {Cage 16 – (R+R1+R2}</field>
+                                <field name="code">LK_VAT_001E_R3</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="foldable" eval="True" />
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_R3.check_balance_b + LK_VAT_001E_R3.sub_balance_c</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_check_balance_a" model="account.report.expression">
+                                        <field name="label">check_balance_a</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">(LK_VAT_001E_B.balance_b) - (LK_VAT_001E_16.balance_c - LK_VAT_001E_R.balance_c - LK_VAT_001E_R1.balance_c - LK_VAT_001E_R2.balance_c)</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_check_balance_b" model="account.report.expression">
+                                        <field name="label">check_balance_b</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_R3.sub_balance_a + LK_VAT_001E_R3.sub_balance_b</field>
+                                        <field name="subformula">if_other_expr_below(LK_VAT_001E_R3.check_balance_c, LKR(0.01))</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_check_balance_c" model="account.report.expression">
+                                        <field name="label">check_balance_c</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">(LK_VAT_001E_R3.sub_balance_a + LK_VAT_001E_R3.sub_balance_b) - (LK_VAT_001E_R3B.balance_c + LK_VAT_001E_R3F.balance_c)</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_sub_balance_a" model="account.report.expression">
+                                        <field name="label">sub_balance_a</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_B.balance_b</field>
+                                        <field name="subformula">if_other_expr_above(LK_VAT_001E_R3.check_balance_a, LKR(0))</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_sub_balance_b" model="account.report.expression">
+                                        <field name="label">sub_balance_b</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_16.balance_c - LK_VAT_001E_R.balance_c - LK_VAT_001E_R1.balance_c - LK_VAT_001E_R2.balance_c</field>
+                                        <field name="subformula">if_other_expr_below(LK_VAT_001E_R3.check_balance_a, LKR(0.01))</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3_sub_balance_c" model="account.report.expression">
+                                        <field name="label">sub_balance_c</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_R3B.balance_c + LK_VAT_001E_R3F.balance_c</field>
+                                        <field name="subformula">if_other_expr_above(LK_VAT_001E_R3.check_balance_c, LKR(0))</field>
+                                    </record>
+                                </field>
+                                <field name="children_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3a" model="account.report.line">
+                                        <field name="name">R3A: B/F Credit on Stock</field>
+                                        <field name="code">LK_VAT_001E_R3A</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3a_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">external</field>
+                                                <field name="formula">sum</field>
+                                                <field name="subformula">editable;rounding=2</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3b" model="account.report.line">
+                                        <field name="name">R3B: Claimed Credit on Stock for the Period</field>
+                                        <field name="code">LK_VAT_001E_R3B</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3b_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">external</field>
+                                                <field name="formula">sum</field>
+                                                <field name="subformula">editable;rounding=2</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3c" model="account.report.line">
+                                        <field name="name">R3C: C/F Credit on Stock</field>
+                                        <field name="code">LK_VAT_001E_R3C</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3c_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">aggregation</field>
+                                                <field name="formula">LK_VAT_001E_R3A.balance_c - LK_VAT_001E_R3B.balance_c</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3d" model="account.report.line">
+                                        <field name="name">R3D: B/F Credit on Purchase</field>
+                                        <field name="code">LK_VAT_001E_R3D</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3d_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">external</field>
+                                                <field name="formula">sum</field>
+                                                <field name="subformula">editable;rounding=2</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3e" model="account.report.line">
+                                        <field name="name">R3E: Credit on purchases for the Period</field>
+                                        <field name="code">LK_VAT_001E_R3E</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3e_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">external</field>
+                                                <field name="formula">sum</field>
+                                                <field name="subformula">editable;rounding=2</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3f" model="account.report.line">
+                                        <field name="name">R3F: Claimed Credit on purchases for the Period</field>
+                                        <field name="code">LK_VAT_001E_R3F</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3f_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">external</field>
+                                                <field name="formula">sum</field>
+                                                <field name="subformula">editable;rounding=2</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_r3g" model="account.report.line">
+                                        <field name="name">R3G: C/F Credit on Purchase</field>
+                                        <field name="code">LK_VAT_001E_R3G</field>
+                                        <field name="hierarchy_level">5</field>
+                                        <field name="expression_ids">
+                                            <record id="l10n_lk_vat001_lk_vat_001e_r3g_balance_c" model="account.report.expression">
+                                                <field name="label">balance_c</field>
+                                                <field name="engine">aggregation</field>
+                                                <field name="formula">LK_VAT_001E_R3D.balance_c + LK_VAT_001E_R3E.balance_c - LK_VAT_001E_R3F.balance_c</field>
+                                            </record>
+                                        </field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="l10n_lk_vat001_lk_vat_001e_s" model="account.report.line">
+                                <field name="name">S: Claim for this Period out of Cage L</field>
+                                <field name="code">LK_VAT_001E_S</field>
+                                <field name="hierarchy_level">3</field>
+                                <field name="expression_ids">
+                                    <record id="l10n_lk_vat001_lk_vat_001e_s_balance_c" model="account.report.expression">
+                                        <field name="label">balance_c</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_S.sub_balance_a + LK_VAT_001E_S.sub_balance_b</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_s_check_balance" model="account.report.expression">
+                                        <field name="label">check_balance</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">(LK_VAT_001E_L.balance_c * 0.1) - LK_VAT_001E_16.balance_c</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_s_sub_balance_a" model="account.report.expression">
+                                        <field name="label">sub_balance_a</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_L.balance_c * 0.1</field>
+                                        <field name="subformula">if_other_expr_below(LK_VAT_001E_S.check_balance, LKR(0.01))</field>
+                                    </record>
+                                    <record id="l10n_lk_vat001_lk_vat_001e_s_sub_balance_b" model="account.report.expression">
+                                        <field name="label">sub_balance_b</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">LK_VAT_001E_16.balance_c</field>
+                                        <field name="subformula">if_other_expr_above(LK_VAT_001E_S.check_balance, LKR(0))</field>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_s1" model="account.report.line">
+                <field name="name">S1A, S1B, S1C: The Input tax set off against other taxes payable to CGIR (IT/ESC/NBT)</field>
+                <field name="code">LK_VAT_001E_S1</field>
+                <field name="hierarchy_level">1</field>
+                <field name="expression_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_s1_balance_a" model="account.report.expression">
+                        <field name="label">balance_a</field>
+                        <field name="engine">external</field>
+                        <field name="formula">sum</field>
+                        <field name="subformula">editable;rounding=2</field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_s1_balance_b" model="account.report.expression">
+                        <field name="label">balance_b</field>
+                        <field name="engine">external</field>
+                        <field name="formula">sum</field>
+                        <field name="subformula">editable;rounding=2</field>
+                    </record>
+                    <record id="l10n_lk_vat001_lk_vat_001e_s1_balance_c" model="account.report.expression">
+                        <field name="label">balance_c</field>
+                        <field name="engine">external</field>
+                        <field name="formula">sum</field>
+                        <field name="subformula">editable;rounding=2</field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_s2" model="account.report.line">
+                <field name="name">S2: The Input tax set off against taxes payable to DGC</field>
+                <field name="code">LK_VAT_001E_S2</field>
+                <field name="hierarchy_level">1</field>
+                <field name="expression_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_s2_balance_c" model="account.report.expression">
+                        <field name="label">balance_c</field>
+                        <field name="engine">external</field>
+                        <field name="formula">sum</field>
+                        <field name="subformula">editable;rounding=2</field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_s3" model="account.report.line">
+                <field name="name">S3: Total claimed from Unabsorbed Input Tax (S+S1A+S1B+S1C+S2)</field>
+                <field name="code">LK_VAT_001E_S3</field>
+                <field name="hierarchy_level">1</field>
+                <field name="expression_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_s3_balance_c" model="account.report.expression">
+                        <field name="label">balance_c</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">LK_VAT_001E_S.balance_c + LK_VAT_001E_S1.balance_a + LK_VAT_001E_S1.balance_b + LK_VAT_001E_S1.balance_c + LK_VAT_001E_S2.balance_c</field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_17" model="account.report.line">
+                <field name="name">17: Total Tax Credits (Q+R+R1+R2+R3+S)</field>
+                <field name="code">LK_VAT_001E_17</field>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_17_balance_c" model="account.report.expression">
+                        <field name="label">balance_c</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">LK_VAT_001E_Q.balance_c + LK_VAT_001E_R.balance_c + LK_VAT_001E_R1.balance_c + LK_VAT_001E_R2.balance_c + LK_VAT_001E_R3.balance_c + LK_VAT_001E_S.balance_c</field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_p" model="account.report.line">
+                <field name="name">P: Unabsorbed balance to be C/F (L-(M+N+O))</field>
+                <field name="code">LK_VAT_001E_P</field>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_p_balance_c" model="account.report.expression">
+                        <field name="label">balance_c</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">LK_VAT_001E_L.balance_c - LK_VAT_001E_M.balance_c - LK_VAT_001E_N.balance_c - LK_VAT_001E_O.balance_c</field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_vat001_lk_vat_001e_18" model="account.report.line">
+                <field name="name">18: Tax Payable/(Refund Due) (16-17-15)</field>
+                <field name="code">LK_VAT_001E_18</field>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="l10n_lk_vat001_lk_vat_001e_18_balance_c" model="account.report.expression">
+                        <field name="label">balance_c</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">LK_VAT_001E_16.balance_c - LK_VAT_001E_17.balance_c - LK_VAT_001E_15.balance_c</field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/l10n_lk/data/form_wht001.xml b/addons/l10n_lk/data/form_wht001.xml
new file mode 100644
index 0000000000000..517dc6a000ed7
--- /dev/null
+++ b/addons/l10n_lk/data/form_wht001.xml
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="l10n_lk_wht001" model="account.report">
+        <field name="name">WHT/AIT Return Form WHT-001</field>
+        <field name="root_report_id" ref="account.generic_tax_report" />
+        <field name="sequence">20</field>
+        <field name="country_id" ref="base.lk" />
+        <field name="column_ids">
+            <record id="l10n_lk_wht001_balance_a" model="account.report.column">
+                <field name="name">Total Payment Value</field>
+                <field name="expression_label">balance_a</field>
+            </record>
+            <record id="l10n_lk_wht001_balance_b" model="account.report.column">
+                <field name="name">Amount Not Liable</field>
+                <field name="expression_label">balance_b</field>
+            </record>
+            <record id="l10n_lk_wht001_balance_c" model="account.report.column">
+                <field name="name">Amount Liable</field>
+                <field name="expression_label">balance_c</field>
+            </record>
+            <record id="l10n_lk_wht001_balance_d" model="account.report.column">
+                <field name="name">Amount Deducted</field>
+                <field name="expression_label">balance_d</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="l10n_lk_wht001_lk_wht_001e_whtd" model="account.report.line">
+                <field name="name">PART I – Summery of Withholding Tax (WHT) Deductions </field>
+                <field name="code">LK_WHT_001E_WHTD</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_1" model="account.report.line">
+                        <field name="name">1. Interest or Discount</field>
+                        <field name="code">LK_WHT_001E_WHTD_1</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_1_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_1.balance_b + LK_WHT_001E_WHTD_1.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_1_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_1B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_1_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_1C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_1_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_1D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_2" model="account.report.line">
+                        <field name="name">2. Charges</field>
+                        <field name="code">LK_WHT_001E_WHTD_2</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_2_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_2.balance_b + LK_WHT_001E_WHTD_2.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_2_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_2B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_2_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_2C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_2_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_2D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_3" model="account.report.line">
+                        <field name="name">3. Natural resource payment</field>
+                        <field name="code">LK_WHT_001E_WHTD_3</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_3_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_3.balance_b + LK_WHT_001E_WHTD_3.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_3_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_3B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_3_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_3C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_3_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_3D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_4" model="account.report.line">
+                        <field name="name">4. Rent</field>
+                        <field name="code">LK_WHT_001E_WHTD_4</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_4_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_4.balance_b + LK_WHT_001E_WHTD_4.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_4_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_4B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_4_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_4C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_4_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_4D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_5" model="account.report.line">
+                        <field name="name">5. Royalty</field>
+                        <field name="code">LK_WHT_001E_WHTD_5</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_5_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_5.balance_b + LK_WHT_001E_WHTD_5.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_5_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_5B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_5_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_5C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_5_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_5D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_6" model="account.report.line">
+                        <field name="name">6. Service fee or insurance premium</field>
+                        <field name="code">LK_WHT_001E_WHTD_6</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_6_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_6.balance_b + LK_WHT_001E_WHTD_6.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_6_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_6B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_6_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_6C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_6_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_6D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_7" model="account.report.line">
+                        <field name="name">7. Fee on Transport or Telecommunications Service</field>
+                        <field name="code">LK_WHT_001E_WHTD_7</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_7_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_7.balance_b + LK_WHT_001E_WHTD_7.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_7_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_7B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_7_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_7C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_7_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_7D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_8" model="account.report.line">
+                        <field name="name">8. Any other payments (Dividend, ect)</field>
+                        <field name="code">LK_WHT_001E_WHTD_8</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_8_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_8.balance_b + LK_WHT_001E_WHTD_8.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_8_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_8B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_8_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_8C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_8_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_8D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_9" model="account.report.line">
+                        <field name="name">9. Rewards, ro winnings from lottery / betting / gambling</field>
+                        <field name="code">LK_WHT_001E_WHTD_9</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_9_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_9.balance_b + LK_WHT_001E_WHTD_9.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_9_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_9B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_9_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_9C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_9_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_9D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_10" model="account.report.line">
+                        <field name="name">10. Sale of gem at an auction</field>
+                        <field name="code">LK_WHT_001E_WHTD_10</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_10_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_10.balance_b + LK_WHT_001E_WHTD_10.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_10_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_10B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_10_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">WHTD_10C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_10_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-WHTD_10D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_whtd_11" model="account.report.line">
+                        <field name="name">IA Total (1-10)</field>
+                        <field name="code">LK_WHT_001E_WHTD_11</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_11_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_1.balance_a + LK_WHT_001E_WHTD_2.balance_a + LK_WHT_001E_WHTD_3.balance_a + LK_WHT_001E_WHTD_4.balance_a + LK_WHT_001E_WHTD_5.balance_a + LK_WHT_001E_WHTD_6.balance_a + LK_WHT_001E_WHTD_7.balance_a + LK_WHT_001E_WHTD_8.balance_a + LK_WHT_001E_WHTD_9.balance_a + LK_WHT_001E_WHTD_10.balance_a</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_11_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_1.balance_b + LK_WHT_001E_WHTD_2.balance_b + LK_WHT_001E_WHTD_3.balance_b + LK_WHT_001E_WHTD_4.balance_b + LK_WHT_001E_WHTD_5.balance_b + LK_WHT_001E_WHTD_6.balance_b + LK_WHT_001E_WHTD_7.balance_b + LK_WHT_001E_WHTD_8.balance_b + LK_WHT_001E_WHTD_9.balance_b + LK_WHT_001E_WHTD_10.balance_b</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_11_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_1.balance_c + LK_WHT_001E_WHTD_2.balance_c + LK_WHT_001E_WHTD_3.balance_c + LK_WHT_001E_WHTD_4.balance_c + LK_WHT_001E_WHTD_5.balance_c + LK_WHT_001E_WHTD_6.balance_c + LK_WHT_001E_WHTD_7.balance_c + LK_WHT_001E_WHTD_8.balance_c + LK_WHT_001E_WHTD_9.balance_c + LK_WHT_001E_WHTD_10.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_whtd_11_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_WHTD_1.balance_d + LK_WHT_001E_WHTD_2.balance_d + LK_WHT_001E_WHTD_3.balance_d + LK_WHT_001E_WHTD_4.balance_d + LK_WHT_001E_WHTD_5.balance_d + LK_WHT_001E_WHTD_6.balance_d + LK_WHT_001E_WHTD_7.balance_d + LK_WHT_001E_WHTD_8.balance_d + LK_WHT_001E_WHTD_9.balance_d + LK_WHT_001E_WHTD_10.balance_d</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="l10n_lk_wht001_lk_wht_001e_aitd" model="account.report.line">
+                <field name="name">PART II – Summery of Advance Income Tax (AIT) Deductions </field>
+                <field name="code">LK_WHT_001E_AITD</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_1" model="account.report.line">
+                        <field name="name">1. Interest or Discount</field>
+                        <field name="code">LK_WHT_001E_AITD_1</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_1_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_1.balance_b + LK_WHT_001E_AITD_1.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_1_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_1B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_1_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_1C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_1_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_1D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_2" model="account.report.line">
+                        <field name="name">2. Charges</field>
+                        <field name="code">LK_WHT_001E_AITD_2</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_2_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_2.balance_b + LK_WHT_001E_AITD_2.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_2_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_2B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_2_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_2C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_2_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_2D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_3" model="account.report.line">
+                        <field name="name">3. Natural resource Payments</field>
+                        <field name="code">LK_WHT_001E_AITD_3</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_3_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_3.balance_b + LK_WHT_001E_AITD_3.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_3_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_3B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_3_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_3C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_3_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_3D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_4" model="account.report.line">
+                        <field name="name">4. Rent</field>
+                        <field name="code">LK_WHT_001E_AITD_4</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_4_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_4.balance_b + LK_WHT_001E_AITD_4.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_4_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_4B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_4_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_4C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_4_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_4D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_5" model="account.report.line">
+                        <field name="name">5. Royalty</field>
+                        <field name="code">LK_WHT_001E_AITD_5</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_5_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_5.balance_b + LK_WHT_001E_AITD_5.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_5_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_5B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_5_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_5C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_5_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_5D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_6" model="account.report.line">
+                        <field name="name">6. Dividend</field>
+                        <field name="code">LK_WHT_001E_AITD_6</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_6_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_6.balance_b + LK_WHT_001E_AITD_6.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_6_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_6B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_6_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_6C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_6_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_6D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_7" model="account.report.line">
+                        <field name="name">7. Premium or Similar Periodic Payment or payment on services</field>
+                        <field name="code">LK_WHT_001E_AITD_7</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_7_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_7.balance_b + LK_WHT_001E_AITD_7.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_7_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_7B</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_7_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">AITD_7C</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_7_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">tax_tags</field>
+                                <field name="formula">-AITD_7D</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="l10n_lk_wht001_lk_wht_001e_aitd_8" model="account.report.line">
+                        <field name="name">IIA Total (1-7)</field>
+                        <field name="code">LK_WHT_001E_AITD_8</field>
+                        <field name="hierarchy_level">1</field>
+                        <field name="expression_ids">
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_8_balance_a" model="account.report.expression">
+                                <field name="label">balance_a</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_1.balance_a + LK_WHT_001E_AITD_2.balance_a + LK_WHT_001E_AITD_3.balance_a + LK_WHT_001E_AITD_4.balance_a + LK_WHT_001E_AITD_5.balance_a + LK_WHT_001E_AITD_6.balance_a + LK_WHT_001E_AITD_7.balance_a</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_8_balance_b" model="account.report.expression">
+                                <field name="label">balance_b</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_1.balance_b + LK_WHT_001E_AITD_2.balance_b + LK_WHT_001E_AITD_3.balance_b + LK_WHT_001E_AITD_4.balance_b + LK_WHT_001E_AITD_5.balance_b + LK_WHT_001E_AITD_6.balance_b + LK_WHT_001E_AITD_7.balance_b</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_8_balance_c" model="account.report.expression">
+                                <field name="label">balance_c</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_1.balance_c + LK_WHT_001E_AITD_2.balance_c + LK_WHT_001E_AITD_3.balance_c + LK_WHT_001E_AITD_4.balance_c + LK_WHT_001E_AITD_5.balance_c + LK_WHT_001E_AITD_6.balance_c + LK_WHT_001E_AITD_7.balance_c</field>
+                            </record>
+                            <record id="l10n_lk_wht001_lk_wht_001e_aitd_8_balance_d" model="account.report.expression">
+                                <field name="label">balance_d</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">LK_WHT_001E_AITD_1.balance_d + LK_WHT_001E_AITD_2.balance_d + LK_WHT_001E_AITD_3.balance_d + LK_WHT_001E_AITD_4.balance_d + LK_WHT_001E_AITD_5.balance_d + LK_WHT_001E_AITD_6.balance_d + LK_WHT_001E_AITD_7.balance_d</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/l10n_lk/data/template/account.account-lk.csv b/addons/l10n_lk/data/template/account.account-lk.csv
new file mode 100644
index 0000000000000..0b5d9ffe4cf32
--- /dev/null
+++ b/addons/l10n_lk/data/template/account.account-lk.csv
@@ -0,0 +1,101 @@
+"id","code","name","account_type","reconcile","tag_ids","non_trade"
+"l10n_lk_account_101000","101000","Bank","asset_cash","True","","False"
+"l10n_lk_account_101100","101100","Cash","asset_cash","True","","False"
+"l10n_lk_account_101200","101200","Liquidity Transfer","asset_cash","True","","False"
+"l10n_lk_account_111000","111000","Trade Debtors","asset_receivable","True","account.account_tag_operating","False"
+"l10n_lk_account_111001","111001","Trade Debtors (PoS)","asset_receivable","True","account.account_tag_operating","False"
+"l10n_lk_account_112000","112000","Due from Related Companies","asset_receivable","True","account.account_tag_operating","False"
+"l10n_lk_account_113000","113000","Staff Loan Receivables","asset_current","False","account.account_tag_investing","False"
+"l10n_lk_account_114000","114000","VAT Receivable","asset_receivable","True","account.account_tag_operating","True"
+"l10n_lk_account_114100","114100","WHT Receivable","asset_receivable","True","account.account_tag_operating","True"
+"l10n_lk_account_115000","115000","Income Tax Refund Due","asset_current","False","account.account_tag_operating","False"
+"l10n_lk_account_116000","116000","Tax Paid","asset_current","False","account.account_tag_operating","False"
+"l10n_lk_account_117000","117000","Tax Withheld","asset_current","False","account.account_tag_operating","False"
+"l10n_lk_account_118000","118000","Other Taxes Receivable","asset_receivable","True","account.account_tag_operating","True"
+"l10n_lk_account_121000","121000","Investment in Fixed Deposits","asset_current","False","account.account_tag_investing","False"
+"l10n_lk_account_131000","131000","Prepaid Expenses","asset_prepayments","False","account.account_tag_operating","False"
+"l10n_lk_account_141000","141000","Stock Valuation","asset_current","False","account.account_tag_operating","False"
+"l10n_lk_account_141300","141300","Cost of Production","asset_current","True","account.account_tag_operating","False"
+"l10n_lk_account_141400","141400","Work in Progress","asset_current","True","account.account_tag_operating","False"
+"l10n_lk_account_151000","151000","Property, Plant and Equipment","asset_fixed","False","account.account_tag_investing","False"
+"l10n_lk_account_151100","151100","Accumulated Depreciation - PPE","asset_fixed","False","","False"
+"l10n_lk_account_161000","161000","Intangible Assets","asset_non_current","False","account.account_tag_investing","False"
+"l10n_lk_account_161100","161100","Accumulated Amortization","asset_non_current","False","","False"
+"l10n_lk_account_162000","162000","Investment in Quoted Shares","asset_non_current","False","account.account_tag_investing","False"
+"l10n_lk_account_163000","163000","Deferred Tax Assets","asset_non_current","False","account.account_tag_operating","False"
+"l10n_lk_account_201000","201000","Bank Overdraft","liability_current","False","account.account_tag_financing","False"
+"l10n_lk_account_202000","202000","Bank Suspense Account","liability_current","False","account.account_tag_operating","False"
+"l10n_lk_account_211000","211000","Credit Card","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_220100","220100","Trade Creditors","liability_payable","True","account.account_tag_operating","False"
+"l10n_lk_account_220200","220200","Customer Advances","liability_current","False","account.account_tag_operating","False"
+"l10n_lk_account_220300","220300","Due to Director","liability_current","True","account.account_tag_financing","False"
+"l10n_lk_account_220400","220400","Staff Salary Arrears Payable","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_220500","220500","EPF Payable","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_220600","220600","ETF Payable","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_220700","220700","Audit and Tax Fee Payable","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_220800","220800","Consultancy Fees Payable","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_220900","220900","Stamp Duty Payables","liability_current","True","account.account_tag_operating","False"
+"l10n_lk_account_221000","221000","PAYE Payable","liability_payable","True","account.account_tag_operating","False"
+"l10n_lk_account_221100","221100","WHT Payable","liability_payable","True","account.account_tag_operating","True"
+"l10n_lk_account_221200","221200","VAT Payable","liability_payable","True","account.account_tag_operating","True"
+"l10n_lk_account_221300","221300","Tax Received","liability_current","False","account.account_tag_operating","False"
+"l10n_lk_account_221400","221400","Tax Withheld","liability_current","False","account.account_tag_operating","False"
+"l10n_lk_account_221500","221500","Other Taxes Payable","liability_payable","True","account.account_tag_operating","True"
+"l10n_lk_account_251000","251000","Retirement Benefit Obligation","liability_non_current","False","account.account_tag_operating","False"
+"l10n_lk_account_301000","301000","Stated Capital","equity","False","account.account_tag_financing","False"
+"l10n_lk_account_302000","302000","Fair Value Through OCI Reserve","equity","False","","False"
+"l10n_lk_account_303000","303000","Retained Earnings","equity","False","","False"
+"l10n_lk_account_401000","401000","Revenue","income","False","account.account_tag_operating","False"
+"l10n_lk_account_411000","411000","Dividend Income","income_other","False","account.account_tag_investing","False"
+"l10n_lk_account_412000","412000","Gain on Disposal of Investment","income_other","False","account.account_tag_investing","False"
+"l10n_lk_account_413000","413000","Gain on Disposal of Motor Vehicle","income_other","False","account.account_tag_investing","False"
+"l10n_lk_account_414000","414000","Other Income","income_other","False","account.account_tag_operating","False"
+"l10n_lk_account_421000","421000","Interest Income","income_other","False","account.account_tag_investing","False"
+"l10n_lk_account_422000","422000","Foreign Exchange Gain","income_other","False","account.account_tag_operating","False"
+"l10n_lk_account_423000","423000","Cash Discount Gain","income_other","False","account.account_tag_operating","False"
+"l10n_lk_account_501000","501000","Cost of Revenue","expense_direct_cost","False","account.account_tag_operating","False"
+"l10n_lk_account_601000","601000","Staff Salaries","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601100","601100","Staff EPF Expense","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601200","601200","Staff ETF Expense","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601300","601300","Staff Allowances","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601400","601400","Staff Bonus","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601500","601500","Staff Welfare","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601600","601600","Staff Traveling","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601700","601700","Staff Loan Write Off","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_601800","601800","Gratuity Provision","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_611000","611000","Director's Remuneration","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_612000","612000","Consultancy Fee","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_613000","613000","Audit Fees and Expenses","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_613100","613100","Tax Fees and Expenses","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_613200","613200","Audit Expenses Under Provision","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_614000","614000","Secretarial Fees","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_621000","621000","Security Charges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_622000","622000","Telephone and Internet Charges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_622100","622100","Internet and e-mail charges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_623000","623000","Computer Maintenance","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_624000","624000","Office Maintenance","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_625000","625000","Electricity Charges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_626000","626000","Water Charges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_627000","627000","Postage","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_628000","628000","Printing and Stationery","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_629000","629000","Building Repair","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_629100","629100","Tender Expenses","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_631000","631000","Fuel Expenses","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_632000","632000","License and Insurance","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_633000","633000","Travelling and Transport","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_634000","634000","Vehicle Maintenance","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_641000","641000","Stock Write Off","expense","False","","False"
+"l10n_lk_account_642000","642000","Duty and Cess","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_643000","643000","Penalty and Surcharges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_651000","651000","Depreciation","expense_depreciation","False","","False"
+"l10n_lk_account_701000","701000","Bank Charges","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_702000","702000","Overdraft Interest","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_703000","703000","Loan Interest","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_704000","704000","Foreign Exchange Loss","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_705000","705000","Cash Discount Loss","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_706000","706000","Other Expenses","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_801000","801000","Current Income Tax Provision","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_802000","802000","Deferred Tax Provision / (Reversal)","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_803000","803000","Income Tax Over/Under Provision","expense","False","account.account_tag_operating","False"
+"l10n_lk_account_901000","901000","Fair Value Gain/Loss - OCI","income_other","False","","False"
+"l10n_lk_account_999999","999999","Undistributed Profits/Losses","equity_unaffected","False","","False"
diff --git a/addons/l10n_lk/data/template/account.fiscal.position-lk.csv b/addons/l10n_lk/data/template/account.fiscal.position-lk.csv
new file mode 100644
index 0000000000000..00d5e8518d7b4
--- /dev/null
+++ b/addons/l10n_lk/data/template/account.fiscal.position-lk.csv
@@ -0,0 +1,3 @@
+"id","name","auto_apply","country_id"
+"l10n_lk_fiscal_position_domestic","Domestic","1","base.lk"
+"l10n_lk_fiscal_position_foreign_trade","Foreign Trade","1",""
diff --git a/addons/l10n_lk/data/template/account.tax-lk.csv b/addons/l10n_lk/data/template/account.tax-lk.csv
new file mode 100644
index 0000000000000..f32e142510fe2
--- /dev/null
+++ b/addons/l10n_lk/data/template/account.tax-lk.csv
@@ -0,0 +1,237 @@
+"id","name","sequence","description","invoice_label","type_tax_use","tax_scope","amount_type","amount","tax_group_id","is_withholding_tax_on_payment","active","country_id","tax_exigibility","repartition_line_ids/factor_percent","repartition_line_ids/repartition_type","repartition_line_ids/document_type","repartition_line_ids/account_id","repartition_line_ids/tag_ids","repartition_line_ids/use_in_tax_closing","fiscal_position_ids","original_tax_ids"
+"l10n_lk_tax_sale_18","18%","","Taxable Supplies","18%","sale","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_A","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_A","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","VAT_0","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","VAT_0","True","",""
+"l10n_lk_tax_sale_18_d_sp","18% D SP","","Deemed Taxable Supplies (Specified Projects)","0%","sale","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_A1","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_A1","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","VAT_1||VAT_R","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","VAT_1||VAT_R","True","",""
+"","","","","","","","","","","","","","","-100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","-100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_18_d_sdp","18% D SDP","","Deemed Taxable Supplies (Strategic Development Project)","0%","sale","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_A2","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_A2","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","VAT_1A||VAT_R1","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","VAT_1A||VAT_R1","True","",""
+"","","","","","","","","","","","","","","-100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","-100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_18_m","18% M","","Wholesale and Retail Taxable Supplies","18%","sale","","percent","18","l10n_lk_tax_group_18","False","False","base.lk","on_invoice","","base","invoice","","VAT_B","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_B","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","VAT_2","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","VAT_2","True","",""
+"l10n_lk_tax_sale_18_svat","18% SVAT","","VAT Suspended Taxable Supplies","18%","sale","","percent","18","l10n_lk_tax_group_18","False","False","base.lk","on_invoice","","base","invoice","","VAT_C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","VAT_2A||VAT_R2","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","VAT_2A||VAT_R2","True","",""
+"","","","","","","","","","","","","","","-100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","-100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_0_g","0% G","","Zero Rated Supplies (Goods)","0%","sale","consu","percent","0","l10n_lk_tax_group_zero_rated","False","True","base.lk","on_invoice","","base","invoice","","VAT_D","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_D","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_0_s","0% S","","Zero Rated Supplies (Services)","0%","sale","service","percent","0","l10n_lk_tax_group_zero_rated","False","True","base.lk","on_invoice","","base","invoice","","VAT_D1","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_D1","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_0_ex_g","0% EX G","","Export (Goods)","0%","sale","consu","percent","0","l10n_lk_tax_group_zero_rated","False","True","base.lk","on_invoice","","base","invoice","","VAT_D","","l10n_lk_fiscal_position_foreign_trade","l10n_lk_tax_sale_18"
+"","","","","","","","","","","","","","","","base","refund","","VAT_D","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_0_ex_s","0% EX S","","Export (Services)","0%","sale","service","percent","0","l10n_lk_tax_group_zero_rated","False","True","base.lk","on_invoice","","base","invoice","","VAT_D1","","l10n_lk_fiscal_position_foreign_trade","l10n_lk_tax_sale_18"
+"","","","","","","","","","","","","","","","base","refund","","VAT_D1","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_0_exempt","0% Exempt","","Exempt Supplies","Exempt","sale","","percent","0","l10n_lk_tax_group_exempt","False","True","base.lk","on_invoice","","base","invoice","","VAT_E","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_E","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_sale_0_excluded","0% Excluded","","Excluded Supplies","Excluded","sale","","percent","0","l10n_lk_tax_group_exempt","False","True","base.lk","on_invoice","","base","invoice","","VAT_E1","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_E1","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221300","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221300","","True","",""
+"l10n_lk_tax_purchase_18_im","18% IM","","Imports","18%","purchase","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_H","","l10n_lk_fiscal_position_foreign_trade","l10n_lk_tax_purchase_18"
+"","","","","","","","","","","","","","","","base","refund","","VAT_H","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","VAT_5","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","VAT_5","True","",""
+"l10n_lk_tax_purchase_18_im_deferred","18% IM Deferred","","Imports Deferred","18%","purchase","","percent","18","l10n_lk_tax_group_18","False","False","base.lk","on_invoice","","base","invoice","","VAT_H","","l10n_lk_fiscal_position_foreign_trade","l10n_lk_tax_purchase_18"
+"","","","","","","","","","","","","","","","base","refund","","VAT_H","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","VAT_4","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","VAT_4","True","",""
+"l10n_lk_tax_purchase_18","18%","","Local Purchases","0%","purchase","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_I","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_I","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","VAT_6","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","VAT_6","True","",""
+"l10n_lk_tax_purchase_18_svat","18% SVAT","","VAT Suspended Purchases","0%","purchase","","percent","18","l10n_lk_tax_group_18","False","False","base.lk","on_invoice","","base","invoice","","VAT_J","","l10n_lk_fiscal_position_domestic","l10n_lk_tax_purchase_18"
+"","","","","","","","","","","","","","","","base","refund","","VAT_J","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","VAT_K||VAT_8A","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","VAT_K||VAT_8A","True","",""
+"","","","","","","","","","","","","","","-100","tax","invoice","l10n_lk_account_116000","","False","",""
+"","","","","","","","","","","","","","","-100","tax","refund","l10n_lk_account_116000","","False","",""
+"l10n_lk_tax_purchase_18_ep","18% EP","","Non-Foreign Exchange Purchases","18%","purchase","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_J1","","l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_J1","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","VAT_K1","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","VAT_K1","True","",""
+"l10n_lk_tax_purchase_0_exempt_im","0% Exempt IM","","Imports on which VAT is not charged","Exempt","purchase","consu","percent","0","l10n_lk_tax_group_exempt","False","True","base.lk","on_invoice","","base","invoice","","VAT_J2","","l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_J2","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","","True","",""
+"l10n_lk_tax_purchase_0_exempt","0% Exempt","","Local Purchases on which VAT is not charged","Exempt","purchase","service","percent","0","l10n_lk_tax_group_exempt","False","True","base.lk","on_invoice","","base","invoice","","VAT_J3","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_J3","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","","True","",""
+"l10n_lk_tax_purchase_0_exempt_n_vat","0% Exempt N-VAT","","Goods Purchased from Non VAT Registered Persons","Exempt","purchase","","percent","0","l10n_lk_tax_group_exempt","False","True","base.lk","on_invoice","","base","invoice","","VAT_J4","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_J4","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_116000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_116000","","True","",""
+"l10n_lk_tax_purchase_18_dis_im","18% Dis IM","","Disallowable Input Tax on Imports, other Purchases and Adjustments","18%","purchase","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_H","","l10n_lk_fiscal_position_foreign_trade","l10n_lk_tax_purchase_18_dis"
+"","","","","","","","","","","","","","","","base","refund","","VAT_H","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_613100","VAT_5||VAT_8","False","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_613100","VAT_5||VAT_8","False","",""
+"l10n_lk_tax_purchase_18_dis","18% Dis","","Disallowable Input Tax on Local Purchases","18%","purchase","","percent","18","l10n_lk_tax_group_18","False","True","base.lk","on_invoice","","base","invoice","","VAT_I","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","VAT_I","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_613100","VAT_6||VAT_8","False","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_613100","VAT_6","False","",""
+"l10n_lk_tax_purchase_5_wht_i_d","5% WHT I D","","WHT Interest or Discount","5% WHT I D","purchase","","percent","-5","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_1C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_1C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_1D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_1D","True","",""
+"l10n_lk_tax_purchase_14_wht_c","14% WHT C","","WHT Charges","14% WHT C","purchase","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_2C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_2C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_2D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_2D","True","",""
+"l10n_lk_tax_purchase_14_wht_nr","14% WHT NR","","WHT Natural resource payment","14% WHT NR","purchase","","percent","-14","l10n_lk_tax_group_wht","True","False","base.lk","on_invoice","","base","invoice","","WHTD_3C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_3C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_3D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_3D","True","",""
+"l10n_lk_tax_purchase_14_wht_rent","14% WHT Rent","","WHT Rent","14% WHT Rent","purchase","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_4C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_4C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_4D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_4D","True","",""
+"l10n_lk_tax_purchase_14_wht_rent_not_liable","14% WHT Rent Not Liable","","WHT Rent - Below Threshold","14% WHT Rent Not Liable","purchase","","percent","0","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_4B","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_4B","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","","True","",""
+"l10n_lk_tax_purchase_14_wht_royalty","14% WHT Royalty","","WHT Royalty","14% WHT Royalty","purchase","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_5C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_5C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_5D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_5D","True","",""
+"l10n_lk_tax_purchase_14_wht_s","14% WHT S","","WHT Service fee or insurance premium","14% WHT S","purchase","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_6C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_6C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_6D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_6D","True","",""
+"l10n_lk_tax_purchase_14_wht_s_not_liable","14% WHT S Not Liable","","WHT Service fee or insurance premium - Below Threshold","14% WHT S Not Liable","purchase","","percent","0","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_6B","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_6B","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","","True","",""
+"l10n_lk_tax_purchase_2_wht_t","2% WHT T","","WHT Fee on Transport or Telecommunications Service","2% WHT T","purchase","","percent","-2","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_7C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_7C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_7D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_7D","True","",""
+"l10n_lk_tax_purchase_15_wht_op","15% WHT OP","","WHT Any other payments (Dividend, etc)","15% WHT OP","purchase","","percent","-15","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","WHTD_8C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_8C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_8D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_8D","True","",""
+"l10n_lk_tax_purchase_14_wht_reward","14% WHT Reward","","WHT Rewards, or winnings from lottery / betting / gambling","14% WHT Reward","purchase","","percent","-14","l10n_lk_tax_group_wht","True","False","base.lk","on_invoice","","base","invoice","","WHTD_9C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_9C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_9D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_9D","True","",""
+"l10n_lk_tax_purchase_2.5_wht_g","2.5% WHT G","","WHT Sale of gem at an auction","2.5% WHT G","purchase","","percent","-2.5","l10n_lk_tax_group_wht","True","False","base.lk","on_invoice","","base","invoice","","WHTD_10C","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","WHTD_10C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","WHTD_10D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","WHTD_10D","True","",""
+"l10n_lk_tax_purchase_5_ait_i_d","5% AIT I D","","AIT Interest or Discount","5% AIT I D","purchase","","percent","-5","l10n_lk_tax_group_ait","False","True","base.lk","on_invoice","","base","invoice","","AITD_1C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_1C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_1D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_1D","True","",""
+"l10n_lk_tax_purchase_14_ait_c","14% AIT C","","AIT Charges","14% AIT C","purchase","","percent","-14","l10n_lk_tax_group_ait","False","True","base.lk","on_invoice","","base","invoice","","AITD_2C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_2C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_2D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_2D","True","",""
+"l10n_lk_tax_purchase_14_ait_nr","14% AIT NR","","AIT Natural resource payment","14% AIT NR","purchase","","percent","-14","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","AITD_3C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_3C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_3D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_3D","True","",""
+"l10n_lk_tax_purchase_14_ait_rent","14% AIT Rent","","AIT Rent","14% AIT Rent","purchase","","percent","-10","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","AITD_4C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_4C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_4D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_4D","True","",""
+"l10n_lk_tax_purchase_14_ait_royalty","14% AIT Royalty","","AIT Royalty","14% AIT Royalty","purchase","","percent","-14","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","AITD_5C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_5C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_5D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_5D","True","",""
+"l10n_lk_tax_purchase_14_ait_d","14% AIT D","","AIT Dividend","14% AIT D","purchase","","percent","-15","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","AITD_6C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_6C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_6D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_6D","True","",""
+"l10n_lk_tax_purchase_14_ait_p","14% AIT P","","AIT Premium or Similar Periodic Payment or payment on services","14% AIT P","purchase","","percent","-14","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","AITD_7C","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","AITD_7C","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_221400","AITD_7D","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_221400","AITD_7D","True","",""
+"l10n_lk_tax_sale_5_wht_i_d","5% WHT I D","","WHT Interest or Discount","5% WHT I D","sale","","percent","-5","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_wht_c","14% WHT C","","WHT Charges","14% WHT C","sale","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_wht_nr","14% WHT NR","","WHT Natural resource payment","14% WHT NR","sale","","percent","-14","l10n_lk_tax_group_wht","True","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_wht_rent","14% WHT Rent","","WHT Rent","14% WHT Rent","sale","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_wht_royalty","14% WHT Royalty","","WHT Royalty","14% WHT Royalty","sale","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_wht_s","14% WHT S","","WHT Service fee or insurance premium","14% WHT S","sale","","percent","-14","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_2_wht_t","2% WHT T","","WHT Fee on Transport or Telecommunications Service","2% WHT T","sale","","percent","-2","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_15_wht_op","15% WHT OP","","WHT Any other payments (Dividend, ect)","15% WHT OP","sale","","percent","-15","l10n_lk_tax_group_wht","True","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_wht_reward","14% WHT Reward","","WHT Rewards, or winnings from lottery / betting / gambling","14% WHT Reward","sale","","percent","-14","l10n_lk_tax_group_wht","True","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_2.5_wht_g","2.5% WHT G","","WHT Sale of gem at an auction","2.5% WHT G","sale","","percent","-2.5","l10n_lk_tax_group_wht","True","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic,l10n_lk_fiscal_position_foreign_trade",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_5_ait_i_d","5% AIT I D","","AIT Interest or Discount","5% AIT I D","sale","","percent","-5","l10n_lk_tax_group_ait","False","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_ait_c","14% AIT C","","AIT Charges","14% AIT C","sale","","percent","-14","l10n_lk_tax_group_ait","False","True","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_ait_nr","14% AIT NR","","AIT Natural resource payment","14% AIT NR","sale","","percent","-14","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_ait_rent","14% AIT Rent","","AIT Rent","14% AIT Rent","sale","","percent","-10","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_ait_royalty","14% AIT Royalty","","AIT Royalty","14% AIT Royalty","sale","","percent","-14","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_ait_d","14% AIT D","","AIT Dividend","14% AIT D","sale","","percent","-15","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
+"l10n_lk_tax_sale_14_ait_p","14% AIT P","","AIT Premium or Similar Periodic Payment or payment on services","14% AIT P","sale","","percent","-14","l10n_lk_tax_group_ait","False","False","base.lk","on_invoice","","base","invoice","","","","l10n_lk_fiscal_position_domestic",""
+"","","","","","","","","","","","","","","","base","refund","","","","",""
+"","","","","","","","","","","","","","","100","tax","invoice","l10n_lk_account_117000","","True","",""
+"","","","","","","","","","","","","","","100","tax","refund","l10n_lk_account_117000","","True","",""
diff --git a/addons/l10n_lk/data/template/account.tax.group-lk.csv b/addons/l10n_lk/data/template/account.tax.group-lk.csv
new file mode 100644
index 0000000000000..09d45b25cb004
--- /dev/null
+++ b/addons/l10n_lk/data/template/account.tax.group-lk.csv
@@ -0,0 +1,6 @@
+"id","name","country_id","tax_payable_account_id","tax_receivable_account_id","tax_advance_account_id"
+"l10n_lk_tax_group_18","18%","base.lk","l10n_lk_account_221200","l10n_lk_account_114000",""
+"l10n_lk_tax_group_zero_rated","Zero-rated","base.lk","l10n_lk_account_221200","l10n_lk_account_114000",""
+"l10n_lk_tax_group_exempt","Exempt","base.lk","l10n_lk_account_221200","l10n_lk_account_114000",""
+"l10n_lk_tax_group_wht","WHT","base.lk","l10n_lk_account_221100","l10n_lk_account_114100",""
+"l10n_lk_tax_group_ait","AIT","base.lk","l10n_lk_account_221500","l10n_lk_account_118000",""
diff --git a/addons/l10n_lk/demo/demo_company.xml b/addons/l10n_lk/demo/demo_company.xml
new file mode 100644
index 0000000000000..d3cb93cd562b3
--- /dev/null
+++ b/addons/l10n_lk/demo/demo_company.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="base.partner_demo_company_lk" model="res.partner" forcecreate="1">
+        <field name="name">LK Company</field>
+        <field name="vat">123456789-7000</field>
+        <field name="street">No. 123, Galle Road</field>
+        <field name="city">Colombo</field>
+        <field name="country_id" ref="base.lk" />
+        <field name="zip">00100</field>
+        <field name="phone">+94 11 234 5678</field>
+        <field name="email">info@company.lkexample.com</field>
+        <field name="website">www.lkexample.com</field>
+    </record>
+
+    <record id="base.demo_company_lk" model="res.company" forcecreate="1">
+        <field name="name">LK Company</field>
+        <field name="partner_id" ref="base.partner_demo_company_lk" />
+    </record>
+
+    <function model="res.company" name="_onchange_country_id">
+        <value eval="[ref('base.demo_company_lk')]" />
+    </function>
+
+    <function model="res.users" name="write">
+        <value eval="[ref('base.user_root'), ref('base.user_admin'), ref('base.user_demo')]" />
+        <value eval="{'company_ids': [(Command.link(ref('base.demo_company_lk')))]}" />
+    </function>
+
+    <function model="account.chart.template" name="try_loading">
+        <value eval="[]" />
+        <value>lk</value>
+        <value model="res.company" eval="obj().env.ref('base.demo_company_lk')" />
+        <value name="install_demo" eval="True" />
+    </function>
+</odoo>
diff --git a/addons/l10n_lk/i18n/l10n_lk.pot b/addons/l10n_lk/i18n/l10n_lk.pot
new file mode 100644
index 0000000000000..7c1d71050f26f
--- /dev/null
+++ b/addons/l10n_lk/i18n/l10n_lk.pot
@@ -0,0 +1,464 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_lk
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 19.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-06 02:11+0000\n"
+"PO-Revision-Date: 2025-11-06 02:11+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_1
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_1
+msgid "1. Interest or Discount"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_10
+msgid "10. Sale of gem at an auction"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_10
+msgid "10: Brought Forward Input Tax"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_11
+msgid ""
+"11: Zero Rated Supplies/Suspended Supplies/22(7) {Cage "
+"9*(C+D+D1)/(A+A1+A2+B+C+D+D1)}"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_12
+msgid ""
+"12: Not belongs to above {(9+10-11) or 100% of cage 0+1+1A+2 whichever is "
+"lower} "
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_13
+msgid "13: Allowable Input (11+12)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_14
+msgid "14: Unabsorbed Excess Input Tax C/F to next Quarter (9+10-13)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_15
+msgid "15: Gross Refund Due if (13-3-8A) > 0"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_16
+msgid "16: Tax Payable if (3-13+8A) > 0"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_17
+msgid "17: Total Tax Credits (Q+R+R1+R2+R3+S)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_18
+msgid "18: Tax Payable/(Refund Due) (16-17-15)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_2
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_2
+msgid "2. Charges"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_3
+msgid "3. Natural resource Payments"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_3
+msgid "3. Natural resource payment"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_tot
+msgid "3: Total Output Tax (0+1+1A+2+2A)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_4
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_4
+msgid "4. Rent"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_5
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_5
+msgid "5. Royalty"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_6
+msgid "6. Dividend"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_6
+msgid "6. Service fee or insurance premium"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_7
+msgid "7. Fee on Transport or Telecommunications Service"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_7
+msgid "7. Premium or Similar Periodic Payment or payment on services"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_tit
+msgid "7: Total Input Tax (4+5+6)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_8
+msgid "8. Any other payments (Dividend, ect)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_8
+msgid "8: Disallowable Input Tax on Imports, other Purchases and Adjustments"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_8a
+msgid "8A: Disallowable Input Tax on Suspended Purchases"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_9
+msgid "9. Rewards, ro winnings from lottery / betting / gambling"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_9
+msgid "9: Allowable Input Tax excluding B/F Amounts (7–8)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_a
+msgid "A, 0: Taxable Supplies"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_a1
+msgid "A1, 1: Deemed Taxable Supplies (Specified Projects)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_a2
+msgid "A2, 1A: Deemed Taxable Supplies (Strategic Development Projects)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:ir.model,name:l10n_lk.model_account_chart_template
+msgid "Account Chart Template"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_wht001_balance_d
+msgid "Amount Deducted"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_wht001_balance_c
+msgid "Amount Liable"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_wht001_balance_b
+msgid "Amount Not Liable"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_b
+msgid "B, 2: Wholesale and Retail Taxable Supplies"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_vat001_balance_a
+msgid "Balance A"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_vat001_balance_b
+msgid "Balance B"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_vat001_balance_c
+msgid "Balance C"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_c
+msgid "C, 2A: VAT Suspended Taxable Supplies"
+msgstr ""
+
+#. module: l10n_lk
+#. odoo-python
+#: code:addons/l10n_lk/models/template_lk.py:0
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_d1
+msgid "D1: Zero Rated Supplies (Services)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_d
+msgid "D: Zero Rated Supplies (Goods)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:ir.model.fields,field_description:l10n_lk.field_account_chart_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_e1
+msgid "E1: Excluded Supplies"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_e
+msgid "E: Exempt Supplies"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_f
+msgid "F, F1: Local Supply of Garments"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_g
+msgid "G, G1: Local Supply of Fabrics"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_h
+msgid "H, 4, 5: Imports"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_i
+msgid "I, 6: Local Purchases"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd_11
+msgid "IA Total (1-10)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:ir.model.fields,field_description:l10n_lk.field_account_chart_template__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd_8
+msgid "IIA Total (1-7)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_j
+msgid "J, K: VAT Suspended Purchases"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_j1
+msgid "J1, K1: Non-Foreign Exchange Purchases"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_j2
+msgid "J2: Imports on which VAT is not charged"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_j3
+msgid "J3: Local Purchases on which VAT is not charged"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_j4
+msgid "J4: Goods Purchased from Non VAT Registered Persons"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_l
+msgid "L: Unabsorbed VAT as at 31/12/2010"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_m
+msgid "M: The aggregate Input Tax set off against VAT after 01/01/2011"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_n
+msgid "N: The aggregate Input Tax set off against other taxes payable to CGIR"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_o
+msgid "O: The aggregate input Tax set off against taxes payable to DGC"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_p
+msgid "P: Unabsorbed balance to be C/F (L-(M+N+O))"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_whtd
+msgid "PART I – Summery of Withholding Tax (WHT) Deductions "
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_lk_wht_001e_aitd
+msgid "PART II – Summery of Advance Income Tax (AIT) Deductions "
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_ot
+msgid "Part (I) - Output tax"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_it
+msgid "Part (II) - Input tax"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_ait
+msgid "Part (III) - Allowable Input tax"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_tpr
+msgid "Part (IV) - Tax Payable/Refundable"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_q
+msgid "Q: Monthly Payment"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r1
+msgid "R1: Deemed Tax Credit (Strategic Development Project)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r2
+msgid "R2: Tax Credit based on SVAT Credit Voucher"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3
+msgid ""
+"R3: Allowed Deemed Input Credit on Wholesale and Retail R2 R3=(R3B+R3F) = "
+"Lesser amount of cage 2 or {Cage 16 – (R+R1+R2}"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3a
+msgid "R3A: B/F Credit on Stock"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3b
+msgid "R3B: Claimed Credit on Stock for the Period"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3c
+msgid "R3C: C/F Credit on Stock"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3d
+msgid "R3D: B/F Credit on Purchase"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3e
+msgid "R3E: Credit on purchases for the Period"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3f
+msgid "R3F: Claimed Credit on purchases for the Period"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r3g
+msgid "R3G: C/F Credit on Purchase"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_r
+msgid "R: Deemed Tax Credit (Specified Projects)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_s1
+msgid ""
+"S1A, S1B, S1C: The Input tax set off against other taxes payable to CGIR "
+"(IT/ESC/NBT)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_s2
+msgid "S2: The Input tax set off against taxes payable to DGC"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_s3
+msgid "S3: Total claimed from Unabsorbed Input Tax (S+S1A+S1B+S1C+S2)"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.line,name:l10n_lk.l10n_lk_vat001_lk_vat_001e_s
+msgid "S: Claim for this Period out of Cage L"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report.column,name:l10n_lk.l10n_lk_wht001_balance_a
+msgid "Total Payment Value"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report,name:l10n_lk.l10n_lk_vat001
+msgid "VAT Return Form VAT-001"
+msgstr ""
+
+#. module: l10n_lk
+#: model:account.report,name:l10n_lk.l10n_lk_wht001
+msgid "WHT/AIT Return Form WHT-001"
+msgstr ""
diff --git a/addons/l10n_lk/models/__init__.py b/addons/l10n_lk/models/__init__.py
new file mode 100644
index 0000000000000..fb411f0c6558c
--- /dev/null
+++ b/addons/l10n_lk/models/__init__.py
@@ -0,0 +1,3 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import template_lk
diff --git a/addons/l10n_lk/models/template_lk.py b/addons/l10n_lk/models/template_lk.py
new file mode 100644
index 0000000000000..f210960a9afbb
--- /dev/null
+++ b/addons/l10n_lk/models/template_lk.py
@@ -0,0 +1,53 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import models
+from odoo.addons.account.models.chart_template import template
+
+
+class AccountChartTemplate(models.AbstractModel):
+    _inherit = "account.chart.template"
+
+    @template("lk")
+    def _get_lk_template_data(self):
+        return {
+            "code_digits": "6",
+            "property_account_receivable_id": "l10n_lk_account_111000",
+            "property_account_payable_id": "l10n_lk_account_220100",
+            "property_stock_valuation_account_id": "l10n_lk_account_141000",
+        }
+
+    @template("lk", "res.company")
+    def _get_lk_res_company(self):
+        return {
+            self.env.company.id: {
+                "account_fiscal_country_id": "base.lk",
+                "bank_account_code_prefix": "10100",
+                "cash_account_code_prefix": "10110",
+                "transfer_account_code_prefix": "10120",
+                "transfer_account_id": "l10n_lk_account_101200",
+                "account_default_pos_receivable_account_id": "l10n_lk_account_111001",
+                "income_currency_exchange_account_id": "l10n_lk_account_422000",
+                "expense_currency_exchange_account_id": "l10n_lk_account_704000",
+                "account_journal_suspense_account_id": "l10n_lk_account_202000",
+                "default_cash_difference_expense_account_id": "l10n_lk_account_706000",
+                "default_cash_difference_income_account_id": "l10n_lk_account_414000",
+                "account_journal_early_pay_discount_loss_account_id": "l10n_lk_account_705000",
+                "account_journal_early_pay_discount_gain_account_id": "l10n_lk_account_423000",
+                "account_sale_tax_id": "l10n_lk_tax_sale_18",
+                "account_purchase_tax_id": "l10n_lk_tax_purchase_18",
+                "deferred_expense_account_id": "l10n_lk_account_131000",
+                "deferred_revenue_account_id": "l10n_lk_account_220200",
+                "income_account_id": "l10n_lk_account_401000",
+                "expense_account_id": "l10n_lk_account_501000",
+            },
+        }
+
+    @template("lk", "account.journal")
+    def _get_lk_account_journal(self):
+        return {
+            "bank": {"default_account_id": "l10n_lk_account_101000"},
+            "cash": {
+                "name": self.env._("Cash"),
+                "type": "cash",
+                "default_account_id": "l10n_lk_account_101100",
+            },
+        }

From e9561e8584175ee3c5fd5b12bbe6054ad882fc79 Mon Sep 17 00:00:00 2001
From: pdso-odoo <pdso@odoo.com>
Date: Wed, 20 Aug 2025 05:50:35 +0000
Subject: [PATCH 332/673] [FIX] website_event: get reCaptcha token on
 registration form submit

Steps to reproduce
===============
1. Enable reCaptcha in Settings and configure keys.
2. Go to an event and click Register.
3. Fill in the form but wait more than 2 minutes.
4. Submit the form
---> An error message is shown.

When reCaptcha was enabled on event registrations, the token was being
requested too early (during `willStart`).
Since a token is only valid for 2 minutes, users who took longer to fill out
the registration form encountered an error when submitting.

After this commit, the reCaptcha token is requested only on submitting.
This way, the token is always valid and the form can be submitted successfully,
even after several minutes.

Task-4982067

closes odoo/odoo#234822

X-original-commit: af884528d4f3a735b4764de086e2f09cf861a184
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Prathmesh Dharmesh Soni (pdso) <pdso@odoo.com>
---
 .../src/interactions/modal_registration.js    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/website_event/static/src/interactions/modal_registration.js b/addons/website_event/static/src/interactions/modal_registration.js
index de16003438dfd..7722b6d3490c9 100644
--- a/addons/website_event/static/src/interactions/modal_registration.js
+++ b/addons/website_event/static/src/interactions/modal_registration.js
@@ -30,18 +30,6 @@ export class ModalRegistration extends Interaction {
 
     async willStart() {
         await this.recaptcha.loadLibs();
-        this.recaptchaToken = await this.recaptcha.getToken("website_event_registration");
-
-        if (this.recaptchaToken.error) {
-            this.services.notification.add(this.recaptchaToken.error, {
-                type: "danger",
-                sticky: true,
-            });
-            this.enableRegistrationFormSubmit();
-
-            this.el.remove();
-            this.services["public.interactions"].stopInteractions(this.el);
-        }
     }
 
     start() {
@@ -92,14 +80,30 @@ export class ModalRegistration extends Interaction {
     /**
      * @param {SubmitEvent} ev
      */
-    onSubmit(ev) {
+    async onSubmit(ev) {
+        ev.preventDefault();
+
+        const form = ev.currentTarget;
+        this.recaptchaToken = await this.recaptcha.getToken("website_event_registration");
+        if (this.recaptchaToken.error) {
+            this.services.notification.add(this.recaptchaToken.error, {
+                type: "danger",
+                sticky: true,
+            });
+            this.enableRegistrationFormSubmit();
+
+            this.el.remove();
+            this.services["public.interactions"].stopInteractions(this.el);
+            return;
+        }
         if (this.recaptchaToken.token) {
             const tokenInput = document.createElement("input");
             tokenInput.setAttribute("name", "recaptcha_token_response");
             tokenInput.setAttribute("type", "hidden");
             tokenInput.setAttribute("value", this.recaptchaToken.token);
-            this.insert(tokenInput, ev.currentTarget);
+            this.insert(tokenInput, form);
         }
+        form.submit();
     }
 }
 

From e64708212b635cfd0f5c6ff28ae0aed4f919074b Mon Sep 17 00:00:00 2001
From: sbbh-odoo <sbbh@odoo.com>
Date: Wed, 17 Sep 2025 11:05:55 +0000
Subject: [PATCH 333/673] [FIX] html_editor: fix backward table selection in
 Firefox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to Reproduce:

1. Create a table in the editor (Firefox).
2. Select table cells backward (right → left or bottom → top).

Before this commit:

- The first selected cell does not remain selected in Firefox when
  extending the selection backward.

After this commit:

- Backward table cell selection works consistently in Firefox.

task-5094832

closes odoo/odoo#234751

X-original-commit: b3197ce042507bb022beba6612a624f114fb15e2
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Samit Bharatbhai Bhadiyadra (sbbh) <sbbh@odoo.com>
---
 addons/html_editor/static/src/main/table/table_plugin.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/html_editor/static/src/main/table/table_plugin.js b/addons/html_editor/static/src/main/table/table_plugin.js
index 02e337268a827..da226c8b2ad8a 100644
--- a/addons/html_editor/static/src/main/table/table_plugin.js
+++ b/addons/html_editor/static/src/main/table/table_plugin.js
@@ -803,14 +803,18 @@ export class TablePlugin extends Plugin {
                 // To solve the issue we merge the ranges of the selection together the first time we find
                 // selection.rangeCount > 1. Morover, when hitting a double click on a cell, it spans a row
                 // inside selection which needs to be simplified here.
-                const [anchorNode, anchorOffset] = getDeepestPosition(
+                let [anchorNode, anchorOffset] = getDeepestPosition(
                     selection.getRangeAt(0).startContainer,
                     selection.getRangeAt(0).startOffset
                 );
-                const [focusNode, focusOffset] = getDeepestPosition(
+                let [focusNode, focusOffset] = getDeepestPosition(
                     selection.getRangeAt(selection.rangeCount - 1).startContainer,
                     selection.getRangeAt(selection.rangeCount - 1).startOffset
                 );
+                if (this.selectionDirection === "backward") {
+                    [anchorNode, focusNode] = [focusNode, anchorNode];
+                    [anchorOffset, focusOffset] = [focusOffset, anchorOffset];
+                }
                 this.dependencies.selection.setSelection({
                     anchorNode,
                     anchorOffset,
@@ -834,6 +838,7 @@ export class TablePlugin extends Plugin {
                     focusNode: ev.target,
                     focusOffset: 0,
                 });
+                this.selectionDirection = selection.direction;
                 return true;
             }
         }

From 9ad82b51c5f2025dc3f343eeecf6f7e820f9ce35 Mon Sep 17 00:00:00 2001
From: adip-odoo <adip@odoo.com>
Date: Thu, 30 Oct 2025 07:01:27 +0000
Subject: [PATCH 334/673] [FIX] calendar: prevent error on rescheduling meeting
 when timezone is not set

Currently, an error occurs when scheduling or updating a meeting for an
applicant if the user's timezone is not set.

Steps to Reproduce:
1. In the user's profile, remove the TimeZone.
2. Now, install the "Recruitment" module.
3. Create an application and schedule a meeting for the applicant.
4. After saving the record, change the start time and try to save the record.

Error:
AttributeError - 'bool' object has no attribute 'upper'

Cause:
At [1], system gets the timezone from the context, but in this case, 'tz' is
False. As a result, user_tz becomes False, and using upper() method on a
bool value triggers an error.

Fix:
This commit ensures that the 'UTC' timezone is assigned when the context
does not include a valid timezone ('tz' is missing or False).

[1]: https://github.com/odoo/odoo/blob/78bd84c7b91f11780f152c29c8f595e3d9ed3d68/addons/calendar/models/mail_activity.py#L23

sentry-6952137101

closes odoo/odoo#234803

X-original-commit: 11f02f7723cab895815d1459cf364fee9b7dcf71
Signed-off-by: Arnaud Joset (arj) <arj@odoo.com>
Signed-off-by: Aditi Patel (adip) <adip@odoo.com>
---
 addons/calendar/models/mail_activity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/models/mail_activity.py b/addons/calendar/models/mail_activity.py
index 08fe093e0cf6f..2bd33d474daab 100644
--- a/addons/calendar/models/mail_activity.py
+++ b/addons/calendar/models/mail_activity.py
@@ -20,7 +20,7 @@ def write(self, vals):
             date_deadline = self[0].date_deadline  # updated, hence all same value
             # also protect against loops in case of ill-managed timezones
             events = self.calendar_event_id.with_context(mail_activity_meeting_update=True)
-            user_tz = self.env.context.get('tz', 'UTC')
+            user_tz = self.env.context.get('tz') or 'UTC'
             for event in events:
                 # allday: just apply diff between dates
                 if event.allday and event.start_date != date_deadline:

From bca1ea78a6f495302a99b2f15a70e2122bcca693 Mon Sep 17 00:00:00 2001
From: Manav Shah <sham@odoo.com>
Date: Mon, 13 Oct 2025 11:53:36 +0000
Subject: [PATCH 335/673] [FIX] l10n_tr_nilvera_einvoice_extended: Fix Payable
 Amount in Export Invoices

When the invoice's type is "Registered For Export", the total of the
invoice which is shown in the cbc:PayableAmount node in XML, has to
reflect the VAT deducted amount.
This commit fixes the following issue.

task-5159638

closes odoo/odoo#234813

X-original-commit: 1ca2f2d996ca745ce3cdbb0b9ca2eba6d1a5a8b2
Signed-off-by: Maximilien La Barre (malb) <malb@odoo.com>
Signed-off-by: Manav Shah (sham) <sham@odoo.com>
---
 .../models/account_edi_xml_ubl_tr.py              | 15 +++++++++++++++
 .../invoice_basic_export_registered_einvoice.xml  |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py b/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
index af4585b5fc920..52d880b0174cd 100644
--- a/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
+++ b/addons/l10n_tr_nilvera_einvoice_extended/models/account_edi_xml_ubl_tr.py
@@ -79,6 +79,21 @@ def _add_invoice_accounting_customer_party_nodes(self, document_node, vals):
         if vals['invoice'].l10n_tr_is_export_invoice:
             document_node['cac:AccountingCustomerParty'] = {'cac:Party': self._get_ministry_party_node()}
 
+    def _add_invoice_monetary_total_nodes(self, document_node, vals):
+        """Extend invoice monetary total nodes for TR E-Invoicing.
+
+        For invoices registered as Export, the payable amount is set to the total amount
+        without tax, as required by Turkish e-invoicing regulations.
+
+        :param document_node: dict representing the invoice XML structure to modify.
+        :param vals: dict containing invoice-related values, including 'invoice'.
+        """
+        super()._add_invoice_monetary_total_nodes(document_node, vals)
+        if vals['invoice'].l10n_tr_gib_invoice_type == "IHRACKAYITLI":
+            document_node["cac:LegalMonetaryTotal"]["cbc:PayableAmount"]["_text"] = (
+                document_node["cac:LegalMonetaryTotal"]["cbc:TaxExclusiveAmount"]["_text"]
+            )
+
     @api.model
     def _get_ministry_party_node(self):
         """Return the fixed ministry (party) information required for TR E-invoicing.
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml
index 12e241a215de8..507f997c90c19 100644
--- a/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml
+++ b/addons/l10n_tr_nilvera_einvoice_extended/tests/expected_xmls/invoice_basic_export_registered_einvoice.xml
@@ -122,7 +122,7 @@
     <cbc:TaxExclusiveAmount currencyID="TRY">132.00</cbc:TaxExclusiveAmount>
     <cbc:TaxInclusiveAmount currencyID="TRY">158.40</cbc:TaxInclusiveAmount>
     <cbc:AllowanceTotalAmount currencyID="TRY">18.00</cbc:AllowanceTotalAmount>
-    <cbc:PayableAmount currencyID="TRY">158.40</cbc:PayableAmount>
+    <cbc:PayableAmount currencyID="TRY">132.00</cbc:PayableAmount>
   </cac:LegalMonetaryTotal>
   <cac:InvoiceLine>
     <cbc:ID>1</cbc:ID>

From 71b960085f5b0fcbbc094d1908f9cabead08e17b Mon Sep 17 00:00:00 2001
From: pmah-odoo <pmah@odoo.com>
Date: Wed, 15 Oct 2025 06:14:01 +0000
Subject: [PATCH 336/673] [FIX] mail: prevent duplicate deaf icon in sidebar
 call participant status

The PR #228657 combined the mute and deafen actions into a single "mute"
action handling both states, As a result, when a user was both
muted and deafened during a call, two identical deaf icons were shown
in the participant status area (in sidebar).

Steps to reproduce:
1. Start a call
2. Click the Mute button
3. Open Voice Settings dropdown
4. Click Deafen button
5. Observe two deaf icons in the sidebar participant status

This commit ensures only one deaf icon is shown when the user is deafened,
since the deaf state already implies being muted. The mute icon is now
hidden when the user is in a deafened state.

task-5166621

closes odoo/odoo#234845

X-original-commit: 1ec0b9780d5c01e46bb1b69284ba2576042ba5dd
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
Signed-off-by: Mahavir Patel (pmah) <pmah@odoo.com>
---
 .../discuss_app/sidebar/call_participants.xml   |  3 +--
 .../mail/static/tests/discuss/call/call.test.js | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
index eb1b13daafb1f..53e482e00c222 100644
--- a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
+++ b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
@@ -78,8 +78,7 @@
                     <t t-set="session" t-value="session"/>
                 </t>
                 <t t-else="">
-                    <span t-if="session.is_muted" class="p-1 fa opacity-75" t-att-class="rtc.callActions.find(a => a.id === 'mute').icon"/>
-                    <span t-if="session.is_deaf" class="p-1 fa opacity-75" t-att-class="rtc.callActions.find(a => a.id === 'deafen').icon"/>
+                    <span t-if="session.is_muted or session.is_deaf" class="p-1 fa opacity-75" t-att-class="rtc.callActions.find(a => a.id === 'mute').icon"/>
                     <span t-if="session.is_screen_sharing_on" class="o-live bg-danger o-text-white rounded">LIVE</span>
                 </t>
             </div>
diff --git a/addons/mail/static/tests/discuss/call/call.test.js b/addons/mail/static/tests/discuss/call/call.test.js
index ace86766d8408..8c3a868bf048c 100644
--- a/addons/mail/static/tests/discuss/call/call.test.js
+++ b/addons/mail/static/tests/discuss/call/call.test.js
@@ -1021,3 +1021,20 @@ test("show all participants on other user stops screen share", async () => {
     await streamerRemote.updateUpload("screen", null);
     await contains(".o-discuss-CallParticipantCard-avatar", { count: 2 });
 });
+
+test("discuss sidebar call participant shows appropriate status icon", async () => {
+    const pyEnv = await startServer();
+    const channelId = pyEnv["discuss.channel"].create({ name: "General" });
+    await start();
+    await openDiscuss(channelId);
+    await click("[title='Start Call']");
+    await contains(".o-discuss-Call");
+    await click("button[title='Mute']");
+    await contains(".o-mail-DiscussSidebarCallParticipants-status .fa-microphone-slash");
+    await click("button[title='Voice Settings']");
+    await click(".dropdown-menu button:contains('Deafen')");
+    await contains(".o-mail-DiscussSidebarCallParticipants-status .fa-deaf");
+    await contains(".o-mail-DiscussSidebarCallParticipants-status .fa-microphone-slash", {
+        count: 0,
+    });
+});

From 9fc076598f24dd78585399de0eca49c0da59d657 Mon Sep 17 00:00:00 2001
From: Karna <kmod@odoo.com>
Date: Tue, 4 Nov 2025 11:06:01 +0000
Subject: [PATCH 337/673] [FIX] account: fix validation error traceback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
  File "/home/odoo/src/odoo/19.0/addons/account/models/account_tax.py", line 611, in _validate_repartition_lines
    raise ValidationError(_("Invoice and credit note distribution should have a total factor (+) equals to 100."))
odoo.exceptions.ValidationError: Invoice and credit note distribution should have a total factor (+) equals to 100.
```
- During the database migration, a traceback occurs because the total_pos_factor
https://github.com/odoo/odoo/blob/18.0/addons/account/models/account_tax.py#L558
is being calculated as 0. When this happens, the float_compare function
https://github.com/odoo/odoo/blob/18.0/addons/account/models/account_tax.py#L559
returns -1, which incorrectly satisfies the validation condition and
triggers a ValidationError.
- To resolve this, we need to add an additional condition to check whether
total_pos_factor is 0, similar to the condition already implemented here
https://github.com/odoo/odoo/blob/18.0/addons/account/models/account_tax.py#L562
in the code.

tbg-1970
opw-5228357

closes odoo/odoo#234859

X-original-commit: 2451f3fb85114d7bcfd59b2864298353d08ac670
Signed-off-by: de Wouters de Bouchout Jean-Benoît (jbw) <jbw@odoo.com>
Signed-off-by: Karna Modasiya (kmod) <kmod@odoo.com>
---
 addons/account/models/account_tax.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/account_tax.py b/addons/account/models/account_tax.py
index f4e1c89e233d8..3a8d534ab4707 100644
--- a/addons/account/models/account_tax.py
+++ b/addons/account/models/account_tax.py
@@ -607,7 +607,7 @@ def _validate_repartition_lines(self):
 
             tax_reps = invoice_repartition_line_ids.filtered(lambda tax_rep: tax_rep.repartition_type == 'tax')
             total_pos_factor = sum(tax_reps.filtered(lambda tax_rep: tax_rep.factor > 0.0).mapped('factor'))
-            if float_compare(total_pos_factor, 1.0, precision_digits=2):
+            if total_pos_factor and float_compare(total_pos_factor, 1.0, precision_digits=2):
                 raise ValidationError(_("Invoice and credit note distribution should have a total factor (+) equals to 100."))
             total_neg_factor = sum(tax_reps.filtered(lambda tax_rep: tax_rep.factor < 0.0).mapped('factor'))
             if total_neg_factor and float_compare(total_neg_factor, -1.0, precision_digits=2):

From d7d89113a4865cc761d9973934ae433d343b167f Mon Sep 17 00:00:00 2001
From: nmak-odoo <nmak@odoo.com>
Date: Mon, 29 Sep 2025 07:07:48 +0000
Subject: [PATCH 338/673] [FIX] im_livechat: fix rendering of conversation
 transcript file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, downloading the conversation transcript file produced rendering
issues, such as a misaligned layout and visible table borders.

This commit updates the rendering template by applying the `table-borderless`
class, required by `web.basic_layout` to suppress table borders. It also
replaces flex with inline-block to ensure the chatBubble displays correctly.
This issue occurred because the `table-borderless` class was not used and flex
was applied when generating the PDF.

Task-5012010

closes odoo/odoo#234864

X-original-commit: 6b2f846483df8702a797b341fdd281988d62053c
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Nitant Makwana (nmak) <nmak@odoo.com>
---
 addons/im_livechat/data/mail_templates.xml  | 20 +++++++++-----------
 addons/im_livechat/models/chatbot_script.py |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/im_livechat/data/mail_templates.xml b/addons/im_livechat/data/mail_templates.xml
index 30fb281012f68..f5c0ab8406614 100644
--- a/addons/im_livechat/data/mail_templates.xml
+++ b/addons/im_livechat/data/mail_templates.xml
@@ -2,8 +2,8 @@
 <odoo>
     <data noupdate="1">
         <template id="livechat_email_template">
-<table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
-<table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 24px; background-color: white; color: #454748; border-collapse:separate; border-radius: 8px;">
+<table border="0" cellpadding="0" cellspacing="0" class="table-borderless" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
+<table border="0" cellpadding="0" cellspacing="0" width="590" class="table-borderless" style="padding: 24px; background-color: white; color: #454748; border-collapse:separate; border-radius: 8px;">
 <tbody>
     <!-- HEADER -->
      <!-- sudo: visitor can access header background color -->
@@ -12,7 +12,7 @@
     <t t-set="title_color" t-value="channel.livechat_channel_id.sudo().title_color or '#FFFFFF'" />
     <tr>
         <td align="center" style="min-width: 590px;">
-            <table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-style="background-color:{{header_background_color}}; padding:0; border-collapse:separate; border-radius: 8px 8px 0 0;">
+            <table border="0" cellpadding="0" cellspacing="0" width="100%" class="table-borderless" t-attf-style="background-color:{{header_background_color}}; padding:0; border-collapse:separate; border-radius: 8px 8px 0 0;">
                 <tr>
                     <td valign="middle" style="padding: 10px 20px 10px 20px;">
                         <span t-attf-style="color:{{title_color}}; font-size:14px;">
@@ -22,7 +22,7 @@
                             <t t-out="company.name"/>
                         </span>
                     </td>
-                    <td valign="middle" align="right" style="padding-right: 20px;" t-if="not company.uses_default_logo">
+                    <td valign="middle" align="right" style="vertical-align: middle; padding-right: 20px;" t-if="not company.uses_default_logo">
                         <img t-att-src="'/logo.png?company=%s' % company.id" 
                              style="border-radius:0.5rem; max-height: 48px; max-width: 48px; width: auto; height: auto; display: block; object-fit: contain;" 
                              t-att-alt="'%s' % company.name"/>
@@ -45,13 +45,13 @@
                 <span t-out="channel.create_date.astimezone(tz).strftime('%m/%d/%y')"/> at
                 <span t-out="channel.create_date.astimezone(tz).strftime('%I:%M %p')"/>.
             </div>
-            <table cellspacing="0" cellpadding="0" style="width:100%; margin: 16px 0;">
+            <table cellspacing="0" cellpadding="0" class="table-borderless" style="width:100%; margin: 16px 0;">
                 <t t-foreach="channel.message_ids.sorted(lambda m: (m.date, m.id))" t-as="message">
                     <t t-if="message.message_type != 'notification'">
                         <t t-set="author_name"><t t-if="message.author_id" t-out="message.author_id.sudo().user_livechat_username or message.author_id.sudo().name"/><t t-else="">You</t></t>
                         <tr>
-                            <td style="padding: 6px 0;">
-                                <table cellspacing="0" cellpadding="0" style="width: 100%;">
+                            <td style="padding: 4px 0;">
+                                <table cellspacing="0" cellpadding="0" class="table-borderless" style="width: 100%;">
                                     <tr>
                                         <td style="width: 50px; vertical-align: top; padding-right: 12px;">
                                             <t t-if="message.author_avatar">
@@ -66,10 +66,8 @@
                                                 <strong t-attf-style="color:{{header_background_color}}; font-size: 13px; margin-right: 2px;" t-out="author_name"/>
                                                 <span style="font-size:10px; color:#666666;" t-out="message.date.astimezone(tz).strftime('%I:%M %p')"/>
                                             </div>
-                                            <div style="display: flex;">
-                                                <div style="background-color:#E2F3F6; padding: 0px 12px; border-radius: 0 0.46875rem 0.46875rem 0.46875rem;max-width:100%;">
-                                                    <span style="font-size:13px; word-break:break-word;"  t-out="message.body"/>
-                                                </div>
+                                            <div style="background-color: #E2F3F6; padding: 16px 12px 0; border-radius: 0 0.46875rem 0.46875rem 0.46875rem; display: inline-block; max-width: 100%;">
+                                                <span style="font-size: 13px; word-break: break-word;" t-out="message.body"/>
                                             </div>
                                         </td>
                                     </tr>
diff --git a/addons/im_livechat/models/chatbot_script.py b/addons/im_livechat/models/chatbot_script.py
index 2856e575e20a1..f0dd373d5ae5c 100644
--- a/addons/im_livechat/models/chatbot_script.py
+++ b/addons/im_livechat/models/chatbot_script.py
@@ -180,7 +180,7 @@ def _post_welcome_steps(self, discuss_channel):
             if not is_html_empty(welcome_step.message):
                 posted_messages += discuss_channel.with_context(mail_post_autofollow_author_skip=True).message_post(
                     author_id=self.operator_partner_id.id,
-                    body=plaintext2html(welcome_step.message),
+                    body=plaintext2html(welcome_step.message, with_paragraph=False),
                     message_type='comment',
                     subtype_xmlid='mail.mt_comment',
                 )

From 9ecbb62ff56c3036f1faf97ac565be1c3f53ce6e Mon Sep 17 00:00:00 2001
From: Rahil Ghanchi <rahg@odoo.com>
Date: Thu, 6 Nov 2025 18:11:13 +0530
Subject: [PATCH 339/673] [REM] html_editor: removed dailymotion options from
 media_dialog

- Dailymotion has deprecated its legacy embed endpoint starting
September 23, 2024. Removed support for embedding Dailymotion videos
in the media dialog.

task-4855038

Part-of: odoo/odoo#234722
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Rahil Ghanchi (rahg) <rahg@odoo.com>
---
 .../src/main/media/media_dialog/video_selector.js    | 12 ------------
 addons/html_editor/tools.py                          |  9 ---------
 2 files changed, 21 deletions(-)

diff --git a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
index 12f3fda05760d..3723176bd2d5f 100644
--- a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
+++ b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
@@ -90,7 +90,6 @@ export class VideoSelector extends Component {
                 description: _t("Videos are muted when autoplay is enabled"),
                 platforms: [
                     this.PLATFORMS.youtube,
-                    this.PLATFORMS.dailymotion,
                     this.PLATFORMS.vimeo,
                 ],
                 urlParameter: () => "autoplay=1",
@@ -104,7 +103,6 @@ export class VideoSelector extends Component {
                 label: _t("Hide player controls"),
                 platforms: [
                     this.PLATFORMS.youtube,
-                    this.PLATFORMS.dailymotion,
                     this.PLATFORMS.vimeo,
                 ],
                 urlParameter: () => "controls=0",
@@ -116,16 +114,6 @@ export class VideoSelector extends Component {
                 isHidden: () =>
                     this.state.options.filter((option) => option.id === "hide_controls")[0].value,
             },
-            hide_dm_logo: {
-                label: _t("Hide Dailymotion logo"),
-                platforms: [this.PLATFORMS.dailymotion],
-                urlParameter: () => "ui-logo=0",
-            },
-            hide_dm_share: {
-                label: _t("Hide sharing button"),
-                platforms: [this.PLATFORMS.dailymotion],
-                urlParameter: () => "sharing-enable=0",
-            },
             is_vertical: {
                 label: _t("Vertical"),
                 platforms: [
diff --git a/addons/html_editor/tools.py b/addons/html_editor/tools.py
index 45d52dcf212dd..da2e36a42d29d 100644
--- a/addons/html_editor/tools.py
+++ b/addons/html_editor/tools.py
@@ -120,15 +120,6 @@ def get_video_url_data(video_url, autoplay=False, loop=False,
         if start_from:
             embed_url = f"{embed_url}#t={start_from}"
     elif platform == 'dailymotion':
-        params['autoplay'] = autoplay and 1 or 0
-        if autoplay:
-            params['mute'] = 1
-        if hide_controls:
-            params['controls'] = 0
-        if hide_dm_logo:
-            params['ui-logo'] = 0
-        if hide_dm_share:
-            params['sharing-enable'] = 0
         if start_from:
             params["startTime"] = start_from.rstrip("s")
         embed_url = f"//geo.dailymotion.com/player.html?video={video_id}&{url_encode(params)}"

From 3b6ee221de33b222a2cbd394ce40490912a7ed60 Mon Sep 17 00:00:00 2001
From: Rahil Ghanchi <rahg@odoo.com>
Date: Thu, 6 Nov 2025 18:18:09 +0530
Subject: [PATCH 340/673] [REM] website, *_editor: remove youku platform
 support in media dialog

*=html

After this commit:

- Embedding Youku videos via iframe has become unreliable and no longer
functions properly in the media dialog. Removed support for Youku
embeds to prevent broken video content.

- The supported platforms string now correctly lists YouTube,
Vimeo, and Dailymotion, Instagram as supported platforms.

task-4855038

closes odoo/odoo#234722

Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Rahil Ghanchi (rahg) <rahg@odoo.com>
---
 .../main/media/media_dialog/video_selector.js    |  1 -
 .../main/media/media_dialog/video_selector.xml   |  2 +-
 addons/html_editor/static/src/utils/url.js       |  3 ---
 addons/html_editor/tests/test_tools.py           | 16 ----------------
 addons/html_editor/tools.py                      |  6 ------
 addons/website/models/website.py                 |  1 -
 .../static/src/interactions/video/media_video.js |  3 +--
 .../wizard/blocked_third_party_domains.xml       |  2 +-
 8 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
index 3723176bd2d5f..e496a53faf2a3 100644
--- a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
+++ b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
@@ -73,7 +73,6 @@ export class VideoSelector extends Component {
             youtube: "youtube",
             dailymotion: "dailymotion",
             vimeo: "vimeo",
-            youku: "youku",
             instagram: "instagram",
             facebook: "facebook",
         };
diff --git a/addons/html_editor/static/src/main/media/media_dialog/video_selector.xml b/addons/html_editor/static/src/main/media/media_dialog/video_selector.xml
index 8c8afcf7309eb..9c951c9c5f871 100644
--- a/addons/html_editor/static/src/main/media/media_dialog/video_selector.xml
+++ b/addons/html_editor/static/src/main/media/media_dialog/video_selector.xml
@@ -27,7 +27,7 @@
                     <b>Video code </b>(URL or Embed)
                 </label>
                 <div class="text-start">
-                    <small class="text-muted">Accepts <b><i>Youtube</i></b>, <b><i>Vimeo</i></b>, <b><i>Dailymotion</i></b> and <b><i>Youku</i></b> videos</small>
+                    <small class="text-muted">Accepts <b><i>Youtube</i></b>, <b><i>Vimeo</i></b>, <b><i>Dailymotion</i></b>, <b><i>Facebook</i></b> and <b><i>Instagram</i></b> videos</small>
                 </div>
                 <textarea t-ref="autofocus" t-model="state.urlInput" class="form-control" id="o_video_text" placeholder="Copy-paste your URL or embed code here" t-on-input="onChangeUrl" t-att-class="{ 'is-valid': state.urlInput and !this.state.errorMessage, 'is-invalid': state.urlInput and this.state.errorMessage }"/>
             </div>
diff --git a/addons/html_editor/static/src/utils/url.js b/addons/html_editor/static/src/utils/url.js
index aa027d1fd5307..9a1fce8769a02 100644
--- a/addons/html_editor/static/src/utils/url.js
+++ b/addons/html_editor/static/src/utils/url.js
@@ -54,9 +54,6 @@ export function getVideoUrl(platform, videoId, params) {
         case "instagram":
             url = new URL(`https://www.instagram.com/p/${videoId}/embed`);
             break;
-        case "youku":
-            url = new URL(`https://player.youku.com/embed/${videoId}`);
-            break;
         case "facebook":
             url = new URL(`https://www.facebook.com/plugins/video.php`);
             params.href = `https://www.facebook.com/facebook/videos/${videoId}/`;
diff --git a/addons/html_editor/tests/test_tools.py b/addons/html_editor/tests/test_tools.py
index 03aa62a2f8803..a436b58c01c83 100644
--- a/addons/html_editor/tests/test_tools.py
+++ b/addons/html_editor/tests/test_tools.py
@@ -18,15 +18,12 @@ class TestVideoUtils(common.BaseCase):
         'vimeo_player': 'https://player.vimeo.com/video/395399735',
         'vimeo_player_unlisted_video': 'https://player.vimeo.com/video/795669787?h=0763fdb816',
         'dailymotion': 'https://www.dailymotion.com/video/x7svr6t',
-        'youku': 'https://v.youku.com/v_show/id_XMzY1MjY4.html?spm=a2hzp.8244740.0.0',
         'instagram': 'https://www.instagram.com/p/B6dXGTxggTG/',
         'dailymotion_hub_no_video': 'http://www.dailymotion.com/hub/x9q_Galatasaray',
         'dailymotion_hub_#video': 'http://www.dailymotion.com/hub/x9q_Galatasaray#video=x2jvvep',
         'dai.ly': 'https://dai.ly/x578has',
         'dailymotion_embed': 'https://www.dailymotion.com/embed/video/x578has?autoplay=1',
         'dailymotion_video_extra': 'https://www.dailymotion.com/video/x2jvvep_hakan-yukur-klip_sport',
-        'player_youku': 'https://player.youku.com/player.php/sid/XMTI5Mjg5NjE4MA==/v.swf',
-        'youku_embed': 'https://player.youku.com/embed/XNTIwMzE1MzUzNg',
         "facebook_video": "http://www.facebook.com/watch?v=2206239373151307",
         "facebook_reel": "https://www.facebook.com/reel/568986686120283",
     }
@@ -43,8 +40,6 @@ def test_player_regexes(self):
         self.assertIsNotNone(re.search(tools.player_regexes['vimeo'], TestVideoUtils.urls['vimeo_player_unlisted_video']))
         # dailymotion
         self.assertIsNotNone(re.search(tools.player_regexes['dailymotion'], TestVideoUtils.urls['dailymotion']))
-        # youku
-        self.assertIsNotNone(re.search(tools.player_regexes['youku'], TestVideoUtils.urls['youku']))
         # instagram
         self.assertIsNotNone(re.search(tools.player_regexes['instagram'], TestVideoUtils.urls['instagram']))
         # facebook
@@ -83,13 +78,6 @@ def test_get_video_source_data(self):
         self.assertEqual('x578has', tools.get_video_source_data(TestVideoUtils.urls['dailymotion_embed'])[1])
         self.assertEqual('dailymotion', tools.get_video_source_data(TestVideoUtils.urls['dailymotion_video_extra'])[0])
         self.assertEqual('x2jvvep', tools.get_video_source_data(TestVideoUtils.urls['dailymotion_video_extra'])[1])
-        # youku
-        self.assertEqual('youku', tools.get_video_source_data(TestVideoUtils.urls['youku'])[0])
-        self.assertEqual('XMzY1MjY4', tools.get_video_source_data(TestVideoUtils.urls['youku'])[1])
-        self.assertEqual('youku', tools.get_video_source_data(TestVideoUtils.urls['player_youku'])[0])
-        self.assertEqual('XMTI5Mjg5NjE4MA', tools.get_video_source_data(TestVideoUtils.urls['player_youku'])[1])
-        self.assertEqual('youku', tools.get_video_source_data(TestVideoUtils.urls['youku_embed'])[0])
-        self.assertEqual('XNTIwMzE1MzUzNg', tools.get_video_source_data(TestVideoUtils.urls['youku_embed'])[1])
         # instagram
         self.assertEqual('instagram', tools.get_video_source_data(TestVideoUtils.urls['instagram'])[0])
         self.assertEqual('B6dXGTxggTG', tools.get_video_source_data(TestVideoUtils.urls['instagram'])[1])
@@ -128,8 +116,6 @@ def test_get_video_url_data(self):
             })
         # dailymotion
         self.assertEqual('dailymotion', tools.get_video_url_data(TestVideoUtils.urls['dailymotion'])['platform'])
-        # youku
-        self.assertEqual('youku', tools.get_video_url_data(TestVideoUtils.urls['youku'])['platform'])
         # instagram
         self.assertEqual('instagram', tools.get_video_url_data(TestVideoUtils.urls['instagram'])['platform'])
 
@@ -151,5 +137,3 @@ def test_get_video_thumbnail(self):
         self.assertIsInstance(tools.get_video_thumbnail(TestVideoUtils.urls['dailymotion']), bytes)
         # instagram
         self.assertIsInstance(tools.get_video_thumbnail(TestVideoUtils.urls['instagram']), bytes)
-        # default
-        self.assertIsInstance(tools.get_video_thumbnail(TestVideoUtils.urls['youku']), bytes)
diff --git a/addons/html_editor/tools.py b/addons/html_editor/tools.py
index da2e36a42d29d..828dc3a1cd0f7 100644
--- a/addons/html_editor/tools.py
+++ b/addons/html_editor/tools.py
@@ -25,7 +25,6 @@
     'vimeo': r'//(player.)?vimeo.com/([a-z]*/)?(?P<id>[^/\?]+)(?:/(?P<hash>[^/\?]+))?(?:\?(?P<params>[^\s]+))?$',
     'dailymotion': r'(https?:\/\/)(www\.)?(dailymotion\.com\/(embed\/video\/|embed\/|video\/|hub\/.*#video=)|geo\.dailymotion\.com\/player\.html\?video=|dai\.ly\/)(?P<id>[A-Za-z0-9]{6,7})',
     'instagram': r'(?:(.*)instagram\.com|instagr\.am)/(?:p|reel)/([a-zA-Z0-9\-_\.]+)',
-    'youku': r'(?:(https?:\/\/)?(v\.youku\.com/v_show/id_|player\.youku\.com/player\.php/sid/|player\.youku\.com/embed/|cloud\.youku\.com/services/sharev\?vid=|video\.tudou\.com/v/)|youku:)(?P<id>[A-Za-z0-9]+)(?:\.html|/v\.swf|)',
     "facebook": r'^(?:(?:https?:)?//)?(?:www\.)?facebook\.com(?:/(?:[^/]+/)?videos/|/watch/?\?v=|/reel/|/plugins/video\.php\?[^ ]*?href=.*?(?:videos|reel)%2[Ff])(?P<id>\d+)',
 }
 
@@ -50,9 +49,6 @@ def get_video_source_data(video_url):
         instagram_match = re.search(player_regexes['instagram'], video_url)
         if instagram_match:
             return ('instagram', instagram_match[2], instagram_match)
-        youku_match = re.search(player_regexes['youku'], video_url)
-        if youku_match:
-            return ('youku', youku_match.group("id"), youku_match)
         facebook_match = re.search(player_regexes["facebook"], video_url)
         if facebook_match:
             return ("facebook", facebook_match.group("id"), facebook_match)
@@ -125,8 +121,6 @@ def get_video_url_data(video_url, autoplay=False, loop=False,
         embed_url = f"//geo.dailymotion.com/player.html?video={video_id}&{url_encode(params)}"
     elif platform == 'instagram':
         embed_url = f'//www.instagram.com/p/{video_id}/embed/'
-    elif platform == 'youku':
-        embed_url = f'//player.youku.com/embed/{video_id}'
     elif platform == "facebook":
         embed_url = f"//facebook.com/plugins/video.php?href=https://www.facebook.com/username/videos/{video_id}/"
 
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 3740114bef26f..23ba772574731 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -53,7 +53,6 @@
     'instagram.com', 'instagr.am', 'ig.me',
     'vimeo.com',  # 'player.vimeo.com', 'vimeo.com',
     'dailymotion.com', 'dai.ly',
-    'youku.com',  # 'player.youku.com', 'youku.com',
     'tudou.com',
     'facebook.com', 'facebook.net', 'fb.com', 'fb.me', 'fb.watch',
     'tiktok.com',
diff --git a/addons/website/static/src/interactions/video/media_video.js b/addons/website/static/src/interactions/video/media_video.js
index e676772450010..22776f21d0b28 100644
--- a/addons/website/static/src/interactions/video/media_video.js
+++ b/addons/website/static/src/interactions/video/media_video.js
@@ -101,8 +101,7 @@ export class MediaVideo extends Interaction {
             "player.vimeo.com",
             "vimeo.com",
             "dailymotion.com",
-            "player.youku.com",
-            "youku.com",
+            "facebook.com",
         ];
         if (!supportedDomains.includes(domain)) {
             return;
diff --git a/addons/website/wizard/blocked_third_party_domains.xml b/addons/website/wizard/blocked_third_party_domains.xml
index 7550ba48a59a0..2d019b2dd73be 100644
--- a/addons/website/wizard/blocked_third_party_domains.xml
+++ b/addons/website/wizard/blocked_third_party_domains.xml
@@ -13,7 +13,7 @@
                 By default, the domains of the following services are already blocked:
                 <ul>
                     <li><strong>Social platforms:</strong> Facebook, Instagram, Twitter, TikTok</li>
-                    <li><strong>Video hosting platforms:</strong> YouTube, Vimeo, Dailymotion, Youku</li>
+                    <li><strong>Video hosting platforms:</strong> YouTube, Vimeo, Dailymotion, Instagram, Facebook</li>
                     <li><strong>Google services:</strong> Google Maps, Google Analytics, Google Tag Manager, etc.</li>
                 </ul>
             </p>

From 041a25c88be7c9ffec13caded36060a9f4a36420 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Tue, 5 Aug 2025 05:49:03 +0000
Subject: [PATCH 341/673] [FIX] website_cf_turnstile: clean temporary classes
 in turnstile forms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
1. Install the `website_cf_turnstile` module.
2. Enter valid cloudflare turnstile credentials in the configuration.
3. Go to the website editor.
4. Add or edit a form (e.g. contact form) and save the page.
5. Notice that the form’s submit button temporarily shows a spinner and
   gets a 'disabled' class while `turnstile` is initializing.
6. After saving, these temporary elements and classes
   (e.g. .turnstile-spinner and 'disabled') are incorrectly saved
   permanently.
7. If you later remove or uninstall the `website_cf_turnstile` module,
   the form button remains disabled and the spinner icon still appears,
   even though `turnstile` is no longer active.

After this commit:
Now, when you save a form in the editor, any temporary classes or
elements added by `turnstile` are removed. This prevents unwanted
changes from being saved to forms.

task-4951470

closes odoo/odoo#234851

X-original-commit: 1da9441e48fd401e64a7f410dcb9e4c8e8eca178
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Garvish Pramodbhai Panchal (gppa) <gppa@odoo.com>
---
 .../website_cf_turnstile/static/src/interactions/turnstile.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/website_cf_turnstile/static/src/interactions/turnstile.js b/addons/website_cf_turnstile/static/src/interactions/turnstile.js
index 2d3b5c8c7a0c4..72aa72ccaa030 100644
--- a/addons/website_cf_turnstile/static/src/interactions/turnstile.js
+++ b/addons/website_cf_turnstile/static/src/interactions/turnstile.js
@@ -67,6 +67,10 @@ export class TurnStile {
      * @param {HTMLElement} el
      */
     static clean(el) {
+        const submitButtons = el.querySelectorAll(".cf_form_disabled");
+        submitButtons.forEach(button => {
+            button.classList.remove("disabled", "cf_form_disabled");
+        });
         const turnstileEls = el.querySelectorAll(".s_turnstile");
         turnstileEls.forEach((element) => element.remove());
     }

From 08982a99ba0fbb496ab215d65f3068ab566d9aea Mon Sep 17 00:00:00 2001
From: "Pierre Lamotte (pila)" <pila@odoo.com>
Date: Mon, 22 Sep 2025 13:41:50 +0000
Subject: [PATCH 342/673] [FIX] sale_loyalty: create loyalty program from
 scratch in test

## Versions
18.3+

## Issue
Tests fail due to free product rewards being reintroduced when a loyalty program is reactivated.

## Cause
Reactivating a loyalty program also reactivates its child records, including default rewards. See: https://github.com/odoo/odoo/blob/f03ff6d9b727a22e3b250a5c9cc875b9f1f16263/addons/loyalty/models/loyalty_program.py#L513-L518

## Fix
Create a new loyalty program instead of reactivating an existing one.

runbot-232709

closes odoo/odoo#234854

X-original-commit: 2ebc838349053f8b383c4a943db9d93669910e1e
Signed-off-by: Pierre Lamotte (pila) <pila@odoo.com>
---
 addons/sale_loyalty/tests/test_loyalty.py | 27 +++++++++++++----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/sale_loyalty/tests/test_loyalty.py b/addons/sale_loyalty/tests/test_loyalty.py
index d3c69778f131c..1f52bbb7d9027 100644
--- a/addons/sale_loyalty/tests/test_loyalty.py
+++ b/addons/sale_loyalty/tests/test_loyalty.py
@@ -388,29 +388,33 @@ def test_multiple_rewards_after_confirm(self):
             - The total points cost matches the rule's requirement.
             - The coupon's points are fully consumed after applying the rewards.
         """
-        promo_program = self.immediate_promotion_program
-        promo_program.write({
-            'active': True,
+        promo_program = self.env['loyalty.program'].create({
+            'name': 'Multiple Rewards Promotion',
+            'program_type': 'promotion',
+            'applies_on': 'current',
+            'company_id': self.env.company.id,
+            'trigger': 'auto',
             'rule_ids': [
-                Command.clear(),
                 Command.create({
+                    'product_ids': self.product_A,
+                    'reward_point_amount': 1,
+                    'reward_point_mode': 'order',
                     'minimum_qty': 1,
-                    'minimum_amount': 0.00,
-                    'reward_point_amount': 2,
-                })
+                }),
             ],
             'reward_ids': [
-                Command.clear(),
                 Command.create({
                     'discount': 10,
                     'discount_applicability': 'specific',
                     'discount_product_ids': [self.product_A.id],
+                    'required_points': 0.5,
                 }),
                 Command.create({
                     'discount': 15,
                     'discount_applicability': 'specific',
                     'discount_product_ids': [self.product_B.id],
-                })
+                    'required_points': 0.5,
+                }),
             ],
         })
 
@@ -423,13 +427,12 @@ def test_multiple_rewards_after_confirm(self):
 
         order._update_programs_and_rewards()
         coupon = order.coupon_point_ids.coupon_id.filtered(lambda c: c.program_id == promo_program)
-        reward1, reward2, reward3 = rewards = promo_program.reward_ids
+        reward1, reward2 = rewards = promo_program.reward_ids
         order._apply_program_reward(reward1, coupon)
         order._apply_program_reward(reward2, coupon)
-        order._apply_program_reward(reward3, coupon)
 
         self.assertEqual(order.order_line.reward_id, rewards, "All rewards should be applied")
-        self.assertEqual(sum(order.order_line.mapped('points_cost')), 3)
+        self.assertEqual(sum(order.order_line.mapped('points_cost')), 1)
         self.assertEqual(coupon.points, 0)
 
     def test_points_awarded_discount_code_no_domain_program(self):

From 29f7814bf283c69044837641972d1c0d10813156 Mon Sep 17 00:00:00 2001
From: "Laetitia (ldau)" <ldau@odoo.com>
Date: Tue, 21 Oct 2025 10:04:14 +0200
Subject: [PATCH 343/673] [IMP] web, *: change bring front/send back icons

* html_builder

This commit adds new Odoo UI icons for the bring front/send to back
functionality.

task-5173190
linked task:task-4789254

Part-of: odoo/odoo#217739
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../core/grid_layout/grid_layout_plugin.js    |   4 ++--
 .../core/overlay_buttons/overlay_buttons.scss |  18 ------------------
 .../odoo_ui_icons/fonts/odoo_ui_icons.woff    | Bin 11896 -> 12432 bytes
 .../odoo_ui_icons/fonts/odoo_ui_icons.woff2   | Bin 9888 -> 10364 bytes
 addons/web/static/lib/odoo_ui_icons/style.css |   2 ++
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js b/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js
index 2c900e6bac49b..b00053626ff0f 100644
--- a/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js
+++ b/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js
@@ -100,12 +100,12 @@ export class GridLayoutPlugin extends Plugin {
         if (!this.config.isMobileView(this.overlayTarget)) {
             buttons.push(
                 {
-                    class: "o_send_back oi",
+                    class: "o_send_back oi-send-back oi",
                     title: _t("Send to back"),
                     handler: this.sendGridItemToBack.bind(this),
                 },
                 {
-                    class: "o_bring_front oi",
+                    class: "o_bring_front oi-bring-front oi",
                     title: _t("Bring to front"),
                     handler: this.bringGridItemToFront.bind(this),
                 }
diff --git a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss
index 91d0258040855..7eb8ff2d7595e 100644
--- a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss
+++ b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss
@@ -35,22 +35,4 @@
     button.o_move_handle {
         cursor: move;
     }
-
-    button.o_send_back, button.o_bring_front {
-        background-position: center;
-        background-repeat: no-repeat;
-
-        &::before {
-            // Hack to give a width to the buttons and apply paddings.
-            content: "\00a0\00a0\00a0";
-        }
-    }
-
-    button.o_send_back {
-        background-image: url('/html_builder/static/img/options/bring-backward.svg');
-    }
-
-    button.o_bring_front {
-        background-image: url('/html_builder/static/img/options/bring-forward.svg');
-    }
 }
diff --git a/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff b/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff
index 0da43a04019f3063738cd0a8b68befa9dea8687f..2e154adc5b868ec4f0c11424d415c2eb8123649d 100644
GIT binary patch
delta 9846
zcmXY%1xy{y*TydtcXxL#?ruejySqzqcNQzwQrsPi+r>&RT8g_Bcc-{}%g6iAx5<-d
z&Tr1y-DGEz$>cm3CtBe7s>#WLU_fsdXCesmKi57<!czi{Kp^<!#StNGD<3Z^5a?as
z+YIWPFx~{Rb+dDRV^bgy!s#1Avt)k^u(R-V1A$O}zD*<jzp(6_{B7UZ5C}wN4Fd6#
zk@DcL*xOjVjagXVa(Ldv&(<krWB&%<nE6{w^(HzbTHxK2y|b6!8w~vqfIu*G5>~JC
zPOet}C4PHjssHKt`BBl?!td?Dtb%Vb)qjGS#5i=ZaJG44`fqhfZ!d~mqG*xe=IZGM
z0<oQdK(I`2EcQuFx6RGN=B<_!@2xK2O}Qc8MZWvxTA5p?n7{ylf~J-QUjHQ^--q#R
z+JiufC%thm76~2;C8v5v)CMBh{28_fo}41zghGAGL@qj?O0T-AI?lC&4-kI9^42=D
z9g>!9x$+`(E+5tkK&OpdFIOfpp~q?IQM|<(<W<#Hc}K>C85vXo)z0Mpw=#Cnr-iu-
zqqfdx5s9GJT|L0Hg=76h=CAP{$wKG33c`<m=QF>Bz}15=;4x-Ubc=b?Zvqv8c$>c7
zZ=5vBe^g}sIt*L<Dpo^W<dtYgnR6I#c8qhB?3xuagfm(L86i1#f(#R^oIpk?p2?=%
z3;zMuuN!q?5B4F|<*K>vaXu9fyXvw0l`<vT#SUO`3qU()zT)Ax#^qxP4!X8Gqk60t
z_zW5Bf(Aar0J~s=&v3ym1mH6wunQ^pj2!Gj1wNwzyU>Hr7{M-J@EI%Eg#&!X1$Jp>
zWQMNT^FsG3@>YF$(^rFd^F`m;)A*B2Szj3!R_-E8&BiX;G5CL+a=Lmcgvy*q6o_is
zQ}+YiQ3SY2Hq6)t>2F4lZJ_&RY}f|#Z$^u4!2f0}*aqL<j1k+w=gl~<4eoH0_NcH8
zgky(1GGkaj#137()wR7vxiPGaZxJ81f$CcdE4IPJo6$@^zO!eXd|Si+eRN5L|CTq*
z+qhQG(TH@gY3SV*0#F->>Sny)zy3H0oeVZR!POVN3tNMS_;L6U!oh8aW5)W$=*Qql
z$<s(_HcHME!*Qp>jpD!4j3P7o_}(9EfLm_WciWdGPB!ebBdp=b>t5dMs3v&#Lu+9?
z(*3A%An$jku=6ZR;M{AsFCnJ*>O8y8{krFQe&Aj1>r2A<GcXC`$#d7^@TYmvT%{(y
z)Zpu$0VNBBo786KgzCBZ(MZEw8HB5ZBiT_j%*f2mq!g7g8iJ|EXJCTz!|FXMBIzfk
z1!JZ0q{Jzqg@e=Z2}0t9#~KF=%=>#^ujW=%TMAxGicF#n37?IN!;8bAE{{sV-)4s#
zXc#xQcV51`BEXeN-YN9Xm_J389@n{+?b2LQ&mhJAqXvz?Je`)feHbrAuUrK_%5cwL
zb>64|DOI{&1tAkwNv@?|Dg9&wJX_Wp?2)rrs)XpGjGsS2@F4s(@#+k1u?6-Fbo?it
zw+@^=HFZ~W<Ksu*%y~H*Puw~qQnz5wSw$xom#dr{OW+;lVxO9~_d>6}`<kJtS^ZR?
zC;5h3aPXR9O?^F27<UM%O~)7dH0TocH3a4TcJgNRmx#WtI0WvLNLDuH(3vQIQ5d5>
zoSZpc1xsa5N0$ut%H*n{#V?#*^x5S_VM)A)ta%}T30+O3e1}@z=3iY{7mE)>Rx{4s
z=XQf*aR92dEK{Stcf<&uflj*D39cJfkb<Xh(W%$39rw1a%fJ`$bMm~)-@?+A4b{>!
z4ymDOg_fVJ8^3a|oe_8jU%=cQBVQh`{6%SG`n(e0_odS!B%q@pkkmYi&yRF|TP~$r
z;|?KcwIo1HiOW|zVW>)J2gQ7&*Fzr8rhTD><_<94&V9<4=M@;VEK;XZr|chcqsfz;
z`{?2*w-?uMby+r`&Wjfx`L0J2((_}GDaSok;dimuY08p`uJ6bcO2~y2<<0vB%tq+4
zlFkKwJX45z<IS32>PV?Q9SQa*Q{ITMnYZe~k6?nq-t0>Yfd4^VTK|d&T}7o*hJ7~e
zcmnXY0pSC6MZLaUa8m#FMG78&4c3ckG`!B==WfFPeklK&ov)7DlM)wo<xvTClSL<D
zOF+amG}H=G<4X<S-dlHK<(=t$_%0#epn3-pT3AXN{XY6WI!ihGTA^(8{d|AbV84{s
z54wovU4*jm8Xo^x<cWS!-0&}^7X~W<Ii!G9)ZYvRgbqa`3UxVVcs2oUlzv_xh`RE2
z^n~=1=sF5xg!!R4$hh8#;rS`q-VdLXB?q5XcZz9PaX7ReVSTAB|D-y`hUAQ4zD|36
zBQo=rqA!>BC`*hXtR*YDUw>Y?ME7Sl+(SQ!w<o&Dizq~&mq;CdA0|QB6d@QT057E;
z10JxK@Xyl43rxOO6XoH$9ODz#KhK<04HdeqfqJ95WKEg|&NpMu55T1{)S&CW1{;-e
z&G#aVnZ5*vMfsQ_yu@*A#y0Wz0Q=b_VJ+pPf!P5aiv}^wi}?PK4$6_zB4du-M&`L_
z6w0{o?|C&<lT6XmG!hULlHPx_?0CI`G6E7g=VueZ-LU7Yd%2%~$dkODukS+AAC5WH
z<JJZDxST-n68uWEpcNHyvdfoD8w8vhE`{{@%&}d*@pPst!Z>Xhqp~Gsk!1s|ov%)}
zW^_hGPJ7gpYSPPvZ~s~`gZlMSTSY<EVq3rKU4h{5^^iju31QnB58r8}@`eG28XyLv
zlk%MNUk}hScwsU>6kyPvbyJuTO3dpGlS1~n0s}NTn8SUl(s^kbCWbz*%u6CQ9UiB9
zy66E-RY-zJ-^@{|{KQ%_&4%8LeJ~Zg)z`E8`3m|nZnPonvvU#+E*JLb!3wglumx|d
zr4(fQN29FiV~v-$2}ksl@DOqs15ZQD$2r%WqU*$;$wdPmvkpuj;N~7YI;%{m%)S5>
zqsTWIdA8|Gc?8BC;S>p;nS;0&vR6An^Zae0#k?iM#6(2#;Yq9v)8ponJj3`_Jo8bW
zHUf^5mm0ZN<YMlOEIHCr^@#CHwW#c2R1UGkE0%|fHA_B`nBtTupM<6JfY|Q?i8Xy!
zHsr-bc}+q{E*aLsH^l@QFy8oLbi-O%pSr`l<qgEUtH9~?!3T=pJB*8SObg0}Tppkl
znwze$!s%@Fcb>=Hq38a`5*CakTMu=gK@@16e4FV#>UhU?0XZ9NMiMFC_Yhj$Qk`vi
zd}+uwV%_c@K2c8%zLRZ02O8}eRWA)+IwCcP8yv1<cw7{IMD7~eu#>w_;zzv;fKQVj
zV2aZpMsF)Vy!M+(lSRif$r`trt^7W3J_Xr;NjOCb6fz8pOPL*+W*UKK5`@oXI;d{;
zdP1$+vMT?I-d?q_CEc=3xNcUzu_rxu{`>qYr!yrlFQpUzKzl7v0kE2GJ$;zS44gNX
zIle1AP1dahnUa<2UDt8NJ35N5)cvLM%JnmuS%9U2PF<O}ERcAPp7Fi2etaY`cl??%
z{^1w(m$H^_$#)n;4KU1>ngePOpEAr7_MC4?w`w-$r7b<KXPpRI=1difu6?AwsYF`#
zn}Yj&cbN{&nAuvFSipiY=MD@xVqtp*XB_k43|3T8-HvfvC>vKs8FW8uw3Ll|ymTA^
zmbXvRsIa9(oD=0EaV{rpKJm+tK1Q-cNtSG<K$IdpiJ%$%#XE-Z(Htat=SZL8S}m_;
zC-m0axGp+yp26o;{2%PM%{qG7BC>icukqGqEtEaQC7&5j^#O(*dBZUV@&~-)YlX0e
z$oeEhiH)f#b9qHA@f4*&YV@9P4ET`i*kg%}4wufqzOTOnR+b-T(@1quvq_&rFXxVq
z&WL2WkGMUN?xttLIFgJYR>H(_RMJwSbV~y?DGi%L_VY+PmpPGn{RlAKBk2w~tB9}Y
z&Ib;C`OLfc_do-(Ct$@&mOM2*VUJ>IE<T6jiX`teb7$Zfmngedjds&oK3e+k8R6{s
zNcq0yJ_&bVGijXpqi!i}*VJqJ$da*8GSdhAG<HQO>$d>rDsv>{M=I#^`<GceJ+$*V
zvwITYp!Yz8J1k>Ekw2r&vLO6!Bjy%kfZMgx$;(%l5ZDR6^gDNR6<tR}6|qSo`dX^F
z<p#!Ixxb_Q+ba>!CMZbYj6o@c<AR=XhhNZj*&+eSmyahSQ7M(fjQ{4N7|1D^+0wYP
z-{41^VSwwFHMyzn!LVWs+R*cY-DR?l+&cWB{#)tL2Y#$%sE>x5i;FatlfWUqFsr|K
z(bOKP1(^DTi(zeexaVHzK*H}q^QD%U)>#rG5xm-%j?F}Ev($E`PRI<g>}5U{>*)3-
zubl9RpPhn+qmVRpn>ASVCi8N1Ma}aJl<7~C1r_2lo`mGGiog2`yZw?>@(KO~EF$gV
z?Gp6*ukw<)5jA$7UC~nxw208XXI_~WEgb?90e)J-!PD2?TzNELvB}WFcNh_|YM7ty
z5QihgfjxTug7UlX2kKQ?<*;Ikl|{E2F2g(-5t2MrF)KB}DW@bAAuVD$!oie{(XuB5
zKjP&DMZoR_`vI_h_H+gBV|9Q@?klXPJiz#?RmbM9QldXeeA6qN<RV(CEmd<8WQQYV
z0AwRLXc_&}2M)AfDP&effvmW(ekPRL<8s^^IRdQ5_o0Yi0$x@xYoo{CRjI?_i2ioY
zHDPe~f%o3p8M>oWkPD$7ouSz(H<P&<`kBn9`iUo#N)^5}=EOPapqIN1O}l7C$TTsJ
zm-4pAan{<z=&Fi>nx~l^URo>f0Gi8m2rS2ji;(>x<feXg4&pFiIo}FW74W?lZ?_-Z
z&dv=#DRd}?P3k;8!N<d%v22L6*V3i?hHH<IUChp<ve4pR=I}%_%NOjUr|w>K9*+|%
ze->PXm<D_9TAb)|`R_;t1#dTXJ}+ZD_B0bhTOU2P<P1KknswjpJJBoe%M#mO0v>DX
zMJi!Gu<}u2OG3w*P<aDO9;|4QI0WIO4k!ae*?3K|r7Aa-M-DELZywz!3TFB03Vg$&
zwrBhNqlOd=&6B_7TPzkqKjEt73%Oft{gM}2nVmKz@nEUll}%Ei!qghJ`3id(U30Y4
z$6|<FmNw$O_*vr%r|VzcEcO|h_rUL9`&RvK$VLd&!l+F@%;4UP;CFiwd#<D8G#0|G
zpO4z~+0F{RNnXa}1;QQLcpcT9r#%zpg8`!bkc<e9M2a6*hpiK$1CLgAUAL#0==}K~
z`ON;EUu?JUWC(Wi{yY2ZcImkzJq_7}G9N#`J0;Hz>==*j`aKnjgUn!g;SDHsTyUqN
z?4@qZF6p|BYPuKYO5mWvL%DeZxVaY7&&GVp5d%WIZ&opZhgGHAZr(e;ozjx-(XArr
z!Uphq3ylWJjTgmkHO%aM=;C-kU1!g9gpTA!c_I(L+WyxsR|N|(o5===Y?2A?@6^xI
z>s_QU4y0c@pTDg(<;I_pk^zTD%Ji_N1PAUSU+A4-!+10MzQDzNi^9l(V=_##r*b-r
z;B32Uqa8$=haG}LjldT9OvSCc`>>ld5!7`(wCn!x#|J7>#elJo(~GX=OO{D8X+2Pm
z;U&7pnLMTf_t)@&*0MKblO0o!(U5^rcw0rUeVNhY)avxYMs$~9858*Dqa~W5xVG_R
z#K%e|*-oAFhwr+LW=cKuJt%;ifz5($=Snoiri+QGgBqP$@;$H22VR=w7&$Nb_b@Xr
zI(|pk$18y2Um{b8_#=`i2&LI2c#ou@8$lv+QokUAXRg3-a7*Y|$KCn(_-*5Uj>Ys^
z;xwPjWo!&_L4(Cay9ewv4^`n+BB^K?>25lz_0z4X^I8L2Bs+zBAzGff<U|~3yCO!}
ziFTBGA5NK>HTq&P5*4GHpiEu8)*zektx97&^s>yBN<RzEYz*ct)+IH4<mlopV-`yI
zmn!{V_e7KFk4Z@fZcocic8V9j!-uT7guyn4kH3vKrwu~vDS(nRpN}3#ep=zz@}rwh
zk~@XFjNFPYG`k-V(YHxCjfsX@4oZDxDM+?oD$hl|T`(|o`#`&9Vgs|4xb?o?!<A~K
zx6e<7%wGpkml}Az=%`oGXeU*=pSw-p`v*fFd)k^=O|3s<UZtf{B3w(YK!#892z$Il
z1U}W1Ri=~2Y5<RoThwTCcg{Ib=38Z5_aWPUi8bI=-yZ_?hlu*T{?l|9P4NwEF|Rxi
zx&Ak5Mce4_zNOw!O6(uGys9bM>^7bHVSs%nBe=A1|8kdSr$71dI6vR-B24p77$Rd?
zyJwg>)1CQMsahYVS9758nYr)1=Q9UfaKg<P5$x-iEFk|wP!H;J!SNYJn@RrN*LRm{
z9jQTy9)VE9{A>3=%$F*xPy>)b*Miq4k{}8~a7E-h4%wt%D-6-iyy3ij<#O)gP0-*<
zxL3s2iYEu{gz2KA?qU|Cp!<Z^2a#cYR^~2h;`wucpz8qH`P5aC`QAX8dlSz7p!=cU
zQ_i(s1K61;|JGEIfv57d!Hg#uC3)Jakm{!h+Q{zBO4tZ8-H9JAa(g71qU8(;wp<pQ
z)ekMF91YbHJ3X*Fk7q_)#a!#05vR$YU^%Rv!m4Jf9J&%5hvF2~WiGKqS*nW2scx#1
zZAC+sO7BI{(1$8?GLu5sk+9^n-8O}2=g{<sa-bWo?mX;YsYFsYDzFg{4*ZO0`;cbi
z%`*LaeZ5aat6X@Jj+fm*T<4l4PR~71W3el0^=41)t1mwv-=0ik<=@No*o3a#^GkTq
zO${tp<NXiSW>LUjLc5w*EX;PSE8o*|kCq=f(@5HNk5;wuri8lEso&Z=8vBGM<8M8R
zMt~ya3^H{|pRg6&kE^E%v4aztDMa-qXtta*;h)=oGN=sg7%TaPqw47FXBAg`?pw1P
zM*CP%+~bBTG)X_l8P|lt{F`o>T2th5xOaZ!qUGWEC9n3C`S+0s#pT?N-a#$LukeS(
zt*r$8jrM@s<+<wZ>cP9skZlRieT}kFaRcDKmb)M^czfiPIU!&`sX4H&TqL8DHtT33
zMVZZf;VfSnz2%H<^@v#qRwgjHDo2F5xxHMc)#a3KXVKYzdvFZ*baT$44EF@DL2thE
zUJ*Oceb;n@ymI@iG5_`GSM_K&VPm8XPp4Gw#np~yNEJyR7BF{Z7K!|*(!9x}Gy^!n
zqqUlc5N_LA+bfB0nnKd#^|<yUc-8EX3B)R#aj5846+--qDMVhSmYehb74k+)naK7T
zVh}<yzoGeY#q2PbU1}+XOp$2X*ucjwD1HL*qK6TD10TCphd0+~_IP@G<9-<Ox&DgB
zLMzg4E#CWMSGuif1U96Xl2bRr+#U##Zkkg`6B-~?)ZpruV^ta(e1Rzd2q(m6H}_(i
z52B)1W_zuAt?uK$o*bVlWUP!%kjeH=kin;fP2G{Tgz~W6-C!{i(Mf9M&^DyduMOuS
zRE9XOgC|m_FHUnMCX5D`q7R-B5uOex{@HeNYE~{@|9~oJ{qQFLY`HZ2bPiP75&m2?
zu0Kgv6CkyIUP^wnrugfT$z8@nPSwjB7EC={eTbCkYF|w;^`rQb<xt4DJ~5I$3PPgM
zs`!E|Eg&weW`|*iv^9R(O3!P|kj2Yac8wiav@`J~*aB<I^XYqYFlxXSPAun_=8V*c
z`J_1bKR4veFX{890^NRB)0P0#IOt}#yZl#dFYK)a`JM%b_^(@$#@FqO*wbb0A46-M
zwVP|-bc$~~uPz}B>GT{Q?F3C)@Nr^A6hiP5$GeIn$RjW4R<cwKvT6?=k4MZVZ`;q4
zjuV!z6R_OuAif4VT+KUwKZT6$3OGu)i;ZGhF{-_`r?_?Ue>rt$Eja~j7eUVue+>Fb
zizo}_Ex}sl!_*oR8}@}k;%n+<>yhLW*}|b8C@&owz0RnGJRT|nSW9EJTFe8D@0P+s
z4D%*@y?u5yv+yv80EVQ|Z>TVeop{lTg50^Iu;c;QT`Lz9(ODw|%<tskrlx)EhRl=8
z74M3U4hq04*%XbUUtbj)#X_6t<OSxRlY#YRxsSm<L1t#j_l(bp!n)6Sd$#*D%IxX)
zZm$8V0)t%=e|_H3Bq)M-e`}vM!n7qCKiM!qBO`};Pu)lJby5r{$$$jLjAt*bRdxZ(
zRI3(-$EvlmDQp+5k~)^|plVbGl0gcaHnDi)YXQ1}aK+=N7S9{@g=PfTS7*XI(-RZ_
z{^NMV0CT;d*~}ifaSL>|U$Us)2uSR<+Mjy0e@?<@q0pbXsS}Ov6U(*88YX7((a62C
zu_(&z{h>1vRwIWjD+7eB3fp+->e|C2Bq0Bgoyb3{pB?vpM%%AziMEkxVr!<MrQU$e
z8ugKjEg_)|$sLTlqCwDSnB?c<n*Ti$S=`HL+3zK#MRNa<F-nuZ(}=~_fd)aosV-b(
zM6XlfQ}(hD*@?3V;@VFX+itZ|@4GAnX&iZr#ne0z;8Qw}P!5nGFHE#WT+q+#gfyxs
zT7PZ7BwyVkpQJ>p(O|)5G|D2t&-}AikKgqoWJI=Z6_U=9N>TaqmUL{weeSPziSw3K
zYX1j;QZBprU+B9voK;KfiUiy=_JL4XuRw>%19*O6O|qlo(-Zk}!)$3O*OK~acU=k(
zU5qKWZC$VXPojXf2VJyBL}03dWH92>)4wqx=irF1h);b{o^^MwW((g~`PGY=)^&_J
zs#}O5{JF%7I$g3K%9k-z8x}xDockp{Z6<AU4*t0?0wK0e4YYW2nV*!C%?V0r;Kl;P
ztPQ3U%llWHI6P_L-{au19gIMgQI@bhXh-B0BUF#!^dErn(awxxSI6lKeOKt3+l1A{
zB++z5Lkp&kO~X_B1&5E$$~Q&k*4uPOf=z+=iWcSPkNVE!69f80D&64$JeiXqHX_aR
zGo}}!kf7#Yh_(*ymOeS>C9W%w<59^M{9@sXoLfV;ynD(P!`k_h`-%i!wdh9ux_?Wo
zFKKh(n7;ww&)MIeflKUlGgpElz0+Z_+s>Mm6S~*vwt8^5lGDiNX?O-=o9<ycg<UjT
zTI#yKD`F@9I2TDqpfC;&MvObS(RYx#Mw^UK()X}Et#jwn@|8DG)LLBVs3b1E$++71
znvx~xmYr>3K_a7JgXEZ}-Nxdcbk2Ij;Qe>P1Y)3;e8oSAq-vl!k$O6yPJ=U%ld(7F
z*v+Ls0M!zI-L=y$V_~U&{(Gljk>$!^Ty3lFX725J{=jjUEiolBH64{gNlI3;UY=C!
zz75ld2Eay}%7f@wK>f>tp379#eEidoQqXeTgr+TNG6uiw>cv+B?h^x)bZW&Lp(<Vb
zr4nEs4OYAD=XY1vgzW5Mxl>N_gvN9VpXJ`7J$p6*y>wV4`?njxX01_~s7JI8*KeFi
zJx(7HjU)&Uo4Q}cUbkPxw!;&B8)l~ESj#8-y^w>|^a=W}x&{3<tt4-FX;yGWOhR}Z
zGl2R=3T0e0P+a*sBCcc~LXOW?#V)&RCIU1<7VMl~8hur=)hi;gR5W$7&gLDQ$%C_G
zE~G4CdgthQ4aVsmmB!?-k&aeBqjB|}IERK2EJq+AaX)Ba<E8rM2{-^7`}<FIt&&yp
zcF#?ADvU8PM+G?nMxIuErrlnlIvH}E$(!65G8Uu4=1%FH7;Hs6`0uj@Q)pCqB7upt
zhnp3tAe!!D<XC3CkS$tU-&%g7zugsG5OaPD`uSxX*Erc;>H;GauvDPbuTLpb$cxI2
z6J?G`wOHkmPRsEdJt#q^iQX}<d#XW4D*@l15I6p1-U@I&N&MR@0MHB{@2mA5TDsS9
zd&MQiApc@@Ag#tG<}Jp#w5`}ap@2$BX{XD-{ofXK;FNn$1M+THh{#5feIs%*fs`sa
z!r4^`xQa(Ph29`VH~1&h^HAz_1zuy>$U%cfU*>iY2wI6~Y+U{gqjZ`0l2f4PD>N%h
z8Zm5qY;uee*xj<i9M`c;5ck^+i<pfr(;A-lV<q7ZqTq+6jUqpFwX;Rh1e!do@f2-X
zZBC~sG?n(YvDW)>W}1t8|4_vxR4!2y^;s#7r^W2xFwxUYK4);Sb}r4XtzGZWeA;_E
z(>1#k^SzX%6G}F_6?<HE6flhlntwRt^lCwE*SzgaAn^+RTqULxbV-xp{KCP1Qt!Gn
z9(%`5^sgc;h=kPdRH5J~1Mq`67C+E>X_zNC5UAx4L4Uy$7j<fddOLPbB>X-Vx@>|w
zwic_gKEM2%^v4lKhw6Q)L!zuo17^t=@3MAw+S4?;JrAlwTo;Lv^}TuQHq^9O|MAUc
z%Fs$5!+51Dp+Gq#goPJ{)u6(83^3&VvDM5G$HGjwkUBde>`x4eOn`HA$7WeV)R1Jk
z$fnsyFcGPlPtF_Odyug4&w*(NscL0lvqU^yDnFCZV+OZIQ_&0)okQ&>{cJ@U;|X;1
zy((8*#nLauBkb{JQ^piFj%}I_$M_RI@m<!RFk8Jfza#vSVb%)fF=DlS{G{xlshf6`
z6F2BT_7qUsbP6Z6tOzu!-F#odJYUKvp>B(ZNaf~W=jIUWhVj@!;Jx$^R>hYoSZ%TT
zf8E@y2&>NYGA&XyLa}&>#7nlgXY?`OcaO%)H=nF6Hk8F6$@Q+<BatY<TtLOT{N;Y#
zyS3UWB>f;q{4=)MjN3M>mIN!h-Ar!$_jTom5Mb2arPFSKX$MqyYmOei#6@HD7h7LP
z+hU9>tEo^332LZ~7ycn=YZvw${=V<$#mR3@WFZ3J>lt2qm>}Dus&OkHi&bF3Qw>C-
zSTIiKp;v29>e9)JwD9=q5Tjjucfp#2dppt0t<bK)EaLvre3bJ|)U`uu8LnUP(?*SU
zRdpa=g(ZuEtRrxSmwFDiS@(;;i=oJ4wUMtLs&Un$DJ_$(Z}QQV8O^sITr#+GRR&<t
zAu%`Eliv~>7I+V^k{bCeaUI29*5jkj;9CcGOl>zc#0u+1s5oCfHV2e#r8+#}T+z+(
zOo~$6)=(-PNxNVF6Ulb3*A!`6@!WeYqTc;Gt7SKtYYK>ZUtJDTm<V!7=w%6u2M1jZ
zZAtGuf4Jk@?}gcJSRy-(+o8T%eDL6QfEoElpQ~&*Z}9MwbYdh5hoF>tM35$FRQ)MQ
zR~jLrJw>y}#DVEjnk~EQ=5gcorL;GiLr3ws*I{ptFkd3*aBAzoEEFltV-8qJ68z2d
zNb-fBehN6oIC74Uh~9~h_^`P&Fz~R|6GofDqgP&D-z6J;XLxj^c9#MEP1ln9_2WBe
z9zx|!Rr2?)KMrIy<~fTV%#~0NlZ)8JB&m-L4bv__;ge;pjwqH2L;cxiyRR(IHp3nZ
ziswU^w1rnFXCHOQ@KbCsB*X)GdtOcEdi_{Q+YWFYtFueQig5Uemq+V_r{qHS#Eynz
zEJvxb<SGYsU4|1qKB-6aIWP?v#K(nVob{9cA#nQ_Xn{5j*pRx=RSWpPrYp2R`AB~m
z*)MC63dKeZyw{FSdY3U4E|a9RZ;7u_%nI_x^kMvfCnAIsD`QB*7KKetp`GTJKjUS;
zR0S-qHRK|d%~`XP;{g@k{ng#X=QHyrs*J|K-(^gDtu0Jb+<IPm9F;lBmKLLe@5E0$
zr_QTtuV*l=KDR0swN6tfJ9o*=AJ4O7GvK*vsEemh(nObanH-zw?be1R{adJ&S*WTw
zB%y@_i97@z@S4tyaq&G^+<E9S<wgZ&0l>ovCX>Uzh$c)9KEavd&P4g|^+syi%<h`w
z_phwkin74G*(7NU`nv0ZT4SG?)8w#u*u>8X!B;LW!mpbw_O4_;ca(zdn7e_dp;<)y
z(YSY8`FlWmMH)`a{b~OxA5jSYW900I-NmuT*OKc8a#b#gN&9O&wml^~Cbr=Eb%5l)
zW3xK;D$HX$AMs!7@Tt<Vr!U9(d=KIDUBDsmk(;WTjcL&5rqNQayycqj8@Q@TEPpP!
zH1)f*pxWi<8D5CJYfaghG7Z7yjbGrANKW>3mh+%Y4--i$ZL<;k@oxHDvocc)Q8VE#
zPfzlqTVa07>ZU)wV&%_E`|C>R5)dW@U-Nq68Q8hkeN$d|Q&qlAmmx7{-MLUA6a4SP
zxAn8E5=OIy_b!<aNn5dCF)YWY4at&M+5a`Bn45#PLm63~w;!FmxG$RMK(a*nBQK-T
zGw`nxF9{aR=HjTk9-N$EGB5$5=(qptYp^yq7r&4Q3k##)dX0Xi)JH=h3Z-HCi3_R<
zMx;yeV<t!RLj&25(&?q-GKaDC5$+Rh5+e{B6IT)6k;s$elm6Ee0Rkz29RJq<^wvHD
z5(c?~;@?<PlN>k?2GCrx%;Chk`NofcyP|OZ++`H7alcjuP}9PI8)dvVAI@2J1&5_?
zK|ISQ4tBbo@#`N;J74R`oi>r4h^T&Hap8PPw8XVi=Ikf<?v6L;M#kudQ|?A$=SFbg
zMnUL?o#95T=Z3%FMlRrn+v-N@>qdC*MoCPuNlmfEmA}cH4{QmUZql1>@vU#Nt#65m
zZ_<iy@pNsnbZv=*Y%+#eAa)0qq&LaVU+69+*|hWLILICGO0vUe)NFv)m6c7oj^IY&
z8kFzzE-7WxNW6w*qOkMy{>lmRFtvD$n@^PTX!X|YHS!V{0l5vqGrSD^F1Ap7R&L#t
z^l#`%%GTK#KpMHGi$|#gT}+Dq9uL_b7+qyvW+F!Uy(6kh_MA%{xYQX3vN?d^yoaxz
zGA~*mPruyyd2Q%wxhg;q_iI)_R=Q%EsWR=5M`;>9{OIWq^*Gy9<aO>&Q7mVC`q5Kq
zuexU4&l<z1=O(5+<SDCH=_`AF=#3L!zBMrxHn^|u1AUO6G=KKdiy8zZvwvmOmqZB7
z(tqYXHkP;RbF`PA;BNWD;o6c+tb+<wgJU`IQwfhK;qz2cZevi<t(6i%ry|2vY{j_L
zx$POCIGLHjM<d?B_fd&azB51?aLiU$8A%?4`|Qhey?{N=5KcH&KFlr1nOmLiowc=L
zl9?%V&%BSLhzM05kPwxawYaZ);l*LRpNc{5A?@v~d$-82R?*wjxh~-{NsyNE!WQ&@
D;dc0;

delta 9273
zcmXw<Wl$YWu!axru0eylySoNS;NTD-xVr?&;_lAD9fDg3?iM__1$PLX;C}gT-Mdxq
zzBNyG@6Mm8nW^do(>p_aFLil&5De(;VfO}M{pTOY6Y)O)s~`}9Cx4;fm6@medk_e&
z=`DixCd@a1ES;?!-dGO^gn0Ib(7&+X`&gN}IfFo`b#Gzh{}Z;A{a4F3_7eo6umyp*
zMX%zwT&*ok%|Re0+P55@H}SJcD1=$R!8fM+Hh%vmT4Wjk?#|l5-TMu`3G|i>L&jh9
zx?t~Q_FrQ58%y|46JE>34yN93KW1iq8^8ZgFg=)uj;0P4Z%pN_F7a)mC`HPq@y<?e
z?jR7$CI|#e_Qu>uSQ%HGT`k^f*`D6&eBPA(?T5$@?`$&@^JF6!08ntn`-C65Wt_%2
zx@#V!I`n=w+l|n>Fi=4y7U_n%1B8fwA_{k7GI{1}RR`C0qFLdT`jGS8D>r~ea@A)c
zu)szCMc!_1R-4Dkttiv$?(86Z?Yg*#OSQa`2E)BdGv{RcAFeFV8Q&~k&fZmR<z5Rq
z<Wa%xbytUnJW4=h2H@0b9rCF4O~!F_$rAZ|O>z5m(^!0)OPzR+Y07&NZHV}QuGV{k
z^v}PzTR)Sac)!9itAjlAC>zTRi@2|Zy5^A<+PW689{fw@(GH$V7V-X=g2m^Y{jVd>
z-9|LfnHO#K=cNt&iI32l0$f#%Nd5}hF>ptFxp&?tXk5{DC!j#LQnoFgk9!1O!vU`m
zg4amFYwy8pbl^2+@EQkrjTgKo1YQ#dugQSd6v1n%;57~Knhto)5WHpzUbD<A-2GhS
z=-U5@qxHm^yY<?dx%Jgr_?|XDbC)O3GFcr7@?k*ua+Cp)jW&<GDI?-KJ!uM0Ukw^x
zkSc4grz)$T*8Jw`vT3oh=F2LwY1MD0CYzS?W~#Djop1IQ3zjt(dW(IdZtzo*O{<L@
zaZQO}{SUrnCd-=N=SHxWy}`5y)`K@oJbZ<bkRKgv?1w`_0!n<*oDCPh{<)uOo$@z6
z#nTnN=>!p;5B?1b02y9TC4yvGWh39yCcbCV!?yVZ`%W`xFA9c9CXS7-Ks2^Ga+Yh`
zXIq65)1uuaxttI3Q*))6fy{TUBFnN*@EW|MW~-9(!v?|d=JkAiFc_;Ww!Zx~+xK>@
z@!;tI@Y?{`fsCwrk+PE6FFAbm{Are7wM{y!MwsnGVjJO3XZLI60=ZyRSd~H0F#5dW
zk$hH?&+Lz4hV$kgT$^zyY-INM>_%>E{0h?22Zni#EW*Ynh6g;QLcDW}i+^%Qku51W
zu}<@dDM|gUt<9~?y^Tu@NlsaA2#_9pecRes(9S|9fjAZM<SC2U3iHD1W;zP=LuNZ%
zRW{{fP^9@UB({VhvnAwaX)Ym7L^`uNq+MC=?3CFO>XallQN3Sge57h=yI%w`w%kX1
zxb>LBN&=c4tHT>+FrH)^sp=im4LAZ&_7_l%mzS3GVP^Gf9qoHO?8s}J>~$k!V==zj
z$yDuN0Hk-z`pX_X{DzHb3k%<`{^<4#7#bTi;@a8SspQ8v<;SGgm2wM+*i&doDH`JX
zg}NjN8qP>sCMA@}A$(ln3`eL#sH%UbnoK*y+p_O@l*C*S6|;^kqf>|gAt6=@RzA8y
zvZFSolih|Rfj@7=btXmXBToMN;4dL!scrP01&~f0j3Nb>j(l$@-^mCF-i(IuAUjxL
zQ^fP2$8YT1em#E|Q^rsH5MczDq*er91+P^}o6MJTbW@jcGD%Lh$g`c^GE89piLmAR
zg80$na(2gmZ51?I)w^0pA^>@cZ4lVpp_o6>i)k(Lk<~UL(E$xpq{&b-t`^m3x$NQ|
z0K7M{g{?w_XrZuy53FI~xJU5cwcQMOm~~hwq6PTE3Ja`h$&e9)FoxhPmtz`L3JFW>
z@=pJ@wP}WHUj$?M6d);gCX6k9{vK3oEej1!Dmou3Fl17onTgPqJ_0Y^MQIxDcrwL>
z^X>G%7+%ze)$MYTKp+~Cem{6NQqRX>0p=Hbnf7yO<e(>>^KUoNl-)Nf^DhRgnmsJ#
zP>wr3u>$%a1_F$|Jq@kRC=yQnTul0=rqa7yJ4U3z6R}oZ>z`Rr2O!}K`KgQBk0P<W
zu@UL;BYVgtjY@iGRWw0-ba1J&5~9rvh6;k7)jw*y>}Vl+_;;O~JU_1a1%}Wc0gfzm
z@6;c#`7s)(`i|!C$~I&s^(g~bsllzVpHUftO%6>!hP95gzP`!U-ddcMq*_(lGmN9k
zqXC1$pO-swPphNoAb$~m)M!gA1!P={4`kCEXNoZdR%eC}>Q1T@Y4?1GzZ+!6a3er^
z;;z%>CH_dT4->EQ8POlr2mgxe5HK}yj_FWgi4q%qr2m|q;SD7rukxBmr|-%39$o9e
zXqiZ_=`>$KvhxqJ#aj@reC=YJB|foyw#0hrl9Ul)fcrLhP``N^BbK{dDsPhMZsw)g
zLWG3Ig%D1S1s=-RpcucE6i?UiFTW_TW|5^y#Xp)iLAbUKz-N+W9(rUK171%LP>qa2
zr^FtgfIk(VAz8v}%k%SJy^qJPf32)LWFHUZ%6kspP)(94h82_cTZRV0SE?kHXwmb0
z)oP@RIu51Q>PfR<&yo_cvt3K9ez`P9gR2(Z-LX+5b%&`@pM$sU0ux<F<7KtnS9jqd
z@ni-wJWO+$B|k=g7LH|81I%RH5B<GEp(3yAx&2;xG$*F-c#fnvU}mk4VdI>u3WY%(
zWKO><AwJt;unHtqnby2Pg$M-IEA@NILRr+N;fIwl`T<gH9fJPQ!T1i><BG|+fL9#i
zoW?GX)BR;EE%oMuV5+<Arz`V<%63knXLhZ&I%<fzhbMfnLK#Ok(0!Mvxgc<0V%<SQ
zDB^teJ38I?9=`cbxwFEE$~XonA49oHC%24S4kk402&9O2%jk!_gS~eVHzPHY`~;cV
zMMsa3pHWOpI<(|`+f$<IN$u8!8rz!}?-*<9<8prnYmN8jF9r{tE+C{!CNvE+IdHkt
zYdeVaks4!$N|P4=ak2(xirQa7qcA_kOty-`x7cx$`+SUM322L=NZPF!?=kMnD`U+w
z)*={7UlvMc<48X&Tr6X1ApKSvj(>L&5a%&g`8@vMwCTJ2z#$kRFW7ZL8-OI^gz?jY
z6Myib;?KU<*n)bALu;=?wnf(Rcn<Qg7j?E6V2XSNmHcE6<gl(pYIYDxa1?_7+5Zwf
z9XG&br)t&C_@J=n7P=MkN0KgyD~ej%HMoZHfsC-NAwRH?h3DQ-cz%Hdo#aMjv);%Q
zOM&I1i;KPxiChV?Tv-s>o?mL38Zg7>emYlAwYcDQXHxwzh_!I6bHBOZ_4cmLr6DI*
z@cFJ*-+T+C>=!z%LOZ!`t6BpV&ZJi9sx@Fb1V7a78(EMnYWx2%dXzf+dC^u}izw+@
zu-Cp;qqU#5UWqvJZ;Y>Jfs7$5K17CC)eZ<m%;x+8r!i0*lV?(0jCER*Rh)RO?r~nx
zJn3{MhNNl2Sia&kKzchztZBV1crb92ZSx}@k_-i~7Y#YjV8|Kr+ljcMm=1qqhZWT9
z=(h#1ai^EI?q`gZuyIb5Ou)nP4oVv2H+PD2q1x&ha>C~7J&ovMB}o*e%5@4Lj>$m;
zjj1l+=!3=#km(#kJPWI3np*5Jo3A7O&@$)fMXzc7WcO%sU=#3)nACn@8U0f&4j&!I
zp4$YNWybK>aAmn~CPz%hBgfGBrOrL<g@qx?Xh2Yx{e&@XkO@5){~1gfzAg`WoD6Ne
znw^9-zYLEFR1@+Fc!on$t5esxqRi)P_Hj;&O5luXTTF)Cx$&jKg1i+QV&&+~dNXIf
z;|%SzAd5tMz<!%oo#k&8d4+R0Kp4nn+9d$6>QUUPxCk+o4z0`h5V$z=>>~x>X*~yS
z^eUqg<kl;%ZY_SNx^BokV|jQM`|@<|hH!cB{)>WW9z}3mb?+&&8%NSIf08Rnb`?je
zpon57mX;P*{40+0`cz`k?|YrzIkfS3(RyRQdF_=nu{XI?_WqKkJ~vSJCTB6WCaxL?
z^>z~d!!w5$f7|z@W<(qIr2;INtvq<MeisZpA#tQ2$`?&+^@sOYZ~g1~jV93j(!Rh`
zu@y{HF*nk?HK*o)g^1j!?YSmO=(Nji2g`nGW2ii7o`tsg7^N0K78=7zMotvvgR@=}
zAcUW(D@jjpNsTi^U5&%rsEhxIhEWI*wmJ6(s-Sg>s`0AM%BzLc^Vt<+jKFDxt}fuh
z(iO92Es`HoBcwS9T6D%Q3e?if>wR}2VXiFC=X!j!5aDN4cH2I&7Avw(N*xbW5O(gR
z7#iH3-DG@ULn)-6F<j8Vv#V`2JUm1{%rMGMtKZI8{SL;2^hrBtPn!bs9_ADPMdRS7
zH2v;pDf!Yw9E%UNb;(x=Y)-dAAz}PJf;0>gecfCHY`*gaN#a{<qr}JEN&sI#LI-pC
z%q0!2lP}e^78-lASX92cJ*I)H5g~3gxVJVnR+2HYs7xtK3r+^|Fw))k>MSlXM20`{
zX~a61eMmZrte7jbJx*>PMBD%-GB1uiR~hK&CENw;u<jwnggo`<#c=P&MAj>O^sxtr
zO_(AI2`|4BDz|QC{6Kgt4^o|UrEDW9qdUO{F{PwL<I#pD$-AS2L{aWK^H|L-RQd?b
zUI%L5tlj&%ICeO#L&rEGbA|~9|HBnty+y*#?+PR6)gOAN!3SU28Bl>X&%#Yig@;y^
z5rAmp!@{wzU>?u-ddF1FO8rmzviBk;ka9`$b75aNxsWDZR_c`$0+b_oNMLDsw92f9
zL!1qytH)h6Z<zpWc<5UsOP%Cvd?;1YgG9<$yxQS(LWqFss%$qowm;yhvXr=Jwm;5K
z;5mOJ==$X*T66o90t%e^Ei7b%18LGA@yPjx`%7Q-J8_=sO+$#tg7Po1#BvBB?5agz
zXSzK%Z=?r5!SLH7lEtZ3Ng1fkHkr&W?F5gK#uO*n^yyQi)l{~i1n})=(uw0#3evhV
z%hyllcq9E_*GwA8C#tdsL1>hAkj<Vl`OO!6nsI|}a6vL}B7p5dxx)5?BW_t>*Y{_Y
z;O0*aieU-|BsO`&2G>2<Q;GEN@@{N4g4uDEJIUdMAA-CrS18WBO`BFVQGJE(V2@r{
z)W4mKYi3J$>>F&nOiS)mXkT8xqSST?d`rBH-Z}3?B@&kqC&oa_&1>q~$g??E+i_64
zDn)!uRpi78-T=}ESZZZjb(QYL$Q|TbSX1{|Li_7KCa}!XFyO&C9K{*xv~`o-*`)(_
z{bRK*FDr+$u|)ANgyF-M8!wx|Emo9p#9T-WVe(_@lrLS#aw0_q<pS?}{PV>KoX>A|
zT==EPtP8X0oJFg#uVmoTClhJl#W|4UITBo_ocSA^@`3I~np9+Oz3kyL&a@^J_}?bD
zJh<<ZNQCWi^R49y1M6Ce`VN1c#F5eHqP@ps#gsi|4I0r;+)=>v!bc?!k0%SyvtMj4
zwB42z=bF2aeta2)+I#xB0&i=(fAmRqx;9jTdf|-puiNE<>{w#tjrZ*Q<hZOj4<xX5
zlS(2{2)H0sh59jHJD=3f*ExgE!t6_jSr4NmWnfTY4o5SZA`)Z9+*H!;gYqxJctb!a
zGuY%a5sK6#GgK&YikAXgtqfI8ud&xO-h&Ujco)cw({1<jc7A_Jp0LI3{3#~wp9h37
z)2jsrn<q9Hl0E#wCGROMc=nsNwu3xOvAxa9-_D=XUd+~1@Hj$L1qVjGZM0}d*<#<n
zlFYvg3x@33zk1hqPtW`g5q)Hou;oz7q*iOn0}E%5DL~2T;mWbm)%S|5IZLut2czL;
z+!av{M!xka3*uuO7~CUo>XdMIDSWNz!@@Ei+8f)QOxbGvnmA$V4rZQyu2}9#=6TvA
z1LRrG<`PGDR8b~r*x-0zVuLj@Mwss-6DY}fBb<6Z)=T6uDV|5d@($d)ZG8QEuP6AC
z;Q6EXC9!&$TF3e_Q<-?`0_AaNsUQi*uKetDZiq7vx^b@0`D;hmzqUpfD^-2m+J=6W
zd)r@FaH07QOXfF|(I#y<S$#UW;IX)Ya=@?k;(eIyW5dK+iVuAyuXW>gUW}Ni{yS?&
zit-q7QEm2ED>TPiLe^VxdvQM-cU^vtaZ1)^UYhuiSq92T2OJsyE)MCQ8d}KaM02G*
zJHUjUMw)o>;u`D{{|*PhI^x)<gA}S=H<5QQH!;I|n4TU+6e5&YVl!e6$WJ__?LgiI
z!c@G`-(%D^qg<88mpg{fAH<bgJN?+E?whW%@8}oSSOZu$?AoL;#N*Kjz<rVFMT%Pv
z$ujyRQV@tv(a+r0r!H{NYZ1_JZ3B)^?5zf5tg!F?Qod|?CDrR{_{nfrZQPUjP2sJO
z*-0|p>Z@>X!doA7U6mZf=28?50XgbQR-ZVSAY^9U<`4L^MZ=O(0ba-{G@1gi^LUC&
zP-<LH6rq%XVlC<zZi7DOvL*haZ274g@Q&q;IL4>Sb6WwYw%?C2?}wzcY^3;=<mrCP
zGUPOwwMm3aencq%q?QI#n;;q|b*+?8EmFZYNrDtOI+jt7WXx3%8y1Hj@Xl}p?s*KL
z1&Ce>uF<>ugWD8REj)N;Qbu{9adQ=MJSedrAnNl^QQKN;pYeaxQb~9mCGU`{s;YiX
zd^<0$^FU`7pVqqqkVH|pV?R6{F6eA-yxhM#kr?b}4|&Ql%c&vs;votA#RpV1&z$sG
zMkKkX>!b-D+|N+3gN0InvlKYg5q4)^>DcyXF6ffYCGwCRQLs%+#O5}8of6(Z!Nu*)
zO=+!Ep;E?USeM&(+`%N@tvT0ZCoh%wVz#SfQ28P~Bj(in{v|Yvy0g9T174Q^n#YMz
z{M`z)(rqE#<g?%D^t3|NxlyOj*|8S1+055j0-C3H$vA6~SM>;JXQ+>eyX-lQ73D&4
z&vMWH{yO-pRQhmBs~IiW^vIwoQ!Rqh;-j1jn#nCb9#TU+d$F0HSQQx+^wi0{W4e?@
z>=0J*3do_p`PFtS#q@<^a_yv@L2E5{%Hp+#XO1cxlc*mno3sR-pZ~8!H5<m4h;G|^
zj=qp5LVf2HI-6zyHq3yt8_k7>yGf4HnPW-0xRUr%3R0vIgn(t61&@s4l|-3aK0FB|
z@H>=AFix0Gf5fTR?vtycXM+2Ty6vZI^E8)4*%S^o`YgZQY)A)E)y&7JI3`)Ep=PVp
zu3yt%?s?a+-a#|SJTl1+;oxS!PxxC^7qD@G6qEX%7_tFO+k0qQ#6d$fz$*1PW7L;i
zK+nNOXyX*Gw-EK&azTNLkF~q?RYBsGzu5Yba_M%}C*ISlPn_?N9cn+J366c?z;X$K
zf#q%H!xho{oilEeu(G&Nea!k!bz|~=r>!~9-|t6lcem3G)M<gGfBt)C94Tp2NY-LK
zb6R%QYpy5Yi7+19eC&AdUJt`RL^xrEc9`Cu!j<EQ^sW^76iw-~ltO@?i~%%Yh#=Nj
zYHG_Tn3k0*WIm!zYg?VT4Z0x2ER;<ZA|PV<!Ma?U+s0Ofi26o;xbxlPHmL95%E;!C
z@T$)O*Ob_Xg9+)3CN=8!k*~%bTeX<ux2@ge66F%$YIpQiF%>Ty{<xpySN|Wskds^U
z*TDk3)#?h@z;<8#-gc>WSv%jo9aB|Sh0k-7&TY0Lw76bLPt5PL{AG|tkWHypGgb96
zD-P~Yei=_)w^JsZ#IKyhV>??l+%9WzHSPEhijVEK*lM<mjA0cqsK16MJ9qNOo_%F4
zIJ49PBp&PTMU`{=dHXZ^T=X)hne^KG3~S<f_GOwzQ{<MTB@<l;?u5F-R|zHQTvY|I
zm&f-sn1)=RTVKRia@gHHn+`OW@zsa{`oyWyXc*<r6vQz>9>Xzeav$uj)eDNU%wMUD
zaEkELGhSA|Op?l!Zwilzax0f06b+(ruMJ{~0gZHuL<>I2z`}~Wt-q(Au~X75oo}MB
z<F(N0#JF6BA?w-J%XPM6u0L=r4@Vtu3*wyvpC!SxB^W-?(YJ<#jP#$mjO7v}J5!PY
z;h|&x!pM&4q+Gx1_0#<Z|7sp0w^V2@rgr<*Uec2cQ&_Z##2Q`-&<+(UKRz^b`{cQ;
z1h>5YVDVMI`P;F5@53fm$I@jpZbGx45JtFF7%L11Pc-|z&y;)fAV?(?*GrHo#=;G~
zXa&|`WSkhMD6paK<EYu%_gyLNq7dprK+-XXTWD;o2`+dTevRHreR1({8)6jHYIkmm
zGGmW+HljGvBDvp?^J%+$D1!2!uAn0TCT)~QRW*jMnYZBZB2JgdXf9=_b0x9>taQHc
z%Lozy^Si2YGwz?mdZDuF85yQ$|D=>aUE%V9rcIuITW<oq1~I?Q!Q@8%nabooK%0aq
z?>%JYj6&MifXi_xs?YV?mQ7=KRvuhs@L}QizX=RfXS?~>td4ls#J3w<33G|UcjssN
zMmIwbiFs>-J4OrWjH=D}a*;Ef5KD~hkCvp+803{dHK6rBE0<pbW6{$QeSL*jW-HS6
zKTfY6+PP<^hG(b3@n-)dSof#K0@BDw3)VJaJa9jrzx??l;Sx3BH0=V^>U#aE?mD}K
zqznox;}5ofiS{b_0lU!F2-|+#a&*YM+RJo9VS+Z~H>cL}VUdw7o@H}rs)@}rqz}0<
zK?!%f5F8Tlt~Q*Nh2&q8ch;GMW3i-SP+_VcU7jkHh_s{ZGP3V)n;Z~YH{elmpz-X$
zMoe)+-a?vtOZ?O*&ueS{S4K;3>4EJ|ryb((u_$HLXBZFd!a#mbzwp3T*MV|!NS9c(
zJIaUW;|Qz+u}0co#wX-&?oGcQt*qU?SZ19UIT^I9j!8Zd6bhG<UTZt&+>$rzS1%M{
zS;zCLhezqIJS4xn`%sDCR1UoUejX0a*<tIb{lg|*yOQI(;;WawEcJrrVXOt8zEn(9
zghpnX@=Tvho5+(98S)dC#k_u%u?;5YDUcZ#{%YiE^bdJ>ouP*z$f)2v?RIiFdS~|Z
zKH+}XCWcvmQlr{s0${yNeY`T<cs1;Ev8!4<O$rrr1Scz5p)LOrwFH{H><^$e-$`br
z!(<;@<!2=OveBKYdN0QoM6fIWiJ$nlcMW~3?>d`6A$XM6vF~g|pE5W<KkE2vmv)hc
zEe)H*E1XGlQ^UhJ6NH}17*`vFDvN1$Mjr)z_@}xu-=>$>f-h+>qxZ{R=65fBB<Y_<
z<*-iWUR2pgafNwi2VY>WO)5Z{Vd-}L`IAoaTm?Desouixel<X_S@djgpG5-%bN2S3
z_l+XOc*hs)_t%;0j1nv4GWRp@mr2#cT^x19U0OiFO@aiwC9BcF4?bvLesC_nO}L=T
zt*KGaSJ<k3QK9TwiX%i^u^`ooBizRSqsyG=O;MrTd`ZNU9iTvX^HLRSeDhZc4>c9L
zQ0W)y?7Hw-brDB0vN$8U%g?q5`pQ;whs0$@Sg9P}K&r5eRy59Od0%W8DMAV6prBth
zuEDwIt4q48*My1$6-^SpH|{|Z<u4@_Eqns<r_UddbUkc&nNircWbuC#!wp%Y>`YS&
zYf_~MvEsWxr~vnxp)yB!Xk1^72yLn1eQQgGQS*ZR-fO}AQ^#^htghXM4kkj3a6d<;
za`-b06e4y+I+Mmx;j9|DA78R@8*Bu=A&p&J2QNsy5Q#u5ye><sH=b{XtGdGyU$1Ll
zPtB%(b$5G&8b4Nwah+lw2VPHA6+Vy5f7Kov6mliCd<2&9^;cH+Yt<;Wzq{_5vRCe4
zVYm~l5UBD?{iYtN=<hN52A1=H*fh}E{f@#SwxG;(#Y~l60N;~&MiFafqrDfn4v0QU
znJWN`&`|8tFL8;8`CowQj#`gechp6{oz^cOkIyJzNw}IEZ-SYZN#f;X!lwGeOqc44
zp4Z1!qySs($Qa4ipyq7y6&c%B4U&OMT^WeBt01{7l%G!k8O~d!;-1^Z5Vk~i_v^;*
z`@t!9FAopE68fa^!EU_vj@{UsKq+ol$A7BpdSRj^KY>SF7(VBnslbZQYY}43Mycgg
z>gUcL3)0tUkH?c$PcQ0O6d6js1a&hcC$SUFX8@Pu%j%f;Af=sy%eUEwsM%ii&3+lr
zysVbR<0r+6>d{r!er0<yqaGK}v}ci7WBByX(svVOnh}R(rH+T?B}gbu)wnCV*IT!a
z>mH+Mj`72t13g7Pl17P%Slj<Tc^a9ueV8S}QK-lj+J}}~J?m;xMrUDd%*OhLKFqA=
zvH-7?<Ww9P5K-U#tG<e4b&2cUr^wdj<6UUQ+l7%*SWuk5qqZI!6MJ%E@2KJ(MIpgp
zdVdq#KocJ3?4(fSr;bf?@zgp-EDd?sz|U#F@lx2xk^j<H_ZsnPJ$;NW<@mPc)#VJG
zE{LB0rz=?9asO*99Fs!y>K_Ysf&RCXjTV3blV7<Du}Br=>SwTz!A?(s_fC(gcSSwd
zH|zY@i^QW!O--GR0+~{Ihga(=!xHw219$Mr)VaH2vp{OowW|7#B*EiA?wHa<>UoIz
z04CPQ_}Ey_*Jp#;1)o8<UTb}i;n!{k$V@G>u~tSfC0RrfTnH5=G<qTaEckjS8XIW&
z#tOO3H7@4&b!eO9oKc|R&`20_@!3a-3_vrF9E%>GjN|$hJ0lasGkMw4^VfetTW5OQ
zAHFNt_gSM2A-gO~0f!vivW}C4^QXn;x28n9(MJ!ne*Ln5pw!MO!!R70^a*NVm0dW)
zDii!fg#5p~j{l06cA0P^n`HITX@mjZeCkhBB=LVV2-=a-h<ckK<7L6yw@s6G3$;Tc
z&3x%R$cx6E*Kj_Ehe%G50ubED(rO8ZG2Of$I8V`;{C~@ad$(?C>Y1uiF)}*W{xoQu
zSsmj?2BTLVLU~1I)#J%WS5%fqKaeuk^1JWI#XQKBzn_s)(HkdHY9`kfKn(^WLKe7u
z9KM-Cp^Xyx#Vc5o;$2IdiqW~L(wyJceJrCR=CupX%VxmL53^muwb&;eQ~NqXeFFSx
zW}NDDbv%=J^Nm}`T|qa&p_4DgjUr4E7x3c)2|_7#SXfoB(X!QP<(=m>jtAEFS_7n$
z#5ln`2d{XOTV6j0p2&*AS*(FdbzvEsN~G8Y?@bhACGd?7E|%y;w~}L?eqJ}=--6i{
z^<z<WYRyVY+u&o|yQ_vT`emKXS|QxuFYj0@=`<r2%ziR>EAwI!o+5EXw$gpUQEzE!
zf7z9BqiR3PP?kfNlM<3vpWV$~ONOK|MWqJagc<Sc5}v3r)}@h%I!OaU1cDR};(Q{r
z68Qnw#{Q1AE&qsK@KZLfz&X3KWss`d_SEvJ*O0kcKL4xTRs9hRJiykwP+4FA^1_jS
zV5<fK{cq!ei3w<1eROzX;BwW^V$(_q6vZjpI=lobdIjz%`!#y}2uJozOkg8nK_Q$N
z5C2~yevxd$f`dp7`tFNFogBbIjwFZ<QUue)Cl|8>GF=c664?{A5hD`o64$(=0KvSq
zIw*kb{<ojwts4R)3~~a+zOm9q4b~hOAZghrixWH4UxPF_GN<^l>zr-<)?eLNMjjSy
zUToV7UDb&Y9F_Cvy``Lp$q@Q&Vm4jte(~BIjX~CrO(RQ8BOipKVgDuS-H*Cha<XBR
z>;b0ip?BGXLfOLzh68klLj;C{e1^jqYXfX+L*#3NVr#>2qOxHM-Z2c`QC8k@0Fig3
zj(4npceIyxJl0)=`dtjiU6j*Z9OYf4@zUUVZ}FaeCet5fk$U?nOScKd9K_w&O$^c>
zNtKzSEb=)fneWq%3V2><DpHE#RLqHIzVd<lGCx(6Xci$jWiNA&>;Flir@4yf@l;IV
zu6J=8t2RljhcwY@6`NAec2u2a0Ita&RB5CPlXb-VKe5kFo2x>EY?7u|H1Oun_ZyN{
z=mQZ1JndN|VEAk%E?0C5{o9wKS!=7ShTXO@Ds*g^ERMoI1yw!h>3ynOQ$u62k<Z*@
zo2~3Gs4g~dc9Uf<UT_s+`nuIQW>;#KWbnte9a2MeGOj4>3#%Ht!_N?g01)sw79huV
z!o)K9-3trra~d@$Hcp1Rt39Dd?Xo6ky&P1hsmkv)2w?{ic(xJt_KxZc5hT|rC2QGP
zx4?$bNFUwctm{xZo|>hn-4Jt^iir?VH^LDFLG|gu$qlq_z1yARPad+3nVSfgHmb`a
zW`t`7N{r-t(j>3rPZ)9S<T|^Z>V}Q#c=Yf(VUJ9h^{Q>r7{lm@uOKm8tjJ`1PQU*F
DyCL31

diff --git a/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2 b/addons/web/static/lib/odoo_ui_icons/fonts/odoo_ui_icons.woff2
index b0eea0184e2dab85c2db65ee0c9b670b8ead773e..4b4efceedfbe283d5643f59216f8bf1c2f9259af 100644
GIT binary patch
literal 10364
zcmV-?D1+B`Pew8T0RR9104RI_4*&oF095P%04N{;0RR9100000000000000000000
z0000SR0d!GixLP937iZO2ny^R-X9Br6aWD>0we>1Bm^J@h6x9U2@HW88&XVF2Yj~!
zAQkFvQAFh`Fe3RNJxlig_XHVZY<ukn0BV*<Qy(^0*S1~^<5E{sJCI;G8V!Yxc5x#-
zj^kjDno_TGE{v7CrG%r5lu+I?b@2Js*hMs~IXmUl@~JT@PJ55P*pC8M3_J!2Ipxt?
zeb;V9`=<&YbA-k|Npc~gHJ!Z=0G2QX;K&LgTJOhye(v?$2SNG((3De70bm49b<Rx4
zNx8wfvgM=pk|HHVJfP?w7&||q=EQ{i;rVU$9&H0g1UOI$>-ImD|672KiS{>g+lj7>
z+hn&2{#DJmDz4H+UCQDj<tlCT|ACGKxw~J#z}upTBaVV70E{?zzSj2s?!Uvdr0ckc
zY#C3PRA~&;Awwuy0%`qETe{~YMFph5Q-1hnH$Vo|k`bh!<Xc}+yQtMwPiuw{$Er*r
zg-w@H_Kp?2km&TO$3xpBxXl@<+}C76e5|d!SYG1=v)?b1BT@v-LEb^uxSg-ccr?B>
zvLG_1>3M+YX8pgj&#LO~OOowb0tkY=I`OhHUw#w1@!wng^ie=_sH+^w_U`|TWP9&E
zUj;iVlakt$Bsc=YAx~qsavK7!2&#qoeyh!B&u9~u6@-y}#XkQ)|2QtX2s?m{0G>w<
zlW+XwUGncbMG7Kw@W!?LQo@?n3RtEBX@#}_zdtS8d*7FgyBi>-Lxn1DipsNR$^do6
z)%!3HME`#|0)xPwbL_Eq_FF@malkZ;RRBT5vK`Qo7O4sWl&QmQ%9N>6rtG&%(U!UQ
zH|tG=bb#(g6oSOsJ+ZI*e?RrlRSBijtYK4J0Td@Fi1w|o0rk+|g7rQUPWjYq{*?q!
zk$Pk1)>sLGw>8`cVsHRJz{~sC#L)y;_?jSKpzSMJzswbKp+kBbqxd_nNzE4coGgUj
z`dzA4;Q5;E^W?Q=n*aRfKq60OcOltn8p%h|3p<2YSjNwA{zDJI68|#g&@n65qQmw=
z084zvl_ri4!kZBJjh1HJaprQT;as<%{{@dmXE0f84wnZ~s5Cl*$zpT3Jib6E5=$Uh
zDw8XeDz!$d(;JK?v&Cw2admU|@bvQbLCDA{D5<DvXo0A}q-Hfch1(?{Ac%+*kwxSp
z@)3oIVnivT98rm=M${te5sipuL@S~l(TV6r^dkBZgNR|oC}JEjiI_&rBIXe*H502f
z2Wyp&^_q)~x&@n6fUPRTcFn_1&Btynz+M$$zlw2CB{-~7ENUT+Y7vfWF-~d;PHQR7
z>TNi$TX9hlTvilURfg*-$4yn>wkmN~Rk*KeJX8%Hs}@gHhv#a<OEuxOn(<c4@m`zo
zQJe8uTkusK_^uuJsoSxfgFnWtBvTO2wsyeUHJtl3D)+xES4JGZ`Z4133z>%-P3mw)
za;&r_J`jge^&qUg$w^@IXPlEkwCJ21=+1cier8IBg!d+~c4<;Ce@MptQ_xzFu?!u>
z&1uhaIeNp^>8YkX?VZlx;3>8zV){_Sa>r<JChqKs>l0<dKuqJon3mBvBzEjARp`Kf
zI7Rx^57lNps;OjFle^pfZ98)+zAf(E%~|Gy9<%dQ_Ue$J96AoE9ibLWRhkL@1u#Z@
z4;vWLUsRK>j5Aw<wX}C~c}3>5I3gY_aY@6YqfnI9tLx|C+LKY@$GDbaJJ$tA3g@H;
z*CZ2)aXBSWgTg}xs;rPLEeti5S6cUv{^V4eni#~or0xx3cva)7?0laizGInkt1Gvh
zh|T}MgGgzyN0D}{-&SGQS#jEd`MqUQ{Y#v3Tqvgs>Kyi9T@2dN`oai^jtOM@G3l`8
zsBW>K1Cj<Ej;@8+D8UN(kBj$x<zLP~ueW4Xn-5xPz?`c@af?HqLP{kH_lIj^XNRt#
zJybe_cJisbv2x_zj92XU#m?)p`vzjc032SKMrU?IO2^w)E79(Q<~1%7%VqpMQqJiC
z1)$(^HFqphcfrw%-~)ODu8(9kNCR98abjmjpB_<Dpejhi0Bid;iDTtn(LTxP1;Vi%
zyS7JMrO^nVJVHWH9*DqIlXixF47VyWH_3fQua?vmko$HIZ@M(axe(tWvg~cOyy9Hr
zDhXK3n6KlGF53r@SYe)yT1@w?n1H)dkx1<Jr25i0MwVd5`<B7Npr+$mqrD)$8~CeY
ze}F-DH#5f69-`(*yA)L>{4*TAbU70w#6uwpfe{oLgA(IVW&$cqLX{~{V=B~{1`Vc<
zOdxF^pz^b}Z}Un)`Wz|r*mWAynS_4(&pP{|zjs;_8Q-Ym7-@GwILxUVwy=q9H0+>Z
z7Y%!8*hj+w8V=ELgob0Z(K#@ytgtZMv-pEja$R;O1*&m<O{bVepxCB&$|8UkJz0@3
zDMo$qiAvQRmaL~ra!Q%DosWy#B(+o9Pp*b~xoNf|d2|K%F7@y#GT2L29H9z17N%8@
zoFm+(nwQD6qH#UnDQmziTG?~Np`ge3I*Nz0e!sGGv`{hDTf2e8WcnJ#R3JJdWqc*R
zw+po{z#c1$Te~oQrqsFjfll89k+AUL3fE?uT(TsuYjSuJ=L=vqW^fH#85F$IR4z_N
z%G7szQk&n}Ghug{%B@Rx%FbBXNrQ-;%sFYi*dvFk@|MnWNM{lBolr7#Gi7d2OnECe
zZ}xl;3<i=kVNzkiVB@UFn*|)zBTxcTipqDy>z5uVITk2V37AXnY%4me7~wvW+wCAx
z7?25aGCO(Sx#QDF5)E*Hya$uJbh9E>E7Rp_Pqx6UXyp(EnGzz_Rs68q%Cg1kzy&qk
z?kTlU_vGFOZ+YjHR?>SMzc}5S&XH8nf@B&OXt&j_vzT>7N;MibR^5NjUA4XUgU1$~
z`HemVH$zzP2;7R;T)2K6W6aV~tIUGwFdX|xbTgh>Jr`)rR<-$?kp8tOWRiFF36fE8
z13Oxs|07xr=Jnw=?6qfQQfXZo&`w4;9l_?XMdaCmmH{n@UYMu)cpi_3yw_uNi@T++
zwe9L$j9(&wGMDR2T(#wfhwDorsRad^*x9v|$JxwRW~#)tX&8SMFq{x)0%biAU^#=T
zA{j@lk^@xrK!6qor(5}t1L$$I83NV45MYe~q4uEw!8${rz83;)FraEI4hPK6J!tBI
z0Gk<9Ey*}$tsJ1O2LfzoP&;J8KI<@FptBbO>@uM41`gO`2=w+sfPDtMuAjdG>Yb;F
zh`Wq#p#hYs!3H-yl#8L;1WbnEFf>NO5Jt10!4bzo4IB?O;u9B?!z4mPahn|r+rtoc
zWI>Y`-X3b=RH%v0P!p$ZfSE9aona_<L1znhhg!HN)WW@?7S7rLb72VcVK}<LUkzB)
z29_DIt29db__oyK*yQSJId7TOwoFaK$0zD@<N^qEo6dwi6VP?Sd7cmr1CV%uunnmL
zkUs)I48#UUgOGIb5W*&figb^LCPO4Vi{=&0N_5tVmLP-fD?ObG)S15~Snx{eu^7TX
z=-W53jgKrOYx&W|skR5hd>;F8u7W1_=URKPj2|S5`LX0*!)kU4$8&m$TKvzE`1x+h
z#`fGoxL4b3$7h2v8L#!xFq`BkA98Qh2XD94Z4DhUTiHi0<JDw8Mp*Fnc#a8wVREQk
zUR5U_%<174o@;#8D&bfA!um7-+~4B3nc2XDZfg$q+u6-q`}RY+i-Hb>1^^}8F4x1=
zR|&8J6!M&zAYhmZmMS`0+hHZ<qH-{jKySDGYd_PF-yaBJ<mDi4bP~Fo?*u7Wy{D5_
z6P6R!Q`nC20A_fV;wA^f>50|JTCCN80D}s8jfP2JpMZoWNQG8M{F+slwX7>y9e2*F
z?f6O<UTQ{{3rChC-NgXNd{^Rubj0DV*b&iOG9!Y$Y~^{8ySNTtQBpCkVAg%Q%0jZI
zx){m|ZesFTbNM)qy_36asv><A$Hay%ii`ka8Oe(!c2gUWRG=kAS}0%Ew!olJS5BVQ
z?OoeSC*4M0ZIj5$tsR6+T#_3=9*nP)rsmcZvX`yP9j?8DF32CwM4B*&ea(FnwW_4%
zBd&xQSGV3*La(BrJtKGbPs04$8i=1$0}ch<ZD(uXc#!1#9L~<;nx(A`;%igachg?R
zV{Y2RuI!C6s}*B^wD<9U7vDG9=d-^nS;@W1J30HFs4qH}3`tuM=GFZ-|B5vL)f+@4
zo9T6whs{~oZ|Al!ON<IvD^XiBWQGHXrxcog(R+#C_K!6hK@&xs{`Gu0Lrq$(8vP3W
zIv$Vj7i8&{r}5K)Be?sY@PeB{aTH4%+KezAa*UgQcdLP+`qNTH>#8ZI1HW&};&p;)
zrWlZuK?)jFmO0xdpP}q44h0isKTRIP)MZZieyTKOi+8<j6}@jsC)W4;*VyMhdpx=`
z{#-Ks4bCdwV*j%IjY8V>5C#gu+l(iZC;#(HeuMUvl@Dn@cy+pW1&<{scZHWCJ_;Ca
z2-FfENbF;ceHh`orzWgRLk!<?9B5)b{Qqjnd%vc1<KRF19zgEB+?UNP^RUKZPHh%c
zm->n>k^jK2$1Y^TpDh)JF-QK8MuKh%dde9Tj$-^-fUkIug?kHkfv7RTJO06pgXcgK
z4sQOxy-f72Qy^Y+hi^h5#=hadQhBjo1}#?qF8-eSJ!mQ~xeSde^Ezi${xly`_~0xT
z^9*Ri?j--2<Nn!0HN075XZ>&KgwG$?rf-$LQQ7cq=zZqsDbQ=kr<Dg^hd;dPjP*ax
z&8A&N+q8*uXf&w97s3=uLE;&d2UXB;_P|hN0-i!Q0wJp!mv+}y5<ZRbW|40vT2)rz
zN?_pI#*iMAG?sWLPk&3pXK8x6NS9j!ryc{G!9T&g_tXro5GtW9$@8IwDmK>T;lI6E
z&v{w_0>QS5b#yu#M&yAcf)>IRi-SZ!BorT>*J1HuJq5ZmVBg#2!cxq#9_nP)qX3((
z2jebyPso0y0oX#<6@Ph@eI%B+=mia<Cb=9Mc$}uZEn1^k(E!kH=!Yx*x>?oa?F%}z
z4R2)~v{)4Bea4GR#wE6K*zU^FK<%9t%078<X{-Xhhq{>8jvE!_{9lBt!g`6OnWh{@
zmV3c!EXig@42gL5!uKg@KsKtVL%teEMttuay9X`vkY^up{KIP^aY+`)%dI%;reM-e
zqKi6<)BQ7>oSr|&My25sS6BZ0)KrDz<QXfsC=IQaRB31Wh>9qE<`R;%Ei`a~vNEND
z-OAg9VsGbtZA}KLHEas!Q;|8p98*;KN(+t+Uk%&RxEK>V!34NYU)vy%KW?<WiCg=5
z#WQ$-e|XOVtf!*Hxf!fkA@Z|cGM{Gs3)8FKX&HNZvM>To*jh4d<M{K~N@^EWrNBM*
zGa;5~p08eDEB_WBwM?EvwNaq4t#bDl#LXZ7H2i}}`#%6em<-~k!LSXKjR-L4ZptnF
z#Cww(^6iDIg*1iaYCNt^Xn5|0fIy;h)%^u&#}t$XemsjMLR~r~?wl58Hp*|r**eV8
zl>J(`kg5IbW$1P37via~bF-aY!DAz?1DUOX-C*uR$G`cz$A!NO>*>*9lj5J<7Kg*G
z^8-NfbgarwC$<M}@*9o-QgImPi4Yq2g-w)(b(d4^K*l#8wQgsQqfrj$xgbdqU3fBN
zwF5W&F#rw!wG-`C=lqxXzgOF(?+bsetlq40zIrmnB`0yAt<LrM`L96}#*B{K5`$Kr
zN~KOX@657o^2L)cZXe629uy5zw}$zAn1(8?>M)Owo}~|BDC%=gZTLvv)FO$JICU}X
z(7m{!7HP0fPI^(EW4SxkpdPT3`4pj7=JSDXk83}>YA}!|-AKt$rz;3HfaBXkr`$I$
zHSLBN`T`O+jiH0IuI?YLS!Ib4SSYpbNoK_HqtU;&qX*ia>USAIEd^uZDUl<e^|a;D
zQ@Dp`mUEA!-xIkrbh@aSe>j@z!Es;mkI4jy_;4RV(nayB_7U?oK&P>h$S7^%+DgH?
ztQSH1W`Lfl84@rfGNiAMcA+wwi8f5i5V!{&yq263CvsYNj$4|5Hp=O|_gkdyz=l=N
z(`09Bc>1%NJZ+Tk`79aCTU_U@W{OG8oYx5EQgNu4OS22DsR~7^)vn3YHYHq~@(Igz
zw-z&o;tcgfc5l`Yca&Risxf5uWOarR!9(i$(h`eBA}!zgR#sDFYa}LbG?_V&(aRkU
z9ld8ywSlM0$<gr)t9%0`N_lF9gn65%Wl@tz6x}q+HvfEs^LbG6$WKurOnW&Vnpzbt
z%YTldE`7>>W?$RUsK0lc-C<R~u>aiOaBXHtS_-{n5}Bx`oV)k5R9l|apozTnX%Q}p
zh<h8WE6f=@sFXOm2*wBLH2cMYJ>^E9ta-}q#l2%b+$Vt8{Pkg7ym?3BEN}ePw-Z0g
zolX8R`JBh;F|Ca?zvcS*#>Nd7wt2_qYuFSr^;*1|>apAHYnapH%qgiz>XVK|!dIMO
zw}-s~w?%dpb}VH+oAyx1voqaCMeqg7$>BLo+Fs4@XJI2+K{tOG_FKHCvd)sHVy{1>
zeE59f`G=JcU9Y~Wl_gLK+(i&B%SRw1kobRam<-_F@hAkrFa(Jjw*-V9JbCDmL5V)*
z<4SZo#gCq}sw>?^{iT48Kx=89U7E5lLa!5ciaGL%!@&l9aSGm;Us4^|$$_w;1#%#K
zm{k*=@u(>L^7iA+t*~G@E`ntHZ}A8Ja^HRb!4OiMKuz*^J$A3xyY9yAxM~1Pdvw<~
zKD~M@_IlxLl8q;kNw|;{;wXtK)PPJq-~RKcykO<ogL3-lj+q_+yB%UKCTVJTFBNLD
z&NhFmqbaHFB9Sd4CR-!DY2;3K(@PES2Gn7)54o(%|D=E&{A%zv*|*mW!)uCw5*=>l
zJFs<oTvTm+R6K#0X2{<loB+??Z^a20{5u1N0_}99Ya_S?XErwqB2W!KJfl|U?v4wT
zg3;)R$KQNm^9EbwPnTPhH$Uh36`pS`+8j+*mL^AQ*=VMfGCJ+uLb;i|mwFi5L{y%c
znKT*Q?aWEbL}eNJo5r-&G~-SEM*07+X^QUS(I=8K(TwElOqFS9fARdawj)(y`ycj%
z(eTlSs?@{u;RMmenVIw<&CHgxoiDpam~x>6RM>MW;0tXOTTYU!hSLt-qc*xjf&+ec
z4#O$z8nckC$g#|`$|+n9(^~J+X6v#oF~3q$;9ROLKHpsOKb(kV##2Dmqi9Mx!;WSO
z;Vm948Zo>8{<0klzDMwhN?(dfjCtxOpUhKBjHReb|A_^=sd&JY?7uy5&m>o7y{QWL
ztM(t@zIT!~{9jL}jjIR}RlXl<uv4g1iaplwzNk_WWaIX9{zn@=`Q89m<^NY5aMQ|_
zO$O`<*q&^9KyeeZFsKJ#4)xt_efUK0c|+K%TvIXFTHPdp5a#<G&)u&+-`;b89XmkK
zX5g%!=>p4i_LVp3?|*)}>Gc1pF==y8G}8gf^u`ozEsDvGu8*6y$Nn)u5wfl{js0k?
zf4lA>a2G)M2yNA~2K;6NZ|yw5{(;;1K?m|{8JEz|@wDyPx7IGhUvI$W(?Qly;lXW6
z<?Pt-Oib>9>6K~b409R_a6UnAd1BgHT~Tdx70(;R(U%UPCdrJmbKd{5oPo7JkVw)e
z+a+s}HPnfsB#x7$*N0*FxOW^!_c?3|Z%KTBjt)c9ajgji;Sy*O=6!w2E_QQ;5Elq=
zVa4m3JZ+Tk`E^n#LVPauO&U-`*WhH;#9;h|T&2I2(px8~7Ky4QbsuZ;v{9b?m~7ok
zvHB}>bJqiZQNr{F#*^e`e;f|9mP1sP3hMG3uRTxotS#oM7?CNm<zhyWHNNh%$J!F4
z^(r?bg}<&+NZ$+MCQ;J8Mm{##9Ze<33za0cW)`QAvqLx4clUfzzK9@Wvfw4X2g***
z2PE0Oq%2mUyLk$qkd{(}i;_AkZ@uO6EsW?j()=V`r?G-mswcIU@7)jG2XvY+C}R6A
z8ii9!A?o{U>w)16nATn#82C)j#eK;Q&hrk(!zmBnoaZ@5IS%$YPCKV`z=a@<&c+e}
zCJ>s;*Ka6Vf{cwtp}=g~i4b{dh7`IYhYHrROyvU{K^ntc&Axf1_)?0K-iNV)3CSpj
z<9#?BQKUc$@VATrYnYsqbXtlcjB*z?`{U)N$e;@yy0Mo3WrR}7x!W_PQVAFj3!!>^
z(p}uJJ#P0r=ZhG}E<81@e16*deOEZ!yQhdv{&#lsoy~2r^5XaZ@I-zZxh=l)#Z;<?
z=;XEY4<F{Y^E$nZK53(z&g~NM7lyvUgGYL#6XR$BMf|NjxOHLS?al9{HJEX>f>J;m
zpOE&91k=w*bK{AJ(vhZ;Piv1E`gXl5ce)+56i-d6NYdX%2heh7rZ~MTLzLN-UYTK*
zs7lu{TGfm$#z|He>$nL#%P1++;Bs2xwJkQB<aulZho?>cF&Qtsu`dyK-PrBOCyQ7b
zchN1XP!@0eRU3Kl(T{u5tI`ka4l|4$Vpm>Nb!bHrPU36J@qL+M+hDV`ap2V*Z7CQ*
z+@*X_KZYQbcRfhHF_vPvie@ktMinDU<%nW50tjfMJQ+dmu?0qRcFDFs6?svZ@bhr$
z4`siddmwvHPQsqOT8`?$c@;<77d5Mze=yboTJ3J5Q?GX()3m0Jkwa70ZN<cUoQk*@
zc|?NP`waTPo3pLOeL|lAaeADwF6uLuwCtI1#}3B2>Dsh2X?@9}Z?E}2cwzlA=0>%+
z9B+sumFhtdpNn+)#Me)^|6AF#K_?KE`9zFxBl7x7D_oD<5auIKC;c&nPW^%Ij}b|X
zh!or~`S*T#|L<~d-<ob-nqLZV-S~W2oZ~(_A1UUCM+X0YP}vgKfajWdLPMU3UI)Wm
zR|A4x3y`4RkG+AB;bQ)L<g*o&?X$Jqqnm%WI04}7)<gAd{v3n~^}$_iQc1KfHCxaP
zy>ht)1KqA3J(CW#QlHL(Yz`DO5jCift<!eu>kn<v<_$nslyhF(p0$fgn10gZ9Y#&c
z(q#$9b7%|rT|nUYHZOyKv;&LGLcn?0GU)^G;H%e=?Yn>;m!|cfroH-<e&&lN35>8V
z;A2xq4k?(rZ@buy$|Z95%(c%C%xt#S(t0(~*do>WL_B?hXsBb37G}dx6d1Ge>qFH?
zE<<)-&+DVl{dU>bWtjU+W8bw+QAes0=bukmijp`A1K(A_KH*WmJqXKAR7}j}rUj*o
z7ma{hcvm36S%Jg}5JxS$17%Q=Ry{{j!0wlOiayi{?oT93Vap~XMNVDEoT8~~Z2D;#
z%W!(!kt1(6?3ms6cYac)-OE?}?dkuW@0>TWT@BrsH)AiFtFnx#6(#1>V>$P;D8RaK
zAqC-tFVSpzo@Hqo00K)t%_5{CN$iD@z_;9pV{2x_(1Cg^3XCcd+kdjkvWIzwd0#p8
zI*i+6!lK%8s#uad=-mXFQ4t*`*$lHz12bEH)Uz!Zwv@&|(x*B}1%ayrVNKJ*irJ4O
z4;NG*Dn^dcOG|D6!9+Vt1nAli3O5h5@L9P;%kv$(by~^rFs(H;NLO&Kc=$>n)@JS%
z$WKt<#U4gU{N^k%tlsKm3xbn7+!*%^5G%qTE9DeBo!ha=eg?j3*JQT=CC(C3CxNJA
z-5LWyAMZpIN@k{^ns7rSL7NDV__o$tAiI8yM9D7{g|^1)!=1!2h3Ut9&<D)NwU68)
zw`SfJR<%|ysFZIN1kGVEQB$h3C%)oIBh_>q^idK9stPwAI5qu~H-dw4P2kD}H(Ytj
zW~Eiu+fwk}vT7^ib^RzbUs*$2*)gm?it*!rmGd|5oPTv=haOP4f3ozk5tADyi;5xY
z&{ZPQ8QwV*(TI*!N}I7-IiXuQdLGO5AOu0dh)K=G=;*+~o+D@#fFA?e7UcBNPBI0A
zjOs8z?Rdj68_g-a@mOqoYsu0zPRL19m+MfgD1eiF->qNMhjmITiz!BzZFr8)szg2R
zO+)PbHY#FEOvIz)LK6Z)*bju#hd-jeh6CZ~5VHwT-%c>vF-a&qSXbxvJ<FtGL@N-&
zL+LM^f11tEA4#Z*DhNbc<u!!30mNr}yYDaLLcE+Jt{mr(Gkr3;oZ^>+3m1U@H{l+$
zCs3y`uz2g$s3w?-618+YjTWNIqSFi+{ft@0Wbr10js6}{AmR!Yw<yeI9gavI9f@30
z?&w;}j4t(rDfOs8?2y8YYQiwj+`1kt1P?$pB?NwI6cg{G=%1fcd9FSo5lC?cpujT}
zwWyvA3e1b0;W_&?-17~}^JgDytxdMB>aODTtS#`i9QDagr2CQ{>ztDUf-d-(BU0BK
zi6@A7Wb(6(X{^d50+Kw&c1kskr>j}K1++9g;2j~wj0l}jg=yj1ZbB<Yj^PZi6ZWSp
zO%p!4iF<OxikQ2;?2{hmXAbPzy#ZVPGbX>?TORAucO=7K*muE8e_vhR?ZkgRm92%-
zv-><)Y5amTG#x|TUoL|?8=3(!u9(}3!&e0nxQj?h${$g>gN*cPB~MRvM6AJ|jt{8+
z?G36B0#TpnL`M}haMH8b)Tjl}h}JbHkaL=ms7{to9ZiqDdZ+@Azfoo|v5mT2xE5Qx
zIH~-N4S)Tg&8B%aRk8C-TN<^>X+(|>HmkLHyB}<Avvq*4#Bh+MY}+!k{iDaOB?}?C
zgEp*cT2D`)nvdU?^JHbwd9=*t4xUy<c%5fGH`fQ$x32BN=T1iB$-fy*a?-g4o;ruj
zX*y}=d+oT`T@6R$uzVBPP6R*8GK{V-b%E#Oe(PFv!58VTFm+IwwrnepG#&tH8dBsZ
zgOuRjj)h7k<+2=#QqcvA?G|7TJ0p;Cq;3|8)O?&N-ay39cEx$ui-0P}MztYft(*E1
zYrcTar}!C#CA%FIE9P}fc@U11cUsDE^lW%cM=)9UB}zrPELd&T+QMr8hb<G4x@>NQ
zGIe%MEfWjePI)G%rr%Ez3NJ1yHOx6<k5Z8*Df!aDh-#rZNYM<0ZU3>X+}Ti^O_^f(
z)~90L>bLM_eit!}LyQY&GmM)Hp3VQS3cD;8Q0cKw52y}9n?3Q|osjU_;nPZ9!Oqu$
zMy>jSPExy|@&`0!@DE$8TW8v13N^r%CEP<^HmNEeJlEMC0_Z8CX7W^S4>am0P?@M_
ziiDam6jRo>f&LE>m;vIX5{P5DOySX*<9jYuLU9$%JAI@Rp_3$V3VhCs2?q|vTL%(m
z0iY8UItD&ebY36pMDGs@<}<LtGl{ZHg~iIk2G|6`ADu@0Y;#@ut}IZpZltNwX1GCY
zTwiF`TK=1#9E_gCd4}aiFUd_im}gtVRh!!B(Du=?b~zz;Rm8sAiezhuAYIAiIM}rs
z_ke5)&IvG{M2tQ>+>?12U-~ft4vSE8`Kb^X{HHBILAigz>BDI~jwZz@6ZVTzMUL_V
zN#ssA=vh)3J~eraI;0_Dy5b}P$J-!RdVytN`}pm2*l(WmvLmx{nT5{53E07i&#eQ_
zL{AGd)P?bbjnrInu$U1jElP*>OEC8Ywx^?_v(u#CX>S`dMr#;*IU1i^;QSV(gu6Nl
zI^|s@nWfniKg%6hvQI0Q%j$4{-Yf4&7c`LbGafG%)aHk3G)4))lQq||OkI-)exJ_f
zI;?(4?*FPODeX@vG5_kz)YOHL<JT0*gLr=c*LI}xgbt75%LO~8jC4jJN{%xeR^85?
z?dr&;+B#-43WnM<K{Z!Kr2@+Is&1{Ns<NWI49CnStwv!`8d6$;Ynd994L_y#$spP$
z_&~Ckhy@RXHD@1HAg!V{ns2*%`qm3&KkPQDZKypUpJB5$ae|zX=Kvu8-%yDZg5gT8
z;o)IHuYsI=L5)73dFvMdX!+fN43+LFJ{cXdEjFJ2O5xlf0-<g06+3S44?abqHM+DH
z7;F;>n{2>OE|>Q|-_S}h?Y>&Rjc7WNC)2-7Gy?jzL>WKtXsuW_*x5>FCQ}vuVbgFJ
zw=-l;kJ?7N5;XAmaR|IKq`6|D60hR>Uv%FubfnzM)0cmt*Vrg5h->RQ@sTpBpdo3c
zQEg(->$D1)v*$m>S#fTvGLJ*gH79F?P+wvwcWzx9@=C2AFlaE+rrfaqG%JBZD;U;G
zt3z$y+6?13+=YyJWL^SG^kRNSqqb5z4)ZwUjQMXadCZ?zay1KYSdgfApf0Ps<pY{>
zsc&wwH#XGQ)z(zotYx^~VzB76DkZXezuC181nYmR`3GHlNL40SH<Q#DuIQNaDXbJ$
z)-Q36Ld!2~EX`x%AEZE_u#hbn!+3$vu^Ng<r0{tagywY;C&(@V1Jm_0iHQtih`}gj
ziO#=~L&Vo+)kM^u$m+yhSOBl<L&VM9ru=7dqO^Kt(q1+QFyah@!gNNsUx0v9+|6y*
zA5W*4p8z~hnKtR9oK`CGtsBkRjdhkV<$yfS=Xv6rd7Rz+Y#FDta)WZO7ri*%lz|%t
z+P5AmZwx8@jTJ((0|3A3|NZq1iA~>Tof7wLr@~MGW)sQC16?)1H(z!XCbZz3^3gUo
z`>*lmg~oUOww*TS`?nbGMy~e+bb|l@U?`>^>;s&gKu{=V`Fyit!D>f^AjDAv6M57U
zgbp=qiFyRk67>n9FB*l%wqT4<?uQlK>NmUw&jzEA7)gy%2$tI<wG=i;8id=TbRuL*
zG9Y|7>W>93y;cAj=9%*UfU2;%!rx5jfH*eitL6fI{z+#XYN~eg{G`Z<u1SbD-I?1z
zx5Jj*o&I3lhvq1ZtA!38rS##t#CA5$n~m9A*qqtl;=)Rfy5NXFNWx}Tu3(SujeJSc
zZVqF)f#^iWl8_B8iWCl&0_2=Z{~)u1^r%esyuooYrP4J-<Y`<IAgUcxUicC+D7=vg
z3%4wG=-?l3=9+ZBbFl}8dn@jAX4lq2rrg!b3wn}|1rpj{5zQC;OxSjn1~EEZMnpO#
zZEQFa?>y?$ox4qtDJnc2F%OKBDB=l3ltiXb8DKPqj2J^j)pWzOY{&KdAdKP!;WW#O
zvZ|Z5>xXfgmvy^bZ}-RZ_5KjFKufejYqUXIv_pGzK*vJ!67L@<(Yb6&?<_&Kq+2bE
zpAzN!5kk8(lm?lSDyx-L`9M{bW=2%0B~>PvbVZ|-uB5LKP4=Lr0$8q8X=d4?RMdsC
z)l2k-{g)Gbt3^>+@-AKD&W5;K#i!y`L6&aKp@@5gjjAzUYkpeU8bX626uxY<xdtj;
zgS$M@V!Q0OI6WUn=c**J%;OqbHWXi41eXHz$y!Ydol+gGR1$cpSxap4P^m$u^D&Z@
zfcOA)QD?HQluC9Q3f6>btQ)hbI?NX*sLZYxt7a;tmRpCglJzmWR{q>oysD;BEdiCO
zt2!6tZ71|J&odyYoRkTbg*(>9OE$w5MeEiajtB@Fy}HMpTh3DbZYMu0ZMXO&M#~x-
z>iCKdO?A7>d`G>i;c_boL|a4kGcaAMi)krf%FLBlHJKMT@wz!RuOaZbNw8eEqTW*F
z-I=JtUBeBPHNT&xmn4J=A|Q-<y0M*2Pd{o10GK@kZV$E<2=`Yn!v~Sai4_p)nhZgG
z)#z(K3m_IJw~Ph!SJL2YnQa-JwRJ-)%Nlxy1)^1;Umd%W84o<iasttj7qnCk<c0bx
aAQ?OZH+L`7_N`E^)sNF#89=E70001?+XC$X

literal 9888
zcmV;RCSTciPew8T0RR9104AUS4*&oF08q>T047HO0RR9100000000000000000000
z0000SR0d!GigpMN37iZO2nysp*AokY5C8!-0we>190VW*h6x9Ta}0qT8;nRL?AVKd
z?tt?wqTbfbMpUqI5VT>25tXFDWdHv?xgkTa1v+c1euxFb3DrcQ>$<3rB;10rsGZxG
zM>dzHTu6w0hsk2GL`FUt&oL!>G2vm$j_Pr^%7IAH#Hzqp9c&5W%nQwp?7=U$4!xpJ
z!In%Ci)33KyL(5!Gw$Gj-Vu__wh+*myZ@=<G6p_GykuG+B&eiBN`C%7I(_dG7-R^N
z0xToT1Oavc<p9C>3pmU@o$Ufm8M{n>E)9DLsxjS%iA*eae05c)3VmFn%A^&bFj4wt
zQQrV<^Z$a-1`M<*gL<5a!P}jccM}9{OtwC&9<kQ#fve&c(J$^*>O%Kg7C(}El^*KK
zX5{t3jAVQ7l2lx$OiC)+<X@7Hz;MXZ*sa|@0apao0>StD{q8=O1|AQ1vXGfy3;w4q
z-E)$n0#e{9KfJRWAOq^i2>L<Ex4xowQLC$-)@-Keq=eFnIG>!NUnc%M(VHE}?XZkM
zjIliUMYA@mf9Jn-_skrU><0i}0U|r9IILvJ?=GqQ7yfi<L3fx=A>y=<5L1ZNm0kKi
zJO9B``A5AT^!R%LMmV!_hL=SPV{o%npg!1$PkZ+Yox|o;6(AG!T5|hKZhtkA$Xr5R
z1RSnu+l5exGk(T~p26p{S(a9n24rG6Lz$x4Ae;5u&_G%6Ro&|CsuFd##;+v}-~zT}
z>h%~#J6gub0GMf6%X*RtXB`1y<fHIH!1TfkFS;~7XBVX5@el5rx3~Q~FitR#5<6wQ
zf`9_}{{K>)JO90{s;iJv3TP~6LF177{S@CZB<E-tTht(;9rLr(m{x;IIJdgh7B6cd
zk!A}Rk@%&;^*=}gkY^RfY;G53VZ7YCIzcNA00?k<*>HKby9o{I!{GqcBviP&tQ*ON
zhqx#S@D`sY4!D!(hVcbaUC+nK65jv9r$R@dRAs&+R|JAlFeR7}>j;*POZ8UhR}`Tm
zSi-*H{0C^N#^Tz<-kINRyiGTy?X{-}1PCmS*lfEhAJGl!jl=QbeD2GIb8FB);L*?$
z=;#?3RjF2^R-Jkc8Z~LwqE(xA9XfRpb?ecqPrm_!h721qN@8MWVP#|I;N;@w;pO8O
z5EK#?A&ZKMOGrvV=m5;3m6&;#Ai@ZY$Vf1fj1(iy$S|^u93#&tFp7*4qs*u<s*D<=
z&S)^2j25GZ(aY##^fLw+gNz}@Fb!a&gBa}y#wuaFCQQ_f$yzW~E2eA1OzoJh19Np^
zzAm)u#zH;l)QiRXuv9;m8^B6~SZxSv4P(6#Y*a?KQEWDbt;Vt41a_LlZd2H68vD)Q
zpjjMt97mnTaW`?&Eu2=tS$A>XJzVq&mklZc|7ARnWfF)v-&bJm8sl`0diTroZl6Oh
zVT?5QOylt;iiR?hV`D9`NaE6KA@SfU5-8SjMFwKUR%C(Z%x>H-T$eKug3D&3>+(sL
zG~7Q0^@$9-v7x&@ZB3`c;CL{8YD@ClZnJax6gf{^JL`HKor5vyPqbat4mHB%vB3s<
zhJMl*t$d~i4fsyb<zMZ&F0w!BQ;WA`U3Y)`i>^t<$(p?03%S##H=W{rQDo2)8=li>
z0WD^gRxI-F!5Hb&n28|5L5k&4NST|sQ$gj94H>7NBQottp4r3JG?eWYcAmxSK}NN^
zx%RT9+C-&<s_;as<SNB!MIPvboW}-K^8~g#IYyQ-)?V+c6;(qGMq*M9BZms!)tKR(
zzqw=sd+3Mu<e3vm{4aMRTPK}d-tl4E#9j5GRzdmBGhzNE1|OTNs0OtxTQE~hG+u3T
z0>af2X+~qpH>ENRD{28jy+)3%oorEoCHuB&wG(>&wgj}=C5iXl2P-v1S1d&_J%J2`
z)Vk?BY^J88hGw8`v`q$9_@q2oF0D6Xz4jNzaID4S2b5t0V&t8vbk-Jx-P-onh}934
z`>K$cPT~Kao{H5#6OgUq>d}#i%UR`6pwqM(VAUXL15yFkoG9t2ab!T!2skBDu@-Cl
zKD(cuzM^3)rw3BkzvI{TLd#eT)SbE>8MWO5b8>~0<~YWDE1+?g`&T;nDO&=vzI}xc
zU5aj>O^=}2GYqZVG4hzHBPL?By9vsk!xu=TGLwlaW%_oSL7ns{B;l4+Z%3>FMaFFH
zdrrxr&n`K(L~J;OtM#3Z)D(9M=UneeeR)dD%S`aIa{r}Le<Ly)%8E^a5ou-&X<;mB
zWgKZ^JZWbt(!tcElW9m7({_$R#@<7%Yx}<Jtw|pj3SM(d70s&+zpYKprwxA(nuvnE
z=wm;nU4$GI^^JB@k@irdz0_zQHQG;&4p5_m)aVd3I!uj@Q0p@Tv(ic|`GM;dT`5&}
zIuUTj)iq_sXa<_Y^q|-P3~?rVB~HqsUV5!GJtubkQ*Z93in48rwqfRVv+qA?4`Ys@
zDZReW349m2!-WDYps)kV5M%hV9is6Z0FaoM$?Vk4em*E}U=~BsT@n{~P4J+8IO`Y5
z+YA$`k*j_mG9!(zQ4d+td!bBNNsq&%CPnyTqjCMowNF(y?|q>8eh`gp`eHfPS`#-{
zDa#g?C+Ri;v&jo*5O7eVX`m`OOcZiMpZMh)f9C9t88<24*;A)wCksUC#dc*7#C$nd
zWzclGK`O&BG(w)S5s|`*hRLAiW{RJQf=*ACL7X(06*w?f@EU^^1_V-okg5z5ar?YS
zdV*QH%mH)3x~LW%!e*RS432|9rH#+PmD$P9%^`<EojCwbQN*b!taU^mWgJGC^)+V2
z8Y7etDb7_|>YI61wk`Su4y)+VGbNL}CnAr0<c&Mb(DNPN8q=GSkz_rBFqPNnx6Q74
z%xayjx=}VpkDhneY%e%=TFKaVIu81Snl}LkB8d}Mua!(so1xXin$~WTbkL}pu{`Q-
zWF7Tx^LtaS51^Jw(uFBxVZt4l-SYe&F;rmQAFji0Ju8#Os!E$x5lOle{&GY_W`n8C
z3dD_Te{`Sh0a(MFzx{xVdvmwexQ9b>pS)B76<2!LrqJH{yvF{aajRFXG5EB%jnr*i
zlIF?DG>;~vAArk&Nt32J0@J45Og&egodL~t1m;cS1?fkCGfuIP7JC9qg?7t04qkEc
zs>y4n-8wriyfO2&*%8<>?UZ`1U77)HcLa7!`(2SZ_ul+g`#ph!Li<B70~{67aZli+
z(DziTAUJvZv%-~fj&q{Bivgc|#5R{7k5sR#q;j34n>Xr#AVUGe!C@pLU!#Cvj4dlQ
zo}eb)fTVaS#2R7?u`huf32I$}+x1Y#hKP+3n<6$Zfwm;5$pm@czA4pJ|4psuGAH^f
z3rc&glZvCo_4WD6%RXI~VHq*JQg1|!0z$E<C))o?@YN<hLGA%ctD-u>8q`+`P%x&!
z(I6;X97fn=p&}hpqb5Sc9Y-;zrq>!z@m3?_^in;Q7{XB+C*LUDC|&eBeeO|j{k0R-
zmam^qZkLPYsNBQZLX-Q0v0ZM57v!;v+x=nAI>+t4@paVVpDi6v;i#^CdvIzuRb8$7
z`$ctslv=MB^Vs^s&X;=VdR?v7(4aHp@S;imqt(h(oQ27kn{aiEHrC%aR>;=<&BhD>
zy**>EW;b!S-JXY|_1xC&Z3iIQCgeRd0HD#YVs#mHnSlx*R2z+vL0}??(m|}hbZDF@
zif&Jwym@x>R<@$NKNw7Qt^~4^Q_x>|Cs2{KS2}SmekFb*neLnLC&$+u+1a5mr=iJ4
zIpy^Ts8K<xG|Wh&42*_Q&el32SFJuTRavOwu(ds|=jWS8kE*%3Oe$P9ZS;Ujwx<Mu
z4oSv&D<m5pnIW-uj%Ng!9W2RoA{924XqXr3S{p(<&do=%m)0r#JTCk}M4q@;Y*EG6
z;s~t$l1wOor4<uhu%}v&lm??XFsReKbQv{mj#nE~x%##4-Ca)YPS^G*4p(+{+PBzW
z-dPVMLFg53d{-lgU*>Zy4&2}~_B&#XYH~Dch+j%CYh@&+ON~O8XWZ3jmI-;si0$<?
zn0;FV{+#N6xY1pA)duc#!(`V;)3dbVcw>!aY+`&n8i{4VX51}9U!>Ws2>ZRgkNZ34
zc7K~m{$25voX3KVS@&gqNm@1(ZBblM5A6LbRuAZrZosOV*+5CNH3vuQ`E4wUg3Om1
zOJ{pz#NYm@HYcYSy_SWse|WzSRfPTVeUF#Z)x@>R!LQJ-gTdeqvg6B7<EH~gar-~+
z1=lu57A{kp+N?MeeB3zu?sh##k4`EbtjeaC4E(SzN8=2WOwc7Eh6oI3oT8U1pK-M2
zJ!(vhews9nxy_jL`D8F<jkjLr+3$1h(DYvT8uPqIuX|7WpGWq56I+46>0c`BNu*qd
z5s1L&jEBP~{|n2$L)QG#htwZDyWF~i#*>oTf=A&W`H$2GD2W3Ua<D-T3{ctAll)PS
znr{jZR58<h`ex03KO=P$ApP*WKN&go%Vx6eD=C}N>lv51x!`k>Kk(}@iy81|UW8%5
z9DYc30M#^|2G^oyYYyI7_=?x1FjBY;K$Qu+<JXum@EkCQfh+HC=a|2>Y4Ali_$EXg
zr1k%CWygFO)L8Yq=zGfdU^YB*?p3PfZN@8pnvW#jJIA7)0sjg8Bvgyb{#ji<!7Q{g
z|2KBQI|tTj+a>Q*)PEcDz;N&sNR`90s=cqn9$CC~>5ubssn`5Ad7Wm+8qoVMgtj@h
zA$$fUjVfw5zS~Q;vZv6c#=b@QoI6}v9pKX#pO(Yh3A~mUtOf+UZ4B#yiG$4avEcNr
z6MWXmNpGRswce;70Zq~0sXTgQyBB_>(P)wjVNiEfd~W{FD(*&)3m{<F)EyHf8=`<y
zU`1e1SUBGaLNKn$bb+yrtBq(dtpP{DTxXhMi1v`Da904bbRCM@p!p&Fl>%V1-B<m@
zk?xd8;<Sfd7?lH&r2`I|^lV~nRC_f5er^9@-cL0Ps+9eW4t2x5tb)OLZ0-nU7F!qJ
zM2&84DSFD(8`SpH*|~KZ%zR2VxAsa!3Hhr?k-1cn9i}Os0w-rdA1pzOfRoUCe&ZV|
z8c?OmI+Q$c5b%*X^!J?Mep>s`n;xu8+F#x&I$YU><8~T`^%OcQ<4&}DqLWjzr&uYs
za^%Y*Jw3KX<|WzIiEZWvvo2K1+iRd^klc_}fBDRSgro|aYuLta7jnn8m`zJ(V~ARa
z&3qbRyrsns2YFf;l+MEE6PH`xp%5kt1Ff=KTLMnwOKh&w#%|K_H14AB?zz89Im>Bg
zib|1)%$#Qn&oljn`Bks91Izw+Y7VGE*OOo!E2RCaDcw+(Joo8mVhm|+$}&X_f6JxD
z;R`4?5)`&i-iWp2g~KWCYr$fMq_I~Gue*OCZ-(xx?dlF1A9WebXbtEAfBI1RH<>&k
z{+;Sb$A(VHf97dcyt!vpO^V@@`S^m(M|y|m6NL!(J4uLWKwj8FQM2KEdM^;HKB!&K
z)|1tqW+h|A0iUI8*%?QC$HxHD^s~eInr-3B<cC-7%ipIyxYD*a+R&Im$uZ6$Hn-8b
zoM`(R%%SAuEa@g_>8aG+1!uk4VclG-?PxrZ2h$i9THG1RFbG|}oyDQFPwDONz%h)m
zS-lL!Se+C`5!Ax*&3;a=be53?IN?Dt%iQh7z`4gvr9y~DW>NuWjg@|G6$2d^%8k|n
z#VI|>+6dxhX{&qhT6Q;x!*@|e+Yr{vTCwu~rsSpZ;dlt#bb}kdZ%^b;-Pm;3&9$yd
zpb^5kghV*-^{TEEwnVVYaap}P;h1n;h&{VqwJQ>)34#&-Urdq^Log(yg%L-^gxbD`
z&ElcL2(2N%L9>vz8pYN)087#ldaBVpbj=zX#PTqLRum;_+`SfMhhqPJMTgSzTmz6%
zV!z<$Vc8z9sa#nimzOBZFKT#Xl=HtB=2Dysq@{yR(vgm(%!T5hoSJ1uOwxh^smZM2
zk*6R|D}(U$vgUC5Vk(+R`Re38!JweIs-Z%@DtUP@8Pr$YtjjeTGqp8K-b-#1b_((Q
zMwLlDiK_+uA%n*@)>kOY6pAus#Z^@W1x1;>5;iI?D@%q&6ox%ll2?ECl>bejc;MTJ
zV6M3amzLHRd-A`FfTtEU-|;@1Xe~c}g$<##-}8QXxh1crPpbnxl!%HihGvf+(w5dF
zw`h=SA4(_E3+D00m?CZkjY&bEh2lKNW|=bs%uiiBRlC*gAw2yI!Dv9F{A8G%&$h;I
zRt~@Ue*EX^&Eo%yXK5Q<H8a%yp6k1(-lr~nacjJVTT$y<vBfZLHk)T~8*NkM>P2g`
zLqhNkTj)!nZ-8UM6<NzJCEbyo3BKc4xhEZb#dx59ONne#N&nZO1Em5VemA`LlsA(v
zQU{}-oGCneKkNS4!ZT0m_xyQrFiE&b(q;Jt$Vf{5KR7fGAUwknD2n4K8Zm7257}{G
z=egd@@~AHim|fz_7F{jVt%tuigO&i3F2$^sYzr?hLzZXo^Yy!eD#~*tL~CkpeZX=)
z2)1;9d=NbA(-4+;K0R!1d|!Jfn07fPoZ|Vt;0OF6Cr<nc22&Yvu!#21W{=0S;3mvO
z(F_*mXf1f(b~9f2xCkD_BSe&lKq!R3D6F6upc>EY?HyE;cID2FeD>gkV-*1AFUt_%
znQbi}Nx{<Oi|zj|V->>P>FITeQSuV)vr2(|C0keVp??#e_o={V?so|=p{fVoXC80p
z2R~B)By67M2Vm!TOhjXIL@bF`IjA2&a0IwFwS*vD;BSCIz=|!7mB3ZNVZS#m94k?U
zB{r71m*WAHHW(Rx?cG-vpYqcE*!d>$;^<#f_4L1urHYc|<Pt@xF~ed;f!%_QB~MfN
z+A2<IJeHr7BpQueX;a9Ou)M_bXO*(6vdU-W8Rh@5vVxWSBKM1vutf0_Zc$a=%Q=&u
zb?vUrF#l|h8w?vfQ(N56?vG1<=x`+Tl{j9It$W=yz|BW80litF2Vd!e>J*~927Wj2
zkuJ6+lK@otTW|v6HB=+K0)=tXrv?)6xu#}Usk}^XjQRnRfLo+>v8mO$e}N;>+*k;x
zJ&#EeIA$yf0iP?u?173`faeJhI;Q!us9c9-R;Co+xRFwvS*gQ{%D*(?&k9aeiT%a{
zHjWDNOwWq^e@*)J2tGQ%>i=`q@;X65V7lSs=n69g!;m?;;^TBfL13L=)$%`C{Rckk
z5fu6Tn)H8W66B5gZ}cA*SDh+&h8sEXj@Lt&qo%X_SKqG)eN#}C11!l|3_ZczkC)v&
zsorTHS%8TNAaG^RMc=9iK2;arc$fY0H;38|{Uwc(ZMojg1~9HCDtk$GlsvLIX3`w}
za}R|0%(o5w-_-nm(;46j0C^bFS?<&0yE)+bx@q<g+^q_nPHp5o!a{~+<MQV-bKnoZ
z1G~J#r!Q;ASYhGjp?*h{dfI-)&UJ9@xWDZ>yW_guRIjhEG!++&5!khZVNu@VY^006
z^hnRl&!~`MWW7`)I)m9Tj3Nk%@-R3~410zN?9IikL`x7I*cvTrhHGqKk}i(1&<@K(
z>v`>ZgwSXRME|yiM@BjSx5I2U%9zx<)Kd()dRMC|dSf4`3;j&c>ZZ*4^z{17rY|%+
zGRnjk;f$*xlV71)y%6w=0#ja`C#dH|u^3Q4pRCnsno?UoTh^v$oJaLmqE>3;B1Td@
zp8oZPt~hPKdfL&fA7+8jM?u{bM!9FG(<ZNsgh?txP2e`|w5A52Zk*3cf6(&~MTcb8
zLwVj&teXl@;k>!L=uGFKnNQT}AjBzgvG=|AT+GG@_n>)Vx_13(QkZV6^53ja-5YAt
zKrWrfWC{ao>p;wRW)^~g%~Lh=YERGCx)`;jy!?9>%UQ|Ur*n_Lhi~D{^1J!E9v6zX
z+FElpxCW`Je)9B%$;<IN5lwZ~3IcL%juvzkme$PRxTyf~Fgh6eZtUKTQfVPuc?*sg
zN2myk<uNRl2uh;`i2Jk#9~jq0*({<NO1TLe`gpyPJkSM~_RbuC9YhPw?ypY@lVCz<
zFibPja(eClZud;mEmRIYxM?rEXZQSfDvXzxC!0t8d2#WB#j&m?=i{Gg;a9@3*yXQE
zVVYd7>{jjCrRr8L_b|MXQDR>&8T+8`UqsNrD(%QHmIh_~+Z@z6HTC}UZ>2Mcb5Rea
zv4%&qs|JGDhqdZh@}!ios^+k|E873Pu;S=cH)avn7U@OmTYmb*={G03BsfVPDLk#=
z-NGZM0Z<v27$0MaoT<Trfx^Opg28YAAfrr#hp*Tar(K>q_DexZ1de<Y2LEsAkF%%b
z8x?UIH<j{>PEQu`OV>nfE}A?Y%K)XN8!Bz(<+i;VKDjqsTDmX`Cw|1&$3)5HlH{Ai
zVJmdei=SW+MuXaDTP%w)mAM@oN8Hi9(QY~*J1kpMZ?0K={|%a2n8V$eHs|6K$&|u0
ziZU+B#bi7=)cuE{&07vI4duir#4CJqYbQ^HUL+O0CHmQlS%1dfRuYXbm=e6W_@}k`
zYk$i37OrjY+A1AD4Ej68xkYeiQkbC%69)Y?XXuD&A=K4Mq#~t?-2{fZ9{UHr<)4Xp
zzVHMH!!lHp!aI6sd~>5<&*HCN0)yBv8m1S&3#JSC$w6e0qOzb@>tH|7Bg!q(vtO)I
zdh)KD;9EG9#{q&Oivjrf74L@MK77sFFGe*(vtG=M8!V*eCunaOScDTa((sJ3Vf-Kf
z!;g{*kc4M|5^(?;30)*L4Gw(;jtR0qgru^)8Qs0EqnK0ZF9k5dCWkk+Wa3gVO(QaK
zrdKYJr@>y&<E1^8b1iM!4yc@@Iws($J))v^Z)NXgvl#}?W#0QxwTML{ujk`(Z*jYx
zPshV%-(t62ua=8p9-583e<yV<YwD^j^3=m-z;$`^T3Zc~R5O>GW|S@-qkvoZqzG_S
zB=&&VmBt+?oeH(;Ig|qSs+?=}N{C58BuioQmXRW-DKV#LnqoVxV!9ttsy{=Pzh1S+
zhJF9-`%P-+{p63P|E)EdZj|lpWcs}7r*(U+T`fZ^O3Z0mQI~u!Dd-uelJ!hzD|f3b
ziy}%frr7<)rD7`7)L9uS@+b`@F%3h3kG+*~2}kV8KQ%n`9an9|5j|m&*|5T*+I%{(
zBze%M0+~?}6DHY+*`yKEM!zqMBNB~ZTVtemLi7R!7YAWMO$%m!NV*z&SXcDy<1E!_
z1_~4H;0e%=o`jPVYWV7U40*`nWwJySSK)fqn0R*LT=4LPKrG$5U7(Yo=W)wfQ$HL+
zht+4@?Fhl4pH{|=0b)V;$5ztvWR<SudS?K9RIkZS10{|gsl6j=*SE@8)0-ij9;#;Q
zstGS{Bxpm(3yv-QHj%+UE}A3XTvf(Y)vF=eC5dTe9B>X;9?P8ajNF=eo0)2@9;uX1
z6@un4m{?P)qX&2Q5pF8&&N|kVh3AoH8#_aP>UA9SOA_w9aK(kEtQJ~jxg$m1XIE`u
zd0jrP`NDK<VMn+8`1s?ZGXCS0@#R;dk&RvAuT`#%O0jXMD!QoM6hxvke6lE_5fi4A
zHZra3=~i|FZgUzgaWS;SP<5@QXlr3(1T6yi<2<d4D0)4_pdy5fnlM1__`osi%PD;D
zSXp;Cj(n;>4zY5%wmYed6*lK?+LC$Lq}1~KhO_f&^VmLSBU|%z80eE<$4px+d0dAk
zG!PJiM1N4oH2*2eM-GHzf|w12^0volyVU^5<w9*d&!P})f{g<q#NvMQ_RnES^ob;D
zkPZ@3YUPgzaRP|1-hI7(B0sKu%M?B~5>w~N=yKBEE?hVQ{J({Jj2>|3_jtJWs<dQO
zQKFWq)xCuXS~Qo2+$s-QOiEue*!=e>L&OCtPEnZ4CLEDGCK9=%Jkhn5kuG)5Ds?A8
z%t}rys`0!$bM3mM5c~oy1)$&!E17sf(!c)o%CY)DB9P($puhu)T2v2NfqAh5p0odm
zdp@B&fAzaq+AJO{9{A7Qa^R<ft+zvXKHRNroP$Ep1wU9K^`j+mkBB>y-n{O%v$3f#
z;)b*(Re7VPn#Cg`wZQ{E5mJmqXm2T&7Ow0XsHIS28N*Xh?9->4wo$zsy;B<&#N6_E
zo$O(LAi#dKPGCF!%A^n8-EZe(o}h{^^hbI7|A(`@5JEV%Np0cuVxJo;8o!Y$G<>3J
z^P`L}MR@?Ialzac9KI+-;3q^%LVi!_2^s0jEz#d-xmbcf9lvGa@r!tbU|ny8$g)Wd
z98x1THEISlqD_k9$vKTA%Dv{3yQL?(JKQC9`EjgRM_tcc3%y83Bb7O6`0amnv*^3E
zicJR>`(UdaE}-Eft1(*L?+0sJtqtIfIPbf*-MYrBiEVMFB?}>@j#lhyD%A_29OG}~
z+}B2Q?&_d(bI#fj0_Jv6bth0?yVf(`bexCvZ#FhbH6w8P95Sb=q?~|zy*P7r>Mz5d
zlL;B&{p#t3v&&O$=5fDWS4(#0XW<VFec~~?!_p|!xJ0Dk9D05}O93MtGnGopWj=~h
z(UD<01(?GQ1X7MPl~y7(#)HKZMEvSCJ^ON|P>{rI9w4N$YhQe>7l><X{GejVP8Z3F
zcol0N3B$-6BV`zR)*ZKJl(jD@73DHxwN+~~)BX=@CL&FKbR(3hLqBL_B7y5EyMVsa
zu4#Zg-YU7d=8U|$hrVga`-d}d0<3S@9&4NNTXru+d9oTtishFPCi7N*!JGL{MAvuG
z&zx1)uZ}#c|KCbDlf?o`J+1i@%w5+;5AHshAx`bS+!8bGIhtXgRiEJ+YDd`fTkh%q
zVWpaNMvwCv0@f_y9JI0_RN{7+8rvX%K84gww#w`g^^E~>SL(q|Ma>wBHR}tY|3d^u
zfY=9t*li|2uIEXfrC=BA9NFH`Yay(YAc4a~6e}id4aHLj38MqFN1@$Bi0i9*BScPs
zg6kQwiKmmaObLsHjSXQH2><9t;?3LfuwIP=YvxN(4{b~vkoD8NcCO_s%!$sZfu3#H
zZX7`JrJb1FhJh;#sk1X~mzp(b65PRF^k4=tY={WbGA74%)m0<rAcukzBABpBCB53c
ze{_VT+I|PyO{lj0lmr3$Qwu047gt5EHnnREA^MoG*_29XDD%2xBW(X04<l4yM3Yy@
zZ4(g96ekD_?_ws^3gm%pVyEk2tFicY)^UqPHcd_(z_x))^=9Er^fa@&da7WggIf+3
zg94>RnNWTKv-Yt0?IfK!leM>3ad5?`&trSUAoC2Izd%a(sZ!7>pMqqTMi0J$Cs?vC
zw|>iBck9s`??^}3CM3*N#SH8Gy(qV84!E7CNfi2YQv5<SU+b{$efi~2Vd}K`%#``v
z-`!$9XffWCqFiSE64TC*$^#u9#perWm@?9VLX;c_99G>912VN|Q*9GhGm?ecE}-vc
zArYrEjOy9W&&|$EPfbpYk7d&Fd?Mdd7iknyGO2h2K3`|iKlxRka(!888V+IP=ReBk
z<(Hg*LJJs{tJSWyUz)D(yPuFg_sny!L@(wC8nu-=ahUs&)91hUa-YB65~()qZiZ&X
z#dX}hEWhQR-`v*b#`@ao%JR};abapQH=m!+W|E1>>voOjKGv-BuXC7W>qDwC!KPA6
zjp2%kbz8EN?DXG>uK@D9?u(g<GhAz!--$yJg@tU!7{(()?HEvVRhl_3ASAr(^hGXc
zk%+1KZRNx)#1OeCWt+u+Q$-^7aAgD{&3o0Q6|&%uaXWGHCkC0XE(J<?o6Gu!fdWPx
zU{IJ2g!@$_am0BX@9|IeL!WOEJcN-pBq^tbiu~Jeg@MvFz2h{9?Vzw()0LOKivs6n
zyxH=<$eWS53jzXsDT}L}D&2q2+y=nUN2%hA1+&=X<e$Aw$zlK-5R70YcN>HWqT<ND
zs-XB~MG=Q*_%mF6^ZzX3v9Et?{(gkVedUl2fXMIE7r;kXkEpBe<9O1po`(YiS2$9O
zg%b?2G}$;GPSH`qX$B|Zyit$df;!)0#eP-W@#1$7Cap;tW*AdQu(iet!9inJnAe!B
zLIsVx!h-p9=~g-enf)te%65mvAHmMBuo1NnDrJY<{CmXWmR|}>r>E=J`|Gwa;+Nkz
zOYvdxUetNky0-e0SL714@bYHYes#5D2`iprV|=4jQTszh?4L2>PMx`TVc)JjS42bN
zhKcN~M!1sLYIcZDF+lTAY&s$eaow%<O2s7z*@&HuIH`#3Cd8<x%oL}NMTtU)^?tGM
zFen8pb7@+L-O8Ojvgrb+)Y9C%ZRTpf_~43c%&fRHtxoXOrjW@}|1y_u24Sy2sGXju
z3&GbXO7$rxIx80kL?|_79yy2y?~I>?Wen1c=u8y+@?9Oy$Q4SJTBFtJ4MvmMLR^pf
zK^VnJn&m}V)eYlq*AL@tzF4l-o9%9YIG)az>+Sw{zTP4lizkw)v~B-CbG7A$rM>1u
z9OXH{af_0fZp+3*pF7*d*qKq_m_;HtEfOiI#A$jbc3UK}=c2GnmJ}ZEfhMfgmMnzq
zpk*)$%d)fmjBZ@;Ao>dvaDudJqdNjp)OJ$)mWd^s7;(0vB!^~y#f+#pU(ugCUoSzY
z*$C(0Id>@&qgH_IUD^POenXg>+P)7t+Wwe(Y5}Ref2BPi2^M7Ze(Dx%q;^r009!Rf
zI;`26N&0=`I~(k++X}4y;9`Qgr%C8U!aztqG+HXP%^+^iMk`#6Oy{_S%&h7pSk2t{
zmjD$bZf>M>W}~^j*%-_!HRamo3GCY#dz#gwMy-!tLioMs!UBh#J2c4wm*vOn$0c3S
zcpP%8XIhhh)N32Gb1tO`Q_vrqSOL#lsB5P^?d$=YKhjv{kzn&k9~HUVotg|GXY8~`
zqO%vLHh((!Ii=r3lwoL>z1^XK_QfYvYh#zG0J!_WpVPAn(U<cw{r|=Zw-u<@O&aZZ
zbm7*Y00jiM0~XF7`*icPSe8E&i=@Pc+JDmk7T|o|RvAQ|KQwQs_FSaQe#oQp6&RO4
S=>HA$FCKL)eCA6XAh8L)q)eg!

diff --git a/addons/web/static/lib/odoo_ui_icons/style.css b/addons/web/static/lib/odoo_ui_icons/style.css
index d2cc906887b41..dd0145f68fba4 100644
--- a/addons/web/static/lib/odoo_ui_icons/style.css
+++ b/addons/web/static/lib/odoo_ui_icons/style.css
@@ -92,6 +92,8 @@
 .oi-google-play:before { content: '\e81d'; }
 .oi-strava:before { content: '\e80f'; }
 .oi-discord:before { content: '\e811'; }
+.oi-bring-front:before { content: '\e84c'; }
+.oi-send-back:before { content: '\e84d'; }
 .oi-life-ring-plus:before { content: '\e849'; }
 
 /* RTL adaptations. */

From 8780a41480642a0dbdf6a6804fba8ef1bdde2506 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Tue, 14 Oct 2025 15:53:52 +0530
Subject: [PATCH 344/673] [IMP] website, html_builder: enhance snippets toolbar

- Persist tooltip 'Double click to replace' for 3 seconds, because
  users often missed it when it disappeared too quickly.
- Update image overlay actions to adopt a toolbar-like style, since the
  old design looked inconsistent and confused users.

task-4789254

Part-of: odoo/odoo#217739
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../src/core/drag_and_drop_move_handle.xml    |  2 +-
 .../static/src/core/media_website_plugin.js   |  2 +-
 .../core/overlay_buttons/overlay_buttons.scss | 26 +------------------
 .../core/overlay_buttons/overlay_buttons.xml  |  6 ++---
 .../static/src/core/remove_plugin.js          |  2 +-
 .../html_builder/static/tests/editor.test.js  |  2 +-
 .../static/tests/builder/images.test.js       |  2 +-
 .../tours/snippet_popup_and_scrollbar.js      |  6 ++---
 8 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/addons/html_builder/static/src/core/drag_and_drop_move_handle.xml b/addons/html_builder/static/src/core/drag_and_drop_move_handle.xml
index cf783124729a6..ec65798221430 100644
--- a/addons/html_builder/static/src/core/drag_and_drop_move_handle.xml
+++ b/addons/html_builder/static/src/core/drag_and_drop_move_handle.xml
@@ -1,7 +1,7 @@
 <templates xml:space="preserve">
 
 <t t-name="html_builder.DragAndDropMoveHandle">
-    <button class="btn o_move_handle fa fa-arrows"
+    <button class="btn btn-light o_move_handle fa fa-arrows"
             t-att-title="title" t-att-aria-label="title"/>
 </t>
 
diff --git a/addons/html_builder/static/src/core/media_website_plugin.js b/addons/html_builder/static/src/core/media_website_plugin.js
index 4099d2c4c3acf..3606f6039b2fa 100644
--- a/addons/html_builder/static/src/core/media_website_plugin.js
+++ b/addons/html_builder/static/src/core/media_website_plugin.js
@@ -104,7 +104,7 @@ export class MediaWebsitePlugin extends Plugin {
         this.removeCurrentTooltip = this.popover.add(mediaEl, Tooltip, {
             tooltip: _t("Double-click to edit"),
         });
-        setTimeout(this.removeCurrentTooltip, 1500);
+        setTimeout(this.removeCurrentTooltip, 3000);
     }
 
     async onSnippetDropped({ snippetEl }) {
diff --git a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss
index 7eb8ff2d7595e..e40be67313506 100644
--- a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss
+++ b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.scss
@@ -1,30 +1,6 @@
 .o_overlay_options {
     display: flex;
-    gap: 2px;
-
-    .btn {
-        --btn-padding-x: #{o-to-rem(7px)};
-        --btn-padding-y: #{o-to-rem(5px)};
-
-        @include button-variant(
-            $background: $o-we-item-clickable-bg,
-            $border: transparent,
-            $color: $o-we-item-clickable-color,
-            $hover-background: $o-we-item-clickable-hover-bg,
-            $hover-border: transparent,
-            $hover-color: $o-we-item-clickable-color,
-            $active-background: mix($o-we-item-clickable-hover-bg, rgba($o-we-color-accent, 0.4)),
-            $active-border: transparent,
-            $active-color: $o-we-fg-lighter,
-            $disabled-background: rgba($o-we-item-clickable-hover-bg, 0.5),
-            $disabled-border: transparent,
-            $disabled-color: $o-we-item-clickable-color,
-        );
-    }
-
-    &:has(span:hover .btn:not(:disabled)) > span:not(:hover) .btn:not(:disabled) {
-        @include o-hover-opacity(.6);
-    }
+    align-items: center;
 
     button {
         &.fa, &.oi {
diff --git a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.xml b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.xml
index cda1e28b50e70..105b018919116 100644
--- a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.xml
+++ b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons.xml
@@ -1,13 +1,13 @@
 <templates xml:space="preserve">
 
 <t t-name="html_builder.OverlayButtons">
-    <div t-att-class="{'d-none': !state.showUi or !state.isVisible}" class="o_overlay_options">
+    <div t-att-class="{'d-none': !state.showUi or !state.isVisible}" class="o-we-toolbar o_overlay_options shadow rounded my-2">
         <t t-foreach="state.buttons" t-as="button" t-key="button_index">
             <!-- Disabled buttons do not display their title -->
-            <span t-att-title="button.disabledReason" t-att-aria-label="button.disabledReason">
+            <span class="btn-group" t-att-title="button.disabledReason" t-att-aria-label="button.disabledReason">
                 <t t-if="button.Component" t-component="button.Component" t-props="button.props || {}"/>
                 <t t-else="">
-                    <button class="btn" t-att-class="button.class"
+                    <button class="btn btn-light" t-att-class="button.class"
                             t-att-title="button.title" t-att-aria-label="button.title"
                             t-att-disabled="!!button.disabledReason"
                             t-on-click="button.handler"/>
diff --git a/addons/html_builder/static/src/core/remove_plugin.js b/addons/html_builder/static/src/core/remove_plugin.js
index 68efca651d0f7..329f854334b8c 100644
--- a/addons/html_builder/static/src/core/remove_plugin.js
+++ b/addons/html_builder/static/src/core/remove_plugin.js
@@ -57,7 +57,7 @@ export class RemovePlugin extends Plugin {
         this.overlayTarget = target;
         const disabledReason = this.dependencies.builderOptions.getRemoveDisabledReason(target);
         buttons.push({
-            class: "oe_snippet_remove bg-danger fa fa-trash",
+            class: "oe_snippet_remove text-danger fa fa-trash",
             title: _t("Remove"),
             disabledReason,
             handler: () => {
diff --git a/addons/html_builder/static/tests/editor.test.js b/addons/html_builder/static/tests/editor.test.js
index a50f8c15fbd13..4604196b3e2b0 100644
--- a/addons/html_builder/static/tests/editor.test.js
+++ b/addons/html_builder/static/tests/editor.test.js
@@ -109,7 +109,7 @@ test("should preserve iframe in the toolbar's font size input", async () => {
         focusNode: p2.firstChild,
         focusOffset: 9,
     });
-    await waitFor(".o-we-toolbar");
+    await waitFor(".o-we-toolbar [name='font_size_selector'] iframe");
     // Get the font size selector input.
     let iframeEl = queryOne(".o-we-toolbar [name='font_size_selector'] iframe");
     let inputEl = iframeEl.contentWindow.document?.querySelector("input");
diff --git a/addons/website/static/tests/builder/images.test.js b/addons/website/static/tests/builder/images.test.js
index b43a434bc318d..07821d140bd84 100644
--- a/addons/website/static/tests/builder/images.test.js
+++ b/addons/website/static/tests/builder/images.test.js
@@ -67,7 +67,7 @@ test("simple click on Image", async () => {
     await click(":iframe img.a_nice_img");
     await waitFor("div.o-tooltip");
     expect("div.o-tooltip").toHaveCount(1);
-    await advanceTime(1600);
+    await advanceTime(3100);
     expect("div.o-tooltip").toHaveCount(0);
 });
 
diff --git a/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js b/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js
index 0191d30e0ea19..0322220eb0437 100644
--- a/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js
+++ b/addons/website/static/tests/tours/snippet_popup_and_scrollbar.js
@@ -93,7 +93,7 @@ registerWebsitePreviewTour(
         },
         {
             content: "Remove the s_media_list snippet",
-            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            trigger: ".o_customize_tab [data-container-title='Media List'] button.oe_snippet_remove",
             run: "click",
         },
         checkScrollbar(true),
@@ -184,13 +184,13 @@ registerWebsitePreviewTour(
         scrollIntoView("#website_cookies_bar .s_media_list_item:last-child"),
         {
             content: "Remove the first Media List snippet in the Cookies Bar.",
-            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            trigger: ".o_customize_tab [data-container-title='Media List'] button.oe_snippet_remove",
             run: "click",
         },
         scrollIntoView("#website_cookies_bar .s_media_list_item:last-child"),
         {
             content: "Remove the second Media List snippet in the Cookies Bar.",
-            trigger: ".overlay .o_overlay_options .oe_snippet_remove",
+            trigger: ".o_customize_tab [data-container-title='Media List'] button.oe_snippet_remove",
             run: "click",
         },
         checkScrollbar(true),

From 101d0c782cec6a7b5dadf062c75828aefff2e8a7 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Tue, 14 Oct 2025 16:02:27 +0530
Subject: [PATCH 345/673] [IMP] website, html_builder: update image options in
 builder

- Reorder image options to follow a more logical sequence.
- Remove size option for image in grid mode.

task-4789254

Part-of: odoo/odoo#217739
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../src/plugins/image/image_tool_option.js    |  1 +
 .../src/plugins/image/image_tool_option.xml   | 34 +++++++++----------
 .../plugins/image/image_transform_option.xml  |  6 ++--
 .../plugins/options/background_option.xml     |  2 ++
 .../website_builder/image_gallery.test.js     | 31 +++++++++++++++++
 5 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/addons/html_builder/static/src/plugins/image/image_tool_option.js b/addons/html_builder/static/src/plugins/image/image_tool_option.js
index f2b7371d3c4d3..7cb6659e3d36d 100644
--- a/addons/html_builder/static/src/plugins/image/image_tool_option.js
+++ b/addons/html_builder/static/src/plugins/image/image_tool_option.js
@@ -19,6 +19,7 @@ export class ImageToolOption extends BaseOptionComponent {
         super.setup();
         this.state = useDomState((editingElement) => ({
             isImageAnimated: editingElement.classList.contains("o_animate"),
+            isGridMode: editingElement.closest(".o_grid_mode, .o_grid"),
         }));
     }
 }
diff --git a/addons/html_builder/static/src/plugins/image/image_tool_option.xml b/addons/html_builder/static/src/plugins/image/image_tool_option.xml
index 0d47a3a62cc34..addb491221d49 100644
--- a/addons/html_builder/static/src/plugins/image/image_tool_option.xml
+++ b/addons/html_builder/static/src/plugins/image/image_tool_option.xml
@@ -17,31 +17,29 @@
             placeholder.translate="Title tag" />
     </BuilderRow>
     <BuilderRow label.translate="Transform" preview="false">
-        <BuilderButton title.translate="Crop image" action="'cropImage'" icon="'fa-crop'" id="'cropImage'" />
-        <BuilderButton title.translate="Reset crop" action="'resetCrop'" t-if="this.isActiveItem('cropImage')">Reset</BuilderButton>
+        <div class="btn-group o-hb-button-group">
+            <BuilderButton title.translate="Crop image" action="'cropImage'" icon="'fa-crop'" id="'cropImage'" />
+            <BuilderButton title.translate="Reset crop" action="'resetCrop'" t-if="this.isActiveItem('cropImage')" icon="'oi-close'" className="'btn-danger-color-hover rounded-start-0 m-0 py-0 flex-grow-0'" />
+        </div>
         <ImageTransformOption t-if="!state.isImageAnimated" />
     </BuilderRow>
     <ImageFilterOption />
-    <BuilderRow label.translate="Size">
-        <BuilderButtonGroup styleAction="'width'">
-            <BuilderButton styleActionValue="''" title.translate="Resize Default">Default</BuilderButton>
-            <BuilderButton styleActionValue="'25%'" title.translate="Resize Quarter">25%</BuilderButton>
-            <BuilderButton styleActionValue="'50%'" title.translate="Resize Half">50%</BuilderButton>
-            <BuilderButton styleActionValue="'100%'" title.translate="Resize Full">100%</BuilderButton>
-        </BuilderButtonGroup>
-    </BuilderRow>
+    <t t-if="!state.isGridMode">
+        <BuilderRow label.translate="Size">
+            <BuilderSelect styleAction="'width'">
+                <BuilderSelectItem styleActionValue="''" title.translate="Resize Default">Default</BuilderSelectItem>
+                <BuilderSelectItem styleActionValue="'100%'" title.translate="Resize Full">100%</BuilderSelectItem>
+                <BuilderSelectItem styleActionValue="'75%'" title.translate="Resize 75%">75%</BuilderSelectItem>
+                <BuilderSelectItem styleActionValue="'50%'" title.translate="Resize Half">50%</BuilderSelectItem>
+                <BuilderSelectItem styleActionValue="'25%'" title.translate="Resize Quarter">25%</BuilderSelectItem>
+                <BuilderSelectItem styleActionValue="'10%'" title.translate="Resize 10%">10%</BuilderSelectItem>
+            </BuilderSelect>
+        </BuilderRow>
+    </t>
     <ImageFormatOption />
 </t>
 
 <t t-name="html_builder.ImageAndFaOption">
-    <BuilderRow label.translate="Alignment">
-        <BuilderSelect>
-            <BuilderSelectItem classAction="''" title.translate="Unalign">None</BuilderSelectItem>
-            <BuilderSelectItem classAction="'me-auto float-start'" title.translate="Align Left">Left</BuilderSelectItem>
-            <BuilderSelectItem classAction="'mx-auto d-block'" title.translate="Align Center">Center</BuilderSelectItem>
-            <BuilderSelectItem classAction="'ms-auto float-end'" title.translate="Align Right">Right</BuilderSelectItem>
-        </BuilderSelect>
-    </BuilderRow>
     <BuilderRow label.translate="Style">
         <BuilderButton icon="'fa-square'" classAction="'rounded'" title.translate="Shape: Rounded"/>
         <BuilderButton icon="'fa-circle-o'" classAction="'rounded-circle'" title.translate="Shape: Circle"/>
diff --git a/addons/html_builder/static/src/plugins/image/image_transform_option.xml b/addons/html_builder/static/src/plugins/image/image_transform_option.xml
index 0e686e1721eec..0bd666d1005fa 100644
--- a/addons/html_builder/static/src/plugins/image/image_transform_option.xml
+++ b/addons/html_builder/static/src/plugins/image/image_transform_option.xml
@@ -1,6 +1,8 @@
 <templates xml:space="preserve">
     <t t-name="website.ImageTransformOption">
-        <BuilderButton title.translate="Transform the picture" id="'transform_image'" action="'transformImage'" actionParam="{ isImageTransformationOpen: transform.isImageTransformationOpen, closeImageTransformation: closeImageTransformation.bind(this) }" icon="'fa-object-ungroup'" />
-        <BuilderButton title.translate="Reset transformation" action="'resetTransformImage'"  actionParam="closeImageTransformation.bind(this)" t-if="isActiveItem('transform_image')">Reset</BuilderButton>
+        <div class="btn-group o-hb-button-group">
+            <BuilderButton title.translate="Transform the picture" id="'transform_image'" action="'transformImage'" actionParam="{ isImageTransformationOpen: transform.isImageTransformationOpen, closeImageTransformation: closeImageTransformation.bind(this) }" icon="'fa-object-ungroup'" />
+            <BuilderButton title.translate="Reset transformation" action="'resetTransformImage'" t-if="isActiveItem('transform_image')" actionParam="closeImageTransformation.bind(this)" icon="'oi-close'" className="'btn-danger-color-hover rounded-start-0 m-0 py-0 flex-grow-0'" />
+        </div>
     </t>
 </templates>
diff --git a/addons/website/static/src/builder/plugins/options/background_option.xml b/addons/website/static/src/builder/plugins/options/background_option.xml
index 0ed38110dc99c..168185be8712a 100644
--- a/addons/website/static/src/builder/plugins/options/background_option.xml
+++ b/addons/website/static/src/builder/plugins/options/background_option.xml
@@ -15,6 +15,8 @@
     <!-- TODO: change position of the xpath when snippet_options_image_optimization_widgets is converted -->
     <xpath expr="//ImageFormatOption" position="after">
         <ParallaxOption/>
+    </xpath>
+    <xpath expr="//BackgroundImageOption" position="before">
         <t t-call="website.BackgroundVideoOption"/>
     </xpath>
     <xpath expr="//BackgroundImageOption" position="replace">
diff --git a/addons/website/static/tests/builder/website_builder/image_gallery.test.js b/addons/website/static/tests/builder/website_builder/image_gallery.test.js
index 450ecbf286dcf..0197ca2660ba8 100644
--- a/addons/website/static/tests/builder/website_builder/image_gallery.test.js
+++ b/addons/website/static/tests/builder/website_builder/image_gallery.test.js
@@ -247,3 +247,34 @@ test("Cloning an image gallery should produce a unique ID", async () => {
     const imageCarousels = queryAll(":iframe .s_image_gallery .carousel");
     expect(imageCarousels[0].id).not.toEqual(imageCarousels[1].id);
 });
+
+test("Changing layout of an image gallery to grid should remove size option on images", async () => {
+    await setupWebsiteBuilder(
+        `
+        <section class="s_image_gallery o_masonry" data-columns="2">
+            <div class="container">
+                <div class="o_masonry_col col-lg-6">
+                    <img class="first_img img img-fluid d-block rounded" data-index="1" src='${dummyBase64Img}'>
+                </div>
+                <div class="o_masonry_col col-lg-6">
+                    <img class="second_img img img-fluid d-block rounded" data-index="5"  src='${dummyBase64Img}'>
+                </div>
+            </div>
+        </section>
+        `
+    );
+    await contains(":iframe .first_img").click();
+    await waitFor("[data-label='Mode']");
+    expect("[data-label='Mode']").toHaveCount(1);
+    expect(queryOne("[data-label='Mode'] .dropdown-toggle").textContent).toBe("Masonry");
+    expect("[data-label='Size']").toHaveCount(1);
+    await contains("[data-label='Mode'] .dropdown-toggle").click();
+
+    await contains("[data-action-param='grid']").click();
+    await waitFor(":iframe .o_grid");
+    expect(":iframe .o_grid").toHaveCount(1);
+    expect(":iframe .o_masonry_col").toHaveCount(0);
+    expect(queryOne("[data-label='Mode'] .dropdown-toggle").textContent).toBe("Grid");
+    await contains(":iframe .first_img").click();
+    expect("[data-label='Size']").toHaveCount(0);
+});

From 98b7e1e1482822d86b5ebe22ce236295c9e61e04 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Tue, 14 Oct 2025 17:22:15 +0530
Subject: [PATCH 346/673] [IMP] website, *: hide overlay button when toolbar is
 active

`*=html_builder, html_editor`

- Hide overlay buttons when editor toolbar is active as this leads to
  a confusion for users.

task-4789254

closes odoo/odoo#217739

Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 .../overlay_buttons/overlay_buttons_plugin.js | 15 +++++++-
 .../static/src/main/toolbar/toolbar_plugin.js |  6 +++-
 .../tests/builder/overlay_buttons.test.js     | 35 +++++++++++++++++--
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js
index 407b535a3dc15..60b90cc9ded37 100644
--- a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js
+++ b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js
@@ -8,7 +8,7 @@ import { withSequence } from "@html_editor/utils/resource";
 
 export class OverlayButtonsPlugin extends Plugin {
     static id = "overlayButtons";
-    static dependencies = ["selection", "overlay", "history", "operation"];
+    static dependencies = ["selection", "overlay", "history", "operation", "toolbar"];
     static shared = [
         "hideOverlayButtons",
         "showOverlayButtons",
@@ -16,6 +16,8 @@ export class OverlayButtonsPlugin extends Plugin {
         "showOverlayButtonsUi",
     ];
     resources = {
+        selectionchange_handlers: this.shouldShowToolbar.bind(this),
+        selection_leave_handlers: this.showOverlayButtonsUi.bind(this),
         step_added_handlers: this.refreshButtons.bind(this),
         change_current_options_containers_listeners: this.addOverlayButtons.bind(this),
         on_mobile_preview_clicked: withSequence(20, this.refreshButtons.bind(this)),
@@ -123,6 +125,17 @@ export class OverlayButtonsPlugin extends Plugin {
         this.overlay.updatePosition();
     }
 
+    shouldShowToolbar() {
+        clearTimeout(this.toolbarTimeout);
+        this.toolbarTimeout = setTimeout(() => {
+            if (this.dependencies.toolbar.getIsToolbarOpen()) {
+                this.hideOverlayButtonsUi();
+            } else {
+                this.showOverlayButtonsUi();
+            }
+        }, 500);
+    }
+
     hideOverlayButtons() {
         this.state.isVisible = false;
     }
diff --git a/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js b/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js
index aba6a7c14547f..f1e1824bc7385 100644
--- a/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js
+++ b/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js
@@ -143,7 +143,7 @@ const MIN_SIZE_FOR_COMPACT = 7;
 export class ToolbarPlugin extends Plugin {
     static id = "toolbar";
     static dependencies = ["overlay", "selection", "userCommand"];
-    static shared = ["getToolbarInfo"];
+    static shared = ["getToolbarInfo", "getIsToolbarOpen"];
     resources = {
         selectionchange_handlers: this.handleSelectionChange.bind(this),
         selection_leave_handlers: () => this.closeToolbar(),
@@ -328,6 +328,10 @@ export class ToolbarPlugin extends Plugin {
         };
     }
 
+    getIsToolbarOpen() {
+        return this.overlay.isOpen;
+    }
+
     handleSelectionChange(selectionData) {
         if (this.onSelectionChangeActive) {
             this.updateToolbar(selectionData);
diff --git a/addons/website/static/tests/builder/overlay_buttons.test.js b/addons/website/static/tests/builder/overlay_buttons.test.js
index 73d27ca9e8f90..8b6afbcaa33f0 100644
--- a/addons/website/static/tests/builder/overlay_buttons.test.js
+++ b/addons/website/static/tests/builder/overlay_buttons.test.js
@@ -1,8 +1,8 @@
 import { undo } from "@html_editor/../tests/_helpers/user_actions";
 import { Plugin } from "@html_editor/plugin";
-import { setContent } from "@html_editor/../tests/_helpers/selection";
-import { expect, test } from "@odoo/hoot";
-import { Deferred, tick } from "@odoo/hoot-dom";
+import { setContent, setSelection } from "@html_editor/../tests/_helpers/selection";
+import { animationFrame, expect, test } from "@odoo/hoot";
+import { Deferred, tick, waitFor } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
 import {
@@ -350,3 +350,32 @@ test("An inner snippet alone in a column should not have overlay options", async
     expect(".oe_overlay").toHaveCount(3);
     expect(".oe_overlay.oe_active").toHaveCount(1);
 });
+
+test("The overlay buttons should be hidden when the toolbar is open", async () => {
+    const { getEditor } = await setupWebsiteBuilder(`
+        <section>
+            <div class="container">
+                <div class="test-options-target">test here</div>
+            </div>
+        </section>
+    `);
+    const editor = getEditor();
+    // Check that the overlay buttons are not hidden.
+    await contains(":iframe .test-options-target").click();
+    expect(".o-we-toolbar.o_overlay_options:not(.d-none)").toHaveCount(1);
+    const text = editor.editable.querySelector(".test-options-target");
+    const selection = {
+        anchorNode: text.childNodes[0],
+        anchorOffset: 2,
+        focusNode: text.childNodes[0],
+        focusOffset: 5,
+    };
+    setSelection(selection);
+    await animationFrame();
+    // Check that the toolbar buttons are shown.
+    await waitFor(".o-we-toolbar:not(.o_overlay_options)");
+    expect(".o-we-toolbar:not(.o_overlay_options)").toHaveCount(1);
+    // Check that the overlay buttons are hidden.
+    await waitFor(".o-we-toolbar.o_overlay_options.d-none", { timeout: 500 });
+    expect(".o-we-toolbar.o_overlay_options.d-none").toHaveCount(1);
+});

From 6be0b0065986dd287917cac9ec8c9936f518acdc Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Thu, 16 Oct 2025 13:10:57 +0000
Subject: [PATCH 347/673] [IMP] website, html_builder: shorten notifications
 text

Reduce the text size of certain notifications so that they are displayed
on a single line.

task-5169680

closes odoo/odoo#234844

X-original-commit: f8f1f3ec0dd4e7192e804c24d539661602d8b6cc
Signed-off-by: Outagant Mehdi (mou) <mou@odoo.com>
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 .../static/src/core/anchor/anchor_plugin.js        | 14 ++++++++++----
 .../static/src/core/save_snippet_plugin.js         |  2 +-
 .../website_switcher_systray_item.js               |  7 ++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addons/html_builder/static/src/core/anchor/anchor_plugin.js b/addons/html_builder/static/src/core/anchor/anchor_plugin.js
index 0c6d2f7e916c3..e2d1d20c87518 100644
--- a/addons/html_builder/static/src/core/anchor/anchor_plugin.js
+++ b/addons/html_builder/static/src/core/anchor/anchor_plugin.js
@@ -91,10 +91,16 @@ export class AnchorPlugin extends Plugin {
         }
         const anchorLink = this.getAnchorLink(element);
         await browser.navigator.clipboard.writeText(anchorLink);
-        const message = _t("Anchor copied to clipboard%(br)sLink: %(anchorLink)s", {
-            anchorLink,
-            br: markup`<br>`,
-        });
+        const message = _t(
+            "Anchor copied to clipboard%(br)s%(open_span)sLink: %(anchor_link)s%(close_span)s",
+            {
+                open_span: markup`<span style=" display: -webkit-box; -webkit-line-clamp: 1;
+                    -webkit-box-orient: vertical; overflow: hidden;">`,
+                anchor_link: anchorLink,
+                br: markup`<br>`,
+                close_span: markup`</span>`,
+            }
+        );
         const closeNotification = this.services.notification.add(message, {
             type: "success",
             buttons: [
diff --git a/addons/html_builder/static/src/core/save_snippet_plugin.js b/addons/html_builder/static/src/core/save_snippet_plugin.js
index bba7f794b0d40..e68ce000e3cb9 100644
--- a/addons/html_builder/static/src/core/save_snippet_plugin.js
+++ b/addons/html_builder/static/src/core/save_snippet_plugin.js
@@ -71,7 +71,7 @@ export class SaveSnippetPlugin extends Plugin {
         );
         if (savedName) {
             const message = _t(
-                "Your custom snippet was successfully saved as %s. Find it in your snippets collection.",
+                "Saved as %s. Find it in your snippets.",
                 markup`<strong>${savedName}</strong>`
             );
             this.services.notification.add(message, {
diff --git a/addons/website/static/src/client_actions/website_preview/website_switcher_systray_item.js b/addons/website/static/src/client_actions/website_preview/website_switcher_systray_item.js
index 8966a392a84c6..13baca9b8ee09 100644
--- a/addons/website/static/src/client_actions/website_preview/website_switcher_systray_item.js
+++ b/addons/website/static/src/client_actions/website_preview/website_switcher_systray_item.js
@@ -63,12 +63,9 @@ export class WebsiteSwitcherSystrayItem extends Component {
                     });
                     if (!website.domain) {
                         const closeFn = this.notificationService.add(
-                            _t(
-                                "This website does not have a domain configured. To avoid unexpected behaviours during website edition, we recommend closing (or refreshing) other browser tabs.\nTo remove this message please set a domain in your website settings"
-                            ),
+                            _t("Add a domain to your website."),
                             {
                                 type: "warning",
-                                title: _t("No website domain configured for this website."),
                                 sticky: true,
                                 buttons: [
                                     {
@@ -79,7 +76,7 @@ export class WebsiteSwitcherSystrayItem extends Component {
                                             closeFn();
                                         },
                                         primary: true,
-                                        name: "Go to Settings",
+                                        name: "Settings",
                                     },
                                 ],
                             }

From e37a3acd5f4d15e892822564f6e8870a55ccfaeb Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 4 Nov 2025 15:15:49 +0000
Subject: [PATCH 348/673] [FIX] web: RPCCache: also invalidate pendingRequests

PR [1] recently reworked the `read` function of RPCCache to better
handle rejected promises. Unfortunately, it introduced a small
regression producing a crash in a specific scenario:
 - do an rpc
 - during the rpc (before it returns), invalidate the cache
 - still during the rpc, do that same rpc again (same params).

Before this commit, it crashed because we didn't clear the
`pendingRequests` structure, whereas the ramCache was emptied. In
`read`, we assume that if there's a pending request, there's an
entry in the ram cache for that request, which is a correct
assumption, except in that faulty scenario. With this commit,
pending requests are also cleared upon invalidation.

[1] odoo/odoo#233610

runbot error~233763

closes odoo/odoo#234799

X-original-commit: 98aaf12d58fcdcfc115d06062e74350b9e025b22
Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../web/static/src/core/network/rpc_cache.js  |  25 ++-
 .../tests/core/network/rpc_cache.test.js      | 173 ++++++++++++++++++
 2 files changed, 191 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/core/network/rpc_cache.js b/addons/web/static/src/core/network/rpc_cache.js
index 061a4c9af3c91..d1d9a144225ca 100644
--- a/addons/web/static/src/core/network/rpc_cache.js
+++ b/addons/web/static/src/core/network/rpc_cache.js
@@ -130,12 +130,13 @@ export class RPCCache {
         if (hasPendingRequest) {
             // never do the same call multiple times in parallel => return the same value for all
             // those calls, but store their callback to call them when/if the real value is obtained
-            this.pendingRequests[requestKey].push(callback);
+            this.pendingRequests[requestKey].callbacks.push(callback);
             return ramValue.then((result) => deepCopy(result));
         }
 
         if (!ramValue || update === "always") {
-            this.pendingRequests[requestKey] = [callback];
+            const request = { callbacks: [callback], invalidated: false };
+            this.pendingRequests[requestKey] = request;
 
             // execute the fallback and write the result in the caches
             const prom = new Promise((resolve, reject) => {
@@ -145,9 +146,10 @@ export class RPCCache {
                     resolve(result);
                     // call the pending request callbacks with the result
                     const hasChanged = !!fromCacheValue && !jsonEqual(fromCacheValue, result);
-                    this.pendingRequests[requestKey]?.forEach((cb) =>
-                        cb(deepCopy(result), hasChanged)
-                    );
+                    request.callbacks.forEach((cb) => cb(deepCopy(result), hasChanged));
+                    if (request.invalidated) {
+                        return result;
+                    }
                     delete this.pendingRequests[requestKey];
                     // update the ram and optionally the disk caches with the latest data
                     this.ramCache.write(table, key, Promise.resolve(result));
@@ -160,12 +162,16 @@ export class RPCCache {
                 };
                 const onRejected = async (error) => {
                     await fromCache;
-                    delete this.pendingRequests[requestKey];
+                    if (!request.invalidated) {
+                        delete this.pendingRequests[requestKey];
+                        if (!fromCacheValue) {
+                            this.ramCache.delete(table, key); // remove rejected prom from ram cache
+                        }
+                    }
                     if (fromCacheValue) {
                         // promise has already been fullfilled with the cached value
                         throw error;
                     }
-                    this.ramCache.delete(table, key); // remove rejected prom from ram cache
                     reject(error);
                 };
                 fallback().then(onFullfilled, onRejected);
@@ -213,5 +219,10 @@ export class RPCCache {
     invalidate(tables) {
         this.indexedDB.invalidate(tables);
         this.ramCache.invalidate(tables);
+        // flag the pending requests as invalidated s.t. we don't write their results in caches
+        for (const key in this.pendingRequests) {
+            this.pendingRequests[key].invalidated = true;
+        }
+        this.pendingRequests = {};
     }
 }
diff --git a/addons/web/static/tests/core/network/rpc_cache.test.js b/addons/web/static/tests/core/network/rpc_cache.test.js
index 49ea46b9e1275..8cc7ebc515a6b 100644
--- a/addons/web/static/tests/core/network/rpc_cache.test.js
+++ b/addons/web/static/tests/core/network/rpc_cache.test.js
@@ -615,6 +615,179 @@ test("RamCache (no update): consecutive calls and rejected promise", async () =>
     expect.verifySteps(["first prom rejected boom", "second prom rejected boom"]);
 });
 
+test("RamCache: pending request and call to invalidate", async () => {
+    const rpcCache = new RPCCache(
+        "mockRpc",
+        1,
+        "85472d41873cdb504b7c7dfecdb8993d90db142c4c03e6d94c4ae37a7771dc5b"
+    );
+
+    const def = new Deferred();
+    rpcCache
+        .read("table", "key", () => {
+            expect.step("fallback first call");
+            return def;
+        })
+        .then((r) => {
+            expect.step(`first prom resolved with ${r}`);
+        });
+    rpcCache.invalidate();
+    rpcCache
+        .read("table", "key", () => {
+            expect.step("fallback second call");
+            return Promise.resolve("another value");
+        })
+        .then((r) => {
+            expect.step(`second prom resolved with ${r}`);
+        });
+
+    def.resolve("some value");
+    await tick();
+    expect.verifySteps([
+        "fallback first call",
+        "fallback second call",
+        "second prom resolved with another value",
+        "first prom resolved with some value",
+    ]);
+
+    // call again to ensure that the correct value is stored in the cache
+    rpcCache
+        .read("table", "key", () => expect.step("should not be called"))
+        .then((r) => {
+            expect.step(`third prom resolved with ${r}`);
+        });
+    await tick();
+    expect.verifySteps(["third prom resolved with another value"]);
+});
+
+test("RamCache: pending request and call to invalidate, update callbacks", async () => {
+    const rpcCache = new RPCCache(
+        "mockRpc",
+        1,
+        "85472d41873cdb504b7c7dfecdb8993d90db142c4c03e6d94c4ae37a7771dc5b"
+    );
+
+    // populate the cache
+    rpcCache.read("table", "key", () => {
+        expect.step("first call: fallback");
+        return Promise.resolve("initial value");
+    });
+    await tick();
+    expect.verifySteps(["first call: fallback"]);
+
+    // read cache again, with update callback
+    const def = new Deferred();
+    rpcCache
+        .read(
+            "table",
+            "key",
+            () => {
+                expect.step("second call: fallback");
+                return def;
+            },
+            {
+                callback: (newValue) => expect.step(`second call: callback ${newValue}`),
+                update: "always",
+            }
+        )
+        .then((r) => expect.step(`second call: resolved with ${r}`));
+    // read it twice, s.t. there's a pending request
+    rpcCache
+        .read(
+            "table",
+            "key",
+            () => {
+                expect.step("should not be called as there's a pending request");
+            },
+            {
+                callback: (newValue) => expect.step(`third call: callback ${newValue}`),
+                update: "always",
+            }
+        )
+        .then((r) => {
+            expect.step(`third call: resolved with ${r}`);
+        });
+    await tick();
+
+    expect.verifySteps([
+        "second call: fallback",
+        "second call: resolved with initial value",
+        "third call: resolved with initial value",
+    ]);
+
+    rpcCache.invalidate();
+    // sanity check to ensure that cache has been invalidated
+    rpcCache.read("table", "key", () => {
+        expect.step("fourth call: fallback");
+        return Promise.resolve("value after invalidation");
+    });
+    expect.verifySteps(["fourth call: fallback"]);
+
+    // resolve def => update callbacks of requests 2 and 3 must be called
+    def.resolve("updated value");
+    await tick();
+    expect.verifySteps([
+        "second call: callback updated value",
+        "third call: callback updated value",
+    ]);
+});
+
+test("RamCache: pending request and call to invalidate, update callbacks in error", async () => {
+    const rpcCache = new RPCCache(
+        "mockRpc",
+        1,
+        "85472d41873cdb504b7c7dfecdb8993d90db142c4c03e6d94c4ae37a7771dc5b"
+    );
+
+    const defs = [new Deferred(), new Deferred()];
+    rpcCache
+        .read("table", "key", () => {
+            expect.step("first call: fallback (error)");
+            return defs[0]; // will be rejected
+        })
+        .catch((e) => expect.step(`first call: rejected with ${e}`));
+
+    // invalidate cache and read again
+    rpcCache.invalidate();
+    rpcCache
+        .read("table", "key", () => {
+            expect.step("second call: fallback");
+            return defs[1];
+        })
+        .then((r) => expect.step(`second call: resolved with ${r}`));
+    await tick();
+
+    expect.verifySteps(["first call: fallback (error)", "second call: fallback"]);
+
+    // reject first def
+    defs[0].reject("my_error");
+    await tick();
+    expect.verifySteps(["first call: rejected with my_error"]);
+
+    // read again, should retrieve same prom as second call which is still pending
+    rpcCache
+        .read("table", "key", () => expect.step("should not be called"))
+        .then((r) => expect.step(`third call: resolved with ${r}`));
+    await tick();
+    expect.verifySteps([]);
+
+    // read again, should retrieve same prom as second call which is still pending (update "always")
+    rpcCache
+        .read("table", "key", () => expect.step("should not be called"), { update: "always" })
+        .then((r) => expect.step(`fourth call: resolved with ${r}`));
+    await tick();
+    expect.verifySteps([]);
+
+    // resolve second def
+    defs[1].resolve("updated value");
+    await tick();
+    expect.verifySteps([
+        "second call: resolved with updated value",
+        "third call: resolved with updated value",
+        "fourth call: resolved with updated value",
+    ]);
+});
+
 test("DiskCache: multiple consecutive calls, empty cache", async () => {
     // The fist call to rpcCache.read saves the promise to the RAM cache.
     // Each next call (before the end of the first call) retrieves the same result as the first call

From 5d37e297bf5d900d502bcd5304647893cb57663e Mon Sep 17 00:00:00 2001
From: "Pedram (PEBR)" <pebr@odoo.com>
Date: Mon, 27 Oct 2025 15:21:31 +0000
Subject: [PATCH 349/673] [FIX] web: Correctly calculate string length in fuzzy
 search

The fuzzy search mechanism (specifically the _match utility) calculates
the length of the string before normalizing it (e.g., with `unaccent`).
However, `unaccent` can remove non-spacing marks (like Thai tone marks
or vowels), which changes the length of the string.

This mismatch caused the search loop to iterate past the end of the
normalized string, leading to incorrect behavior or potential errors.

This commit moves the length calculation to after the string has
been unaccented, ensuring the loop has the correct bounds.

opw-5189276

closes odoo/odoo#234861

X-original-commit: 9f311faae175b3313369f89caf94ccb054f7df4e
Signed-off-by: Pedram Bi Ria (pebr) <pebr@odoo.com>
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/web/static/src/core/utils/search.js        | 3 ++-
 addons/web/static/tests/core/utils/search.test.js | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/core/utils/search.js b/addons/web/static/src/core/utils/search.js
index c33b0b26ca90d..edfa1cc31aa13 100644
--- a/addons/web/static/src/core/utils/search.js
+++ b/addons/web/static/src/core/utils/search.js
@@ -34,12 +34,13 @@ function match(pattern, strs) {
 function _match(pattern, str) {
     let totalScore = 0;
     let currentScore = 0;
-    const len = str.length;
     let patternIndex = 0;
 
     pattern = normalize(pattern);
     str = normalize(str);
 
+    const len = str.length;
+
     for (let i = 0; i < len; i++) {
         if (str[i] === pattern[patternIndex]) {
             patternIndex++;
diff --git a/addons/web/static/tests/core/utils/search.test.js b/addons/web/static/tests/core/utils/search.test.js
index 99be7f14cb881..0ff9a6d138727 100644
--- a/addons/web/static/tests/core/utils/search.test.js
+++ b/addons/web/static/tests/core/utils/search.test.js
@@ -11,6 +11,7 @@ test("fuzzyLookup", () => {
         { name: "Jane Yellow" },
         { name: "Brandon Green" },
         { name: "Jérémy Red" },
+        { name: "สมศรี จู่โจม" },
     ];
     expect(fuzzyLookup("ba", data, (d) => d.name)).toEqual([
         { name: "Brandon Green" },
@@ -25,6 +26,7 @@ test("fuzzyLookup", () => {
         { name: "Jane Yellow" },
     ]);
     expect(fuzzyLookup("", data, (d) => d.name)).toEqual([]);
+    expect(fuzzyLookup("สมศ", data, (d) => d.name)).toEqual([{ name: "สมศรี จู่โจม" }]);
 });
 
 test("fuzzyTest", () => {

From ebf94337d75f6957880f45bad6e8b79aee2ef9f8 Mon Sep 17 00:00:00 2001
From: "Victor Piryns (pivi)" <pivi@odoo.com>
Date: Wed, 5 Nov 2025 11:59:33 +0000
Subject: [PATCH 350/673] [FIX] test_lint: Index lint Many2one inverse for
 inherited fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Many2one fields that originated from an `inherits` model were not
linted for indexing if they were an inverse to a One2many field, because
those fields on the inverse model have `store=False`. The Many2one field
that needs to be indexed is the one on the delegated model.

This commit fixes this by always getting the `base_field` for the
inverse field - if it's an inherited field, it will use the
source field; if not, it will use the field itself.

closes odoo/odoo#234771

X-original-commit: 1c7fac156b2f3f9860e076955462ca1afb070207
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
Signed-off-by: Piryns Victor (pivi) <pivi@odoo.com>
---
 addons/hr/models/hr_version.py            | 4 ++--
 odoo/addons/test_lint/tests/test_index.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr/models/hr_version.py b/addons/hr/models/hr_version.py
index fbf844cebf1fa..b2b06d3b87a0d 100644
--- a/addons/hr/models/hr_version.py
+++ b/addons/hr/models/hr_version.py
@@ -115,10 +115,10 @@ def _default_salary_structure(self):
             ('statutory', 'Statutory'),
             ('apprenticeship', 'Apprenticeship'),
         ], string='Employee Type', default='employee', required=True, groups="hr.group_hr_user", tracking=True)
-    department_id = fields.Many2one('hr.department', check_company=True, tracking=True)
+    department_id = fields.Many2one('hr.department', check_company=True, tracking=True, index=True)
     member_of_department = fields.Boolean("Member of department", compute='_compute_part_of_department', search='_search_part_of_department',
         help="Whether the employee is a member of the active user's department or one of it's child department.")
-    job_id = fields.Many2one('hr.job', check_company=True, tracking=True)
+    job_id = fields.Many2one('hr.job', check_company=True, tracking=True, index=True)
     job_title = fields.Char(compute="_compute_job_title", inverse="_inverse_job_title", store=True, readonly=False,
         string="Job Title", tracking=True)
     is_custom_job_title = fields.Boolean(compute='_compute_is_custom_job_title', store=True, default=False, groups="hr.group_hr_user")
diff --git a/odoo/addons/test_lint/tests/test_index.py b/odoo/addons/test_lint/tests/test_index.py
index 17a36c12efcd2..bdad195057202 100644
--- a/odoo/addons/test_lint/tests/test_index.py
+++ b/odoo/addons/test_lint/tests/test_index.py
@@ -68,7 +68,7 @@ def ignore(o2m_field, m2o_field):
             for field in model._fields.values():
                 if field.type == 'one2many' and field.inverse_name:
                     comodel = self.env[field.comodel_name]
-                    inverse_field = comodel._fields.get(field.inverse_name)
+                    inverse_field = comodel._fields.get(field.inverse_name).base_field
                     if inverse_field and not ignore(field, inverse_field):
                         fields_to_index.add(f"{inverse_field} (inverse of {field})")
         if fields_to_index:

From c199d35ab70d8fbc2b38f2137f362a3b6b0aff5e Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Thu, 6 Nov 2025 13:04:51 +0000
Subject: [PATCH 351/673] [FIX] iot_box_image: remove aiortc version for
 windows

Forcing aiortc version to 1.4.0 on windows made it impossible to install,
we then removed the marker to install the latest.

closes odoo/odoo#234843

X-original-commit: 7c4d7e7d4d5bad855c39301117230921f7ba60c7
Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 setup/iot_box_builder/configuration/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/iot_box_builder/configuration/requirements.txt b/setup/iot_box_builder/configuration/requirements.txt
index c56aed3f4a9fb..a9aba755c47f3 100644
--- a/setup/iot_box_builder/configuration/requirements.txt
+++ b/setup/iot_box_builder/configuration/requirements.txt
@@ -2,7 +2,7 @@
 gatt; sys_platform == "linux" and "rpi" in platform_release
 
 # The following requirements are needed only on Windows Virtual IoT:
-aiortc==1.4.0; sys_platform == "win32"
+aiortc; sys_platform == "win32"
 ghostscript==0.7; sys_platform == "win32"
 decorator; sys_platform == "win32"
 

From 8afb85dca5ff43fa9a78868b6c270589ac11d32b Mon Sep 17 00:00:00 2001
From: Serhii Rubanskyi <seru@odoo.com>
Date: Wed, 8 Oct 2025 15:04:11 +0000
Subject: [PATCH 352/673] [FIX] website: prevent editing input field in the
 edit mode on firefox

Since the [html_builder refactoring], it's possible to type something
inside of an input while in the edit mode on Firefox, which is not
the expected behavior and which is not the case in other browsers, for
example, Chrome.
Steps to see the issue:
- Open Website and start editing
- Drop a searchbar
- Click on the input
- Type something

=> It will remove the searchbar and add text to the searchbar button.
This happens because of the different behavior on Chrome and Firefox of
`pointer-events`. When the input has `pointer-events` set to
`none` Chrome blocks any activity on it, including `beforeinput` events,
but Firefox doesn't.
This commit fixes this problem making the input not `contenteditable`.

task-5144517

[html_builder refactoring]: https://github.com/odoo/odoo/commit/9fe45e2b7ddbbfd0445ffe25a859e67a316d02b2

closes odoo/odoo#234804

X-original-commit: 46dc2beb63d524714a1442f8e528acdb1419fe0b
Signed-off-by: Denis Rygaert <dery@odoo.com>
Signed-off-by: Serhii Rubanskyi (seru) <seru@odoo.com>
---
 .../plugins/options/searchbar_option_plugin.js        |  4 ++++
 .../builder/website_builder/searchbar_option.test.js  | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js b/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
index 489fc02d5a3e9..eefd582f0a764 100644
--- a/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
@@ -52,6 +52,10 @@ class SearchbarOptionPlugin extends Plugin {
                 dependency: "search_all_opt",
             },
         ],
+        // input group should not be contenteditable, while all other children
+        // beside the input are contenteditable
+        content_not_editable_selectors: [".input-group:has( > input)"],
+        content_editable_selectors: [".input-group:has( > input) > *:not(input)"],
     };
 }
 
diff --git a/addons/website/static/tests/builder/website_builder/searchbar_option.test.js b/addons/website/static/tests/builder/website_builder/searchbar_option.test.js
index da175d4043e10..25bd73be834c7 100644
--- a/addons/website/static/tests/builder/website_builder/searchbar_option.test.js
+++ b/addons/website/static/tests/builder/website_builder/searchbar_option.test.js
@@ -89,3 +89,14 @@ test("Switching search type keeps 'order by' option if it exists on both types",
     expect("[data-label='Search within'] button.o-dropdown").toHaveText("Everything");
     expect("[data-label='Order by'] button.o-dropdown").toHaveText("something");
 });
+
+test("Input parent is not contenteditable, while all other children beside the input are", async () => {
+    await setupWebsiteBuilder(searchbarHTML("name asc"));
+
+    expect(":iframe .input-group:has(:scope > input)").toHaveAttribute("contenteditable", "false");
+
+    expect(":iframe .input-group:has(:scope > input) > *:not(input)").toHaveAttribute(
+        "contenteditable",
+        "true"
+    );
+});

From 34fccb865a530ef107c1710d8c9d81df230dc835 Mon Sep 17 00:00:00 2001
From: "Thomas Becquevort (thbe)" <thbe@odoo.com>
Date: Wed, 13 Aug 2025 16:02:26 +0200
Subject: [PATCH 353/673] [FIX] website_forum: editable recipient_id

Since ForumVotePost.recipient_id is related stored, it is possible to perform
actions faking doing them on the post_id.create_uid while actually chosing a
recipient_id arbitrarily.

task-5220103
---
 addons/website_forum/models/forum_post_vote.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website_forum/models/forum_post_vote.py b/addons/website_forum/models/forum_post_vote.py
index aed264bac6242..7ab47abbe7252 100644
--- a/addons/website_forum/models/forum_post_vote.py
+++ b/addons/website_forum/models/forum_post_vote.py
@@ -45,6 +45,8 @@ def create(self, vals_list):
         if not self.env.is_admin():
             for vals in vals_list:
                 vals.pop('user_id', None)
+                vals.pop('recipient_id', None)
+            self = self.with_context({k: v for k, v in self.env.context.items() if k not in ['default_user_id', 'default_recipient_id']})  # noqa: PLW0642
 
         votes = super().create(vals_list)
 
@@ -60,6 +62,7 @@ def write(self, vals):
         # can't modify owner of a vote
         if not self.env.is_admin():
             vals.pop('user_id', None)
+            vals.pop('recipient_id', None)
 
         for vote in self:
             vote._check_general_rights(vals)

From 85c99ca6a8edad4a47b7a82f484cda2fcfdc0c62 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Thu, 6 Nov 2025 07:12:43 +0000
Subject: [PATCH 354/673] [REF] core: frozendict typing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add typing to `frozendict`. It returns generic mapping.

closes odoo/odoo#234676

Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 odoo/orm/models.py | 4 ++--
 odoo/tools/misc.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index 461cfef904312..a6dfdbdc5a95a 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -400,7 +400,7 @@ class BaseModel(metaclass=MetaModel):
         * If :attr:`._name` is set, name(s) of parent models to inherit from
         * If :attr:`._name` is unset, name of a single model to extend in-place
     """
-    _inherits: frozendict[str, str] = frozendict()
+    _inherits: Mapping[str, str] = frozendict()
     """dictionary {'parent_model': 'm2o_field'} mapping the _name of the parent business
     objects to the names of the corresponding foreign key fields to use::
 
@@ -457,7 +457,7 @@ class BaseModel(metaclass=MetaModel):
     through an environment using `sudo` or a more privileged user.
     """
 
-    _depends: frozendict[str, Iterable[str]] = frozendict()
+    _depends: Mapping[str, Iterable[str]] = frozendict()
     """dependencies of models backed up by SQL views
     ``{model_name: field_names}``, where ``field_names`` is an iterable.
     This is only used to determine the changes to flush to database before
diff --git a/odoo/tools/misc.py b/odoo/tools/misc.py
index 0bc7d50946e28..ce65e168f4035 100644
--- a/odoo/tools/misc.py
+++ b/odoo/tools/misc.py
@@ -1612,7 +1612,7 @@ def format_duration(value: float) -> str:
 consteq = hmac_lib.compare_digest
 
 
-class _HashDict(dict):
+class _HashDict[K, V](dict[K, V]):
     """ Simple extension of ``dict`` that provides a hash function.
         For the hash to be correct, one should not modify the dict's content.
     """
@@ -1623,7 +1623,7 @@ def __hash__(self):
         return hash(frozenset((key, freehash(val)) for key, val in self.items()))
 
 
-def frozendict(mapping=(), /, **kw) -> MappingProxyType:
+def frozendict[K, V](mapping: Iterable[tuple[K, V]] | Mapping[K, V] = (), /, **kw: V) -> MappingProxyType[K, V]:
     """ Return an immutable copy of a mapping.
         This allows the returned proxy mapping to be hashed.
         The reference to the newly created internal dictionary is not

From 663bfbc5fb1eb2c53180204970bc65ba2fdc5e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Lef=C3=A8vre=20=28mlef=29?= <mlef@odoo.com>
Date: Fri, 31 Oct 2025 16:37:22 +0100
Subject: [PATCH 355/673] [FIX] hr_holidays_attendance: Fix traceback on hourly
 extra hours

A stacktrace would be shown when clicking on the "Monthly Hours" smart
button, when "Display Extra Hours" is checked in Configuration/Settings

This was due to a missing comma in the domain creation.
When reviewing the code that was causing the crash, we noticed that the
wrong domain was used on the wrong model to fetch overtime data.

Also, the function needed logic from hr_holidays (and not just
hr_attendance). So I needed to move that to the hr_holidays_attendance.

Moreover, the correct values were not displayed in the JS list
view (that adds a small summary on top of the list). I had to
investigate and fetch the correct info about the selected employee's overtime.

task-5106638

closes odoo/odoo#234319

Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
---
 addons/hr_attendance/models/hr_employee.py    | 13 ---
 .../hr_attendance/views/hr_employee_view.xml  |  2 +-
 .../models/hr_employee.py                     | 61 +++++++++-----
 .../static/src/views/extra_hours_list_view.js | 25 +++---
 .../src/views/extra_hours_list_view.xml       |  6 +-
 .../tests/test_holidays_overtime.py           | 80 +++++++++++++++++++
 .../views/hr_employee_views.xml               | 10 +++
 7 files changed, 147 insertions(+), 50 deletions(-)
 rename addons/{hr_attendance => hr_holidays_attendance}/static/src/views/extra_hours_list_view.js (58%)
 rename addons/{hr_attendance => hr_holidays_attendance}/static/src/views/extra_hours_list_view.xml (80%)

diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 818101c22cf74..ed47c7ac02fd1 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -201,19 +201,6 @@ def _attendance_action_change(self, geo_information=None):
                 empl_name=self.sudo().name))
         return attendance
 
-    @api.model
-    def get_overtime_data(self, domain=None, employee_id=None):
-        domain = [] if domain is None else domain
-        validated_overtime = {
-            attendance[0].id: attendance[1]
-            for attendance in self.env["hr.attendance"]._read_group(
-                domain=domain,
-                groupby=['employee_id'],
-                aggregates=['validated_overtime_hours:sum']
-            )
-        }
-        return {"validated_overtime": validated_overtime, "overtime_adjustments": {}}
-
     def action_open_last_month_attendances(self):
         self.ensure_one()
         return {
diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml
index 3fb68d2d7a2c7..45179bac1759b 100644
--- a/addons/hr_attendance/views/hr_employee_view.xml
+++ b/addons/hr_attendance/views/hr_employee_view.xml
@@ -127,7 +127,7 @@
         <field name="name">hr.attendance.list</field>
         <field name="model">hr.attendance</field>
         <field name="arch" type="xml">
-            <list sample="1" js_class="extra_hours_list_view">
+            <list sample="1">
                 <field name="check_in"/>
                 <field name="check_out"/>
                 <field name="worked_hours" string="Work Hours" widget="float_time"/>
diff --git a/addons/hr_holidays_attendance/models/hr_employee.py b/addons/hr_holidays_attendance/models/hr_employee.py
index 291f6ce8a0dc7..b80cb4802b5b3 100644
--- a/addons/hr_holidays_attendance/models/hr_employee.py
+++ b/addons/hr_holidays_attendance/models/hr_employee.py
@@ -1,30 +1,47 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import models, api
-from odoo.fields import Domain
+from odoo import models
 
 
 class HrEmployee(models.Model):
     _inherit = "hr.employee"
 
-    @api.model
-    def get_overtime_data(self, domain=None, employee_id=None):
-        overtime_data = super().get_overtime_data(domain, employee_id)
-        domain = [] if domain is None else domain
-        overtime_adjustments = {
-            allocation[0].id: allocation[1]
-            for allocation in self.env["hr.leave.allocation"]._read_group(
-                domain=Domain.AND(
-                    domain,
-                    [
-                        ('holiday_status_id.overtime_deductible', '=', True),
-                        ('state', '=', 'confirm'),
-                    ]),
-                groupby=['employee_id'],
-                aggregates=['number_of_hours_display:sum']
+    def get_overtime_data_by_employee(self):
+        """
+        Provide a summary of an employee's overtime.
+        A compensable overtime is an overtime that can be cumulated to be used
+        as time off.
+        Extra hours and overtime is used interchangably.
+        """
+        # Make so that at least all employees are present in return value
+        overtime_data = {}
+        for employee_id in self.ids:
+            overtime_data[employee_id] = {
+                "compensable_overtime": 0,
+                "not_compensable_overtime": 0,
+                "unspent_compensable_overtime": 0,
+            }
+
+        unspent_overtime = self.env[
+            'hr.leave'
+        ]._get_deductible_employee_overtime(self)
+        for employee in unspent_overtime:
+            overtime_data[employee.id]['unspent_compensable_overtime'] += max(
+                0, unspent_overtime[employee]
             )
-        }
-        overtime_data.update({
-            'overtime_adjustments': overtime_adjustments
-        })
+
+        all_overtimes = self.env['hr.attendance.overtime.line']._read_group(
+            domain=[
+                ('employee_id', 'in', self.ids),
+            ],
+            groupby=["employee_id", "compensable_as_leave"],
+            aggregates=["duration:sum"],
+        )
+        for employee, is_compensable, amount in all_overtimes:
+            overtime_type = (
+                'compensable_overtime'
+                if is_compensable
+                else 'not_compensable_overtime'
+            )
+            overtime_data[employee.id][overtime_type] += amount
+
         return overtime_data
diff --git a/addons/hr_attendance/static/src/views/extra_hours_list_view.js b/addons/hr_holidays_attendance/static/src/views/extra_hours_list_view.js
similarity index 58%
rename from addons/hr_attendance/static/src/views/extra_hours_list_view.js
rename to addons/hr_holidays_attendance/static/src/views/extra_hours_list_view.js
index db950e24bbb15..6bde6ce88f02a 100644
--- a/addons/hr_attendance/static/src/views/extra_hours_list_view.js
+++ b/addons/hr_holidays_attendance/static/src/views/extra_hours_list_view.js
@@ -1,10 +1,10 @@
 import { Component, useState, useEffect } from "@odoo/owl";
-
 import { ListRenderer } from "@web/views/list/list_renderer";
 import { listView } from "@web/views/list/list_view";
 import { registry } from "@web/core/registry";
 import { useService } from "@web/core/utils/hooks";
 
+// Adds an overtime summary at the top of the monthly hours list
 export class ExtraHoursSummary extends Component {
     static template = "hr_attendance.ExtraHoursSummary";
     static props = {};
@@ -14,8 +14,9 @@ export class ExtraHoursSummary extends Component {
         this.floatTime = registry.category("formatters").get("float_time");
         this.state = useState({
             totalExtraHours: 0,
-            totalOvertimeAdjustment: 0,
-            remainingExtraHours: 0
+            compensableExtraHours: 0,
+            timeOffTaken: 0,
+            remainingExtraHours: 0,
         });
 
         useEffect(() => {
@@ -31,16 +32,14 @@ export class ExtraHoursSummary extends Component {
         if (!this.shouldDisplay) {
             return;
         }
-        const { context, domain } = this.env.searchModel;
-        const employeeId = context.employee_id;
-        const { overtime_adjustments = {}, validated_overtime = {} } =
-            await this.orm.call("hr.employee", "get_overtime_data", [domain, employeeId]);
-        const validatedOvertimeHours = validated_overtime[employeeId] || 0;
-        const adjustmentOvertimeHours = overtime_adjustments[employeeId] || 0;
-        const remainingOvertimeHours = validatedOvertimeHours + adjustmentOvertimeHours;
-        this.state.totalExtraHours = this.floatTime(validatedOvertimeHours);
-        this.state.totalOvertimeAdjustment = this.floatTime(adjustmentOvertimeHours);
-        this.state.remainingExtraHours = this.floatTime(remainingOvertimeHours);
+        const employeeId = this.env.searchModel.context.employee_id;
+        const overtime_data = (await this.orm.call("hr.employee", "get_overtime_data_by_employee", [employeeId]))[employeeId];
+        /* overtime_data is currently in float value. We need to format it
+           before showing it in the UI */
+        this.state.totalExtraHours = this.floatTime(overtime_data['compensable_overtime'] + overtime_data['not_compensable_overtime']);
+        this.state.compensableExtraHours = this.floatTime(overtime_data['compensable_overtime']);
+        this.state.timeOffTaken = this.floatTime(overtime_data['compensable_overtime'] - overtime_data['unspent_compensable_overtime']);
+        this.state.remainingExtraHours = this.floatTime(overtime_data['unspent_compensable_overtime']);
     }
 }
 
diff --git a/addons/hr_attendance/static/src/views/extra_hours_list_view.xml b/addons/hr_holidays_attendance/static/src/views/extra_hours_list_view.xml
similarity index 80%
rename from addons/hr_attendance/static/src/views/extra_hours_list_view.xml
rename to addons/hr_holidays_attendance/static/src/views/extra_hours_list_view.xml
index 62ac2a5bafeb3..e95f6d6200b48 100644
--- a/addons/hr_attendance/static/src/views/extra_hours_list_view.xml
+++ b/addons/hr_holidays_attendance/static/src/views/extra_hours_list_view.xml
@@ -8,9 +8,13 @@
                     <span>Total Extra Hours Worked:</span>
                     <span><t t-out="this.state.totalExtraHours"/></span>
                 </div>
+                <div class="d-flex justify-content-between">
+                    <span>Total Compensable Extra Hours:</span>
+                    <span><t t-out="this.state.compensableExtraHours"/></span>
+                </div>
                 <div class="d-flex justify-content-between">
                     <span>Time Off Taken from Extra Hours:</span>
-                    <span><t t-out="this.state.totalOvertimeAdjustment"/></span>
+                    <span><t t-out="this.state.timeOffTaken"/></span>
                 </div>
             </div>
             <hr/>
diff --git a/addons/hr_holidays_attendance/tests/test_holidays_overtime.py b/addons/hr_holidays_attendance/tests/test_holidays_overtime.py
index 9d737e5abd679..1bc0ed2676376 100644
--- a/addons/hr_holidays_attendance/tests/test_holidays_overtime.py
+++ b/addons/hr_holidays_attendance/tests/test_holidays_overtime.py
@@ -271,3 +271,83 @@ def test_overtime_approval_after_refusal(self):
 
         leave.with_user(self.user_manager).action_approve(check_state=False)
         self._check_deductible(8)
+
+    def test_get_overtime_data_by_employee(self):
+        # Even if employee has not overtime, it should still appear in return
+        # value
+        expected_overtime_data = {
+            'compensable_overtime': 0,
+            'not_compensable_overtime': 0,
+            'unspent_compensable_overtime': 0,
+        }
+        overtime_data = self.employee.get_overtime_data_by_employee()
+        self.assertEqual(
+            overtime_data[self.employee.id],
+            expected_overtime_data,
+            "get_overtime_data_by_employee() did not return an empty overtime_data",
+        )
+
+        # These attendances will create some extra hours that is deductible as
+        # time off
+        self.new_attendance(
+            check_in=datetime(2021, 1, 1, 8), check_out=datetime(2021, 1, 1, 20)
+        )
+        self.new_attendance(
+            check_in=datetime(2021, 1, 2, 4), check_out=datetime(2021, 1, 2, 20)
+        )
+        self.new_attendance(
+            check_in=datetime(2021, 2, 2, 4), check_out=datetime(2021, 2, 2, 18)
+        )
+
+        # The extra hours from the next attendances will not be deductible as
+        # time off. Affects compensable_overtime's value.
+        not_compensable_ruleset = self.env[
+            'hr.attendance.overtime.ruleset'
+        ].create(
+            {
+                'name': 'Ruleset schedule quantity',
+                'rule_ids': [
+                    Command.create(
+                        {
+                            'name': 'Extra Mile',
+                            'base_off': 'quantity',
+                            'expected_hours_from_contract': True,
+                            'quantity_period': 'day',
+                            'compensable_as_leave': False,
+                        }
+                    ),
+                ],
+            }
+        )
+        self.employee.ruleset_id = not_compensable_ruleset
+
+        # Creates extra hours, but won't be usable as time off
+        # Affects not_compensable_overtime's value.
+        self.new_attendance(
+            check_in=datetime(2021, 3, 3, 5), check_out=datetime(2021, 3, 3, 20)
+        )
+
+        # Use some of the overtime as a day off (8 hours)
+        # Affects unspent_compensable_time's value
+        leave = self.env['hr.leave'].create(
+            {
+                'name': 'no overtime',
+                'employee_id': self.employee.id,
+                'holiday_status_id': self.leave_type_no_alloc.id,
+                'request_date_from': '2022-1-6',
+                'request_date_to': '2022-1-6',
+            }
+        )
+        leave.with_user(self.user_manager).action_approve()
+
+        expected_overtime_data = {
+            'compensable_overtime': 24.0,
+            'not_compensable_overtime': 6.0,
+            'unspent_compensable_overtime': 16.0,
+        }
+        overtime_data = self.employee.get_overtime_data_by_employee()
+        self.assertEqual(
+            overtime_data[self.employee.id],
+            expected_overtime_data,
+            "get_overtime_data_by_employee() did not return the expected values",
+        )
diff --git a/addons/hr_holidays_attendance/views/hr_employee_views.xml b/addons/hr_holidays_attendance/views/hr_employee_views.xml
index d6ac152a50203..6214664904780 100644
--- a/addons/hr_holidays_attendance/views/hr_employee_views.xml
+++ b/addons/hr_holidays_attendance/views/hr_employee_views.xml
@@ -20,4 +20,14 @@
         </field>
     </record>
 
+    <record id="hr_attendance_employee_simple_tree_view" model="ir.ui.view">
+        <field name="name">hr.attendance.employee.simple.tree.view.inherit.hr_holidays_attendance</field>
+        <field name="model">hr.attendance</field>
+        <field name="inherit_id" ref="hr_attendance.hr_attendance_employee_simple_tree_view"/>
+        <field name="arch" type="xml">
+            <list position="attributes">
+                <attribute name="js_class">extra_hours_list_view</attribute>
+            </list>
+        </field>
+    </record>
 </odoo>

From 10f3e8916b07aaa838ec44d739b86f93dbf941ae Mon Sep 17 00:00:00 2001
From: std-odoo <std@odoo.com>
Date: Wed, 1 Oct 2025 12:49:35 +0000
Subject: [PATCH 356/673] [FIX] google_gmail, microsoft_outlook: fix error
 message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug
===
When both module are installed, one overwrite the error messages of the
other, because the methods have the same name.

For database without enterprise, they won't have a subscription. We
don't want to try reaching IAP in that case, and so we show a generic
error message. For simplicity, we didn't make a bridge module just for
that error, and we just check the version.

Task-5113992

closes odoo/odoo#234612

X-original-commit: 2aa7842599ce719ada9d2e7463e6e8f90ef56c7f
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Stéphane Debauche (std) <std@odoo.com>
---
 .../google_gmail/models/google_gmail_mixin.py  | 18 +++++++++++-------
 addons/google_gmail/tools.py                   |  6 ++++++
 .../models/microsoft_outlook_mixin.py          | 18 ++++++++++--------
 3 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 addons/google_gmail/tools.py

diff --git a/addons/google_gmail/models/google_gmail_mixin.py b/addons/google_gmail/models/google_gmail_mixin.py
index e432bffcad2bc..bab48fb4699e5 100644
--- a/addons/google_gmail/models/google_gmail_mixin.py
+++ b/addons/google_gmail/models/google_gmail_mixin.py
@@ -8,9 +8,10 @@
 
 from werkzeug.urls import url_encode
 
-from odoo import _, fields, models, tools
+from odoo import _, fields, models, tools, release
 from odoo.exceptions import AccessError, UserError
 from odoo.tools.urls import urljoin as url_join
+from odoo.addons.google_gmail.tools import get_iap_error_message
 
 GMAIL_TOKEN_REQUEST_TIMEOUT = 5
 
@@ -26,6 +27,8 @@ class GoogleGmailMixin(models.AbstractModel):
 
     _description = 'Google Gmail Mixin'
 
+    # The scope `https://mail.google.com/` is needed for SMTP and IMAP
+    # https://developers.google.com/workspace/gmail/imap/xoauth2-protocol
     _SERVICE_SCOPE = 'https://mail.google.com/ https://www.googleapis.com/auth/userinfo.email'
     _DEFAULT_GMAIL_IAP_ENDPOINT = 'https://gmail.api.odoo.com'
 
@@ -85,8 +88,13 @@ def open_google_gmail_uri(self):
         is_configured = google_gmail_client_id and google_gmail_client_secret
 
         if not is_configured:  # use IAP (see '/google_gmail/iap_confirm')
+            if release.version_info[-1] != 'e':
+                raise UserError(_('Please configure your Gmail credentials.'))
+
             gmail_iap_endpoint = self.env['ir.config_parameter'].sudo().get_str(
-                'mail.server.gmail.iap.endpoint') or self._DEFAULT_GMAIL_IAP_ENDPOINT
+                'mail.server.gmail.iap.endpoint',
+                self._DEFAULT_GMAIL_IAP_ENDPOINT,
+            )
             db_uuid = self.env['ir.config_parameter'].sudo().get_str('database.uuid')
 
             # final callback URL that will receive the token from IAP
@@ -221,11 +229,7 @@ def _fetch_gmail_access_token_iap(self, refresh_token):
         return response
 
     def _raise_iap_error(self, error):
-        errors = {
-            "not_configured": _("Gmail is not configured on IAP."),
-            "no_subscription": _("You don't have an active subscription."),
-        }
-        raise UserError(_('An error occurred: %s.', errors.get(error, error)))
+        raise UserError(get_iap_error_message(self.env, error))
 
     def _generate_oauth2_string(self, user, refresh_token):
         """Generate a OAuth2 string which can be used for authentication.
diff --git a/addons/google_gmail/tools.py b/addons/google_gmail/tools.py
new file mode 100644
index 0000000000000..62b6a923f1e8b
--- /dev/null
+++ b/addons/google_gmail/tools.py
@@ -0,0 +1,6 @@
+def get_iap_error_message(env, error):
+    errors = {
+        "not_configured": env._("Something went wrong. Try again later"),
+        "no_subscription": env._("You don't have an active subscription"),
+    }
+    return errors.get(error, error)
diff --git a/addons/microsoft_outlook/models/microsoft_outlook_mixin.py b/addons/microsoft_outlook/models/microsoft_outlook_mixin.py
index 9e2cf364a5e2e..8cf57fa392843 100644
--- a/addons/microsoft_outlook/models/microsoft_outlook_mixin.py
+++ b/addons/microsoft_outlook/models/microsoft_outlook_mixin.py
@@ -8,10 +8,11 @@
 
 from werkzeug.urls import url_encode
 
-from odoo import _, api, fields, models
+from odoo import _, api, fields, models, release
 from odoo.exceptions import AccessError, UserError
 from odoo.tools import hmac, email_normalize
 from odoo.tools.urls import urljoin as url_join
+from odoo.addons.google_gmail.tools import get_iap_error_message
 
 _logger = logging.getLogger(__name__)
 
@@ -87,8 +88,13 @@ def open_microsoft_outlook_uri(self):
         is_configured = microsoft_outlook_client_id and microsoft_outlook_client_secret
 
         if not is_configured:  # use IAP (see '/microsoft_outlook/iap_confirm')
+            if release.version_info[-1] != 'e':
+                raise UserError(_('Please configure your Outlook credentials.'))
+
             outlook_iap_endpoint = self.env['ir.config_parameter'].sudo().get_str(
-                'mail.server.outlook.iap.endpoint') or self._DEFAULT_OUTLOOK_IAP_ENDPOINT
+                'mail.server.outlook.iap.endpoint',
+                self._DEFAULT_OUTLOOK_IAP_ENDPOINT,
+            )
             db_uuid = self.env['ir.config_parameter'].sudo().get_str('database.uuid')
 
             # final callback URL that will receive the token from IAP
@@ -120,7 +126,7 @@ def open_microsoft_outlook_uri(self):
             microsoft_outlook_uri = self.microsoft_outlook_uri
 
         if not microsoft_outlook_uri:
-            raise UserError(_('Please configure your outlook credentials.'))
+            raise UserError(_('Please configure your Outlook credentials.'))
 
         return {
             'type': 'ir.actions.act_url',
@@ -226,11 +232,7 @@ def _fetch_outlook_access_token_iap(self, refresh_token):
         return response
 
     def _raise_iap_error(self, error):
-        errors = {
-            "not_configured": _("Outlook is not configured on IAP."),
-            "no_subscription": _("You don't have an active subscription."),
-        }
-        raise UserError(_('An error occurred: %s.', errors.get(error, error)))
+        raise UserError(get_iap_error_message(self.env, error))
 
     def _generate_outlook_oauth2_string(self, login):
         """Generate a OAuth2 string which can be used for authentication.

From 7f7f69e7ce8b3015c9da57a78b5ca7ebe0f81591 Mon Sep 17 00:00:00 2001
From: djameltouati <otd@odoo.com>
Date: Mon, 3 Nov 2025 10:50:39 +0000
Subject: [PATCH 357/673] [FIX] mrp: raise UserError when canceling a done MO
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
- Enable multi-step routes.
- Go to Warehouse:
    - Manufacturing Operations
        - Enable 3 steps.
- Create a storable product P1.
- Create a MO to produce one unit of P1.
- Validate the MO.
- Go to the MO list view.
- Select the MO.
- Try to cancel it.

Issue:
The MO is not canceled, but the picking from production to stock is
canceled instead.
A done MO should not be cancelable — a UserError should be raised.

opw-5216220

closes odoo/odoo#234849

X-original-commit: 06ad6292b4b4737a2d47a730a45b5c56ed823b7f
Related: odoo/enterprise#99052
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Djamel Touati (otd) <otd@odoo.com>
---
 addons/mrp/models/mrp_production.py |  7 +++++++
 addons/mrp/tests/test_cancel_mo.py  | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index e198db36a9a69..1bf60ef3df767 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -1056,6 +1056,11 @@ def unlink(self):
             workorders_to_delete.unlink()
         return super(MrpProduction, self).unlink()
 
+    @api.ondelete(at_uninstall=True)
+    def _unlink_if_not_done(self):
+        if any(mo.state == 'done' for mo in self):
+            raise UserError(_("You cannot delete a manufacturing order that is already done."))
+
     def copy_data(self, default=None):
         default = dict(default or {})
         vals_list = super().copy_data(default=default)
@@ -1743,6 +1748,8 @@ def _action_generate_backorder_wizard(self, quantity_issues):
     def action_cancel(self):
         """ Cancels production order, unfinished stock moves and set procurement
         orders in exception """
+        if any(mo.state == 'done' for mo in self):
+            raise UserError(_("You cannot cancel a manufacturing order that is already done."))
         self._action_cancel()
         return True
 
diff --git a/addons/mrp/tests/test_cancel_mo.py b/addons/mrp/tests/test_cancel_mo.py
index 185d317d1042e..12e39c5cbe299 100644
--- a/addons/mrp/tests/test_cancel_mo.py
+++ b/addons/mrp/tests/test_cancel_mo.py
@@ -117,3 +117,25 @@ def test_cancel_mo_without_component(self):
 
         self.assertEqual(mo.move_finished_ids.state, 'cancel')
         self.assertEqual(mo.state, 'cancel')
+
+    def test_cannot_cancel_done_mo_with_three_steps(self):
+        """Test that a done manufacturing order cannot be canceled.
+
+        The test ensures that when the warehouse uses a 3-step manufacturing route (Pick → Produce → Store),
+        attempting to cancel a manufacturing order that is already in 'done' state raises a UserError.
+        It also verifies that the linked pickings are not canceled in this case.
+        """
+        # Enable 3-step manufacturing process
+        self.warehouse_1.manufacture_steps = 'pbm_sam'
+        # Create and confirm a manufacturing order
+        mo = self.env['mrp.production'].create({
+            'bom_id': self.bom_1.id,
+        })
+        mo.action_confirm()
+        mo.button_mark_done()
+        self.assertEqual(mo.state, 'done')
+        with self.assertRaises(UserError):
+            mo.action_cancel()
+        self.assertNotEqual(mo.picking_ids.mapped('state'), ['cancel', 'cancel'])
+        with self.assertRaises(UserError):
+            mo.unlink()

From 18c8aa350afacce0e712a5e4c4ec7657e2446b9f Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Thu, 10 Jul 2025 09:37:46 +0000
Subject: [PATCH 358/673] [FIX] sale_stock: delivered orders should be marked
 as invoiced

If no other operations are expected on the picking, even if the full
quantity wasn't delivered, the order should be marked as invoiced.

task-4607401

closes odoo/odoo#234852

X-original-commit: 133f201c0f3136fb39b5c9beadc71a0eab8cba30
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/sale_stock/models/sale_order_line.py | 25 +++++++++++
 addons/sale_stock/tests/test_sale_stock.py  | 50 ++++++++++++++++++++-
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/addons/sale_stock/models/sale_order_line.py b/addons/sale_stock/models/sale_order_line.py
index 5770607c25a01..60aeda639d37f 100644
--- a/addons/sale_stock/models/sale_order_line.py
+++ b/addons/sale_stock/models/sale_order_line.py
@@ -210,6 +210,31 @@ def _compute_qty_delivered(self):
                     qty -= move.product_uom._compute_quantity(move.quantity, line.product_uom_id, rounding_method='HALF-UP')
                 line.qty_delivered = qty
 
+    def _compute_invoice_status(self):
+        def check_moves_state(moves):
+            # All moves states are either 'done' or 'cancel', and there is at least one 'done'
+            at_least_one_done = False
+            for move in moves:
+                if move.state not in ['done', 'cancel']:
+                    return False
+                at_least_one_done = at_least_one_done or move.state == 'done'
+            return at_least_one_done
+        super()._compute_invoice_status()
+        for line in self:
+            # We handle the following specific situation: a physical product is partially delivered,
+            # but we would like to set its invoice status to 'Fully Invoiced'. The use case is for
+            # products sold by weight, where the delivered quantity rarely matches exactly the
+            # quantity ordered.
+            if (
+                line.state == 'sale'
+                and line.invoice_status == 'no'
+                and line.product_id.type in ['consu', 'product']
+                and line.product_id.invoice_policy == 'delivery'
+                and line.move_ids
+                and check_moves_state(line.move_ids)
+            ):
+                line.invoice_status = 'invoiced'
+
     @api.model_create_multi
     def create(self, vals_list):
         lines = super().create(vals_list)
diff --git a/addons/sale_stock/tests/test_sale_stock.py b/addons/sale_stock/tests/test_sale_stock.py
index df0638a1705eb..7ae00e7423c3e 100644
--- a/addons/sale_stock/tests/test_sale_stock.py
+++ b/addons/sale_stock/tests/test_sale_stock.py
@@ -240,7 +240,55 @@ def test_02_sale_stock_return(self):
         adv_wiz.create_invoices()
         self.inv_2 = self.so.invoice_ids.filtered(lambda r: r.state == 'draft')
         self.assertAlmostEqual(self.inv_2.invoice_line_ids.sorted()[0].quantity, 2.0, msg='Sale Stock: refund quantity on the invoice should be 2.0 instead of "%s".' % self.inv_2.invoice_line_ids.sorted()[0].quantity)
-        self.assertEqual(self.so.invoice_status, 'no', 'Sale Stock: so invoice_status should be "no" instead of "%s" after invoicing the return' % self.so.invoice_status)
+        self.assertEqual(self.so.invoice_status, 'invoiced', 'Sale Stock: so invoice_status should be "invoiced" instead of "%s" after invoicing the return' % self.so.invoice_status)
+
+    def test_03_sale_stock_delivery_partial(self):
+        """
+        Test a SO with a product invoiced on delivery. Deliver partially and invoice the SO, when
+        the SO is set on 'done', the SO should be fully invoiced.
+        """
+        self.product = self.company_data['product_delivery_no']
+        so_vals = {
+            'partner_id': self.partner_a.id,
+            'partner_invoice_id': self.partner_a.id,
+            'partner_shipping_id': self.partner_a.id,
+            'order_line': [(0, 0, {
+                'name': self.product.name,
+                'product_id': self.product.id,
+                'product_uom_qty': 5.0,
+                'product_uom_id': self.product.uom_id.id,
+                'price_unit': self.product.list_price,
+            })],
+        }
+        self.so = self.env['sale.order'].create(so_vals)
+
+        # confirm our standard so, check the picking
+        self.so.action_confirm()
+        self.assertTrue(self.so.picking_ids, 'Sale Stock: no picking created for "invoice on delivery" storable products')
+
+        # invoice in on delivery, nothing should be invoiced
+        self.assertEqual(self.so.invoice_status, 'no', 'Sale Stock: so invoice_status should be "nothing to invoice"')
+
+        # deliver partially
+        pick = self.so.picking_ids
+        pick.move_ids.write({'quantity': 4})
+        res_dict = pick.button_validate()
+        wizard = Form(self.env[(res_dict.get('res_model'))].with_context(res_dict['context'])).save()
+        wizard.process_cancel_backorder()
+
+        # Check Exception error is logged on SO
+        activity = self.env['mail.activity'].search([('res_id', '=', self.so.id), ('res_model', '=', 'sale.order')])
+        self.assertEqual(len(activity), 1, 'When no backorder is created for a partial delivery, a warning error should be logged in its origin SO')
+
+        # Check quantity delivered
+        del_qty = sum(sol.qty_delivered for sol in self.so.order_line)
+        self.assertEqual(del_qty, 4.0, 'Sale Stock: delivered quantity should be 4.0 after partial delivery')
+
+        # Check invoice
+        self.assertEqual(self.so.invoice_status, 'to invoice', 'Sale Stock: so invoice_status should be "to invoice" before invoicing')
+        self.inv_1 = self.so._create_invoices()
+        self.assertEqual(len(self.inv_1), 1, 'Sale Stock: only one invoice should be created')
+        self.assertEqual(self.so.invoice_status, 'invoiced', 'Sale Stock: so invoice_status should be "invoiced" when set to done')
 
     def test_04_create_picking_update_saleorderline(self):
         """

From e84bae089593a2706cf85905452014892550a3b3 Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Wed, 5 Nov 2025 10:39:31 +0000
Subject: [PATCH 359/673] [IMP] setup: bump windows iot box checkout version

Windows IoT Boxes will follow 19.1 by default after install.

closes odoo/odoo#234627

X-original-commit: d685ab19e32d577c7748a7ebe2b8ba636d01dda4
Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 setup/win32/setup-iot.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/win32/setup-iot.nsi b/setup/win32/setup-iot.nsi
index 24811b2af5c58..a0aaa874ee152 100644
--- a/setup/win32/setup-iot.nsi
+++ b/setup/win32/setup-iot.nsi
@@ -170,7 +170,7 @@ Section $(TITLE_Odoo_IoT) SectionOdoo_IoT
 
     # Cloning odoo
     DetailPrint "Cloning Odoo"
-    nsExec::Exec '"$INSTDIR\git\cmd\git.exe" clone --filter=tree:0 -b saas-18.4 --single-branch --no-checkout https://github.com/odoo/odoo.git "$INSTDIR\odoo"'
+    nsExec::Exec '"$INSTDIR\git\cmd\git.exe" clone --filter=tree:0 -b saas-19.1 --single-branch --no-checkout https://github.com/odoo/odoo.git "$INSTDIR\odoo"'
 
     DetailPrint "Configuring Sparse Checkout for IoT modules"
     nsExec::Exec '"$INSTDIR\git\cmd\git.exe" -C "$INSTDIR\odoo" sparse-checkout init --no-cone'

From 0c02c8cc8190ea14904e3f0a847541d209a879c5 Mon Sep 17 00:00:00 2001
From: 3amo-magdy <ammg@odoo.com>
Date: Tue, 22 Jul 2025 15:12:46 +0200
Subject: [PATCH 360/673] [IMP] hr_recruitment_survey: Bulk interview send
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Removed the “Create Application” button within the `Hr.Applicant` list view, unless accessed via “Talent Pools”.

- Modified the "Send Interview" action to allow the bulk sending of interviews, and added a new action button within the `hr.applicant` list view:
  = Replaced the extended `Survey.Invite` Wizard within the `hr.recruitment.survey` module with a new one `hr.recruitment.survey.invite`, that expects multiple applicant ids via the context field `applicant_ids` instead of one single applicant.
  = Modified the wizard view to change based on how many applicants are selected and whether they share the same `survey_id` or not.
  = Overriden fields & computation methods to work with multiple applicants & associated surveys/partners.
  = Adapted the access rules to check for all selected surveys.

- Tests Changes:
  = (test-bug fix) `hr_recruitment.group_hr_recruitment_user` doesn't have to be an interviewer to be able to send interviews as long as they can access the surveys.
  = Added a test for bulk interview sending

Task-4852412

closes odoo/odoo#214233

Related: odoo/upgrade#7925
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
---
 addons/hr_recruitment/models/hr_applicant.py  |   1 -
 .../views/hr_applicant_views.xml              |   2 +-
 addons/hr_recruitment_survey/__manifest__.py  |   1 +
 .../models/hr_applicant.py                    |  46 +--
 .../hr_recruitment_survey_security.xml        |  22 +-
 .../security/ir.model.access.csv              |   4 +-
 .../tests/test_recruitment_survey.py          | 146 ++++++--
 .../views/hr_applicant_views.xml              |  18 +
 .../hr_recruitment_survey/wizard/__init__.py  |   2 +-
 .../wizard/hr_recruitment_survey_invite.py    | 319 ++++++++++++++++++
 .../wizard/survey_invite.py                   |  48 ---
 .../wizard/survey_invite_views.xml            |  24 ++
 12 files changed, 516 insertions(+), 117 deletions(-)
 create mode 100644 addons/hr_recruitment_survey/wizard/hr_recruitment_survey_invite.py
 delete mode 100644 addons/hr_recruitment_survey/wizard/survey_invite.py
 create mode 100644 addons/hr_recruitment_survey/wizard/survey_invite_views.xml

diff --git a/addons/hr_recruitment/models/hr_applicant.py b/addons/hr_recruitment/models/hr_applicant.py
index 9debcbf515116..d49a50d35fa93 100644
--- a/addons/hr_recruitment/models/hr_applicant.py
+++ b/addons/hr_recruitment/models/hr_applicant.py
@@ -835,7 +835,6 @@ def action_open_applications(self):
                 "active_test": False,
                 "search_default_stage": 1,
                 "default_applicant_ids": self.ids,
-                "no_create_application_button": True,
             },
         }
 
diff --git a/addons/hr_recruitment/views/hr_applicant_views.xml b/addons/hr_recruitment/views/hr_applicant_views.xml
index 592b5a33fa856..5d207b879191c 100644
--- a/addons/hr_recruitment/views/hr_applicant_views.xml
+++ b/addons/hr_recruitment/views/hr_applicant_views.xml
@@ -9,7 +9,7 @@
                     <button
                         name="action_job_add_applicants"
                         string="Create Applications"
-                        invisible="context.get('default_job_id') or context.get('no_create_application_button')"
+                        invisible="context.get('default_job_id') or not context.get('default_talent_pool_ids')"
                         type="object"
                     />
                     <button
diff --git a/addons/hr_recruitment_survey/__manifest__.py b/addons/hr_recruitment_survey/__manifest__.py
index 76a1adc1ecc45..53992cebfe741 100644
--- a/addons/hr_recruitment_survey/__manifest__.py
+++ b/addons/hr_recruitment_survey/__manifest__.py
@@ -19,6 +19,7 @@
         'views/res_config_setting_views.xml',
         'views/survey_survey_views.xml',
         'views/survey_templates_statistics.xml',
+        'wizard/survey_invite_views.xml',
     ],
     'demo': [
         'data/survey_demo.xml',
diff --git a/addons/hr_recruitment_survey/models/hr_applicant.py b/addons/hr_recruitment_survey/models/hr_applicant.py
index c822a40715f94..89cb7403006a6 100644
--- a/addons/hr_recruitment_survey/models/hr_applicant.py
+++ b/addons/hr_recruitment_survey/models/hr_applicant.py
@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import timedelta
-from odoo import fields, models, _
+from odoo import fields, models
 from odoo.exceptions import UserError
 
 
@@ -32,25 +32,33 @@ def action_print_survey(self):
         return action
 
     def action_send_survey(self):
-        self.ensure_one()
+        template = self.env.ref('hr_recruitment_survey.mail_template_applicant_interview_invite', raise_if_not_found=False)
 
-        # if an applicant does not already has associated partner_id create it
-        if not self.partner_id:
-            if not self.partner_name:
-                raise UserError(_('Please provide an applicant name.'))
-            self.partner_id = self.env['res.partner'].sudo().create({
-                'is_company': False,
-                'name': self.partner_name,
-                'email': self.email_from,
-                'phone': self.partner_phone,
-            })
+        applicant_partner_ids = self.env['res.partner']
+        applicant_survey_ids = self.env['survey.survey']
+
+        # If an applicant does not already have an associated partner, search for it, or create it.
+        for applicant in self:
+            if not applicant.partner_id:
+                if not applicant.partner_name:
+                    raise UserError(self.env._('Please provide an applicant name.'))
+
+                applicant.partner_id = applicant.env['res.partner'].sudo().create({
+                    'is_company': False,
+                    'name': applicant.partner_name,
+                    'email': applicant.email_from,
+                    'phone': applicant.partner_phone,
+                })
+
+            applicant.survey_id.check_validity()
+            applicant_partner_ids += applicant.partner_id
+            applicant_survey_ids += applicant.survey_id
 
-        self.survey_id.check_validity()
-        template = self.env.ref('hr_recruitment_survey.mail_template_applicant_interview_invite', raise_if_not_found=False)
         local_context = dict(
-            default_applicant_id=self.id,
-            default_partner_ids=self.partner_id.ids,
-            default_survey_id=self.survey_id.id,
+            default_applicant_ids=self.ids,
+            default_survey_id=False,
+            default_survey_ids=applicant_survey_ids.ids,
+            default_partner_ids=applicant_partner_ids.ids,
             default_use_template=bool(template),
             default_template_id=template and template.id or False,
             default_email_layout_xmlid='mail.mail_notification_light',
@@ -59,9 +67,9 @@ def action_send_survey(self):
 
         return {
             'type': 'ir.actions.act_window',
-            'name': _("Send an interview"),
+            'name': self.env._("Send interviews"),
             'view_mode': 'form',
-            'res_model': 'survey.invite',
+            'res_model': 'hr.recruitment.survey.invite',
             'target': 'new',
             'context': local_context,
         }
diff --git a/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml b/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml
index 237163a52a73c..ca30131c58fbb 100644
--- a/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml
+++ b/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml
@@ -64,8 +64,8 @@
         </record>
         <record id="survey_invite_recruitment_manager" model="ir.rule">
             <field name="name">Survey invite: recruitment manager: all recruitment</field>
-            <field name="model_id" ref="survey.model_survey_invite"/>
-            <field name="domain_force">[('survey_id.survey_type', '=', 'recruitment')]</field>
+            <field name="model_id" ref="hr_recruitment_survey.model_hr_recruitment_survey_invite"/>
+            <field name="domain_force">[('all_surveys_are_recruitment', '=', True)]</field>
             <field name="groups" eval="[(4, ref('hr_recruitment.group_hr_recruitment_manager'))]"/>
             <field name="perm_unlink" eval="0"/>
             <field name="perm_write" eval="1"/>
@@ -102,11 +102,11 @@
         </record>
         <record id="survey_invite_recruitment_user" model="ir.rule">
             <field name="name">Survey invite: recruitment officer: unrestricted or in restricted users</field>
-            <field name="model_id" ref="survey.model_survey_invite"/>
+            <field name="model_id" ref="hr_recruitment_survey.model_hr_recruitment_survey_invite"/>
             <field name="domain_force">[
-                '&amp;', ('survey_id.survey_type', '=', 'recruitment'),
-                '|',  ('survey_id.restrict_user_ids', 'in', user.id),
-                        ('survey_id.restrict_user_ids', '=', False)]</field>
+                '&amp;',
+                ('all_surveys_are_recruitment', '=', True),
+                ('accessible_by_current_user', '=', True)]</field>
             <field name="groups" eval="[(4, ref('hr_recruitment.group_hr_recruitment_user'))]"/>
             <field name="perm_unlink" eval="0"/>
             <field name="perm_write" eval="1"/>
@@ -173,11 +173,11 @@
 
         <record id="survey_invite_recruitment_interviewer" model="ir.rule">
             <field name="name">Survey invite: recruitment interviewer: send surveys to applicants for which they are set as interviewer</field>
-            <field name="model_id" ref="survey.model_survey_invite"/>
-            <field name="domain_force">[('survey_id.survey_type', '=', 'recruitment'),
-                '|', ('survey_id.hr_job_ids.interviewer_ids', 'in', user.id),
-                     ('survey_id.hr_job_ids.application_ids.interviewer_ids', 'in', user.id)
-                ]</field>
+            <field name="model_id" ref="hr_recruitment_survey.model_hr_recruitment_survey_invite"/>
+            <field name="domain_force">[
+                '&amp;',
+                ('all_surveys_are_recruitment', '=', True),
+                ('accessible_by_interviewer_user', '=', True)]</field>
             <field name="groups" eval="[(4, ref('hr_recruitment.group_hr_recruitment_interviewer'))]"/>
             <field name="perm_unlink" eval="0"/>
             <field name="perm_write" eval="1"/>
diff --git a/addons/hr_recruitment_survey/security/ir.model.access.csv b/addons/hr_recruitment_survey/security/ir.model.access.csv
index 1f4425c4784ae..2301dc704ac3f 100644
--- a/addons/hr_recruitment_survey/security/ir.model.access.csv
+++ b/addons/hr_recruitment_survey/security/ir.model.access.csv
@@ -7,10 +7,10 @@ access_survey_question_answer_recruitment_manager,survey.question.answer.recruit
 
 access_survey_user_input_recruitment_user,survey.user_input.recruitment.user,survey.model_survey_user_input,hr_recruitment.group_hr_recruitment_user,1,0,0,0
 access_survey_user_input_line_recruitment_user,survey.user_input.line.recruitment.user,survey.model_survey_user_input_line,hr_recruitment.group_hr_recruitment_user,1,0,0,0
-access_survey_invite_recruitment_user,survey.invite.recruitment.user,survey.model_survey_invite,hr_recruitment.group_hr_recruitment_user,1,1,1,0
+access_hr_recruitment_survey_invite_recruitment_user,survey.invite.recruitment.user,hr_recruitment_survey.model_hr_recruitment_survey_invite,hr_recruitment.group_hr_recruitment_user,1,1,1,0
 
 access_survey_user_input_recruitment_interviewer,survey.user.input.recruitment.interviewer,survey.model_survey_user_input,hr_recruitment.group_hr_recruitment_interviewer,1,0,0,0
 access_survey_user_input_line_recruitment_interviewer,survey.user_input.line.recruitment.interviewer,survey.model_survey_user_input_line,hr_recruitment.group_hr_recruitment_interviewer,1,0,0,0
 access_survey_survey_recruitment_interviewer,survey.survey.recruitment.interviewer,survey.model_survey_survey,hr_recruitment.group_hr_recruitment_interviewer,1,0,0,0
 access_survey_question_recruitment_interviewer,survey.question.recruitment.interviewer,survey.model_survey_question,hr_recruitment.group_hr_recruitment_interviewer,1,0,0,0
-access_survey_invite_recruitment_interviewer,survey.invite.recruitment.interviewer,survey.model_survey_invite,hr_recruitment.group_hr_recruitment_interviewer,1,1,1,0
+access_hr_recruitment_survey_invite_recruitment_interviewer,survey.invite.recruitment.interviewer,hr_recruitment_survey.model_hr_recruitment_survey_invite,hr_recruitment.group_hr_recruitment_interviewer,1,1,1,0
diff --git a/addons/hr_recruitment_survey/tests/test_recruitment_survey.py b/addons/hr_recruitment_survey/tests/test_recruitment_survey.py
index 440d3a3a0d032..2a43bf933f09b 100644
--- a/addons/hr_recruitment_survey/tests/test_recruitment_survey.py
+++ b/addons/hr_recruitment_survey/tests/test_recruitment_survey.py
@@ -31,82 +31,160 @@ def setUpClass(cls):
 
         # Create some sample data to avoid demo data
         cls.department_admins = cls.env['hr.department'].create({'name': 'Admins'})
-        cls.survey_sysadmin, cls.survey_custom = cls.env['survey.survey'].create([
+
+        cls.survey_sysadmin, cls.survey_developer, cls.survey_custom, cls.survey_restricted_1, cls.survey_restricted_2 = cls.env['survey.survey'].create([
             {'title': 'Questions for Sysadmin job offer', 'survey_type': 'recruitment'},
-            {'title': 'Survey of type custom for security tests purpose', 'survey_type': 'custom'}
+            {'title': 'Questions for Developer job offer', 'survey_type': 'recruitment'},
+            {'title': 'Survey of type custom for security tests purpose', 'survey_type': 'custom'},
+            {'title': 'Questions for restricted survey', 'survey_type': 'recruitment', 'restrict_user_ids': cls.hr_recruitment_manager.ids},
+            {'title': 'Questions for restricted survey', 'survey_type': 'recruitment', 'restrict_user_ids': cls.hr_recruitment_user.ids},
+        ])
+        cls.question_ft = cls.env['survey.question'].create([
+            {'title': 'Test Free Text', 'survey_id': cls.survey_sysadmin.id, 'sequence': 2, 'question_type': 'text_box'},
+            {'title': 'Test Free Text', 'survey_id': cls.survey_developer.id, 'sequence': 2, 'question_type': 'text_box'},
+            {'title': 'Test Free Text', 'survey_id': cls.survey_custom.id, 'sequence': 2, 'question_type': 'text_box'},
+            {'title': 'Test Free Text', 'survey_id': cls.survey_restricted_1.id, 'sequence': 2, 'question_type': 'text_box'},
+            {'title': 'Test Free Text', 'survey_id': cls.survey_restricted_2.id, 'sequence': 2, 'question_type': 'text_box'},
         ])
-        cls.question_ft = cls.env['survey.question'].create({
-            'title': 'Test Free Text',
+
+        # Jobs
+        cls.job_sysadmin = cls.env['hr.job'].create({
+            'name': 'System Admin',
             'survey_id': cls.survey_sysadmin.id,
-            'sequence': 2,
-            'question_type': 'text_box',
+            'description': None,
         })
-        cls.job = cls.env['hr.job'].create({
+        cls.job_developer = cls.env['hr.job'].create({
+            'name': 'Developer',
+            'survey_id': cls.survey_developer.id,
+            'description': None,
+        })
+        cls.job_restricted_1 = cls.env['hr.job'].create({
             'name': 'Technical worker',
-            'survey_id': cls.survey_sysadmin.id,
+            'survey_id': cls.survey_restricted_1.id,
             'description': None,
         })
-        cls.job_applicant = cls.env['hr.applicant'].create({
+        cls.job_restricted_2 = cls.env['hr.job'].create({
+            'name': 'Technical worker',
+            'survey_id': cls.survey_restricted_2.id,
+            'description': None,
+        })
+
+        # Applicants
+        cls.job_applicant_sysadmin = cls.env['hr.applicant'].create({
             'partner_name': 'Jane Doe',
             'email_from': 'customer@example.com',
             'department_id': cls.department_admins.id,
-            'job_id': cls.job.id,
+            'job_id': cls.job_sysadmin.id,
+        })
+        cls.job_applicant_developer = cls.env['hr.applicant'].create({
+            'partner_name': 'Jane Doe',
+            'email_from': 'customer@example.com',
+            'job_id': cls.job_developer.id,
+        })
+        cls.job_applicant_restricted_1 = cls.env['hr.applicant'].create({
+            'partner_name': 'Jack',
+            'email_from': 'jack@example.com',
+            'job_id': cls.job_restricted_1.id,
+        })
+        cls.job_applicant_restricted_2 = cls.env['hr.applicant'].create({
+            'partner_name': 'John',
+            'email_from': 'john@example.com',
+            'job_id': cls.job_restricted_2.id,
         })
 
     @mute_logger('odoo.addons.base.models.ir_rule')
     def test_send_survey(self):
         Answer = self.env['survey.user_input']
-        invite_recruitment = self._prepare_invite(self.survey_sysadmin, self.job_applicant)
+        invite_recruitment = self._prepare_invite(self.survey_sysadmin, self.job_applicant_sysadmin)
         invite_recruitment.action_invite()
 
-        self.assertEqual(invite_recruitment.applicant_id, self.job_applicant)
-        self.assertNotEqual(self.job_applicant.response_ids.ids, False)
+        self.assertEqual(invite_recruitment.applicant_ids, self.job_applicant_sysadmin)
+        self.assertNotEqual(self.job_applicant_sysadmin.response_ids.ids, False)
         answers = Answer.search([('survey_id', '=', self.survey_sysadmin.id)])
         self.assertEqual(len(answers), 1)
-        self.assertEqual(self.job_applicant.response_ids, answers)
+        self.assertEqual(self.job_applicant_sysadmin.response_ids, answers)
         self.assertSetEqual(
             set(answers.mapped('email')),
-            {self.job_applicant.email_from})
+            {self.job_applicant_sysadmin.email_from})
 
         # Tests ACL
         # Manager: ok for survey type recruitment
         invite_recruitment.with_user(self.hr_recruitment_manager).action_invite()
         with self.assertRaises(AccessError):
             self.survey_custom.with_user(self.hr_recruitment_manager).read(['title'])
-        # Interviewer and User: need to be set as interviewer for the job or the applicant
-        for user in (self.hr_recruitment_interviewer, self.hr_recruitment_user):
-            with self.subTest(user=user):
-                with self.assertRaises(AccessError):
-                    invite_recruitment.with_user(user).action_invite()
-                self.job.interviewer_ids = user
+
+        # Interviewer needs to be set as interviewer for the job or the applicant
+        user = self.hr_recruitment_interviewer
+        with self.subTest(user=user):
+            with self.assertRaises(AccessError):
                 invite_recruitment.with_user(user).action_invite()
-                self.job.interviewer_ids = False
-                with self.assertRaises(AccessError):
-                    invite_recruitment.with_user(user).action_invite()
-                self.job_applicant.interviewer_ids = user
+            self.job_sysadmin.interviewer_ids = user
+            invite_recruitment.with_user(user).action_invite()
+            self.job_sysadmin.interviewer_ids = False
+            with self.assertRaises(AccessError):
                 invite_recruitment.with_user(user).action_invite()
+            self.job_applicant_sysadmin.interviewer_ids = user
+            invite_recruitment.with_user(user).action_invite()
+
+        # Recruitment officer can send unrestricted surveys, or those restricted but allowing him.
+        user = self.hr_recruitment_user
+        with self.subTest(user=user):
+            invite_recruitment.with_user(user).action_invite()
+            invite_recruitment = self._prepare_invite(self.survey_restricted_1, self.job_applicant_restricted_1)
+            with self.assertRaises(AccessError):
+                invite_recruitment.with_user(user).action_invite()
+            invite_recruitment = self._prepare_invite(self.survey_restricted_2, self.job_applicant_restricted_2)
+            invite_recruitment.with_user(user).action_invite()
 
     @mute_logger('odoo.addons.base.models.ir_rule')
     def test_print_survey(self):
-        action_print = self.job_applicant.action_print_survey()
+        action_print = self.job_applicant_sysadmin.action_print_survey()
         self.assertEqual(action_print['type'], 'ir.actions.act_url')
-        self.job_applicant.response_ids = self.env['survey.user_input'].create({'survey_id': self.survey_sysadmin.id})
-        action_print_with_response = self.job_applicant.action_print_survey()
-        self.assertIn(self.job_applicant.response_ids.access_token, action_print_with_response['url'])
+        self.job_applicant_sysadmin.response_ids = self.env['survey.user_input'].create({'survey_id': self.survey_sysadmin.id})
+        action_print_with_response = self.job_applicant_sysadmin.action_print_survey()
+        self.assertIn(self.job_applicant_sysadmin.response_ids.access_token, action_print_with_response['url'])
 
         # Test ACL
         # Interviewer: no access to hr_applicant
         with self.assertRaises(AccessError):
-            self.job_applicant.with_user(self.hr_recruitment_interviewer).action_print_survey()
+            self.job_applicant_sysadmin.with_user(self.hr_recruitment_interviewer).action_print_survey()
         # Manager: ok for survey type recruitment
-        self.job_applicant.with_user(self.hr_recruitment_manager).action_print_survey()
+        self.job_applicant_sysadmin.with_user(self.hr_recruitment_manager).action_print_survey()
         with self.assertRaises(AccessError):
             self.survey_custom.with_user(self.hr_recruitment_manager).action_print_survey()
         # User: no access unless set as interviewer
         with self.assertRaises(AccessError):
-            self.job_applicant.with_user(self.hr_recruitment_user).action_print_survey()
-        self.job_applicant.interviewer_ids = self.hr_recruitment_user
-        self.job_applicant.with_user(self.hr_recruitment_user).action_print_survey()
+            self.job_applicant_sysadmin.with_user(self.hr_recruitment_user).action_print_survey()
+        self.job_applicant_sysadmin.interviewer_ids = self.hr_recruitment_user
+        self.job_applicant_sysadmin.with_user(self.hr_recruitment_user).action_print_survey()
+
+    @mute_logger('odoo.addons.base.models.ir_rule')
+    def test_bulk_send_surveys(self):
+        Answer = self.env['survey.user_input']
+
+        applicants = self.job_applicant_sysadmin | self.job_applicant_developer
+
+        # Prepare the wizard
+        self.survey_sysadmin.write({'access_mode': 'public', 'users_login_required': False})
+        self.survey_developer.write({'access_mode': 'public', 'users_login_required': False})
+
+        invite_wizard = Form.from_action(self.env, applicants.action_send_survey()).save()
+
+        # Send survey
+        invite_wizard.action_invite()
+
+        # Assert each applicant received a response
+        for applicant in applicants:
+            self.assertTrue(applicant.response_ids, f"No survey response found for {applicant.partner_name}")
+            self.assertEqual(
+                applicant.response_ids.survey_id,
+                applicant.job_id.survey_id,
+                f"Survey mismatch for {applicant.partner_name}"
+            )
+            self.assertIn(applicant.email_from, applicant.response_ids.mapped('email'))
+
+        responses = Answer.search([('applicant_id', 'in', applicants.ids)])
+        self.assertEqual(len(responses), 2, "Incorrect number of survey responses generated.")
 
     def _prepare_invite(self, survey, applicant):
         survey.write({'access_mode': 'public', 'users_login_required': False})
diff --git a/addons/hr_recruitment_survey/views/hr_applicant_views.xml b/addons/hr_recruitment_survey/views/hr_applicant_views.xml
index df6284c3ecb2d..87ea7b3453a30 100644
--- a/addons/hr_recruitment_survey/views/hr_applicant_views.xml
+++ b/addons/hr_recruitment_survey/views/hr_applicant_views.xml
@@ -5,6 +5,14 @@
         <field name="model">hr.applicant</field>
         <field name="inherit_id" ref="hr_recruitment.crm_case_tree_view_job"/>
         <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button
+                    name="action_send_survey"
+                    string="Send Interviews"
+                    type="object"
+                    invisible="context.get('default_talent_pool_ids')"
+                />
+            </xpath>
             <xpath expr="//field[@name='source_id']" position="after">
                 <field name="survey_id" column_invisible="True"/>
                 <field name="response_ids" column_invisible="True"/>
@@ -50,4 +58,14 @@
             </xpath>
         </field>
     </record>
+
+    <record id="action_applicant_send_interview" model="ir.actions.server">
+        <field name="name">Send Interview</field>
+        <field name="model_id" ref="hr_recruitment_survey.model_hr_applicant"/>
+        <field name="sequence">1</field>
+        <field name="binding_model_id" ref="hr_recruitment_survey.model_hr_applicant"/>
+        <field name="binding_view_types">list,kanban</field>
+        <field name="state">code</field>
+        <field name="code">action = records.action_send_survey()</field>
+    </record>
 </odoo>
diff --git a/addons/hr_recruitment_survey/wizard/__init__.py b/addons/hr_recruitment_survey/wizard/__init__.py
index 7d07eb5367ddb..bb0f911644a5c 100644
--- a/addons/hr_recruitment_survey/wizard/__init__.py
+++ b/addons/hr_recruitment_survey/wizard/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from . import survey_invite
+from . import hr_recruitment_survey_invite
diff --git a/addons/hr_recruitment_survey/wizard/hr_recruitment_survey_invite.py b/addons/hr_recruitment_survey/wizard/hr_recruitment_survey_invite.py
new file mode 100644
index 0000000000000..c552c65e25d92
--- /dev/null
+++ b/addons/hr_recruitment_survey/wizard/hr_recruitment_survey_invite.py
@@ -0,0 +1,319 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import re
+
+from markupsafe import Markup
+from odoo import api, fields, models
+from odoo.tools.misc import clean_context
+from odoo.tools.urls import urljoin
+from odoo.exceptions import UserError
+from odoo.tools.mail import email_split_and_format
+from odoo.fields import Domain
+from odoo.tools import html_sanitize
+
+emails_split = re.compile(r"[;,\n\r]+")
+
+
+class HrRecruitmentSurveyInvite(models.TransientModel):
+    _name = 'hr.recruitment.survey.invite'
+    _inherit = ["survey.invite"]
+    _description = 'Wizard for sending interview invitations to job applicants during recruitment process'
+
+    # Allow multiple applicants with different survey_ids
+    applicant_ids = fields.Many2many('hr.applicant', string='Applicant')
+    survey_ids = fields.Many2many('survey.survey', string='Surveys')
+    single_survey_id = fields.Many2one('survey.survey', compute='_compute_single_survey', store=False)  # If all applicants associate with the same survey, otherwise False
+    has_many_applicants = fields.Boolean(compute="_compute_has_many_applicants", store=False)
+    hide_url = fields.Boolean(compute="_compute_hide_url", store=False)
+
+    # Overrides
+    survey_id = fields.Many2one('survey.survey', default=False, required=False)    # Make it optional, default it to False
+    survey_access_mode = fields.Char(compute="_compute_survey_access_mode")
+    survey_start_url = fields.Char('Survey URL', compute='_compute_survey_start_url')
+
+    attachment_ids = fields.Many2many(
+        'ir.attachment', 'hr_recruitment_survey_mail_compose_message_ir_attachments_rel', 'wizard_id', 'attachment_id',
+        string='Attachments', compute='_compute_attachment_ids', store=True, readonly=False)
+
+    partner_ids = fields.Many2many(
+        'res.partner', 'hr_recruitment_survey_invite_partner_ids', 'invite_id', 'partner_id', string='Recipients'
+    )
+
+    # Security
+    accessible_by_current_user = fields.Boolean(store=False, compute='_compute_accessible_by_current_user', search='_search_accessible_by_current_user')
+    accessible_by_interviewer_user = fields.Boolean(store=False, compute='_compute_accessible_by_interviewer_user', search='_search_accessible_by_interviewer_user')
+    all_surveys_are_recruitment = fields.Boolean(store=False, compute='_compute_all_surveys_are_recruitment', search='_search_all_surveys_are_recruitment')
+
+    @api.depends('survey_ids')
+    def _compute_single_survey(self):
+        for invite in self:
+            if invite.survey_ids and len(invite.survey_ids) == 1:
+                invite.single_survey_id = invite.survey_ids
+            else:
+                invite.single_survey_id = False
+
+    @api.depends('applicant_ids')
+    def _compute_has_many_applicants(self):
+        for invite in self:
+            invite.has_many_applicants = len(invite.applicant_ids) > 1
+
+    @api.depends('survey_access_mode', 'survey_ids')
+    def _compute_hide_url(self):
+        for invite in self:
+            invite.hide_url = invite.survey_access_mode != 'public' or len(invite.survey_ids) > 1
+
+    @api.depends('survey_ids', 'survey_ids.access_mode', 'single_survey_id')
+    def _compute_survey_access_mode(self):
+        for invite in self:
+            if not invite.single_survey_id:
+                invite.survey_access_mode = 'token'
+            else:
+                invite.survey_access_mode = self.single_survey_id.access_mode
+
+    @api.depends('survey_ids', 'survey_id')
+    def _compute_survey_start_url(self):
+        for invite in self:
+            if invite.single_survey_id:
+                invite.survey_start_url = urljoin(invite.single_survey_id.get_base_url(), invite.single_survey_id.get_start_url())
+            else:
+                invite.survey_start_url = False
+
+    @api.depends('survey_ids')
+    def _compute_survey_users_login_required(self):
+        for invite in self:
+            invite.survey_users_login_required = any(s.users_login_required for s in invite.survey_ids)
+
+    @api.depends('survey_ids')
+    def _compute_survey_users_can_signup(self):
+        for invite in self:
+            invite.survey_users_can_signup = any(s.users_can_signup for s in invite.survey_ids)
+
+    def _partners_access(self):
+        # Filter applicants with surveys needing validation
+        applicants_with_login_only_surveys = self.applicant_ids.filtered(
+            lambda a: a.survey_id.users_login_required and not a.survey_id.users_can_signup
+        )
+
+        partner_survey_applicant_map = {(a.partner_id.id, a.survey_id.id): a for a in applicants_with_login_only_surveys}
+        if partner_survey_applicant_map:
+            # find partners with no linked users
+            unlinked_partner_domain = Domain.FALSE
+            for (partner_id, survey_id), _ in partner_survey_applicant_map.items():
+                unlinked_partner_domain = Domain.OR(
+                    [
+                        unlinked_partner_domain,
+                        Domain.AND(
+                            [
+                                Domain("id", "=", partner_id),
+                                Domain("user_ids", "=", False),
+                            ],
+                        ),
+                    ]
+                )
+
+            unlinked_partners = self.env['res.partner'].search(unlinked_partner_domain)
+            if unlinked_partners:
+                raise UserError(self.env._(
+                    'The following recipients have no user account: %s. You should create user accounts for them or allow external signup in configuration.',
+                    ', '.join(unlinked_partners.mapped('name'))
+                ))
+
+    @api.constrains('partner_ids')
+    def _check_partners_access(self):
+        self._partners_access()
+
+    @api.onchange('partner_ids')
+    def _onchange_partner_ids(self):
+        self._partners_access()
+
+    @api.onchange('emails')
+    def _onchange_emails(self):
+        if not self.single_survey_id or not self.emails:
+            return
+        if self.single_survey_id.users_login_required and not self.single_survey_id.users_can_signup:
+            raise UserError(self.env._('This survey does not allow external people to participate. You should create user accounts or update survey access mode accordingly.'))
+
+        valid, error = [], []
+        emails = list(set(emails_split.split(self.emails or "")))
+        for email in emails:
+            email_check = email_split_and_format(email)
+            if not email_check:
+                error.append(email)
+            else:
+                valid.extend(email_check)
+        if error:
+            raise UserError(self.env._(
+                "The following emails you just entered are invalid:\n%s"
+            ) % '\n'.join(error))
+
+        self.emails = '\n'.join(valid)
+
+    def _prepare_answers(self, partners, emails):
+        self.ensure_one()
+
+        all_answers_domain = Domain.FALSE
+        for applicant in self.applicant_ids:
+            all_answers_domain = Domain.OR([
+                all_answers_domain,
+                Domain.AND([
+                    Domain('survey_id', '=', applicant.survey_id.id),
+                    Domain('partner_id', '=', applicant.partner_id.id)
+                ])
+            ])
+
+        all_answers = self.env['survey.user_input'].search(all_answers_domain)
+
+        # Index by (survey_id, partner_id)
+        answers_by_applicant = all_answers.grouped(lambda ans: (ans.survey_id.id, ans.partner_id.id))
+
+        total_answers = self.env['survey.user_input']
+        for applicant in self.applicant_ids:
+            key = (applicant.survey_id.id, applicant.partner_id.id)
+            existing_answers = answers_by_applicant.get(key)
+
+            _, _, answers = self._get_done_partners_emails(existing_answers)
+            survey = applicant.survey_id
+
+            if applicant.response_ids.filtered(lambda res: res.survey_id.id == survey.id):
+                if not existing_answers or self.existing_mode != 'resend':
+                    answers |= survey._create_answer(partner=applicant.partner_id, check_attempts=False, **self._get_answers_values())
+            else:
+                answers |= survey._create_answer(partner=applicant.partner_id, check_attempts=False, **self._get_answers_values())
+
+            total_answers |= answers
+
+        return total_answers
+
+    def action_invite(self):
+        self.ensure_one()
+        if self.applicant_ids:
+            for applicant_id in self.applicant_ids:
+                survey = applicant_id.survey_id.with_context(clean_context(self.env.context))
+                if not applicant_id.response_ids.filtered(lambda res: res.survey_id.id == survey.id):
+                    applicant_id.sudo().write({
+                        'response_ids': (applicant_id.response_ids | survey.sudo()._create_answer(partner=applicant_id.partner_id,
+                            **self._get_answers_values())).ids
+                    })
+                partner = applicant_id.partner_id
+                survey_link = survey._get_html_link(title=survey.title)
+                partner_link = partner._get_html_link()
+                content = self.env._('The survey %(survey_link)s has been sent to %(partner_link)s',
+                    survey_link=survey_link,
+                    partner_link=partner_link,
+                )
+                body = Markup('<p>%s</p>') % content
+                applicant_id.message_post(body=body)
+        return super().action_invite()
+
+    # Mail compose overrides
+    @api.depends('template_id', 'survey_ids')
+    def _compute_subject(self):
+        for invite in self:
+            if invite.subject:
+                continue
+            else:
+                if len(invite.survey_ids.ids) == 1:
+                    invite.subject = self.env._("Interview Invitation: %(survey_name)s", survey_name=invite.single_survey_id.display_name)
+                else:
+                    invite.subject = self.env._("Interview Invitation")
+
+    def _send_mail(self, answer):
+        mail = super()._send_mail(answer)
+        if answer.applicant_id:
+            sanitized_html = html_sanitize(mail.body_html)
+            answer.applicant_id.message_post(body=sanitized_html)
+            mail.send()
+        return mail
+
+    # Security
+    @api.depends('survey_ids.restrict_user_ids')
+    def _compute_accessible_by_current_user(self):
+        current_user = self.env.user
+        for record in self:
+            record.accessible_by_current_user = all(
+                not survey.restrict_user_ids or current_user in survey.restrict_user_ids
+                for survey in record.survey_ids
+            )
+
+    @api.depends('survey_ids.survey_type')
+    def _compute_all_surveys_are_recruitment(self):
+        for record in self:
+            record.all_surveys_are_recruitment = all(
+                survey.survey_type == 'recruitment'
+                for survey in record.survey_ids
+            )
+
+    @api.depends('survey_ids.hr_job_ids.interviewer_ids', 'survey_ids.hr_job_ids.application_ids.interviewer_ids')
+    def _compute_accessible_by_interviewer_user(self):
+        current_user = self.env.user
+        for record in self:
+            record.accessible_by_interviewer_user = all(
+                any(
+                    current_user in (job.interviewer_ids | job.application_ids.interviewer_ids)
+                    for job in survey.hr_job_ids
+                )
+                for survey in record.survey_ids
+            )
+
+    def _search_accessible_by_current_user(self, operator, value):
+        if operator != 'in':
+            return NotImplemented
+
+        current_user = self.env.user
+
+        accessible_survey_ids = self.env['survey.survey']._search([
+            '|',
+            ('restrict_user_ids', '=', False),
+            ('restrict_user_ids', 'any', [('id', '=', current_user.id)])
+        ])
+
+        inaccessible_self_records = self.env['hr.recruitment.survey.invite']._search([
+            ('survey_ids', '!=', False),
+            ('survey_ids', 'any', [('id', 'not in', accessible_survey_ids)])  # True if one ore more survey(s) are NOT accessible
+        ])
+
+        domain = [('id', 'not in', inaccessible_self_records)] if value else [('id', 'in', inaccessible_self_records)]
+        return domain
+
+    def _search_all_surveys_are_recruitment(self, operator, value):
+        if operator != 'in':
+            return NotImplemented
+
+        recruitment_survey_ids = self.env['survey.survey']._search([
+            ('survey_type', '=', 'recruitment'),
+        ])
+
+        inaccessible_self_records = self.env['hr.recruitment.survey.invite']._search([
+            ('survey_ids', '!=', False),
+            ('survey_ids', 'any', [('id', 'not in', recruitment_survey_ids)])  # returns True if one or more survey(s) are NOT of type recruitment
+        ])
+
+        domain = [('id', 'not in', inaccessible_self_records)] if value else [('id', 'in', inaccessible_self_records)]
+        return domain
+
+    def _search_accessible_by_interviewer_user(self, operator, value):
+        if operator != 'in':
+            return NotImplemented
+
+        current_user = self.env.user
+
+        accessible_applications_by_interviewer = self.env['hr.applicant']._search([
+            ('interviewer_ids', 'any', [('id', '=', current_user.id)])
+        ])
+
+        accessible_jobs_by_interviewer = self.env['hr.job']._search([
+            '|',
+            ('interviewer_ids', 'any', [('id', '=', current_user.id)]),
+            ('application_ids', 'any', [('id', 'in', accessible_applications_by_interviewer)])
+        ])
+
+        accessible_survey_ids_by_interviewer = self.env['survey.survey']._search([
+            ('hr_job_ids', 'any', [('id', 'in', accessible_jobs_by_interviewer)])
+        ])
+
+        inaccessible_self_records = self.env['hr.recruitment.survey.invite']._search([
+            ('survey_ids', '!=', False),
+            ('survey_ids', 'any', [('id', 'not in', accessible_survey_ids_by_interviewer)])  # True if one ore more survey(s) are NOT accessible
+        ])
+
+        domain = [('id', 'not in', inaccessible_self_records)] if value else [('id', 'in', inaccessible_self_records)]
+        return domain
diff --git a/addons/hr_recruitment_survey/wizard/survey_invite.py b/addons/hr_recruitment_survey/wizard/survey_invite.py
deleted file mode 100644
index e4b44b151f1c4..0000000000000
--- a/addons/hr_recruitment_survey/wizard/survey_invite.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from markupsafe import Markup
-
-from odoo import fields, models, _
-from odoo.tools.misc import clean_context
-
-
-class SurveyInvite(models.TransientModel):
-    _inherit = "survey.invite"
-
-    applicant_id = fields.Many2one('hr.applicant', string='Applicant')
-
-    def _get_done_partners_emails(self, existing_answers):
-        partners_done, emails_done, answers = super()._get_done_partners_emails(existing_answers)
-        if self.applicant_id.response_ids.filtered(lambda res: res.survey_id.id == self.survey_id.id):
-            if existing_answers and self.existing_mode == 'resend':
-                partners_done |= self.applicant_id.partner_id
-        return partners_done, emails_done, answers
-
-    def _send_mail(self, answer):
-        mail = super()._send_mail(answer)
-        if answer.applicant_id:
-            answer.applicant_id.message_post(body=Markup(mail.body_html))
-            mail.send()
-        return mail
-
-    def action_invite(self):
-        self.ensure_one()
-        if self.applicant_id:
-            survey = self.survey_id.with_context(clean_context(self.env.context))
-
-            if not self.applicant_id.response_ids.filtered(lambda res: res.survey_id.id == self.survey_id.id):
-                self.applicant_id.sudo().write({
-                    'response_ids': (self.applicant_id.response_ids | survey.sudo()._create_answer(partner=self.applicant_id.partner_id,
-                        **self._get_answers_values())).ids
-                })
-
-            partner = self.applicant_id.partner_id
-            survey_link = survey._get_html_link(title=survey.title)
-            partner_link = partner._get_html_link()
-            content = _('The survey %(survey_link)s has been sent to %(partner_link)s',
-                survey_link=survey_link,
-                partner_link=partner_link,
-            )
-            body = Markup('<p>%s</p>') % content
-            self.applicant_id.message_post(body=body)
-        return super().action_invite()
diff --git a/addons/hr_recruitment_survey/wizard/survey_invite_views.xml b/addons/hr_recruitment_survey/wizard/survey_invite_views.xml
new file mode 100644
index 0000000000000..427aee2623ef4
--- /dev/null
+++ b/addons/hr_recruitment_survey/wizard/survey_invite_views.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data>
+    <record id="hr_recruitment_survey_invite_view_form" model="ir.ui.view">
+      <field name="name">survey.invite.view.form.inherit</field>
+      <field name="mode">primary</field>
+      <field name="model">hr.recruitment.survey.invite</field>
+      <field name="inherit_id" ref="survey.survey_invite_view_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//label[@for='survey_start_url']" position="attributes">
+            <attribute name="invisible">hide_url</attribute>
+        </xpath>
+
+        <xpath expr="//field[@name='survey_start_url']" position="attributes">
+            <attribute name="invisible">hide_url</attribute>
+        </xpath>
+
+        <xpath expr="//field[@name='emails']" position="attributes">
+            <attribute name="invisible">has_many_applicants or not send_email</attribute>
+        </xpath>
+      </field>
+    </record>
+  </data>
+</odoo>

From 47aa32a09846530e6d243a695bc13173ad38d4ca Mon Sep 17 00:00:00 2001
From: 3amo-magdy <ammg@odoo.com>
Date: Tue, 4 Nov 2025 09:30:30 +0100
Subject: [PATCH 361/673] [IMP] mail: add 'technical_usage' field on
 mail.activity

Added new field `technical_usage` on `mail.activity` to be able to identify activities by their technical purpose, instead of creating many new activity types.

Task-5022170

Part-of: odoo/odoo#223578
Related: odoo/upgrade#8770
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/mail/models/mail_activity.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 75b3c5df5e986..1780f01218aae 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -79,6 +79,7 @@ def _default_activity_type_for_model(self, model):
     automated = fields.Boolean(
         'Automated activity', readonly=True,
         help='Indicates this activity has been created automatically and not by any user.')
+    technical_usage = fields.Selection(selection=[('none', 'Non Technical')], default='none', readonly=True, help="Technical identifier")
     # Attachments are linked to a document through model / res_id and to the activity through this field.
     attachment_ids = fields.Many2many(
         'ir.attachment', 'activity_attachment_rel',

From 86c9bb40a32fd55ed9ed6252511c794819cc93f9 Mon Sep 17 00:00:00 2001
From: 3amo-magdy <ammg@odoo.com>
Date: Tue, 4 Nov 2025 10:01:44 +0100
Subject: [PATCH 362/673] [IMP] hr: Ensure contract-end notice activities are
 created even if cron misses the exact trigger date

Previously, the cron would only create an activity on the exact day
`(end_date - notice_period)`. If the server was down or the cron did
not run on that day, the activity was never created.

With this commit, the cron now checks every day within the notice
period and ensures that the activity is created if it does not already
exist.

Task-5022170

closes odoo/odoo#223578

Related: odoo/upgrade#8770
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/__init__.py      |  1 +
 addons/hr/models/hr_employee.py   | 58 +++++++++++++++++++++++++------
 addons/hr/models/mail_activity.py | 12 +++++++
 3 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 addons/hr/models/mail_activity.py

diff --git a/addons/hr/models/__init__.py b/addons/hr/models/__init__.py
index 36b6182e02724..ce14ff0fae135 100644
--- a/addons/hr/models/__init__.py
+++ b/addons/hr/models/__init__.py
@@ -4,6 +4,7 @@
 from . import hr_job
 from . import hr_version
 from . import hr_contract_type
+from . import mail_activity
 from . import hr_employee
 from . import hr_mixin
 from . import hr_employee_category
diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index df513deebfd29..dd888a2271c4f 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -1190,32 +1190,68 @@ def notify_expiring_contract_work_permit(self):
         companies = self.env['res.company'].search([])
         employees_contract_expiring = self.env['hr.employee']
         employees_work_permit_expiring = self.env['hr.employee']
+        today = fields.Date.today()
 
         for company in companies:
+            # Employees with contracts expiring soon
             employees_contract_expiring += self.env['hr.employee'].search([
                 ('company_id', '=', company.id),
                 ('contract_date_start', '!=', False),
-                ('contract_date_start', '<', fields.Date.today()),
-                ('contract_date_end', '=', fields.Date.today() + relativedelta(days=company.contract_expiration_notice_period)),
+                ('contract_date_start', '<', today),
+                ('contract_date_end', '>=', today),
+                ('contract_date_end', '<=', today + relativedelta(days=company.contract_expiration_notice_period)),
             ])
 
+            # Employees with work permits expiring soon
             employees_work_permit_expiring += self.env['hr.employee'].search([
                 ('company_id', '=', company.id),
                 ('work_permit_expiration_date', '!=', False),
-                ('work_permit_expiration_date', '=', fields.Date.today() + relativedelta(days=company.work_permit_expiration_notice_period)),
+                ('work_permit_expiration_date', '>=', today),
+                ('work_permit_expiration_date', '<=', today + relativedelta(days=company.work_permit_expiration_notice_period)),
             ])
 
+        todo_type = self.env.ref('mail.mail_activity_data_todo')
+
+        # Existing activities
+        existing_activities_contract = employees_contract_expiring.activity_ids.filtered(
+            lambda a: a.technical_usage == 'hr_expiring_contract'
+        )
+        existing_activities_permit = employees_work_permit_expiring.activity_ids.filtered(
+            lambda a: a.technical_usage == 'hr_expiring_work_permit'
+        )
+
+        existing_activities_index_contract = {
+            (a.res_id, a.date_deadline, a.user_id.id): a for a in existing_activities_contract
+        }
+        existing_activities_index_permit = {
+            (a.res_id, a.date_deadline, a.user_id.id): a for a in existing_activities_permit
+        }
+
+        # Create contract expiry activities
         for employee in employees_contract_expiring:
-            employee.with_context(mail_activity_quick_update=True).activity_schedule(
-                'mail.mail_activity_data_todo', employee.contract_date_end,
-                _("The contract of %s is about to expire.", employee.name),
-                user_id=employee.hr_responsible_id.id or self.env.uid)
+            activity_responsible = employee.hr_responsible_id.id or self.env.uid
+            key = (employee.id, employee.contract_date_end, activity_responsible)
+            if key not in existing_activities_index_contract:
+                employee.with_context(mail_activity_quick_update=True).activity_schedule(
+                    activity_type_id=todo_type.id,
+                    date_deadline=employee.contract_date_end,
+                    summary=self.env._("The contract of %(employee_name)s is about to expire.", employee_name=employee.name),
+                    user_id=activity_responsible,
+                    technical_usage='hr_expiring_contract',
+                )
 
+        # Create work permit expiry activities
         for employee in employees_work_permit_expiring:
-            employee.with_context(mail_activity_quick_update=True).activity_schedule(
-                'mail.mail_activity_data_todo', employee.work_permit_expiration_date,
-                _("The work permit of %s is about to expire.", employee.name),
-                user_id=employee.hr_responsible_id.id or self.env.uid)
+            activity_responsible = employee.hr_responsible_id.id or self.env.uid
+            key = (employee.id, employee.work_permit_expiration_date, activity_responsible)
+            if key not in existing_activities_index_permit:
+                employee.with_context(mail_activity_quick_update=True).activity_schedule(
+                    activity_type_id=todo_type.id,
+                    date_deadline=employee.work_permit_expiration_date,
+                    summary=self.env._("The work permit of %(employee_name)s is about to expire.", employee_name=employee.name),
+                    user_id=activity_responsible,
+                    technical_usage='hr_expiring_work_permit',
+                )
 
         return True
 
diff --git a/addons/hr/models/mail_activity.py b/addons/hr/models/mail_activity.py
new file mode 100644
index 0000000000000..4e32463b86b43
--- /dev/null
+++ b/addons/hr/models/mail_activity.py
@@ -0,0 +1,12 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class MailActivity(models.Model):
+    _inherit = 'mail.activity'
+
+    technical_usage = fields.Selection(selection_add=[
+        ('hr_expiring_contract', 'Expiring Contract'),
+        ('hr_expiring_work_permit', 'Expiring Work Permit')
+    ])

From 6dacbbae74ed3e3612263834f9bb2633334d7ec6 Mon Sep 17 00:00:00 2001
From: "Yousef Alnashef (alny)" <alny@odoo.com>
Date: Fri, 12 Sep 2025 05:26:54 +0000
Subject: [PATCH 363/673] [FIX] base: fix test_lang_computation_form_view to
 run in single app

before this commit, test_lang_computation_form_view failed on l10n_gcc_invoice or any of the depending modules.
because activating arabic makes the test expect arabic as the default language when it is english.

to reproduce:
- install l10n_gcc_invoice
- run the test test_lang_computation_form_view.
- will fail since it expects the partner default lang to be arabic but it is in english.

with this commit, we make sure to compare the partner's default language with the user defined default for res.parner.lang
instead of using the first language alphabetically.

runbot:231711

closes odoo/odoo#234323

X-original-commit: 7a27912047441e3c545e356fd7d28cf0de8b096c
Signed-off-by: Chong Wang (cwg) <cwg@odoo.com>
Signed-off-by: Yousef Alnashef (alny) <alny@odoo.com>
---
 odoo/addons/base/tests/test_res_partner.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/odoo/addons/base/tests/test_res_partner.py b/odoo/addons/base/tests/test_res_partner.py
index b12daeb32f628..9018c5450ea75 100644
--- a/odoo/addons/base/tests/test_res_partner.py
+++ b/odoo/addons/base/tests/test_res_partner.py
@@ -1151,8 +1151,7 @@ class TestPartnerForm(TransactionCase):
     def test_lang_computation_form_view(self):
         """ Check computation of lang: coming from installed languages, forced
         default value and propagation from parent."""
-        default_lang_info = self.env['res.lang'].get_installed()[0]
-        default_lang_code = default_lang_info[0]
+        default_lang_code = self.env['ir.default']._get('res.partner', 'lang') or False
         self.assertNotEqual(default_lang_code, 'de_DE')  # should not be the case, just to ease test
         self.assertNotEqual(default_lang_code, 'fr_FR')  # should not be the case, just to ease test
 

From ace9c59c8c89352ed36d65402d622df8df4a928a Mon Sep 17 00:00:00 2001
From: SilvioC2C <silvio.gregorini@camptocamp.com>
Date: Wed, 29 Oct 2025 18:39:42 +0000
Subject: [PATCH 364/673] [FIX] product: prevent unnecessary cache invalidation

closes odoo/odoo#234863

X-original-commit: cbe2e58f8c9ce06c124d04013d2daa0550ff2cd9
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/product/models/product_template.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 6008365645463..15ca1e8513594 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -726,8 +726,10 @@ def _create_variant_ids(self):
                     # Do not add single value if the resulting combination would
                     # be invalid anyway.
                     if (
-                        len(combination) == len(lines_without_no_variants) and
-                        combination.attribute_line_id == lines_without_no_variants
+                        len(combination) == len(lines_without_no_variants)
+                        and combination.attribute_line_id == lines_without_no_variants
+                        # Update only if necessary to prevent a cache invalidation
+                        and variant.product_template_attribute_value_ids != combination
                     ):
                         variant.product_template_attribute_value_ids = combination
 

From 90effb5e0bc4c5ea2e2c87c81a5e3c2a03aea0f3 Mon Sep 17 00:00:00 2001
From: Adam Heinz <adam.heinz@metricwise.com>
Date: Wed, 22 Oct 2025 19:23:17 +0000
Subject: [PATCH 365/673] [IMP] sale_pdf_quote_builder: Defensively test
 sale.order state names.

This ensures that tests pass even if a third party module that
renames sale.order state selections has been installed.

closes odoo/odoo#234794

X-original-commit: 9e51f5fa9a6c296d9c06eb3cce6d76d09b492489
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 .../sale_pdf_quote_builder/tests/test_pdf_quote_builder.py  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/sale_pdf_quote_builder/tests/test_pdf_quote_builder.py b/addons/sale_pdf_quote_builder/tests/test_pdf_quote_builder.py
index 53e389262c3b5..d3c8ee778465c 100644
--- a/addons/sale_pdf_quote_builder/tests/test_pdf_quote_builder.py
+++ b/addons/sale_pdf_quote_builder/tests/test_pdf_quote_builder.py
@@ -107,9 +107,8 @@ def test_dynamic_fields_mapping_for_quotation_document(self):
             new_form_fields[3]: "",  # datetime missing
             new_form_fields[4]: "1.0",  # float
             new_form_fields[5]: "1",  # integer
-            new_form_fields[6]: "Quotation",  # selection
+            new_form_fields[6]: dict(self.sale_order._fields['state'].selection)['draft'],  # selection
             new_form_fields[7]: "$\xa0725.00",  # monetary
-
             new_form_fields[8]: f"{sol_1.display_name}, {sol_2.display_name}",  # one2many
             new_form_fields[9]: f"{self.sale_order.company_id.display_name}",  # many2one
             new_form_fields[10]: f"{self.sale_order.company_id.display_name}",  # many2many
@@ -153,9 +152,8 @@ def test_dynamic_fields_mapping_for_product_document(self):
             'datetime_test': "12/21/2121 01:21:12 PM",
             'float_test': "4.99",
             'integer_test': "0",
-            'selection_test': "Quotation",
+            'selection_test': dict(self.sale_order._fields['state'].selection)['draft'],
             'monetary_test': self.sale_order.currency_id.format(720.01),
-
             'one2many_test': f"{sol_1.display_name}, {sol_2.display_name}",
             'many2one_test': self.sale_order.company_id.display_name,
             'many2many_test': "test tax1, test tax2",

From a7bd47bd493ffd78c821169b503fc2b0edf6d068 Mon Sep 17 00:00:00 2001
From: anko-odoo <anko@odoo.com>
Date: Wed, 29 Oct 2025 10:37:22 +0000
Subject: [PATCH 366/673] [FIX] sale_gelato: send mail to customer

Fix not sending the email to customer, when order status update was
received from Gelato.

opw-4962878

closes odoo/odoo#234795

X-original-commit: 9fca9115a3c511469009d4226a0eaab4f89f95fd
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: anko-odoo <anko@odoo.com>
---
 addons/sale_gelato/controlers/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale_gelato/controlers/main.py b/addons/sale_gelato/controlers/main.py
index 9ac588f2087a1..49026e5d23eb3 100644
--- a/addons/sale_gelato/controlers/main.py
+++ b/addons/sale_gelato/controlers/main.py
@@ -73,12 +73,14 @@ def gelato_webhook(self):
                 tracking_data = self._extract_tracking_data(item_data=event_data['items'])
                 order_sudo.with_context({'tracking_data': tracking_data}).message_post_with_source(
                     source_ref=request.env.ref('sale_gelato.order_status_update'),
+                    subtype_xmlid='mail.mt_comment',
                     author_id=request.env.ref('base.partner_root').id,
                 )
             elif fulfillment_status == 'delivered':
                 # Send the Gelato order status update email.
                 order_sudo.with_context({'order_delivered': True}).message_post_with_source(
                     source_ref=request.env.ref('sale_gelato.order_status_update'),
+                    subtype_xmlid='mail.mt_comment',
                     author_id=request.env.ref('base.partner_root').id,
                 )
             elif fulfillment_status == 'returned':

From d8ef7d95d9cd39cc88cc1ec87ae3bd1599355610 Mon Sep 17 00:00:00 2001
From: Brieuc-brd <brd@odoo.com>
Date: Tue, 4 Nov 2025 14:11:05 +0000
Subject: [PATCH 367/673] [FIX] web: adjust bg color for search_panel on mobile

This commit adjusts the search_panel background color so it adapts
correctly to both light and dark modes on mobile.
It only affects the "bottom sheet" use case.

task-5121027

closes odoo/odoo#234658

X-original-commit: f1169bccbede8ed5f972f51eba42f8e662be7077
Related: odoo/enterprise#98968
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/web/static/src/search/search_panel/search_panel.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/search/search_panel/search_panel.scss b/addons/web/static/src/search/search_panel/search_panel.scss
index 21eca59560580..a9d3cec4ed943 100644
--- a/addons/web/static/src/search/search_panel/search_panel.scss
+++ b/addons/web/static/src/search/search_panel/search_panel.scss
@@ -71,3 +71,9 @@
         align-items: initial;
     }
 }
+
+.o_search_panel_section {
+    .o_bottom_sheet & .list-group {
+        --#{$prefix}list-group-bg: transparent;
+    }
+}

From 683d4bd01e437dc571676c1770afb244c1d0d968 Mon Sep 17 00:00:00 2001
From: mear-odoo <mear@odoo.com>
Date: Mon, 13 Oct 2025 06:37:44 +0000
Subject: [PATCH 368/673] [FIX] resource_mail:  prevent error when opening
 avatar popover of archived employee
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
- Open the Planning app.
- Archive an employee.
- Open the archived employee's avatar popover.

Before this commit:
Opening the popover raised an error because `get_avatar_card_data` returned an
empty list for archived records. This occurred since `search_read` ignored
inactive records by default.

After this commit:
The method now uses `read` instead, ensuring archived records are
properly handled without error.

enterprise PR: https://github.com/odoo/enterprise/pull/98230

closes odoo/odoo#234890

X-original-commit: fa3da9d7c701a6e16fe7bb4300447ed79725fc87
Related: odoo/enterprise#99074
Signed-off-by: Aryankumar Riteshkumar Mehta (mear) <mear@odoo.com>
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/resource_mail/models/resource_resource.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/resource_mail/models/resource_resource.py b/addons/resource_mail/models/resource_resource.py
index d6fc8a65aaf89..797be7bd04f8e 100644
--- a/addons/resource_mail/models/resource_resource.py
+++ b/addons/resource_mail/models/resource_resource.py
@@ -15,6 +15,4 @@ def _default_color(self):
     im_status = fields.Char(related='user_id.im_status')
 
     def get_avatar_card_data(self, fields):
-        return self.env['resource.resource'].search_read(
-            domain=[('id', 'in', self.ids)],
-        )
+        return self.read(fields)

From 037927bc521837f245c1fd0a81f370d888290007 Mon Sep 17 00:00:00 2001
From: jorv-odoo <jorv@odoo.com>
Date: Thu, 6 Nov 2025 08:26:28 +0000
Subject: [PATCH 369/673] [IMP] base: make an unallowed files exception text
 more explicit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While working on a support ticket, I was faced with this exception handling:
https://github.com/odoo/odoo/blob/49061347c181b1a451435bc363bb9508db8b6fab/odoo/addons/base/models/ir_asset.py#L344-L346

It might be nitpicky, but given the if condition, the exception error text
could be more explicit about the fact that it's raised because the files
in question being from an uninstalled addon/module.

This might fast track troubleshooting without having to dive into the source
code to understand why the error is being raised.

There is always the possibilty that I might be missing some context or other
scenarios where this error could be raised.

closes odoo/odoo#234848

X-original-commit: 1561f142d7abc8fc191ed423e4260c2664c92ff0
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
Signed-off-by: Joel Rodrigues Vitória (jorv) <jorv@odoo.com>
---
 odoo/addons/base/models/ir_asset.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/odoo/addons/base/models/ir_asset.py b/odoo/addons/base/models/ir_asset.py
index 231a53a8c0271..c11fcbdb445c0 100644
--- a/odoo/addons/base/models/ir_asset.py
+++ b/odoo/addons/base/models/ir_asset.py
@@ -346,7 +346,8 @@ def _get_paths(self, path_def, installed):
         if addon_manifest:
             if addon not in installed:
                 # Assert that the path is in the installed addons
-                raise Exception(f"Unallowed to fetch files from addon {addon} for file {path_def}")
+                raise Exception(f"""Unallowed to fetch files from addon {addon} for file {path_def}. """
+                                f"""Addon {addon} is not installed""")
             addons_path = addon_manifest.addons_path
             full_path = os.path.normpath(os.path.join(addons_path, *path_parts))
             # forbid escape from the current addon

From 90d63d9254feb71e823455e1751f4aaaaa18c368 Mon Sep 17 00:00:00 2001
From: "Yousef Alnashef (alny)" <alny@odoo.com>
Date: Thu, 11 Sep 2025 13:34:57 +0000
Subject: [PATCH 370/673] [FIX] l10n_gcc_*,l10n_sa: fixing post l10n_gcc report
 refactor bugs

after the merge https://github.com/odoo/odoo/pull/220167 there were some bugs due to the new section features
that were also merged in 19.0
this commits fixes certain tracebacks that occured when sections were used in the invoice pdf report.

closes odoo/odoo#234889

X-original-commit: e743e3c2dbf7a6e0aa6c9f55e7cb7b55ddbbf814
Signed-off-by: Maximilien La Barre (malb) <malb@odoo.com>
Signed-off-by: Yousef Alnashef (alny) <alny@odoo.com>
---
 .../views/report_invoice_templates.xml        | 24 ++++++++--------
 .../l10n_gcc_invoice/models/account_move.py   |  4 +--
 .../receipt_screen/receipt/order_receipt.xml  |  6 ++--
 addons/l10n_sa/views/report_invoice.xml       | 28 +++++++++++--------
 .../l10n_sa/views/report_templates_views.xml  |  3 ++
 5 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/addons/l10n_ae/views/report_invoice_templates.xml b/addons/l10n_ae/views/report_invoice_templates.xml
index f016ea47776ad..0b43a6038b81c 100644
--- a/addons/l10n_ae/views/report_invoice_templates.xml
+++ b/addons/l10n_ae/views/report_invoice_templates.xml
@@ -23,42 +23,40 @@
         <td name="td_taxes" position="after">
             <t t-if="display_taxes">
                 <td name="td_vat_amount" class="text-end">
-                    <span t-if="not line.collapse_prices" name="td_vat_amount_span" t-field="line.l10n_gcc_invoice_tax_amount"/>
+                    <span t-if="not hide_prices" name="td_vat_amount_span" t-field="line.l10n_gcc_invoice_tax_amount"/>
                 </td>
             </t>
         </td>
         <td name="td_subtotal" position="after">
             <t t-if="o.currency_id != o.company_currency_id">
                 <td name="td_subtotal_curr" class="text-end">
-                    <span name="td_subtotal_curr_excl_span" class="text-nowrap" t-if="o.company_price_include == 'tax_excluded' and not line.collapse_prices"
-                          t-out="line.currency_id._convert(line.price_subtotal, o.company_currency_id, o.company_id, o.invoice_date or datetime.date.today())"
+                    <span name="td_subtotal_curr_excl_span" class="text-nowrap" t-if="o.company_price_include == 'tax_excluded' and not hide_prices"
+                          t-out="line.price_subtotal * 1 / o.invoice_currency_rate"
                           t-options="{'widget': 'monetary', 'display_currency': o.company_currency_id}"/>
-                    <span name="td_subtotal_curr_incl_span" class="text-nowrap" t-if="o.company_price_include == 'tax_included' and not line.collapse_prices"
-                          t-out="line.currency_id._convert(line.price_total, o.company_currency_id, o.company_id, o.invoice_date or datetime.date.today())"
+                    <span name="td_subtotal_curr_incl_span" class="text-nowrap" t-if="o.company_price_include == 'tax_included' and not hide_prices"
+                          t-out="line.price_total * 1 / o.invoice_currency_rate"
                           t-options="{'widget': 'monetary', 'display_currency': o.company_currency_id}"/>
                 </td>
             </t>
         </td>
         <td name="td_subtotal_grouped" position="before">
             <td name="td_vat_amount_grouped" t-attf-class="text-end">
-                <span t-if="not line.collapse_prices" t-out="grouped_line['l10n_gcc_invoice_tax_amount']"  t-options='{"widget": "monetary", "display_currency": o.currency_id}' class="text-nowrap">4.05</span>
+                <span t-if="(grouped_line.get('display_type') in ('line_section', 'line_subsection') or hide_details)" t-out="grouped_line['l10n_gcc_invoice_tax_amount']"  t-options='{"widget": "monetary", "display_currency": o.currency_id}' class="text-nowrap">4.05</span>
             </td>
         </td>
         <td name="td_subtotal_grouped" position="after">
             <td name="th_subtotal_curr_grouped" class="text-end" t-if="o.currency_id != o.company_currency_id">
-                <span t-if="not line.collapse_prices and o.company_price_include == 'tax_excluded'" class="text-nowrap" t-out="line.currency_id._convert(grouped_line['price_subtotal'], o.company_currency_id, o.company_id, o.invoice_date or datetime.date.today())" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'>27.00</span>
-                <span t-if="not line.collapse_prices and o.company_price_include == 'tax_included'" class="text-nowrap" t-out="line.currency_id._convert(grouped_line['price_total'], o.company_currency_id, o.company_id, o.invoice_date or datetime.date.today())" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'>27.00</span>
+                <span t-if="(grouped_line.get('display_type') in ('line_section', 'line_subsection') or hide_details) and o.company_price_include == 'tax_excluded'" class="text-nowrap" t-out="grouped_line['price_subtotal'] * 1 / o.invoice_currency_rate" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'>27.00</span>
+                <span t-if="(grouped_line.get('display_type') in ('line_section', 'line_subsection') or hide_details) and o.company_price_include == 'tax_included'" class="text-nowrap" t-out="grouped_line['price_total'] * 1 / o.invoice_currency_rate" t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'>27.00</span>
             </td>
         </td>
-        <xpath expr="//t[@t-elif=&quot;line.display_type in ('line_section', 'line_subsection')&quot;]//span[@t-out='section_subtotal']/.." position="before">
-            <td colspan="1" class="text-end o_price_total">
-                <span t-out="line._l10n_gcc_get_section_tax_amount()" class="text-nowrap" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
-            </td>
+        <xpath expr="//span[@t-out='section_subtotal']/.." position="attributes">
+            <attribute name="colspan">2</attribute>
         </xpath>
         <xpath expr="//t[@t-elif=&quot;line.display_type in ('line_section', 'line_subsection')&quot;]//span[@t-out='section_subtotal']/.." position="after">
             <td colspan="1" class="text-end o_price_total" t-if="o.currency_id != o.company_currency_id">
                 <span class="text-nowrap"
-                      t-out="line.currency_id._convert(section_subtotal, o.company_currency_id, o.company_id, o.invoice_date or datetime.date.today())"
+                      t-out="section_subtotal * 1 / o.invoice_currency_rate"
                       t-options='{"widget": "monetary", "display_currency": o.company_currency_id}'/>
             </td>
         </xpath>
diff --git a/addons/l10n_gcc_invoice/models/account_move.py b/addons/l10n_gcc_invoice/models/account_move.py
index 550069e3267de..9bda1b3acbae7 100644
--- a/addons/l10n_gcc_invoice/models/account_move.py
+++ b/addons/l10n_gcc_invoice/models/account_move.py
@@ -92,10 +92,10 @@ def lang_product_name(line, lang):
             else:
                 line.l10n_gcc_line_name = line.name
 
-    def get_lines_grouped_by_section(self):
+    def _get_child_lines(self):
         # EXTENDS account
         self.ensure_one()
-        res = super().get_lines_grouped_by_section()
+        res = super()._get_child_lines()
 
         for line in res:
             line['l10n_gcc_invoice_tax_amount'] = line['price_total'] - line['price_subtotal']
diff --git a/addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml b/addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
index 2a8b33914418e..547e078211d37 100644
--- a/addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
+++ b/addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
@@ -10,16 +10,16 @@
                 <div class="pos-receipt-header">
                     <t t-if="!show_simplified_title">
                         <t t-if="order.config_id.l10n_gcc_dual_language_receipt">
-                            <span id="title_en" t-translation="off">Tax Invoice</span>
+                            <span id="title_en" t-translation="off">Tax Invoice</span> / 
                             <span id="title_ar" t-translation="off">الفاتورة الضريبية</span>
                         </t>
                         <t t-else="">
-                            <span name="title_simplified">Simplified Tax Invoice</span>
+                            <span name="title">Tax Invoice</span>
                         </t>
                     </t>
                     <t t-else="">
                         <t t-if="order.config_id.l10n_gcc_dual_language_receipt">
-                            <span name="title_simplified_en" t-translation="off">Simplified Tax Invoice</span>
+                            <span name="title_simplified_en" t-translation="off">Simplified Tax Invoice</span> / 
                             <span name="title_simplified_ar" t-translation="off">فاتورة ضريبية مبسطة</span>
                         </t>
                         <t t-else="">
diff --git a/addons/l10n_sa/views/report_invoice.xml b/addons/l10n_sa/views/report_invoice.xml
index b1d81918b704b..3f457f364b6f6 100644
--- a/addons/l10n_sa/views/report_invoice.xml
+++ b/addons/l10n_sa/views/report_invoice.xml
@@ -4,7 +4,7 @@
         <!-- Header & Footer -->
          <t name="l10n_gcc_settings" position="inside">
             <t t-set="additional_footer_text" t-value="o.get_l10n_sa_confirmation_datetime_sa_tz()"/>
-            <t t-if="o.company_id.country_id.code == 'SA' and not o._l10n_sa_is_legal() " t-set="custom_header_sa">
+            <t t-if="o.company_id.country_id.code == 'SA' and o.is_sale_document() and not o._l10n_sa_is_legal() " t-set="custom_header_sa">
                 <div class="fw-bold text-center mt-2">
                     <h5>THIS IS NOT A LEGAL DOCUMENT</h5>
                     <h5>هذا المستند ليس مستنداً قانونياً</h5>
@@ -134,13 +134,13 @@
         </td>
         <t name="account_invoice_line_accountable" position="inside">
             <td name="td_vat_amount" class="text-end">
-                <span t-if="not line.collapse_prices" class="text-nowrap" t-field="line.l10n_gcc_invoice_tax_amount" t-options="{'widget': 'monetary', 'display_currency': o.currency_id}">4.05</span>
+                <span class="text-nowrap" t-field="line.l10n_gcc_invoice_tax_amount" t-options="{'widget': 'monetary', 'display_currency': o.currency_id}">4.05</span>
             </td>
             <td name="td_vat_excl" class="text-end o_price_total">
-                <span t-if="not line.collapse_prices" class="text-nowrap" t-field="line.price_subtotal">27.00</span>
+                <span class="text-nowrap" t-field="line.price_subtotal">27.00</span>
             </td>
             <td name="td_vat_incl" class="text-end o_price_total">
-                <span t-if="not line.collapse_prices" class="text-nowrap" t-field="line.price_total">31.05</span>
+                <span class="text-nowrap" t-field="line.price_total">31.05</span>
             </td>
         </t>
         <xpath expr="//td[@name='td_price_unit']/span" position="attributes">
@@ -148,20 +148,26 @@
         </xpath>
         <td name="td_subtotal_grouped" position="before">
             <td name="td_vat_amount_grouped" t-attf-class="text-end {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
-                <span t-if="not line.collapse_prices" t-out="grouped_line['l10n_gcc_invoice_tax_amount']"  t-options='{"widget": "monetary", "display_currency": o.currency_id}' class="text-nowrap">4.05</span>
+                <span t-if="(grouped_line.get('display_type') in ('line_section', 'line_subsection') or hide_details)" t-out="grouped_line['l10n_gcc_invoice_tax_amount']"  t-options='{"widget": "monetary", "display_currency": o.currency_id}' class="text-nowrap">4.05</span>
             </td>
         </td>
+        <td name="td_subtotal_grouped" position="attributes">
+            <attribute name="class" separator=" " add="d-none"/>
+        </td>
         <td name="td_subtotal_grouped" position="after">
-            <td name="td_vat_amount_grouped" t-attf-class="text-end {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
-                <span t-if="not line.collapse_prices" t-out="grouped_line['price_total']"  t-options='{"widget": "monetary", "display_currency": o.currency_id}' class="text-nowrap">4.05</span>
+            <td name="td_vat_incl_grouped" t-attf-class="text-end {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
+                <span t-if="(grouped_line.get('display_type') in ('line_section', 'line_subsection') or hide_details)" class="text-nowrap" t-out="grouped_line['price_total']" t-options='{"widget": "monetary", "display_currency": o.currency_id}'>27.00</span>
             </td>
         </td>
-        <xpath expr="//t[@t-elif=&quot;line.display_type in ('line_section', 'line_subsection')&quot;]//span[@t-out='section_subtotal']/.." position="before">
-            <td colspan="1" class="text-end o_price_total">
-                <span t-out="line._l10n_gcc_get_section_tax_amount()" class="text-nowrap" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
+        <td name="td_subtotal_grouped" position="after">
+            <td name="td_vat_excl_grouped" t-attf-class="text-end {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}">
+                <span t-if="(grouped_line.get('display_type') in ('line_section', 'line_subsection') or hide_details)" class="text-nowrap" t-out="grouped_line['price_subtotal']" t-options='{"widget": "monetary", "display_currency": o.currency_id}'>27.00</span>
             </td>
+        </td>
+        <xpath expr="//span[@t-out='section_subtotal']/.." position="attributes">
+            <attribute name="colspan">2</attribute>
         </xpath>
-        <xpath expr="//t[@t-elif=&quot;line.display_type in ('line_section', 'line_subsection')&quot;]//span[@t-out='section_subtotal']/.." position="after">
+        <xpath expr="//span[@t-out='section_subtotal']/.." position="after">
             <td colspan="1" class="text-end o_price_total">
                 <span t-out="line._l10n_gcc_get_section_total()" class="text-nowrap" t-options='{"widget": "monetary", "display_currency": o.currency_id}'/>
             </td>
diff --git a/addons/l10n_sa/views/report_templates_views.xml b/addons/l10n_sa/views/report_templates_views.xml
index 803793d59a680..f4fee6928f862 100644
--- a/addons/l10n_sa/views/report_templates_views.xml
+++ b/addons/l10n_sa/views/report_templates_views.xml
@@ -47,6 +47,9 @@
         <xpath expr="//span[hasclass('page')]/.." position="before">
             <t t-call="l10n_sa.l10n_sa_additional_footer"/>
         </xpath>
+        <t t-set="header_shape_height" position="after">
+            <t t-set="header_shape_height" t-if="o and o._name == 'account.move' and o.country_code == 'SA'">215</t>
+        </t>
     </template>
     <template id="l10n_sa_external_layout_wave" inherit_id="web.external_layout_wave">
         <!-- support for custom header -->

From 0e403e9fdc61e028ea39a6139bdcb20ac64269ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Lef=C3=A8vre=20=28mlef=29?= <mlef@odoo.com>
Date: Mon, 29 Sep 2025 10:28:09 +0000
Subject: [PATCH 371/673] [FIX] hr: Fix work_phone overridden by company phone
 in cron job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When executing the ir_cron_data_employee_update_current_version job,
employee's work_phone fields would always be overridden by the company phone.

We found out that setting the employee phone as the company phone as a
default was pretty much never useful. By searching for other computed
properties that could be triggered by the cron job, I found out that two
computed properties were the exact same as their equivalent in
hr_version. I thus removed them.

The computed property triggered by the cron would assign
current_version_id, even if it was the same. Even in this case will all
the computed properties be triggered (even if current_version_id stays
the same), so I added a check before to avoid unnecessary recomputations.

task-5103739

closes odoo/odoo#234891

X-original-commit: d4e523fd388b427ffd6822f103807117ebb23c35
Signed-off-by: Jurgen Gjini (jugj) <jugj@odoo.com>
Signed-off-by: Martin Lefèvre (mlef) <mlef@odoo.com>
---
 addons/hr/models/hr_employee.py     | 19 +++----
 addons/hr/tests/test_hr_employee.py | 82 ++++++++++++++++++++++++++++-
 2 files changed, 87 insertions(+), 14 deletions(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index dd888a2271c4f..55cbbca72219a 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -589,12 +589,14 @@ def _compute_current_version_id(self):
                 order='date_version desc',
                 limit=1,
             )
+            new_current_version = False
             if version:
-                employee.current_version_id = version
+                new_current_version = version
             elif employee.version_ids:
-                employee.current_version_id = employee.version_ids[0]
-            else:
-                employee.current_version_id = False
+                new_current_version = employee.version_ids[0]
+            # To not trigger computed properties if still the same version
+            if employee.current_version_id != new_current_version:
+                employee.current_version_id = new_current_version
 
     def _cron_update_current_version_id(self):
         self.search([])._compute_current_version_id()
@@ -974,15 +976,6 @@ def _compute_work_permit_name(self):
             permit_no = '_' + employee.permit_no if employee.permit_no else ''
             employee.work_permit_name = "%swork_permit%s" % (name, permit_no)
 
-    @api.depends('distance_home_work', 'distance_home_work_unit')
-    def _compute_km_home_work(self):
-        for employee in self:
-            employee.km_home_work = employee.distance_home_work * 1.609 if employee.distance_home_work_unit == "miles" else employee.distance_home_work
-
-    def _inverse_km_home_work(self):
-        for employee in self:
-            employee.distance_home_work = employee.km_home_work / 1.609 if employee.distance_home_work_unit == "miles" else employee.km_home_work
-
     def _get_partner_count_depends(self):
         return ['user_id']
 
diff --git a/addons/hr/tests/test_hr_employee.py b/addons/hr/tests/test_hr_employee.py
index 54fb7944ce949..c19ada86e8805 100644
--- a/addons/hr/tests/test_hr_employee.py
+++ b/addons/hr/tests/test_hr_employee.py
@@ -2,10 +2,11 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from psycopg2.errors import UniqueViolation
+from freezegun import freeze_time
 
 from odoo import fields, Command
 from odoo.fields import Domain
-from odoo.tests import Form, users, new_test_user, HttpCase, tagged
+from odoo.tests import Form, users, new_test_user, HttpCase, tagged, TransactionCase
 from odoo.addons.hr.tests.common import TestHrCommon
 from odoo.tools import mute_logger
 from odoo.exceptions import ValidationError
@@ -695,6 +696,85 @@ def test_shared_private_link_permissions(self):
             )
 
 
+@tagged('-at_install', 'post_install')
+class TestVersionCron(TransactionCase):
+    """Test the behavior of CRONs affecting hr.version"""
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # Will be used for default employee version address (contains phone)
+        cls.env.user.company_id = cls.env['res.company'].create(
+            {'name': 'Pokémon Center', 'phone': '+32404040404'}
+        )
+
+        # Employee has a default version that will be overridden
+        with freeze_time("2020-10-07"):
+            cls.employee = cls.env['hr.employee'].create(
+                {
+                    'name': 'Charizard',
+                    'work_phone': '+32404040404',
+                    "distance_home_work": 32,
+                    "distance_home_work_unit": 'miles',
+                }
+            )
+
+    def test_version_cron_update_no_fields(self):
+        """
+        Employees should not see their fields be updated if the CRON does not
+        change their version.
+        """
+        with freeze_time('2023-10-06'):
+            self.employee.create_version(
+                {'date_version': '2023-10-07', "distance_home_work": 40}
+            )
+
+        # Saving current employee data to compare later on
+        employee_values = {}
+        employee_fields = self.env['hr.employee']._fields.keys()
+        for field in employee_fields:
+            employee_values[field] = self.employee[field]
+
+        # Should not change to new version
+        with freeze_time('2023-10-06'):
+            self.env['hr.employee']._cron_update_current_version_id()
+
+        for field in employee_fields:
+            self.assertEqual(
+                employee_values[field],
+                self.employee[field],
+                f"""No field should change if _cron_update_current_version_id() does not change the version.
+    However, the field {field} changed""",
+            )
+
+    def test_version_cron_update_fields(self):
+        """
+        Employees should see some of their field be changed if the CRON changes
+        their version.
+        """
+        with freeze_time('2023-10-06'):
+            self.employee.create_version(
+                {'date_version': '2023-10-07', "distance_home_work": 40}
+            )
+        current_home_distance = self.employee.distance_home_work
+        current_version = self.employee.current_version_id
+        # Should change to new version
+        with freeze_time('2023-10-07'):
+            self.env['hr.employee']._cron_update_current_version_id()
+
+        self.assertNotEqual(
+            current_version,
+            self.employee.current_version_id,
+            "current_version_id should have changed after calling _cron_update_current_version_id()",
+        )
+        self.assertNotEqual(
+            current_home_distance,
+            self.employee.distance_home_work,
+            "distance_home_work should have changed after calling _cron_update_current_version_id()",
+        )
+
+
 @tagged('-at_install', 'post_install')
 class TestHrEmployeeWebJson(HttpCase):
 

From 10b947e1baad2000dd5e564b6120e887d4ceab5c Mon Sep 17 00:00:00 2001
From: Alvaro Fuentes <afu@odoo.com>
Date: Wed, 5 Nov 2025 13:23:24 +0000
Subject: [PATCH 372/673] [FIX] stock: improve query for many locations

In the `_read_group`s on
https://github.com/odoo/odoo/blob/704405b1af4cd80f0687712d280baf5b536bdc84/addons/stock/models/product.py#L203-L204
when there are too many locations (37K on a real DB) the `Domain.OR`
variant leads to a very big query that runs too slow. Even the query
planner has issues parsing with it.

closes odoo/odoo#234846

X-original-commit: 212ff6d7cfe8a66a0b43dcaa3e6e724dec017be4
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock/models/product.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index b6635b28b83d0..c9bfca17ef418 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -9,6 +9,7 @@
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 from odoo.fields import Domain
+from odoo.tools import SQL
 from odoo.tools.barcode import check_barcode_encoding
 from odoo.tools.float_utils import float_compare
 from odoo.tools.mail import html2plaintext, is_html_empty
@@ -381,15 +382,17 @@ def _get_domain_locations_new(self, location_ids) -> tuple[Domain, Domain, Domai
             dest_loc_domain = Domain('location_dest_id', 'in', locations.ids)
             dest_loc_domain_out = Domain('location_dest_id', 'not in', locations.ids)
         elif locations:
-            paths_domain = Domain.OR(Domain('parent_path', '=like', loc.parent_path + '%') for loc in locations)
-            loc_domain = Domain('location_id', 'any', paths_domain)
+            alias = locations._table + '_inner'
+            paths_query = models.Query(locations.env, alias, SQL.identifier(locations._table))
+            paths_query.add_where(alias + '.parent_path LIKE ANY(%s)', [[loc.parent_path + '%' for loc in locations]])
+            loc_domain = Domain('location_id', 'in', paths_query)
             # The condition should be split for done and not-done moves as the final_dest_id only make sense
             # for the part of the move chain that is not done yet.
-            dest_loc_domain_done = Domain('location_dest_id', 'any', paths_domain)
+            dest_loc_domain_done = Domain('location_dest_id', 'in', paths_query)
             dest_loc_domain_in_progress = Domain([
                 '|',
-                    '&', ('location_final_id', '!=', False), ('location_final_id', 'any', paths_domain),
-                    '&', ('location_final_id', '=', False), ('location_dest_id', 'any', paths_domain),
+                    '&', ('location_final_id', '!=', False), ('location_final_id', 'in', paths_query),
+                    '&', ('location_final_id', '=', False), ('location_dest_id', 'in', paths_query),
             ])
             dest_loc_domain = Domain([
                 '|',

From d0ff93afed55fdab4dedfd0d5e09e727e38cd089 Mon Sep 17 00:00:00 2001
From: Antoine Boonen <aboo@odoo.com>
Date: Tue, 16 Sep 2025 18:24:44 +0100
Subject: [PATCH 373/673] [FIX] base: Fix href traceback

task-5129524
---
 odoo/addons/base/models/ir_qweb.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/odoo/addons/base/models/ir_qweb.py b/odoo/addons/base/models/ir_qweb.py
index a4d277ff97173..6f68e4d3e48ad 100644
--- a/odoo/addons/base/models/ir_qweb.py
+++ b/odoo/addons/base/models/ir_qweb.py
@@ -477,6 +477,10 @@
 
 ETREE_TEMPLATE_REF = count()
 
+# Only allow a javascript scheme if it is followed by [ ][window.]history.back()
+MALICIOUS_SCHEMES = re.compile(r'javascript:(?!( ?)((window\.)?)history\.back\(\)$)', re.I).findall
+
+
 def _id_or_xmlid(ref):
     try:
         return int(ref)
@@ -1693,7 +1697,7 @@ def _compile_static_node(self, el, compile_context, level):
         """ Compile a purely static element into a list of string. """
         if not el.nsmap:
             unqualified_el_tag = el_tag = el.tag
-            attrib = self._post_processing_att(el.tag, el.attrib)
+            attrib = self._post_processing_att(el.tag, {**el.attrib, '__is_static_node': True})
         else:
             # Etree will remove the ns prefixes indirection by inlining the corresponding
             # nsmap definition into the tag attribute. Restore the tag and prefix here.
@@ -1724,7 +1728,7 @@ def _compile_static_node(self, el, compile_context, level):
                 else:
                     attrib[name] = value
 
-            attrib = self._post_processing_att(el.tag, attrib)
+            attrib = self._post_processing_att(el.tag, {**attrib, '__is_static_node': True})
 
             # Update the dict of inherited namespaces before continuing the recursion. Note:
             # since `compile_context['nsmap']` is a dict (and therefore mutable) and we do **not**
@@ -2681,6 +2685,8 @@ def _post_processing_att(self, tagName, atts):
 
             @returns dict
         """
+        if not atts.pop('__is_static_node', False) and (href := atts.get('href')) and MALICIOUS_SCHEMES(str(href)):
+            atts['href'] = ""
         return atts
 
     def _get_field(self, record, field_name, expression, tagName, field_options, values):

From 76c25949f42ac6a14d2151c6005bc1aa27c00fd9 Mon Sep 17 00:00:00 2001
From: "Chong Wang (cwg)" <cwg@odoo.com>
Date: Mon, 3 Nov 2025 12:39:24 +0100
Subject: [PATCH 374/673] [IMP] core: modify the comment for monetary field

In the latest fetch strategy, the ORM won't update the cache value if it
is already filled. The comment is outdated. And we can remove its
corresponding test. However the code is still useful when the user
changes the monetary field but doesn't have the read access of the
currency and maybe other fields. We still use
``sudo().with_context(prefetch_fields=False)`` to get the currency
record without prefetching other fields.

Part-of: odoo/odoo#234490
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/test_orm/tests/test_fields.py | 27 -----------------------
 odoo/orm/fields_numeric.py                | 10 ++++-----
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/odoo/addons/test_orm/tests/test_fields.py b/odoo/addons/test_orm/tests/test_fields.py
index 0fc47001b6736..a081f1f96b8b6 100644
--- a/odoo/addons/test_orm/tests/test_fields.py
+++ b/odoo/addons/test_orm/tests/test_fields.py
@@ -1053,33 +1053,6 @@ def test_20_monetary(self):
             for record in records:
                 self.check_monetary(record, amount, currency, 'multi write(amount)')
 
-    def test_20_monetary_opw_2223134(self):
-        """ test monetary fields with cache override """
-        model = self.env['test_orm.monetary_order']
-        currency = self.env.ref('base.USD')
-
-        def check(value):
-            self.assertEqual(record.total, value)
-            self.env.flush_all()
-            self.cr.execute('SELECT total FROM test_orm_monetary_order WHERE id=%s', [record.id])
-            [total] = self.cr.fetchone()
-            self.assertEqual(total, value)
-
-        # create, and compute amount
-        record = model.create({
-            'currency_id': currency.id,
-            'line_ids': [Command.create({'subtotal': 1.0})],
-        })
-        check(1.0)
-
-        # delete and add a line: the deletion of the line clears the cache, then
-        # the recomputation of 'total' must prefetch record.currency_id without
-        # screwing up the new value in cache
-        record.write({
-            'line_ids': [Command.delete(record.line_ids.id), Command.create({'subtotal': 1.0})],
-        })
-        check(1.0)
-
     def test_20_monetary_related(self):
         """ test value rounding with related currency """
         currency = self.env.ref('base.USD')
diff --git a/odoo/orm/fields_numeric.py b/odoo/orm/fields_numeric.py
index 3557a45cf6c99..b05d3eee788bf 100644
--- a/odoo/orm/fields_numeric.py
+++ b/odoo/orm/fields_numeric.py
@@ -227,9 +227,9 @@ def convert_to_column_insert(self, value, record, values=None, validate=True):
             currency = dummy[currency_field_name]
         else:
             # Note: this is wrong if 'record' is several records with different
-            # currencies, which is functional nonsense and should not happen
-            # BEWARE: do not prefetch other fields, because 'value' may be in
-            # cache, and would be overridden by the value read from database!
+            # currencies, which is functional nonsense and should not happen.
+            # sudo and only fetch the currency record in case the user doesn't
+            # have the read permission of the currency field.
             currency = record[:1].sudo().with_context(prefetch_fields=False)[currency_field_name]
             currency = currency.with_env(record.env)
 
@@ -244,9 +244,9 @@ def convert_to_cache(self, value, record, validate=True):
         if value and validate:
             # FIXME @rco-odoo: currency may not be already initialized if it is
             # a function or related field!
-            # BEWARE: do not prefetch other fields, because 'value' may be in
-            # cache, and would be overridden by the value read from database!
             currency_field = self.get_currency_field(record)
+            # sudo and only fetch the currency record in case the user doesn't
+            # have the read permission of the currency field.
             currency = record.sudo().with_context(prefetch_fields=False)[currency_field]
             if len(currency) > 1:
                 raise ValueError("Got multiple currencies while assigning values of monetary field %s" % str(self))

From 9b79b8fb8ec5bd85c7d4c1b17f4e5c43810a0209 Mon Sep 17 00:00:00 2001
From: "Chong Wang (cwg)" <cwg@odoo.com>
Date: Mon, 3 Nov 2025 13:54:25 +0100
Subject: [PATCH 375/673] [IMP] core: avoid rounding value from the cache

According to the comment, the method is for odoo/odoo#177200, but in
odoo/odoo#177200, we rounded the value of the argument but not the value
from the cache. The code logic is actually changed in odoo/odoo#204796
when migrating the code from environments.py to fields_numeric.py.

After re-analyzing the code, we think it is not needed to re-round the
``cache_value`` of the argument for each ``record[currency_field]``,
since we expect it is already arounded before calling the this method,
and all records should have the same ``record[currency_field]``. So we
can drop the outdated comment.

Rounding ``value`` from the cache is a logic added in odoo/odoo#204796.
The idea was to avoid modifying value in cache like 1.000000000000001
to 1.00 and marking it dirty when the ronding digits for decimal places
is 2.

We decide to drop the logic because:
1. code is less and simpler
2. the number of extra queries to fix unrounded values are acceptable
3. can have better data consistency
4. less space usage for each database raw
5. allow to users to fix and get better exported data
   a. database value is 1.000000000000001
   b. export reocrd data (value is not rounded when exporting)
   c. csv value: '1.000000000000001'
   d. fix the value to '1.00'
   e. import record data from csv
   f. export record data again
   g. csv value: '1.00'

Part-of: odoo/odoo#234490
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/orm/fields_numeric.py | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/odoo/orm/fields_numeric.py b/odoo/orm/fields_numeric.py
index b05d3eee788bf..bdb8c650f5eda 100644
--- a/odoo/orm/fields_numeric.py
+++ b/odoo/orm/fields_numeric.py
@@ -267,24 +267,3 @@ def convert_to_export(self, value, record):
         if value or value == 0.0:
             return value
         return ''
-
-    def _filter_not_equal(self, records: BaseModel, cache_value: typing.Any) -> BaseModel:
-        records = super()._filter_not_equal(records, cache_value)
-        if not records:
-            return records
-        # check that the values were rounded properly when put in cache
-        # see fix odoo/odoo#177200 (commit 7164d5295904b08ec3a0dc1fb54b217671ff531c)
-        env = records.env
-        field_cache = self._get_cache(env)
-        currency_field = records._fields[self.get_currency_field(records)]
-        return records.browse(
-            record_id
-            for record_id, record_sudo in zip(
-                records._ids, records.sudo().with_context(prefetch_fields=False)
-            )
-            if not (
-                (value := field_cache.get(record_id))
-                and (currency := currency_field.__get__(record_sudo))
-                and currency.with_env(env).round(value) == cache_value
-            )
-        )

From f9f561077c67668143b29d04762b04337d9a1f83 Mon Sep 17 00:00:00 2001
From: "Chong Wang (cwg)" <cwg@odoo.com>
Date: Wed, 5 Nov 2025 15:17:48 +0100
Subject: [PATCH 376/673] [IMP] core: more accurate cache value for monetary

For monetary fields, in ``convert_to_cache``, when ``currency`` is
available, convert the ``round``ed float value to str like
``convert_to_column_insert`` and then convert it back to float, which
mimics the type converting from python variable to postgresql database
and then back to python variable.So that even if the ``round`` method
is not perfect, we can still promise the new cache value will be ``==``
to the value fetched from the database after flushing.

for example, the
rounded value is ``99.99000000000001``  # assume the ``round`` is not perfect
float_repr value is ``'99.99'``
database value is ``'99.99'::numeric``
fetched value would be ``float('99.99')``

closes odoo/odoo#234490

Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/orm/fields_numeric.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/odoo/orm/fields_numeric.py b/odoo/orm/fields_numeric.py
index bdb8c650f5eda..fdb48d054b167 100644
--- a/odoo/orm/fields_numeric.py
+++ b/odoo/orm/fields_numeric.py
@@ -248,10 +248,15 @@ def convert_to_cache(self, value, record, validate=True):
             # sudo and only fetch the currency record in case the user doesn't
             # have the read permission of the currency field.
             currency = record.sudo().with_context(prefetch_fields=False)[currency_field]
+            currency = currency.with_env(record.env)
             if len(currency) > 1:
                 raise ValueError("Got multiple currencies while assigning values of monetary field %s" % str(self))
             elif currency:
-                value = currency.with_env(record.env).round(value)
+                value = currency.round(value)
+                # convert the rounded value to ``str`` and then to ``float`` to mimic the data flow of flushing and
+                # fetching, which promises ``value_written_to_cache == value_fetched_from_database`` even if the
+                # ``round`` method is not perfect.
+                value = float(float_repr(value, currency.decimal_places))
         return value
 
     def convert_to_record(self, value, record):

From 4b267fd12ab931c35eb5b67e41af8196d04927c6 Mon Sep 17 00:00:00 2001
From: hapt-odoo <hapt@odoo.com>
Date: Tue, 22 Jul 2025 17:52:55 +0530
Subject: [PATCH 377/673] [IMP] stock: enhance address labeling in delivery
 slip report

To resolve ambiguities and improve operational efficiency:
1. The delivery address is explicitly labeled 'Delivery Address'. Ensuring no
   doubt about the final destination.
2. The label for the customer's primary information has been updated from
   'Customer Address' to simply Customer, which prevents operators from
   mistaking it for the delivery point.

closes odoo/odoo#220019

Task: 4929649
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/stock/report/report_deliveryslip.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
index 28b6b24d32b85..4cf70702379eb 100644
--- a/addons/stock/report/report_deliveryslip.xml
+++ b/addons/stock/report/report_deliveryslip.xml
@@ -10,6 +10,7 @@
                     <div name="div_outgoing_address">
                         <div name="outgoing_delivery_address"
                             t-if="o.should_print_delivery_address()">
+                            <strong>Delivery Address</strong>
                             <div t-out="o.move_ids[0].partner_id or o.partner_id"
                                 t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
                         </div>
@@ -30,7 +31,7 @@
                                 <t t-set="show_partner" t-value="True" />
                             </div>
                             <div name="customer_address" t-if="o.picking_type_id.code=='outgoing' and partner and partner != partner.commercial_partner_id">
-                                <strong>Customer Address</strong>
+                                <strong>Customer</strong>
                                 <t t-set="show_partner" t-value="True" />
                             </div>
                             <div t-if="show_partner" name="partner_header">

From 2d92a8e918c3449a228ec43427386f6c4ee2f2dd Mon Sep 17 00:00:00 2001
From: "Giorgio Tocco (gito)" <gito@odoo.com>
Date: Tue, 4 Nov 2025 14:43:37 +0000
Subject: [PATCH 378/673] [FIX] mail: reset chat hub position on chat window
 open

Prior to this commit, moving the chat hub could cause newly opened
chat windows to appear on top of it, rendering the hub invisible and
unusable.

This commit fixes the issue by resetting the chat hub's position
whenever a chat window opens and disabling its drag functionality
while any chat window remains open.

task-5227499

closes odoo/odoo#234912

X-original-commit: 50b90815e3434e6844c3ead0d0245172339c732c
Signed-off-by: Giorgio Tocco (gito) <gito@odoo.com>
---
 addons/mail/static/src/core/common/chat_hub.js          | 7 +++++++
 addons/mail/static/src/core/common/chat_window_model.js | 1 +
 2 files changed, 8 insertions(+)

diff --git a/addons/mail/static/src/core/common/chat_hub.js b/addons/mail/static/src/core/common/chat_hub.js
index 94cc593ae94c4..4be254eac4e48 100644
--- a/addons/mail/static/src/core/common/chat_hub.js
+++ b/addons/mail/static/src/core/common/chat_hub.js
@@ -51,6 +51,7 @@ export class ChatHub extends Component {
             }
         });
         useMovable({
+            enable: () => this.chatHub.compact || !this.chatHub.opened.length,
             cursor: "grabbing",
             ref: this.ref,
             elements: ".o-mail-ChatHub-bubbles",
@@ -63,6 +64,9 @@ export class ChatHub extends Component {
             onDragEnd: () => (this.position.isDragging = false),
             onDrop: this.onDrop.bind(this),
         });
+        this.env.bus.addEventListener("ChatWindow:will-open", () => {
+            this.resetPosition();
+        });
     }
 
     get optionActions() {
@@ -152,6 +156,9 @@ export class ChatHub extends Component {
     expand() {
         this.chatHub.compact = false;
         this.more.isOpen = this.chatHub.folded.length > this.chatHub.maxFolded;
+        if (this.chatHub.opened.length > 0) {
+            this.resetPosition();
+        }
     }
 }
 
diff --git a/addons/mail/static/src/core/common/chat_window_model.js b/addons/mail/static/src/core/common/chat_window_model.js
index 8654f11f2e492..a25d9da1cbfd3 100644
--- a/addons/mail/static/src/core/common/chat_window_model.js
+++ b/addons/mail/static/src/core/common/chat_window_model.js
@@ -89,6 +89,7 @@ export class ChatWindow extends Record {
         swapOpened = true,
     } = {}) {
         await this.store.chatHub.initPromise;
+        this.store.env.bus.trigger("ChatWindow:will-open");
         this.store.chatHub.folded.delete(this);
         if (swapOpened || !this.store.chatHub.opened.includes(this)) {
             this.store.chatHub.opened.delete(this);

From a49ecc0ce1ebe363dd2dcd5a6962197d7f077e19 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Thu, 23 Oct 2025 07:08:36 +0000
Subject: [PATCH 379/673] [IMP] html_editor: generalize the embeddedEditable
 selection restoration

Prior to this commit, to make use of the automatic selection restoration feature
hidden in `useEditableDescendants` hook for editable descendants of embedded
components, one had to define a new env property: `editorShared` and populate it
with the selection plugin shared functions. This process was pretty obscure and
is always the same, therefore it makes a lot more sense to automatically
populate the `env` with the selection shared functions.

This commit refines the concept of `env.editorShared`: it is now always present
in the `env` of embedded components that are inside an editor, and can be
populated using the `mount_component_handlers` resource. The idea is that a
plugin can assign some of its dependencies in that shared Object for its related
embedded components.

Embedded components using editable descendants will now always have the
`selection` plugin shared functions in `env.editorShared.selection`.

task-5189453

X-original-commit: a5fc09d9596c5447c2ad38a94717dae5d9ea6bdb
Part-of: odoo/odoo#234847
Related: odoo/enterprise#99051
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../src/others/embedded_component_plugin.js   |  9 +++-
 .../src/others/embedded_component_utils.js    |  4 +-
 .../embedded_file_plugin.js                   | 32 ++++++------
 .../toggle_block_plugin.js                    | 11 ----
 .../static/tests/embedded_components.test.js  | 50 +++++++++++++++++++
 5 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/addons/html_editor/static/src/others/embedded_component_plugin.js b/addons/html_editor/static/src/others/embedded_component_plugin.js
index de110d4bf5c9f..5a4513f10fdc2 100644
--- a/addons/html_editor/static/src/others/embedded_component_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_component_plugin.js
@@ -9,7 +9,7 @@ import { memoize } from "@web/core/utils/functions";
  */
 export class EmbeddedComponentPlugin extends Plugin {
     static id = "embeddedComponents";
-    static dependencies = ["history", "protectedNode"];
+    static dependencies = ["history", "protectedNode", "selection"];
     resources = {
         /** Handlers */
         normalize_handlers: withSequence(0, this.normalize.bind(this)),
@@ -32,7 +32,7 @@ export class EmbeddedComponentPlugin extends Plugin {
         // map from node to component info
         this.nodeMap = new WeakMap();
         this.app = this.config.embeddedComponentInfo.app;
-        this.env = this.config.embeddedComponentInfo.env;
+        this.env = this.config.embeddedComponentInfo.env ?? {};
         this.hostToStateChangeManagerMap = new WeakMap();
         this.embeddedComponents = memoize((embeddedComponents = []) => {
             const result = {};
@@ -163,11 +163,16 @@ export class EmbeddedComponentPlugin extends Plugin {
     ) {
         const props = getProps?.(host) || {};
         const env = Object.create(this.env);
+        env.editorShared = {};
         if (getStateChangeManager) {
             env.getStateChangeManager = this.getStateChangeManager.bind(this);
         }
         if (getEditableDescendants) {
             env.getEditableDescendants = getEditableDescendants;
+            // Enable the automatic selection restoration feature in @see useEditableDescendants
+            Object.assign(env.editorShared, {
+                selection: { ...this.dependencies.selection },
+            });
         }
         this.dispatchTo("mount_component_handlers", { name, env, props });
         const root = this.app.createRoot(Component, {
diff --git a/addons/html_editor/static/src/others/embedded_component_utils.js b/addons/html_editor/static/src/others/embedded_component_utils.js
index db27f275dfd1b..2db1046aa9ab3 100644
--- a/addons/html_editor/static/src/others/embedded_component_utils.js
+++ b/addons/html_editor/static/src/others/embedded_component_utils.js
@@ -100,9 +100,9 @@ export function useEditableDescendants(host) {
             _restoreSelection = undefined;
         }
     };
-    if (component.env.editorShared?.preserveSelection) {
+    if (component.env.editorShared?.selection) {
         onRendered(() => {
-            _restoreSelection = component.env.editorShared.preserveSelection().restore;
+            _restoreSelection = component.env.editorShared.selection.preserveSelection().restore;
         });
     }
     onMounted(() => {
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js
index 891bf72953472..7b859bb7478b0 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js
@@ -40,25 +40,23 @@ export class EmbeddedFilePlugin extends FilePlugin {
 
     setupNewFile({ name, env }) {
         if (name === "file") {
-            Object.assign(env, {
-                editorShared: {
-                    setSelectionAfter: (host) => {
-                        try {
-                            const leaf = nextLeaf(host, this.editable);
-                            if (!leaf) {
-                                return;
-                            }
-                            const leafEl = isBlock(leaf) ? leaf : leaf.parentElement;
-                            if (isBlock(leafEl) && leafEl.isContentEditable) {
-                                this.dependencies.selection.setSelection({
-                                    anchorNode: leafEl,
-                                    anchorOffset: 0,
-                                });
-                            }
-                        } catch {
+            Object.assign(env.editorShared, {
+                setSelectionAfter: (host) => {
+                    try {
+                        const leaf = nextLeaf(host, this.editable);
+                        if (!leaf) {
                             return;
                         }
-                    },
+                        const leafEl = isBlock(leaf) ? leaf : leaf.parentElement;
+                        if (isBlock(leafEl) && leafEl.isContentEditable) {
+                            this.dependencies.selection.setSelection({
+                                anchorNode: leafEl,
+                                anchorOffset: 0,
+                            });
+                        }
+                    } catch {
+                        return;
+                    }
                 },
             });
         }
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
index 9bfc9bb1b7a8a..b91de46b00d8d 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
@@ -83,7 +83,6 @@ export class ToggleBlockPlugin extends Plugin {
             },
         ],
 
-        mount_component_handlers: this.setupNewToggle.bind(this),
         normalize_handlers: withSequence(Infinity, this.normalize.bind(this)),
 
         delete_backward_overrides: this.handleDeleteBackward.bind(this),
@@ -586,14 +585,4 @@ export class ToggleBlockPlugin extends Plugin {
             !closestElement(selection.anchorNode, `${toggleSelector} ${titleSelector}`)
         );
     }
-
-    setupNewToggle({ name, env }) {
-        if (name === "toggleBlock") {
-            Object.assign(env, {
-                editorShared: {
-                    preserveSelection: this.dependencies.selection.preserveSelection,
-                },
-            });
-        }
-    }
 }
diff --git a/addons/html_editor/static/tests/embedded_components.test.js b/addons/html_editor/static/tests/embedded_components.test.js
index 87c0a59616842..6dde98690f914 100644
--- a/addons/html_editor/static/tests/embedded_components.test.js
+++ b/addons/html_editor/static/tests/embedded_components.test.js
@@ -41,6 +41,7 @@ import { Deferred } from "@web/core/utils/concurrency";
 import { Plugin } from "@html_editor/plugin";
 import { cleanHints, dispatchCleanForSave } from "./_helpers/dispatch";
 import { expectElementCount } from "./_helpers/ui_expectations";
+import { renderToElement } from "@web/core/utils/render";
 
 function getConfig(components) {
     return {
@@ -1286,6 +1287,55 @@ describe("editable descendants", () => {
         expect(getEditableDescendants(simple).deep).toBe(editableDescendants[0]);
         expect(getEditableDescendants(wrapper).deep).toBe(editableDescendants[1]);
     });
+
+    test("preserve selection inside an editable descendant", async () => {
+        const SimpleEmbeddedWrapper = EmbeddedWrapperMixin("deep");
+        const { el, editor, plugins } = await setupEditor(unformat(`<p>after</p>`), {
+            config: getConfig([
+                embedding("wrapper", SimpleEmbeddedWrapper, (host) => ({ host }), {
+                    getEditableDescendants,
+                }),
+            ]),
+        });
+        plugins.get("dom").insert(
+            renderToElement(xml`
+                <div data-embedded="wrapper">
+                    <div data-embedded-editable="deep">
+                        <p>deep</p>
+                    </div>
+                </div>
+            `)
+        );
+        addStep(editor);
+        // Set the selection before the component is mounted
+        plugins.get("selection").setCursorStart(el.querySelector("[data-embedded-editable] p"));
+        expect(getContent(el)).toBe(
+            unformat(`
+                <p data-selection-placeholder=""><br></p>
+                <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
+                    <div data-embedded-editable="deep" data-oe-protected="false" contenteditable="true">
+                        <p>[]deep</p>
+                    </div>
+                </div>
+                <p>after</p>
+            `)
+        );
+        await animationFrame();
+        // Verify that the selection was preserved after insertion
+        expect(getContent(el)).toBe(
+            unformat(`
+                <p data-selection-placeholder=""><br></p>
+                <div data-embedded="wrapper" data-oe-protected="true" contenteditable="false">
+                    <div class="deep">
+                        <div data-embedded-editable="deep" data-oe-protected="false" contenteditable="true">
+                            <p>[]deep</p>
+                        </div>
+                    </div>
+                </div>
+                <p>after</p>
+            `)
+        );
+    });
 });
 
 describe("Embedded state", () => {

From 432ebf785d909fe011a01e41256a78f558c7dd21 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Thu, 6 Nov 2025 13:53:04 +0000
Subject: [PATCH 380/673] [IMP] html_editor: introduce renderBlueprintToElement

Prior to this commit, it was pretty difficult to execute an operation in a
Plugin related to an embedded Component after inserting the blueprint, because
the Plugin has no way of knowing when the embedded component finishes its async
mount operation.

This commit introduces a new shared function `renderBlueprintToElement`, which
allows one to define a callback (associated with the rendered blueprint) which
will be executed after the first mount of its related embedded component when it
was just inserted in the DOM. That function will not be executed if the
blueprint is removed from the DOM before the first mount nor if the component is
mounted again afterwards.

task-5189453

closes odoo/odoo#234847

X-original-commit: c3c61118d5c7048033302baed8c4e947c8a2a753
Related: odoo/enterprise#99051
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 .../src/others/embedded_component_plugin.js   | 32 +++++++++++
 .../static/tests/embedded_components.test.js  | 56 +++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/addons/html_editor/static/src/others/embedded_component_plugin.js b/addons/html_editor/static/src/others/embedded_component_plugin.js
index 5a4513f10fdc2..627b042ef7b53 100644
--- a/addons/html_editor/static/src/others/embedded_component_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_component_plugin.js
@@ -2,6 +2,7 @@ import { nodeToTree } from "@html_editor/core/history_plugin";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { memoize } from "@web/core/utils/functions";
+import { renderToElement } from "@web/core/utils/render";
 
 /**
  * This plugin is responsible with providing the API to manipulate/insert
@@ -10,6 +11,7 @@ import { memoize } from "@web/core/utils/functions";
 export class EmbeddedComponentPlugin extends Plugin {
     static id = "embeddedComponents";
     static dependencies = ["history", "protectedNode", "selection"];
+    static shared = ["renderBlueprintToElement"];
     resources = {
         /** Handlers */
         normalize_handlers: withSequence(0, this.normalize.bind(this)),
@@ -34,6 +36,7 @@ export class EmbeddedComponentPlugin extends Plugin {
         this.app = this.config.embeddedComponentInfo.app;
         this.env = this.config.embeddedComponentInfo.env ?? {};
         this.hostToStateChangeManagerMap = new WeakMap();
+        this.hostToOnComponentInsertedMap = new WeakMap();
         this.embeddedComponents = memoize((embeddedComponents = []) => {
             const result = {};
             for (const embedding of embeddedComponents) {
@@ -190,6 +193,12 @@ export class EmbeddedComponentPlugin extends Plugin {
             fiberComplete.call(fiber);
             this.dispatchTo("post_mount_component_handlers");
         };
+        const onComponentInserted = this.extractOnComponentInserted(host);
+        if (onComponentInserted) {
+            // If a pending operation should be executed after the first mount
+            // of an inserted blueprint, add it as the last `onMounted` callback
+            root.node.mounted.push(onComponentInserted);
+        }
         const info = {
             root,
             host,
@@ -265,6 +274,29 @@ export class EmbeddedComponentPlugin extends Plugin {
         }
     }
 
+    /**
+     * @param {String} template blueprint for the embedded Component
+     * @param {Object} [context] rendering context
+     * @param {Function} [onComponentInserted] function to be executed when
+     *        it is first mounted after it was inserted in the DOM. It will not
+     *        be executed if the blueprint is removed from the DOM before the
+     *        first mount nor if the component is mounted again afterwards.
+     * @returns {HTMLElement} host
+     */
+    renderBlueprintToElement(template, context = {}, onComponentInserted = undefined) {
+        const host = renderToElement(template, context);
+        if (onComponentInserted) {
+            this.hostToOnComponentInsertedMap.set(host, onComponentInserted);
+        }
+        return host;
+    }
+
+    extractOnComponentInserted(host) {
+        const onComponentInserted = this.hostToOnComponentInsertedMap.get(host);
+        this.hostToOnComponentInsertedMap.delete(host);
+        return onComponentInserted;
+    }
+
     normalize(elem) {
         this.forEachEmbeddedComponentHost(elem, (host, { getEditableDescendants }) => {
             this.dependencies.protectedNode.setProtectingNode(host, true);
diff --git a/addons/html_editor/static/tests/embedded_components.test.js b/addons/html_editor/static/tests/embedded_components.test.js
index 6dde98690f914..08f8ed7a9b292 100644
--- a/addons/html_editor/static/tests/embedded_components.test.js
+++ b/addons/html_editor/static/tests/embedded_components.test.js
@@ -894,6 +894,62 @@ describe("Mount processing", () => {
         await animationFrame();
         expect(setSelection).toBe(simplePlugin.dependencies.selection.setSelection);
     });
+
+    test("Insert a component and execute a callback for its first mount", async () => {
+        const { el, editor, plugins } = await setupEditor(`<p>[]after</p>`, {
+            config: getConfig([embedding("counter", Counter)]),
+        });
+        const host = plugins
+            .get("embeddedComponents")
+            .renderBlueprintToElement(xml`<span data-embedded="counter"></span>`, {}, () =>
+                expect.step("onComponentInserted")
+            );
+        plugins.get("dom").insert(host);
+        addStep(editor);
+        await animationFrame();
+        // First mount
+        expect(getContent(el)).toBe(
+            `<p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></span>[]after</p>`
+        );
+        expect.verifySteps(["onComponentInserted"]);
+        deleteBackward(editor);
+        addStep(editor);
+        expect(getContent(el)).toBe(`<p>[]after</p>`);
+        undo(editor);
+        await animationFrame();
+        // Second mount, onComponentInserted was discarded
+        expect(getContent(el)).toBe(
+            `<p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></span>[]after</p>`
+        );
+        expect.verifySteps([]);
+    });
+
+    test("Discard onComponentInserted callback if a component is removed before finishing being mounted after insertion", async () => {
+        const { el, editor, plugins } = await setupEditor(`<p>[]after</p>`, {
+            config: getConfig([embedding("counter", Counter)]),
+        });
+        const host = plugins
+            .get("embeddedComponents")
+            .renderBlueprintToElement(xml`<span data-embedded="counter"></span>`, {}, () =>
+                expect.step("onComponentInserted")
+            );
+        plugins.get("dom").insert(host);
+        addStep(editor);
+        expect(getContent(el)).toBe(
+            `<p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"></span>[]after</p>`
+        );
+        // Don't wait for the component to mount, and remove the host
+        deleteBackward(editor);
+        addStep(editor);
+        expect(getContent(el)).toBe(`<p>[]after</p>`);
+        undo(editor);
+        await animationFrame();
+        // First mount, but onComponentInserted was discarded since the component was removed
+        expect(getContent(el)).toBe(
+            `<p><span data-embedded="counter" data-oe-protected="true" contenteditable="false"><span class="counter">Counter:0</span></span>[]after</p>`
+        );
+        expect.verifySteps([]);
+    });
 });
 
 describe("In-editor manipulations", () => {

From d30f39987722d030aab1c2c2f96149f47f59ebb7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Wed, 5 Nov 2025 12:33:57 +0000
Subject: [PATCH 381/673] [FIX] attachment_indexation: fix import find_spec()

The call to importlib.util.find_spec('pdfminer.high_level') introduced
by https://github.com/odoo/odoo/pull/230123 crashes when the module is
not available.  One has to check for 'pdfminer' first, and then
'pdfminer.high_level'.

closes odoo/odoo#234642

X-original-commit: d42c6ed937fe5af82353b339cfeacb5be9e49164
Signed-off-by: Julien Castiaux (juc) <juc@odoo.com>
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/attachment_indexation/models/ir_attachment.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/attachment_indexation/models/ir_attachment.py b/addons/attachment_indexation/models/ir_attachment.py
index 3b56c2c665133..8ff1ed0c0509b 100644
--- a/addons/attachment_indexation/models/ir_attachment.py
+++ b/addons/attachment_indexation/models/ir_attachment.py
@@ -13,7 +13,7 @@
 
 _logger = logging.getLogger(__name__)
 
-if not importlib.util.find_spec('pdfminer.high_level'):
+if not (importlib.util.find_spec('pdfminer') and importlib.util.find_spec('pdfminer.high_level')):
     _logger.warning("Attachment indexation of PDF documents is unavailable because the 'pdfminer.six' Python library cannot be found on the system. "
                     "You may install it from https://pypi.org/project/pdfminer.six/ (e.g. `pip3 install pdfminer.six`)")
 

From b9d6dac90d2a7f815d8d7b7bbf04ed16066e4a6c Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Thu, 6 Nov 2025 16:53:03 +0000
Subject: [PATCH 382/673] [FIX] stock_account: enable Inventory at date for
 non-standard product

Steps to reproduce:
- Create a product
- Set a category using 'avco' valuation
- Create a purchase order for that product, with some quantity and unit
  price
- Validate the receipt
- Bill the purchase order
- Go to Inventory > Reporting > Stock
- Use 'Inventory at Date' with today's date

Issue:
A traceback appears, as the wizard sends a datetime for `at_date`
context. However, we compare it later on with `account.move.line.date`,
which is a date and will cause a faulty comparison between two different
types.

closes odoo/odoo#234921

X-original-commit: 397859117386bcbfaa9c45c8302f0611b8a9dd1a
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/purchase_stock/models/stock_move.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/purchase_stock/models/stock_move.py b/addons/purchase_stock/models/stock_move.py
index ef62a0c8315f0..f5b1986da01dd 100644
--- a/addons/purchase_stock/models/stock_move.py
+++ b/addons/purchase_stock/models/stock_move.py
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from collections import deque
+from datetime import datetime
 
 from odoo import api, Command, fields, models, _
+from odoo.fields import Date
 from odoo.tools.float_utils import float_round, float_is_zero, float_compare
 from odoo.exceptions import UserError
 
@@ -150,6 +152,10 @@ def _get_value_from_account_move(self, quantity, at_date=None):
         if not self.purchase_line_id:
             return valuation_data
 
+        if isinstance(at_date, datetime):
+            # Since aml.date are Date, we don't need the extra precision here.
+            at_date = Date.to_date(at_date)
+
         aml_quantity = 0
         value = 0
         aml_ids = set()

From 27060e0cbabe434ee568ec0ea99781c58e104988 Mon Sep 17 00:00:00 2001
From: Paolo Gatti <pgi@odoo.com>
Date: Fri, 17 Oct 2025 14:47:04 +0000
Subject: [PATCH 383/673] [FIX] l10n_it_edi_withholding: checks shouldn't
 consider ENASARCO as withholding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the Italian localization, we validate that each invoice line has at
most one tax per kind (VAT, withholding, pension fund).

In Italy, a product cannot have more than one VAT tax. Also, the
FatturaPA XML structure only allows global declarations for withholding
and pension fund taxes — on the line level, it can only specify if those
taxes apply, not which ones. To reflect this, we enforce one tax per
kind per line. This validation was broken and recently fixed.

However, ENASARCO is a special case: it acts both as a withholding and a
pension fund tax. We added the Withholding flag recently (odoo/odoo#226968).
In realistic cases (e.g., a line with VAT + withholding 23% RIT AG +
ENASARCO), the validation fails and the user gets a blocking error in
account.move.send.

Since ENASARCO already has dedicated support through the
AltriDatiGestionali tag on the line, we allow it to pass the check as if
it were only a pension fund, restoring the previous behavior before we
added the withholding flag.

Some validation added and fields clear up in the tax editing phase, preventing invalid cases.

opw-5154223

closes odoo/odoo#234648

X-original-commit: a71b92bb2f2322f57bd4fa697bd6ffd3c73e8f2b
Signed-off-by: William André (wan) <wan@odoo.com>
Signed-off-by: Paolo Gatti (pgi) <pgi@odoo.com>
---
 addons/l10n_it_edi/models/account_move.py     |  2 +-
 addons/l10n_it_edi/models/account_tax.py      | 18 ++++++++++-
 .../tests/test_account_move_send.py           | 15 +++++++++
 addons/l10n_it_edi/tests/test_withholding.py  | 31 ++++++++++++++++++-
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_it_edi/models/account_move.py b/addons/l10n_it_edi/models/account_move.py
index adf283015657e..6b66c593b34c4 100644
--- a/addons/l10n_it_edi/models/account_move.py
+++ b/addons/l10n_it_edi/models/account_move.py
@@ -1820,7 +1820,7 @@ def _l10n_it_edi_export_taxes_check(self):
         errors = {}
         for kind_code, kind_desc, min_len in (
             ('vat', _('VAT'), 1),
-            ('withholding', _('Withholding'), 0),
+            ('withholding_no_enasarco', _('Withholding'), 0),
             ('pension_fund', _('Pension Fund'), 0),
         ):
             errors.update(self._l10n_it_edi_check_lines_for_tax_kind(kind_code, kind_desc, min_len))
diff --git a/addons/l10n_it_edi/models/account_tax.py b/addons/l10n_it_edi/models/account_tax.py
index a13f3f5b4820f..f6fd0cdc1cde5 100644
--- a/addons/l10n_it_edi/models/account_tax.py
+++ b/addons/l10n_it_edi/models/account_tax.py
@@ -1,7 +1,6 @@
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
-
 WITHHOLDING_TYPE_SELECTION = [
     ('RT01', '[RT01] Withholding for persons'),
     ('RT02', '[RT02] Withholding for personal businesses'),
@@ -83,6 +82,13 @@ def _l10n_it_filter_kind(self, kind):
         match kind:
             case 'withholding':
                 return self.filtered(lambda tax: tax.l10n_it_withholding_type)
+            case 'withholding_no_enasarco':
+                # Enasarco has both withholding and pension fund types,
+                # but it must be considered a pension fund for the checks.
+                return self.filtered(lambda tax:
+                    tax.l10n_it_withholding_type
+                    and tax.l10n_it_withholding_type != 'RT04'
+                )
             case 'pension_fund':
                 return self.filtered(lambda tax: tax.l10n_it_pension_fund_type)
             case 'vat':
@@ -93,6 +99,12 @@ def _l10n_it_filter_kind(self, kind):
             case _:
                 return super()._l10n_it_filter_kind(kind)
 
+    @api.onchange("l10n_it_withholding_type")
+    def _onchange_l10n_it_withholding_type(self):
+        """ When no withholding type is selected, there should be no withholding reason, the field is hidden """
+        taxes_to_be_cleared = self.filtered(lambda tax: tax.l10n_it_withholding_reason and not tax.l10n_it_withholding_type)
+        taxes_to_be_cleared.l10n_it_withholding_reason = False
+
     @api.constrains('amount', 'l10n_it_withholding_type', 'l10n_it_withholding_reason', 'l10n_it_pension_fund_type')
     def _validate_withholding(self):
         for tax in self:
@@ -102,3 +114,7 @@ def _validate_withholding(self):
                 raise ValidationError(_("Tax '%s' has a withholding type, so the withholding reason must also be specified", tax.name))
             if tax.l10n_it_withholding_reason and not tax.l10n_it_withholding_type:
                 raise ValidationError(_("Tax '%s' has a withholding reason, so the withholding type must also be specified", tax.name))
+            if (tax.l10n_it_withholding_type == 'RT04') ^ (tax.l10n_it_pension_fund_type == 'TC07'):
+                raise ValidationError(_("Tax '%s' has one of withholding and pension fund types that do not relate to ENASARCO, and one that does.", tax.name))
+            if tax.l10n_it_withholding_type == 'RT04' and tax.l10n_it_withholding_reason != 'ZO':
+                raise ValidationError(_("Tax '%s' has withholding type ENASARCO, the withholding reason should be [ZO] - Other reason.", tax.name))
diff --git a/addons/l10n_it_edi/tests/test_account_move_send.py b/addons/l10n_it_edi/tests/test_account_move_send.py
index 448e4a0fed214..badd869f5d1c5 100644
--- a/addons/l10n_it_edi/tests/test_account_move_send.py
+++ b/addons/l10n_it_edi/tests/test_account_move_send.py
@@ -232,3 +232,18 @@ def _l10n_it_edi_upload_single(record, file):
             self.assertFalse(invoices[1].l10n_it_edi_state)
             self.assertFalse(invoices[1].l10n_it_edi_transaction)
             self.assertTrue(invoices[1].l10n_it_edi_header)
+
+    def test_enasarco_no_warnings(self):
+        self.proxy_user.edi_mode = 'demo'
+        ref = self.env['account.chart.template'].with_company(self.proxy_user.company_id).ref
+        self.partner_a.write({
+            "l10n_it_codice_fiscale": "PERTLELPALQZRTSN",
+            'country_id': self.env.ref('base.it').id,
+            'street': 'Test street',
+            'city': 'Test town',
+            'zip': '32121',
+        })
+        invoice = self._create_invoice_it(tax_ids=ref('22v') | ref('23vwo') | ref('enasarcov'))
+        wizard = self.create_send_and_print(invoice, sending_methods=['l10n_it_edi'])
+        non_info_alerts = {k: v for k, v in wizard.alerts.items() if v.get('level') != 'info'}
+        self.assertFalse(non_info_alerts)
diff --git a/addons/l10n_it_edi/tests/test_withholding.py b/addons/l10n_it_edi/tests/test_withholding.py
index 50c89ea392937..49678c09accc2 100644
--- a/addons/l10n_it_edi/tests/test_withholding.py
+++ b/addons/l10n_it_edi/tests/test_withholding.py
@@ -1,7 +1,7 @@
 import datetime
 
 from odoo import fields
-from odoo.tests import tagged
+from odoo.tests import tagged, Form
 from odoo.exceptions import ValidationError
 from odoo.addons.l10n_it_edi.tests.common import TestItEdi
 
@@ -143,6 +143,35 @@ def find_tax_by_ref(ref_name):
         cls.enasarco_tax_invoice._post()
         cls.inps_tax_invoice._post()
 
+    def test_withholding_tax_change(self):
+        tax_form = Form(self.env['account.tax'])
+        name = "Test Withholding"
+
+        tax_form.name = name
+        tax_form.amount = -2.00
+        tax_form.l10n_it_withholding_type = 'RT01'
+        tax_form.l10n_it_withholding_reason = False
+        with self.assertRaises(ValidationError):
+            tax_form.save()
+
+        tax_form.l10n_it_withholding_reason = "A"
+        tax = tax_form.save()
+        self.assertRecordValues(tax, [{
+            'name': name,
+            'amount': -2.00,
+            'l10n_it_withholding_type': 'RT01',
+            'l10n_it_withholding_reason': 'A',
+        }])
+
+        tax_form.l10n_it_withholding_type = False
+        tax = tax_form.save()
+        self.assertRecordValues(tax, [{
+            'name': name,
+            'amount': -2.00,
+            'l10n_it_withholding_type': False,
+            'l10n_it_withholding_reason': False,
+        }])
+
     def test_withholding_tax_constraints(self):
         with self.assertRaises(ValidationError):
             self.withholding_sale_tax.amount = 10

From 3925d52077338c5c661b5565a8394ae3c15c445b Mon Sep 17 00:00:00 2001
From: defl <defl@odoo.com>
Date: Thu, 24 Jul 2025 17:15:18 +0000
Subject: [PATCH 384/673] [FIX] mail: fix recipients for partner with multiple
 emails in chatter

**Steps to reproduce:**
- Go to the `Contacts` app
- Create a new contact
- Add multiple emails in the email field
    (e.g. "test1@example.com,test2@example.com")
- Click on `Send Message` button in the chatter
- Default recipients are computed for each email
- One of them match the contact, the other doesn't but
    still pass to the badges list
- When sending a message, the second mail is considered
    as a new contact to create

**Issue:**
Emails coming from an email field with multiple emails are considered
separately when added in the chatter recipients. The partner only match the
first one which means that the second one creates a duplicate.

This seems to be the default behavior when receiving an email from the
additional email address of a partner (`If an email is not unique
(e.g. multi-email input), only the first found valid email in input is
considered.`), but automatically filling the recipients badges in this
way seemed unintended.

**Fix:**
Properly parsed the email field of recipients to avoid creating a duplicate
when sending a message on a contact page.

opw-4929564

closes odoo/odoo#234896

X-original-commit: 8130b74ac2733729bf0c0b9b07eb44da3426e186
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Florentin Delcourt (defl) <defl@odoo.com>
---
 addons/mail/models/models.py                         |  7 ++++++-
 addons/test_mail/tests/test_mail_thread_internals.py | 11 +++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/mail/models/models.py b/addons/mail/models/models.py
index 758528ec55017..b6e2940fe431b 100644
--- a/addons/mail/models/models.py
+++ b/addons/mail/models/models.py
@@ -578,12 +578,17 @@ def email_key(email):
                     not p.is_public
                 )
             ))
+            existing_mails = {
+                email_key(e)
+                for rec in (followers | partners)
+                for e in ([rec.email_normalized] if rec.email_normalized else []) + email_split_and_format(rec.email or '')
+            }
             email_to_lst = list(tools.misc.unique(
                 e for email_input in suggested[record.id]['email_to_lst'] for e in email_split_and_format(email_input)
                 if (
                     e and e.strip() and
                     email_key(e) not in ban_emails and
-                    email_key(e) not in ((followers | partners).mapped('email_normalized') + (followers | partners).mapped('email'))
+                    email_key(e) not in existing_mails
                 )
             ))
 
diff --git a/addons/test_mail/tests/test_mail_thread_internals.py b/addons/test_mail/tests/test_mail_thread_internals.py
index f0587b2e3be24..6b5dcbf88193f 100644
--- a/addons/test_mail/tests/test_mail_thread_internals.py
+++ b/addons/test_mail/tests/test_mail_thread_internals.py
@@ -583,11 +583,18 @@ def test_message_get_suggested_recipients(self):
             'email_from': self.partner_employee.email_formatted,
             'name': 'Partner follower (user)',
         })
+        # existing partner with multiple emails -> should propose only the first one
+        partner_multiemail = self.test_partner.copy({'email': 'test1.external@example.com,test2.external@example.com'})
+        ticket_partner_multiemail = self.env['mail.test.ticket.mc'].create({
+            'customer_id': partner_multiemail.id,
+            'email_from': partner_multiemail.email_formatted,
+            'name': 'Partner Multi-Emails',
+        })
         ticket_partner_fol.message_subscribe(partner_ids=self.test_partner.ids)
         ticket_partner_fol.message_subscribe(partner_ids=self.partner_employee.ids)
         for ticket, sugg_partner in zip(
-            ticket_partner_email + ticket_partner + ticket_partner_fol + ticket_partner_fol_user,
-            (self.test_partner, self.test_partner, self.test_partner, False),
+            ticket_partner_email + ticket_partner + ticket_partner_fol + ticket_partner_fol_user + ticket_partner_multiemail,
+            (self.test_partner, self.test_partner, self.test_partner, False, partner_multiemail),
             strict=True,
         ):
             with self.subTest(ticket=ticket.name):

From 00e4521bd8b08f0104ff992515dfcd7931520253 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Tue, 3 Jun 2025 15:12:31 +0530
Subject: [PATCH 385/673] [IMP] website: introduce pop-up option on images

Before this PR:
- Only images inside the gallery snippet could be viewed in
  full-screen using a modal.
- Users were unable to view other images in full-screen image.

After this PR:
- Adds a toggle option `Pop-up on Click` on image elements and to
  `s_image_gallery` to enable full-screen view.
- This option will be enabled by default on `s_image_gallery` and
  `.s_image_gallery.o_slideshow`.
- Clicking an image opens a modal using the same light-box component
  as `s_image_gallery` when `Pop-up on Click` is enabled.
- Includes a backdrop close only on single images and keyboard support
  to slide next and previous images.

task-2811804

closes odoo/odoo#212700

Related: odoo/upgrade#8638
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
---
 addons/website/__manifest__.py                |  1 -
 .../plugins/image/image_popup_option.xml      | 10 +++
 .../image/image_popup_option_plugin.js        | 23 +++++++
 .../plugins/options/image_gallery_option.xml  |  2 +
 .../src/interactions/base_lightbox_popup.js   | 69 +++++++++++++++++++
 .../image_lightbox.xml}                       | 42 +++++------
 .../static/src/interactions/image_popup.js    | 36 ++++++++++
 addons/website/static/src/scss/website.scss   |  5 ++
 .../src/snippets/s_image_gallery/000.scss     |  2 +-
 .../src/snippets/s_image_gallery/001.scss     |  2 +-
 .../src/snippets/s_image_gallery/002.scss     |  4 +-
 .../src/snippets/s_image_gallery/gallery.js   | 56 +++------------
 .../interactions/snippets/gallery.test.js     | 17 ++---
 .../interactions/snippets/image_popup.test.js | 46 +++++++++++++
 .../tests/tours/snippet_image_gallery.js      |  2 +-
 .../views/snippets/s_image_gallery.xml        | 11 +--
 16 files changed, 232 insertions(+), 96 deletions(-)
 create mode 100644 addons/website/static/src/builder/plugins/image/image_popup_option.xml
 create mode 100644 addons/website/static/src/builder/plugins/image/image_popup_option_plugin.js
 create mode 100644 addons/website/static/src/interactions/base_lightbox_popup.js
 rename addons/website/static/src/{snippets/s_image_gallery/000.xml => interactions/image_lightbox.xml} (51%)
 create mode 100644 addons/website/static/src/interactions/image_popup.js
 create mode 100644 addons/website/static/tests/interactions/snippets/image_popup.test.js

diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 9dbad48a96a01..52a4ec0bd83a7 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -391,7 +391,6 @@
             'web/static/lib/bootstrap/scss/_variables-dark.scss',
             'web/static/lib/bootstrap/scss/_maps.scss',
             'website/static/src/scss/website.edit_mode.scss',
-            'website/static/src/snippets/s_image_gallery/000.xml',
             'website/static/src/js/send_mail_form.js',
             'website/static/src/xml/website_form.xml',
             'website/static/src/xml/website_form_editor.xml',
diff --git a/addons/website/static/src/builder/plugins/image/image_popup_option.xml b/addons/website/static/src/builder/plugins/image/image_popup_option.xml
new file mode 100644
index 0000000000000..e1bfe94bcfe3d
--- /dev/null
+++ b/addons/website/static/src/builder/plugins/image/image_popup_option.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+<t t-name="website.ImagePopUpOption">
+    <BuilderRow label.translate="Pop-up on Click">
+        <BuilderCheckbox preview="false" classAction="'o_image_popup'"/>
+    </BuilderRow>
+</t>
+
+</templates>
diff --git a/addons/website/static/src/builder/plugins/image/image_popup_option_plugin.js b/addons/website/static/src/builder/plugins/image/image_popup_option_plugin.js
new file mode 100644
index 0000000000000..198e9fd0ae2fa
--- /dev/null
+++ b/addons/website/static/src/builder/plugins/image/image_popup_option_plugin.js
@@ -0,0 +1,23 @@
+import { ALIGNMENT_STYLE_PADDING, between, IMAGE_TOOL } from "@html_builder/utils/option_sequence";
+import { registry } from "@web/core/registry";
+import { Plugin } from "@html_editor/plugin";
+import { withSequence } from "@html_editor/utils/resource";
+import { BaseOptionComponent } from "@html_builder/core/utils";
+
+export const POPUP_IMAGE = between(IMAGE_TOOL, ALIGNMENT_STYLE_PADDING);
+
+export class ImagePopUpOptionPlugin extends Plugin {
+    static id = "imagePopUpOption";
+    static dependencies = [];
+    resources = {
+        builder_options: [withSequence(POPUP_IMAGE, ImagePopUpOption)],
+    };
+}
+
+export class ImagePopUpOption extends BaseOptionComponent {
+    static template = "website.ImagePopUpOption";
+    static selector = "img";
+    static exclude = "a img, header img, footer img, .s_image_gallery img";
+}
+
+registry.category("website-plugins").add(ImagePopUpOptionPlugin.id, ImagePopUpOptionPlugin);
diff --git a/addons/website/static/src/builder/plugins/options/image_gallery_option.xml b/addons/website/static/src/builder/plugins/options/image_gallery_option.xml
index 506781ae2f568..888359035fd7d 100644
--- a/addons/website/static/src/builder/plugins/options/image_gallery_option.xml
+++ b/addons/website/static/src/builder/plugins/options/image_gallery_option.xml
@@ -95,6 +95,8 @@
         </BuilderSelect>
      </BuilderRow>
 
+    <t t-call="website.ImagePopUpOption"/>
+
     <BuilderContext applyTo="'img'">
         <BorderConfigurator label.translate="Border"/>
     </BuilderContext>
diff --git a/addons/website/static/src/interactions/base_lightbox_popup.js b/addons/website/static/src/interactions/base_lightbox_popup.js
new file mode 100644
index 0000000000000..938a87ff1e379
--- /dev/null
+++ b/addons/website/static/src/interactions/base_lightbox_popup.js
@@ -0,0 +1,69 @@
+import { registry } from "@web/core/registry";
+
+import { Interaction } from "@web/public/interaction";
+
+export class BaseLightbox extends Interaction {
+    static selector = ".modal.o_image_lightbox";
+    dynamicContent = {
+        _root: {
+            "t-on-hidden.bs.modal": this.onModalHidden,
+            "t-on-keydown": this.onModalKeydown,
+            "t-on-click": this.onLightboxClick,
+        },
+    };
+
+    setup() {
+        this.modalEl = this.el;
+        this.hasMultipleImages = this.modalEl.querySelectorAll("img").length
+            ? this.el.querySelectorAll("img").length > 1
+            : false;
+    }
+
+    /**
+     * Called when the modal is hidden. Cleans up the modal element.
+     */
+    onModalHidden() {
+        this.modalEl.classList.add("d-none");
+        for (const backdropEl of this.modalEl.querySelectorAll(".modal-backdrop")) {
+            backdropEl.remove();
+        }
+        this.modalEl.remove();
+        this.modalEl = null;
+    }
+
+    /**
+     * Called when a key is pressed while the modal is focused.
+     * - Escape closes the modal
+     * - ArrowLeft and ArrowRight navigate through images if there are
+     *   multiple images
+     *
+     * @param {KeyboardEvent} ev
+     */
+    onModalKeydown(ev) {
+        if (ev.key === "Escape") {
+            // If the user is connected as an editor, prevent the backend header from collapsing.
+            ev.stopPropagation();
+        }
+        if (this.hasMultipleImages && (ev.key === "ArrowLeft" || ev.key === "ArrowRight")) {
+            const side = ev.key === "ArrowLeft" ? "prev" : "next";
+            this.modalEl.querySelector(`.carousel-control-${side}`).click();
+        }
+    }
+
+    /**
+     * Close the modal when clicking outside of the image if there is only one image.
+     * @param {MouseEvent} ev
+     */
+    onLightboxClick(ev) {
+        if (!this.hasMultipleImages && ev.target.nodeName !== "IMG") {
+            const modalInstance = Modal.getInstance(this.modalEl);
+            if (modalInstance) {
+                modalInstance.hide();
+            }
+        }
+    }
+}
+
+registry
+    .category("public.interactions")
+    .add("website.base_lightbox", BaseLightbox);
diff --git a/addons/website/static/src/snippets/s_image_gallery/000.xml b/addons/website/static/src/interactions/image_lightbox.xml
similarity index 51%
rename from addons/website/static/src/snippets/s_image_gallery/000.xml
rename to addons/website/static/src/interactions/image_lightbox.xml
index ded5fa048bf80..132ef5194812c 100644
--- a/addons/website/static/src/snippets/s_image_gallery/000.xml
+++ b/addons/website/static/src/interactions/image_lightbox.xml
@@ -9,7 +9,7 @@
 
         ========================================================================
     -->
-    <t t-name="website.s_image_gallery_mirror">
+    <t t-name="website.image_mirror">
         <div t-attf-id="#{id}" t-attf-class="carousel slide #{colorContrast}" t-att-data-bs-ride="ride" t-attf-data-bs-interval="#{interval}" style="margin: 0 12px;">
             <div class="carousel-inner">
                 <t t-foreach="images" t-as="image" t-key="image_index">
@@ -18,42 +18,44 @@
                     </div>
                 </t>
             </div>
-            <div class="o_carousel_controllers">
-                <button class="carousel-control-prev o_we_no_overlay o_not_editable" contenteditable="false" t-attf-data-bs-target="##{id}" data-bs-slide="prev" aria-label="Previous" title="Previous">
-                    <span class="carousel-control-prev-icon" aria-hidden="true"/>
-                    <span class="visually-hidden">Previous</span>
-                </button>
-                <div class="carousel-indicators s_image_gallery_indicators_bars">
-                    <t t-foreach="images" t-as="image" t-key="image_index">
-                        <button type="button" aria-label="Carousel indicator" t-attf-data-bs-target="##{id}" t-att-data-bs-slide-to="image_index" t-att-class="image_index == index and 'active' or None" t-attf-style="background-image: url(#{image.getAttribute('src')})"/>
-                    </t>
+            <t t-if="shouldShowControls">
+                <div class="o_carousel_controllers">
+                    <button class="carousel-control-prev o_we_no_overlay o_not_editable" contenteditable="false" t-attf-data-bs-target="##{id}" data-bs-slide="prev" aria-label="Previous" title="Previous">
+                        <span class="carousel-control-prev-icon" aria-hidden="true"/>
+                        <span class="visually-hidden">Previous</span>
+                    </button>
+                    <div class="carousel-indicators s_image_gallery_indicators_bars">
+                        <t t-foreach="images" t-as="image" t-key="image_index">
+                            <button type="button" aria-label="Carousel indicator" t-attf-data-bs-target="##{id}" t-att-data-bs-slide-to="image_index" t-att-class="image_index == index and 'active' or None" t-attf-style="background-image: url(#{image.getAttribute('src')})"/>
+                        </t>
+                    </div>
+                    <button class="carousel-control-next o_we_no_overlay o_not_editable" contenteditable="false" t-attf-data-bs-target="##{id}" data-bs-slide="next" aria-label="Next" title="Next">
+                        <span class="carousel-control-next-icon" aria-hidden="true"/>
+                        <span class="visually-hidden">Next</span>
+                    </button>
                 </div>
-                <button class="carousel-control-next o_we_no_overlay o_not_editable" contenteditable="false" t-attf-data-bs-target="##{id}" data-bs-slide="next" aria-label="Next" title="Next">
-                    <span class="carousel-control-next-icon" aria-hidden="true"/>
-                    <span class="visually-hidden">Next</span>
-                </button>
-            </div>
+            </t>
         </div>
     </t>
 
     <!--
         ========================================================================
-        Gallery Slideshow LightBox
+        Photo/Gallery Slideshow LightBox
 
         This template is used to display a lightbox with a slideshow.
 
-        This template wraps website.s_image_gallery_mirror in a bootstrap modal
+        This template wraps website.image_mirror in a bootstrap modal
         dialog.
         ========================================================================
     -->
-    <t t-name="website.gallery.s_image_gallery_mirror.lightbox">
-        <div role="dialog" class="modal o_technical_modal fade s_gallery_lightbox p-0" aria-label="Image Gallery Dialog" tabindex="-1">
+    <t t-name="website.image_mirror.lightbox">
+        <div role="dialog" class="modal o_technical_modal fade o_image_lightbox p-0" aria-label="Image Gallery Dialog" tabindex="-1">
             <div class="modal-dialog m-0" role="Picture Gallery"
                 t-attf-style="">
                 <div class="modal-content bg-transparent modal-fullscreen">
                     <main class="modal-body o_slideshow bg-transparent">
                         <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close" style="position: absolute; right: 10px; top: 10px;"></button>
-                        <t t-call="website.s_image_gallery_mirror"/>
+                        <t t-call="website.image_mirror"/>
                     </main>
                 </div>
             </div>
diff --git a/addons/website/static/src/interactions/image_popup.js b/addons/website/static/src/interactions/image_popup.js
new file mode 100644
index 0000000000000..51d7cc8ae12d4
--- /dev/null
+++ b/addons/website/static/src/interactions/image_popup.js
@@ -0,0 +1,36 @@
+import { registry } from "@web/core/registry";
+import { Interaction } from "@web/public/interaction";
+
+export class ImagePopUp extends Interaction {
+    static selector = "img.o_image_popup";
+    dynamicContent = {
+        _root: {
+            "t-on-click": this.onClickImg,
+        },
+    };
+
+    /**
+     * Handles the click on an image with the 'o_image_popup' class.
+     * If the image is not inside a link or a modal, opens it in a lightbox.
+     * @param {MouseEvent} ev
+     */
+    onClickImg(ev) {
+        if (ev.currentTarget.closest("a") || ev.currentTarget.closest(".modal")) {
+            return;
+        }
+
+        const clone = ev.currentTarget.cloneNode(true);
+        this.hasMultipleImages = false;
+        this.modalEl = this.renderAt("website.image_mirror.lightbox", {
+            images: [clone],
+            index: 0,
+            shouldShowControls: this.hasMultipleImages,
+        })[0];
+        this.insert(this.modalEl, document.body);
+        new Modal(this.modalEl, { keyboard: true, backdrop: true }).show();
+    }
+}
+
+registry
+    .category("public.interactions")
+    .add("website.image_popup", ImagePopUp);
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index 7c36360e2e4b7..f1ab1d4eb24b3 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -3252,3 +3252,8 @@ input[value*="data-oe-translation-source-sha"] {
         }
     }
 }
+
+// Cursor pointer for image's that open in lightbox popup
+img.o_image_popup {
+    cursor: pointer;
+}
diff --git a/addons/website/static/src/snippets/s_image_gallery/000.scss b/addons/website/static/src/snippets/s_image_gallery/000.scss
index a99bc86fcd23a..65fdbd22703d9 100644
--- a/addons/website/static/src/snippets/s_image_gallery/000.scss
+++ b/addons/website/static/src/snippets/s_image_gallery/000.scss
@@ -151,5 +151,5 @@
     }
 }
 
-// Note: the s_gallery_lightbox is always using the right dom and classes of the
+// Note: the o_image_lightbox is always using the right dom and classes of the
 // most recent version of the snippet as it is generated by JS after page load.
diff --git a/addons/website/static/src/snippets/s_image_gallery/001.scss b/addons/website/static/src/snippets/s_image_gallery/001.scss
index 0e1750c105f38..9684b1963505c 100644
--- a/addons/website/static/src/snippets/s_image_gallery/001.scss
+++ b/addons/website/static/src/snippets/s_image_gallery/001.scss
@@ -270,7 +270,7 @@
     }
 }
 
-.s_gallery_lightbox {
+.o_image_lightbox {
     .modal-dialog {
         height: 100%;
         background-color: rgba(0,0,0,0.7);
diff --git a/addons/website/static/src/snippets/s_image_gallery/002.scss b/addons/website/static/src/snippets/s_image_gallery/002.scss
index db6373d95615f..eed33a8461f47 100644
--- a/addons/website/static/src/snippets/s_image_gallery/002.scss
+++ b/addons/website/static/src/snippets/s_image_gallery/002.scss
@@ -83,7 +83,7 @@
         }
     }
 
-    &:not(.o_slideshow) {
+    &.o_image_popup {
         img {
             cursor: pointer;
         }
@@ -405,7 +405,7 @@
     }
 }
 
-.s_gallery_lightbox {
+.o_image_lightbox {
     .modal-dialog {
         height: 100%;
         background-color: rgba(0,0,0,0.7);
diff --git a/addons/website/static/src/snippets/s_image_gallery/gallery.js b/addons/website/static/src/snippets/s_image_gallery/gallery.js
index e3f902df99260..687b2f752c4a4 100644
--- a/addons/website/static/src/snippets/s_image_gallery/gallery.js
+++ b/addons/website/static/src/snippets/s_image_gallery/gallery.js
@@ -1,11 +1,10 @@
-import { Interaction } from "@web/public/interaction";
 import { registry } from "@web/core/registry";
 
 import { uniqueId } from "@web/core/utils/functions";
-import { renderToElement } from "@web/core/utils/render";
+import { Interaction } from "@web/public/interaction";
 
 export class Gallery extends Interaction {
-    static selector = ".s_image_gallery:not(.o_slideshow)";
+    static selector = ".s_image_gallery.o_image_popup";
     dynamicContent = {
         img: {
             "t-on-click": this.onClickImg,
@@ -13,7 +12,6 @@ export class Gallery extends Interaction {
     };
 
     setup() {
-        this.modalEl = null;
         this.originalSources = [...this.el.querySelectorAll("img")].map((img) =>
             img.getAttribute("src")
         );
@@ -27,7 +25,7 @@ export class Gallery extends Interaction {
      */
     onClickImg(ev) {
         const clickedEl = ev.currentTarget;
-        if (this.modalEl || clickedEl.matches("a > img")) {
+        if (clickedEl.matches("a > img")) {
             return;
         }
 
@@ -54,56 +52,18 @@ export class Gallery extends Interaction {
 
         const milliseconds = this.el.dataset.interval || false;
 
-        this.modalEl = renderToElement("website.gallery.s_image_gallery_mirror.lightbox", {
+        this.hasMultipleImages = imageEls.length > 1;
+        this.modalEl = this.renderAt("website.image_mirror.lightbox", {
             images: imageEls,
             index: currentImageIndex,
             dim: dimensions,
             interval: milliseconds || 0,
             ride: !milliseconds ? "false" : "carousel",
             id: uniqueId("slideshow_"),
-        });
-
-        this.onModalKeydownBound = this.onModalKeydown.bind(this);
-
-        this.modalEl.addEventListener("hidden.bs.modal", () => {
-            this.modalEl.classList.add("d-none");
-            for (const backdropEl of this.modalEl.querySelectorAll(".modal-backdrop")) {
-                backdropEl.remove(); // bootstrap leaves a modal-backdrop
-            }
-            const slideshowEl = this.modalEl.querySelector(".modal-body.o_slideshow");
-            this.services["public.interactions"].stopInteractions(slideshowEl);
-            this.modalEl.removeEventListener("keydown", this.onModalKeydownBound);
-            this.modalEl.remove();
-            this.modalEl = undefined;
-        });
-
-        this.modalEl.addEventListener(
-            "shown.bs.modal",
-            () => {
-                const slideshowEl = this.modalEl.querySelector(".modal-body.o_slideshow");
-                this.services["public.interactions"].startInteractions(slideshowEl);
-                this.modalEl.addEventListener("keydown", this.onModalKeydownBound);
-            },
-            { once: true }
-        );
-
+            shouldShowControls: this.hasMultipleImages,
+        })[0];
         this.insert(this.modalEl, document.body);
-        const modalBS = new Modal(this.modalEl, { keyboard: true, backdrop: true });
-        modalBS.show();
-    }
-
-    /**
-     * @param {MouseEvent} ev
-     */
-    onModalKeydown(ev) {
-        if (ev.key === "ArrowLeft" || ev.key === "ArrowRight") {
-            const side = ev.key === "ArrowLeft" ? "prev" : "next";
-            this.modalEl.querySelector(`.carousel-control-${side}`).click();
-        }
-        if (ev.key === "Escape") {
-            // If the user is connected as an editor, prevent the backend header from collapsing.
-            ev.stopPropagation();
-        }
+        new Modal(this.modalEl, { keyboard: true }).show();
     }
 }
 
diff --git a/addons/website/static/tests/interactions/snippets/gallery.test.js b/addons/website/static/tests/interactions/snippets/gallery.test.js
index 053f7038b958b..c3261a95d1457 100644
--- a/addons/website/static/tests/interactions/snippets/gallery.test.js
+++ b/addons/website/static/tests/interactions/snippets/gallery.test.js
@@ -4,14 +4,14 @@ import { describe, expect, test } from "@odoo/hoot";
 import { animationFrame, click, press, queryAll } from "@odoo/hoot-dom";
 import { advanceTime } from "@odoo/hoot-mock";
 
-setupInteractionWhiteList("website.gallery");
+setupInteractionWhiteList(["website.gallery", "website.base_lightbox"]);
 
 describe.current.tags("interaction_dev");
 
 // TODO Obtain rendering from `website.s_images_wall` template ?
 const defaultGallery = `
     <div id="wrapwrap">
-        <section class="s_image_gallery o_spc-small o_masonry pt24 pb24 o_colored_level" data-vcss="002" data-columns="3" style="overflow: hidden;" data-snippet="s_images_wall" data-name="Images Wall">
+        <section class="s_image_gallery o_spc-small o_masonry pt24 pb24 o_colored_level o_image_popup" data-vcss="002" data-columns="3" style="overflow: hidden;" data-snippet="s_images_wall" data-name="Images Wall">
             <div class="container">
                 <div class="row s_nb_column_fixed">
                     <div class="o_masonry_col o_snippet_not_selectable col-lg-4">
@@ -32,15 +32,6 @@ const defaultGallery = `
     </div>
 `;
 
-test("gallery does nothing if there is no non-slideshow s_image_gallery", async () => {
-    const { core } = await startInteractions(`
-        <div id="wrapwrap">
-            <section class="s_image_gallery o_slideshow"/>
-        </div>
-    `);
-    expect(core.interactions).toHaveLength(0);
-});
-
 async function checkLightbox({ next, previous, close }) {
     const { core } = await startInteractions(defaultGallery);
     expect(core.interactions).toHaveLength(1);
@@ -48,7 +39,7 @@ async function checkLightbox({ next, previous, close }) {
     await click(imgEls[3]);
     await animationFrame();
     await advanceTime(1000);
-    const lightboxEl = document.querySelector(".s_gallery_lightbox");
+    const lightboxEl = document.querySelector(".o_image_lightbox");
     expect(lightboxEl).not.toBe(null);
 
     async function checkActiveImage(expectedIndex) {
@@ -73,7 +64,7 @@ async function checkLightbox({ next, previous, close }) {
     await close(lightboxEl);
     await animationFrame();
     await advanceTime(1000);
-    expect(document.querySelector(".s_gallery_lightbox")).toBe(null);
+    expect(document.querySelector(".o_image_lightbox")).toBe(null);
 }
 
 test("gallery interaction opens lightbox on click, then use keyboard", async () => {
diff --git a/addons/website/static/tests/interactions/snippets/image_popup.test.js b/addons/website/static/tests/interactions/snippets/image_popup.test.js
new file mode 100644
index 0000000000000..d27cf51fec45c
--- /dev/null
+++ b/addons/website/static/tests/interactions/snippets/image_popup.test.js
@@ -0,0 +1,46 @@
+import { startInteractions, setupInteractionWhiteList } from "@web/../tests/public/helpers";
+
+import { describe, expect, test } from "@odoo/hoot";
+import { animationFrame, click, press, queryAll } from "@odoo/hoot-dom";
+import { advanceTime } from "@odoo/hoot-mock";
+
+setupInteractionWhiteList(["website.image_popup", "website.base_lightbox"]);
+
+describe.current.tags("interaction_dev");
+
+const defaultImage = `
+    <img src="/web/image/website.s_picture_default_image" class="figure-img img-fluid rounded o_image_popup" alt=""/>
+`;
+test("image won't open in pop-up if there is no 'o_image_popup' class in img element", async () => {
+    const { core } = await startInteractions(`
+        <img src="/web/image/website.s_picture_default_image" class="figure-img img-fluid rounded" alt=""/>
+    `);
+    expect(core.interactions).toHaveLength(0);
+});
+
+async function checkLightbox({ close }) {
+    const { core } = await startInteractions(defaultImage);
+    expect(core.interactions).toHaveLength(1);
+    const imgEl = queryAll("img");
+    await click(imgEl);
+    await animationFrame();
+    await advanceTime(1000);
+    const lightboxEl = document.querySelector(".o_image_lightbox");
+    expect(lightboxEl).not.toBe(null);
+    await close(lightboxEl);
+    await animationFrame();
+    await advanceTime(1000);
+    expect(document.querySelector(".o_image_lightbox")).toBe(null);
+}
+
+test("image interaction opens lightbox on click, then use keyboard", async () => {
+    await checkLightbox({
+        close: async () => await press("Escape", { code: "Escape" }),
+    });
+});
+
+test("image interaction opens lightbox on click, then use mouse", async () => {
+    await checkLightbox({
+        close: async (lightboxEl) => await click(lightboxEl.querySelector(".btn-close")),
+    });
+});
diff --git a/addons/website/static/tests/tours/snippet_image_gallery.js b/addons/website/static/tests/tours/snippet_image_gallery.js
index 0b23288e1eada..4c767c8c6009c 100644
--- a/addons/website/static/tests/tours/snippet_image_gallery.js
+++ b/addons/website/static/tests/tours/snippet_image_gallery.js
@@ -25,7 +25,7 @@ registerWebsitePreviewTour(
         },
         {
             content: "Check that the modal has opened properly",
-            trigger: ":iframe .s_gallery_lightbox img",
+            trigger: ":iframe .o_image_lightbox img",
         },
     ]
 );
diff --git a/addons/website/views/snippets/s_image_gallery.xml b/addons/website/views/snippets/s_image_gallery.xml
index b9baceabb4bf8..508a6dca28915 100644
--- a/addons/website/views/snippets/s_image_gallery.xml
+++ b/addons/website/views/snippets/s_image_gallery.xml
@@ -2,7 +2,7 @@
 <odoo>
 
 <template id="s_image_gallery" name="Image Gallery">
-    <section class="s_image_gallery o_slideshow pt24 pb24 s_image_gallery_controllers_outside s_image_gallery_controllers_outside_arrows_right s_image_gallery_indicators_dots s_image_gallery_arrows_default" data-vcss="002" data-columns="3">
+    <section class="s_image_gallery o_slideshow pt24 pb24 s_image_gallery_controllers_outside s_image_gallery_controllers_outside_arrows_right s_image_gallery_indicators_dots s_image_gallery_arrows_default o_image_popup" data-vcss="002" data-columns="3">
         <div class="o_container_small overflow-hidden">
             <div id="slideshow_sample" class="carousel carousel-dark slide" data-bs-ride="carousel" data-bs-interval="0">
                 <div class="carousel-inner">
@@ -37,7 +37,7 @@
 </template>
 
 <template id="s_images_wall" name="Images Wall">
-    <section class="s_image_gallery o_spc-small o_masonry pt24 pb24" data-vcss="002" data-columns="3" style="overflow: hidden;">
+    <section class="s_image_gallery o_spc-small o_masonry pt24 pb24 o_image_popup" data-vcss="002" data-columns="3" style="overflow: hidden;">
         <div class="container">
             <div class="row s_nb_column_fixed">
                 <div class="o_masonry_col o_snippet_not_selectable col-lg-4">
@@ -77,11 +77,4 @@
     <field name="path">website/static/src/snippets/s_image_gallery/002.scss</field>
 </record>
 
-<record id="website.s_image_gallery_000_xml" model="ir.asset">
-    <field name="name">Image gallery 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_image_gallery/000.xml</field>
-    <field name="active" eval="True"/>
-</record>
-
 </odoo>

From d818094b22f42da2d5b2f8dd41df74b6fe65aece Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Tue, 4 Nov 2025 14:41:53 +0100
Subject: [PATCH 386/673] [IMP] mail: make Call components use channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Part-of: odoo/odoo#234360
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/discuss/call/common/call.js     |  4 ++--
 .../static/src/discuss/call/common/call.xml    | 10 +++++-----
 .../discuss/call/common/call_action_list.js    |  6 +++---
 .../src/discuss/call/common/call_invitation.js | 18 +++++++++---------
 .../discuss/call/common/call_invitation.xml    |  6 +++---
 .../discuss/call/common/call_invitations.xml   |  2 +-
 .../call/common/call_participant_card.js       |  4 ++--
 .../discuss/call/common/chat_window_patch.xml  |  2 +-
 .../static/src/discuss/call/common/meeting.xml |  2 +-
 .../src/discuss/call/common/pip_banner.xml     |  2 +-
 .../discuss_app/sidebar/call_participants.js   | 10 +++++-----
 .../discuss_app/sidebar/call_participants.xml  |  2 +-
 .../discuss_app/sidebar/channel_patch.xml      |  2 +-
 .../core/public_web/discuss_content_patch.xml  |  2 +-
 14 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/call.js b/addons/mail/static/src/discuss/call/common/call.js
index f2fb5a0485629..d32888f1a18ba 100644
--- a/addons/mail/static/src/discuss/call/common/call.js
+++ b/addons/mail/static/src/discuss/call/common/call.js
@@ -37,7 +37,7 @@ export class Call extends Component {
         CallParticipantCard,
         PttAdBanner,
     };
-    static props = ["thread?", "compact?", "hasOverlay?", ...inDiscussCallViewProps];
+    static props = ["channel?", "compact?", "hasOverlay?", ...inDiscussCallViewProps];
     static defaultProps = { hasOverlay: true };
     static template = "discuss.Call";
 
@@ -105,7 +105,7 @@ export class Call extends Component {
     }
 
     get channel() {
-        return this.props.thread?.channel || this.rtc.channel;
+        return this.props.channel || this.rtc.channel;
     }
 
     /** @returns {CardData[]} */
diff --git a/addons/mail/static/src/discuss/call/common/call.xml b/addons/mail/static/src/discuss/call/common/call.xml
index 7480d749d7ca2..fb8c954714153 100644
--- a/addons/mail/static/src/discuss/call/common/call.xml
+++ b/addons/mail/static/src/discuss/call/common/call.xml
@@ -28,7 +28,7 @@
                         className="'o-discuss-Call-mainCardStyle'"
                         minimized="minimized"
                         compact="props.compact"
-                        thread="channel.thread"
+                        channel="channel"
                     />
                     <span t-if="env.inChatWindow and visibleMainCards.length > 6" class="oi oi-ellipsis-h ps-1 pe-1"/>
                     <CallParticipantCard t-if="!env.inChatWindow" t-foreach="visibleMainCards.slice(6)" t-as="cardData" t-key="cardData.key"
@@ -36,7 +36,7 @@
                         className="'o-discuss-Call-mainCardStyle p-1'"
                         minimized="minimized"
                         compact="props.compact"
-                        thread="channel.thread"
+                        channel="channel"
                     />
                 </div>
 
@@ -47,7 +47,7 @@
                 </t>
                 <div t-if="props.hasOverlay and (state.overlay or !isControllerFloating)" class="o-discuss-Call-overlay d-flex justify-content-center w-100 pb-1" t-att-class="{ 'o-isFloating position-absolute z-2 bottom-0 pb-2': isControllerFloating }">
                     <div t-on-mousemove="onMousemoveOverlay">
-                        <CallActionList thread="channel.thread" compact="props.compact or props.isPip"/>
+                        <CallActionList channel="channel" compact="props.compact or props.isPip"/>
                     </div>
                 </div>
                 <div t-if="hasCallNotifications" class="position-absolute d-flex flex-column-reverse start-0 bottom-0" t-att-class="{ 'ps-5 pb-5': rtc.isFullscreen, 'ps-2 pb-2': !rtc.isFullscreen }">
@@ -61,7 +61,7 @@
                 <CallParticipantCard t-foreach="channel.visibleCards" t-as="cardData" t-key="cardData.key"
                     cardData="cardData"
                     className="'o-discuss-Call-sidebarCard w-100 p-1'"
-                    thread="channel.thread"
+                    channel="channel"
                     isSidebarItem="true"
                 />
             </div>
@@ -69,7 +69,7 @@
                 t-if="channel.videoCount > 0 and state.insetCard"
                 cardData="state.insetCard"
                 className="'o-discuss-Call-mainCardStyle o-bg-black'"
-                thread="channel.thread"
+                channel="channel"
                 inset.bind="setInset"
             />
         </div>
diff --git a/addons/mail/static/src/discuss/call/common/call_action_list.js b/addons/mail/static/src/discuss/call/common/call_action_list.js
index 9626b5e09ee19..4982e5d7ac313 100644
--- a/addons/mail/static/src/discuss/call/common/call_action_list.js
+++ b/addons/mail/static/src/discuss/call/common/call_action_list.js
@@ -11,7 +11,7 @@ import { ACTION_TAGS } from "@mail/core/common/action";
 
 export class CallActionList extends Component {
     static components = { ActionList };
-    static props = ["thread", "compact?"];
+    static props = ["channel", "compact?"];
     static template = "discuss.CallActionList";
 
     setup() {
@@ -19,7 +19,7 @@ export class CallActionList extends Component {
         this.store = useService("mail.store");
         this.rtc = useService("discuss.rtc");
         this.pipService = useService("discuss.pip_service");
-        this.callActions = useCallActions({ thread: () => this.props.thread });
+        this.callActions = useCallActions({ thread: () => this.props.channel.thread });
         this.more = useRef("more");
         this.root = useRef("root");
         this.popover = usePopover(Tooltip, {
@@ -62,7 +62,7 @@ export class CallActionList extends Component {
     }
 
     get isOfActiveCall() {
-        return Boolean(this.props.thread.channel?.eq(this.rtc.channel));
+        return Boolean(this.props.channel.eq(this.rtc.channel));
     }
 
     get isSmall() {
diff --git a/addons/mail/static/src/discuss/call/common/call_invitation.js b/addons/mail/static/src/discuss/call/common/call_invitation.js
index 1bce604cb445c..0121c1be240fc 100644
--- a/addons/mail/static/src/discuss/call/common/call_invitation.js
+++ b/addons/mail/static/src/discuss/call/common/call_invitation.js
@@ -14,7 +14,7 @@ import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
 
 export class CallInvitation extends Component {
-    static props = ["thread"];
+    static props = ["channel"];
     static template = "discuss.CallInvitation";
     static components = { ActionList, CallPreview };
 
@@ -34,7 +34,7 @@ export class CallInvitation extends Component {
     }
 
     joinCall() {
-        this.rtc.toggleCall(this.props.thread.channel, {
+        this.rtc.toggleCall(this.props.channel, {
             audio: this.state.hasMicrophone,
             camera: this.state.hasCamera,
         });
@@ -61,21 +61,21 @@ export class CallInvitation extends Component {
                 definition: acceptWithCameraUpdated,
                 owner: this,
                 store: this.store,
-                thread: this.props.thread,
+                thread: this.props.channel.thread,
             }),
             new CallAction({
                 id: "join",
                 definition: joinUpdated,
                 owner: this,
                 store: this.store,
-                thread: this.props.thread,
+                thread: this.props.channel.thread,
             }),
             new CallAction({
                 id: "reject",
                 definition: rejectAction,
                 owner: this,
                 store: this.store,
-                thread: this.props.thread,
+                thread: this.props.channel.thread,
             }),
         ];
     }
@@ -108,19 +108,19 @@ export class CallInvitation extends Component {
     }
 
     get avatarTitle() {
-        const channelName = this.props.thread.displayName;
-        if (this.props.thread.channel?.channel_type === "chat") {
+        const channelName = this.props.channel.displayName;
+        if (this.props.channel.channel_type === "chat") {
             return _t("View chat with %(channel_name)s", { channel_name: channelName });
         }
         return _t("View the %(channel_name)s channel", { channel_name: channelName });
     }
 
     get inviter() {
-        return this.props.thread.self_member_id?.rtc_inviting_session_id?.channel_member_id;
+        return this.props.channel.self_member_id?.rtc_inviting_session_id?.channel_member_id;
     }
 
     get incomingCallText() {
-        if (this.props.thread.channel?.channel_type === "chat" || !this.inviter) {
+        if (this.props.channel.channel_type === "chat" || !this.inviter) {
             return _t("Incoming call");
         }
         return _t("Incoming call from %(inviter)s", { inviter: this.inviter.name });
diff --git a/addons/mail/static/src/discuss/call/common/call_invitation.xml b/addons/mail/static/src/discuss/call/common/call_invitation.xml
index 31fc6d7b2bcd2..7740ab809eab4 100644
--- a/addons/mail/static/src/discuss/call/common/call_invitation.xml
+++ b/addons/mail/static/src/discuss/call/common/call_invitation.xml
@@ -2,17 +2,17 @@
 <templates xml:space="preserve">
 
     <t t-name="discuss.CallInvitation">
-        <div class="o-discuss-CallInvitation align-self-center o-rounded-bubble overflow-hidden shadow-sm" t-att-class="{'o-preview-open': state.showCameraPreview, 'o-chat': props.thread.channel_type === 'chat', 'border border-light': !store.isOdooWhiteTheme}">
+        <div class="o-discuss-CallInvitation align-self-center o-rounded-bubble overflow-hidden shadow-sm" t-att-class="{'o-preview-open': state.showCameraPreview, 'o-chat': props.channel.channel_type === 'chat', 'border border-light': !store.isOdooWhiteTheme}">
             <div class="d-flex flex-colum d-flex flex-column">
                 <div class="o-discuss-CallInvitation-main" t-ref="root">
                     <div class="ms-1 position-relative d-flex justify-content-between p-2">
                         <div class="d-flex align-items-center" style="min-width: 0;">
-                            <div class="o-mail-CallInvitation-avatar flex-shrink-0 cursor-pointer d-flex align-items-center justify-content-center rounded-circle overflow-hidden" t-att-class="{'bg-primary': !inviter}" t-on-click="() => props.thread.open()" t-att-title="avatarTitle">
+                            <div class="o-mail-CallInvitation-avatar flex-shrink-0 cursor-pointer d-flex align-items-center justify-content-center rounded-circle overflow-hidden" t-att-class="{'bg-primary': !inviter}" t-on-click="() => props.channel.open()" t-att-title="avatarTitle">
                                 <img t-if="inviter" class="object-fit-cover h-100 w-100" t-att-src="inviter.avatarUrl" alt="Avatar"/>
                                 <i t-else="" class="fa fa-phone"/>
                             </div>
                             <div class="ms-2 me-3 flex-grow-1 overflow-hidden">
-                                <p class="o-discuss-CallInvitation-channelName m-0 fw-bold small text-truncate" t-esc="props.thread.displayName"/>
+                                <p class="o-discuss-CallInvitation-channelName m-0 fw-bold small text-truncate" t-esc="props.channel.displayName"/>
                                 <p class="o-discuss-CallInvitation-description m-0 fst-italic smaller text-truncate pe-1" t-esc="incomingCallText"/>
                             </div>
                         </div>
diff --git a/addons/mail/static/src/discuss/call/common/call_invitations.xml b/addons/mail/static/src/discuss/call/common/call_invitations.xml
index e79eff5a09884..c008c15ba2ea3 100644
--- a/addons/mail/static/src/discuss/call/common/call_invitations.xml
+++ b/addons/mail/static/src/discuss/call/common/call_invitations.xml
@@ -4,7 +4,7 @@
     <t t-name="discuss.CallInvitations">
         <div t-if="store.ringingThreads.length > 0" class="o-discuss-CallInvitations position-fixed top-0 end-0 d-flex flex-column p-2">
             <t t-foreach="store.ringingThreads" t-as="thread" t-key="thread.localId">
-                <CallInvitation thread="thread"/>
+                <CallInvitation channel="thread.channel"/>
             </t>
         </div>
     </t>
diff --git a/addons/mail/static/src/discuss/call/common/call_participant_card.js b/addons/mail/static/src/discuss/call/common/call_participant_card.js
index abcdd339697bc..a43d22e576b1e 100644
--- a/addons/mail/static/src/discuss/call/common/call_participant_card.js
+++ b/addons/mail/static/src/discuss/call/common/call_participant_card.js
@@ -17,7 +17,7 @@ export class CallParticipantCard extends Component {
     static props = [
         "className",
         "cardData",
-        "thread",
+        "channel",
         "minimized?",
         "inset?",
         "isSidebarItem?",
@@ -195,7 +195,7 @@ export class CallParticipantCard extends Component {
             return;
         }
         await rpc("/mail/rtc/channel/cancel_call_invitation", {
-            channel_id: this.props.thread.id,
+            channel_id: this.props.channel.id,
             member_ids: [this.channelMember.id],
         });
     }
diff --git a/addons/mail/static/src/discuss/call/common/chat_window_patch.xml b/addons/mail/static/src/discuss/call/common/chat_window_patch.xml
index ffc433fde77d2..e0b66d2f5ff80 100644
--- a/addons/mail/static/src/discuss/call/common/chat_window_patch.xml
+++ b/addons/mail/static/src/discuss/call/common/chat_window_patch.xml
@@ -3,7 +3,7 @@
     <t t-inherit="mail.ChatWindow" t-inherit-mode="extension">
         <xpath expr="//Thread" position="before">
             <PipBanner t-if="rtc.isPipMode and channel.eq(rtc.channel)" compact="true"/>
-            <Call t-elif="channel.showCallView" thread="channel.thread" compact="true"/>
+            <Call t-elif="channel.showCallView" channel="channel" compact="true"/>
         </xpath>
     </t>
 </templates>
diff --git a/addons/mail/static/src/discuss/call/common/meeting.xml b/addons/mail/static/src/discuss/call/common/meeting.xml
index 8d387c34d9327..a2d3d0c29fb0a 100644
--- a/addons/mail/static/src/discuss/call/common/meeting.xml
+++ b/addons/mail/static/src/discuss/call/common/meeting.xml
@@ -12,7 +12,7 @@
             </div>
             <div class="pt-2 d-flex justify-content-between overflow-x-auto flex-shrink-0" t-att-class="{'p-2 pb-3': ui.isSmall}">
                 <div/>
-                <CallActionList thread="store.rtc.channel.thread"/>
+                <CallActionList channel="store.rtc.channel"/>
                 <MeetingSideActions threadActions="threadActions"/>
             </div>
         </div>
diff --git a/addons/mail/static/src/discuss/call/common/pip_banner.xml b/addons/mail/static/src/discuss/call/common/pip_banner.xml
index a2ca6b247b263..d8e68b0878db5 100644
--- a/addons/mail/static/src/discuss/call/common/pip_banner.xml
+++ b/addons/mail/static/src/discuss/call/common/pip_banner.xml
@@ -15,7 +15,7 @@
             </button>
         </div>
         <div class="d-flex justify-content-center">
-            <CallActionList thread="rtc.channel?.thread" compact="true"/>
+            <CallActionList channel="rtc.channel" compact="true"/>
         </div>
     </span>
 </t>
diff --git a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js
index 40c59606ee703..2e5b0ce6879f5 100644
--- a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js
+++ b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js
@@ -1,6 +1,5 @@
 import { Component, useEffect, useState } from "@odoo/owl";
 import { useService } from "@web/core/utils/hooks";
-import { Thread } from "@mail/core/common/thread_model";
 import { AvatarStack } from "@mail/discuss/core/common/avatar_stack";
 import { useHover } from "@mail/utils/common/hooks";
 import { useDropdownState } from "@web/core/dropdown/dropdown_hooks";
@@ -9,12 +8,13 @@ import { _t } from "@web/core/l10n/translation";
 
 /**
  * @typedef {Object} Props
- * @property {import("models").Thread} thread
+ * @property {import("models").DiscussChannel} channel
+ * @property {Boolean|undefined} [compact]
  * @extends {Component<Props, Env>}
  */
 export class DiscussSidebarCallParticipants extends Component {
     static template = "mail.DiscussSidebarCallParticipants";
-    static props = { thread: { type: Thread }, compact: { type: Boolean, optional: true } };
+    static props = ["channel", "compact?"];
     static components = { AvatarStack, DiscussSidebarCallParticipants, Dropdown };
 
     setup() {
@@ -48,7 +48,7 @@ export class DiscussSidebarCallParticipants extends Component {
     }
 
     get lastActiveSession() {
-        const sessions = [...this.props.thread.rtc_session_ids];
+        const sessions = [...this.props.channel.rtc_session_ids];
         sessions?.sort((s1, s2) => {
             if (s1.isActuallyTalking && !s2.isActuallyTalking) {
                 return -1;
@@ -74,7 +74,7 @@ export class DiscussSidebarCallParticipants extends Component {
     }
 
     get sessions() {
-        const sessions = [...this.props.thread.rtc_session_ids];
+        const sessions = [...this.props.channel.rtc_session_ids];
         return sessions.sort((s1, s2) => {
             const persona1 = s1.channel_member_id?.persona;
             const persona2 = s2.channel_member_id?.persona;
diff --git a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
index 53e482e00c222..3b8c432bde3c1 100644
--- a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
+++ b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
@@ -22,7 +22,7 @@
             'ps-3 pe-2': props.compact === undefined and !compact,
             'px-2': props.compact === false,
             'rounded-3': props.compact === undefined,
-            'opacity-75': props.thread.channel?.notEq(rtc.channel) and compact,
+            'opacity-75': props.channel.notEq(rtc.channel) and compact,
         }" style="margin: 1px;">
             <button class="o-mail-DiscussSidebarCallParticipants-expandBtn btn btn-link p-1 my-n1 ms-n1 me-0 align-self-start d-flex rounded-circle" t-if="!compact" t-on-click="() => state.expanded = !state.expanded">
                 <i class="oi o-xxsmaller text-muted text-dark" t-att-class="{'oi-chevron-right': !state.expanded, 'oi-chevron-down': state.expanded}" t-att-title="title"/>
diff --git a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/channel_patch.xml b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/channel_patch.xml
index 5d4f30d2399b6..53646d9fcdd1c 100644
--- a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/channel_patch.xml
+++ b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/channel_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
     <t t-inherit="mail.DiscussSidebarChannel" t-inherit-mode="extension">
         <xpath expr="//*[@name='root']" position="after">
-            <DiscussSidebarCallParticipants thread="thread"/>
+            <DiscussSidebarCallParticipants channel="thread.channel"/>
         </xpath>
     </t>
 </templates>
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml b/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml
index 9915a8e4bd50d..9259557d3011f 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_content_patch.xml
@@ -3,7 +3,7 @@
     <t t-inherit="mail.DiscussContent" t-inherit-mode="extension">
         <xpath expr="//Thread" position="before">
             <PipBanner t-if="rtc.isPipMode and thread.channel?.eq(rtc.channel)"/>
-            <Call t-elif="thread.showCallView" thread="thread"/>
+            <Call t-elif="thread.showCallView" channel="thread.channel"/>
         </xpath>
     </t>
 </templates>

From 360d5cff69d6aeb8cbf5fa96f1b08f35bd7ee5bf Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 5 Nov 2025 09:11:57 +0100
Subject: [PATCH 387/673] [IMP] mail: make CallActions use channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Part-of: odoo/odoo#234360
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/discuss/call/common/call.js    |  2 +-
 .../discuss/call/common/call_action_list.js   |  2 +-
 .../src/discuss/call/common/call_actions.js   | 52 +++++++++----------
 .../discuss/call/common/call_invitation.js    |  6 +--
 .../src/discuss/call/common/call_menu.js      |  2 +-
 .../src/discuss/call/common/rtc_service.js    |  2 +-
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/call.js b/addons/mail/static/src/discuss/call/common/call.js
index d32888f1a18ba..132e53cf5e835 100644
--- a/addons/mail/static/src/discuss/call/common/call.js
+++ b/addons/mail/static/src/discuss/call/common/call.js
@@ -61,7 +61,7 @@ export class Call extends Component {
             insetCard: undefined,
         });
         this.store = useService("mail.store");
-        this.callActions = useCallActions({ thread: () => this.channel?.thread });
+        this.callActions = useCallActions({ channel: () => this.channel });
         onMounted(() => {
             this.resizeObserver = new ResizeObserver(() => this.arrangeTiles());
             this.resizeObserver.observe(this.grid.el);
diff --git a/addons/mail/static/src/discuss/call/common/call_action_list.js b/addons/mail/static/src/discuss/call/common/call_action_list.js
index 4982e5d7ac313..362bf18db7dff 100644
--- a/addons/mail/static/src/discuss/call/common/call_action_list.js
+++ b/addons/mail/static/src/discuss/call/common/call_action_list.js
@@ -19,7 +19,7 @@ export class CallActionList extends Component {
         this.store = useService("mail.store");
         this.rtc = useService("discuss.rtc");
         this.pipService = useService("discuss.pip_service");
-        this.callActions = useCallActions({ thread: () => this.props.channel.thread });
+        this.callActions = useCallActions({ channel: () => this.props.channel });
         this.more = useRef("more");
         this.root = useRef("root");
         this.popover = usePopover(Tooltip, {
diff --git a/addons/mail/static/src/discuss/call/common/call_actions.js b/addons/mail/static/src/discuss/call/common/call_actions.js
index e3171f1e30409..2bfe53ad99faf 100644
--- a/addons/mail/static/src/discuss/call/common/call_actions.js
+++ b/addons/mail/static/src/discuss/call/common/call_actions.js
@@ -2,10 +2,10 @@ import { Action, ACTION_TAGS, useAction, UseActions } from "@mail/core/common/ac
 import { isMobileOS } from "@web/core/browser/feature_detection";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
-import { QuickVoiceSettings } from "./quick_voice_settings";
-import { QuickVideoSettings } from "./quick_video_settings";
+import { QuickVoiceSettings } from "@mail/discuss/call/common/quick_voice_settings";
+import { QuickVideoSettings } from "@mail/discuss/call/common/quick_video_settings";
 import { attClassObjectToString } from "@mail/utils/common/format";
-import { CALL_PROMOTE_FULLSCREEN } from "./thread_model_patch";
+import { CALL_PROMOTE_FULLSCREEN } from "@mail/discuss/call/common/thread_model_patch";
 
 export const callActionsRegistry = registry.category("discuss.call/actions");
 
@@ -173,10 +173,10 @@ registerCallAction("auto-focus", {
     sequenceGroup: 200,
 });
 registerCallAction("fullscreen", {
-    btnClass: ({ owner, thread }) =>
+    btnClass: ({ owner, channel }) =>
         attClassObjectToString({
             "o-discuss-CallActionList-pulse": Boolean(
-                !owner.env.pipWindow && thread.promoteFullscreen === CALL_PROMOTE_FULLSCREEN.ACTIVE
+                !owner.env.pipWindow && channel.promoteFullscreen === CALL_PROMOTE_FULLSCREEN.ACTIVE
             ),
         }),
     condition: ({ channel, store }) => channel?.eq(store.rtc?.channel),
@@ -216,9 +216,9 @@ registerCallAction("picture-in-picture", {
     tags: ACTION_TAGS.CALL_LAYOUT,
 });
 export const acceptWithCamera = {
-    condition: ({ thread }) =>
-        thread?.self_member_id?.rtc_inviting_session_id?.is_camera_on &&
-        typeof thread?.useCameraByDefault !== "boolean",
+    condition: ({ channel }) =>
+        channel?.self_member_id?.rtc_inviting_session_id?.is_camera_on &&
+        typeof channel?.useCameraByDefault !== "boolean",
     disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     name: _t("Accept with camera"),
     icon: "fa fa-video-camera",
@@ -237,9 +237,9 @@ registerCallAction("join-back", {
     condition: ({ channel, store }) =>
         !channel?.eq(store.rtc?.channel) && typeof channel?.useCameraByDefault === "boolean",
     disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
-    icon: ({ thread }) => (thread.useCameraByDefault ? "fa fa-video-camera" : "fa fa-phone"),
+    icon: ({ channel }) => (channel.useCameraByDefault ? "fa fa-video-camera" : "fa fa-phone"),
     inlineName: ({ owner }) => (owner.env.inCallInvitation ? undefined : _t("Join")),
-    name: ({ thread }) => (thread.useCameraByDefault ? _t("Join Video Call") : _t("Join Call")),
+    name: ({ channel }) => (channel.useCameraByDefault ? _t("Join Video Call") : _t("Join Call")),
     onSelected: ({ channel, store }) =>
         store.rtc.toggleCall(channel, { camera: channel.useCameraByDefault }),
     sequence: 110,
@@ -273,16 +273,16 @@ export const joinAction = {
 };
 registerCallAction("join", joinAction);
 export const rejectAction = {
-    btnClass: ({ owner, thread }) =>
+    btnClass: ({ owner, channel }) =>
         attClassObjectToString({
-            "pe-2 rounded-pill": typeof thread?.useCameraByDefault === "boolean",
-            "mx-1": !owner.env.inCallInvitation && typeof thread?.useCameraByDefault === "boolean",
+            "pe-2 rounded-pill": typeof channel?.useCameraByDefault === "boolean",
+            "mx-1": !owner.env.inCallInvitation && typeof channel?.useCameraByDefault === "boolean",
         }),
-    condition: ({ thread }) => thread?.self_member_id?.rtc_inviting_session_id,
+    condition: ({ channel }) => channel?.self_member_id?.rtc_inviting_session_id,
     disabledCondition: ({ store }) => store.rtc?.hasPendingRequest,
     icon: "oi oi-close",
-    inlineName: ({ owner, thread }) =>
-        !owner.env.inCallInvitation && typeof thread?.useCameraByDefault === "boolean"
+    inlineName: ({ owner, channel }) =>
+        !owner.env.inCallInvitation && typeof channel?.useCameraByDefault === "boolean"
             ? _t("Reject")
             : undefined,
     name: _t("Reject"),
@@ -310,21 +310,21 @@ registerCallAction("disconnect", {
 });
 
 export class CallAction extends Action {
-    /** @type {() => Thread} */
-    threadFn;
+    /** @type {() => import("models").DiscussChannel} */
+    channelFn;
 
     /**
      * @param {Object} param0
-     * @param {Thread|() => Thread} thread
+     * @param {import("models").DiscussChannel|() => import("models").DiscussChannel} channel
      */
-    constructor({ thread }) {
+    constructor({ channel }) {
         super(...arguments);
-        this.threadFn = typeof thread === "function" ? thread : () => thread;
+        this.channelFn = typeof channel === "function" ? channel : () => channel;
     }
 
     get params() {
-        const thread = this.threadFn();
-        return Object.assign(super.params, { channel: thread?.channel, thread });
+        const channel = this.channelFn();
+        return Object.assign(super.params, { channel });
     }
 
     get isTracked() {
@@ -338,8 +338,8 @@ class UseCallActions extends UseActions {
 
 /**
  * @param {Object} [params0={}]
- * @param {Thread|() => Thread} thread
+ * @param {DiscussChannel|() => DiscussChannel} channel
  */
-export function useCallActions({ thread } = {}) {
-    return useAction(callActionsRegistry, UseCallActions, CallAction, { thread });
+export function useCallActions({ channel } = {}) {
+    return useAction(callActionsRegistry, UseCallActions, CallAction, { channel });
 }
diff --git a/addons/mail/static/src/discuss/call/common/call_invitation.js b/addons/mail/static/src/discuss/call/common/call_invitation.js
index 0121c1be240fc..55b0aebeb0eae 100644
--- a/addons/mail/static/src/discuss/call/common/call_invitation.js
+++ b/addons/mail/static/src/discuss/call/common/call_invitation.js
@@ -61,21 +61,21 @@ export class CallInvitation extends Component {
                 definition: acceptWithCameraUpdated,
                 owner: this,
                 store: this.store,
-                thread: this.props.channel.thread,
+                channel: this.props.channel,
             }),
             new CallAction({
                 id: "join",
                 definition: joinUpdated,
                 owner: this,
                 store: this.store,
-                thread: this.props.channel.thread,
+                channel: this.props.channel,
             }),
             new CallAction({
                 id: "reject",
                 definition: rejectAction,
                 owner: this,
                 store: this.store,
-                thread: this.props.channel.thread,
+                channel: this.props.channel,
             }),
         ];
     }
diff --git a/addons/mail/static/src/discuss/call/common/call_menu.js b/addons/mail/static/src/discuss/call/common/call_menu.js
index 0ae762a3fe448..8946ed011d477 100644
--- a/addons/mail/static/src/discuss/call/common/call_menu.js
+++ b/addons/mail/static/src/discuss/call/common/call_menu.js
@@ -11,7 +11,7 @@ export class CallMenu extends Component {
     setup() {
         super.setup();
         this.rtc = useService("discuss.rtc");
-        this.callActions = useCallActions({ thread: () => this.thread });
+        this.callActions = useCallActions({ channel: () => this.rtc.channel });
         this.isEnterprise = odoo.info && odoo.info.isEnterprise;
     }
 
diff --git a/addons/mail/static/src/discuss/call/common/rtc_service.js b/addons/mail/static/src/discuss/call/common/rtc_service.js
index 0a1ba595c310c..d43066abdac99 100644
--- a/addons/mail/static/src/discuss/call/common/rtc_service.js
+++ b/addons/mail/static/src/discuss/call/common/rtc_service.js
@@ -17,7 +17,7 @@ import { loadBundle, loadJS } from "@web/core/assets";
 import { memoize } from "@web/core/utils/functions";
 import { url } from "@web/core/utils/urls";
 import { isBrowserSafari, isMobileOS } from "@web/core/browser/feature_detection";
-import { CallAction } from "./call_actions";
+import { CallAction } from "@mail/discuss/call/common/call_actions";
 
 let sequence = 1;
 const getSequence = () => sequence++;

From 60c91bc0b00c9ebdd0806968afa741e3c2618942 Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 5 Nov 2025 09:35:07 +0100
Subject: [PATCH 388/673] [IMP] mail: transform ringingThreads into
 ringingChannels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Part-of: odoo/odoo#234360
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../mail/static/src/discuss/call/common/@types/models.d.ts  | 2 +-
 .../mail/static/src/discuss/call/common/call_invitations.js | 4 ++--
 .../static/src/discuss/call/common/call_invitations.xml     | 6 +++---
 .../static/src/discuss/call/common/channel_member_patch.js  | 4 ++--
 .../static/src/discuss/call/common/store_service_patch.js   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/@types/models.d.ts b/addons/mail/static/src/discuss/call/common/@types/models.d.ts
index f293338382bb7..de4a3a369ccb6 100644
--- a/addons/mail/static/src/discuss/call/common/@types/models.d.ts
+++ b/addons/mail/static/src/discuss/call/common/@types/models.d.ts
@@ -26,7 +26,7 @@ declare module "models" {
         fullscreenChannel: DiscussChannel;
         meetingViewOpened: boolean;
         nextTalkingTime: number;
-        ringingThreads: Thread[];
+        ringingChannels: DiscussChannel[];
         rtc: Rtc;
         Rtc: StaticMailRecord<Rtc, typeof RtcClass>;
     }
diff --git a/addons/mail/static/src/discuss/call/common/call_invitations.js b/addons/mail/static/src/discuss/call/common/call_invitations.js
index cf71e9e044808..b4383d402de13 100644
--- a/addons/mail/static/src/discuss/call/common/call_invitations.js
+++ b/addons/mail/static/src/discuss/call/common/call_invitations.js
@@ -24,7 +24,7 @@ export const callInvitationsService = {
         const store = services["mail.store"];
         let removeOverlay;
         const onChangeRingingThreadsLength = () => {
-            if (store.ringingThreads.length > 0) {
+            if (store.ringingChannels.length > 0) {
                 if (!removeOverlay) {
                     removeOverlay = services.overlay.add(CallInvitations, {});
                 }
@@ -34,7 +34,7 @@ export const callInvitationsService = {
             }
         };
         onChangeRingingThreadsLength();
-        onChange(store.ringingThreads, "length", onChangeRingingThreadsLength);
+        onChange(store.ringingChannels, "length", onChangeRingingThreadsLength);
     },
 };
 registry.category("services").add("discuss.call_invitations", callInvitationsService);
diff --git a/addons/mail/static/src/discuss/call/common/call_invitations.xml b/addons/mail/static/src/discuss/call/common/call_invitations.xml
index c008c15ba2ea3..befb08706a678 100644
--- a/addons/mail/static/src/discuss/call/common/call_invitations.xml
+++ b/addons/mail/static/src/discuss/call/common/call_invitations.xml
@@ -2,9 +2,9 @@
 <templates xml:space="preserve">
 
     <t t-name="discuss.CallInvitations">
-        <div t-if="store.ringingThreads.length > 0" class="o-discuss-CallInvitations position-fixed top-0 end-0 d-flex flex-column p-2">
-            <t t-foreach="store.ringingThreads" t-as="thread" t-key="thread.localId">
-                <CallInvitation channel="thread.channel"/>
+        <div t-if="store.ringingChannels.length > 0" class="o-discuss-CallInvitations position-fixed top-0 end-0 d-flex flex-column p-2">
+            <t t-foreach="store.ringingChannels" t-as="channel" t-key="channel.localId">
+                <CallInvitation channel="channel"/>
             </t>
         </div>
     </t>
diff --git a/addons/mail/static/src/discuss/call/common/channel_member_patch.js b/addons/mail/static/src/discuss/call/common/channel_member_patch.js
index 1c3eb80cb5314..c49c7a3ad53d5 100644
--- a/addons/mail/static/src/discuss/call/common/channel_member_patch.js
+++ b/addons/mail/static/src/discuss/call/common/channel_member_patch.js
@@ -16,7 +16,7 @@ const ChannelMemberPatch = {
                     return;
                 }
                 this.channel_id.rtc_session_ids.add(r);
-                this.store.ringingThreads.add(this.channel_id.thread);
+                this.store.ringingChannels.add(this.channel_id);
                 this.channel_id.cancelRtcInvitationTimeout = browser.setTimeout(() => {
                     this.store.env.services["discuss.rtc"].leaveCall(this.channel_id);
                 }, ChannelMember.CANCEL_CALL_INVITE_DELAY);
@@ -27,7 +27,7 @@ const ChannelMemberPatch = {
                     return;
                 }
                 browser.clearTimeout(this.channel_id.cancelRtcInvitationTimeout);
-                this.store.ringingThreads.delete(this.channel_id.thread);
+                this.store.ringingChannels.delete(this.channel_id);
             },
         });
         this.rtcSession = fields.One("discuss.channel.rtc.session");
diff --git a/addons/mail/static/src/discuss/call/common/store_service_patch.js b/addons/mail/static/src/discuss/call/common/store_service_patch.js
index 21bbe7071200b..4f155cfaf18d9 100644
--- a/addons/mail/static/src/discuss/call/common/store_service_patch.js
+++ b/addons/mail/static/src/discuss/call/common/store_service_patch.js
@@ -13,10 +13,10 @@ const StorePatch = {
                 return {};
             },
         });
-        this.ringingThreads = fields.Many("mail.thread", {
+        this.ringingChannels = fields.Many("discuss.channel", {
             /** @this {import("models").Store} */
             onUpdate() {
-                if (this.ringingThreads.length > 0) {
+                if (this.ringingChannels.length > 0) {
                     this.env.services["mail.sound_effects"].play("call-invitation", {
                         loop: true,
                     });

From ec7618756f403ba518bd30bbf09220ac2a6dea6a Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 5 Nov 2025 10:20:05 +0100
Subject: [PATCH 389/673] [IMP] mail: meeting use channel model
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#234360

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../mail/static/src/discuss/call/common/meeting.js   |  8 ++++----
 .../mail/static/src/discuss/call/common/meeting.xml  |  4 ++--
 .../static/src/discuss/call/common/meeting_chat.js   |  5 ++---
 .../static/src/discuss/call/common/meeting_chat.xml  | 12 +++++-------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/meeting.js b/addons/mail/static/src/discuss/call/common/meeting.js
index ea6d8fb102bed..46cf257a91d34 100644
--- a/addons/mail/static/src/discuss/call/common/meeting.js
+++ b/addons/mail/static/src/discuss/call/common/meeting.js
@@ -57,9 +57,9 @@ export class Meeting extends Component {
                         ?.actionPanelOpen(),
             },
         });
-        this.threadActions = useThreadActions({ thread: () => this.thread });
+        this.threadActions = useThreadActions({ thread: () => this.channel.thread });
         this.messageHighlight = useMessageScrolling();
-        this.messageSearch = useMessageSearch(this.thread);
+        this.messageSearch = useMessageSearch(this.channel.thread);
         useChildSubEnv({
             closeActionPanel: () => this.threadActions.activeAction?.actionPanelClose(),
             messageHighlight: this.messageHighlight,
@@ -69,7 +69,7 @@ export class Meeting extends Component {
         onWillUnmount(() => (this.store.meetingViewOpened = false));
     }
 
-    get thread() {
-        return this.store.rtc.channel?.thread;
+    get channel() {
+        return this.store.rtc.channel;
     }
 }
diff --git a/addons/mail/static/src/discuss/call/common/meeting.xml b/addons/mail/static/src/discuss/call/common/meeting.xml
index a2d3d0c29fb0a..5d7b3cbbc1b2d 100644
--- a/addons/mail/static/src/discuss/call/common/meeting.xml
+++ b/addons/mail/static/src/discuss/call/common/meeting.xml
@@ -7,12 +7,12 @@
                     <Call hasOverlay="false" isPip="props.isPip"/>
                 </div>
                 <div t-if="threadActions.activeAction?.actionPanelComponentCondition" t-attf-class="{{ threadActions.activeAction.actionPanelOuterClass }}" class="o-mail-DiscussContent-panelContainer o-mail-discussSidebarBgColor h-100 border-start border-secondary flex-shrink-0 rounded-2" t-att-class="{ 'w-100': ui.isSmall }">
-                    <t t-component="threadActions.activeAction.actionPanelComponent" t-props="threadActions.activeAction.actionPanelComponentProps" thread="thread"/>
+                    <t t-component="threadActions.activeAction.actionPanelComponent" t-props="threadActions.activeAction.actionPanelComponentProps" thread="channel.thread"/>
                 </div>
             </div>
             <div class="pt-2 d-flex justify-content-between overflow-x-auto flex-shrink-0" t-att-class="{'p-2 pb-3': ui.isSmall}">
                 <div/>
-                <CallActionList channel="store.rtc.channel"/>
+                <CallActionList channel="channel"/>
                 <MeetingSideActions threadActions="threadActions"/>
             </div>
         </div>
diff --git a/addons/mail/static/src/discuss/call/common/meeting_chat.js b/addons/mail/static/src/discuss/call/common/meeting_chat.js
index 3192373a4e4fb..5d1f3ef851899 100644
--- a/addons/mail/static/src/discuss/call/common/meeting_chat.js
+++ b/addons/mail/static/src/discuss/call/common/meeting_chat.js
@@ -10,7 +10,6 @@ import { useChildRef, useService } from "@web/core/utils/hooks";
 
 /**
  * @typedef {Object} Props
- * @property {import("models").Thread} [thread]
  * @extends {Component<Props, Env>}
  */
 export class MeetingChat extends Component {
@@ -33,7 +32,7 @@ export class MeetingChat extends Component {
         useSubEnv({ inMeetingChat: true });
     }
 
-    get thread() {
-        return this.store.rtc.channel?.thread;
+    get channel() {
+        return this.store.rtc.channel;
     }
 }
diff --git a/addons/mail/static/src/discuss/call/common/meeting_chat.xml b/addons/mail/static/src/discuss/call/common/meeting_chat.xml
index 8dfc9d6fcff04..fc0f0d18200e4 100644
--- a/addons/mail/static/src/discuss/call/common/meeting_chat.xml
+++ b/addons/mail/static/src/discuss/call/common/meeting_chat.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
     <t t-name="mail.MeetingChat">
-        <ActionPanel t-if="thread" title.translate="Chat" resizable="true" minWidth="300" initialWidth="400" icon="'fa fa-comments'" contentRef="panelContentRef">
-            <Thread thread="thread" jumpPresent="state.jumpPresent"/>
-            <t t-call="mail.ChatWindow.memberTyping">
-                <t t-set="channel" t-value="thread.channel"/>
-            </t>
+        <ActionPanel t-if="channel" title.translate="Chat" resizable="true" minWidth="300" initialWidth="400" icon="'fa fa-comments'" contentRef="panelContentRef">
+            <Thread thread="channel.thread" jumpPresent="state.jumpPresent"/>
+            <t t-call="mail.ChatWindow.memberTyping"/>
             <Composer
-                composer="thread.composer"
+                composer="channel.composer"
                 autofocus="!isMobileOS"
-                onDiscardCallback="() => (thread.composer.replyToMessage = undefined)"
+                onDiscardCallback="() => (channel.composer.replyToMessage = undefined)"
                 onPostCallback.bind="() => this.state.jumpPresent++"
                 dropzoneRef="panelContentRef"
            />

From 1bd44e7126fe51d7bb8557a8e28fab73b229691e Mon Sep 17 00:00:00 2001
From: "Priyanshu Goyal (prgo)" <prgo@odoo.com>
Date: Tue, 28 Oct 2025 17:37:42 +0530
Subject: [PATCH 390/673] [IMP] hr_holidays: change gantt color of time-off
 overview

Change the color of the Gantt pill from employee-wise to the time-off color.

task-5215713

closes odoo/odoo#233551

Related: odoo/enterprise#98343
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_holidays/report/hr_leave_report_calendar.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/report/hr_leave_report_calendar.py b/addons/hr_holidays/report/hr_leave_report_calendar.py
index 5cd746cd1cb88..0cf3d431aa6ac 100644
--- a/addons/hr_holidays/report/hr_leave_report_calendar.py
+++ b/addons/hr_holidays/report/hr_leave_report_calendar.py
@@ -33,6 +33,7 @@ class HrLeaveReportCalendar(models.Model):
     description = fields.Char("Description", readonly=True, groups='hr_holidays.group_hr_holidays_user')
     holiday_status_id = fields.Many2one('hr.leave.type', readonly=True, string="Time Off Type",
         groups='hr_holidays.group_hr_holidays_user')
+    color = fields.Integer("Color", related='holiday_status_id.color')
 
     is_hatched = fields.Boolean('Hatched', readonly=True)
     is_striked = fields.Boolean('Striked', readonly=True)

From 1afc82a50fd4a44fdc37c3203b0d5b7248204064 Mon Sep 17 00:00:00 2001
From: defl <defl@odoo.com>
Date: Mon, 3 Nov 2025 09:25:59 +0000
Subject: [PATCH 391/673] [FIX] website_slides: adapt fullscreen highlighting
 interaction

**Issue:**
`this.websiteAnimateWidget` is undefined
Also the fix wasn't working properly in later versions.

This is due to an incorrect conflict resolution in the forward port
of the related fix.

**Fix:**
The fix for websiteAnimateWidget was made obsolete in these versions with:
https://github.com/odoo/odoo/commit/22e777c046521f3f89b62caa5876680beb7f5aba

But the original issue of `textHighlightWidget` was still present and not
properly caught by the tour. The new fix add the fullscreen slide to the
selector of the TextHighlight interaction which is restarted when fullscreen
is enabled.

related: https://github.com/odoo/odoo/commit/184c6f855f703239864f482ff252beb1293c343d

opw-4978798

closes odoo/odoo#234832

X-original-commit: d33f24e29f449f76dafb772aff7c819100cb524e
Signed-off-by: Florian Charlier (flch) <flch@odoo.com>
Signed-off-by: Florentin Delcourt (defl) <defl@odoo.com>
---
 .../static/src/interactions/text_highlights.js        |  2 +-
 .../static/src/js/slides_course_fullscreen_player.js  | 11 -----------
 .../static/tests/tours/slides_text_highlights.js      |  6 +++++-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/addons/website/static/src/interactions/text_highlights.js b/addons/website/static/src/interactions/text_highlights.js
index 1f6fcb2971bea..edbe5eaeee7da 100644
--- a/addons/website/static/src/interactions/text_highlights.js
+++ b/addons/website/static/src/interactions/text_highlights.js
@@ -8,7 +8,7 @@ import {
 } from "@website/js/highlight_utils";
 
 export class TextHighlight extends Interaction {
-    static selector = "#wrapwrap";
+    static selector = "#wrapwrap, .o_wslides_fs_content";
     dynamicContent = {
         _root: {
             "t-on-text_highlight_added": ({ target }) => this.onTextHighlightAdded(target),
diff --git a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
index 864730dd059d8..d51e80e50a14d 100644
--- a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
+++ b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
@@ -542,14 +542,6 @@
                 const slide = this._slideValue;
                 var $content = this.$('.o_wslides_fs_content');
                 $content.empty();
-                if (this.websiteAnimateWidget) {
-                    this.websiteAnimateWidget.destroy()
-                    this.websiteAnimateWidget = null;
-                }
-                if (this.textHighlightWidget) {
-                    this.textHighlightWidget.destroy()
-                    this.textHighlightWidget = null;
-                }
 
                 // display quiz slide, or quiz attached to a slide
                 if (slide.category === 'quiz' || slide.isQuiz) {
@@ -576,9 +568,6 @@
                     this.trigger_up('widgets_start_request', {
                         $target: $content,
                     });
-                    this.websiteAnimateWidget.attachTo($wpContainer);
-                    this.textHighlightWidget = new publicWidget.registry.TextHighlight();
-                    this.textHighlightWidget.attachTo($wpContainer);
                 }
                 unhideConditionalElements();
             } finally {
diff --git a/addons/website_slides/static/tests/tours/slides_text_highlights.js b/addons/website_slides/static/tests/tours/slides_text_highlights.js
index bcf3cbb847111..edc92f9d448bc 100644
--- a/addons/website_slides/static/tests/tours/slides_text_highlights.js
+++ b/addons/website_slides/static/tests/tours/slides_text_highlights.js
@@ -64,9 +64,13 @@ registerWebsitePreviewTour('fullscreen_slide_text_highlights', {
         {
             content: "Click on the fullscreen button",
             trigger: ':iframe #wrapwrap a[aria-label="Fullscreen"]',
+            run: "click",
+        }, {
+            content: "Wait for fullscreen",
+            trigger: ':iframe #wrapwrap a[title="Exit Fullscreen"]',
         }, {
             content: "Check that the highlight was applied in fullscreen",
-            trigger: ":iframe .o_wslides_lesson_content_type p span.o_text_highlight > svg.o_text_highlight_svg",
+            trigger: ":iframe .o_wslides_fs_content p span.o_text_highlight > svg.o_text_highlight_svg",
         },
     ],
 );

From 4b59fa573a0017c755148f0603628b14b03aa9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= <ryv@odoo.com>
Date: Tue, 4 Nov 2025 14:30:18 +0000
Subject: [PATCH 392/673] [FIX] core: fix uninstallation for model extension
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When we uninstall a module, we never reflect impacted models or fields
on ir.model or ir.model.fields. That can lead to an inconsistent state
after uninstallation:

For example, the 'appointment_account_payment' module that makes
`calendar_event_id` not required anymore. After uninstalling it, the ORM
will complain that the not-null constraint doesn't exist ("Missing
not-null constraint on appointment.answer.input.calendar_event_id").
Also, if we look at the `ir.model.fields` record for `calendar_event_id`,
it shows that the field isn't required, but it should be required again
(with the correct constraints too).

Add the information of impacted models for the 'to remove' modules, and
force the new registry to call `init_models` on them. This will handle
constraints and reflection on `ir.model`/`ir.model.fields`. We can then
remove the call to `check_tables_exist` (see 3058ca4121048796c38aad78e3e4f5ffde3530f5)
since `init_models` will do the job correctly for impacted models.

Also remove a part of the uninstall hook of website because it forces
reloading the registry too soon (warning of missing not-null
constraint) and the uninstallation manages the case genericly (remove
correctly `ir.model.fields` record of `res.config.settings.website_id`)

runbot-error-233770

closes odoo/odoo#234922

X-original-commit: f7399e670361e934083d248070d1172bca42a190
Signed-off-by: Chong Wang (cwg) <cwg@odoo.com>
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/website/__init__.py | 15 ---------------
 odoo/modules/loading.py    | 30 ++++++++++++++++++------------
 odoo/orm/registry.py       |  2 ++
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/addons/website/__init__.py b/addons/website/__init__.py
index 70ad0464eac7b..3a88b012b9e04 100644
--- a/addons/website/__init__.py
+++ b/addons/website/__init__.py
@@ -4,10 +4,7 @@
 from . import models
 from . import wizard
 
-import odoo
-from odoo import api, SUPERUSER_ID
 from odoo.http import request
-from functools import partial
 
 
 def uninstall_hook(env):
@@ -25,18 +22,6 @@ def uninstall_hook(env):
     # from 15.0 and above.
     env['website'].search([])._remove_attachments_on_website_unlink()
 
-    # Properly unlink website_id from ir.model.fields
-    def rem_website_id_null(dbname):
-        db_registry = odoo.modules.registry.Registry.new(dbname)
-        with db_registry.cursor() as cr:
-            env = api.Environment(cr, SUPERUSER_ID, {})
-            env['ir.model.fields'].search([
-                ('name', '=', 'website_id'),
-                ('model', '=', 'res.config.settings'),
-            ]).unlink()
-
-    env.cr.postcommit.add(partial(rem_website_id_null, env.cr.dbname))
-
 
 def post_init_hook(env):
     if request:
diff --git a/odoo/modules/loading.py b/odoo/modules/loading.py
index 108d5af6531fd..a3a9b7b5750bb 100644
--- a/odoo/modules/loading.py
+++ b/odoo/modules/loading.py
@@ -17,6 +17,7 @@
 import odoo.tools.sql
 import odoo.tools.translate
 from odoo import api, tools
+from odoo.tools import OrderedSet
 from odoo.tools.convert import convert_file, IdRef, ConvertMode as LoadMode
 
 from . import db as modules_db
@@ -108,7 +109,7 @@ def load_module_graph(
     graph: ModuleGraph,
     update_module: bool = False,
     report: OdooTestResult | None = None,
-    models_to_check: set[str] | None = None,
+    models_to_check: OrderedSet[str] | None = None,
     install_demo: bool = True,
 ) -> None:
     """ Load, upgrade and install not loaded module nodes in the ``graph`` for ``env.registry``
@@ -121,7 +122,7 @@ def load_module_graph(
        :param install_demo: whether to attempt installing demo data for newly installed modules
     """
     if models_to_check is None:
-        models_to_check = set()
+        models_to_check = OrderedSet()
 
     registry = env.registry
     assert isinstance(env.cr, odoo.sql_db.Cursor), "Need for a real Cursor to load modules"
@@ -179,8 +180,8 @@ def load_module_graph(
 
         if update_operation:
             model_names = registry.descendants(model_names, '_inherit', '_inherits')
-            models_updated |= set(model_names)
-            models_to_check -= set(model_names)
+            models_updated |= model_names
+            models_to_check -= model_names
             registry._setup_models__(env.cr, [])  # incremental setup
             registry.init_models(env.cr, model_names, {'module': package.name}, update_operation == 'install')
         elif update_module and package.state != 'to remove':
@@ -190,7 +191,11 @@ def load_module_graph(
             # e.g. adding required=True to an existing field, but the schema has not been
             # updated by this module because it's not marked as 'to upgrade/to install'.
             model_names = registry.descendants(model_names, '_inherit', '_inherits')
-            models_to_check |= set(model_names) & models_updated
+            models_to_check |= model_names & models_updated
+        elif update_module and package.state == 'to remove':
+            # For all model extented (with _inherit) in the package to uninstall, we need to
+            # update ir.model / ir.model.fields along side not-null SQL constrains.
+            models_to_check |= model_names
 
         if update_operation:
             # Can't put this line out of the loop: ir.module.module will be
@@ -332,6 +337,7 @@ def load_modules(
     install_modules: Collection[str] = (),
     reinit_modules: Collection[str] = (),
     new_db_demo: bool = False,
+    models_to_check: OrderedSet[str] | None = None,
 ) -> None:
     """ Load the modules for a registry object that has just been created.  This
         function is part of Registry.new() and should not be used anywhere else.
@@ -343,9 +349,10 @@ def load_modules(
         :param reinit_modules: A collection of module names to reinitialize.
         :param new_db_demo: Whether to install demo data for new database. Defaults to ``False``
     """
-    initialize_sys_path()
+    if models_to_check is None:
+        models_to_check = OrderedSet()
 
-    models_to_check: set[str] = set()
+    initialize_sys_path()
 
     with registry.cursor() as cr:
         # prevent endless wait for locks on schema changes (during online
@@ -536,11 +543,8 @@ def load_modules(
                 cr.commit()
                 _logger.info('Reloading registry once more after uninstalling modules')
                 registry = Registry.new(
-                    cr.dbname, update_module=update_module
+                    cr.dbname, update_module=update_module, models_to_check=models_to_check,
                 )
-                cr.transaction.reset()
-                registry.check_tables_exist(cr)
-                cr.commit()
                 return
 
         # STEP 5.5: Verify extended fields on every model
@@ -555,7 +559,9 @@ def load_modules(
             cr.execute("""SELECT DISTINCT model FROM ir_model_fields WHERE state = 'manual'""")
             models_to_check.update(model_name for model_name, in cr.fetchall() if model_name in registry)
         if models_to_check:
-            registry.init_models(cr, list(models_to_check), {'models_to_check': True, 'update_custom_fields': True})
+            # Doesn't check models that didn't exist anymore, it might happen during uninstallation
+            models_to_check = [model for model in models_to_check if model in registry]
+            registry.init_models(cr, models_to_check, {'models_to_check': True, 'update_custom_fields': True})
 
         # STEP 6: verify custom views on every model
         if update_module:
diff --git a/odoo/orm/registry.py b/odoo/orm/registry.py
index 7024da6f50ac1..897c8e691da5e 100644
--- a/odoo/orm/registry.py
+++ b/odoo/orm/registry.py
@@ -138,6 +138,7 @@ def new(
         upgrade_modules: Collection[str] = (),
         reinit_modules: Collection[str] = (),
         new_db_demo: bool | None = None,
+        models_to_check: set[str] | None = None,
     ) -> Registry:
         """Create and return a new registry for the given database name.
 
@@ -192,6 +193,7 @@ def new(
                     install_modules=install_modules,
                     reinit_modules=reinit_modules,
                     new_db_demo=new_db_demo,
+                    models_to_check=models_to_check,
                 )
             except Exception:
                 reset_modules_state(db_name)

From d816d251977e0c00d7297a864d8af55ecfa24ec5 Mon Sep 17 00:00:00 2001
From: "Louis (loti)" <loti@odoo.com>
Date: Thu, 30 Oct 2025 16:20:39 +0000
Subject: [PATCH 393/673] [FIX] website_sale*: use web utils to redirect to a
 URL

closes odoo/odoo#234952

X-original-commit: 1b695c64a71df8316dc0d841b4452f6be9eac061
Signed-off-by: Valentin Chevalier <vcr@odoo.com>
Signed-off-by: Louis Tinel (loti) <loti@odoo.com>
---
 addons/portal/static/src/interactions/address.js           | 3 ++-
 addons/website_sale/static/src/interactions/cart_line.js   | 3 ++-
 addons/website_sale/static/src/interactions/price_range.js | 3 ++-
 addons/website_sale/static/src/js/cart_service.js          | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/portal/static/src/interactions/address.js b/addons/portal/static/src/interactions/address.js
index 2cdc9d02f71a8..9b560715c5a9d 100644
--- a/addons/portal/static/src/interactions/address.js
+++ b/addons/portal/static/src/interactions/address.js
@@ -1,6 +1,7 @@
 import { Interaction } from '@web/public/interaction';
 import { registry } from '@web/core/registry';
 import { rpc } from '@web/core/network/rpc';
+import { redirect } from '@web/core/utils/urls';
 
 export class CustomerAddress extends Interaction {
     // /my/address & /my/account
@@ -140,7 +141,7 @@ export class CustomerAddress extends Interaction {
             new FormData(this.addressForm),
         ))
         if (result.redirectUrl) {
-            window.location = result.redirectUrl;
+            redirect(result.redirectUrl);
         } else {
             // Highlight missing/invalid form values
             this.el.querySelectorAll('.is-invalid').forEach(element => {
diff --git a/addons/website_sale/static/src/interactions/cart_line.js b/addons/website_sale/static/src/interactions/cart_line.js
index 38ef12bc4a036..752bb9f495e1d 100644
--- a/addons/website_sale/static/src/interactions/cart_line.js
+++ b/addons/website_sale/static/src/interactions/cart_line.js
@@ -2,6 +2,7 @@ import { Interaction } from '@web/public/interaction';
 import { browser } from '@web/core/browser/browser';
 import { registry } from '@web/core/registry';
 import { rpc } from '@web/core/network/rpc';
+import { redirect } from '@web/core/utils/urls';
 import wSaleUtils from '@website_sale/js/website_sale_utils';
 
 export class CartLine extends Interaction {
@@ -64,7 +65,7 @@ export class CartLine extends Interaction {
         if (!data.cart_quantity) {
             // Ensure the last cart removal is recorded.
             browser.sessionStorage.setItem('website_sale_cart_quantity', 0);
-            return window.location = '/shop/cart';
+            return redirect('/shop/cart');
         }
         input.value = data.quantity;
         this.el.querySelectorAll(`.js_quantity[data-line-id="${lineId}"]`).forEach(input =>
diff --git a/addons/website_sale/static/src/interactions/price_range.js b/addons/website_sale/static/src/interactions/price_range.js
index 174a537a85820..f42f8fbb80981 100644
--- a/addons/website_sale/static/src/interactions/price_range.js
+++ b/addons/website_sale/static/src/interactions/price_range.js
@@ -1,4 +1,5 @@
 import { Interaction } from '@web/public/interaction';
+import { redirect } from '@web/core/utils/urls';
 import { registry } from '@web/core/registry';
 
 export class PriceRange extends Interaction {
@@ -24,7 +25,7 @@ export class PriceRange extends Interaction {
         if (product_list_div) {
             product_list_div.classList.add('opacity-50');
         }
-        window.location.href = `${url.pathname}?${searchParams.toString()}`;
+        redirect(`${url.pathname}?${searchParams.toString()}`);
     }
 }
 
diff --git a/addons/website_sale/static/src/js/cart_service.js b/addons/website_sale/static/src/js/cart_service.js
index 0956c8c0a73cd..5696f64a7ade7 100644
--- a/addons/website_sale/static/src/js/cart_service.js
+++ b/addons/website_sale/static/src/js/cart_service.js
@@ -10,6 +10,7 @@ import { browser } from '@web/core/browser/browser';
 import { serializeDateTime } from '@web/core/l10n/dates';
 import { rpc } from '@web/core/network/rpc';
 import { registry } from '@web/core/registry';
+import { redirect } from '@web/core/utils/urls';
 import { session } from '@web/session';
 
 const { DateTime } = luxon;
@@ -462,7 +463,7 @@ export class CartService {
         });
         // TODO should not redirect if errors in data.
         if (shouldRedirectToCart || session.add_to_cart_action === 'go_to_cart') {
-            window.location = '/shop/cart';
+            redirect('/shop/cart');
             return data.quantity;
         }
         if (data.cart_quantity && (

From f7d41e806bd08b98cfe7c7b699efebd6c824c22f Mon Sep 17 00:00:00 2001
From: FrancoisGe <fge@odoo.com>
Date: Thu, 6 Nov 2025 14:09:23 +0000
Subject: [PATCH 394/673] [REV] website_sale: ProductsListPageOption should be
 always visible

Due to commit 160a2c90a12d683726e7df50d83df10068c55e0b, the ProductListOption options no longer apply.
So We will revert this commit.

closes odoo/odoo#234948

X-original-commit: ea646f73c16dcee89ad73c6d01806e1d90280b16
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../static/src/website_builder/products_list_page_option.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/static/src/website_builder/products_list_page_option.js b/addons/website_sale/static/src/website_builder/products_list_page_option.js
index 0ea5a7cf4b9e0..4e0807f16ab4b 100644
--- a/addons/website_sale/static/src/website_builder/products_list_page_option.js
+++ b/addons/website_sale/static/src/website_builder/products_list_page_option.js
@@ -4,7 +4,7 @@ import { products_sort_mapping } from "@website_sale/website_builder/shared";
 
 export class ProductsListPageOption extends BaseOptionComponent {
     static template = "website_sale.ProductsListPageOption";
-    static selector = "main:has(#o_wsale_container)";
+    static selector = "#o_wsale_container";
     static title = _t("Products Page");
     static groups = ["website.group_website_designer"];
     static editableOnly = false;

From cd7395d2e2813481d78428cae73b7645d19278dd Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 3 Nov 2025 16:45:27 +0000
Subject: [PATCH 395/673] [IMP] core: allow different language codes

For the moment, when you import/export a language
it has to be like the ISO code.  The confusing for
the user is that for France French it is fr and
for Belgian French fr_BE, while sometime a France French
file is called fr_FR.po.  So it is better to allow both
code and iso_code to search for the language.  That way,
both fr_FR and fr are the same.

X-original-commit: 8028592d433bf280a8db27ef57a81ec0ffb47e78
Part-of: odoo/odoo#234949
Signed-off-by: Paolo Gatti (pgi) <pgi@odoo.com>
---
 odoo/cli/i18n.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/odoo/cli/i18n.py b/odoo/cli/i18n.py
index aa49e8c8c62af..77e42b40a18c3 100644
--- a/odoo/cli/i18n.py
+++ b/odoo/cli/i18n.py
@@ -7,6 +7,7 @@
 from odoo import SUPERUSER_ID
 from odoo.api import Environment
 from odoo.cli.command import Command
+from odoo.fields import Domain
 from odoo.modules import get_module_path
 from odoo.modules.registry import Registry
 from odoo.tools import OrderedSet, config
@@ -128,7 +129,8 @@ def run(self, cmdargs):
     def _get_languages(self, env, language_codes, active_test=True):
         # We want to log invalid parameters
         Lang = env['res.lang'].with_context(active_test=False)
-        languages = Lang.search([('iso_code', 'in', language_codes)])
+        languages = Lang.search(Domain.OR([Domain('iso_code', 'in', language_codes),
+                                           Domain('code', 'in', language_codes)]))
         if not_found_language_codes := set(language_codes) - set(languages.mapped("iso_code")):
             _logger.warning("Ignoring not found languages: %s", ', '.join(not_found_language_codes))
         if active_test:

From 683baa725821e5e5999a60f6ba0e5b95a1c3b1e1 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 6 Nov 2025 11:11:54 +0000
Subject: [PATCH 396/673] [IMP] core: cli i18n add a hint message when a lang
 is not installed

When exporting/importing a language with the i18n export/import
CLI tool we might forget installing the language in the database
first.  By providing a hint on how to do that, the user can
easily copy the command to install it in his database and continue
in what he was doing.  We see that Python also gives similar hints

closes odoo/odoo#234949

X-original-commit: 1c2be14eaf577481ddad08f52410dcbb67c46a3b
Signed-off-by: Paolo Gatti (pgi) <pgi@odoo.com>
---
 odoo/cli/i18n.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/odoo/cli/i18n.py b/odoo/cli/i18n.py
index 77e42b40a18c3..a47b91b421c15 100644
--- a/odoo/cli/i18n.py
+++ b/odoo/cli/i18n.py
@@ -136,8 +136,18 @@ def _get_languages(self, env, language_codes, active_test=True):
         if active_test:
             if not_installed_languages := languages.filtered(lambda x: not x.active):
                 languages -= not_installed_languages
-                iso_code_str = ", ".join(not_installed_languages.mapped("iso_code"))
-                _logger.warning("Ignoring not installed languages: %s", iso_code_str)
+                iso_codes = not_installed_languages.mapped('iso_code')
+                _logger.warning(
+                    textwrap.dedent("""\
+                        Ignoring not installed languages: %s
+                        Install them running the below command, then run this command again.
+
+                        $ %s -l %s
+                    """),
+                    ', '.join(iso_codes),
+                    self.loadlang_parser.prog,
+                    ' '.join(iso_codes),
+                )
         return languages
 
     def _import(self, parsed_args):

From 94bb4a29189400d6bd0c2ca97eba271601262e1b Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Mon, 3 Nov 2025 09:26:18 +0000
Subject: [PATCH 397/673] [FIX] hr: make sure the employee fields are
 searchable

Before this commit, since now `hr.employee` is inherited by `hr.version`
when the other model search employee field, the current user has to
access to version or be a hr user to be able to use filters using
employee fields.

This commit makes sure the employee fields are searchable.

runbot-error-233311

closes odoo/odoo#234950

X-original-commit: d7d00c0ecaa5cd9c1dbb0a398e9ad1bb493cedaf
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_employee.py    |  4 +-
 addons/hr/tests/test_hr_version.py | 80 ++++++++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 55cbbca72219a..91d3e1c2ae08b 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -60,7 +60,7 @@ class HrEmployee(models.Model):
         string="Current Employee Record",
         compute='_compute_current_version_id',
         store=True,
-        groups="hr.group_hr_user",
+        bypass_search_access=True,
     )
     current_date_version = fields.Date(
         string="Current Date Employee Record",
@@ -1129,6 +1129,7 @@ def search_fetch(self, domain, field_names=None, offset=0, limit=None, order=Non
         # cache, and interpreted as an access error
         if field_names is None:
             field_names = [field.name for field in self._determine_fields_to_fetch()]
+        field_names = [f_name for f_name in field_names if f_name != 'current_version_id']
         self._check_private_fields(field_names)
         self.flush_model(field_names)
         public = self.env['hr.employee.public'].search_fetch(domain, field_names, offset, limit, order)
@@ -1145,6 +1146,7 @@ def fetch(self, field_names=None):
         # cache, and interpreted as an access error
         if field_names is None:
             field_names = [field.name for field in self._determine_fields_to_fetch()]
+        field_names = [f_name for f_name in field_names if f_name != 'current_version_id']
         self._check_private_fields(field_names)
         self.flush_recordset(field_names)
         public = self.env['hr.employee.public'].browse(self._ids)
diff --git a/addons/hr/tests/test_hr_version.py b/addons/hr/tests/test_hr_version.py
index d262b7fa8f953..5eaabad844043 100644
--- a/addons/hr/tests/test_hr_version.py
+++ b/addons/hr/tests/test_hr_version.py
@@ -4,13 +4,16 @@
 from psycopg2.errors import CheckViolation
 
 from odoo.tests import tagged
-from odoo.tests.common import TransactionCase, freeze_time
-from odoo.exceptions import ValidationError
+from odoo.tests.common import freeze_time
+from odoo.exceptions import AccessError, ValidationError
 from odoo.tools import mute_logger
 
+from odoo.addons.hr.tests.common import TestHrCommon
+from odoo.addons.mail.tests.common import mail_new_test_user
+
 
 @tagged('post_install', '-at_install')
-class TestHrVersion(TransactionCase):
+class TestHrVersion(TestHrCommon):
     def test_dates_constraints(self):
         employee = self.env['hr.employee'].create({
             'name': 'John Doe',
@@ -698,3 +701,74 @@ def test_hr_version_fields_tracking(self):
             fields_without_tracking,
             f"The following hr.version fields should have tracking=True: {fields_without_tracking}",
         )
+
+    def test_search_on_version_fields(self):
+        Department = self.env['hr.department'].with_context(tracking_disable=True)
+        rd_dep = Department.create({
+            'name': 'Research and devlopment',
+        })
+        employee1, employee2 = employees = self.env['hr.employee'].create([
+            {
+                'contract_date_start': '2020-10-10',
+                'wage': 3000,
+                'name': 'Employee1',
+                'hr_responsible_id': self.res_users_hr_manager.id,
+                'department_id': rd_dep.id,
+            },
+            {
+                'contract_date_start': '2022-10-10',
+                'wage': 2000,
+                'name': 'Employee2',
+            },
+        ])
+        internal_user = mail_new_test_user(
+            self.env,
+            email='internal_user@example.com',
+            login='internal_user',
+            name='Internal User',
+        )
+        self.employee.department_id = rd_dep
+        self.employee.user_id = internal_user
+
+        HrEmployeePublic_with_internal_user = self.env['hr.employee.public'].with_user(internal_user)
+        with self.assertRaises(AccessError, msg="Internal user should not be able to access to hr.employee model"):
+            HrEmployeePublic_with_internal_user.search([
+                ('employee_id.contract_date_start', '<', '2022-01-01'),
+                ('id', 'in', employees.ids),
+            ])
+        with self.assertRaises(AccessError, msg="Internal user should not be able to access to hr.employee model"):
+            HrEmployeePublic_with_internal_user.search([('employee_id.wage', '=', 2000), ('id', 'in', employees.ids)])
+        with self.assertRaises(AccessError, msg="Internal user should not be able to access to hr.employee model"):
+            HrEmployeePublic_with_internal_user.search([('employee_id.version_id.wage', '=', 2000), ('id', 'in', employees.ids)])
+        self.assertEqual(
+            HrEmployeePublic_with_internal_user.search([('name', '=', 'Employee2'), ('id', 'in', employees.ids)]),
+            self.env['hr.employee.public'].browse(employee2.id),
+        )
+        self.assertEqual(
+            HrEmployeePublic_with_internal_user.search([('member_of_department', '=', True), ('id', 'in', employees.ids)]),
+            self.env['hr.employee.public'].browse(employee1.id),
+        )
+
+        HrEmployee_with_office_user = self.env['hr.employee'].with_user(self.res_users_hr_officer)
+        self.employee.user_id = self.res_users_hr_officer
+        with self.assertRaises(AccessError, msg="HR Officer should not be able to access to 'payroll fields'"):
+            HrEmployee_with_office_user.search([('contract_date_start', '<', '2022-01-01'), ('id', 'in', employees.ids)])
+        with self.assertRaises(AccessError, msg="HR Officer should not be able to access to 'payroll fields'"):
+            HrEmployee_with_office_user.search([('wage', '=', 2000), ('id', 'in', employees.ids)])
+        with self.assertRaises(AccessError, msg="HR Officer should not be able to access to 'payroll fields'"):
+            HrEmployee_with_office_user.search([('version_id.wage', '=', 2000), ('id', 'in', employees.ids)])
+        self.assertEqual(HrEmployee_with_office_user.search([('name', '=', 'Employee1'), ('id', 'in', employees.ids)]), employee1)
+        self.assertEqual(HrEmployee_with_office_user.search([('hr_responsible_id', '=', self.res_users_hr_manager.id), ('id', 'in', employees.ids)]), employee1)
+        self.assertEqual(HrEmployee_with_office_user.search([('version_id.hr_responsible_id', '=', self.res_users_hr_manager.id), ('id', 'in', employees.ids)]), employee1)
+        self.assertEqual(HrEmployee_with_office_user.search([('member_of_department', '=', True), ('id', 'in', employees.ids)]), employee1)
+
+        if payroll_group := self.env.ref('hr_payroll.group_hr_payroll_user', raise_if_not_found=False):
+            self.res_users_hr_manager.group_ids += payroll_group
+        HrEmployee_with_manager_user = self.env['hr.employee'].with_user(self.res_users_hr_manager)
+        self.employee.user_id = self.res_users_hr_manager
+        self.assertEqual(HrEmployee_with_manager_user.search([('contract_date_start', '<', '2022-01-01'), ('id', 'in', employees.ids)]), employee1)
+        self.assertEqual(HrEmployee_with_manager_user.search([('wage', '=', 2000), ('id', 'in', employees.ids)]), employee2)
+        self.assertEqual(HrEmployee_with_manager_user.search([('version_id.wage', '=', 2000), ('id', 'in', employees.ids)]), employee2)
+        self.assertEqual(HrEmployee_with_manager_user.search([('hr_responsible_id', '=', self.res_users_hr_manager.id), ('id', 'in', employees.ids)]), employee1)
+        self.assertEqual(HrEmployee_with_manager_user.search([('version_id.hr_responsible_id', '=', self.res_users_hr_manager.id), ('id', 'in', employees.ids)]), employee1)
+        self.assertEqual(HrEmployee_with_manager_user.search([('member_of_department', '=', True), ('id', 'in', employees.ids)]), employee1)

From 4dda8716ab0989abf622a481513a3275ad85501a Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Mon, 27 Oct 2025 15:51:21 +0100
Subject: [PATCH 398/673] [IMP] web: allow having a edit button as text

Part-of: odoo/odoo#233483
Related: odoo/enterprise#98285
Related: odoo/documentation#15073
Related: odoo/upgrade#8720
Signed-off-by: John Laterre (jol) <jol@odoo.com>
---
 addons/account/views/account_move_views.xml         | 4 ++--
 addons/web/static/src/views/list/list_renderer.scss | 1 +
 addons/web/static/src/views/list/list_renderer.xml  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 0ab96efb2a8bd..dcc5e9f224d9a 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -201,7 +201,7 @@
                     <field name="parent_state" column_invisible="True"/>
                     <field name="deductible_amount" optional="hide"/>
                     <groupby name="partner_id">
-                        <button name="edit" type="edit" icon="fa-edit" title="Edit"/>
+                        <button name="edit" type="edit" icon="fa-edit"/>
                     </groupby>
                 </list>
             </field>
@@ -415,7 +415,7 @@
                     <field name="is_account_reconcile" column_invisible="True"/>
                     <field name="parent_state" column_invisible="True"/>
                     <groupby name="partner_id">
-                        <button name="edit" type="edit" icon="fa-edit" title="Edit"/>
+                        <button name="edit" type="edit"/>
                     </groupby>
                 </list>
             </field>
diff --git a/addons/web/static/src/views/list/list_renderer.scss b/addons/web/static/src/views/list/list_renderer.scss
index 523d1bd8051e2..7ac24e6becaf8 100644
--- a/addons/web/static/src/views/list/list_renderer.scss
+++ b/addons/web/static/src/views/list/list_renderer.scss
@@ -285,6 +285,7 @@
                 > button {
                     padding-top: 0;
                     padding-bottom: 0;
+                    margin-right: 3px;
                 }
             }
             .o_pager {
diff --git a/addons/web/static/src/views/list/list_renderer.xml b/addons/web/static/src/views/list/list_renderer.xml
index da1a3038e6c60..065e0c4293a69 100644
--- a/addons/web/static/src/views/list/list_renderer.xml
+++ b/addons/web/static/src/views/list/list_renderer.xml
@@ -221,8 +221,8 @@
                         <t t-foreach="groupByButtons[group.groupByField.name]" t-as="button" t-key="button.id">
                             <t t-if="!evalInvisible(button.invisible, group.record)">
                                 <t t-if="button.clickParams.type === 'edit'">
-                                    <button t-att-title="button.title" class="btn" t-on-click.stop="() => this.editGroupRecord(group)" tabindex="-1">
-                                        <i t-attf-class="fa fa-fw {{button.icon}} o_button_icon"/>
+                                    <button class="btn btn-secondary" t-on-click.stop="() => this.editGroupRecord(group)" tabindex="-1">
+                                        View
                                     </button>
                                 </t>
                                 <t t-else="">

From 05bb8308f91d943413fb280cc4ac6b5d3cd880c2 Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Fri, 24 Oct 2025 16:44:50 +0200
Subject: [PATCH 399/673] [IMP] account: cleanup journal audit view

task-5207451

Part-of: odoo/odoo#233483
Related: odoo/enterprise#98285
Related: odoo/documentation#15073
Related: odoo/upgrade#8720
Signed-off-by: John Laterre (jol) <jol@odoo.com>
---
 addons/account/views/account_move_views.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index dcc5e9f224d9a..0716d50a7d8af 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -179,8 +179,8 @@
                     <field name="tax_ids" widget="many2many_tax_tags" optional="hide" readonly="1"/>
                     <field name="amount_currency" string="In Currency" groups="base.group_multi_currency" optional="hide" readonly="1" invisible="is_same_currency"/>
                     <field name="currency_id" groups="base.group_multi_currency" optional="hide" string="Currency" readonly="1" invisible="is_same_currency"/>
-                    <field name="debit" sum="Total Debit" readonly="1"/>
-                    <field name="credit" sum="Total Credit" readonly="1"/>
+                    <field name="debit" sum="Total Debit" readonly="1" decoration-muted="debit == 0"/>
+                    <field name="credit" sum="Total Credit" readonly="1" decoration-muted="credit == 0"/>
                     <field name="tax_tag_ids" string="Tax Grids" options="{'no_create': True, 'no_create_edit': True}" domain="[('applicability', '=', 'taxes')]" widget="many2many_tags" optional="hide"/>
                     <field name="discount_date" string="Discount Date" optional="hide" />
                     <field name="discount_amount_currency" string="Discount Amount" optional="hide" />
@@ -203,6 +203,11 @@
                     <groupby name="partner_id">
                         <button name="edit" type="edit" icon="fa-edit"/>
                     </groupby>
+                    <groupby name="move_id">
+                        <button name="action_post" type="object" string="Post" class="btn-primary" invisible="state != 'draft'" groups="account.group_account_user"/>
+                        <button name="set_moves_checked" type="object" string="Review" class="btn-primary" invisible="checked" groups="account.group_account_user"/>
+                        <button name="edit_move" type="edit" icon="fa-edit" string="Edit"/>
+                    </groupby>
                 </list>
             </field>
         </record>
@@ -308,24 +313,16 @@
                         '|', '|', '|',
                         ('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self)]"/>
                     <field name="name"/>
-                    <field name="ref"/>
                     <field name="invoice_date"/>
                     <field name="date"/>
-                    <field name="date_maturity" string="Due Date"/>
-                    <field name="discount_date" string="Discount Date"/>
                     <field name="balance" string="Amount" filter_domain="['|', ('credit', '=', raw_value), ('debit', '=', raw_value)]"/>
                     <field name="account_id"/>
-                    <field name="account_type"/>
                     <field name="partner_id"/>
                     <field name="journal_id"/>
                     <field name="journal_group_id"/>
-                    <field name="product_id"/>
-                    <field name="product_category_id"/>
                     <field name="move_id" string="Journal Entry" filter_domain="[
                         '|', ('move_id.name', 'ilike', self), ('move_id.ref', 'ilike', self)]"/>
                     <field name="tax_ids" />
-                    <field name="tax_line_id" string="Originator Tax"/>
-                    <field name="reconcile_model_id"/>
                     <separator/>
                     <filter string="Unposted" name="unposted" domain="[('parent_state', '=', 'draft')]" help="Unposted Journal Items"/>
                     <filter string="Posted" name="posted" domain="[('parent_state', '=', 'posted')]" help="Posted Journal Items"/>

From af368c872fcbdd952dffde47abcdc7d1fd02f298 Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Fri, 24 Oct 2025 17:56:28 +0200
Subject: [PATCH 400/673] [IMP] account: add review state on journal entries

task-5207451

closes odoo/odoo#233483

Related: odoo/enterprise#98285
Related: odoo/documentation#15073
Related: odoo/upgrade#8720
Signed-off-by: John Laterre (jol) <jol@odoo.com>
---
 .../models/account_bank_statement_line.py     |   6 +-
 .../models/account_journal_dashboard.py       |   8 +-
 addons/account/models/account_move.py         |  66 ++++++----
 addons/account/models/kpi_provider.py         |   2 +-
 .../account_review_state_selection_badge.js   | 119 ++++++++++++++++++
 .../account_review_state_selection_badge.scss |   8 ++
 .../account_review_state_selection_badge.xml  |  46 +++++++
 .../char_with_placeholder_field.xml           |  14 ---
 ...ith_placeholder_field_to_check_to_check.js |  16 ---
 .../tests/test_account_journal_dashboard.py   |   8 +-
 addons/account/tests/test_account_to_check.py | 106 +++++++++++++---
 addons/account/tests/test_audit_trail.py      |   4 +-
 addons/account/tests/test_kpi_provider.py     |   4 +-
 addons/account/views/account_move_views.xml   |  58 ++++++---
 .../hr_expense/views/account_move_views.xml   |  10 +-
 addons/web/static/src/core/py_js/py_parser.js |   4 +-
 16 files changed, 373 insertions(+), 106 deletions(-)
 create mode 100644 addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.js
 create mode 100644 addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.scss
 create mode 100644 addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.xml
 delete mode 100644 addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field.xml
 delete mode 100644 addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field_to_check_to_check.js

diff --git a/addons/account/models/account_bank_statement_line.py b/addons/account/models/account_bank_statement_line.py
index 2efd547ef32e8..220f5286618ec 100644
--- a/addons/account/models/account_bank_statement_line.py
+++ b/addons/account/models/account_bank_statement_line.py
@@ -279,7 +279,7 @@ def _compute_internal_index(self):
                                       f'{st_line._origin.id:0>10}'
 
     @api.depends('journal_id', 'currency_id', 'amount', 'foreign_currency_id', 'amount_currency',
-                 'move_id.checked',
+                 'move_id.review_state',
                  'move_id.line_ids.account_id', 'move_id.line_ids.amount_currency',
                  'move_id.line_ids.amount_residual_currency', 'move_id.line_ids.currency_id',
                  'move_id.line_ids.matched_debit_ids', 'move_id.line_ids.matched_credit_ids')
@@ -292,7 +292,7 @@ def _compute_is_reconciled(self):
             _liquidity_lines, suspense_lines, _other_lines = st_line._seek_for_lines()
 
             # Compute residual amount
-            if not st_line.checked:
+            if st_line.review_state in ('todo', 'anomaly'):
                 st_line.amount_residual = -st_line.amount_currency if st_line.foreign_currency_id else -st_line.amount
             elif suspense_lines.account_id.reconcile:
                 st_line.amount_residual = sum(suspense_lines.mapped('amount_residual_currency'))
@@ -465,7 +465,7 @@ def action_undo_reconciliation(self):
 
         for st_line in self:
             st_line.with_context(force_delete=True, skip_readonly_check=True).write({
-                'checked': True,
+                'review_state': 'reviewed',
                 'line_ids': [Command.clear()] + [
                     Command.create(line_vals) for line_vals in st_line._prepare_move_line_default_vals()],
             })
diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index 2d9dc80172c09..e48d99bc12154 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -458,7 +458,7 @@ def _fill_bank_cash_dashboard_data(self, dashboard_data):
              WHERE st_line.journal_id IN %s
                AND st_line.company_id IN %s
                AND st_line.is_reconciled IS NOT TRUE
-               AND st_line_move.checked IS TRUE
+               AND (st_line_move.review_state IS NULL OR st_line_move.review_state NOT IN ('todo', 'anomaly'))
                AND st_line_move.state = 'posted'
           GROUP BY st_line.journal_id
         """, [tuple(bank_cash_journals.ids), tuple(self.env.companies.ids)])
@@ -506,7 +506,7 @@ def _fill_bank_cash_dashboard_data(self, dashboard_data):
                 domain=[
                     ('journal_id', 'in', bank_cash_journals.ids),
                     ('move_id.company_id', 'in', self.env.companies.ids),
-                    ('move_id.checked', '=', False),
+                    ('move_id.review_state', 'in', ('todo', 'anomaly')),
                     ('move_id.state', '=', 'posted'),
                 ],
                 groupby=['journal_id'],
@@ -752,7 +752,7 @@ def _get_to_check_payment_query(self):
         query = self.env['account.move']._search([
             *self.env['account.move']._check_company_domain(self.env.companies),
             ('journal_id', 'in', self.ids),
-            ('checked', '=', False),
+            ('review_state', 'in', ('todo', 'anomaly')),
             ('state', '=', 'posted'),
         ])
         selects = [
@@ -1009,7 +1009,7 @@ def to_check_ids(self):
         return self.env['account.bank.statement.line'].search([
             ('journal_id', '=', self.id),
             ('move_id.company_id', 'in', self.env.companies.ids),
-            ('move_id.checked', '=', False),
+            ('move_id.review_state', 'in', ('todo', 'anomaly')),
             ('move_id.state', '=', 'posted'),
         ])
 
diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index f914b377e41f4..8c8e58a6c5894 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -54,6 +54,12 @@
         ('blocked', 'Blocked'),
         ('invoicing_legacy', 'Invoicing App Legacy'),
 ]
+REVIEW_STATE_SELECTION = [
+    ('todo', "To Review"),
+    ('reviewed', "Reviewed"),
+    ('supervised', "Supervised"),
+    ('anomaly', "Anomaly"),
+]
 
 TYPE_REVERSE_MAP = {
     'entry': 'entry',
@@ -311,10 +317,10 @@ def _sequence_year_range_monthly_regex(self):
         index='btree_not_null',
     )
     hide_post_button = fields.Boolean(compute='_compute_hide_post_button', readonly=True)
-    checked = fields.Boolean(
-        string='Reviewed',
-        compute='_compute_checked',
-        store=True, readonly=False, tracking=True, copy=False,
+    review_state = fields.Selection(
+        string="Review",
+        selection=REVIEW_STATE_SELECTION,
+        tracking=True, copy=False,
     )
     posted_before = fields.Boolean(copy=False)
     suitable_journal_ids = fields.Many2many(
@@ -773,7 +779,7 @@ def _sequence_year_range_monthly_regex(self):
     display_send_button = fields.Boolean(compute='_compute_display_send_button')
     highlight_send_button = fields.Boolean(compute='_compute_highlight_send_button')
 
-    _checked_idx = models.Index("(journal_id) WHERE (checked IS NOT TRUE)")
+    _checked_idx = models.Index("(journal_id) WHERE (review_state IN ('todo', 'anomaly'))")
     _payment_idx = models.Index("(journal_id, state, payment_state, move_type, date)")
     _unique_name = models.UniqueIndex(
         "(name, journal_id) WHERE (state = 'posted'AND name != '/')",
@@ -2345,11 +2351,6 @@ def _search_next_payment_date(self, operator, value):
             return NotImplemented
         return [('line_ids', 'any', [('reconciled', '=', False), ('payment_date', operator, value)])]
 
-    @api.depends('state', 'journal_id.type')
-    def _compute_checked(self):
-        for move in self:
-            move.checked = move.state == 'posted' and (move.journal_id.type == 'general' or move._is_user_able_to_review())
-
     @api.depends('line_ids.no_followup')
     def _compute_no_followup(self):
         for move in self:
@@ -3727,6 +3728,16 @@ def _get_copy_message_content(self, default):
         """
         return _('This entry has been reversed from %s', self._get_html_link()) if default.get('reversed_entry_id') else _('This entry has been duplicated from %s', self._get_html_link())
 
+    def _check_user_access(self, vals_list):
+        is_user_able_to_review = self.env.user.has_group('account.group_account_user')
+        is_user_able_to_supervise = self.env.user.has_group('account.group_account_manager')
+        for vals in vals_list:
+            if (
+                ((vals.get('review_state') == 'reviewed' or not vals.get('review_state', True)) and not is_user_able_to_review)
+                or (vals.get('review_state') == 'supervised' and not is_user_able_to_supervise)
+            ):
+                raise AccessError(_("You don't have the access rights to perform this action."))
+
     def _sanitize_vals(self, vals):
         if vals.get('invoice_line_ids') and vals.get('journal_line_ids'):
             # values can sometimes be in only one of the two fields, sometimes in
@@ -3768,6 +3779,7 @@ def _get_protected_vals(self, vals, records):
     def create(self, vals_list):
         if any('state' in vals and vals.get('state') == 'posted' for vals in vals_list):
             raise UserError(_('You cannot create a move already in the posted state. Please create a draft move and post it after.'))
+        self._check_user_access(vals_list)
         container = {'records': self}
         with self._check_balanced(container):
             with ExitStack() as exit_stack, self._sync_dynamic_lines(container):
@@ -3787,12 +3799,26 @@ def write(self, vals):
         if not vals:
             return True
         self._sanitize_vals(vals)
+        self._check_user_access([vals])
 
+        is_user_able_to_supervise = self.env.user.has_group('account.group_account_manager')
+        is_user_able_to_review = self.env.user.has_group('account.group_account_user') or is_user_able_to_supervise
+        move_ids_review_done = []
+        move_ids_review_todo = []
         for move in self:
-            if vals.get('checked') and not move._is_user_able_to_review():
-                raise AccessError(_("You don't have the access rights to perform this action."))
-            if vals.get('state') == 'draft' and move.checked and not move._is_user_able_to_review():
-                raise ValidationError(_("Validated entries can only be changed by your accountant."))
+            if vals.get('state') == 'draft' and (
+                ((move.review_state == 'reviewed' or not move.review_state) and not is_user_able_to_review)
+                or (move.review_state == 'supervised' and not is_user_able_to_supervise)
+            ):
+                raise ValidationError(_("This entry has already been reviewed. You need the bookkeeper role to change it."))
+            if (vals.get('state') == 'posted' and move.auto_post == 'no') or vals.get('auto_post', 'no') != 'no':
+                if is_user_able_to_review:
+                    if move.review_state:
+                        move_ids_review_done.append(move.id)
+                else:
+                    move_ids_review_todo.append(move.id)
+            if not is_user_able_to_review and move.review_state in ('reviewed', 'supervised'):
+                move_ids_review_todo.append(move.id)
 
             violated_fields = set(vals).intersection(move._get_integrity_hash_fields() + ['inalterable_hash'])
             if move.inalterable_hash and violated_fields:
@@ -3874,6 +3900,8 @@ def write(self, vals):
                 if vals.get('state') == 'posted':
                     self.flush_recordset()  # Ensure that the name is correctly computed
                     self._hash_moves()
+                super(AccountMove, self.browse(move_ids_review_done)).write({'review_state': 'reviewed'})
+                super(AccountMove, self.browse(move_ids_review_todo)).write({'review_state': 'todo'})
 
             self._synchronize_business_models(set(vals.keys()))
 
@@ -4693,6 +4721,7 @@ def _get_fields_to_copy_recurring_entries(self, values):
             'auto_post_until': self.auto_post_until,  # same as above
             'auto_post_origin_id': self.auto_post_origin_id.id,  # same as above
             'invoice_user_id': self.invoice_user_id.id,  # otherwise user would be OdooBot
+            'review_state': self.review_state,
         })
         if self.invoice_date:
             values.update({'invoice_date': self._apply_delta_recurring_entries(self.invoice_date, self.auto_post_origin_id.invoice_date, self.auto_post)})
@@ -5911,15 +5940,12 @@ def js_remove_outstanding_partial(self, partial_id):
         partial = self.env['account.partial.reconcile'].browse(partial_id)
         return partial.unlink()
 
-    def button_set_checked(self):
-        self.set_moves_checked()
-
     def check_selected_moves(self):
         self.env['account.move'].browse(self.env.context.get('active_ids', [])).set_moves_checked()
 
     def set_moves_checked(self, is_checked=True):
         for move in self.filtered(lambda m: m.state == 'posted'):
-            move.checked = is_checked
+            move.review_state = 'reviewed' if is_checked else 'todo'
 
     def button_draft(self):
         if any(move.state not in ('cancel', 'posted') for move in self):
@@ -6610,10 +6636,6 @@ def _get_available_invoice_template_pdf_report_ids(self):
 
         return available_reports
 
-    def _is_user_able_to_review(self):
-        # If only account is installed, we don't check user access rights.
-        return True
-
     # -------------------------------------------------------------------------
     # TOOLING
     # -------------------------------------------------------------------------
diff --git a/addons/account/models/kpi_provider.py b/addons/account/models/kpi_provider.py
index 38d42f7f99b09..ddae6fbd2f2fa 100644
--- a/addons/account/models/kpi_provider.py
+++ b/addons/account/models/kpi_provider.py
@@ -9,7 +9,7 @@ def get_account_kpi_summary(self):
         grouped_moves_to_report = self.env['account.move']._read_group(
             fields.Domain.OR([
                 [('state', '=', 'draft')],
-                [('state', '=', 'posted'), ('checked', '=', False)],
+                [('state', '=', 'posted'), ('review_state', 'in', ('todo', 'anomaly'))],
                 [('state', '=', 'posted'), ('journal_id.type', '=', 'bank'), ('statement_line_id.is_reconciled', '=', False)],
             ]),
             ['journal_id'],
diff --git a/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.js b/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.js
new file mode 100644
index 0000000000000..f05784fac0bc9
--- /dev/null
+++ b/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.js
@@ -0,0 +1,119 @@
+import { registry } from "@web/core/registry";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { Component, onWillStart } from "@odoo/owl";
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { cookie } from "@web/core/browser/cookie";
+import { user } from "@web/core/user";
+
+export class AccountReviewStateSelectionBadge extends Component {
+    static template = "account_reports.AccountReviewStateSelectionBadgeField";
+    static props = {
+        ...standardFieldProps,
+        decorations: { type: Object, optional: true },
+        options: { type: Object, optional: true },
+        class: { type: String, optional: true },
+        size: { type: String, optional: true },
+    };
+
+    setup() {
+        onWillStart(async () => {
+            this.editableOptions = await this.getEditableOptions();
+        });
+    }
+
+    static defaultProps = {
+        size: "normal"
+    };
+
+    static components = {
+        Dropdown,
+        DropdownItem,
+    }
+
+    get options() {
+        return this.props.record.fields[this.props.name].selection;
+    }
+
+    get value() {
+        return this.props.record.data[this.props.name];
+    }
+
+    get required() {
+        return this.props.record.fields[this.props.name].required;
+    }
+
+    get display() {
+        const result = this.options.filter((val) => val[0] === this.value)[0];
+        if(result) {
+            return result[1];
+        }
+        return null;
+    }
+
+    async getEditableOptions () {
+        const editableOptions = []
+        if (this.props.options[false] === undefined) {
+            editableOptions.push(false);
+        }
+
+        for (let [key, value] of Object.entries(this.props.options)) {
+            if (
+                [true, undefined].includes(value.can_edit)
+                || (typeof value.can_edit == 'string' && (await Promise.all(
+                    value.can_edit.split(",").map(group => user.hasGroup(group))
+                )).some(Boolean))
+            ) {
+                editableOptions.push(key === 'false' ? false : key);
+            }
+        }
+
+        return editableOptions;
+    }
+
+    getDropdownButtonDecoration(value) {
+        const decoration = this.props.options[value]?.decoration
+        if (!decoration || decoration === 'muted') {
+            return 'btn-outline-secondary'
+        }
+        return `btn-outline-${decoration}`
+    }
+
+    getDropdownItemDecoration(value) {
+        const colorScheme = cookie.get("color_scheme");
+        const decoration = this.props.options[value]?.decoration;
+        if (decoration) {
+            if (decoration === "muted") {
+                return colorScheme === 'dark' ? "text-bg-200" : "text-bg-300";
+            }
+            return `text-bg-${decoration}`;
+        }
+        return "text-bg-200"
+    }
+
+    get additionalClassName() {
+        return this.props.class || "";
+    }
+
+    get capsuleStyle() {
+        return "min-width: 10ch; min-height: 2em;";
+    }
+
+    async onChange(value) {
+        await this.props.record.update(
+            { [this.props.name]: value },
+            { save: true }
+        );
+        this.env.reload?.()
+    }
+}
+
+export const accountReviewStateSelectionBadge = {
+    supportedTypes: ["selection"],
+    component: AccountReviewStateSelectionBadge,
+    extractProps: ({options}) => {
+        return { options };
+    },
+}
+
+registry.category("fields").add("account_review_state_selection_badge", accountReviewStateSelectionBadge)
diff --git a/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.scss b/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.scss
new file mode 100644
index 0000000000000..e080306955ba9
--- /dev/null
+++ b/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.scss
@@ -0,0 +1,8 @@
+.o_account_review_state_selection_badge_dropdown_item {
+    min-height: 27px;
+}
+
+.o_account_review_state_selection_badge_audit_list .btn {
+    font-size: 0.7rem;
+    padding: 0 5px;
+}
diff --git a/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.xml b/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.xml
new file mode 100644
index 0000000000000..2926921345552
--- /dev/null
+++ b/addons/account/static/src/components/account_review_state_selection/account_review_state_selection_badge.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="account_reports.AccountReviewStateSelectionBadgeField">
+        <t t-if="this.editableOptions.includes(value)">
+            <Dropdown>
+                <button
+                    t-attf-class="btn btn-link d-flex align-items-center shadow-none rounded-pill {{ this.additionalClassName }} {{ this.getDropdownButtonDecoration(value) }}"
+                    t-att-style="this.capsuleStyle"
+                >
+                    <span t-esc="display"/>
+                </button>
+                <t t-set-slot="content">
+                    <t t-if="this.editableOptions.includes(false)">
+                        <DropdownItem
+                            class="'o_account_review_state_selection_badge_dropdown_item'"
+                            t-if="!required || !value"
+                            t-esc="this.props.placeholder || ''"
+                            onSelected="() => this.onChange(false)"
+                        />
+                    </t>
+                    <t t-foreach="options" t-as="option" t-key="option[0]">
+                        <t t-if="this.editableOptions.includes(option[0])">
+                            <DropdownItem
+                                class="'d-flex text-black align-items-center o_account_review_state_selection_badge_dropdown_item'"
+                                onSelected="() => this.onChange(option[0])"
+                            >
+                                <div class="rounded-circle me-2" style="width: 10px; height: 10px;" t-att-class="this.getDropdownItemDecoration(option[0])"/>
+                                <span t-esc="option[1]"/>
+                            </DropdownItem>
+                        </t>
+                    </t>
+                </t>
+            </Dropdown>
+        </t>
+        <t t-else="">
+            <div
+                t-attf-class="badge border rounded px-2 py-1 cursor-default {{ this.additionalClassName }} {{ this.getDropdownButtonDecoration(value) }}"
+                t-att-style="this.capsuleStyle"
+                t-on-click.stop.prevent="() => {}"
+                t-out="display"
+            />
+        </t>
+    </t>
+
+</templates>
diff --git a/addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field.xml b/addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field.xml
deleted file mode 100644
index 691dbe18443f9..0000000000000
--- a/addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="account.CharWithPlaceholderFieldToCheck" t-inherit="account.CharWithPlaceholderField" t-inherit-mode="extension">
-        <xpath expr="//span" position="after">
-            <span t-if="props.record.data.checked === false and props.record.data.state === 'posted'"
-                  groups="account.group_account_user"
-                  class="badge rounded-pill text-bg-info mx-2 d-inline-flex">
-                To review
-            </span>
-        </xpath>
-    </t>
-
-</templates>
diff --git a/addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field_to_check_to_check.js b/addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field_to_check_to_check.js
deleted file mode 100644
index dd271f165adb6..0000000000000
--- a/addons/account/static/src/components/char_with_placeholder_field_to_check/char_with_placeholder_field_to_check_to_check.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { registry } from "@web/core/registry";
-import {
-    charWithPlaceholderField,
-    CharWithPlaceholderField
-} from "../char_with_placeholder_field/char_with_placeholder_field";
-
-export class CharWithPlaceholderFieldToCheck extends CharWithPlaceholderField {
-    static template = "account.CharWithPlaceholderField";
-}
-
-export const charWithPlaceholderFieldToCheck = {
-    ...charWithPlaceholderField,
-    component: CharWithPlaceholderFieldToCheck,
-};
-
-registry.category("fields").add("char_with_placeholder_field_to_check", charWithPlaceholderFieldToCheck);
diff --git a/addons/account/tests/test_account_journal_dashboard.py b/addons/account/tests/test_account_journal_dashboard.py
index 7bd832f281084..3d0dbd006a33e 100644
--- a/addons/account/tests/test_account_journal_dashboard.py
+++ b/addons/account/tests/test_account_journal_dashboard.py
@@ -336,7 +336,7 @@ def test_to_check_posted(self):
             'move_type': 'out_invoice',
             'journal_id': journal.id,
             'partner_id': self.partner_a.id,
-            'checked': False,
+            'review_state': 'todo',
             'invoice_line_ids': [
                 Command.create({
                     'product_id': self.product_a.id,
@@ -351,7 +351,7 @@ def test_to_check_posted(self):
         self.assertEqual(dashboard_data['to_check_balance'], journal.currency_id.format(0))
 
         move.action_post()
-        move.checked = False
+        move.review_state = 'todo'
 
         dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id]
         self.assertEqual(dashboard_data['to_check_balance'], journal.currency_id.format(100))
@@ -389,7 +389,7 @@ def test_to_check_amount_different_currency(self):
             'journal_id': journal.id,
             'partner_id': self.partner_a.id,
             'currency_id': currency.id,
-            'checked': False,
+            'review_state': 'todo',
             'invoice_line_ids': [
                 Command.create({
                     'product_id': self.product_a.id,
@@ -400,7 +400,7 @@ def test_to_check_amount_different_currency(self):
             ]
         } for currency in (self.env.ref('base.EUR'), self.env.ref('base.CHF'))])
         moves.action_post()
-        moves.checked = False
+        moves.review_state = 'todo'
 
         dashboard_data = journal._get_journal_dashboard_data_batched()[journal.id]
         self.assertEqual(dashboard_data['to_check_balance'], journal.currency_id.format(150))
diff --git a/addons/account/tests/test_account_to_check.py b/addons/account/tests/test_account_to_check.py
index e1f83fe0ac21d..b5a8e62b38c27 100644
--- a/addons/account/tests/test_account_to_check.py
+++ b/addons/account/tests/test_account_to_check.py
@@ -18,47 +18,115 @@ def setUpClass(cls):
         cls.bank_journal = cls.env['account.journal'].search([('type', '=', 'bank'), ('company_id', '=', cls.company.id)], limit=1)
 
     def test_try_check_move_with_invoicing_user(self):
-        if 'accountant' not in self.env["ir.module.module"]._installed():
-            self.skipTest('accountant is not installed')
-        invoice = self._create_invoice(checked=True)
+        invoice = self._create_invoice(review_state='todo')
         invoice.action_post()
-        with self.assertRaisesRegex(ValidationError, 'Validated entries can only be changed by your accountant.'):
+        with self.assertRaisesRegex(ValidationError, 'This entry has already been reviewed.'):
             invoice.with_user(self.simple_accountman).button_draft()
 
         invoice.button_draft()
         self.assertEqual(invoice.state, 'draft')
 
         invoice.action_post()
-        invoice.checked = False
+        self.assertEqual(invoice.review_state, 'reviewed')
+        invoice.review_state = 'todo'
         invoice.with_user(self.simple_accountman).button_draft()
         self.assertEqual(invoice.state, 'draft')
 
+    def test_sales_change_invoice_from_accountant(self):
+        invoice = self._create_invoice()
+        invoice.action_post()
+        with self.assertRaisesRegex(ValidationError, 'This entry has already been reviewed.'):
+            invoice.with_user(self.simple_accountman).button_draft()
+
+    def test_sales_modify_draft_reviewed(self):
+        invoice = self._create_invoice(review_state='reviewed')
+        invoice.with_user(self.simple_accountman).invoice_date = '2017-01-01'
+        self.assertEqual(invoice.review_state, 'todo')
+
     def test_post_move_auto_check(self):
-        if 'accountant' not in self.env["ir.module.module"]._installed():
-            self.skipTest('accountant is not installed')
         invoice_admin = self._create_invoice()
         invoice_admin.action_post()
-        # As the user has admin right, the move should be auto checked
-        self.assertTrue(invoice_admin.checked)
+        # As the user has admin right, the move doesn't need to be checked
+        self.assertFalse(invoice_admin.review_state)
 
         invoice_invoicing = self._create_invoice(user_id=self.simple_accountman.id)
         invoice_invoicing.with_user(self.simple_accountman).action_post()
         # As the user has only invoicing right, the move shouldn't be checked
-        self.assertFalse(invoice_invoicing.checked)
+        self.assertEqual(invoice_invoicing.review_state, 'todo')
+
+    def test_post_move_auto_check_with_auto_post_at_date_accountant(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.auto_post = 'at_date'
+        self.assertFalse(invoice.review_state)
+        with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        self.assertFalse(invoice.review_state)
+
+    def test_post_move_auto_check_with_auto_post_at_date_sales(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.with_user(self.simple_accountman).auto_post = 'at_date'
+        self.assertEqual(invoice.review_state, 'todo')
+        with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        self.assertEqual(invoice.review_state, 'todo')
+
+    def test_post_move_auto_check_with_auto_post_at_date_sales_prereviewed(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.with_user(self.simple_accountman).auto_post = 'at_date'
+        self.assertEqual(invoice.review_state, 'todo')
+        invoice.review_state = 'reviewed'
+        with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        self.assertEqual(invoice.review_state, 'reviewed')
+
+    def test_post_move_auto_check_with_auto_post_monthly_accountant(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.auto_post = 'monthly'
+        self.assertFalse(invoice.review_state)
+        with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        self.assertFalse(invoice.review_state)
+        last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc')
+        self.assertFalse(last_recurring.review_state)
+
+    def test_post_move_auto_check_with_auto_post_monthly_sales(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.with_user(self.simple_accountman).auto_post = 'monthly'
+        self.assertEqual(invoice.review_state, 'todo')
+        with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        self.assertEqual(invoice.review_state, 'todo')
+        last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc')
+        self.assertEqual(last_recurring.review_state, 'todo')
+
+    def test_post_move_auto_check_with_auto_post_monthly_sales_prereviewed(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.with_user(self.simple_accountman).auto_post = 'monthly'
+        self.assertEqual(invoice.review_state, 'todo')
+        invoice.review_state = 'reviewed'
+        with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        self.assertEqual(invoice.review_state, 'reviewed')
+        last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc')
+        self.assertEqual(last_recurring.review_state, 'reviewed')
 
-    def test_post_move_auto_check_with_auto_post(self):
-        if 'accountant' not in self.env["ir.module.module"]._installed():
-            self.skipTest('accountant is not installed')
-        invoice = self._create_invoice(auto_post='at_date', date=fields.Date.today())
-        self.assertFalse(invoice.checked)
+    def test_post_move_auto_check_with_auto_post_monthly_sales_postreviewed(self):
+        invoice = self._create_invoice(date=fields.Date.today())
+        invoice.with_user(self.simple_accountman).auto_post = 'monthly'
+        self.assertEqual(invoice.review_state, 'todo')
         with freeze_time(invoice.date + relativedelta(days=1)), self.enter_registry_test_mode():
             self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
-        self.assertTrue(invoice.checked)
+        invoice.review_state = 'reviewed'
+        last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc')
+        self.assertEqual(last_recurring.review_state, 'todo')
+        last_recurring.review_state = 'reviewed'
+        with freeze_time(invoice.date + relativedelta(days=1, months=1)), self.enter_registry_test_mode():
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+        last_recurring = self.env['account.move'].search([('auto_post_origin_id', '=', invoice.id)], limit=1, order='date desc')
+        self.assertEqual(last_recurring.review_state, 'reviewed')
 
     def test_create_statement_line_auto_check(self):
         """Test if a user changes the reconciliation on a st_line, it marks the bank move as 'To Review'"""
-        if 'accountant' not in self.env["ir.module.module"]._installed():
-            self.skipTest('accountant is not installed')
         payment = self.env['account.payment'].create({
             'payment_type': 'inbound',
             'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id,
@@ -76,6 +144,6 @@ def test_create_statement_line_auto_check(self):
             'amount': -100,
         }])
         bank_line_1._try_auto_reconcile_statement_lines()
-        self.assertTrue(bank_line_1.move_id.checked)
+        self.assertFalse(bank_line_1.move_id.review_state)
         with self.assertRaisesRegex(ValidationError, 'Validated entries can only be changed by your accountant.'):
             bank_line_1.with_user(self.simple_accountman).delete_reconciled_line(payment.move_id.line_ids[0].id)
diff --git a/addons/account/tests/test_audit_trail.py b/addons/account/tests/test_audit_trail.py
index f1e163d610b6e..d99ed937dd57e 100644
--- a/addons/account/tests/test_audit_trail.py
+++ b/addons/account/tests/test_audit_trail.py
@@ -86,11 +86,11 @@ def test_content(self):
         self.assertTrail(self.get_trail(self.move), messages)
 
         self.move.action_post()
-        messages.append("Updated\nFalse ⇨ True (Reviewed)\nFalse ⇨ MISC/2021/04/0001 (Number)\nDraft ⇨ Posted (Status)")
+        messages.append("Updated\nFalse ⇨ MISC/2021/04/0001 (Number)\nDraft ⇨ Posted (Status)")
         self.assertTrail(self.get_trail(self.move), messages)
 
         self.move.button_draft()
-        messages.append("Updated\nTrue ⇨ False (Reviewed)\nPosted ⇨ Draft (Status)")
+        messages.append("Updated\nPosted ⇨ Draft (Status)")
         self.assertTrail(self.get_trail(self.move), messages)
 
         self.move.name = "nawak"
diff --git a/addons/account/tests/test_kpi_provider.py b/addons/account/tests/test_kpi_provider.py
index 924367e6d8284..fd229d7120431 100644
--- a/addons/account/tests/test_kpi_provider.py
+++ b/addons/account/tests/test_kpi_provider.py
@@ -70,12 +70,12 @@ def test_kpi_summary_reports_posted_but_to_check_moves(self):
             'move_type': 'out_invoice',
         })
         move.action_post()
-        move.checked = False
+        move.review_state = 'todo'
         self.assertCountEqual(self.env['kpi.provider'].get_account_kpi_summary(), [
             {'id': 'account_journal_type.sale', 'name': 'Sales', 'type': 'integer', 'value': 1},
         ])
 
-        move.button_set_checked()
+        move.set_moves_checked()
         self.assertCountEqual(self.env['kpi.provider'].get_account_kpi_summary(), [])
 
     def test_kpi_summary_reports_unreconciled_bank_statements(self):
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 0716d50a7d8af..16810abe02a51 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -205,8 +205,8 @@
                     </groupby>
                     <groupby name="move_id">
                         <button name="action_post" type="object" string="Post" class="btn-primary" invisible="state != 'draft'" groups="account.group_account_user"/>
-                        <button name="set_moves_checked" type="object" string="Review" class="btn-primary" invisible="checked" groups="account.group_account_user"/>
-                        <button name="edit_move" type="edit" icon="fa-edit" string="Edit"/>
+                        <button name="set_moves_checked" type="object" string="Review" class="btn-primary" invisible="state != 'posted' or review_state not in ('todo', 'anomaly')" groups="account.group_account_user"/>
+                        <button name="edit_move" type="edit"/>
                     </groupby>
                 </list>
             </field>
@@ -330,7 +330,7 @@
                     <filter name="not_secured" string="Not Secured" domain="[('move_id.secured', '=', False), ('move_id.state', '=', 'posted')]"
                             groups="account.group_account_secured,base.group_no_one"/>
                     <separator/>
-                    <filter string="To Review" name="to_check" domain="[('move_id.checked', '=', False), ('parent_state', '!=', 'draft')]"/>
+                    <filter string="To Review" name="to_check" domain="[('move_id.review_state', 'in', ('todo', 'anomaly'))]"/>
                     <separator/>
                     <filter string="Unreconciled"
                             domain="[('balance', '!=', 0), ('account_id.reconcile', '=', True), '|', ('matching_number', '=', False), ('matching_number', '=like', 'P%')]"
@@ -473,13 +473,22 @@
                     <field name="made_sequence_gap" column_invisible="True"/>
                     <field name="invoice_date" string="Invoice Date" optional="hide" readonly="state != 'draft'"/>
                     <field name="date" readonly="state in ['cancel', 'posted']"/>
-                    <field name="name" decoration-danger="made_sequence_gap and state == 'posted'" widget="char_with_placeholder_field_to_check" placeholder="/" readonly="state != 'draft'"/>
-                    <field name="checked" column_invisible="True" groups="account.group_account_user"/> <!-- To be used for Reviewed badge display, see char_with_placeholder_field_to_check -->
+                    <field name="name" decoration-danger="made_sequence_gap and state == 'posted'" widget="char_with_placeholder_field" placeholder="/" readonly="state != 'draft'"/>
                     <field name="partner_id" optional="show" readonly="state != 'draft'"/>
                     <field name="ref" optional="show"/>
                     <field name="journal_id"/>
                     <field name="company_id" groups="base.group_multi_company" optional="show"/>
                     <field name="amount_total_signed" sum="Total Amount" string="Total" decoration-bf="1"/>
+                    <field name="review_state" optional="hide" groups="account.group_account_user"
+                           widget="account_review_state_selection_badge"
+                           class="o_account_review_state_selection_badge_audit_list"
+                           options="{
+                               False: {'can_edit': 'account.group_account_user,account.group_account_manager'},
+                               'todo': {'decoration': 'info'},
+                               'reviewed': {'decoration': 'success'},
+                               'supervised': {'decoration': 'success', 'can_edit': 'account.group_account_manager'},
+                               'anomaly': {'decoration': 'danger'},
+                           }"/>
                     <field name="state" widget="badge" decoration-info="state == 'draft'" decoration-success="state == 'posted'"/>
                     <field name="currency_id" column_invisible="True" readonly="state in ['cancel', 'posted']"/>
                     <field name="activity_ids" widget="list_activity" optional="hide"/>
@@ -508,6 +517,7 @@
                       decoration-info="state == 'draft'"
                       decoration-muted="state == 'cancel'"
                       expand="context.get('expand', False)"
+                      multi_edit="1"
                       sample="1">
                     <header>
                         <button name="action_force_register_payment" type="object" string="Pay"
@@ -516,8 +526,7 @@
                     </header>
                     <field name="made_sequence_gap" column_invisible="True"/>
                     <field name="duplicated_ref_ids" column_invisible="True"/>  <!-- Needed for custome view account_tree-->
-                    <field name="name" decoration-bf="1" decoration-danger="made_sequence_gap and state == 'posted'" widget="char_with_placeholder_field_to_check" placeholder="/"/>
-                    <field name="checked" column_invisible="True" groups="account.group_account_user"/> <!-- To be used for Reviewed badge display, see char_with_placeholder_field_to_check -->
+                    <field name="name" decoration-bf="1" decoration-danger="made_sequence_gap and state == 'posted'" widget="char_with_placeholder_field" placeholder="/"/>
                     <field name="invoice_partner_display_name" column_invisible="context.get('default_move_type') not in ('in_invoice', 'in_refund', 'in_receipt')" groups="base.group_user" string="Vendor" />
                     <field name="invoice_partner_display_name" column_invisible="context.get('default_move_type') not in ('out_invoice', 'out_refund', 'out_receipt')" groups="base.group_user" string="Customer" />
                     <field name="invoice_date" optional="show" column_invisible="context.get('default_move_type') not in ('in_invoice', 'in_refund', 'in_receipt')" readonly="state != 'draft'" string="Bill Date" decoration-warning="abnormal_date_warning"/>
@@ -537,6 +546,16 @@
                     <field name="amount_residual_signed" string="Amount Due" sum="Amount Due" optional="hide"/>
                     <field name="currency_id" optional="hide" readonly="state in ['cancel', 'posted']"/>
                     <field name="company_currency_id" column_invisible="True"/>
+                    <field name="review_state" optional="hide" groups="account.group_account_user"
+                           widget="account_review_state_selection_badge"
+                           class="o_account_review_state_selection_badge_audit_list"
+                           options="{
+                               False: {'can_edit': 'account.group_account_user,account.group_account_manager'},
+                               'todo': {'decoration': 'info'},
+                               'reviewed': {'decoration': 'success'},
+                               'supervised': {'decoration': 'success', 'can_edit': 'account.group_account_manager'},
+                               'anomaly': {'decoration': 'danger'},
+                           }"/>
                     <field name="status_in_payment"
                            string="Status"
                            widget="badge"
@@ -656,13 +675,13 @@
             <field name="arch" type="xml">
                 <kanban class="o_kanban_mobile" sample="1" js_class="account_documents_kanban">
                     <field name="currency_id"/>
-                    <field name="checked"/>
+                    <field name="review_state"/>
                     <templates>
                         <t t-name="card">
                             <div class="d-flex align-items-baseline mb-2">
                                 <field name="partner_id" class="fw-bolder fs-5 me-2" invisible="not partner_id" readonly="state != 'draft'"/>
                                 <field name="journal_id" class="fw-bolder fs-5 me-2" invisible="partner_id"/>
-                                <div invisible="checked or state != 'posted'" groups="account.group_account_user">
+                                <div invisible="review_state not in ('todo', 'anomaly') or state != 'posted'" groups="account.group_account_user">
                                     <span class="badge text-bg-info">
                                         To Review
                                     </span>
@@ -772,13 +791,18 @@
                                 invisible="state != 'posted' or show_reset_to_draft_button or not need_cancel_request"
                                 data-hotkey="w"/>
                         <!-- Review button -->
-                        <button name="button_set_checked"
-                                class="btn btn-info"
-                                type="object"
-                                string="Reviewed"
-                                invisible="state != 'posted' or checked"
-                                groups="account.group_account_user"/>
-
+                        <field name="review_state"
+                               widget="account_review_state_selection_badge"
+                               options="{
+                                   False: {'can_edit': 'account.group_account_user,account.group_account_manager'},
+                                   'todo': {'decoration': 'info'},
+                                   'reviewed': {'decoration': 'success'},
+                                   'supervised': {'decoration': 'success', 'can_edit': 'account.group_account_manager'},
+                                   'anomaly': {'decoration': 'danger'},
+                               }"
+                               class="ms-auto me-2 align-self-center"
+                               invisible="state != 'posted'"
+                               groups="account.group_account_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted"
                                groups="!account.group_account_secured"/>
                         <field name="state" widget="account_move_statusbar_secured" statusbar_visible="draft,posted"
@@ -1665,7 +1689,7 @@
                             domain="[('move_type', '=', 'out_refund')]"
                     />
                     <separator/>
-                    <filter string="To Review" name="to_check" domain="[('checked', '=', False), ('state', '!=', 'draft')]"/>
+                    <filter string="To Review" name="to_check" domain="[('review_state', 'in', ('todo', 'anomaly'))]"/>
                     <separator/>
                     <!-- not_paid & partial -->
                     <filter name="open" string="To pay" domain="[('state', '=', 'posted'), ('payment_state', 'in', ('not_paid', 'partial'))]"/>
diff --git a/addons/hr_expense/views/account_move_views.xml b/addons/hr_expense/views/account_move_views.xml
index ef240f96f38c1..8c4c43e121831 100644
--- a/addons/hr_expense/views/account_move_views.xml
+++ b/addons/hr_expense/views/account_move_views.xml
@@ -41,7 +41,15 @@
                     <field name="amount_residual_signed" string="Amount Due" sum="Amount Due" optional="hide"/>
                     <field name="currency_id" optional="hide" readonly="state in ['cancel', 'posted']"/>
                     <field name="company_currency_id" column_invisible="True"/>
-                    <field name="checked" optional="hide" widget="boolean_toggle"/>
+                    <field name="review_state" optional="hide" groups="account.group_account_user"
+                           widget="account_review_state_selection_badge"
+                           options="{
+                               False: {'can_edit': 'account.group_account_user,account.group_account_manager'},
+                               'todo': {'decoration': 'info'},
+                               'reviewed': {'decoration': 'success'},
+                               'supervised': {'decoration': 'success', 'can_edit': 'account.group_account_manager'},
+                               'anomaly': {'decoration': 'danger'},
+                           }"/>
                     <field name="status_in_payment"
                            string="Status"
                            widget="badge"
diff --git a/addons/web/static/src/core/py_js/py_parser.js b/addons/web/static/src/core/py_js/py_parser.js
index d5321d0f514c7..8ecd64ac41342 100644
--- a/addons/web/static/src/core/py_js/py_parser.js
+++ b/addons/web/static/src/core/py_js/py_parser.js
@@ -197,7 +197,9 @@ function parsePrefix(current, tokens) {
                     while (tokens[0] && !isSymbol(tokens[0], "}")) {
                         const key = _parse(tokens, 0);
                         if (
-                            (key.type !== 1 /* String */ && key.type !== 0) /* Number */ ||
+                            (key.type !== 1 /* String */ &&
+                                key.type !== 2 /* Boolean */ &&
+                                key.type !== 0) /* Number */ ||
                             !tokens[0] ||
                             !isSymbol(tokens[0], ":")
                         ) {

From fc9675a248308334e7b6567f0ac1041ee9e0396d Mon Sep 17 00:00:00 2001
From: kuay-odoo <kuay@odoo.com>
Date: Tue, 7 Oct 2025 12:04:53 +0530
Subject: [PATCH 401/673] [IMP] hr_skills: improve certifications management
 and company filtering

- Set default focus on 'valid_from' field instead of 'valid_to' when creating
  new certifications.
- Add company column in certifications list view to display employee's company.
- Implement company-based filtering to show only certifications from
  selected companies

task - 5128961

closes odoo/odoo#230234

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_skills/models/hr_employee_skill.py | 1 +
 addons/hr_skills/views/hr_views.xml          | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/hr_skills/models/hr_employee_skill.py b/addons/hr_skills/models/hr_employee_skill.py
index af02b2be10ea9..8eef9e037e3fc 100644
--- a/addons/hr_skills/models/hr_employee_skill.py
+++ b/addons/hr_skills/models/hr_employee_skill.py
@@ -11,6 +11,7 @@ class HrEmployeeSkill(models.Model):
     _rec_name = "skill_id"
 
     employee_id = fields.Many2one('hr.employee', required=True, index=True, ondelete='cascade')
+    company_id = fields.Many2one(related='employee_id.company_id')
 
     def _linked_field_name(self):
         return 'employee_id'
diff --git a/addons/hr_skills/views/hr_views.xml b/addons/hr_skills/views/hr_views.xml
index 3e6e8d47e4ca9..360ee43b02f77 100644
--- a/addons/hr_skills/views/hr_views.xml
+++ b/addons/hr_skills/views/hr_views.xml
@@ -415,7 +415,7 @@
                             context="{'default_skill_type_id': skill_type_id}"/>
                         <label for="valid_from" string="Validity" class="me-1" invisible="not is_certification"/>
                         <div class="d-flex flex-row" invisible="not is_certification">
-                            <field name="valid_from" nolabel="1" class="w-25" required="is_certification"/>
+                            <field name="valid_from" nolabel="1" class="w-25" required="is_certification" default_focus="1"/>
                             <label for="valid_to" string="To" class="mx-1"/>
                             <field name="valid_to" placeholder="indefinite" nolabel="1" class="w-25"/>
                         </div>
@@ -560,6 +560,7 @@
                 <field name="skill_id" string="Certification"/>
                 <field name="skill_level_id" optional="hide"/>
                 <field name="skill_type_id" optional="hide"/>
+                <field name="company_id" optional="hide"/>
                 <field name="valid_from" string="From" widget="formatted_date" options="{'month_format': 'short'}" width="300"/>
                 <field name="valid_to" string="To" widget="formatted_date" options="{'month_format': 'short'}" width="300"/>
                 <field name="certificate_filename" column_invisible="1"/>
@@ -592,7 +593,7 @@
         <field name="name">Certifications</field>
         <field name="res_model">hr.employee.skill</field>
         <field name="path">certifications</field>
-        <field name="domain">[('is_certification', '=', True)]</field>
+        <field name="domain">[('is_certification', '=', True), ('company_id', 'in', allowed_company_ids)]</field>
         <field name="context">{'show_employee': True}</field>
         <field name="view_mode">list,form</field>
         <field name="view_ids" eval="[(5, 0, 0),

From b97d24d04a1178a85b09647a98d8779cccbf5c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20=28blse=29?= <blse@odoo.com>
Date: Thu, 23 Oct 2025 14:58:07 +0200
Subject: [PATCH 402/673] [IMP] html_builder: allow creation of anchors on
 cards and columns

This commit allows user to create anchors on cards and columns (like
there is on sections).

To achieve this, the selector used to tell whether an anchor is allowed
is extended to accept children of `.row`. The name used as fallback if
there is no title is changed to support the cases where the name of the
block is not given in its dataset, by using the same function that give
the name in the sidebar.

task-5179852

closes odoo/odoo#232868

Signed-off-by: Denis Rygaert <dery@odoo.com>
---
 .../static/src/core/anchor/anchor_plugin.js   | 11 +++--
 .../custom_tab/container_buttons.test.js      | 46 +++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/addons/html_builder/static/src/core/anchor/anchor_plugin.js b/addons/html_builder/static/src/core/anchor/anchor_plugin.js
index e2d1d20c87518..baf7af8121c7f 100644
--- a/addons/html_builder/static/src/core/anchor/anchor_plugin.js
+++ b/addons/html_builder/static/src/core/anchor/anchor_plugin.js
@@ -4,11 +4,12 @@ import { browser } from "@web/core/browser/browser";
 import { _t } from "@web/core/l10n/translation";
 import { markup } from "@odoo/owl";
 import { AnchorDialog } from "./anchor_dialog";
-import { getElementsWithOption } from "@html_builder/utils/utils";
+import { getElementsWithOption, getSnippetName } from "@html_builder/utils/utils";
 
-const anchorSelector = ":not(p).oe_structure > *, :not(p)[data-oe-type=html] > *";
+const anchorSelector =
+    ":not(p).oe_structure > *, :not(p)[data-oe-type=html] > *, .row > *, .s_card";
 const anchorExclude =
-    ".modal *, .oe_structure .oe_structure *, [data-oe-type=html] .oe_structure *, .s_popup";
+    ".modal *, .oe_structure .oe_structure *, [data-oe-type=html] .oe_structure *, .s_popup, .carousel *";
 
 export function canHaveAnchor(element) {
     return element.matches(anchorSelector) && !element.matches(anchorExclude);
@@ -63,8 +64,8 @@ export class AnchorPlugin extends Plugin {
     }
 
     createAnchor(element) {
-        const titleEls = element.querySelectorAll("h1, h2, h3, h4, h5, h6");
-        const title = titleEls.length > 0 ? titleEls[0].innerText : element.dataset.name;
+        const title =
+            element.querySelector("h1, h2, h3, h4, h5, h6")?.innerText || getSnippetName(element);
         const anchorName = this.formatAnchor(title);
 
         let n = "";
diff --git a/addons/website/static/tests/builder/custom_tab/container_buttons.test.js b/addons/website/static/tests/builder/custom_tab/container_buttons.test.js
index 9d56302e0bd3f..ed8b7d65a6282 100644
--- a/addons/website/static/tests/builder/custom_tab/container_buttons.test.js
+++ b/addons/website/static/tests/builder/custom_tab/container_buttons.test.js
@@ -189,6 +189,22 @@ test("Use the sidebar 'create anchor' buttons", async () => {
         <section class="third" data-name="Dummy Section" data-snippet="s_dummy">
             <p>test<p>
         </section>
+        <section class="fourth">
+            <p>test<p>
+            <div class="row">
+                <div>column</div>
+            </div>
+        </section>
+        <section class="fifth carousel">
+            <p>test<p>
+            <div class="row">
+                <div>column</div>
+            </div>
+        </section>
+        <section class="sixth">
+            <p>test<p>
+            <div class="s_card" data-name="Card">card</div>
+        </section>
     `;
     await setupWebsiteBuilder(websiteContent);
     const anchorSelector =
@@ -241,6 +257,36 @@ test("Use the sidebar 'create anchor' buttons", async () => {
     await contains(".o_dialog button:contains('Remove')").click();
     expect(":iframe section.third").not.toHaveAttribute("id");
     expect(":iframe section.third").not.toHaveAttribute("data-anchor");
+
+    await contains(notificationCloseSelector).click();
+    // Column without title nor data-name should use the default name for column
+    await contains(":iframe section.fourth div.row div").click();
+    await animationFrame();
+    await contains(
+        ".o_customize_tab .options-container > div:contains('Column') button.oe_snippet_anchor"
+    ).click();
+    await animationFrame();
+    expect(queryText(notificationContentSelector)).toInclude("#Column");
+    await contains(notificationCloseSelector).click();
+    expect(":iframe section.fourth div.row div").toHaveAttribute("id", "Column");
+
+    // Column in carousel does not allow anchor
+    await contains(":iframe section.fifth div.row div").click();
+    await animationFrame();
+    expect(
+        ".o_customize_tab .options-container > div:contains('Column') button.oe_snippet_anchor"
+    ).toHaveCount(0);
+
+    // Card outside a column also support anchor
+    await contains(":iframe section.sixth div").click();
+    await animationFrame();
+    await contains(
+        ".o_customize_tab .options-container > div:contains('Card') button.oe_snippet_anchor"
+    ).click();
+    await animationFrame();
+    expect(queryText(notificationContentSelector)).toInclude("#Card");
+    await contains(notificationCloseSelector).click();
+    expect(":iframe section.sixth div").toHaveAttribute("id", "Card");
 });
 
 test("Clicking on the options container title selects the corresponding element", async () => {

From 5675d0f03cb905af0574f3c15acb2d2eb59ef7c2 Mon Sep 17 00:00:00 2001
From: "Robin Lejeune (role)" <role@odoo.com>
Date: Wed, 15 Oct 2025 15:34:59 +0200
Subject: [PATCH 403/673] [FIX] website_blog, web: use empty alt on author's
 avatar

On blog posts, the `alt` attribute on the author's avatar is the title
of the post. It doesn't make sense and should be empty as it is a
decorative image (see [W3C WAI]).
We could consider writing the author's name in the alt, but as it is
already written right next to the avatar, the image should be considered
decorative.

To make the empty alt appear after QWeb rendering,
`IrQwebFieldImage.record_to_html` must be adapted to allow empty strings
as values.

[W3C WAI]: https://www.w3.org/WAI/tutorials/images/decorative/

task-5187019

closes odoo/odoo#231725

Signed-off-by: Denis Rygaert <dery@odoo.com>
---
 addons/web/models/ir_qweb_fields.py                   | 4 ++--
 addons/website_blog/views/website_blog_components.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/models/ir_qweb_fields.py b/addons/web/models/ir_qweb_fields.py
index a341e7a20fb57..bf7370c412b8b 100644
--- a/addons/web/models/ir_qweb_fields.py
+++ b/addons/web/models/ir_qweb_fields.py
@@ -76,7 +76,7 @@ def record_to_html(self, record, field_name, options):
 
         if options.get('alt-field') and options['alt-field'] in record and record[options['alt-field']]:
             alt = escape(record[options['alt-field']])
-        elif options.get('alt'):
+        elif options.get('alt') is not None:
             alt = options['alt']
         else:
             alt = escape(record.display_name)
@@ -101,7 +101,7 @@ def record_to_html(self, record, field_name, options):
 
         img = ['<img']
         for name, value in atts.items():
-            if value:
+            if value is not None:
                 img.append(' ')
                 img.append(escape(name))
                 img.append('="')
diff --git a/addons/website_blog/views/website_blog_components.xml b/addons/website_blog/views/website_blog_components.xml
index a7424895f1405..a43e57defd427 100644
--- a/addons/website_blog/views/website_blog_components.xml
+++ b/addons/website_blog/views/website_blog_components.xml
@@ -140,7 +140,7 @@
         <div t-if="blog_post.author_avatar"
              t-field="blog_post.author_avatar"
              style="line-height:1"
-             t-options='{"widget": "image", "class": "rounded-circle " + "o_wblog_author_avatar me-1" if hide_date else  "o_wblog_author_avatar_date me-2"}' />
+             t-options='{"widget": "image", "alt": "", "class": "rounded-circle " + "o_wblog_author_avatar me-1" if hide_date else  "o_wblog_author_avatar_date me-2"}' />
         <div t-att-class="not hide_date and 'small fw-bold'" style="line-height:1">
             <span t-if="editable" t-field="blog_post.author_id" t-options='{ "widget": "contact", "fields": ["name"]}'/>
             <span t-else="" t-out="blog_post.author_name"/>

From 93bd4b9de7f3f3b681ee04057a36673847372cdf Mon Sep 17 00:00:00 2001
From: pmah-odoo <pmah@odoo.com>
Date: Wed, 8 Oct 2025 06:49:24 +0000
Subject: [PATCH 404/673] [FIX] mail: prevent traceback when copying invitation
 link from pip window
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, attempting to copy the invitation link from the
PIP (Picture-in-Picture) window resulted in a traceback error due to
the document not being focused.

This commit resolves the issue by ensuring the clipboard's writeText
method is called on the correct clipboard, specifically from the focused
window, i.e., the PIP window’s clipboard.

task-5149370

closes odoo/odoo#234951

X-original-commit: a4154ccd69360fdf37c84270cdab105a5ee546a1
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/discuss/call/common/pip_service.js  |  3 +++
 .../src/discuss/core/common/channel_invitation.js  | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/pip_service.js b/addons/mail/static/src/discuss/call/common/pip_service.js
index a79cab4916a83..4c78d8c4dff18 100644
--- a/addons/mail/static/src/discuss/call/common/pip_service.js
+++ b/addons/mail/static/src/discuss/call/common/pip_service.js
@@ -56,6 +56,9 @@ export const callPipService = {
             get isNativePipAvailable() {
                 return Boolean(window.documentPictureInPicture);
             },
+            get pipWindow() {
+                return pipWindow;
+            },
             state,
             closePip,
             openPip,
diff --git a/addons/mail/static/src/discuss/core/common/channel_invitation.js b/addons/mail/static/src/discuss/core/common/channel_invitation.js
index c1dae3aeebf8b..f7f73936f20c1 100644
--- a/addons/mail/static/src/discuss/core/common/channel_invitation.js
+++ b/addons/mail/static/src/discuss/core/common/channel_invitation.js
@@ -189,8 +189,18 @@ export class ChannelInvitation extends Component {
     }
 
     async onClickCopy(ev) {
-        await navigator.clipboard.writeText(this.props.thread.invitationLink);
-        this.notification.add(_t("Link copied!"), { type: "success" });
+        let notification = _t("Invitation link copied!");
+        let type = "success";
+        const clipboard = this.env.inDiscussCallView?.isPip
+            ? this.rtc.pipService.pipWindow?.navigator.clipboard
+            : navigator.clipboard;
+        try {
+            await clipboard.writeText(this.props.thread.invitationLink);
+        } catch {
+            notification = _t("Invitation link copy failed (Permission denied?)!");
+            type = "danger";
+        }
+        this.notification.add(notification, { type });
     }
 
     async onClickInvite() {

From 80a03f5e3d66913fac9790966801be86c5c13abe Mon Sep 17 00:00:00 2001
From: kawkb <kdeb@odoo.com>
Date: Tue, 16 Sep 2025 13:43:03 +0000
Subject: [PATCH 405/673] [FIX] mrp_subcontracting: make warehouse duplication
 test agnostic to purchase_stock

The test `test_duplicating_warehouses_recreates_their_routes_and_operation_types` was failing with:

    AttributeError: 'stock.warehouse' object has no attribute 'buy_to_resupply'

A recent change added to the test :

    wh_original.buy_to_resupply = False

However, `buy_to_resupply` is defined in `purchase_stock`. When this module is not installed,
the field is absent and the test crashes.

Fix:
    Only assign the field if it exists on stock.warehouse.

RB-232580

closes odoo/odoo#234520

X-original-commit: 66ddf08e7bd3b29f9c67f0ad367b0395a4be9790
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/mrp_subcontracting/tests/test_subcontracting.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mrp_subcontracting/tests/test_subcontracting.py b/addons/mrp_subcontracting/tests/test_subcontracting.py
index 441cde23b59bd..ac4e59e58ff96 100644
--- a/addons/mrp_subcontracting/tests/test_subcontracting.py
+++ b/addons/mrp_subcontracting/tests/test_subcontracting.py
@@ -28,7 +28,9 @@ def test_duplicating_warehouses_recreates_their_routes_and_operation_types(self)
         Not reusing the existing routes and operation types"""
         wh_original = self.env['stock.warehouse'].search([], limit=1)
         wh_copy = wh_original.copy(default={'name': 'Dummy Warehouse (copy)', 'code': 'Dummy'})
-        wh_original.buy_to_resupply = False
+        if 'buy_to_resupply' in wh_original._fields:
+            # If purchase is installed, the buy route would be reused instead of duplicated.
+            wh_original.buy_to_resupply = False
         wh_original.manufacture_to_resupply = False
         # Check if warehouse routes got RECREATED (instead of reused)
         route_types = [

From b43d4e90135984cf8ddbf95ce1fbe634dce95464 Mon Sep 17 00:00:00 2001
From: Zelong Lin <zel@odoo.com>
Date: Fri, 7 Nov 2025 12:40:26 +0100
Subject: [PATCH 406/673] [IMP] mail,*: add channel/group owner
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Add a new selection field to store the ownership of a channel.
Owners are set by DB admin or another owner. Owners can assign admin to
channel members.

2. Owners, Admins and DB admin can remove members from the channel.

3. Owner/admin should have a special icon in the member list.

Task-4107790

closes odoo/odoo#177445

Related: odoo/upgrade#6462
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/avatar_card_popover_patch.xml  |   2 +-
 .../tests/test_chatbot_internals.py           |  11 +-
 .../tests/test_get_discuss_channel.py         |   3 +
 addons/mail/controllers/discuss/channel.py    |  31 +++++-
 addons/mail/data/discuss_channel_data.xml     |   1 +
 .../mail/demo/discuss/public_channel_demo.xml |   2 +
 addons/mail/demo/discuss_channel_demo.xml     |   1 +
 addons/mail/models/discuss/bus_sync_mixin.py  |  37 ++++---
 addons/mail/models/discuss/discuss_channel.py |  75 +++++++++----
 .../models/discuss/discuss_channel_member.py  |  40 ++++++-
 addons/mail/security/mail_security.xml        |  46 ++++++++
 .../core/common/channel_member_list.xml       |   2 +
 .../core/common/channel_member_model.js       |  12 +++
 .../core/common/message_model_patch.js        |   9 ++
 .../core/web/channel_member_list_patch.js     |   1 +
 .../web/avatar_card/avatar_card_popover.js    | 101 +++++++++++++++++-
 .../web/avatar_card/avatar_card_popover.xml   |  25 ++++-
 .../tests/discuss/test_discuss_channel.py     |   2 +
 .../avatar_card_resource_popover.js           |   1 +
 .../tests/test_performance.py                 |  19 ++++
 .../tests/test_livechat_basic_flow.py         |   3 +
 21 files changed, 380 insertions(+), 44 deletions(-)

diff --git a/addons/hr_holidays/static/src/avatar_card_popover_patch.xml b/addons/hr_holidays/static/src/avatar_card_popover_patch.xml
index e3bdb6c923c78..8376ba80b2745 100644
--- a/addons/hr_holidays/static/src/avatar_card_popover_patch.xml
+++ b/addons/hr_holidays/static/src/avatar_card_popover_patch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
     <t t-inherit="mail.AvatarCardPopover" t-inherit-mode="extension">
-        <xpath expr="//span[hasclass('o-mail-avatar-card-name')]" position="after">
+        <xpath expr="//div[hasclass('o-mail-avatar-card-name-actions')]" position="after">
             <span t-if="partner?.outOfOfficeDateEndText" class="text-warning me-1 smaller fw-bold opacity-75" t-esc="partner.outOfOfficeDateEndText"/>
         </xpath>
     </t>
diff --git a/addons/im_livechat/tests/test_chatbot_internals.py b/addons/im_livechat/tests/test_chatbot_internals.py
index d76acf47bcab4..1fa1633ac714a 100644
--- a/addons/im_livechat/tests/test_chatbot_internals.py
+++ b/addons/im_livechat/tests/test_chatbot_internals.py
@@ -158,6 +158,7 @@ def test_forward_to_specific_operator(self):
             lambda m: m.partner_id == self.chatbot_script.operator_partner_id
         )
         member_bot_data = {
+            "channel_role": False,
             "create_date": fields.Datetime.to_string(member_bot.create_date),
             "fetched_message_id": False,
             "id": member_bot.id,
@@ -284,6 +285,7 @@ def get_forward_op_bus_params():
                             "discuss.channel": [{"id": discuss_channel.id, "member_count": 3}],
                             "discuss.channel.member": [
                                 {
+                                    "channel_role": False,
                                     "create_date": fields.Datetime.to_string(
                                         member_emp.create_date
                                     ),
@@ -326,11 +328,16 @@ def get_forward_op_bus_params():
                         "payload": {
                             "discuss.channel": [
                                 {
-                                    "channel_member_ids": [["DELETE", [member_bot.id]]],
                                     "id": discuss_channel.id,
                                     "member_count": 2,
                                 }
-                            ]
+                            ],
+                            "discuss.channel.member": [
+                                {
+                                    "_DELETE": True,
+                                    "id": member_bot.id,
+                                }
+                            ],
                         },
                     },
                     {
diff --git a/addons/im_livechat/tests/test_get_discuss_channel.py b/addons/im_livechat/tests/test_get_discuss_channel.py
index 575012eadc257..3016567f36ea0 100644
--- a/addons/im_livechat/tests/test_get_discuss_channel.py
+++ b/addons/im_livechat/tests/test_get_discuss_channel.py
@@ -184,6 +184,7 @@ def test_channel_get_livechat_visitor_info(self):
                     "partner_id": operator.partner_id.id,
                     "seen_message_id": False,
                     "channel_id": {"id": channel_info["id"], "model": "discuss.channel"},
+                    "channel_role": False,
                 },
                 {
                     "create_date": fields.Datetime.to_string(visitor_member.create_date),
@@ -203,6 +204,7 @@ def test_channel_get_livechat_visitor_info(self):
                     "seen_message_id": False,
                     "unpin_dt": False,
                     "channel_id": {"id": channel_info["id"], "model": "discuss.channel"},
+                    "channel_role": False,
                 },
             ],
         )
@@ -276,6 +278,7 @@ def test_channel_get_livechat_visitor_info(self):
                     "seen_message_id": False,
                     "unpin_dt": fields.Datetime.to_string(operator_member.unpin_dt),
                     "channel_id": {"id": channel_info["id"], "model": "discuss.channel"},
+                    "channel_role": False,
                 },
             ],
         )
diff --git a/addons/mail/controllers/discuss/channel.py b/addons/mail/controllers/discuss/channel.py
index 1cab8034a18bb..1080374b111cc 100644
--- a/addons/mail/controllers/discuss/channel.py
+++ b/addons/mail/controllers/discuss/channel.py
@@ -6,7 +6,8 @@
 from odoo import http
 from odoo.http import request
 from odoo.addons.mail.controllers.webclient import WebclientController
-from odoo.addons.mail.tools.discuss import add_guest_to_context, Store
+from odoo.addons.mail.tools.discuss import Store, add_guest_to_context
+from odoo.exceptions import AccessError
 
 
 class DiscussChannelWebclientController(WebclientController):
@@ -226,3 +227,31 @@ def discuss_delete_sub_channel(self, sub_channel_id):
         channel.parent_channel_id.message_post(body=body, subtype_xmlid="mail.mt_comment")
         # sudo: discuss.channel - skipping ACL for users who created the thread
         channel.sudo().unlink()
+
+    @http.route("/discuss/channel/remove_member", methods=["POST"], type="jsonrpc", auth="public")
+    def discuss_channel_remove_member(self, member_id):
+        channel_member = request.env["discuss.channel.member"].search([("id", "=", member_id)])
+        if not channel_member:
+            raise NotFound()
+        channel_member.unlink()
+
+    @http.route("/discuss/channel/member/set_role", methods=["POST"], type="jsonrpc", auth="public")
+    def discuss_channel_set_channel_member_role(self, member_id, channel_role):
+        channel_member = request.env["discuss.channel.member"].search([("id", "=", member_id)])
+        if not channel_member:
+            raise NotFound()
+        channel = channel_member.channel_id
+        # sudo: discuss.channel.member - reading channel role of is considered allowed
+        self_channel_role = channel.self_member_id.sudo().channel_role
+        if not self_channel_role == "owner" and not request.env.user.has_group("base.group_system"):
+            raise AccessError(self.env._("Only the channel owner or DB admins can modify member roles."))
+        if (
+            channel_member.sudo().channel_role == "owner"
+            and channel_member != channel.self_member_id
+            and not request.env.user.has_group("base.group_system")
+        ):
+            raise AccessError(
+                self.env._("Removing ownership from an owner is not allowed. Please contact your DB administrator.")
+            )
+        # sudo: discuss.channel.member - writing channel role of a member is considered allowed
+        channel_member.sudo().channel_role = channel_role
diff --git a/addons/mail/data/discuss_channel_data.xml b/addons/mail/data/discuss_channel_data.xml
index 1a3a0c4a51f51..391d202f62e03 100644
--- a/addons/mail/data/discuss_channel_data.xml
+++ b/addons/mail/data/discuss_channel_data.xml
@@ -27,6 +27,7 @@
         <record model="discuss.channel.member" id="channel_member_general_channel_for_admin">
             <field name="partner_id" ref="base.partner_admin"/>
             <field name="channel_id" ref="mail.channel_all_employees"/>
+            <field name="channel_role" eval="'owner'"/>
             <field name="fetched_message_id" ref="mail.module_install_notification"/>
             <field name="is_favorite" eval="True"/>
             <field name="seen_message_id" ref="mail.module_install_notification"/>
diff --git a/addons/mail/demo/discuss/public_channel_demo.xml b/addons/mail/demo/discuss/public_channel_demo.xml
index e3dc03c7f2e5b..a42ccea7f8dd4 100644
--- a/addons/mail/demo/discuss/public_channel_demo.xml
+++ b/addons/mail/demo/discuss/public_channel_demo.xml
@@ -64,6 +64,7 @@
         <record model="discuss.channel.member" id="mail.channel_public_community_member_partner_admin_demo">
             <field name="partner_id" ref="base.partner_admin"/>
             <field name="channel_id" ref="mail.channel_public_community_demo"/>
+            <field name="channel_role" eval="'owner'"/>
             <field name="fetched_message_id" ref="mail.channel_public_community_message_0_demo"/>
             <field name="seen_message_id" ref="mail.channel_public_community_message_0_demo"/>
             <field name="new_message_separator" eval="ref('mail.channel_public_community_message_0_demo') + 1"/>
@@ -71,6 +72,7 @@
         <record model="discuss.channel.member" id="mail.channel_public_community_member_partner_demo_demo">
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="channel_id" ref="mail.channel_public_community_demo"/>
+            <field name="channel_role" eval="'owner'"/>
             <field name="fetched_message_id" ref="mail.channel_public_community_message_2_demo"/>
             <field name="is_favorite" eval="True"/>
             <field name="seen_message_id" ref="mail.channel_public_community_message_2_demo"/>
diff --git a/addons/mail/demo/discuss_channel_demo.xml b/addons/mail/demo/discuss_channel_demo.xml
index da31f6c52c669..f0441d476c551 100644
--- a/addons/mail/demo/discuss_channel_demo.xml
+++ b/addons/mail/demo/discuss_channel_demo.xml
@@ -222,6 +222,7 @@
         <record model="discuss.channel.member" id="mail.admin_member_troubleshooting">
             <field name="partner_id" ref="base.partner_admin"/>
             <field name="channel_id" ref="mail.troubleshooting_sub"/>
+            <field name="channel_role" eval="'owner'"/>
             <field name="fetched_message_id" ref="mail.troubleshooting_message_2"/>
             <field name="seen_message_id" ref="mail.troubleshooting_message_2"/>
             <field name="new_message_separator" eval="ref('mail.troubleshooting_message_2') + 1"/>
diff --git a/addons/mail/models/discuss/bus_sync_mixin.py b/addons/mail/models/discuss/bus_sync_mixin.py
index 3ed7d6d462063..8c47314bfcd0c 100644
--- a/addons/mail/models/discuss/bus_sync_mixin.py
+++ b/addons/mail/models/discuss/bus_sync_mixin.py
@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from collections import defaultdict
-from odoo import models, api
+from odoo import models
 from odoo.addons.web.models.models import lazymapping
 from odoo.addons.mail.tools.discuss import Store
 
@@ -10,15 +10,13 @@ class BusSyncMixin(models.AbstractModel):
     _name = "bus.sync.mixin"
     _description = "Mixin for Bus Sync"
 
-    @api.model
     def _sync_field_names(self):
         """
         Return the field names to sync. Override in specific models.
-        Keys are bus subchannel names, values are lists of field names to sync.
+        Keys are bus subchannel or (main channel_id, subchannel) names, values are lists of field names to sync.
         """
         return defaultdict(list)
 
-    @api.model
     def _sync_extra_field_names(self, target: Store.Target, fields):
         """
         Return the extra field names to sync. Override in specific models.
@@ -46,31 +44,38 @@ def get_field_value(record, field_description):
 
         def get_vals(record):
             """Get the current values of the fields to sync."""
-            return {
-                subchannel: {
+            result = defaultdict(dict)
+            for bus_target, field_descriptions in fields_to_sync.items():
+                target = (
+                    (record[bus_target[0]], bus_target[1])
+                    if isinstance(bus_target, tuple)
+                    else (record._bus_channel(), bus_target)
+                )
+                result[target] = {
                     get_field_name(field_description): (
                         get_field_value(record, field_description),
                         field_description,
                     )
                     for field_description in field_descriptions
                 }
-                for subchannel, field_descriptions in self._sync_field_names().items()
-            }
+            return result
 
+        fields_to_sync = self._sync_field_names()
         old_vals = {record: get_vals(record) for record in self}
         result = super().write(vals)
         stores = lazymapping(lambda param: Store(bus_channel=param[0], bus_subchannel=param[1]))
         for record in self:
-            for subchannel, values in get_vals(record).items():
-                diff = []
+            for (channels, subchannel), values in get_vals(record).items():
+                diff = defaultdict(list)
                 for field_name, (value, field_description) in values.items():
-                    if value != old_vals[record][subchannel][field_name][0]:
-                        diff.append(field_description)
+                    if value != old_vals[record][channels, subchannel][field_name][0]:
+                        diff[channels, subchannel].append(field_description)
                 if diff:
-                    for channel in record._bus_channel():
-                        stores[channel, subchannel].add(record, diff)
-                        if extra_fields := record._sync_extra_field_names(stores[channel, subchannel].target, diff):
-                            stores[channel, subchannel].add(record, extra_fields)
+                    for (channels, subchannel), diff_fields in diff.items():
+                        for channel in channels:
+                            stores[channel, subchannel].add(record, diff_fields)
+                            if extra_fields := record._sync_extra_field_names(stores[channel, subchannel].target, diff_fields):
+                                stores[channel, subchannel].add(record, extra_fields)
         for store in stores.values():
             store.bus_send()
         return result
diff --git a/addons/mail/models/discuss/discuss_channel.py b/addons/mail/models/discuss/discuss_channel.py
index 57dd677a90cd2..bc30a25c813fe 100644
--- a/addons/mail/models/discuss/discuss_channel.py
+++ b/addons/mail/models/discuss/discuss_channel.py
@@ -95,7 +95,7 @@ def _generate_random_token(self):
     call_history_ids = fields.One2many("discuss.call.history", "channel_id")
     is_member = fields.Boolean("Is Member", compute="_compute_is_member", search="_search_is_member", compute_sudo=True)
     # sudo: discuss.channel - sudo for performance, self member can be accessed on accessible channel
-    self_member_id = fields.Many2one("discuss.channel.member", compute="_compute_self_member_id", compute_sudo=True)
+    self_member_id = fields.Many2one("discuss.channel.member", compute="_compute_self_member_id", search="_search_self_member_id", compute_sudo=True)
     # sudo: discuss.channel - sudo for performance, invited members can be accessed on accessible channel
     invited_member_ids = fields.One2many("discuss.channel.member", compute="_compute_invited_member_ids", compute_sudo=True)
     member_count = fields.Integer(string="Member Count", compute='_compute_member_count', compute_sudo=True)
@@ -318,6 +318,13 @@ def _compute_self_member_id(self):
         for channel in self:
             channel.self_member_id = member_by_channel.get(channel)
 
+    def _search_self_member_id(self, operator, operand):
+        if operator == "in":
+            return [("channel_member_ids", "any", [("is_self", "=", True), ("id", "in", operand)])]
+        if operator in ('any', 'any!'):
+            return Domain('channel_member_ids', operator, Domain('is_self', '=', True) & operand)
+        return NotImplemented
+
     @api.depends("channel_member_ids.rtc_inviting_session_id")
     def _compute_invited_member_ids(self):
         members_by_channel = {
@@ -372,7 +379,7 @@ def _compute_invitation_url(self):
 
     @api.model
     def _get_allowed_channel_member_create_params(self):
-        return ["partner_id", "guest_id", "unpin_dt", "last_interest_dt"]
+        return ["channel_role", "partner_id", "guest_id", "unpin_dt", "last_interest_dt"]
 
     @api.model_create_multi
     def create(self, vals_list):
@@ -408,8 +415,19 @@ def create(self, vals_list):
             # is_pinned + ensure they have rights to see channel
             if not self.env.context.get('install_mode') and not self.env.user._is_public():
                 partner_ids_to_add = list(set(partner_ids + [self.env.user.partner_id.id]))
-            vals['channel_member_ids'] = membership_ids_cmd + [
-                (0, 0, {'partner_id': pid})
+            vals["channel_member_ids"] = membership_ids_cmd + [
+                Command.create(
+                    {
+                        "partner_id": pid,
+                        "channel_role": (
+                            "owner"
+                            if vals.get("channel_type") in ["channel", "group"]
+                            and pid == self.env.user.partner_id.id
+                            and not self.env.user._is_public()
+                            else None
+                        ),
+                    }
+                )
                 for pid in partner_ids_to_add if pid not in membership_pids
             ]
 
@@ -457,6 +475,20 @@ def write(self, vals):
                         channels=failing_channels.mapped("name"),
                     )
                 )
+        if "active" in vals:
+            if channels_to_check := self.filtered(lambda channel: channel.active != vals["active"]):
+                if failing_channels := channels_to_check.filtered(
+                    lambda channel: channel.channel_type in ["channel", "group"]
+                    and channel.self_member_id.channel_role != "owner"
+                    and not self.env.user.has_group("base.group_system")
+                ):
+                    raise UserError(
+                        self.env._(
+                            "Cannot change the active state of the following channels: %(channels)s. "
+                            "You must be the owner or a system administrator to change it.",
+                            channels=", ".join(failing_channels.mapped("name")),
+                        )
+                    )
         result = super().write(vals)
         if vals.get('group_ids'):
             self._subscribe_users_automatically()
@@ -549,13 +581,6 @@ def _action_unfollow(self, partner=None, guest=None, post_leave_message=True):
                 body=notification, subtype_xmlid="mail.mt_comment", author_id=partner.id
             )
         member.unlink()
-        Store(bus_channel=self).add(
-            self,
-            [
-                Store.Many("channel_member_ids", [], mode="DELETE", value=member),
-                "member_count",
-            ],
-        ).bus_send()
 
     def add_members(
         self, partner_ids=None, guest_ids=None, invite_to_rtc_call=False, post_joined_message=True
@@ -1185,7 +1210,9 @@ def _to_store_defaults(self, target: Store.Target):
         # (through inverse of channels_with_all_members.channel_member_ids), so the ORM will only
         # prefetch all fields for members with unknown channel_id. The following line force a
         # single fetch for all fields of all members.
-        all_members.mapped("create_date")  # any field in table will do except channel_id
+        # sudo : discuss.channel.member - prefetching member fields as sudo is acceptable,
+        # and its necessary to get channel_role in the same query as the other fields
+        all_members.sudo().mapped("create_date")  # any field in table will do except channel_id
         # prefetch in batch, including nested relations (member, guest, ...)
         Store(bus_channel=target.channel, bus_subchannel=target.subchannel).add(all_members)
         # sudo: bus.bus: reading non-sensitive last id
@@ -1466,12 +1493,24 @@ def _create_group(self, partners_to, default_display_mode=False, name=''):
             :rtype: dict
         """
         partners_to = OrderedSet(partners_to)
-        channel = self.create({
-            'channel_member_ids': [Command.create({'partner_id': partner_id}) for partner_id in partners_to],
-            'channel_type': 'group',
-            'default_display_mode': default_display_mode,
-            'name': name,
-        })
+        channel = self.create(
+            {
+                "channel_member_ids": [
+                    Command.create(
+                        {
+                            "partner_id": partner_id,
+                            "channel_role": "owner"
+                            if partner_id == self.env.user.partner_id.id and not self.env.user._is_public()
+                            else None,
+                        }
+                    )
+                    for partner_id in partners_to
+                ],
+                "channel_type": "group",
+                "default_display_mode": default_display_mode,
+                "name": name,
+            }
+        )
         channel._broadcast(channel.channel_member_ids.partner_id.ids)
         return channel
 
diff --git a/addons/mail/models/discuss/discuss_channel_member.py b/addons/mail/models/discuss/discuss_channel_member.py
index 236ae1e7cacc1..f9e1393684437 100644
--- a/addons/mail/models/discuss/discuss_channel_member.py
+++ b/addons/mail/models/discuss/discuss_channel_member.py
@@ -8,6 +8,7 @@
 
 from odoo import api, fields, models, _
 from odoo.addons.mail.tools.discuss import Store
+from odoo.addons.web.models.models import lazymapping
 from odoo.addons.mail.tools.web_push import PUSH_NOTIFICATION_ACTION, PUSH_NOTIFICATION_TYPE
 from odoo.exceptions import AccessError, UserError, ValidationError
 from odoo.fields import Domain
@@ -32,6 +33,13 @@ class DiscussChannelMember(models.Model):
     is_self = fields.Boolean(compute="_compute_is_self", search="_search_is_self")
     # channel
     channel_id = fields.Many2one("discuss.channel", "Channel", ondelete="cascade", required=True, bypass_search_access=True)
+    channel_role = fields.Selection(
+        [("owner", "Owner"), ("admin", "Admin")],
+        default=None,
+        string="Channel Role",
+        help="The role of the member in the channel. The owner can add and remove admins. The owner and admins can edit the channel and its members.",
+        groups="base.group_system",
+    )
     # state
     custom_channel_name = fields.Char('Custom channel name')
     fetched_message_id = fields.Many2one('mail.message', string='Last Fetched', index="btree_not_null")
@@ -90,6 +98,18 @@ def _contrains_no_public_member(self):
             if any(user._is_public() for user in member.partner_id.user_ids):
                 raise ValidationError(_("Channel members cannot include public users."))
 
+    @api.constrains("channel_role", "channel_id")
+    def _check_channel_role_supported(self):
+        for member in self:
+            if member.channel_role and member.channel_id.channel_type not in ["group", "channel"]:
+                raise ValidationError(
+                    _(
+                        "The role '%(role_name)s' is not supported for the channel type '%(channel_type)s'.",
+                        role_name=member.channel_role,
+                        channel_type=member.channel_id.channel_type,
+                    )
+                )
+
     @api.depends_context("uid", "guest")
     def _compute_is_self(self):
         if not self:
@@ -235,9 +255,12 @@ def write(self, vals):
                     raise AccessError(_('You can not write on %(field_name)s.', field_name=field_name))
         return super().write(vals)
 
-    @api.model
     def _sync_field_names(self):
         res = super()._sync_field_names()
+        res["channel_id", None] = [
+            # sudo: discuss.channel.member - reading channel ownership related to a member is considered acceptable
+            Store.Attr("channel_role", sudo=True),
+        ]
         res[None] += [
             "custom_channel_name",
             "custom_notifications",
@@ -256,7 +279,6 @@ def _sync_field_names(self):
         ]
         return res
 
-    @api.model
     def _sync_extra_field_names(self, target: Store.Target, fields):
         res = super()._sync_extra_field_names(target, fields)
         res += [
@@ -291,16 +313,24 @@ def unlink(self):
         name_members_by_channel = {
             channel: channel.channel_name_member_ids for channel in self.channel_id
         }
+        members_by_channel = {
+            channel: self.filtered(lambda m: m.channel_id == channel) for channel in self.channel_id
+        }
         res = super().unlink()
+        stores = lazymapping(lambda channel: Store(bus_channel=channel))
         for channel, members in name_members_by_channel.items():
             # sudo - discuss.channel: updating channel names according to members is allowed,
             # even after the member left the channel.
             channel_sudo = channel.sudo()
             if channel_sudo.channel_name_member_ids != members:
-                Store(bus_channel=channel).add(
+                stores[channel].add(
                     channel_sudo,
                     Store.Many("channel_name_member_ids", sort="id"),
-                ).bus_send()
+                )
+        for channel, members in members_by_channel.items():
+            stores[channel].delete(members).add(channel, ["member_count"])
+        for store in stores.values():
+            store.bus_send()
         return res
 
     def _bus_channel(self):
@@ -353,6 +383,8 @@ def _to_store_persona(self, target: Store.Target, fields=None):
 
     def _to_store_defaults(self, target):
         return [
+            # sudo: discuss.channel.member - reading channel ownership related to a member is considered acceptable
+            Store.Attr("channel_role", sudo=True),
             Store.One("channel_id", [], as_thread=True),
             "create_date",
             "fetched_message_id",
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 0219605e445b1..c558caf4b3c15 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -96,6 +96,52 @@
             <field name="perm_unlink" eval="False"/>
         </record>
 
+        <record id="ir_rule_discuss_channel_member_is_channel_owner_unlink" model="ir.rule">
+            <field name="name">discuss.channel.member: channel owner can remove members except owners</field>
+            <field name="model_id" ref="mail.model_discuss_channel_member"/>
+            <field name="groups"
+                eval="[
+                    Command.link(ref('base.group_user')),
+                    Command.link(ref('base.group_portal')),
+                    Command.link(ref('base.group_public')),
+                ]"
+            />
+            <field name="domain_force">
+                [
+                    ("channel_id.self_member_id.channel_role", "=", "owner"),
+                    ("channel_role", "!=", "owner"),
+                    "|",
+                        ("channel_id.channel_type", "=", "channel"),
+                        ("channel_id.channel_type", "=", "group"),
+                ]
+            </field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+        </record>
+        <record id="ir_rule_discuss_channel_member_is_channel_admin_unlink" model="ir.rule">
+            <field name="name">discuss.channel.member: channel admin can remove members except admins and owners</field>
+            <field name="model_id" ref="mail.model_discuss_channel_member"/>
+            <field name="groups"
+                eval="[
+                    Command.link(ref('base.group_user')),
+                    Command.link(ref('base.group_portal')),
+                    Command.link(ref('base.group_public')),
+                ]"
+            />
+            <field name="domain_force">
+                [
+                    ("channel_id.self_member_id.channel_role", "=", "admin"),
+                    ("channel_role", "=", False),
+                    "|",
+                        ("channel_id.channel_type", "=", "channel"),
+                        ("channel_id.channel_type", "=", "group"),
+                ]
+            </field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+        </record>
         <record id="ir_rule_discuss_channel_member_create_is_group_matching_all" model="ir.rule">
             <field name="name">discuss.channel.member: can join group restricted channels when group is matching</field>
             <field name="model_id" ref="mail.model_discuss_channel_member"/>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.xml b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
index 3002da7d0ee8e..3dc90eafcab35 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_list.xml
+++ b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
@@ -43,6 +43,8 @@
             <div t-ref="displayName" class="d-flex overflow-hidden flex-column lh-sm">
                 <span class="ms-2 text-truncate text-muted fw-bold" t-esc="member.name" t-att-title="member.name"/>
             </div>
+            <i t-if="member.channel_role === 'owner'" class="ms-2 fa fa-star text-warning" role="img" title="Channel Owner" aria-label="Channel Owner"/>
+            <i t-if="member.channel_role === 'admin'" class="ms-2 fa fa-star text-primary" role="img" title="Channel Admin" aria-label="Channel Admin"/>
             <span class="ms-auto">
                 <span t-if="member.in(props.thread.invited_member_ids)" class="p-1 oi oi-user-plus opacity-75"/>
                 <span t-if="member.rtcSession?.is_muted and !member.rtcSession?.is_deaf" class="p-1 fa fa-microphone-slash opacity-75"/>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_model.js b/addons/mail/static/src/discuss/core/common/channel_member_model.js
index cf92d189aca6a..1af32383a5b06 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_model.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_model.js
@@ -4,6 +4,7 @@ import { fields, Record } from "@mail/model/export";
 import { browser } from "@web/core/browser/browser";
 import { deserializeDateTime } from "@web/core/l10n/dates";
 import { user } from "@web/core/user";
+import { rpc } from "@web/core/network/rpc";
 
 const { DateTime } = luxon;
 
@@ -47,6 +48,10 @@ export class ChannelMember extends Record {
         return this.partner_id || this.guest_id;
     }
     channel_id = fields.One("discuss.channel", { inverse: "channel_member_ids" });
+    /**
+     * @type {false|"owner"|"admin"}
+     */
+    channel_role;
     threadAsSelf = fields.One("mail.thread", {
         compute() {
             if (this.store.self?.eq(this.persona)) {
@@ -153,6 +158,13 @@ export class ChannelMember extends Record {
               })
             : undefined;
     }
+
+    async setChannelRole(channel_role) {
+        await rpc("/discuss/channel/member/set_role", {
+            member_id: this.id,
+            channel_role,
+        });
+    }
 }
 
 ChannelMember.register();
diff --git a/addons/mail/static/src/discuss/core/common/message_model_patch.js b/addons/mail/static/src/discuss/core/common/message_model_patch.js
index bc407432d69c4..b3a5c6641add9 100644
--- a/addons/mail/static/src/discuss/core/common/message_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/message_model_patch.js
@@ -52,6 +52,15 @@ const messagePatch = {
         });
         this.threadAsFirstUnread = fields.One("mail.thread", { inverse: "firstUnreadMessage" });
     },
+    /**
+     * @override
+     */
+    get allowsEdition() {
+        return (
+            super.allowsEdition ||
+            ["owner", "admin"].includes(this.channel_id?.self_member_id?.channel_role)
+        );
+    },
     /** @returns {import("models").ChannelMember[]} */
     get channelMemberHaveSeen() {
         return this.thread.membersThatCanSeen.filter(
diff --git a/addons/mail/static/src/discuss/core/web/channel_member_list_patch.js b/addons/mail/static/src/discuss/core/web/channel_member_list_patch.js
index 103950dfc66f6..a90d3450498c3 100644
--- a/addons/mail/static/src/discuss/core/web/channel_member_list_patch.js
+++ b/addons/mail/static/src/discuss/core/web/channel_member_list_patch.js
@@ -18,6 +18,7 @@ patch(ChannelMemberList.prototype, {
         if (!this.avatarCard.isOpen) {
             this.avatarCard.open(ev.currentTarget, {
                 id: member.partner_id.main_user_id?.id,
+                channelMember: member,
             });
         }
     },
diff --git a/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js b/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js
index ed2c99711eff6..893ef3583cf0f 100644
--- a/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js
+++ b/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js
@@ -1,13 +1,19 @@
 import { useService } from "@web/core/utils/hooks";
+import { _t } from "@web/core/l10n/translation";
+import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { rpc } from "@web/core/network/rpc";
 import { Component } from "@odoo/owl";
 import { useOpenChat } from "@mail/core/web/open_chat_hook";
 import { ImStatus } from "@mail/core/common/im_status";
 
 export class AvatarCardPopover extends Component {
     static template = "mail.AvatarCardPopover";
-    static components = { ImStatus };
+    static components = { Dropdown, DropdownItem, ImStatus };
     static props = {
         id: { type: Number, required: true },
+        channelMember: { type: Object, optional: true },
         close: { type: Function, required: true },
         model: {
             type: String,
@@ -22,6 +28,7 @@ export class AvatarCardPopover extends Component {
     setup() {
         this.actionService = useService("action");
         this.store = useService("mail.store");
+        this.dialog = useService("dialog");
         this.openChat = useOpenChat(this.props.model);
         this.store.fetchStoreData("avatar_card", {
             id: this.props.id,
@@ -29,6 +36,61 @@ export class AvatarCardPopover extends Component {
         });
     }
 
+    get canOpenSettingMenu() {
+        return (
+            this.canSetAdmin ||
+            this.canRemoveAdmin ||
+            this.canSetOwner ||
+            this.canRemoveOwner ||
+            this.canRemoveMember
+        );
+    }
+
+    get selfChannelRole() {
+        return this.props.channelMember?.channel_id?.self_member_id?.channel_role;
+    }
+
+    get currentChannelRole() {
+        return this.props.channelMember?.channel_role;
+    }
+
+    get canSetAdmin() {
+        return (
+            this.currentChannelRole !== "admin" &&
+            (this.store.self_user?.is_admin ||
+                (this.selfChannelRole === "owner" && this.currentChannelRole !== "owner") ||
+                (this.selfChannelRole === "owner" && this.props.channelMember?.threadAsSelf))
+        );
+    }
+
+    get canRemoveAdmin() {
+        return (
+            this.currentChannelRole === "admin" &&
+            (this.store.self_user?.is_admin || this.selfChannelRole === "owner")
+        );
+    }
+
+    get canSetOwner() {
+        return (
+            this.currentChannelRole !== "owner" &&
+            (this.store.self_user?.is_admin || this.selfChannelRole === "owner")
+        );
+    }
+
+    get canRemoveOwner() {
+        return (
+            this.currentChannelRole === "owner" &&
+            (this.store.self_user?.is_admin || this.props.channelMember?.threadAsSelf)
+        );
+    }
+
+    get canRemoveMember() {
+        return (
+            this.store.self_user?.is_admin ||
+            (this.selfChannelRole && this.currentChannelRole !== "owner")
+        );
+    }
+
     get user() {
         if (this.props.model === "res.users") {
             return this.store["res.users"].get(this.props.id);
@@ -77,6 +139,43 @@ export class AvatarCardPopover extends Component {
         this.props.close();
     }
 
+    onClickRemove() {
+        this.dialog.add(ConfirmationDialog, {
+            body: _t('Do you want to remove "%(member_name)s" from this channel?', {
+                member_name: this.props.channelMember.name,
+            }),
+            cancel: () => {},
+            confirm: () => {
+                rpc("/discuss/channel/remove_member", {
+                    member_id: this.props.channelMember.id,
+                });
+                this.props.close();
+            },
+        });
+    }
+
+    setChannelRole(role) {
+        if (
+            !this.store.self_user?.is_admin &&
+            (this.props.channelMember.threadAsSelf || role === "owner")
+        ) {
+            this.dialog.add(ConfirmationDialog, {
+                body: this.props.channelMember.threadAsSelf
+                    ? _t(
+                          "Do you want to remove owner from yourself? You will no longer have full control over the channel and its settings."
+                      )
+                    : _t(
+                          'Do you want to set "%(member_name)s" as the owner? This means that the member will have full control over the channel and its settings.\n\nThis action cannot be reverted.',
+                          { member_name: this.props.channelMember.name }
+                      ),
+                cancel: () => {},
+                confirm: () => this.props.channelMember.setChannelRole(role),
+            });
+        } else {
+            this.props.channelMember.setChannelRole(role);
+        }
+    }
+
     async onClickViewProfile(newWindow) {
         const action = await this.getProfileAction();
         if (!action) {
diff --git a/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.xml b/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.xml
index f43d9bd9141fe..83fa9164d7a95 100644
--- a/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.xml
+++ b/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.xml
@@ -14,7 +14,30 @@
                         </span>
                     </span>
                     <div class="d-flex flex-column o_card_user_infos overflow-hidden">
-                        <span class="o-mail-avatar-card-name fw-bold" t-if="name" t-esc="name"/>
+                        <div class="o-mail-avatar-card-name-actions d-flex align-items-center justify-content-center">
+                            <span class="o-mail-avatar-card-name fw-bold" t-if="name" t-esc="name"/>
+                            <div class="flex-grow-1"/>
+                            <Dropdown t-if="canOpenSettingMenu" position="'right-start'">
+                                <button class="btn btn-sm">
+                                    <i class="oi oi-ellipsis-v"/>
+                                </button>
+                                <t t-set-slot="content">
+                                    <DropdownItem t-if="canSetAdmin" onSelected="() => this.setChannelRole('admin')">
+                                        Set Channel Admin
+                                    </DropdownItem>
+                                    <DropdownItem t-if="canRemoveAdmin or canRemoveOwner" onSelected="() => this.setChannelRole(false)">
+                                        <t t-if="canRemoveOwner">Remove Channel Owner</t>
+                                        <t t-if="canRemoveAdmin">Remove Channel Admin</t>
+                                    </DropdownItem>
+                                    <DropdownItem t-if="canSetOwner" onSelected="() => this.setChannelRole('owner')">
+                                        Set Channel Owner
+                                    </DropdownItem>
+                                    <DropdownItem t-if="canRemoveMember" onSelected.bind="onClickRemove">
+                                        <span class="text-danger">Remove from Channel</span>
+                                    </DropdownItem>
+                                </t>
+                            </Dropdown>
+                        </div>
                         <t t-if="userInfoTemplate" t-call="{{userInfoTemplate}}"/>
                         <a t-if="email" t-att-href="'mailto:'+email" t-att-title="email" class="text-truncate">
                             <i class="fa fa-fw fa-envelope me-1"/><t t-esc="email"/>
diff --git a/addons/mail/tests/discuss/test_discuss_channel.py b/addons/mail/tests/discuss/test_discuss_channel.py
index 3a08a272f744b..20db915cfc0e2 100644
--- a/addons/mail/tests/discuss/test_discuss_channel.py
+++ b/addons/mail/tests/discuss/test_discuss_channel.py
@@ -151,6 +151,7 @@ def get_add_member_bus():
                             "discuss.channel.member": [
                                 {
                                     "channel_id": {"id": test_group.id, "model": "discuss.channel"},
+                                    "channel_role": False,
                                     "create_date": fields.Datetime.to_string(member.create_date),
                                     "fetched_message_id": False,
                                     "id": member.id,
@@ -197,6 +198,7 @@ def get_add_member_again_bus():
                             "discuss.channel": [{"id": test_group.id, "member_count": 2}],
                             "discuss.channel.member": [
                                 {
+                                    "channel_role": False,
                                     "create_date": fields.Datetime.to_string(member.create_date),
                                     "fetched_message_id": False,
                                     "id": member.id,
diff --git a/addons/resource_mail/static/src/components/avatar_card_resource/avatar_card_resource_popover.js b/addons/resource_mail/static/src/components/avatar_card_resource/avatar_card_resource_popover.js
index a1426c2c117ad..13a23868a4a2e 100644
--- a/addons/resource_mail/static/src/components/avatar_card_resource/avatar_card_resource_popover.js
+++ b/addons/resource_mail/static/src/components/avatar_card_resource/avatar_card_resource_popover.js
@@ -22,6 +22,7 @@ export class AvatarCardResourcePopover extends AvatarCardPopover {
 
     setup() {
         this.orm = useService("orm");
+        this.store = useService("mail.store");
         this.actionService = useService("action");
         this.openChat = useOpenChat("res.users");
         onWillStart(this.onWillStart);
diff --git a/addons/test_discuss_full/tests/test_performance.py b/addons/test_discuss_full/tests/test_performance.py
index 08f7312da6ac8..8e00ceaae6ad5 100644
--- a/addons/test_discuss_full/tests/test_performance.py
+++ b/addons/test_discuss_full/tests/test_performance.py
@@ -921,6 +921,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
         bus_last_id = self.env["bus.bus"].sudo()._bus_last_id()
         if channel == self.channel_general and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -941,6 +942,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_channel_public_1 and partner == self.users[0].partner_id:
             return {
+                "channel_role": "owner",
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -961,6 +963,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_channel_public_2 and partner == self.users[0].partner_id:
             return {
+                "channel_role": "owner",
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -981,6 +984,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_channel_group_1 and partner == self.users[0].partner_id:
             return {
+                "channel_role": "owner",
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1007,6 +1011,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_channel_group_2 and partner == self.users[0].partner_id:
             return {
+                "channel_role": "owner",
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1027,6 +1032,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_group_1 and partner == self.users[0].partner_id:
             return {
+                "channel_role": "owner",
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1047,6 +1053,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_group_1 and partner == self.users[12].partner_id:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_12.create_date),
                 "last_seen_dt": False,
                 "fetched_message_id": False,
@@ -1057,6 +1064,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_1 and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1077,6 +1085,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_1 and partner == self.users[14].partner_id:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_14.create_date),
                 "last_seen_dt": False,
                 "fetched_message_id": False,
@@ -1087,6 +1096,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_2 and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1107,6 +1117,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_2 and partner == self.users[15].partner_id:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_15.create_date),
                 "last_seen_dt": False,
                 "fetched_message_id": False,
@@ -1117,6 +1128,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_3 and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1137,6 +1149,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_3 and partner == self.users[2].partner_id:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_2.create_date),
                 "last_seen_dt": False,
                 "fetched_message_id": False,
@@ -1147,6 +1160,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_4 and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1167,6 +1181,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_chat_4 and partner == self.users[3].partner_id:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_3.create_date),
                 "last_seen_dt": False,
                 "fetched_message_id": False,
@@ -1177,6 +1192,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_livechat_1 and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1198,6 +1214,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_livechat_1 and partner == self.users[1].partner_id:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_1.create_date),
                 "last_seen_dt": fields.Datetime.to_string(member_1.last_seen_dt),
                 "fetched_message_id": last_message.id,
@@ -1209,6 +1226,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_livechat_2 and partner == self.users[0].partner_id:
             return {
+                "channel_role": False,
                 "create_date": member_0_create_date,
                 "custom_channel_name": False,
                 "custom_notifications": False,
@@ -1230,6 +1248,7 @@ def _res_for_member(self, channel, partner=None, guest=None):
             }
         if channel == self.channel_livechat_2 and guest:
             return {
+                "channel_role": False,
                 "create_date": fields.Datetime.to_string(member_g.create_date),
                 "last_seen_dt": fields.Datetime.to_string(member_g.last_seen_dt),
                 "fetched_message_id": last_message.id,
diff --git a/addons/website_livechat/tests/test_livechat_basic_flow.py b/addons/website_livechat/tests/test_livechat_basic_flow.py
index 7180ecf3c6bbf..6cd651a082495 100644
--- a/addons/website_livechat/tests/test_livechat_basic_flow.py
+++ b/addons/website_livechat/tests/test_livechat_basic_flow.py
@@ -234,6 +234,7 @@ def test_channel_visitor_data(self):
                 ),
                 "discuss.channel.member": [
                     {
+                        "channel_role": False,
                         "create_date": fields.Datetime.to_string(operator_member.create_date),
                         "fetched_message_id": False,
                         "id": operator_member.id,
@@ -244,6 +245,7 @@ def test_channel_visitor_data(self):
                         "channel_id": {"id": channel.id, "model": "discuss.channel"},
                     },
                     {
+                        "channel_role": False,
                         "create_date": fields.Datetime.to_string(guest_member.create_date),
                         "fetched_message_id": False,
                         "id": guest_member.id,
@@ -350,6 +352,7 @@ def test_channel_to_store_after_operator_left(self):
             [
                 {
                     "channel_id": {"id": channel.id, "model": "discuss.channel"},
+                    "channel_role": False,
                     "create_date": fields.Datetime.to_string(guest_member.create_date),
                     "custom_channel_name": False,
                     "custom_notifications": False,

From 7cb32012d5866abfc93afa6280a4eb76579ef37e Mon Sep 17 00:00:00 2001
From: "Dylan Kiss (dyki)" <dyki@odoo.com>
Date: Fri, 24 Oct 2025 19:34:40 +0000
Subject: [PATCH 407/673] [I18N] l10n_lu: improve translations

task-5184489

closes odoo/odoo#235004

X-original-commit: 4922622c18f4e9dd635868c05e4b9541aefdc289
Related: odoo/enterprise#99138
Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
Signed-off-by: Dylan Kiss (dyki) <dyki@odoo.com>
---
 addons/l10n_lu/data/tax_report/section_1.xml  |    6 +-
 addons/l10n_lu/data/tax_report/section_2.xml  |   24 +-
 .../l10n_lu/data/tax_report/sections_34.xml   |    6 +-
 addons/l10n_lu/i18n/de.po                     |  384 +++++
 addons/l10n_lu/i18n/fr.po                     |  373 +++++
 addons/l10n_lu/i18n/l10n_lu.pot               |  352 +++++
 addons/l10n_lu/i18n/lb.po                     |  365 +++++
 addons/l10n_lu/i18n_extra/de.po               | 1319 -----------------
 addons/l10n_lu/i18n_extra/fr.po               | 1312 ----------------
 addons/l10n_lu/i18n_extra/l10n_lu.pot         | 1216 ---------------
 addons/l10n_lu/i18n_extra/lb.po               | 1271 ----------------
 11 files changed, 1504 insertions(+), 5124 deletions(-)
 create mode 100644 addons/l10n_lu/i18n/de.po
 create mode 100644 addons/l10n_lu/i18n/fr.po
 create mode 100644 addons/l10n_lu/i18n/l10n_lu.pot
 create mode 100644 addons/l10n_lu/i18n/lb.po
 delete mode 100644 addons/l10n_lu/i18n_extra/de.po
 delete mode 100644 addons/l10n_lu/i18n_extra/fr.po
 delete mode 100644 addons/l10n_lu/i18n_extra/l10n_lu.pot
 delete mode 100644 addons/l10n_lu/i18n_extra/lb.po

diff --git a/addons/l10n_lu/data/tax_report/section_1.xml b/addons/l10n_lu/data/tax_report/section_1.xml
index a2430549699d6..c36a8ce2dc7ee 100644
--- a/addons/l10n_lu/data/tax_report/section_1.xml
+++ b/addons/l10n_lu/data/tax_report/section_1.xml
@@ -2,6 +2,7 @@
 <odoo auto_sequence="1">
     <record id="l10n_lu_tax_report_section_1" model="account.report">
         <field name="name">Section I</field>
+        <field name="name@fr">Section I</field>
         <field name="name@de">Abschnitt I</field>
         <field name="name@lb">Abschnitt I</field>
         <field name="sequence">1</field>
@@ -10,8 +11,9 @@
         <field name="column_ids">
             <record id="tax_report_section_1_balance" model="account.report.column">
                 <field name="name">Balance</field>
-                <field name="name@de">Waage</field>
-                <field name="name@lb">Gläichgewiicht</field>
+                <field name="name@fr">Solde</field>
+                <field name="name@de">Saldo</field>
+                <field name="name@lb">Sold</field>
                 <field name="expression_label">balance</field>
             </record>
         </field>
diff --git a/addons/l10n_lu/data/tax_report/section_2.xml b/addons/l10n_lu/data/tax_report/section_2.xml
index 0e37eaf1b1051..941c1640ca2e5 100644
--- a/addons/l10n_lu/data/tax_report/section_2.xml
+++ b/addons/l10n_lu/data/tax_report/section_2.xml
@@ -2,6 +2,7 @@
 <odoo auto_sequence="1">
     <record id="l10n_lu_tax_report_section_2" model="account.report">
         <field name="name">Section II</field>
+        <field name="name@fr">Section II</field>
         <field name="name@de">Abschnitt II</field>
         <field name="name@lb">Abschnitt II</field>
         <field name="sequence">2</field>
@@ -10,8 +11,9 @@
         <field name="column_ids">
             <record id="tax_report_section_2_balance" model="account.report.column">
                 <field name="name">Balance</field>
-                <field name="name@de">Waage</field>
-                <field name="name@lb">Gläichgewiicht</field>
+                <field name="name@fr">Solde</field>
+                <field name="name@de">Saldo</field>
+                <field name="name@lb">Sold</field>
                 <field name="expression_label">balance</field>
             </record>
         </field>
@@ -33,6 +35,7 @@
                         <field name="children_ids">
                             <record id="account_tax_report_line_2a_base_17" model="account.report.line">
                                 <field name="name">701 - base 17%</field>
+                                <field name="name@fr">701 - base 17%</field>
                                 <field name="name@de">701 - Besteuerungsgrundlage 17%</field>
                                 <field name="name@lb">701 - Basis 17%</field>
                                 <field name="code">LUTAX_701</field>
@@ -47,6 +50,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_16" model="account.report.line">
                                 <field name="name">901 - base 16%</field>
+                                <field name="name@fr">901 - base 16%</field>
                                 <field name="name@de">901 - Besteuerungsgrundlage 16%</field>
                                 <field name="name@lb">901 - Basis 16%</field>
                                 <field name="code">LUTAX_901</field>
@@ -61,6 +65,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_14" model="account.report.line">
                                 <field name="name">703 - base 14%</field>
+                                <field name="name@fr">703 - base 14%</field>
                                 <field name="name@de">703 - Besteuerungsgrundlage 14%</field>
                                 <field name="name@lb">703 - Basis 14%</field>
                                 <field name="code">LUTAX_703</field>
@@ -75,6 +80,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_13" model="account.report.line">
                                 <field name="name">903 - base 13%</field>
+                                <field name="name@fr">903 - base 13%</field>
                                 <field name="name@de">903 - Besteuerungsgrundlage 13%</field>
                                 <field name="name@lb">903 - Basis 13%</field>
                                 <field name="code">LUTAX_903</field>
@@ -89,6 +95,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_8" model="account.report.line">
                                 <field name="name">705 - base 8%</field>
+                                <field name="name@fr">705 - base 8%</field>
                                 <field name="name@de">705 - Besteuerungsgrundlage 8%</field>
                                 <field name="name@lb">705 - Basis 8%</field>
                                 <field name="code">LUTAX_705</field>
@@ -103,6 +110,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_7" model="account.report.line">
                                 <field name="name">905 - base 7%</field>
+                                <field name="name@fr">905 - base 7%</field>
                                 <field name="name@de">905 - Besteuerungsgrundlage 7%</field>
                                 <field name="name@lb">905 - Basis 7%</field>
                                 <field name="code">LUTAX_905</field>
@@ -117,6 +125,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_3" model="account.report.line">
                                 <field name="name">031 - base 3%</field>
+                                <field name="name@fr">031 - base 3%</field>
                                 <field name="name@de">031 - Besteuerungsgrundlage 3%</field>
                                 <field name="name@lb">031 - Basis 3%</field>
                                 <field name="code">LUTAX_031</field>
@@ -131,6 +140,7 @@
                             </record>
                             <record id="account_tax_report_line_2a_base_0" model="account.report.line">
                                 <field name="name">033 - base 0%</field>
+                                <field name="name@fr">033 - base 0%</field>
                                 <field name="name@de">033 - Besteuerungsgrundlage 0%</field>
                                 <field name="name@lb">033 - Basis 0%</field>
                                 <field name="code">LUTAX_033</field>
@@ -269,6 +279,7 @@
                         <field name="children_ids">
                             <record id="account_tax_report_line_2b_base_17" model="account.report.line">
                                 <field name="name">711 - base 17%</field>
+                                <field name="name@fr">711 - base 17%</field>
                                 <field name="name@de">711 - Besteuerungsgrundlage 17%</field>
                                 <field name="name@lb">711 - Basis 17%</field>
                                 <field name="code">LUTAX_711</field>
@@ -283,6 +294,7 @@
                             </record>
                             <record id="account_tax_report_line_2b_base_16" model="account.report.line">
                                 <field name="name">911 - base 16%</field>
+                                <field name="name@fr">911 - base 16%</field>
                                 <field name="name@de">911 - Besteuerungsgrundlage 16%</field>
                                 <field name="name@lb">911 - Basis 16%</field>
                                 <field name="code">LUTAX_911</field>
@@ -297,6 +309,7 @@
                             </record>
                             <record id="account_tax_report_line_2b_base_14" model="account.report.line">
                                 <field name="name">713 - base 14%</field>
+                                <field name="name@fr">713 - base 14%</field>
                                 <field name="name@de">713 - Besteuerungsgrundlage 14%</field>
                                 <field name="name@lb">713 - Basis 14%</field>
                                 <field name="code">LUTAX_713</field>
@@ -311,6 +324,7 @@
                             </record>
                             <record id="account_tax_report_line_2b_base_13" model="account.report.line">
                                 <field name="name">913 - base 13%</field>
+                                <field name="name@fr">913 - base 13%</field>
                                 <field name="name@de">913 - Besteuerungsgrundlage 13%</field>
                                 <field name="name@lb">913 - Basis 13%</field>
                                 <field name="code">LUTAX_913</field>
@@ -325,6 +339,7 @@
                             </record>
                             <record id="account_tax_report_line_2b_base_8" model="account.report.line">
                                 <field name="name">715 - base 8%</field>
+                                <field name="name@fr">715 - base 8%</field>
                                 <field name="name@de">715 - Besteuerungsgrundlage 8%</field>
                                 <field name="name@lb">715 - Basis 8%</field>
                                 <field name="code">LUTAX_715</field>
@@ -339,6 +354,7 @@
                             </record>
                             <record id="account_tax_report_line_2b_base_7" model="account.report.line">
                                 <field name="name">915 - base 7%</field>
+                                <field name="name@fr">915 - base 7%</field>
                                 <field name="name@de">915 - Besteuerungsgrundlage 7%</field>
                                 <field name="name@lb">915 - Basis 7%</field>
                                 <field name="code">LUTAX_915</field>
@@ -353,6 +369,7 @@
                             </record>
                             <record id="account_tax_report_line_2b_base_3" model="account.report.line">
                                 <field name="name">049 - base 3%</field>
+                                <field name="name@fr">049 - base 3%</field>
                                 <field name="name@de">049 - Besteuerungsgrundlage 3%</field>
                                 <field name="name@lb">049 - Basis 3%</field>
                                 <field name="code">LUTAX_049</field>
@@ -1021,6 +1038,7 @@
                         <field name="children_ids">
                             <record id="account_tax_report_line_2e_1_base" model="account.report.line">
                                 <field name="name">436 - base</field>
+                                <field name="name@fr">436 - base</field>
                                 <field name="name@de">436 - Besteuerungsgrundlage</field>
                                 <field name="name@lb">436 - Basis</field>
                                 <field name="code">LUTAX_436</field>
@@ -1150,6 +1168,7 @@
                             </record>
                             <record id="account_tax_report_line_2e_2_base" model="account.report.line">
                                 <field name="name">463 - base</field>
+                                <field name="name@fr">463 - base</field>
                                 <field name="name@de">463 - Besteuerungsgrundlage</field>
                                 <field name="name@lb">463 - Basis</field>
                                 <field name="code">LUTAX_463</field>
@@ -1279,6 +1298,7 @@
                             </record>
                             <record id="account_tax_report_line_2e_3_base" model="account.report.line">
                                 <field name="name">765 - base</field>
+                                <field name="name@fr">765 - base</field>
                                 <field name="name@de">765 - Besteuerungsgrundlage</field>
                                 <field name="name@lb">765 - Basis</field>
                                 <field name="code">LUTAX_765</field>
diff --git a/addons/l10n_lu/data/tax_report/sections_34.xml b/addons/l10n_lu/data/tax_report/sections_34.xml
index 9fe055f689f05..e357fb3d2b15d 100644
--- a/addons/l10n_lu/data/tax_report/sections_34.xml
+++ b/addons/l10n_lu/data/tax_report/sections_34.xml
@@ -2,6 +2,7 @@
 <odoo auto_sequence="1">
     <record id="l10n_lu_tax_report_sections_3_4" model="account.report">
         <field name="name">Sections III, IV</field>
+        <field name="name@fr">Sections III, IV</field>
         <field name="name@de">Abschnitte III, IV</field>
         <field name="name@lb">Abschnitt III, IV</field>
         <field name="sequence">3</field>
@@ -10,8 +11,9 @@
         <field name="column_ids">
             <record id="tax_report_sections_3_4_balance" model="account.report.column">
                 <field name="name">Balance</field>
-                <field name="name@de">Waage</field>
-                <field name="name@lb">Gläichgewiicht</field>
+                <field name="name@fr">Solde</field>
+                <field name="name@de">Saldo</field>
+                <field name="name@lb">Sold</field>
                 <field name="expression_label">balance</field>
             </record>
         </field>
diff --git a/addons/l10n_lu/i18n/de.po b/addons/l10n_lu/i18n/de.po
new file mode 100644
index 0000000000000..243093dcd3f3c
--- /dev/null
+++ b/addons/l10n_lu/i18n/de.po
@@ -0,0 +1,384 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_lu
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~17.4+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-06 15:42+0000\n"
+"PO-Revision-Date: 2025-05-19 08:37+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_001
+msgid "001 - Supply of inhouse manufactured goods"
+msgstr "001 - Lieferung von selbst hergestellten Waren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_002
+msgid "002 - Supply of goods not manufactured inhouse"
+msgstr "002 - Lieferung von nicht selbst hergestellten Waren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_003
+msgid "003 - Net profit margin"
+msgstr "003 - Nettogewinnspanne"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_004
+msgid "004 - Supply of services"
+msgstr "004 - Erbringung von Dienstleistungen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_005
+msgid "005 - Disposal of tangible and intangible capital assets"
+msgstr "005 - Veräußerung von Sachanlagen und immateriellen Anlagegütern"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_008
+msgid "008 - Application of goods for private use or for that of the staff"
+msgstr "008 - Verwendung von Waren zum privaten Gebrauch oder für das Personal"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_009
+msgid "009 - Application for the purpose of business of goods"
+msgstr "009 - Anmeldung zum Zweck des Warenverkehrs"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_010
+msgid "010 - Use of goods considered business assets"
+msgstr "010 - Verwendung von Waren, die als Betriebsvermögen gelten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_011
+msgid "011 - Supply of services carried out free of charge"
+msgstr "011 - Unentgeltlich erbrachte Dienstleistungen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_013
+msgid "013 - IC supply of goods"
+msgstr "013 - IC Lieferung von Waren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_077
+msgid "077 - VAT on stock entries invoiced by other taxable persons"
+msgstr ""
+"077 - Mehrwertsteuer auf von anderen Steuerpflichtigen in Rechnung gestellte "
+"Lagerbestände"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_078
+msgid "078 - VAT on stock entries due in respect of IC acquisitions"
+msgstr ""
+"078 - Fällige Mehrwertsteuer auf Lagerbuchungen im Zusammenhang mit dem "
+"Erwerb von IC"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_079
+msgid "079 - VAT on stock entries of importations of goods"
+msgstr "079 - Mehrwertsteuer auf Lagerbuchungen bei der Einfuhr von Waren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_081
+msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
+msgstr ""
+"081 - Mehrwertsteuer auf von anderen Steuerpflichtigen in Rechnung gestellte "
+"Investitionsausgaben"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_082
+msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
+msgstr ""
+"082 - Mehrwertsteuer auf Investitionen im Zusammenhang mit dem Erwerb von IC"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_083
+msgid "083 - VAT on capital expenditures of importations of goods"
+msgstr ""
+"083 - Mehrwertsteuer auf Investitionsausgaben für die Einfuhr von Waren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_085
+msgid "085 - VAT on operational expenditures invoiced by other taxable persons"
+msgstr ""
+"085 - Mehrwertsteuer auf Betriebsausgaben, die von anderen Steuerpflichtigen "
+"in Rechnung gestellt werden"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_086
+msgid "086 - VAT on operational expenditures due in respect of IC acquisitions"
+msgstr ""
+"086 - Mehrwertsteuer auf Betriebsausgaben im Zusammenhang mit dem Erwerb von "
+"IC"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_087
+msgid "087 - VAT on operational expenditures of importations of goods"
+msgstr ""
+"087 - Mehrwertsteuer auf betriebliche Aufwendungen für die Einfuhr von Waren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
+msgid "188 - Appendix A - Expenses for other work carried out by third parties"
+msgstr ""
+"188 - Anhang A - Kosten für sonstige Arbeiten, die von Dritten ausgeführt "
+"werden"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
+msgid "190 - Appendix A - Car expenses"
+msgstr "190 - Anhang A - Kfz-Kosten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_202
+msgid "202 - IC supply of new means of transport"
+msgstr "202 - IC Angebot an neuen Verkehrsmitteln"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_203
+msgid "203 - Supply of goods carried out abroad"
+msgstr "203 - Im Ausland durchgeführte Lieferungen von Gegenständen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
+msgid "239 - Appendix A - Gross salaries"
+msgstr "239 - Anhang A - Bruttolöhne"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
+msgid "244 - Appendix A - Gross wages"
+msgstr "244 - Anhang A - Bruttolöhne"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
+msgid "247 - Appendix A - Occasional salaries"
+msgstr "247 - Anhang A - Gelegentliche Gehälter"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
+msgid ""
+"250 - Appendix A - Compulsory social security contributions (employer's "
+"share)"
+msgstr ""
+"250 - Anhang A - Obligatorische Sozialversicherungsbeiträge "
+"(Arbeitgeberanteil)"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
+msgid "253 - Appendix A - Accident insurance"
+msgstr "253 - Anhang A - Unfallversicherung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
+msgid "260 - Appendix A - Staff travel and representation expenses"
+msgstr "260 - Anhang A - Reise- und Repräsentationskosten des Personals"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
+msgid "269 - Appendix A - Accounting and bookkeeping fees"
+msgstr "269 - Anhang A - Rechnungslegungs- und Buchführungskosten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
+msgid "283 - Appendix A - Employer's travel and representation expenses"
+msgstr "283 - Anhang A - Reise- und Repräsentationskosten des Arbeitgebers"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
+msgid "285 - Appendix A - Electricity"
+msgstr "285 - Anhang A - Elektrizität"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
+msgid "289 - Appendix A - Gas"
+msgstr "289 - Anhang A - Gas"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
+msgid "293 - Appendix A - Employer's travel and representation expenses"
+msgstr "293 - Anhang A - Reise- und Repräsentationskosten des Arbeitgebers"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
+msgid "301 - Appendix A - Telecommunications"
+msgstr "301 - Anhang A - Telekommunikation"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
+msgid ""
+"305 - Appendix A - Renting/leasing of immovable property with application of "
+"VAT"
+msgstr ""
+"305 - Anhang A - Vermietung/Verpachtung von Grundstücken mit Anwendung der "
+"Mehrwertsteuer"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
+msgid ""
+"307 - Appendix A - Renting/leasing of immovable property with no application "
+"of VAT"
+msgstr ""
+"307 - Anhang A - Vermietung/Verpachtung von Grundstücken ohne Anwendung der "
+"Mehrwertsteuer"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
+msgid ""
+"310 - Appendix A - Renting/leasing of permanently installed equipment and "
+"machinery"
+msgstr ""
+"310 - Anhang A - Vermietung/Leasing von fest installierten Anlagen und "
+"Maschinen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
+msgid "316 - Appendix A - Property tax"
+msgstr "316 - Anhang A - Grundsteuer"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
+msgid "324 - Appendix A - Business tax"
+msgstr "324 - Anhang A - Gewerbesteuer"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
+msgid "326 - Appendix A - Interest paid for long-term debts"
+msgstr "326 - Anhang A - Zinszahlungen für langfristige Verbindlichkeiten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
+msgid "327 - Appendix A - Interest paid for short-term debts"
+msgstr "327 - Anhang A - Zinszahlungen für kurzfristige Verbindlichkeiten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
+msgid "328 - Appendix A - Other financial costs"
+msgstr "328 - Anhang A - Sonstige finanzielle Aufwendungen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
+msgid "330 - Appendix A - Stock and business equipment insurance"
+msgstr "330 - Anhang A - Versicherung von Vorräten und Geschäftsausstattung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
+msgid ""
+"331 - Appendix A - Public and professional third party liability insurance"
+msgstr "331 - Anhang A - Betriebs- und Berufshaftpflichtversicherung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
+msgid "332 - Appendix A - Office expenses"
+msgstr "332 - Anhang A - Bürokosten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
+msgid ""
+"336 - Appendix A - Fees and subscriptions paid to professional associations "
+"and learned societies"
+msgstr ""
+"336 - Anhang A - Gebühren und Mitgliedsbeiträge an Berufsverbände und "
+"Fachgesellschaften"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
+msgid "337 - Appendix A - Papers and periodicals for business purposes"
+msgstr "337 - Anhang A - Zeitungen und Zeitschriften für Geschäftszwecke"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
+msgid "343 - Appendix A - Shipping and transport expenses"
+msgstr "343 - Anhang A - Versand- und Transportkosten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
+msgid "345 - Appendix A - Work clothes"
+msgstr "345 - Anhang A - Arbeitskleidung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
+msgid "347 - Appendix A - Advertising and publicity"
+msgstr "347 - Anhang A - Werbung und Öffentlichkeitsarbeit"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
+msgid "349 - Appendix A - Packaging"
+msgstr "349 - Anhang A - Verpackung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
+msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
+msgstr "351 - Anhang A - Reparatur und Wartung von Geräten und Maschinen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
+msgid "353 - Appendix A - Other repairs"
+msgstr "353 - Anhang A - Sonstige Reparaturen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
+msgid ""
+"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
+"be fully allocated to the year of acquisition or creation"
+msgstr ""
+"355 - Anhang A - Neuanschaffungen (Werkzeuge und Ausrüstungen), wenn ihre "
+"Kosten vollständig dem Jahr der Anschaffung oder Herstellung zugeordnet "
+"werden können"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
+msgid "358 - Appendix A - Custom (value)"
+msgstr "358 - Anhang A - Zoll (Wert)"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
+msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
+msgstr "361 - Anhang A - Insgesamt \"Anhang zu den operationellen Ausgaben\"."
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_404
+msgid "404 - VAT on stock entries due under the reverse charge"
+msgstr ""
+"404 - Im Rahmen der Umkehrung der Steuerschuldnerschaft geschuldete "
+"Mehrwertsteuer auf Lagerbuchungen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_405
+msgid "405 - VAT on capital expenditures due under the reverse charge"
+msgstr ""
+"405 - Mehrwertsteuer auf Investitionen im Rahmen der Umkehrung der "
+"Steuerschuldnerschaft"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_406
+msgid "406 - VAT on operational expenditures due under the reverse charge"
+msgstr ""
+"406 - Mehrwertsteuer auf Betriebsausgaben im Rahmen der Umkehrung der "
+"Steuerschuldnerschaft"
+
+#. module: l10n_lu
+#: model:ir.model,name:l10n_lu.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "Kontenplanvorlage"
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
+msgid "Luxembourg"
+msgstr "Luxemburg"
diff --git a/addons/l10n_lu/i18n/fr.po b/addons/l10n_lu/i18n/fr.po
new file mode 100644
index 0000000000000..2bce800d67d51
--- /dev/null
+++ b/addons/l10n_lu/i18n/fr.po
@@ -0,0 +1,373 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_lu
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~17.4+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-06 15:42+0000\n"
+"PO-Revision-Date: 2025-05-19 08:35+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_001
+msgid "001 - Supply of inhouse manufactured goods"
+msgstr "001 - Fourniture de produits fabriqués en interne"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_002
+msgid "002 - Supply of goods not manufactured inhouse"
+msgstr "002 - Fourniture de biens non fabriqués en interne"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_003
+msgid "003 - Net profit margin"
+msgstr "003 - Marge bénéficiaire nette"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_004
+msgid "004 - Supply of services"
+msgstr "004 - Prestations de services"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_005
+msgid "005 - Disposal of tangible and intangible capital assets"
+msgstr "005 - Cession d'immobilisations corporelles et incorporelles"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_008
+msgid "008 - Application of goods for private use or for that of the staff"
+msgstr ""
+"008 - Utilisation de biens à des fins privées ou pour le compte du personnel"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_009
+msgid "009 - Application for the purpose of business of goods"
+msgstr "009 - Demande aux fins de commerce de marchandises"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_010
+msgid "010 - Use of goods considered business assets"
+msgstr "010 - Utilisation de biens considérés comme des actifs de l'entreprise"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_011
+msgid "011 - Supply of services carried out free of charge"
+msgstr "011 - Prestations de services effectuées à titre gratuit"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_013
+msgid "013 - IC supply of goods"
+msgstr "013 - IC fourniture de biens"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_077
+msgid "077 - VAT on stock entries invoiced by other taxable persons"
+msgstr "077 - TVA sur les entrées en stock facturées par d'autres assujettis"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_078
+msgid "078 - VAT on stock entries due in respect of IC acquisitions"
+msgstr "078 - TVA sur les entrées en stock due au titre des acquisitions de CI"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_079
+msgid "079 - VAT on stock entries of importations of goods"
+msgstr "079 - TVA sur les entrées en stock des importations de biens"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_081
+msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
+msgstr ""
+"081 - TVA sur les dépenses d'investissement facturées par d'autres assujettis"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_082
+msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
+msgstr ""
+"082 - TVA sur les dépenses en capital dues au titre des acquisitions d'IC"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_083
+msgid "083 - VAT on capital expenditures of importations of goods"
+msgstr "083 - TVA sur les dépenses en capital des importations de biens"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_085
+msgid "085 - VAT on operational expenditures invoiced by other taxable persons"
+msgstr ""
+"085 - TVA sur les dépenses opérationnelles facturées par d'autres assujettis"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_086
+msgid "086 - VAT on operational expenditures due in respect of IC acquisitions"
+msgstr ""
+"086 - TVA sur les dépenses opérationnelles due au titre des acquisitions IC"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_087
+msgid "087 - VAT on operational expenditures of importations of goods"
+msgstr "087 - TVA sur les dépenses opérationnelles d'importation de biens"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
+msgid "188 - Appendix A - Expenses for other work carried out by third parties"
+msgstr "188 - Annexe A - Frais pour d'autres travaux effectués par des tiers"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
+msgid "190 - Appendix A - Car expenses"
+msgstr "190 - Annexe A - Frais de voiture"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_202
+msgid "202 - IC supply of new means of transport"
+msgstr "202 - Approvisionnement en nouveaux moyens de transport"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_203
+msgid "203 - Supply of goods carried out abroad"
+msgstr "203 - Livraisons de biens effectuées à l'étranger"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
+msgid "239 - Appendix A - Gross salaries"
+msgstr "239 - Annexe A - Salaires bruts"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
+msgid "244 - Appendix A - Gross wages"
+msgstr "244 - Annexe A - Salaires bruts"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
+msgid "247 - Appendix A - Occasional salaries"
+msgstr "247 - Annexe A - Salaires occasionnels"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
+msgid ""
+"250 - Appendix A - Compulsory social security contributions (employer's "
+"share)"
+msgstr ""
+"250 - Annexe A - Cotisations obligatoires de sécurité sociale (part "
+"patronale)"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
+msgid "253 - Appendix A - Accident insurance"
+msgstr "253 - Annexe A - Assurance accidents"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
+msgid "260 - Appendix A - Staff travel and representation expenses"
+msgstr "260 - Annexe A - Frais de voyage et de représentation du personnel"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
+msgid "269 - Appendix A - Accounting and bookkeeping fees"
+msgstr "269 - Annexe A - Frais de comptabilité et de tenue de livres"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
+msgid "283 - Appendix A - Employer's travel and representation expenses"
+msgstr ""
+"283 - Annexe A - Frais de déplacement et de représentation de l'employeur"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
+msgid "285 - Appendix A - Electricity"
+msgstr "285 - Annexe A - Électricité"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
+msgid "289 - Appendix A - Gas"
+msgstr "289 - Annexe A - Gaz"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
+msgid "293 - Appendix A - Employer's travel and representation expenses"
+msgstr ""
+"293 - Annexe A - Frais de déplacement et de représentation de l'employeur"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
+msgid "301 - Appendix A - Telecommunications"
+msgstr "301 - Annexe A - Télécommunications"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
+msgid ""
+"305 - Appendix A - Renting/leasing of immovable property with application of "
+"VAT"
+msgstr ""
+"305 - Annexe A - Location/affermage de biens immobiliers avec application de "
+"la TVA"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
+msgid ""
+"307 - Appendix A - Renting/leasing of immovable property with no application "
+"of VAT"
+msgstr ""
+"307 - Annexe A - Location/affermage de biens immobiliers sans application de "
+"la TVA"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
+msgid ""
+"310 - Appendix A - Renting/leasing of permanently installed equipment and "
+"machinery"
+msgstr ""
+"310 - Annexe A - Location/leasing d'équipements et de machines installés de "
+"façon permanente"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
+msgid "316 - Appendix A - Property tax"
+msgstr "316 - Annexe A - Impôt foncier"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
+msgid "324 - Appendix A - Business tax"
+msgstr "324 - Annexe A - Taxe professionnelle"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
+msgid "326 - Appendix A - Interest paid for long-term debts"
+msgstr "326 - Annexe A - Intérêts payés pour les dettes à long terme"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
+msgid "327 - Appendix A - Interest paid for short-term debts"
+msgstr "327 - Annexe A - Intérêts payés pour les dettes à court terme"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
+msgid "328 - Appendix A - Other financial costs"
+msgstr "328 - Annexe A - Autres coûts financiers"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
+msgid "330 - Appendix A - Stock and business equipment insurance"
+msgstr "330 - Annexe A - Assurance du stock et du matériel d'entreprise"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
+msgid ""
+"331 - Appendix A - Public and professional third party liability insurance"
+msgstr ""
+"331 - Annexe A - Assurance responsabilité civile publique et professionnelle"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
+msgid "332 - Appendix A - Office expenses"
+msgstr "332 - Annexe A - Frais de bureau"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
+msgid ""
+"336 - Appendix A - Fees and subscriptions paid to professional associations "
+"and learned societies"
+msgstr ""
+"336 - Annexe A - Cotisations versées aux associations professionnelles et "
+"aux sociétés savantes"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
+msgid "337 - Appendix A - Papers and periodicals for business purposes"
+msgstr "337 - Annexe A - Papiers et périodiques à usage professionnel"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
+msgid "343 - Appendix A - Shipping and transport expenses"
+msgstr "343 - Annexe A - Frais d'expédition et de transport"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
+msgid "345 - Appendix A - Work clothes"
+msgstr "345 - Annexe A - Vêtements de travail"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
+msgid "347 - Appendix A - Advertising and publicity"
+msgstr "347 - Annexe A - Publicité et annonce"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
+msgid "349 - Appendix A - Packaging"
+msgstr "349 - Annexe A - Emballage"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
+msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
+msgstr ""
+"351 - Annexe A - Réparation et entretien des équipements et des machines"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
+msgid "353 - Appendix A - Other repairs"
+msgstr "353 - Annexe A - Autres réparations"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
+msgid ""
+"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
+"be fully allocated to the year of acquisition or creation"
+msgstr ""
+"355 - Annexe A - Nouvelles acquisitions (outils et équipements) si leur coût "
+"peut être entièrement imputé à l'année d'acquisition ou de création"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
+msgid "358 - Appendix A - Custom (value)"
+msgstr "358 - Annexe A - Personnalisation (valeur)"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
+msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
+msgstr "361 - Annexe A - Total \"Annexe aux dépenses opérationnelles\"."
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_404
+msgid "404 - VAT on stock entries due under the reverse charge"
+msgstr "404 - TVA sur les entrées en stock due au titre de l'autoliquidation"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_405
+msgid "405 - VAT on capital expenditures due under the reverse charge"
+msgstr ""
+"405 - TVA sur les dépenses en capital due au titre de l'autoliquidation"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_406
+msgid "406 - VAT on operational expenditures due under the reverse charge"
+msgstr ""
+"406 - TVA sur les dépenses opérationnelles due au titre de l'autoliquidation"
+
+#. module: l10n_lu
+#: model:ir.model,name:l10n_lu.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "Modèle de plan comptable"
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
+msgid "Luxembourg"
+msgstr "Luxembourg"
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
new file mode 100644
index 0000000000000..f133f61be1571
--- /dev/null
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -0,0 +1,352 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_lu
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~18.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-06 15:42+0000\n"
+"PO-Revision-Date: 2025-11-06 15:42+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_001
+msgid "001 - Supply of inhouse manufactured goods"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_002
+msgid "002 - Supply of goods not manufactured inhouse"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_003
+msgid "003 - Net profit margin"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_004
+msgid "004 - Supply of services"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_005
+msgid "005 - Disposal of tangible and intangible capital assets"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_008
+msgid "008 - Application of goods for private use or for that of the staff"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_009
+msgid "009 - Application for the purpose of business of goods"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_010
+msgid "010 - Use of goods considered business assets"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_011
+msgid "011 - Supply of services carried out free of charge"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_013
+msgid "013 - IC supply of goods"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_077
+msgid "077 - VAT on stock entries invoiced by other taxable persons"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_078
+msgid "078 - VAT on stock entries due in respect of IC acquisitions"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_079
+msgid "079 - VAT on stock entries of importations of goods"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_081
+msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_082
+msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_083
+msgid "083 - VAT on capital expenditures of importations of goods"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_085
+msgid ""
+"085 - VAT on operational expenditures invoiced by other taxable persons"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_086
+msgid ""
+"086 - VAT on operational expenditures due in respect of IC acquisitions"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_087
+msgid "087 - VAT on operational expenditures of importations of goods"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
+msgid ""
+"188 - Appendix A - Expenses for other work carried out by third parties"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
+msgid "190 - Appendix A - Car expenses"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_202
+msgid "202 - IC supply of new means of transport"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_203
+msgid "203 - Supply of goods carried out abroad"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
+msgid "239 - Appendix A - Gross salaries"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
+msgid "244 - Appendix A - Gross wages"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
+msgid "247 - Appendix A - Occasional salaries"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
+msgid ""
+"250 - Appendix A - Compulsory social security contributions (employer's "
+"share)"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
+msgid "253 - Appendix A - Accident insurance"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
+msgid "260 - Appendix A - Staff travel and representation expenses"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
+msgid "269 - Appendix A - Accounting and bookkeeping fees"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
+msgid "283 - Appendix A - Employer's travel and representation expenses"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
+msgid "285 - Appendix A - Electricity"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
+msgid "289 - Appendix A - Gas"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
+msgid "293 - Appendix A - Employer's travel and representation expenses"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
+msgid "301 - Appendix A - Telecommunications"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
+msgid ""
+"305 - Appendix A - Renting/leasing of immovable property with application of"
+" VAT"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
+msgid ""
+"307 - Appendix A - Renting/leasing of immovable property with no application"
+" of VAT"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
+msgid ""
+"310 - Appendix A - Renting/leasing of permanently installed equipment and "
+"machinery"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
+msgid "316 - Appendix A - Property tax"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
+msgid "324 - Appendix A - Business tax"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
+msgid "326 - Appendix A - Interest paid for long-term debts"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
+msgid "327 - Appendix A - Interest paid for short-term debts"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
+msgid "328 - Appendix A - Other financial costs"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
+msgid "330 - Appendix A - Stock and business equipment insurance"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
+msgid ""
+"331 - Appendix A - Public and professional third party liability insurance"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
+msgid "332 - Appendix A - Office expenses"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
+msgid ""
+"336 - Appendix A - Fees and subscriptions paid to professional associations "
+"and learned societies"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
+msgid "337 - Appendix A - Papers and periodicals for business purposes"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
+msgid "343 - Appendix A - Shipping and transport expenses"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
+msgid "345 - Appendix A - Work clothes"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
+msgid "347 - Appendix A - Advertising and publicity"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
+msgid "349 - Appendix A - Packaging"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
+msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
+msgid "353 - Appendix A - Other repairs"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
+msgid ""
+"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
+"be fully allocated to the year of acquisition or creation"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
+msgid "358 - Appendix A - Custom (value)"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
+msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_404
+msgid "404 - VAT on stock entries due under the reverse charge"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_405
+msgid "405 - VAT on capital expenditures due under the reverse charge"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_406
+msgid "406 - VAT on operational expenditures due under the reverse charge"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.model,name:l10n_lu.model_account_chart_template
+msgid "Account Chart Template"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
+msgid "Luxembourg"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/lb.po b/addons/l10n_lu/i18n/lb.po
new file mode 100644
index 0000000000000..67911e1ecc2f5
--- /dev/null
+++ b/addons/l10n_lu/i18n/lb.po
@@ -0,0 +1,365 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* l10n_lu
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server saas~17.4+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-06 15:42+0000\n"
+"PO-Revision-Date: 2025-05-19 08:38+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: lb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_001
+msgid "001 - Supply of inhouse manufactured goods"
+msgstr "001 - Versuergung vun intern fabrizéierte Wueren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_002
+msgid "002 - Supply of goods not manufactured inhouse"
+msgstr "002 - Versuergung vu Wueren net intern hiergestallt"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_003
+msgid "003 - Net profit margin"
+msgstr "003 - Net Benefice Margin"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_004
+msgid "004 - Supply of services"
+msgstr "004 - Versuergung vu Servicer"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_005
+msgid "005 - Disposal of tangible and intangible capital assets"
+msgstr "005 - Entsuergung vun materiellen an immaterielle Kapital Verméigen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_008
+msgid "008 - Application of goods for private use or for that of the staff"
+msgstr "008 - Uwendung vu Wueren fir privat Notzung oder fir dee vum Personal"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_009
+msgid "009 - Application for the purpose of business of goods"
+msgstr "009 - Applikatioun fir den Zweck vum Geschäft vu Wueren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_010
+msgid "010 - Use of goods considered business assets"
+msgstr "010 - Notzung vu Wueren considéréiert Affär Verméigen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_011
+msgid "011 - Supply of services carried out free of charge"
+msgstr "011 - Versuergung vu Servicer gratis duerchgefouert"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_013
+msgid "013 - IC supply of goods"
+msgstr "013 - IC Versuergung vu Wueren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_077
+msgid "077 - VAT on stock entries invoiced by other taxable persons"
+msgstr "077 - TVA op Stock Einträg vun anere besteierbaren Persounen Rechnung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_078
+msgid "078 - VAT on stock entries due in respect of IC acquisitions"
+msgstr "078 - TVA op Stock Entréen wéinst IC Acquisitioun"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_079
+msgid "079 - VAT on stock entries of importations of goods"
+msgstr "079 - TVA op Stock Entréen vun Importer vu Wueren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_081
+msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
+msgstr ""
+"081 - TVA op Kapitalausgaben, déi vun anere besteierbare Persounen "
+"fakturéiert ginn"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_082
+msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
+msgstr "082 - TVA op Kapitalausgaben wéinst IC Acquisitioun"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_083
+msgid "083 - VAT on capital expenditures of importations of goods"
+msgstr "083 - TVA op Kapitalausgaben vun Importer vu Wueren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_085
+msgid "085 - VAT on operational expenditures invoiced by other taxable persons"
+msgstr ""
+"085 - TVA op Operatiounskäschten, déi vun anere steierbaren Persounen "
+"fakturéiert ginn"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_086
+msgid "086 - VAT on operational expenditures due in respect of IC acquisitions"
+msgstr "086 - TVA op Operatiounskäschte wéinst IC Acquisitioun"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_087
+msgid "087 - VAT on operational expenditures of importations of goods"
+msgstr "087 - TVA op Operatiounskäschte vun Importer vu Wueren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
+msgid "188 - Appendix A - Expenses for other work carried out by third parties"
+msgstr ""
+"188 - Appendix A - Käschte fir aner Aarbechten, déi vun Drëtte gemaach ginn"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
+msgid "190 - Appendix A - Car expenses"
+msgstr "190 - Anhang A - Auto Käschten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_202
+msgid "202 - IC supply of new means of transport"
+msgstr "202 - IC Versuergung vun neie Transportmëttel"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_203
+msgid "203 - Supply of goods carried out abroad"
+msgstr "203 - Liwwerung vu Wueren am Ausland duerchgefouert"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
+msgid "239 - Appendix A - Gross salaries"
+msgstr "239 - Anhang A - Brutto Gehälter"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
+msgid "244 - Appendix A - Gross wages"
+msgstr "244 - Anhang A - Brutto Léin"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
+msgid "247 - Appendix A - Occasional salaries"
+msgstr "247 - Anhang A - Geleeëntlech Gehälter"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
+msgid ""
+"250 - Appendix A - Compulsory social security contributions (employer's "
+"share)"
+msgstr "250 - Anhang A - Obligatoresch Sozialbeiträg (Patronatdeel)"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
+msgid "253 - Appendix A - Accident insurance"
+msgstr "253 - Unhang A - Accident Versécherung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
+msgid "260 - Appendix A - Staff travel and representation expenses"
+msgstr "260 - Appendix A - Personal Rees- a Representatiounskäschte"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
+msgid "269 - Appendix A - Accounting and bookkeeping fees"
+msgstr "269 ​​- Appendix A - Comptabilitéits- a Buchhaltungsgebühren"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
+msgid "283 - Appendix A - Employer's travel and representation expenses"
+msgstr "283 - Appendix A - Employeur Rees- a Representatiounskäschten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
+msgid "285 - Appendix A - Electricity"
+msgstr "285 - Unhang A - Elektrizitéit"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
+msgid "289 - Appendix A - Gas"
+msgstr "289 - Unhang A - Gas"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
+msgid "293 - Appendix A - Employer's travel and representation expenses"
+msgstr "293 - Appendix A - Employeur Rees- a Representatiounskäschten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
+msgid "301 - Appendix A - Telecommunications"
+msgstr "301 - Unhang A - Telekommunikatioun"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
+msgid ""
+"305 - Appendix A - Renting/leasing of immovable property with application of "
+"VAT"
+msgstr ""
+"305 - Appendix A - Locatioun/Locatioun vun Immobilien mat Applikatioun TVA"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
+msgid ""
+"307 - Appendix A - Renting/leasing of immovable property with no application "
+"of VAT"
+msgstr ""
+"307 - Appendix A - Locatioun / Locatioun vun Immobilien ouni TVA-Uwendung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
+msgid ""
+"310 - Appendix A - Renting/leasing of permanently installed equipment and "
+"machinery"
+msgstr ""
+"310 - Anhang A - Locatioun / Locatioun vun permanent installéiert Ausrüstung "
+"a Maschinnen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
+msgid "316 - Appendix A - Property tax"
+msgstr "316 - Unhang A - Grondsteier"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
+msgid "324 - Appendix A - Business tax"
+msgstr "324 - Unhang A - Betrib Steier"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
+msgid "326 - Appendix A - Interest paid for long-term debts"
+msgstr "326 - Anhang A - Zënse bezuelt fir laangfristeg Scholden"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
+msgid "327 - Appendix A - Interest paid for short-term debts"
+msgstr "327 - Anhang A - Zënse bezuelt fir kuerzfristeg Scholden"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
+msgid "328 - Appendix A - Other financial costs"
+msgstr "328 - Unhang A - Aner finanziell Käschten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
+msgid "330 - Appendix A - Stock and business equipment insurance"
+msgstr "330 - Unhang A - Stock a Betrib Equipement Versécherung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
+msgid ""
+"331 - Appendix A - Public and professional third party liability insurance"
+msgstr ""
+"331 - Appendix A - Ëffentlech a berufflech Drëtt Partei Haftung Versécherung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
+msgid "332 - Appendix A - Office expenses"
+msgstr "332 - Anhang A - Büro Käschten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
+msgid ""
+"336 - Appendix A - Fees and subscriptions paid to professional associations "
+"and learned societies"
+msgstr ""
+"336 - Appendix A - Fraisen an Abonnementer bezuelt fir Beruffsverbänn a "
+"geléiert Gesellschaften"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
+msgid "337 - Appendix A - Papers and periodicals for business purposes"
+msgstr "337 - Appendix A - Pabeieren an Zäitschrëften fir Geschäftszwecker"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
+msgid "343 - Appendix A - Shipping and transport expenses"
+msgstr "343 - Appendix A - Versand- an Transportkäschten"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
+msgid "345 - Appendix A - Work clothes"
+msgstr "345 - Unhang A - Aarbechtskleedung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
+msgid "347 - Appendix A - Advertising and publicity"
+msgstr "347 - Appendix A - Publicitéit a Publizitéit"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
+msgid "349 - Appendix A - Packaging"
+msgstr "349 - Unhang A - Verpakung"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
+msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
+msgstr "351 - Appendix A - Reparatur an Ënnerhalt vun Ausrüstung a Maschinnen"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
+msgid "353 - Appendix A - Other repairs"
+msgstr "353 - Anhang A - Aner Fléckaarbechte"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
+msgid ""
+"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
+"be fully allocated to the year of acquisition or creation"
+msgstr ""
+"355 - Appendix A - Nei Acquisitioune (Tools an Ausrüstung) wann hir Käschte "
+"komplett un d'Joer vun der Acquisitioun oder der Schafung zougedeelt kënne "
+"ginn"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
+msgid "358 - Appendix A - Custom (value)"
+msgstr "358 - Appendix A - Benotzerdefinéiert (Wäert)"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
+msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
+msgstr "361 - Appendix A - Gesamt 'Anhang fir Operatiounsausgaben'"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_404
+msgid "404 - VAT on stock entries due under the reverse charge"
+msgstr "404 - TVA op Stock Entréen wéinst ënner der ëmgedréint charge"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_405
+msgid "405 - VAT on capital expenditures due under the reverse charge"
+msgstr "405 - TVA op Kapitalausgaben, déi ënner der ëmgedréint Charge sinn"
+
+#. module: l10n_lu
+#: model:account.account.tag,name:l10n_lu.account_tag_406
+msgid "406 - VAT on operational expenditures due under the reverse charge"
+msgstr "406 - TVA op Operatiounskäschte wéinst der ëmgedréint Charge"
+
+#. module: l10n_lu
+#: model:ir.model,name:l10n_lu.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "Kont Chart Schabloun"
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.model.fields,field_description:l10n_lu.field_account_chart_template__id
+msgid "ID"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
+msgid "Luxembourg"
+msgstr "Lëtzebuerg"
diff --git a/addons/l10n_lu/i18n_extra/de.po b/addons/l10n_lu/i18n_extra/de.po
deleted file mode 100644
index ffb0576f61602..0000000000000
--- a/addons/l10n_lu/i18n_extra/de.po
+++ /dev/null
@@ -1,1319 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* l10n_lu
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~17.4+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-19 08:37+0000\n"
-"PO-Revision-Date: 2025-05-19 08:37+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_001
-msgid "001 - Supply of inhouse manufactured goods"
-msgstr "001 - Lieferung von selbst hergestellten Waren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_002
-msgid "002 - Supply of goods not manufactured inhouse"
-msgstr "002 - Lieferung von nicht selbst hergestellten Waren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_003
-msgid "003 - Net profit margin"
-msgstr "003 - Nettogewinnspanne"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_004
-msgid "004 - Supply of services"
-msgstr "004 - Erbringung von Dienstleistungen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_005
-msgid "005 - Disposal of tangible and intangible capital assets"
-msgstr "005 - Veräußerung von Sachanlagen und immateriellen Anlagegütern"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_008
-msgid "008 - Application of goods for private use or for that of the staff"
-msgstr "008 - Verwendung von Waren zum privaten Gebrauch oder für das Personal"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_009
-msgid "009 - Application for the purpose of business of goods"
-msgstr "009 - Anmeldung zum Zweck des Warenverkehrs"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_010
-msgid "010 - Use of goods considered business assets"
-msgstr "010 - Verwendung von Waren, die als Betriebsvermögen gelten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_011
-msgid "011 - Supply of services carried out free of charge"
-msgstr "011 - Unentgeltlich erbrachte Dienstleistungen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_overall_turnover
-msgid "012 - Overall turnover"
-msgstr "012 - Gesamtumsatz"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_013
-msgid "013 - IC supply of goods"
-msgstr "013 - IC Lieferung von Waren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_2_export
-msgid "014 - Exports"
-msgstr "014 - Ausfuhren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
-msgid "015 - Other exemptions"
-msgstr "015 - Andere Befreiungen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
-msgid "016 - Other exemptions"
-msgstr "016 - Andere Befreiungen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_5_manufactured_tobacco_vat_collected
-msgid ""
-"017 - Manufactured tobacco whose VAT was collected at the source or at the "
-"exit of the tax..."
-msgstr ""
-"017 - Tabakwaren, deren Mehrwertsteuer an der Quelle oder am Ausgang des "
-"Steuerlagers gemeinsam mit den Verbrauchsteuern erhoben wurde"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_a_subsequent_to_intra_community
-msgid ""
-"018 - Supply, subsequent to intra-Community acquisitions of goods, in the "
-"context of triangular transactions, when the customer identified,..."
-msgstr ""
-"018 - An innergemeinschaftliche Erwerbe anschließende Lieferungen im Rahmen "
-"von Dreiecksgeschäften..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
-msgid ""
-"019 - Other supplies carried out (for which the place of supply is) abroad"
-msgstr "019 - Andere im Ausland getätigte (steuerpflichtige) Umsätze"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_exemptions_deductible_amounts
-msgid "021 - Exemptions and deductible amounts"
-msgstr "021 - Steuerbefreiungen und abzugsfähige Beträge"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1c_taxable_turnover
-msgid "022 - Taxable turnover"
-msgstr "022 - Steuerpflichtiger Umsatz"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_3
-msgid "031 - base 3%"
-msgstr "031 - Besteuerungsgrundlage 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_0
-msgid "033 - base 0%"
-msgstr "033 - Besteuerungsgrundlage 0%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_base
-msgid "037 - Breakdown of taxable turnover – base"
-msgstr "037 - Steuerpflichtiger Umsatz: Aufteilung - Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_3
-msgid "040 - tax 3%"
-msgstr "040 - MwSt. 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_tax
-msgid "046 - Breakdown of taxable turnover – tax"
-msgstr "046 - Steuerpflichtiger Umsatz: Aufteilung - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_3
-msgid "049 - base 3%"
-msgstr "049 - Besteuerungsgrundlage 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acqui_of_goods_base
-msgid "051 - Intra-Community acquisitions of goods – base"
-msgstr ""
-"051 - Innergemeinschaftliche Erwerbe von Gegenständen - "
-"Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_3
-msgid "054 - tax 3%"
-msgstr "054 - MwSt. 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acquisitions_goods_tax
-msgid "056 - Intra-Community acquisitions of goods – tax"
-msgstr "056 - Innergemeinschaftliche Erwerbe von Gegenständen - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_3
-msgid "059 - for business purposes: base 3%"
-msgstr "059 - für Zwecke des Unternehmens: Besteuerungsgrundlage 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_3
-msgid "063 - for non-business purposes: base 3%"
-msgstr "063 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_base
-msgid "065 - Importation of goods – base"
-msgstr "065 - Einfuhren von Gegenständen - Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_3
-msgid "068 - for business purposes: tax 3%"
-msgstr "068 - für Zwecke des Unternehmens: MwSt. 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_3
-msgid "073 - for non-business purposes: tax 3%"
-msgstr "073 - für unternehmensfremde Zwecke: MwSt. 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2h_total_tax_due
-msgid "076 - Total tax due"
-msgstr "076 - Gesamtbetrag der Steuer"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_077
-msgid "077 - VAT on stock entries invoiced by other taxable persons"
-msgstr "077 - Mehrwertsteuer auf von anderen Steuerpflichtigen in Rechnung gestellte Lagerbestände"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_078
-msgid "078 - VAT on stock entries due in respect of IC acquisitions"
-msgstr "078 - Fällige Mehrwertsteuer auf Lagerbuchungen im Zusammenhang mit dem Erwerb von IC"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_079
-msgid "079 - VAT on stock entries of importations of goods"
-msgstr "079 - Mehrwertsteuer auf Lagerbuchungen bei der Einfuhr von Waren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_081
-msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
-msgstr "081 - Mehrwertsteuer auf von anderen Steuerpflichtigen in Rechnung gestellte Investitionsausgaben"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_082
-msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
-msgstr "082 - Mehrwertsteuer auf Investitionen im Zusammenhang mit dem Erwerb von IC"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_083
-msgid "083 - VAT on capital expenditures of importations of goods"
-msgstr "083 - Mehrwertsteuer auf Investitionsausgaben für die Einfuhr von Waren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_085
-msgid ""
-"085 - VAT on operational expenditures invoiced by other taxable persons"
-msgstr ""
-"085 - Mehrwertsteuer auf Betriebsausgaben, die von anderen Steuerpflichtigen in Rechnung gestellt werden"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_086
-msgid ""
-"086 - VAT on operational expenditures due in respect of IC acquisitions"
-msgstr ""
-"086 - Mehrwertsteuer auf Betriebsausgaben im Zusammenhang mit dem Erwerb von IC"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_087
-msgid "087 - VAT on operational expenditures of importations of goods"
-msgstr "087 - Mehrwertsteuer auf betriebliche Aufwendungen für die Einfuhr von Waren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
-msgid "090 - Due in respect of the application of goods for business purposes"
-msgstr ""
-"090 - Erklärte Mehrwertsteuer für die Zuordnung von Gegenständen zu Zwecken "
-"des Unternehmens"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
-msgid "092 - Paid as joint and several guarantee"
-msgstr "092 - Als solidarisch haftender Bürge bezahlte MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_total_input_tax
-msgid "093 - Total input tax"
-msgstr "093 - Gesamtbetrag Vorsteuer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b1_rel_trans
-msgid ""
-"094 - relating to transactions which are exempt pursuant to articles 44 and "
-"56quater"
-msgstr ""
-"094 - Nicht abziehbare Vorsteuer betreffend die gemäß Art. 44 und Art. "
-"56quater steuerfreien Umsätze"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_ded_prop
-msgid ""
-"095 - where the deductible proportion determined in accordance to article 50"
-" is applied"
-msgstr ""
-"095 - Nicht abziehbare Vorsteuer in Anwendung der in Art. 50 vorgesehenen "
-"Prorata-Regel"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
-msgid ""
-"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
-"56ter-2(7) (when applying the margin scheme)"
-msgstr ""
-"096 - Nicht abziehbare Vorsteuer in Anwendung von Art. 56ter-1/7 und "
-"56ter-2/7 "
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
-msgid "097 - Total input tax non-deductible"
-msgstr "097 - Gesamtbetrag der nicht abziehbaren Vorsteuer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3c_total_input_tax_deductible
-msgid "102 - Total input tax deductible"
-msgstr "102 - Gesamtbetrag der abziehbaren Vorsteuer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_tax_due
-msgid "103 - Total tax due"
-msgstr "103 - Gesamtbetrag der Steuer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_input_tax_deductible
-msgid "104 - Total input tax deductible"
-msgstr "104 - Gesamtbetrag der abziehbaren Vorsteuer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4c_exceeding_amount
-msgid "105 - Exceeding amount"
-msgstr "105 - Überschuss"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2c_acquisitions_triangular_transactions_base
-msgid "152 - Acquisitions, in the context of triangular transactions – base"
-msgstr ""
-"152 - Im Rahmen von Dreiecksgeschäften getätigte Erwerbe - "
-"Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
-msgid ""
-"188 - Appendix A - Expenses for other work carried out by third parties"
-msgstr ""
-"188 - Anhang A - Kosten für sonstige Arbeiten, die von Dritten ausgeführt "
-"werden"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
-msgid "190 - Appendix A - Car expenses"
-msgstr "190 - Anhang A - Kfz-Kosten"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_exempt
-msgid "194 - base exempt"
-msgstr "194 - Besteuerungsgrundlage steuerbefreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_exempt
-msgid "195 - for business purposes: base exempt"
-msgstr ""
-"195 - für Zwecke des Unternehmens: Besteuerungsgrundlage steuerbefreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_exempt
-msgid "196 - for non-business purposes: base exempt"
-msgstr ""
-"196 - für unternehmensfremde Zwecke: Besteuerungsgrundlage steuerbefreit"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_202
-msgid "202 - IC supply of new means of transport"
-msgstr "202 - IC Angebot an neuen Verkehrsmitteln"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_203
-msgid "203 - Supply of goods carried out abroad"
-msgstr "203 - Im Ausland durchgeführte Lieferungen von Gegenständen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_c_supplies_scope_special_arrangement
-msgid ""
-"226 - Supplies carried out within the scope of the special arrangement of "
-"art. 56sexies"
-msgstr ""
-"226 - Im Rahmen der Sonderregelung von Artikel 56sexies getätigte Umsätze"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2g_special_arrangement
-msgid "227 - Special arrangement for tax suspension: adjustment"
-msgstr "227 - Sonderregelung zur Steueraussetzung: Berichtigung"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
-msgid "228 - Adjusted tax - special arrangement for tax suspension"
-msgstr "228 - Berichtigte Steuer - Sonderregelung zur Steueraussetzung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
-msgid "239 - Appendix A - Gross salaries"
-msgstr "239 - Anhang A - Bruttolöhne"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
-msgid "244 - Appendix A - Gross wages"
-msgstr "244 - Anhang A - Bruttolöhne"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
-msgid "247 - Appendix A - Occasional salaries"
-msgstr "247 - Anhang A - Gelegentliche Gehälter"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
-msgid ""
-"250 - Appendix A - Compulsory social security contributions (employer's "
-"share)"
-msgstr ""
-"250 - Anhang A - Obligatorische Sozialversicherungsbeiträge "
-"(Arbeitgeberanteil)"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
-msgid "253 - Appendix A - Accident insurance"
-msgstr "253 - Anhang A - Unfallversicherung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
-msgid "260 - Appendix A - Staff travel and representation expenses"
-msgstr "260 - Anhang A - Reise- und Repräsentationskosten des Personals"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
-msgid "269 - Appendix A - Accounting and bookkeeping fees"
-msgstr "269 - Anhang A - Rechnungslegungs- und Buchführungskosten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
-msgid "283 - Appendix A - Employer's travel and representation expenses"
-msgstr "283 - Anhang A - Reise- und Repräsentationskosten des Arbeitgebers"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
-msgid "285 - Appendix A - Electricity"
-msgstr "285 - Anhang A - Elektrizität"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
-msgid "289 - Appendix A - Gas"
-msgstr "289 - Anhang A - Gas"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
-msgid "293 - Appendix A - Employer's travel and representation expenses"
-msgstr "293 - Anhang A - Reise- und Repräsentationskosten des Arbeitgebers"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
-msgid "301 - Appendix A - Telecommunications"
-msgstr "301 - Anhang A - Telekommunikation"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
-msgid ""
-"305 - Appendix A - Renting/leasing of immovable property with application of"
-" VAT"
-msgstr ""
-"305 - Anhang A - Vermietung/Verpachtung von Grundstücken mit Anwendung der "
-"Mehrwertsteuer"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
-msgid ""
-"307 - Appendix A - Renting/leasing of immovable property with no application"
-" of VAT"
-msgstr ""
-"307 - Anhang A - Vermietung/Verpachtung von Grundstücken ohne Anwendung der "
-"Mehrwertsteuer"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
-msgid ""
-"310 - Appendix A - Renting/leasing of permanently installed equipment and "
-"machinery"
-msgstr ""
-"310 - Anhang A - Vermietung/Leasing von fest installierten Anlagen und "
-"Maschinen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
-msgid "316 - Appendix A - Property tax"
-msgstr "316 - Anhang A - Grundsteuer"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
-msgid "324 - Appendix A - Business tax"
-msgstr "324 - Anhang A - Gewerbesteuer"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
-msgid "326 - Appendix A - Interest paid for long-term debts"
-msgstr "326 - Anhang A - Zinszahlungen für langfristige Verbindlichkeiten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
-msgid "327 - Appendix A - Interest paid for short-term debts"
-msgstr "327 - Anhang A - Zinszahlungen für kurzfristige Verbindlichkeiten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
-msgid "328 - Appendix A - Other financial costs"
-msgstr "328 - Anhang A - Sonstige finanzielle Aufwendungen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
-msgid "330 - Appendix A - Stock and business equipment insurance"
-msgstr "330 - Anhang A - Versicherung von Vorräten und Geschäftsausstattung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
-msgid ""
-"331 - Appendix A - Public and professional third party liability insurance"
-msgstr "331 - Anhang A - Betriebs- und Berufshaftpflichtversicherung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
-msgid "332 - Appendix A - Office expenses"
-msgstr "332 - Anhang A - Bürokosten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
-msgid ""
-"336 - Appendix A - Fees and subscriptions paid to professional associations "
-"and learned societies"
-msgstr ""
-"336 - Anhang A - Gebühren und Mitgliedsbeiträge an Berufsverbände und "
-"Fachgesellschaften"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
-msgid "337 - Appendix A - Papers and periodicals for business purposes"
-msgstr "337 - Anhang A - Zeitungen und Zeitschriften für Geschäftszwecke"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
-msgid "343 - Appendix A - Shipping and transport expenses"
-msgstr "343 - Anhang A - Versand- und Transportkosten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
-msgid "345 - Appendix A - Work clothes"
-msgstr "345 - Anhang A - Arbeitskleidung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
-msgid "347 - Appendix A - Advertising and publicity"
-msgstr "347 - Anhang A - Werbung und Öffentlichkeitsarbeit"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
-msgid "349 - Appendix A - Packaging"
-msgstr "349 - Anhang A - Verpackung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
-msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
-msgstr "351 - Anhang A - Reparatur und Wartung von Geräten und Maschinen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
-msgid "353 - Appendix A - Other repairs"
-msgstr "353 - Anhang A - Sonstige Reparaturen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
-msgid ""
-"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
-"be fully allocated to the year of acquisition or creation"
-msgstr ""
-"355 - Anhang A - Neuanschaffungen (Werkzeuge und Ausrüstungen), wenn ihre "
-"Kosten vollständig dem Jahr der Anschaffung oder Herstellung zugeordnet "
-"werden können"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
-msgid "358 - Appendix A - Custom (value)"
-msgstr "358 - Anhang A - Zoll (Wert)"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
-msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
-msgstr "361 - Anhang A - Insgesamt \"Anhang zu den operationellen Ausgaben\"."
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_404
-msgid "404 - VAT on stock entries due under the reverse charge"
-msgstr "404 - Im Rahmen der Umkehrung der Steuerschuldnerschaft geschuldete Mehrwertsteuer auf Lagerbuchungen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_405
-msgid "405 - VAT on capital expenditures due under the reverse charge"
-msgstr "405 - Mehrwertsteuer auf Investitionen im Rahmen der Umkehrung der Steuerschuldnerschaft"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_406
-msgid "406 - VAT on operational expenditures due under the reverse charge"
-msgstr "406 - Mehrwertsteuer auf Betriebsausgaben im Rahmen der Umkehrung der Steuerschuldnerschaft"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_tax
-msgid "407 - Importation of goods – tax"
-msgstr "407 - Einfuhren von Gegenständen - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer
-msgid ""
-"409 - Supply of services for which the customer is liable for the payment of"
-" VAT – base"
-msgstr ""
-"409 - Vom Empfänger als Steuerschuldner zu erklärende Dienstleistungen  - "
-"Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax
-msgid ""
-"410 - Supply of services for which the customer is liable for the payment of"
-" VAT – tax"
-msgstr ""
-"410 - Vom Empfänger als Steuerschuldner zu erklärende Dienstleistungen  - "
-"MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_7_inland_supplies_for_customer
-msgid ""
-"419 - Inland supplies for which the customer is liable for the payment of "
-"VAT"
-msgstr "419 - Umsätze im Inland, für die der Empfänger Steuerschuldner ist"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b1_non_exempt_customer_vat
-msgid ""
-"423 - not exempt in the MS where the customer is liable for payment of VAT"
-msgstr ""
-"423 - Dienstleistungen, die im Mitgliedstaat des Empfängers, der dort für "
-"Zwecke der MwSt. erfasst und Steuerschuldner ist, nicht steuerbefreit sind"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
-msgid "424 - exempt in the MS where the customer is identified"
-msgstr ""
-"424 - Dienstleistungen, die im Mitgliedstaat des Empfängers, der dort für "
-"Zwecke der MwSt. erfasst ist, steuerbefreit sind"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_3
-msgid "431 - not exempt within the territory: base 3%"
-msgstr "431 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
-msgid "432 - not exempt within the territory: tax 3%"
-msgstr "432 - nicht steuerbefreit im Inland: MwSt. 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_b_exempt
-msgid "435 - exempt within the territory: exempt"
-msgstr "435 - steuerbefreit im Inland: steuerbefreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_base
-msgid "436 - base"
-msgstr "436 - Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_3
-msgid "441 - not established or residing within the Community: base 3%"
-msgstr ""
-"441 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_3
-msgid "442 - not established or residing within the Community: tax 3%"
-msgstr ""
-"442 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_exempt
-msgid "445 - not established or residing within the Community: exempt"
-msgstr ""
-"445 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: steuerbefreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_total_sale
-msgid "454 - Total Sales / Receipts"
-msgstr "454 - Gesamtbetrag der Entgelte"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_app_goods_non_bus
-msgid ""
-"455 - Application of goods for non-business use and for business purposes"
-msgstr ""
-"455 - Entnahmen von Gegenständen für Zwecke des Unternehmens und für "
-"unternehmensfremde Zwecke"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_non_bus_gs
-msgid "456 - Non-business use of goods and supply of services free of charge"
-msgstr "456 - Erbringung von Dienstleistungen für unternehmensfremde Zwecke"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_1_intra_community_goods_pi_vat
-msgid ""
-"457 - Intra-Community supply of goods to persons identified for VAT purposes"
-" in another Member State (MS)"
-msgstr ""
-"457 - Innergemeinschaftliche Lieferungen an Personen, die eine Id.-Nummer in"
-" einem anderen Mitgliedstaat besitzen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
-msgid "458 - Invoiced by other taxable persons for goods or services supplied"
-msgstr ""
-"458 - Von anderen Steuerpflichtigen für Warenlieferungen und "
-"Dienstleistungen in Rechnung gestellte Mehrwertsteuer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
-msgid "459 - Due in respect of intra-Community acquisitions of goods"
-msgstr ""
-"459 - Erklärte oder bezahlte Mehrwertsteuer für innergemeinschaftliche "
-"Erwerbe von Gegenständen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
-msgid "460 - Due or paid in respect of importation of goods"
-msgstr "460 - Erklärte oder bezahlte Mehrwertsteuer für eingeführte Waren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
-msgid "461 - Due under the reverse charge (see points II.E and F)"
-msgstr "461 - Als Schuldner erklärte Mehrwertsteuer (Siehe Punkte II.E und F)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax
-msgid "462 - tax"
-msgstr "462 - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base
-msgid "463 - base"
-msgstr "463 - Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax
-msgid "464 - tax"
-msgstr "464 - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_telecom_service
-msgid ""
-"471 - Telecommunications services, radio and television broadcasting "
-"services..."
-msgstr ""
-"471 - Telekommunikationsdienstleistungen, Rundfunk- und "
-"Fernsehdienstleistungen..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_other_sales
-msgid "472 - Other sales / receipts"
-msgstr "472 - Andere Umsätze / Erträge"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_8_supplies_carried_out_domestic
-msgid ""
-"481 - Supplies carried out within the scope of the domestic SME scheme of "
-"article 57bis (7)"
-msgstr ""
-"481 - Lieferungen, die im Rahmen der inländischen KMU-Regelung nach Artikel "
-"57bis Absatz 7 erfolgen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_9_supplies_carried_out_cross_border
-msgid ""
-"482 - Supplies carried out within the scope of the cross-border SME scheme "
-"of article 57quater "
-msgstr ""
-"482 - Lieferungen, die im Rahmen der grenzüberschreitenden KMU-Regelung des "
-"Artikels 57quater erfolgen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_17
-msgid "701 - base 17%"
-msgstr "701 - Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_17
-msgid "702 - tax 17%"
-msgstr "702 - MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_14
-msgid "703 - base 14%"
-msgstr "703 - Besteuerungsgrundlage 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_14
-msgid "704 - tax 14%"
-msgstr "704 - MwSt. 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_8
-msgid "705 - base 8%"
-msgstr "705 - Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_8
-msgid "706 - tax 8%"
-msgstr "706 - MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_17
-msgid "711 - base 17%"
-msgstr "711 - Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_17
-msgid "712 - tax 17%"
-msgstr "712 - MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_14
-msgid "713 - base 14%"
-msgstr "713 - Besteuerungsgrundlage 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_14
-msgid "714 - tax 14%"
-msgstr "714 - MwSt. 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_8
-msgid "715 - base 8%"
-msgstr "715 - Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_8
-msgid "716 - tax 8%"
-msgstr "716 - MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
-msgid ""
-"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-"719 - von Tabakwaren, deren Mehrwertsteuer am Ausgang des Steuerlagers "
-"gemeinsam mit den Verbrauchsteuern erhoben wird"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_17
-msgid "721 - for business purposes: base 17%"
-msgstr "721 - für Zwecke des Unternehmens: Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_17
-msgid "722 - for business purposes: tax 17%"
-msgstr "722 - für Zwecke des Unternehmens: MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_14
-msgid "723 - for business purposes: base 14%"
-msgstr "723 - für Zwecke des Unternehmens: Besteuerungsgrundlage 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_14
-msgid "724 - for business purposes: tax 14%"
-msgstr "724 - für Zwecke des Unternehmens: MwSt. 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_8
-msgid "725 - for business purposes: base 8%"
-msgstr "725 - für Zwecke des Unternehmens: Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_8
-msgid "726 - for business purposes: tax 8%"
-msgstr "726 - für Zwecke des Unternehmens: MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
-msgid ""
-"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-"729 - von Tabakwaren, deren Mehrwertsteuer am Ausgang des Steuerlagers "
-"gemeinsam mit den Verbrauchsteuern erhoben wird"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_17
-msgid "731 - for non-business purposes: base 17%"
-msgstr "731 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_17
-msgid "732 - for non-business purposes: tax 17%"
-msgstr "732 - für unternehmensfremde Zwecke: MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_14
-msgid "733 - for non-business purposes: base 14%"
-msgstr "733 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_14
-msgid "734 - for non-business purposes: tax 14%"
-msgstr "734 - für unternehmensfremde Zwecke: MwSt. 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_8
-msgid "735 - for non-business purposes: base 8%"
-msgstr "735 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_8
-msgid "736 - for non-business purposes: tax 8%"
-msgstr "736 - für unternehmensfremde Zwecke: MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_17
-msgid "741 - not exempt within the territory: base 17%"
-msgstr "741 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
-msgid "742 - not exempt within the territory: tax 17%"
-msgstr "742 - nicht steuerbefreit im Inland: MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_14
-msgid "743 - not exempt within the territory: base 14%"
-msgstr "743 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
-msgid "744 - not exempt within the territory: tax 14%"
-msgstr "744 - nicht steuerbefreit im Inland: MwSt. 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_8
-msgid "745 - not exempt within the territory: base 8%"
-msgstr "745 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
-msgid "746 - not exempt within the territory: tax 8%"
-msgstr "746 - nicht steuerbefreit im Inland: MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_17
-msgid "751 - not established or residing within the Community: base 17%"
-msgstr ""
-"751 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_17
-msgid "752 - not established or residing within the Community: tax 17%"
-msgstr ""
-"752 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_14
-msgid "753 - not established or residing within the Community: base 14%"
-msgstr ""
-"753 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_14
-msgid "754 - not established or residing within the Community: tax 14%"
-msgstr ""
-"754 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_8
-msgid "755 - not established or residing within the Community: base 8%"
-msgstr ""
-"755 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_8
-msgid "756 - not established or residing within the Community: tax 8%"
-msgstr ""
-"756 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_17
-msgid "761 - suppliers established within the territory: base 17%"
-msgstr ""
-"761 - erbracht an den Erklärenden von im Inland ansässigen "
-"Steuerpflichtigen: Besteuerungsgrundlage 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_17
-msgid "762 - suppliers established within the territory: tax 17%"
-msgstr ""
-"762 - erbracht an den Erklärenden von im Inland ansässigen "
-"Steuerpflichtigen: MwSt. 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
-msgid "763 - base 8%"
-msgstr "763 - Besteuerungsgrundlage 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
-msgid "764 - tax 8%"
-msgstr "764 - MwSt. 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base
-msgid "765 - base"
-msgstr "765 - Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax
-msgid "766 - tax"
-msgstr "766 - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base
-msgid ""
-"767 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - base"
-msgstr ""
-"767 - Vom Erwerber als Steuerschuldner zu erklärende Lieferungen - "
-"Besteuerungsgrundlage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax
-msgid ""
-"768 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - tax"
-msgstr ""
-"768 - Vom Erwerber als Steuerschuldner zu erklärende Lieferungen - MwSt."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_17
-msgid "769 - base 17%"
-msgstr "769 - 17% Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_17
-msgid "770 - tax 17%"
-msgstr "770 - Steuer 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_16
-msgid "901 - base 16%"
-msgstr "901 - Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_16
-msgid "902 - tax 16%"
-msgstr "902 - MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_13
-msgid "903 - base 13%"
-msgstr "903 - Besteuerungsgrundlage 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_13
-msgid "904 - tax 13%"
-msgstr "904 - MwSt. 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_7
-msgid "905 - base 7%"
-msgstr "905 - Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_7
-msgid "906 - tax 7%"
-msgstr "906 - MwSt. 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_16
-msgid "911 - base 16%"
-msgstr "911 - Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_16
-msgid "912 - tax 16%"
-msgstr "912 - MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_13
-msgid "913 - base 13%"
-msgstr "913 - Besteuerungsgrundlage 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_13
-msgid "914 - tax 13%"
-msgstr "914 - MwSt. 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_7
-msgid "915 - base 7%"
-msgstr "915 - Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_7
-msgid "916 - tax 7%"
-msgstr "916 - MwSt. 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_16
-msgid "921 - for business purposes: base 16%"
-msgstr "921 - für Zwecke des Unternehmens: Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_16
-msgid "922 - for business purposes: tax 16%"
-msgstr "922 - für Zwecke des Unternehmens: MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_13
-msgid "923 - for business purposes: base 13%"
-msgstr "923 - für Zwecke des Unternehmens: Besteuerungsgrundlage 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_13
-msgid "924 - for business purposes: tax 13%"
-msgstr "924 - für Zwecke des Unternehmens: MwSt. 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_7
-msgid "925 - for business purposes: base 7%"
-msgstr "925 - für Zwecke des Unternehmens: Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_7
-msgid "926 - for business purposes: tax 7%"
-msgstr "926 - für Zwecke des Unternehmens: MwSt. 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_16
-msgid "931 - for non-business purposes: base 16%"
-msgstr "931 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_16
-msgid "932 - for non-business purposes: tax 16%"
-msgstr "932 - für unternehmensfremde Zwecke: MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_13
-msgid "933 - for non-business purposes: base 13%"
-msgstr "933 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_13
-msgid "934 - for non-business purposes: tax 13%"
-msgstr "934 - für unternehmensfremde Zwecke: MwSt. 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_7
-msgid "935 - for non-business purposes: base 7%"
-msgstr "935 - für unternehmensfremde Zwecke: Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_7
-msgid "936 - for non-business purposes: tax 7%"
-msgstr "936 - für unternehmensfremde Zwecke: MwSt. 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_16
-msgid "941 - not exempt within the territory: base 16%"
-msgstr "941 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_16
-msgid "942 - not exempt within the territory: tax 16%"
-msgstr "942 - nicht steuerbefreit im Inland: MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_13
-msgid "943 - not exempt within the territory: base 13%"
-msgstr "943 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_13
-msgid "944 - not exempt within the territory: tax 13%"
-msgstr "944 - nicht steuerbefreit im Inland: MwSt. 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_7
-msgid "945 - not exempt within the territory: base 7%"
-msgstr "945 - nicht steuerbefreit im Inland: Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_7
-msgid "946 - not exempt within the territory: tax 7%"
-msgstr "946 - nicht steuerbefreit im Inland: MwSt. 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_16
-msgid "951 - not established or residing within the Community: base 16%"
-msgstr ""
-"951 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_16
-msgid "952 - not established or residing within the Community: tax 16%"
-msgstr ""
-"952 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_13
-msgid "953 - not established or residing within the Community: base 13%"
-msgstr ""
-"953 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_13
-msgid "954 - not established or residing within the Community: tax 13%"
-msgstr ""
-"954 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_7
-msgid "955 - not established or residing within the Community: base 7%"
-msgstr ""
-"955 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_7
-msgid "956 - not established or residing within the Community: tax 7%"
-msgstr ""
-"956 - erbracht an den Erklärenden von Steuerpflichtigen, die nicht in der "
-"Gemeinschaft ansässig sind: MwSt. 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_16
-msgid "961 - suppliers established within the territory: base 16%"
-msgstr ""
-"961 - erbracht an den Erklärenden von im Inland ansässigen "
-"Steuerpflichtigen: Besteuerungsgrundlage 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_16
-msgid "962 - suppliers established within the territory: tax 16%"
-msgstr ""
-"962 - erbracht an den Erklärenden von im Inland ansässigen "
-"Steuerpflichtigen: MwSt. 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_7
-msgid "963 - base 7%"
-msgstr "963 - Besteuerungsgrundlage 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_7
-msgid "964 - tax 7%"
-msgstr "964 - MwSt. 7%"
-
-#. module: l10n_lu
-#: model:ir.model,name:l10n_lu.model_account_chart_template
-msgid "Account Chart Template"
-msgstr "Kontenplanvorlage"
-
-#. module: l10n_lu
-#: model:account.report.column,name:l10n_lu.tax_report_section_1_balance
-#: model:account.report.column,name:l10n_lu.tax_report_section_2_balance
-#: model:account.report.column,name:l10n_lu.tax_report_sections_3_4_balance
-msgid "Balance"
-msgstr "Waage"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_turnover
-msgid "I. ASSESSMENT OF TAXABLE TURNOVER"
-msgstr "I. BERECHNUNG DES STEUERPFLICHTIGEN UMSATZES"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_tax_due
-msgid "II. ASSESSMENT OF TAX DUE"
-msgstr "II. FESTSETZUNG DER GESCHULDETEN STEUER"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3_assessment_deducible_tax
-msgid "III. ASSESSMENT OF DEDUCTIBLE TAX (input tax)"
-msgstr "III. BERECHNUNG DER ABZIEHBAREN VORSTEUER"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4_tax_tobe_paid_or_reclaimed
-msgid "IV. TAX TO BE PAID OR TO BE RECLAIMED"
-msgstr "IV. BERECHNUNG DES ÜBERSCHUSSES"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
-msgid "Luxembourg"
-msgstr "Luxemburg"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_1
-msgid "Section I"
-msgstr "Abschnitt I"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_2
-msgid "Section II"
-msgstr "Abschnitt II"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_sections_3_4
-msgid "Sections III, IV"
-msgstr "Abschnitte III, IV"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.tax_report
-msgid "Tax Report"
-msgstr "Steuerbericht"
diff --git a/addons/l10n_lu/i18n_extra/fr.po b/addons/l10n_lu/i18n_extra/fr.po
deleted file mode 100644
index 60765d8760532..0000000000000
--- a/addons/l10n_lu/i18n_extra/fr.po
+++ /dev/null
@@ -1,1312 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* l10n_lu
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~17.4+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-19 08:35+0000\n"
-"PO-Revision-Date: 2025-05-19 08:35+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_001
-msgid "001 - Supply of inhouse manufactured goods"
-msgstr "001 - Fourniture de produits fabriqués en interne"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_002
-msgid "002 - Supply of goods not manufactured inhouse"
-msgstr "002 - Fourniture de biens non fabriqués en interne"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_003
-msgid "003 - Net profit margin"
-msgstr "003 - Marge bénéficiaire nette"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_004
-msgid "004 - Supply of services"
-msgstr "004 - Prestations de services"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_005
-msgid "005 - Disposal of tangible and intangible capital assets"
-msgstr "005 - Cession d'immobilisations corporelles et incorporelles"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_008
-msgid "008 - Application of goods for private use or for that of the staff"
-msgstr "008 - Utilisation de biens à des fins privées ou pour le compte du personnel"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_009
-msgid "009 - Application for the purpose of business of goods"
-msgstr "009 - Demande aux fins de commerce de marchandises"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_010
-msgid "010 - Use of goods considered business assets"
-msgstr "010 - Utilisation de biens considérés comme des actifs de l'entreprise"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_011
-msgid "011 - Supply of services carried out free of charge"
-msgstr "011 - Prestations de services effectuées à titre gratuit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_overall_turnover
-msgid "012 - Overall turnover"
-msgstr "012 - Chiffre d'affaires global"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_013
-msgid "013 - IC supply of goods"
-msgstr "013 - IC fourniture de biens"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_2_export
-msgid "014 - Exports"
-msgstr "014 - Exportations"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
-msgid "015 - Other exemptions"
-msgstr "015 - Autres exonérations"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
-msgid "016 - Other exemptions"
-msgstr "016 - Autres exonérations"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_5_manufactured_tobacco_vat_collected
-msgid ""
-"017 - Manufactured tobacco whose VAT was collected at the source or at the "
-"exit of the tax..."
-msgstr ""
-"017 - Tabacs fabriqués dont la TVA a été perçue à la source respectivement à"
-" la sortie de l'entrepôt fiscal..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_a_subsequent_to_intra_community
-msgid ""
-"018 - Supply, subsequent to intra-Community acquisitions of goods, in the "
-"context of triangular transactions, when the customer identified,..."
-msgstr ""
-"018 - Livraisons subséquentes à des acqu. Intra. dans le cadre d'opérations "
-"triangulaires…"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
-msgid ""
-"019 - Other supplies carried out (for which the place of supply is) abroad"
-msgstr "019 - Autres opérations réalisées (imposables) à l'étranger"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_exemptions_deductible_amounts
-msgid "021 - Exemptions and deductible amounts"
-msgstr "021 - Exonérations et montants déductibles"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1c_taxable_turnover
-msgid "022 - Taxable turnover"
-msgstr "022 - Chiffre d'affaires imposable"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_3
-msgid "031 - base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_0
-msgid "033 - base 0%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_base
-msgid "037 - Breakdown of taxable turnover – base"
-msgstr "037 - Chiffre d'affaires imposable – base"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_3
-msgid "040 - tax 3%"
-msgstr "040 - taxe 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_tax
-msgid "046 - Breakdown of taxable turnover – tax"
-msgstr "046 - Chiffre d'affaires imposable – taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_3
-msgid "049 - base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acqui_of_goods_base
-msgid "051 - Intra-Community acquisitions of goods – base"
-msgstr "051 - Acquisitions intracommunautaires de biens - base"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_3
-msgid "054 - tax 3%"
-msgstr "054 - taxe 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acquisitions_goods_tax
-msgid "056 - Intra-Community acquisitions of goods – tax"
-msgstr "056 - Acquisitions intracommunautaires de biens - taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_3
-msgid "059 - for business purposes: base 3%"
-msgstr "059 - à des fins de l'entreprise: base 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_3
-msgid "063 - for non-business purposes: base 3%"
-msgstr "063 - à des fins étrangères à l'entreprise: base 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_base
-msgid "065 - Importation of goods – base"
-msgstr "065 - Importations de biens - base"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_3
-msgid "068 - for business purposes: tax 3%"
-msgstr "068 - à des fins de l'entreprise: taxe de 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_3
-msgid "073 - for non-business purposes: tax 3%"
-msgstr "073 - à des fins étrangères à l'entreprise: taxe de 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2h_total_tax_due
-msgid "076 - Total tax due"
-msgstr "076 - Total de la taxe en aval"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_077
-msgid "077 - VAT on stock entries invoiced by other taxable persons"
-msgstr "077 - TVA sur les entrées en stock facturées par d'autres assujettis"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_078
-msgid "078 - VAT on stock entries due in respect of IC acquisitions"
-msgstr "078 - TVA sur les entrées en stock due au titre des acquisitions de CI"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_079
-msgid "079 - VAT on stock entries of importations of goods"
-msgstr "079 - TVA sur les entrées en stock des importations de biens"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_081
-msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
-msgstr "081 - TVA sur les dépenses d'investissement facturées par d'autres assujettis"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_082
-msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
-msgstr "082 - TVA sur les dépenses en capital dues au titre des acquisitions d'IC"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_083
-msgid "083 - VAT on capital expenditures of importations of goods"
-msgstr "083 - TVA sur les dépenses en capital des importations de biens"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_085
-msgid ""
-"085 - VAT on operational expenditures invoiced by other taxable persons"
-msgstr ""
-"085 - TVA sur les dépenses opérationnelles facturées par d'autres assujettis"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_086
-msgid ""
-"086 - VAT on operational expenditures due in respect of IC acquisitions"
-msgstr ""
-"086 - TVA sur les dépenses opérationnelles due au titre des acquisitions IC"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_087
-msgid "087 - VAT on operational expenditures of importations of goods"
-msgstr "087 - TVA sur les dépenses opérationnelles d'importation de biens"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
-msgid "090 - Due in respect of the application of goods for business purposes"
-msgstr "090 - Taxe déclarée pour l'affectation de biens à l'entreprise"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
-msgid "092 - Paid as joint and several guarantee"
-msgstr "092 - Taxe acquittée comme caution solidaire"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_total_input_tax
-msgid "093 - Total input tax"
-msgstr "093 - Total de la taxe en amont"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b1_rel_trans
-msgid ""
-"094 - relating to transactions which are exempt pursuant to articles 44 and "
-"56quater"
-msgstr ""
-"094 - Taxe non déductible en rapport avec des opérations exonérées en vertu "
-"des articles 44 et 56quater"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_ded_prop
-msgid ""
-"095 - where the deductible proportion determined in accordance to article 50"
-" is applied"
-msgstr ""
-"095 - Taxe non déductible en application du prorata visé à l'article 50"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
-msgid ""
-"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
-"56ter-2(7) (when applying the margin scheme)"
-msgstr ""
-"096 - Taxe non déductible en application des articles 56ter-1/7 et 56ter-2/7"
-" (en cas d'option pour le régime d'imposition de la marge bénéficiaire)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
-msgid "097 - Total input tax non-deductible"
-msgstr "097 - Total de la taxe en amont non déductible"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3c_total_input_tax_deductible
-msgid "102 - Total input tax deductible"
-msgstr "102 - Total de la taxe en amont déductible"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_tax_due
-msgid "103 - Total tax due"
-msgstr "103 - Total de la taxe en aval"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_input_tax_deductible
-msgid "104 - Total input tax deductible"
-msgstr "104 - Total de la taxe en amont déductible"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4c_exceeding_amount
-msgid "105 - Exceeding amount"
-msgstr "105 - Excédent"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2c_acquisitions_triangular_transactions_base
-msgid "152 - Acquisitions, in the context of triangular transactions – base"
-msgstr "152 - Acquisitions triangulaires – base"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
-msgid ""
-"188 - Appendix A - Expenses for other work carried out by third parties"
-msgstr "188 - Annexe A - Frais pour d'autres travaux effectués par des tiers"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
-msgid "190 - Appendix A - Car expenses"
-msgstr "190 - Annexe A - Frais de voiture"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_exempt
-msgid "194 - base exempt"
-msgstr "194 - base exonérée"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_exempt
-msgid "195 - for business purposes: base exempt"
-msgstr "195 - à des fins de l'entreprise: base exonérée"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_exempt
-msgid "196 - for non-business purposes: base exempt"
-msgstr "196 - à des fins étrangères à l'entreprise: base exonérée"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_202
-msgid "202 - IC supply of new means of transport"
-msgstr "202 - Approvisionnement en nouveaux moyens de transport"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_203
-msgid "203 - Supply of goods carried out abroad"
-msgstr "203 - Livraisons de biens effectuées à l'étranger"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_c_supplies_scope_special_arrangement
-msgid ""
-"226 - Supplies carried out within the scope of the special arrangement of "
-"art. 56sexies"
-msgstr ""
-"226 - Opérations réalisées dans le cadre du régime particulier de l'article "
-"56sexies"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2g_special_arrangement
-msgid "227 - Special arrangement for tax suspension: adjustment"
-msgstr "227 - Régime particulier suspensif: régularisation"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
-msgid "228 - Adjusted tax - special arrangement for tax suspension"
-msgstr "228 - Taxe régularisée - régime particulier suspensif"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
-msgid "239 - Appendix A - Gross salaries"
-msgstr "239 - Annexe A - Salaires bruts"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
-msgid "244 - Appendix A - Gross wages"
-msgstr "244 - Annexe A - Salaires bruts"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
-msgid "247 - Appendix A - Occasional salaries"
-msgstr "247 - Annexe A - Salaires occasionnels"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
-msgid ""
-"250 - Appendix A - Compulsory social security contributions (employer's "
-"share)"
-msgstr ""
-"250 - Annexe A - Cotisations obligatoires de sécurité sociale (part "
-"patronale)"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
-msgid "253 - Appendix A - Accident insurance"
-msgstr "253 - Annexe A - Assurance accidents"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
-msgid "260 - Appendix A - Staff travel and representation expenses"
-msgstr "260 - Annexe A - Frais de voyage et de représentation du personnel"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
-msgid "269 - Appendix A - Accounting and bookkeeping fees"
-msgstr "269 - Annexe A - Frais de comptabilité et de tenue de livres"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
-msgid "283 - Appendix A - Employer's travel and representation expenses"
-msgstr "283 - Annexe A - Frais de déplacement et de représentation de l'employeur"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
-msgid "285 - Appendix A - Electricity"
-msgstr "285 - Annexe A - Électricité"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
-msgid "289 - Appendix A - Gas"
-msgstr "289 - Annexe A - Gaz"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
-msgid "293 - Appendix A - Employer's travel and representation expenses"
-msgstr ""
-"293 - Annexe A - Frais de déplacement et de représentation de l'employeur"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
-msgid "301 - Appendix A - Telecommunications"
-msgstr "301 - Annexe A - Télécommunications"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
-msgid ""
-"305 - Appendix A - Renting/leasing of immovable property with application of"
-" VAT"
-msgstr ""
-"305 - Annexe A - Location/affermage de biens immobiliers avec application de"
-" la TVA"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
-msgid ""
-"307 - Appendix A - Renting/leasing of immovable property with no application"
-" of VAT"
-msgstr ""
-"307 - Annexe A - Location/affermage de biens immobiliers sans application de"
-" la TVA"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
-msgid ""
-"310 - Appendix A - Renting/leasing of permanently installed equipment and "
-"machinery"
-msgstr ""
-"310 - Annexe A - Location/leasing d'équipements et de machines installés de "
-"façon permanente"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
-msgid "316 - Appendix A - Property tax"
-msgstr "316 - Annexe A - Impôt foncier"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
-msgid "324 - Appendix A - Business tax"
-msgstr "324 - Annexe A - Taxe professionnelle"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
-msgid "326 - Appendix A - Interest paid for long-term debts"
-msgstr "326 - Annexe A - Intérêts payés pour les dettes à long terme"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
-msgid "327 - Appendix A - Interest paid for short-term debts"
-msgstr "327 - Annexe A - Intérêts payés pour les dettes à court terme"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
-msgid "328 - Appendix A - Other financial costs"
-msgstr "328 - Annexe A - Autres coûts financiers"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
-msgid "330 - Appendix A - Stock and business equipment insurance"
-msgstr "330 - Annexe A - Assurance du stock et du matériel d'entreprise"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
-msgid ""
-"331 - Appendix A - Public and professional third party liability insurance"
-msgstr ""
-"331 - Annexe A - Assurance responsabilité civile publique et professionnelle"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
-msgid "332 - Appendix A - Office expenses"
-msgstr "332 - Annexe A - Frais de bureau"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
-msgid ""
-"336 - Appendix A - Fees and subscriptions paid to professional associations "
-"and learned societies"
-msgstr ""
-"336 - Annexe A - Cotisations versées aux associations professionnelles et "
-"aux sociétés savantes"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
-msgid "337 - Appendix A - Papers and periodicals for business purposes"
-msgstr "337 - Annexe A - Papiers et périodiques à usage professionnel"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
-msgid "343 - Appendix A - Shipping and transport expenses"
-msgstr "343 - Annexe A - Frais d'expédition et de transport"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
-msgid "345 - Appendix A - Work clothes"
-msgstr "345 - Annexe A - Vêtements de travail"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
-msgid "347 - Appendix A - Advertising and publicity"
-msgstr "347 - Annexe A - Publicité et annonce"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
-msgid "349 - Appendix A - Packaging"
-msgstr "349 - Annexe A - Emballage"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
-msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
-msgstr ""
-"351 - Annexe A - Réparation et entretien des équipements et des machines"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
-msgid "353 - Appendix A - Other repairs"
-msgstr "353 - Annexe A - Autres réparations"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
-msgid ""
-"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
-"be fully allocated to the year of acquisition or creation"
-msgstr ""
-"355 - Annexe A - Nouvelles acquisitions (outils et équipements) si leur coût"
-" peut être entièrement imputé à l'année d'acquisition ou de création"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
-msgid "358 - Appendix A - Custom (value)"
-msgstr "358 - Annexe A - Personnalisation (valeur)"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
-msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
-msgstr "361 - Annexe A - Total \"Annexe aux dépenses opérationnelles\"."
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_404
-msgid "404 - VAT on stock entries due under the reverse charge"
-msgstr "404 - TVA sur les entrées en stock due au titre de l'autoliquidation"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_405
-msgid "405 - VAT on capital expenditures due under the reverse charge"
-msgstr "405 - TVA sur les dépenses en capital due au titre de l'autoliquidation"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_406
-msgid "406 - VAT on operational expenditures due under the reverse charge"
-msgstr "406 - TVA sur les dépenses opérationnelles due au titre de l'autoliquidation"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_tax
-msgid "407 - Importation of goods – tax"
-msgstr "407 - Importations de biens - taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer
-msgid ""
-"409 - Supply of services for which the customer is liable for the payment of"
-" VAT – base"
-msgstr ""
-"409 - Prestations de services à déclarer par le preneur redevable de la taxe"
-" - base"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax
-msgid ""
-"410 - Supply of services for which the customer is liable for the payment of"
-" VAT – tax"
-msgstr ""
-"410 - Prestations de services à déclarer par le preneur redevable de la taxe"
-" - taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_7_inland_supplies_for_customer
-msgid ""
-"419 - Inland supplies for which the customer is liable for the payment of "
-"VAT"
-msgstr ""
-"419 - Opérations à l'intérieur du pays pour lesquelles le preneur est le "
-"redevable"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b1_non_exempt_customer_vat
-msgid ""
-"423 - not exempt in the MS where the customer is liable for payment of VAT"
-msgstr ""
-"423 - Prestations de services non exonérées dans l'Etat membre du preneur "
-"redevable"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
-msgid "424 - exempt in the MS where the customer is identified"
-msgstr "424 - Prestations de services exonérées dans l'Etat membre du preneur"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_3
-msgid "431 - not exempt within the territory: base 3%"
-msgstr "431 - non exonérées à l'intérieur du pays: base 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
-msgid "432 - not exempt within the territory: tax 3%"
-msgstr "432 - non exonérées à l'intérieur du pays: tax 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_b_exempt
-msgid "435 - exempt within the territory: exempt"
-msgstr "435 - exonérées à l'intérieur du pays: exonérées"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_base
-msgid "436 - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_3
-msgid "441 - not established or residing within the Community: base 3%"
-msgstr ""
-"441 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_3
-msgid "442 - not established or residing within the Community: tax 3%"
-msgstr ""
-"442 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: tax 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_exempt
-msgid "445 - not established or residing within the Community: exempt"
-msgstr ""
-"445 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: exonérées"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_total_sale
-msgid "454 - Total Sales / Receipts"
-msgstr "454 - Total Ventes / Recettes"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_app_goods_non_bus
-msgid ""
-"455 - Application of goods for non-business use and for business purposes"
-msgstr ""
-"455 - Application de biens de l'utilisation privée et à des fins de "
-"l'entreprise"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_non_bus_gs
-msgid "456 - Non-business use of goods and supply of services free of charge"
-msgstr ""
-"456 - Prestations de services effectuées à des fins étrangères à "
-"l'entreprise"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_1_intra_community_goods_pi_vat
-msgid ""
-"457 - Intra-Community supply of goods to persons identified for VAT purposes"
-" in another Member State (MS)"
-msgstr ""
-"457 - Livraisons intracommunautaires de biens à des personnes identifiées à "
-"la TVA dans un autre État membre"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
-msgid "458 - Invoiced by other taxable persons for goods or services supplied"
-msgstr ""
-"458 - Taxe facturée par d'autres assujettis pour des biens et des services "
-"fournis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
-msgid "459 - Due in respect of intra-Community acquisitions of goods"
-msgstr ""
-"459 - Taxe déclarée ou payée sur des acquisitions intracommunautaires de "
-"biens"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
-msgid "460 - Due or paid in respect of importation of goods"
-msgstr "460 - Taxe déclarée ou payée sur des biens importés"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
-msgid "461 - Due under the reverse charge (see points II.E and F)"
-msgstr "461 - Taxe déclarée comme débiteur (cf points II.E et F)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax
-msgid "462 - tax"
-msgstr "462 - taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base
-msgid "463 - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax
-msgid "464 - tax"
-msgstr "464 - taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_telecom_service
-msgid ""
-"471 - Telecommunications services, radio and television broadcasting "
-"services..."
-msgstr "471 - Prestations de services de télécom., de radio et de tv..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_other_sales
-msgid "472 - Other sales / receipts"
-msgstr "472 - Autres Ventes / Recettes"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_8_supplies_carried_out_domestic
-msgid ""
-"481 - Supplies carried out within the scope of the domestic SME scheme of "
-"article 57bis (7)"
-msgstr ""
-"481 - Fournitures effectuées dans le cadre du régime national des PME de "
-"l'article 57bis (7)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_9_supplies_carried_out_cross_border
-msgid ""
-"482 - Supplies carried out within the scope of the cross-border SME scheme "
-"of article 57quater "
-msgstr ""
-"482 - Fournitures effectuées dans le cadre du régime des PME "
-"transfrontalières de l'article 57 quater"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_17
-msgid "701 - base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_17
-msgid "702 - tax 17%"
-msgstr "702 - taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_14
-msgid "703 - base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_14
-msgid "704 - tax 14%"
-msgstr "704 - taxe 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_8
-msgid "705 - base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_8
-msgid "706 - tax 8%"
-msgstr "706 - taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_17
-msgid "711 - base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_17
-msgid "712 - tax 17%"
-msgstr "712 - taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_14
-msgid "713 - base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_14
-msgid "714 - tax 14%"
-msgstr "714 - taxe 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_8
-msgid "715 - base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_8
-msgid "716 - tax 8%"
-msgstr "716 - taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
-msgid ""
-"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-"719 - de tabacs fabriqués dont la TVA est perçue à la sortie de l'entrepôt "
-"fiscal conjointement avec les accises"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_17
-msgid "721 - for business purposes: base 17%"
-msgstr "721 - à des fins de l'entreprise: base 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_17
-msgid "722 - for business purposes: tax 17%"
-msgstr "722 - à des fins de l'entreprise: taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_14
-msgid "723 - for business purposes: base 14%"
-msgstr "723 - à des fins de l'entreprise: base 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_14
-msgid "724 - for business purposes: tax 14%"
-msgstr "724 - à des fins de l'entreprise: taxe 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_8
-msgid "725 - for business purposes: base 8%"
-msgstr "725 - à des fins de l'entreprise: base 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_8
-msgid "726 - for business purposes: tax 8%"
-msgstr "726 - à des fins de l'entreprise: taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
-msgid ""
-"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-"729 - de tabacs fabriqués dont la TVA est perçue à la sortie de l'entrepôt "
-"fiscal conjointement avec les accises"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_17
-msgid "731 - for non-business purposes: base 17%"
-msgstr "731 - à des fins étrangères à l'entreprise: base 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_17
-msgid "732 - for non-business purposes: tax 17%"
-msgstr "732 - à des fins étrangères à l'entreprise: taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_14
-msgid "733 - for non-business purposes: base 14%"
-msgstr "733 - à des fins étrangères à l'entreprise: base 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_14
-msgid "734 - for non-business purposes: tax 14%"
-msgstr "734 - à des fins étrangères à l'entreprise: taxe 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_8
-msgid "735 - for non-business purposes: base 8%"
-msgstr "735 - à des fins étrangères à l'entreprise: base 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_8
-msgid "736 - for non-business purposes: tax 8%"
-msgstr "736 - à des fins étrangères à l'entreprise: taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_17
-msgid "741 - not exempt within the territory: base 17%"
-msgstr "741 - non exonérées à l'intérieur du pays: base 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
-msgid "742 - not exempt within the territory: tax 17%"
-msgstr "742 - non exonérées à l'intérieur du pays: taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_14
-msgid "743 - not exempt within the territory: base 14%"
-msgstr "743 - non exonérées à l'intérieur du pays: base 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
-msgid "744 - not exempt within the territory: tax 14%"
-msgstr "744 - non exonérées à l'intérieur du pays: taxe 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_8
-msgid "745 - not exempt within the territory: base 8%"
-msgstr "745 - non exonérées à l'intérieur du pays: base 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
-msgid "746 - not exempt within the territory: tax 8%"
-msgstr "746 - non exonérées à l'intérieur du pays: taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_17
-msgid "751 - not established or residing within the Community: base 17%"
-msgstr ""
-"751 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_17
-msgid "752 - not established or residing within the Community: tax 17%"
-msgstr ""
-"752 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_14
-msgid "753 - not established or residing within the Community: base 14%"
-msgstr ""
-"753 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_14
-msgid "754 - not established or residing within the Community: tax 14%"
-msgstr ""
-"754 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: taxe 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_8
-msgid "755 - not established or residing within the Community: base 8%"
-msgstr ""
-"755 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_8
-msgid "756 - not established or residing within the Community: tax 8%"
-msgstr ""
-"756 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_17
-msgid "761 - suppliers established within the territory: base 17%"
-msgstr ""
-"761 - effectuées au déclarant par des assujettis établis à l'intérieur du "
-"pays: base 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_17
-msgid "762 - suppliers established within the territory: tax 17%"
-msgstr ""
-"762 - effectuées au déclarant par des assujettis établis à l'intérieur du "
-"pays: taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
-msgid "763 - base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
-msgid "764 - tax 8%"
-msgstr "764 - taxe 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base
-msgid "765 - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax
-msgid "766 - tax"
-msgstr "766 - taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base
-msgid ""
-"767 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - base"
-msgstr ""
-"767 - Livraisons de biens à déclarer par l'acquéreur redevable de la taxe - "
-"base"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax
-msgid ""
-"768 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - tax"
-msgstr ""
-"768 - Livraisons de biens à déclarer par l'acquéreur redevable de la taxe - "
-"taxe"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_17
-msgid "769 - base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_17
-msgid "770 - tax 17%"
-msgstr "770 - taxe 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_16
-msgid "901 - base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_16
-msgid "902 - tax 16%"
-msgstr "902 - taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_13
-msgid "903 - base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_13
-msgid "904 - tax 13%"
-msgstr "904 - taxe 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_7
-msgid "905 - base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_7
-msgid "906 - tax 7%"
-msgstr "906 - taxe 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_16
-msgid "911 - base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_16
-msgid "912 - tax 16%"
-msgstr "912 - taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_13
-msgid "913 - base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_13
-msgid "914 - tax 13%"
-msgstr "914 - taxe 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_7
-msgid "915 - base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_7
-msgid "916 - tax 7%"
-msgstr "916 - taxe 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_16
-msgid "921 - for business purposes: base 16%"
-msgstr "921 - à des fins de l'entreprise: base 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_16
-msgid "922 - for business purposes: tax 16%"
-msgstr "922 - à des fins de l'entreprise: taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_13
-msgid "923 - for business purposes: base 13%"
-msgstr "923 - à des fins de l'entreprise: base 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_13
-msgid "924 - for business purposes: tax 13%"
-msgstr "924 - à des fins de l'entreprise: taxe 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_7
-msgid "925 - for business purposes: base 7%"
-msgstr "925 - à des fins de l'entreprise: base 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_7
-msgid "926 - for business purposes: tax 7%"
-msgstr "926 - à des fins de l'entreprise: taxe 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_16
-msgid "931 - for non-business purposes: base 16%"
-msgstr "931 - à des fins étrangères à l'entreprise: base 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_16
-msgid "932 - for non-business purposes: tax 16%"
-msgstr "932 - à des fins étrangères à l'entreprise: taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_13
-msgid "933 - for non-business purposes: base 13%"
-msgstr "933 - à des fins étrangères à l'entreprise: base 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_13
-msgid "934 - for non-business purposes: tax 13%"
-msgstr "934 - à des fins étrangères à l'entreprise: taxe 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_7
-msgid "935 - for non-business purposes: base 7%"
-msgstr "935 - à des fins étrangères à l'entreprise: base 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_7
-msgid "936 - for non-business purposes: tax 7%"
-msgstr "936 - à des fins étrangères à l'entreprise: taxe 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_16
-msgid "941 - not exempt within the territory: base 16%"
-msgstr "941 - non exonérées à l'intérieur du pays: base 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_16
-msgid "942 - not exempt within the territory: tax 16%"
-msgstr "942 - non exonérées à l'intérieur du pays: taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_13
-msgid "943 - not exempt within the territory: base 13%"
-msgstr "943 - non exonérées à l'intérieur du pays: base 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_13
-msgid "944 - not exempt within the territory: tax 13%"
-msgstr "944 - non exonérées à l'intérieur du pays: taxe 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_7
-msgid "945 - not exempt within the territory: base 7%"
-msgstr "945 - non exonérées à l'intérieur du pays: base 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_7
-msgid "946 - not exempt within the territory: tax 7%"
-msgstr "946 - non exonérées à l'intérieur du pays: taxe 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_16
-msgid "951 - not established or residing within the Community: base 16%"
-msgstr ""
-"951 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_16
-msgid "952 - not established or residing within the Community: tax 16%"
-msgstr ""
-"952 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_13
-msgid "953 - not established or residing within the Community: base 13%"
-msgstr ""
-"953 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_13
-msgid "954 - not established or residing within the Community: tax 13%"
-msgstr ""
-"954 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: taxe 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_7
-msgid "955 - not established or residing within the Community: base 7%"
-msgstr ""
-"955 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: base 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_7
-msgid "956 - not established or residing within the Community: tax 7%"
-msgstr ""
-"956 - effectuées au déclarant par des assujettis établis en dehors de la "
-"Communauté: taxe 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_16
-msgid "961 - suppliers established within the territory: base 16%"
-msgstr ""
-"961 - effectuées au déclarant par des assujettis établis à l'intérieur du "
-"pays: base 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_16
-msgid "962 - suppliers established within the territory: tax 16%"
-msgstr ""
-"962 - effectuées au déclarant par des assujettis établis à l'intérieur du "
-"pays: taxe 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_7
-msgid "963 - base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_7
-msgid "964 - tax 7%"
-msgstr "964 - taxe 7%"
-
-#. module: l10n_lu
-#: model:ir.model,name:l10n_lu.model_account_chart_template
-msgid "Account Chart Template"
-msgstr "Modèle de plan comptable"
-
-#. module: l10n_lu
-#: model:account.report.column,name:l10n_lu.tax_report_section_1_balance
-#: model:account.report.column,name:l10n_lu.tax_report_section_2_balance
-#: model:account.report.column,name:l10n_lu.tax_report_sections_3_4_balance
-msgid "Balance"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_turnover
-msgid "I. ASSESSMENT OF TAXABLE TURNOVER"
-msgstr "I. ÉVALUATION DU CHIFFRE D'AFFAIRES IMPOSABLE"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_tax_due
-msgid "II. ASSESSMENT OF TAX DUE"
-msgstr "II. ÉVALUATION DE LA TAXE DUE"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3_assessment_deducible_tax
-msgid "III. ASSESSMENT OF DEDUCTIBLE TAX (input tax)"
-msgstr "III. CALCUL DE LA TAXE DEDUCTIBLE (taxe en amont)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4_tax_tobe_paid_or_reclaimed
-msgid "IV. TAX TO BE PAID OR TO BE RECLAIMED"
-msgstr "IV. CALCUL DE L'EXCEDENT"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_1
-msgid "Section I"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_2
-msgid "Section II"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_sections_3_4
-msgid "Sections III, IV"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.tax_report
-msgid "Tax Report"
-msgstr "Rapport fiscal"
diff --git a/addons/l10n_lu/i18n_extra/l10n_lu.pot b/addons/l10n_lu/i18n_extra/l10n_lu.pot
deleted file mode 100644
index 200aab0524140..0000000000000
--- a/addons/l10n_lu/i18n_extra/l10n_lu.pot
+++ /dev/null
@@ -1,1216 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* l10n_lu
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~17.4+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-19 08:28+0000\n"
-"PO-Revision-Date: 2025-05-19 08:28+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_001
-msgid "001 - Supply of inhouse manufactured goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_002
-msgid "002 - Supply of goods not manufactured inhouse"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_003
-msgid "003 - Net profit margin"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_004
-msgid "004 - Supply of services"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_005
-msgid "005 - Disposal of tangible and intangible capital assets"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_008
-msgid "008 - Application of goods for private use or for that of the staff"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_009
-msgid "009 - Application for the purpose of business of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_010
-msgid "010 - Use of goods considered business assets"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_011
-msgid "011 - Supply of services carried out free of charge"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_overall_turnover
-msgid "012 - Overall turnover"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_013
-msgid "013 - IC supply of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_2_export
-msgid "014 - Exports"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
-msgid "015 - Other exemptions"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
-msgid "016 - Other exemptions"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_5_manufactured_tobacco_vat_collected
-msgid ""
-"017 - Manufactured tobacco whose VAT was collected at the source or at the "
-"exit of the tax..."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_a_subsequent_to_intra_community
-msgid ""
-"018 - Supply, subsequent to intra-Community acquisitions of goods, in the "
-"context of triangular transactions, when the customer identified,..."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
-msgid ""
-"019 - Other supplies carried out (for which the place of supply is) abroad"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_exemptions_deductible_amounts
-msgid "021 - Exemptions and deductible amounts"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1c_taxable_turnover
-msgid "022 - Taxable turnover"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_3
-msgid "031 - base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_0
-msgid "033 - base 0%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_base
-msgid "037 - Breakdown of taxable turnover – base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_3
-msgid "040 - tax 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_tax
-msgid "046 - Breakdown of taxable turnover – tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_3
-msgid "049 - base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acqui_of_goods_base
-msgid "051 - Intra-Community acquisitions of goods – base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_3
-msgid "054 - tax 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acquisitions_goods_tax
-msgid "056 - Intra-Community acquisitions of goods – tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_3
-msgid "059 - for business purposes: base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_3
-msgid "063 - for non-business purposes: base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_base
-msgid "065 - Importation of goods – base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_3
-msgid "068 - for business purposes: tax 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_3
-msgid "073 - for non-business purposes: tax 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2h_total_tax_due
-msgid "076 - Total tax due"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_077
-msgid "077 - VAT on stock entries invoiced by other taxable persons"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_078
-msgid "078 - VAT on stock entries due in respect of IC acquisitions"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_079
-msgid "079 - VAT on stock entries of importations of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_081
-msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_082
-msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_083
-msgid "083 - VAT on capital expenditures of importations of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_085
-msgid ""
-"085 - VAT on operational expenditures invoiced by other taxable persons"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_086
-msgid ""
-"086 - VAT on operational expenditures due in respect of IC acquisitions"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_087
-msgid "087 - VAT on operational expenditures of importations of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
-msgid "090 - Due in respect of the application of goods for business purposes"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
-msgid "092 - Paid as joint and several guarantee"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_total_input_tax
-msgid "093 - Total input tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b1_rel_trans
-msgid ""
-"094 - relating to transactions which are exempt pursuant to articles 44 and "
-"56quater"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_ded_prop
-msgid ""
-"095 - where the deductible proportion determined in accordance to article 50"
-" is applied"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
-msgid ""
-"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
-"56ter-2(7) (when applying the margin scheme)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
-msgid "097 - Total input tax non-deductible"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3c_total_input_tax_deductible
-msgid "102 - Total input tax deductible"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_tax_due
-msgid "103 - Total tax due"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_input_tax_deductible
-msgid "104 - Total input tax deductible"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4c_exceeding_amount
-msgid "105 - Exceeding amount"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2c_acquisitions_triangular_transactions_base
-msgid "152 - Acquisitions, in the context of triangular transactions – base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
-msgid ""
-"188 - Appendix A - Expenses for other work carried out by third parties"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
-msgid "190 - Appendix A - Car expenses"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_exempt
-msgid "194 - base exempt"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_exempt
-msgid "195 - for business purposes: base exempt"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_exempt
-msgid "196 - for non-business purposes: base exempt"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_202
-msgid "202 - IC supply of new means of transport"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_203
-msgid "203 - Supply of goods carried out abroad"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_c_supplies_scope_special_arrangement
-msgid ""
-"226 - Supplies carried out within the scope of the special arrangement of "
-"art. 56sexies"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2g_special_arrangement
-msgid "227 - Special arrangement for tax suspension: adjustment"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
-msgid "228 - Adjusted tax - special arrangement for tax suspension"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
-msgid "239 - Appendix A - Gross salaries"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
-msgid "244 - Appendix A - Gross wages"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
-msgid "247 - Appendix A - Occasional salaries"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
-msgid ""
-"250 - Appendix A - Compulsory social security contributions (employer's "
-"share)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
-msgid "253 - Appendix A - Accident insurance"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
-msgid "260 - Appendix A - Staff travel and representation expenses"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
-msgid "269 - Appendix A - Accounting and bookkeeping fees"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
-msgid "283 - Appendix A - Employer's travel and representation expenses"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
-msgid "285 - Appendix A - Electricity"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
-msgid "289 - Appendix A - Gas"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
-msgid "293 - Appendix A - Employer's travel and representation expenses"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
-msgid "301 - Appendix A - Telecommunications"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
-msgid ""
-"305 - Appendix A - Renting/leasing of immovable property with application of"
-" VAT"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
-msgid ""
-"307 - Appendix A - Renting/leasing of immovable property with no application"
-" of VAT"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
-msgid ""
-"310 - Appendix A - Renting/leasing of permanently installed equipment and "
-"machinery"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
-msgid "316 - Appendix A - Property tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
-msgid "324 - Appendix A - Business tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
-msgid "326 - Appendix A - Interest paid for long-term debts"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
-msgid "327 - Appendix A - Interest paid for short-term debts"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
-msgid "328 - Appendix A - Other financial costs"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
-msgid "330 - Appendix A - Stock and business equipment insurance"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
-msgid ""
-"331 - Appendix A - Public and professional third party liability insurance"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
-msgid "332 - Appendix A - Office expenses"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
-msgid ""
-"336 - Appendix A - Fees and subscriptions paid to professional associations "
-"and learned societies"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
-msgid "337 - Appendix A - Papers and periodicals for business purposes"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
-msgid "343 - Appendix A - Shipping and transport expenses"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
-msgid "345 - Appendix A - Work clothes"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
-msgid "347 - Appendix A - Advertising and publicity"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
-msgid "349 - Appendix A - Packaging"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
-msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
-msgid "353 - Appendix A - Other repairs"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
-msgid ""
-"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
-"be fully allocated to the year of acquisition or creation"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
-msgid "358 - Appendix A - Custom (value)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
-msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_404
-msgid "404 - VAT on stock entries due under the reverse charge"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_405
-msgid "405 - VAT on capital expenditures due under the reverse charge"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_406
-msgid "406 - VAT on operational expenditures due under the reverse charge"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_tax
-msgid "407 - Importation of goods – tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer
-msgid ""
-"409 - Supply of services for which the customer is liable for the payment of"
-" VAT – base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax
-msgid ""
-"410 - Supply of services for which the customer is liable for the payment of"
-" VAT – tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_7_inland_supplies_for_customer
-msgid ""
-"419 - Inland supplies for which the customer is liable for the payment of "
-"VAT"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b1_non_exempt_customer_vat
-msgid ""
-"423 - not exempt in the MS where the customer is liable for payment of VAT"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
-msgid "424 - exempt in the MS where the customer is identified"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_3
-msgid "431 - not exempt within the territory: base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
-msgid "432 - not exempt within the territory: tax 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_b_exempt
-msgid "435 - exempt within the territory: exempt"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_base
-msgid "436 - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_3
-msgid "441 - not established or residing within the Community: base 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_3
-msgid "442 - not established or residing within the Community: tax 3%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_exempt
-msgid "445 - not established or residing within the Community: exempt"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_total_sale
-msgid "454 - Total Sales / Receipts"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_app_goods_non_bus
-msgid ""
-"455 - Application of goods for non-business use and for business purposes"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_non_bus_gs
-msgid "456 - Non-business use of goods and supply of services free of charge"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_1_intra_community_goods_pi_vat
-msgid ""
-"457 - Intra-Community supply of goods to persons identified for VAT purposes"
-" in another Member State (MS)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
-msgid "458 - Invoiced by other taxable persons for goods or services supplied"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
-msgid "459 - Due in respect of intra-Community acquisitions of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
-msgid "460 - Due or paid in respect of importation of goods"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
-msgid "461 - Due under the reverse charge (see points II.E and F)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax
-msgid "462 - tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base
-msgid "463 - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax
-msgid "464 - tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_telecom_service
-msgid ""
-"471 - Telecommunications services, radio and television broadcasting "
-"services..."
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_other_sales
-msgid "472 - Other sales / receipts"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_8_supplies_carried_out_domestic
-msgid ""
-"481 - Supplies carried out within the scope of the domestic SME scheme of "
-"article 57bis (7)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_9_supplies_carried_out_cross_border
-msgid ""
-"482 - Supplies carried out within the scope of the cross-border SME scheme "
-"of article 57quater "
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_17
-msgid "701 - base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_17
-msgid "702 - tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_14
-msgid "703 - base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_14
-msgid "704 - tax 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_8
-msgid "705 - base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_8
-msgid "706 - tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_17
-msgid "711 - base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_17
-msgid "712 - tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_14
-msgid "713 - base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_14
-msgid "714 - tax 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_8
-msgid "715 - base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_8
-msgid "716 - tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
-msgid ""
-"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_17
-msgid "721 - for business purposes: base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_17
-msgid "722 - for business purposes: tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_14
-msgid "723 - for business purposes: base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_14
-msgid "724 - for business purposes: tax 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_8
-msgid "725 - for business purposes: base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_8
-msgid "726 - for business purposes: tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
-msgid ""
-"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_17
-msgid "731 - for non-business purposes: base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_17
-msgid "732 - for non-business purposes: tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_14
-msgid "733 - for non-business purposes: base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_14
-msgid "734 - for non-business purposes: tax 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_8
-msgid "735 - for non-business purposes: base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_8
-msgid "736 - for non-business purposes: tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_17
-msgid "741 - not exempt within the territory: base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
-msgid "742 - not exempt within the territory: tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_14
-msgid "743 - not exempt within the territory: base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
-msgid "744 - not exempt within the territory: tax 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_8
-msgid "745 - not exempt within the territory: base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
-msgid "746 - not exempt within the territory: tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_17
-msgid "751 - not established or residing within the Community: base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_17
-msgid "752 - not established or residing within the Community: tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_14
-msgid "753 - not established or residing within the Community: base 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_14
-msgid "754 - not established or residing within the Community: tax 14%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_8
-msgid "755 - not established or residing within the Community: base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_8
-msgid "756 - not established or residing within the Community: tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_17
-msgid "761 - suppliers established within the territory: base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_17
-msgid "762 - suppliers established within the territory: tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
-msgid "763 - base 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
-msgid "764 - tax 8%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base
-msgid "765 - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax
-msgid "766 - tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base
-msgid ""
-"767 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - base"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax
-msgid ""
-"768 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - tax"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_17
-msgid "769 - base 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_17
-msgid "770 - tax 17%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_16
-msgid "901 - base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_16
-msgid "902 - tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_13
-msgid "903 - base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_13
-msgid "904 - tax 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_7
-msgid "905 - base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_7
-msgid "906 - tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_16
-msgid "911 - base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_16
-msgid "912 - tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_13
-msgid "913 - base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_13
-msgid "914 - tax 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_7
-msgid "915 - base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_7
-msgid "916 - tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_16
-msgid "921 - for business purposes: base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_16
-msgid "922 - for business purposes: tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_13
-msgid "923 - for business purposes: base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_13
-msgid "924 - for business purposes: tax 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_7
-msgid "925 - for business purposes: base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_7
-msgid "926 - for business purposes: tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_16
-msgid "931 - for non-business purposes: base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_16
-msgid "932 - for non-business purposes: tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_13
-msgid "933 - for non-business purposes: base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_13
-msgid "934 - for non-business purposes: tax 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_7
-msgid "935 - for non-business purposes: base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_7
-msgid "936 - for non-business purposes: tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_16
-msgid "941 - not exempt within the territory: base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_16
-msgid "942 - not exempt within the territory: tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_13
-msgid "943 - not exempt within the territory: base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_13
-msgid "944 - not exempt within the territory: tax 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_7
-msgid "945 - not exempt within the territory: base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_7
-msgid "946 - not exempt within the territory: tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_16
-msgid "951 - not established or residing within the Community: base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_16
-msgid "952 - not established or residing within the Community: tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_13
-msgid "953 - not established or residing within the Community: base 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_13
-msgid "954 - not established or residing within the Community: tax 13%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_7
-msgid "955 - not established or residing within the Community: base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_7
-msgid "956 - not established or residing within the Community: tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_16
-msgid "961 - suppliers established within the territory: base 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_16
-msgid "962 - suppliers established within the territory: tax 16%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_7
-msgid "963 - base 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_7
-msgid "964 - tax 7%"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.model,name:l10n_lu.model_account_chart_template
-msgid "Account Chart Template"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.column,name:l10n_lu.tax_report_section_1_balance
-#: model:account.report.column,name:l10n_lu.tax_report_section_2_balance
-#: model:account.report.column,name:l10n_lu.tax_report_sections_3_4_balance
-msgid "Balance"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_turnover
-msgid "I. ASSESSMENT OF TAXABLE TURNOVER"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_tax_due
-msgid "II. ASSESSMENT OF TAX DUE"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3_assessment_deducible_tax
-msgid "III. ASSESSMENT OF DEDUCTIBLE TAX (input tax)"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4_tax_tobe_paid_or_reclaimed
-msgid "IV. TAX TO BE PAID OR TO BE RECLAIMED"
-msgstr ""
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
-msgid "Luxembourg"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_1
-msgid "Section I"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_2
-msgid "Section II"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_sections_3_4
-msgid "Sections III, IV"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.tax_report
-msgid "Tax Report"
-msgstr ""
diff --git a/addons/l10n_lu/i18n_extra/lb.po b/addons/l10n_lu/i18n_extra/lb.po
deleted file mode 100644
index e0d6f52899855..0000000000000
--- a/addons/l10n_lu/i18n_extra/lb.po
+++ /dev/null
@@ -1,1271 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* l10n_lu
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~17.4+e\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-19 08:38+0000\n"
-"PO-Revision-Date: 2025-05-19 08:38+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_001
-msgid "001 - Supply of inhouse manufactured goods"
-msgstr "001 - Versuergung vun intern fabrizéierte Wueren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_002
-msgid "002 - Supply of goods not manufactured inhouse"
-msgstr "002 - Versuergung vu Wueren net intern hiergestallt"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_003
-msgid "003 - Net profit margin"
-msgstr "003 - Net Benefice Margin"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_004
-msgid "004 - Supply of services"
-msgstr "004 - Versuergung vu Servicer"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_005
-msgid "005 - Disposal of tangible and intangible capital assets"
-msgstr "005 - Entsuergung vun materiellen an immaterielle Kapital Verméigen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_008
-msgid "008 - Application of goods for private use or for that of the staff"
-msgstr "008 - Uwendung vu Wueren fir privat Notzung oder fir dee vum Personal"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_009
-msgid "009 - Application for the purpose of business of goods"
-msgstr "009 - Applikatioun fir den Zweck vum Geschäft vu Wueren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_010
-msgid "010 - Use of goods considered business assets"
-msgstr "010 - Notzung vu Wueren considéréiert Affär Verméigen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_011
-msgid "011 - Supply of services carried out free of charge"
-msgstr "011 - Versuergung vu Servicer gratis duerchgefouert"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_overall_turnover
-msgid "012 - Overall turnover"
-msgstr "012 - Ganzen Ëmsaz"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_013
-msgid "013 - IC supply of goods"
-msgstr "013 - IC Versuergung vu Wueren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_2_export
-msgid "014 - Exports"
-msgstr "014 - Exporter"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_3_other_exemptions_art_43
-msgid "015 - Other exemptions"
-msgstr "015 - Aner Ausnahmen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_4_other_exemptions_art_44_et_56quater
-msgid "016 - Other exemptions"
-msgstr "016 - Aner Ausnahmen"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_5_manufactured_tobacco_vat_collected
-msgid ""
-"017 - Manufactured tobacco whose VAT was collected at the source or at the "
-"exit of the tax..."
-msgstr ""
-"017 - Tubak fabrizéiert, deem seng TVA bei der Quell oder beim Austrëtt vun "
-"der Steier gesammelt gouf..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_a_subsequent_to_intra_community
-msgid ""
-"018 - Supply, subsequent to intra-Community acquisitions of goods, in the "
-"context of triangular transactions, when the customer identified,..."
-msgstr ""
-"018 - Versuergung, no intra-Communautéit Acquisitioune vu Wueren, am Kontext"
-" vun dräieckeger Transaktiounen, wann de Client identifizéiert, ..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_d_supplies_other_referred
-msgid ""
-"019 - Other supplies carried out (for which the place of supply is) abroad"
-msgstr ""
-"019 - Aner Liwwerungen duerchgefouert (fir déi Plaz vun der Versuergung ass)"
-" am Ausland"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_exemptions_deductible_amounts
-msgid "021 - Exemptions and deductible amounts"
-msgstr "021 - Ausnahmen an deductible Quantitéiten"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1c_taxable_turnover
-msgid "022 - Taxable turnover"
-msgstr "022 - Besteierbaren Ëmsaz"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_3
-msgid "031 - base 3%"
-msgstr "031 - Basis 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_0
-msgid "033 - base 0%"
-msgstr "033 - Basis 0%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_base
-msgid "037 - Breakdown of taxable turnover – base"
-msgstr "037 - Ënnerdeelung vum besteierbaren Ëmsaz - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_3
-msgid "040 - tax 3%"
-msgstr "040 - Steier 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_breakdown_taxable_turnover_tax
-msgid "046 - Breakdown of taxable turnover – tax"
-msgstr "046 - Ënnerdeelung vun besteierbaren Ëmsaz - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_3
-msgid "049 - base 3%"
-msgstr "049 - Basis 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acqui_of_goods_base
-msgid "051 - Intra-Community acquisitions of goods – base"
-msgstr "051 - Intra-Communautéit Acquisitioun vu Wueren - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_3
-msgid "054 - tax 3%"
-msgstr "054 - Steier 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_intra_community_acquisitions_goods_tax
-msgid "056 - Intra-Community acquisitions of goods – tax"
-msgstr "056 - Intra-Communautéit Acquisitioun vu Wueren - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_3
-msgid "059 - for business purposes: base 3%"
-msgstr "059 - fir Geschäftszwecker: Basis 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_3
-msgid "063 - for non-business purposes: base 3%"
-msgstr "063 - fir net-geschäftlech Zwecker: Basis 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_base
-msgid "065 - Importation of goods – base"
-msgstr "065 - Import vu Wueren - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_3
-msgid "068 - for business purposes: tax 3%"
-msgstr "068 - fir Geschäftszwecker: Steier 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_3
-msgid "073 - for non-business purposes: tax 3%"
-msgstr "073 - fir net-geschäftlech Zwecker: Steier 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2h_total_tax_due
-msgid "076 - Total tax due"
-msgstr "076 - Ganzen Steier wéinst"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_077
-msgid "077 - VAT on stock entries invoiced by other taxable persons"
-msgstr "077 - TVA op Stock Einträg vun anere besteierbaren Persounen Rechnung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_078
-msgid "078 - VAT on stock entries due in respect of IC acquisitions"
-msgstr "078 - TVA op Stock Entréen wéinst IC Acquisitioun"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_079
-msgid "079 - VAT on stock entries of importations of goods"
-msgstr "079 - TVA op Stock Entréen vun Importer vu Wueren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_081
-msgid "081 - VAT on capital expenditures invoiced by other taxable persons"
-msgstr "081 - TVA op Kapitalausgaben, déi vun anere besteierbare Persounen fakturéiert ginn"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_082
-msgid "082 - VAT on capital expenditures due in respect of IC acquisitions"
-msgstr "082 - TVA op Kapitalausgaben wéinst IC Acquisitioun"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_083
-msgid "083 - VAT on capital expenditures of importations of goods"
-msgstr "083 - TVA op Kapitalausgaben vun Importer vu Wueren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_085
-msgid ""
-"085 - VAT on operational expenditures invoiced by other taxable persons"
-msgstr ""
-"085 - TVA op Operatiounskäschten, déi vun anere steierbaren Persounen fakturéiert ginn"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_086
-msgid ""
-"086 - VAT on operational expenditures due in respect of IC acquisitions"
-msgstr ""
-"086 - TVA op Operatiounskäschte wéinst IC Acquisitioun"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_087
-msgid "087 - VAT on operational expenditures of importations of goods"
-msgstr "087 - TVA op Operatiounskäschte vun Importer vu Wueren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_4_due_respect_application_goods
-msgid "090 - Due in respect of the application of goods for business purposes"
-msgstr ""
-"090 - Wéinst am Respekt vun der Uwendung vu Wueren fir Geschäftszwecker"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_6_paid_joint_several_guarantee
-msgid "092 - Paid as joint and several guarantee"
-msgstr "092 - Bezuelt als gemeinsame Garantie"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_total_input_tax
-msgid "093 - Total input tax"
-msgstr "093 - Ganzen Input Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b1_rel_trans
-msgid ""
-"094 - relating to transactions which are exempt pursuant to articles 44 and "
-"56quater"
-msgstr ""
-"094 - betreffend Transaktiounen déi befreit sinn no den Artikelen 44 a "
-"56quater"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_ded_prop
-msgid ""
-"095 - where the deductible proportion determined in accordance to article 50"
-" is applied"
-msgstr ""
-"095 - wou den ofzuchbaren Undeel, deen am Aklang mam Artikel 50 bestëmmt "
-"ass, applizéiert gëtt"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b2_input_tax_margin
-msgid ""
-"096 - Non recoverable input tax in accordance with Art. 56ter-1(7) and "
-"56ter-2(7) (when applying the margin scheme)"
-msgstr ""
-"096 - Net recuperable Input Steier am Aklang mat Art. 56ter-1 (7) an 56ter-2"
-" (7) (wann Dir de Marginschema applizéiert)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3b_total_input_tax_nd
-msgid "097 - Total input tax non-deductible"
-msgstr "097 - Ganzen Input Steier net ofgezu"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3c_total_input_tax_deductible
-msgid "102 - Total input tax deductible"
-msgstr "102 - Ganzen Input Steier ofgezu"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_tax_due
-msgid "103 - Total tax due"
-msgstr "103 - Ganzen Steier wéinst"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4a_total_input_tax_deductible
-msgid "104 - Total input tax deductible"
-msgstr "104 - Ganzen Input Steier ofgezu"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4c_exceeding_amount
-msgid "105 - Exceeding amount"
-msgstr "105 - Iwwerschreiden Betrag"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2c_acquisitions_triangular_transactions_base
-msgid "152 - Acquisitions, in the context of triangular transactions – base"
-msgstr ""
-"152 - Acquisitioune, am Kontext vun dräieckeger Transaktiounen - Basis"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_188
-msgid ""
-"188 - Appendix A - Expenses for other work carried out by third parties"
-msgstr ""
-"188 - Appendix A - Käschte fir aner Aarbechten, déi vun Drëtte gemaach ginn"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_190
-msgid "190 - Appendix A - Car expenses"
-msgstr "190 - Anhang A - Auto Käschten"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_exempt
-msgid "194 - base exempt"
-msgstr "194 - Basis befreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_exempt
-msgid "195 - for business purposes: base exempt"
-msgstr "195 - fir Geschäftszwecker: Basis befreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_exempt
-msgid "196 - for non-business purposes: base exempt"
-msgstr "196 - fir net-Geschäftszwecker: Basis befreit"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_202
-msgid "202 - IC supply of new means of transport"
-msgstr "202 - IC Versuergung vun neie Transportmëttel"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_203
-msgid "203 - Supply of goods carried out abroad"
-msgstr "203 - Liwwerung vu Wueren am Ausland duerchgefouert"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_c_supplies_scope_special_arrangement
-msgid ""
-"226 - Supplies carried out within the scope of the special arrangement of "
-"art. 56sexies"
-msgstr ""
-"226 - Liwwerungen am Kader vun der spezieller Arrangement vun Art "
-"duerchgefouert. 56 sexy"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2g_special_arrangement
-msgid "227 - Special arrangement for tax suspension: adjustment"
-msgstr "227 - Special Arrangement fir Steier Suspensioun: Upassung"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_7_adjusted_tax_special_arrangement
-msgid "228 - Adjusted tax - special arrangement for tax suspension"
-msgstr "228 - Ajustéiert Steier - speziell Arrangement fir Steier Suspensioun"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_239
-msgid "239 - Appendix A - Gross salaries"
-msgstr "239 - Anhang A - Brutto Gehälter"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_244
-msgid "244 - Appendix A - Gross wages"
-msgstr "244 - Anhang A - Brutto Léin"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_247
-msgid "247 - Appendix A - Occasional salaries"
-msgstr "247 - Anhang A - Geleeëntlech Gehälter"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_250
-msgid ""
-"250 - Appendix A - Compulsory social security contributions (employer's "
-"share)"
-msgstr "250 - Anhang A - Obligatoresch Sozialbeiträg (Patronatdeel)"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_253
-msgid "253 - Appendix A - Accident insurance"
-msgstr "253 - Unhang A - Accident Versécherung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_260
-msgid "260 - Appendix A - Staff travel and representation expenses"
-msgstr "260 - Appendix A - Personal Rees- a Representatiounskäschte"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_269
-msgid "269 - Appendix A - Accounting and bookkeeping fees"
-msgstr "269 ​​- Appendix A - Comptabilitéits- a Buchhaltungsgebühren"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_283
-msgid "283 - Appendix A - Employer's travel and representation expenses"
-msgstr "283 - Appendix A - Employeur Rees- a Representatiounskäschten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_285
-msgid "285 - Appendix A - Electricity"
-msgstr "285 - Unhang A - Elektrizitéit"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_289
-msgid "289 - Appendix A - Gas"
-msgstr "289 - Unhang A - Gas"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_293
-msgid "293 - Appendix A - Employer's travel and representation expenses"
-msgstr "293 - Appendix A - Employeur Rees- a Representatiounskäschten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_301
-msgid "301 - Appendix A - Telecommunications"
-msgstr "301 - Unhang A - Telekommunikatioun"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_305
-msgid ""
-"305 - Appendix A - Renting/leasing of immovable property with application of"
-" VAT"
-msgstr ""
-"305 - Appendix A - Locatioun/Locatioun vun Immobilien mat Applikatioun TVA"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_307
-msgid ""
-"307 - Appendix A - Renting/leasing of immovable property with no application"
-" of VAT"
-msgstr ""
-"307 - Appendix A - Locatioun / Locatioun vun Immobilien ouni TVA-Uwendung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_310
-msgid ""
-"310 - Appendix A - Renting/leasing of permanently installed equipment and "
-"machinery"
-msgstr ""
-"310 - Anhang A - Locatioun / Locatioun vun permanent installéiert Ausrüstung"
-" a Maschinnen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_316
-msgid "316 - Appendix A - Property tax"
-msgstr "316 - Unhang A - Grondsteier"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_324
-msgid "324 - Appendix A - Business tax"
-msgstr "324 - Unhang A - Betrib Steier"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_326
-msgid "326 - Appendix A - Interest paid for long-term debts"
-msgstr "326 - Anhang A - Zënse bezuelt fir laangfristeg Scholden"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_327
-msgid "327 - Appendix A - Interest paid for short-term debts"
-msgstr "327 - Anhang A - Zënse bezuelt fir kuerzfristeg Scholden"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_328
-msgid "328 - Appendix A - Other financial costs"
-msgstr "328 - Unhang A - Aner finanziell Käschten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_330
-msgid "330 - Appendix A - Stock and business equipment insurance"
-msgstr "330 - Unhang A - Stock a Betrib Equipement Versécherung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_331
-msgid ""
-"331 - Appendix A - Public and professional third party liability insurance"
-msgstr ""
-"331 - Appendix A - Ëffentlech a berufflech Drëtt Partei Haftung Versécherung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_332
-msgid "332 - Appendix A - Office expenses"
-msgstr "332 - Anhang A - Büro Käschten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_336
-msgid ""
-"336 - Appendix A - Fees and subscriptions paid to professional associations "
-"and learned societies"
-msgstr ""
-"336 - Appendix A - Fraisen an Abonnementer bezuelt fir Beruffsverbänn a "
-"geléiert Gesellschaften"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_337
-msgid "337 - Appendix A - Papers and periodicals for business purposes"
-msgstr "337 - Appendix A - Pabeieren an Zäitschrëften fir Geschäftszwecker"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_343
-msgid "343 - Appendix A - Shipping and transport expenses"
-msgstr "343 - Appendix A - Versand- an Transportkäschten"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_345
-msgid "345 - Appendix A - Work clothes"
-msgstr "345 - Unhang A - Aarbechtskleedung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_347
-msgid "347 - Appendix A - Advertising and publicity"
-msgstr "347 - Appendix A - Publicitéit a Publizitéit"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_349
-msgid "349 - Appendix A - Packaging"
-msgstr "349 - Unhang A - Verpakung"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_351
-msgid "351 - Appendix A - Repair and maintenance of equipment and machinery"
-msgstr "351 - Appendix A - Reparatur an Ënnerhalt vun Ausrüstung a Maschinnen"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_353
-msgid "353 - Appendix A - Other repairs"
-msgstr "353 - Anhang A - Aner Fléckaarbechte"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_355
-msgid ""
-"355 - Appendix A - New acquisitions (tools and equipment) if their cost can "
-"be fully allocated to the year of acquisition or creation"
-msgstr ""
-"355 - Appendix A - Nei Acquisitioune (Tools an Ausrüstung) wann hir Käschte "
-"komplett un d'Joer vun der Acquisitioun oder der Schafung zougedeelt kënne "
-"ginn"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_358
-msgid "358 - Appendix A - Custom (value)"
-msgstr "358 - Appendix A - Benotzerdefinéiert (Wäert)"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_appendix_361
-msgid "361 - Appendix A - Total 'Appendix to Operational expenditures'"
-msgstr "361 - Appendix A - Gesamt 'Anhang fir Operatiounsausgaben'"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_404
-msgid "404 - VAT on stock entries due under the reverse charge"
-msgstr "404 - TVA op Stock Entréen wéinst ënner der ëmgedréint charge"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_405
-msgid "405 - VAT on capital expenditures due under the reverse charge"
-msgstr "405 - TVA op Kapitalausgaben, déi ënner der ëmgedréint Charge sinn"
-
-#. module: l10n_lu
-#: model:account.account.tag,name:l10n_lu.account_tag_406
-msgid "406 - VAT on operational expenditures due under the reverse charge"
-msgstr "406 - TVA op Operatiounskäschte wéinst der ëmgedréint Charge"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_importation_of_goods_tax
-msgid "407 - Importation of goods – tax"
-msgstr "407 - Import vu Wueren - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer
-msgid ""
-"409 - Supply of services for which the customer is liable for the payment of"
-" VAT – base"
-msgstr ""
-"409 - Liwwerung vu Servicer, fir déi de Client fir d'Bezuelung vun der TVA "
-"verantwortlech ass - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_supply_of_service_for_customer_liable_for_payment_tax
-msgid ""
-"410 - Supply of services for which the customer is liable for the payment of"
-" VAT – tax"
-msgstr ""
-"410 - Liwwerung vu Servicer, fir déi de Client fir d'Bezuelung vun der TVA "
-"verantwortlech ass - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_7_inland_supplies_for_customer
-msgid ""
-"419 - Inland supplies for which the customer is liable for the payment of "
-"VAT"
-msgstr ""
-"419 - Inland Liwwerungen, fir déi de Client fir d'Bezuelung vun der TVA "
-"haftbar ass"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b1_non_exempt_customer_vat
-msgid ""
-"423 - not exempt in the MS where the customer is liable for payment of VAT"
-msgstr ""
-"423 - net befreit an der MS wou de Client fir d'Bezuelung vun der TVA "
-"haftbar ass"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_6_b2_exempt_ms_customer
-msgid "424 - exempt in the MS where the customer is identified"
-msgstr "424 - befreit an der MS wou de Client identifizéiert ass"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_3
-msgid "431 - not exempt within the territory: base 3%"
-msgstr "431 - net befreit am Territoire: Basis 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_3
-msgid "432 - not exempt within the territory: tax 3%"
-msgstr "432 - net befreit am Territoire: Steier 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_b_exempt
-msgid "435 - exempt within the territory: exempt"
-msgstr "435 - befreit am Territoire: befreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_base
-msgid "436 - base"
-msgstr "436 - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_3
-msgid "441 - not established or residing within the Community: base 3%"
-msgstr "441 - net etabléiert oder an der Gemeinschaft wunnen: Basis 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_3
-msgid "442 - not established or residing within the Community: tax 3%"
-msgstr "442 - net etabléiert oder wunnen an der Gemeinschaft: Steier 3%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_exempt
-msgid "445 - not established or residing within the Community: exempt"
-msgstr "445 - net etabléiert oder an der Gemeinschaft wunnen: befreit"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_total_sale
-msgid "454 - Total Sales / Receipts"
-msgstr "454 - Ganzen Ofsaz / Recetten"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_app_goods_non_bus
-msgid ""
-"455 - Application of goods for non-business use and for business purposes"
-msgstr ""
-"455 - Uwendung vu Wueren fir net-geschäftlech Notzung a fir Geschäftszwecker"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_non_bus_gs
-msgid "456 - Non-business use of goods and supply of services free of charge"
-msgstr ""
-"456 - Net-geschäftlech Notzung vu Wueren a Versuergung vu Servicer gratis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_1_intra_community_goods_pi_vat
-msgid ""
-"457 - Intra-Community supply of goods to persons identified for VAT purposes"
-" in another Member State (MS)"
-msgstr ""
-"457 - Intracommunautéit Versuergung vu Wueren u Persounen, déi fir TVA "
-"Zwecker an engem anere Memberstaat (MS) identifizéiert sinn"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_1_invoiced_by_other_taxable_person
-msgid "458 - Invoiced by other taxable persons for goods or services supplied"
-msgstr ""
-"458 - Rechnung vun anere besteierbaren Persoune fir geliwwert Wueren oder "
-"Servicer"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_2_due_respect_intra_comm_goods
-msgid "459 - Due in respect of intra-Community acquisitions of goods"
-msgstr "459 - Wéinst am Respekt vun intra-Gemeinschaft Acquisitioun vu Wueren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_3_due_paid_respect_importation_goods
-msgid "460 - Due or paid in respect of importation of goods"
-msgstr "460 - Wéinst oder bezuelt am Bezuch op den Import vu Wueren"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3a_5_due_under_reverse_charge
-msgid "461 - Due under the reverse charge (see points II.E and F)"
-msgstr "461 - Wéinst ënner der ëmgedréint Charge (kuckt Punkten II.E an F)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax
-msgid "462 - tax"
-msgstr "462 - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base
-msgid "463 - base"
-msgstr "463 - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax
-msgid "464 - tax"
-msgstr "464 - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_telecom_service
-msgid ""
-"471 - Telecommunications services, radio and television broadcasting "
-"services..."
-msgstr ""
-"471 - Telekommunikatiounsservicer, Radio- an Fernsehsendéngschtleeschtungen "
-"..."
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1a_other_sales
-msgid "472 - Other sales / receipts"
-msgstr "472 - Aner Ofsaz / Empfang"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_8_supplies_carried_out_domestic
-msgid ""
-"481 - Supplies carried out within the scope of the domestic SME scheme of "
-"article 57bis (7)"
-msgstr "481 - Ëmgeréits am Kader vum Haus-SME Schema vum Artikel 57bis (7)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_1b_9_supplies_carried_out_cross_border
-msgid ""
-"482 - Supplies carried out within the scope of the cross-border SME scheme "
-"of article 57quater "
-msgstr ""
-"482 - Liwwerungen duerchgefouert am Kader vum grenziwwerschreidend PME "
-"Schema vum Artikel 57quater"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_17
-msgid "701 - base 17%"
-msgstr "701 - Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_17
-msgid "702 - tax 17%"
-msgstr "702 - Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_14
-msgid "703 - base 14%"
-msgstr "703 - Basis 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_14
-msgid "704 - tax 14%"
-msgstr "704 - Steier 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_8
-msgid "705 - base 8%"
-msgstr "705 - Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_8
-msgid "706 - tax 8%"
-msgstr "706 - Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_17
-msgid "711 - base 17%"
-msgstr "711 - Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_17
-msgid "712 - tax 17%"
-msgstr "712 - Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_14
-msgid "713 - base 14%"
-msgstr "713 - Basis 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_14
-msgid "714 - tax 14%"
-msgstr "714 - Steier 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_8
-msgid "715 - base 8%"
-msgstr "715 - Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_8
-msgid "716 - tax 8%"
-msgstr "716 - Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_manufactured_tobacco
-msgid ""
-"719 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-"719 - vun hiergestallten Tubak (TVA gëtt um Sortie vum Steierlager mat "
-"Akzisen gesammelt)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_17
-msgid "721 - for business purposes: base 17%"
-msgstr "721 - fir Geschäftszwecker: Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_17
-msgid "722 - for business purposes: tax 17%"
-msgstr "722 - fir Geschäftszwecker: Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_14
-msgid "723 - for business purposes: base 14%"
-msgstr "723 - fir Geschäftszwecker: Basis 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_14
-msgid "724 - for business purposes: tax 14%"
-msgstr "724 - fir Geschäftszwecker: Steier 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_8
-msgid "725 - for business purposes: base 8%"
-msgstr "725 - fir Geschäftszwecker: Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_8
-msgid "726 - for business purposes: tax 8%"
-msgstr "726 - fir Geschäftszwecker: Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_manufactured_tobacco
-msgid ""
-"729 - of manufactured tobacco (VAT is collected at the exit of the tax "
-"warehouse with excise duties)"
-msgstr ""
-"729 - vun hiergestallten Tubak (TVA gëtt bei der Sortie vum Steierlager mat "
-"Akzisen gesammelt)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_17
-msgid "731 - for non-business purposes: base 17%"
-msgstr "731 - fir net-geschäftlech Zwecker: Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_17
-msgid "732 - for non-business purposes: tax 17%"
-msgstr "732 - fir net-Geschäftszwecker: Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_14
-msgid "733 - for non-business purposes: base 14%"
-msgstr "733 - fir net-geschäftlech Zwecker: Basis 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_14
-msgid "734 - for non-business purposes: tax 14%"
-msgstr "734 - fir net-geschäftlech Zwecker: Steier 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_8
-msgid "735 - for non-business purposes: base 8%"
-msgstr "735 - fir net-geschäftlech Zwecker: Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_8
-msgid "736 - for non-business purposes: tax 8%"
-msgstr "736 - fir net-Geschäftszwecker: Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_17
-msgid "741 - not exempt within the territory: base 17%"
-msgstr "741 - net befreit am Territoire: Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_17
-msgid "742 - not exempt within the territory: tax 17%"
-msgstr "742 - net befreit am Territoire: Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_14
-msgid "743 - not exempt within the territory: base 14%"
-msgstr "743 - net befreit am Territoire: Basis 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_14
-msgid "744 - not exempt within the territory: tax 14%"
-msgstr "744 - net befreit am Territoire: Steier 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_8
-msgid "745 - not exempt within the territory: base 8%"
-msgstr "745 - net befreit am Territoire: Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_8
-msgid "746 - not exempt within the territory: tax 8%"
-msgstr "746 - net befreit am Territoire: Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_17
-msgid "751 - not established or residing within the Community: base 17%"
-msgstr "751 - net etabléiert oder an der Gemeinschaft wunnen: Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_17
-msgid "752 - not established or residing within the Community: tax 17%"
-msgstr "752 - net etabléiert oder an der Gemeinschaft wunnen: Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_14
-msgid "753 - not established or residing within the Community: base 14%"
-msgstr "753 - net etabléiert oder an der Gemeinschaft wunnen: Basis 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_14
-msgid "754 - not established or residing within the Community: tax 14%"
-msgstr "754 - net etabléiert oder an der Gemeinschaft wunnen: Steier 14%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_8
-msgid "755 - not established or residing within the Community: base 8%"
-msgstr "755 - net etabléiert oder an der Gemeinschaft wunnen: Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_8
-msgid "756 - not established or residing within the Community: tax 8%"
-msgstr "756 - net etabléiert oder an der Gemeinschaft wunnen: Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_17
-msgid "761 - suppliers established within the territory: base 17%"
-msgstr "761 - Fournisseuren am Territoire etabléiert: Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_17
-msgid "762 - suppliers established within the territory: tax 17%"
-msgstr "762 - Fournisseuren am Territoire etabléiert: Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_8
-msgid "763 - base 8%"
-msgstr "763 - Basis 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_8
-msgid "764 - tax 8%"
-msgstr "764 - Steier 8%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base
-msgid "765 - base"
-msgstr "765 - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax
-msgid "766 - tax"
-msgstr "766 - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base
-msgid ""
-"767 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - base"
-msgstr ""
-"767 - Liwwerung vu Wueren, fir déi de Keefer fir d'Bezuelung vun der TVA "
-"haftbar ass - Basis"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax
-msgid ""
-"768 - Supply of goods for which the purchaser is liable for the payment of "
-"VAT - tax"
-msgstr ""
-"768 - Liwwerung vu Wueren, fir déi de Keefer fir d'Bezuelung vun der TVA "
-"haftbar ass - Steier"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_17
-msgid "769 - base 17%"
-msgstr "769 - Basis 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_17
-msgid "770 - tax 17%"
-msgstr "770 - Steier 17%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_16
-msgid "901 - base 16%"
-msgstr "901 - Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_16
-msgid "902 - tax 16%"
-msgstr "902 - Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_13
-msgid "903 - base 13%"
-msgstr "903 - Basis 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_13
-msgid "904 - tax 13%"
-msgstr "904 - Steier 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_base_7
-msgid "905 - base 7%"
-msgstr "905 - Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2a_tax_7
-msgid "906 - tax 7%"
-msgstr "906 - Steier 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_16
-msgid "911 - base 16%"
-msgstr "911 - Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_16
-msgid "912 - tax 16%"
-msgstr "912 - Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_13
-msgid "913 - base 13%"
-msgstr "913 - Basis 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_13
-msgid "914 - tax 13%"
-msgstr "914 - Steier 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_base_7
-msgid "915 - base 7%"
-msgstr "915 - Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2b_tax_7
-msgid "916 - tax 7%"
-msgstr "916 - Steier 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_16
-msgid "921 - for business purposes: base 16%"
-msgstr "921 - fir Geschäftszwecker: Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_16
-msgid "922 - for business purposes: tax 16%"
-msgstr "922 - fir Geschäftszwecker: Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_13
-msgid "923 - for business purposes: base 13%"
-msgstr "923 - fir Geschäftszwecker: Basis 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_13
-msgid "924 - for business purposes: tax 13%"
-msgstr "924 - fir Geschäftszwecker: Steier 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_base_7
-msgid "925 - for business purposes: base 7%"
-msgstr "925 - fir Geschäftszwecker: Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_1_tax_7
-msgid "926 - for business purposes: tax 7%"
-msgstr "926 - fir Geschäftszwecker: Steier 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_16
-msgid "931 - for non-business purposes: base 16%"
-msgstr "931 - fir net-geschäftlech Zwecker: Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_16
-msgid "932 - for non-business purposes: tax 16%"
-msgstr "932 - fir net-geschäftlech Zwecker: Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_13
-msgid "933 - for non-business purposes: base 13%"
-msgstr "933 - fir net-geschäftlech Zwecker: Basis 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_13
-msgid "934 - for non-business purposes: tax 13%"
-msgstr "934 - fir net-geschäftlech Zwecker: Steier 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_base_7
-msgid "935 - for non-business purposes: base 7%"
-msgstr "935 - fir net-geschäftlech Zwecker: Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2d_2_tax_7
-msgid "936 - for non-business purposes: tax 7%"
-msgstr "936 - fir net-Geschäftszwecker: Steier 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_16
-msgid "941 - not exempt within the territory: base 16%"
-msgstr "941 - net befreit am Territoire: Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_16
-msgid "942 - not exempt within the territory: tax 16%"
-msgstr "942 - net befreit am Territoire: Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_13
-msgid "943 - not exempt within the territory: base 13%"
-msgstr "943 - net befreit am Territoire: Basis 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_13
-msgid "944 - not exempt within the territory: tax 13%"
-msgstr "944 - net befreit am Territoire: Steier 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_base_7
-msgid "945 - not exempt within the territory: base 7%"
-msgstr "945 - net befreit am Territoire: Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_1_a_tax_7
-msgid "946 - not exempt within the territory: tax 7%"
-msgstr "946 - net befreit am Territoire: Steier 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_16
-msgid "951 - not established or residing within the Community: base 16%"
-msgstr "951 - net etabléiert oder an der Gemeinschaft wunnen: Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_16
-msgid "952 - not established or residing within the Community: tax 16%"
-msgstr "952 - net etabléiert oder an der Gemeinschaft wunnen: Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_13
-msgid "953 - not established or residing within the Community: base 13%"
-msgstr "953 - net etabléiert oder an der Gemeinschaft wunnen: Basis 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_13
-msgid "954 - not established or residing within the Community: tax 13%"
-msgstr "954 - net etabléiert oder an der Gemeinschaft wunnen: Steier 13%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_base_7
-msgid "955 - not established or residing within the Community: base 7%"
-msgstr "955 - net etabléiert oder an der Gemeinschaft wunnen: Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_2_tax_7
-msgid "956 - not established or residing within the Community: tax 7%"
-msgstr "956 - net etabléiert oder an der Gemeinschaft wunnen: Steier 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_base_16
-msgid "961 - suppliers established within the territory: base 16%"
-msgstr "961 - Fournisseuren am Territoire etabléiert: Basis 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2e_3_tax_16
-msgid "962 - suppliers established within the territory: tax 16%"
-msgstr "962 - Fournisseuren am Territoire etabléiert: Steier 16%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_base_7
-msgid "963 - base 7%"
-msgstr "963 - Basis 7%"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_2f_supply_goods_tax_7
-msgid "964 - tax 7%"
-msgstr "964 - Steier 7%"
-
-#. module: l10n_lu
-#: model:ir.model,name:l10n_lu.model_account_chart_template
-msgid "Account Chart Template"
-msgstr "Kont Chart Schabloun"
-
-#. module: l10n_lu
-#: model:account.report.column,name:l10n_lu.tax_report_section_1_balance
-#: model:account.report.column,name:l10n_lu.tax_report_section_2_balance
-#: model:account.report.column,name:l10n_lu.tax_report_sections_3_4_balance
-msgid "Balance"
-msgstr "Gläichgewiicht"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_turnover
-msgid "I. ASSESSMENT OF TAXABLE TURNOVER"
-msgstr "I. Aschätzung vum besteierbaren Ëmsaz"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.l10n_lu_tax_report_assessment_tax_due
-msgid "II. ASSESSMENT OF TAX DUE"
-msgstr "II. ASSESSMENT VUN STEIER DUE"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_3_assessment_deducible_tax
-msgid "III. ASSESSMENT OF DEDUCTIBLE TAX (input tax)"
-msgstr "III. ASSESSMENT VUN DEDUCTIBLE TAX (Input Steier)"
-
-#. module: l10n_lu
-#: model:account.report.line,name:l10n_lu.account_tax_report_line_4_tax_tobe_paid_or_reclaimed
-msgid "IV. TAX TO BE PAID OR TO BE RECLAIMED"
-msgstr "IV. STEIER ZE BEZUELT ODER ZE RECLAIMED"
-
-#. module: l10n_lu
-#: model:ir.ui.menu,name:l10n_lu.account_reports_lu_statements_menu
-msgid "Luxembourg"
-msgstr "Lëtzebuerg"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_1
-msgid "Section I"
-msgstr "Abschnitt I"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_section_2
-msgid "Section II"
-msgstr "Abschnitt II"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.l10n_lu_tax_report_sections_3_4
-msgid "Sections III, IV"
-msgstr "Abschnitt III, IV"
-
-#. module: l10n_lu
-#: model:account.report,name:l10n_lu.tax_report
-msgid "Tax Report"
-msgstr "Steier Rapport"

From d029ec5a578e8d08ce6454ccc5a82cb1c5e18bb6 Mon Sep 17 00:00:00 2001
From: msho-odoo <msho@odoo.com>
Date: Fri, 13 Jun 2025 14:35:49 +0000
Subject: [PATCH 408/673] [FIX] stock: fix mo confirmation from bom overview

This commit fixes the error that occurs when confirming an MO
from the BoM overview for a product with a 2 level BoM.

Bug Reproduction:
1- Create BoM for a Main Product.
2- Create a child BoM for any component in the main Product's BoM and
make that component have an MTO route.
3- Navigate to the BoM Overview of the Main Product.
4- Click "Manufacture" to create an MO for the Main Product.
5- Click the save icon in the MO.
6- There are two scenarios to reproduce the error now:
    a- Confirm the MO form.
    b- Or update the quantity to produce in the MO.
= The confirmation or update of the MO is blocked, it should be allowed.

The Issue:
A dirty context is being passed from the BoM overview. it sets the
`default_product_qty` to be set in the MO. However, when creating The
moves necessary for the MO, this makes an issue as `product_qty`
should never be set in stock moves, we set `product_uom_qty` instead.

Task-4795105

closes odoo/odoo#235018

X-original-commit: a8b5fbd0a03f2badefcaccb7f8cb809a232d395a
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Signed-off-by: Moamen Shoman (msho) <msho@odoo.com>
---
 addons/mrp/models/mrp_production.py                | 14 ++++++++++++++
 .../mrp_bom_overview_control_panel.js              |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 1bf60ef3df767..fb8117e6ab649 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -43,6 +43,20 @@ class MrpProduction(models.Model):
     _inherit = ['mail.thread', 'mail.activity.mixin', 'product.catalog.mixin']
     _order = 'priority desc, date_start asc,id'
 
+    @api.model
+    def default_get(self, fields):
+        context = dict(self.env.context)
+        product_qty = context.pop('bom_overview_product_qty', False)
+        picking_type_id = context.pop('bom_overview_picking_type_id', False)
+        defaults = super(MrpProduction, self.with_context(context)).default_get(fields)
+
+        if product_qty:
+            defaults['product_qty'] = product_qty
+        if picking_type_id:
+            defaults['picking_type_id'] = picking_type_id
+
+        return defaults
+
     @api.model
     def _get_default_date_start(self):
         if self.env.context.get('default_date_deadline'):
diff --git a/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.js b/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.js
index 60060e5bcc5d3..f2f602ef7d146 100644
--- a/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.js
+++ b/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.js
@@ -82,8 +82,8 @@ export class BomOverviewControlPanel extends Component {
             target: "current",
             context: {
                 default_bom_id: this.props.data.bom_id,
-                default_picking_type_id: this.props.currentWarehouse.manu_type_id[0],
-                default_product_qty: this.props.bomQuantity,
+                bom_overview_picking_type_id: this.props.currentWarehouse.manu_type_id[0],
+                bom_overview_product_qty: this.props.bomQuantity,
             },
         };
         return this.action.doAction(action);

From bf33387123d166c37dffca108da8a7a4e436ded8 Mon Sep 17 00:00:00 2001
From: jorv-odoo <jorv@odoo.com>
Date: Wed, 8 Oct 2025 08:11:58 +0000
Subject: [PATCH 409/673] [FIX] mail: mark messages as read when fetching mails
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The refactor PR https://github.com/odoo/odoo/pull/191911 introduced
a nice/needed refactor of the fetchmail methods.

But in doing so a small logic error sneaked in.
More specifically:
This try/except/else block
https://github.com/odoo/odoo/blob/1f672b95a145b32d1ef2da9e83d82cd950045b5d/addons/mail/models/fetchmail.py#L305-L313
fails to account for the fact that in certain conditions a exception is expected
while the `message_process` methods try to match the mail content with Odoo
records.

One example:
If you fetch an email in the inbox that is addressed to an email address
that is **not** an email alias in the database, it will raise a ValueError.
Example:
```
ValueError: No possible route found for incoming message from "John Doe"
<john@example.com> to "Josephine" <mon_amour@odoolove.com>
(Message-Id <shrekislove@odoo.com>:). Create an appropriate mail.alias
or force the destination model.
```

It follows that the `else` block is never triggered and `handled_message`
will not be called, which would have marked the email in question as "READ".

This means, that the next time the fetchmail CRON job runs, it will retry
to refetch the same (failing) emails, which A) means lost time and processing
time for a non relevant email B) if the backlog of failing emails is important
enough, it will clog the mail fetching and we will never reach new emails.

Proposed fix:
Remove the else block, meaning that the `handled_message` get's called
even after an exception.

A this level of the stack we presume that any exception is either expected
or the results of a misconfiguration (mail flows or Odoo configuration).
So the mail was handled and should be marked a read in the mailbox being
fetched.

OPW-5122869

closes odoo/odoo#235024

X-original-commit: 5e3f33b7e0836322c6853d749492720d20196124
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Joel Rodrigues Vitória (jorv) <jorv@odoo.com>
---
 addons/mail/models/fetchmail.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mail/models/fetchmail.py b/addons/mail/models/fetchmail.py
index 3a95a6fcfa9b7..9be47c6615449 100644
--- a/addons/mail/models/fetchmail.py
+++ b/addons/mail/models/fetchmail.py
@@ -297,8 +297,7 @@ def _fetch_mail(self, batch_limit=50) -> Exception | None:
                         failed += 1
                         _logger.info('Failed to process mail from %s server %s.', *server_type_and_name, exc_info=True)
                         remaining_time = MailThread.env['ir.cron']._commit_progress()
-                    else:
-                        server_connection.handled_message(message_num)
+                    server_connection.handled_message(message_num)
                     if count >= batch_limit or not remaining_time:
                         break
                 server.error_date = False

From 3bc90153d9f2dbd55091b11e43efb11fc1c0db37 Mon Sep 17 00:00:00 2001
From: tau-odoo <tau@odoo.com>
Date: Fri, 7 Nov 2025 04:03:10 +0000
Subject: [PATCH 410/673] [FIX] l10n_tw_edi_ecpay: correct JSON data handling
 for credit notes

Originally, adding amount_residual_signed to sale_amount to handle the
discrepancy in TotalAmount for credit notes.
But, it does not cover the scenario where the original invoice is
reconciled and the credit note is issued.

Steps to reproduce the issue:
1. Create and validate an invoice.
2. Register payment for the invoice.
3. Create a credit note for the invoice.
4. Try to send the credit note to ECPay.

Since amount_residual_signed on the credit note is negative,
by doing sale_amount += self.amount_residual_signed,
TotalAmount does not match the original sale amount in the invoice,
and the ECPay API returns error.

task-5230384

closes odoo/odoo#234956

X-original-commit: 4fca401148ed798b9c1d04674b44c3287ded5679
Signed-off-by: Nicolas Viseur (vin) <vin@odoo.com>
---
 .../l10n_tw_edi_ecpay/models/account_move.py  |  6 --
 addons/l10n_tw_edi_ecpay/tests/test_edi.py    | 82 +++++++++++++++++++
 2 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/addons/l10n_tw_edi_ecpay/models/account_move.py b/addons/l10n_tw_edi_ecpay/models/account_move.py
index 9685fc30aa492..8a94a3dd72977 100644
--- a/addons/l10n_tw_edi_ecpay/models/account_move.py
+++ b/addons/l10n_tw_edi_ecpay/models/account_move.py
@@ -545,12 +545,6 @@ def _l10n_tw_edi_prepare_item_list(self, json_data, is_allowance=False):
             item_list[-1]["ItemPrice"] = float_round(item_list[-1]["ItemAmount"] / item_list[-1]["ItemCount"], precision_rounding=0.01)
             sale_amount += exchange_difference
 
-            # Check if the credit note has amount due, we need to add it to the sale amount
-            item_list[-1]["ItemAmount"] += self.amount_residual_signed
-            item_list[-1]["ItemAmount"] = float_round(item_list[-1]["ItemAmount"], precision_rounding=0.01)
-            item_list[-1]["ItemPrice"] = float_round(item_list[-1]["ItemAmount"] / item_list[-1]["ItemCount"], precision_rounding=0.01)
-            sale_amount += self.amount_residual_signed
-
         if self.l10n_tw_edi_is_b2b and is_allowance:
             json_data["Details"] = item_list
         else:
diff --git a/addons/l10n_tw_edi_ecpay/tests/test_edi.py b/addons/l10n_tw_edi_ecpay/tests/test_edi.py
index eb77a2ed2135e..1bb4d4d7590db 100644
--- a/addons/l10n_tw_edi_ecpay/tests/test_edi.py
+++ b/addons/l10n_tw_edi_ecpay/tests/test_edi.py
@@ -278,6 +278,51 @@ def test_08_invoice_with_downpayment(self):
             ],
         )
 
+    def test_09_refund_invoice_with_payment(self):
+        """
+        This tests the flow of refunding an invoice that has the payment has been registered and
+        has already been sent to the ECpay platform with an offline agreement type.
+        Make sure that the credit note is created with the correct fields and values from the wizard
+        and the credit note is successfully sent to the ECpay platform
+        """
+        send_and_print = self.create_send_and_print(self.basic_invoice)
+        with patch(CALL_API_METHOD, new=self._test_09_mock):
+            basic_invoice_json = self.basic_invoice._l10n_tw_edi_generate_invoice_json()
+            send_and_print.action_send_and_print()
+            # register payment
+            self.env['account.payment.register'].with_context(active_model='account.move', active_ids=self.basic_invoice.ids).create({
+                'amount': self.basic_invoice.amount_total,
+            })._create_payments()
+            self.assertEqual(self.basic_invoice.payment_state, self.env['account.move']._get_invoice_in_payment_state())
+            # create credit note
+            wizard_vals = {
+                'journal_id': self.basic_invoice.journal_id.id,
+                'l10n_tw_edi_refund_agreement_type': 'offline',
+                'l10n_tw_edi_allowance_notify_way': 'email',
+                'reason': 'refund',
+            }
+            wizard_reverse = self.env['account.move.reversal']\
+                .with_context(active_ids=self.basic_invoice.id, active_model='account.move').create(wizard_vals)
+            wizard_reverse.reverse_moves(is_modify=False)
+            credit_note = wizard_reverse.new_move_ids
+            credit_note.action_post()
+            credit_note_json = credit_note._l10n_tw_edi_generate_issue_allowance_json()
+            # Ensure that the sale amount on invoice json and the allowance amount on credit note json are the same
+            self.assertEqual(basic_invoice_json.get('SalesAmount'), credit_note_json.get('AllowanceAmount'))
+            send_and_print_credit_note = self.create_send_and_print(credit_note)
+            send_and_print_credit_note.action_send_and_print()
+        self.assertRecordValues(
+            credit_note,
+            [{
+                'reversed_entry_id': self.basic_invoice.id,
+                'l10n_tw_edi_refund_agreement_type': 'offline',
+                'l10n_tw_edi_refund_invoice_number': '20250106000000021',
+                'l10n_tw_edi_refund_state': 'agreed',
+                'l10n_tw_edi_ecpay_invoice_id': 'AB11100099',
+                'l10n_tw_edi_invoice_create_date': datetime(2025, 1, 6, 15, 0, 0),
+            }]
+        )
+
     # -------------------------------------------------------------------------
     # Patched methods
     # -------------------------------------------------------------------------
@@ -433,3 +478,40 @@ def _test_06_mock(self, endpoint, params, company_id, is_b2b=False):
             }
         else:
             raise UserError('Unexpected endpoint called during a test: %s with params %s.' % (endpoint, params))
+
+    def _test_09_mock(self, endpoint, params, company_id, is_b2b=False):
+        if endpoint == "/Issue":
+            return {
+                "RtnCode": 1,
+                "RtnMsg": "Success",
+                "InvoiceNo": "AB11100099",
+                "InvoiceDate": "2025-01-06 23:00:00",
+                "RandomNumber": "6868"
+            }
+        elif endpoint == "/GetIssue":
+            return_data = {
+                "RtnCode": 1,
+                "RtnMsg": "Success",
+                "IIS_Sales_Amount": self.basic_invoice.amount_total,
+                "IIS_Invalid_Status": "0",
+                "IIS_Issue_Status": "1",
+                "IIS_Relate_Number": "20250106000000020",
+                "IIS_Remain_Allowance_Amt": 0,
+            }
+            return return_data
+        elif endpoint == "/Allowance":
+            return {
+                "RtnCode": 1,
+                "RtnMsg": "Success",
+                "IA_Allow_No": "20250106000000021",
+                "IA_Invoice_No": "AB11100099",
+                "IA_Date": "2025-01-06 23:00:00",
+                "IA_Remain_Allowance_Amt": 0,
+            }
+        elif endpoint == "/GetCompanyNameByTaxID":
+            return {
+                "RtnCode": 1,
+                "CompanyName": "Test Company",
+            }
+        else:
+            raise UserError('Unexpected endpoint called during a test: %s with params %s.' % (endpoint, params))

From 762b2232b99dcda6a163b3af1592a09731288e05 Mon Sep 17 00:00:00 2001
From: akth-odoo <akth@odoo.com>
Date: Tue, 16 Sep 2025 11:51:54 +0000
Subject: [PATCH 411/673] [FIX] im_livechat: exclude unrated sessions from
 rating percentage in dashboard

Before this commit:
The live chat rating percentage in the dashboard included sessions that were
not rated, which made the overall rating misleading.

After this commit:
The dashboard rating percentage only takes into account sessions that have a
rating. Unrated sessions are ignored, resulting in a more accurate rating
display.

Task-5048700

closes odoo/odoo#234984

X-original-commit: 60f4c48069a8fd80202129906fc33a831bd06819
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
Signed-off-by: Akshay Thakur (akth) <akth@odoo.com>
---
 addons/im_livechat/report/im_livechat_report_channel.py | 2 +-
 addons/im_livechat/tests/test_im_livechat_report.py     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/im_livechat/report/im_livechat_report_channel.py b/addons/im_livechat/report/im_livechat_report_channel.py
index d1b95df48e2f3..94b207eb1eae5 100644
--- a/addons/im_livechat/report/im_livechat_report_channel.py
+++ b/addons/im_livechat/report/im_livechat_report_channel.py
@@ -119,7 +119,7 @@ def _select(self) -> SQL:
                     ELSE C.livechat_failure
                 END AS session_outcome,
                 C.country_id,
-                C.rating_last_value AS rating,
+                NULLIF(C.rating_last_value, 0) AS rating,
                 CASE
                     WHEN C.rating_last_value = 1 THEN 'Unhappy'
                     WHEN C.rating_last_value = 5 THEN 'Happy'
diff --git a/addons/im_livechat/tests/test_im_livechat_report.py b/addons/im_livechat/tests/test_im_livechat_report.py
index ead025eb66426..6c494e5661bd4 100644
--- a/addons/im_livechat/tests/test_im_livechat_report.py
+++ b/addons/im_livechat/tests/test_im_livechat_report.py
@@ -69,6 +69,11 @@ def test_im_livechat_report_operator(self):
         self.assertEqual(len(result), 1)
         self.assertEqual(result[0]["time_to_answer:avg"], 7800 / 3600)
         self.assertEqual(int(result[0]['duration:avg']), 195)
+        channel = self.env["discuss.channel"].search([("livechat_channel_id", "=", self.livechat_channel.id)])
+        rated_channel = channel.copy({"rating_last_value": 5})
+        self._create_message(rated_channel, self.operator, "2023-03-18 11:00:00")
+        result = self.env["im_livechat.report.channel"].formatted_read_group([], aggregates=["rating:avg"])
+        self.assertEqual(result[0]["rating:avg"], 5, "Rating average should be 5, excluding unrated sessions")
 
     @classmethod
     def _create_message(cls, channel, author, date):

From 733af9105ea68ab240ae3059d053e5227ac5b931 Mon Sep 17 00:00:00 2001
From: sagu-odoo <sagu@odoo.com>
Date: Fri, 7 Nov 2025 09:17:23 +0000
Subject: [PATCH 412/673] [FIX] orm/fields_relational: Fix key error

Issue:

If no of records are
[more]
https://github.com/odoo/odoo/blob/f40203c0f3954d3c6be7d4234ee102cd903704b6/odoo/orm/fields_relational.py#L63
than the ``PREFETCH_MAX``.So, it just the fetch the data
using ``fetch`` method. If records are less then that then
it directly check from ORM and using ``__get__`` method.
if record is missing it will raise missing error in that
case otherwise records are more in that it directly assume
that records are fetch and it directly check from field_cache
which leads to key error and here in attachment scenerio
code implementation they are expecting to have
[missing error]
https://github.com/odoo/odoo/blob/f40203c0f3954d3c6be7d4234ee102cd903704b6/odoo/addons/base/models/ir_attachment.py#L588
To fix:
 raising missing error

```
Traceback (most recent call last):
   File "/tmp/tmpbit0pj9c/migrations/base/tests/test_mock_crawl.py", line 333, in crawl_menu
    self.mock_action(action_vals)
   File "/tmp/tmpbit0pj9c/migrations/base/tests/test_mock_crawl.py", line 346, in mock_action
    return self.mock_act_window(action)
   File "/tmp/tmpbit0pj9c/migrations/base/tests/test_mock_crawl.py", line 430, in mock_act_window
    views = get_views(
   File "/home/odoo/src/odoo/19.0/addons/mail/models/mail_thread.py", line 463, in get_views
    res = super().get_views(views, options)
   File "/home/odoo/src/enterprise/19.0/web_studio/models/models.py", line 10, in get_views
    result = super().get_views(views, options=options)
   File "/home/odoo/src/enterprise/19.0/web_studio/models/ir_ui_view.py", line 52, in get_views
    return super().get_views(views, options)
   File "/home/odoo/src/odoo/19.0/odoo/addons/base/models/ir_ui_view.py", line 2935, in get_views
    result['models'][model] = {"fields": self.env[model].fields_get(
   File "/home/odoo/src/odoo/19.0/addons/stock/models/product.py", line 512, in fields_get
    res = super().fields_get(allfields, attributes)
   File "/home/odoo/src/enterprise/19.0/web_studio/models/ir_model.py", line 76, in fields_get
    return super().fields_get(allfields, attributes=attributes)
   File "/home/odoo/src/enterprise/19.0/ai_fields/models/models.py", line 47, in fields_get
    res = super().fields_get(allfields, attributes)
   File "/home/odoo/src/odoo/19.0/odoo/orm/models.py", line 3360, in fields_get
    description = field.get_description(self.env, attributes=attributes)
   File "/home/odoo/src/odoo/19.0/odoo/orm/fields.py", line 883, in get_description
    value = value(env)
   File "/home/odoo/src/odoo/19.0/odoo/orm/fields.py", line 930, in _description_groupable
    model._read_group_groupby(model._table, groupby, query)
   File "/home/odoo/src/odoo/19.0/addons/mail/models/mail_activity_mixin.py", line 259, in _read_group_groupby
    return super()._read_group_groupby(alias, groupby_spec, query)
   File "/home/odoo/src/odoo/19.0/odoo/orm/models.py", line 2064, in _read_group_groupby
    coquery = comodel._search(codomain, bypass_access=field.bypass_search_access)
   File "/home/odoo/src/odoo/19.0/odoo/addons/base/models/ir_attachment.py", line 661, in _search
    return records._filtered_access('read')[offset:]._as_query(ordered)
   File "/home/odoo/src/odoo/19.0/odoo/orm/models.py", line 4128, in _filtered_access
    if self and not self.env.su and (result := self._check_access(operation)):
   File "/home/odoo/src/odoo/19.0/odoo/addons/base/models/ir_attachment.py", line 544, in _check_access
    forbidden_res_model_id = set(self._inaccessible_comodel_records(model_ids, operation))
   File "/home/odoo/src/odoo/19.0/odoo/addons/base/models/ir_attachment.py", line 586, in _inaccessible_comodel_records
    records = records._filtered_access(operation)
   File "/home/odoo/src/odoo/19.0/odoo/orm/models.py", line 4128, in _filtered_access
    if self and not self.env.su and (result := self._check_access(operation)):
   File "/home/odoo/src/odoo/19.0/odoo/orm/models.py", line 4152, in _check_access
    if domain and (forbidden := self - self.sudo().filtered_domain(domain)):
   File "/home/odoo/src/odoo/19.0/odoo/orm/models.py", line 6251, in filtered_domain
    predicate = Domain(domain)._as_predicate(self)
   File "/home/odoo/src/odoo/19.0/odoo/orm/domains.py", line 1079, in _as_predicate
    func = field.filter_function(records, field_expr, positive_operator, value)
   File "/home/odoo/src/odoo/19.0/odoo/orm/fields_relational.py", line 179, in filter_function
    corecords = getter(records)
   File "/home/odoo/src/odoo/19.0/odoo/orm/fields_relational.py", line 71, in __get__
    vals.append(field_cache[record_id])
 KeyError: 3
```

upg-3267511
opw-5246118

closes odoo/odoo#234979

X-original-commit: 2a63c3bf5d92c504f762ca660186c6878319f938
Signed-off-by: Chong Wang (cwg) <cwg@odoo.com>
Signed-off-by: Sanchit Gupta (sagu) <sagu@odoo.com>
---
 odoo/orm/fields_relational.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/odoo/orm/fields_relational.py b/odoo/orm/fields_relational.py
index 5b55edb05eb43..797be8cab8ad5 100644
--- a/odoo/orm/fields_relational.py
+++ b/odoo/orm/fields_relational.py
@@ -65,6 +65,12 @@ def __get__(self, records: BaseModel, owner=None):
                     # a lot of missing records, just fetch that field
                     remaining = records[len(vals):]
                     remaining.fetch([self.name])
+                    # fetch does not raise MissingError, check value
+                    if record_id not in field_cache:
+                        raise MissingError("\n".join([
+                            env._("Record does not exist or has been deleted."),
+                            env._("(Record: %(record)s, User: %(user)s)", record=record_id, user=env.uid),
+                        ])) from None
                 else:
                     remaining = records.__class__(env, (record_id,), records._prefetch_ids)
                     super().__get__(remaining, owner)

From b8428c9995a5cad5e82bb1a7e3700ba904d5bff2 Mon Sep 17 00:00:00 2001
From: Romain Estievenart <res@odoo.com>
Date: Fri, 7 Nov 2025 09:55:30 +0000
Subject: [PATCH 413/673] [FIX] mail: Error when manually unregistering the
 ServiceWorker

When you manually unregister the ServiceWorker linked to your Odoo,
you may receive a notification "Failed to enable push notifications".
This occurs because the ServiceWorker associated with the previous
subscription is gone and the browser has lost the link between the
subscription and the Odoo instance.

To handle this case, we ensure waiting the activated state of the
registration of the service worker before subscribing to the web push
notification.

Steps to reproduce:

- In Odoo, enable push notifications.
- Inside another tab, go to the internal Chrome URL:
    chrome://serviceworker-internals/?devtools
- Unsubscribe the ServiceWorker linked to your Odoo instance.
- In the Odoo instance tab, press F5.
  => You will see an internal notification stating
  "Failed to enable push notifications" => BUG.

closes odoo/odoo#235051

X-original-commit: 924a4e0166d256c7edd7a65ee65bf36ee9d2e7e0
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Romain Estievenart (res) <res@odoo.com>
---
 addons/mail/static/src/webclient/web/webclient.js |  2 ++
 addons/web/static/src/webclient/webclient.js      | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/webclient/web/webclient.js b/addons/mail/static/src/webclient/web/webclient.js
index 66d95e12babc5..1d3155141c29f 100644
--- a/addons/mail/static/src/webclient/web/webclient.js
+++ b/addons/mail/static/src/webclient/web/webclient.js
@@ -54,6 +54,7 @@ patch(WebClient.prototype, {
      * @return {Promise<void>}
      */
     async _subscribePush(numberTry = 1) {
+        await this.serviceWorkerActivatedDeferred;
         const pushManager = await this.pushManager();
         if (!pushManager) {
             return;
@@ -123,6 +124,7 @@ patch(WebClient.prototype, {
      * @return {Promise<void>}
      */
     async _unsubscribePush() {
+        await this.serviceWorkerActivatedDeferred;
         const pushManager = await this.pushManager();
         if (!pushManager) {
             return;
diff --git a/addons/web/static/src/webclient/webclient.js b/addons/web/static/src/webclient/webclient.js
index 3ab361e6e0551..e2cbb322330e1 100644
--- a/addons/web/static/src/webclient/webclient.js
+++ b/addons/web/static/src/webclient/webclient.js
@@ -1,4 +1,5 @@
 import { useOwnDebugContext } from "@web/core/debug/debug_context";
+import { Deferred } from "@web/core/utils/concurrency";
 import { DebugMenu } from "@web/core/debug/debug_menu";
 import { localization } from "@web/core/l10n/localization";
 import { MainComponentsContainer } from "@web/core/main_components_container";
@@ -60,6 +61,7 @@ export class WebClient extends Component {
             this.env.bus.trigger("WEB_CLIENT_READY");
         });
         useExternalListener(window, "click", this.onGlobalClick, { capture: true });
+        this.serviceWorkerActivatedDeferred = new Deferred();
         onWillStart(this.registerServiceWorker);
     }
 
@@ -169,7 +171,18 @@ export class WebClient extends Component {
         if (navigator.serviceWorker) {
             navigator.serviceWorker
                 .register("/web/service-worker.js", { scope: "/odoo" })
-                .then(() => {
+                .then((registration) => {
+                    if (registration.active && registration.active.state === "activated") {
+                        this.serviceWorkerActivatedDeferred.resolve();
+                    } else {
+                        const sw =
+                            registration.installing || registration.waiting || registration.active;
+                        sw.addEventListener("statechange", (e) => {
+                            if (e.target.state === "activated") {
+                                this.serviceWorkerActivatedDeferred.resolve();
+                            }
+                        });
+                    }
                     navigator.serviceWorker.ready.then(() => {
                         if (!navigator.serviceWorker.controller) {
                             // https://stackoverflow.com/questions/51597231/register-service-worker-after-hard-refresh

From 3e47db3592aad54aad01d95cb1a66dff75ddb67d Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 7 Nov 2025 10:29:55 +0000
Subject: [PATCH 414/673] [FIX] mail: prevent max call stack error in messaging
 menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Accessing the chat tab in the messaging menu with many chats causes
a max call stack error.

Threads in the messaging menu rely on the `menuThreads` store field,
which depends on `thread.displayName`.
- Thread display name is a getter which accesses `correspondent.name`,
a computed field.
- Accessing `thread.displayName` in a loop repeatedly triggers recomputation
of `menuThreads`, eventually reaching max call stack size.
- Additionally, `menuThreads` computation is inefficient due to sorting
and reactive proxy access.

There is no good reason for `persona.displayName` to be a computed field
instead of a getter. This commit reverts it back to a getter to break
the compute cycle.

closes odoo/odoo#235055

X-original-commit: 7196ee37589b113235874df5a68771753b41930e
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/core/common/res_partner_model.js      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/core/common/res_partner_model.js b/addons/mail/static/src/core/common/res_partner_model.js
index 0907d6227d1a3..d872b93fa7ff9 100644
--- a/addons/mail/static/src/core/common/res_partner_model.js
+++ b/addons/mail/static/src/core/common/res_partner_model.js
@@ -38,11 +38,6 @@ export class ResPartner extends Record {
     commercial_company_name;
     country_id = fields.One("res.country");
     debouncedSetImStatus;
-    displayName = fields.Attr(undefined, {
-        compute() {
-            return this._computeDisplayName();
-        },
-    });
     /** @type {string} */
     email;
     /**
@@ -97,6 +92,16 @@ export class ResPartner extends Record {
     user_ids = fields.Many("res.users", { inverse: "partner_id" });
     write_date = fields.Datetime();
 
+    /**
+     * @deprecated
+     *
+     * `store.menuThreads` uses this field to filter threads based on search
+     * terms. For each computation, the `menuThread` field is marked as needing a
+     * recompute, which can lead to excessive recursion—sometimes even exceeding the
+     * call stack size. This computation is simple enough that it doesn’t need a
+     * compute and has been replaced by a getter. To override the display name
+     * computation, override the displayName getter.
+     */
     _computeDisplayName() {
         return this.name;
     }
@@ -112,6 +117,10 @@ export class ResPartner extends Record {
         });
     }
 
+    get displayName() {
+        return this._computeDisplayName();
+    }
+
     searchChat() {
         return Object.values(this.store["mail.thread"].records).find(
             (thread) =>

From b5230e516874a668e721a5937f3efe073e437e05 Mon Sep 17 00:00:00 2001
From: hisi-odoo <hisi@odoo.com>
Date: Wed, 29 Oct 2025 07:45:59 +0000
Subject: [PATCH 415/673] [FIX] l10n_ro: correct account type for customer
 advance payments

Before this commit:
- Accounts 419000, 419100, and 419200 were set as Current Assets, even though
  they represent customer advances (liabilities).

After this commit:
- These accounts are reclassified as Current Liabilities, allowing them
  to be properly used as downpayment accounts on customer invoices.

Task-5188142

closes odoo/odoo#234973

X-original-commit: ffb99060674a8f27179a96c0bbc7183b5c0992d3
Signed-off-by: Ricardo Gomes Rodrigues (rigr) <rigr@odoo.com>
Signed-off-by: Himilsinh Sindha (hisi) <hisi@odoo.com>
---
 addons/l10n_ro/data/template/account.account-ro.csv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_ro/data/template/account.account-ro.csv b/addons/l10n_ro/data/template/account.account-ro.csv
index 420ca306ebe78..cade417489de9 100644
--- a/addons/l10n_ro/data/template/account.account-ro.csv
+++ b/addons/l10n_ro/data/template/account.account-ro.csv
@@ -240,9 +240,9 @@
 "pcg_4118","Uncertain or litigious customers","4118","asset_current","True","","Clienți incerți sau în litigiu"
 "pcg_413","Notes to be received from customers","413","asset_current","True","","Efecte de primit de la clienți"
 "pcg_418","Customers - invoices to be issued","418","asset_current","True","","Clienți - facturi de întocmit"
-"pcg_419","Advance payments from customers","419","asset_current","True","","Clienţi – creditori"
-"pcg_4191","Customers - creditor - resumed in a period of up to one year","4191","asset_current","True","","Clienți - creditori - reluate într-o perioadă de până la un an"
-"pcg_4192","Customers - creditor - resumed in a period of at least one year","4192","asset_current","True","","Clienți - creditori - reluate într-o perioadă mai mare de un an"
+"pcg_419","Advance payments from customers","419","liability_current","True","","Clienţi - creditori"
+"pcg_4191","Customers - creditor - resumed in a period of up to one year","4191","liability_current","True","","Clienți - creditori - reluate într-o perioadă de până la un an"
+"pcg_4192","Customers - creditor - resumed in a period of at least one year","4192","liability_current","True","","Clienți - creditori - reluate într-o perioadă mai mare de un an"
 "pcg_421","Staff - wages due","421","liability_payable","True","","Personal - salarii datorate"
 "pcg_4211","Staff - wages due - resumed in a period of up to one year","4211","liability_payable","True","","Personal - salarii datorate - reluate într-o perioadă de până la un an"
 "pcg_4212","Staff - wages due - resumed in a period of at least one year","4212","liability_payable","True","","Personal - salarii datorate - reluate într-o perioadă mai mare de un an"

From 073e30e09bcfd16eb347dd95134cebd1e0468dfc Mon Sep 17 00:00:00 2001
From: David Monnom <moda@odoo.com>
Date: Wed, 29 Oct 2025 16:09:38 +0000
Subject: [PATCH 416/673] [FIX] point_of_sale: fix prices sign in
 pos_order_line_accounting

Before this commit, the prices in the pos_order_line_accounting model
were taking into account the order sign 2 times, leading to incorrect
display of prices in accounting reports.

This commit fixes the issue by removing the redundant sign application,
ensuring that prices are displayed correctly according to the order type

---

From a performance standpoint, the `get prices` getter has been removed
because it was being called too often. We now calculate prices globally,
which requires calculating all order lines at the same time.

When refreshing the interface, each line called the getter, which caused
slowdowns when many lines were added to the order.

Now, the price is recalculated and cached on the order when a line is
modified or added.

closes odoo/odoo#234963

X-original-commit: 7a29c6e32fdc4cea16f9f676f083534022a51a2d
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../models/report_sale_details.py             |  5 ++-
 .../order_display/order_display.xml           |  9 +++-
 .../models/accounting/pos_order_accounting.js | 29 ++++++++++++-
 .../accounting/pos_order_line_accounting.js   | 27 +++++++++---
 .../static/src/app/models/pos_config.js       | 42 +++++++++++++++++++
 .../src/app/models/related_models/index.js    | 17 +++++---
 .../payment_status/payment_status.xml         |  2 +-
 .../receipt_screen/receipt/order_receipt.xml  |  2 +-
 .../generic_helpers/order_widget_util.js      | 14 +++++++
 .../tests/pos/tours/product_screen_tour.js    |  3 +-
 .../pos/tours/utils/product_screen_util.js    |  3 ++
 .../unit/components/order_summary.test.js     | 22 +++++++++-
 .../unit/components/payment_screen.test.js    | 27 ++++++++++++
 .../unit/components/receipt_screen.test.js    | 22 ++++++++++
 .../tests/unit/models/pos_order.test.js       |  1 +
 .../tests/unit/models/pos_order_line.test.js  |  5 ++-
 .../tests/unit/services/pos_service.test.js   | 33 +++++++++++++++
 .../control_buttons/control_buttons.js        |  6 +--
 18 files changed, 240 insertions(+), 29 deletions(-)
 create mode 100644 addons/point_of_sale/static/tests/unit/components/payment_screen.test.js
 create mode 100644 addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js

diff --git a/addons/point_of_sale/models/report_sale_details.py b/addons/point_of_sale/models/report_sale_details.py
index 50155ec07a7e7..7e3a0313f8789 100644
--- a/addons/point_of_sale/models/report_sale_details.py
+++ b/addons/point_of_sale/models/report_sale_details.py
@@ -98,7 +98,7 @@ def get_sale_details(self, date_start=False, date_stop=False, config_ids=False,
             currency = order.session_id.currency_id
 
             for line in order.lines:
-                if line.price_subtotal_incl >= 0:
+                if not line.order_id.is_refund:
                     products_sold, taxes = self._get_products_and_taxes_dict(line, products_sold, taxes, currency)
                 else:
                     refund_done, refund_taxes = self._get_products_and_taxes_dict(line, refund_done, refund_taxes, currency)
@@ -381,7 +381,8 @@ def _get_products_and_taxes_dict(self, line, products, taxes, currency):
             taxes['taxes'].setdefault(0, {'name': _('No Taxes'), 'tax_amount': 0.0, 'base_amount': 0.0})
             taxes['taxes'][0]['base_amount'] += line.price_subtotal_incl
 
-        taxes['base_amount'] += line.price_subtotal
+        refund_sign = -1 if line.order_id.is_refund else 1
+        taxes['base_amount'] += line.price_subtotal * refund_sign
         return products, taxes
 
     def _get_total_and_qty_per_category(self, categories):
diff --git a/addons/point_of_sale/static/src/app/components/order_display/order_display.xml b/addons/point_of_sale/static/src/app/components/order_display/order_display.xml
index a36f69bbf2fad..b0bce4a76b0c4 100644
--- a/addons/point_of_sale/static/src/app/components/order_display/order_display.xml
+++ b/addons/point_of_sale/static/src/app/components/order_display/order_display.xml
@@ -30,14 +30,19 @@
                     </div>
                 </div>
                 <div t-if="props.mode !== 'receipt'" class="order-summary d-flex flex-column gap-1 p-2 border-bottom fw-bolder lh-sm">
-                    <div t-if="order.prices.taxDetails.has_tax_groups" class="tax-info subentry d-flex justify-content-between w-100 fs-6 text-muted ">
+                    <div t-if="this.order.config_id.iface_tax_included != 'total' and order.prices.taxDetails.has_tax_groups" class="tax-info subentry d-flex justify-content-between w-100 fs-6 text-muted">
+                        <span>Subtotal</span>
+                        <span t-esc="order.currencyDisplayPriceExcl" class="subtotal"/>
+                    </div>
+                    <div t-if="order.prices.taxDetails.has_tax_groups" class="tax-info subentry d-flex justify-content-between w-100 fs-6 text-muted">
                         Taxes
                         <div id="order-widget-taxes">
                             <span t-esc="order.currencyAmountTaxes" class="tax"/>
                         </div>
                     </div>
                     <div class="d-flex justify-content-between w-100 fs-3">
-                        Total <span t-esc="order.currencyDisplayPrice" class="total"/>
+                        <span>Total</span>
+                        <span t-esc="order.currencyDisplayPriceIncl" class="total"/>
                     </div>
                 </div>
             </div>
diff --git a/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
index 7b0d23f9d97f9..2288615a748db 100644
--- a/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
+++ b/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
@@ -6,6 +6,20 @@ import { formatCurrency } from "@web/core/currency";
 const CONSOLE_COLOR = "#4EFF4D";
 
 export class PosOrderAccounting extends Base {
+    static accountingFields = new Set(["pricelist_id", "fiscal_position_id"]);
+
+    setup() {
+        super.setup();
+
+        this._prices = {};
+        this.triggerRecomputeAllPrices();
+    }
+
+    triggerRecomputeAllPrices() {
+        this._prices.original = this._constructPriceData();
+        this._prices.unit = this._constructPriceData({ baseLineOpts: { quantity: 1 } });
+    }
+
     /**
      * Currency formatted prices, these getters already handle included/excluded tax configuration.
      * They must be used each time a price is displayed to the user.
@@ -14,6 +28,14 @@ export class PosOrderAccounting extends Base {
         return formatCurrency(this.displayPrice, this.currency.id);
     }
 
+    get currencyDisplayPriceIncl() {
+        return formatCurrency(this.priceIncl, this.currency.id);
+    }
+
+    get currencyDisplayPriceExcl() {
+        return formatCurrency(this.priceExcl, this.currency.id);
+    }
+
     get currencyAmountTaxes() {
         return formatCurrency(this.amountTaxes, this.currency.id);
     }
@@ -67,7 +89,7 @@ export class PosOrderAccounting extends Base {
         }
 
         const total =
-            Math.abs(this.displayPrice) -
+            Math.abs(this.priceIncl) -
             Math.abs(this.amountPaid) +
             (isNegative ? -roundingSanatizer : roundingSanatizer);
 
@@ -94,7 +116,10 @@ export class PosOrderAccounting extends Base {
      * Do not try to make your own price computation outside these getters.
      */
     get prices() {
-        return this._constructPriceData();
+        return this._prices.original;
+    }
+    get unitPrices() {
+        return this._prices.unit;
     }
     get priceIncl() {
         return this.prices.taxDetails.total_amount_no_rounding;
diff --git a/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js
index 74794bed162a1..7d8608f2b2e5e 100644
--- a/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js
+++ b/addons/point_of_sale/static/src/app/models/accounting/pos_order_line_accounting.js
@@ -4,6 +4,16 @@ import { accountTaxHelpers } from "@account/helpers/account_tax";
 import { _t } from "@web/core/l10n/translation";
 
 export class PosOrderlineAccounting extends Base {
+    static accountingFields = new Set([
+        "order_id",
+        "qty",
+        "price_unit",
+        "discount",
+        "tax_ids",
+        "price_type",
+        "price_extra",
+    ]);
+
     /**
      * Display price in the currency format, depending on the tax configuration (included or excluded).
      *
@@ -52,7 +62,7 @@ export class PosOrderlineAccounting extends Base {
               }, 0);
     }
     get displayPriceUnit() {
-        return this.unitPrices.total_excluded * this.order_id.orderSign;
+        return this.unitPrices.total_excluded;
     }
 
     get priceIncl() {
@@ -85,9 +95,7 @@ export class PosOrderlineAccounting extends Base {
      * Same as "get prices" but the prices are computed as if the quantity was 1.
      */
     get unitPrices() {
-        const data = this.order_id._constructPriceData({
-            baseLineOpts: { quantity: 1 },
-        }).baseLineByLineUuids[this.uuid];
+        const data = this.order_id.unitPrices.baseLineByLineUuids[this.uuid];
         return data.tax_details;
     }
 
@@ -118,12 +126,19 @@ export class PosOrderlineAccounting extends Base {
             .join(" ");
     }
 
+    delete(record, opts = {}) {
+        const order = this.order_id;
+        const result = super.delete(record, opts);
+        order?.triggerRecomputeAllPrices();
+        return result;
+    }
+
     /**
      * Prepare extra values for the base line used in taxes computation.
      */
     prepareBaseLineForTaxesComputationExtraValues(customValues = {}) {
         const order = this.order_id;
-        const currency = order.config.currency_id;
+        const currency = this.config.currency_id;
         const extraValues = { currency_id: currency };
         const product = this.getProduct();
         const priceUnit = this.price_unit || 0;
@@ -139,7 +154,7 @@ export class PosOrderlineAccounting extends Base {
             is_refund: this.qty * priceUnit < 0,
             ...customValues,
         };
-        if (order.fiscal_position_id) {
+        if (order?.fiscal_position_id) {
             // Recompute taxes based on product and fiscal position.
             values.tax_ids = order.fiscal_position_id.getTaxesAfterFiscalPosition(
                 values.product_id.taxes_id
diff --git a/addons/point_of_sale/static/src/app/models/pos_config.js b/addons/point_of_sale/static/src/app/models/pos_config.js
index aa74dcb6256a8..e7337e33376ef 100644
--- a/addons/point_of_sale/static/src/app/models/pos_config.js
+++ b/addons/point_of_sale/static/src/app/models/pos_config.js
@@ -3,6 +3,9 @@ import { imageUrl } from "@web/core/utils/urls";
 import { Base } from "./related_models";
 import { getImageDataUrl } from "@point_of_sale/utils";
 import { logPosMessage } from "../utils/pretty_console_log";
+import { PosOrderlineAccounting } from "./accounting/pos_order_line_accounting";
+import { PosOrderAccounting } from "./accounting/pos_order_accounting";
+
 const CONSOLE_COLOR = "#F5B427";
 
 export class PosConfig extends Base {
@@ -11,6 +14,45 @@ export class PosConfig extends Base {
     initState() {
         super.initState();
         this.uiState = {};
+        this.handlePricesComputation();
+    }
+
+    /**
+     * Since order lines prices needs to be computed globally we need to recompute the whole
+     * order prices each time an order line is created or updated.
+     */
+    handlePricesComputation() {
+        const lineModel = this.models["pos.order.line"];
+        const orderModel = this.models["pos.order"];
+
+        const updateLinePrices = (ids, fields) => {
+            const fieldTargetted = fields?.some((field) =>
+                PosOrderlineAccounting.accountingFields.has(field)
+            );
+
+            if (fieldTargetted || !fields) {
+                // Orders needs to be read from raw in case of not fully setuped records
+                const lines = lineModel.readMany(ids);
+                const orderIds = new Set(lines.map((l) => l.raw.order_id));
+                const orders = orderModel.readMany([...orderIds]);
+                orders.forEach((order) => order.triggerRecomputeAllPrices());
+            }
+        };
+
+        const updateOrderPrices = (id, fields) => {
+            const fieldTargetted = fields?.some((field) =>
+                PosOrderAccounting.accountingFields.has(field)
+            );
+
+            if (fieldTargetted) {
+                const order = orderModel.get(id);
+                order?.triggerRecomputeAllPrices();
+            }
+        };
+
+        lineModel.addEventListener("create", (data) => updateLinePrices(data.ids));
+        lineModel.addEventListener("update", (data) => updateLinePrices([data.id], data.fields));
+        orderModel.addEventListener("update", (data) => updateOrderPrices(data.id, data.fields));
     }
 
     get hasCashRounding() {
diff --git a/addons/point_of_sale/static/src/app/models/related_models/index.js b/addons/point_of_sale/static/src/app/models/related_models/index.js
index 01925183e9741..45e7351899119 100644
--- a/addons/point_of_sale/static/src/app/models/related_models/index.js
+++ b/addons/point_of_sale/static/src/app/models/related_models/index.js
@@ -122,7 +122,7 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
         }
 
         readMany(ids) {
-            return ids.map((value) => this.read(value));
+            return ids.map((value) => this.read(value)).filter(Boolean);
         }
 
         // aliases
@@ -212,22 +212,24 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
             }
 
             if (!(event in callbacks[this.name])) {
-                callbacks[this.name][event] = [];
+                callbacks[this.name][event] = new Map();
             }
 
-            callbacks[this.name][event].push(callback);
+            const key = uuidv4();
+            callbacks[this.name][event].set(key, callback);
+            return () => callbacks[this.name][event].delete(key);
         }
 
         triggerEvents(event, data) {
             if (
                 !(event in callbacks[this.name]) ||
-                callbacks[this.name][event].length === 0 ||
+                callbacks[this.name][event].size === 0 ||
                 !data
             ) {
                 return;
             }
 
-            for (const callback of callbacks[this.name][event]) {
+            for (const callback of callbacks[this.name][event].values()) {
                 callback(data);
             }
         }
@@ -653,7 +655,10 @@ export function createRelatedModels(modelDefs, modelClasses = {}, opts = {}) {
                         if (!isUpdate) {
                             createdIds.push(record.id);
                         } else {
-                            modelEvents.triggerEvents("update", { id: record.id });
+                            modelEvents.triggerEvents("update", {
+                                id: record.id,
+                                fields: Object.keys(rawData),
+                            });
                         }
                         resultsArray.push(record);
                     }
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml
index d52c672523daa..ea820c722d6de 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_status/payment_status.xml
@@ -9,7 +9,7 @@
             <div class="payment-status-container d-flex flex-column-reverse flex-lg-row justify-content-between fs-2">
                 <div class="payment-status-amount d-flex justify-content-between flex-grow-1">
                     <span class="label pe-2" t-out="statusText" />
-                    <span class="amount align-self-end me-5 pe-5" t-att-class="{ 'highlight text-danger fw-bolder': !isComplete }">
+                    <span class="amount align-self-end me-5 pe-5" t-att-amount="amountText" t-att-class="{ 'highlight text-danger fw-bolder': !isComplete }">
                         <PriceFormatter price="amountText" />
                     </span>
                 </div>
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
index 745095c1b1d97..ae5687e6fc4d5 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
+++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
@@ -42,7 +42,7 @@
                 <!-- Total -->
                 <div class="pos-receipt-amount receipt-total fw-bolder">
                     <span class="label-total">Total</span>
-                    <span t-out="order.currencyDisplayPrice" class="pos-receipt-right-align font-monospace"/>
+                    <span t-out="order.currencyDisplayPriceIncl" class="pos-receipt-right-align font-monospace"/>
                 </div>
                 <t t-if="order.appliedRounding">
                     <div class="pos-receipt-amount receipt-rounding">
diff --git a/addons/point_of_sale/static/tests/generic_helpers/order_widget_util.js b/addons/point_of_sale/static/tests/generic_helpers/order_widget_util.js
index 4162e7e331453..e3b1255975174 100644
--- a/addons/point_of_sale/static/tests/generic_helpers/order_widget_util.js
+++ b/addons/point_of_sale/static/tests/generic_helpers/order_widget_util.js
@@ -101,6 +101,20 @@ export function hasTotal(amount) {
         },
     ];
 }
+export function hasSubtotal(amount) {
+    return [
+        {
+            isActive: ["desktop"],
+            content: `order total amount is '${amount}'`,
+            trigger: `.product-screen .order-summary .subtotal:contains("${amount}")`,
+        },
+        {
+            isActive: ["mobile"],
+            content: `order total amount is '${amount}'`,
+            trigger: `.product-screen .order-summary .subtotal:contains("${amount}"):not(:visible)`,
+        },
+    ];
+}
 export function hasTax(amount) {
     return {
         content: `order total tax is '${amount}'`,
diff --git a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
index 684a9c6a538ab..364195f2cba72 100644
--- a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
@@ -352,7 +352,8 @@ registry.category("web_tour.tours").add("ShowTaxExcludedTour", {
             Dialog.confirm("Open Register"),
 
             ProductScreen.clickDisplayedProduct("Test Product", true, "1", "100.0"),
-            ProductScreen.totalAmountIs("100.0"), // Order total is also displayed excluding tax
+            ProductScreen.totalAmountIs("110.0"), // Order total is also displayed excluding tax
+            ProductScreen.subtotalAmountIs("100.0"),
             Chrome.endTour(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
index 5ef514dd32d06..f39f27a2a26ff 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
@@ -649,6 +649,9 @@ export function searchProduct(string) {
         },
     ];
 }
+export function subtotalAmountIs(amount) {
+    return inLeftSide(...Order.hasSubtotal(amount));
+}
 export function totalAmountIs(amount) {
     return inLeftSide(...Order.hasTotal(amount));
 }
diff --git a/addons/point_of_sale/static/tests/unit/components/order_summary.test.js b/addons/point_of_sale/static/tests/unit/components/order_summary.test.js
index 0cc420c6c7a8d..9d0df9179dbe0 100644
--- a/addons/point_of_sale/static/tests/unit/components/order_summary.test.js
+++ b/addons/point_of_sale/static/tests/unit/components/order_summary.test.js
@@ -1,8 +1,9 @@
-import { test, expect } from "@odoo/hoot";
+import { test, expect, animationFrame } from "@odoo/hoot";
 import { mountWithCleanup } from "@web/../tests/web_test_helpers";
 import { OrderSummary } from "@point_of_sale/app/screens/product_screen/order_summary/order_summary";
 import { setupPosEnv, getFilledOrder } from "../utils";
 import { definePosModels } from "../data/generate_model_definitions";
+import { queryAll, queryOne } from "@odoo/hoot-dom";
 
 definePosModels();
 
@@ -15,3 +16,22 @@ test("getNewLine", async () => {
     expect(newLine.order_id.id).toBe(order.id);
     expect(newLine.qty).toBe(0);
 });
+
+test("Display tax include/exclude subtotal label", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrder(store);
+
+    order.config.iface_tax_included = "total";
+    await mountWithCleanup(OrderSummary, {});
+    const total = queryOne(".total");
+    const subtotal = queryAll(".subtotal");
+    expect(subtotal).toHaveLength(0);
+    expect(total.innerHTML).toBe("$&nbsp;17.85");
+
+    order.config.iface_tax_included = "subtotal";
+    await animationFrame();
+    const total2 = queryOne(".total");
+    const subtotal2 = queryOne(".subtotal");
+    expect(total2.innerHTML).toBe("$&nbsp;17.85");
+    expect(subtotal2.innerHTML).toBe("$&nbsp;15.00");
+});
diff --git a/addons/point_of_sale/static/tests/unit/components/payment_screen.test.js b/addons/point_of_sale/static/tests/unit/components/payment_screen.test.js
new file mode 100644
index 0000000000000..a636acddf39b7
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/components/payment_screen.test.js
@@ -0,0 +1,27 @@
+import { test, animationFrame } from "@odoo/hoot";
+import { mountWithCleanup } from "@web/../tests/web_test_helpers";
+import { setupPosEnv, getFilledOrder, expectFormattedPrice } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { queryOne } from "@odoo/hoot-dom";
+import { PaymentScreen } from "@point_of_sale/app/screens/payment_screen/payment_screen";
+
+definePosModels();
+
+test("Change always incl", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrder(store);
+    const firstPm = store.models["pos.payment.method"].getFirst();
+    order.config.iface_tax_included = "total";
+    const comp = await mountWithCleanup(PaymentScreen, {
+        props: { orderUuid: order.uuid },
+    });
+    await comp.addNewPaymentLine(firstPm);
+    order.payment_ids[0].setAmount(20);
+    await animationFrame();
+    const total = queryOne(".amount");
+    expectFormattedPrice(total.attributes.amount.value, "$ -2.15");
+    order.config.iface_tax_included = "subtotal";
+    await animationFrame();
+    const subtotal = queryOne(".amount");
+    expectFormattedPrice(subtotal.attributes.amount.value, "$ -2.15");
+});
diff --git a/addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js b/addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js
new file mode 100644
index 0000000000000..48425674fda55
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js
@@ -0,0 +1,22 @@
+import { test, expect } from "@odoo/hoot";
+import { mountWithCleanup } from "@web/../tests/web_test_helpers";
+import { setupPosEnv, getFilledOrder } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { queryOne } from "@odoo/hoot-dom";
+import { ReceiptScreen } from "@point_of_sale/app/screens/receipt_screen/receipt_screen";
+
+definePosModels();
+
+test("Total on receipt always incl", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrder(store);
+    order.config.iface_tax_included = "total";
+    await mountWithCleanup(ReceiptScreen, {
+        props: { orderUuid: order.uuid },
+    });
+    const total = queryOne(".pos-receipt-amount .pos-receipt-right-align");
+    expect(total.innerHTML).toBe("$&nbsp;17.85");
+    order.config.iface_tax_included = "subtotal";
+    const subtotal = queryOne(".pos-receipt-amount .pos-receipt-right-align");
+    expect(subtotal.innerHTML).toBe("$&nbsp;17.85");
+});
diff --git a/addons/point_of_sale/static/tests/unit/models/pos_order.test.js b/addons/point_of_sale/static/tests/unit/models/pos_order.test.js
index facda0f18b898..415fdcf772fc6 100644
--- a/addons/point_of_sale/static/tests/unit/models/pos_order.test.js
+++ b/addons/point_of_sale/static/tests/unit/models/pos_order.test.js
@@ -100,6 +100,7 @@ test("getTotalDiscount", async () => {
     const line2 = order.lines[1];
     line1.setDiscount(20);
     line2.setDiscount(50);
+
     expect(order.getTotalDiscount()).toBe(5.82);
     const taxTotalsWDiscount = order.prices.taxDetails;
     expect(taxTotalsWDiscount.base_amount).toBe(10.2);
diff --git a/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js b/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js
index 63a276c8e788f..c84755bd09e8d 100644
--- a/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js
+++ b/addons/point_of_sale/static/tests/unit/models/pos_order_line.test.js
@@ -90,7 +90,8 @@ test("[get prices()] with multiple taxes settings", async () => {
     // Test with "include_base_amount" and "include_base_amount" to true for both taxes
     models["account.tax"].get(1).include_base_amount = true;
     models["account.tax"].get(2).include_base_amount = true;
-    const updatedLineTax = data["pos.order.line"][0].prices;
+    orderLine.order_id.triggerRecomputeAllPrices(); // Force the recompute because updating taxes do not trigger it
+    const updatedLineTax = orderLine.prices;
     expect(updatedLineTax.total_excluded).toBe(100.0);
     expect(updatedLineTax.total_included).toBe(143.75);
     expect(updatedLineTax.taxes_data[0].tax_amount).toBe(15.0);
@@ -98,7 +99,7 @@ test("[get prices()] with multiple taxes settings", async () => {
 
     // Test without any taxes
     product.taxes_id = [];
-    data["pos.order.line"][0].tax_ids = [];
+    orderLine.tax_ids = []; // Do not need to force the recompute here, changing line taxes does it for us
     const noTaxLine = data["pos.order.line"][0].prices;
     expect(noTaxLine.total_excluded).toBe(100.0);
     expect(noTaxLine.total_included).toBe(100.0);
diff --git a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
index 44f8aeb25100b..cc03e9777305c 100644
--- a/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
+++ b/addons/point_of_sale/static/tests/unit/services/pos_service.test.js
@@ -462,5 +462,38 @@ describe("pos_store.js", () => {
             expect.verifySteps([`Company logo ${companyId} fetched`]);
             expect(store.config.receiptLogoUrl).toInclude(getCompanyLogo256Url(companyId));
         });
+
+        test("preSyncAllOrders", async () => {
+            // This test check prices sign on preSyncAllOrders for refunds
+            const store = await setupPosEnv();
+            const order = await getFilledOrder(store);
+
+            await store.preSyncAllOrders([order]);
+            expect(order.amount_total).toEqual(17.85);
+            expect(order.amount_tax).toEqual(2.85);
+            expect(order.lines[0].qty).toEqual(3);
+            expect(order.lines[0].price_unit).toEqual(3);
+            expect(order.lines[0].price_subtotal).toEqual(3);
+            expect(order.lines[0].price_subtotal_incl).toEqual(10.35);
+            expect(order.lines[1].qty).toEqual(2);
+            expect(order.lines[1].price_unit).toEqual(3);
+            expect(order.lines[1].price_subtotal).toEqual(3);
+            expect(order.lines[1].price_subtotal_incl).toEqual(7.5);
+
+            order.is_refund = true;
+            order.lines.forEach((line) => (line.qty = -line.qty));
+            await store.preSyncAllOrders([order]);
+
+            expect(order.amount_total).toEqual(-17.85);
+            expect(order.amount_tax).toEqual(-2.85);
+            expect(order.lines[0].qty).toEqual(-3);
+            expect(order.lines[0].price_unit).toEqual(3);
+            expect(order.lines[0].price_subtotal).toEqual(3);
+            expect(order.lines[0].price_subtotal_incl).toEqual(10.35);
+            expect(order.lines[1].qty).toEqual(-2);
+            expect(order.lines[1].price_unit).toEqual(3);
+            expect(order.lines[1].price_subtotal).toEqual(3);
+            expect(order.lines[1].price_subtotal_incl).toEqual(7.5);
+        });
     });
 });
diff --git a/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js b/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js
index 1e8f40f2b3800..3deb9755c2bba 100644
--- a/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js
+++ b/addons/pos_loyalty/static/src/app/screens/product_screen/control_buttons/control_buttons.js
@@ -1,4 +1,4 @@
-import { useState, onWillRender } from "@odoo/owl";
+import { useState } from "@odoo/owl";
 import { ControlButtons } from "@point_of_sale/app/screens/product_screen/control_buttons/control_buttons";
 import { AlertDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
 import { TextInputPopup } from "@point_of_sale/app/components/popups/text_input_popup/text_input_popup";
@@ -13,10 +13,6 @@ patch(ControlButtons.prototype, {
         this.state = useState({
             nbrRewards: [],
         });
-
-        onWillRender(() => {
-            this.state.nbrRewards = this.getPotentialRewards().length;
-        });
     },
     _getEWalletRewards(order) {
         const claimableRewards = order.getClaimableRewards();

From b094553e23a5907b443081d5cc4a44b60e4b111b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 7 Nov 2025 18:27:40 +0100
Subject: [PATCH 417/673] [REF] mail: explicit props.thread in
 actionPanelComponentProps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, `actionPanelComponentProps` of thread actions had
implicit `props.thread` passed to thread actions components.

This `actionPanelComponentProps` was only used by thread actions in
the past so this made sense to make it implicit. But now that this
is intended to be used by other types of discuss actions, it should
have explicit prop list.

We also want to make channel component more specific by passing
`channel`, so some thread actions would want to pass `channel` rather
than `thread`. This change also allow to do that.

closes odoo/odoo#234975

Related: odoo/enterprise#99121
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../crm_livechat/static/src/core/thread_actions.js | 11 ++++++-----
 .../static/src/core/web/thread_actions.js          |  2 ++
 addons/mail/static/src/core/common/chat_window.xml |  2 +-
 .../mail/static/src/core/common/thread_actions.js  |  2 ++
 .../static/src/core/public_web/discuss_content.xml |  2 +-
 .../src/discuss/call/common/call_settings.js       |  4 ++--
 .../static/src/discuss/call/common/meeting.xml     |  2 +-
 .../src/discuss/core/common/thread_actions.js      | 14 ++++++++++----
 .../src/discuss/core/public_web/thread_actions.js  |  5 ++++-
 .../discuss/message_pin/common/thread_actions.js   |  1 +
 10 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/addons/crm_livechat/static/src/core/thread_actions.js b/addons/crm_livechat/static/src/core/thread_actions.js
index 4dc7ade67f9e5..66b8841ac7cea 100644
--- a/addons/crm_livechat/static/src/core/thread_actions.js
+++ b/addons/crm_livechat/static/src/core/thread_actions.js
@@ -9,18 +9,19 @@ import { usePopover } from "@web/core/popover/popover_hook";
 registerThreadAction("create-lead", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: LivechatCommandDialog,
-    actionPanelComponentProps: ({ action }) => ({
+    actionPanelComponentProps: ({ action, thread }) => ({
         close: () => action.actionPanelClose(),
         commandName: "lead",
         placeholderText: _t("e.g. Product pricing"),
+        thread,
         title: _t("Create Lead"),
         icon: "fa fa-handshake-o",
     }),
     actionPanelOpen({ owner, thread }) {
-        this.popover?.open(owner.root.el.querySelector(`[name="${this.id}"]`), {
-            thread,
-            ...this.actionPanelComponentProps,
-        });
+        this.popover?.open(
+            owner.root.el.querySelector(`[name="${this.id}"]`),
+            this.actionPanelComponentProps
+        );
     },
     actionPanelOuterClass: "bg-100",
     condition: false, // managed by ThreadAction patch
diff --git a/addons/im_livechat/static/src/core/web/thread_actions.js b/addons/im_livechat/static/src/core/web/thread_actions.js
index 62237013df36e..ac24679d54601 100644
--- a/addons/im_livechat/static/src/core/web/thread_actions.js
+++ b/addons/im_livechat/static/src/core/web/thread_actions.js
@@ -7,6 +7,7 @@ import { joinChannelAction } from "@mail/discuss/core/web/thread_actions";
 
 registerThreadAction("livechat-info", {
     actionPanelComponent: LivechatChannelInfoList,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     actionPanelOuterClass: "o-livechat-ChannelInfoList bg-inherit",
     condition: ({ channel, owner }) =>
         channel?.channel_type === "livechat" && !owner.isDiscussSidebarChannelActions,
@@ -17,6 +18,7 @@ registerThreadAction("livechat-info", {
 });
 registerThreadAction("livechat-status", {
     actionPanelComponent: LivechatChannelInfoList,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     actionPanelOuterClass: "o-livechat-ChannelInfoList bg-inherit",
     condition: ({ channel, owner }) =>
         channel?.channel_type === "livechat" && !channel.livechat_end_dt && !owner.isDiscussContent,
diff --git a/addons/mail/static/src/core/common/chat_window.xml b/addons/mail/static/src/core/common/chat_window.xml
index 85d8f95888f67..2a7bdd8f3e977 100644
--- a/addons/mail/static/src/core/common/chat_window.xml
+++ b/addons/mail/static/src/core/common/chat_window.xml
@@ -69,7 +69,7 @@
         <div t-if="!props.chatWindow.folded or ui.isSmall" class="d-flex flex-column h-100 overflow-auto o-scrollbar-thin position-relative bg-inherit" t-att-class="{ 'opacity-50': state.editingName }" t-ref="content">
             <t name="thread content">
                 <div t-if="threadActions.activeAction?.actionPanelComponentCondition" class="h-100" t-attf-class="{{ threadActions.activeAction.actionPanelOuterClass }}">
-                    <t t-component="threadActions.activeAction.actionPanelComponent" t-props="{ ...threadActions.activeAction.actionPanelComponentProps, thread: channel.thread }"/>
+                    <t t-component="threadActions.activeAction.actionPanelComponent" t-props="threadActions.activeAction.actionPanelComponentProps"/>
                 </div>
                 <t t-else="">
                     <Thread autofocus="isMobileOS ? props.chatWindow.autofocus : undefined" thread="channel.thread" t-key="channel.thread.localId" jumpPresent="state.jumpThreadPresent" jumpToNewMessage="props.chatWindow.jumpToNewMessage"/>
diff --git a/addons/mail/static/src/core/common/thread_actions.js b/addons/mail/static/src/core/common/thread_actions.js
index bfca0567fc67b..8beaec04b86b3 100644
--- a/addons/mail/static/src/core/common/thread_actions.js
+++ b/addons/mail/static/src/core/common/thread_actions.js
@@ -55,6 +55,7 @@ registerThreadAction("close", {
 });
 registerThreadAction("search-messages", {
     actionPanelComponent: SearchMessagesPanel,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     actionPanelOuterClass: "o-mail-SearchMessagesPanel bg-inherit",
     condition: ({ owner, thread }) =>
         ["discuss.channel", "mail.box"].includes(thread?.model) &&
@@ -79,6 +80,7 @@ registerThreadAction("search-messages", {
 });
 registerThreadAction("meeting-chat", {
     actionPanelComponent: MeetingChat,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     actionPanelOuterClass: "bg-100 border border-secondary",
     badge: ({ thread }) => thread.isUnread,
     badgeIcon: ({ thread }) => !thread.importantCounter && "fa fa-circle text-700",
diff --git a/addons/mail/static/src/core/public_web/discuss_content.xml b/addons/mail/static/src/core/public_web/discuss_content.xml
index 84e0b99a5d959..218a15fc570b6 100644
--- a/addons/mail/static/src/core/public_web/discuss_content.xml
+++ b/addons/mail/static/src/core/public_web/discuss_content.xml
@@ -72,7 +72,7 @@
                             <Composer t-if="thread.model !== 'mail.box' or thread.composer.replyToMessage" t-key="thread.localId" composer="thread.composer" autofocus="true" onDiscardCallback="() => (thread.composer.replyToMessage = undefined)" onPostCallback.bind="() => this.state.jumpThreadPresent++" dropzoneRef="root" type="thread.composer.replyToMessage ? (thread.composer.replyToMessage.isNote ? 'note' : 'message') : undefined"/>
                         </div>
                         <div t-if="threadActions.activeAction?.actionPanelComponentCondition" t-attf-class="{{ threadActions.activeAction.actionPanelOuterClass }}" class="o-mail-DiscussContent-panelContainer o-mail-discussSidebarBgColor h-100 border-start border-secondary flex-shrink-0" t-att-class="{ 'w-100': ui.isSmall }">
-                            <t t-component="threadActions.activeAction.actionPanelComponent" thread="thread" t-props="threadActions.activeAction.actionPanelComponentProps"/>
+                            <t t-component="threadActions.activeAction.actionPanelComponent" t-props="threadActions.activeAction.actionPanelComponentProps"/>
                         </div>
                     </t>
                     <div t-elif="(!ui.isSmall or store.discuss.activeTab === 'notification') and store.discuss.hasRestoredThread" class="d-flex flex-grow-1 align-items-center justify-content-center w-100">
diff --git a/addons/mail/static/src/discuss/call/common/call_settings.js b/addons/mail/static/src/discuss/call/common/call_settings.js
index c24d641553f18..33bb9ef5375ce 100644
--- a/addons/mail/static/src/discuss/call/common/call_settings.js
+++ b/addons/mail/static/src/discuss/call/common/call_settings.js
@@ -12,7 +12,7 @@ import { Dialog } from "@web/core/dialog/dialog";
 
 export class CallSettings extends Component {
     static template = "discuss.CallSettings";
-    static props = ["withActionPanel?", "*"];
+    static props = ["withActionPanel?", "isCompact?"];
     static defaultProps = {
         withActionPanel: true,
     };
@@ -153,6 +153,6 @@ export class CallSettingsDialog extends Component {
             <CallSettings withActionPanel="false"/>
         </Dialog>
     `;
-    static props = ["*"];
+    static props = [];
     static components = { CallSettings, Dialog };
 }
diff --git a/addons/mail/static/src/discuss/call/common/meeting.xml b/addons/mail/static/src/discuss/call/common/meeting.xml
index 5d7b3cbbc1b2d..863a728276cbf 100644
--- a/addons/mail/static/src/discuss/call/common/meeting.xml
+++ b/addons/mail/static/src/discuss/call/common/meeting.xml
@@ -7,7 +7,7 @@
                     <Call hasOverlay="false" isPip="props.isPip"/>
                 </div>
                 <div t-if="threadActions.activeAction?.actionPanelComponentCondition" t-attf-class="{{ threadActions.activeAction.actionPanelOuterClass }}" class="o-mail-DiscussContent-panelContainer o-mail-discussSidebarBgColor h-100 border-start border-secondary flex-shrink-0 rounded-2" t-att-class="{ 'w-100': ui.isSmall }">
-                    <t t-component="threadActions.activeAction.actionPanelComponent" t-props="threadActions.activeAction.actionPanelComponentProps" thread="channel.thread"/>
+                    <t t-component="threadActions.activeAction.actionPanelComponent" t-props="threadActions.activeAction.actionPanelComponentProps"/>
                 </div>
             </div>
             <div class="pt-2 d-flex justify-content-between overflow-x-auto flex-shrink-0" t-att-class="{'p-2 pb-3': ui.isSmall}">
diff --git a/addons/mail/static/src/discuss/core/common/thread_actions.js b/addons/mail/static/src/discuss/core/common/thread_actions.js
index b8c66f1df1f98..3f29fa044822a 100644
--- a/addons/mail/static/src/discuss/core/common/thread_actions.js
+++ b/addons/mail/static/src/discuss/core/common/thread_actions.js
@@ -76,6 +76,7 @@ registerThreadAction("unset-favorite", {
 registerThreadAction("notification-settings", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: NotificationSettings,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     actionPanelOpen({ owner, store, thread }) {
         if (owner.isDiscussSidebarChannelActions || owner.env.inMeetingView) {
             store.env.services.dialog?.add(ChannelActionDialog, {
@@ -113,6 +114,7 @@ registerThreadAction("notification-settings", {
 });
 registerThreadAction("attachments", {
     actionPanelComponent: AttachmentPanel,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     condition: ({ owner, thread }) =>
         thread?.hasAttachmentPanel &&
         (!owner.props.chatWindow || owner.props.chatWindow.isOpen) &&
@@ -125,7 +127,10 @@ registerThreadAction("attachments", {
 registerThreadAction("invite-people", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: ChannelInvitation,
-    actionPanelComponentProps: ({ action }) => ({ close: () => action.actionPanelClose() }),
+    actionPanelComponentProps: ({ action, thread }) => ({
+        close: () => action.actionPanelClose(),
+        thread,
+    }),
     actionPanelOpen({ owner, store, thread }) {
         if (owner.isDiscussSidebarChannelActions) {
             store.env.services.dialog?.add(ChannelActionDialog, {
@@ -170,12 +175,13 @@ registerThreadAction("member-list", {
         }
     },
     actionPanelComponent: ChannelMemberList,
-    actionPanelComponentProps: ({ actions }) => ({
+    actionPanelComponentProps: ({ actions, thread }) => ({
         openChannelInvitePanel({ keepPrevious } = {}) {
             actions.actions
                 .find(({ id }) => id === "invite-people")
                 ?.actionPanelOpen({ keepPrevious });
         },
+        thread,
     }),
     actionPanelOpen: ({ owner, store }) => {
         if (owner.env.inDiscussApp) {
@@ -207,8 +213,8 @@ registerThreadAction("mark-read", {
 registerThreadAction("delete-thread", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: DeleteThreadDialog,
-    actionPanelComponentProps({ action }) {
-        return { close: () => action.actionPanelClose() };
+    actionPanelComponentProps({ action, thread }) {
+        return { close: () => action.actionPanelClose(), thread };
     },
     actionPanelOuterClass: "bg-100",
     condition({ owner, store, thread }) {
diff --git a/addons/mail/static/src/discuss/core/public_web/thread_actions.js b/addons/mail/static/src/discuss/core/public_web/thread_actions.js
index bb0d917d8f81d..51c8b297c1a01 100644
--- a/addons/mail/static/src/discuss/core/public_web/thread_actions.js
+++ b/addons/mail/static/src/discuss/core/public_web/thread_actions.js
@@ -8,7 +8,10 @@ import { usePopover } from "@web/core/popover/popover_hook";
 registerThreadAction("show-threads", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: SubChannelList,
-    actionPanelComponentProps: ({ action }) => ({ close: () => action.actionPanelClose() }),
+    actionPanelComponentProps: ({ action, thread }) => ({
+        close: () => action.actionPanelClose(),
+        thread,
+    }),
     actionPanelOpen({ owner, thread }) {
         const channel = thread?.parent_channel_id || thread;
         this.popover?.open(owner.root.el.querySelector(`[name="${this.id}"]`), { thread: channel });
diff --git a/addons/mail/static/src/discuss/message_pin/common/thread_actions.js b/addons/mail/static/src/discuss/message_pin/common/thread_actions.js
index 33a86406ba842..bcae53a5eeebc 100644
--- a/addons/mail/static/src/discuss/message_pin/common/thread_actions.js
+++ b/addons/mail/static/src/discuss/message_pin/common/thread_actions.js
@@ -7,6 +7,7 @@ import { _t } from "@web/core/l10n/translation";
 
 registerThreadAction("pinned-messages", {
     actionPanelComponent: PinnedMessagesPanel,
+    actionPanelComponentProps: ({ thread }) => ({ thread }),
     actionPanelOuterClass: "o-discuss-PinnedMessagesPanel bg-inherit",
     condition: ({ channel, owner }) =>
         channel &&

From a731d79a5669bd76ebf9263916cfdfddd4517769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Thu, 2 Oct 2025 15:48:24 +0000
Subject: [PATCH 418/673] [IMP] mail: PWA shows discuss badge counter on app
 icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds a badge counter with global discuss counter on the
PWA app icon, which helps a lot in knowing how many chat
notifications are pending in the PWA when the Odoo app is not open.

Task-5136354

closes odoo/odoo#235003

X-original-commit: c04c4cb715902fe95618a15e18233cd001bdb304
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/__manifest__.py                   |  1 +
 .../mail/static/lib/idb-keyval/idb-keyval.js  | 81 +++++++++++++++++++
 .../static/src/core/common/store_service.js   | 13 +--
 .../public_web/out_of_focus_service_patch.js  |  5 +-
 .../src/core/web/messaging_menu_patch.js      |  2 +-
 .../core/web/out_of_focus_service_patch.js    |  9 +++
 .../src/core/web/store_service_patch.js       | 29 +++++++
 .../discuss/core/web/messaging_menu_patch.js  | 18 -----
 .../discuss/core/web/store_service_patch.js   | 20 +++++
 addons/mail/static/src/service_worker.js      | 14 +++-
 10 files changed, 166 insertions(+), 26 deletions(-)
 create mode 100644 addons/mail/static/lib/idb-keyval/idb-keyval.js
 create mode 100644 addons/mail/static/src/core/web/out_of_focus_service_patch.js

diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 1a5641875322c..ac399e65d6e70 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -146,6 +146,7 @@
             # depends on BS variables, can't be loaded in assets_primary or assets_secondary
             'mail/static/src/scss/variables/derived_variables.scss',
             'mail/static/src/scss/*.scss',
+            'mail/static/lib/idb-keyval/idb-keyval.js',
             'mail/static/lib/selfie_segmentation/selfie_segmentation.js',
             'mail/static/src/js/**/*',
             'mail/static/src/model/**/*',
diff --git a/addons/mail/static/lib/idb-keyval/idb-keyval.js b/addons/mail/static/lib/idb-keyval/idb-keyval.js
new file mode 100644
index 0000000000000..c08909dc79a8b
--- /dev/null
+++ b/addons/mail/static/lib/idb-keyval/idb-keyval.js
@@ -0,0 +1,81 @@
+//     idb-keyval.js 3.2.0
+//     https://github.com/jakearchibald/idb-keyval
+//     Copyright 2016, Jake Archibald
+//     Licensed under the Apache License, Version 2.0
+
+var idbKeyval = (function (exports) {
+    'use strict';
+    
+    class Store {
+        constructor(dbName = 'keyval-store', storeName = 'keyval') {
+            this.storeName = storeName;
+            this._dbp = new Promise((resolve, reject) => {
+                const openreq = indexedDB.open(dbName, 1);
+                openreq.onerror = () => reject(openreq.error);
+                openreq.onsuccess = () => resolve(openreq.result);
+                // First time setup: create an empty object store
+                openreq.onupgradeneeded = () => {
+                    openreq.result.createObjectStore(storeName);
+                };
+            });
+        }
+        _withIDBStore(type, callback) {
+            return this._dbp.then(db => new Promise((resolve, reject) => {
+                const transaction = db.transaction(this.storeName, type);
+                transaction.oncomplete = () => resolve();
+                transaction.onabort = transaction.onerror = () => reject(transaction.error);
+                callback(transaction.objectStore(this.storeName));
+            }));
+        }
+    }
+    let store;
+    function getDefaultStore() {
+        if (!store)
+            store = new Store();
+        return store;
+    }
+    function get(key, store = getDefaultStore()) {
+        let req;
+        return store._withIDBStore('readonly', store => {
+            req = store.get(key);
+        }).then(() => req.result);
+    }
+    function set(key, value, store = getDefaultStore()) {
+        return store._withIDBStore('readwrite', store => {
+            store.put(value, key);
+        });
+    }
+    function del(key, store = getDefaultStore()) {
+        return store._withIDBStore('readwrite', store => {
+            store.delete(key);
+        });
+    }
+    function clear(store = getDefaultStore()) {
+        return store._withIDBStore('readwrite', store => {
+            store.clear();
+        });
+    }
+    function keys(store = getDefaultStore()) {
+        const keys = [];
+        return store._withIDBStore('readonly', store => {
+            // This would be store.getAllKeys(), but it isn't supported by Edge or Safari.
+            // And openKeyCursor isn't supported by Safari.
+            (store.openKeyCursor || store.openCursor).call(store).onsuccess = function () {
+                if (!this.result)
+                    return;
+                keys.push(this.result.key);
+                this.result.continue();
+            };
+        }).then(() => keys);
+    }
+    
+    exports.Store = Store;
+    exports.get = get;
+    exports.set = set;
+    exports.del = del;
+    exports.clear = clear;
+    exports.keys = keys;
+    
+    return exports;
+    
+    }({}));
diff --git a/addons/mail/static/src/core/common/store_service.js b/addons/mail/static/src/core/common/store_service.js
index 9562564d82164..5caca0ca753b3 100644
--- a/addons/mail/static/src/core/common/store_service.js
+++ b/addons/mail/static/src/core/common/store_service.js
@@ -437,15 +437,18 @@ export class Store extends BaseStore {
                     });
                 }
             }
-            if (
-                type === "notification-displayed" &&
-                ["mail.thread", "discuss.channel"].includes(payload.model)
-            ) {
-                this.env.services["mail.out_of_focus"]._playSound();
+            if (type === "notification-displayed") {
+                this.onPushNotificationDisplayed(payload);
             }
         });
     }
 
+    onPushNotificationDisplayed(payload) {
+        if (["mail.thread", "discuss.channel"].includes(payload.model)) {
+            this.env.services["mail.out_of_focus"]._playSound();
+        }
+    }
+
     /**
      * Search and fetch for a partner with a given user or partner id.
      * @param {Object} param0
diff --git a/addons/mail/static/src/core/public_web/out_of_focus_service_patch.js b/addons/mail/static/src/core/public_web/out_of_focus_service_patch.js
index aa32385d21e1e..d9334f6913487 100644
--- a/addons/mail/static/src/core/public_web/out_of_focus_service_patch.js
+++ b/addons/mail/static/src/core/public_web/out_of_focus_service_patch.js
@@ -7,7 +7,7 @@ patch(OutOfFocusService.prototype, {
         this.titleService = services.title;
         this.counter = 0;
         this.contributingMessageLocalIds = new Set();
-        env.bus.addEventListener("window_focus", () => this.clearUnreadMessage());
+        env.bus.addEventListener("window_focus", () => this.onWindowFocus());
     },
     clearUnreadMessage() {
         this.counter = 0;
@@ -23,5 +23,8 @@ patch(OutOfFocusService.prototype, {
         this.titleService.setCounters({ discuss: this.counter });
         super.notify(...arguments);
     },
+    onWindowFocus() {
+        this.clearUnreadMessage();
+    },
 });
 outOfFocusService.dependencies = [...outOfFocusService.dependencies, "title"];
diff --git a/addons/mail/static/src/core/web/messaging_menu_patch.js b/addons/mail/static/src/core/web/messaging_menu_patch.js
index 0961735298740..29debd33acd38 100644
--- a/addons/mail/static/src/core/web/messaging_menu_patch.js
+++ b/addons/mail/static/src/core/web/messaging_menu_patch.js
@@ -167,7 +167,7 @@ patch(MessagingMenu.prototype, {
     },
     get counter() {
         let value =
-            this.store.inbox.counter +
+            this.store.globalCounter +
             this.store.failures.reduce((acc, f) => acc + parseInt(f.notifications.length), 0);
         if (this.canPromptToInstall) {
             value++;
diff --git a/addons/mail/static/src/core/web/out_of_focus_service_patch.js b/addons/mail/static/src/core/web/out_of_focus_service_patch.js
new file mode 100644
index 0000000000000..d82e867b92b64
--- /dev/null
+++ b/addons/mail/static/src/core/web/out_of_focus_service_patch.js
@@ -0,0 +1,9 @@
+import { OutOfFocusService } from "@mail/core/common/out_of_focus_service";
+import { patch } from "@web/core/utils/patch";
+
+patch(OutOfFocusService.prototype, {
+    onWindowFocus() {
+        super.onWindowFocus();
+        this.store.updateAppBadge();
+    },
+});
diff --git a/addons/mail/static/src/core/web/store_service_patch.js b/addons/mail/static/src/core/web/store_service_patch.js
index 7c61ebc71ac3c..f9f7db1ec9bd3 100644
--- a/addons/mail/static/src/core/web/store_service_patch.js
+++ b/addons/mail/static/src/core/web/store_service_patch.js
@@ -5,6 +5,13 @@ import { _t } from "@web/core/l10n/translation";
 
 import { patch } from "@web/core/utils/patch";
 
+const unread_store = (() => {
+    if (!window.idbKeyval) {
+        return undefined;
+    }
+    return new window.idbKeyval.Store("odoo-mail-unread-db", "odoo-mail-unread-store");
+})();
+
 /** @type {import("models").Store} */
 const StorePatch = {
     setup() {
@@ -26,10 +33,22 @@ const StorePatch = {
                 return getSortId(g1) - getSortId(g2);
             },
         });
+        this.globalCounter = fields.Attr(0, {
+            compute() {
+                return this.computeGlobalCounter();
+            },
+            onUpdate() {
+                this.updateAppBadge();
+            },
+            eager: true,
+        });
         this.inbox = fields.One("mail.thread");
         this.starred = fields.One("mail.thread");
         this.history = fields.One("mail.thread");
     },
+    computeGlobalCounter() {
+        return this.inbox?.counter ?? 0;
+    },
     async initialize() {
         await Promise.all([
             this.fetchStoreData("failures"),
@@ -37,6 +56,10 @@ const StorePatch = {
             super.initialize(...arguments),
         ]);
     },
+    onPushNotificationDisplayed() {
+        super.onPushNotificationDisplayed(...arguments);
+        this.updateAppBadge();
+    },
     onStarted() {
         super.onStarted(...arguments);
         this.inbox = {
@@ -102,6 +125,12 @@ const StorePatch = {
             )
         );
     },
+    updateAppBadge() {
+        if (unread_store) {
+            window.idbKeyval.set("unread", this.globalCounter, unread_store);
+            Promise.resolve(navigator.setAppBadge?.(this.globalCounter)).catch(() => {}); // FIXME: Illegal invocation error in HOOT
+        }
+    },
     /**
      * @param {object} param0
      * @param {{ type: "INSERT"|"DELETE"|"RELOAD_CHATTER", payload: Partial<import("models").Activity> }} param0.data
diff --git a/addons/mail/static/src/discuss/core/web/messaging_menu_patch.js b/addons/mail/static/src/discuss/core/web/messaging_menu_patch.js
index 6abf514822989..d7416d12189a0 100644
--- a/addons/mail/static/src/discuss/core/web/messaging_menu_patch.js
+++ b/addons/mail/static/src/discuss/core/web/messaging_menu_patch.js
@@ -21,22 +21,4 @@ patch(MessagingMenu.prototype, {
             this.dropdown.close();
         }
     },
-    get counter() {
-        const count = super.counter;
-        const channelsContribution =
-            this.store.channels.status !== "fetched"
-                ? this.store.initChannelsUnreadCounter
-                : Object.values(this.store["discuss.channel"].records).filter(
-                      (channel) =>
-                          channel.displayToSelf &&
-                          !channel.self_member_id?.mute_until_dt &&
-                          (channel.self_member_id?.message_unread_counter ||
-                              channel.message_needaction_counter)
-                  ).length;
-        // Needactions are already counted in the super call, but we want to discard them for channel so that there is only +1 per channel.
-        const channelsNeedactionCounter = Object.values(
-            this.store["discuss.channel"].records
-        ).reduce((acc, channel) => acc + channel.message_needaction_counter, 0);
-        return count + channelsContribution - channelsNeedactionCounter;
-    },
 });
diff --git a/addons/mail/static/src/discuss/core/web/store_service_patch.js b/addons/mail/static/src/discuss/core/web/store_service_patch.js
index d33e4c57b309d..cc58dcb53f307 100644
--- a/addons/mail/static/src/discuss/core/web/store_service_patch.js
+++ b/addons/mail/static/src/discuss/core/web/store_service_patch.js
@@ -10,6 +10,26 @@ const StorePatch = {
         super.setup(...arguments);
         this.initChannelsUnreadCounter = 0;
     },
+    computeGlobalCounter() {
+        if (!this["discuss.channel"]) {
+            return super.computeGlobalCounter();
+        }
+        const channelsContribution =
+            this.channels.status !== "fetched"
+                ? this.initChannelsUnreadCounter
+                : Object.values(this.store["discuss.channel"].records).filter(
+                      (channel) =>
+                          channel.displayToSelf &&
+                          !channel.self_member_id?.mute_until_dt &&
+                          (channel.self_member_id?.message_unread_counter ||
+                              channel.message_needaction_counter)
+                  ).length;
+        // Needactions are already counted in the super call, but we want to discard them for channel so that there is only +1 per channel.
+        const channelsNeedactionCounter = Object.values(
+            this.store["discuss.channel"].records
+        ).reduce((acc, channel) => acc + channel.message_needaction_counter, 0);
+        return super.computeGlobalCounter() + channelsContribution + channelsNeedactionCounter;
+    },
     /** @returns {import("models").Thread[]} */
     getSelfImportantChannels() {
         return this.getSelfRecentChannels().filter((channel) => channel.importantCounter > 0);
diff --git a/addons/mail/static/src/service_worker.js b/addons/mail/static/src/service_worker.js
index a1f00623c2886..7a1a96bdbd8fc 100644
--- a/addons/mail/static/src/service_worker.js
+++ b/addons/mail/static/src/service_worker.js
@@ -1,5 +1,7 @@
 /* eslint-env serviceworker */
 /* eslint-disable no-restricted-globals */
+/* global idbKeyval */
+importScripts("/mail/static/lib/idb-keyval/idb-keyval.js");
 
 const MESSAGE_TYPE = { POST_RTC_LOGS: "POST_RTC_LOGS" };
 const PUSH_NOTIFICATION_TYPE = {
@@ -11,8 +13,10 @@ const PUSH_NOTIFICATION_ACTION = {
     DECLINE: "DECLINE",
 };
 
+const { Store, set, get } = idbKeyval;
 const LOG_AGE_LIMIT = 24 * 60 * 60 * 1000; // 24h
 let db;
+const unread_store = new Store("odoo-mail-unread-db", "odoo-mail-unread-store");
 let interactionSinceCleanupCount = 0;
 
 async function openDatabase() {
@@ -229,6 +233,13 @@ self.addEventListener("message", ({ data }) => {
     }
 });
 
+async function incrementUnread() {
+    const oldCounter = (await get("unread", unread_store)) ?? 0;
+    const newCounter = oldCounter + 1;
+    set("unread", newCounter, unread_store);
+    navigator.setAppBadge?.(newCounter);
+}
+
 async function handlePushEvent(notification) {
     const { model, res_id } = notification.options?.data || {};
     const correlationId = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
@@ -252,7 +263,8 @@ async function handlePushEvent(notification) {
                 })
             );
         });
-        timeoutId = setTimeout(() => {
+        timeoutId = setTimeout(async () => {
+            await incrementUnread();
             self.clients.matchAll({ includeUncontrolled: true, type: "window" }).then((clients) => {
                 clients.forEach((client) =>
                     client.postMessage({

From 1e66efa8f8309160bdab2358f75eda5acbd6f100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Thu, 6 Nov 2025 14:58:24 +0000
Subject: [PATCH 419/673] [FIX] mail: default group chat avatar is squared
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Was circle but UI shows discuss conversations as square most of the
time. This commit makes it square like channel avatars for
consistency.

closes odoo/odoo#235059

X-original-commit: 700fac2532d2de6abc6f87e30a5b056dcfc109d1
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/models/discuss/discuss_channel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/models/discuss/discuss_channel.py b/addons/mail/models/discuss/discuss_channel.py
index bc30a25c813fe..b144646bb5e98 100644
--- a/addons/mail/models/discuss/discuss_channel.py
+++ b/addons/mail/models/discuss/discuss_channel.py
@@ -23,7 +23,7 @@
 <path d="M416.74,217.29l5-28a8.4,8.4,0,0,0-8.27-9.88H361.09l10.24-57.34a8.4,8.4,0,0,0-8.27-9.88H334.61a8.4,8.4,0,0,0-8.27,6.93L315.57,179.4H246.5l10.24-57.34a8.4,8.4,0,0,0-8.27-9.88H220a8.4,8.4,0,0,0-8.27,6.93L201,179.4H145.6a8.42,8.42,0,0,0-8.28,6.93l-5,28a8.4,8.4,0,0,0,8.27,9.88H193l-16,89.62H121.59a8.4,8.4,0,0,0-8.27,6.93l-5,28a8.4,8.4,0,0,0,8.27,9.88H169L158.73,416a8.4,8.4,0,0,0,8.27,9.88h28.45a8.42,8.42,0,0,0,8.28-6.93l10.76-60.29h69.07L273.32,416a8.4,8.4,0,0,0,8.27,9.88H310a8.4,8.4,0,0,0,8.27-6.93l10.77-60.29h55.38a8.41,8.41,0,0,0,8.28-6.93l5-28a8.4,8.4,0,0,0-8.27-9.88H337.08l16-89.62h55.38A8.4,8.4,0,0,0,416.74,217.29ZM291.56,313.84H222.5l16-89.62h69.07Z" fill="#ffffff"/>
 </svg>'''
 group_avatar = '''<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 530.06 530.06">
-<circle cx="265.03" cy="265.03" r="265.03" fill="#875a7b"/>
+<rect width="530.06" height="530.06" fill="#875a7b"/>
 <path d="m184.356059,265.030004c-23.740561,0.73266 -43.157922,10.11172 -58.252302,28.136961l-29.455881,0c-12.0169,0 -22.128621,-2.96757 -30.335161,-8.90271s-12.309921,-14.618031 -12.309921,-26.048671c0,-51.730902 9.08582,-77.596463 27.257681,-77.596463c0.87928,0 4.06667,1.53874 9.56217,4.61622s12.639651,6.19167 21.432451,9.34235s17.512401,4.72613 26.158581,4.72613c9.8187,0 19.563981,-1.68536 29.236061,-5.05586c-0.73266,5.4223 -1.0991,10.25834 -1.0991,14.508121c0,20.370061 5.93514,39.127962 17.805421,56.273922zm235.42723,140.025346c0,17.585601 -5.34888,31.470971 -16.046861,41.655892s-24.912861,15.277491 -42.645082,15.277491l-192.122688,0c-17.732221,0 -31.947101,-5.09257 -42.645082,-15.277491s-16.046861,-24.070291 -16.046861,-41.655892c0,-7.7669 0.25653,-15.350691 0.76937,-22.751371s1.53874,-15.387401 3.07748,-23.960381s3.48041,-16.523211 5.82523,-23.850471s5.4955,-14.471411 9.45226,-21.432451s8.49978,-12.89618 13.628841,-17.805421c5.12906,-4.90924 11.393931,-8.82951 18.794611,-11.76037s15.570511,-4.3964 24.509931,-4.3964c1.46554,0 4.61622,1.57545 9.45226,4.72613s10.18492,6.6678 16.046861,10.55136c5.86194,3.88356 13.702041,7.40068 23.520741,10.55136s19.710601,4.72613 29.675701,4.72613s19.857001,-1.57545 29.675701,-4.72613s17.658801,-6.6678 23.520741,-10.55136c5.86194,-3.88356 11.21082,-7.40068 16.046861,-10.55136s7.98672,-4.72613 9.45226,-4.72613c8.93942,0 17.109251,1.46554 24.509931,4.3964s13.665551,6.85113 18.794611,11.76037c5.12906,4.90924 9.67208,10.844381 13.628841,17.805421s7.10744,14.105191 9.45226,21.432451s4.28649,15.277491 5.82523,23.850471s2.56464,16.559701 3.07748,23.960381s0.76937,14.984471 0.76937,22.751371zm-225.095689,-280.710152c0,15.534021 -5.4955,28.796421 -16.486501,39.787422s-24.253401,16.486501 -39.787422,16.486501s-28.796421,-5.4955 -39.787422,-16.486501s-16.486501,-24.253401 -16.486501,-39.787422s5.4955,-28.796421 16.486501,-39.787422s24.253401,-16.486501 39.787422,-16.486501s28.796421,5.4955 39.787422,16.486501s16.486501,24.253401 16.486501,39.787422zm154.753287,84.410884c0,23.300921 -8.24325,43.194632 -24.729751,59.681133s-36.380212,24.729751 -59.681133,24.729751s-43.194632,-8.24325 -59.681133,-24.729751s-24.729751,-36.380212 -24.729751,-59.681133s8.24325,-43.194632 24.729751,-59.681133s36.380212,-24.729751 59.681133,-24.729751s43.194632,8.24325 59.681133,24.729751s24.729751,36.380212 24.729751,59.681133zm126.616325,49.459502c0,11.43064 -4.10338,20.113531 -12.309921,26.048671s-18.318261,8.90271 -30.335161,8.90271l-29.455881,0c-15.094381,-18.025241 -34.511741,-27.404301 -58.252302,-28.136961c11.87028,-17.145961 17.805421,-35.903862 17.805421,-56.273922c0,-4.24978 -0.36644,-9.08582 -1.0991,-14.508121c9.67208,3.3705 19.417361,5.05586 29.236061,5.05586c8.64618,0 17.365781,-1.57545 26.158581,-4.72613s15.936951,-6.26487 21.432451,-9.34235s8.68289,-4.61622 9.56217,-4.61622c18.171861,0 27.257681,25.865561 27.257681,77.596463zm-28.136961,-133.870386c0,15.534021 -5.4955,28.796421 -16.486501,39.787422s-24.253401,16.486501 -39.787422,16.486501s-28.796421,-5.4955 -39.787422,-16.486501s-16.486501,-24.253401 -16.486501,-39.787422s5.4955,-28.796421 16.486501,-39.787422s24.253401,-16.486501 39.787422,-16.486501s28.796421,5.4955 39.787422,16.486501s16.486501,24.253401 16.486501,39.787422z" fill="#ffffff"/>
 </svg>'''
 

From e1919b9d5b691091c0bf91f6217c60fb2e6ee623 Mon Sep 17 00:00:00 2001
From: Khumam Alzagim <alkh@odoo.com>
Date: Fri, 24 Oct 2025 11:53:55 +0000
Subject: [PATCH 420/673] [FIX] l10n_tr_nilvera_einvoice: group out moves by
 company on sync

The sync process previously used the wrong company when synchronizing
invoices. This fix groups invoices by their respective companies and
performs the sync for each company individually.

task-5207338

closes odoo/odoo#235029

X-original-commit: 1d2896925fbc40814892211e113ef7fc9419bef1
Signed-off-by: Wala Gauthier (gawa) <gawa@odoo.com>
Signed-off-by: Khumam Alzagim (alkh) <alkh@odoo.com>
---
 .../models/account_journal.py                 | 11 ++--
 .../models/account_move.py                    | 53 ++++++++++---------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/addons/l10n_tr_nilvera_einvoice/models/account_journal.py b/addons/l10n_tr_nilvera_einvoice/models/account_journal.py
index d09359077c562..b8495a9f5da59 100644
--- a/addons/l10n_tr_nilvera_einvoice/models/account_journal.py
+++ b/addons/l10n_tr_nilvera_einvoice/models/account_journal.py
@@ -30,15 +30,10 @@ def button_fetch_in_einvoices(self):
         self.env['account.move']._cron_nilvera_get_new_einvoice_purchase_documents()
 
     def button_refresh_out_einvoices_status(self):
-        # EXTENDS 'account'
-        """Gets the status from Nilvera for all processing invoices in
-        this journal and fetches E-Invoice, & E-Archive invoices from nilvera
+        """ Extends account to get the status from Nilvera for all processing invoices in
+        all journals and fetches E-Invoice, & E-Archive invoices from nilvera
         """
         super().button_refresh_out_einvoices_status()
-        invoices_to_update = self.env['account.move'].search([
-            ('journal_id', '=', self.id),
-            ('l10n_tr_nilvera_send_status', 'in', ['waiting', 'sent']),
-        ])
-        invoices_to_update._l10n_tr_nilvera_get_submitted_document_status()
+        self.env['account.move']._cron_nilvera_get_invoice_status()
         self.env['account.move']._cron_nilvera_get_new_einvoice_sale_documents()
         self.env['account.move']._cron_nilvera_get_new_earchive_sale_documents()
diff --git a/addons/l10n_tr_nilvera_einvoice/models/account_move.py b/addons/l10n_tr_nilvera_einvoice/models/account_move.py
index d43c33d378b26..46eccc6ddcc53 100644
--- a/addons/l10n_tr_nilvera_einvoice/models/account_move.py
+++ b/addons/l10n_tr_nilvera_einvoice/models/account_move.py
@@ -169,33 +169,34 @@ def _l10n_tr_nilvera_post_series(self, endpoint, client):
         )
 
     def _l10n_tr_nilvera_get_submitted_document_status(self):
-        with _get_nilvera_client(self.env.company) as client:
-            for invoice in self:
-                invoice_channel = invoice.partner_id.l10n_tr_nilvera_customer_status
-                document_category = invoice._l10n_tr_get_document_category(invoice_channel)
-                if not document_category or not invoice_channel:
-                    continue
-
-                response = client.request(
-                    "GET",
-                    f"/{invoice_channel}/{quote(document_category)}/{invoice.l10n_tr_nilvera_uuid}/Status",
-                )
-
-                nilvera_status = response.get('InvoiceStatus', {}).get('Code') or response.get('StatusCode')
-                if nilvera_status in dict(invoice._fields['l10n_tr_nilvera_send_status'].selection):
-                    invoice.l10n_tr_nilvera_send_status = nilvera_status
-                    if nilvera_status == 'error':
-                        invoice.message_post(
-                            body=Markup(
-                                "%s<br/>%s - %s<br/>"
-                            ) % (
-                                _("The invoice couldn't be sent to the recipient."),
-                                response.get('InvoiceStatus', {}).get('Description') or response.get('StatusDetail'),
-                                response.get('InvoiceStatus', {}).get('DetailDescription') or response.get('ReportStatus'),
+        for company, invoices in self.grouped("company_id").items():
+            with _get_nilvera_client(company) as client:
+                for invoice in invoices:
+                    invoice_channel = invoice.partner_id.l10n_tr_nilvera_customer_status
+                    document_category = invoice._l10n_tr_get_document_category(invoice_channel)
+                    if not document_category or not invoice_channel:
+                        continue
+
+                    response = client.request(
+                        "GET",
+                        f"/{invoice_channel}/{quote(document_category)}/{invoice.l10n_tr_nilvera_uuid}/Status",
+                    )
+
+                    nilvera_status = response.get('InvoiceStatus', {}).get('Code') or response.get('StatusCode')
+                    if nilvera_status in dict(invoice._fields['l10n_tr_nilvera_send_status'].selection):
+                        invoice.l10n_tr_nilvera_send_status = nilvera_status
+                        if nilvera_status == 'error':
+                            invoice.message_post(
+                                body=Markup(
+                                    "%s<br/>%s - %s<br/>"
+                                ) % (
+                                    _("The invoice couldn't be sent to the recipient."),
+                                    response.get('InvoiceStatus', {}).get('Description') or response.get('StatusDetail'),
+                                    response.get('InvoiceStatus', {}).get('DetailDescription') or response.get('ReportStatus'),
+                                )
                             )
-                        )
-                else:
-                    invoice.message_post(body=_("The invoice status couldn't be retrieved from Nilvera."))
+                    else:
+                        invoice.message_post(body=_("The invoice status couldn't be retrieved from Nilvera."))
 
     def _l10n_tr_nilvera_get_documents(self, invoice_channel="einvoice", document_category="Purchase", journal_type="in_invoice"):
         with _get_nilvera_client(self.env.company) as client:

From 98cdf7998759cdd0a5e6c7b7d93bff925138183c Mon Sep 17 00:00:00 2001
From: rmun-odoo <rmun@odoo.com>
Date: Mon, 6 Oct 2025 06:17:54 +0000
Subject: [PATCH 421/673] [FIX] hr: fix default work address

Steps to reproduce:
- Open the Employee app.
- Create a new employee in a company different from the current user's company.

Issue:
- The default address is taken from the current user's company
  instead of the active company's address.

Fix:
- Default address now uses the active company's address
  instead of the user's company.

task-5138714

closes odoo/odoo#235062

X-original-commit: 3af6e774ecf737f57f51ecafc616dda1f0aaaade
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Rajat Mungra (rmun) <rmun@odoo.com>
---
 addons/hr/models/hr_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/models/hr_version.py b/addons/hr/models/hr_version.py
index b2b06d3b87a0d..97bf73d7f9145 100644
--- a/addons/hr/models/hr_version.py
+++ b/addons/hr/models/hr_version.py
@@ -29,7 +29,7 @@ class HrVersion(models.Model):
     _rec_name = 'name'
 
     def _get_default_address_id(self):
-        address = self.env.user.company_id.partner_id.address_get(['default'])
+        address = self.env.company.partner_id.address_get(['default'])
         return address['default'] if address else False
 
     def _default_salary_structure(self):

From 600ec28fd90b19037b193eb4a98e0306bce78e1a Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Mon, 20 Oct 2025 16:17:59 +0200
Subject: [PATCH 422/673] [IMP] web: add offline UI support

This commit introduces the first offline features in the webclient.
For that matter, an "offline" service has been created. The service
exposes a reactive containing the offline state such that components
that want to render differently in offline can easily do so and be
automatically re-rendered when switching from/to offline mode.

A systray item has been added to indicate when we are offline.

By default, all buttons and checkboxes are disabled in offline. The
attribute `data-available-offline` can be set on those elements
that want to be available offline (e.g. breadcrumbs, menus...).

When offline, views that have an offline support (for now form,
list and kanban), take the priority over other views, as we know
the other views won't be able to fetch their data and render.

task~5106517

Part-of: odoo/odoo#229492
Related: odoo/enterprise#96626
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/web/models/ir_ui_view.py               |   7 +-
 addons/web/static/src/@types/services.d.ts    |   2 +
 addons/web/static/src/core/dialog/dialog.xml  |   6 +-
 .../static/src/core/errors/error_dialogs.xml  |  12 +-
 .../static/src/core/errors/error_handlers.js  |  56 +-------
 .../src/core/notifications/notification.xml   |   2 +-
 .../web/static/src/core/offline/offline.scss  |  11 ++
 .../static/src/core/offline/offline_error.js  |  26 ++++
 .../src/core/offline/offline_service.js       |  96 +++++++++++++
 .../src/core/offline/offline_systray.js       |  21 +++
 .../src/core/offline/offline_systray.xml      |  21 +++
 addons/web/static/src/core/pager/pager.xml    |   8 +-
 .../src/model/relational_model/record.js      |   4 +
 .../relational_model/relational_model.js      |   6 +-
 .../src/search/action_menus/action_menus.js   |   2 +-
 .../src/search/control_panel/control_panel.js |   2 -
 .../search/control_panel/control_panel.xml    |  13 +-
 .../src/search/search_bar/search_bar.js       |   3 +
 .../src/search/search_bar/search_bar.xml      |   2 +-
 addons/web/static/src/views/fields/field.js   |   5 +-
 .../src/views/fields/relational_utils.xml     |   2 +-
 .../src/views/form/button_box/button_box.xml  |   2 +-
 .../views/view_dialogs/form_view_dialog.xml   |   4 +-
 .../src/webclient/actions/action_service.js   |  15 ++-
 .../web/static/src/webclient/navbar/navbar.js |   4 +
 .../static/src/webclient/navbar/navbar.xml    |   4 +-
 .../tests/_framework/env_test_helpers.js      |   6 +
 .../tests/core/errors/error_service.test.js   |  48 +------
 .../tests/core/offline/offline_error.test.js  |  18 +++
 .../core/offline/offline_service.test.js      | 127 ++++++++++++++++++
 .../core/offline/offline_systray.test.js      |  64 +++++++++
 addons/web/static/tests/model/record.test.js  |   2 +-
 .../fields/badge_selection_field.test.js      |   5 +-
 .../fields/many2many_checkboxes_field.test.js |   2 +-
 .../views/fields/selection_field.test.js      |   8 +-
 .../static/tests/views/form/form_view.test.js |  43 ++++++
 .../static/tests/views/list/list_view.test.js |  51 +++++++
 addons/web/static/tests/web_test_helpers.js   |  30 ++---
 .../webclient/actions/error_handling.test.js  |   4 -
 .../static/tests/webclient/clickbot.test.js   |   6 +-
 40 files changed, 583 insertions(+), 167 deletions(-)
 create mode 100644 addons/web/static/src/core/offline/offline.scss
 create mode 100644 addons/web/static/src/core/offline/offline_error.js
 create mode 100644 addons/web/static/src/core/offline/offline_service.js
 create mode 100644 addons/web/static/src/core/offline/offline_systray.js
 create mode 100644 addons/web/static/src/core/offline/offline_systray.xml
 create mode 100644 addons/web/static/tests/core/offline/offline_error.test.js
 create mode 100644 addons/web/static/tests/core/offline/offline_service.test.js
 create mode 100644 addons/web/static/tests/core/offline/offline_systray.test.js

diff --git a/addons/web/models/ir_ui_view.py b/addons/web/models/ir_ui_view.py
index 62d09e10d7b20..208d1d5cb9a00 100644
--- a/addons/web/models/ir_ui_view.py
+++ b/addons/web/models/ir_ui_view.py
@@ -13,6 +13,7 @@ def get_view_info(self):
                 'display_name': display_name,
                 'icon': _view_info[type_]['icon'],
                 'multi_record': _view_info[type_].get('multi_record', True),
+                'available_offline': _view_info[type_].get('available_offline', False),
             }
             for (type_, display_name)
             in self.fields_get(['type'], ['selection'])['type']['selection']
@@ -21,11 +22,11 @@ def get_view_info(self):
 
     def _get_view_info(self):
         return {
-            'list': {'icon': 'oi oi-view-list'},
-            'form': {'icon': 'fa fa-address-card', 'multi_record': False},
+            'list': {'icon': 'oi oi-view-list', 'available_offline': True},
+            'form': {'icon': 'fa fa-address-card', 'multi_record': False, 'available_offline': True},
             'graph': {'icon': 'fa fa-area-chart'},
             'pivot': {'icon': 'oi oi-view-pivot'},
-            'kanban': {'icon': 'oi oi-view-kanban'},
+            'kanban': {'icon': 'oi oi-view-kanban', 'available_offline': True},
             'calendar': {'icon': 'fa fa-calendar'},
             'search': {'icon': 'oi oi-search'},
         }
diff --git a/addons/web/static/src/@types/services.d.ts b/addons/web/static/src/@types/services.d.ts
index 9a6c91c580b50..2b65ea9907b2e 100644
--- a/addons/web/static/src/@types/services.d.ts
+++ b/addons/web/static/src/@types/services.d.ts
@@ -14,6 +14,7 @@ declare module "services" {
     import { nameService } from "@web/core/name_service";
     import { httpService } from "@web/core/network/http_service";
     import { notificationService } from "@web/core/notifications/notification_service";
+    import { offlineService } from "@web/core/offline/offline_service";
     import { ormService } from "@web/core/orm_service";
     import { overlayService } from "@web/core/overlay/overlay_service";
     import { popoverService } from "@web/core/popover/popover_service";
@@ -54,6 +55,7 @@ declare module "services" {
         menu: typeof menuService;
         name: typeof nameService;
         notification: typeof notificationService;
+        offline: typeof offlineService;
         orm: typeof ormService;
         overlay: typeof overlayService;
         popover: typeof popoverService;
diff --git a/addons/web/static/src/core/dialog/dialog.xml b/addons/web/static/src/core/dialog/dialog.xml
index f0080045ffd67..f2c2cb088d04d 100644
--- a/addons/web/static/src/core/dialog/dialog.xml
+++ b/addons/web/static/src/core/dialog/dialog.xml
@@ -33,16 +33,16 @@
 
     <t t-name="web.Dialog.header">
         <t t-if="fullscreen">
-            <button class="btn oi oi-arrow-left oi-large" aria-label="Close" tabindex="-1" t-on-click="dismiss" />
+            <button class="btn oi oi-arrow-left oi-large" aria-label="Close" tabindex="-1" t-on-click="dismiss" data-available-offline=""/>
         </t>
         <h4 class="modal-title text-break flex-grow-1" t-att-class="{ 'me-auto': fullscreen, 'fs-5': props.size == 'sm' }">
             <t t-esc="props.title"/>
         </h4>
         <t t-if="onExpand">
-            <button type="button" class="fa fa-expand btn opacity-75 opacity-100-hover o_expand_button" aria-label="Expand" tabindex="-1" t-on-click="onExpand"/>
+            <button type="button" class="fa fa-expand btn opacity-75 opacity-100-hover o_expand_button" aria-label="Expand" tabindex="-1" t-on-click="onExpand" data-available-offline=""/>
         </t>
         <t t-if="!fullscreen">
-            <button type="button" class="btn-close" t-att-class="{'position-absolute top-0 end-0 mt-1 me-1': design == 'minimal' and !onExpand  }" aria-label="Close" tabindex="-1" t-on-click="dismiss"/>
+            <button type="button" class="btn-close" t-att-class="{'position-absolute top-0 end-0 mt-1 me-1': design == 'minimal' and !onExpand  }" aria-label="Close" tabindex="-1" t-on-click="dismiss" data-available-offline=""/>
         </t>
     </t>
 </templates>
diff --git a/addons/web/static/src/core/errors/error_dialogs.xml b/addons/web/static/src/core/errors/error_dialogs.xml
index 81d195c3f8db7..b687e74b583a3 100644
--- a/addons/web/static/src/core/errors/error_dialogs.xml
+++ b/addons/web/static/src/core/errors/error_dialogs.xml
@@ -7,7 +7,7 @@
                 <p t-esc="message" class="text-prewrap"/>
             </div>
             <t t-set-slot="footer">
-                <button class="btn btn-primary o-default-button" t-on-click="props.close">Close</button>
+                <button class="btn btn-primary o-default-button" t-on-click="props.close" data-available-offline="">Close</button>
             </t>
         </Dialog>
     </t>
@@ -19,7 +19,7 @@
             </div>
             <t t-set-slot="footer">
                 <button class="btn btn-primary" t-on-click="onClick" t-esc="buttonText"/>
-                <button class="btn btn-secondary" t-on-click="props.close">Close</button>
+                <button class="btn btn-secondary" t-on-click="props.close" data-available-offline="">Close</button>
             </t>
         </Dialog>
     </t>
@@ -32,7 +32,7 @@
                 </p>
             </div>
             <t t-set-slot="footer">
-                <button class="btn btn-primary o-default-button" t-on-click="props.close">Close</button>
+                <button class="btn btn-primary o-default-button" t-on-click="props.close" data-available-offline="">Close</button>
             </t>
         </Dialog>
     </t>
@@ -45,7 +45,7 @@
                 </p>
             </div>
             <t t-set-slot="footer">
-                <button class="btn btn-primary o-default-button" t-on-click="onClick">Close</button>
+                <button class="btn btn-primary o-default-button" t-on-click="onClick" data-available-offline="">Close</button>
             </t>
         </Dialog>
     </t>
@@ -59,7 +59,7 @@
                 <details t-on-toggle="() => { state.showTraceback = !state.showTraceback }">
                     <summary t-esc="state.showTraceback ? this.constructor.hideTracebackButtonText : this.constructor.showTracebackButtonText" class="mb-1 link-info"/>
                     <div class="text-bg-100 clearfix mt-2 position-relative o_error_detail pb-2">
-                        <button class="btn position-absolute top-0 end-0 pt-2 btn-link link-body-emphasis" t-ref="copyButton" t-on-click="onClickClipboard">
+                        <button class="btn position-absolute top-0 end-0 pt-2 btn-link link-body-emphasis" t-ref="copyButton" t-on-click="onClickClipboard" data-available-offline="">
                             <span class="fa fa-clipboard"/>
                         </button>
                         <div class="ps-1 pt-1 ps-md-3 pt-md-3">
@@ -73,7 +73,7 @@
                 </details>
             </div>
             <t t-set-slot="footer">
-                <button class="btn btn-primary o-default-button" t-on-click="props.close">Close</button>
+                <button class="btn btn-primary o-default-button" t-on-click="props.close" data-available-offline="">Close</button>
             </t>
         </Dialog>
     </t>
diff --git a/addons/web/static/src/core/errors/error_handlers.js b/addons/web/static/src/core/errors/error_handlers.js
index 5d5a3f93f0bcc..da30d5a88a64e 100644
--- a/addons/web/static/src/core/errors/error_handlers.js
+++ b/addons/web/static/src/core/errors/error_handlers.js
@@ -1,6 +1,4 @@
-import { _t } from "@web/core/l10n/translation";
-import { browser } from "../browser/browser";
-import { ConnectionLostError, RPCError, rpc } from "../network/rpc";
+import { RPCError } from "../network/rpc";
 import { registry } from "../registry";
 import { session } from "@web/session";
 import { user } from "@web/core/user";
@@ -81,54 +79,6 @@ export function rpcErrorHandler(env, error, originalError) {
 
 errorHandlerRegistry.add("rpcErrorHandler", rpcErrorHandler, { sequence: 97 });
 
-// -----------------------------------------------------------------------------
-// Lost connection errors
-// -----------------------------------------------------------------------------
-
-let connectionLostNotifRemove = null;
-/**
- * @param {OdooEnv} env
- * @param {UncaughError} error
- * @param {Error} originalError
- * @returns {boolean}
- */
-export function lostConnectionHandler(env, error, originalError) {
-    if (!(error instanceof UncaughtPromiseError)) {
-        return false;
-    }
-    if (originalError instanceof ConnectionLostError) {
-        if (connectionLostNotifRemove) {
-            // notification already displayed (can occur if there were several
-            // concurrent rpcs when the connection was lost)
-            return true;
-        }
-        connectionLostNotifRemove = env.services.notification.add(
-            _t("Connection lost. Trying to reconnect..."),
-            { sticky: true }
-        );
-        let delay = 2000;
-        browser.setTimeout(function checkConnection() {
-            rpc("/web/webclient/version_info", {})
-                .then(function () {
-                    if (connectionLostNotifRemove) {
-                        connectionLostNotifRemove();
-                        connectionLostNotifRemove = null;
-                    }
-                    env.services.notification.add(_t("Connection restored. You are back online."), {
-                        type: "info",
-                    });
-                })
-                .catch(() => {
-                    // exponential backoff, with some jitter
-                    delay = delay * 1.5 + 500 * Math.random();
-                    browser.setTimeout(checkConnection, delay);
-                });
-        }, delay);
-        return true;
-    }
-}
-errorHandlerRegistry.add("lostConnectionHandler", lostConnectionHandler, { sequence: 98 });
-
 // -----------------------------------------------------------------------------
 // Default handler
 // -----------------------------------------------------------------------------
@@ -182,5 +132,7 @@ if (user.isInternalUser === undefined) {
         );
     }
 } else {
-    registry.category("error_handlers").add("swallowAllVisitorErrors", swallowAllVisitorErrors, { sequence: 0 });
+    registry
+        .category("error_handlers")
+        .add("swallowAllVisitorErrors", swallowAllVisitorErrors, { sequence: 0 });
 }
diff --git a/addons/web/static/src/core/notifications/notification.xml b/addons/web/static/src/core/notifications/notification.xml
index 1e77f634628d6..12ed89d399b41 100644
--- a/addons/web/static/src/core/notifications/notification.xml
+++ b/addons/web/static/src/core/notifications/notification.xml
@@ -5,7 +5,7 @@
         <div t-on-mouseenter="freeze" t-on-mouseleave="refresh" t-attf-class="o_notification {{props.className}} d-flex mb-2 position-relative rounded shadow-lg" role="alert" aria-live="assertive" aria-atomic="true">
             <span t-attf-class="o_notification_bar bg-{{props.type}} rounded-start"/>
             <div class="w-100 py-2 ps-3 pe-5 border border-start-0 rounded-end text-break">
-                <button type="button" class="o_notification_close btn-close position-absolute top-0 end-0 mt-2 me-2" aria-label="Close" t-on-click="close"/>
+                <button type="button" class="o_notification_close btn-close position-absolute top-0 end-0 mt-2 me-2" aria-label="Close" t-on-click="close" data-available-offline=""/>
                 <div class="o_notification_body d-flex align-items-center">
                     <span class="me-auto o_notification_content w-100">
                         <!-- TODO-IPB: at the end, title has to be removed, but the change is too important to do all in once now -->
diff --git a/addons/web/static/src/core/offline/offline.scss b/addons/web/static/src/core/offline/offline.scss
new file mode 100644
index 0000000000000..d06c99ede6179
--- /dev/null
+++ b/addons/web/static/src/core/offline/offline.scss
@@ -0,0 +1,11 @@
+.o_disabled_offline {
+    cursor: not-allowed !important;
+    pointer-events: auto !important;
+    opacity: 0.5 !important;
+}
+
+// must override this rule https://github.com/odoo/odoo/blob/9e3b9bd085483ba0e0e956762fc0ad7d759eec73/addons/web/static/src/webclient/webclient.scss#L140
+.o_disabled_offline[type="action"],
+.o_disabled_offline[type="toggle"] {
+    cursor: not-allowed !important;
+}
diff --git a/addons/web/static/src/core/offline/offline_error.js b/addons/web/static/src/core/offline/offline_error.js
new file mode 100644
index 0000000000000..13526419517a4
--- /dev/null
+++ b/addons/web/static/src/core/offline/offline_error.js
@@ -0,0 +1,26 @@
+import { UncaughtPromiseError } from "../errors/error_service";
+import { ConnectionLostError } from "../network/rpc";
+import { registry } from "../registry";
+
+const errorHandlerRegistry = registry.category("error_handlers");
+
+// -----------------------------------------------------------------------------
+// Lost connection errors
+// -----------------------------------------------------------------------------
+
+/**
+ * @param {OdooEnv} env
+ * @param {UncaughError} error
+ * @param {Error} originalError
+ * @returns {boolean}
+ */
+export function lostConnectionHandler(env, error, originalError) {
+    if (!(error instanceof UncaughtPromiseError)) {
+        return false;
+    }
+    if (originalError instanceof ConnectionLostError) {
+        env.services.offline.status.offline = true;
+        return true;
+    }
+}
+errorHandlerRegistry.add("lostConnectionHandler", lostConnectionHandler, { sequence: 98 });
diff --git a/addons/web/static/src/core/offline/offline_service.js b/addons/web/static/src/core/offline/offline_service.js
new file mode 100644
index 0000000000000..18000435c213b
--- /dev/null
+++ b/addons/web/static/src/core/offline/offline_service.js
@@ -0,0 +1,96 @@
+import { reactive, useState } from "@odoo/owl";
+import { browser } from "@web/core/browser/browser";
+import { ConnectionLostError, rpc, rpcBus } from "@web/core/network/rpc";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+
+const SELECTORS_TO_DISABLE = [
+    "button:not([data-available-offline]):not([disabled])",
+    "input[type='checkbox']:not([disabled])",
+];
+
+function offlineUI() {
+    document.querySelectorAll(SELECTORS_TO_DISABLE.join(", ")).forEach((el) => {
+        el.setAttribute("disabled", "");
+        el.classList.add("o_disabled_offline");
+    });
+}
+
+function onlineUI() {
+    document.querySelectorAll(".o_disabled_offline").forEach((el) => {
+        el.removeAttribute("disabled");
+        el.classList.remove("o_disabled_offline");
+    });
+}
+
+export const offlineService = {
+    async start() {
+        let timeout;
+        let observer;
+
+        async function checkConnection() {
+            try {
+                await rpc("/web/webclient/version_info", {});
+            } catch {
+                status.offline = true;
+                return;
+            }
+            status.offline = false;
+        }
+
+        const status = reactive(
+            {
+                offline: false,
+            },
+            () => {
+                if (status.offline) {
+                    // Disable everything in the UI that isn't marked as available offline
+                    offlineUI();
+                    // Create an observer instance linked to the callback function to keep disabling
+                    // buttons that would appear in the DOM while being offline
+                    observer = new MutationObserver((mutationList) => {
+                        if (status.offline && mutationList.find((m) => m.addedNodes.length > 0)) {
+                            offlineUI();
+                        }
+                    });
+                    observer.observe(document.body, {
+                        childList: true, // listen for direct children being added/removed
+                        subtree: true, // also observe descendants (not just direct children)
+                    });
+
+                    // Repeatedly check if connection is back
+                    let delay = 2000;
+                    const _checkConnection = async () => {
+                        if (status.offline) {
+                            await checkConnection();
+                            // exponential backoff, with some jitter
+                            delay = delay * 1.5 + 500 * Math.random();
+                            timeout = browser.setTimeout(_checkConnection, delay);
+                        }
+                    };
+                    timeout = browser.setTimeout(_checkConnection, delay);
+                } else {
+                    onlineUI();
+                    observer?.disconnect();
+                    browser.clearTimeout(timeout);
+                }
+            }
+        );
+        status.offline; // activate the reactivity!
+
+        rpcBus.addEventListener("RPC:RESPONSE", (ev) => {
+            status.offline = ev.detail.error instanceof ConnectionLostError;
+        });
+
+        return {
+            status,
+            checkConnection,
+        };
+    },
+};
+
+registry.category("services").add("offline", offlineService);
+
+export function useOfflineStatus() {
+    return useState(useService("offline").status);
+}
diff --git a/addons/web/static/src/core/offline/offline_systray.js b/addons/web/static/src/core/offline/offline_systray.js
new file mode 100644
index 0000000000000..9483b67849fa4
--- /dev/null
+++ b/addons/web/static/src/core/offline/offline_systray.js
@@ -0,0 +1,21 @@
+import { Component, useEffect } from "@odoo/owl";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { useOfflineStatus } from "./offline_service";
+
+class OfflineSystray extends Component {
+    static template = "web.OfflineSystray";
+    static props = {};
+
+    setup() {
+        this.offlineService = useService("offline");
+        this.status = useOfflineStatus();
+        useEffect(this.env.redrawNavbar, () => [this.status.offline]);
+    }
+}
+
+const offlineSystrayItem = {
+    Component: OfflineSystray,
+};
+
+registry.category("systray").add("offline", offlineSystrayItem, { sequence: 1000 });
diff --git a/addons/web/static/src/core/offline/offline_systray.xml b/addons/web/static/src/core/offline/offline_systray.xml
new file mode 100644
index 0000000000000..a31a146adedc1
--- /dev/null
+++ b/addons/web/static/src/core/offline/offline_systray.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="web.OfflineSystray">
+        <div t-if="status.offline" t-on-click="() => this.offlineService.checkConnection()">
+            <i t-if="env.isSmall"
+                class="fa fa-chain-broken o_nav_entry text-danger"
+                role="img"
+                aria-label="Working offline"
+                data-tooltip="Working offline"/>
+            <button t-else=""
+                class="o_nav_entry px-2 o_tag opacity-75 rounded-pill text-bg-danger"
+                data-available-offline=""
+                data-tooltip="Click to check connection">
+                <i class="fa fa-chain-broken me-1"></i> Working offline
+            </button>
+        </div>
+    </t>
+
+</templates>
+
diff --git a/addons/web/static/src/core/pager/pager.xml b/addons/web/static/src/core/pager/pager.xml
index d69bfb65d1f49..00b92ea1f2c64 100644
--- a/addons/web/static/src/core/pager/pager.xml
+++ b/addons/web/static/src/core/pager/pager.xml
@@ -20,10 +20,14 @@
             </span>
             <span class="btn-group d-print-none" aria-atomic="true">
                 <!-- accesskeys not wanted in X2Many widgets -->
-                <button type="button" class="btn btn-secondary o_pager_previous px-2 rounded-start" aria-label="Previous" data-tooltip="Previous" tabindex="-1" t-att-data-hotkey="props.withAccessKey ? 'p' : false" t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(-1)">
+                <button type="button" class="btn btn-secondary o_pager_previous px-2 rounded-start" aria-label="Previous" tabindex="-1"
+                    data-tooltip="Previous" t-att-data-hotkey="props.withAccessKey ? 'p' : false" data-available-offline=""
+                    t-att-disabled="state.isDisabled or isSinglePage"  t-on-click.stop="() => this.navigate(-1)">
                     <i class="oi oi-chevron-left"/>
                 </button>
-                <button type="button" class="btn btn-secondary o_pager_next px-2 rounded-end" aria-label="Next" data-tooltip="Next" tabindex="-1" t-att-data-hotkey="props.withAccessKey ? 'n' : false" t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(1)">
+                <button type="button" class="btn btn-secondary o_pager_next px-2 rounded-end" aria-label="Next" tabindex="-1"
+                    data-tooltip="Next" t-att-data-hotkey="props.withAccessKey ? 'n' : false" data-available-offline=""
+                    t-att-disabled="state.isDisabled or isSinglePage" t-on-click.stop="() => this.navigate(1)">
                     <i class="oi oi-chevron-right"/>
                 </button>
             </span>
diff --git a/addons/web/static/src/model/relational_model/record.js b/addons/web/static/src/model/relational_model/record.js
index a82b235986e67..ddf94362ffe85 100644
--- a/addons/web/static/src/model/relational_model/record.js
+++ b/addons/web/static/src/model/relational_model/record.js
@@ -142,9 +142,13 @@ export class Record extends DataPoint {
     }
 
     get isInEdition() {
+        if (this.model.offline.status.offline) {
+            return false;
+        }
         if (this.config.mode === "readonly") {
             return false;
         } else {
+            // FIXME: why the or ? if it's not in 'readonly' it's in 'edit', in which case the first is false ?
             return this.config.mode === "edit" || !this.resId;
         }
     }
diff --git a/addons/web/static/src/model/relational_model/relational_model.js b/addons/web/static/src/model/relational_model/relational_model.js
index 3f9cfa8af71ee..a1f81c1d2cf34 100644
--- a/addons/web/static/src/model/relational_model/relational_model.js
+++ b/addons/web/static/src/model/relational_model/relational_model.js
@@ -112,7 +112,7 @@ rpcBus.addEventListener("RPC:RESPONSE", (ev) => {
 });
 
 export class RelationalModel extends Model {
-    static services = ["action", "dialog", "notification", "orm"];
+    static services = ["action", "dialog", "notification", "orm", "offline"];
     static Record = RelationalRecord;
     static Group = Group;
     static DynamicRecordList = DynamicRecordList;
@@ -128,10 +128,11 @@ export class RelationalModel extends Model {
      * @param {RelationalModelParams} params
      * @param {Services} services
      */
-    setup(params, { action, dialog, notification }) {
+    setup(params, { action, dialog, notification, offline }) {
         this.action = action;
         this.dialog = dialog;
         this.notification = notification;
+        this.offline = offline;
 
         this.bus = new EventBus();
 
@@ -284,6 +285,7 @@ export class RelationalModel extends Model {
         }
         if (
             !this.isReady || // first load of the model
+            this.offline.status.offline || // use the cache if we are offline
             // monorecord, loading a different id, or creating a new record (onchange)
             (config.isMonoRecord && (this.root.config.resId !== config.resId || !config.resId))
         ) {
diff --git a/addons/web/static/src/search/action_menus/action_menus.js b/addons/web/static/src/search/action_menus/action_menus.js
index d5cb08a509ee3..8d7fb97f2de29 100644
--- a/addons/web/static/src/search/action_menus/action_menus.js
+++ b/addons/web/static/src/search/action_menus/action_menus.js
@@ -55,7 +55,7 @@ export class ActionMenus extends Component {
     setup() {
         this.orm = useService("orm");
         this.actionService = useService("action");
-        this.state = useState({ printItems: []})
+        this.state = useState({ printItems: [] });
         onWillStart(async () => {
             this.actionItems = await this.getActionItems(this.props);
         });
diff --git a/addons/web/static/src/search/control_panel/control_panel.js b/addons/web/static/src/search/control_panel/control_panel.js
index 24394b55025a1..ffba124d53ea3 100644
--- a/addons/web/static/src/search/control_panel/control_panel.js
+++ b/addons/web/static/src/search/control_panel/control_panel.js
@@ -15,7 +15,6 @@ import { makeContext } from "@web/core/context";
 import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
 import { Transition } from "@web/core/transition";
 import { Breadcrumbs } from "../breadcrumbs/breadcrumbs";
-import { SearchBar } from "../search_bar/search_bar";
 
 import { Component, useState, onMounted, useRef, useEffect } from "@odoo/owl";
 
@@ -91,7 +90,6 @@ export class ControlPanel extends Component {
     static template = "web.ControlPanel";
     static components = {
         Pager,
-        SearchBar,
         Dropdown,
         DropdownItem,
         Breadcrumbs,
diff --git a/addons/web/static/src/search/control_panel/control_panel.xml b/addons/web/static/src/search/control_panel/control_panel.xml
index f4c18d5984d1e..056d527b9162e 100644
--- a/addons/web/static/src/search/control_panel/control_panel.xml
+++ b/addons/web/static/src/search/control_panel/control_panel.xml
@@ -93,15 +93,19 @@
                     <t t-if="env.config.viewSwitcherEntries?.length > 1">
                         <div t-if="env.isSmall" class="o_cp_switch_buttons btn-group d-print-none">
                             <Dropdown menuClass="{o_cp_switch_buttons: true, o_custom_bottom_sheet: true }">
-                                <button class="btn btn-secondary">
+                                <button class="btn btn-secondary" data-available-offline="">
                                     <t t-set="activeView" t-value="env.config.viewSwitcherEntries.find((view) => view.active)"/>
                                     <i class="oi-fw" t-att-class="activeView.icon"/>
                                 </button>
                                 <t t-set-slot="content">
                                     <t t-foreach="env.config.viewSwitcherEntries" t-as="view" t-key="view.type">
-                                        <DropdownItem onSelected="() => this.switchView(view.type)" class="view.active ? 'selected' : ''">
-                                            <i class="oi-fw" t-att-class="view.icon"/>
-                                            <span class="ms-1" t-out="view.name"/>
+                                        <DropdownItem 
+                                            tag="'button'"
+                                            attrs="{ 'data-available-offline': view.availableOffline}"
+                                            onSelected="() => this.switchView(view.type)"
+                                            class="view.active ? 'selected' : ''">
+                                                <i class="oi-fw" t-att-class="view.icon"/>
+                                                <span class="ms-1" t-out="view.name"/>
                                         </DropdownItem>
                                     </t>
                                 </t>
@@ -111,6 +115,7 @@
                             <t t-foreach="env.config.viewSwitcherEntries" t-as="view" t-key="view.type">
                                 <button class="btn btn-secondary o_switch_view "
                                     t-attf-class="o_{{view.type}} {{view.active ? 'active' : ''}}"
+                                    t-att-data-available-offline="view.availableOffline"
                                     t-att-data-tooltip="view.name"
                                     t-custom-click="(ev, isMiddleClick) => this.switchView(view.type, isMiddleClick)"
                                     t-att-aria-label="view.name + ' View'"
diff --git a/addons/web/static/src/search/search_bar/search_bar.js b/addons/web/static/src/search/search_bar/search_bar.js
index 85f8e4ce4705c..69eac96c956c5 100644
--- a/addons/web/static/src/search/search_bar/search_bar.js
+++ b/addons/web/static/src/search/search_bar/search_bar.js
@@ -13,6 +13,7 @@ import { hasTouch } from "@web/core/browser/feature_detection";
 import { Dropdown } from "@web/core/dropdown/dropdown";
 import { DropdownItem } from "@web/core/dropdown/dropdown_item";
 import { useNavigation } from "@web/core/navigation/navigation";
+import { useOfflineStatus } from "@web/core/offline/offline_service";
 
 const parsers = registry.category("parsers");
 
@@ -86,6 +87,8 @@ export class SearchBar extends Component {
         this.items = useState([]);
         this.subItems = {};
 
+        this.offlineStatus = useOfflineStatus();
+
         this.facetContainerRef = useRef("facetContainerRef");
         this.menuRef = useChildRef();
         this.setupFacetNavigation();
diff --git a/addons/web/static/src/search/search_bar/search_bar.xml b/addons/web/static/src/search/search_bar/search_bar.xml
index 8efa774a67c54..4373a3ece756f 100644
--- a/addons/web/static/src/search/search_bar/search_bar.xml
+++ b/addons/web/static/src/search/search_bar/search_bar.xml
@@ -86,7 +86,7 @@
     </t>
 
     <t t-name="web.SearchBar">
-        <div t-if="visibilityState.showSearchBar" class="o_cp_searchview d-flex input-group" role="search" t-ref="root">
+        <div t-if="visibilityState.showSearchBar and !offlineStatus.offline" class="o_cp_searchview d-flex input-group" role="search" t-ref="root">
             <Dropdown
                 state="inputDropdownState"
                 manual="true"
diff --git a/addons/web/static/src/views/fields/field.js b/addons/web/static/src/views/fields/field.js
index fa3bdc014dc2b..0c08ba1c299c6 100644
--- a/addons/web/static/src/views/fields/field.js
+++ b/addons/web/static/src/views/fields/field.js
@@ -1,4 +1,5 @@
 import { Domain } from "@web/core/domain";
+import { useOfflineStatus } from "@web/core/offline/offline_service";
 import { evaluateBooleanExpr, evaluateExpr } from "@web/core/py_js/py";
 import { registry } from "@web/core/registry";
 import { utils } from "@web/core/ui/ui_service";
@@ -355,6 +356,7 @@ export class Field extends Component {
     };
 
     setup() {
+        this.offlineStatus = useOfflineStatus();
         if (this.props.fieldInfo) {
             this.field = this.props.fieldInfo.field;
         } else {
@@ -409,7 +411,8 @@ export class Field extends Component {
 
     get fieldComponentProps() {
         const record = this.props.record;
-        let readonly = this.props.readonly || false;
+        // disable edition in offline mode
+        let readonly = this.props.readonly || this.offlineStatus.offline || false;
 
         let propsFromNode = {};
         if (this.props.fieldInfo) {
diff --git a/addons/web/static/src/views/fields/relational_utils.xml b/addons/web/static/src/views/fields/relational_utils.xml
index c401bacc34b0a..f33ef30b2bfe4 100644
--- a/addons/web/static/src/views/fields/relational_utils.xml
+++ b/addons/web/static/src/views/fields/relational_utils.xml
@@ -63,7 +63,7 @@
         </t>
     </t>
     <t t-else="">
-        <button class="btn btn-primary o_form_button_cancel" t-on-click="() => this.props.close()" data-hotkey="j">Close</button>
+        <button class="btn btn-primary o_form_button_cancel" t-on-click="() => this.props.close()" data-hotkey="j" data-available-offline="">Close</button>
     </t>
 </t>
 
diff --git a/addons/web/static/src/views/form/button_box/button_box.xml b/addons/web/static/src/views/form/button_box/button_box.xml
index 85af8800d7cb8..882675b804ce0 100644
--- a/addons/web/static/src/views/form/button_box/button_box.xml
+++ b/addons/web/static/src/views/form/button_box/button_box.xml
@@ -6,7 +6,7 @@
         <t t-slot="{{ button_value }}" t-foreach="visibleButtons" t-as="button" t-key="button_value"/>
         <div t-if="additionalButtons.length" class="oe_stat_button btn position-relative p-0 border-0">
             <Dropdown position="!env.isSmall ? 'bottom-end' : ''" menuClass="'o-form-buttonbox p-0 border-0 ' + (!env.isSmall ? 'o_dropdown_more' : 'o-form-buttonbox-small')">
-                <button class="o_button_more btn d-flex justify-content-center align-items-center" t-att-class="!env.isSmall ? 'o-dropdown-caret btn-outline-secondary' : 'btn-secondary'">
+                <button class="o_button_more btn d-flex justify-content-center align-items-center" t-att-class="!env.isSmall ? 'o-dropdown-caret btn-outline-secondary' : 'btn-secondary'" data-available-offline="">
                     <span t-if="!env.isSmall">More</span>
                     <i t-else="" class="fa fa-fw fa-bolt lh-base" aria-hidden="true"/>
                 </button>
diff --git a/addons/web/static/src/views/view_dialogs/form_view_dialog.xml b/addons/web/static/src/views/view_dialogs/form_view_dialog.xml
index 26053bd43a843..f3d297d2cd6f1 100644
--- a/addons/web/static/src/views/view_dialogs/form_view_dialog.xml
+++ b/addons/web/static/src/views/view_dialogs/form_view_dialog.xml
@@ -6,10 +6,10 @@
       <View t-props="viewProps"/>
       <t t-set-slot="footer">
         <t t-if="props.preventEdit and props.preventCreate">
-          <button class="btn btn-primary" t-on-click="() => props.close()">Close</button>
+          <button class="btn btn-primary" t-on-click="() => props.close()" data-available-offline="">Close</button>
         </t>
         <t t-else="">
-          <button class="btn btn-primary o-default-button" t-on-click="() => props.close()">Ok</button>
+          <button class="btn btn-primary o-default-button" t-on-click="() => props.close()" data-available-offline="">Ok</button>
         </t>
       </t>
     </Dialog>
diff --git a/addons/web/static/src/webclient/actions/action_service.js b/addons/web/static/src/webclient/actions/action_service.js
index 06164fb938f9e..cd03dea6d5f6a 100644
--- a/addons/web/static/src/webclient/actions/action_service.js
+++ b/addons/web/static/src/webclient/actions/action_service.js
@@ -674,6 +674,7 @@ export function makeActionManager(env, router = _router) {
                     name: v.display_name,
                     type: v.type,
                     multiRecord: v.multiRecord,
+                    availableOffline: v.availableOffline,
                 };
                 if (view.type === v.type) {
                     viewSwitcherEntry.active = true;
@@ -1218,8 +1219,13 @@ export function makeActionManager(env, router = _router) {
                 continue;
             }
             if (session.view_info[type]) {
-                const { icon, display_name, multi_record: multiRecord } = session.view_info[type];
-                views.push({ icon, display_name, multiRecord, type });
+                const {
+                    icon,
+                    display_name,
+                    multi_record: multiRecord,
+                    available_offline: availableOffline,
+                } = session.view_info[type];
+                views.push({ icon, display_name, multiRecord, type, availableOffline });
             } else {
                 unknown.push(type);
             }
@@ -1239,6 +1245,9 @@ export function makeActionManager(env, router = _router) {
         if (env.isSmall) {
             view = _findView(views, view.multiRecord, action.mobile_view_mode) || view;
         }
+        if (env.services.offline.status.offline && !view.availableOffline) {
+            view = views.find((v) => v.availableOffline);
+        }
 
         const controller = _makeController({
             Component: View,
@@ -1875,7 +1884,7 @@ export function makeActionManager(env, router = _router) {
 }
 
 export const actionService = {
-    dependencies: ["dialog", "effect", "localization", "notification", "title", "ui"],
+    dependencies: ["dialog", "effect", "localization", "notification", "offline", "title", "ui"],
     start(env) {
         return makeActionManager(env);
     },
diff --git a/addons/web/static/src/webclient/navbar/navbar.js b/addons/web/static/src/webclient/navbar/navbar.js
index 66f6eee392a47..1ad8d67bc27c1 100644
--- a/addons/web/static/src/webclient/navbar/navbar.js
+++ b/addons/web/static/src/webclient/navbar/navbar.js
@@ -15,6 +15,7 @@ import {
     useRef,
     useState,
     onWillUnmount,
+    useChildSubEnv,
 } from "@odoo/owl";
 const systrayRegistry = registry.category("systray");
 
@@ -70,6 +71,9 @@ export class NavBar extends Component {
             () => [adaptCounter]
         );
 
+        // allow systray items to trigger an adapt when their layout changes
+        useChildSubEnv({ redrawNavbar: renderAndAdapt });
+
         this.state = useState({
             isAllAppsMenuOpened: false,
             isAppMenuSidebarOpened: false,
diff --git a/addons/web/static/src/webclient/navbar/navbar.xml b/addons/web/static/src/webclient/navbar/navbar.xml
index dca113d9bda24..6c548e890dab0 100644
--- a/addons/web/static/src/webclient/navbar/navbar.xml
+++ b/addons/web/static/src/webclient/navbar/navbar.xml
@@ -110,7 +110,7 @@
               <small class="d-flex align-items-center justify-content-between ms-2">
                   <a href="/odoo" class="btn btn-primary" t-on-click.prevent="onAllAppsBtnClick"><i class="oi oi-apps"></i><span class="px-2">All Apps</span></a>
               </small>
-              <button class="o_sidebar_close oi oi-close btn d-flex align-items-center h-100 bg-transparent border-0 fs-2 text-reset" aria-label="Close menu" title="Close menu" t-on-click.stop="_closeAppMenuSidebar"/>
+              <button class="o_sidebar_close oi oi-close btn d-flex align-items-center h-100 bg-transparent border-0 fs-2 text-reset" aria-label="Close menu" title="Close menu" t-on-click.stop="_closeAppMenuSidebar" data-available-offline=""/>
           </div>
           <nav class="o_burger_menu_content flex-grow-1 flex-shrink-1 overflow-auto o_burger_menu_app">
                 <div t-if="!state.isAllAppsMenuOpened and currentApp" class="d-flex align-items-center m-3 mb-0">
@@ -178,7 +178,7 @@
                     </t>
                     <t t-else="">
                         <Dropdown>
-                            <button t-att-data-hotkey="hotkey" t-att-data-menu-xmlid="section.xmlid">
+                            <button t-att-data-hotkey="hotkey" t-att-data-menu-xmlid="section.xmlid" data-available-offline="">
                                 <span t-esc="section.name" t-att-data-section="section.id" />
                             </button>
                             <t t-set-slot="content">
diff --git a/addons/web/static/tests/_framework/env_test_helpers.js b/addons/web/static/tests/_framework/env_test_helpers.js
index 1632d0e07fe32..212354115f3b5 100644
--- a/addons/web/static/tests/_framework/env_test_helpers.js
+++ b/addons/web/static/tests/_framework/env_test_helpers.js
@@ -106,6 +106,12 @@ export async function makeMockEnv(partialEnv, options) {
         currentEnv = env;
         startRouter();
         after(() => {
+            // Ideally: this should be done in a stop of the service !!!
+            // This is done to remove the observer that disables the buttons.
+            if (currentEnv.services.offline) {
+                currentEnv.services.offline.status.offline = false;
+            }
+
             currentEnv = null;
 
             // Ideally: should be done in a patch of the localization service, but this
diff --git a/addons/web/static/tests/core/errors/error_service.test.js b/addons/web/static/tests/core/errors/error_service.test.js
index b8e81eebcbbfd..7a74e26b7ae35 100644
--- a/addons/web/static/tests/core/errors/error_service.test.js
+++ b/addons/web/static/tests/core/errors/error_service.test.js
@@ -1,12 +1,11 @@
 import { beforeEach, describe, expect, test } from "@odoo/hoot";
 import { manuallyDispatchProgrammaticEvent } from "@odoo/hoot-dom";
-import { Deferred, advanceTime, animationFrame } from "@odoo/hoot-mock";
+import { Deferred, animationFrame } from "@odoo/hoot-mock";
 import { Component, OwlError, onError, onWillStart, xml } from "@odoo/owl";
 import {
     makeMockEnv,
     mockService,
     mountWithCleanup,
-    onRpc,
     patchWithCleanup,
     serverState,
 } from "@web/../tests/web_test_helpers";
@@ -17,7 +16,7 @@ import {
     standardErrorDialogProps,
 } from "@web/core/errors/error_dialogs";
 import { UncaughtPromiseError } from "@web/core/errors/error_service";
-import { ConnectionLostError, RPCError } from "@web/core/network/rpc";
+import { RPCError } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { omit } from "@web/core/utils/objects";
 
@@ -164,49 +163,6 @@ test("handle normal RPC_ERROR of type='server' and associated custom dialog clas
     expect.verifyErrors(["RPC_ERROR: A normal error occured"]);
 });
 
-test("handle CONNECTION_LOST_ERROR", async () => {
-    expect.errors(1);
-    mockService("notification", {
-        add(message) {
-            expect.step(`create (${message})`);
-            return () => {
-                expect.step(`close`);
-            };
-        },
-    });
-    const values = [false, true]; // simulate the 'back online status' after 2 'version_info' calls
-    onRpc("/web/webclient/version_info", async () => {
-        expect.step("version_info");
-        const online = values.shift();
-        if (online) {
-            return true;
-        } else {
-            return Promise.reject();
-        }
-    });
-
-    await makeMockEnv();
-    const error = new ConnectionLostError("/fake_url");
-    Promise.reject(error);
-    await animationFrame();
-    patchWithCleanup(Math, {
-        random: () => 0,
-    });
-    // wait for timeouts
-    await advanceTime(2000);
-    await advanceTime(3500);
-    expect.verifySteps([
-        "create (Connection lost. Trying to reconnect...)",
-        "version_info",
-        "version_info",
-        "close",
-        "create (Connection restored. You are back online.)",
-    ]);
-    expect.verifyErrors([
-        `Error: Connection to "/fake_url" couldn't be established or was interrupted`,
-    ]);
-});
-
 test("will let handlers from the registry handle errors first", async () => {
     expect.assertions(4);
     expect.errors(1);
diff --git a/addons/web/static/tests/core/offline/offline_error.test.js b/addons/web/static/tests/core/offline/offline_error.test.js
new file mode 100644
index 0000000000000..c237d24ac255e
--- /dev/null
+++ b/addons/web/static/tests/core/offline/offline_error.test.js
@@ -0,0 +1,18 @@
+import { ConnectionLostError } from "@web/core/network/rpc";
+
+import { animationFrame, expect, test } from "@odoo/hoot";
+import { makeMockEnv } from "@web/../tests/web_test_helpers";
+
+test("ConnectionLostError handler", async () => {
+    expect.errors(1);
+
+    const env = await makeMockEnv();
+    expect(env.services.offline.status.offline).toBe(false);
+    const error = new ConnectionLostError("/fake_url");
+    Promise.reject(error);
+    await animationFrame();
+    expect(env.services.offline.status.offline).toBe(true);
+    expect.verifyErrors([
+        `Error: Connection to "/fake_url" couldn't be established or was interrupted`,
+    ]);
+});
diff --git a/addons/web/static/tests/core/offline/offline_service.test.js b/addons/web/static/tests/core/offline/offline_service.test.js
new file mode 100644
index 0000000000000..c259bc0f5127a
--- /dev/null
+++ b/addons/web/static/tests/core/offline/offline_service.test.js
@@ -0,0 +1,127 @@
+import { Component, xml } from "@odoo/owl";
+import { rpc } from "@web/core/network/rpc";
+
+import { advanceTime, animationFrame, expect, test } from "@odoo/hoot";
+import {
+    getService,
+    makeMockEnv,
+    mountWithCleanup,
+    onRpc,
+    patchWithCleanup,
+} from "@web/../tests/web_test_helpers";
+
+test("RPC:RESPONSE: rpc returning a status 502", async () => {
+    expect.errors(1);
+
+    onRpc("/rpc/offline", () => new Response("", { status: 502 }), { pure: true });
+
+    const env = await makeMockEnv();
+    expect(env.services.offline.status.offline).toBe(false);
+
+    rpc("/rpc/offline");
+    await animationFrame();
+    expect(env.services.offline.status.offline).toBe(true);
+
+    expect.verifyErrors([
+        `Error: Connection to "/rpc/offline" couldn't be established or was interrupted`,
+    ]);
+});
+
+test("RPC:RESPONSE: any succesfull rpc turns offline off", async () => {
+    onRpc("/rpc/thatworks", () => true);
+
+    const env = await makeMockEnv();
+    env.services.offline.status.offline = true;
+    expect(env.services.offline.status.offline).toBe(true);
+
+    await rpc("/rpc/thatworks");
+    expect(env.services.offline.status.offline).toBe(false);
+});
+
+test("offlineUI: disable interactive elements except [data-available-offline]", async () => {
+    class Root extends Component {
+        static template = xml`
+            <div>
+                <button type="button" class="button_to_disable"> Disable this button </button>
+                <button type="button" class="button_available_offline" data-available-offline=""> Don't disable this button </button>
+                <input type="checkbox" name="checkbox" class="checkbox_to_disable"/>
+            </div>
+        `;
+        static props = ["*"];
+    }
+
+    await mountWithCleanup(Root);
+    expect(`.button_to_disable`).not.toHaveAttribute("disabled");
+    expect(`.button_available_offline`).not.toHaveAttribute("disabled");
+    expect(`.checkbox_to_disable`).not.toHaveAttribute("disabled");
+
+    getService("offline").status.offline = true;
+    expect(`.button_to_disable`).toHaveAttribute("disabled");
+    expect(`.button_available_offline`).not.toHaveAttribute("disabled");
+    expect(`.checkbox_to_disable`).toHaveAttribute("disabled");
+    expect(`.button_to_disable`).toHaveClass("o_disabled_offline");
+    expect(`.button_available_offline`).not.toHaveClass("o_disabled_offline");
+    expect(`.checkbox_to_disable`).toHaveClass("o_disabled_offline");
+
+    getService("offline").status.offline = false;
+    expect(`.button_to_disable`).not.toHaveAttribute("disabled");
+    expect(`.button_available_offline`).not.toHaveAttribute("disabled");
+    expect(`.checkbox_to_disable`).not.toHaveAttribute("disabled");
+});
+
+test("offlineUI: don't disable already disabled elements", async () => {
+    class Root extends Component {
+        static template = xml`
+            <div>
+                <button type="button" class="button" disabled="disabled"> Disabled button </button>
+                <input type="checkbox" class="checkbox" disabled="disabled"/>
+            </div>
+        `;
+        static props = ["*"];
+    }
+
+    await mountWithCleanup(Root);
+    expect(`.button`).toHaveAttribute("disabled");
+    expect(`.checkbox`).toHaveAttribute("disabled");
+
+    getService("offline").status.offline = true;
+    expect(`.button`).toHaveAttribute("disabled");
+    expect(`.checkbox`).toHaveAttribute("disabled");
+    expect(`.button`).not.toHaveClass("o_disabled_offline");
+    expect(`.checkbox`).not.toHaveClass("o_disabled_offline");
+
+    getService("offline").status.offline = false;
+    expect(`.button`).toHaveAttribute("disabled");
+    expect(`.checkbox`).toHaveAttribute("disabled");
+});
+
+test("Repeatedly check connection when going offline", async () => {
+    patchWithCleanup(Math, {
+        random: () => 1, // no jitter
+    });
+
+    const values = [false, true]; // simulate the 'back online status' after 2 'version_info' calls
+    const mockVersionInfoRpc = () => {
+        expect.step("version_info");
+        const online = values.shift();
+        if (online) {
+            return new Response("true", { status: 200 });
+        } else {
+            return new Response("", { status: 502 });
+        }
+    };
+    onRpc("/web/webclient/version_info", mockVersionInfoRpc, { pure: true });
+
+    const env = await makeMockEnv();
+    expect(env.services.offline.status.offline).toBe(false);
+
+    // go offline
+    env.services.offline.status.offline = true;
+
+    expect(env.services.offline.status.offline).toBe(true);
+    await advanceTime(2000); // first version_info check
+    expect(env.services.offline.status.offline).toBe(true);
+    await advanceTime(3500); // second version_info check
+    expect(env.services.offline.status.offline).toBe(false);
+    expect.verifySteps(["version_info", "version_info"]);
+});
diff --git a/addons/web/static/tests/core/offline/offline_systray.test.js b/addons/web/static/tests/core/offline/offline_systray.test.js
new file mode 100644
index 0000000000000..4f2e68daf0cfa
--- /dev/null
+++ b/addons/web/static/tests/core/offline/offline_systray.test.js
@@ -0,0 +1,64 @@
+import { WebClient } from "@web/webclient/webclient";
+
+import { animationFrame, expect, test } from "@odoo/hoot";
+import { contains, getService, mountWithCleanup, onRpc } from "@web/../tests/web_test_helpers";
+
+test.tags("desktop");
+test("offline systray item: basic rendering (desktop)", async () => {
+    await mountWithCleanup(WebClient);
+    expect(`.o_menu_systray .o_nav_entry .fa-chain-broken`).toHaveCount(0);
+    getService("offline").status.offline = true;
+
+    await animationFrame();
+    expect(`.o_menu_systray .o_nav_entry .fa-chain-broken`).toHaveCount(1);
+    expect(`.o_menu_systray .o_nav_entry:first`).toHaveText("Working offline");
+
+    getService("offline").status.offline = false;
+    await animationFrame();
+    expect(`.o_menu_systray .o_nav_entry .fa-chain-broken`).toHaveCount(0);
+});
+
+test.tags("mobile");
+test("offline systray item: basic rendering (mobile)", async () => {
+    await mountWithCleanup(WebClient);
+    expect(`.o_menu_systray .o_nav_entry.fa-chain-broken`).toHaveCount(0);
+    getService("offline").status.offline = true;
+
+    await animationFrame();
+    expect(`.o_menu_systray .o_nav_entry.fa-chain-broken`).toHaveCount(1);
+    expect(`.o_menu_systray .o_nav_entry:first`).toHaveAttribute("data-tooltip", "Working offline");
+
+    getService("offline").status.offline = false;
+    await animationFrame();
+    expect(`.o_menu_systray .o_nav_entry.fa-chain-broken`).toHaveCount(0);
+});
+
+test.tags("desktop");
+test("offline systray item: click to check connection (desktop)", async () => {
+    onRpc("/web/webclient/version_info", async () => {
+        expect.step("version_info");
+        return true;
+    });
+    await mountWithCleanup(WebClient);
+    getService("offline").status.offline = true;
+
+    await contains(`.o_menu_systray .o_nav_entry .fa-chain-broken`).click();
+    expect.verifySteps(["version_info"]);
+    expect(getService("offline").status.offline).toBe(false);
+    expect(`.o_menu_systray .o_nav_entry .fa-chain-broken`).toHaveCount(0);
+});
+
+test.tags("mobile");
+test("offline systray item: click to check connection (mobile)", async () => {
+    onRpc("/web/webclient/version_info", async () => {
+        expect.step("version_info");
+        return true;
+    });
+    await mountWithCleanup(WebClient);
+    getService("offline").status.offline = true;
+
+    await contains(`.o_menu_systray .o_nav_entry.fa-chain-broken`).click();
+    expect.verifySteps(["version_info"]);
+    expect(getService("offline").status.offline).toBe(false);
+    expect(`.o_menu_systray .o_nav_entry .fa-chain-broken`).toHaveCount(0);
+});
diff --git a/addons/web/static/tests/model/record.test.js b/addons/web/static/tests/model/record.test.js
index 33a50a50bf622..f7b785fff9598 100644
--- a/addons/web/static/tests/model/record.test.js
+++ b/addons/web/static/tests/model/record.test.js
@@ -796,7 +796,7 @@ test(`don't duplicate a useRecordObserver effect when switching back and forth b
 
         setup() {
             this.orm = useService("orm");
-            const services = { orm: this.orm };
+            const services = { orm: this.orm, offline: useService("offline") };
             const model = new StandaloneRelationalModel(this.env, {}, services);
             model.load({ resId: 1, values: { foo: "abc" } });
             const record1 = model.root;
diff --git a/addons/web/static/tests/views/fields/badge_selection_field.test.js b/addons/web/static/tests/views/fields/badge_selection_field.test.js
index 787ae1b574e55..45e9958693fe3 100644
--- a/addons/web/static/tests/views/fields/badge_selection_field.test.js
+++ b/addons/web/static/tests/views/fields/badge_selection_field.test.js
@@ -86,9 +86,8 @@ test("[Offline] BadgeSelectionField widget on a many2one", async () => {
     expect(`div.o_field_selection_badge`).toHaveCount(1, {
         message: "should have rendered outer div",
     });
-    expect(`span.o_selection_badge`).toHaveCount(1);
-    expect(queryAllTexts(`span.o_selection_badge`)).toEqual(["xphone"]);
-    expect(`span.active`).toHaveCount(1);
+    expect(`div.o_field_selection_badge span`).toHaveCount(1);
+    expect(queryAllTexts(`div.o_field_selection_badge span`)).toEqual(["xphone"]);
 });
 
 test("BadgeSelectionField widget on a selection in a new record", async () => {
diff --git a/addons/web/static/tests/views/fields/many2many_checkboxes_field.test.js b/addons/web/static/tests/views/fields/many2many_checkboxes_field.test.js
index 5aa6b8f03f44b..68f6465f37942 100644
--- a/addons/web/static/tests/views/fields/many2many_checkboxes_field.test.js
+++ b/addons/web/static/tests/views/fields/many2many_checkboxes_field.test.js
@@ -95,7 +95,7 @@ test("[Offline] Many2ManyCheckBoxesField", async () => {
 
     expect("div.o_field_widget div.form-check input:eq(0)").toBeChecked();
 
-    expect("div.o_field_widget div.form-check input:disabled").toHaveCount(0);
+    expect("div.o_field_widget div.form-check input:disabled").toHaveCount(1);
 });
 test("Many2ManyCheckBoxesField (readonly)", async () => {
     Partner._records[0].timmy = [12];
diff --git a/addons/web/static/tests/views/fields/selection_field.test.js b/addons/web/static/tests/views/fields/selection_field.test.js
index b3f392c54a702..88ac01b35863d 100644
--- a/addons/web/static/tests/views/fields/selection_field.test.js
+++ b/addons/web/static/tests/views/fields/selection_field.test.js
@@ -127,10 +127,10 @@ test("[Offline] SelectionField on many2one field", async () => {
                 <field name="product_id" widget="selection" />
             </form>`,
     });
-    expect(".o_select_menu").toHaveCount(1);
-    await contains(".o_field_widget[name='product_id'] input").click();
-    expect(queryAllTexts(".o_select_menu_item")).toEqual(["xphone"]);
-    expect(".o_field_widget[name='product_id'] input").toHaveValue("xphone");
+    expect(".o_field_widget[name='product_id'] span").toHaveCount(1, {
+        message: "field should be readonly",
+    });
+    expect(".o_field_widget[name='product_id']").toHaveText("xphone");
 });
 
 test("unset selection field with 0 as key", async () => {
diff --git a/addons/web/static/tests/views/form/form_view.test.js b/addons/web/static/tests/views/form/form_view.test.js
index 8e8e0b01a32f1..1097721d049d9 100644
--- a/addons/web/static/tests/views/form/form_view.test.js
+++ b/addons/web/static/tests/views/form/form_view.test.js
@@ -255,6 +255,49 @@ test(`simple form rendering`, async () => {
     expect(`label.o_form_label_empty:contains(type_ids)`).toHaveCount(0);
 });
 
+test(`[Offline] form switches to readonly in offline mode`, async () => {
+    await mountView({
+        resModel: "partner",
+        type: "form",
+        arch: `
+            <form>
+                <field name="foo"/>
+                <field name="bar"/>
+                <field name="int_field" string="f3_description"/>
+                <field name="float_field"/>
+                <field name="child_ids">
+                    <list>
+                        <field name="foo"/>
+                        <field name="bar"/>
+                    </list>
+                </field>
+            </form>
+        `,
+        resId: 2,
+    });
+    expect(`.o_field_char[name="foo"] input`).toHaveCount(1);
+    expect(`.o_field_boolean[name="bar"] .o-checkbox input`).not.toHaveAttribute("disabled");
+    expect(`.o_field_integer[name="int_field"] input`).toHaveCount(1);
+    expect(`.o_field_float[name="float_field"] input`).toHaveCount(1);
+    expect(`.o_field_x2many_list_row_add`).toHaveCount(1);
+
+    getService("offline").status.offline = true;
+    await animationFrame();
+    expect(`.o_field_char[name="foo"] input`).toHaveCount(0);
+    expect(`.o_field_boolean[name="bar"] .o-checkbox input`).toHaveAttribute("disabled");
+    expect(`.o_field_integer[name="int_field"] input`).toHaveCount(0);
+    expect(`.o_field_float[name="float_field"] input`).toHaveCount(0);
+    expect(`.o_field_x2many_list_row_add`).toHaveCount(0);
+
+    getService("offline").status.offline = false;
+    await animationFrame();
+    expect(`.o_field_char[name="foo"] input`).toHaveCount(1);
+    expect(`.o_field_boolean[name="bar"] .o-checkbox input`).not.toHaveAttribute("disabled");
+    expect(`.o_field_integer[name="int_field"] input`).toHaveCount(1);
+    expect(`.o_field_float[name="float_field"] input`).toHaveCount(1);
+    expect(`.o_field_x2many_list_row_add`).toHaveCount(1);
+});
+
 test(`form rendering with class and style attributes`, async () => {
     await mountView({
         resModel: "partner",
diff --git a/addons/web/static/tests/views/list/list_view.test.js b/addons/web/static/tests/views/list/list_view.test.js
index 3eafcd7aeca7b..835018356af32 100644
--- a/addons/web/static/tests/views/list/list_view.test.js
+++ b/addons/web/static/tests/views/list/list_view.test.js
@@ -552,6 +552,57 @@ test(`editable list with edit="0"`, async () => {
     expect.verifySteps(["switch to form - resId: 1 activeIds: 1,2,3,4"]);
 });
 
+test.tags("desktop");
+test(`[Offline] editable list`, async () => {
+    await mountView({
+        resModel: "foo",
+        type: "list",
+        arch: `<list editable="top"><field name="foo"/></list>`,
+    });
+    expect(`tbody tr.o_data_row[data-id]`).toHaveCount(4);
+
+    expect(`.o_searchview`).toHaveCount(1);
+    await contains(`.o_data_cell`).click();
+    expect(`tbody tr.o_selected_row`).toHaveCount(1, { message: "should have editable row" });
+
+    getService("offline").status.offline = true;
+    await animationFrame();
+    expect(`.o_searchview`).toHaveCount(0);
+    await contains(`.o_data_cell`).click();
+    expect(`tbody tr.o_selected_row`).toHaveCount(0, { message: "should not have editable row" });
+});
+
+test.tags("desktop");
+test(`[Offline] list with priority widget`, async () => {
+    Foo._fields.priority = fields.Selection({
+        selection: [
+            [0, "Not Prioritary"],
+            [1, "Prioritary"],
+        ],
+        default: 0,
+    });
+
+    await mountView({
+        resModel: "foo",
+        type: "list",
+        arch: `
+            <list>
+                <field name="priority" widget="priority"/>
+                <field name="foo"/>
+            </list>`,
+    });
+
+    expect(".o_field_widget[name=priority] .o_priority_star").not.toHaveClass("o_disabled");
+
+    getService("offline").status.offline = true;
+    await animationFrame();
+    expect(".o_field_widget[name=priority] .o_priority_star").toHaveClass("o_disabled");
+
+    getService("offline").status.offline = false;
+    await animationFrame();
+    expect(".o_field_widget[name=priority] .o_priority_star").not.toHaveClass("o_disabled");
+});
+
 test(`non-editable list with open_form_view`, async () => {
     await mountView({
         resModel: "foo",
diff --git a/addons/web/static/tests/web_test_helpers.js b/addons/web/static/tests/web_test_helpers.js
index 45c7fb55135e8..5745d311a2fba 100644
--- a/addons/web/static/tests/web_test_helpers.js
+++ b/addons/web/static/tests/web_test_helpers.js
@@ -13,8 +13,8 @@ import { IrUiView } from "./_framework/mock_server/mock_models/ir_ui_view";
 import { ResCompany } from "./_framework/mock_server/mock_models/res_company";
 import { ResCountry } from "./_framework/mock_server/mock_models/res_country";
 import { ResCurrency } from "./_framework/mock_server/mock_models/res_currency";
-import { ResGroupsPrivilege } from "./_framework/mock_server/mock_models/res_groups_privilege";
 import { ResGroups } from "./_framework/mock_server/mock_models/res_groups";
+import { ResGroupsPrivilege } from "./_framework/mock_server/mock_models/res_groups_privilege";
 import { ResPartner } from "./_framework/mock_server/mock_models/res_partner";
 import { ResUsers } from "./_framework/mock_server/mock_models/res_users";
 import { ResUsersSettings } from "./_framework/mock_server/mock_models/res_users_settings";
@@ -42,7 +42,7 @@ export {
     findComponent,
     getDropdownMenu,
     mountWithCleanup,
-    waitUntilIdle,
+    waitUntilIdle
 } from "./_framework/component_test_helpers";
 export { contains, defineStyle, editAce, sortableDrag } from "./_framework/dom_test_helpers";
 export {
@@ -52,7 +52,7 @@ export {
     makeDialogMockEnv,
     makeMockEnv,
     mockService,
-    restoreRegistry,
+    restoreRegistry
 } from "./_framework/env_test_helpers";
 export {
     clickKanbanLoadMore,
@@ -74,7 +74,7 @@ export {
     toggleKanbanColumnActions,
     toggleKanbanRecordDropdown,
     validateKanbanColumn,
-    validateKanbanRecord,
+    validateKanbanRecord
 } from "./_framework/kanban_test_helpers";
 export { Command, registerInlineViewArchs } from "./_framework/mock_server/mock_model";
 export {
@@ -88,14 +88,14 @@ export {
     MockServer,
     onRpc,
     stepAllNetworkCalls,
-    withUser,
+    withUser
 } from "./_framework/mock_server/mock_server";
 export {
     getKwArgs,
     makeKwArgs,
     makeServerError,
     MockServerError,
-    unmakeKwArgs,
+    unmakeKwArgs
 } from "./_framework/mock_server/mock_server_utils";
 export { serverState } from "./_framework/mock_server_state.hoot";
 export { patchWithCleanup } from "./_framework/patch_test_helpers";
@@ -117,10 +117,7 @@ export {
     openAddCustomFilterDialog,
     pagerNext,
     pagerPrevious,
-    removeFacet,
-    saveFavorite,
-    saveAndEditFavorite,
-    selectGroup,
+    removeFacet, saveAndEditFavorite, saveFavorite, selectGroup,
     switchView,
     toggleActionMenu,
     toggleFavoriteMenu,
@@ -131,13 +128,12 @@ export {
     toggleMenuItemOption,
     toggleSaveFavorite,
     toggleSearchBarMenu,
-    validateSearch,
+    validateSearch
 } from "./_framework/search_test_helpers";
 export { swipeLeft, swipeRight } from "./_framework/touch_helpers";
 export {
-    installLanguages,
-    patchTranslations,
-    allowTranslations,
+    allowTranslations, installLanguages,
+    patchTranslations
 } from "./_framework/translation_test_helpers";
 export {
     clickButton,
@@ -146,15 +142,13 @@ export {
     clickFieldDropdownItem,
     clickModalButton,
     clickSave,
-    clickViewButton,
-    expectMarkup,
+    clickViewButton, editSelectMenu, expectMarkup,
     fieldInput,
     hideTab,
     mountView,
     mountViewInDialog,
     parseViewProps,
-    selectFieldDropdownItem,
-    editSelectMenu,
+    selectFieldDropdownItem
 } from "./_framework/view_test_helpers";
 export { mountWebClient, useTestClientAction } from "./_framework/webclient_test_helpers";
 
diff --git a/addons/web/static/tests/webclient/actions/error_handling.test.js b/addons/web/static/tests/webclient/actions/error_handling.test.js
index a1fd4b74fe4a2..974dd48e8a578 100644
--- a/addons/web/static/tests/webclient/actions/error_handling.test.js
+++ b/addons/web/static/tests/webclient/actions/error_handling.test.js
@@ -145,8 +145,6 @@ test("connection lost when opening form view from kanban", async () => {
     });
     await contains(".o_kanban_record").click();
     expect(".o_kanban_view").toHaveCount(1);
-    expect(".o_notification").toHaveCount(1);
-    expect(".o_notification").toHaveText("Connection lost. Trying to reconnect...");
     expect.verifySteps([
         "/web/webclient/translations",
         "/web/webclient/load_menus",
@@ -204,8 +202,6 @@ test("connection lost when coming back to kanban from form", async () => {
     expect(".o_kanban_view").toHaveCount(1);
     expect(".o_kanban_view .o_kanban_renderer").toHaveCount(1);
     expect(".o_kanban_view .o_kanban_record:not(.o_kanban_ghost)").toHaveCount(2);
-    expect(".o_notification").toHaveCount(1);
-    expect(".o_notification").toHaveText("Connection lost. Trying to reconnect...");
     expect.verifySteps([
         "/web/webclient/load_menus",
         "/web/action/load",
diff --git a/addons/web/static/tests/webclient/clickbot.test.js b/addons/web/static/tests/webclient/clickbot.test.js
index 816632886000d..02a7fdd91ecb4 100644
--- a/addons/web/static/tests/webclient/clickbot.test.js
+++ b/addons/web/static/tests/webclient/clickbot.test.js
@@ -461,7 +461,7 @@ test("clickbot show rpc error when an error dialog is detected", async () => {
     const expectedModalHtml = /* xml */ `
         <header class="modal-header">
             <h4 class="modal-title text-break flex-grow-1">Oops!</h4>
-            <button type="button" class="btn-close position-absolute top-0 end-0 mt-1 me-1" aria-label="Close" tabindex="-1"></button>
+            <button type="button" class="btn-close position-absolute top-0 end-0 mt-1 me-1" aria-label="Close" tabindex="-1" data-available-offline=""></button>
         </header>
         <main class="modal-body">
             <div role="alert">
@@ -469,7 +469,7 @@ test("clickbot show rpc error when an error dialog is detected", async () => {
                 <details>
                     <summary class="mb-1 link-info">See technical details</summary>
                     <div class="text-bg-100 clearfix mt-2 position-relative o_error_detail pb-2">
-                        <button class="btn position-absolute top-0 end-0 pt-2 btn-link link-body-emphasis"><span class="fa fa-clipboard"></span></button>
+                        <button class="btn position-absolute top-0 end-0 pt-2 btn-link link-body-emphasis" data-available-offline=""><span class="fa fa-clipboard"></span></button>
                         <div class="ps-1 pt-1 ps-md-3 pt-md-3">
                             <p class="m-0"><b>Odoo Server Error</b></p>
                             <p class="d-block small text-info">ERROR INFO</p>
@@ -482,7 +482,7 @@ test("clickbot show rpc error when an error dialog is detected", async () => {
             </div>
         </main>
         <footer class="modal-footer d-empty-none justify-content-around justify-content-md-start flex-wrap gap-1 w-100">
-            <button class="btn btn-primary o-default-button">Close</button>
+            <button class="btn btn-primary o-default-button" data-available-offline="">Close</button>
         </footer>`
         .trim()
         .replaceAll(/>[\n\s]+</gm, "><");

From 2d327a150d18f79a5c3ff07cd311fc7ad5b54b4f Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 28 Oct 2025 12:23:43 +0100
Subject: [PATCH 423/673] [FIX] web: do not crash when saving if offline

Be in a form view, edit some fields, simulate a connection lost
(e.g. with devtools network throttling). Leave the form, e.g. by
clicking on the breadcrumb. Before this commit, there was a crash,
because the web_save returned a ConnectionLostError and that error
wasn't properly handled. With this commit, we remain in the form,
and if the connection is back later on, the user is able to leave
and save again.

part of task~5106517

closes odoo/odoo#229492

Related: odoo/enterprise#96626
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../static/src/views/form/form_controller.js  |   4 +
 .../static/tests/views/form/form_view.test.js | 113 ++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/addons/web/static/src/views/form/form_controller.js b/addons/web/static/src/views/form/form_controller.js
index 457b41bb278b9..a793f0a1330e5 100644
--- a/addons/web/static/src/views/form/form_controller.js
+++ b/addons/web/static/src/views/form/form_controller.js
@@ -45,6 +45,7 @@ import {
 } from "@odoo/owl";
 import { FetchRecordError } from "@web/model/relational_model/errors";
 import { effect } from "@web/core/utils/reactive";
+import { ConnectionLostError } from "@web/core/network/rpc";
 
 const viewRegistry = registry.category("views");
 
@@ -427,6 +428,9 @@ export class FormController extends Component {
     async onWillSaveRecord() {}
 
     async onSaveError(error, { discard, retry }, leaving) {
+        if (error instanceof ConnectionLostError) {
+            return false;
+        }
         const suggestedCompany = error.data?.context?.suggested_company;
         const activeCompanyIds = user.activeCompanies.map((c) => c.id);
         if (
diff --git a/addons/web/static/tests/views/form/form_view.test.js b/addons/web/static/tests/views/form/form_view.test.js
index 1097721d049d9..5949afe272ee4 100644
--- a/addons/web/static/tests/views/form/form_view.test.js
+++ b/addons/web/static/tests/views/form/form_view.test.js
@@ -298,6 +298,119 @@ test(`[Offline] form switches to readonly in offline mode`, async () => {
     expect(`.o_field_x2many_list_row_add`).toHaveCount(1);
 });
 
+test(`[Offline] save a form view offline (click save icon)`, async () => {
+    let offline = false;
+    onRpc(
+        "/web/dataset/call_kw/partner/web_save",
+        () => {
+            expect.step("web_save");
+            if (offline) {
+                return new Response("", { status: 502 });
+            }
+        },
+        { pure: true }
+    );
+
+    Partner._views = {
+        form: `<form><field name="foo"/></form>`,
+        list: `<list><field name="foo"/></list>`,
+        search: `<search/>`,
+    };
+    defineActions([
+        {
+            id: 1,
+            name: "Partner",
+            res_model: "partner",
+            views: [
+                [false, "list"],
+                [false, "form"],
+            ],
+        },
+    ]);
+
+    await mountWithCleanup(WebClient);
+    await getService("action").doAction(1);
+
+    await contains(".o_data_row .o_data_cell").click();
+    expect(".o_form_renderer").toHaveClass("o_form_editable");
+    expect(".o_field_widget[name=foo] input").toHaveValue("yop");
+    await contains(".o_field_widget[name=foo] input").edit("new foo");
+
+    offline = true;
+    await contains(".o_form_button_save").click();
+    expect(".o_form_renderer").toHaveClass("o_form_readonly");
+    expect(".o_field_widget[name=foo]").toHaveText("new foo");
+    expect(getService("offline").status.offline).toBe(true);
+    expect.verifySteps(["web_save"]);
+
+    offline = false;
+    getService("offline").status.offline = false;
+    await animationFrame();
+    expect(".o_form_renderer").toHaveClass("o_form_editable");
+    await contains(".o_form_button_save").click();
+    expect.verifySteps(["web_save"]);
+
+    await contains(".o_breadcrumb .o_back_button").click();
+    expect(".o_data_cell:first").toHaveText("new foo");
+});
+
+test(`[Offline] save a form view offline (autosave when leaving)`, async () => {
+    // this test is the same as above, but in this one we don't manually save
+    // the record before leaving
+    let offline = false;
+    onRpc(
+        "/web/dataset/call_kw/partner/web_save",
+        () => {
+            expect.step("web_save");
+            if (offline) {
+                return new Response("", { status: 502 });
+            }
+        },
+        { pure: true }
+    );
+
+    Partner._views = {
+        form: `<form><field name="foo"/></form>`,
+        list: `<list><field name="foo"/></list>`,
+        search: `<search/>`,
+    };
+    defineActions([
+        {
+            id: 1,
+            name: "Partner",
+            res_model: "partner",
+            views: [
+                [false, "list"],
+                [false, "form"],
+            ],
+        },
+    ]);
+
+    await mountWithCleanup(WebClient);
+    await getService("action").doAction(1);
+
+    await contains(".o_data_row .o_data_cell").click();
+    expect(".o_form_renderer").toHaveClass("o_form_editable");
+    expect(".o_field_widget[name=foo] input").toHaveValue("yop");
+    await contains(".o_field_widget[name=foo] input").edit("new foo");
+
+    offline = true;
+    await contains(".o_breadcrumb .o_back_button").click();
+    expect(".o_form_renderer").toHaveClass("o_form_readonly");
+    expect(".o_field_widget[name=foo]").toHaveText("new foo");
+    expect(getService("offline").status.offline).toBe(true);
+    expect.verifySteps(["web_save"]);
+
+    offline = false;
+    getService("offline").status.offline = false;
+    await animationFrame();
+    expect(".o_form_renderer").toHaveClass("o_form_editable");
+
+    await contains(".o_breadcrumb .o_back_button").click();
+    expect(".o_data_cell:first").toHaveText("new foo");
+    expect.verifySteps(["web_save"]);
+});
+
 test(`form rendering with class and style attributes`, async () => {
     await mountView({
         resModel: "partner",

From 2bb3960d4fa8a8ae183306e315d07a7ef62ce482 Mon Sep 17 00:00:00 2001
From: djameltouati <otd@odoo.com>
Date: Thu, 30 Oct 2025 13:13:35 +0000
Subject: [PATCH 424/673] [FIX] stock_account: create journal item with correct
 total qty value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce the bug:
- Create a storable product “P1”:
    - Cost: $10
    - UoM: Unit
    - Sales tab:
        - Packaging: Pack of 6
    - Category: Goods
        - Costing Method: AVCO
        - Inventory Valuation: Perpetual (at invoicing)
        - Expense Account: 500000 Cost of Goods Sold
        - Stock Account: 110100 Stock Valuation

- Create an invoice:
    - Customer: Azure Interior
    - Product: P1
    - Quantity: 10
    - UoM: Pack of 6
    - Confirm

Problem:
The journal items created for Stock Valuation and Cost of Goods Sold are
computed with an incorrect amount: $100 instead of $600.

Explanation:
In the `_stock_account_prepare_realtime_out_lines_vals` method, the unit
price is first computed for a single unit, regardless of the costing
method (AVCO, Standard, or FIFO), using the helper method
`_get_cogs_value`:

- https://github.com/odoo/odoo/blob/08b62a4bbcc6f9a391b2cc00a621ef4c76100229/addons/stock_account/models/account_move.py#L121
- https://github.com/odoo/odoo/blob/08b62a4bbcc6f9a391b2cc00a621ef4c76100229/addons/stock_account/models/account_move_line.py#L66-L67

In the FIFO case, the computation is based on the stock move value,
but still returns the price per single unit:
- https://github.com/odoo/odoo/blob/08b62a4bbcc6f9a391b2cc00a621ef4c76100229/addons/stock_account/models/account_move_line.py#L70-L71

opw-5215191

closes odoo/odoo#234976

X-original-commit: e8530d225529430fddc00d6e9c3d147cb0fd382f
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Djamel Touati (otd) <otd@odoo.com>
---
 addons/stock_account/models/account_move.py     |  2 +-
 addons/stock_account/tests/common.py            |  3 ++-
 .../stock_account/tests/test_stockvaluation.py  | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/addons/stock_account/models/account_move.py b/addons/stock_account/models/account_move.py
index 1002986bbf168..e1f7d96082471 100644
--- a/addons/stock_account/models/account_move.py
+++ b/addons/stock_account/models/account_move.py
@@ -119,7 +119,7 @@ def _stock_account_prepare_realtime_out_lines_vals(self):
                 # Compute accounting fields.
                 sign = -1 if move.move_type == 'out_refund' else 1
                 price_unit = line.with_context(anglo_saxon_price_ctx)._get_cogs_value()
-                amount_currency = sign * line.quantity * price_unit
+                amount_currency = sign * line.product_uom_id._compute_quantity(line.quantity, line.product_id.uom_id) * price_unit
 
                 if move.currency_id.is_zero(amount_currency) or float_is_zero(price_unit, precision_digits=price_unit_prec):
                     continue
diff --git a/addons/stock_account/tests/common.py b/addons/stock_account/tests/common.py
index 812dab92f2d90..a1ca56cdb3ab4 100644
--- a/addons/stock_account/tests/common.py
+++ b/addons/stock_account/tests/common.py
@@ -24,6 +24,7 @@ def _create_account_move(self, move_type, product, quantity=1.0, price_unit=1.0,
         if kwargs.get('reversed_entry_id'):
             invoice_vals["reversed_entry_id"] = kwargs['reversed_entry_id']
         invoice = self.env["account.move"].create(invoice_vals)
+        product_uom = kwargs.get('product_uom') or product.uom_id
         self.env["account.move.line"].create({
             "move_id": invoice.id,
              "display_type": "product",
@@ -31,7 +32,7 @@ def _create_account_move(self, move_type, product, quantity=1.0, price_unit=1.0,
              "price_unit": price_unit,
              "quantity": quantity,
              "product_id": product.id,
-             "product_uom_id": product.uom_id.id,
+             "product_uom_id": product_uom.id,
              "tax_ids": [(5, 0, 0)],
         })
         if post:
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index d3f0fd6983f0f..79c93b9315910 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -2846,3 +2846,20 @@ def test_journal_entry_created_with_given_accounting_date(self):
             self._get_stock_valuation_move_lines().move_id.date,
             past_accounting_date
         )
+
+    def test_journal_entry_with_packaging_uom_cogs(self):
+        """Test that journal entries for COGS and stock valuation are correctly computed
+        when selling a product using a different UoM (e.g., pack of 6).
+        The COGS amount should reflect the total quantity converted to the product's base UoM.
+        """
+        invoice = self._create_invoice(self.product_avco_auto, quantity=10, price_unit=100, product_uom=self.env.ref('uom.product_uom_pack_6'))
+        self.assertEqual(self.product_avco_auto.standard_price, 10)
+        self.assertRecordValues(
+            invoice.journal_line_ids,
+            [
+                {'account_id': self.category_avco_auto.property_account_income_categ_id.id, 'credit': 1000.0, 'debit': 0.0},
+                {'account_id': self.account_receivable.id, 'credit': 0.0, 'debit': 1000.0},
+                {'account_id': self.account_stock_valuation.id, 'credit': 600.0, 'debit': 0.0},
+                {'account_id': self.account_expense.id, 'credit': 0.0, 'debit': 600.0},
+            ]
+        )

From ae92dd659b935eeadc16fa3a1ec93c7bb50d140f Mon Sep 17 00:00:00 2001
From: hamza <hasaa@odoo.com>
Date: Fri, 31 Oct 2025 17:24:42 +0100
Subject: [PATCH 425/673] [IMP] hr: added a nationality field

Added a nationality field in the hr.employee module.

For now, it's needed for the saudi localization to display certain fields such as iqama only for non saudi employees.

But because this field is relevant for all localizations , we should put it here instead.

task - 5064850
enterprise - 98239

closes odoo/odoo#234016

Related: odoo/enterprise#98239
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_employee.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 91d3e1c2ae08b..4fc513468bffd 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -194,7 +194,11 @@ def _lang_get(self):
     structure_type_id = fields.Many2one(readonly=False, related='version_id.structure_type_id', inherited=True, groups="hr.group_hr_manager")
     contract_type_id = fields.Many2one(readonly=False, related='version_id.contract_type_id', inherited=True, groups="hr.group_hr_manager")
     hourly_cost = fields.Monetary('Hourly Cost', groups="hr.group_hr_user", tracking=True)
-
+    nationality_country_code = fields.Char(
+        string='Nationality',
+        related='version_id.country_id.code',
+        groups="hr.group_hr_user"
+    )
     # Direct subordinates
     parent_id = fields.Many2one('hr.employee', 'Manager', tracking=True, index=True,
                                 domain="['|', ('company_id', '=', False), ('company_id', 'in', allowed_company_ids)]")

From df4db68d067a8e4d43f35dcf2843a345127c8a48 Mon Sep 17 00:00:00 2001
From: kuay-odoo <kuay@odoo.com>
Date: Mon, 18 Aug 2025 08:29:30 +0000
Subject: [PATCH 426/673] [FIX] hr_holidays: allocation warning wrongly
 displayed for valid future dates

steps to reproduce:
- Go to Time Off > Allocations
- Create new allocation
- Set `date_from` and `date_to` (future dates)
- Notice the warning 'The allocated days cannot be used, because the allocation
  is set to finish in the past' appears incorrectly

cause:
- The warning visibility condition used literal string `'today'` instead of
proper date comparison, causing incorrect evaluation in view expressions.

fix:
- Replace `'today'` string with `context_today().strftime('%Y-%m-%d')`
in the invisible condition.
- This ensures the warning only appears when `date_to` is actually in the past.

task-5009365

closes odoo/odoo#234980

X-original-commit: 6e2d57ba53f036ed9060ff31708b19e935cff88c
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 .../tours/time_off_allocation_warning_tour.js | 63 +++++++++++++++++++
 addons/hr_holidays/tests/__init__.py          |  1 +
 .../tests/test_time_off_allocation_tour.py    |  8 +++
 .../views/hr_leave_allocation_views.xml       |  2 +-
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 addons/hr_holidays/static/tests/tours/time_off_allocation_warning_tour.js
 create mode 100644 addons/hr_holidays/tests/test_time_off_allocation_tour.py

diff --git a/addons/hr_holidays/static/tests/tours/time_off_allocation_warning_tour.js b/addons/hr_holidays/static/tests/tours/time_off_allocation_warning_tour.js
new file mode 100644
index 0000000000000..0e4edc77d770d
--- /dev/null
+++ b/addons/hr_holidays/static/tests/tours/time_off_allocation_warning_tour.js
@@ -0,0 +1,63 @@
+import { registry } from '@web/core/registry';
+import { stepUtils } from "@web_tour/tour_utils";
+
+registry.category("web_tour.tours").add("time_off_allocation_warning_tour", {
+    url: "/odoo",
+    steps: () => [
+        stepUtils.showAppsMenuItem(),
+        {
+            content: "Click Time Off",
+            trigger: ".o_app[data-menu-xmlid='hr_holidays.menu_hr_holidays_root']",
+            run: "click",
+        },
+        {
+            content: "Open Management menu",
+            trigger: ".o-dropdown[data-menu-xmlid='hr_holidays.menu_hr_holidays_management']",
+            run: "click",
+        },
+        {
+            content: "Go to Allocations",
+            trigger: ".o-dropdown-item[data-menu-xmlid='hr_holidays.hr_holidays_menu_manager_approve_allocations']",
+            run: "click",
+        },
+        {
+            content: "Create a new allocation",
+            trigger: ".o-kanban-button-new",
+            run: "click",
+        },
+        {
+            content: "Click to select a leave type",
+            trigger: ".o_field_widget[name='holiday_status_id'] .o-autocomplete--input",
+            run: "click",
+        },
+        {
+            trigger: ".o-autocomplete--dropdown-item:nth-child(1) > a",
+            run: "click",
+        },
+        {
+            content: "Open the start date picker",
+            trigger: ".o_field_widget[name='date_from'] .o_input",
+            run: "click",
+        },
+        {
+            content: "Choose a start date",
+            trigger: ".o_date_item_cell:nth-child(15) > div",
+            run: "click",
+        },
+        {
+            content: "Open the end date picker",
+            trigger: ".o_field_widget[name='date_to'] .o_input",
+            run: "click",
+        },
+        {
+            content: "Choose a future end date",
+            trigger: ".o_date_item_cell:nth-child(22) > div",
+            run: "click",
+        },
+        ...stepUtils.saveForm(),
+        {
+            trigger: ".o_menu_brand",
+            run: "click",
+        },
+    ],
+});
diff --git a/addons/hr_holidays/tests/__init__.py b/addons/hr_holidays/tests/__init__.py
index d3a1297fa85bf..6bbff4177cb11 100644
--- a/addons/hr_holidays/tests/__init__.py
+++ b/addons/hr_holidays/tests/__init__.py
@@ -32,5 +32,6 @@
 from . import test_time_off_graph_view_tour
 from . import test_leave_type_data
 from . import test_multi_contract
+from . import test_time_off_allocation_tour
 from . import test_flexible_resource_calendar
 from . import test_calendar_leaves_count
diff --git a/addons/hr_holidays/tests/test_time_off_allocation_tour.py b/addons/hr_holidays/tests/test_time_off_allocation_tour.py
new file mode 100644
index 0000000000000..5be587917c191
--- /dev/null
+++ b/addons/hr_holidays/tests/test_time_off_allocation_tour.py
@@ -0,0 +1,8 @@
+from odoo.tests import HttpCase, tagged
+
+
+@tagged("post_install", "-at_install")
+class TestTimeOffAllocationTour(HttpCase):
+
+    def test_time_off_allocation_warning_tour(self):
+        self.start_tour("/", "time_off_allocation_warning_tour", login="admin")
diff --git a/addons/hr_holidays/views/hr_leave_allocation_views.xml b/addons/hr_holidays/views/hr_leave_allocation_views.xml
index efcae3d4d9b18..13c2417715224 100644
--- a/addons/hr_holidays/views/hr_leave_allocation_views.xml
+++ b/addons/hr_holidays/views/hr_leave_allocation_views.xml
@@ -155,7 +155,7 @@
                                     invisible="not id or date_to or state != 'confirm'">No limit</div>
                             </div>
                             <div colspan="2" class="oe_row alert alert-warning my-2" role="alert"
-                                 invisible="id or not date_to or not (date_to &lt; 'today') or (date_from and (date_to &lt; date_from))">
+                                 invisible="id or not date_to or not (date_to &lt; context_today().strftime('%Y-%m-%d')) or (date_from and (date_to &lt; date_from))">
                                 <span>The allocated days cannot be used, because the allocation is set to finish in the past.</span>
                             </div>
                             <field name="number_of_days" invisible="1"/>

From 2fc13fec492e6a348b98a52f066376b706160f1d Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Tue, 28 Oct 2025 11:02:42 +0000
Subject: [PATCH 427/673] [FIX] website_sale: find single-value
 no-variant-attribute product line

Versions
--------
- 18.0+

Steps
-----
1. Have a product attribute with variant creation set to never;
2. have product using only this attribute, with only a single value;
3. open website editor on /shop;
4. enable add-to-cart button & save;
5. use button on the aforementioned product at least twice.

Issue
-----
Each time the product gets added, a new line is created.

Cause
-----
Because there's only a single value, the product configurator doesn't
pop up by default when adding the product to the cart. Without the
configurator pop-up, the `_cart_update` method doesn't receive any
`no_variant_attribute_value_ids`, which are used find a matching line if
the product template has any `no_variant` attribute.

Solution
--------
Instead of checking `product.product_tmpl._has_no_variant_attributes()`,
to see if we should attempt to match `no_variant_attribute_value_ids`,
check if the added product has any `no_variant` attributes that have
more than one value or are optional (multi-checkbox). If not, a
`no_variant` product behaves the same as a single-variant product.

opw-5093175

closes odoo/odoo#235028

X-original-commit: cb2d707420fdc44eafeaa78d71af08f893375e25
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 addons/website_sale/models/sale_order.py |  7 +++-
 addons/website_sale/tests/test_cart.py   | 43 ++++++++++++++++--------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index cb219cdaf8700..b77edf4e7d3d6 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -403,7 +403,12 @@ def _cart_find_product_line(
         if not filtered_sol:
             return self.env['sale.order.line']
 
-        if product.product_tmpl_id._has_no_variant_attributes():
+        has_configurable_no_variant_attributes = any(
+            len(line.value_ids) > 1 or line.attribute_id.display_type == 'multi'
+            for line in product.attribute_line_ids
+            if line.attribute_id.create_variant == 'no_variant'
+        )
+        if has_configurable_no_variant_attributes:
             filtered_sol = filtered_sol.filtered(
                 lambda sol:
                     sol.product_no_variant_attribute_value_ids.ids == no_variant_attribute_value_ids
diff --git a/addons/website_sale/tests/test_cart.py b/addons/website_sale/tests/test_cart.py
index a2505d3d8bf26..c7135d83c841f 100644
--- a/addons/website_sale/tests/test_cart.py
+++ b/addons/website_sale/tests/test_cart.py
@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import datetime
+from functools import partial
 from unittest.mock import patch
 
 from odoo.exceptions import UserError, ValidationError
@@ -374,29 +375,43 @@ def test_cart_lines_aggregation(self):
         # one SOLine
         product_no_variants = self.env['product.template'].create({
             'name': 'No variants product (TEST)',
-            'attribute_line_ids': [
-                Command.create({
-                    'attribute_id': self.no_variant_attribute.id,
-                    'value_ids': [Command.set(self.no_variant_attribute.value_ids.ids)],
-                })
-            ]
+            'attribute_line_ids': [Command.create({
+                'attribute_id': self.no_variant_attribute.id,
+                'value_ids': [Command.set(self.no_variant_attribute.value_ids.ids)],
+            })],
         })
         no_variant_ptavs = product_no_variants.attribute_line_ids.product_template_value_ids
-        self.assertEqual(len(self.empty_cart.order_line), 0)
-        self.empty_cart._cart_add(
+        no_variant_ptav = no_variant_ptavs[0]
+        add_one = partial(
+            self.empty_cart._cart_add,
             product_id=product_no_variants.product_variant_id.id,
             quantity=1,
-            no_variant_attribute_value_ids=no_variant_ptavs[0].ids,
         )
+        self.assertEqual(len(self.empty_cart.order_line), 0)
+
+        add_one(no_variant_attribute_value_ids=no_variant_ptav.ids)
         self.assertEqual(len(self.empty_cart.order_line), 1)
-        self.empty_cart._cart_add(
-            product_id=product_no_variants.product_variant_id.id,
-            quantity=1,
-            no_variant_attribute_value_ids=no_variant_ptavs[0].ids,
-        )
+
+        add_one(no_variant_attribute_value_ids=no_variant_ptav.ids)
         self.assertEqual(len(self.empty_cart.order_line), 1)
         self.assertEqual(self.empty_cart.order_line.product_uom_qty, 2)
 
+        # Providing `no_variant_attribute_value_ids` should be optional if there's only 1 value...
+        product_no_variants.attribute_line_ids.value_ids = self.no_variant_attribute.value_ids[0]
+        add_one(no_variant_attribute_value_ids=[])
+        self.assertEqual(len(self.empty_cart.order_line), 1)
+        self.assertEqual(self.empty_cart.order_line.product_uom_qty, 3)
+
+        # ...except if it's a multi-checkbox attribute, making the value optional
+        self.no_variant_attribute.display_type = 'multi'
+        add_one(no_variant_attribute_value_ids=[])
+        self.assertEqual(len(self.empty_cart.order_line), 2)
+        self.assertEqual(self.empty_cart.order_line.mapped('product_uom_qty'), [3, 1])
+
+        add_one(no_variant_attribute_value_ids=no_variant_ptav.ids)
+        self.assertEqual(len(self.empty_cart.order_line), 2)
+        self.assertEqual(self.empty_cart.order_line.mapped('product_uom_qty'), [4, 1])
+
     def test_cart_new_pricelist_from_geoip(self):
         """Check that, when adding a new partner to a website order, the partner's GeoIP
         is factored into the pricelist recomputation.

From b1c7cb4f401d4d4eccd4d9bc90dba52c05cbf883 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Mon, 10 Nov 2025 09:17:45 +0100
Subject: [PATCH 428/673] [IMP] im_livechat: manage expertises from info panel

The live chat info panel shows expertises linked to the
chat. However, it's not possible to assign expertises to
the chat (only available from the chat bot script).

Expertises are useful to quickly identify which kind of help
is needed on a chat, or to find conversations about the same
topic.

This commit allows to add expertises from the channel info panel.

task-5190361

closes odoo/odoo#234977

X-original-commit: a4e98809f2c9107850a5ab01aeb76b3dac2b2a6e
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/im_livechat/controllers/channel.py     | 38 ++++++++-
 addons/im_livechat/models/res_users.py        |  8 ++
 .../static/src/core/common/@types/models.d.ts |  3 +
 .../src/core/common/res_users_model_patch.js  | 12 +++
 .../core/web/expertise_tags_autocomplete.js   | 83 +++++++++++++++++++
 .../core/web/expertise_tags_autocomplete.xml  | 31 +++++++
 .../core/web/livechat_channel_info_list.js    | 13 +--
 .../core/web/livechat_channel_info_list.xml   |  8 +-
 .../tests/livechat_channel_info_list.test.js  | 33 +++++---
 .../static/tests/livechat_test_helpers.js     |  1 +
 .../tests/mock_server/livechat_mock_server.js | 42 +++++++++-
 .../mock_server/mock_models/res_groups.js     |  5 ++
 .../mock_server/mock_models/res_users.js      |  5 ++
 .../tests/test_get_discuss_channel.py         |  2 +
 .../tests/test_performance.py                 |  1 +
 15 files changed, 253 insertions(+), 32 deletions(-)
 create mode 100644 addons/im_livechat/static/src/core/common/res_users_model_patch.js
 create mode 100644 addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.js
 create mode 100644 addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.xml

diff --git a/addons/im_livechat/controllers/channel.py b/addons/im_livechat/controllers/channel.py
index f4060e52785da..cc9a830da9aae 100644
--- a/addons/im_livechat/controllers/channel.py
+++ b/addons/im_livechat/controllers/channel.py
@@ -1,9 +1,11 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from markupsafe import Markup
-from werkzeug.exceptions import NotFound
+from werkzeug.exceptions import BadRequest, NotFound
 
+from odoo.fields import Command
 from odoo.http import request, route
+
 from odoo.addons.mail.controllers.discuss.channel import ChannelController
 
 
@@ -30,3 +32,37 @@ def livechat_session_update_status(self, channel_id, livechat_status):
             raise NotFound()
         # sudo: discuss.channel - internal users having the rights to read the session can update its status
         channel.sudo().livechat_status = livechat_status
+
+    @route(
+        "/im_livechat/conversation/write_expertises", auth="user", methods=["POST"], type="jsonrpc"
+    )
+    def livechat_conversation_write_expertises(self, channel_id, orm_commands):
+        if any(cmd[0] not in (Command.LINK, Command.UNLINK) for cmd in orm_commands):
+            raise BadRequest(
+                self.env._("Write expertises: Only LINK and UNLINK commands are allowed.")
+            )
+        if not self.env.user.has_group("im_livechat.im_livechat_group_user"):
+            return
+        if channel := request.env["discuss.channel"].search(
+            [("id", "=", channel_id), ("channel_type", "=", "livechat")]
+        ):
+            # sudo: discuss.channel - live chat users can update the expertises of any live chat.
+            channel.sudo().livechat_expertise_ids = orm_commands
+
+    @route(
+        "/im_livechat/conversation/create_and_link_expertise",
+        auth="user",
+        methods=["POST"],
+        type="jsonrpc",
+    )
+    def livechat_conversation_create_and_link_expertise(self, channel_id, expertise_name):
+        channel = request.env["discuss.channel"].search(
+            [("id", "=", channel_id), ("channel_type", "=", "livechat")]
+        )
+        if not channel:
+            return
+        stripped_name = expertise_name.strip()
+        expertise = request.env["im_livechat.expertise"].search([("name", "=", stripped_name)])
+        if not expertise:
+            expertise = request.env["im_livechat.expertise"].create({"name": stripped_name})
+        channel.livechat_expertise_ids = [Command.link(expertise.id)]
diff --git a/addons/im_livechat/models/res_users.py b/addons/im_livechat/models/res_users.py
index 889dd0a72737a..ea4ed638f5283 100644
--- a/addons/im_livechat/models/res_users.py
+++ b/addons/im_livechat/models/res_users.py
@@ -146,3 +146,11 @@ def write(self, vals):
     def _init_store_data(self, store: Store):
         super()._init_store_data(store)
         store.add_global_values(has_access_livechat=self.env.user.has_access_livechat)
+        if not self.env.user._is_public():
+            store.add(
+                self.env.user,
+                Store.Attr(
+                    "is_livechat_manager",
+                    lambda u: u.has_group("im_livechat.im_livechat_group_manager"),
+                ),
+            )
diff --git a/addons/im_livechat/static/src/core/common/@types/models.d.ts b/addons/im_livechat/static/src/core/common/@types/models.d.ts
index 1b0551809cf83..8c237778bdcb6 100644
--- a/addons/im_livechat/static/src/core/common/@types/models.d.ts
+++ b/addons/im_livechat/static/src/core/common/@types/models.d.ts
@@ -36,6 +36,9 @@ declare module "models" {
         livechat_expertise: String[];
         livechat_languages: String[];
     }
+    export interface ResUsers {
+        is_livechat_manager: boolean;
+    }
     export interface Store {
         Chatbot: StaticMailRecord<Chatbot, typeof ChatbotClass>;
         "chatbot.script": StaticMailRecord<ChatbotScript, typeof ChatbotScriptClass>;
diff --git a/addons/im_livechat/static/src/core/common/res_users_model_patch.js b/addons/im_livechat/static/src/core/common/res_users_model_patch.js
new file mode 100644
index 0000000000000..4e076a58d4694
--- /dev/null
+++ b/addons/im_livechat/static/src/core/common/res_users_model_patch.js
@@ -0,0 +1,12 @@
+import { ResUsers } from "@mail/core/common/res_users_model";
+
+import { patch } from "@web/core/utils/patch";
+
+/** @type {import("models").ResUsers} */
+const resUsersPatch = {
+    setup() {
+        super.setup(...arguments);
+        this.is_livechat_manager = false;
+    },
+};
+patch(ResUsers.prototype, resUsersPatch);
diff --git a/addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.js b/addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.js
new file mode 100644
index 0000000000000..81ea7d37afe00
--- /dev/null
+++ b/addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.js
@@ -0,0 +1,83 @@
+import { Component } from "@odoo/owl";
+
+import { _t } from "@web/core/l10n/translation";
+import { rpc } from "@web/core/network/rpc";
+import { x2ManyCommands } from "@web/core/orm_service";
+import { useTagNavigation } from "@web/core/record_selectors/tag_navigation_hook";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
+import { useService } from "@web/core/utils/hooks";
+import { Many2XAutocomplete } from "@web/views/fields/relational_utils";
+
+/**
+ * @typedef {Object} Props
+ * @property {import("models").DiscussChannel} channel
+ * @extends {Component<Props, Env>}
+ */
+export class ExpertiseTagsAutocomplete extends Component {
+    static template = "im_livechat.ExpertiseTagsAutocomplete";
+    static props = ["channel"];
+    static components = { BadgeTag, Many2XAutocomplete };
+
+    setup() {
+        super.setup(...arguments);
+        this.orm = useService("orm");
+        this.store = useService("mail.store");
+        useTagNavigation("root", {
+            delete: (index) => {
+                const expertise = this.props.channel.livechat_expertise_ids[index];
+                if (expertise) {
+                    this.unlinkExpertise(expertise);
+                }
+            },
+        });
+    }
+
+    /** @param {(ReturnType<typeof x2ManyCommands.link>|ReturnType<typeof x2ManyCommands.unlink>)[]} ormCommands */
+    writeExpertises(ormCommands) {
+        rpc("/im_livechat/conversation/write_expertises", {
+            channel_id: this.props.channel.id,
+            orm_commands: ormCommands,
+        });
+    }
+
+    /** @param {string} name */
+    createAndLinkExpertise(name) {
+        if (
+            this.props.channel.livechat_expertise_ids.some(
+                (expertise) => expertise.name === name.trim()
+            )
+        ) {
+            return;
+        }
+        rpc("/im_livechat/conversation/create_and_link_expertise", {
+            channel_id: this.props.channel.id,
+            expertise_name: name,
+        });
+    }
+
+    /** @param {{id: number, display_name: string}[]} expertises */
+    addExpertises(expertises) {
+        const toAdd = expertises.filter((expertise) => !this.isSelected(expertise.id));
+        if (!toAdd.length) {
+            return;
+        }
+        this.writeExpertises(toAdd.map((expertise) => x2ManyCommands.link(expertise.id)));
+    }
+
+    /** @param {import("models").LivechatExpertise} expertise */
+    unlinkExpertise(expertise) {
+        this.writeExpertises([x2ManyCommands.unlink(expertise.id)]);
+    }
+
+    get placeholder() {
+        if (this.props.channel.livechat_expertise_ids.length === 0) {
+            return _t("Add expertise");
+        }
+        return "";
+    }
+
+    /** @param {number} expertiseId */
+    isSelected(expertiseId) {
+        return this.props.channel.livechat_expertise_ids.some((e) => e.id === expertiseId);
+    }
+}
diff --git a/addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.xml b/addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.xml
new file mode 100644
index 0000000000000..45b12a3ad0ccc
--- /dev/null
+++ b/addons/im_livechat/static/src/core/web/expertise_tags_autocomplete.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="im_livechat.ExpertiseTagsAutocomplete">
+        <div
+            class="o-livechat-ExpertiseTagsAutocomplete d-inline-flex o_tags_input o_input flex-wrap gap-1 mb-3"
+            t-ref="root"
+        >
+            <div class="d-flex flex-wrap gap-1">
+                <BadgeTag t-foreach="props.channel.livechat_expertise_ids" t-as="expertise" t-key="expertise.id" text="expertise.name" onDelete="() => this.unlinkExpertise(expertise)"/>
+            </div>
+            <div class="flex-grow-1 d-inline-flex w-100" style="flex-basis: 0;">
+                <Many2XAutocomplete
+                    placeholder="placeholder"
+                    resModel="'im_livechat.expertise'"
+                    activeActions="{'link': true}"
+                    isToMany="true"
+                    fieldString.translate="Expertise"
+                    update.bind="addExpertises"
+                    quickCreate="store.self_user?.is_livechat_manager ? (name) => this.createAndLinkExpertise(name) : null"
+                    getDomain="() => []"
+                >
+                    <t t-set-slot="autoCompleteItem" t-slot-scope="autoCompleteItemScope">
+                        <span t-att-class="{ 'fw-bold': isSelected(autoCompleteItemScope.record.id) }">
+                            <span t-out="autoCompleteItemScope.label"/>
+                        </span>
+                    </t>
+                </Many2XAutocomplete>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/im_livechat/static/src/core/web/livechat_channel_info_list.js b/addons/im_livechat/static/src/core/web/livechat_channel_info_list.js
index 823f06efaf702..266a2ee697f4c 100644
--- a/addons/im_livechat/static/src/core/web/livechat_channel_info_list.js
+++ b/addons/im_livechat/static/src/core/web/livechat_channel_info_list.js
@@ -1,18 +1,18 @@
 import { TranscriptSender } from "@im_livechat/core/common/transcript_sender";
+import { ExpertiseTagsAutocomplete } from "@im_livechat/core/web/expertise_tags_autocomplete";
 
 import { ActionPanel } from "@mail/discuss/core/common/action_panel";
 import { prettifyMessageContent } from "@mail/utils/common/format";
 
 import { Component, useEffect, useSubEnv } from "@odoo/owl";
 
+import { startUrl } from "@web/core/browser/router";
 import { rpc } from "@web/core/network/rpc";
 import { useService } from "@web/core/utils/hooks";
 import { url } from "@web/core/utils/urls";
-import { startUrl } from "@web/core/browser/router";
-import { BadgeTag } from "@web/core/tags_list/badge_tag";
 
 export class LivechatChannelInfoList extends Component {
-    static components = { ActionPanel, BadgeTag, TranscriptSender };
+    static components = { ActionPanel, ExpertiseTagsAutocomplete, TranscriptSender };
     static template = "im_livechat.LivechatChannelInfoList";
     static props = ["thread"];
 
@@ -41,13 +41,6 @@ export class LivechatChannelInfoList extends Component {
             .map((m) => m.chatbotStep);
     }
 
-    get expertiseTags() {
-        return this.props.thread.livechat_expertise_ids.map((expertise) => ({
-            id: expertise.id,
-            text: expertise.name,
-        }));
-    }
-
     onBlurNote() {
         prettifyMessageContent(this.props.thread.livechatNoteText).then((note) => {
             rpc("/im_livechat/session/update_note", { channel_id: this.props.thread.id, note });
diff --git a/addons/im_livechat/static/src/core/web/livechat_channel_info_list.xml b/addons/im_livechat/static/src/core/web/livechat_channel_info_list.xml
index 27019a4a00a77..9d25a6827f014 100644
--- a/addons/im_livechat/static/src/core/web/livechat_channel_info_list.xml
+++ b/addons/im_livechat/static/src/core/web/livechat_channel_info_list.xml
@@ -33,13 +33,9 @@
                     </div>
                 </t>
             </div>
-            <div t-if="expertiseTags.length" class="d-flex flex-column bg-inherit gap-1">
+            <div class="d-flex flex-column bg-inherit gap-1">
                 <h6 class="pt-3 mb-1">Expertise</h6>
-                <div class="d-flex flex-wrap gap-1">
-                    <t t-foreach="expertiseTags" t-as="tag" t-key="tag.id">
-                        <BadgeTag cssClass="'me-1 mb-1'" text="tag.text"/>
-                    </t>
-                </div>
+                <ExpertiseTagsAutocomplete channel="props.thread"/>
             </div>
             <t t-name="extra_infos"/>
             <div t-if="props.thread.livechat_end_dt" class="d-flex flex-column bg-inherit gap-1">
diff --git a/addons/im_livechat/static/tests/livechat_channel_info_list.test.js b/addons/im_livechat/static/tests/livechat_channel_info_list.test.js
index 991a947fd0565..a4c4c4f8d368e 100644
--- a/addons/im_livechat/static/tests/livechat_channel_info_list.test.js
+++ b/addons/im_livechat/static/tests/livechat_channel_info_list.test.js
@@ -6,7 +6,7 @@ import {
     start,
     startServer,
 } from "@mail/../tests/mail_test_helpers";
-import { describe, test } from "@odoo/hoot";
+import { describe, press, test } from "@odoo/hoot";
 import { Command, serverState } from "@web/../tests/web_test_helpers";
 import { defineLivechatModels } from "@im_livechat/../tests/livechat_test_helpers";
 
@@ -156,21 +156,18 @@ test("editing livechat status is synced between tabs", async () => {
     }); // Status should be synced with bus
 });
 
-test("Shows expertise", async () => {
+test("Manage expertises from channel info list", async () => {
     const pyEnv = await startServer();
-    const userId = pyEnv["res.users"].create({ name: "James" });
-    pyEnv["res.partner"].create({
-        name: "James",
-        user_ids: [userId],
+    pyEnv["res.users"].write([serverState.userId], {
+        group_ids: pyEnv["res.groups"]
+            .search_read([["id", "=", serverState.groupLivechatManagerId]])
+            .map(({ id }) => id),
     });
+    const userId = pyEnv["res.users"].create({ name: "James" });
+    pyEnv["res.partner"].create({ name: "James", user_ids: [userId] });
     const countryId = pyEnv["res.country"].create({ code: "be", name: "Belgium" });
-    const guestId = pyEnv["mail.guest"].create({
-        name: "Visitor #20",
-    });
-    const expertiseIds = pyEnv["im_livechat.expertise"].create([
-        { name: "pricing" },
-        { name: "events" },
-    ]);
+    const guestId = pyEnv["mail.guest"].create({ name: "Visitor #20" });
+    const expertiseIds = pyEnv["im_livechat.expertise"].create([{ name: "pricing" }]);
     const channelId = pyEnv["discuss.channel"].create({
         channel_member_ids: [
             Command.create({ partner_id: serverState.partnerId, livechat_member_type: "agent" }),
@@ -184,5 +181,15 @@ test("Shows expertise", async () => {
     await start();
     await openDiscuss(channelId);
     await contains(".o-livechat-ChannelInfoList .o_tag", { text: "pricing" });
+    await insertText(".o-livechat-ExpertiseTagsAutocomplete input", "events");
+    await click("a", { text: 'Create "events"' });
+    await contains(".o-livechat-ChannelInfoList .o_tag", { text: "events" });
+    await click(".o-livechat-ExpertiseTagsAutocomplete input");
+    await press("Backspace");
+    await contains(".o-livechat-ChannelInfoList .o_tag", { text: "events", count: 0 });
+    await press("Backspace");
+    await contains(".o-livechat-ChannelInfoList .o_tag", { text: "pricing", count: 0 });
+    await contains(".o-livechat-ExpertiseTagsAutocomplete input[placeholder='Add expertise']");
+    await click("a", { text: "events" });
     await contains(".o-livechat-ChannelInfoList .o_tag", { text: "events" });
 });
diff --git a/addons/im_livechat/static/tests/livechat_test_helpers.js b/addons/im_livechat/static/tests/livechat_test_helpers.js
index 9aa0bf5dc2c7c..11eb1e33eccc8 100644
--- a/addons/im_livechat/static/tests/livechat_test_helpers.js
+++ b/addons/im_livechat/static/tests/livechat_test_helpers.js
@@ -36,6 +36,7 @@ export const livechatModels = {
 };
 
 serverState.groupLivechatId = 42;
+serverState.groupLivechatManagerId = 43;
 
 /**
  * Setup the server side of the livechat app.
diff --git a/addons/im_livechat/static/tests/mock_server/livechat_mock_server.js b/addons/im_livechat/static/tests/mock_server/livechat_mock_server.js
index 1441fb6390b00..1a9912037e17a 100644
--- a/addons/im_livechat/static/tests/mock_server/livechat_mock_server.js
+++ b/addons/im_livechat/static/tests/mock_server/livechat_mock_server.js
@@ -3,7 +3,7 @@ import {
     parseRequestParams,
     registerRoute,
 } from "@mail/../tests/mock_server/mail_mock_server";
-import { makeKwArgs } from "@web/../tests/web_test_helpers";
+import { Command, makeKwArgs } from "@web/../tests/web_test_helpers";
 import { loadBundle } from "@web/core/assets";
 import { patch } from "@web/core/utils/patch";
 
@@ -63,7 +63,9 @@ async function get_session(request) {
         });
         return { store_data: store.get_result(), channel_id: -1 };
     }
-    const channelVals = LivechatChannel._get_livechat_discuss_channel_vals(channel_id, {'agent': agent});
+    const channelVals = LivechatChannel._get_livechat_discuss_channel_vals(channel_id, {
+        agent: agent,
+    });
     channelVals.country_id = country_id;
     const channelId = DiscussChannel.create(channelVals);
     const store = new mailDataHelpers.Store();
@@ -186,6 +188,42 @@ async function session_update_note(request) {
     return true;
 }
 
+registerRoute("/im_livechat/conversation/write_expertises", livechat_conversation_write_expertises);
+/** @type {RouteCallback} */
+async function livechat_conversation_write_expertises(request) {
+    /** @type {import("mock_models").DiscussChannel} */
+    const DiscussChannel = this.env["discuss.channel"];
+    const { channel_id, orm_commands } = await parseRequestParams(request);
+    const [channel] = DiscussChannel.search_read([["id", "=", channel_id]]);
+    if (!channel) {
+        return false;
+    }
+    DiscussChannel.write(channel_id, { livechat_expertise_ids: orm_commands });
+}
+
+registerRoute(
+    "/im_livechat/conversation/create_and_link_expertise",
+    livechat_conversation_create_and_link_expertise
+);
+/** @type {RouteCallback} */
+async function livechat_conversation_create_and_link_expertise(request) {
+    /** @type {import("mock_models").DiscussChannel} */
+    const DiscussChannel = this.env["discuss.channel"];
+    /** @type {import("mock_models").ImLivechatExpertise} */
+    const ImLivechatExpertise = this.env["im_livechat.expertise"];
+    const { channel_id, expertise_name } = await parseRequestParams(request);
+    const [channel] = DiscussChannel.search([["id", "=", channel_id]]);
+    if (!channel) {
+        return false;
+    }
+    const [expertise] = ImLivechatExpertise.search([["name", "=", expertise_name]]);
+    let expertiseId = expertise?.id;
+    if (!expertise) {
+        expertiseId = ImLivechatExpertise.create({ name: expertise_name });
+    }
+    DiscussChannel.write(channel_id, { livechat_expertise_ids: [Command.link(expertiseId)] });
+}
+
 patch(mailDataHelpers, {
     _process_request_for_all(store, name, params) {
         const ResPartner = this.env["res.partner"];
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/res_groups.js b/addons/im_livechat/static/tests/mock_server/mock_models/res_groups.js
index 8ff1ccc40995a..1317c6f9677b9 100644
--- a/addons/im_livechat/static/tests/mock_server/mock_models/res_groups.js
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/res_groups.js
@@ -9,5 +9,10 @@ export class ResGroups extends mailModels.ResGroups {
             name: "Livechat User",
             privilege_id: false,
         },
+        {
+            id: serverState.groupLivechatManagerId,
+            name: "Livechat Manager",
+            privilege_id: false,
+        },
     ];
 }
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/res_users.js b/addons/im_livechat/static/tests/mock_server/mock_models/res_users.js
index 9b5f11d5a56eb..b6a2d47316b47 100644
--- a/addons/im_livechat/static/tests/mock_server/mock_models/res_users.js
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/res_users.js
@@ -10,5 +10,10 @@ export class ResUsers extends mailModels.ResUsers {
         store.add({
             has_access_livechat: this.env.user?.group_ids.includes(serverState.groupLivechatId),
         });
+        store.add(this.browse(this.env.uid), {
+            is_livechat_manager: this.env.user?.group_ids.includes(
+                serverState.groupLivechatManagerId
+            ),
+        });
     }
 }
diff --git a/addons/im_livechat/tests/test_get_discuss_channel.py b/addons/im_livechat/tests/test_get_discuss_channel.py
index 3016567f36ea0..04108e7ba7208 100644
--- a/addons/im_livechat/tests/test_get_discuss_channel.py
+++ b/addons/im_livechat/tests/test_get_discuss_channel.py
@@ -165,6 +165,7 @@ def test_channel_get_livechat_visitor_info(self):
                 {
                     "id": test_user.id,
                     "is_admin": False,
+                    "is_livechat_manager": False,
                     "notification_type": "email",
                     "partner_id": test_user.partner_id.id,
                     "signature": ["markup", str(test_user.signature)],
@@ -289,6 +290,7 @@ def test_channel_get_livechat_visitor_info(self):
                 {
                     "id": operator.id,
                     "is_admin": False,
+                    "is_livechat_manager": False,
                     "notification_type": "email",
                     "partner_id": operator.partner_id.id,
                     "share": False,
diff --git a/addons/test_discuss_full/tests/test_performance.py b/addons/test_discuss_full/tests/test_performance.py
index 8e00ceaae6ad5..030c7fbc293b0 100644
--- a/addons/test_discuss_full/tests/test_performance.py
+++ b/addons/test_discuss_full/tests/test_performance.py
@@ -420,6 +420,7 @@ def _get_init_store_data_result(self):
                 {
                     "id": self.users[0].id,
                     "is_admin": False,
+                    "is_livechat_manager": False,
                     "notification_type": "inbox",
                     "partner_id": partner_0.id,
                     "share": False,

From bfb0dfd80da8101dcd009548931368fdb21f3c8d Mon Sep 17 00:00:00 2001
From: "Victor Piryns (pivi)" <pivi@odoo.com>
Date: Fri, 24 Oct 2025 09:06:23 +0000
Subject: [PATCH 429/673] [PERF] account: Speed-up `_get_invalid_statement_ids`

Description
-----------
Avoid self-join of `account_bank_statement` that is done with a
`Nested Loop` due to the `LATERAL`. Even if correlated, it requires
two separate accesses to its index.
Replaces it with a window function + `LAG` partitioned by the
`journal_id`.
This leads to a simpler plan (lower cost) and working in-memory
instead of accessing disk pages (lower IO contention).

Benchmark
---------
On a database with 46k `account_bank_statement`, calling
`_get_invalid_statement_ids` for all statements took:

| Before | After | Speed-up |
|--------|-------|----------|
| 146ms  | 72ms  | 2x       |

closes odoo/odoo#235035

X-original-commit: d616323d03cc8f2c25a7570fdd96af43714f6a91
Signed-off-by: Florian Gilbert (flg) <flg@odoo.com>
Signed-off-by: Piryns Victor (pivi) <pivi@odoo.com>
---
 .../account/models/account_bank_statement.py  | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index e1e4b2c435044..58fc216ec73e9 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -240,21 +240,26 @@ def _get_invalid_statement_ids(self, all_statements=None):
         self.env['account.bank.statement'].flush_model(['balance_start', 'balance_end_real', 'first_line_index'])
 
         self.env.cr.execute(f"""
-            SELECT st.id
-              FROM account_bank_statement st
-         LEFT JOIN res_company co ON st.company_id = co.id
-         LEFT JOIN account_journal j ON st.journal_id = j.id
-         LEFT JOIN res_currency currency ON COALESCE(j.currency_id, co.currency_id) = currency.id,
-                   LATERAL (
-                       SELECT balance_end_real
-                         FROM account_bank_statement st_lookup
-                        WHERE st_lookup.first_line_index < st.first_line_index
-                          AND st_lookup.journal_id = st.journal_id
-                     ORDER BY st_lookup.first_line_index desc
-                        LIMIT 1
-                   ) prev
-             WHERE ROUND(prev.balance_end_real, currency.decimal_places) != ROUND(st.balance_start, currency.decimal_places)
-               {"" if all_statements else "AND st.id IN %(ids)s"}
+             WITH statements AS (
+                     SELECT st.id,
+                            st.balance_start,
+                            st.journal_id,
+                            LAG(st.balance_end_real) OVER (
+                                PARTITION BY st.journal_id
+                                    ORDER BY st.first_line_index
+                            ) AS prev_balance_end_real,
+                            currency.decimal_places
+                       FROM account_bank_statement st
+                  LEFT JOIN res_company co ON st.company_id = co.id
+                  LEFT JOIN account_journal j ON st.journal_id = j.id
+                  LEFT JOIN res_currency currency ON COALESCE(j.currency_id, co.currency_id) = currency.id
+                      WHERE st.first_line_index IS NOT NULL
+                      {"" if all_statements else "AND st.id IN %(ids)s"}
+                  )
+           SELECT id
+             FROM statements
+            WHERE prev_balance_end_real IS NOT NULL
+              AND ROUND(prev_balance_end_real, decimal_places) != ROUND(balance_start, decimal_places);
         """, {
             'ids': tuple(self.ids)
         })

From 643be6154555047eca556831c21abaffb326a275 Mon Sep 17 00:00:00 2001
From: mohammed84farouk <mohf@odoo.com>
Date: Wed, 1 Oct 2025 10:58:26 +0200
Subject: [PATCH 430/673] [IMP] Employee: Add domain on contract type by
 country

- Applied a domain on contract type based on the employee's country of birth,
ensuring it matches the country defined on the contract type.
- Renamed the hr_contract_type_action record from (Employment Types) to (Contract Types).

task-5118865

closes odoo/odoo#229475

Related: odoo/enterprise#95995
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/models/hr_contract_type.py       |  2 +-
 addons/hr/models/hr_employee.py            | 17 +++++++++++++++++
 addons/hr/views/hr_contract_type_views.xml |  6 +++---
 addons/hr/views/hr_employee_views.xml      |  5 ++++-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/addons/hr/models/hr_contract_type.py b/addons/hr/models/hr_contract_type.py
index a60963f383599..ce0c810c9669b 100644
--- a/addons/hr/models/hr_contract_type.py
+++ b/addons/hr/models/hr_contract_type.py
@@ -7,7 +7,7 @@
 class HrContractType(models.Model):
     _name = 'hr.contract.type'
     _description = 'Contract Type'
-    _order = 'sequence'
+    _order = 'name'
 
     name = fields.Char(required=True, translate=True)
     code = fields.Char(compute='_compute_code', store=True, readonly=False)
diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 4fc513468bffd..0939ac1d19b0b 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -272,6 +272,11 @@ def _lang_get(self):
         'A user cannot be linked to multiple employees in the same company.',
     )
 
+    has_country_contract_type = fields.Boolean(
+        compute='_compute_has_country_contract_type',
+        groups="hr.group_hr_user",
+    )
+
     def _prepare_create_values(self, vals_list):
         result = super()._prepare_create_values(vals_list)
         new_vals_list = []
@@ -602,6 +607,18 @@ def _compute_current_version_id(self):
             if employee.current_version_id != new_current_version:
                 employee.current_version_id = new_current_version
 
+    @api.depends('company_country_id')
+    def _compute_has_country_contract_type(self):
+        count_contract_type_by_country = dict(self.env['hr.contract.type']._read_group(
+            domain=[],
+            groupby=['country_id'],
+            aggregates=['__count']
+        ))
+        for employee in self:
+            employee.has_country_contract_type = bool(
+                count_contract_type_by_country.get(employee.company_country_id)
+            )
+
     def _cron_update_current_version_id(self):
         self.search([])._compute_current_version_id()
 
diff --git a/addons/hr/views/hr_contract_type_views.xml b/addons/hr/views/hr_contract_type_views.xml
index 7fd2f465c1fa8..b676001e632ce 100644
--- a/addons/hr/views/hr_contract_type_views.xml
+++ b/addons/hr/views/hr_contract_type_views.xml
@@ -4,7 +4,7 @@
         <record id="hr_contract_type_view_tree" model="ir.ui.view">
             <field name="model">hr.contract.type</field>
             <field name="arch" type="xml">
-                <list string="Contract Types" editable="bottom">
+                <list string="Contract Types" editable="bottom" default_order="name">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="code" column_invisible="1"/>
@@ -29,12 +29,12 @@
         </record>
 
         <record id="hr_contract_type_action" model="ir.actions.act_window">
-            <field name="name">Employment Types</field>
+            <field name="name">Contract Types</field>
             <field name="res_model">hr.contract.type</field>
             <field name="view_mode">list</field>
             <field name="help" type="html">
                 <p class="o_view_nocontent_smiling_face">
-                    Create a new employment type
+                    Create a new contract type
                 </p>
             </field>
         </record>
diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index 74465ae2c9dfe..039948af0991b 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -379,7 +379,10 @@
                                             <field name="wage" class="oe_inline o_hr_narrow_field" nolabel="1"/>
                                         </div>
                                         <field name="employee_type"/>
-                                        <field name="contract_type_id" string="Contract Type" placeholder="Contract Type"/>
+                                        <field name="contract_type_id" string="Contract Type" placeholder="Contract Type"
+                                               invisible="not has_country_contract_type" domain="[('country_id', '=', company_country_id)]"/>
+                                        <field name="contract_type_id" string="Contract Type" placeholder="Contract Type"
+                                               invisible="has_country_contract_type" domain="[('country_id', '=', False)]"/>
                                         <field name="structure_type_id" string="Pay Category" placeholder="Pay Category"
                                                 domain="['|', ('country_id', '=', False), ('country_id', '=', company_country_id)]"/>
 

From 8171d2988df4c9a4b6ffa4e0e63863114c3dba55 Mon Sep 17 00:00:00 2001
From: mano-odoo <mano@odoo.com>
Date: Tue, 17 Jun 2025 13:01:19 +0200
Subject: [PATCH 431/673] [IMP] web: import existing fonts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The font file exists but are not used in the reports. Wkhtml and the
browser auto generates the font-synthesis variation for the italic and
some font-weight but it's better to use the file we already have to
ensure a clear result.

Italic variants are not generated by the browser if a font-pair exists,
thus this commits adds an extra mixin parameter to avoid creating
font-pair for missing italic files.

task-4836556

Note:
Some fonts are missing variants, thus wkhtml will generate a synthesis
variant for the following:

Missing italic: Oswald, Tajawal (italic variant doesn't exist at all)
Missing medium: Open_Sans

We don't import these file to avoid increasing the footprint and the
font-synthesis does the job.

Note:
Never import the `light` font weight if the file doesn´t exist. if so
wkhtmltopdf will not render the content in the footer, loosing
information.

Part-of: odoo/odoo#214856
Related: odoo/upgrade#8811
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/web/static/fonts/fonts.scss | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/fonts/fonts.scss b/addons/web/static/fonts/fonts.scss
index 488aa9de6376c..e64c19a333c9f 100644
--- a/addons/web/static/fonts/fonts.scss
+++ b/addons/web/static/fonts/fonts.scss
@@ -73,21 +73,36 @@ $google-font-path: './google';
 
 @mixin google-font($family, $type, $weight, $style) {
     @font-face {
+        $style_name: if($weight == 400 and $style == italic, "Italic", "#{$type}#{if($style != normal, $style, "")}");
+        $file_name: "#{$family}-#{$style_name}.ttf";
+
         font-family: $family;
-        src: url('#{$google-font-path}/#{$family}/#{$family}-#{$type}.ttf') format('truetype');
+        src: url('#{$google-font-path}/#{$family}/#{$file_name}') format('truetype');
         font-weight: $weight;
         font-style: $style;
     }
 }
 
-@mixin google-font-pair($family) {
-    @include google-font('#{$family}', 'Regular', 400, normal);
+@mixin google-font-pair($family, $italic: true, $font-weights: (
+    'Regular': 400,
+    'Medium': 500,
+    'Bold': 700)) {
+
+    @each $type, $weight in $font-weights {
+        @include google-font('#{$family}', $type, $weight, normal);
+        @if $italic {
+            @include google-font('#{$family}', $type, $weight, italic);
+        }
+    }
 }
 
 @include google-font-pair('Montserrat');
-@include google-font-pair('Open_Sans');
-@include google-font-pair('Oswald');
+@include google-font-pair('Open_Sans', $font-weights: (
+    'Regular': 400,
+    'Bold': 700,
+));
+@include google-font-pair('Oswald', $italic: false);
 @include google-font-pair('Raleway');
 @include google-font-pair('Roboto');
-@include google-font-pair('Tajawal');
-@include google-font-pair('Fira_Mono');
+@include google-font-pair('Tajawal', $italic: false);
+@include google-font-pair('Fira_Mono', $italic: false);

From dc840a5d3551bfc7321249169cd0dfb948cef55a Mon Sep 17 00:00:00 2001
From: mano-odoo <mano@odoo.com>
Date: Tue, 14 Oct 2025 14:32:17 +0200
Subject: [PATCH 432/673] [IMP] base, web: replace "Fira Mono" in the reports

Fira Mono has rendering issue when a report is generated from an UNIX
OS. This commit replaces Fira Mono for Noto Sans Mono only in the
reports (Fira Mono can't be deleted it's used elsewhere).

Noto Sans Mono doesn't have the italic variations.

task-4836556

closes odoo/odoo#214856

Related: odoo/upgrade#8811
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/web/static/fonts/fonts.scss            |  14 +--
 .../Noto_Sans_Mono/Noto_Sans_Mono-Bold.woff   | Bin 0 -> 23836 bytes
 .../Noto_Sans_Mono/Noto_Sans_Mono-Medium.woff | Bin 0 -> 24348 bytes
 .../Noto_Sans_Mono-Regular.woff               | Bin 0 -> 22044 bytes
 .../fonts/google/Noto_Sans_Mono/OFL.txt       |  93 ++++++++++++++++++
 odoo/addons/base/models/res_company.py        |   2 +-
 6 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Bold.woff
 create mode 100644 addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Medium.woff
 create mode 100644 addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Regular.woff
 create mode 100644 addons/web/static/fonts/google/Noto_Sans_Mono/OFL.txt

diff --git a/addons/web/static/fonts/fonts.scss b/addons/web/static/fonts/fonts.scss
index e64c19a333c9f..7e77a753d2746 100644
--- a/addons/web/static/fonts/fonts.scss
+++ b/addons/web/static/fonts/fonts.scss
@@ -71,27 +71,28 @@ $lato-font-path: './lato';
 // ------------------------------------------------------------------
 $google-font-path: './google';
 
-@mixin google-font($family, $type, $weight, $style) {
+@mixin google-font($family, $type, $weight, $style, $file_type) {
     @font-face {
         $style_name: if($weight == 400 and $style == italic, "Italic", "#{$type}#{if($style != normal, $style, "")}");
-        $file_name: "#{$family}-#{$style_name}.ttf";
+        $format: if($file_type == 'ttf', 'truetype', $file_type);
+        $file_name: "#{$family}-#{$style_name}.#{$file_type}";
 
         font-family: $family;
-        src: url('#{$google-font-path}/#{$family}/#{$file_name}') format('truetype');
+        src: url('#{$google-font-path}/#{$family}/#{$file_name}') format('#{$format}');
         font-weight: $weight;
         font-style: $style;
     }
 }
 
-@mixin google-font-pair($family, $italic: true, $font-weights: (
+@mixin google-font-pair($family, $italic: true, $file_type: 'ttf', $font-weights: (
     'Regular': 400,
     'Medium': 500,
     'Bold': 700)) {
 
     @each $type, $weight in $font-weights {
-        @include google-font('#{$family}', $type, $weight, normal);
+        @include google-font('#{$family}', $type, $weight, normal, $file_type);
         @if $italic {
-            @include google-font('#{$family}', $type, $weight, italic);
+            @include google-font('#{$family}', $type, $weight, italic, $file_type);
         }
     }
 }
@@ -106,3 +107,4 @@ $google-font-path: './google';
 @include google-font-pair('Roboto');
 @include google-font-pair('Tajawal', $italic: false);
 @include google-font-pair('Fira_Mono', $italic: false);
+@include google-font-pair('Noto_Sans_Mono', $italic: false, $file_type: 'woff');
diff --git a/addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Bold.woff b/addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Bold.woff
new file mode 100644
index 0000000000000000000000000000000000000000..ec2292e2165b174beabeed13c2a61dad9b656da5
GIT binary patch
literal 23836
zcmY&-V~}V))9u){ZJTFo&z!Ms+c;y}wr$(CZQK0jsrUZ5samymuS%zrovzBxZdW-`
zQ2;=I-=>WNfb<_%T>j7g@A?04qM}MN004lAzbejuC}Qps5EB*={ncuJZT?^A0saHT
z5tElw{MBxMZH`~aC;ai35>r$b1ONb{_|+MHnc;-^tV~Xko(TW|SnWT*|KLfkcWP*@
zZ}+RU{`T|x#kx^Yk(;5569E7K=zn9C|7u9=g&w6QcBa<9+93b{*fjtE9E<@yq`#@Y
z<F7Bw;%`5Q{|5w9D|eG$Z4&@MtO)=hq|~8?htkYg-v|Ie>A!Wb{Rgt--5j%D@mHJt
zwF!Pf0+#?<VP@^*_N!g~##H*9Q!Z1g$BC7#;cq_`{$FkA7xRlI4dd4OZohHW{)_pa
zF9BFJ@QsbWwehd^yIvsf-+6*)In@~1**ZD_0BHQi2K=2j(8!>xqN|;Q@vpCz_^;pm
zFWwn4|AzfC;4c97bEtpcEdaol-{jGMe1trN>b7pEXQXGaYpACu4`_f(kdgK;P5>lS
z<X>!<K;#~0>=aO<A&`M67#jg4@F0{tE|#7)3=9}QCzurmKw=9}_W%6#b`5UzZw>YA
z?H?fZV<oF;#`WbT=q0C2W+x<Q#tduq^Z?8CUw`n$cTE8S0nC)(<K5Ps<t8Kt<WVvU
zC4z`ZQ7Y$yK+yYwKs1E4oRDerEEXDBTj}pWhgk}F5$0-cfj^N{eL{4J7RSy+3g?H?
zJdY<gAN;^_{o%a^PG7qqqFyQGY8{hwH+MNOcZynr1>jAX-B}Y~HD&`6qG2zbocKR$
zJOTvJm*aN*&kaPBUS=b#8ix+RbXLfMc?@>AiKF}dT5ntQiW#(9F-KZ3FDJZk1|-NB
z*>et0C^Z&7tirwR1;6Ozky(^Nn95iEqO2Qd$r{wQ3RKXxRIjC5qg6Z0E^%`tKmK}G
zM7E!=i<K@ysl#giwKgavyKpmE{@gN}4vDX--+{)vrNCaPoBooVv}6K4&n8M%#m=8>
zqin$4&S%yfIQ~0Bm(Pcn<qccd*%oRb7XpVr2M_ANX#)TPQVY}x015yC$_z5~yLsvV
zW1uMj6QJDR-G_#N1OWvB0s`3u0Qvy}`26`zA5H*--#nF*69dczfF=C|Gx`3_UC04o
zk>7;K*;xSq0MP+${vC?|0QkRs)YCKZ)58Q41w&{BI%M>Jqk-Y}YeWkGiX8$qx?@^o
z{4|9zsnp{db`tw1B_J#yDIhB#As{25+b2n=qaT$Yf1dO6(^q^8<V>pv<6mwpk02i_
zAN#MoN%-%?=g-Ga$xqBD{rk;J%-u}}I5|F!yWMTyKX6a{OOM*KzH#s>c$yphwkND}
zHX=Y`>_I6#Hsn}60oC5#-tpn-zOkXHfr$}%0tyluA}TUELP}CvVruf5+|t6z{PN=J
zyt1OIf{GGbJu@RK0}B%yeRE@LLrc?}-P6O%{qy7Ny|bgMgNqY<1Pl}$BrG&ML`+m%
zWNh@D*wn<y*}1hXZs%qHBB|smwQh%}b=Hez+s#_@hvlmcm&^4w+naA-7*g}IwU-Js
z^dsJiQT@~O0r~OXSanDjZ5`Z!a-OL&Py!d9uYknl=QOcsogVv>>nY6+OgMZ)xA#*<
z`QrCyp5W&0<?rmU1Twi)-T?je&NoNQ=o|_#$t3_r0CDi(-2dKxE(pUp(>YV8soP9@
z)W3hE(f{^xATEY}=+z~EdOk<~#eVz*%LI~M|6u1{x)W$-7a@!u>nRy38M^h~1{#CP
z-&FtLV?+b(X#_V(!(-<Bw0x5T6+iui^$vNbdc|G=r$II&8WmGYG0sZU)viOrAg9KE
zdjp^Mz_OJ*?id!^ikrw7rH-}-a0WghPhjVUm0MX&K3iGQ@TFd29${*!fdZz+%k=;N
zxUE;IT54jCpk^<@Mgjs0u1>XIQy40w;Es{l;}}rGtr;ueke2nfZaLd@h_}il=)`ZI
zvUcev@;RzB%4ONUnY+(SN&<p!mdq&fo^~=nOlMwXs*9UR?E9b$|8>C+d&{CzzUB!%
z4VGHjKg`3~jwziL=gUA_$lp=@u<4Q|B10^#in9}reU))w89UTZfYMk}?vfCp1s5AS
zO1}jz2V;`>tgOX(RWHDhCtT%DWT^n~cj7PF-Yb=-*u^Nv*Q$QFH0wToO(D&_7gH_?
zXBEju#~my{Ezv_sW<ljC2SvOnNFo@8ti}<4?-VOq0xz(f)<Sp|Di2i13XgJose&+a
z#gI6EVrYV7vu0QiHB3`yqiGK=^CB_NT3JbZbEl6F9cD;kS%^TI6xYencS@L>8kE`R
za6zO^hkYk;Ax6?BTVZtRa0;4BvUxWXcuc!1rFlMZiyc06v(NNIm;n4#@YyV^Pp-{f
z6yIA=nvF1%d}FEdG6K+yCsUSgMTF!WEq?YMi@2<|oI24>m+j|GS~*vPIh2RXqt>Kn
zN65>fIBPqz!6|FSlUnaY*Pl9SJuGH1mt1J;#SZhAd0+`1SEWEdDp6YX6_>>io?X;P
zm^L3<o*t-*Urq4>vL<6xjHflcip0yxKo>ZzSt1W|)XAYKRQC)&=nDj>CTGGaPfW1z
zr`3{$kU$rWt`fFTZZ}q*%&N<(Hb}ASak_dfcDKgiO3y$YLeS7sj#-f(M0Zl52xJj&
zNpH**NQ$Qesks9L7)7AHHA61|O{fvUY1H#4LJZ(#Sultl)h9AX)VG|EzrGexH?Kw2
zEouXHUM(!Yz82o{beXR*?6x>gaVAUl|4?XdM2Ss!Z#=zA5;A{V1N~O-h3BLm6{(wx
zV1mQ{d<q$5Sfs05LT!$!vs`h9wqcqXye$O&;7;X9t7QJ03aOwRs>;7VJ!+4WP?e6B
zMiJ<VNK2_3%o1~-p-920OZL;|G=><FPvy090zqRqCDCwX9>e>zS%O%N`l|Mj?xbJ}
zHz5_uK2dX4IeJf-m890rMcvR@*#I?Bb72*JgqkJO@EJTkUH90CHIhRGNmOMNk?H!{
z%p!rWsg*|KV}zbDf~HCyfxjVA2C98K{fI34wb4HAgZEMc_d{~&f%RRdbQ^P|{5nz(
z_@h?c&zHOt=u1=6_sjmiG%LIK6UoWeinS}Oi#n1d>DdV&WJRrkwAE|QGAlgo(I2lc
z)q-N#aWY9Z6gHP~My;1$4F@Qu4@t4q(b?(~<Fd4ovnXp5C(%JCG}ExOIqb=NF$*;0
zpXIVz8;aI@?sfO{eZHEmi=r+AWpy>|i0~YC?O&}lXQBx@vsDpSWY(YTR8Sr8?-Am0
zYUZQKmv&P8W;bvlxJv@?VYjz=7yBaXcA4u;L|)KcmO*s>DuUeB7#eKUUR?NY-~-9=
z^*n=VEpqcl6WL;@M=@*hNY|7Z+;a*N$wi(@8nk?<ADiZ;vyDk>dCkb>AThctfgM@i
zNs<Cg@=C)6;YWXC+j}8h+ecms8DPJ3t%*mVu$te7(jg<!GF`)wj6E$tWkAL#3U<eJ
zIZ?^$5n<W#Lw7n8e9EAMX7NS@4VpXCM+BP?i&My?SPYk2ltYpn&~Bs!N2gcC6ILTM
z>Z8E3s%FSZH<C*HsbC|o@qS$DB>q&bKUh)Hy`{vcBSkJG-GWaa(8VZrhJDZNQ`jsF
z5uCTVDH?Oz7+*{?U0+d?tGI4$hbjLocFC<HnzbMCNbDsSZ)_tp+eh`4F_(#(MJ(45
zv(PzuSFewjyz)O(U1;S(t&{|1n9l4hufc4m-zERl6>|U7P?_Yk#x$X7EY*3GjkIOq
zvg~SZb5PY7IBir^{Gn@OPe9ldfv|X9Kd=O0?_AH%Xg#XQV%!<BpLR&n0r1gYh(NHl
zLlFwpv^m(r6}ym`0+q1^@X?G3Tm?G?<bZK`9A#wg05CbmbL0Z>oYc3=;e_cPzyaG?
z5<3k7lm|J)K)E0undSkgceG`k(SKxnfbj@%2kV;n6R>TVMabXJg;`jc(8qgWG;2Ct
z0RVi=z@Y~h5HhKM%VW5LHv1B#9l6c!!ubBLE@BRRm`)TQs{`X}c6I1f?APEEjoe58
z`5ufkL%t=3)&=}b4X_dA73CY!%y9HEA$0Vy;gFqv17+)B;e1LlF>=At80GdcCS351
za&+jor7`Nar8Vlm>Fr|Xym>J(I?YiVedPNO2BxyF2|?1Y4ZnbHrI(xjsKCU0-=Q&j
z-=Q^n=c{EV|6C9xgZXtX@o?JqTKhYMn*=q4@WYY^JKQa{0It-z&W*#jJVg(HT?eTC
z`+Wom0QmC*0RMaLbwPS5Ev@nSWOq!Zk6k8=8D&Vv6M{gDk$?mS>LaQPszt`~LrD15
zMudij(u9YGhJW~nVi#Fhhlh$+<eQ057D<-<wWul@->|3>(G~tTx%ZOkcw;pN;{B7;
z<I_*V{Ibb;!Z~yAo&2Ch6dM-^(Qs4|D(+Oc6TvSTa=9#l{iFDuPxRwFYNODrI~GCY
zscB++vrO6I3bzJ(`4u~5OZ~X<NgVV?10ZJB{a*RRm+>!`;BE44|4_}KmOK46d)6Z)
zx)cDv$v*kQ2(ki-hA~1QTb^t(1S4jl6DKY`igoy!B2fMg$eTzKDzM;@O^V__MN)<;
zBX7ft$urohhTTNB#)ic6^b!_X+iVA8>L0p-Rz<H2-;`*Sz^{6Wu*(gQ-kJa|$R442
z2`&-YPq^<MI}(VszR`e7UHcNfs7w>S%WM*KaOYhf@7E2~y*Ms)goP)6fP97-1B6~H
zlu*b~El?8kcQ?y)Jto$)bBM92vFU!sZfV<KaMPRGp>O7s<UpK%lD??l9D)X+U#*{9
zpNPQGey0%1pm6YC?5Pnm0j`4|#4hmMOqYC*8~d^z7Kh-(F0j@c%AL^7-LB6Jn{wz4
zIRmCU1y{96&Cu4S_WIoPHu2%8++)Ndh4AVK)8YeV&yZ+uTXZ4X<X8feh#)`)SFPG#
z<ZOZ7!YKR*`nUo_68y)=5=bUU0;z;cZ~g9da-a%G#lzKzAm(IoAm)Mx)SS&QCCY3c
zl28%;Nu0ZNPr#e?<>RpvS97SK)|^DwS<|SslyoH<2N?3|3MeSyKX;3P2h88E`*qsb
zaNm{J$s;C}?d|th-q<$Pn05L~xqAgk8tblwAX5o0J9m$o(H(5qWL{c^d7eOfXVe#X
zA410)^%L#+JGGai(UGV}ORWNdqk&qV8eBv@QqrTQI)B9_$M8q4#`{s983T+!@)PW~
zxeR76V4y>3gev?pSGl%<Ji1oXi&KRatdK6e4qT3QQ@>Mi41qe6W0W)&_!ZVsNR&mw
z3H|-FribJ3f?3&urTj&@r8AbS!2bT#Qo^EnIx#_ehth_tSUF}b$ylH@=fYH<Otf)H
zAsG(<6eLJiRROujG)Crw9NvMo+HAHy(AI337wYffi*}PNk)gg>5OY)TbVdGAZ0!DA
zZ0PYhdNb8I|3iDj!>6+Ob19|DDwnpohQG7Zg1&R(=JKM<Tr4fh6;b%UuSx+QB2Gq0
z;5`;_;Nl*q6Kw^mo?qCqVUlFr2Q7?d>Akg$dbcI&%nz_8O$_}vtT8;CUmTlQ<<Yf&
zjsA|xo=hL)aD}3m-u(Brg8~lx4HL7V&lWE|x=5I2BpX?dA>xz`sO%$fatn?+ccxDh
zdWe{HE$^OW2IzM6)KcALKO_au_b_kzF}{`i%I+npi`{UQaNhLg`BIU}^A_Hg@WbX7
z`!Eo#9CFh2x|q;&=60AA)7|wA_uhj)i`-xvd#%gixgAd^B<9r3T3>}GsN4`M3oxP(
zleyPEitPf;SOxB!8J;h*xClSnI<J4gHVbD@9nD;fVM-#3jxT1V;;9Vr1FBE{_1MQf
zGyCHg<<h$($VGA6H{k?Ix+sLc`z7esGdK59mo{a@o+aD9EjJ7L`sKen^6@X=TXkFN
zCc;Z-X5pKDfJ_Nfw^yhXpc(2#l5j|zrqC6`eZh(;Uoc5tCUp#>`mfF~_Dt`VC!}tT
ztrsQmDtaoxDMe-cP^{W%9BzK?*PJWd+<-9y%R`SkLq0u^ms%^j|Kq_?E((54NLZuc
zdPz_ta*r)EC#|wnO`cZ46F)9Jw4y>;0b0Dm1(E6~Gpd(dw%?8k5m~jqvo!YFXOa)L
z23g7uSk|MD+9zY<LRHD$J92G$HJ`u@|N5o~d??^8LeOC@(IETiB1I5HEjN{Log)ye
z-7Akj-1Rv(4%56T>nw0hzagH-Lq_0@GlWa1W)N;`4bLWd^PU+cA<1MAE<atlVVifL
zN2Zs_>OgQa6qRiO-JS#eFos5wO`bOMziE&S@Was|d=jD?)wie()#e!)iO*v|J{&|r
zexjR;qkt27!<@!~KP?j>3Z_NK@R$g2ZQ5kS8#5Xt)nr~w7IgDeWe<X6geoyphKv(t
zrUE6kZ%1pDKA(Uk;Hg%e<KU}Q{<~;s!d!cuxxx;lsmSRb2bprJQ}c5lR9XEm{XImI
zgXEdz=|qwEcwwVIpm*h%ap+|AO;)1Jicx<o34``NSsDcBp>u`)F1x6w1gSBtwF@Q%
zHHTA?;`#>>W?a6Lzdj;6+-w5i?)ZOwY2_WIIioJGFO<;1OnT=mSWs^JQdV>FQ}r9O
zb=qeqtqHRv5`BaVClLd-K)>4ffq02{8#SQ!z=0_(iI-!|fm#O2w;eiY6gt_xX;0`k
z_c1z+HX8VPehr2c^KI1b6<K}@(wQs;qHA;Rv+7^jKf6!Oz7=GA$Xa7Fe{b2V2J`OV
z>eM+6$G7)!XC=<u&}}Bnar6*iVt4n$#$N&{j0*`xX2xU)@>dUK8Da#cS+=1n6UnCB
zMI#;I){L0T$uVQch4>>VB@tm6LLBWiO6A7)fZaO_9G2t!%P<=|ZiEm#8?lx9Q6!E9
z_iZwwOk8BI@pT>$i!<L?j&wI8j_khgW6wn9SN-c_<ul;Bjk&?_GT<3bzQt($)#p`|
z=;L5L;tv&_Hv3n+qIKFn)@Kh1(XP6Q2^a|iOWs1^C(_ifOhT|fT}B#y&B`TlV-hJa
zF3Hb7!VmCMIt&~otCo14kj3xeX@!_uuT^5vGeq#r-d^?ObK$Wx_Cx55Q*+5nw8dJy
z1!2U3cwpetycA~=riUSXZ+KkGlOfz*im3~FNDD55b<2Q>0_pA_y(D8JB32$wsid$n
zSe*2D2z>YJdy6YgtM`2QMBq*7!~(~Dud6E0CpSq<+1_BeB@k;rdSZ61_ru)y7j+1c
zOtQ|WpoO5<zM#?Y?<t%+0xJ!yj<RNx50`W@A|e}d7$!4)02ZHgHvMq8Hva~qy*vK^
znLqxV;;EI1D0F@pS~{J&=Bt0i{s_G%{89SODaLD8IQ71O-P0r9y}Gl=V!gzQmkR7`
zAo2b(o$%xF{lVue(gXI^QDNJ9l>T;sLAzlOzj4G<3Zww0umY6An>xlWC!Eg)>0BP%
zxJKeADgn_laU-ZtAE`wcH)?OLd!mU>6KI)})Jp$^!;BKg^cR!v=3+4-MV_(CpWolO
zYyAFUej!!ngo>;uCl~Vxi$5FGXbq>g3!o0n09tft0Dw%_^CKVK7Q4ga;4TBMO5@>L
zW~IjcHF|?@jm6mM05wIf44d6`?(<?>>ypOW$8EWtePr`vEWYHzBIm8s@Gz0RTC<@>
z!K=|$s@3B$m5?}tm{g`|pay^YSza6Y<f^DOnd}Y1KEbOw#si_SR4Kfv)pFDbi7AaH
zqH5G=%ph$KFh1dEY-Y4Yb4qkmjJ<Wq8%BkwfYAh=K}JsSsI{&&4%h%Xpb0vdz0vED
zyQA&x6}t!ge$9L|7oIozgTqnOGGXC9;KG-8<84b!Hz2{Lq-KtdOA2LqQny}zN+u$C
z<cq-^a~%`@4EuVDVoHLKdkkJm2;;mqjmI2s>6Jp8za(`WL1s=zgjl1nIL$1M>nH9o
zg^^oxqGuzzlu#Tbt!!QWjx&}k*mugMfoCiJJ%SaQX0yf{eJd|*|20L&jnpRbpHpnY
z-|9z9!`T#Jpd->Cc}O~7@wP0@!J@c;eq-{zAkW=h_Q#w@@XZz4S`7Q(q>t#LJ>JPV
zz(z<2#@IiKZM3@$*|GgmP7Ko{IkX01Cq{KbkKQl1S)W_3TgQZT?n=s7tI}M70&%WG
zMdWe?Shqex^c~<QwZQHb7*9TIlw<+@z_BC{nIJ^DnFvNS=Gy-Dg0#!yfyFYF6H}Bh
zhbSj#rr;iwX4wEm!pM--+im^x>VsCd+(?w~Rze@j2PJatZ@2lrUk|;m+vj%!Ql3vz
zC45$gBsS*Ak|$fN#l_ZxwQ<(?HQPTEdkw|W=lG))5TL=rTi5Ss{l@-UI1$||I*C^n
zOw5~!kYHu=<fCAL2@aH}f!{C_i~C40^+u_-^UzFG2)GMFT*pjtoWcsP?Zwp2c@6}?
z;EAds<sVOwXzz|)c;Hw}U4rAelaqO1b;_&Ise!qd;P(N5BASU}N?K6J1(Fqhg2b(r
zE+DUTpyRm8;?U3xMYTcS+25D;6nqYVV3Dl_Z|@G~o2o6>+wF&pB>+0QwU@imo_rdQ
zHGEy&uG~BuMvTTL%F(ya>(KE1m9ne%pxP3;Jtq|(DfB;fFE?~bb0X96kW02Z&?dK6
zMLl0UUxD44KmA7fFc?0z?GA6PLDu5f<PH<OZ>(BHL4>O;iwM2qeT##CqD_q!1F3Qu
zv2K}giPV~-O6C6zk>R`sU`;{7_fomV;@RfHE_7#s6)E03LLIG4#{_~t65b(rV;t}J
zj5wBeZ{@A&LXUgkVIsm^%-sT7kONLd63mE%tr#$PurT{Uq|5bY=*y6kuyYg7WSqDZ
zdsgCg3Z?J#A|y}Eq=}w5Y-CFEFG)j~;?C*1^yc08w)#xJO(&p27teGauL=E9>octT
z4ZW|oWypq_P!HE*TB||-VlY=bdA-MUWizG|=|~TbZ?$0d42kj{)S=5L12mB%VVZhm
z8hE@OuAiIMnK>A415CXICVy!oQf8jm2piTOjN_G6`0aOd4IUP_W1h|QLX>sO&Yz#Y
zvM!&uV{Q7M@wIMzC%yp7-7p>R=}4R|^P6zy60(Jx;XR+c<dkNDtH;4%o@k7+)ZoCh
zcuA^FN`od0D^YBn(g$j)u=~{IXYc|RbAML?e2cS&$JD2lp7poSu2Ti;Jh_FDGnuTC
znXel@u8@OwS2MMh!KP?_VF?6G!EmrKgdIkBF`M{{_Erv>OSCWFkXN%qwmiyup;m=$
z&$wCO*M>79iPoNfC?OH;JG#;R44u7t2bC#lb|<UeZ`v!mByp~H*)(9ai8pJdw-Akf
zdi>uG1fo;D)(IH%f(*n{SM}bEg+o9FlK}a}F<h5aN8@kbd(Vu0O`x;?8vJT=x<zzD
zL`%OPYBHAp+)sDVyF{klb93<C)FRvb!>mQX%Y1$^^SJhvn}epqc+wW$sfn%X2s88&
zUD0a=_z|V1ojQu^y$h!i7VwsPwDLD_!wx^Q4{wa<B!=PTQ&B@*^Ltqfd2zn~KnnsE
z4bU0!BK3wk0kORb=OPa>!!df4eimT+lD5kC4frJXxjX127Q5$y{t|1=;{W(W-DZzU
z4D=L11YP*_hf>-Yq<D*j0W20sPxQl~vY%D~l;!PkKY3r8AhhdKN21i|Quk_b<lqsb
zH+x(iy@`2X%Xl0G=P=y`=_3`s)54Ny;I`hJ=+lHN1?mBOiiLwj!uW&LZ^sGS2l$Tt
z4tJh1I%*8PyD(ZmeIWS7lwL9Zz#Fw=6puaqR~-X=0ZA;9DUNk;l(GvxJc!KwCMfLj
z5B`i-ND>Ec!d(Rf5iw1IfOBzacmB&5Ng7@T@pw&iY`|6(5pp?DDFZNP{RA84wRV*+
zz}8m-9DE^<IG^`A3>mQnoV)GGhQZTYoqP+9O`v)6wD!Kyz!vq6hsliiy9>}wVFN|I
z1j^sPR9S@^S_+bRiZji<@PHlA=1%~dk=v#JrVA{eMrqKG1)q`o$xlWkxlb!vMEoaB
zm@wCgdSVPtjJW+R7mY-K&=82d8e~K*+vm(3>LDye!v>22zla@C6Gr^<TG{TwJ+Q3I
zjI84hS~gqbvvu3%A+hxkX@X(RYViu;tzNqyHeXJrvwpJmBU5cn$iD`>QAPEgCXe&;
zCFGr2g&!v%+Ob2&Qhil+SIRVpC;fKe8K!C|zZFlWwR3lF-0h~)+f;kVZoc*t6j_ko
z1QM&iCV;q-4+1ROgKAi#jAAGHmCYVRg1^G-H2?IL*n#t_r2W|f8a%5tDl|=%32lg7
zJJ9g2+1X<k$OIGQ_UDKKd%QG#%!0F}5)`KUjAY9jCt!3id(^x0X1*TiwIf{@hcw{u
zp@U{CS5jc1ww53cja|q@BZp($(DLaT2Xv30C>K)DPYg>Rj4Fk}*%9LQ4(aac-0PvX
zO{cl}I#GCkgN+Lb)H@8sc(vPR;nGdYpxvzDkbZAaHzJsyd?u0#O}`l@;3@~2$_mBo
zuau5~P7?4vr6+%{_$t)ntE&eRKvFHGGmYL(Aa2WyM|i(y_x;+{R9&w9et00);pxEH
zwf*_nNUPa)2cY%T=v6<)HmS(z($n+9b7k{0KAY~8&mGj%r^oEMeST+$WBak(ck#?-
zU&z)UYdpmAfKTVpzY8tEe|S^1bWs%h+`}n0WmRRw<5$RoMNTbE4k~bpV@ab+e6F`!
z4XV?!b=;^&uc9B%9u-XbBe;pC*+4o~nnG#-oY8L54>E(P>@Q2yD02ED-+B9vjg||<
zcM#a<xNpmy^2c@NYbIQi%d)%RXYWDT9&_P<Ll<+O2yaEHw2wzikr2VLl_w8S8ICXa
zxdTb^dwb@{?uiSos1Yw|tU0<$?n^7v+sCTk`ymx?rv6NQvRI{wTRg_3xGx`MjM$yc
zwz#}c*q5wUob?AOWaAo=u+;gL^BJ0g>+X1nz~qf&EIy3~%PZw#JQB^2l;FS?Ga)V8
zWEwYMb${n^`2!t4<GG||&s#%9^oQ|TPHvmx6LD!XO?R{Fk;mfrf^PWjDs+uL3#9A{
zpnA)u#qlZ_taoI}4=`$9hYMY@=M78nwLJx|@Z=10Pjj!u3^iKVg2?2w5J}=4j|VdF
z;ns3c31u0%YipX)N)a{+HhPYd0RrKUAJrP6T)vBkfabiD(}4nVf<Wc3nlz9tHOU}p
zd*CI){HnDJt<lH;a;RBgT^#*j^C(^3_ir)l#53zT!lE<#8gVCiM}Te${v^L<h({?N
z#V3ZDVfC}xkM_|2;C5+6cY%j%WA5Pv{{kt*Ik4)y5CSWai)E%&7E@h<C{c79JU<0~
z|3tK1j05{ahm74w#R_vF$Yw_qQ&5j2vuL`eCwb>>uSe`?==?<%?Xz^nH^9f_R>b&u
z)Gir@iUP16Fbu@b+o17SBq-8}9|8z073Sk6SgyNB>@3A!*Q?R7S{{9^>Y6Z*T}q6u
zy0;1C&Qph}dCJCI2un)rbjozbA>E@8*&uI!#GB&qfcfc;lQGw+t6l8hsog1fpQJCG
zo0i~2ZOpj7@NO~heAujK3a7<0+<jR$*#o+$)WmGVUBbtrQ9LOuZ7QZhu$0sv(oVu5
zM_KpRrf?XjfucVg%-CD_$<pyobAgHiFH*CDtmZ3c`4Z$c>;a$-OrJVE3;Io|2nq=B
zZZLJ?U-EjG9M|4bbeaI97+L-nvv=atdC@67pC@Z_H){*`%c?uE5kC}5JN8@so;f#}
zdz&AR-P+-Qo2>`&O>jT02OU=wb!lwP;}fq6L}S%1&6D<psng}M-Pb^%(y5%S-%bUj
zsyJ5Gq$h4)k72Br1)ZEN`dcWLl3F+EB8(bCi2`2zY*JW>7@6kOC#If{O^-EcJ+fhl
zFk|x&i7{qDQ#F=@+!kf^>L88@)Pdhh8-w6AbFfb@J(2FGj>mN;HE$m)>t{1@ebpKt
z7kYF~a6CDylX#tmgc2^Wb2#cPp61B0dp?e4^jWrEJ|FBe)FV50^}2~4gsi|Gajzu0
z4=(At3zqtE;lVi$>7v0W^zCZw>GQ*E36Yt$-A%@elOA_=z1=PhWxWQ#L1%3jd#KOw
z-q&H?x7_e9OkA*E28EzTq0db)7UVtK)GD#v6+VFXToU0M)LnRz(X*?9JPg(4oHIVP
z>GsQJ3Uh1WYr=eSq+-al12zuyJI`mPC~na>a9uLiMmd!6p-Y!TA&_R5ck#-sEQDSO
zZm0g)uK65lZ~NRdzNBFAAaJM~X0u;Nsj3^kZWK)ilW*&8ZQI*^<l?&0_(Ps_x4)R~
z2-Nl1xI1EQwK-~PschK$UJg#=Bd9Evv2Ef2-X%$cD4-pS-tAnHpwI0A?B8;APR_8`
zZPf>8<8M^SbB=*6BK>J4eg;PSK-(_yEw=SL`Rox0e=Tac_B=gZDA+4*UWOGVPuyQV
z(+Bu^p9E&#{OjrAUu!$Jo{?<kUW_YAw|?2CAA<NcGT6v#ioe*+AiEV_NkKh@G1D5l
z(B|HGobb_~=0=P|GI{f@Z<q?&n>A?O01nj_Gd7PMWYHK-$gBlEA$OfOlJ~kAhK^Te
zY32!hybv<v-cybDwM<>4Yhp|Nd-a1jVYUz!^X6>l0j&4lq=T28yao|r0gNavyUq{%
z9Ntch-?37nH{}wvGBy!W_QFwUE(?thbL2iKBif8RzWbDP2!mF*Z1Cd0fAIQO={GVZ
z=oBh6m%)D9O1nQ>j#U~Ag*S&*`TR$&l*-7k4H6q(S_AZ?FFHo2-7re0=hihu_8a$F
zE3bxAf{*jPWr&)$V0drW24(LY^;&-GK%NYRe`uN(J^NGFLxBS>D2Sd1F%5U(psC=p
zZEP^bSdU+7ixFN*ASR|=sliaE0G=<bYmCFm<S}8Gq2Hr3hI^MHJcysA=*Wd}Bz|Pi
zS}IS?w8G17%`)WlZW)uhS`_r@c}cS-^RXl#F4t~_R@D_J)T`qDn~JwZlBG?BiPlQ8
zB{dR^$B`)CF;b+*l<~~^7!yI|ACe1V@;2HcSH|i`lzs?YSWUxurMbzV6%>U<<R%uC
zE2jV~)2dNQt^Uh4PaKw-><-d#zuOtInOpaPpq_4&o%OET2{G%3k`9vUU0Yk+!xUSE
z0tzWGm8U?4R&pi-=QP5pUnAwH{FVRsz1u$(+Qd(N!_}e@bFNEsvMkLT74mYaR5KdA
zzTyj|z!qH(V|Zu2kK5xY_Gv@K?-;HFNAC|8u$msROe78${Uz0$viIz{M&OqXNwQ#A
zafQvU)$ENW9#aHvC_`_3`W>UEo5LBb0T?*Vu%+uT5pIt6Xs|yj0(CNYOmOwNfO*$=
z9)5Tm)f~h}3oR_t0bz|S^)S)Zg)_s)L$9;^<pX4_M1!+sY|P9#X=oVtcYI4kFrN*K
zR!WTW2Bi?L_NX*PBS8`j?z&M*T3t7ve0Do5_|Q-0vC?anD4=1&Q$3n{8oK=Kzoqb%
z3!|!ZNZ0VLK3?UB6q6A?D`7XuTa`XP;$1qLTFl8c@t|0-Bljm#G3ni}Rr;ln&*jZ!
zNLc2pVZD#UaQh<O1CjWRj{H=Y_dDG(cSrB5$K&MT-dRv~*)Wud=koA7W+Lyki`KNb
zZW6kVRy6D~Z*|xQvm)V51O~A@P6?Z}oh?$0Bu(tPBW|Gd&3z~^;UKoyo1h}{iOMV8
zE{|Be9bZX{?Rp{9rG-Zwva<3oogqg>x@2^zS17!YIXmEqh`c+eqPG1r%53kYzs?qu
z?7DUBLC=nlD2Le}aP_At=+#}%>AqEJdx2Ce{A8uYJtZY)FOR#vu6$pI**uR^JXqBQ
zvb^B%`|Tq71rRVf5b^TZpfE7@WhDB?+6yBz2J=J?IK5#BAQbU6zcqv|%s_!<FI!%p
zC~`GDLwjg3rylzP^?8szETrkYeP&YZN-4Qunxvjg*Ckxq0SDe6>xTzm+T<DZDb8j)
zP-iN`n=GfLUH6ynS<xRUU%u!2AZ4doyTdee{m15x&qkppb=gLBD{VlBfZ(XhQm#M>
zwtha4CwN$F<Dv0OlNeR^^xJj@>mqk8;$hYGtN3BNc6MTVa^hXsRh%v;b&-FOqM@YW
zYTEhXF0)8)BEch=e8jVe;6+7GA4~b%FDoZ7wp;VJCl`^VX5qYA-9|(Ea_H`Y6C><a
z1$;SA5#YzLYjsDPI(wtfQ9<;Vg}8hlm<I<QhX*J2QFIQ<t0tmrVo4`Xg^&cyD@xi)
zSu3q&*c2j5otj%s7}81k9@&%-==PvMbW4u3jd_ZLY3s!0KolM4gtw?Tly#f8Eh38K
zY>{1Gcoa&kpO#|4k2~Gku5)tohPSUh!EqDnqKwdYQGA-@lG?yh4ILoK_YPh<ET>2E
z**I$RpdS+Uulo+ip?EFiVkT?5-T1DbM=>*0DwaAXKmK{y`Uxc=pQbV1&przq8!a46
z;3>}&4X~~G`g#<^`#50LX;0>KrtLga`eO`k5n%AvSdR^+SiJZ=%W)@nYn5a}aT_)J
z_vXOazW!DEjMe&uoj7GkaH`a&O&qadnVV}ur=(VT5}2^=j0)xv##omsD!C?lcSPu|
z`9=R=0yr1v8L}w^QO<rYa_EulQoew*^O)B&LU>#|9;ys)XLMBqLVWC#;W|A8uhG2?
z-^$6#FlkMhcQ#XSJKKjsYRsbYy)O0QDokh{NX53KVxH+7Dc{5#77H2~pA2M9;%M1h
zlUAkQU@Spkb2I^Xz0U|xbk|%&q=Jyc<&xLNpSgY>qwR?5t%k<$pIM{)kNOuh&#NUv
z`*yWD23ym8S%#fMn|o&mNJX>CRy^%6t&`J<FW6a|D$$p9+|t`d-FAfBc4*KJ#%n3+
zFjSdeC^eA`wA4u^j>kfWTX9Y|8fqX!dZ^HL*6VO-Q2k{}T;0j%#%yx>%pm`nb6=G<
zs6RD7hH(V2GwD=)y~*5CWHp=~C9?<Wqh|+iSx2ZYEwmptxkOpA{-|k9fDF~9*#vU-
zd>|apHrX+IU&i>NgFyy8N|=Rt;kctm-JyNshW5GMcHQ7#TQY_kut*K~n5!(X#6!hm
zf-sqr;?;+Tab9CWK{^dzH3pZ!ow0vm^<+f{$BlfM45_u^_cwNb>n@rVm|HiL7gEM8
zHDrX;ATR5tdY%(^*I?UK71-nP4ECk_3gS#Q31FbS;oohK>gzw^?e(IA6DM@<GGfzj
z5nso>AoET5c+7?D#(5<3WzUpX8Z(8Y;MD?AmC<b+H@8)Vb3(6#ye9z$N(Nt1S>%oz
z1Exe7M>?)nY!F|&UoVBN(CPYIt+M+t9+bC1qc!VtCR}6Ie{-E~EV?;JGCyj!+hBOn
z=&;4%<+N;?G;6bG_;BQb#Q|pK$?kFNQ^!5tK$U646Dmug{2ijE6Jq0dz;r$zgO|9N
zP+S=SAaUF!(M!@7P8{UiT(8f~(Mmzp)op8!jE$hwD*<&%Vzuf6E~koEZ4cOuqOUO@
z-vkw_$)vm)S(-DHfh8|tTQEF72a^ljcVAhXe7g}C3$##3T8I)1W6`?gr*HEg84Cw(
zn$<~<;nD~cB~!Adv4kX|?tezI{kNkcKZ+xXH+tX#`^4ZFCbSvJT(jCVhlRt`;PIG0
zCIo&$$Mnabjp1`Wtm$a2A}BsDV!ei<%}UVume1*Fx2^z4*AWK@*D2sMh3p>deS43<
z15dhZIy^1dME=4FseHZ-zF!L1?Pwk#ks@Svdv&>=N<2DcHj8v#xQV}{JBTW)XkUTW
zMseyw%LaNw1_~-Jg!IcBGxGb=$UjL4P%qMzRxz;-nD}xPa6;8mA>Qf<OJDmuqQ86f
zr1g*1<Y%B9Hny%kI?C#w^EFU`Nsy~qpcsl$QjpOBE>-^2ueFu<$Ey<VZ4Ea4*?}cZ
z{GI31?2d`%<*U`Be>jP}pr6}W8&Ry}4fi=4TX&Ozw)GyA9|dhMW3AITOdNk=vj+J8
ziTNy3(scJ~Q3Ne9j5u<K=VwSbwUcRQP3b$LfLO_Pah3#n&i@;aHF14=bldGcTHNd5
zCXd<b{#xvy=TYV}*q%kKk{5H`A+5Zs<kPM<+D?X#!R6t4GtzlZq#WVxyl8{WO1Fh_
zG0%63H;Na0{HfQL?HIE9D|~BmiXt)Gw#Wp)%!UlRl4{?<l*W^gYDt)TD|S~`8pMkr
z9{R8(hh0!6^-o$*FZ<}><Q=L3>f=@Y9w}D9zn!3BrvggFef4koAFdX~lQ}>s(sCAb
z@Fx1UJm;_DD4`IWcFTcD?Bu4cZsUd7ybJa@Qxh#$8Ow*Il|Evj;7yN{cg__ZX48XX
zSk}ELZ1$=5mCPqsf7`Qe;}!PlR<IKk!S)6$5B4%hcs9WPEDezU%EP}X$7g^r{E_1B
zX*p|*|K?VWDiybUQx=A)6y7*-9c>`bCBJ>epP+>3_<rzti^&PZ<-DYB{JUGfxK5?m
zzjM1^)~dN(p-YH71J^@sU$Q!Q4IP|=(F(r*T27D+ZTix-Fc^9@wn`7Rrtzd?vj$(4
z!7=8ABP+AMteN&x))hVsKobvjXN|n-;CH+xt(G0e>lFG+!*B4o75IQ+swhMY@;mch
zQ(#Yv3;K80CM-qz5lqW@Ve7LY<e<CCk#*&!1S3+X0T~>nz*tz8(6eNYCL-5U(-R(|
zrgvgZ5G(oE?YssYJTFy!EDdbja6g^XZ>QhC!fu#oJzOTZR`KyTI86lS-={rfAxA%V
zTfO-qDjzg!J$xn>)3*F!yNep5EgJZUUTxkFJA-}M{_(ea$ZfY1YJ0lp1ul6Wdh;R7
zLXo3JyIy!Yz+&x%^G7r@0)Y843Wgme32vL8EXOmH+NBH)glhZq&HbUA$>udbh&XUj
zlmD$rCe!&Od3HEBXE+jt?>$rqY4}>9;i@drEEOYuqTp#lyq!JJ<F0{7;qa52t2oX-
zA2zwlu+D5)ergny(ktOFn{F#_Jlbn4KJ&O-xQU};rMuqZTGP)j>u%FFVm#GsjQvD{
zJ1?^y2))$4>M!3m815UOF-1{e3#W8MehD;=4&EWS5q!`R(}o+E!w23k>QVc!r1;a|
zy7i68tmFAOm&5mBrfK<xN<1RB#c4jTyivmUygffc{KDsT7uN9j1^eS|`14cgcF=zD
zqO00+bB0@!w5`=?HMiG0ENH_G6~w$R`=*VOuXR7wsy#G$6;`b8ML|r%K5&pQW-G}Q
zBge&RJRMK}@I=s%2or#%fn}1^%i=R!M6WSLZ=kD%P!S!Y8#!CVn0*~LMxxsqm|HK@
z+eJ5Y^!L&Mx3&UXy*Oa$#>CX!f!V>(96!(%OsY|dmGJ7o#5~7sS*(^u>tRB-smj_0
ze&_iWSabP=Z4!HF^*Pk;IK7Sf_>5G{)9mY%+qSp>P0RNtaW9C=&@l^3$SQ$MipDxc
z^pPIhnM0;2dWo3J=t*RgU)S%Q*mPQ0<w18k+d2SP-A<2jOEyOf=|_1gCAQ&j9S6$F
zfa66cKtR}#673A6k)Xl9Xpdmg$_N<bmh2!)Sz#Rst_#8TOp`cqRQJCgp%1=j`*%zZ
ztSNr#pt+}c%azDRBK#-=(O69IiF>pGI!u#tz&!KXHIuAmM0)!~dWS^v^W5ASkODtG
zT@#Yy^$`sbo}dv>4-WDu^;YWT6ly+ND4PNq9!Qh_bP}a1X6+!YTYLsd09|;YYva0C
z-p);PZnQt%BazoamaEJ=_QKK*BsV@_DLmuD`kJRd@bl%o<oH%^pE5r9#2DS)GDP~V
zX&aWGN`Bt<z|E}B6dN=4CYa7TTeW>oN=~HJ_ZSi(BZ?kE;EA!{hZGFJ4Zx5k=Lvj5
zd=#juD-Odzi(~(2bTxBN;f5G$FR3NMK~X2RJ*<4NZ+{<4!AE2G8b8HK91JP+tTo;(
zt=M!tBx$P#hiJPmrF#s!YPw}>?{nDcwKCmxqK*gto<5jLi~u84CV@LtB#}uAn23r3
z`;auv!?G#`<8t~U&tbTs=E*sJNlpil?P=X#cO#!TNow>i6!=6sSO{?Hu`1>W+{wVg
z&|xE1L~?V?7RRwTx&n1p_sRUEd?^DlM`lSg4qSqy7@y(#>Fh?9H@?Pan@zTr9W#js
z*h(yv1z^b$Pct`6T4}76RJJNNKCV^T9o-Cn3gw*lIA&tE&e!Pd3tN>rgTH5AZ`H`p
zsZ~x+rFbI>mbs_p<cR|VT(W2PgNG05H5a5sdAI^k%`T)FLu%{&afd18%9oGn5)=_d
zdF`KIUu-?<t?vy{QKy(QR$MFHy*?g~dG<&3Z5LbUeZ1@?)USp~*{8c|)=xE5e7C@!
z{;Uz61-fb7A@htKZ61)^WpaOebS==Cz4>CuADIHM1BBS%0TWO7>V9aRO+H-Urd-vS
z*u&v<Sd!s6z`~nfIzz!g)Rtx?3^m6R8YpzYNIdzvgQmE|D>_cqH^vyXQ4$W7cu&UI
za$T}jjP))I<J}6+Y`rQ5@k&Ce=hJY$=FNH;TeX~m$Bs27j2teE6{bMab143k1(U>g
z1YNER+Zx}caZEF1I84g=M0D&bw%~N&zkPyYa`~6j1`RWTwpIx&$ie*FQ)|6@*z<L;
z@dJ?*v-6TFZ^0L}y6yEG;!7DZ&C@&c3MtE|sui^#H?fsY;R=D}Itc$RQ2v1G?^vv1
zGvoI{yhs_nzvP*6_eCqiJbZvK>f0auie8(pPzd5-MP~GeJO4Y?V>Y#hLJf7kY*U5F
zUCsC?o-tvVH=SAko$TD{k5!J={K##;k?DtWLyE&TmFU}M3C^x5U%=SOeftH6568@*
zJ`*Ni=83()1LDwMR$r_{D^IyfUE7e&j*$}7$klt7!oeoI6MSKux`3Pmm-rzn2D|Y}
z3i`PZHB!+#{+Ah*i1dS%glS=^Ydw#JWE+=aPS!4SiDK_dh^ASWlbUQ_y9cSBPT!;P
z^oc-b@a&JF?-rl${_l|(oNS&KaXGeizfrPN1n4Dn4A`ef(8jrbkMD`K2BbWphSS-h
zSuk3u{T?Q4iy`0a!=@5AB`c9bneGX^f=KAvLQD`eUa<fw;#k!}4b}$DzD%vcEiR>b
zD5_Iuli7&(4G0fT2rs>AKokX~;{6Ds=2H^nZ$jC}AaGY)6N48e;jpNb_Q;gQyT1`|
zBqHgn7}Ks?RUB)bTBgy=<lGU?Ty`CmaMa_>6;V$`=Fd|K>OtFnps|4E7{IlT7fkO;
z2nHpeTD_m^k|OM%_99SeV#{Ba4=P+rIG**6ISg?=5N#dkbcHv6DAGJ4-kXkBGRPx>
z+INGa;(AJIqBdz|I%*&Cn%D>E)@#jaPubgQ?A}B2&`emo1Pb&a)%z%0DZ>2QN=F^#
z<2n$s#+nqkFm7>0kdmAOPnVJ`%e?^&oU@pcG<k^O=49m2Z)oh3AL*uNCZ0)YHl4<T
zT)ESMC;6Rqc{cAS2j_KymJEw0yKU$0>lqC#2|CD;tbCg3v=Vh$_Rrg(Gr%U(Im+(|
zO`u7b5+CLXg%1JeV_*nMI7uCFTHUxQ{+jrsRsa+bLU0wx8kWU@K>q8jjmD5)!-%}7
z)LTxoHGGthm&Q#ucPc>~z;xz1Q1W6t*N}d9LbMH{VXMBdp1<RM6wS)slKUZkS*Unf
zXi4R_T_m1JLP0q^B1EI1Jyo5pvBf9xrXTeG*U8_#bJbX63C4!*V6FX>X<~$IZPgee
z2&DtEvmOSkO0TZK=dm_8F(TLbzAVB{tJM|Mofb|Ds?pqKvVZ#2qza?MRb;#$)s^(=
zOe;kcQ+O=%kETFs2;VKT3VmYKP2StMbWXF8>lCuu@Vl9y*%6qqLV%s1%Rjv(i|Fv!
zj*2VVey-!8^k#`)IZ6%IN59TQkk>qQV%npMr#?072}&ksJlZ2KRxT1RJED`#_Cd{M
z_2OO~zsBb)MR8>s;-Nt&08{OVwW>X-HH0l*fDRts)Y%J9-fa@oJ}5dUj6D}hc<uKO
zD>1akRb<dy=-+*Y^~g&*>-4q3i?7wNe7C9`!nfQ62IE(;BL*fr#hhu!vgtpR#(6>k
zZUVb)FP<DfC|Naltp7q_AmI%LokmWi+GSKrWLEU-R$)~FmP{JBuRKi73kb?4X!Zt!
z6&Q$|+%~zL?8eoXzb&E;>e+)oPjMDPp}UIgTGvYnCJA_F!vre@{|=g;&x$OKJ-mh)
zcM;vL77fMk)wR;lvB`uC=uK1E?<Rk2;i&?g6hnuOCGhZ=72v-w|7kK^Iz4lI{$_ph
z3h8EfJ!kh?Ae+Jat@ma}F;A0$!oY*~mX@aB3)|9YSPODd5zz7LuN36Y2t{#vcdilG
ziS=EX9QS8ksZ<4p7;`>6T)n-Si<^abl&56*!<L<C1n+mqe-(bWKi?;<JdV?|@Z@ST
z7g#Md1%U>Ey$g?{CfRu9<r67A^&%&s9tBL}%CwP5Xex5Ypw=lzLB&Ai>haSqM1l!a
zIVgNBxCahFN1cw;@6)wl$EzU6kfyZ*w7KDwO*jmC;Hk9N>p)X07>)<QoFiFrxqcNb
z=dTn*a)!nnHe3VxbSG0_?K6@|oa&3nmW-t)Ts?9&Rg0XV6$~6gsL7l%#C{T4a|)nU
z9rdkO`+t1v+H^VJ^><7^mzP)K%j3OiTAX#g6*#v{YMWJ7)|8%ZkvrMAjW?B^khPex
zc^Rde%PP#sR__gxqERtGjF}$hN9dVw+C&!cq^Ma#*EAVMfv#5I6MByx3-9I#{n%gQ
z913?AIuT*4;3vQQeFrPTrkE^<5&s~<?KjGQ6S~Yauw`QWvmJ!Ry+bQ*&`UD<7g1=}
zp^;vQCcVbl#4G|I&{p5QuOG;#bSXHwoc(b*4OvS-_<#r3SQ<QdKFC-Vt^&vI=~O}}
z=fg|?#W70LwT(<VhVUii&qv-%o=pf&2sRbMoG%8?$KR=^_K3yc5fUZS3*{&}MD@5=
zcZF?ai}zRIo}4n5f{9ZD<08oMt<=Iz!aez{Sv1=7=*s9ERblUHRJVd{i9a0}IXQT3
z`f9CYV+mL89v;pfU;%yRdV5~Q<LdT`n>#Y8$eDsX(_TBSr`V8=`|F;*&MBCr)09ze
zX{1U`Y$WDZto7XNd2@lXC1T}gPcj}#TWB>y6|xh14C#*T<=25@&Z1Axu!h(tSJvX0
zIptN@=b9tV83m<N3QOibOmu(J&zK5|Cs6VisJUF~!%X|_Ts*q;iy>ix$$(WYY<f0w
zQZg1~s?t1_EW<!hHTU!G!;o#NN?b{$xr4|qBz1kd{~nB;-x^1fV+Jrj&qpW#)0JJ0
zHEU7FL^2hyW-;f*PX<DYF&x|y-Mf9Vm=KkU^QNV7kPn9d_Y)3>M4qTyOL)nWu#wW<
zRWs#oj3M9HA4{c50foM@=+iNt#{Nlo{ey8+=jfFAl3Hv6RGQKb06y%#ey5XkwmE87
ziBJGNKq^gvNdY6BsYvukJUgXyihA6Zb+0ed8{^^Bcq*1kuu%)84sGy~+^~s8H*@Hb
zr$McsrXy`CIxx(|wC?&tf@Q-%l#7T<$xnol1Z^kLSSA6(PohR=OTy(irsb}ogb>p{
zb!^5Uv(kb^e(h_My@63iW=qyLhl7wM6ZM!B7qA3AvxxgO^EFK|x(X^y=gt$<o2ik>
zVpb9yMltW};5<;D$~CVeR^bnzLYk+r((F;~x$3)d8Nm|yn5kOQ{DyBFNb%oHb7ju~
z>%IC31N2aHWSa2&vtcvcM7Own`4d6IoHOU+R)@+nGGcT+?|6U>#VoHVsryS5F+F6G
z_oZyv0kUazxy#TWuwd$hO6mE;q(Dk;+-(@KX66lZ$9452ed%tA^0Hx2T$kc>OQn6!
zOmnYn^G->Ww&seXxKycv>_zh<reV`9vSoMXSl0WlHxA_xp&BMp|Id<4yLuvo=E6)T
zf5}#mFhfVv&a8-6NJJO(=4Hm1KE2td{5&IXB=r#Cer%F_GeoC5&ks-2w?Ef8z1x(k
z3G4qCQyi@0Z4iv9R+a2EyncywN!q$py~kEIG(3bUJH5b?CG&AHT5B#IIAa^rCgF-8
zVMTG(XY5h+rCd^19SF-)EvB0?Y`esIfb0OPR3bfu>(P4EK+phH2Jj%_0~q=!_~|E)
zK@fu5=?MsIqaTBHI}}3TNi<*nZS({^u?-4wzkL^<mG+>@XI@Bv*#oo5APOYk?{TA%
za-b)IdbQRFWGvCny0>zp$>X<eP?w#R703=0^(tbP(-W*JQqO3ydJ*<pe$Wx`Ggry_
z%<X%8^L(&D#=Gn1KelN$Jx%|4VBO_u@Mz7V^(#AXxzR`$4{2EN{;y#KTl(Cs?T25b
z@6re8sutni_7<US%DIU9`_86@$c}NUE@o$txgPT|N$aM?80O$^htQ@|`zE2*LJQ%v
zqs!zo`BG>wvHLmYnELv4(t+h9#g*#pa(sSzk{QJ#i5e?mdWt$dqru~LAcitz8Z()`
z%82VLN4JT^mDQ%?iN&>4s%a(6D-ER~hEI|-l-eejsZ^vK*G}n{EMJD(VYlR_=W_kz
z?V_Kc+XR!96I|P6mPu+U#Y{zQo~qmiS#4H=)H2P<9SNz8VE~j^)_tuYkeB1jbO$}b
zpCYl{Y1&m>8<OXoLQcC+Tu^IV`M%qt`)*A$iV}mMTA>?D1@R-t(o7BeAq=${Y<7p!
zt|ZziF?QlQw%tnN(d#%0O*(`f^MO`rJrgRzWrUS>fIOFXO%Pev1l}+qj-BHD5(@k_
ztzUvG)V-5L?!n|%65oBvdP&f)1<SI(ETCi5b0fHS_bRz$0C_-7KAMW7J^t8{g6LmJ
zhiG=v!`c-y?W>hGiE`3OOJBmryuWNT@XE`dyd>Jut?OrvylUH@%h(qgVgL+KQj|f}
zh?Vi<GX-j+NRijg^Tx<R=QDH5Z>_$4@SOI>vQeYTn#Q)xqJIbS>0uDcuehQ-z1Vw&
zxqRqA?;o7ioq^I7{cA>Dv2MbUS;MO9`VJeuxc$NoX~_qF-?M$h(y`S;e73wISIAH_
zxNc_kb1!MVJxBBN*M3q$zS9mPsKHxFc7rJ8f}rD7ImvG-Iw?xMeg<F#Fd(xk8NE)_
z&sA&IwCKicG}k(v(5e^(u4y!)mjBo&6tE_3s8Q8XzHlj56b4oqxgj>}5+iU2@&frx
z_4X>tFA0>O&ynGB*wT%Dlb@?#bFvrsqerua_Go~DZtv-kcKkg01;?e&YscxYN9*02
z{3m)Cga@P5rk*)b`X|4cK>xnv(u6ds<ToUdzl{6@>Z>CSQR?^83`oz!Pa1&4_vQPI
zhG3z;cYg2eEY@(;YBA&)^PF~5qJa^A{6zd0(HKl#k5oUS24sFZ&C_@faE<4k(crqQ
zWFnCRAnF;_yS=T`$N8Sc7Zn1^I;~7eqoFKwY&x66RIycO6u23S^8JsEV&%QsP@`%9
zqkNAe6&}-4hh1U>l0GX~ly2$MoAnFN_vaw-T@FiOdLbH6GYd8(8BoWMZvf#Ib;ypF
zd7$Y~&%1!Ob-~*_>~!g!i0*@#ovI^MkfwEN2!P&@k7O<Z#l$-`#NRNQVx1bQh>n;|
zIx}xd#QP!77@x*6G-{JT9<gdghhg^kbTFBeR-;8wyRfU9F!(1ACq`qFb`MLmk^7*y
zbE4hmr;f#aDJboSZVIU=?^jh?)w{T;z@MA#bNBW1jkzw?9$l9o-=}Z6ufDWbegXP1
zt7nwm#Qm6&J#N?WM5q0N>k=C#Y5S$t%;Jub)3F^>bonSCB_J8J9gDu9H;8d9B@?4T
zHqI4H0y{a(>TGB5a4hrbW{*z;gF$N5n+1-jVp{6bgOJuu+DNks#ZXolRKv@4%)!!z
zUup#INg>-4NU<kzC}-&r%Kf<Z5@#m|JSX?K9bJot&;RC<$}GAkyLddMgjACK+Mf7v
z3-WLailciHe<NW}%A#2xURJ3SQW31nzOd-WkB&(}<Zz&GAD7c)Ebrf^vTtRtU_m~T
z*y}8Dl|*w$mL76QKTcoa?|<2_Ve!H{zw0%iqP{A$rf0*PoLM@5+a;(g5+~AjpR|k=
zA-4}C+rmy;nxGaYqxqE!as|T6Yh0{l3M(2hA$dWbuLo9btTs`w7*XwzR-HL|zORIs
zWH2?d%L%)B?j^2n3<pd51%sR~2bK;D_6_ze;guxb3}#4qad8n8rKjpC!%k1+K)eYC
zJMm)yP!FyEqny?>xNP%%FZ^=tLt|$*ZF>5tS?zZ&d1NFl5!cM0F|%p&!j8&;n}mL1
zc}3MgdiQ06M~)g3a_-u>yF-y0ZZ3Iu@~l}KPd;+To%f9W+xVu2>5al~u3db?Tw1(*
z_OuxjMvhSHiK&yHEiGg@F$ai3mQ#?#Y>=fq6S^f`b7Hf5%!%dZ_`Iw{Qjtg@6n4#t
z6$#yXw5aJYMQGQG*21U$)}>*~#`|4~Wo-9(!Gr20sejAm%7AEXo7M-PW92LoAoqtY
z3=wDIQhcnJhE_b-m%S;Xlf4eH5Rqh^q}lgazYG>Zj$^9c(PSEW<?#_IFK!IyWM?xh
zn;pmwuneKgiAXlfl*N&(DLI(Xb03riQ3Tu4V?&fg1lv<@lsG-~Jd=E9*ur+qi}c7$
zphq8~k;8B)a_FPvD2~S{3_VaoAEkyjE6Zre%FoKr%gJ!Fa(jc%=yTeQNwJF_=>T6x
zOIlC%Ob4ylwPz|M@<keA_#nAAY*jHMQxdr#DlyJrz)vC|A!q1O`1P_z3Y{+6Jc%vT
z5XF4G6M`b~5h*Wj3}^cN=@x&`A1n+o{eW06FFg;jo~awwgPtiOC1E@`d<nWFqP(7I
zBWbizF+(pz+xLf!MX0ocAnBr=MEaP)Kop%pnadK8aU-wSM?DL+W>eI>_tr9%ED{qN
znfhWhI>p7zuossWm-a0w4ERxbx_fzg#m#zJ&k>p)=_JleHs`x~rc-x&-XpQ1{b2mu
zmbZn|nIciMnu^*dfDtQGg7|sG8C}}Kc#<=p35{XwJo)J`Ixdy`Oiq2a#QMXWh(;SP
z1e1EiMCZ%$BGba@O#0P~XTp5Fq}y~8+Z!Y#MVk}a8yE}*yTRT=UNku?`gClXXVhp^
z(j-YDU0GgaX4s}mr<xH}q*z0nOd+bcqpg9Oqq)&2Wn)>>*e8wQG>gUJv3M?-IPI1;
zT^^rwJQUew;-WThi<UcR3!Bu8sUl0!N_8*Gn#LuDb=uKIn@)L>ld7>#8p9r*SIu?j
z{-5%ysj{j|W9#U~=zmCDjMhU%$>q=8stFI)@m5T%F2tJ7IK~KL6UwpUO;voEEPlqG
zc7=A|3tp|M3X@AuRS`cd8mw}&uz$S8iuPQKrZ4H=K{)n@(S{*gPPOi;8`F0Cji0ye
zhD!RkbE}uFT7JXAtDTSre+Bbw>EYY&eq?b)@8>U@e8)qJ=y5uZo}#}yvE#XUcW-&%
zwynJX3f~Jej|T65*$W0G+Kr}nf(vO%bOQ|rrIlr3o5!1tY9>~5YWnpwf?XR;a?Os9
z3ipZmn?K=l=KAxLZ_pi7HQrAuql0c;alS}hNp~i(S<dmqRM>^$uFZ2qZQuR8RwI{O
z|FW7WQRz^qBuku@kDSe0&I_%&C??2Hksa=G5gI^`n?a*2pF7u+i?GOLa-}FF6;n6l
ziD|u;yLaYEP=Ag~HR*}3mDPackR>mZgtZos)Js)!+)8w*{_aWTF4r`MU2d1r;LCL7
zxN{KlIE_wLhMJtNNwLPb%DgMZ8l$@N5-W_akJXk0$aSwolQ-IK#^6m9;Aucb&lAnM
zD6Gj(k&W(hQDfNc%S^ZA<z@za0faK%bT6-AO_BFWvC=NNpX*aCH$m%OYEz?YHuI{L
z5^`I20X8O!d{h{Dg4z@f7{vwnCtQv&KakHtM7@G6WQ~Z$@A3Zx2~NH5sT14Zq##PN
zEW0kn>ykzni&oE5LY8T4&T?dNgQTUmSqPf#v>}S&@>Ar%yIj;5&Sg}9Br5!r0@~DM
z=xVx}QV<{oSi7XWZz1nW)zT;Y45Ux3K2)Mz`H+)kR*Nd5JKM+#>CkPFWNDK67)OuG
z>a+P0n`9WeKFo$4hfF-_H7`7F?6C0I+Q=7T2QAV55TCEB9ba2Je%u85+KCgibwcfU
z{I7Nb(e%+CX_d6?|Bz#!-E)pzR&(s3SdKl=J;x4x9~`p<sk(Vd_`wky=$997Uubs1
z@X{gIt@!t~*QV2VLbY=jJpyJ%(g8CUwmn8KFshab_L(E#W8WTX-u?8XVYJK>?+x0-
zZATv2tMvwB_9L4&KJ!KYP~yG8{JJEI!r*VSmgUwbWj_j2UdS>S{Azu&>Cwef`YA3#
zdz+zJo=h*#?&q2EQdk~H*{dmTdFXGub!|$tJgFNv#c8BR>)N5wh}oU2D2>!V5@?i1
zdLof7i9`kDQWVmquvk4@!w%CigXPWO^#!@c+-?RdWgDw_(z!cjV)p9C=#oYXqP$~P
z?UkQNCQ>H$r!Ia<)t_v`SSdoYR*IlcO5zlzypW|~_|^JU#;%8pkUUOi>vFPrjYC0t
zK}uVfnn=mE?!PGrm1yZw5=+!*rRwrN<X39XvSN@F*0Zb_Sdn3rci3@<n0jXpMYCE5
zp*JRl?F&*}$6~_#Vq=mSFvN>0Qe1@8$yTiZJJRpVbocS}`6*UFOi8Y;R-mLi!MYoP
z9(tz<YOgO%_7?F@?!;p^iz4f-D@LO}tYLecQDo@eDm6=!Ac;v(_hzX!qan-ZbfjyN
zqf1VlrfwM)6P-gn_701R(7Cc6dWdN~Clx26y#jJg*eLTZ)oRa4wg0pRWqa%?nbdze
z;bUf<X2$zY`Z5X0%gHS86|lZl!6L2iWV|JKPn{<r-)QWi^`xHA#gp4E-F=erzPg7|
z-d`3r7vy?HS;;_S9bIQ`5~fi-I%d&%@lQMB<7^GiD4dVGe%=`N@fcJue_mD>{xx2L
ze^c&kR|Y=c^Zs^a<RAW=dZX3n%<Pa4Gb9J;VWSr$F#{Ai+L|&DJw##P*g$*0wO&nC
z7-NMp?4j5LlP~2@ZDGG^71Ml>+P^A#10zJo=i&GPvGW=RL;Sf=KR!Afy3{}tABH$P
zHj4FY$<>~liP$oJMul}@X3ZeY@h6A*%RLE4gA}p6%ElXm<_Lmx<F19}@cyLB1%dwa
z%o*@T&W{+_yO(RwyY`at&Ux>F^(Ememv&&t34&AH<DkxUyKbpw{8z|xOiM{7dm0FN
zfJOZjaNrJjodS9cxCP}*pPE2NL`f&IbJj|<`>9zkFh4|&?m@U;>@pI+ic=)zfW~kj
z-|zDQ2^RWG@=JVqzPy|)mSag*b4!_!nZ`*V*w}OOSW3yB4Ss7Zp`?J7hYrdISfkIN
z-1y6vUwZNRhN~Xm`V<}h+M*j*+}C(h*%a8>9=bxLTZRrFKD4@WfD<l*bcBKZw{N50
z{retzWb)B*<EA_%>;e6nJ7~`9Fz?kDUwiW<E}y)fO|8SrVU?EInI2KmjtuD3=$6`~
z3kjz*De9R4bd9ro-i)}Q8G079Xpvi2(W*)+b?bg+pli(=kh9VW@iUG&0{j$pM%U^_
zxE@Wrh{}zh{Z2CPXOqtHM9nsfudDYyDIFKT;(n;s{}1hj2#pC<(n<aQqTXVx|6fXv
zF|}`)><C`6pU?m2&&UzjA(5Z*JZxqMj)<Yy<FI+_iXGCCpEA}9ew%b8HlH2h0Wm1=
zC5rakmFRO@?7ZIz3~+=5oga2ot~xd<hyGVQ{sE-Zk3Ud*rgY%gL40iYXRgN{0dBAI
zdlV5mF3$z8rEINu0P>Hy-=?4c|Mnblf$SF#NM=5dG~x+6d9$*a{MkXc4hMTuPG*Ti
zT}h$(vcF>Wu`yZnG`yxR?6i3NFgWSagYNkHy4_cOI+LhA20nUUP{aT(QC43hGv04Z
z7Fg*>{taN2pZtJ+1EmMuhv`@N!teV9Js_3wb*Hh8AS~O9OIL3%ixLx$2|67ix-?yy
z(ZH#o#Hrxd9_hNR_eiAZoU0<&B30Ng^gstZ>!CNj%87H+t9*~@V2`*~3jCjYsI1xg
z=-M@pZG$~qw?Fyt!%sf`STy&~pSjLDQ}++|<&WSbt$Il(C^A={-VD|vBsZINl1_Xe
zuA$4**!?~HE)nf1s?-{NVy#2#is_6#JT>}^+=Pdz0*oRp;zp4sKeyIn0AVk^2d+6v
zzXW#+9LR*Xm(d;k=n#$>Nmhv)ByW5S?>~ZLoUC*02jHe(N?tnDM{AZr6Etx-t4A6<
zA|D{VNlSQ!9c0OYu2U~CLNO4dREx$2#<7RP=>$>7>KF_FMgivWXoq@i&}byBrf8?-
zU?G~DJl+I^bz(5{em=dSw`yidFi^=JXjO$T14y(V9qV4{M8m?YZ!`&4^(}p;Wb;Zv
zSh=wXMtt*|=UN|~zxpXJY@<^I0iLJr-e)&$-n7gK$~PU>{w3xY&Vpz1-$y>M`30%a
zQtatiy?)3KgZUXR;WU3Ht&?PtG2u}bqbQ0pdzPRq;BK!o>J5lkg<BQ&OjManWv@h@
z$sSB1PjI<V$!59K1CVa^01ubVZZj#F>~NP4LbiYnmm=c-IRcBQ2P)a)poG%n%U6H+
zh@xM8^L2=egh=Oa;D=|0)51Y|A6y-|3?43;Mel}d(}(uf(V0T^rcIHzHJyigzDa6A
z&a|;7hG?CdY*s<ZC}9V+q^1iy*bn)C;)f5=000000RR910t1$$SM*I^4?Oh%9|!;d
z0002pfXw9p0002x6U7w(0R9RD%?Jnp0RRX90ssI20001Z+GAj3VBkFbXEy@_2L}Vg
z|Nks!8Gs@v-~|APs0K}V+HI2|NCZ(3hG&;W4wGR)#2|)4Hp(KV#c~)84>4W7cHuP1
zW-*9d6*WE#qUK9>L6gC36pUi_pZEUthQ}>@%)FU5Z{Ezj&A(+J`0{%RU-8<JJ%DBC
z8{m%i2DT4y25PLY!4&#sTx*QHff2X>69At$aLcv&PNN=jsQ)RR6QpOZlDh66Qupx=
zVLjviPIuHBv(NL~E~X?E@v$DgbEws^_EqMcFy5J(9PKUjmNc|GBM*6pG2=DolF6@q
zTmwH*$~p6Q{qQ`yj(g-Ce1RRT`}9pYi(SZVusOE{UYOgl-&X*+vn|H2kUel>dbEg<
znM21cLChRdbpJa27S7`TeJrA6Pf~lEVEdn9XKASzQ}LdC>c8N#C`5Wa)J2&;f?Om!
zA{n^B&vP7RSI-Img4%qXX?W|;1ar&|v@VT>z7Ga^F5it5Ly<pcn+P~~+GAi~&_RMp
z3_T1_7!#O8m{u?yVS2+X!tBFb#XOIB5Ay@&KP+x6Wh}>7)mW2QH?VQA>9I{=`@pWp
zp26P0zJ~n}haATmj%S=UoGqMtINxxIab<8#;X1(efm?;!g}aS=2lp2qJ)Rn#1H1~n
zF1!`IOL)KVY48Q{HSjIr+r#&OpNn6MKZO61K$O57K`p^5!3#oBLMw#62?q(!6TT#3
zAyOl<PgF~Ej_4aPKd~uduf)Z~6T~NpUz1>w@RKN!*eA&Zgl3YfB)>_eNv)H5Bb_F_
zNJc^Cl*}ht5m_bKC9+54*yNn#dgPwSbI51Nuam!`Af(`;Fh}8tVw&PBr7g;Q%4y0w
zRD@J&R352%s7_G*rRJqJMeUioi+Z2>B@H=^GK~Y8N}4sA7qs-WW@$5Nt7*4sU(-?2
zDbu;6E2bNw`$}(>eu{yHA%o#5qY7gw;|3EBlO9tk(+y@EW-(?v%;n7METk+ZSTa~v
zS+QAlSlzI;us&rIX7k3j!}f<=mfaisRSs4T6CCzA{J{<#xf~@N)f`<M6CCRt=Q$p7
zeCH(P6yQ|mbOZ?RIsI_@;hf>T&-n@fIS-UH000000RR91=m0(d1poj500063umYd}
zjQ{`xg8>f!0001Z+MQEfYZE~fJ=?9?`q3v5DLxE&5D~N4lvcDB!CDf8Xwe3J-X@zg
zG~LAPq(SHp=&$g>AK{Zfzz^_U5PwDS*)w<V=A#5b8Sd<vnS1WNbM6j+>-Y^H-r_O<
zL(8y-TU=#$0ZZ6Y?BfA;6ffd7P846jDn2N_hyp$-zC`a|ikEQLD=1#Z9j~VNGPXUd
z_zE6-9~EE4mUpK3npao|6|dmF|4Q*^-0)8oe?jQKSNs(#{&&USaMS;p;U7L${WCm4
z7Zx!FNDv7!XrYJ$^f(Ujg0rO=?D0H7O7xuTgtkrVqKP#G2vNp59-)d|jw(^k%y~Jh
zIOhE=wi$c9mg-V;<it#6`<DzIi5}4`qeVQ6am4R{cQo{9ajwdp+hjTwY8+3QE01dN
z4t+U!Cd@WtCY;?mL1V7x4rf<+TPm+}6_Go=8?zFFeKO1(eshLzl^?J>mZOhNlsHB*
z0(wpA4_Hx;z9p_>`j#|uk7z#o=v?+mgp_+j*5W!)Cp*)!BK}so=k&9T;`EHiYIpf<
zaP4}N-E&CXlzzI~9Ek58^{er_D_N77$hDaW_qcQZZz!`)XJ)Fh*}Rk9AJaNKji`6l
z;}O@cj_l8<@HM;?Y^jYI>y)ZeDWeX^=yNw^&QziWtYkoyOT0ma75^XW4eQybiuujU
z@|V}CSS;E!ba$O|h=+__#s+8i65N{zX&a(#i}erXRri^p$=5KFT!*4uk^a-2drRLA
z_g&w*e*o1H${YZA+HKHBOjKbI!14dUvI|S^Rk32%_ulSOtn317$KERn?5-l<;;PsU
z*h@4fdeYb~YV0){^`OSyVu^b2Y>x-^sw?mF=3IW6$;>1(M9>z$oz(Kb_y7_ikz$c3
zBC!yK6&umSU?-M1;z=NpB$7!Xl{C`HAd@Vz$sw0K+R>hTI?$0$bfybkDWDtO=|N9=
z(VIT>r5_qP1`eFKD5QvDO6bo31~Q1j451V^9?B@E0xv@u#&AY3l2MGNk}-^B9OIe5
zL?$trDNJP=)0x3cW-*&N%%w`K9HEsBTxW0is*UVq8~ZuNQL(X=ceJoaq9ukM>|-;x
zcrSJiaGam~;1`EE$$jo}ih0au7u7tZhI>5VDUW!}6F!DN_=0CV=QKXPvzynv<Q0BC
z^OY?uAizQvQAa%oX<#vp1Zg6~5|*-zPb_Bz&8%cKtGL1;*0P3mtmg~gxXKyMa*a2<
zl~{?Bcu9~%Ns?qqkyJ^ObjgrR$>JR6xx{5|bAgN8VG}1Ln;YDe9LZ(7<XL@n&5eHD
z#4vH#LiGVn)5=ZVno{K+L#g^aC4V)-14><KC>=_t(xog^7AcFB|Ms~}b+uR5?X>}4
zC|FZn)#NuzhS${PwN!+H4Q+|bTlNQ4#h8J3+GFtE!EhodVk0ACU*rbHog54t49Nu>
z8Q7g1xLQh582lKlv^W^Fzyd;*9GM)E9KlTPZ1ybr9E$85Tu_NdwnDZ<wlD@?7H1}N
zHVsy=1izCbmt2EXgII$ogAjuN0}lg71JHDCpp-aJiopR5f~0mbFf%Z?Y*b<F2#na^
z&=CRRr?_m?0P%NlFhB$tTq316s)K}f0Zn9Nap*`6fk}XXgHSbFHd{1XD5EEfBa<PU
iGAjq4)(*!1ts7W+H!?A}Y-UYiV{mZ+0Kp74fB*n2Z%MNN

literal 0
HcmV?d00001

diff --git a/addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Medium.woff b/addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Medium.woff
new file mode 100644
index 0000000000000000000000000000000000000000..5d1988cda34fb3bd02b6a5a346d9ed185bb2f99f
GIT binary patch
literal 24348
zcmY&<b95$8u=X3<wzcubw(V?eY;3%-H@3C0Z95y=wr$`1zI*@q`pk2x>p5N3JySi?
z)6+d}3gY4b5WsiR#|NPPCyU4bSN|{n|0i*ARXG3vB=MWY{||*M&EgWGV&dOi&9^T2
z4FeE=5PS(m1(k2^`djDxhGGJ5fQ*ESnlJzWO8w0<eM_bzvXfE;6~><c0GQ@~cK^Xs
zO&`qI#?bzoYxyqc_l;GP;6is}S7%}X0OCJis{aAi1WVM+-rVM!i~KHA`|ZzErGc^7
z+|cRU7E18D4D|m2+1%R0?3<GW02JT=fEZ}HUj<$kriLZ}fck&F*#84%=xVCPH~Gzd
z`vVYvgB&piBFDnU+5MZV_^!kIyG^-2RiYHF?To+6Y0`aj{ok1N7Su+!F?9c~_t*9R
z*%E_7fMnVl+L!_WTFBpR`#wJiXM11|kG-9fGXS7t@ol&N%?}T_skqrYntt2r$$r~T
zee?DyXQ@Qr`TrM@-5lEQYYPBu_>CX@ClAoNaotyq4NMG-wv7!86hVv#h%?gs<AlJ&
z#QbCb2u1F2#ZG`G8iN{%L$VXofDOPZ65tx>!ox!fazR>S0}`7-v;WuLVB6^0@Y>kG
z!Ql?ZFjl&XZq!gwicxyPY<f(JZp668zyPGo@cD~Ka@!mP1Yn_x6z{(3qA(`iuZW&m
zAQenXfnG5i435<s46Y@r<BUfC_xD@_TMOe2#1Lx%Kk`iVHP}0<hEJ$I>HNrvSi$UI
z8t`y@{mu_EHvq}2|M<BRI_jB5p~fjme|?)1XREL!L<q@@#e*&JS!+5lAsXS#*;(+t
z+A~lHYcXy+;M7P=^=Uf7x?yk+Qg4YegwJS;hb+3!ujRVgpomGg1!uS!=X}fyzh8=y
znImWah(>Gf%{tuMLHL6~5sg(f^k><!UzAP5G-bW!M!q`chQ_6AOSDEu={Z4;^qaDG
zd1Tw^szk{=>@NguWgDXs$}@Mf#rF-9$<X-9x-B@uYihiu+Q|>;ajTzTr`e>*8hCl*
ztu*xnn|UnS{fEj^40!^CS>6Z*9j#$T3ZaNZGe{7QT($sk@M@5I00aOWf(3lyJ9z2;
zD?uj!W}wO6(T9VC0fztw1qI&*fPR4j-oL)PEEnLrzep%3NPzSJ5GdXu%|5^TF3bd&
z*msA>*;)bsz!f2yzI_n`!2XM)fq|Ky0S=@%BytPrK6Ahe9XyX;17;v->>z~6&Chw}
zcXN2N3IpyTX9<59AyFY|A$cJwAvq!aUTG3N!>GLY)10rb-lA(z7kUHufHG4>WW`v;
zSpTv{QRT7sueYz_ub6kn*Q=+Po2v{cDk6Lj`|DnRC?L_fXU$3PC{!g9-4#*m1MVq1
zDF_+ffQ$h<TC9PPMo&-A=+I>E$lyf(*f1k8H8~yW4@w3S8VY(cTB_>Yl7fo7vZAWL
zrG=IG<;8Xe7ADq4zs+n7Elq8Vt<0~skN3}aPY*A5P7W^i&W?zXvC;8SaWM%|a4-na
z@UU`XQxnIhXI3_NTowZgWs)m3yBr@@+0GX2)@v;97BALZ&sSURu0FxwDJ)M`p2{(?
z4*1Le86KziD~|TW{(^DU)g$OH<C`djAa?cn2uw_VOp}P#>vlN0oX~E^K_oJEe?4Ya
zEP8$93u)?F{LKE7K&g<*A85GR@#2INokI;Ny#QbaNJ53={$DKW08xNcKmnixPyuKI
zbO8ncV;}^86+kke4A2W00*nD>01Myx24D|_1ds)o1mprj0EvJ=fG@xt@Eed0=m5+C
zS^!M|Q3w?GRb8cad2J!&4Fn`G|AA#<u2uB<wAdlwUkI3ig(xEvp5Oy$OAg1l2nP@%
zL4Q$%)oPsFzXg&RkR(`=Uc&q&s4P}td8|A<^-hy%EHa~UWo{={Qz}Q~v3(nm6YL-I
zl8yC%r-HMysK|yuC@pKV`%#y-PdLbonM9u7fCD}|8YCP!9)GQd;?J3P*pRn(qB|b!
z2G+Uzd2W~!67a(e2bsVtoQbwEq}PCj9U~^Dg4Cj227w~w&t}%6-(xk6aWfr(EGRD{
ztb!_5HsI->^CSy*4(KwmV@0*>si}3J<Y>LYBhG3njpNU&y}EVv#|D8vCj6n6`_(<*
z2@#Pf(Px{<N9hny9*xQepivU=VYv?0M?MP#UnEh7I;5m|_CgvVhvJrca@iH?zj!m`
zZ0rd7o`2!@x^?5oa6kVGS;a;%;xVG}gAo-LS9=M;o$926+*f{^5=`_vxQX%2f^N86
z7UfN8bU|cRhxYVYTfZF(Z&z=fj1YFSEBjqCOEdANH`z4|mQ4uPFJ#=CG4=K-?f=S4
zSH)_92rlBu;rW%<cp6sTfyG}(HP>CM^?fUTKdC{!z5qz>tA(9#2Ivb9oV;#kk7?c$
zT^uWNbt~i<$p7MXg~K|w>_kPwB~c(yAVdqG!@|P+!mv@qL?gm*QRuT)D#D<l`C(O2
zDj}rl8yCwqFe@A1OF(hDoi4LBtR)3sKL#fzC;1OEou>G%oI>_mLGXta7IgbzGX2Zd
zp|Q^5Si>;%hcP-Y75L&okwP;`w=D^><#F$mj)3Ga*$R?|rF3+`P}hUMX;yOOmvo&T
z4?uPe5q;wEKW@-{#hU}i_RiPI87y~Oeu&i+C17Tklh%<@It`<H6Vq$&)osSrfwyqi
zN;eH`2lw?_GAx?RX-BGs>q?J3rWz&8hKrV=XXrZqp#0mFtwI;DpJ?-tWi{I7EH}_e
z*vzl2d<hGO;^?gU<&!V|bRsY+G%(AN9EHzsG*A;q<`OZLbwq95D4bsdVjz-Py&X^L
zNAC0|v3C>)1e#yo#8?(Hnx=z~{tj^vu(Yr?7Y>t+z^juJX8$qCMh>#nCvh<{x?u7>
zOcKprSbQeCvHFhP=p^n9h_{G?Xo&g@QQU!i6%6A^lA}t2=`dQ3*Y`Mtlf6J%si84K
zh!l1O^_|Sh+2(ZT&SNQ@h`uIoQ`7Y|J6|Vnnl$xki!wxyybLG$k<mlphhuHua?W1g
z9hMdG6Q-1wjU3;AUcg^>krZL?@CBl5v4j=<SlLs&-NwW0p_VP%uX<_s?EK0RpHwm3
zTsXTw33eww;z@t@3WTeY|2n;4)F~T5XX^7`nlX7iY`rc{uONi;>Jj>qzOTmn+BNsO
zXSt>q_`rNO6FPJYNZW$hF;9nO$)W4J6DERUBrZdQu|$E#z*N(}&RM4-!t7DQa}C~!
zLq>hR4hm-CC9Q(yJw>gOOw{x&`2iE{=`*j9&mQwC|51g9vd|sr<8z<V-weO@G>D-e
zKU6F=kzkU+jYy<WCXua96)W!5<FSq55BwZfGb-F1!RQZn-Srt6=}JA9rzRnx*BD6X
zLXKZJf~ZR#-0uh??eXyDrAgfJ0Qo1k|9kYzP(urGu2CBH@2op-_U$rPyJph-fm#o(
zP7-3xk9gY3fo-mFkQ|8HvonlRFvkuQF8+P6Xr%cu(^;#`71Fd@8J?uqQ`6qk>udh$
ze3_-T)u7=smPCm{VG!4#UbIsBm_<y~996l~b-f%DvH~lcl-uLG&}K#}&(bL}B)N89
zvxzr5y0@|Pxb8Ijnv-cY4jmwU=>~9tu6DbW!}@ITG{o*KtymuJ>3QXSCg$R)vt45A
zNzkKGu<8D5VJ~nf<ljWmpCgWaJ6z5V?5E`DJ)d`R-U=SUCvQL6J)?C>21}vKm|W-*
z<T)wY+irj_dQPgm3#=HpRnjaBViu+6G5Vb7rEKXT0MV5bo#RrF6MQEYDfGZzbMjd2
zT#}aU`W)anlI*!cPa)@ujPxKK>Nt|tATDfAhb2Qy%~_}d5nG4-=hUe$E?Xo|s&zJy
zJZxKjz+W&9m2bqOm;v~hf<(8~VY%Qv#XsTO*2y*7V&YJ}=?#oaNSj-Qxmg@q()0an
zUD6ZKFJ5zSO?5xJ@^M>}Q<<8wU9Ux(;(xmtzD9kqT8=3msBC)@lurb$B;1MDD^LSi
zs*x8Yh?A>O5s-ylrYchwW(1gWFRy396&9cd75@~E;6+aIK>R_OB`=;_M;t3wlENcN
zW1L$u5ON-Wl-U1JM^58P6gzaHx~^wZMat-fzIjRBIeK!tPNDQnXIy%_3Qq!GV5KW;
z=a)5Tu`4%l78cdA-lZ3$WWIb$QQlms+kDa08icp)TWqv*WL_-rR7?Qn!(%mj%XNyS
zq00h%zqWeQpYaB?x-7)e*mcie-$o!!ZV3F^sQ21v<ycVA__%$l)^%GVbv)`ZeeZp-
z@}wtVvma3F(FpQlWW6O)Nz)ym5b9Dd1piU>htABTF^^0Qr}q7WYKDzE>cnlSlqY!b
zT9@|dh<XoYMSNup&^|HQwQmn<)-il>FE;8?cX>1XDA3?~5opK%$Vo&-`m(*?{d@P#
zx76hg<CfuLV&*#IA#H2k+y@Q7-285)VQz!PpMK5Fhqx&yzK3+_eSR}cq~dl-7TW!V
z#nqs%bmpr%Reqy!!@-s2s~35!IyvM}#hn$4JnF@rLJ}jY>lhSC<KF2PNvq;Uu<`m{
zKjlk@=xNHER>seF^5FO&FejDuy2)x3y0tuzg<@=k`nZLS_$<Osj-ID5*5)2hMxDS}
zU;0Celb0McoNBuD&^Y%V9qs%Fb2e+*4POEXzZv_^-!v9A8uf4#XdRe_E-E^)0=fOk
zN|UNKGurNgxC*5s_OiQ?AJMZ#N_-5Qe}d<nFrY=km()j*6JCsIW~S7_)xuGhRlse2
zoRu=Tw4w6r5l4a1b~{8q2YY6MOZ8Oy6lRBR$;68EiThAgc*A^V3y)iRZO_u;gUCbM
zLq3byyjb-U#&6qEhCW^fUn%nhp#%7SI90@sgNWt)BE9dO9%rN0iu@BvAmp$=D^S*V
z)RqNEz<Ne`qWdcgAZF(D0=TBf5Lxs0ow;Ta1OdGX&mV4TmgF+Q>m0CCSV^&MRnnzI
z+F`awimy{QELYAIy#&b!u2n#I-^SzXrI@s`Y8bf&FGDmkCs7UB=Xc<-WDxmv;I-p=
z`1f^d*s_#UjytMhBqqJUc+CWM$={$hn|A!AL@rmCk@p2CniJYHY);WmH{O?`IBttW
z%fGDIWl3#OKNmXThtZdrn71A9mXO@>4cU&VW0+Jgm{;6oQPu(cjSS!f*O5v+BKd^w
zLm-N9;+lp5wC6u$B)Jt@nq*Ivi<=YBSLhPT?j)qBj4f6%Z|d{Sr@$90;jW3YH205x
zM(g@g=zNLiYQ(mu&uETt6el1SB;lk8fS-HII=swErGQkQ!h!-Iu^OFYE#VAF61}2@
zi8BfddUu6ww(UpNiM8^Q?@>$Ue~JQ8+P2x3i?VCXDSoj&7M<~|^W3$jV9CEZ_3zm2
z%^k*QDBQF+C%kBEby+KI@f=opyst|6E_+WDQKjft`q*uZZR;YPX(L@HJ2X3vC<kc-
zH9nAaFgS6Wj?g{?de(3MOi`Kc=U22F940U9fpo_p-j3!4@P_+E6aqM*Zncypv3r_0
zlln;AU8TZ{0ofn&D{vO`{;moGO2ry+TCRTBrsPc$iR(r!CLhmR8`tA=-99c4r^QX<
zAA>C2=|0=*f2*^-V<R=@e&21i5uGl34C+3ucUi5hpV_ru{26}a;J+95=Px3Bxkxc!
zbV@KJFgtN|GMj`McD^I`K=0Mb{?n{JLW*5Q*#HbX4<9KquA`{J_74nppS2jR5t$WD
z8wi36d|kHyy~pnv^;iYHiMN)}tD=CR+4<ua26B`qqbq8cI<D}%7DpyAKVnipcuXkh
z`6c~){f<#x`X+U?^lzHL_n1Fr#usk78}^y)-^K);tr!zaj7TlmN7j%RTsju0F~M{Z
zzb|eYxXtz^aB@+3Zb{iD;qLJS9oUP+zEX>{?WC%aP{bRt@%LA@=*>xwSIw%T4eX0`
zQlxTxs?gtAj2p^uiY9o521!GDSfR!+V)-Us4?p;qg*N^1&QiRuUw0$_qB!JMJg<-+
z_Fri1+yq$tIdKUQp0=MZ)KXf`?0}|==D#UseMz?2)ZL(2<#62K>X8$X?J=wTjgV()
zBnIHlaycU->jnM5tt~Yn?h(WN7a81eJ)~(6CFSj%+(WStKn%zUJby})2lWk{*7f|d
z#|4lOVEou=nF7=7sgkt73yMgzce#Y`_wUmGch!<Vb&PifG#0PioINRo2<>`~<9T6x
z*vh%r^Vr}+V$^Rlq3u@1CcU_g-mH1MWKK{Z`cnR2#L2>aT8>h%)%sXwvEDcY@r?>~
znG5t%IQ?0tx?>-c{}s^gZ$BUZm;0XxsY&*=$K6czbL#WQruk&i;FVGr0~9wxz{k-+
zpMlK8cD(HmmY&F;N-Wa<R+IP@v>v(kQP+Xo+p4;<G!A<-6hY#g_^v(8bhc*VF4S?E
zJdu>WS^C!byUl17+^JHSr7cNm^AQ7Ze}*gj1!`6c=Y{hQn>G&^_UqMWZ>b31FRPln
zSDFPsx~X#1zV1ed=80k$^j-D)!}YUI&~Z3x#v-}k?7A#L((bl1z!q~_Y{p9BrZzth
zW|@JPDKSKwz_~29E!LaOxaOM!HjT&Q?JM3d^F6y3|JO#`oDL{VWvWC$!~s1}{@NXX
zndy1iB$_N(F>4FU&{)G%UuAesES^NiWdsoWPn&TB8gY&R68{F86lHb|AIaQf4KY8%
zd!4Q#?>75CoK&qgZIV*x?gE=KB@xS#L&D(i<sK#&!k_PKwe4k4Q=axu=NX|fnLlmj
z?u86dmJcVlJ}>qTB2sK=3G9crDXfANzQiL>tLIawY=Ad^gN==&H$K}&kZjU<4`1hU
zDuDYZVlMTRZob@j#>mA1wokpD%@%Gv{$NPI-2`?+cA-TO<X;QGSC8E_+F!GYxN@)l
zDRG7CyIb$q?2v^-;RY{>;}yeKRYIj{j!{gwOF`+)icz$)#oF#xLK>?Ltvgs9$}8Ks
z&M!5m@_MxDi4VQwu>BU?Qqp)l@imPmAkW5O)@kRyOe4_Iy8n~Y_rMjKN{DuIj%;h8
zH^g|jG(kb-TDCSHqbHGVK|B?~7kp(=L6-ANfw*i&x_84g(oi*U&J}|fH|XMM7<z5w
zuH7x65%}29s;*o4r{}=+IwB(lhND2AiutE)F>aR33nR?ChM;#E^=RqO(*aGkrn~&r
z^01L!V`&)VVRck+sv%egnLi>oxxP@qO4RI1_6DbSF;nV1Y4Vj{jKEB(`mrEYm3J{o
zVJnbR2O-d2xLm6`DZ83D<UfA($|)=6A?rzUle{&@({6KDX)AVD&pbuCE=w0n{5&>j
zbdQq6_tYCvf2!;{TW$w)VzM1wlqSxHs|Y&`ZrL~njgF!t@%g>T8(-ZgpZ1s>p#GJD
zFNLm+?}|&Or6yY$NlP$AX0n1#W5}Zq9uP7Q#`sw4x3&McuxyRrS%DZoXFx0@L=>^d
zcBH1j)&PAfB;s9i1Cb(o9phf)1QLS?Zx{Jz$H`>MdAuwzx4m&M`cX&vpHYr1JV?h>
z#ow`knLh<tQzSiObdw*=>7LM;uA#aaCEEO3WtbFQr#j}dT~9$=Pwp57IXdNim1LH<
zcD55X?YcrycD$x54QIsOI{IC%>9zJRxcrgV>5EUV%TDfnpj_eI@DS;QL(j{n+EY|6
zerx<<ZO)+lk2+F#+cWco$&3C1&q9%!uZQDq?%yRJy07H7TJfw?8Q!N}%v};T8ka4l
z2e;E|iE09oY!at#pVJ**sYWz&CBkq&hGod65Ri(=o$=FzU~n~Pn$9>f;>P=bQm%(R
z{^=~7=qU7Z`srGkc_7cBRN`ob7|gRR08OAlv_w$NHY^-*6ava^#?{E*goyb%F{z(c
zKCA|nix>Pne%5NkcO3C@W9A5JqchJ_41VT6Dq0B|?3mr^%|f{a%ajS!;QLs&iwz)<
zE12N4{Zt6U%t^5@Yi@;A=Kx_8&Kvb41l@sy^q{ENqS&PdZCIIf6J8=}c`=CxTJFys
z5xgH4NMn~ewL75#rRMT{u2;9k0v{#|eL#+`%C(!>Y^dhe35bkr?)#NV;8kX`#nQci
zg4vrp^ZC@T8UgQ~ZYiu?!!emL)PTbpi?w-+$uK#Jso|hPBXHt`On!wm=W)*M9&V=G
zauU<$;)3++h!Kl;&S}omPjmkF>x~%S*3#OWlr3KF#IICYl9-qTs4`#WuR@>VBB;(K
z;1I|)vWG3rv>VCv5;VUO#{}6=Q)@gJsndd<RD(h}MCWO099`%XllZ!QP&o)<v6(Z6
zYc&&^U&5m!3#av`pQcU<-VV3<4{Zde{ikrJd#B#*eoz~tq~ZlIRd$I(rBGH@RzIz*
zXagonjOiqTDV#9m2oEV$uvWnrxt}M;^%pxN4vFiB84T6$oPG4}e)|O44(mM(b^iWy
zNNZAM)z|p%HRe8DoS>6Z7siQa3A|ai-Cz>}Yg`YJ5!0jo#ly9-w&s$oL`Scub~?U)
zy>6YRnaXd-5AP3w39Vgz96426R+aPYN&gx5hP@bTOr}Q<qBx1)`E~+&CnC-YO70HX
zAXqd_>ivTSN}v@Z+$8%uXfiTWBzh@=47Kx6JW0Xhw37%HuhYHguvCT_Viqu@<Kq=3
zmiFofsz=J(+RL%z73$$k?26Y%4dhpIITv?4U9LOHRb;N!l6C?*BqfcBE-6JS4MuQs
zl1RlfCn+Q*#WY%>gzE%TS{xvUjE<hK7fL?U;#0ag|HZ>+cg661ZbAizASOWYxeKEj
z8TswdU0EUpF&e?alR29KM>Fde;mmLXuS>A|weR)ns!J~c16X4@*wQmKjfwyYY3?oU
z64W5`-(e!8tTjR%q$TgCVU<3R)6ii}IyIErS=K1QgWT*(M0B6+Xw6g}qu8E8qbg`g
z#Gc5q9yk4ttL(QJ-<O4?HPWkjzS~IqcdzYvUy)y0lX*84leqM9xbzQyWLw6iVI=dl
z=Lw;hPS0>|+7{!2V8$H-8}6UC4NV4p=b2uHaa?A^bMt&==sTJ{7GDzHPb+^zSGg$f
zc@r!t<&*992f%uIQh>Z0`j3HQFo7lfBA*&Td&l31c6xMMNta#RezbpT+yNm4o>Y4X
z;scM%=E8Cm#ymB<2*mjK3EaJQ`3G^|g_<tF8f_cZ@`tHTk3sI9d4Gv4Q`2-1WFt^F
z;}FCL3@S}gqqtJ&U=y6}RzyHwPo3RMCP+<4yzUje^112hy<Rt)m1{Kby}KI1*DS7L
z>=$WIGGZjlt1ea8W@q%zx!R6HoEb=(+?u)e3|}hV`^Ah5-Ws_EF;0QnpMdbQ@Maiz
zl(;SZF6<*$iatlCMDeqxsaV$V90r~WsLfyl$`Ieia-QqWL;vKIMm6Us<nxQK)GE3K
zIr%HF`N^z0G<p&9QICb%J0&TmuIKKr)A8CtzTo>Gd7(qN>QXxWP31~1u+QsNm&_#O
zh!Kaeh~icyp>CPE#$E%CydhP1er@V?Uh#FD`afNrxZKWQWox%Tw${RhBwy!PQ&k1B
z*z)CmTD?^-R3mLVo`H~lXnlmfa;5s{?UMEG#B?fLghg&n?yX~Y{*J35K2$b?OF}S9
zbSI?5<DJ)sToJT^UY6I}cjU08Qkr8jkoGr&G0CTI|5v{Mb$aC6aOl_JBGW$<BiJ9=
zQtI$>eTepMPP<s8CAx!M&aU|C(NmW;KtWNU4>+cRh;66HC=HLRgO>UwZFmDp(}_q?
z5?2SG9jM3j+nF7P&v}JzL_OD1(5OfxZa%pVF^iV;m{DkrsCBB#wydNJ+#|!+ONl_C
z=y<J=DWCCBk=}2`1-BR%P1XkJH{hX;D1z!CY19Nq&z^qKSOX97!vWq-8gm~WjHyCC
zUd}HWqanf?kgq>l=8AF+A|JIM|4AtvCeJ6A?3Hip>o!=_7-RD*Z_VMp=5@qoLgtxd
zf(PQW>+P~Ta3oBeo<T8UrW`zp!@%$vd7e1F(@NHrNCnpaJQy)@^G6m)3paQj^14^=
zDV#W(<ntt|+=zdo91{&*VtN=)H%r%1|9B?m8%U@|WU@rLSUTrlt*JeRhI(kly*HwG
zWf_N;8WKLQWPamfmug<%t?2LR<fF+`zR75@KyLY}?z%P!skE`Y&$o9*d1nEplZf5)
z=$+B{++X_3mIG>VA?N(8@`Rq`-DSMkt`h46us_1N)m=M{><@bP2w1(VS5#TsE2pB0
z|AETb298eqhb^4M!MGSGl0R_s&Ko;d4U&mUv8&UmP-P-_Z?!*VqV&^I=a=x+f|&?s
z4b6B?n8i;J7p&u;Fu)<EvxX)WSH-}vJfb2%=8KP(QQ}=wcHa-=HO4S<Dsenb6q<jI
z+zFq)ClXX&Nx>*&5wZJTttt(S*_VT^H%)tQB*+|+*rvjRE{<7vfR0I~)^NO(`h*(q
z*YfIcF(|A}SApNWqLwsC7M!XWRUsTCsUh#MGy-u8?h*;kp7=<4JzO=*twLI+T1}vD
z9>CFHJPm_6cm9bgx?t3u$=ttM@U#{*C=Vn~bdi{gm05F!;;)(qD*Wr~((Q!%vg6KP
z7!jHl^7jtszYnxtZ?^h+*zz8j1a5a=IVW5~aoKHE=|O$nQD;si1V$GH81$$m1$7T1
zVG3Z+1TN`Jby6Njd8pgv5+_hmdEXw>AZ5aZXi-i7*>wbEUKhkrflf@FJS>(TPqJ^z
z%obe&jko9WzRoMB1u28qk?a%-Q|;7MM*it}YWHsOo3UE&s7bZ6^Zk4jwR}Xq;T&GF
zhtkEr?J@;nKrFi4^wcdT{%7CCzSy)&eRd}B3vA-dFT2w}+v*rMxj7kM)m+<Xo>SR<
zUOO-Clpf9SOG37Q!$Ujknu3PHRKE;uq-$zk_muFH^-KMZqocl6qCV<sse|JPSG>U-
z{ue*WHYg?T-x=U+IL;p8HsdI79VCw+Xip<_jn9=z0oBP}F!wgKCbRdm_fZNPk)MLu
z#S@@$tDFsQ2mtg80S8B8TQ7B~!q#-wMuA8_&9e+;g4FKe0?2rWP8WJ02)IRX8ZIR}
zt)<!tb}72Sv^%#OeD!@A+4^Tw0$n_D>p|FMa6mKvV3t#Jn{(euhgoH$STKOR1mLT6
zld-#`_*?Pv<ke=aC&m7ilfQ&zmmv2JtL7?M`;$f+G*WuG+nvYsFhfcdkgc9#k1HEu
zZ2yv&4U*^9Gvw#(_rQy@4WFi&fJh9sCLo(RQ1yuis93F#Vf)Noaq<E`Z|%$^d>5J^
zpBL@{VA`sqrOE1b2fjbJxYWNg5P`hdqviZ2^xryA{l)vfN7pkpJR%GaK?p}`j&cY1
zHPC;AdiF>x&k;@)RKpK%rP<r7#-w05$V=hUrrZWF$4rYUyoPKGPt}!0N6n#9M%en~
zcQk(>3*4O5<^@y!j;>otmp)`2GpRfTbl*BGB|!oqZV3DLVon~!`3osh5ve<~mB7pQ
zmoSC?sh05cU@ER2z8EFr(U|t$pb%Zj-#;~V2vxZO=;xjkM06m7CuI`afO%AUWl-H8
z+T<&;-qm$&>lLx+{*@IAtj-rw@a%PwUJn=EPyFp3|2Fe;yjtl^bZ!P0JBd1*e>T1y
znEUN7Y2Vid&q>&2cU)Z@<~^+Gtv>eU(^5vfo}lZGd&n)c_m0Av=8>hxg&DdHGz$uf
z{|l3d$#_M!g<=~4qvH)wj`xhtjmtb%ha?{~k?^?KqmFj;4=ReL*}Dv!HQ<6VTlTa5
z*@B-6ijZ==^fhT+wZeV$!T9z0S&`DV44On7L3iplM!49%5Q@3Zd#?5UzW-JFr7nQa
z<4&<9l_jzmo76qB3L~${!*Pm<Nz}VeM`}3EjNzT`VBw_X5>iSef0f%C2bZPW8M-KG
zU|$&r{-@^dW|Q{P<7MRtF9&Gy;(vJM-jlJ9r1skJaM`O7dVU3WpNYsc55kuvIOU;r
z0FST_gg{6no}NoAEQXuUituRgZ!vnD?x=+*fiprc{S8j65-_oYK-#ZKo?DY7uH1=9
z9}1xkzxp!(Z9s-khB9!bZykJyrX%9?G#gx!_hXFF$4w;r<Cxa)Zo>Edx?G@Ir+ydY
z0r()(g;tvoZeIKz$$QgZ>cSWwExO$O)|irKf-ojGz0NVcI0DgPsbx#b7#Kg5D&HE3
z7%ALxze3)ELI<s(!~Xk0z&07m4R2;=H2)q_Kh$*R7QX=#*%)!rbLGIq-w+B49`*a;
zXw(9VX>||?LwyKGz8?2q?#%C@d>e1JX|KwP=gFvEv^K!tt~SRd{`_%P`g+N+lw*tp
z8k3h2)2j2=`i~T;5#KGHMfB`;W*;QS^9nMqp@l;&isp&wh{}$6FpDuVwJ*uZ(CYa8
zq0e@1wM^CmbsCeapSNXg_WCE|v6{RfQx`|sI;v$Y!Ivv2SF2`nE&;_(f9ANi{;N4Y
zbb&`6T7e^RV*SHtVX^PbEJ`XX=LfHxC7&)^gp1%AX%*_blv!<}0W(T(A1%2%M2}UJ
zp?ugs0?p51i93NpK|?!Y#LRtJTD3IzSb`Gz6lt131DD_uxLt52u0d0Xk_%Spi|bkH
z#$C7`Cx`=TG8Om4oSwxpnQ2+)#Dj8RJOiE7z+6<sZK?aKfI#YtD3X&&#%unoFHwi*
zgv1g@6-(+V`#7)X=@fa6q!pp6!VQWM*&joVYVN1|?oXC;!Q#oYB{8prYFq%`$lpn-
zgdZ{IrmgOp<vukryz5EnQHG|j>7<sok`V|sxyTinQItff8UdI5;?>siMoc7uQj(CJ
zBxslRX9zHI$<m1HhqJF};zpfZS)NxhIgI*n@n+&Dm~T~2i0s4969XRh3U|Xb40uda
zFz?2oC5I-Yl0A$=-!p&)=y<paBHBHI?4jlaNL;a>seV@OB9uYkzO~77+ZMOD`0V!R
zV3w?0_#lu1^eT;Q$c}M}zCZA+;+?bC6Xzi7RK5MLq>I?AJL`P6l=5GnIvwQ_zkv4r
zFQqeVZ6QMaAqcpfCe&;F^=kD@xZBN6FD;=_qUF#a^1E`mHB7OQ^5OtaI0x!nDOVP5
z+=dcKb3p6_pl$_@7_6d>401i$tf~s}v2lzjw{N7!axp%F3kI4a0B<5dPnjRM5^w5O
z66Li!HJq&_y@|Wny>&eEgruRMw)s|bt!Llg3Ul?<HEzG>XD9-Nh|8ULJ79bN%byDW
z7)vR;hABJuow#<IFT#PVF<tlvTCZSHXwxg^0a&(3Dny6t*9^mBSGp`|2X`_)XQl0C
zl^X|^^UF~q+Q{$5Iu8o2`d=I3)l-W^?0k!#`xX3+3Zj@7A17kwm{L4rZT=OiIonXN
zQdW7pw5AB=91=@Rt!yAwJV^UOI8SgFZSwc}(BWWUd3G|?hG<1}KM%l6w_6P!oN#2q
zpn8j8xS5WtI4RVn6^B$LV4L{4&xDHO&5Igo8m8lem_w=3?<{<<sSk}Iz*o^OansQd
zW1%Y({61I=y_u@5Z?|igfKjH+k)6O%pU(C?_l3_>y+B}Ceu~b5-S~2?@h0!0PJj23
zx5ZZOtMr}vXQ%$S=S$&XrOucS6u$1dg^kSwZiuIe3Xe4RVQK)Ax;xZDx+av(Vx~$;
zh$3M~B?tr^>o6c4($}onYP-sp#=27}Y3pNeyfuaqOG1F2$i2KZa;s}MTjVW0#wndJ
z2lg5pB=4`5UVr?In>+$;{Djpq^J=b;5r-k<n1M;FE7kD{`Hu5EhZ8qv`Y|=;&m@S!
z*OLJeeqs<sqbwj_SJTdn#DYLI8Gl!zYMHO%SLvq=-_VoSo*U7n$6h~~MRlnyY)S&{
z04$8mP=f^t#wr&6c_^tgeKAxL6GdvmiWOyzZ%xU-pB3vFv!!#kP6{ivZLWqNf;n;U
zD7v^PX}y?H?tCEey(G$XmA-}3USsB=0t($vy`T{Xn<1f>y0f{T5-w*z-X@Im#;=mC
z5{VpKX8EW;U2ce-AD_K^r)KhVF1BT7(|YNZD;T*^H2TfUGKX*%6xZ)2zL}Kjey>`8
zc~@o3CiHF<fg{8;+_bv~LSX&rwMp<eJTY3*E~y+n!W2d0CAK0qj}K6xSF9MeJil2t
zJ$FBRKZ7~dt8^A~vk%9@k_PaIK6VHk8}4)&1CE)?B9yB|xA?-mc(I<{$+q{zU^0?W
zvfY2isAKOJ)|Uks&~S&raeN;bShkGeaBku{)IO{!ifG4{RWm~N8n}^~eW17Eqlvvr
zFTG7gW(@&MX)>>6`tfeUhuJZcU1vuckpymEP6c>#@K>Ac`KOh~L^*0p${->wB0XoM
zJ?l7oR?N8iff(1w>RuxI>8a<uMM2iAYf(yP(LE;)4JX3b`Yga(8RmL=w?y=uoS`Kn
zx~^nKHk9ISvaX}vb7l6wGllqjR&DrrFz_}xOBxmhS{Kv3OP86<pT7c^jh9=}e=lKO
zU8ua;co{w3|3TuOSRfEjbRJ`@Ju3WirF+~A@(-*!p3&b1qsS@;B3?9nj_hay-Og4j
zr!d54D3aWz;dorjkOb<3M^d>Ox~vhOUEO{=FfPy34U()W-mOHfu3|fYDYauHGe||I
zX|0h@{pC4}8PRLHVlF(IP+#-3^!XR@LSi5VqKT@bxo#hjB1T>E>)2?eD^goYd16W0
zN%GeqyR|_oo89{9%b2Z>n}k~pJgt=E2kXN7OW#Rwbz*XqE>F}I7-xm}moPrUn<;)u
zLmt8ysCzneE(os%4+wAMnihfTQoFXWM;%7QBd3_%LemGtU%pcT^lE-)?_L!dd28Ax
z`7e20`NNwW)|jrVO}DKb+NlvMeS-!92(NDN?Ye-i@$KE8+sj6D2Lr$AYk9EBP`eQK
z(DV5PRyqakXy`ZyzJxn(Iyl=rcB<{p-8arbeGa(NK3oAlK&W?DXeUt%gt1BRHxCI?
zye6mF8Upbz3UhYr=CAo?CnjX`gigejP6cKN-`I(_7RrQ`i^7}6a}<P<8PZ0@&huDw
zjT-*594Bl&v?xsaj>A0v;be0V8B|jCO=3|{s8CLw*LOq}1=(m|l<QNNThrG+xr+MJ
zs7=zn2LXWN@YU;;)l}Tz>1+|!XDcX-B<`#?x11Kf`cXrk@!2wNYsc~`^=(1hHE%8Q
z+ph=tx}A>K;8!gE-q4zc_LsZEev^7`oNACy2tBf%K`wC#V^BG+m>w^VJ!V`_`W{-P
zUKm7PDw@1<w$A~|-w?*Szyu|#?&`969#8N4)>Xb`m*ZuwK+kt;`=c}4(nyfm2wU&A
zExTvaqf?2=>{T*Sn`ZeAQxqMniXY6N_WJ|deo<oUfdM<WM)qsZD-(504IXd;z$nEU
z7n%B0lbfp8Hknu#o>pRx;QUhcK?})1wJLXbR&<HTif~qY`1)3PEO+mlf&@yJ%w<HA
zFe)&4FN}Zcq)vpyZ9$(XajDU)0ZNvo#fF7?1?rALeC)d*XR}~MkpEZ|*fP(R<%J_K
zV<(!&-}e)=&EGErA@=Vyo^MnHZSL29=<q4=-592^d5V5Kx0SzCz7HKq71Jz%zITYY
z+_m>EqWhiIA_3@i;x4Qt()k-4J(deQ_AnM~_Pgu?n-OlBK>K=A`z(*G+~I~zRCGq%
z{%&QA7mIDZ5XKq_^G~co`hzcW_OHpL(RUL%anFD6kCh)JC)wl{ZI{ut;oAL^O|qMn
zt7;!4CE5RS-6!V8sA#tgejI-+VVZo5GW#d*ZU63cScS5q@5?&;HST+O{c`aVs8x^U
z65t5Pw>%3n5{1C+H^8ev0l5Ot2l}jf2a|9Z#3crI<*khI3J8wPl>`ijsS7~Ni+O9F
zwk}dw4E$MS#a;CHn(=)sxeO$AdGHv6<-g)Ew;wLEh1dXMzxeDoW%swaW;Y9ZHz<6K
z)@>885=lmvkG))-d^R|Nahd&1o&M#xpZKHbynzT6DZ|=To;I=mut7+R#U{2UfNK+f
z=zPSX0w13(cS}-c1+TDg(lB2f0gu`1xz&$)7E-dW6O@}+_Dsmu;DMMmH{+HIEH4T2
za{t}E2z}u4Z`?mXgv{$jL(+i4%lg#}tnfRC-_WjTJXfvQgbHIsJZTHf&MnMi0Y?1d
z4U@Gjt#|PI#kKJgtLsVQZf}adwYAsF%nGAGnckqU5I8El%^GPUq~6Knq#e>ZVNHJM
zXV#W$eog-)dixn7h=w`uG3Yg?RA!P#pk2-^9%n=&Y{vclc82GkYG1@~&y@1}e5%~5
z7_1L8-w%OR**qeJuojgW$oqU7RX@FM|3MBqR2x>g9)=4k(ngq4it5l+Y`Dh0?EU9I
zbzXFhHW#@(hxo)Q^ZL=}ql_|;SK7~ul)IZwCbGs~Qwvud7kKR?9a!g!YQ!IqVRrqv
ziB4|zb!Zg|-dYS%%wr7U0b($#rE9?y#vYFi%Kq8dv27zFUJw=Bb$^z4)+<WOM-1v#
zONSNrgQk}8ZMF7wf3T%hobTn;|Ji#GSFhJT5<x%pg51Urobp4^RT4puNImmX^;VHE
zUszA#V9>QcD{Do9$EiDSQe(O5_<BupQb)vh-$+lZ$HO(7@|48q0S@L0(VA6e^Ic)p
zYfS2G`c8+h(Aw#?92a$u>(=g$Eg;RXok3YOX*GjcYh4T2aJ8l;iqtu%(>W;OJG&LF
z6M71#D6W&z7K4y2xx!nyRoddx)UMiBR<I@_E38&Lj~<3-M02va*ZL$LIPq5Aa=}D?
z^mj|zq<+fWza`#N^~;ytO&W|udA^5v28b@8Z5_L^Ds1CrL|Jigl>F{LY@DCkw)qX%
zFHKmS3E`|1!4?zn6!&~h9O?91LGu&nuz7pDAb0&F+QkZZd#4e6Ngz^y**cAALDbQ(
z<w~j8Z%9?(4^z{5XiK#&EK%=`f#@YJb)3GvLp^tkH2z!BD@BlGYhMQ|1_%+t5K(mO
zq71;$RmC|AX!4dqVDjr;){tHisu;(fs}5k+l^2*bk~jbTlK;I7+3BM-iVHz#50yaA
z(A*r>7`^(BitI63m(^|dRsZX@?XSXzkHXwoCz03f^nIwFmutWA36f7r%iWB;+j?W8
zt*Vig#}X~@p`-1nC-g|6qxn8PDuM{7&UTx?#klR!+xoJ)`eP-8EhD%bQns~^+2XXu
z@*&zvi9dYTtq*0xGB$>gVaTv*GN~ueb_LTML7UFH_-W2o5iZ@z2luW`5H;E5q-^j{
z*mAekMQ*R|Z>ZS44|7C(=QF@Y2Y=_={Uw{dpxq-cvbqcFQ&o%Rd-NiU^LF-bkGmw7
z=p+nx9%*uTO}=Bzor>vs3sW*|m=0((Z*8LB6iRFODJI?=J^Siq25h~CA+CTFPHNFf
z7+;qjC9UqPm09REB6_0QGz4u#E;GWeDnp{Hy?V+LGW=dTgd(-&!D9>4a^#Nlww_BO
z7F=sp>>*xa3}s<)bEaP2=g!ubnn2E13SWEoyRx^zIt!8<;a2HXPc2##0v>STp9|g#
z+7~H-`qx{jZ!hGrpq~2G+w0Z-XLq@AwrA&DWL;}B5z-Xmn5x?Xw76mIB|xzR+ew?+
zK?PDAOd}aLn10@1utpD9lnK!sfuOg7PXk2;iycM1(Xq0x&eSX;)As`lYbb|88a{mu
zRqLS1U<3%ZSGTUtT+~#TRZ7<=_PfbC<Ky3yIVGlmFh0vI75`70&5*V>hb4tHm&WUx
zbL|JCm5$Xk?=BVK*L$*d(UPhhz8XdNhG8}TlpGdqa6%>_FKR{2Q(Bl1&@($yzdW1r
zFr;gro42OoU<1PB&7@Ij!;xSGG8Aor{xmtKK9y)^utss{q=%=-HJ?B0WT0SU$8%oJ
zB8EbYq&x_I#da*LK}d7qAETu;zZ9lZr6)<NdR8>CQ9ZBq-fb)Od3Fjl77yEIRN;?f
zrMeDKMpZq)PZrb^<66})@4l@%#|9ZnQ}YP$QzF?H)x^%SurVd5B1q-Ib5Z6>t0^Y-
z(ekpAec7}uAOFQ`EE#DjOFj%P6wT>y$8(`NU<;}j3+2cl*0nQRj!g!L8KfKP6Z0d!
z1TU&hUlnP-)QekW_0{J^ILV#BTIW#&<Ky|~`Tiu&Rc52%L40lJ(ZbX5gzv3ONM-eJ
z_oL{};x5m(O2)aeIDKBzT|S40_POGbR7*DIT+2##t>qH!ty%ptg}pu0kHW@xx!n_b
zZ36{o)FBw{p5#8lM4yUw&6}{)zbfZOO^K^U#fS|m8RY(Yd_xZnQkaCmCcI9UDGxXt
z$zlzS^=1_x`^FBl)0!O)SsZS!@D|sX@@jhRH0jC?$I(Pu3AtAPp?-FwsUr8()f5hk
z8$Mc>Up{RZ%QHT-HCYSQzc+d?-3JF}U^{b3uwm*^G6Igu%bUuO;H+Mv7!8t7A?zuL
zth1Y3XdlWwVU2^uKZbKfstXzz3|@Xh&6dTsMKb`oPx6G&G@$XMEx#u;D`uI>xs7m#
zQd0SBWHi?Ep=D<jO{YHKDOz?=R5ADOD!NB{dX|z`BlT4s)eb8m@BSaJ+6c5GW`^gp
z`HgH~Jo6!*kJtiEo1JcyRjsxLL=lE3xIvBWOoEzlHOY=DTwJIs;B8ejEa$A-K$;?V
zl+&MD@@nwp`G&cG<4Z>!^BR#vgRqc#QdzJJ@?i8O<HyJ@f4*l1XQ)oi;6Uh_2ixwL
z1UAsb*vs-u9FEJ46&A`!yy=g&HSy|I_pi1%Z;6<%hX|`6in9>JlXl0OZM_GL$W&&V
znR^tLcTdYjw!0+&gXK+7jT+Hmq?STc?gDqJqZL67q4@9&HQa&owM!2cOYA*g;FRks
zizY9MyH8{Ba2IzZ*-Xos#bi{gV&sxvwk?`;o`Xp;n_E3^Mti3pDk2keE2BWJDr%CW
zh%_3MVJ0U>!M+ATL$W9zV>B4ia&%X2T$O&2z)E;iHwrtz8Y=2Wg_3egHX2=mgZB~#
z4MDTWS+>Pe_UbrYFl5-bMS<$;fqDygviSy-=e~|RCa?1K{&M@+6BtKEo%F5K>{IHB
z6d;Q{7^l_;Aa14)L4gcO%pQYUzSdZX%gQsZYE@#`JcXc;g+$}RbT<mQz%@3YHAjNA
zsPLMK<JQj+hy=`DXR1NXv(AZ)56GOMrjuY%;Bi0VFuAV>G0X6boGl?lmS$AUXdbz5
zMyDmk$Yq<FGPwnKx5;%AIgcnJCZeBu%%hOX1M*5~jDA~!H0$fZani_0@_%oSjBfNx
zkSCwEZ}8ZX2q_!&c<os<E4G=$$FqEX*)ORUSjB^>;b5QsMM`K3olr^B{O_S(EWGgi
zo?2UXRjcn+OGfjlketqzHQv2zr?)aHhWEMe^{;UiF8_O3@xTe=<@(F6O!dV&_toRt
z7c-uz6`33DGI-9<jND1l)3DIQ+G24dC538=y@g8h7=mb(W&+}be+7R|mvcQI9!yBn
zScM3nLh%<C%p&jR(tXBt5*>i8CQRC;C$QY%PyTSJk{Caoy>CoNk^+ObtBT-XiEGsx
z>0l;Sb$=5uMMpepDCy7$TG3_GLGJ<~K%O;YAG4rzE3PsbQiL<dF`e9DE%_HQ24Kl}
z>igCo>Ihw0h2gc7cwZA%XBTG+2c;{2R>tA+R#||qhii5AdhPZe%|A1K&!#rLA=<q@
zS!pPB33Hf@Cz@>XI)yd5TRdVOn${{#-(L|g<DFPs@+T?nS_3=&Mt4|!ytWfg5bcy7
zhx7fCY?s5m_|dA-sFhXn@3*1~#2`b(CFJ-2g^s#{rHBG@H20)r*Z$B^u%bV9z&@d)
zu!*C}v}XP>vT?y$qSfFVLRz82FBZ&QichE#Q+)iD<U2e2@lF$P@|z_p;#Y0VYB~K(
z(b&?G%L%LfeVF!DmebP$OHpjqMSRuVyG9kkVyp3y5QkhgpU3_?&0aFt)*$s3!ERrV
zQ&y|(ItQI`|LaQxbu-NY^QaF2S}E?355ew8x?_PL0y5b_-Jm;hSwvR~?DGk&*#}xH
zKP52QutgYgHkl*WI5rs*>O*jY7pe(k?50IIiXiUB#07q<{1TcqT5Zp;0^h<5;*=yZ
z*+?N1wcjUSQVii>;1)ZRffgiwQPQzNuZioRiuLNe=MS`Ww(8cbtj4~oGbfjSO1w@%
zqS#jbt14PZi4$AWn4~YtV$_Du(>n0fID*h7m18&gj|?8AoTmC(?UKvOMa@k|?VRu8
z-jC3~CN~Wp7)Y+2mhbO>2)G|PHKzG_jFB?AB_snG2D?_)T1-%ez{e^YqWel+CXC1@
z<;WZ~Y5frzC|3o`Q+kl1X(<1&O+j9yTGqf;aE2$1vvGknq$R6lF6SQ%z9>meZvVZ%
zp0QoYChvVUw{)+v%8Fr+IFueO<k(`V-^y6pWVX5QTdUsqX|o?07=ieaAuD>o>L}Q)
zG}Dw-zlPTMHi&`kh0kTpc~)4^nH7?h>7T$Uz;WAmDQ_<0W}e%5Iq6l|ey5g=T`7-s
zcI7N>4KLo*&7z&V(lqDv?@R2m!WO&1w+DhCC#2O@tM}!ywPf)%4Xzx4?kz6mSoEP8
z%8D3DJz>LTL{F8(*t~Hr5m%RYzgrCmslS{t`h?ig(6{kX*#>v41;7-?(+s4q5nl~#
zWQ9`4oBS)H>0qzwK-&fyt4D0@F>l7yP*};laFnq65d-g|sbNa%6x=B!GXtTz_=I@g
zYJ3Xxmyg+%zz>#hzVX@z^^AeQhZXwCrV}Qj1PRqjT(p0}9J#jtkJgW1d(K!>QN_Ph
z_;(2#4r~-B>6o|*TbM0LL|4noTHczeNlX5a6NdEUQkZ<s@LPB|v(F)>r2%A#BKhCE
zF=djNX-K?mGZ4)y)Qg{XA_y{@9e8<Yulm21|E{u6@%k!HWNMG{xHQ3AiNpg5V^qaX
zJ?V7UDz$ZE=(q&sSv+L{o-I8Yj7OK9v80#ZoAXn3(tAQOVBxz5Ebm)PlcGG-!Y5*c
zu(bGb9_P56jR^aRj7QnQ)KibyqA1?Z4r*9N&UjTfQ5(iSS|g`DS4l~;fj>f_cl}nY
zz@S_!32JmjfNy@>@B=Ocse@l=xPE6_SL=4HU5oPfM_Ly4{4#+PDS062(%8N~q6%+W
zb?4I&Yu+Ko`xx!F_xm%Mbj_%U*&-p;Uo`-exUt}tBrld{^>WJY#Nl*C4-&~gr7cO?
zemDcRC@jeLIq$ewwVK>t<;GGrc)cBD^OcHivyAyX2g<7d!4~IP-eJk6`7HH0tzkz6
z<+*!%cQ`fMuK2v1H0Vzc@|C{4W%9*YSQ@*|H02~t7z!D!$S%*zBDoY<%Ow_R_khJw
z*nee>e>5vT<rK%cR_-n5KgioYUk=Lhz^y>(C+WVWTf1UK2Mlxzqt$Zh&?n%c6%<n8
z>QMDUWa|V)?tZ~NI_iA*McRFqa~rPAkTghnHfwcYg)-eHydYHA5qQa+Ygg|RT2$K+
z9LburrwO?bQz_<@h!pAJT|_et;Sih@aLA6)kxwMT1v<nzLcvN~R*cfJ;n*;!y9XNy
z-2|-Ir+r+x#v3a$rIc&6)DV4+JQ$uj4SME5vG0F^xjk7Ib9Lzngtr+*q!~Aj)NWVa
zX-(;(@AJNjXnd$Pw>=fNEzF4JxkO>oPLLfwRyH?q?K{_SXk^o5Ey3KIHzg6EAN5eG
zX6iH@#rGb4p4fU$DfAxM%*o{-NbZ9^EbNkO<%f*-6ig{aRT}(wwM@tOLYLi<nWfVZ
zIrMYqmvb=|iMAaNeiSZT{^>>vdrPzzj&i=%jlM5AZcl1z{v($-`-Hrcld{EuzQsS&
zM++pBU*T^KTSoe{T@!GXbeX#|o^Mj@AtG{|YPi0SKf+3U^=T5;Bl}@qzh~~kWdX=o
zUY>o+s@}1p1OJ}+`HGo6dD37<_;)3!mHz1$um;2H@*KVGar;gO(@PJbt00&=%!YXW
znFmU6VVtf<=UGdW7pp5zwh-8UjiHa}Wr)DfRJs;OKeo||-q29{&fwQb0Exxg!t%~{
zmKWPRwwi35XqSZ;{67Im9=G8~fG>^I1?+txUKe5NTnvqEnYtB<?eR4lFe_<)bO8IJ
z%rp*f(mDjOL7F3G(OM;Y+3Y-joK{Zd(eOLYS@6V@);yZ&2ERF(N7LMSh>(@_PaAw%
zffa4<H_(`ZRGS%uQb{CNW)uoKvJEZcP}IibY#_>a-|_Qz@+&h_QTX|4|IA<%HL;V^
zX0wa{o7@hz*Sa>-2rwe<0^_?N-sE>hz@Eke21nNXWG!qgWtz?QrOLA@B|X9A!~q7W
zAd9Y|^<{Txa|{%HIaWcNT}7yugHlouL-ju~&Om6_I&VGXU`)m`ud25FB4e4yENx~V
zTwt10o~5%8V6WjUgeuf<?My@H*xodRPTDktCcBQ#)&1WFBDA=)ml}=W(gfLMjYtq}
z83}hGULCN0z8$=(+QX}(hF1#kD(k>z6DZ};`u`b0P3~O^zmJ$4ye#ziKjzo~x%fr7
zTJBm6zp4y=HQEdSz^?-Et8ggQ8h$tfpaS{Ljdp*v^s3$G4@PyY14_v+KtyY*E{SMs
zzgf8CpbNQ;B%SmVqc23MtxvtF?Kq4q4aNcuI&j^%H5v`7Gc@P|Mnp75o#~=@Q_vTM
z{TzW8?l=wU0comySdT*IB5H0l_ztNK>_{tA0h-B0_yLw0rg6NY4w4h-ri)b5+LU4(
zUKR$rb*a8I-P+yDm!{v-?R(vcpCn>yFT5QBiW>bU0R3>fVm($8Qwl~h6s!aahGKGE
zBIRScss>1RMW(l|$z6<PeEI&&ltrXfQx|hNoUDeE)iI?D=%?<up^AYpz7S<N5Ev0U
z)UDj9)YKunRYopNwp`CMmsq)at_|T{$tbv*7E+PMjIL{+Xur~w-ub>4kW09;#fK-{
zD<mLB#5JJjIai&D)=!v7l)N&J3?xJ5sk_L4dFoE}&3UAs=(|(hL;BwVFL&NS`l@gK
zf(**=t}HIrbF`<r5^Kn4p0Tu*e4@S{XidfMqm9&2ZSa~YPTf4(K8=IU<*4+kL2~H|
zX!(J~2|go|wG>;ZT^`zA{i@mG<?<=nbxzv<m!&l=n3EW_X}O#>Z`qa|xJ+rg>+bQZ
z=FLIs{(8aqHS-pp43m>X??I|A96Im0wIPk7H?AA=)*C9L>G;RSyt#*5|JEWQe;g38
zdF==!X=*;z!#Hn)%C8X4;AuN?qp-b+8(7IGWQCVWYLdJGtOIO+{6>qCX*G!B?Tl7w
zXCQ}uPF9KJ!We8H#!!1O7HX{oO_JNEH7G0C0@yx`S^KyZh-9gz8QK9+*Rw?t<iZ%m
zC}~?5E82sx@&Y=hBvb+#_fQ>h5rXCl{#Fn#Ya{0`0(%?FS<rA`a;Pf17jm#bLRV&m
zP$Zr)NdT)Rw~!G+E%-H+TTF1W7$s9oDfesEijWaP#gZcF**vL8<wcRbh!x!m?Imr^
z=yvfw(Z-yHwWISqVC`^DVBLiiJ)Cs>1Z;I2>fzFcdL(&^L@ma)gFUhaN6Ul{y%uQC
z8T29Qv&_>nPs+-9Gjl0f5Yl3!UbqEJdcn&^&Y4(m7EVk9cz9bpj#fKOO#?sqX-&K>
z(~1BzOtc*>b@VSSqop2w0!K@oXTzn`ljP)zwab>GY+VDqut8tMU4i<XLPT4=BgQnC
zGm41a7~LrtS9sF$6|`uJR?z}5=;!Bq(oKf^GFbcsaD0LW%9S2izjX!PCj)1VTcswk
zvU68t_Jp%3FBHKFMY&AEvPA>+5|s$nixkz%U8STUzgQcCrm=uc@VE<gK6)#Xh}QX?
zsWt7TtJQib*ZlYQ@13b1eO0|)vX=$wUEK!`DEx5uuV!?6eCX=~=KbROP^??GSm^Fs
z=ByMq{^rf+)(yC0c;A5$i`(l6IxDOlx{saOr}4%9Z<cm`uJ7>Cqvu^!J*qC=Db}-e
z#K`G$&&`27LuYd6!&HA%aS!EA<tS}6m7}s{DhJy%I25{sDwDQTIdGel0P;;HvmXZ`
zgJ#)*gE{g;MLDxMO0%;$D*u<+94+Elxa5?M!!#r}cwfmyr*-J&duWXAopUo<=61BE
zNe6E2Wlbun`pHQp9WR(vLJ6X|2CNUro^cTVpNE!YH}NH=m+V?R<ogbL2VY`{iBJ!l
z+;heLZmnoi%2jiZ=h7tFiY6UfXcA-n((cS%SlZI0Gj>bo@<|8jH6%+xu(-4pU2wWT
zr$n=K>G;1fOjg}svf)xZvxbEuN34Ee_>haTjW~d5pUw>pozG9paE?YJ-8Vp^YVadI
z&ZSXJD;jmp&<NN@DF9a@5^pLlr~+vd)w6g9^DAONx|l<*Mz<l;loLx;v!j?p>5`>s
zQ^elISd}Wxh7dFYU!gG_&<E>DP4(2bU^Fg{*3jAvI!C(HDVL$gmZfml|B1rwdnA`6
z^}>utQrVeB8}7KJtW(Sqx&+y&FVe01(nssj7n#<wXGM+nr!_fN$GvwMl1#3R$wdhz
zW@Sx1-7;dW$zOuDK*--#z{zn840nWgI>wZ^KbM#5b4XnxB~4V|%OPj7z*AIDSvF~~
zV5Nl|b;>TRa7;R5we|J?4}vgT$M4EgI@gzJkLs&fnSX}48wS+Y4I13F%fR;N{THnj
z;Jhg#5RPV=0$OOUUr%X{e&3PHkd(mjSUH2)$hsKz3(#!j6}i&0gj8jCyqfZOszNKT
z2FaS&juh#hD_NE564pA<MM@d+EmbskRiRP*r$<65b>M_66(#kTCuc8Gl6(oVTX)a&
zsmt%XdHOwz>pRD~caK$fzk~!9{nHjKoHBjkf}7*ry2Wd{)w7xgp!+s)Dp=|@AZMD`
zG<mr=p;Q@hP({*4Xd5qWw(c5F#eHQqAbwnjxlTFmP&%V<W)h}C$^><2iU3}LLFRKP
z2^{nyrK$X&Q63x-2u^p>SZ1TMjh%`E3yl)M!~x3ao=in=RT*pa^+`=!ump`F#TaMX
z!Y0wK9C}ZP-X!P#GT3m1(}<iXK|Iuh%(+PdkXm0BX6fNyJ@dqsS5BBbq}zu6ZwwvN
z_}H_mTmSc7H(gPG+mOGHt6e)|!6W<nBt~98_C4|!Qr>sSfNMxy<Ewgc=<Lb;pQz~4
z(4c;wUZ`#=uS!NsKb$q?rN%K=t!|hoS~foN(0VrKN_EpYS7qF?oH<veTxMc|(bOu9
zTArImEzYD-i?eA|dS{V5?BsU`3L>Q}kD9a@U95DFrcom_e@>@mIkVHUq>D|<YL!Z*
znbgt?$7jubrC46SZcwaapNGax7^n`qV3bxj!)PsoI<9j(@97R)_Wnzt-<{y2M!4x0
zPN51L)2R@fLKV_yr?KJ`su1nwFVv<`q3v8~#4!<h4woO%y~rG@(8cFawU~Dook;bG
zX4;irY%-Pjy=K{+{|%0)%Ed3hm2fkEYRXpRB2%_XwJBS#0)F|S5{6)t)rR+>{NHD7
zWzDop4BdK(nQ86M-XgDOEVR~ZSj3g%gtXQ;f)-2_GaQTc=}ayHaV(}dhBX{%r3dbL
z7p?J-b^xwkUjen;^-e%Gklzln#g|ynT=VOqYx)$JUOjeE(`(qpmQ{EcEU(+&q?T9n
zel~ne)b1U2n$B%01DUw-Ld?PIOBFH9F%c7t$+3juwPKYek>go16vdldM%4TPQ0zt)
ziUd{PRNN6mkw_X8ivcWf^#<vEUz+k9LWDN*IF-s6W@b8O?|#&pJVh5LPpg6$N}XIK
z-VUXn$TaN@(&$9)$*A$R8{q~`i8oILa`D%+DDce8Eu8V_!ig8{&D^3zFqbiR$&(qZ
zg>i-U2Ww@wb#|=Q`BOB4Hh5plRIQwWk-6|WFAksUvfy)P2Y)#)3ZJ$YTc&<(V{wlb
z=)@Da-Ma7B>L*&@^IjZ2-(|t)&%kGMUkbj=E@~m+D=c0%dilex;iL{q;-N=7fn1<)
z!v4V7YT<0XMBC|VXbfAeY}Qo?wtXlLKfT8&W|DsbgC?(mhfNanv-##htmY0BUB-~L
zvi1h9o!^S_utBw8mum5_+Ce#^*V^=`YBQzuMYLypqIM^TA_MIjr}HkDunXE~*Ep?r
zvT0r8n#mrPQi9&$qF$)isYsMhN{eu>b5tQ`MnGaap0BQ)hPb13UK;jxdK~QbU*2NP
z0-R3xKb@Fh9JKxH*pJ4J8?$85w_^`)cuxKIzyGR!d3+t|*zm-|8ym={e<$X-;=yMg
zTfDGWr&U)>e0braC)9h7tDmdCC)U4ikl)yO&kI}GEK!`{1-_*Vyqi@Qnc^i^<YcKT
za<Wt%GsC^)s<<}at0hmBGwiFW$ed@)G%wO1PRr!4CcQ5hVfC+<9{<%Q(@cj!v>FOF
zgSmdA3oB!`d6xOtN3VtBs+i@%VPWEltj9-_P{7M<ox^l?SO}wy?Mx3VY;Ss4kv2W-
zRh%B?4qV>+uohdSy-8xcCcZ8*QA~(tWm#*ugWTA5;SRM2ccBLN4hlER1n9I(z~vyI
zNwxOi-^b+JMZhPgTZCOM{Mh0Aa}EAL2L2*}-QWk{hmDmP(U0)c9%j<g!~7cJVU;W%
zEr*2jGdZOw&@Lja12^rBb-TMo{*7#Z!khSYi!f{+otgHQ#R>M55iVDSRU8zj(hN==
z1k7407P^U=BufZ(lwXf&GrFSy)vyf<hUH?6&ty8}Vwv9GFiW%n4P-Zdz|*p;+{Kc!
zj|mB3@t0O&1W@rrS!I#Zp|o8}w7aR=C&?ohq<ZP@>eSg%axwa3QoL-F<<dyhXmlEA
z<fd7b`!y>0GgK-R=-s_46N<%}&g4`G9Uj_b@({dDy`RoAE?~rHD%TaX&8gTu;4|<>
zi?fimMPsFPfiq<gLNv$ADTV%a$&zb3wGbm$zvK|+-i%V|m!-tx8ST=VCc0Ib(8qr?
zV(^c&%tP43rNx+tGs5vc-qjrTX&S6)tvwnvzT&j9X;0!Y9KB)oBL~rvB<*f;Iq*qc
z5^;94Nm$#wr(d_OefxK*>wnk$ezkS|`6Z2w>bC>?^cmQ1zyQIxY*{~=@}a!DOPngM
z0clbI{@P5|XNrr#RwW>0oiyw&bu*oZ^BmDbb940mqM-9$)miNV6DnqUyJ4l!3WT;x
z+NkL!Gv|%48>uIC1|#bea&VdPD5&*vbG>>tle9||sQ%TaIm7S2c9DAO@9XA_Tr&3l
zKUR>Z`(D3xT|@t|4Ub0nO5!Ay{b!B?g@+XHIeXl~Cy1%x=lqb^k>)=~Kisoq0_r_F
zlTGtWr(AR@Tj<hL*$OjhO6t*Iy4T}JA4ax1FJnYoixOx(tnKxT_`hIio4z>5hHZhr
z;1ci$FAaYvn+kS$>9`u&35+>bHWTpD@MkUC3uevD*Tnw?;Dfx(%KcpUi!xl+4*bQJ
zhCh4({ZmrLpR{T-gtVK7{M16^sDswXENoE&?cmd54AZ?sank(74&0*`!3r0pg1Lz$
z@l1jTGsP|;<0H00RxZQPa1op?iYaCOT>LTh6A&_PV^K@ixTK=~GUo(dEQ{Ql4D;HW
z%@>j*E82SJ#BzByw+_}Bqa!`qPOgh&C)Z&F#Dp#|OUYdB47+S2*Tsj~IT=4*WTu^X
zvX$>eXSLGV`o%a6)Rxgn#*9wV=DM*tD{jm+d*Zam9`#V3cDF$kgiSiVLqc9GkQ5{J
z-2Jx94Xp|#IgbwO)@4@3aH&D9zc(7&8`Ns#)Spkg@=~)}1xA11$pDRD%)f92Z~<Zo
zCDanL$Unw(X!dq4O&v|x*aaF@E{|c{f<`Nf^AQ(9qZLV=NN-GMWWkEdU%ZR?YZqTj
z^;BC<yvV}p7Pe(bo*MysbUnQvV;Cc`baUFwX%><#fCD|R)%??{;bL<-WwyG+%$=*W
z8%NkO=~(cq(Qr%JLUbmU1zc`)Q$sk=4pGO@w4R18=!~oot=8oHbeGD7tjGz62<5cu
z<lI84P6FLG;@X2xjvYkKs3|OuCL@~vJ!;_W7p8Xp<mO-WtF0RHDgWs|$ly0TS`&}^
z)<Z=46<8a83yIMn<AEwIt{>tmxz5<Jgm<%+3lfS1?s+&)H9N2bO%hheQypwxjA(Tb
z*%(>Cw@{+pe7HqzaM&S^4P02+U~#aava}zoK+y2T`5INuq*3xBSAY<9(cpvRrMJGp
zkI)eu9h^z7kR`69+^O|=>u!=0$|@<3w%ibbdBHjswXc%5{d`f!QCp|3>ZR6`n{N8~
zU3bo(w5;RRO)oa>y6T!SqehLr=1QWHg1!U#jNxmDjg(E8v}5TX9$EBua>SOw6K>p1
z62$WHp+iSLc>lN48(!WFv|=?c6R2HEB|vV~3mT+_iIj!a`CvXZjQ3urmZ;r<BZROT
z28U!}+^WFOgaLY4I0{p{>y1+2p|{m;uSiC?$cAXCnK|EHvqw(-%$7EVJcQ`Q6T*8S
zgDt@GY$#236ba5Zr1vmn(F$z<Nk$hEJyU-eJI%y?FhmM6<Xia7lQbtioC9Z{-kByZ
z-UO~BTIP7`oVeDeoANQg#n)==V}MFabolL*NAUJ)+I@xFxFg?Q#PQJF_^gL<=~+$x
zzu)5ylS3lM-a{+<u#nK+!u#LAdxzP361*oKrf(6lSJ*FD=>63>($$sV4H2@p%i>=S
z4V@5<A0$5Y#0PBV$9DLfQTv>;F5%M)Wc#4PzuRI<h5aP@fp@ohl70^FeeEO`_Bp(X
zwUD`Sb<X{&flbfA?;WMThcmR;mCM-Enc790h6hiO<+Y2R9#H&=aQrZFsvo}V#ivuB
zwfQcCCc&Q0z!$7t7N3Fd+iDj9XztIv2h}v`3}08j!5MPuanVTOvt}VoXn=}?E54Qn
zEjpEjx18AhV4R<B0i5DEmz)$P2xqZwwbdQE=iWd2wiPR9-L{-R_0WCyJ+x}YawgY$
zf?R7L1swPiU|n!^E%zxXyU0H3IkJDhE3dqN6xoou<2c!vxgB-pmgB=(p0&GBBW$;F
zvxFOkqm=$^BpJDtT>qr{HxhgjN0Bv-Q=eD2jHjQS&OI+o7U^1Pqe{qh5>h|kNG7RU
z&f-*(@#^?|bprCwIKW|(?f}?}n4rQ@fVGj@L{}~|Sk8bN!Q(~+k(GyBblhs5U%fF(
zI-J?};+XZT*6a+E6RMx*$=}t=qJ5h-G(5ERzv`bllJC}rYV2`CgG#~^wvBwXsliv1
zC|J8?Tkl=HiSsn*!ymunzY_P-`__T75P*Ym!VZxV1w@;$j(5~7<UNv&{8wH{mK<2J
z{H;}b<LbFfjYQyez30zw-pY@M#}U;^{?lATHkVJqBYW=-26ddaM?j{I5y#*jsgc4G
z9-rI({{hO|C5iw50RR910t1#?zvWn84?Oh%9|!;d0002pfXw9p0002x6Tce&^8N}0
z%?JDd000O80ssI20001Z+GAj3VBkFaXEy@_`=9@x{{Lq=%K#KX0WSd0J_$Q`+I^BS
zNCQC-MQ6`L!9v7FEUd1u5D^Jh5(Kdl2@1i&Dp&;@36jDhMGz4QViAzTB85o65JW^Q
zg4kIIu?!YsX%Vmx3$YO6pW7d@9OA*_|C`;p*_&DKO%?@@SCi=Rn_Wx`%)(EAGsc$?
z`vPUKg7-^Mfv<vu&5<_9gKMx4jzI>Tf*r2ySs&FvuH1kl>J=CT0cd~%DAFrwzH6;}
z`WMzHa=qbb)ybJ8^91YW)t=dm@EiK?8_->zUGuX%_W`}eL$C#I>DL+0I=T%WKn|2Z
z3XD;e8fuOEO>fw$lv)1?T4yh`<^uK%L7%baL(zLP!?}dE_fZV<GE?v;&?J}xZPw1P
z-=W<T<><c+l4<rR_=kcshc2xc;>;mV-I;|8XCa5|`(Fe+Z$3sC!|i{Z3bhm?#T?b;
z-W@Uh(D%L{k%4cKu6pMprUTLzQ6EBc(d-gE<dO5d0~fsOpB9~?(fg6qT=-3p)$by<
z<~KVZ{;J3?Jun_v0001Z+GAi~&_RM#3~LxCFljIyU=Cp}VxGf%jQItN7E2II0m~eg
zZLEB(eyq#bgxJ#9F0nhYr?Efdh~t>Uafjmrrx2$a=QJ)4t_fV<xE;6~xc6{>;)&y#
z#&e06h1ZHVf%gQT0ACK@27Vd-BK}tbQUVbIlLV~<a|GuIo)Y{eBqHP?lqOUsv_e=x
zxJ~$kh>6HFkyoNQqT9s8#LC3BiG31J5nm(zLn1-qgrt(>G|3-QE>cBOFQlcU<D`3}
z-^g&tWXS9Q!e6oxvU}u=<fh1NllPEsQ4mw;QP`kxL*bcXli~u!7fKdNeM(=HWt8)j
zH!0sx;ZgBZnWnNwHA?k|+97o_^&a&{8ZH`VH2pLmXa#9q(^k_i&_1K%pff?|fv%12
z8a+O}Y5Gk1MfzV1rWhI+1{q#5QZXtsx?vn*JjM8)Ns-AP(>5~+vuoxPEPO0}S(aHo
zvx=~~VqIW;z(&9(#par=o9!t(HM=&u5B5zCJPv*iha8n0n;hRbl{uYrHgn$RV&QVm
z)xtH&bsY}4$Mux!4cBL`pWN8oq}=q}eB83!dfb+{-2%c7?rcEl=3e360sy>|n56&!
z0RR91=m0?g1poj5000620RRF3761SN00CD30001Z+MQI(Zqq;%J&w(zP$Jk=sA6Fu
zRH2HzARrzU5>TZArBt*PuxuV~5+$`m><}Tb;v4t`K7vo+A+ch^juqkySaat3I<cb&
z0UFKt+&lL*=gt_wij{{A%UJ^8a>m%gI;9xrkjEp%Ha75Fv4h)qtN0jJ@kQ}*tl_8P
z6WE-_KZ$i~SMd@qTdx(L!hP$V;?uZm{ZPD&joc;0XRM341I2mVu-_;?iwpL9#pkeW
ze^vYeEB1HAA5pe{DgK1Kv!?hn&O6l@f3vab)Nv03MDQ?zkA@%@hbW+nfTNGcTq8~w
zd))UC5^YoVMYm1+HhLK22)o1`q5<tjxQZgmsGy2F*uoCS7Eux{iIqeuWFq~2PIoTr
zQ#nb<U1RO0s`%H;J;~bOj2N*&3y=FIN1wWY9JxG^;i$vhhP67!1LjL2M|g#y>^v0D
z4rBUUjqIbf&~lTjslFrC?^9~fH?1|bx@gkFUEtr&_($qrWH%#@A#ZPqV<MwSt6BX;
zRus^-MA@TlNh1eDi@lHLvd<!f)QyGHfM@6`mo>4Eq^pL%h*1om-jwYDzb(q9Kk+%o
z#BJ%RIZan=_sCzJ-yO;7XCl`#5w1`(e<Lca(@Zy2SvK#i_b)kna<iJ+;|XO`M|?AC
zd_7MDN94wx@)RmlA)}7yF{CzR&QPKiS;>ejmw192EB-&PKfRIkjebVlB-;r?6?qZ+
z-1CIPmTIe9%ecuJs<_4V8YT07%AD7w2ZzivmcPZ2m9+VCCQ?&h7%nhIy2CGM+oRs}
zckmmJ<J%5++HKHBOjKbI!14dUvI|S^Rk32%_ulSOtn317$KERn?5-l<;;PsU*h@4f
zdeYb~YV0){^`OSyVu^b2Y>x-^sw?mF=3IW6$;>1(M9>z$oz(Kb_y7_ikz$c3BC!yK
z6&umSU?-M1;z=NpB$7!Xl{C`HAd@Vz$sw0K+R>hTI?$0$bfybkDWDtO=|N9=(VIT>
zr5_qP1`eFKD5QvDO6bo31~Q1j451V^9?B@E0xv@u#&AY3l2MGNk}-^B9OIe5L?$tr
zDNJP=)0x3cW-*&N%%w`K9HEsBTxW0is*UVq8~ZuNQL(X=ceJoaq9ukM>|-;xcrSJi
zaGam~;1`EE$$jo}ih0au7u7tZhI>5VDUW!}6F!DN_=0CV=QKXPvzynv<Q0BC^OY?u
zAizQvQAa%oX<#vp1Zg6~5|*-zPb_Bz&8%cKtGL1;*0P3mtmg~gxXKyMa*a2<l~{?B
zcu9~%Ns?qqkyJ^ObjgrR$>JR6xx{5|bAgN8VG}1Ln;YDe9LZ(7<XL@n&5eHD#4vH#
zLiGVn)5=ZVno{K+L#g^aC4V)-14><KC>=_t(xog^7AcFB|Ms~}b+uR5?X>}4C|FZn
z)#NuzhS${PwN!+H4Q+|bTlNQ4#h8J3+C|R062VXq2H+eaB5p~<5rvtkPf1N9nlwh0
z7>$=Oql!kM;03(IMr9OUjUVgi_WNgVH}O1>I2j4qi?k5poE39Rr9*PFgn}iCeKsIV
zty6={C?-?Q$d2Nx`6#Ims(`&?SU@#lQ~+ztC<B!NqxN2KVK_i-!>9w!l+gg{BSsTw
zw7(G4;#ay+d^cL6X_Qo9&bLSc^mUJ#9WYpF`e0|G>4E-O(*?ayvkkgSP5HT%KmWIS
a??ejuPeP3Ja?L&%${#Zd)C=I-X72#JtV3b|

literal 0
HcmV?d00001

diff --git a/addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Regular.woff b/addons/web/static/fonts/google/Noto_Sans_Mono/Noto_Sans_Mono-Regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..71ec0b10168dbde8749d8d05799bef05acbd7b66
GIT binary patch
literal 22044
zcmY&;b8w|ku=a_qO*Xb|I~&{9iFsn%+1R#iTN`a`ZM?BJ_Ltwi_n&X7p6cnRx@V@|
zo|$)Qrri}KBmiK5ucCnu`1YU77ye)Uzxw}QBqY@20RXV%FBbnll(4nYONxn0d~x+(
zy6_i(V1Z!xl1hrIU)=SV&iw_YB>o^-Nmcb90021k7tj19nUBa$Dil?jSOEYCt^fS~
zgAJ;px(Ue0;frhkvJ3dax@l;Mhl!gDF#rJdUt9kJXku6ma|a917x!fg*6`JynQAjr
znT3(_mkvYzWe59zK((;-H2>o00RV|A0N`hc5pSG{rJ0c_03g5mWyAR&$T1fbEWbzq
zKmqkjC;kFCv@b-7CCJ6&i(~%kL-uP-*|6$T>$dhLUv`Q<U)<mq<|pB*YC%RGU;Qcz
z|DP{0I22fnoe{|Fivxa*jsI($_&~Kr9S3`77XUyt`^#_tiy!^9tt#r^WcKB&9`NOx
z@rA9ROeNwk`9Bfa%cJ}HwgA9pz~sSy@&LUL;IVE3GzA*(m;ixFV8#T*Ss8%|B9K4D
z1LGq^qIY@Xr@)g<z>OuKIf-c?e!(jd-~#m#5ut^7plz`M$!*}d|LYIjF}^msHUT<1
z-ohEh%hb~UHd2yil9@7}osgy<H>n2#!77cOK8d7uEWp43mTD-89_y}(6EZ_e7}>?r
zp`;WT)$^f{SOcMuI%0Y*=nMtc3(XwuOgB&??8Snpb9L7cZ{IZi!VO6m$4|tI=Z7=A
z4=4ZJ20-Trq4*3PKlQ-IJkcoDJEs`_+2O|7E@=-FK{03Z<Vb$fnGH^gMLKhF5q_)l
z3KqdyPS^=LH5ONUoQ<+=9^QvGSfLCPFy7`PiyaJTzitDTGV8bFjJDyNPx#;uNmH_L
z<^4UP(OG!4jr4W=@y@7(&aM{DTDck!18Sb7Y|`2+(!ku*yp(H?)$Fb~C&-g|Rq?Hg
z?mS(WEMJ7zM$%OQ8JAO@d6+N1ZJJJpC)PA>BM@Fw<E=DIzspS8utJ>XlBR0n6;5{0
zG!bkSvgr;Ts?0DJ3K8b`A{BRc{4`b!M<$v>fpX%p13-eyfW-r#zGNi0)>rUk|5t(;
z09e8PTL}nIaF9@t;NXxu0Ps(6z}x57l;r_@%|A&+MM<!J020L;B*VuB0021!7Wy?I
z^0rsLys*K4f3-ynfcP(tK%jX55C>WU8nqq#FH6ufJtAK~GiES&{4kX14eKJyn+2kI
zHIR42MKVxUL`+0RL_tJaL|(*jK!(J?D5fy+H1G3sp!6Etl>vwtRB5J!suZsjA6VHU
zrZVyN`TAM*8TZEYa`hN@bCm@{MTGC^a6J$R<4tt#Rev(@8>R+@{)(vM9`}@!6pRe-
zmn@JIJsv2c+27y)dt`cGe0XYTVw8!Pnw*}LmXeW#hJt~Nj;b!dytulsvb46KqNJv%
zs>~i}X=-b1ZEj~|Wd<^_vAEhf{(HW6dU&~ea&WPKc0`1Vje-9S7n2YT=Q{y99#&p_
zdh+D#+}b9e>vB+uY-){GuhacH$Jw&|pL(m?<%<os^Ysq<s}Bf73agW~$0|&$1Hq~>
zqvOmWrQiMW+Hh|A1_VQu0#g-G#BP4?!O5u)8IrLEeU3+$Q@UL^$V4U{FUKrOr7sTx
zVXeK(AGr}pl#1zs!A9%d&(1ipdDPG{O8^#t6iitD|HVQHAP5i#NCVUX{s5h?y3|)q
z2Ve;B1&9LV0Ga@mub2u0_`miUMt}l<1l-eOU0=CNL01HI6A1+(@YgCa&pJj^M*N6(
z0TkS?r5IyVzR&|$D=w#mC`T|N;XpB@^*WsVf?}yGXc8<bpC5uG-`H$^7P9m4H91db
zu*v>TsB}NEnNd9=k00EGp5lC0kZNfHJQkmw#Y8s;!|2$W-~D!d{Xl@unoH)h1{?_3
z)1ctU^9AZOmwn8=!H2!R5#91(H?uF?E%L&hkU$=0Im!lK;Y@W-pu7Yv?HV&P7pIr*
zF$$Hce6+D2Sx?lrB+PXOv!OkYvkR-*fFLtJ7D<+F9Wi9%CrTSQ)6*M2$k7Kv$6eG_
zTPB~@2lN}8j)B3nQ-Lt6LmHllgvcnA81rr9zv+?C9*nDg!J;MM!}A>c8UH92ewO++
z(k(5+w;$F5J(94}pU<h-^vRzk53(m1eA31raPPyB<$W3pTgOH-<};=VfD`*6q5d3(
zJJUlC{a596MmRa(;3m#L2e$cgRg6Ea#TA)F1J=uL<Ilf|$S#eJ>8Ky>_LbJ<^E6Yh
z2GhNx5V?d1Ln0;vSu?L6GJ!Ar^tJ4k$dIC5Twb4rEvG-Ly0HWssTTSgbiS6`*KQ2<
z`3XSrSnu(L1L|s~9QRyVZRfdZr<zK)9#FK}j<?#5>Kc!_W&d(}_+_<huDIY^K(~<7
zY9+0?K1ihFrUQR94u6qM6QTlrtn^gE4#DQrnh}_Z(;7H~QL6mG^Vmx@F1!Bk`F26a
z%S&gA=P1|v!I=<EDjRj3oL@oAn7js_;-t4*S@V7(+IaRepNR?HK?(y+@$ANB%M!M4
zDXq*ykZ!m{O+#j+;yI?ySKj08e4xEP1~u^Q^bgUo@~)XNDQ9ECU!)Lrx*#h?drT>|
zlnbkjY-O<{{EsOeabs%@+hv}$RE_H8jy2w_wK=_dZmFDFZO2*jVe6znjRoP<=3vOx
z0-%eI*ytG>Daum;ZI<UMyu{tpkdt;B{i`u4(gf6h;vu_mFRm~6{Q(|G3H;essjh25
zmZX&WO}1l7Yssm@Y)}I~$hk?{F~~rS*sFBIh-n;yOBj`BCnTT?4}v#u<2J5G$0u|H
zM$8H&`oTJ{U1Ktb9Oj5QtHe5Ry<0(l>a3~57>B9uaqHlH@B(!S@7ro(bxCUo?a<>R
z^PWIpJ7+u%K>vne?t9Fxu9wFIuyu8pfp(?%pps1nwjA9UKudY1w`JMLK7)+odU&Ya
zHx9daJ0P7$r1-*rXukGWr8;>|En>mEqw4fI5X;{k>V`u%m*^>No9bG))@ce}T>?cf
zRRH%It(L_GIb)~)DzoLO#$m^KYTcLfDIiKf=6o(H?kNNCis(Z()(h2#v+P%<^O^(e
zXU<va%NlkxOp-=S8p{Y5p+pcdqJ#C86kZu{*)eU)2<NX&_IgXPX2=TTAB?f}Z%gBL
z%NutD&(2b7$zclAkacB)Z__Qvq0@KrvU*>KEY$F?>)QSReW-4*Z<h-84SoEsqYqtf
z&_5AYI#J>u8tLnNBVUzTgtHTf@~X;M?GF4q-a_OQH<j*!6KNGTqH|+<f~yrR7t2G;
z`r+Sl*_-*pZmsV#rmT^ptZ6H{HoHm>?a5wRfHIJRRoD?Vm;yYcw-<(m0Dgvizp6|M
zN;=Oh8JA2X`c@*yj^_`VZV5ljsP|6G0FrJgO#0@+9F*zxGsMVCGLuZ;O-!$;g>U5o
z(Xnj_4--EQzkUwEeZ`4yRyd~}VjT`|_xnz40U23V+r?UE2~FGMxCsM95O>2+y_cSp
zg4q3bRE<7g=S1TXI7w?qpr25yqpNksZF7efXj?DO2~B|H=tFgt(kEOiA{;V6Vd^hQ
z;v=cWs3YCVS-@s|o4AM4pU#dSs@#n0St*p<F6nCpqFj;(X3=W4_FWiQN`ruK=(KMk
zLpt2mt~5weM8HK%54Qn{yzf(6!k~OftMX8+UWY#@Oh4yCLZV3FHj%kmQH!G&=TfGg
zI>^U7n=+<jO$SAr*xP<RyAB1bK5;czo0_I%TpDV=&F<e$!^JFYSd^ApxXI~zoeW#V
z!7}Atcs1@J?&mCa2*Fl`tVn;CjyL;jkoZU<A0(Aj&Yi|Z!jpLy;32ECoTr@F+Og)K
zf`XR}Xp3+D7FJd)D-BkQ$=&QwDAi9{bDfO{VJ?BTEJ*QPZom>>OgPTgae_mjQC0=t
z&jUtq_lD$^U7X_aC}L~xX7p^wgc`le={|=*AJNeypDrzQ)HHITKX2-<3UnM-fKQ?v
zwn`QB$ntiNU;B|*k84re<Ge{v7UO!S{lve?)tw@~&W*OEQETf1b(jShE<{Dey5o(t
zmo@dOx-Caz<Anmy1)YSUjw}oel|~E|UY4Vx@;}V6bpp9%%JyRQVfs)c)zpT_T+XV-
zI|lWzLH9mCJEC`bpB1?vawcXdBO}`)u9*VtA^Ua!P99f$_2)}4-jzVZuE=RA<#Uw(
z+a^}t-iklG-+u7}9`6NL2wP;s9o|n*+Osshk+N$n!Z(|T`@OtK``>R|=Eudtp@yh1
zB)NLTDIAC3BLOUCatG%4iae#ZihOzeop$eczm!RuOSP5f@w(f}gq}QJkl!xZJ1|Xu
zTdy+V!B#ifPSUCgQJt}Q{!q?Ejq2c0gd<d$L!4ckZ#;;mH^pE(2iK>xZ{6`WC-a#!
z9uY-g;i7Yk^|iok6&e#*y<hNW`#5jfZ}va0G9>Ump@4q0IjSw@iqDD&T-<Fz2$Jz6
zBMU%ou7>lFrE(yM3>h<nfZn&cuQe&X9*aQHH|KkR{g@{EYjG#OKD><TnG)&z6fRqi
zIvZV>ge_~6eir>oSTNzoDKG^DzU2OaeCciYv0($F#;IxTGd$@3V_{d%-+2?M@1F2!
zfQZfD9|Y6xN1?3<7^2?={rUBy(qrmgokLus?;6Z&qs|kf-Zm6Iv&cV*?q--)@+2i>
zF|uDk=Al-$E)1b~F_ev3_}q7MRCb9uN*0m*>wY?c2I#fYfBEDIdc+#tU?_I@DCgvV
zi+d;R-!AO^d&X}jUbap+2wds7<h)J>25*O9BB@SF_|g_$&lEB2ZTlVzAgba8y$2+i
z!4w!9<xAp}N0$kdvs`h?;ZT$38{vMMLgZ)oVcqv5QKF&9L+?Oy_0whoacBZgScAw>
zMTExGj42bS(o(>CJuDPX$9N#AHeXwoh^V)oeom9BZ*alGAZPas%&%A!T&=ar+q+>e
z`trd$3<uhQv5s5SJO!A$6=%R%VVW9Gn&nP(-NA;_0f<lZJ<27akp_aO1qXqN^7GYO
z#;z=#W_->N$q~3FGAY9fr%|sGeeFh54l|`l89gf(JwESYqsP51hFbnhK>zLQ{!-Dd
z<xP(FdOO^m%z*o52t8@1<iF^!X|N8@XpGX?bXt>eLgm;9L0Va<NEXTIo(gV@*$K(0
z{im=b0my6st#Cjj93cK~%v`#lfiSsT#ud`6qS)id^|||m0Y-j~4=Bru%DWbF>v;dv
z)cA0=G^UJ_a@h|5bfdf1><9^lQAg<C9jHwockK@=r^mwG>OWh?l|HYlyJNR3Y!8=5
zGbxKe)13l?C(H&^t~Jqr=6|g*T%n9P5Zsz&zk@%(;Fjbz+X|9xuttuDVM=b9E@Knh
zo7);m40_LfgX~Sw??=#Z1%s4!W97Hh*xMsbxi}xAKpH`;5%PGtP9=ID%WoRVOV9sQ
ziLUY9i*S8zaUXG(^8@RN>CYo^g4jJpJOPP%@da+#sm?;*x#0zDsYg@z5Ni(oX~usW
z%rl-WY;NH-J+tcBWB-^V=~95ut6kRMwQ1qeuN0B|o=3R4d?^e?3H@A|Ud-PTAhVz$
zOwmns8HFcn?c?<X^c!`t18S#VGEIBV_k`Q^yoT)y-@Q^T^HiPO-L=uD5%73H%<CjU
zfyJAIcZ6vShVe+)4_l_waohL^I}b;A@s5Z5Ky4pQO$cVBfOl~X)+-mUBLC?m;_#w`
z&_y90R~w)LA>)<0y2;tB9IenV64y2JeFoA8&@ResP8WkRtwPNGa=d=&QE0N%JDm@-
z?0M){=OXMnUB1Yolqgk*z04=LgS$-zt%Yp{Z`ATSjZZ0F;`DiV-4@|Ff?fa>)>?QF
zry4z!C<%s2BSj8WJ1t=Nq=R5i8I)E;?~XTZT@{k;c3$V_F@vtuWRd}lg!xh7VgtE+
z692xbPy&)gxWuj4lg~Mr;)l)>P1^HZ`a_95O*r|7f0aNWt3F}=R55QUF$P9p_v^xo
zRm+8NLX$tz6teM=wp5y_u*yYG`qkvi3FuHLlQ0Ws=(GOozh615>vf(Q$%-TB_1joo
zt#mcfwY&GmwXX7p*1U76OZUARdlFw@+gLH=OkZbdJUJc!=?4#WOe&c$wS;BabU)1Y
z=f)zdjKeIEhx!0TZ7G5)(M|(UDvdeW)vDrAaIyE$gc$~tgR=pjSRUPI*HQWRmkx#b
z@#dgJt>O6U#DKrkgeA!Jc^vTpebr0=#qe~w;`l6>5WRU3bv`wY-WR*h<4E0{2@U-o
zMl8kFy45ALZ-~7NzA$xvoUT@<V{A0!=ec709*Yzigq(a>huV#2ghe-&Mg`lA>OT{a
ziq8$H`nPW43Dq|WMp~4`zH!uIp(QflumenCyj6TGVTf5dBY0XmVyh1&(qjEMX7d0b
zxo33E-*;E-c9`ikj%<1>!r8@ef3XdwW7C`ir-sgPqR{U%Nee=4^ngx3Ge<N*am1=`
zf56dVtzZ1Z^rWK(3EQD>T$Z2D7r8`*G<<Sn=XWRj<flL4qytQneGDBI^4PX}Wtue7
zLj$@7lO;a&TU1VW?34YPRz>=r-%n1M3I|xPa66_k*DJzpq6awy-46bKrsuqIVXT-!
zTk1i6z&Y}$1hdz2RydIpJMDt?dj8_!vWZixV2OrxhRXm2vi>qp`{PNX6pXAdmRLf#
zb~c^0nco%|3chq*x`jE&CE|wumq>n_+cJdGXd!vAT#{^Sa<1pK?)SsvFRCnWKD_YP
z<*TjfV`?A%9&ayGSy|O1)}}6Rd6Rcx3)#oUCZXl!Y0t}~LF;(3n&K><lxq+w44JF8
zj`Tnh`kjJ?6--kxFPVGEccK@20bAYjT-<dcD{eVw7OVP6nx0B{kNui1B`EH{(XyA^
zHIOAjzXKPpjXASUuGx=v8xAisyON+CHoeAdiPJBHV}xZT<+#Ka5?{5Oj_-z5V<uJ!
zWf>rltxpqj6923gxwI5zi_GEG<g~5D(^ilRy6t5Ip!q<l$MvIi3JOl4;}?6(KkvTQ
z_4KvXm5MNtQ@)0|E7V-p&zrv95TxmQ4{>ZPD;i$UCT$a7v*T0+)l68vBM1q--wZuk
zoV60HcYlWUZ|hdI`s~(@8a$1W<<%O_UCVsDNZQw*Q<iYg()A}G|I4=Sh~y<32~+}3
z{AdL-qrtBe9^0bM@#Rao4t8U#9jmxl?gY*{I#xc6`dI-ZQ`$|v*1_`P3Ci;PZ>Zj?
zMVC8FC#-ttJ56`l+Y^C4C;U^_71}$5inrBpL^s_yGf`p<+yQ@QR7C6nS%b<r7RuC_
zDV)t4{Mw4FDePX2H1U%XS9o1VjM&c?W7AAEcNq+XyD3d;{x4MPZ!eW24}Oa@T^a9B
ztiW@a8Yih1k^$2lUU;9qAN_IMw@BzFtGpt=p;;S~oRhyhps>k9q_6ZxFdwT8oBl%D
zb8qy>!;i-x%j{Hcs}?1upsb1J$4-=MXgSot6TA|9uiE`kS6w0KIa`<1wC~-EjQC!Z
z^?<<SZ@1(Xwbkq9bTypB^;nmE-pe}#+DXZ$IyK7kW|29Tc)A$jSqmlRiK*-aj?~AA
zpj;OQ5l6xWOrQsUcdw&%qzh;w+UH9faibIR`M0BHJRBB0YM7%V(D49)G6$j9x7f`4
zJS#Bl9|4N>Nn!Ss2r<WGavivw%tD24D*ug(WuUjW6_w%1#F@+t2*=xX$WX_F9N*J~
zBPAh`$m{q_n(^_dKa0ESz~=m@P@MUgB1hWx#oCEJqa3`iHkH$7Yic#;)nXIaS7np~
zl^_&l{npcJT0%U}-u<XNEjFj9Us?Qg3-12lpZeY>LKTu$_PKJWP3hcXlc~+#YC5`e
zFX!bZAYnG~Z3QAtyC>cCW4L&}Wao#yJXRmXidEpf%a9lJK+@#vnpfn38NHO9khO2c
z`8QG+9sNl3pQlhq6DPwqycF%YnS2U#^i9%t`>fs+!}*dU&94-9I2c^mU_ige{O<^r
z3YeR+|3oYr+2}}^n&0k+x|Wyk6bxM6Hl{Y)eEdg4QTXL76ntB(<S$?@>3VnHE?sWO
zT+7t@Ca0Dy;umB%D^<ku7=B_(Ff?@Y{tS#4A@9c(yN@zL0qHYK<)tKEbMuM@v#||x
zg``E*&80T!yXZTnUIj+&?qc0O1qPAUoBs1^6>~sjgfx%?$|i9kPzW-c{sVVbhP;-&
zUO#mmK$8zV<p@&sx*1Qp3xgrVu16qv2n2gwvtNhV$$S;*>xExwPGBF`&6ok(n94VU
z?H^|b!$dyp*Y2nS#`jOn{ecvQr}+GcXwWr}CEB`N!+%A6Un#uZt5SPe8nWMz&XN&o
zk`WS3{f#Wa&PRsJ$k&#)ODo`mC9Th+sBuRwUS#h=iT89^VA$t*ta}z{?ax6_q;eCw
z*WzM)#FSvCS<YWWHKEo?g3NDVw8MgupDM-fPDu8&Uieg-UZ6iXVR5xSwnAJqcuwLk
z;6L?UByXw`GiMKM_r&O|8XGiOEUJF9N72_AQvna=!+gX3#OW`lKj$wbRFih^VBoIP
zFyQ%W<s`GXc8*M?3Aoc1Sv;AjQwN=sOm;yIOqkZ6nrQKa3d<792HMjM`upW2cRb_X
zWa@HmxU_+~^^X857sW(S&|UYvo5Lx0vRM2|-3=J_!o6;ZNC?Zr>1Gnem4w1v*Z|Qx
z=GjD-y?<IDY>YIF0q_}fEylyxDMOyj8p&QMl@O~t+)DH*-8d}&nkI;xyfy#tJ(sp=
z4mXmoQE9=G;yiQo*<cxT2}_leEmny^<9hBor4|@b8Bo>)m6P}R2&MzvEkIUQI;f&$
z&mZ@bp%+fBOZlj^XnG%VX$WG%6Y^^9Cq2W)KARRR)oYFS_Q$Pteg|wb-C{GC{tr74
z%`afdpP7Ul=v>;`Gz6Q}1Po>;$28KCvd|o0KSCoHqV&$8>uJB6vLPv7x&)}a9TM5K
z-}c95)Ffra!ZY=Cex~j*oovmy?u$<5S@N`{&J7}a`9vMkSv6nphC)PRDzNF|#mOKb
z?t2R(VTujdiW-l3NppfplTWVVc$?-m$1__?c?r7K3ibNyx-L!KQs0fnY=30;%8@G+
z5mFX)n@W0yGk-rB&X13Q)ln)huAHlB`$ye1J%G`+*Juns0+1`-?_Z~%R0KOQ5aB1Y
z{WOJo7JN2z_p|!6V9Z%<G~Y~h+&!ohil^z7vWXJPPeZB0y%62nLVP0++^V30k?u8!
zD)2z<CLT<dnW$xx`QEQ~Fep`;2nlceQ1lyWrA~4^=UYuK5M$`sX};#^jb2V=#>`MD
zvxL$A+xBg{nIVtPJZ-U#YYs&W1hhSIW$==s?N;BFqpppvVs|aup7)G+IH$z2ZD*0Y
z^KIjSdT*8=(blSu2{j=~2!8JROYb@X7H74zL8evJy~o*^m-QpQ(QAu%i)?gp+9-o;
z1B~`xI5mi<g`<0DOms-`9Ikq)0<a=Aa}Ga(M+y<0=Gi@W^N_RBvYD+wG&o9>^xBbj
z%h<m;Qf$H2;bW=Q=63<GP-JN(rl3E^U^byV+sAtaxWEEPb)x8L#M-RWypE?%f103`
zl_rzz51beG;mMZAz55>lGsOD^ezndXI;+V`>@=>E<H=E)O~EHh+|YgvT8<1q)i;5}
zpKpQms_5ghwcg+ca|GQckBaVrJ2qLXy`BQTP!J0TXQAVLNj}&&&YFQj0a)tg2(fa>
z<HEF>w-Xzy2Q9@)A+nDP=>Bglhp-_7X!({mLPFOsR|floJ@6skJI#fUAIhA$ejgJ|
zADojjS-af_&3ljU$`6A__8)O1-1futpmJJ(9S*-nyV(r9R}oY?RdEFvuW6{NxmztQ
zzYvEkm_&XkOmI1?k2XuF2yBpsk+(j@4Dl4SjOn*IaW?P{P6>e^V3aH9L_rI(h@soj
z=PG%L1iQG!JHW^AeSVnCz3(QfOVjVkZygEOwA&T5A$G%)Z}!b{ZG5@bVDp`__jQ1B
z@W3Q2oHSo>Ry$qr`sW(6xH$6kX57co*4GL5bwlXS^PTD)YiG}sjndyd>fB<a;VbpG
zR=5i&lL)3?^s@TcGt|&{vbxmJ(N?fy@NWReVH<!q71P__vWGVZgq>?Juj2OBCxla~
z%1znNF;nj<YclM>Q5NZ8d2ZQE?Uu*{Nyh<V^F3I3YTQu=LfpmoVgG!0j6MnPk&x-}
zhNe2X+xOcn=ht*3vtRE+Q&teN?59Zd$l(0y%)AjeXLzjG$+HF#IIhmn%qocfeb3_p
zk8dp=9&ffoPlNc;<#R=(F#F^4f4y6k9x*wfAhtWufjpBy98y{@Kom<2>UYe2oOauR
zelX^C?xtW!M=N2RmUel78n@QuINw#r5tYyysgM0zjifqWgwBA(3nxp!w8j)Y2ju!P
z@<ae#4o}ka<M@n!h|Y=Zu%K7@6SiMmHXpSu-=k+gm9QyG40tq*k}PZi7l|$3YX#h4
zRX6c@p*yVjPB=7p82;hndAh2JXLZoDG<~Oe>WE5!{pKX~y^Hxfm|<f|uLJo~6F(2x
z+ZL;UF~XJki)-?5;y2+bTqm;euK2=q1<fDO9G2mMRwSpx%v}KqY1~OLU@j^8lhEI)
z*l;ktT?2gTgMu?PzB%v)yxFzZ+e&O%-Zu8Du!mqq=mud`M~ZVkj&Vx2)@z*u#SKQN
zC_HyU#Hn5@=0qg@-G|2_<@X!(Uwhf?=4!fK-Y=&lM<34DI!*@45DWc_%dE)XL-$P3
zvr5a_6l(3zhw=BqpM%@4DYcl48Z}!C@#%9Qp9-Qy#f%y_c)~U4nTt1mN3Q`;AoAN)
z`R$@3aP*Gt0ypf9D}v%tY!QQ(C{8?`;GULr(ac9ZLNgDz<m{JDc;gH`mejEb&p6Yw
zAGf`?D>(+UW@>7){5}cXbF=Xarazx+><N|cInE~_wb1hs_(RIzZb=2=y5c-VqPH{p
zi+6VzcF$9S<g*m@+Fa@RxtmS)DTx<$dYcySc5+;+Y#8}nOf{#}FsxD`GBdEJDp{O@
zII&C+CD@=Pur1A@GsU^5CZn~0&f}%ghs~8{s@QP|Uhz((5L3{xv_*Q@G?Iv3;XU{)
z2&QMRR&E2oAugOW_59k`fUAN=b7pY_-KRlGMMdrcQaSFq>DBf=@6}d5L%wZ3pev25
zHkpQd$n!yB9X>f{UH1BS=t*oIaR!rLJ+=;qrtZ+PNwZ$RR(ZWv2(KCc6%MZrfxH)q
z#2SFBqtiatx^d@jw`0@@58{^H_%l&$D$%9e&cg{dQ7dPC%pKkn)4GIzr16I526kf>
zohHbxx;k$VCQ8o~dzm?hZx`tTuX_fy_aG`J&$J=c`lso?>8G+b&J6P#+TbGim7gn4
z7+@|-?D4UBqC_EikTW}X6Y}2`W}pjy)K|Vv21rmu2J5X+vWZ!yW(d;>xdT^@<GD6A
zHt+vUu-&DAd4I;bZmCb-{d?dTruPlK4gLN^DpFV+`$yv6lGH|fXAF0s37|?~DnfVW
zr!K_KQoB~bb~+?a0cKiy0H2(dhMh{V(;(a=80Rz1+$FO5XvXbcE1RrLZ7N0@%2rI*
zcOeb3;ee@_u-x2l2M}xcT=iNy5Ihp{w(a_Bh`pVsKs#44d%V8Gk)e$;#<fn3#ZXOm
zqMnza@NLDZHo-(&J<kWCy6!^1PS^M1GTLP&XQ53c{-^3I-H;W<fD2^rfv8;Ug$qtQ
zJQ_xIyC<0p8j|1)>Mm=fLUH>?V{ufvN+*&`FVPurn!sM#OGPU$i8A{>^RrO46+}fi
zdq2f?;LH|66j6cAm4J)L4Hmy9-_$>leNgX1!USz0NvWKH;*#Z0s;LD+znU>}ds8&D
zA{=f}X6s#4kHrjasbw=4o=j~g$i<!so>5amI_73?R67DQWK|kFQYfEh(oTW*k{RV&
z+Z*rkQwI>Jop<f1xNQ|CQrjZ$T2Ee{A2VijDLXAi5V4+b;NKrbZm5QNK)X2L2QN!`
z#E3UD5?@{NWJ^BS47^hR9}^Ojv|*GT89;5a#+yRwnL2%X*F7Yfo_SS%%(tCVt{;;g
zLsJ1GL%km#DHC9)Ca;uU{_#5wLg%_HKR$;99a`(1`^dN0l~mbKEzbNyE+)7JP>vbu
zgv`@c*PXfghxa)wKhiWZsLkDuXGyu*cYtm|kEyILv6I-LnInB2$M^n%Z|9u5Q+p6G
zSX?c=|8Do%w%6aJRrdILm&tB5GS{FwJ0fWdOR&;)?PTe<?qm&%2WB34LVW`+BrNi9
zx1|SqV-x6FxIF>R5bZTcKPx$^)P~kQJeR0|_z*>^^^@Z)2Fzu+5R5JL%*Zn=fjs0p
z_=OO7J0+owvU^}z*3l}*a^~_@(2a60X>O2SQ6)!{0s47bENB=uR4<JSTff#%l$_*X
z84X+PHm61F#Y;z^dkx+Ma&$N#6%PcmhzYs(Y|JbAB^+@NWmxD|%fL17wNl~FN61qo
zp|)rn_6#up4&*D~EPqRHcOJcXN!8`N$QZv@jDa7hxae~GPE@8V0sVMI_o1>-<`^&v
zu41YdbHvS_^Oqx;y>n`^5{-f*Y}cX})BHp%H|5sYmt?LgQE?+sU#FKhq3a#Sebe)8
z?-7)z)8^*%&+)YVcI&b4YWj6c=yC5R>fu6Q#B7WQD|i@5#itHe5v)Z^B-h%!%!USy
z>+}JUEO8@LodbK%XbrV3z%M13W(?KR6)#BZ0;Z;xjW3&2cU?F_?+-3G1C7<r;JkvO
zmg_~@dEdX^?=ap-VFj+}RT9g&PcfD{J!tZU6>9r^^Gz_Z`21cT+s@gsjHUkF{T1Ge
z(Nd^YkTNe+*1{~Mjuj|Cm=?I@dcBl6RtyO`w)X@{20{ArZ~Atn_Vwl9h~LU&4Xxt;
z&hA`c=jV*8fP{tUV8`^mcLTGh1$%SgjgNNUSM-=U{jPqyKB}A%JlbRXpH2C<geDy#
zQQ2=epYvP=lKCj20KWN7E(>Zkl=)_Kr~K<TkdAIDPwj7(*_vo=TZ!A)&|TkZzv%v<
z-KF$LSt1F-M(B>$yu`ALFclb(dhgrMbv+03IbIrt?EcUKgQo+{<@*!i!grJ4gXS{@
z&j7NZ-;8Lrpby$ZJ2hj47px_RqE^1tYy)Q)C2M=8sE~zihT#>2oi4>ZaguE5=2fLs
zGQrXYe(9swaXwBrrIN)LcEvLn!l22!RHk#Hl2Am}#ffsyZr={vEA-9c3XvSC8&}{Q
z<rA16-bS*swX^&=l7s{?A*o3vK}KiN;@HNfv4mm31=a2{M7Ri-2RY^0qGM>xwqv*7
zqD}mb`$B%~Z4xu2WLz~#11kdyw$o+ul(r<GyX3c2oi<xX{ID31#o<6HA=2P7rDzRm
zp2&ux#A&Nd_0+Fl;N!GPAEE|AG(%r<;M^(4<1=$_=Cvzlzjl1HIih9=*E|l!XvU7%
zlW#o?5iGb9q%HirNlX|%G-C6&OSLAFJdHxca4C}Y?pP4>_qOhp$-mHL;TFQxu6p-x
z^a4t6cfSh|9+j`wxJI}v8`>xXMkV$t-G!ThXnK(c;y*zK{MG@DQnC|JX`Fas&hrjF
zD=SQBLBm*ek75r}E<5LVh>F)NAxqa?OMkKcbS7_VKP=FbmU!YJkSZ&4e7o-u^3jMA
zQ%@sPZrzr<Np7B_$WowFhnD*k`rKQr``{9~a39}Vh{RFQRS??#EZa_R=2k=9SF&cO
z)xwEM6csQXqs5k|e^dL8s2-Ac9A9%Mao_DuOR9>UM7o5H(3rzSno_A42z6F0y;7Py
zOy2oMfMsrMK4%JAufHg44H01<34I_F?*GK^x|v;9En_6;wF}Ce>Ah)l7qhPAdIufg
zPQ^*jwZ%z8IbkQs;OKsQOu#7Q@?Y<56M39Fo|cB$`xHHu?bR9h=NvHCoV&jlXIz_c
znPrUES^PjaP+4=KN-T7~pNx|!G@C}c7g=w-sH=P{q;vWklt*4#ihj?LkQ&Vd?&0fd
z+2~DoA@G_&kR?}zIKiuN%WLUDJ=ii;lAVgy8i0%=w#XE#X>{rB*K8fe$keN#h|wqS
z{c=K9H4?c}H@q$2`1N>785L?E<x$d&^DBTUMkQALI={Y3VPb$SUEBrYQ=84x9ks1{
zBV3*#!)G?8E{HmVEc$cqIxVOgHdWIyV*tDPMr9CeJ&v*&C8S~H7$WBw=}G5C?>*w<
z!-S8K$L}psKm7I6gac&fZ@Ky6=r}qqN*H`J8_XBt$jfmLG{-4ebeR@k3HGH<gsnQ0
zuu&T|3vi8nzd24IbmQQt`G|QM(H#(PZ)BCBBgQdrU}lcQh>NUpfcAYRHtz=Tl?DY7
zCI=&eNDwV`+3+=)*y2z%<9^v1uAOSg$+bhKb1lOe_)2~yZGfrzFNZ^k0g<znZq6mM
z+vp`!#EER|tmNwF>;sROWwdA+tF(k2Uot4@H`pe10h6Mb%TcBlp3IjxtD=@6U0UN|
zP*q%iq6uKc?(h=eoVD5IbfA=CM&RZ!tz{QoN;)g6Dr0=Nf;+w&*iYg_99z-Pt)WLz
zun9~EaUDB$b-sGkY+wt}hG;Xb5i3KmA9r7KvO;)JU31y60P%3nh?;<(={1G^lY^CH
z(jCUsfdhkvMoWuG5-Yq|@8OVdcs#nOQVCaqDi<pZ<V3=2QDE{0SJ1z!c9Os;`6i;r
z2PUg|fP*g}1;X%*&|_f+qxdCzBYnUJptg)CHFb_|2iT#$HiP6kJ}P=*e%(P}*L){e
zeJ)OQlR545i4w<BU|_-^%r^QMJ$a`VgACeizd_&E&k8pzkhJgIXt2_$*3oy}xh@cx
zb2W0j`Y3O$8!+%k;?};k9s&qLbxG~`xrx{lYj`)En=x265^3;9ZsIkv4AGhj^cPm+
z3Sf(@aQ<vf9K%-sMSwGejWJR?WJzPBwK!nwZAS_gMakEMAWEt=3;}L(G&%Vpj~8a5
zznP;gUV$*z8?mD<sUg^WA-peD=sqk!hr%V-RjQpcSreqIC0QwzsHb4+t`h-X9MN33
zaI11Xi$j6f$$f4-!sY;>5kR+#+WKt{pkeo$W4;>b;CVB9n#+-Sp<tKZxyy!}hIPh$
z5W;TLdK-84r%8-Cy}cz9f%vT>Ai<0^CVl)Dbizxl9w4;@p&Mez(wv)bb%SHRx3JZ%
z98~Q59Qm;OkkZn^VZ&$$@rjVY>0u(iA?0rGKkBd%Nsf==u9w!+Y;Swlxl~2xgywgL
zPVl|sXOOHDs)69)Ahvqx&V2*=OZA?*EPH>xYj(mW&aj;c8bTMu%4jX7HTQWn^A=QH
zH;(zAbpjp1Augu8K${`iF~_AHrjFZ_8H4M24ix_D{?sHYMFWy<y*KJj?QR>(q1h>}
zAqceco9rY7Hf<}&9@x^1YQ-vnRO;EeHkNuS%)gp<mQ-kmmrH@t7=^?lF;$v%g38_M
z?LW7)y1zeuIIf2Gp-v}aj3@FnSJURh)6T{`cuVTE=7OzNu=me|0S=(C&Wa-kh7)mI
zvXLC-<2879P0PVV58TX|gy=H=1fIT_U9|tIv7`8A!NN3rR5RHDU97rzBKuFVgRTow
zZGlI#uivM%AL|d&t;ajdZ(Ca!fnLzi@4(4UhO=eG%k2&`(WUFZ;yLJe{r=r|{YESO
z&GrYsFXqewBMwIj%;tVMe5R^dSK4z6VxLvn)yBrS+UqX2+nFN0JAgQ?E6?Oy#pG&)
zvo=DaPH=Y1s{IO*hzs<!#o0+rc9L{@m1fy^sLwLOH5?o&j*WCCYC78@7%z5OEp@9)
z@2^&i917byc~uCa{!uMkG)3cMrox45BliaS1dJWJ3{;R2whQ}qq8>@M0MD=z-?$SQ
zA)gbd^ikK)Qt-4fho@idF8FP6_8pNc{se7=SorEiOU*Z#mmR}tP@Juq%a3#bVx(ri
zW$FLJ8Jz5a>pZB0axKvJF{DHvi42|R4>o%=a6Q<3G;qA%BuEo<|4MaWDmP^Nv;H?~
z#da;(w!8`tuPnT_{c3BXuKRIorPpJaqKwHKWZcEXpzk%gcKPR*Nod^s<NOTlHkdz^
z#MUT>@4#67q$IW5K#BuOWxI18&JwtXvynj!lr@H$#K17z-kx1kU-BxPiScN#^+4z)
zo>79|p)pXJ<wQApuNwm;KaPixV;H?a=j-x%*VE-9?DD1++5f6CYoT>Hq4m$~ztrW{
zT+ElEX=LSVraJ35y@%k^Ryl878xvtv(tsnkd6AhpB2<V56LrqB=!u)Mi#(l=UOw-t
z+*9A}S1+0tf19<kT)U^zcU^f!fz7e^4UWHckO^B7cf~Q9)@Mh}wcI%wE7B+F0x2sj
z7lmXcyflgydNOXc1v4>o9}RoDO!3dY*2RSg@?3FTHp0d}1&MqnxbBB0j@?p-48KpK
zvt_Wrqn?_KSo|@qpQ=2d_s@5Hv3|UXSrX0|cLmH$duUYDB>aJDl8g>Z;1J#UXv`&R
z(?gQQ9wOD`3)|mU*%BUX@1$|xq70?|af!gaI)tDKz9aa;%d)v7hs9doexLZ~<wJdH
zy!Yc5_#uO!44-@T^|sgj648mJB(ESXeu*JwvQuB4AM$7F<>L@;tfW<ugNrTV^M}!k
z<IDH@IQsr)GHZqo$?!GWt;aKqr5_py6Ux%o4cuO*-{^YLl*hb;@Bh;5@<6-e>?Wrn
zXw{<;Zgm<voRy{w4NR-~a_VlUmwdWTEQ3VpT7B|aveuHVEW8~U&T4cK&MxVP*Uw)%
z+?T>mbUKk1#+ORgBdmfoLt5DBEk`f{scrIz{6C&=W)_Z)QLo17b0xlk`3gzp<r|`N
z1rz2O--&+*fyXJu@EIBAv@B{K<!x(XEz<jKX?`X2Y3a;NBV6;#a;%v75_KDw3x2o1
zQmED9Yo=uD{&0N}TPcCiztQUM;NVKPA;8n)>fiB7?gcndjQa(ZCXFrE0Ot}e^j_+J
z`?u5}@8e>3!d0dwgQe@jX=;Y0(RQ9*Bb}?c6=m&-W?=@_99QbDs+GAx_&PL~mE0>S
z&d7n9tvoNTpCTJNrSum{V}_cU(=DZ<4<w2jUX~wvZGFqc+0C+2<G>01QQhX4ta!W<
zM`HIQ@q2oci!|>-#HCmF0;#}r6K+s8D~h%*;Ed8hwmB4yU6G^ydh{Rr6j<3*A4A}+
z2<XaDMZ(z1oZg;+-^j4nA1Z@?2elxOiO?9D(U*7aaursvVw1m9)%kL}H=&w$<R~vb
zwA<;pmlIq#qBC=y(E#O;Dj^^mpa$Jo?4a4=2u~TDap{I~qfB<;-@=0^oo$I~E(KQc
z?7M(O0<XPvTb;7_K4%km#m`P#`?C6X)V>(UIsKWi=Ulx0&UF@k&P<!Xx|FWnd!YsI
zd-9RU&o$jj5x`CO&1;WWs{yIRttaUUWc<S+=4y;pIvN#qp8MzwHB&w6x+~G6n^3;a
z^}p+jR`?PxXNRtYem!jJ>=DyxT|lplws*x;OHEPlOuPRx*PVFI1nJ`=)l^{039Oo+
zYzq2RKTU`RakcA_+eAI$G->Y(J*at~JI0H~1u|TVbFvLcj&#V;dpx(udi|7^m=w{H
z;rW?p+MGgOw4$Bquydj{D>vpgYm!tIR#vKkq=;Oa3bM7_qGqq%ZUw!Efi^hr?)8>d
zra(zJ^E9Y0eeKhP#T9z}7HWCs!kR+&i~9L(LiZJ$`Q?T*6`<K7-lu<nvlEBlIxWfE
z-Dh8(YK_yNloQ8JYlYyZ6!k*OXp4W!sfckw7<AZy3J-^@OWKhy7g8|=i`L8`#yAww
z=E{^rwIh#%Bu`qd*eF$VjtW*6Gj@|2NBX_gb*?w{Dn654RI;F1Y0&U0`_JiY%7zA_
z)~W^IA_1<!XOU}tYyzg&^ZMSaqK`v+k%{F7=fDp7R$up%C<OhvetUgwQ{D)C*?6q~
zOZesZ_$8co&lJvqvl#8kqEzl72f3C^{QQ(vGHr+rzg8FC@)Vd6KLYH+-E@cu5d)kx
z>G<2ZDVYy(`r@FNZR<~o#C-O%$mL>>3u-oWRa&!tKSYVdav|$KPA*osW@#EU2wxdV
z4-ZnV%yY@-dbxPk=VQK>($=mZYx&Ti0x=t#+L~6bO+mmNcr{Ls0mMdiYO!?eTS&bT
zsgo>c9_pf><zK22#_9Gdo~mXrcMkJ^AlILcx)2U&qiCa~hV>lq1;m7yKPsP&6()Mw
zj&CNG%Ioiho2^TAtAeq`P5cV}<SOd~jN-CBr)v1rmEgdxuLp(KxC+k_V#EtZ12eq6
zk~M7KrHa?F^IDc}X!XO%-5bB@Va@9`6ygx>8O9emY~p$-v>$QZR!r^F7}Qr;|2RL<
z&Ey+cz9J}pU?S4pOgOd0)!ta<%&ySZ==rIdXLqcHDUTyoA=LGU4f|B?Xgy7QdaILs
z2;TId!|#QSWby?k4*f8X8V>!jWLSl+S;sf7g@<FhL)#gNle4jc!HPXmYp(*HFVDp-
z0qX)76T6n<4nrEPa2XJCFzy77Ak{tDj!@4z;<rP!ygF7@4BmaE7BgCty)vs6%n+Mr
zvdeQ-7(2povN`C4S-1Zhf4>>Q%JK~hE*@)U!IP?Cn$NxCma$#!NdLGy$2}10>)u!8
zC})(T>M@!3iaC#Dmn_%a+v6yQD&KWW+K!)*f)0Zq){(iPm@$RiU`79QV1X7Mi+%t8
zAGoNynPTn}oB_z=VO+)DAcHZstze=s_Loo+<EH>YL^h*>2Cj4OmY6czAtpPGj`~Jz
zqh>-UyJ%e^qro>pCVii1#t&Bg%Cth+zuhiyO!>0;VrhU`3Z+6>?Bl&5N&YJohfc^r
zTz#JpVGowR`gy^~hJ;yuKd>O;QDRrj>u7gPQ_608VqOk{)|q|0G*^Fbx4b0*4u<bT
z2p&g%`O4VE!!t9YMb;8UKPAYjX&X-)qV1NAkoMGA1xAQD#tRdtA#2UjU#E9jNo;0h
z$9{qTkdO_D1}7<^_(2&Ezx4F;h)h{w%<>1BsVih09c)BXYBjxLtShUNJOv3$!ps6@
z^&nCcCc?25=Us7;H~&XGjmfc9%=rV<kC7*z!H1YTHOaML39THNm2fp}^<duXO({C|
z6BF%W`1wxSq9y36JIK!>;1P=;9~}XW*i)5MMrXw5j4=q#NF$P?GK9W|(UBT~m(vk<
z`WlwJ>@NUC7_-KQ4kdXn0axG?=lI0j>tgD5c46rFgkerq28;9$a#R_D#uB^XSm`7_
z6k*Jb9G1E3R))SP0_-Ur+9C|(eF`itc#zjM+Kjhvc7AWXgi_oJR;B3*cB`hA{x{Wz
z#UaX3nj6?<taLA0ZOvOO2X<1j=KRn&_8*G(Ep151=V#6iDllZAIZNjJ`IpXz%ga_d
z#m6=O!(V>P=n<x*VrTYo4O;>zo^mlws1}^Mb_5Ugt@%MiW};au1Go{O5(#7b5?><-
za2XuV7`P!uPE0qn`X?nDIt@NN7{a$WnBU}Kb>LCcyxD}=Qa|JN=v~|S4*~<V74_ux
zO$Y2n%}6ME6lYCBsq*MCJ{^3$uC=~-CzeGn<m2NWL)XCk8TRTwW1gsQhvAoQ)^?}V
z;E$Lbik^P?4Q>1vo%1Klhy-k>S{?<o#@{B&xy!GkuGVX6ocm<E<Gl}DJ=?ZARY%e^
z8|eU%UCFJ^#7fOIvwu3zs4Letcij{|KK&ulQF;^q$s6k<nzkb6@sH??TK_TyhiyLB
zpr(G9EGA=%TX9<N!3y(9HTG~Up`uoqYf8tdFm1rf>L)@wrm$)w0d4+sk~LR(e=>d8
zvkQDLTh5OwNX4a%`HCMAn)9czjnGViTFaZK^w4N72=nwm?0mhc9l10tzEiD#^3S}s
z67OFQaRWv6Iztte=+tg(zp?h>Km;Q*<y8(Nwmo|!h<B8Fj;SB!sGUP&mgWHowDMlS
z{q!qUHy>+xmvH)wU5O|+vF@tVp434GOnwo!)@JD55k^=8tv8=Iww_rz_ji-wwZHmk
zU4)Lh`B2(fAv6aueRNlUT*0@}B5{^YY&St3&~j@PZJC%|=Af8DAwZxwb8`^(-gU<_
znj602#BfohkzRwZw}~3FATSA=uneU-Q~;Mf$LRlR1+qv`WjUh$A|#69jQLT<!GLZ(
z7ihM(f4dFt16NH?5qJyNozcDdoArs?W9Ik#qlQ@jwCrtkcZ>umn5&VNxk42Wa$c?^
zfEON;V~-sV=HDt}7L3!TYqNV|?XLpj=ErSE`mrl29-<~f-}?6)a_LKh#S*5K;_oP{
z_XU&H+o})}evk(3tn@}oDpyY5%*1K(w59$PMb`RFQgG{AYxWsS$y^2jZ$e1RiKf1-
z+N%p(&2BO=8Wn50y{*t26)<IkD_IpcX@O_K0bU`UPt{GQ5>>$lW#ysDHOj!V2P*(}
zpIsRU#Ma-;2Lb{#7%efU;PN>#o1Z@sEEJMB5O(xN%%(}XuNcR3WVn6FW!x$q!q~aV
zPL+rQ*ns9!NJifks<+@~ouJ>eLslr)*60NVu1rZ~$eS_#8kYcc*uzNFQ^oXesaSui
zfA75(N-JeczG)}AE{Dduq5K|)ixj7`+EvhOykHWwQN4f}<hvV=Wls1GeOGw+^<PQO
z%tTo7VG`4?_C<FTCu`uPy>Xmz`tj0j+1&Bopc7kp4kpHu)(u%GYa1y3WS+VT6A}7T
z^QrRt&oi}dB9&+Q2=qAl^<<?m9(sz_Bl5;bBvZ$b39#Qfg60f_ztS|bEkU^fSGF;N
z0WLd7RSTiGj6urez$CK))9>UOx#|q#B<I#NKLt(L2Ry#>iKOkQ%ZsJeGr?WVH?lbr
z?ET!HF-V>z(j=H%QCrMYh2o~j8s7|3IEMBOVGERn2;{O5{1|^w^yz+2BAW7%V>T7M
ziEw-RG$FG2ggi>|$H)vd3`)a*j@19{9AV4ftmZ`K0E4Yv;|&`ACBDUIbT~gZaa1?v
zc#^zzi2<>6N^fbK5>c7bM{<%pzDMap`>Wec&7iO}rR)F`u@2O6a>(F|B%0H6)#K@_
zI20K>fB@cCrQhJ{WM=)m%t7e2!)7QSN9lg~cE`rVQ7dz~N@2+QBhT8W-b4NZ;*r3h
z;(;wV7Ep!SeR&`&Z&$8k?Ifzj5I4g|LDYtaDQ{0b%s*j*&-nMB!vH&sa&2=D?Jmx9
z({6^V%ob|mEagoBo-BB&%m6Ep$pNe#wZ0O*s|rywq*@og_E^QCK!Bm}a7YkYDIBV7
zWmLT=CN4pUDIjx^4r0v^(>)51WAE*#MP$q_7k`E+8dWOIU*#dsO{#>D1~_iA>kbwj
znBj84iCasbLOdFJ^WoP2c@s13rCI+HhqR4kVhCIJXN0u7L`he#Oe4@Rl%*AQ;70rb
zyQ)U*-u!4#8pV#Yus_>qh>-uZ9!4BkgC8|2kc|B!>ovb4?%)RHP7%R(j62J4S0qM1
z^CmdhhMGuE6;<G1&R|RBvjaGhT)K+waf`3a&k2$XNxrYx_w&iIt{A?|m{@WYBI2R#
z_L-=9weR?pEIQlLJaxvwm`<ek6b=nSqO4$<90ysQ3mBWFIGoTsn5Ci|x2<c1KyYZF
zVlJb~1%%lIKI+aRlG4}Nj_rl`RXa8YfoaBly(kR({ys-uS>(7a)Zy$jfHMZw6G@&F
z{*1aC1F3AGMn5>v)dkNee)ribXUSg<Pc|mha^@kvZsoL^LSgK-)*fZ8T+xnBWB?K#
z^Va*?tc<NAp!>d`l-e#hT!99kDmaQ_hFYxpwk%oGV>Fs3X8G6K{Ae3`tthp(SCeIz
znCh(Jig6ivU!i(oES0Gnd5~iM_FP%3h%R)cFV1!YRYV8A5*-@e{nx6)8k_mIXQ5HB
za*wh$iP_UYzn|N;-?zhFX@2#zqUj#vAA>C}J-!W_&YIpnk2z%9Pv0g43hEg(rJlr-
zGyLt9;a!|55_Qf%uK9lfM-{m0d`_y3%}Hf+Xk0{xG~V+9=rC)x1aP=KkmB<|imGrd
zS)xTGinM61|8r?EPxy;(Gs|OTSsgSkJ=Q}AR#?H^r5PU@U48^~X(AouE0uI<nMaq5
zMi)7i#_7s(O=dPyl>&)TtLHv$CnHxgkf+%tH=(Z>;8t-UU1;J*%_<$+7SXXw<tLzr
z+$;fY6sbvaGg3xsTad6W3GbNUaLaKZW~SxOCgu`m_1n=jw}gf5J0Ec?EbS6;bt-Lt
z3bc*E-pi0zE2*29N8MD3y5KmqXO${Y$IF1GSw0BDHa8orA!YlzMx|q2iH>p_3Es@#
zZcZ1{{HRRe4wUjLfoqV!a<y9tVToU}G;8$Q5{!A>dH1pm5;cvC+tQAVn@aq-v@WUk
zGJ#8{mf&8d=53s|-(fEnQFv4}<{PxV{gsM*5u>x%&SYFOaPdp;Ldt=VE2Md{D4Q<S
zs>!0xO38<IJJyx7xRiDrhz^IT^UA}nN_nWX#CefUJIKY5t+5HcK1E8Y9gOFdib^&O
zzmSUeyes)wP70NZiO(x48`ShrH_r>5S7e@3Gev87hDan{uq#G{1gRyhK-n*ld=w)`
z;2GlRpN34{L0PLQYyQn-3h6-90R&F#*?pDLE@c@CQcl)7AXuFXH3x<pk;v%`(zy*Y
zEMS}=3G0A_d5e|RH8o3lN5aHL2Dud%R^Wh1;SQlmA^Ws?)lihxUdsV#mViluOuWo3
zxAZ6`BqbKuVr>t<yI5C=qO7NzPo7C?9mOdJ)dtuDeGR!R&KB`*UNf0WrPHy{M09Vo
zcFU^C|1DmzJeM21EEQUP(b#k%+|=1}$uFOrsBL>>YP%pL2D|Eqyy2;-n=a4&ZPQfk
zMLpRK>zbR#r&>hg_@nB4ug&LNY(`NXIY3IIiNFpoM3+iHVbH{Hoy+@cShty^CZK9~
z0?OeHg_A6(;FnlX!4zd_C;xfUPHF@7;=EJ+{NYB~naaG=_vQ^c3hC#iojm1xwG`Rx
zpg8utzy0)}#CfI%CDrLc1<~T<&e8wn{GgH%b)G>&W^O_)oF_z&l^oE8I9>FY;&cje
zVgq^rsacyn5@n|1pNCf|Zg(EMF61`RLcCrt`z)1s;WVPF7UGozykZ=$Sa}!`;uT|f
z)u?zO7n)Gyxjk5gD19FA^ZBcy3_&*_7z{0eVC;Md&bM}!oC39`Z09sBF%XJ=ufoXr
zSDX%|Q*r$%i*&`o#(8QXwt!+G%(2DETvchgF{}7Yc-uG%ic~{AoSF5QPy+|JVl}by
zR;0sh%1{mGll*)#T}W|<co}L0Sa!u*1>{Levlgew`k6rQ)-_^$Jf$TI7mz4?J`$Dn
zDko3r^+Gx^C2Chm^mX>Cl2C#{Rj02b%Zrt{I6gb4$Y$1VS$a+q8<_CU1CrR>1U3xG
z<~rXnByE$blaTJ^o3dgK((fzdLH`}F+1=-bP2FfJY-%#D0=8Y1aey*x{`12Ycvr9m
zHP{^9w}VaFDk^-3%6p>{#>!|AyH6s6^QVl4VT^e%ISI?1maDQj3`_R$B01}sf|E12
zlPBWd0f||!QGiVm<XZtp00uGa;tQV#qs4hS4XuhuPz7EKx)`-NL1$r?*P`|b5p|+X
zGL7>MWGPMMIu^qYn@f$veh^}KLr1*%&neMhad|>qk*cFsl2O*nq^eTho{y1iv)$!k
zox@!`DqGLOv8kLN1GHLjqg2+Pd+$XTx9SqRZmK_Cm#H1<zPA3@nhiH!alCD6`mxD1
zAHME~H}?vMwye$#hQoca=2cw-6JI=X;{M;P+wsE6&1Jr~gOBDRDRS~WQ<>!2v=Y!`
zuzt2GP;25h0l}eD4GV@fvAg^fyxbr2g0$jC6;qrV%Tt^bYYJyHIs<$NjYU#@*>{-g
zv{VXX-lV7crP6o{rauY0=B4p~cljC@*(|6Cc4I6t4Jx|SG^m)`iBS+llaDK<cbW%P
z%Hu5<4ArUH4GZQ&(Qt*`FdxqKe?FY25YAwPkKR^7Rqtwml_swi09>aU1PcJZy&^VJ
zhBp8@az=$Wtic;E8#f^{n-URK;YG_PRGQ)*l|C<s4yVTyP}6yQ7sbO%0X|RL8y1b>
zT3eQ8=>-$H==aMq?KkRlE)9nt0S-~pfHsXubFvu@4SZ0CgKdgg$q|Mf64YZ?wc5Ch
z!xm?)%*T%M9RWUeor)(mE!TlCcoy*U22F_ubtt+I&}&F6iQW=BU@?{}me>a2Md+5d
zfrc*FH5}ic0=^#Lv3hckig7^0IAXwohH_n2ahNbz!$y_!!CtdAAL8la0^P^^0x*Y{
z)K|fI9?-|;T5i*@Sg{M|eF=6CW6GGMm;$ikRqk1_T8(%{0!z`MWT6Np<VzC1wAM_x
zyE)!>b7MurUNCYAe~xg}XUn#VsNSD*436x;x$T4v_%zL_ZLc_l#%1ESJJg+#9hrj3
zNxA?rcZS{Jkhj0;OZUi<N=MW5x#GWd=VHN7j6c%;v9UY*`eM;2y^=j?^5{pf23=}S
z@Tis()K(y5nEMMdfxHzQbAiNd(Q<)`-q`alvw^wWFP`jeSl-%u=kbYLL+`S|?N$Gn
z$gP`PooHV>=|ck7cGs_%xbDvT;@zo%@tfCm&`kJP@r}Sm`^MV1-r=*eip)~jeBS9<
z)o(vND^gC!c>;`6-hO~q$#I)ENoyAuy9)+t3B^)vVI{14{!&;A0IMGxyxE<;cyjI?
z!B)lZJg}eR!gnFqhc)3_33rSfIWOEbZx44|OD%f5EVX#bDft6zcmhX&Ymj$=fF_XV
zA<<oy#fuP`SF6Zz`6*k2TJrJp_1lKiax$y<VWUPf%qmk8j$W2<3@%DI##zEqtA9@y
z;{2$Le!V&@j+vL(zU4=cD*_6Lr68reGg`|Vt(92vohh+6F*%<c6&C42dOWfyH_2yy
z6<G{;iK$;TZ1LXx)UQ&B;L_v2v@V$?rho|-mfe-oEXz09RE1r9A`P1dY0^ePs&ld8
zn*34(Uxu|tht;{>2~~*A>J2Wu$u8!6c@GPl23a2L9auEjd*LX{?YgB#S-$aVduoYc
zmZC~i9#?NbxjUb#7(!3+5PE{E_u!dQVG0w%g*vX-P_I`5unM*FnGJd!GxqD;>=q*L
zc2R^y472p=+*4T(yVMfhzpyw~APummdf9!<SoN<<t2Jch>;W8msTQ#F5|nCju3)yg
zF`8i(OJ=4z%o8V&Y7>M)+5{nHbYcOHB4S;FT~bGWq2Rzm9kZkmA0J*-RUYkGuEuAv
zDJ*7}U@0389dC;N?wQ9Qf2Mf0E^%n@1((%EBFW3?p=VB8Sb4tXE6)^v>=I%w)SrG9
zTTX(ssDr)n7{9A4_8+_SC>xj-g=J+4rp8R6-tI%Z>dUvFuLflJiZZ<FGgv{HQb$DL
zO-$oBD=;K-ybJ+8j>Ci_u`!>`0#}5YHrUJ$A93SH>fL!#9mkK<@*#NYsBAS}9Hm;o
z*f8$~pn4WC_HS9AUhYe692@(wknUX8o6B9$nA)~}>+}W94Gk?b<lIA}i6$!Des8*c
z_pL{}5A3QPP3+zK&~4w@f9&X?4}WA6(uLPEX!Th~=2tXeVOEG2W}$l*#<2ieIhMnP
zBUboyBo=>EqgAB>LA(=%db0~9;NkPrmZ*YQ%+P8%#7*-my2~{YLc@H{rQ}v&7kwS%
z9?rSsLpw^N9JD!?BF{#t0~|Efb8AIK{JiJ|CGUaX{4w)`TX2>gbL`ETS%c^@sl!1s
zYJo+;!zZ`+xSh9zG5(&VJkWU_=lN#R{Q2ki!};Hr&+n%v`FTQqCT!#9`)S-KZ2K9%
zkLi!;>+~9SZ(!oVA$!K;kE{AtBwV}cj}P2__c4}3_zryLvhrsF2IF@U&O^pfKYjgP
z(8_nrzlS_o`u6ZRZwh|ryX<%DrK{!m({22svz6DjasUK!D}3*@%J0FiXZh2u@M%L;
z-+TBIeO>()JizyE2bg}%V6vB>QonaQ2kx3m7)$rDe}Vj#evr<Aze6e#UoZ4!GyVPh
z`|0tazP_Qs{(fec*MnTiu>02I{voAX(l0)!XLBsRUh&B9jhm==<T;z?NH_g3{Re*k
zT2?an+@}UloEW6k{*BtFpRVJd*#@8aPyCEJlHob{#HT)W1HAtY`#0F{Gy!ZYh1W<5
zc_E8~#&8Z>X~wV-q^iN^MFFcteZ{76O2?<XC$8HwRkwE4!*##^FG~OGcePKhUbA}o
z7wJE&aD_}^am7vdwT?G_X@xx$cC5(POx94Q=h+>FC)xd5s)00}{DuV{33oaUXXdwh
z^Wu0(%OAE4zOZX(c*l^a8|z%D6R7Y|S6A^2ZGyi&#otnA@riGG+VH>_^XgvZbODMB
zVfsVlVZ0?_Km8&7VG(Kee*lU*n*aa+0RR910t1#lp)n#~4?Oh%9|PzB0002pfXw9p
z0002x6Tble_Wuh4SOen#000O80ssI20001Z+GAj3U|`YxcbkEM`SJg63=B*W3_uYS
z@C*Qm?*=G%+I`bMO9L?&$MIYhbW`vU97RwOyL35+>TpO0PvI7!-cp1vf_8CnaI@m#
zs6}ycaq$(nbgr|$0l~fKQXB;RrG6tJhzB2@T%IJCe;4hWS)(V~GQ+1-|J9dUi6y6Q
zK|bYC?xi62EFJnBNmX{GCL2<rT@~xZK79+?7MS3>4N1v0Q0BcQP0ELSqei~r#ci+8
z4CY|-Z_N3OG3+|Kw9o0EFyEAN?yYB!vRh-~#WnIPk};1-Vwts`m+H~@PaN)*+xx=X
z7tJ*qQ#_EiEX$SbFmA`IyOd42!GJau#_h?4Tr>VCrdVJ6kJLK{rxh^XIfVSP@VT?d
z{>V8o{i}gI;O~FP)n|b+IU5&cnmL`=yAiz`GxDl`#KlZM%7@(HSbCBS*WU3o*^d`_
z;;y$D_mq1!Z~H1fSaw{+rLTcm{RYaPo#p^|+GAi~&_aSa3=0@5n7EjxF)J}UFefp$
zFfU?$z{0|!#Nxq{#IlLyAFCJZCN?Iv47LkwU)XclZ*homcyL5<RB`lheBoTeCCAmk
zb%^U1w+VL!_bDDG9vhx4o_Rb+c+Gfgcn|S0@rCd$;pgMG<1gc1ClDggB(Oo?o*<W?
zieQ*vkzkkLCLtxE8lgSHQo?1zCq$e?Iz*m{I*HbaZV{6aOA%Wo&LN&5en3J^qDA72
z#1F}NlBc9Nq)epxq*h6@NCyC6m-H8zFqspwDzbjEcjUz6=E)1m8^}k<r^x?NkWxrc
zSflVmF-EaP@rsg&l7&)+(h{XN${fmbR7_O9s3xesQL9krQs1T#rzxV@r1?+FOKXzW
z6YVhVCEA~K+;rCIa_F|{-qO?4o21XD->1LAK*}J=V4We0VVU6;!yiU%#w^AiCL$(>
zOv}tv%+8rxm@l&6vuLrDvCOjEVZ~!rVfD;9%X*)Um`#Pv2iqdsO?FCl6?Rwbt?Z9D
z2sq?9JaG(iyyxWLl;yMt2VCd0%juZYC8v8%ADo$-MVt+seVj9#>zr2r;V$Ph&SzX$
zTufY?0QS_3vj6}90RR91=m0qY1poj5000620RRF3761SN00B?{0001Z+MQF&Zqq;%
zJ&wbp5VArDRV+rVD%3a*O%ar;5>Tap0u?lZwG+E(Na}=mLc|}i;3N15#5eGe*z*H?
z0b<RW>v0lC5fW%L<1^Ry+<WKT8332@8!nvU8UV$aVh7i_OK|~Z>{{$%505P_ViWHy
zK7)09wD>GG@ZI8b*q_Bej~mX8#cSAbLW?ipzVqJVi`a8AZV9`ElEs&t>xG9FmvPH|
zW$|ZRaX(o61-|>q;;$&XKP~=-tM0E9|8TKhEa4so(1<Wbj6jgWF)BF0kfV>MTs5b{
z5&y?Xh@NmCb3Uhc7ZXMZ$iE2>K5D4rE)H<WaX^&uGj_(UEV2KVM=kljka`pJ<iA?T
z{O{R%k}2TSv<C?3cPc)8+J@9Z@f=2rF1bdXCdUJ2%wlW2#Yp}<5@we%W3FZ&qqEX;
zpR1|AEA_Xy3&>rxMyy1kO@>;*4|9BN`5wEbIY!t)m18Qyqu0ECj};B+Tjf5YZ`DQ~
z60K&RE@hubNNAg|7So3o*{PNd@z>Hxqn~CJqh~Zzd%$mpd()xxoD<?ux@t~yBECn|
zugUMBWQ}u?o4E*^v@G9=8tXJuEmW4zJMaA)&Ys+iw(aqhds9bxGa7s)&jf2~qh>lK
zR;h$h$7GCXO_(#0XdWvWQ{^g8&|t;?$9l<n+Eg(+c}?zmi;6{}O~+d6Tz%YT>^kmn
z^|384!{^)<ZI4<1L|*%d8A85^spRU5ausalI`^8sJ=#s*27dqtjn4FV+HKEAOw(}`
z!13>c(n8sLy7&J7|D_Cf3sl9u_dtQRih#wcxX`#2jK)MSU~pX2xMwu#L5+LG5%u8N
z9S`bNEB~K2-{q6{@<twEw8igc4E`4%K*A(kED}LD79y}>Ba$fWL=!_Sam15AB1t5Z
zLMmyblR+j~WRpWX+S7rKbfPm|=t?)b(}SM$qBni$OF#NE01Z8K-$5=;^2n!vLIyI3
z!3<$2!x)YWH$@avf`<`|WE7>0W(;E)$9N_%kx5Ku3R9WJbY?J<S<Ge*bD76{7EmTu
zj<A_6TxWmitF7#27cCs)sMy%aJ2tUTA|;9@4zQhDycatMInGah@QcHo<UV&f#X=Ub
zhjJcL!95=Elt(<~2_LEC1<!cSX}o-AFRyvYD|~$BD?3<>pCv4%ifUS^VHvdqs3XX7
zR<M#!tYS6wtYIB%xxyhDSkDGF@`Z0)<qT)J#v9&Bw8TiP#7Vp)NTMW3vZP3=q)EDD
zaE|j_;xf0nz(ww`jT4f|4Q@)7WYZ`)R&P~(txq>GOdPggwO`Y;VpEr<RJq$wsy=t&
zUyaa!Qdb&EhcZ{`ROTu3l?BRw`&_2F+N<mKO20Q4s3<S1^O+^XW9sx+N`ir!w#4Zv
z`UB*}n6&_S+C9uI62dSP1mL8hX+wXAsDzoI5bp$dT2sSRB{Q4=4OlQpILix);d12x
zA#T5&oqh80iu}fU%(vEaes{i;V3(*}kIg{g;ua`jXBi69qJRxb(>}zIz!xb&t^+27
z)C6Ro**+jAWcmk=Dm<0cs$&9PbSGj#ELV|JVlj`bO#5Q$JhIr-G^h@dGh(g(blAWf
KZAU*}0001OB2-`i

literal 0
HcmV?d00001

diff --git a/addons/web/static/fonts/google/Noto_Sans_Mono/OFL.txt b/addons/web/static/fonts/google/Noto_Sans_Mono/OFL.txt
new file mode 100644
index 0000000000000..09f020bb988fa
--- /dev/null
+++ b/addons/web/static/fonts/google/Noto_Sans_Mono/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2022 The Noto Project Authors (https://github.com/notofonts/latin-greek-cyrillic)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py
index 6087ada7e0160..109cdb7888846 100644
--- a/odoo/addons/base/models/res_company.py
+++ b/odoo/addons/base/models/res_company.py
@@ -71,7 +71,7 @@ def _default_currency_id(self):
     company_registry_placeholder = fields.Char(related='partner_id.company_registry_placeholder')
     paperformat_id = fields.Many2one('report.paperformat', 'Paper format', default=lambda self: self.env.ref('base.paperformat_euro', raise_if_not_found=False))
     external_report_layout_id = fields.Many2one('ir.ui.view', 'Document Template')
-    font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open_Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway"), ('Tajawal', 'Tajawal'), ('Fira_Mono', 'Fira Mono')], default="Lato")
+    font = fields.Selection([("Lato", "Lato"), ("Roboto", "Roboto"), ("Open_Sans", "Open Sans"), ("Montserrat", "Montserrat"), ("Oswald", "Oswald"), ("Raleway", "Raleway"), ('Tajawal', 'Tajawal'), ('Noto_Sans_Mono', 'Noto Sans Mono')], default="Lato")
     primary_color = fields.Char()
     secondary_color = fields.Char()
     color = fields.Integer(compute='_compute_color', inverse='_inverse_color')

From 1c8fb57eb5cb27bb5ce7959b2a6a01a662fc9a44 Mon Sep 17 00:00:00 2001
From: amga-odoo <amga@odoo.com>
Date: Wed, 5 Nov 2025 11:15:28 +0530
Subject: [PATCH 433/673] [IMP] fleet: apply unique constraint for license
 plate

Before:
- The license_plate field in the fleet.vehicle model allowed duplicate values.
- Multiple vehicles could be registered with the same license plate,
causing data inconsistencies and confusion in fleet management.

After:
- A unique SQL constraint has been added to the license_plate field.
- The system now prevents saving multiple vehicles with the same license plate,
ensuring data integrity.

Task-5071264

closes odoo/odoo#227958

Related: odoo/upgrade#8795
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/fleet/models/fleet_vehicle.py          |  5 ++
 addons/fleet/tests/__init__.py                |  1 +
 .../fleet/tests/test_unique_license_plate.py  | 60 +++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 addons/fleet/tests/test_unique_license_plate.py

diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py
index e54f0c7a8a967..86a1df45dca9f 100644
--- a/addons/fleet/models/fleet_vehicle.py
+++ b/addons/fleet/models/fleet_vehicle.py
@@ -145,6 +145,11 @@ def _get_year_selection(self):
     range_unit = fields.Selection([('km', 'km'), ('mi', 'mi')],
         compute='_compute_range_unit', store=True, readonly=False, default="km", required=True)
 
+    _unique_license_plate = models.Constraint(
+        'UNIQUE(license_plate)',
+        'The license plate must be unique',
+    )
+
     @api.depends('log_services')
     def _compute_service_activity(self):
         for vehicle in self:
diff --git a/addons/fleet/tests/__init__.py b/addons/fleet/tests/__init__.py
index ed15d44a44114..38cbaa8f11df2 100644
--- a/addons/fleet/tests/__init__.py
+++ b/addons/fleet/tests/__init__.py
@@ -3,3 +3,4 @@
 
 from . import test_access_rights
 from . import test_overdue
+from . import test_unique_license_plate
diff --git a/addons/fleet/tests/test_unique_license_plate.py b/addons/fleet/tests/test_unique_license_plate.py
new file mode 100644
index 0000000000000..3ff4a4c4669b5
--- /dev/null
+++ b/addons/fleet/tests/test_unique_license_plate.py
@@ -0,0 +1,60 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo.tests import tagged, common
+from odoo.tools import mute_logger
+from psycopg2 import IntegrityError
+
+
+@tagged('at_install', '-post_install')
+class TestUniqueLicensePlate(common.TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.car_brand = cls.env["fleet.vehicle.model.brand"].create({
+            "name": "Toyota",
+        })
+        cls.car_model = cls.env["fleet.vehicle.model"].create({
+            "brand_id": cls.car_brand.id,
+            "name": "Corolla",
+        })
+
+    def test_unique_license_plate_constraint(self):
+        """Test that license plates must be unique across all vehicles"""
+        vehicle1 = self.env["fleet.vehicle"].create({
+            "model_id": self.car_model.id,
+            "license_plate": "ABC-123",
+        })
+        self.assertTrue(vehicle1.id)
+        with mute_logger('odoo.sql_db'), self.assertRaises(IntegrityError):
+            self.env["fleet.vehicle"].create({
+                "model_id": self.car_model.id,
+                "license_plate": "ABC-123",
+            })
+
+    def test_unique_license_plate_allows_different_plates(self):
+        """Test that vehicles with different license plates can be created"""
+        vehicle1 = self.env["fleet.vehicle"].create({
+            "model_id": self.car_model.id,
+            "license_plate": "ABC-123",
+        })
+        vehicle2 = self.env["fleet.vehicle"].create({
+            "model_id": self.car_model.id,
+            "license_plate": "XYZ-789",
+        })
+        self.assertTrue(vehicle1.id)
+        self.assertTrue(vehicle2.id)
+        self.assertNotEqual(vehicle1.license_plate, vehicle2.license_plate)
+
+    def test_unique_license_plate_allows_none(self):
+        """Test that multiple vehicles can have no license plate (NULL values)"""
+        vehicle1 = self.env["fleet.vehicle"].create({
+            "model_id": self.car_model.id,
+            "license_plate": False,
+        })
+        vehicle2 = self.env["fleet.vehicle"].create({
+            "model_id": self.car_model.id,
+            "license_plate": False,
+        })
+        self.assertTrue(vehicle1.id)
+        self.assertTrue(vehicle2.id)
+        self.assertFalse(vehicle1.license_plate)
+        self.assertFalse(vehicle2.license_plate)

From f3ed505ec084adf22026527781a6839afada4d38 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Thu, 6 Nov 2025 16:03:59 +0000
Subject: [PATCH 434/673] [IMP] orm: reading many2many fields should add to
 cache

When reading many2many fields, the permissions are checked either by
filtering explicitly after execution of the query or they are already
part of the query. In that second case, we may mark them as accessible.

closes odoo/odoo#234775

Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/orm/fields_relational.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/odoo/orm/fields_relational.py b/odoo/orm/fields_relational.py
index 797be8cab8ad5..b6fd57541230c 100644
--- a/odoo/orm/fields_relational.py
+++ b/odoo/orm/fields_relational.py
@@ -1380,12 +1380,12 @@ def read(self, records):
 
         # bypass the access during search if method is overwriten to avoid
         # possibly filtering all records of the comodel before joining
-        filter_access = self.bypass_search_access and type(comodel)._search is not BaseModel._search
+        bypass_access = self.bypass_search_access and type(comodel)._search is not BaseModel._search
 
         # make the query for the lines
         domain = self.get_comodel_domain(records)
         try:
-            query = comodel._search(domain, order=comodel._order, bypass_access=filter_access)
+            query = comodel._search(domain, order=comodel._order, bypass_access=bypass_access)
         except AccessError as e:
             raise AccessError(records.env._("Failed to read field %s", self) + '\n' + str(e)) from e
 
@@ -1399,18 +1399,23 @@ def read(self, records):
 
         # retrieve pairs (record, line) and group by record
         group = defaultdict(list)
+        corecord_ids = OrderedSet()
         for id1, id2 in records.env.execute_query(query.select(sql_id1, sql_id2)):
             group[id1].append(id2)
+            corecord_ids.add(id2)
 
         # filter using record rules
-        if filter_access and group:
-            corecord_ids = OrderedSet(id_ for ids in group.values() for id_ in ids)
+        if bypass_access and corecord_ids:
             accessible_corecords = comodel.browse(corecord_ids)._filtered_access('read')
             if len(accessible_corecords) < len(corecord_ids):
                 # some records are inaccessible, remove them from groups
                 corecord_ids = set(accessible_corecords._ids)
                 for id1, ids in group.items():
                     group[id1] = [id_ for id_ in ids if id_ in corecord_ids]
+        elif corecord_ids and not comodel.env.su:
+            # query is already filtered, corecords are accessible
+            accessible_corecords = comodel.browse(corecord_ids)
+            comodel.env._add_to_access_cache(accessible_corecords)
 
         # store result in cache
         values = [tuple(group[id_]) for id_ in records._ids]

From 01f9e5da175b472a4db2fb7df148ae83c0d59c75 Mon Sep 17 00:00:00 2001
From: Ayush Modi <aamo@odoo.com>
Date: Fri, 31 Oct 2025 06:29:36 +0000
Subject: [PATCH 435/673] [FIX] hr_attendance: set default value for field
 timing_type

This error occurs when no 'timing_type' is set for the timing in the rule.

Steps to reproduce:
- Install 'hr_attendance' module(without demo)
- Attendance > Configurations > Overtime Rulesets
- Create New Rule >  Add an overtime rule in this ruleset with:
    - Rule is based on: Timing
    - Save & Close
- Now Save Rule

Traceback:
KeyError: False

At [1], this error occurs because the rule has no 'timing_type' set, as no
default value for field is defined.

[1]: https://github.com/odoo/odoo/blob/6e5146113adbdce3cbe317a7b3ef16be0a244b6a/addons/hr_attendance/models/hr_attendance_overtime_rule.py#L453

sentry-6986530016

closes odoo/odoo#235091

X-original-commit: 565c7050b0a12d9445406ce47e55adc06b0b20b1
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
Signed-off-by: Aayush Modi (aamo) <aamo@odoo.com>
---
 .../models/hr_attendance_overtime_rule.py          |  2 +-
 .../tests/test_hr_attendance_overtime.py           | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/hr_attendance/models/hr_attendance_overtime_rule.py b/addons/hr_attendance/models/hr_attendance_overtime_rule.py
index 72c6c9fb8a3cc..295e508c4ddd9 100644
--- a/addons/hr_attendance/models/hr_attendance_overtime_rule.py
+++ b/addons/hr_attendance/models/hr_attendance_overtime_rule.py
@@ -95,7 +95,7 @@ class HrAttendanceOvertimeRule(models.Model):
         # ('employee', "Outside the employee's working schedule"),
         # ('off_time', "When employee is off"),  # TODO in ..._holidays
         # ('public_leave', "On a holiday"), ......
-    ])
+    ], default='work_days')
     timing_start = fields.Float("From", default=0)
     timing_stop = fields.Float("To", default=24)
     expected_hours_from_contract = fields.Boolean("Hours from employee schedule", default=True)
diff --git a/addons/hr_attendance/tests/test_hr_attendance_overtime.py b/addons/hr_attendance/tests/test_hr_attendance_overtime.py
index 30a26e3fdd225..f8103bc530f7b 100644
--- a/addons/hr_attendance/tests/test_hr_attendance_overtime.py
+++ b/addons/hr_attendance/tests/test_hr_attendance_overtime.py
@@ -1019,3 +1019,17 @@ def test_overtime_rule_quantity(self):
     def test_overtime_rule_combined(self):
         # TODO
         pass
+
+    def test_overtime_rule_timing_type_not_set(self):
+        ruleset = self.env['hr.attendance.overtime.ruleset'].create({
+            'name': 'Test Timing Ruleset',
+            'rule_ids': [
+                Command.create({
+                    'name': "Company Schedule",
+                    'base_off': 'timing',
+                }),
+            ],
+        })
+
+        self.assertEqual(ruleset.rule_ids.timing_type, 'work_days',
+                 "Employee work Timing type should default to 'work_days' when not set.")

From 91f4270af10d09b402a1257af7e3a3f93afc7fa4 Mon Sep 17 00:00:00 2001
From: Julien Castiaux <juc@odoo.com>
Date: Wed, 22 Oct 2025 14:58:30 +0000
Subject: [PATCH 436/673] [FIX] base: PyOpenSSLContext wants cryptography
 objects

Since Trixie there's a warning because PyOpenSSL prefers we use the
objects (certificate/private key) of cryptography.

Reference: pyca/pyopenssl@b0cb4b4
X-original-commit: ebc142cec8d9c2f3c1ac4e909561e72e7c04cba1
Part-of: odoo/odoo#235050
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
Signed-off-by: Julien Castiaux (juc) <juc@odoo.com>
---
 odoo/addons/base/models/ir_mail_server.py | 49 +++++++++++++++++------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/odoo/addons/base/models/ir_mail_server.py b/odoo/addons/base/models/ir_mail_server.py
index 73fb0aa55ebff..f5bb522fd7b76 100644
--- a/odoo/addons/base/models/ir_mail_server.py
+++ b/odoo/addons/base/models/ir_mail_server.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import base64
 import datetime
-import email
 import email.policy
 import functools
-import idna
 import logging
 import re
 import smtplib
@@ -15,14 +13,40 @@
 from email.utils import make_msgid
 from socket import gaierror, timeout
 
+import idna
+import OpenSSL
 from OpenSSL import crypto as SSLCrypto
-from OpenSSL.crypto import Error as SSLCryptoError, FILETYPE_PEM
-from OpenSSL.SSL import Error as SSLError, VERIFY_PEER, VERIFY_FAIL_IF_NO_PEER_CERT
+from OpenSSL.crypto import FILETYPE_PEM
+from OpenSSL.crypto import Error as SSLCryptoError
+from OpenSSL.SSL import VERIFY_FAIL_IF_NO_PEER_CERT, VERIFY_PEER
+from OpenSSL.SSL import Error as SSLError
 from urllib3.contrib.pyopenssl import PyOpenSSLContext, get_subj_alt_name
 
-from odoo import api, fields, models, tools, _, modules
+from odoo import _, api, fields, models, modules, tools
 from odoo.exceptions import UserError
-from odoo.tools import formataddr, email_normalize, encapsulate_email, email_domain_extract, email_domain_normalize, human_size
+from odoo.tools import (
+    email_domain_extract,
+    email_domain_normalize,
+    email_normalize,
+    encapsulate_email,
+    formataddr,
+    human_size,
+    parse_version,
+)
+
+if parse_version(OpenSSL.__version__) >= parse_version('24.3.0'):
+    from cryptography.hazmat.primitives.serialization import load_pem_private_key
+    from cryptography.x509 import load_pem_x509_certificate
+else:
+    from OpenSSL import crypto as SSLCrypto
+    from OpenSSL.crypto import FILETYPE_PEM
+    from OpenSSL.crypto import Error as SSLCryptoError
+
+    def load_pem_private_key(pem_key, password):
+        return SSLCrypto.load_privatekey(FILETYPE_PEM, pem_key)
+
+    def load_pem_x509_certificate(pem_cert):
+        return SSLCrypto.load_certificate(FILETYPE_PEM, pem_cert)
 
 try:
     # urllib3 1.26 (ubuntu jammy and up, debian bullseye and up)
@@ -424,12 +448,11 @@ def _connect__(self, host=None, port=None, user=None, password=None, encryption=
                         )
                     else:  # ssl, starttls
                         ssl_context.verify_mode = ssl.CERT_NONE
-                    smtp_ssl_certificate = base64.b64decode(mail_server.smtp_ssl_certificate)
-                    certificate = SSLCrypto.load_certificate(FILETYPE_PEM, smtp_ssl_certificate)
-                    smtp_ssl_private_key = base64.b64decode(mail_server.smtp_ssl_private_key)
-                    private_key = SSLCrypto.load_privatekey(FILETYPE_PEM, smtp_ssl_private_key)
-                    ssl_context._ctx.use_certificate(certificate)
-                    ssl_context._ctx.use_privatekey(private_key)
+                    ssl_context._ctx.use_certificate(load_pem_x509_certificate(
+                        base64.b64decode(mail_server.smtp_ssl_certificate)))
+                    ssl_context._ctx.use_privatekey(load_pem_private_key(
+                        base64.b64decode(mail_server.smtp_ssl_private_key),
+                        password=None))
                     # Check that the private key match the certificate
                     ssl_context._ctx.check_privatekey()
                 except SSLCryptoError as e:

From 95c62669391bd3c789ee46d2ee82b401cb4bf743 Mon Sep 17 00:00:00 2001
From: Julien Castiaux <juc@odoo.com>
Date: Wed, 22 Oct 2025 15:05:15 +0000
Subject: [PATCH 437/673] [FIX] base: localhost can't resolve to ::1

On a Trixie docker image, resolving `localhost` with `AF_INET6` raises a
DNS error. We want to resolve `localhost` because it is the domain with
used in the various certificates's Subject Alternative Name entries.
Here the solution is to resolve the ip address (be it 127.0.0.1 or ::1)
and use that as (fake) name resolution for `localhost`.

closes odoo/odoo#235050

X-original-commit: 65d555c1fcc730dd8d62c937527ba4b11876bee8
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
Signed-off-by: Julien Castiaux (juc) <juc@odoo.com>
---
 odoo/addons/base/tests/test_ir_mail_server_smtpd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/odoo/addons/base/tests/test_ir_mail_server_smtpd.py b/odoo/addons/base/tests/test_ir_mail_server_smtpd.py
index cc57de0661fe4..cd042a74d7289 100644
--- a/odoo/addons/base/tests/test_ir_mail_server_smtpd.py
+++ b/odoo/addons/base/tests/test_ir_mail_server_smtpd.py
@@ -149,8 +149,8 @@ def _get_socket(self, *args, **kwargs):
         # when resolving "localhost" (so stupid), use the following to
         # force aiosmtpd/odoo to bind/connect to a fixed ipv4 OR ipv6
         # address.
-        family, _, cls.port = _find_free_local_address()
-        cls.localhost = getaddrinfo('localhost', cls.port, family)
+        family, addr, cls.port = _find_free_local_address()
+        cls.localhost = getaddrinfo(addr, cls.port, family)
         cls.startClassPatcher(patch('socket.getaddrinfo', cls.getaddrinfo))
 
     def setUp(self):

From bec93444c7d27429affe525fe6a621da99dfbe3d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Thu, 25 Sep 2025 14:44:22 +0200
Subject: [PATCH 438/673] [IMP] test_orm: prefetching

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py            | 71 ++++++++++++++-----
 .../test_orm/models/test_performance.py       | 20 ++++++
 odoo/addons/test_orm/tests/test_timeit.py     | 60 ++++++++++++++++
 3 files changed, 132 insertions(+), 19 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index fbb647444bcf8..28b35e02489bf 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -317,25 +317,25 @@ def test_60_prefetch(self):
     @mute_logger('odoo.models')
     def test_60_prefetch_model(self):
         """ Check the prefetching model. """
-        partners = self.env['res.partner'].search([('id', 'in', self.partners.ids)], limit=PREFETCH_MAX)
-        self.assertTrue(partners)
-
-        def same_prefetch(a, b):
-            self.assertEqual(set(a._prefetch_ids), set(b._prefetch_ids))
+        partners = self.partners
+        self.assertGreater(len(partners), 5)
 
-        def diff_prefetch(a, b):
-            self.assertNotEqual(set(a._prefetch_ids), set(b._prefetch_ids))
+        prefetch_ids = partners._prefetch_ids
+        self.assertIsInstance(prefetch_ids, tuple)
 
         # the recordset operations below use different prefetch sets
-        diff_prefetch(partners, partners.browse())
-        diff_prefetch(partners, partners[0])
-        diff_prefetch(partners, partners[:5])
+        part = partners.browse(partners.ids[:5])
+        self.assertNotEqual(prefetch_ids, partners.browse()._prefetch_ids)
+        self.assertNotEqual(prefetch_ids, part._prefetch_ids)
+        self.assertNotEqual(set(prefetch_ids), set(partners.filtered('country_id')._prefetch_ids))
+        self.assertNotEqual(set(prefetch_ids), set(partners[0]._prefetch_ids))
+        self.assertNotEqual(set(prefetch_ids), set(partners[:5]._prefetch_ids))
 
         # the recordset operations below share the prefetch set
-        same_prefetch(partners, partners.browse(partners.ids))
-        same_prefetch(partners, partners.with_user(self.user_demo))
-        same_prefetch(partners, partners.with_context(active_test=False))
-        same_prefetch(partners, partners[:10].with_prefetch(partners._prefetch_ids))
+        self.assertEqual(prefetch_ids, partners.browse(partners.ids)._prefetch_ids)
+        self.assertEqual(prefetch_ids, partners.with_user(self.user_demo)._prefetch_ids)
+        self.assertEqual(prefetch_ids, partners.with_context(active_test=False)._prefetch_ids)
+        self.assertEqual(prefetch_ids, part.with_prefetch(prefetch_ids)._prefetch_ids)
 
         # iteration and relational fields should use the same prefetch set
         self.assertEqual(type(partners).country_id.type, 'many2one')
@@ -354,12 +354,45 @@ def diff_prefetch(a, b):
             'bank_ids': [Command.create({'acc_number': 'FOO42'})],
             'category_id': [Command.link(self.partner_category.id)],
         }
-        partners = partners.create(vals0) + partners.create(vals1)
+        partners = partners.create([vals0, vals1])
         for partner in partners:
-            same_prefetch(partner, partners)
-            same_prefetch(partner.country_id, partners.country_id)
-            same_prefetch(partner.bank_ids, partners.bank_ids)
-            same_prefetch(partner.category_id, partners.category_id)
+            self.assertEqual(partner._prefetch_ids, partners._prefetch_ids)
+            self.assertEqual(set(partner.country_id._prefetch_ids), set(partners.country_id._prefetch_ids))
+            self.assertEqual(set(partner.bank_ids._prefetch_ids), set(partners.bank_ids._prefetch_ids))
+            self.assertEqual(set(partner.category_id._prefetch_ids), set(partners.category_id._prefetch_ids))
+
+        # records concatenation, union, intersection, difference
+        partners = self.partners
+        prefetch_ids = partners._prefetch_ids
+        part = partners.browse(partners.ids[:5])
+        ners = partners.browse(partners.ids[5:])
+        self.assertNotEqual(part._prefetch_ids, ners._prefetch_ids)
+
+        self.assertNotEqual(set(prefetch_ids), set((partners & ners)._prefetch_ids))
+        self.assertNotEqual(set(prefetch_ids), set((partners - ners)._prefetch_ids))
+
+        self.assertEqual(prefetch_ids, (part + ners)._prefetch_ids)
+        self.assertEqual(prefetch_ids, (part | ners)._prefetch_ids)
+
+        # combining concatenation and union with relational fields
+        child_ids = partners.child_ids._ids
+        self.assertEqual(set(child_ids), set(partners.child_ids._prefetch_ids))
+        self.assertEqual(set(child_ids), set((part.child_ids + ners.child_ids)._prefetch_ids))
+        self.assertEqual(set(child_ids), set((part.child_ids | ners.child_ids)._prefetch_ids))
+
+        prefetch_ids = partners.child_ids._prefetch_ids
+        children = [partner.child_ids[:1] for partner in partners]
+        for child in children:
+            self.assertNotEqual(set(prefetch_ids), set(child._prefetch_ids))
+
+        self.assertNotEqual(set(prefetch_ids), set(partners.browse().concat(*children)._prefetch_ids))
+        self.assertNotEqual(set(prefetch_ids), set(partners.browse().union(*children)._prefetch_ids))
+
+        # incremental concatenation/union should not cause a recursion error
+        result = self.env['res.partner']
+        for partner in partners.create([{'name': f'Partner {i}'} for i in range(1000)]):
+            result += partner.with_prefetch()
+        list(result._prefetch_ids)
 
     @mute_logger('odoo.models')
     def test_60_prefetch_read(self):
diff --git a/odoo/addons/test_orm/models/test_performance.py b/odoo/addons/test_orm/models/test_performance.py
index 06f6494c49063..3e41a059a4afa 100644
--- a/odoo/addons/test_orm/models/test_performance.py
+++ b/odoo/addons/test_orm/models/test_performance.py
@@ -101,3 +101,23 @@ class Test_PerformanceSimpleMinded(models.Model):
     parent_id = fields.Many2one('test_performance.simple.minded')
 
     child_ids = fields.One2many('test_performance.simple.minded', 'parent_id')
+
+    def simple_loop(self):
+        for record in self:
+            record.name
+
+    def nested_loop(self):
+        for record in self:
+            for child in record.child_ids:
+                child.name
+
+    def union_once(self):
+        """ Union all first children at once. """
+        return self.browse().union(*[record.child_ids[:1] for record in self])
+
+    def union_loop(self):
+        """ Union all first children in a loop. """
+        result = self.browse()
+        for record in self:
+            result |= record.child_ids[:1]
+        return result
diff --git a/odoo/addons/test_orm/tests/test_timeit.py b/odoo/addons/test_orm/tests/test_timeit.py
index 56f8415a33ac3..945336df72a0e 100644
--- a/odoo/addons/test_orm/tests/test_timeit.py
+++ b/odoo/addons/test_orm/tests/test_timeit.py
@@ -3,6 +3,8 @@
 import timeit
 from typing import Literal
 
+from unittest.mock import patch
+
 from odoo import Command
 from odoo.models import BaseModel
 from odoo.tests.common import tagged, TransactionCase
@@ -216,3 +218,61 @@ def large_domain_uniq(records):
         ctx = {'dom': large_domain_uniq}
         self.launch_perf_set("records._search(dom(records))",
             ctx=ctx, number=3)
+
+    def test_prefetch_loop(self):
+        records = self.Model.create([{
+                'name': f'record {i}',
+                'child_ids': [
+                    Command.create({'name': f'child {i} {j}', 'active': True})
+                    for j in range(10)
+                ],
+            } for i in range(100)
+        ])
+
+        # mock data fetch to avoid variance due to database communication
+        all_records = records | records.child_ids
+        data = {
+            'name': {record.id: record.name for record in all_records},
+            'child_ids': {record.id: record.child_ids._ids for record in all_records},
+        }
+
+        def fetch(self, field_names):
+            [field_name] = field_names
+            field = self._fields[field_name]
+            field_data = data[field_name]
+            field._insert_cache(self, [field_data[id_] for id_ in self._ids])
+
+        with patch.object(self.Model.__class__, 'fetch', fetch):
+            records = records.with_context(prefetch_fields=False)
+            self.launch_perf("records.env.invalidate_all(); records.simple_loop()", records)
+            self.launch_perf("records.env.invalidate_all(); records.nested_loop()", records)
+
+    def test_prefetch_union(self):
+        # 990 children forces the prefetching to iterate across all prefetch ids
+        records = self.Model.create([{
+                'name': f'record {i}',
+                'child_ids': [
+                    Command.create({'name': f'child {i} {j}', 'active': True})
+                    for j in range(10)
+                ],
+            } for i in range(99)
+        ])
+        # test making a union all at once or in a loop
+        self.launch_perf("records.union_once()", records)
+        self.launch_perf("records.union_loop()", records)
+
+        # test making a union, then iterate over it and prefetch a field
+
+        # mock data fetch to avoid variance due to database communication
+        def fetch(self, field_names):
+            [field_name] = field_names
+            field = self._fields[field_name]
+            field._insert_cache(self, [field_data[id_] for id_ in self._ids])
+
+        field_data = {record.id: record.name for record in records.child_ids}
+
+        with patch.object(self.Model.__class__, 'fetch', fetch):
+            # don't invalidate child_ids, as it impacts prefetching of children
+            records = records.with_context(prefetch_fields=False)
+            self.launch_perf("records.invalidate_model(['name']); records.union_once().simple_loop()", records)
+            self.launch_perf("records.invalidate_model(['name']); records.union_loop().simple_loop()", records)

From 93bfc383b0e196b0c9d95ad8acef0ebf0a8891de Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Fri, 26 Sep 2025 10:49:13 +0200
Subject: [PATCH 439/673] [IMP] orm: factor out and simplify all prefetching
 implementations

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py |  4 +-
 odoo/orm/fields_relational.py      | 59 +++---------------------------
 odoo/orm/utils.py                  | 40 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 28b35e02489bf..49b30a1fe2d8f 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -457,11 +457,11 @@ def test_60_reversed(self):
 
         # check prefetching across x2many field
         prefetch_ids = records.child_ids.ids
-        reversed_ids = list(unique(
+        reversed_ids = [
             child.id
             for record in reversed(records)
             for child in record.child_ids
-        ))
+        ]
 
         self.assertEqual(list(first.child_ids._prefetch_ids), prefetch_ids)
         self.assertEqual(list(last.child_ids._prefetch_ids), reversed_ids)
diff --git a/odoo/orm/fields_relational.py b/odoo/orm/fields_relational.py
index b6fd57541230c..09d139d97a9bd 100644
--- a/odoo/orm/fields_relational.py
+++ b/odoo/orm/fields_relational.py
@@ -4,7 +4,6 @@
 import logging
 import typing
 from collections import defaultdict
-from collections.abc import Reversible
 from operator import attrgetter
 
 from odoo.exceptions import AccessError, MissingError, UserError
@@ -19,7 +18,7 @@
 from .identifiers import NewId
 from .models import BaseModel
 from .query import Query
-from .utils import COLLECTION_TYPES, SQL_OPERATORS, check_pg_name
+from .utils import COLLECTION_TYPES, Prefetch, SQL_OPERATORS, check_pg_name
 
 if typing.TYPE_CHECKING:
     from collections.abc import Sequence
@@ -355,12 +354,12 @@ def convert_to_cache(self, value, record, validate=True):
     def convert_to_record(self, value, record):
         # use registry to avoid creating a recordset for the model
         ids = () if value is None else (value,)
-        prefetch_ids = PrefetchMany2one(record, self)
+        prefetch_ids = Prefetch.relational(self, record)
         return record.pool[self.comodel_name](record.env, ids, prefetch_ids)
 
     def convert_to_record_multi(self, values, records):
         # return the ids as a recordset without duplicates
-        prefetch_ids = PrefetchMany2one(records, self)
+        prefetch_ids = Prefetch.relational(self, records)
         ids = tuple(unique(id_ for id_ in values if id_ is not None))
         return records.pool[self.comodel_name](records.env, ids, prefetch_ids)
 
@@ -649,7 +648,7 @@ def convert_to_cache(self, value, record, validate=True):
 
     def convert_to_record(self, value, record):
         # use registry to avoid creating a recordset for the model
-        prefetch_ids = PrefetchX2many(record, self)
+        prefetch_ids = Prefetch.relational(self, record)
         Comodel = record.pool[self.comodel_name]
         corecords = Comodel(record.env, value, prefetch_ids)
         if (
@@ -661,7 +660,7 @@ def convert_to_record(self, value, record):
 
     def convert_to_record_multi(self, values, records):
         # return the list of ids as a recordset without duplicates
-        prefetch_ids = PrefetchX2many(records, self)
+        prefetch_ids = Prefetch.relational(self, records)
         Comodel = records.pool[self.comodel_name]
         ids = tuple(unique(id_ for ids in values for id_ in ids))
         corecords = Comodel(records.env, ids, prefetch_ids)
@@ -1740,51 +1739,3 @@ def _condition_to_sql_relational(self, model: BaseModel, alias: str, exists: boo
             SQL.identifier(rel_alias, rel_id2),
             coquery.subselect(),
         )
-
-
-class PrefetchMany2one(Reversible):
-    """ Iterable for the values of a many2one field on the prefetch set of a given record. """
-    __slots__ = ('field', 'record')
-
-    def __init__(self, record: BaseModel, field: Many2one):
-        self.record = record
-        self.field = field
-
-    def __iter__(self):
-        field_cache = self.field._get_cache(self.record.env)
-        return unique(
-            coid for id_ in self.record._prefetch_ids
-            if (coid := field_cache.get(id_)) is not None
-        )
-
-    def __reversed__(self):
-        field_cache = self.field._get_cache(self.record.env)
-        return unique(
-            coid for id_ in reversed(self.record._prefetch_ids)
-            if (coid := field_cache.get(id_)) is not None
-        )
-
-
-class PrefetchX2many(Reversible):
-    """ Iterable for the values of an x2many field on the prefetch set of a given record. """
-    __slots__ = ('field', 'record')
-
-    def __init__(self, record: BaseModel, field: _RelationalMulti):
-        self.record = record
-        self.field = field
-
-    def __iter__(self):
-        field_cache = self.field._get_cache(self.record.env)
-        return unique(
-            coid
-            for id_ in self.record._prefetch_ids
-            for coid in field_cache.get(id_, ())
-        )
-
-    def __reversed__(self):
-        field_cache = self.field._get_cache(self.record.env)
-        return unique(
-            coid
-            for id_ in reversed(self.record._prefetch_ids)
-            for coid in field_cache.get(id_, ())
-        )
diff --git a/odoo/orm/utils.py b/odoo/orm/utils.py
index 6225ca0e4adff..4e044b24273c0 100644
--- a/odoo/orm/utils.py
+++ b/odoo/orm/utils.py
@@ -127,6 +127,41 @@ def expand_ids(id0, ids):
             seen.add(id_)
 
 
+#
+# The value of records._prefetch_ids must be iterable and reversible
+#
+
+class PrefetchRelational(Reversible):
+    """ A prefetch object for the values of a relational field. """
+    __slots__ = ('_field', '_records')
+
+    def __init__(self, field, records):
+        self._field = field
+        self._records = records
+
+    def __iter__(self):
+        field_cache = self._field._get_cache(self._records.env)
+        if self._field.type == 'many2one':
+            for id_ in self._records._prefetch_ids:
+                if (coid := field_cache.get(id_)) is not None:
+                    yield coid
+        else:
+            for id_ in self._records._prefetch_ids:
+                if (coids := field_cache.get(id_)):
+                    yield from coids
+
+    def __reversed__(self):
+        field_cache = self._field._get_cache(self._records.env)
+        if self._field.type == 'many2one':
+            for id_ in reversed(self._records._prefetch_ids):
+                if (coid := field_cache.get(id_)) is not None:
+                    yield coid
+        else:
+            for id_ in reversed(self._records._prefetch_ids):
+                if (coids := field_cache.get(id_)):
+                    yield from coids
+
+
 class OriginIds(Reversible):
     """ A reversible iterable returning the origin ids of a collection of ``ids``.
         Actual ids are returned as is, and ids without origin are not returned.
@@ -145,3 +180,8 @@ def __reversed__(self):
         for id_ in reversed(self.ids):
             if id_ := id_ or id_.origin:
                 yield id_
+
+
+class Prefetch:
+    relational = PrefetchRelational
+    origin = OriginIds

From ed6d67841f443ec5562e08326ad0e405876ed540 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 23 Sep 2025 19:20:06 +0200
Subject: [PATCH 440/673] [IMP] orm: make filtered() keep prefetching

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py |  2 +-
 odoo/orm/models.py                 | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 49b30a1fe2d8f..a98ad363ac550 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -327,7 +327,6 @@ def test_60_prefetch_model(self):
         part = partners.browse(partners.ids[:5])
         self.assertNotEqual(prefetch_ids, partners.browse()._prefetch_ids)
         self.assertNotEqual(prefetch_ids, part._prefetch_ids)
-        self.assertNotEqual(set(prefetch_ids), set(partners.filtered('country_id')._prefetch_ids))
         self.assertNotEqual(set(prefetch_ids), set(partners[0]._prefetch_ids))
         self.assertNotEqual(set(prefetch_ids), set(partners[:5]._prefetch_ids))
 
@@ -336,6 +335,7 @@ def test_60_prefetch_model(self):
         self.assertEqual(prefetch_ids, partners.with_user(self.user_demo)._prefetch_ids)
         self.assertEqual(prefetch_ids, partners.with_context(active_test=False)._prefetch_ids)
         self.assertEqual(prefetch_ids, part.with_prefetch(prefetch_ids)._prefetch_ids)
+        self.assertEqual(prefetch_ids, partners.filtered('country_id')._prefetch_ids)
 
         # iteration and relational fields should use the same prefetch set
         self.assertEqual(type(partners).country_id.type, 'many2one')
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index a6dfdbdc5a95a..0b5bb895dc037 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -5564,19 +5564,24 @@ def filtered(self, func: str | Callable[[Self], bool] | Domain) -> Self:
         if not func:
             # align with mapped()
             return self
+
         if callable(func):
             # normal function
             pass
         elif isinstance(func, str):
             if '.' in func:
-                return self.browse(rec_id for rec_id, rec in zip(self._ids, self) if any(rec.mapped(func)))
-            # avoid costly mapped
-            func = self._fields[func].__get__
+                seq_fnames = func
+                func = lambda record: any(record.mapped(seq_fnames))  # noqa: E731
+            else:
+                # avoid costly mapped
+                func = self._fields[func].__get__
         elif isinstance(func, Domain):
             return self.filtered_domain(func)
         else:
             raise TypeError(f"Invalid function {func!r} to filter on {self._name}")
-        return self.browse(rec_id for rec_id, rec in zip(self._ids, self) if func(rec))
+
+        ids = tuple(id_ for id_, rec in zip(self._ids, self) if func(rec))
+        return self.__class__(self.env, ids, self._prefetch_ids)
 
     @typing.overload
     def grouped(self, key: str) -> dict[typing.Any, Self]:
@@ -5621,7 +5626,8 @@ def filtered_domain(self, domain: DomainType) -> Self:
         if not self or not domain:
             return self
         predicate = Domain(domain)._as_predicate(self)
-        return self.browse(rec_id for rec_id, rec in zip(self._ids, self) if predicate(rec))
+        ids = tuple(id_ for id_, rec in zip(self._ids, self) if predicate(rec))
+        return self.__class__(self.env, ids, self._prefetch_ids)
 
     @api.private
     def sorted(self, key: Callable[[Self], typing.Any] | str | None = None, reverse: bool = False) -> Self:

From e098f2c2d40d16f3aa8be94931ce964723853d20 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 23 Sep 2025 19:26:29 +0200
Subject: [PATCH 441/673] [IMP] orm: make records[...] keep prefetching

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py | 6 +++---
 odoo/orm/models.py                 | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index a98ad363ac550..8b879c8c395d4 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -327,8 +327,6 @@ def test_60_prefetch_model(self):
         part = partners.browse(partners.ids[:5])
         self.assertNotEqual(prefetch_ids, partners.browse()._prefetch_ids)
         self.assertNotEqual(prefetch_ids, part._prefetch_ids)
-        self.assertNotEqual(set(prefetch_ids), set(partners[0]._prefetch_ids))
-        self.assertNotEqual(set(prefetch_ids), set(partners[:5]._prefetch_ids))
 
         # the recordset operations below share the prefetch set
         self.assertEqual(prefetch_ids, partners.browse(partners.ids)._prefetch_ids)
@@ -336,6 +334,8 @@ def test_60_prefetch_model(self):
         self.assertEqual(prefetch_ids, partners.with_context(active_test=False)._prefetch_ids)
         self.assertEqual(prefetch_ids, part.with_prefetch(prefetch_ids)._prefetch_ids)
         self.assertEqual(prefetch_ids, partners.filtered('country_id')._prefetch_ids)
+        self.assertEqual(prefetch_ids, partners[0]._prefetch_ids)
+        self.assertEqual(prefetch_ids, partners[:5]._prefetch_ids)
 
         # iteration and relational fields should use the same prefetch set
         self.assertEqual(type(partners).country_id.type, 'many2one')
@@ -383,7 +383,7 @@ def test_60_prefetch_model(self):
         prefetch_ids = partners.child_ids._prefetch_ids
         children = [partner.child_ids[:1] for partner in partners]
         for child in children:
-            self.assertNotEqual(set(prefetch_ids), set(child._prefetch_ids))
+            self.assertEqual(set(prefetch_ids), set(child._prefetch_ids))
 
         self.assertNotEqual(set(prefetch_ids), set(partners.browse().concat(*children)._prefetch_ids))
         self.assertNotEqual(set(prefetch_ids), set(partners.browse().union(*children)._prefetch_ids))
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index 0b5bb895dc037..543c07c583d4b 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -6056,10 +6056,8 @@ def __getitem__(self, key):
         if isinstance(key, str):
             # important: one must call the field's getter
             return self._fields[key].__get__(self)
-        elif isinstance(key, slice):
-            return self.browse(self._ids[key])
-        else:
-            return self.browse((self._ids[key],))
+        ids = self._ids[key] if isinstance(key, slice) else (self._ids[key],)
+        return self.__class__(self.env, ids, self._prefetch_ids)
 
     def __setitem__(self, key: str, value: typing.Any):
         """ Assign the field ``key`` to ``value`` in record ``self``. """

From 7dc1ddcfcaabd5e38cfe2bcb6e8eb130c20e0434 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 23 Sep 2025 19:52:17 +0200
Subject: [PATCH 442/673] [IMP] orm: make recordset difference and intersection
 preserve prefetching

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py | 4 ++--
 odoo/orm/models.py                 | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 8b879c8c395d4..199f391b0252d 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -368,8 +368,8 @@ def test_60_prefetch_model(self):
         ners = partners.browse(partners.ids[5:])
         self.assertNotEqual(part._prefetch_ids, ners._prefetch_ids)
 
-        self.assertNotEqual(set(prefetch_ids), set((partners & ners)._prefetch_ids))
-        self.assertNotEqual(set(prefetch_ids), set((partners - ners)._prefetch_ids))
+        self.assertEqual(prefetch_ids, (partners & ners)._prefetch_ids)
+        self.assertEqual(prefetch_ids, (partners - ners)._prefetch_ids)
 
         self.assertEqual(prefetch_ids, (part + ners)._prefetch_ids)
         self.assertEqual(prefetch_ids, (part | ners)._prefetch_ids)
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index 543c07c583d4b..26bd86dce067b 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -5938,7 +5938,8 @@ def __sub__(self, other) -> Self:
             if self._name != other._name:
                 raise TypeError(f"inconsistent models in: {self} - {other}")
             other_ids = set(other._ids)
-            return self.browse(id_ for id_ in self._ids if id_ not in other_ids)
+            ids = tuple(id_ for id_ in self._ids if id_ not in other_ids)
+            return self.__class__(self.env, ids, self._prefetch_ids)
         except AttributeError:
             raise TypeError(f"unsupported operand types in: {self} - {other!r}")
 
@@ -5950,7 +5951,8 @@ def __and__(self, other) -> Self:
             if self._name != other._name:
                 raise TypeError(f"inconsistent models in: {self} & {other}")
             other_ids = set(other._ids)
-            return self.browse(OrderedSet(id_ for id_ in self._ids if id_ in other_ids))
+            ids = {id_: None for id_ in self._ids if id_ in other_ids}
+            return self.__class__(self.env, tuple(ids), self._prefetch_ids)
         except AttributeError:
             raise TypeError(f"unsupported operand types in: {self} & {other!r}")
 

From d4344d34ab159330a729ce219b470c9e310f95ee Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 23 Sep 2025 19:48:00 +0200
Subject: [PATCH 443/673] [IMP] orm: make concat() and union() sum all
 prefetching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prefetching unions are automatically flattened and deduplicated.  The
flattening of iterables and deduplication is done at iteration only, as
this gives the best tradeoff in terms of performance: the union is very
quick, and the costly part is done when prefetching.  Making unions of
recordsets is faster (big union from 230µs to 213µs, incremental union
from 585µs to 508µs), while determining ids to prefetch is much faster
thanks to the deduplication (4750µs to 400µs).

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py | 11 +++---
 odoo/orm/models.py                 | 11 ++++--
 odoo/orm/utils.py                  | 56 ++++++++++++++++++++++++++++--
 3 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 199f391b0252d..d410cc7afc822 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -371,8 +371,11 @@ def test_60_prefetch_model(self):
         self.assertEqual(prefetch_ids, (partners & ners)._prefetch_ids)
         self.assertEqual(prefetch_ids, (partners - ners)._prefetch_ids)
 
-        self.assertEqual(prefetch_ids, (part + ners)._prefetch_ids)
-        self.assertEqual(prefetch_ids, (part | ners)._prefetch_ids)
+        # those are not the same prefetch object, but they return the same ids
+        self.assertNotEqual(prefetch_ids, (part + ners)._prefetch_ids)
+        self.assertNotEqual(prefetch_ids, (part | ners)._prefetch_ids)
+        self.assertEqual(set(prefetch_ids), set((part + ners)._prefetch_ids))
+        self.assertEqual(set(prefetch_ids), set((part | ners)._prefetch_ids))
 
         # combining concatenation and union with relational fields
         child_ids = partners.child_ids._ids
@@ -385,8 +388,8 @@ def test_60_prefetch_model(self):
         for child in children:
             self.assertEqual(set(prefetch_ids), set(child._prefetch_ids))
 
-        self.assertNotEqual(set(prefetch_ids), set(partners.browse().concat(*children)._prefetch_ids))
-        self.assertNotEqual(set(prefetch_ids), set(partners.browse().union(*children)._prefetch_ids))
+        self.assertEqual(set(prefetch_ids), set(partners.browse().concat(*children)._prefetch_ids))
+        self.assertEqual(set(prefetch_ids), set(partners.browse().union(*children)._prefetch_ids))
 
         # incremental concatenation/union should not cause a recursion error
         result = self.env['res.partner']
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index 26bd86dce067b..ea9262f475276 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -65,7 +65,7 @@
 from .identifiers import NewId
 from .query import Query
 from .utils import (
-    OriginIds, check_object_name, parse_field_expr,
+    OriginIds, Prefetch, check_object_name, parse_field_expr,
     COLLECTION_TYPES, SQL_OPERATORS,
     READ_GROUP_ALL_TIME_GRANULARITY, READ_GROUP_TIME_GRANULARITY, READ_GROUP_NUMBER_GRANULARITY,
     SUPERUSER_ID,
@@ -5921,14 +5921,16 @@ def concat(self, *args: Self) -> Self:
             linear time complexity).
         """
         ids = list(self._ids)
+        prefetch_ids_list = [self._prefetch_ids]
         for arg in args:
             try:
                 if arg._name != self._name:
                     raise TypeError(f"inconsistent models in: {self} + {arg}")
                 ids.extend(arg._ids)
+                prefetch_ids_list.append(arg._prefetch_ids)
             except AttributeError:
                 raise TypeError(f"unsupported operand types in: {self} + {arg!r}")
-        return self.browse(ids)
+        return self.__class__(self.env, tuple(ids), Prefetch.union(prefetch_ids_list))
 
     def __sub__(self, other) -> Self:
         """ Return the recordset of all the records in ``self`` that are not in
@@ -5968,14 +5970,17 @@ def union(self, *args: Self) -> Self:
             complexity, with first occurrence order preserved).
         """
         ids = list(self._ids)
+        prefetch_ids_list = [self._prefetch_ids]
         for arg in args:
             try:
                 if arg._name != self._name:
                     raise TypeError(f"inconsistent models in: {self} | {arg}")
                 ids.extend(arg._ids)
+                prefetch_ids_list.append(arg._prefetch_ids)
             except AttributeError:
                 raise TypeError(f"unsupported operand types in: {self} | {arg!r}")
-        return self.browse(OrderedSet(ids))
+        ids = tuple(dict.fromkeys(ids))
+        return self.__class__(self.env, ids, Prefetch.union(prefetch_ids_list))
 
     def __eq__(self, other):
         """ Test whether two recordsets are equivalent (up to reordering). """
diff --git a/odoo/orm/utils.py b/odoo/orm/utils.py
index 4e044b24273c0..3539403a322ba 100644
--- a/odoo/orm/utils.py
+++ b/odoo/orm/utils.py
@@ -1,6 +1,6 @@
 import re
 import warnings
-from collections.abc import Reversible
+from collections.abc import Iterable, Reversible
 from collections.abc import Set as AbstractSet
 
 import dateutil.relativedelta
@@ -131,7 +131,7 @@ def expand_ids(id0, ids):
 # The value of records._prefetch_ids must be iterable and reversible
 #
 
-class PrefetchRelational(Reversible):
+class PrefetchRelational(Reversible):  # noqa: PLW1641
     """ A prefetch object for the values of a relational field. """
     __slots__ = ('_field', '_records')
 
@@ -139,6 +139,13 @@ def __init__(self, field, records):
         self._field = field
         self._records = records
 
+    def __eq__(self, other):
+        return (
+            isinstance(other, PrefetchRelational)
+            and self._field is other._field
+            and self._records._prefetch_ids == other._records._prefetch_ids
+        )
+
     def __iter__(self):
         field_cache = self._field._get_cache(self._records.env)
         if self._field.type == 'many2one':
@@ -162,7 +169,7 @@ def __reversed__(self):
                     yield from coids
 
 
-class OriginIds(Reversible):
+class OriginIds(Reversible):  # noqa: PLW1641
     """ A reversible iterable returning the origin ids of a collection of ``ids``.
         Actual ids are returned as is, and ids without origin are not returned.
     """
@@ -171,6 +178,9 @@ class OriginIds(Reversible):
     def __init__(self, ids):
         self.ids = ids
 
+    def __eq__(self, other):
+        return isinstance(other, OriginIds) and self.ids == other.ids
+
     def __iter__(self):
         for id_ in self.ids:
             if id_ := id_ or id_.origin:
@@ -182,6 +192,46 @@ def __reversed__(self):
                 yield id_
 
 
+class PrefetchUnion(Reversible):
+    """ A prefetch object for the concatenation/union of recordsets.
+    The constructor takes the `_prefetch_ids` of the recordsets in the
+    concatenation/union.
+    """
+    __slots__ = ('_prefetches',)
+
+    def __init__(self, prefetches: Iterable[Reversible]):
+        self._prefetches = prefetches
+
+    def __iter__(self):
+        prev_it = ()
+        # flatten out prefetches in order to avoid recursion errors
+        stack = list(reversed(self._prefetches))
+        while stack:
+            it = stack.pop()
+            if isinstance(it, PrefetchUnion):
+                stack.extend(reversed(it._prefetches))
+                continue
+            if it == prev_it:  # small optimization to deduplicate a bit
+                continue
+            yield from it
+            prev_it = it
+
+    def __reversed__(self):
+        prev_it = ()
+        # flatten out prefetches in order to avoid recursion errors
+        stack = list(self._prefetches)
+        while stack:
+            it = stack.pop()
+            if isinstance(it, PrefetchUnion):
+                stack.extend(it._prefetches)
+                continue
+            if it == prev_it:  # small optimization to deduplicate a bit
+                continue
+            yield from reversed(it)
+            prev_it = it
+
+
 class Prefetch:
     relational = PrefetchRelational
     origin = OriginIds
+    union = PrefetchUnion

From 040d9711e9bdff4b239e1821d19f2f96396cd5d1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Mon, 20 Oct 2025 11:07:42 +0200
Subject: [PATCH 444/673] [IMP] orm: in filtered, __getitem__, concat, union,
 prefetch record ids first
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This provides better prefetching heuristics when there are more prefetch
ids than the prefetch batch size.  It only makes the union of recordsets
a bit more costly (big union 213µs to 231µs, union loop 508µs to 537µs).

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_api.py        | 48 ++++++++++++++++++++---
 odoo/addons/test_orm/tests/test_fields.py |  2 +-
 odoo/orm/models.py                        | 17 ++++----
 odoo/orm/utils.py                         | 19 +++++----
 4 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index d410cc7afc822..5c17338c651a2 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -333,9 +333,9 @@ def test_60_prefetch_model(self):
         self.assertEqual(prefetch_ids, partners.with_user(self.user_demo)._prefetch_ids)
         self.assertEqual(prefetch_ids, partners.with_context(active_test=False)._prefetch_ids)
         self.assertEqual(prefetch_ids, part.with_prefetch(prefetch_ids)._prefetch_ids)
-        self.assertEqual(prefetch_ids, partners.filtered('country_id')._prefetch_ids)
-        self.assertEqual(prefetch_ids, partners[0]._prefetch_ids)
-        self.assertEqual(prefetch_ids, partners[:5]._prefetch_ids)
+        self.assertEqual(set(prefetch_ids), set(partners.filtered('country_id')._prefetch_ids))
+        self.assertEqual(set(prefetch_ids), set(partners[0]._prefetch_ids))
+        self.assertEqual(set(prefetch_ids), set(partners[:5]._prefetch_ids))
 
         # iteration and relational fields should use the same prefetch set
         self.assertEqual(type(partners).country_id.type, 'many2one')
@@ -368,8 +368,8 @@ def test_60_prefetch_model(self):
         ners = partners.browse(partners.ids[5:])
         self.assertNotEqual(part._prefetch_ids, ners._prefetch_ids)
 
-        self.assertEqual(prefetch_ids, (partners & ners)._prefetch_ids)
-        self.assertEqual(prefetch_ids, (partners - ners)._prefetch_ids)
+        self.assertEqual(set(prefetch_ids), set((partners & ners)._prefetch_ids))
+        self.assertEqual(set(prefetch_ids), set((partners - ners)._prefetch_ids))
 
         # those are not the same prefetch object, but they return the same ids
         self.assertNotEqual(prefetch_ids, (part + ners)._prefetch_ids)
@@ -392,11 +392,47 @@ def test_60_prefetch_model(self):
         self.assertEqual(set(prefetch_ids), set(partners.browse().union(*children)._prefetch_ids))
 
         # incremental concatenation/union should not cause a recursion error
+        partners = partners.create([{
+            'name': f'Partner {i}',
+            'child_ids': [
+                Command.create({'name': f'Child {i} 1'}),
+                Command.create({'name': f'Child {i} 2'}),
+            ],
+        } for i in range(PREFETCH_MAX)
+        ])
         result = self.env['res.partner']
-        for partner in partners.create([{'name': f'Partner {i}'} for i in range(1000)]):
+        for partner in partners:
             result += partner.with_prefetch()
         list(result._prefetch_ids)
 
+        # when building subsets of large recordsets, prefetch in priority the
+        # records in the subset
+        children = partners.child_ids.with_prefetch()
+
+        records = children.filtered(lambda child: child.name.endswith('1'))
+        records.invalidate_model(['name'])
+        records.mapped('name')
+        fetched_ids = records._fields['name']._get_all_cache_ids(records.env)
+        self.assertEqual(set(fetched_ids), set(records._ids))
+
+        records = children[500 : PREFETCH_MAX + 500]
+        records.invalidate_model(['name'])
+        records.mapped('name')
+        fetched_ids = records._fields['name']._get_all_cache_ids(records.env)
+        self.assertEqual(set(fetched_ids), set(records._ids))
+
+        records = children - children[500 : PREFETCH_MAX + 500]
+        records.invalidate_model(['name'])
+        records.mapped('name')
+        fetched_ids = records._fields['name']._get_all_cache_ids(records.env)
+        self.assertEqual(set(fetched_ids), set(records._ids))
+
+        records = self.env['res.partner'].concat(*[partner.child_ids[0] for partner in partners])
+        records.invalidate_model(['name'])
+        records.mapped('name')
+        fetched_ids = records._fields['name']._get_all_cache_ids(records.env)
+        self.assertEqual(set(fetched_ids), set(records._ids))
+
     @mute_logger('odoo.models')
     def test_60_prefetch_read(self):
         """ Check that reading a field computes it on self only. """
diff --git a/odoo/addons/test_orm/tests/test_fields.py b/odoo/addons/test_orm/tests/test_fields.py
index a081f1f96b8b6..845a36240f595 100644
--- a/odoo/addons/test_orm/tests/test_fields.py
+++ b/odoo/addons/test_orm/tests/test_fields.py
@@ -1870,7 +1870,7 @@ def test_31_prefetch(self):
         cat1, cat2 = cats
         self.assertEqual(cat2.name, 'ACCESS')
         # both categories should be ready for prefetching
-        self.assertItemsEqual(cat2._prefetch_ids, cats.ids)
+        self.assertEqual(set(cat2._prefetch_ids), set(cats.ids))
         # but due to our (lame) overwrite of `read`, it should not forbid us to read records we have access to
         self.assertFalse(cat2.discussions)
         self.assertEqual(cat2.parent, cat1)
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index ea9262f475276..59eea9269282e 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -5581,7 +5581,7 @@ def filtered(self, func: str | Callable[[Self], bool] | Domain) -> Self:
             raise TypeError(f"Invalid function {func!r} to filter on {self._name}")
 
         ids = tuple(id_ for id_, rec in zip(self._ids, self) if func(rec))
-        return self.__class__(self.env, ids, self._prefetch_ids)
+        return self.__class__(self.env, ids, Prefetch.union(ids, self._prefetch_ids))
 
     @typing.overload
     def grouped(self, key: str) -> dict[typing.Any, Self]:
@@ -5627,7 +5627,7 @@ def filtered_domain(self, domain: DomainType) -> Self:
             return self
         predicate = Domain(domain)._as_predicate(self)
         ids = tuple(id_ for id_, rec in zip(self._ids, self) if predicate(rec))
-        return self.__class__(self.env, ids, self._prefetch_ids)
+        return self.__class__(self.env, ids, Prefetch.union(ids, self._prefetch_ids))
 
     @api.private
     def sorted(self, key: Callable[[Self], typing.Any] | str | None = None, reverse: bool = False) -> Self:
@@ -5930,7 +5930,8 @@ def concat(self, *args: Self) -> Self:
                 prefetch_ids_list.append(arg._prefetch_ids)
             except AttributeError:
                 raise TypeError(f"unsupported operand types in: {self} + {arg!r}")
-        return self.__class__(self.env, tuple(ids), Prefetch.union(prefetch_ids_list))
+        ids = tuple(ids)
+        return self.__class__(self.env, ids, Prefetch.union(ids, *prefetch_ids_list))
 
     def __sub__(self, other) -> Self:
         """ Return the recordset of all the records in ``self`` that are not in
@@ -5941,7 +5942,7 @@ def __sub__(self, other) -> Self:
                 raise TypeError(f"inconsistent models in: {self} - {other}")
             other_ids = set(other._ids)
             ids = tuple(id_ for id_ in self._ids if id_ not in other_ids)
-            return self.__class__(self.env, ids, self._prefetch_ids)
+            return self.__class__(self.env, ids, Prefetch.union(ids, self._prefetch_ids))
         except AttributeError:
             raise TypeError(f"unsupported operand types in: {self} - {other!r}")
 
@@ -5953,8 +5954,8 @@ def __and__(self, other) -> Self:
             if self._name != other._name:
                 raise TypeError(f"inconsistent models in: {self} & {other}")
             other_ids = set(other._ids)
-            ids = {id_: None for id_ in self._ids if id_ in other_ids}
-            return self.__class__(self.env, tuple(ids), self._prefetch_ids)
+            ids = tuple({id_: None for id_ in self._ids if id_ in other_ids})
+            return self.__class__(self.env, ids, Prefetch.union(ids, self._prefetch_ids))
         except AttributeError:
             raise TypeError(f"unsupported operand types in: {self} & {other!r}")
 
@@ -5980,7 +5981,7 @@ def union(self, *args: Self) -> Self:
             except AttributeError:
                 raise TypeError(f"unsupported operand types in: {self} | {arg!r}")
         ids = tuple(dict.fromkeys(ids))
-        return self.__class__(self.env, ids, Prefetch.union(prefetch_ids_list))
+        return self.__class__(self.env, ids, Prefetch.union(ids, *prefetch_ids_list))
 
     def __eq__(self, other):
         """ Test whether two recordsets are equivalent (up to reordering). """
@@ -6064,7 +6065,7 @@ def __getitem__(self, key):
             # important: one must call the field's getter
             return self._fields[key].__get__(self)
         ids = self._ids[key] if isinstance(key, slice) else (self._ids[key],)
-        return self.__class__(self.env, ids, self._prefetch_ids)
+        return self.__class__(self.env, ids, Prefetch.union(ids, self._prefetch_ids))
 
     def __setitem__(self, key: str, value: typing.Any):
         """ Assign the field ``key`` to ``value`` in record ``self``. """
diff --git a/odoo/orm/utils.py b/odoo/orm/utils.py
index 3539403a322ba..2ac4693a45437 100644
--- a/odoo/orm/utils.py
+++ b/odoo/orm/utils.py
@@ -1,6 +1,6 @@
 import re
 import warnings
-from collections.abc import Iterable, Reversible
+from collections.abc import Reversible
 from collections.abc import Set as AbstractSet
 
 import dateutil.relativedelta
@@ -194,16 +194,20 @@ def __reversed__(self):
 
 class PrefetchUnion(Reversible):
     """ A prefetch object for the concatenation/union of recordsets.
-    The constructor takes the `_prefetch_ids` of the recordsets in the
-    concatenation/union.
+    The constructor takes the ids of the concatenation/union and the prefetch
+    ids of the recordsets in the concatenation/union.  The given ids are
+    redundant but have priority when iterating, which makes them prioritary
+    when prefetching.
     """
-    __slots__ = ('_prefetches',)
+    __slots__ = ('_ids', '_prefetches')
 
-    def __init__(self, prefetches: Iterable[Reversible]):
+    def __init__(self, ids: tuple, *prefetches: Reversible):
+        self._ids = ids
         self._prefetches = prefetches
 
     def __iter__(self):
-        prev_it = ()
+        prev_it = self._ids
+        yield from prev_it
         # flatten out prefetches in order to avoid recursion errors
         stack = list(reversed(self._prefetches))
         while stack:
@@ -217,7 +221,8 @@ def __iter__(self):
             prev_it = it
 
     def __reversed__(self):
-        prev_it = ()
+        prev_it = self._ids
+        yield from prev_it
         # flatten out prefetches in order to avoid recursion errors
         stack = list(self._prefetches)
         while stack:

From c69a88cbdad78f61af65e29bc76e5b64d6c228bb Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Mon, 3 Nov 2025 15:42:23 +0100
Subject: [PATCH 445/673] [IMP] *: simplify code, use records[0] instead of
 next(iter(records))

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/account/models/account_move.py         | 2 +-
 addons/calendar/models/mail_activity_mixin.py | 3 +--
 addons/mail/models/mail_activity_mixin.py     | 2 +-
 addons/payment_paypal/utils.py                | 4 ++--
 addons/sale/tests/test_sale_order.py          | 2 +-
 addons/test_mail/tests/test_mail_message.py   | 4 ++--
 odoo/addons/base/models/res_config.py         | 2 +-
 odoo/orm/fields.py                            | 5 ++---
 8 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 8c8e58a6c5894..7f0033ffb5b7c 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -2947,7 +2947,7 @@ def _is_eligible_for_early_payment_discount(self, currency, reference_date):
                 not reference_date
                 or not self.invoice_date
                 or (
-                    (existing_discount_date := next(iter(payment_terms)).discount_date)
+                    (existing_discount_date := payment_terms[0].discount_date)
                     and
                     reference_date <= existing_discount_date
                 )
diff --git a/addons/calendar/models/mail_activity_mixin.py b/addons/calendar/models/mail_activity_mixin.py
index 495fb629aa320..9eac3e2dc1e30 100644
--- a/addons/calendar/models/mail_activity_mixin.py
+++ b/addons/calendar/models/mail_activity_mixin.py
@@ -16,5 +16,4 @@ def _compute_activity_calendar_event_id(self):
         It evaluates to false if there is no such event."""
         for record in self:
             activities = record.activity_ids
-            activity = next(iter(activities), activities)
-            record.activity_calendar_event_id = activity.calendar_event_id
+            record.activity_calendar_event_id = activities[:1].calendar_event_id
diff --git a/addons/mail/models/mail_activity_mixin.py b/addons/mail/models/mail_activity_mixin.py
index 525028bec5e8c..d5c9dff391c59 100644
--- a/addons/mail/models/mail_activity_mixin.py
+++ b/addons/mail/models/mail_activity_mixin.py
@@ -210,7 +210,7 @@ def _compute_sql_activity_state(self, alias, query):
     def _compute_activity_date_deadline(self):
         for record in self:
             activities = record.activity_ids
-            record.activity_date_deadline = next(iter(activities), activities).date_deadline
+            record.activity_date_deadline = activities[:1].date_deadline
 
     def _search_activity_date_deadline(self, operator, operand):
         if operator == 'in' and False in operand:
diff --git a/addons/payment_paypal/utils.py b/addons/payment_paypal/utils.py
index 6e4b6555dfa0b..f1223279784b6 100644
--- a/addons/payment_paypal/utils.py
+++ b/addons/payment_paypal/utils.py
@@ -39,10 +39,10 @@ def format_shipping_address(tx_sudo):
     address_vals = {}
 
     if 'sale_order_ids' in tx_sudo and tx_sudo.sale_order_ids:
-        order = next(iter(tx_sudo.sale_order_ids))
+        order = tx_sudo.sale_order_ids[0]
         partner_shipping = order.partner_shipping_id
     elif 'invoice_ids' in tx_sudo and tx_sudo.invoice_ids:
-        invoice = next(iter(tx_sudo.invoice_ids))
+        invoice = tx_sudo.invoice_ids[0]
         partner_shipping = invoice.partner_shipping_id
     else:
         return address_vals
diff --git a/addons/sale/tests/test_sale_order.py b/addons/sale/tests/test_sale_order.py
index 0b161e50182c1..5df8a78c5bf99 100644
--- a/addons/sale/tests/test_sale_order.py
+++ b/addons/sale/tests/test_sale_order.py
@@ -241,7 +241,7 @@ def test_sol_names(self):
         })
         no_variant_product = no_variant_product_tmpl.product_variant_id
         ptals = no_variant_product_tmpl.valid_product_template_attribute_line_ids
-        ptav1 = next(iter(ptals.product_template_value_ids))
+        ptav1 = ptals.product_template_value_ids[0]
         product_with_desc = self.env['product.product'].create({
             'name': "Product with description",
             'description_sale': "Additional\ninfo.",
diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py
index 8e1688b16835d..f5111f87ee1a5 100644
--- a/addons/test_mail/tests/test_mail_message.py
+++ b/addons/test_mail/tests/test_mail_message.py
@@ -163,11 +163,11 @@ def test_records_by_message(self):
         self.assertEqual(m2_records, record3)
         self.assertEqual(m2_records._prefetch_ids, tuple(record3.ids))
         # methods called on individual message from a batch: prefetch from batch is kept
-        records_by_model_name = next(iter(messages))._records_by_model_name()
+        records_by_model_name = messages[0]._records_by_model_name()
         test_simple_records = records_by_model_name["mail.test.simple"]
         self.assertEqual(test_simple_records, record1)
         self.assertEqual(test_simple_records._prefetch_ids, tuple((record1 + record2).ids))
-        record_by_message = next(iter(messages))._record_by_message()
+        record_by_message = messages[0]._record_by_message()
         m0_records = record_by_message[messages[0]]
         self.assertEqual(m0_records, record1)
         self.assertEqual(m0_records._prefetch_ids, tuple((record1 + record2).ids))
diff --git a/odoo/addons/base/models/res_config.py b/odoo/addons/base/models/res_config.py
index df3fce0d5de1a..ed21702c02b75 100644
--- a/odoo/addons/base/models/res_config.py
+++ b/odoo/addons/base/models/res_config.py
@@ -540,7 +540,7 @@ def create(self, vals_list):
                 old_value = field0.convert_to_record(
                     field0.convert_to_cache(vals[fname0], self), self)
                 for fname in fnames:
-                    old_value = next(iter(old_value), old_value)[fname]
+                    old_value = old_value[:1][fname]
 
                 # determine the new value
                 new_value = field.convert_to_record(
diff --git a/odoo/orm/fields.py b/odoo/orm/fields.py
index bc3e3826451fa..80c3c582fea0a 100644
--- a/odoo/orm/fields.py
+++ b/odoo/orm/fields.py
@@ -686,8 +686,7 @@ def traverse_related(self, record: BaseModel) -> tuple[BaseModel, Field]:
         one, and return it as a pair `(last_record, last_field)`. """
         for name in self.related.split('.')[:-1]:
             # take the first record when traversing
-            corecord = record[name]
-            record = next(iter(corecord), corecord)
+            record = record[name][:1]
         return record, self.related_field
 
     def traverse_related_sql(self, model: BaseModel, alias: str, query: Query) -> tuple[BaseModel, Field, str]:
@@ -741,7 +740,7 @@ def _compute_related(self, records: BaseModel) -> None:
         values = list(records)
         for name in self.related.split('.')[:-1]:
             try:
-                values = [next(iter(val := value[name]), val) for value in values]
+                values = [value[name][:1] for value in values]
             except AccessError as e:
                 description = records.env['ir.model']._get(records._name).name
                 env = records.env

From 64c453027e57b28caf83c506ef38714769e57f61 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 30 Sep 2025 16:16:35 +0200
Subject: [PATCH 446/673] [FIX] mrp: test on resequence

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/mrp/tests/test_bom.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/tests/test_bom.py b/addons/mrp/tests/test_bom.py
index 3ae0418c04bbd..7ef9ae509027a 100644
--- a/addons/mrp/tests/test_bom.py
+++ b/addons/mrp/tests/test_bom.py
@@ -2146,12 +2146,13 @@ def test_cycle_on_bom_sequencing(self):
         # simulate resequence from UI (reverse C->D and C->E)
         # (see odoo/addons/web/controllers/main.py:1352)
         boms.invalidate_recordset()
-        for i, record in enumerate(boms[0] | boms[1] | boms[3] | boms[2] | boms[4] | boms[5]):
+        # hack warning: the sequence check depends on the prefetching order!
+        for i, record in enumerate(boms.browse(boms.ids[i] for i in [0, 1, 3, 2, 4, 5])):
             record.write({'sequence': i})
 
         # simulate a second resequencing (set C->A before C->D)
         with self.assertRaises(exceptions.ValidationError):
-            for i, record in enumerate(boms[0] | boms[1] | boms[5] | boms[3] | boms[2] | boms[4]):
+            for i, record in enumerate(boms.browse(boms.ids[i] for i in [0, 1, 5, 3, 2, 4])):
                 record.write({'sequence': i})
 
     def test_cycle_on_legit_apply_variants(self):

From 2eaca73880e4855b9ca33290769155159f7fc4ed Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Thu, 2 Oct 2025 14:26:09 +0200
Subject: [PATCH 447/673] [FIX] test_mail: reduce prefetching for a test case

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/test_mail/tests/test_performance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index af7cb7138a1ab..12bcba3b38fbe 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -992,7 +992,7 @@ def test_message_get_default_recipients_batch(self):
     @users('employee')
     @warmup
     def test_message_get_suggested_recipients(self):
-        record = self.test_records_recipients[0].with_env(self.env)
+        record = self.test_records_recipients[0].with_env(self.env).with_prefetch()
         with self.assertQueryCount(employee=22):  # tm: 16
             recipients = record._message_get_suggested_recipients(no_create=False)
         new_partner = self.env['res.partner'].search([('email_normalized', '=', 'only.email.1@test.example.com')])

From 1a738e238ce591eecf32b48b31631b601830b97d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Fri, 3 Oct 2025 09:39:05 +0200
Subject: [PATCH 448/673] [FIX] hr_recruitment: make computed field work with
 several records

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/hr_recruitment_survey/models/survey_survey.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/hr_recruitment_survey/models/survey_survey.py b/addons/hr_recruitment_survey/models/survey_survey.py
index e85b73c702834..f91fc56db84c3 100644
--- a/addons/hr_recruitment_survey/models/survey_survey.py
+++ b/addons/hr_recruitment_survey/models/survey_survey.py
@@ -15,7 +15,8 @@ def _compute_allowed_survey_types(self):
         super()._compute_allowed_survey_types()
         if self.env.user.has_group('hr_recruitment.group_hr_recruitment_interviewer') or \
                 self.env.user.has_group('survey.group_survey_user'):
-            self.allowed_survey_types = (self.allowed_survey_types or []) + ['recruitment']
+            for survey in self:
+                survey.allowed_survey_types = (survey.allowed_survey_types or []) + ['recruitment']
 
     def get_formview_id(self, access_uid=None):
         if self.survey_type == 'recruitment':

From 19a382a8f8a8e27bfc5bb3ff5e97c4aaaa071ff6 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Tue, 14 Oct 2025 17:33:56 +0200
Subject: [PATCH 449/673] [FIX] html_editor: add explicit prefetching to avoid
 memory error

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/html_editor/models/ir_ui_view.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/html_editor/models/ir_ui_view.py b/addons/html_editor/models/ir_ui_view.py
index b3c91f996bcf1..4cc07aace858d 100644
--- a/addons/html_editor/models/ir_ui_view.py
+++ b/addons/html_editor/models/ir_ui_view.py
@@ -63,7 +63,7 @@ def _views_get(self, view_id, get_children=True, bundles=False, root=True, visit
                 views_to_return += self._views_get(called_view, get_children=get_children, bundles=bundles, visited=visited + views_to_return.ids)
 
         if not get_children:
-            return views_to_return
+            return views_to_return.with_prefetch()  # simplify prefetching to avoid memory error
 
         extensions = self._view_get_inherited_children(view)
 
@@ -74,7 +74,7 @@ def _views_get(self, view_id, get_children=True, bundles=False, root=True, visit
                 for ext_view in self._views_get(extension, get_children=extension.active, root=False, visited=visited + views_to_return.ids):
                     if ext_view not in views_to_return:
                         views_to_return += ext_view
-        return views_to_return
+        return views_to_return.with_prefetch()  # simplify prefetching to avoid memory error
 
     @api.model
     def get_related_views(self, key, bundles=False):

From 22c0997b530f33c9e14f830f46772a5433bf2b93 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Thu, 16 Oct 2025 16:35:11 +0200
Subject: [PATCH 450/673] [FIX] website_sale: remove extra query due to
 aggressive prefetching

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/website_sale/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index e06c86912f5d6..94f20d8c36c18 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -448,7 +448,7 @@ def shop(self, page=0, category=None, search='', min_price=0.0, max_price=0.0, t
 
         pager = website.pager(url=url, total=product_count, page=page, step=ppg, scope=5, url_args=post)
         offset = pager['offset']
-        products = search_product[offset:offset + ppg]
+        products = search_product[offset:offset + ppg].with_prefetch()
         products.fetch()
 
         # map each product to its variant, and prefetch the variants

From e295e6125c17a4200abb0ff539dd4e0c02d4b836 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Thu, 23 Oct 2025 15:36:22 +0200
Subject: [PATCH 451/673] [FIX] test_website_modules: filtered() saved one
 query

Part-of: odoo/odoo#229057
Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/test_website_modules/tests/test_performance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/test_website_modules/tests/test_performance.py b/addons/test_website_modules/tests/test_performance.py
index 5116fa8db8aa7..5faea806810ee 100644
--- a/addons/test_website_modules/tests/test_performance.py
+++ b/addons/test_website_modules/tests/test_performance.py
@@ -374,9 +374,9 @@ def test_perf_sql_queries_shop(self):
         # To increase the query count you must ask the permission to al
         query_count, queries = self._get_queries_shop()
 
-        query_count += 3
+        query_count += 2
         queries['account_tax'] += 1
-        queries['account_account_tag'] += 2
+        queries['account_account_tag'] += 1
 
         if self._has_demo_data():
             query_count += 2

From 8f31dd2c6d84e23ace506524817b76b3ba262a30 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Mon, 3 Nov 2025 09:29:08 +0100
Subject: [PATCH 452/673] [FIX] sale: use x.with_prefetch() instead of x[0] to
 avoid prefetching

closes odoo/odoo#229057

Related: odoo/enterprise#96085
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/sale/models/sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py
index 3b34cf94c1cea..f4c90d7144cce 100644
--- a/addons/sale/models/sale_order.py
+++ b/addons/sale/models/sale_order.py
@@ -1276,7 +1276,7 @@ def _cron_send_pending_emails(self):
         pending_email_orders = self.search([('pending_email_template_id', '!=', False)])
         self.env['ir.cron']._commit_progress(remaining=len(pending_email_orders))
         for order in pending_email_orders:
-            order = order[0]  # Avoid pre-fetching after each cache invalidation due to committing.
+            order = order.with_prefetch()  # Avoid pre-fetching after each cache invalidation due to committing.
             order._send_order_notification_mail(
                 order.pending_email_template_id, allow_deferred_sending=False
             )  # Resume the email sending.

From 674187c6dcf3eedfe7ef556ba4656c8a3b4aa24b Mon Sep 17 00:00:00 2001
From: Akash Parmar <akap@odoo.com>
Date: Tue, 4 Nov 2025 18:15:32 +0530
Subject: [PATCH 453/673] [IMP] mail: redirect from Configuration to Settings >
 Discuss
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Purpose of this commit:

A new menu item `Settings` has been added under the Discuss app `Configuration`
menu, which redirects users to Settings > General Settings > Discuss
for easier access to Discuss related settings.

Part of task-5227387

closes odoo/odoo#234470

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/__manifest__.py                   |  2 +-
 ...actions_client.xml => ir_actions_data.xml} |  5 +
 .../tests/tours/discuss_configuration_tour.js | 16 ++++
 addons/mail/views/mail_menus.xml              |  8 +-
 .../mail/views/res_config_settings_views.xml  | 94 ++++++++++---------
 5 files changed, 77 insertions(+), 48 deletions(-)
 rename addons/mail/data/{ir_actions_client.xml => ir_actions_data.xml} (75%)

diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index ac399e65d6e70..4b2f384f60399 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -102,7 +102,7 @@
         'data/mail_activity_type_data.xml',
         'data/security_notifications_templates.xml',
         'data/ir_cron_data.xml',
-        'data/ir_actions_client.xml',
+        'data/ir_actions_data.xml',
         'security/mail_security.xml',
         'security/ir.model.access.csv',
         'views/discuss_public_templates.xml',
diff --git a/addons/mail/data/ir_actions_client.xml b/addons/mail/data/ir_actions_data.xml
similarity index 75%
rename from addons/mail/data/ir_actions_client.xml
rename to addons/mail/data/ir_actions_data.xml
index b11f9e9ee24ce..825898e0d7e5b 100644
--- a/addons/mail/data/ir_actions_client.xml
+++ b/addons/mail/data/ir_actions_data.xml
@@ -13,5 +13,10 @@
             <field name="target">new</field>
             <field name="context">{'dialog_size': 'medium', 'footer': false}</field>
         </record>
+        <record id="action_open_discuss_settings" model="ir.actions.act_url">
+            <field name="name">Settings</field>
+            <field name="url" eval="'/odoo/settings#discuss_setting'"/>
+            <field name="target">self</field>
+        </record>
     </data>
 </odoo>
diff --git a/addons/mail/static/tests/tours/discuss_configuration_tour.js b/addons/mail/static/tests/tours/discuss_configuration_tour.js
index 23aade9f70056..556639a02879c 100644
--- a/addons/mail/static/tests/tours/discuss_configuration_tour.js
+++ b/addons/mail/static/tests/tours/discuss_configuration_tour.js
@@ -74,5 +74,21 @@ registry.category("web_tour.tours").add("discuss_configuration_tour", {
         {
             trigger: "label:contains('Edge blur intensity')",
         },
+        {
+            trigger: ".modal-header button[aria-label='Close']",
+            run: "click",
+        },
+        {
+            trigger: ".o_main_navbar button:contains('Configuration')",
+            run: "click",
+        },
+        {
+            trigger: ".dropdown-menu a:contains('Settings')",
+            expectUnloadPage: true,
+            run: "click",
+        },
+        {
+            trigger: "#discuss_setting",
+        },
     ],
 });
diff --git a/addons/mail/views/mail_menus.xml b/addons/mail/views/mail_menus.xml
index a5552fc146adc..c8bd07ed55ce5 100644
--- a/addons/mail/views/mail_menus.xml
+++ b/addons/mail/views/mail_menus.xml
@@ -27,11 +27,17 @@
         parent="mail.menu_root_discuss"
         sequence="3"
     />
+    <menuitem name="Settings"
+        id="mail.menu_settings"
+        parent="mail.menu_configuration"
+        action="action_open_discuss_settings"
+        sequence="1"
+    />
     <menuitem name="Notifications"
         id="mail.menu_notification_settings"
         parent="mail.menu_configuration"
         action="mail.discuss_notification_settings_action"
-        sequence="1"
+        sequence="2"
     />
     <menuitem
         id="mail.menu_call_settings"
diff --git a/addons/mail/views/res_config_settings_views.xml b/addons/mail/views/res_config_settings_views.xml
index 610b0c4fa8b16..e65dc94fd3abf 100644
--- a/addons/mail/views/res_config_settings_views.xml
+++ b/addons/mail/views/res_config_settings_views.xml
@@ -59,55 +59,57 @@
                             <field name="restrict_template_rendering"/>
                         </setting>
                     </block>
-                    <block title="Discuss" id="discuss">
-                        <setting id="activities_setting" string="Activities" help="Configure your activity types">
-                            <div class="content-group">
-                                <div class="mt8">
-                                    <button name="%(mail.mail_activity_type_action)d" string="Activity Types" type="action" class="oe_link" icon="oi-arrow-right"/>
-                                </div>
-                            </div>
-                        </setting>
-                        <setting string="Custom ICE Server with Twilio"
-                                 help="Set up your own server for small group calls using peer-to-peer connections"
-                                 documentation="https://www.odoo.com/documentation/latest/applications/productivity/discuss/ice_servers.html">
-                            <field name="use_twilio_rtc_servers"/>
-                            <div class="content-group" invisible="not use_twilio_rtc_servers">
-                                <div class="row mt16" id="mail_twilio_sid">
-                                    <label for="twilio_account_sid" class="col-lg-3"/>
-                                    <field name="twilio_account_sid" string="Account SID" placeholder="e.g. ACd5543a0b450ar4c7t95f1b6e8a39t543"/>
-                                </div>
-                                <div class="row mt16" id="mail_twilio_auth_token">
-                                    <label for="twilio_account_token" class="col-lg-3"/>
-                                    <field name="twilio_account_token" string="Account Auth Token" placeholder="e.g. 65ea4f9e948b693N5156F350256bd152"/>
+                    <div id="discuss_setting">
+                        <block title="Discuss" id="discuss">
+                            <setting id="activities_setting" string="Activities" help="Configure your activity types">
+                                <div class="content-group">
+                                    <div class="mt8">
+                                        <button name="%(mail.mail_activity_type_action)d" string="Activity Types" type="action" class="oe_link" icon="oi-arrow-right"/>
+                                    </div>
                                 </div>
-                            </div>
-                        </setting>
-                        <setting string="Custom SFU Server" help="Set up your own server for large group calls by routing connections centrally">
-                            <field name="use_sfu_server"/>
-                            <div class="content-group" invisible="not use_sfu_server">
-                                <div class="row mt16">
-                                    <label for="sfu_server_url" string="URL" class="col-lg-3"/>
-                                    <field name="sfu_server_url"/>
+                            </setting>
+                            <setting string="Custom ICE Server with Twilio"
+                                    help="Set up your own server for small group calls using peer-to-peer connections"
+                                    documentation="https://www.odoo.com/documentation/latest/applications/productivity/discuss/ice_servers.html">
+                                <field name="use_twilio_rtc_servers"/>
+                                <div class="content-group" invisible="not use_twilio_rtc_servers">
+                                    <div class="row mt16" id="mail_twilio_sid">
+                                        <label for="twilio_account_sid" class="col-lg-3"/>
+                                        <field name="twilio_account_sid" string="Account SID" placeholder="e.g. ACd5543a0b450ar4c7t95f1b6e8a39t543"/>
+                                    </div>
+                                    <div class="row mt16" id="mail_twilio_auth_token">
+                                        <label for="twilio_account_token" class="col-lg-3"/>
+                                        <field name="twilio_account_token" string="Account Auth Token" placeholder="e.g. 65ea4f9e948b693N5156F350256bd152"/>
+                                    </div>
                                 </div>
-                                <div class="row mt16">
-                                    <label for="sfu_server_key" string="Key" class="col-lg-3"/>
-                                    <field name="sfu_server_key"/>
+                            </setting>
+                            <setting string="Custom SFU Server" help="Set up your own server for large group calls by routing connections centrally">
+                                <field name="use_sfu_server"/>
+                                <div class="content-group" invisible="not use_sfu_server">
+                                    <div class="row mt16">
+                                        <label for="sfu_server_url" string="URL" class="col-lg-3"/>
+                                        <field name="sfu_server_url"/>
+                                    </div>
+                                    <div class="row mt16">
+                                        <label for="sfu_server_key" string="Key" class="col-lg-3"/>
+                                        <field name="sfu_server_key"/>
+                                    </div>
                                 </div>
-                            </div>
-                        </setting>
-                        <setting string="Custom ICE Servers" help="Use your own servers for calls to manage heavy traffic and ensure reliability if Twilio is unavailable"
-                                 documentation="https://www.odoo.com/documentation/latest/applications/productivity/discuss/ice_servers.html#define-a-list-of-custom-ice-servers">
-                                 <div class="content-group">
-                                        <button type="action" name="%(mail.action_ice_servers)d" string="Configure ICE Servers" icon="oi-arrow-right" class="btn-link"/>
-                                 </div>
-                        </setting>
-                        <setting id="tenor_api_key" string="Tenor GIF API key" help="Add a Tenor GIF API key to enable GIFs support." documentation="https://developers.google.com/tenor/guides/quickstart#setup">
-                            <field name="tenor_api_key" placeholder="Paste your API key"/>
-                        </setting>
-                        <setting string="Message Translation" help="Google Translate Integration" id="message_translation_setting" documentation="https://cloud.google.com/translate/docs/setup">
-                            <field name="google_translate_api_key" placeholder="Paste your API key"/>
-                        </setting>
-                    </block>
+                            </setting>
+                            <setting string="Custom ICE Servers" help="Use your own servers for calls to manage heavy traffic and ensure reliability if Twilio is unavailable"
+                                    documentation="https://www.odoo.com/documentation/latest/applications/productivity/discuss/ice_servers.html#define-a-list-of-custom-ice-servers">
+                                    <div class="content-group">
+                                            <button type="action" name="%(mail.action_ice_servers)d" string="Configure ICE Servers" icon="oi-arrow-right" class="btn-link"/>
+                                    </div>
+                            </setting>
+                            <setting id="tenor_api_key" string="Tenor GIF API key" help="Add a Tenor GIF API key to enable GIFs support." documentation="https://developers.google.com/tenor/guides/quickstart#setup">
+                                <field name="tenor_api_key" placeholder="Paste your API key"/>
+                            </setting>
+                            <setting string="Message Translation" help="Google Translate Integration" id="message_translation_setting" documentation="https://cloud.google.com/translate/docs/setup">
+                                <field name="google_translate_api_key" placeholder="Paste your API key"/>
+                            </setting>
+                        </block>
+                    </div>
                 </div>
                 <setting id="document_layout_setting" position="after">
                     <setting string="Email Templates" help="Customize the look and feel of automated emails" id="mail_templates_setting" groups="mail.group_mail_template_editor,base.group_system" company_dependent="1">

From 9bedd783a6fc6dc001e5b5f7630416db85dabee8 Mon Sep 17 00:00:00 2001
From: "Mahdi Alijani (malj)" <malj@odoo.com>
Date: Tue, 4 Nov 2025 10:00:58 +0000
Subject: [PATCH 454/673] [FIX] mrp_account: failing test due to duration
 inverse change

Issue:
This is caused by changing the duration inverse in #233777.

Cause:
Before #233777, in duration inverse, only sum of `time_ids` was
taken into account to calculate the `duration`.
After that PR, `time_ids` with `get_working_duration`
are also taken into account which cause this test fail.

runbot-233742

closes odoo/odoo#235127

X-original-commit: 70ea4328f33755f476453853465cb8feb33076b4
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Signed-off-by: Mohammadmahdi Alijani (malj) <malj@odoo.com>
---
 addons/mrp_account/tests/test_mrp_account.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mrp_account/tests/test_mrp_account.py b/addons/mrp_account/tests/test_mrp_account.py
index 30c1ddde5dbda..df2cb412e427a 100644
--- a/addons/mrp_account/tests/test_mrp_account.py
+++ b/addons/mrp_account/tests/test_mrp_account.py
@@ -819,7 +819,6 @@ def test_mo_without_finished_moves(self):
         })
         mo.action_confirm()
         workorder = mo.workorder_ids
-        workorder.button_start()
         workorder.duration = 60
         self.assertEqual(workorder._cal_cost(), 20)
         # Simulate missing finished moves

From cff8e9ff5c6c433e0294332119364e1013db5c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tanguy=20Qu=C3=A9guineur?= <taqu@odoo.com>
Date: Tue, 4 Nov 2025 14:18:49 +0000
Subject: [PATCH 455/673] [FIX] project: prevent error when mail sent to alias

**Steps to reproduce**
- Set an alias on a project, e.g. `my-project@my-domain.com`
- Send an email to this alias, with the `To` part including
a display name (default in most clients).
e.g. `To: MyProject <my-project@my-domain.com>`
- Issue: the task is not created because of a traceback
`ValueError: list.remove(x): x not in list`

**Change**
The values in the dict returned by `_mail_cc_sanitized_raw_dict` can
be more than just an email, so use the keys instead.
Note: use `discard` instead of `remove` to avoid error if for some
reason a partner has the same mail as the alias.

opw-5176607

closes odoo/odoo#235002

X-original-commit: 75ba7dc1f06d0a0d946750a3a6bb200486e6db85
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/project/models/project_task.py         |  6 +--
 .../tests/test_project_mail_features.py       | 52 ++++++++++++-------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/addons/project/models/project_task.py b/addons/project/models/project_task.py
index f7c5aff42c129..266e48e306b56 100644
--- a/addons/project/models/project_task.py
+++ b/addons/project/models/project_task.py
@@ -1654,13 +1654,13 @@ def _find_internal_users_from_address_mail(self, emails, project_id=False):
         )
         partners = self.env['res.partner'].concat(*matched_partners)
         unresolved_emails = set(sanitized_email_dict) - set(partners.mapped("email"))
-        unmatched_partner_emails = [sanitized_email_dict.get(email) for email in unresolved_emails]
         if project_id:
             project = self.env["project.project"].browse(project_id)
             project_alias_address = project.alias_name + "@" + project.alias_domain_id.name
-            # Removing project alias from unmatched_partner_emails as this will be added to cc_mail address and when
+            # Removing project alias from unresolved_emails as this will be added to cc_mail address and when
             # a mail is sent unnecessary partner is created in the name of project_alias
-            unmatched_partner_emails.remove(project_alias_address)
+            unresolved_emails.discard(project_alias_address)
+        unmatched_partner_emails = [sanitized_email_dict.get(email) for email in unresolved_emails]
 
         users = partners.user_ids
         internal_user_ids = users.filtered(lambda u: not u.share).ids
diff --git a/addons/project/tests/test_project_mail_features.py b/addons/project/tests/test_project_mail_features.py
index 39ae23ffb497a..fca98ad31ccb9 100644
--- a/addons/project/tests/test_project_mail_features.py
+++ b/addons/project/tests/test_project_mail_features.py
@@ -571,32 +571,44 @@ def test_task_portal_share_adds_followers(self):
     def test_mail_alais_assignees_from_recipient_list(self):
         # including all types of users in recipient list
         new_user = new_test_user(self.env, 'int_user')
-        incoming_to = (
+
+        # format: Name <some@email.com>
+        incoming_to_emails_with_name = (
+            f"\"{self.project_goats.name}\" <{self.project_goats.alias_name}@{self.project_goats.alias_domain_id.name}>"
+            f"\"{self.user_public.name}\" <{self.user_public.email}>,"
+            f"\"{self.user_projectmanager.name}\" <{self.user_projectmanager.email}>,"
+            f"\"{self.user_portal.name}\" <{self.user_portal.email}>,"
+            f"\"{self.user_projectuser.name}\" <{self.user_projectuser.email}>,"
+        )
+        # format: some@email.com
+        incoming_to_emails = (
             f"{self.project_goats.alias_name}@{self.project_goats.alias_domain_id.name},"
             f"{self.user_public.email},"
             f"{self.user_projectmanager.email},"
             f"{self.user_portal.email},"
             f"{self.user_projectuser.email},"
         )
-        with self.mock_mail_gateway():
-            task = self.format_and_process(
-                MAIL_TEMPLATE,
-                self.user_employee.email,
-                incoming_to,
-                cc=f"{new_user.email}",
-                subject='Test task assignees from email to address',
-                target_model='project.task',
-            )
-            self.flush_tracking()
-        self.assertTrue(task, "Task has not been created from a incoming email")
-        # only internal users are set as asssignees
-        self.assertEqual(task.user_ids, self.user_projectmanager + self.user_projectuser, "Assignees have not been set from the to address of the mail")
-        # public and portal users are ignored
-        self.assertNotIn(task.user_ids, self.user_public + self.user_portal, "Assignees should not be set for user other than internal users")
-        # sender should not be added as user in the task
-        self.assertNotIn(task.user_ids, self.user_employee, "Sender can never be in assignees")
-        # internal users in cc of mail shoudl be added in email_cc field
-        self.assertEqual(task.email_cc, new_user.email, "The internal user in CC is not added into email_cc field")
+
+        for incoming_to in [incoming_to_emails_with_name, incoming_to_emails]:
+            with self.mock_mail_gateway():
+                task = self.format_and_process(
+                    MAIL_TEMPLATE,
+                    self.user_employee.email,
+                    incoming_to,
+                    cc=f"{new_user.email}",
+                    subject=f'Test task assignees from email to address with {incoming_to}',
+                    target_model='project.task',
+                )
+                self.flush_tracking()
+            self.assertTrue(task, "Task has not been created from a incoming email")
+            # only internal users are set as asssignees
+            self.assertEqual(task.user_ids, self.user_projectmanager + self.user_projectuser, "Assignees have not been set from the to address of the mail")
+            # public and portal users are ignored
+            self.assertNotIn(task.user_ids, self.user_public + self.user_portal, "Assignees should not be set for user other than internal users")
+            # sender should not be added as user in the task
+            self.assertNotIn(task.user_ids, self.user_employee, "Sender can never be in assignees")
+            # internal users in cc of mail shoudl be added in email_cc field
+            self.assertEqual(task.email_cc, new_user.email, "The internal user in CC is not added into email_cc field")
 
     def test_task_creation_removes_email_signatures(self):
         """

From e4df7dddb37b451bf5f78c8cca6cfbef8b50383c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Mon, 10 Nov 2025 13:19:50 +0100
Subject: [PATCH 456/673] [FIX] mail: do not allow avatar card actions when not
 member
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Actions were meant to be available only on avatar cards of members, but
the conditions with a negative check were matching also when no member
was provided.

Update all actions to explicitly check for the presence of a member.

closes odoo/odoo#235097

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/discuss/web/avatar_card/avatar_card_popover.js   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js b/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js
index 893ef3583cf0f..2ea05fc69009c 100644
--- a/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js
+++ b/addons/mail/static/src/discuss/web/avatar_card/avatar_card_popover.js
@@ -56,6 +56,7 @@ export class AvatarCardPopover extends Component {
 
     get canSetAdmin() {
         return (
+            this.props.channelMember &&
             this.currentChannelRole !== "admin" &&
             (this.store.self_user?.is_admin ||
                 (this.selfChannelRole === "owner" && this.currentChannelRole !== "owner") ||
@@ -65,6 +66,7 @@ export class AvatarCardPopover extends Component {
 
     get canRemoveAdmin() {
         return (
+            this.props.channelMember &&
             this.currentChannelRole === "admin" &&
             (this.store.self_user?.is_admin || this.selfChannelRole === "owner")
         );
@@ -72,6 +74,7 @@ export class AvatarCardPopover extends Component {
 
     get canSetOwner() {
         return (
+            this.props.channelMember &&
             this.currentChannelRole !== "owner" &&
             (this.store.self_user?.is_admin || this.selfChannelRole === "owner")
         );
@@ -79,6 +82,7 @@ export class AvatarCardPopover extends Component {
 
     get canRemoveOwner() {
         return (
+            this.props.channelMember &&
             this.currentChannelRole === "owner" &&
             (this.store.self_user?.is_admin || this.props.channelMember?.threadAsSelf)
         );
@@ -86,8 +90,9 @@ export class AvatarCardPopover extends Component {
 
     get canRemoveMember() {
         return (
-            this.store.self_user?.is_admin ||
-            (this.selfChannelRole && this.currentChannelRole !== "owner")
+            this.props.channelMember &&
+            (this.store.self_user?.is_admin ||
+                (this.selfChannelRole && this.currentChannelRole !== "owner"))
         );
     }
 

From 3c6d045e475324e212e29c38b35d516e02ea3a59 Mon Sep 17 00:00:00 2001
From: shmn-odoo <shmn@odoo.com>
Date: Wed, 17 Sep 2025 09:39:47 +0000
Subject: [PATCH 457/673] [FIX] mail: open form view when clicking on a channel
 from kanban view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
Open 'Discuss'
Click on 'Channel' in the menu to display channels in kanban view
Click on any channel

Cause:
The action 'mail.discuss_channel_action' did not include form view in view_mode.

Effect:
Clicking on a kanban card does not display the form view.

Fix:
Open the form view of a channel when clicking on a kanban card.

Task-5076555

closes odoo/odoo#235146

X-original-commit: 109d7221d7f2ea2c73041572ba1b01cc70aad3cf
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/views/discuss_channel_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/views/discuss_channel_views.xml b/addons/mail/views/discuss_channel_views.xml
index 73e63fa104476..59c1aa8d82687 100644
--- a/addons/mail/views/discuss_channel_views.xml
+++ b/addons/mail/views/discuss_channel_views.xml
@@ -137,7 +137,7 @@
         <record id="mail.discuss_channel_action" model="ir.actions.act_window">
             <field name="name">Channels</field>
             <field name="res_model">discuss.channel</field>
-            <field name="view_mode">kanban</field>
+            <field name="view_mode">kanban,form</field>
             <field name="domain" eval="[(('channel_type', '=', 'channel'))]" />
             <field name="search_view_id" ref="discuss_channel_view_search" />
         </record>

From cd05e8c744c2938f1584d23c4d47f80dd584b525 Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Thu, 6 Nov 2025 13:23:34 +0000
Subject: [PATCH 458/673] [FIX] payment: allow branch companies to use parent's
 payment providers

Versions
--------
- 17.0+

Steps
-----
1. Have a published payment provider;
2. create a branch company;
3. create a sales order in branch company;
4. enable online payment for sales order;
5. open sales order in portal view;
6. attempt to pay.

Issue
-----
No compatible payment providers found.

Cause
-----
The `payment.provider._check_company_domain` is set to the default exact
match, so when it's used in `_get_compatible_payment_providers`, it's
unable to find any providers for the branch company.

Solution
--------
Set `_check_company_domain` to `check_company_domain_parent_of`.

opw-5214269

closes odoo/odoo#235144

X-original-commit: 1d15b0237610053917c234a6a6cea106e55e745f
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 addons/payment/models/payment_provider.py     |  2 +-
 addons/payment/tests/test_payment_provider.py | 11 +++++++++++
 addons/payment/wizards/res_config_settings.py |  9 ++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/payment/models/payment_provider.py b/addons/payment/models/payment_provider.py
index bd49d2ae9f78c..78873bff61eef 100644
--- a/addons/payment/models/payment_provider.py
+++ b/addons/payment/models/payment_provider.py
@@ -13,7 +13,6 @@
 from odoo.addons.payment.const import REPORT_REASONS_MAPPING, SENSITIVE_KEYS
 from odoo.addons.payment.logging import get_payment_logger
 
-
 # Pass the possibly empty set of sensitive keys to the logger in case a provider module extends it.
 _logger = get_payment_logger(__name__, sensitive_keys=SENSITIVE_KEYS)
 
@@ -23,6 +22,7 @@ class PaymentProvider(models.Model):
     _description = 'Payment Provider'
     _order = 'module_state, state desc, sequence, name'
     _check_company_auto = True
+    _check_company_domain = models.check_company_domain_parent_of
 
     def _valid_field_parameter(self, field, name):
         return name == 'required_if_provider' or super()._valid_field_parameter(field, name)
diff --git a/addons/payment/tests/test_payment_provider.py b/addons/payment/tests/test_payment_provider.py
index ab140ee20a264..67a2585f80e60 100644
--- a/addons/payment/tests/test_payment_provider.py
+++ b/addons/payment/tests/test_payment_provider.py
@@ -121,6 +121,17 @@ def test_unpublished_provider_not_compatible_with_non_internal_user(self):
             )
             self.assertNotIn(self.provider, compatible_providers)
 
+    def test_provider_compatible_with_branch_companies(self):
+        """ Test that the provider is available to branch companies. """
+        branch_company = self.env['res.company'].create({
+            'name': "Provider Branch Company",
+            'parent_id': self.provider.company_id.id,
+        })
+        compatible_providers = self.provider._get_compatible_providers(
+            branch_company.id, self.partner.id, self.amount,
+        )
+        self.assertIn(self.provider, compatible_providers)
+
     def test_provider_compatible_with_available_countries(self):
         """ Test that the provider is compatible with its available countries. """
         belgium = self.env.ref('base.be')
diff --git a/addons/payment/wizards/res_config_settings.py b/addons/payment/wizards/res_config_settings.py
index e97e813354faa..9785977cef546 100644
--- a/addons/payment/wizards/res_config_settings.py
+++ b/addons/payment/wizards/res_config_settings.py
@@ -45,11 +45,10 @@ def _get_active_providers_domain(self, enabled_only=False):
         :return: The active providers domain.
         :rtype: Domain
         """
-        company_domain = self.env['payment.provider']._check_company_domain(self.company_id)
-        if enabled_only:
-            return company_domain & Domain('state', '=', 'enabled')
-        else:
-            return company_domain & Domain('state', '!=', 'disabled')
+        return Domain.AND([
+            [('state', '=', 'enabled') if enabled_only else ('state', '!=', 'disabled')],
+            self.env['payment.provider']._check_company_domain(self.company_id),
+        ])
 
     # === ACTION METHODS === #
 

From d41852eae3d6691c4ee516f1a78cb47c0751a043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 10 Nov 2025 11:53:38 +0000
Subject: [PATCH 459/673] [FIX] mail: discuss command palette avatar smaller in
 desktop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Discuss command avatar were much bigger than rest of discuss UI,
such as discuss sidebar.

Discuss sidebar avatar size was reduced in 19.0, but discuss command
palette still had big size like before this change.

This commit fixes the issue with reduced size.
To compensate with reduced size, more items are shown at once.
This change only applies to desktop: in mobile the avatar need to
be bigger, so this commit doesn't affect small UI.

Part of Task-5227387

closes odoo/odoo#235154

X-original-commit: b5cfd0b6076e0ec2a69b856dbc0611b0cb700731
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/controllers/discuss/search.py             |  2 +-
 .../core/public_web/discuss_command_palette.js        |  2 +-
 .../core/public_web/discuss_command_palette.scss      | 11 +++++++++++
 .../core/public_web/discuss_command_palette.xml       |  2 +-
 .../mail/static/tests/mock_server/mail_mock_server.js |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/addons/mail/controllers/discuss/search.py b/addons/mail/controllers/discuss/search.py
index d8b46347db5d5..f80b088b7755b 100644
--- a/addons/mail/controllers/discuss/search.py
+++ b/addons/mail/controllers/discuss/search.py
@@ -9,7 +9,7 @@
 class SearchController(http.Controller):
     @http.route("/discuss/search", methods=["POST"], type="jsonrpc", auth="public")
     @add_guest_to_context
-    def search(self, term, category_id=None, limit=8):
+    def search(self, term, category_id=None, limit=10):
         store = Store()
         self.get_search_store(store, search_term=term, limit=limit)
         return store.get_result()
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
index 96925a1d03861..2803a869219b7 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
@@ -156,7 +156,7 @@ export class DiscussCommandPalette {
 
     /** @param {Record[]} [filtered] persona or thread to filters, e.g. being build already in a category in a patch such as MENTIONS or RECENT */
     buildResults(filtered) {
-        const TOTAL_LIMIT = this.ui.isSmall ? 7 : 8;
+        const TOTAL_LIMIT = this.ui.isSmall ? 7 : 10;
         const remaining = TOTAL_LIMIT - (filtered ? filtered.size : 0);
         let partners = [];
         if (this.store.self_user) {
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.scss b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.scss
index f853507ec93ed..f33cca41d665c 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.scss
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.scss
@@ -28,3 +28,14 @@
 .o-mail-DiscussCommand-actionIcon {
     font-size: 0.75rem;
 }
+
+.o-mail-DiscussCommand-img {
+    width: 26px;
+    height: 26px;
+
+    &.o-uiSmall {
+        width: 32px;
+        height: 32px;
+    }
+}
+
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml
index 6b269254ad343..64f63d0e49a00 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.xml
@@ -5,7 +5,7 @@
         <div class="o-mail-DiscussCommand o_command_default d-flex align-items-center ps-3 pe-4" t-att-class="{ 'o-uiSmall': ui.isSmall }">
             <i t-if="props.channel" class="fa-fw opacity-75 text-muted me-2" t-att-class="props.channel.parent_channel_id ? 'fa fa-comments-o' : props.channel.discussAppCategory?.icon ?? 'oi oi-user opacity-0'"/>
             <i t-elif="props.persona" class="oi fa-fw oi-user opacity-75 text-muted me-2"/>
-            <img class="rounded-3 me-2 object-fit-cover shadow-sm" t-if="props.imgUrl" t-att-src="props.imgUrl"  style="width: 32px; height: 32px"/>
+            <img class="o-mail-DiscussCommand-img rounded-3 me-2 object-fit-cover shadow-sm" t-if="props.imgUrl" t-att-src="props.imgUrl" t-att-class="{ 'o-uiSmall': ui.isSmall }"/>
             <ImStatus t-if="props.persona" className="'me-1'" persona="props.persona"/>
             <span class="o-mail-DiscussCommand-nameContainer pe-1 text-ellipsis d-flex align-items-center fw-bold" t-att-class="{ 'o-action': props.action }">
                 <t t-if="props.channel?.parent_channel_id">
diff --git a/addons/mail/static/tests/mock_server/mail_mock_server.js b/addons/mail/static/tests/mock_server/mail_mock_server.js
index 45c1218dd89cb..0232c1b3404a2 100644
--- a/addons/mail/static/tests/mock_server/mail_mock_server.js
+++ b/addons/mail/static/tests/mock_server/mail_mock_server.js
@@ -933,7 +933,7 @@ export async function mail_data(request) {
 registerRoute("/discuss/search", search);
 /** @type {RouteCallback} */
 async function search(request) {
-    const { term, limit = 8 } = await parseRequestParams(request);
+    const { term, limit = 10 } = await parseRequestParams(request);
 
     /** @type {import("mock_models").DiscussChannel} */
     const DiscussChannel = this.env["discuss.channel"];

From 90c23bd8120396ecbe792ba9bdc12de13f3bde17 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Mon, 10 Nov 2025 14:55:27 +0000
Subject: [PATCH 460/673] [FIX] hr: make sure hr user can access to employee
 form view

Before this commit, the version timeline component needs to read
contract_type_id and contract dates fields to be able to add an extra
line below the versions to mention the versions inside the same
contract. The problem is `contract_type_id` and the contract dates
fields are not available when the user cannot see the payroll tab in the
employee form.

This commit makes sure the fields needed to display the extra line
inside the version timeline are only used if the user has access to them
otherwise no extra line will be displayed since some information is
missing to be able to display it.

task-5253864

closes odoo/odoo#235165

X-original-commit: 70552a60893bf6a39395e773722dc67239fa8054
Signed-off-by: Jurgen Gjini (jugj) <jugj@odoo.com>
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 .../versions_timeline/versions_timeline.js           | 12 ++++++++++--
 .../versions_timeline/versions_timeline.xml          |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/hr/static/src/components/versions_timeline/versions_timeline.js b/addons/hr/static/src/components/versions_timeline/versions_timeline.js
index 7582877f6ab2f..aecb40bfb3e08 100644
--- a/addons/hr/static/src/components/versions_timeline/versions_timeline.js
+++ b/addons/hr/static/src/components/versions_timeline/versions_timeline.js
@@ -35,7 +35,7 @@ export class VersionsTimeline extends StatusBarField {
                         record.evalContext
                     );
                 }
-                return orm.searchRead(relation, domain, fieldNames);
+                return orm.searchRead(relation, domain, fieldNames.filter((fName) => fName in record.fields));
             });
         }
 
@@ -50,6 +50,12 @@ export class VersionsTimeline extends StatusBarField {
         });
     }
 
+    displayContractLines() {
+        return ["contract_type_id", "contract_date_start", "contract_date_end"].every(
+            (fieldName) => fieldName in this.props.record.fields
+        );
+    }
+
     async createVersion(date) {
         const version_id = await this.orm.call("hr.employee", "create_version", [
             this.props.record.evalContext.id,
@@ -88,7 +94,9 @@ export class VersionsTimeline extends StatusBarField {
             return luxon.DateTime.fromISO(dateString).toFormat("MMM dd, yyyy");
         }
         const items = super.getAllItems();
-
+        if (!this.displayContractLines) {
+            return items;
+        }
         const dataById = new Map(this.specialData.data.map(d => [d.id, d]));
 
         const selectedVersion = items.find(item => item.isSelected)?.value;
diff --git a/addons/hr/static/src/components/versions_timeline/versions_timeline.xml b/addons/hr/static/src/components/versions_timeline/versions_timeline.xml
index 0271ff21ce6ff..5bc1ba151fe20 100644
--- a/addons/hr/static/src/components/versions_timeline/versions_timeline.xml
+++ b/addons/hr/static/src/components/versions_timeline/versions_timeline.xml
@@ -62,6 +62,7 @@
                         t-esc="item.label"
                         t-on-click="() => this.selectItem(item)"/>
                     <div
+                        t-if="displayContractLines"
                         t-att-class="{
                             o_first: item_first,
                             o_last: item_last,

From 99d68de43fe3dc9b3a2cfebf03d2fd8d50fc14df Mon Sep 17 00:00:00 2001
From: David Monnom <moda@odoo.com>
Date: Thu, 6 Nov 2025 10:38:43 +0000
Subject: [PATCH 461/673] [FIX] point_of_sale: disable indexedDB for hoot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Disable IndexedDB in Hoot tests to avoid creating to much IndexedDB
databases when running the full test suite.

IndexedDB is still tested in dedicated tours.

closes odoo/odoo#235159

X-original-commit: ae2879e4b13ee6ea96c336edcc6b2988c067b8d4
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../tests/unit/override/data_service.js       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 addons/point_of_sale/static/tests/unit/override/data_service.js

diff --git a/addons/point_of_sale/static/tests/unit/override/data_service.js b/addons/point_of_sale/static/tests/unit/override/data_service.js
new file mode 100644
index 0000000000000..1a54c8b5d6b49
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/override/data_service.js
@@ -0,0 +1,35 @@
+import { PosData } from "@point_of_sale/app/services/data_service";
+import { patch } from "@web/core/utils/patch";
+
+/**
+ * Disable IndexedDB in Hoot tests to avoid creating to much IndexedDB databases
+ * when running the full test suite.
+ *
+ * IndexedDB is still tested in dedicated tours.
+ */
+patch(PosData.prototype, {
+    setup() {
+        this.indexedDB = {
+            delete: async () => ({}),
+            create: async () => ({}),
+            reset: async () => ({}),
+            readAll: async () => ({}),
+        };
+        return super.setup(...arguments);
+    },
+    initIndexedDB() {
+        return true;
+    },
+    initListeners() {
+        return true;
+    },
+    synchronizeLocalDataInIndexedDB() {
+        return true;
+    },
+    async getCachedServerDataFromIndexedDB() {
+        return {};
+    },
+    async getLocalDataFromIndexedDB() {
+        return {};
+    },
+});

From 317a43444c7cbf4e762bdfea48a9868e59374597 Mon Sep 17 00:00:00 2001
From: "Ayush Chauhan (aych)" <aych@odoo.com>
Date: Mon, 13 Oct 2025 13:40:35 +0000
Subject: [PATCH 462/673] [FIX] im_livechat: prevent breadcrumb flicker when
 navigating sessions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit,
The breadcrumbs flickered when navigating between livechat sessions.
This occurred because the FormController (@web/views/form/form_controller)
updated the breadcrumb title inside the onRendered hook and set it to
this.model.root.data.display_name which is undefined, the Discuss component
also updated the breadcrumb title in a useEffect hook.
(@mail/code/web/discuss_patch.js)

The two updates conflicted: the onRendered hook first set the title to
“Unnamed,” and then the useEffect hook replaced it with the correct title,
causing a brief flicker. Additionally, when navigating to another session with
the same thread.displayName, the useEffect hook did not trigger (since its
dependency did not change), but onRendered still ran, causing the breadcrumb
to remain “Unnamed”.

This commit fixes the issue by introducing a LivechatFormController which
updates the breadcrumbs when channel is fetched in store.

task-4671251

closes odoo/odoo#235019

X-original-commit: fff1fee59d2cefe519720028aff113840f423920
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/views/livechat_form_controller.js  | 15 +++++++++++++++
 .../static/src/views/livechat_form_view.js        |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 addons/im_livechat/static/src/views/livechat_form_controller.js

diff --git a/addons/im_livechat/static/src/views/livechat_form_controller.js b/addons/im_livechat/static/src/views/livechat_form_controller.js
new file mode 100644
index 0000000000000..1be16763824ad
--- /dev/null
+++ b/addons/im_livechat/static/src/views/livechat_form_controller.js
@@ -0,0 +1,15 @@
+import { useService } from "@web/core/utils/hooks";
+import { FormController } from "@web/views/form/form_controller";
+
+export class LivechatSessionFormController extends FormController {
+    setup() {
+        super.setup();
+        this.store = useService("mail.store");
+    }
+    get channel() {
+        return this.store["discuss.channel"].get(this.model.root.resId);
+    }
+    displayName() {
+        return this.channel?.displayName || super.displayName();
+    }
+}
diff --git a/addons/im_livechat/static/src/views/livechat_form_view.js b/addons/im_livechat/static/src/views/livechat_form_view.js
index 2bc8bf9247826..99c4901d5767b 100644
--- a/addons/im_livechat/static/src/views/livechat_form_view.js
+++ b/addons/im_livechat/static/src/views/livechat_form_view.js
@@ -1,9 +1,11 @@
 import { registry } from "@web/core/registry";
 import { formView } from "@web/views/form/form_view";
+import { LivechatSessionFormController } from "./livechat_form_controller";
 import { LivechatSessionFormRenderer } from "./livechat_form_renderer";
 
 export const LivechatSesionFormView = {
     ...formView,
+    Controller: LivechatSessionFormController,
     Renderer: LivechatSessionFormRenderer,
     display: { controlPanel: false },
 };

From 6be243072374d6874436cbc705b3e9615787afc7 Mon Sep 17 00:00:00 2001
From: jayp-odoo <jayp@odoo.com>
Date: Fri, 7 Nov 2025 06:50:59 +0000
Subject: [PATCH 463/673] [FIX] mail, im_livechat: prevent notification when
 invited to meeting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, when inviting someone to a meeting, they received both a
call invitation card and a channel joined notification, which was redundant.
This change removes the duplicate notification, keeping only the call invitation
card for clarity.

task-5227387

closes odoo/odoo#234982

X-original-commit: f922339e5f1cd68483ef866ac7777d5ceff45070
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/im_livechat/tests/test_chatbot_internals.py |  1 +
 addons/mail/models/discuss/discuss_channel.py      |  1 +
 .../public_web/discuss_core_public_web_service.js  | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/im_livechat/tests/test_chatbot_internals.py b/addons/im_livechat/tests/test_chatbot_internals.py
index 1fa1633ac714a..29315396d0fc8 100644
--- a/addons/im_livechat/tests/test_chatbot_internals.py
+++ b/addons/im_livechat/tests/test_chatbot_internals.py
@@ -268,6 +268,7 @@ def get_forward_op_bus_params():
                         "type": "discuss.channel/joined",
                         "payload": {
                             "channel_id": discuss_channel.id,
+                            "invite_to_rtc_call": False,
                             "data": channel_data_join,
                             "invited_by_user_id": self.env.user.id,
                         },
diff --git a/addons/mail/models/discuss/discuss_channel.py b/addons/mail/models/discuss/discuss_channel.py
index b144646bb5e98..ef1a14ad852c0 100644
--- a/addons/mail/models/discuss/discuss_channel.py
+++ b/addons/mail/models/discuss/discuss_channel.py
@@ -632,6 +632,7 @@ def _add_members(
             for member in new_members:
                 payload = {
                     "channel_id": member.channel_id.id,
+                    "invite_to_rtc_call": invite_to_rtc_call,
                     "data": Store(bus_channel=member._bus_channel())
                     .add(member.channel_id)
                     .add(member, "unpin_dt")
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js b/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js
index c37080ff3be01..e384035ab7dcd 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_core_public_web_service.js
@@ -15,14 +15,24 @@ export class DiscussCorePublicWeb {
         this.busService = services.bus_service;
         this.notificationService = services.notification;
         this.busService.subscribe("discuss.channel/joined", async (payload) => {
-            const { data, channel_id, invited_by_user_id: invitedByUserId } = payload;
+            const {
+                data,
+                channel_id,
+                invite_to_rtc_call,
+                invited_by_user_id: invitedByUserId,
+            } = payload;
             this.store.insert(data);
             await this.store.fetchChannel(channel_id);
             const thread = this.store["mail.thread"].get({
                 id: channel_id,
                 model: "discuss.channel",
             });
-            if (thread && invitedByUserId && invitedByUserId !== this.store.self_user?.id) {
+            if (
+                thread &&
+                invitedByUserId &&
+                invitedByUserId !== this.store.self_user?.id &&
+                !invite_to_rtc_call
+            ) {
                 this.notificationService.add(
                     _t("You have been invited to #%s", thread.displayName),
                     { type: "info" }

From 41367e39419fbaf38dd4f1a650657554d183b689 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Mon, 10 Nov 2025 09:49:59 +0000
Subject: [PATCH 464/673] [FIX] mail: broken uninstallation of module 'mail'

When uninstalling module mail, an override of unlink() deletes the
activities of the records being deleted.  However, this override crashes
whenever columns of mail.activity have been dropped already.  As a
consequence, it may prevent the deletion of the field mail_message_id of
model mail.tracking.value, and its table, too.  And this causes the
reinstallation of module mail to log error:

    column "mail_message_id" of relation "mail_tracking_value" contains null values

See https://runbot.odoo.com/odoo/runbot.build.error/233618 for the cases
where it failed.

The fix consists in checking whether the columns of mail.activity still
exist before searching for activities.

closes odoo/odoo#235169

X-original-commit: 08770d201b7f44948599217a82bb9e697764c860
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/mail/models/models.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/mail/models/models.py b/addons/mail/models/models.py
index b6e2940fe431b..0e8e6beb25597 100644
--- a/addons/mail/models/models.py
+++ b/addons/mail/models/models.py
@@ -10,6 +10,9 @@
 from odoo.addons.mail.tools.alias_error import AliasError
 from odoo.tools import parse_contact_from_email
 from odoo.tools.mail import email_normalize, email_split_and_format
+from odoo.tools.sql import column_exists
+
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
 
 import logging
 
@@ -44,7 +47,13 @@ def unlink(self):
         # Override unlink to delete records activities through (res_model, res_id)
         record_ids = self.ids if (not self._abstract and not self._transient) else []
         result = super().unlink()
-        if record_ids:
+        if record_ids and (
+            # during uninstallation of module mail, the search below will crash
+            not self.env.context.get(MODULE_UNINSTALL_FLAG) or (
+                column_exists(self.env.cr, 'mail_activity', 'res_model')
+                and column_exists(self.env.cr, 'mail_activity', 'res_id')
+            )
+        ):
             self.env['mail.activity'].with_context(active_test=False).sudo().search(
                 [('res_model', '=', self._name), ('res_id', 'in', record_ids)]
             ).unlink()

From 5c4f0a119f41288f6a06c156742e7c2f0607a906 Mon Sep 17 00:00:00 2001
From: Pablo Montenegro <pam@adhoc.com.ar>
Date: Fri, 12 Sep 2025 17:02:25 +0000
Subject: [PATCH 465/673] [FIX] l10n_ar_withholding: duplicated taxes when demo
 is installed.

Description of the issue/feature this PR addresses:
This pr is to avoid duplicated taxes when the demo data is installed.

Steps to reproduce:
1. Install l10n_ar_withholding module with demo data.
2. Take position in "(AR) Responsable Inscripto" company.
3. Check the taxes created on "Invoicing > Configuration > Accounting > Taxes".
4. Delete the filter "Sale or Purchase".
5. Add custom filter: Argentina Withholding Payment Tax type (l10n_ar_withholding_payment_type) is in ["supplier", "customer"].
6. You will see that there are duplicated taxes (duplicated names) with suffix (Copy).

Current behavior before PR:
Duplicated taxes are created when demo data is installed.

Desired behavior after PR is merged:
No duplicated taxes are created when demo data is installed.

Task latam side: 1360.
Task Adhoc side: 57627.

closes odoo/odoo#235034

X-original-commit: 087cf226857afc12e4b5a249fb5701f09bb12ed9
Signed-off-by: Joren Van Onder (jov) <jov@odoo.com>
---
 addons/l10n_ar_withholding/__init__.py          | 14 --------------
 addons/l10n_ar_withholding/__manifest__.py      |  1 -
 addons/l10n_ar_withholding/demo/account_demo.py | 13 -------------
 3 files changed, 28 deletions(-)

diff --git a/addons/l10n_ar_withholding/__init__.py b/addons/l10n_ar_withholding/__init__.py
index 8b7047408629d..24557e3a972c4 100644
--- a/addons/l10n_ar_withholding/__init__.py
+++ b/addons/l10n_ar_withholding/__init__.py
@@ -3,17 +3,3 @@
 from . import models
 from . import wizards
 from . import demo
-
-import logging
-
-_logger = logging.getLogger(__name__)
-
-
-def _l10n_ar_wth_post_init(env):
-    """ Existing companies that have the Argentinean Chart of Accounts set """
-    template_codes = ['ar_ri', 'ar_ex', 'ar_base']
-    ar_companies = env['res.company'].search([('chart_template', 'in', template_codes), ('parent_id', '=', False)])
-    for company in ar_companies:
-        ChartTemplate = env['account.chart.template'].with_company(company)
-        if company.chart_template == 'ar_ri' and env.ref('base.module_l10n_ar_withholding').demo:
-            ChartTemplate._ar_withholding_copy_tax_demo()
diff --git a/addons/l10n_ar_withholding/__manifest__.py b/addons/l10n_ar_withholding/__manifest__.py
index 36b5b0b69c3db..3a0c4a6b987dd 100644
--- a/addons/l10n_ar_withholding/__manifest__.py
+++ b/addons/l10n_ar_withholding/__manifest__.py
@@ -24,6 +24,5 @@
         'data/earnings_table_data.xml',
     ],
     'installable': True,
-    'post_init_hook': '_l10n_ar_wth_post_init',
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_ar_withholding/demo/account_demo.py b/addons/l10n_ar_withholding/demo/account_demo.py
index 520c23ca7a2f3..a14c4457c49df 100644
--- a/addons/l10n_ar_withholding/demo/account_demo.py
+++ b/addons/l10n_ar_withholding/demo/account_demo.py
@@ -6,19 +6,6 @@
 class AccountChartTemplate(models.AbstractModel):
     _inherit = "account.chart.template"
 
-    def _post_load_demo_data(self, template_code):
-        super()._post_load_demo_data(template_code)
-        if template_code == 'ar_ri':
-            # Because in demo we want to skip the config, while in data we want to require them to configure
-            self._ar_withholding_copy_tax_demo()
-
-    def _ar_withholding_copy_tax_demo(self):
-        self.env['account.tax'].search([
-            *self.env['account.tax']._check_company_domain(self.env.company),
-            ('l10n_ar_withholding_payment_type', '!=', False),
-            ('l10n_ar_tax_type', 'in', ('iibb_untaxed', 'iibb_total')),
-        ]).copy(default={'amount_type': 'percent', 'amount': 1})
-
     @template(template='ar_ri', model='ir.sequence', demo=True)
     def _get_ar_withholding_ir_sequence_demo(self):
         return {

From b54666b46f20665f68f9bca086e7014ed1dee21b Mon Sep 17 00:00:00 2001
From: bona-odoo <bona@odoo.com>
Date: Wed, 1 Oct 2025 07:06:31 +0000
Subject: [PATCH 466/673] [FIX] product: pricelist rules not saved

steps to reproduce:
-------------------
1. Install sales
2. Enable Product Variants and Pricelist under Sales > Configuration
3. Open a product variant and create a pricelist rule
4. Save it

issue:
-----
The pricelist rules are not saved.

cause:
------
The field `pricelist_rule_ids` on `product.product` is a non-stored One2many.
https://github.com/odoo/odoo/blob/b1041951d436b4b6adc90d8b8dd7b8c88cc69a46/addons/product/models/product_product.py#L62-L68
In the ORM, such fields are handled in the else part of write_real(),
Since this field is non-stored, it has no corresponding column in the database
to persist changes. As a result, any updates made to it are lost after saving.
https://github.com/odoo/odoo/blob/b1041951d436b4b6adc90d8b8dd7b8c88cc69a46/odoo/orm/fields_relational.py#L1033-L1049

solution:
---------
Add an inverse method to make the field writable.

opw-5097909

closes odoo/odoo#235025

X-original-commit: 657fa92cedc3c9b7f13f7c6b6d549d78bd4702b5
Signed-off-by: Bommisetty Narendra (bona) <bona@odoo.com>
---
 addons/product/models/product_product.py | 17 +++++-
 addons/product/tests/common.py           | 19 +++++++
 addons/product/tests/test_pricelist.py   | 68 +++++++++++++++++++++++-
 3 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/addons/product/models/product_product.py b/addons/product/models/product_product.py
index be5bf4e438a99..bb686a5e5779b 100644
--- a/addons/product/models/product_product.py
+++ b/addons/product/models/product_product.py
@@ -64,6 +64,7 @@ class ProductProduct(models.Model):
         comodel_name='product.pricelist.item',
         inverse_name='product_id',
         compute='_compute_pricelist_rule_ids',
+        inverse='_inverse_pricelist_rule_ids',
         readonly=False,
     )
 
@@ -138,14 +139,26 @@ def _set_template_field(self, template_field, variant_field):
             else:
                 record[variant_field] = record[template_field]
 
-    @api.depends('product_tmpl_id')
+    @api.depends('product_tmpl_id.pricelist_rule_ids')
     def _compute_pricelist_rule_ids(self):
         for product in self:
             if not product.id:
                 product.pricelist_rule_ids = False
                 continue
             product.pricelist_rule_ids = product.product_tmpl_id.pricelist_rule_ids.filtered(
-                lambda rule: not rule.product_id or rule.product_id == product.id
+                lambda rule: rule.product_id <= product,
+            )
+
+    def _inverse_pricelist_rule_ids(self):
+        for product in self:
+            template = product.product_tmpl_id
+            template.pricelist_rule_ids = (
+                product.pricelist_rule_ids
+                # We have to manually keep the rules the current variant
+                # wasn't aware of because they targeted other variants.
+                | template.pricelist_rule_ids.filtered(
+                    lambda rule: rule.product_id and rule.product_id != product
+                )
             )
 
     @api.depends("product_tmpl_id.write_date")
diff --git a/addons/product/tests/common.py b/addons/product/tests/common.py
index 480063983b588..92c9de0e627f2 100644
--- a/addons/product/tests/common.py
+++ b/addons/product/tests/common.py
@@ -138,3 +138,22 @@ def setUpClass(cls):
                 ])],
             })]
         })
+
+        cls.product_sofa_red = cls.product_template_sofa.product_variant_ids.filtered(
+            lambda pp:
+                pp.product_template_attribute_value_ids.product_attribute_value_id
+                ==
+                cls.color_attribute_red
+        )
+        cls.product_sofa_blue = cls.product_template_sofa.product_variant_ids.filtered(
+            lambda pp:
+                pp.product_template_attribute_value_ids.product_attribute_value_id
+                ==
+                cls.color_attribute_blue
+        )
+        cls.product_sofa_green = cls.product_template_sofa.product_variant_ids.filtered(
+            lambda pp:
+                pp.product_template_attribute_value_ids.product_attribute_value_id
+                ==
+                cls.color_attribute_green
+        )
diff --git a/addons/product/tests/test_pricelist.py b/addons/product/tests/test_pricelist.py
index a9441ad690269..5e85ea3daa17d 100644
--- a/addons/product/tests/test_pricelist.py
+++ b/addons/product/tests/test_pricelist.py
@@ -6,11 +6,11 @@
 from odoo.fields import Command
 from odoo.tests import Form, tagged
 
-from odoo.addons.product.tests.common import ProductCommon
+from odoo.addons.product.tests.common import ProductVariantsCommon
 
 
 @tagged('post_install', '-at_install')
-class TestPricelist(ProductCommon):
+class TestPricelist(ProductVariantsCommon):
 
     @classmethod
     def setUpClass(cls):
@@ -309,3 +309,67 @@ def create_item_vals(pl_from, pl_to):
         with self.assertRaises(ValidationError):
             # C -> [B -> D -> A -> B -> _, D -> _] (recurs)
             Pricelist.item_ids.create(create_item_vals(pl_b, pl_d))
+
+    def test_pricelist_rule_linked_to_product_variant(self):
+        """Verify that pricelist rules assigned to a variant remain linked after write."""
+        self.product_sofa_red.pricelist_rule_ids = [
+            Command.create({
+                'applied_on': '0_product_variant',
+                'product_id': self.product_sofa_red.id,
+                'compute_price': 'fixed',
+                'fixed_price': 99.9,
+                'pricelist_id': self.pricelist.id,
+            }),
+            Command.create({
+                'applied_on': '0_product_variant',
+                'product_id': self.product_sofa_red.id,
+                'compute_price': 'fixed',
+                'fixed_price': 89.9,
+                'pricelist_id': self.pricelist.id,
+            }),
+        ]
+        self.assertEqual(len(self.product_sofa_red.pricelist_rule_ids), 2)
+        first_rule, second_rule = self.product_sofa_red.pricelist_rule_ids
+        self.product_sofa_red.pricelist_rule_ids = [
+            Command.update(first_rule.id, {'fixed_price': 79.9}),
+            Command.unlink(second_rule.id),
+        ]
+        self.assertEqual(len(self.product_sofa_red.pricelist_rule_ids), 1)
+        self.assertEqual(self.pricelist.item_ids.fixed_price, 79.9)
+        self.assertIn(self.product_sofa_red, self.pricelist.item_ids.product_id)
+
+        # Update of template-based rules through variant form
+        self.product_template_sofa.pricelist_rule_ids = [
+            # Template-based rule (can be edited through the variants)
+            Command.create({
+                'applied_on': '1_product',
+                'product_tmpl_id': self.product_template_sofa.id,
+                'pricelist_id': self.pricelist.id,
+            }),
+            # Rule on another variant than the one being edited. It cannot be edited through the
+            # current variant and therefore shouldn't change when another variant rules are edited.
+            Command.create({
+                'applied_on': '0_product_variant',
+                'product_id': self.product_sofa_blue.id,
+                'compute_price': 'fixed',
+                'fixed_price': 89.9,
+                'pricelist_id': self.pricelist.id,
+            })
+        ]
+        self.assertEqual(len(self.product_template_sofa.pricelist_rule_ids), 3)
+        template_rule = self.product_template_sofa.pricelist_rule_ids.filtered(
+            lambda item: not item.product_id
+        )
+        self.assertEqual(len(self.product_sofa_red.pricelist_rule_ids), 2)
+        self.product_sofa_red.pricelist_rule_ids = [
+            Command.update(template_rule.id, {'fixed_price': 133}),
+        ]
+        self.assertEqual(template_rule.fixed_price, 133)
+
+        self.product_sofa_red.pricelist_rule_ids = [
+            Command.unlink(template_rule.id),
+        ]
+        self.assertFalse(template_rule.exists())
+
+        self.assertTrue(self.product_sofa_blue.pricelist_rule_ids)
+        self.assertEqual(len(self.product_template_sofa.pricelist_rule_ids), 2)

From 94a7c61c487972cc4f3e81dd896365ba0bc9fa15 Mon Sep 17 00:00:00 2001
From: akth-odoo <akth@odoo.com>
Date: Mon, 10 Nov 2025 05:51:35 +0000
Subject: [PATCH 467/673] [FIX] mail: add test to ensure mentioned channels are
 kept with ArrowUp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up of #229546

Add a test to verify that mentioned channels are correctly restored when editing
a message using the ArrowUp shortcut in the composer.

closes odoo/odoo#235130

X-original-commit: e6293ff7fafc96e0d750c88a832e7e0e00696f4c
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Akshay Thakur (akth) <akth@odoo.com>
---
 addons/mail/static/tests/message/message.test.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/mail/static/tests/message/message.test.js b/addons/mail/static/tests/message/message.test.js
index 33b6e8b17e515..495655bdda6ec 100644
--- a/addons/mail/static/tests/message/message.test.js
+++ b/addons/mail/static/tests/message/message.test.js
@@ -244,6 +244,16 @@ test("Editing message keeps the mentioned channels", async () => {
     await contains(".o-mail-Message-content", { text: "other bye (edited)" });
     await click(".o_channel_redirect", { text: "other" });
     await contains(".o-mail-DiscussContent-threadName", { value: "other" });
+    // Test editing via arrow up shortcut
+    await click(".o-mail-DiscussSidebarChannel", { text: "general" });
+    await contains(".o-mail-Message");
+    await press("ArrowUp");
+    await contains(".o-mail-Message .o-mail-Composer-input", { value: "#other bye" });
+    await insertText(".o-mail-Message .o-mail-Composer-input", "#other hello", { replace: true });
+    await click(".o-mail-Message button", { text: "save" });
+    await contains(".o-mail-Message-content", { text: "other hello (edited)" });
+    await click(".o_channel_redirect", { text: "other" });
+    await contains(".o-mail-DiscussContent-threadName", { value: "other" });
 });
 
 test("Can edit message comment in chatter", async () => {

From 9126fec55576098a25ebcbb92fbfc4e9a62243f4 Mon Sep 17 00:00:00 2001
From: Akash Pandey <apan@odoo.com>
Date: Fri, 7 Nov 2025 10:13:17 +0000
Subject: [PATCH 468/673] [FIX] base: limit defaults search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There’s no constraint preventing duplicate `ir.default` records.
When setting a default using `self.env['ir.default'].set()`, it searches
for an existing one, but if more than one match is found, accessing
`default.json_value` raises a singleton error.

This fix makes sure the search only picks one record, avoiding that crash.

Before fix:
```py
self: res.users(1,)
>>> company = self.company_id
>>> company
res.company(1,)
>>> self.env['ir.default'].create({'field_id': 4540, 'company_id': company.id, 'json_value': 7})
ir.default(9,)
>>> self.env['ir.default'].set('res.partner', 'property_account_receivable_id', 7, company_id=company.id)
Traceback (most recent call last):
  File "/home/odoo/odoo/odoo/odoo/orm/models.py", line 5630, in ensure_one
    _id, = self._ids
    ^^^^
ValueError: too many values to unpack (expected 1)

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "<console>", line 1, in <module>
  File "/home/odoo/odoo/odoo/odoo/addons/base/models/ir_default.py", line 107, in set
    if default.json_value != json_value:
       ^^^^^^^^^^^^^^^^^^
  File "/home/odoo/odoo/odoo/odoo/orm/fields.py", line 1670, in __get__
    record.ensure_one()
  File "/home/odoo/odoo/odoo/odoo/orm/models.py", line 5633, in ensure_one
    raise ValueError("Expected singleton: %s" % self)
ValueError: Expected singleton: ir.default(4, 9)
```

After fix:
```py
self: res.users(1,)
>>> company = self.company_id
>>> company
res.company(1,)
>>> self.env['ir.default'].create({'field_id': 4540, 'company_id': company.id, 'json_value': 7})
ir.default(10,)
>>> self.env['ir.default'].set('res.partner', 'property_account_receivable_id', 7, company_id=company.id)
True
```

opw-5228419

closes odoo/odoo#235116

X-original-commit: 7bbfb207f8699973f8580ea18821f82b1a83e149
Signed-off-by: Chong Wang (cwg) <cwg@odoo.com>
Signed-off-by: Akash Pandey (apan) <apan@odoo.com>
---
 odoo/addons/base/models/ir_default.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo/addons/base/models/ir_default.py b/odoo/addons/base/models/ir_default.py
index 55508863492b0..c190d6ad59d57 100644
--- a/odoo/addons/base/models/ir_default.py
+++ b/odoo/addons/base/models/ir_default.py
@@ -102,7 +102,7 @@ def set(self, model_name, field_name, value, user_id=False, company_id=False, co
             ('user_id', '=', user_id),
             ('company_id', '=', company_id),
             ('condition', '=', condition),
-        ])
+        ], limit=1)
         if default:
             # Avoid clearing the cache if nothing changes
             if default.json_value != json_value:

From c22210c61e1684fa3688ac7749e4f4023bb11f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 10 Nov 2025 14:41:48 +0100
Subject: [PATCH 469/673] [IMP] mail: reword '(un)set favorite' to 'Add/Remove
 from Favorites'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reword label so this feels more natural to name of action to actual
action it does on UI.

closes odoo/odoo#235118

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../mail/static/src/discuss/core/common/thread_actions.js | 8 ++++----
 addons/mail/static/tests/chat_window/chat_window.test.js  | 2 +-
 addons/mail/static/tests/discuss_app/sidebar.test.js      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/discuss/core/common/thread_actions.js b/addons/mail/static/src/discuss/core/common/thread_actions.js
index 3f29fa044822a..6eef35a3d6605 100644
--- a/addons/mail/static/src/discuss/core/common/thread_actions.js
+++ b/addons/mail/static/src/discuss/core/common/thread_actions.js
@@ -22,7 +22,7 @@ class ChannelActionDialog extends Component {
     `;
 }
 
-registerThreadAction("set-favorite", {
+registerThreadAction("add-to-favorites", {
     /**
      * @param {Object} param0
      * @param {import("models").DiscussChannel} param0.channel
@@ -33,7 +33,7 @@ registerThreadAction("set-favorite", {
         !channel.self_member_id.is_favorite &&
         !owner.isDiscussContent,
     icon: "fa fa-fw fa-star",
-    name: _t("Set favorite"),
+    name: _t("Add to Favorites"),
     /**
      * @param {Object} param0
      * @param {import("models").DiscussChannel} param0.channel
@@ -49,7 +49,7 @@ registerThreadAction("set-favorite", {
     sequence: 5, // before notification-settings
     sequenceGroup: 30,
 });
-registerThreadAction("unset-favorite", {
+registerThreadAction("remove-from-favorites", {
     /**
      * @param {Object} param0
      * @param {import("models").DiscussChannel} param0.channel
@@ -57,7 +57,7 @@ registerThreadAction("unset-favorite", {
     condition: ({ channel, owner }) =>
         channel?.self_member_id?.is_favorite && !owner.isDiscussContent,
     icon: "fa fa-fw fa-star-o",
-    name: _t("Unset favorite"),
+    name: _t("Remove from Favorites"),
     /**
      * @param {Object} param0
      * @param {import("models").DiscussChannel} param0.channel
diff --git a/addons/mail/static/tests/chat_window/chat_window.test.js b/addons/mail/static/tests/chat_window/chat_window.test.js
index 361257a0fa217..e9f1afbd1109c 100644
--- a/addons/mail/static/tests/chat_window/chat_window.test.js
+++ b/addons/mail/static/tests/chat_window/chat_window.test.js
@@ -127,7 +127,7 @@ test("chat window: basic rendering", async () => {
     await contains(".o-dropdown-item", { text: "Search Messages" });
     await contains(".o-dropdown-item", { text: "Rename Thread" });
     await contains(".o-dropdown-item", { text: "Notification Settings" });
-    await contains(".o-dropdown-item", { text: "Set favorite" });
+    await contains(".o-dropdown-item", { text: "Add to Favorites" });
     await contains(".o-dropdown-item", { text: "Call Settings" });
     await contains(".o-dropdown-item", { text: "Leave Channel" });
 });
diff --git a/addons/mail/static/tests/discuss_app/sidebar.test.js b/addons/mail/static/tests/discuss_app/sidebar.test.js
index cc986682d3261..892c4d274c175 100644
--- a/addons/mail/static/tests/discuss_app/sidebar.test.js
+++ b/addons/mail/static/tests/discuss_app/sidebar.test.js
@@ -1167,8 +1167,8 @@ test("add and remove channel from favorites updates sidebar", async () => {
     await start();
     await openDiscuss();
     await click(`${channelContainerSelector} ${generalChannelSelector} button .oi-ellipsis-h`);
-    await click(".o-dropdown-item:contains('Set favorite')");
+    await click(".o-dropdown-item:contains('Add to Favorites')");
     await click(`${favoriteContainerSelector} ${generalChannelSelector} button .oi-ellipsis-h`);
-    await click(".o-dropdown-item:contains('Unset favorite')");
+    await click(".o-dropdown-item:contains('Remove from Favorites')");
     await contains(`${channelContainerSelector} ${generalChannelSelector}`);
 });

From 7efdfd7b7caa72089a5628696210e03546b90387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 10 Nov 2025 14:57:05 +0100
Subject: [PATCH 470/673] [REF] mail: define ChannelMember.isOnline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As preparation to define a ChannelMember component, as the "offline"
template param can now be deduced by !member.isOnline.

Part-of: odoo/odoo#235132
Related: odoo/enterprise#99194
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/discuss/core/common/channel_member_model.js  | 4 ++++
 .../static/src/discuss/core/common/thread_model_patch.js    | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/discuss/core/common/channel_member_model.js b/addons/mail/static/src/discuss/core/common/channel_member_model.js
index 1af32383a5b06..0319e425f1f8f 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_model.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_model.js
@@ -134,6 +134,10 @@ export class ChannelMember extends Record {
         return this.partner_id?.im_status || this.guest_id?.im_status;
     }
 
+    get isOnline() {
+        return this.store.onlineMemberStatuses.includes(this.im_status);
+    }
+
     /**
      * @returns {string}
      */
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index f78fbc7b32a43..e3840c23bdbfb 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -140,7 +140,7 @@ const threadPatch = {
             /** @this {import("models").Thread} */
             compute() {
                 return this.channel?.channel_member_ids
-                    .filter((member) => this.store.onlineMemberStatuses.includes(member.im_status))
+                    .filter((member) => member.isOnline)
                     .sort((m1, m2) => this.store.sortMembers(m1, m2)); // FIXME: sort are prone to infinite loop (see test "Display livechat custom name in typing status")
             },
         });
@@ -171,9 +171,7 @@ const threadPatch = {
     },
     /** @returns {import("models").ChannelMember[]} */
     _computeOfflineMembers() {
-        return this.channel?.channel_member_ids.filter(
-            (member) => !this.store.onlineMemberStatuses.includes(member.im_status)
-        );
+        return this.channel?.channel_member_ids.filter((member) => !member.isOnline);
     },
     /** Equivalent to DiscussChannel._allow_invite_by_email */
     get allow_invite_by_email() {

From ade60c3331a298e0391021f2a9e4e8a575e468be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 10 Nov 2025 15:17:53 +0100
Subject: [PATCH 471/673] [REF] mail: turn 'discuss.channel_member' into
 ChannelMember component
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This helps documenting all props, and simplifies code with shorter
function names.

Part-of: odoo/odoo#235132
Related: odoo/enterprise#99194
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 ...ist_patch.xml => channel_member_patch.xml} |  2 +-
 .../src/core/web/channel_member_list_patch.js | 12 ------
 .../src/core/web/channel_member_patch.js      | 12 ++++++
 ...ist_patch.xml => channel_member_patch.xml} |  6 +--
 ...ist.dark.scss => channel_member.dark.scss} |  0
 .../src/discuss/core/common/channel_member.js | 39 +++++++++++++++++++
 ...l_member_list.scss => channel_member.scss} |  0
 .../discuss/core/common/channel_member.xml    | 22 +++++++++++
 .../core/common/channel_member_list.js        | 21 +---------
 .../core/common/channel_member_list.xml       | 27 +------------
 ..._list_patch.js => channel_member_patch.js} | 14 +++----
 11 files changed, 88 insertions(+), 67 deletions(-)
 rename addons/hr_holidays/static/src/discuss/core/common/{channel_member_list_patch.xml => channel_member_patch.xml} (85%)
 delete mode 100644 addons/im_livechat/static/src/core/web/channel_member_list_patch.js
 create mode 100644 addons/im_livechat/static/src/core/web/channel_member_patch.js
 rename addons/im_livechat/static/src/core/web/{channel_member_list_patch.xml => channel_member_patch.xml} (77%)
 rename addons/mail/static/src/discuss/core/common/{channel_member_list.dark.scss => channel_member.dark.scss} (100%)
 create mode 100644 addons/mail/static/src/discuss/core/common/channel_member.js
 rename addons/mail/static/src/discuss/core/common/{channel_member_list.scss => channel_member.scss} (100%)
 create mode 100644 addons/mail/static/src/discuss/core/common/channel_member.xml
 rename addons/mail/static/src/discuss/core/web/{channel_member_list_patch.js => channel_member_patch.js} (58%)

diff --git a/addons/hr_holidays/static/src/discuss/core/common/channel_member_list_patch.xml b/addons/hr_holidays/static/src/discuss/core/common/channel_member_patch.xml
similarity index 85%
rename from addons/hr_holidays/static/src/discuss/core/common/channel_member_list_patch.xml
rename to addons/hr_holidays/static/src/discuss/core/common/channel_member_patch.xml
index 4b014c56bbd29..5ef194b90180a 100644
--- a/addons/hr_holidays/static/src/discuss/core/common/channel_member_list_patch.xml
+++ b/addons/hr_holidays/static/src/discuss/core/common/channel_member_patch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-inherit="discuss.channel_member" t-inherit-mode="extension">
+    <t t-inherit="discuss.ChannelMember" t-inherit-mode="extension">
         <xpath expr="//*[@t-ref='displayName']" position="inside">
             <span t-if="member.partner_id?.outOfOfficeDateEndText" class="text-warning smaller ms-2 text-truncate fw-bold opacity-75">
                 <t t-esc="member.partner_id.outOfOfficeDateEndText"/>
diff --git a/addons/im_livechat/static/src/core/web/channel_member_list_patch.js b/addons/im_livechat/static/src/core/web/channel_member_list_patch.js
deleted file mode 100644
index 2ec163248e328..0000000000000
--- a/addons/im_livechat/static/src/core/web/channel_member_list_patch.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ChannelMemberList } from "@mail/discuss/core/common/channel_member_list";
-import { patch } from "@web/core/utils/patch";
-
-patch(ChannelMemberList.prototype, {
-    canOpenChatWith(member) {
-        return (
-            super.canOpenChatWith(member) &&
-            !member.partner_id?.is_public &&
-            member.livechat_member_type !== "bot"
-        );
-    },
-});
diff --git a/addons/im_livechat/static/src/core/web/channel_member_patch.js b/addons/im_livechat/static/src/core/web/channel_member_patch.js
new file mode 100644
index 0000000000000..e150c3594e0b8
--- /dev/null
+++ b/addons/im_livechat/static/src/core/web/channel_member_patch.js
@@ -0,0 +1,12 @@
+import { ChannelMember } from "@mail/discuss/core/common/channel_member";
+import { patch } from "@web/core/utils/patch";
+
+patch(ChannelMember.prototype, {
+    get canOpenChat() {
+        return (
+            super.canOpenChat &&
+            !this.member.partner_id?.is_public &&
+            this.member.livechat_member_type !== "bot"
+        );
+    },
+});
diff --git a/addons/im_livechat/static/src/core/web/channel_member_list_patch.xml b/addons/im_livechat/static/src/core/web/channel_member_patch.xml
similarity index 77%
rename from addons/im_livechat/static/src/core/web/channel_member_list_patch.xml
rename to addons/im_livechat/static/src/core/web/channel_member_patch.xml
index 9b312a816a0c6..7268c5d51b32c 100644
--- a/addons/im_livechat/static/src/core/web/channel_member_list_patch.xml
+++ b/addons/im_livechat/static/src/core/web/channel_member_patch.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-inherit="discuss.channel_member" t-inherit-mode="extension">
+    <t t-inherit="discuss.ChannelMember" t-inherit-mode="extension">
         <xpath expr="//*[@t-ref='displayName']" position="inside">
                 <div t-if="member.channel_id.channel_type === 'livechat'" class="ms-2 d-flex flex-wrap">
                     <span t-if="member.getLangName()" class="me-2">
                         <i class="fa fa-comment-o me-1" aria-label="Lang"/>
                         <t t-esc="member.getLangName()"/>
                     </span>
-                    <span t-if="member.persona?.country_id or props.thread.country_id">
+                    <span t-if="member.persona?.country_id or member.channel_id.country_id">
                         <i class="fa fa-globe me-1" aria-label="country"/>
-                        <t t-esc="member.persona?.country_id?.name ?? props.thread.country_id.name"/>
+                        <t t-esc="member.persona?.country_id?.name ?? member.channel_id.country_id.name"/>
                     </span>
                 </div>
         </xpath>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.dark.scss b/addons/mail/static/src/discuss/core/common/channel_member.dark.scss
similarity index 100%
rename from addons/mail/static/src/discuss/core/common/channel_member_list.dark.scss
rename to addons/mail/static/src/discuss/core/common/channel_member.dark.scss
diff --git a/addons/mail/static/src/discuss/core/common/channel_member.js b/addons/mail/static/src/discuss/core/common/channel_member.js
new file mode 100644
index 0000000000000..a83d72630dd39
--- /dev/null
+++ b/addons/mail/static/src/discuss/core/common/channel_member.js
@@ -0,0 +1,39 @@
+import { ImStatus } from "@mail/core/common/im_status";
+import { ActionPanel } from "@mail/discuss/core/common/action_panel";
+
+import { Component } from "@odoo/owl";
+
+import { useService } from "@web/core/utils/hooks";
+
+export class ChannelMember extends Component {
+    static components = { ImStatus, ActionPanel };
+    static props = ["member"];
+    static template = "discuss.ChannelMember";
+
+    setup() {
+        super.setup();
+        this.store = useService("mail.store");
+    }
+
+    /** @return {import("models").ChannelMember} */
+    get member() {
+        return this.props.member;
+    }
+
+    get canOpenChat() {
+        if (this.store.inPublicPage) {
+            return false;
+        }
+        if (this.member.partner_id) {
+            return true;
+        }
+        return false;
+    }
+
+    onClickAvatar(ev) {
+        if (!this.canOpenChat) {
+            return;
+        }
+        this.store.openChat({ partnerId: this.member.partner_id.id });
+    }
+}
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.scss b/addons/mail/static/src/discuss/core/common/channel_member.scss
similarity index 100%
rename from addons/mail/static/src/discuss/core/common/channel_member_list.scss
rename to addons/mail/static/src/discuss/core/common/channel_member.scss
diff --git a/addons/mail/static/src/discuss/core/common/channel_member.xml b/addons/mail/static/src/discuss/core/common/channel_member.xml
new file mode 100644
index 0000000000000..841b37a243cbb
--- /dev/null
+++ b/addons/mail/static/src/discuss/core/common/channel_member.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="discuss.ChannelMember">
+        <div class="o-discuss-ChannelMember d-flex align-items-center p-1 bg-inherit rounded-3" t-att-class="{ 'cursor-pointer': canOpenChat, 'o-offline': !member.isOnline }" t-on-click.stop="(ev) => this.onClickAvatar(ev)">
+            <div class="bg-inherit o-discuss-ChannelMember-avatar position-relative d-flex flex-shrink-0 rounded-3">
+                <img class="w-100 h-100 rounded-3 object-fit-cover" t-att-src="member.avatarUrl"/>
+                <ImStatus member="member" className="'position-absolute top-100 start-100 translate-middle mt-n1 ' + (member.isTyping ? 'ms-n2' : 'ms-n1')" size="'md'"/>
+            </div>
+            <div t-ref="displayName" class="d-flex overflow-hidden flex-column lh-sm">
+                <span class="ms-2 text-truncate text-muted fw-bold" t-esc="member.name" t-att-title="member.name"/>
+            </div>
+            <i t-if="member.channel_role === 'owner'" class="ms-2 fa fa-star text-warning" role="img" title="Channel Owner" aria-label="Channel Owner"/>
+            <i t-if="member.channel_role === 'admin'" class="ms-2 fa fa-star text-primary" role="img" title="Channel Admin" aria-label="Channel Admin"/>
+            <span class="ms-auto">
+                <span t-if="member.in(member.channel_id.invited_member_ids)" class="p-1 oi oi-user-plus opacity-75"/>
+                <span t-if="member.rtcSession?.is_muted and !member.rtcSession?.is_deaf" class="p-1 fa fa-microphone-slash opacity-75"/>
+                <span t-elif="member.rtcSession?.is_deaf" class="p-1 fa fa-deaf opacity-75"/>
+                <span t-if="member.rtcSession?.raisingHand" class="p-1 fa fa-hand-paper-o"/>
+            </span>
+        </div>
+    </t>
+</templates>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.js b/addons/mail/static/src/discuss/core/common/channel_member_list.js
index 7ac1f554797e5..a5d6fa9d71378 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_list.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_list.js
@@ -1,5 +1,5 @@
-import { ImStatus } from "@mail/core/common/im_status";
 import { ActionPanel } from "@mail/discuss/core/common/action_panel";
+import { ChannelMember } from "@mail/discuss/core/common/channel_member";
 
 import { Component, onWillUpdateProps, onWillStart } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
@@ -7,7 +7,7 @@ import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
 
 export class ChannelMemberList extends Component {
-    static components = { ImStatus, ActionPanel };
+    static components = { ActionPanel, ChannelMember };
     static props = ["thread", "openChannelInvitePanel", "className?"];
     static template = "discuss.ChannelMemberList";
 
@@ -37,21 +37,4 @@ export class ChannelMemberList extends Component {
             offline_count: this.props.thread.offlineMembers.length,
         });
     }
-
-    canOpenChatWith(member) {
-        if (this.store.inPublicPage) {
-            return false;
-        }
-        if (member.guest_id) {
-            return false;
-        }
-        return true;
-    }
-
-    onClickAvatar(ev, member) {
-        if (!this.canOpenChatWith(member)) {
-            return;
-        }
-        this.store.openChat({ partnerId: member.partner_id.id });
-    }
 }
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.xml b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
index 3dc90eafcab35..8fe5c5d37df51 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_list.xml
+++ b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
@@ -9,7 +9,7 @@
                     <t t-set="sectionName" t-value="onlineSectionText"/>
                 </t>
                 <div class="d-flex flex-column bg-inherit gap-1">
-                    <t t-foreach="props.thread.onlineMembers" t-as="member" t-key="member.id" t-call="discuss.channel_member"/>
+                    <ChannelMember t-foreach="props.thread.onlineMembers" t-as="member" t-key="member.id" member="member"/>
                 </div>
             </t>
             <t name="offlineMembers" t-if="props.thread.offlineMembers.length > 0">
@@ -17,9 +17,7 @@
                     <t t-set="sectionName" t-value="offlineSectionText"/>
                 </t>
                 <div class="d-flex flex-column bg-inherit gap-1">
-                    <t t-foreach="props.thread.offlineMembers" t-as="member" t-key="member.id" t-call="discuss.channel_member">
-                        <t t-set="offline" t-value="1"/>
-                    </t>
+                    <ChannelMember t-foreach="props.thread.offlineMembers" t-as="member" t-key="member.id" member="member"/>
                 </div>
             </t>
             <span t-if="props.thread.unknownMembersCount === 1" class="mx-2 mt-2">And 1 other member.</span>
@@ -34,25 +32,4 @@
         <h6 class="text-muted pt-4 text-uppercase o-xsmaller opacity-75" t-esc="sectionName"/>
     </t>
 
-    <t t-name="discuss.channel_member">
-        <div class="o-discuss-ChannelMember d-flex align-items-center p-1 bg-inherit rounded-3" t-att-class="{ 'cursor-pointer': canOpenChatWith(member), 'o-offline': offline }" t-on-click.stop="(ev) => this.onClickAvatar(ev, member)">
-            <div class="bg-inherit o-discuss-ChannelMember-avatar position-relative d-flex flex-shrink-0 rounded-3">
-                <img class="w-100 h-100 rounded-3 object-fit-cover" t-att-src="member.avatarUrl"/>
-                <ImStatus member="member" className="'position-absolute top-100 start-100 translate-middle mt-n1 ' + (member.isTyping ? 'ms-n2' : 'ms-n1')" size="'md'"/>
-            </div>
-            <div t-ref="displayName" class="d-flex overflow-hidden flex-column lh-sm">
-                <span class="ms-2 text-truncate text-muted fw-bold" t-esc="member.name" t-att-title="member.name"/>
-            </div>
-            <i t-if="member.channel_role === 'owner'" class="ms-2 fa fa-star text-warning" role="img" title="Channel Owner" aria-label="Channel Owner"/>
-            <i t-if="member.channel_role === 'admin'" class="ms-2 fa fa-star text-primary" role="img" title="Channel Admin" aria-label="Channel Admin"/>
-            <span class="ms-auto">
-                <span t-if="member.in(props.thread.invited_member_ids)" class="p-1 oi oi-user-plus opacity-75"/>
-                <span t-if="member.rtcSession?.is_muted and !member.rtcSession?.is_deaf" class="p-1 fa fa-microphone-slash opacity-75"/>
-                <span t-elif="member.rtcSession?.is_deaf" class="p-1 fa fa-deaf opacity-75"/>
-                <span t-if="member.rtcSession?.raisingHand" class="p-1 fa fa-hand-paper-o"/>
-            </span>
-
-        </div>
-    </t>
-
 </templates>
diff --git a/addons/mail/static/src/discuss/core/web/channel_member_list_patch.js b/addons/mail/static/src/discuss/core/web/channel_member_patch.js
similarity index 58%
rename from addons/mail/static/src/discuss/core/web/channel_member_list_patch.js
rename to addons/mail/static/src/discuss/core/web/channel_member_patch.js
index a90d3450498c3..6479812f006ad 100644
--- a/addons/mail/static/src/discuss/core/web/channel_member_list_patch.js
+++ b/addons/mail/static/src/discuss/core/web/channel_member_patch.js
@@ -1,26 +1,26 @@
-import { ChannelMemberList } from "@mail/discuss/core/common/channel_member_list";
+import { ChannelMember } from "@mail/discuss/core/common/channel_member";
 import { AvatarCardPopover } from "@mail/discuss/web/avatar_card/avatar_card_popover";
 
 import { usePopover } from "@web/core/popover/popover_hook";
 import { patch } from "@web/core/utils/patch";
 
-patch(ChannelMemberList.prototype, {
+patch(ChannelMember.prototype, {
     setup() {
         super.setup(...arguments);
         this.avatarCard = usePopover(AvatarCardPopover, {
             position: "right",
         });
     },
-    onClickAvatar(ev, member) {
-        if (!this.canOpenChatWith(member)) {
+    onClickAvatar(ev) {
+        if (!this.canOpenChat) {
             return;
         }
         if (!this.avatarCard.isOpen) {
             this.avatarCard.open(ev.currentTarget, {
-                id: member.partner_id.main_user_id?.id,
-                channelMember: member,
+                id: this.member.partner_id.main_user_id?.id,
+                channelMember: this.member,
             });
         }
     },
 });
-Object.assign(ChannelMemberList.components, { AvatarCardPopover });
+Object.assign(ChannelMember.components, { AvatarCardPopover });

From 8461ed461605028525fca8fc84da03408186528d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 10 Nov 2025 15:24:47 +0100
Subject: [PATCH 472/673] [IMP] mail: member card better position + highlighted
 member item
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- make avatar card position more natural with `right-start`.
- remove arrow of popover, since this looks bad especially when not
centered
- highlight member when card is open like when mouse-hovering, so
that it's very clear which item the popover comes from

closes odoo/odoo#235132

Related: odoo/enterprise#99194
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/discuss/core/common/channel_member.js |  7 ++++-
 .../discuss/core/common/channel_member.scss   |  2 +-
 .../discuss/core/common/channel_member.xml    |  2 +-
 .../discuss/core/web/channel_member_patch.js  |  7 ++++-
 .../static/src/core/popover/popover_hook.js   | 27 +++++++++----------
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/addons/mail/static/src/discuss/core/common/channel_member.js b/addons/mail/static/src/discuss/core/common/channel_member.js
index a83d72630dd39..cce549fcfc6f7 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member.js
@@ -1,7 +1,7 @@
 import { ImStatus } from "@mail/core/common/im_status";
 import { ActionPanel } from "@mail/discuss/core/common/action_panel";
 
-import { Component } from "@odoo/owl";
+import { Component, useState } from "@odoo/owl";
 
 import { useService } from "@web/core/utils/hooks";
 
@@ -12,6 +12,7 @@ export class ChannelMember extends Component {
 
     setup() {
         super.setup();
+        this.state = useState({});
         this.store = useService("mail.store");
     }
 
@@ -20,6 +21,10 @@ export class ChannelMember extends Component {
         return this.props.member;
     }
 
+    get attClass() {
+        return { "cursor-pointer": this.canOpenChat, "o-offline": !this.member.isOnline };
+    }
+
     get canOpenChat() {
         if (this.store.inPublicPage) {
             return false;
diff --git a/addons/mail/static/src/discuss/core/common/channel_member.scss b/addons/mail/static/src/discuss/core/common/channel_member.scss
index e7d33262a0637..9e74ef27a8a3a 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member.scss
+++ b/addons/mail/static/src/discuss/core/common/channel_member.scss
@@ -8,7 +8,7 @@
         }
     }
 
-    &.cursor-pointer:hover {
+    &.cursor-pointer:hover, &.o-active {
         background-color: var(--discuss-ChannelMember-hoverBg, mix($gray-100, $gray-200));
     }
 }
diff --git a/addons/mail/static/src/discuss/core/common/channel_member.xml b/addons/mail/static/src/discuss/core/common/channel_member.xml
index 841b37a243cbb..9206e3ae3aa16 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member.xml
+++ b/addons/mail/static/src/discuss/core/common/channel_member.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
     <t t-name="discuss.ChannelMember">
-        <div class="o-discuss-ChannelMember d-flex align-items-center p-1 bg-inherit rounded-3" t-att-class="{ 'cursor-pointer': canOpenChat, 'o-offline': !member.isOnline }" t-on-click.stop="(ev) => this.onClickAvatar(ev)">
+        <div class="o-discuss-ChannelMember d-flex align-items-center p-1 bg-inherit rounded-3" t-att-class="attClass" t-on-click.stop="(ev) => this.onClickAvatar(ev)">
             <div class="bg-inherit o-discuss-ChannelMember-avatar position-relative d-flex flex-shrink-0 rounded-3">
                 <img class="w-100 h-100 rounded-3 object-fit-cover" t-att-src="member.avatarUrl"/>
                 <ImStatus member="member" className="'position-absolute top-100 start-100 translate-middle mt-n1 ' + (member.isTyping ? 'ms-n2' : 'ms-n1')" size="'md'"/>
diff --git a/addons/mail/static/src/discuss/core/web/channel_member_patch.js b/addons/mail/static/src/discuss/core/web/channel_member_patch.js
index 6479812f006ad..4143418516062 100644
--- a/addons/mail/static/src/discuss/core/web/channel_member_patch.js
+++ b/addons/mail/static/src/discuss/core/web/channel_member_patch.js
@@ -8,9 +8,14 @@ patch(ChannelMember.prototype, {
     setup() {
         super.setup(...arguments);
         this.avatarCard = usePopover(AvatarCardPopover, {
-            position: "right",
+            arrow: false,
+            popoverClass: "mx-2",
+            position: "right-start",
         });
     },
+    get attClass() {
+        return { ...super.attClass, "o-active": this.avatarCard.isOpen };
+    },
     onClickAvatar(ev) {
         if (!this.canOpenChat) {
             return;
diff --git a/addons/web/static/src/core/popover/popover_hook.js b/addons/web/static/src/core/popover/popover_hook.js
index b2b82218f98dd..54ff0a34eab98 100644
--- a/addons/web/static/src/core/popover/popover_hook.js
+++ b/addons/web/static/src/core/popover/popover_hook.js
@@ -1,4 +1,4 @@
-import { onWillUnmount, status, useComponent } from "@odoo/owl";
+import { onWillUnmount, reactive, status, useComponent, useState } from "@odoo/owl";
 import { useService } from "@web/core/utils/hooks";
 
 /**
@@ -24,25 +24,24 @@ import { useService } from "@web/core/utils/hooks";
  * @returns {PopoverHookReturnType}
  */
 export function makePopover(addFn, component, options) {
-    let removeFn = null;
-    function close() {
-        removeFn?.();
-    }
-    return {
+    return reactive({
+        _removeFn: null,
         open(target, props) {
-            close();
+            this.close();
             const newOptions = Object.create(options);
             newOptions.onClose = () => {
-                removeFn = null;
+                this._removeFn = null;
                 options.onClose?.();
             };
-            removeFn = addFn(target, component, props, newOptions);
+            this._removeFn = addFn(target, component, props, newOptions);
+        },
+        close() {
+            this._removeFn?.();
         },
-        close,
         get isOpen() {
-            return Boolean(removeFn);
+            return Boolean(this._removeFn);
         },
-    };
+    });
 }
 
 /**
@@ -66,7 +65,7 @@ export function usePopover(component, options = {}) {
             options.onClose?.();
         }
     };
-    const popover = makePopover(service.add, component, newOptions);
-    onWillUnmount(popover.close);
+    const popover = useState(makePopover(service.add, component, newOptions));
+    onWillUnmount(() => popover.close());
     return popover;
 }

From eee6afca6c11eac9b49d86268771620569199f30 Mon Sep 17 00:00:00 2001
From: dvsh-odoo <dvsh@odoo.com>
Date: Mon, 29 Sep 2025 10:44:45 +0000
Subject: [PATCH 473/673] [FIX] account: prevent draggable upload button in
 dashboard

Issue:
- In the dashboard, the upload button (purchase journal and others)
  could be dragged.
- This caused unintended movement of the upload UI element.

Fix:
- Added `draggable=false` to the upload button element.
- Ensures the button remains fixed and cannot be dragged around.

TaskID-5114617

closes odoo/odoo#235210

X-original-commit: 6d027789a0f0f26a479a62233ca969f42984ec18
Signed-off-by: Habib Ayob (ayh) <ayh@odoo.com>
Signed-off-by: Devmitra Vedbandhu Sharma (dvsh) <dvsh@odoo.com>
---
 .../components/account_file_uploader/account_file_uploader.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml b/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml
index 8912d0bd758b8..41fcd3d436acd 100644
--- a/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml
+++ b/addons/account/static/src/components/account_file_uploader/account_file_uploader.xml
@@ -19,7 +19,7 @@
 
     <t t-name="account.JournalUploadLink">
         <t groups="account.group_account_invoice">
-            <a t-att-class="props.btnClass" href="#" t-out="props.linkText"/>
+            <a t-att-class="props.btnClass" href="#" t-out="props.linkText" draggable="false"/>
         </t>
     </t>
 

From 39b37e496b3cd987dd31f1409232a178f158f6eb Mon Sep 17 00:00:00 2001
From: "Mahdi Alijani (malj)" <malj@odoo.com>
Date: Tue, 4 Nov 2025 09:19:52 +0000
Subject: [PATCH 474/673] [FIX] website_sale: fix ribbon public access

Issue:
An access error is shown on the website if ribbon is added to a product
variant.

To reproduce:
1- Create a db with `website_sale` installed.
2- Activate product variant.
3- Create a product variant and publish it.
4- Add a ribbon to the variant.
5- Using public user, navigate to the website product page.

Cause:
This is caused due to not having proper access rights.
On stable we can use both the csv modification and adding sudo env
to have an easier view update without need to upgrade the module.
In master, we can keep the fix only in the csv file.

opw-5224552

closes odoo/odoo#235143

X-original-commit: e2bc8c34c53052f176e98356306f4880b42c8d9d
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
Signed-off-by: Mohammadmahdi Alijani (malj) <malj@odoo.com>
---
 addons/website_sale/models/product_template.py   | 2 +-
 addons/website_sale/security/ir.model.access.csv | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/models/product_template.py b/addons/website_sale/models/product_template.py
index 1711261d86535..84e8bc2394177 100644
--- a/addons/website_sale/models/product_template.py
+++ b/addons/website_sale/models/product_template.py
@@ -1049,7 +1049,7 @@ def _get_ribbon(self, price_vals=None, auto_assign_ribbons=None, variant=None):
         :rtype: `product.ribbon` recordset
         """
         variant = variant or self.product_variant_id
-        ribbon = variant.variant_ribbon_id or self.sudo().website_ribbon_id
+        ribbon = variant.sudo().variant_ribbon_id or self.sudo().website_ribbon_id
         if not ribbon:
             # The None check ensures that we do not recompute the ribbons when no ribbons were
             # previously found.
diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv
index e035784d5d507..4833487663a57 100644
--- a/addons/website_sale/security/ir.model.access.csv
+++ b/addons/website_sale/security/ir.model.access.csv
@@ -21,7 +21,9 @@ access_product_pricelist_public_employee,product.pricelist.public,product.model_
 access_product_pricelist_item_public_public,product.pricelist.item.public,product.model_product_pricelist_item,base.group_public,1,0,0,0
 access_product_pricelist_item_public_portal,product.pricelist.item.public,product.model_product_pricelist_item,base.group_portal,1,0,0,0
 access_product_pricelist_item_public_employee,product.pricelist.item.public,product.model_product_pricelist_item,base.group_user,1,0,0,0
-access_product_ribbon_public,product.ribbon.public,website_sale.model_product_ribbon,base.group_user,1,0,0,0
+access_product_ribbon_public_public,product.ribbon.public,website_sale.model_product_ribbon,base.group_public,1,0,0,0
+access_product_ribbon_public_portal,product.ribbon.public,website_sale.model_product_ribbon,base.group_portal,1,0,0,0
+access_product_ribbon_public_employee,product.ribbon.public,website_sale.model_product_ribbon,base.group_user,1,0,0,0
 access_product_ribbon_sale_manager,product.ribbon.sale_manager,website_sale.model_product_ribbon,sales_team.group_sale_manager,1,1,1,1
 access_product_attribute_public_public,product.attribute public,product.model_product_attribute,base.group_public,1,0,0,0
 access_product_attribute_public_portal,product.attribute public,product.model_product_attribute,base.group_portal,1,0,0,0

From 527ff5b9454140115ff3c713802527480978557a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Mon, 10 Nov 2025 13:29:09 +0000
Subject: [PATCH 475/673] [FIX] purchase: test failure on pg18

Apparently in pg18 a standard-compliance
fix (postgres/postgres@086c84b23d99c2ad268f97508cd840efc1fdfd79) has
led to `RESTRICT_VIOLATION` being emitted in cases which formerly
emitted `FOREIGN_KEY_VIOLATION`. One such case is specifically being
tested for by `test_purchase_order_line_without_uom`, leading to this
test failing systematically when running pg18:

    psycopg2.errors.RestrictViolation: update or delete on table "uom_uom" violates RESTRICT setting of foreign key constraint "purchase_order_line_product_uom_id_fkey" on table "purchase_order_line"
    DETAIL:  Key (id)=(29) is referenced from table "purchase_order_line".

Update the test to use the more generic `IntegrityError` as it's
probably more than sufficient for our purposes. Technically we could
pass a tuple of `(ForeignKeyViolation, RestrictViolation)` but it
doesn't really seem necessary. And it would require fixing the
`_raisesContext` override as currently it is very much *not*
compatible with that.

closes odoo/odoo#235177

X-original-commit: 39cd4ea856fe00f5674f8c44b2b66cbf2705426d
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
---
 addons/purchase/tests/test_purchase.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/tests/test_purchase.py b/addons/purchase/tests/test_purchase.py
index 61466ac13062e..c6dbe93d80173 100644
--- a/addons/purchase/tests/test_purchase.py
+++ b/addons/purchase/tests/test_purchase.py
@@ -9,7 +9,7 @@
 
 from datetime import timedelta
 from freezegun import freeze_time
-from psycopg2.errors import ForeignKeyViolation
+from psycopg2.errors import IntegrityError
 import pytz
 
 
@@ -1140,7 +1140,7 @@ def test_purchase_order_line_without_uom(self):
                 })],
         })
 
-        with (self.assertRaises(ForeignKeyViolation), self.cr.savepoint(), mute_logger("odoo.sql_db")):
+        with (self.assertRaises(IntegrityError), self.cr.savepoint(), mute_logger("odoo.sql_db")):
             uom_test.unlink()
 
         self.assertEqual(po.order_line[0].product_uom_id, uom_test)

From e121591a7e7438b4a599737e923b9f0ee5bf8181 Mon Sep 17 00:00:00 2001
From: "Xavier Luyckx (xlu)" <xlu@odoo.com>
Date: Sat, 4 Oct 2025 10:44:21 +0200
Subject: [PATCH 476/673] [IMP] html_editor, *: improve history dialog UI/UX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: project, project_todo

Before this commit, the history dialog had a basic layout with limited
visual feedback and unclear presentation. The mobile experience was also
particularly poor, with no way to navigate between the revision list
and content view on smaller screens.

This commit significantly improves the history dialog component with
better visual design, mobile responsiveness, and adherence to Odoo's UI
patterns.

The revision list has been redesigned with a semantically correct
component (list-group) with clearer visual indicators for different
revision states.

The top bar, info bar, and main history/comparison view have been
reworked with improved layout and spacing, providing better visual
hierarchy and clearer readability. An expand button has been added to
allow full-screen comparison when needed.

Mobile responsiveness has been dramatically improved with a
tab-based navigation system that allows users to switch between the
revision list and content preview on smaller screens.

Dark mode support has been enhanced to provide appropriate contrast.

task-5135850

closes odoo/odoo#231349

Related: odoo/enterprise#97070
Signed-off-by: Geelen Sébastien (sge) <sge@odoo.com>
---
 .../history_dialog/history_dialog.dark.scss   |  55 +--
 .../history_dialog/history_dialog.js          | 155 ++++++--
 .../history_dialog/history_dialog.scss        | 340 ++++++++++--------
 .../history_dialog/history_dialog.xml         | 240 ++++++++-----
 .../tests/tours/project_task_history.js       |  14 +-
 .../tests/tours/project_todo_history.js       |   8 +-
 6 files changed, 485 insertions(+), 327 deletions(-)

diff --git a/addons/html_editor/static/src/components/history_dialog/history_dialog.dark.scss b/addons/html_editor/static/src/components/history_dialog/history_dialog.dark.scss
index 53ce709d76760..086f87ad2e293 100644
--- a/addons/html_editor/static/src/components/history_dialog/history_dialog.dark.scss
+++ b/addons/html_editor/static/src/components/history_dialog/history_dialog.dark.scss
@@ -1,52 +1,9 @@
-.html-history-dialog .history-container {
-    --border-color: #3C3E4B;
+.history-container {
+    --HistoryDialog__container-diff-added-bg: #265426;
+    --HistoryDialog__container-diff-removed-bg: #7b2b2b;
 }
 
-.html-history-dialog {
-    .history-view-top-bar {
-        background-color: rgba(27, 161, 228, 0.1);
-        border-bottom: 1px solid #385f7f;
-        .text-info {
-            --color: #FFFFFF;
-        }
-    }
-    .history-view-inner {
-        background-color: rgb(27, 29, 38);
-        border-color: rgba(27, 161, 228, 0.2);
-    }
-    .history-container {
-        --border-color: #ddd;
-        margin-left: 240px;
-        .o_notebook_content {
-            padding: 10px 12px;
-            border: 1px solid var(--border-color);
-            border-top: 0;
-        }
-        .nav {
-            padding-left: 24px;
-        }
-        removed {
-            background-color: #8d1d1d;
-            opacity: 1;
-            color: #d58f8f;
-        }
-        added {
-            background-color: #1e4506;
-            color: #bbd9bb;
-        }
-    }
-    .revision-list {
-        .btn {
-            color: #999;
-            &:hover {
-                background-color: rgba($primary, .40);
-            }
-            &.targeted {
-                color: #c3c3c3;
-            }
-            &.selected {
-                color: #fff;
-            }
-        }
-    }
+.nav-link {
+    --historyDialog__link-color--active: #{o-text-color('primary')};
+    --historyDialog__link-border-top-color--active: #{o-text-color('primary')};
 }
diff --git a/addons/html_editor/static/src/components/history_dialog/history_dialog.js b/addons/html_editor/static/src/components/history_dialog/history_dialog.js
index e750f7cd7348b..00692bd88e9a9 100644
--- a/addons/html_editor/static/src/components/history_dialog/history_dialog.js
+++ b/addons/html_editor/static/src/components/history_dialog/history_dialog.js
@@ -1,9 +1,8 @@
 import { Dialog } from "@web/core/dialog/dialog";
-import { Notebook } from "@web/core/notebook/notebook";
-import { formatDateTime } from "@web/core/l10n/dates";
 import { useService } from "@web/core/utils/hooks";
+import { useHotkey } from "@web/core/hotkeys/hotkey_hook";
 import { memoize } from "@web/core/utils/functions";
-import { Component, onMounted, useState, markup, onWillStart, onWillDestroy } from "@odoo/owl";
+import { Component, onMounted, useState, markup, onWillStart, useRef } from "@odoo/owl";
 import { _t } from "@web/core/l10n/translation";
 import { user } from "@web/core/user";
 import { HtmlViewer } from "@html_editor/components/html_viewer/html_viewer";
@@ -12,12 +11,13 @@ import { browser } from "@web/core/browser/browser";
 import { cookie } from "@web/core/browser/cookie";
 import { loadBundle } from "@web/core/assets";
 import { htmlReplaceAll } from "@web/core/utils/html";
+import { scrollTo } from "@web/core/utils/scrolling";
 
 const { DateTime } = luxon;
 
 export class HistoryDialog extends Component {
     static template = "html_editor.HistoryDialog";
-    static components = { Dialog, HtmlViewer, Notebook };
+    static components = { Dialog, HtmlViewer };
     static props = {
         recordId: Number,
         recordModel: String,
@@ -45,15 +45,19 @@ export class HistoryDialog extends Component {
         revisionContent: null,
         revisionComparison: null,
         revisionId: null,
-        revisionLoading: true,
-        cssMaxHeight: 400,
+        isLoading: true,
+        size: "xl",
+        mobileActiveTab: "revisions",
     });
 
     setup() {
-        this.size = "fullscreen";
         this.title = this.props.title;
         this.orm = useService("orm");
-        this.resizeObserver = null;
+        this.toggleFullscreen = this.toggleFullscreen.bind(this);
+        this.listboxRef = useRef("listbox");
+
+        useHotkey("ArrowUp", () => this.navigateRevisions("PREV"), { allowRepeat: true });
+        useHotkey("ArrowDown", () => this.navigateRevisions("NEXT"), { allowRepeat: true });
 
         onWillStart(async () => {
             // We include the current document version as the first revision,
@@ -81,19 +85,35 @@ export class HistoryDialog extends Component {
             });
 
             this.state.revisionsData = revisionData;
-            this.resizeObserver = new ResizeObserver(this.resize.bind(this));
-            this.resizeObserver.observe(document.body);
         });
         onMounted(() => this.init());
-        onWillDestroy(() => {
-            this.resizeObserver?.disconnect();
-        });
     }
 
-    resize() {
-        const dialogContainer = document.querySelector(".html-history-dialog-container");
-        const computedStyle = getComputedStyle(dialogContainer);
-        this.state.cssMaxHeight = parseInt(computedStyle.height.replace("px", "")) - 160;
+    toggleFullscreen() {
+        this.state.size = this.state.size === "xl" ? "fullscreen" : "xl";
+    }
+
+    toggleComparison() {
+        this.state.currentView = this.state.currentView === "comparison" ? "content" : "comparison";
+    }
+
+    setComparisonUnified() {
+        this.state.isComparisonSplit = false;
+    }
+
+    setComparisonSplit() {
+        this.state.isComparisonSplit = true;
+    }
+
+    setMobileTab(tab) {
+        this.state.mobileActiveTab = tab;
+    }
+
+    onRevisionKeydown(revisionId, ev) {
+        if (ev.key === 'Enter' || ev.key === ' ') {
+            ev.preventDefault();
+            this.updateCurrentRevision(revisionId);
+        }
     }
 
     getConfig(value) {
@@ -109,19 +129,27 @@ export class HistoryDialog extends Component {
             await loadBundle("html_editor.assets_history_diff");
         }
         await this.updateCurrentRevision(this.state.revisionsData[0]["revision_id"]);
-        this.resize();
     }
 
     async updateCurrentRevision(revisionId) {
         if (this.state.revisionId === revisionId) {
             return;
         }
-        this.state.revisionLoading = true;
+        this.state.isLoading = true;
         this.state.revisionId = revisionId;
         this.state.revisionContent = await this.getRevisionContent(revisionId);
         this.state.revisionComparison = await this.getRevisionComparison(revisionId);
         this.state.revisionComparisonSplit = await this.getRevisionComparisonSplit(revisionId);
-        this.state.revisionLoading = false;
+        this.state.isLoading = false;
+        this.state.mobileActiveTab = "content";
+    }
+
+    get isMobileActiveTab() {
+        return (tab) => this.state.mobileActiveTab === tab;
+    }
+
+    get userTZ() {
+        return user.tz || "local";
     }
 
     getRevisionComparison = memoize(
@@ -195,7 +223,7 @@ export class HistoryDialog extends Component {
 
     _removeExternalBlockHtml(baseHtml) {
         const filteringRegex = /<[a-z ]+data-embedded="(?:(?!<).)+<\/[a-z]+>/gim;
-        const placeholderHtml = markup`<div class="embedded-history-dialog-placeholder">${_t(
+        const placeholderHtml = markup`<div class="embedded-history-dialog-placeholder d-flex align-items-center justify-content-center gap-2 p-4 my-2 bg-100 rounded text-muted fw-medium small">${_t(
             "Dynamic element"
         )}</div>`;
         return htmlReplaceAll(baseHtml, filteringRegex, () => placeholderHtml);
@@ -208,14 +236,89 @@ export class HistoryDialog extends Component {
         if (!revision || !revision["create_date"]) {
             return "--";
         }
-        const userTZ = user.tz || "local";
-        return formatDateTime(
-            DateTime.fromISO(revision["create_date"], { zone: "utc" }).setZone(userTZ),
-            { showSeconds: false }
+        const revisionDate = DateTime.fromISO(revision["create_date"], { zone: "utc" }).setZone(this.userTZ);
+        const now = DateTime.now().setZone(this.userTZ);
+        const diffInMinutes = now.diff(revisionDate, 'minutes').minutes;
+        const diffInHours = now.diff(revisionDate, 'hours').hours;
+
+        if (diffInMinutes < 1 && diffInMinutes >= 0) {
+            return "Just now";
+        }
+
+        if (diffInMinutes < 60 && diffInMinutes >= 1) {
+            const minutes = Math.floor(diffInMinutes);
+            return `${minutes} minute${minutes > 1 ? 's' : ''} ago`;
+        }
+
+        if (diffInHours < 24 && revisionDate.hasSame(now, 'day')) {
+            const hours = Math.floor(diffInHours);
+            return `${hours} hour${hours > 1 ? 's' : ''} ago`;
+        }
+
+        if (revisionDate.hasSame(now, 'day')) {
+            return `Today at ${revisionDate.toFormat('h:mm a')}`;
+        }
+
+        if (revisionDate.plus({ days: 1 }).hasSame(now, 'day')) {
+            return `Yesterday at ${revisionDate.toFormat('h:mm a')}`;
+        }
+
+        if (revisionDate.hasSame(now, 'year')) {
+            return revisionDate.toFormat('MMM d \'at\' h:mm a');
+        }
+
+        return revisionDate.toFormat('MMM d, yyyy');
+    }
+
+    getRevisionFullDate(revision) {
+        if (!revision || !revision["create_date"]) {
+            return "--";
+        }
+        const revisionDate = DateTime.fromISO(revision["create_date"], { zone: "utc" }).setZone(this.userTZ);
+        return revisionDate.toFormat('MMM d, yyyy \'at\' h:mm:ss a');
+    }
+
+    isRevisionSelected(revision) {
+        return this.currentRevision?.revision_id === revision.revision_id;
+    }
+
+    navigateRevisions(direction) {
+        if (!this.state.revisionsData.length) {
+            return;
+        }
+
+        const currentIndex = this.state.revisionsData.findIndex(
+            (rev) => rev.revision_id === this.state.revisionId
         );
+
+        if (currentIndex === -1) {
+            this.updateCurrentRevision(this.state.revisionsData[0].revision_id);
+            return;
+        }
+
+        let nextIndex;
+        if (direction === "NEXT") {
+            nextIndex = currentIndex < this.state.revisionsData.length - 1 ? currentIndex + 1 : 0;
+        } else if (direction === "PREV") {
+            nextIndex = currentIndex > 0 ? currentIndex - 1 : this.state.revisionsData.length - 1;
+        }
+
+        const nextRevision = this.state.revisionsData[nextIndex];
+        this.updateCurrentRevision(nextRevision.revision_id);
+
+        if (this.listboxRef.el) {
+            const revisionElement = this.listboxRef.el.querySelector(
+                `[data-revision-id="${nextRevision.revision_id}"]`
+            );
+            if (revisionElement) {
+                revisionElement.focus();
+                scrollTo(revisionElement, { scrollable: this.listboxRef.el });
+            }
+        }
     }
+
     getRevisionClasses(revision) {
-        let classesStr = "btn";
+        let classesStr = "list-group-item";
 
         if (
             this.state.revisionId !== -1 &&
diff --git a/addons/html_editor/static/src/components/history_dialog/history_dialog.scss b/addons/html_editor/static/src/components/history_dialog/history_dialog.scss
index d011a4c6d8ab1..ddefa4df23f2a 100644
--- a/addons/html_editor/static/src/components/history_dialog/history_dialog.scss
+++ b/addons/html_editor/static/src/components/history_dialog/history_dialog.scss
@@ -1,168 +1,222 @@
 .html-history-dialog-container {
-    margin-left: 10px;
-    margin-right: 10px;
-    width: calc(100% - 20px);
-}
-.html-history-dialog {
-    position: relative;
-    .history-view-top-bar {
-        display: flex;
-        align-items: center;
-        padding: 8px 12px;
-        background-color: #f7f7f7;
-        border-bottom: 1px solid #ddd;
-
-        >div {
-            flex-grow: 6;
-            &.toggle-view-btns {
-                flex-grow: 1;
-                padding-right: 10px;
-                width: 220px;
-            }
-            &:last-child {
-                flex-grow: 1;
-                text-align: right;
-                width: 180px;
-                .fa {
-                    margin-right: 10px;
-                }
-            }
+    overflow: hidden;
+
+    // Expand/collapse button styled to match BS .btn-close for visual consistency
+    .o_expand_button {
+        padding: calc(var(--modal-header-padding-y) * .5) calc(var(--modal-header-padding-x) * .5);
+        margin: calc(-.5 * var(--modal-header-padding-y)) var(--modal-header-padding-x) calc(-.5 * var(--modal-header-padding-y)) auto;
+        color: var(--btn-close-color);
+        background: transparent var(--btn-close-bg) center / 1em auto no-repeat;
+        border: 0;
+        border-radius: $border-radius-sm;
+        width: 2rem;
+
+        &:focus {
+            outline: 0;
+            box-shadow: $btn-close-focus-shadow;
         }
-    }
-    .history-view-inner {
-        padding: 8px 12px;
-        border: 1px solid #ddd;
-        border-top: 0;
-        overflow: auto;
-        .embedded-history-dialog-placeholder {
-            color: #444;
-            padding: 32px;
-            text-align: center;
-            font-size: 20px;
-            border : 1px solid #999;
-            border-radius: 4px;
-            margin: 8px 0;
-            background-image: linear-gradient(45deg, #d1d1d1 25%, #999 25%, #999 50%, #d1d1d1 50%, #d1d1d1 75%, #999 75%, #999);
-            background-size: 50px 50px;
-            text-shadow:
-                    -2px -2px 0 #d1d1d1,
-                    2px -2px 0 #d1d1d1,
-                    -2px 2px 0 #d1d1d1,
-                    2px 2px 0 #d1d1d1,
-                    -3px 0px 0 #d1d1d1,
-                    3px 0px 0 #d1d1d1,
-                    0px -3px 0 #d1d1d1,
-                    0px 3px 0 #d1d1d1,
+
+        &:active {
+            border: none;
+            transform: none;
         }
-        .history-comparison-split {
-            position: relative;
+
+        @include media-breakpoint-down(md) {
+            display: none;
         }
     }
-    .history-container {
-        --border-color: #ddd;
-        margin-left: 240px;
-        overflow: hidden;
-        .o_notebook_content {
-            padding: 10px 12px;
-            border: 1px solid var(--border-color);
-            border-top: 0;
+
+    @include media-breakpoint-up(md) {
+        margin: $o-horizontal-padding * 5;
+    }
+}
+
+.modal-fullscreen {
+    .o_expand_button.fa-expand:before {
+        content: "\f066";
+    }
+}
+
+.history-view-inner {
+    min-height: 0;
+
+    .embedded-history-dialog-placeholder {
+        border: $border-width * 2 dashed $border-color;
+
+        &:before {
+            content: '\f1b2';
+            font-family: FontAwesome;
+            font-size: 1.25rem;
+            opacity: 0.5;
         }
-        .nav {
-            padding-left: 24px;
+    }
+
+    .loading-spinner {
+        filter: invert(1);
+        width: 30px;
+        height: 30px;
+    }
+}
+
+.history-container {
+    min-width: 0;
+
+    // Custom diff elements generated by backend (see diff_utils.py)
+    removed {
+        display: inline;
+        background-color: var(#{--HistoryDialog__container-diff-removed-bg}, #f1afaf);
+        text-decoration: line-through;
+        opacity: 0.8;
+    }
+
+    added {
+        display: inline;
+        background-color: var(#{--HistoryDialog__container-diff-added-bg}, #c8f1af);
+    }
+}
+
+.history-view-top-bar {
+    height: 4rem;
+}
+
+.history-content-view,
+.history-comparison-view {
+    min-height: 0;
+}
+
+// Revision List
+.o_revision_panel {
+    // Timeline configuration
+    $dot-size: 1.375rem;
+    $dot-size-small: 0.8125rem;         // 13px
+    $timeline-offset: 2.25rem;
+    $line-left: 1.625rem;               // 26px - vertical line position
+
+    min-width: 320px;
+
+    .o_revision_panel_item {
+        --Avatar-size: 2rem;
+        margin-left: $timeline-offset;
+
+        .o_avatar {
+            width: var(--Avatar-size);
+            height: var(--Avatar-size);
         }
-        removed {
-            display: inline;
-            background-color: #f1afaf;
-            text-decoration: line-through;
-            opacity: 0.5;
+
+        &:hover {
+            background-color: rgba($o-action, .08);
+            border-color: rgba($o-action, .15);
+
+            &:before {
+                box-shadow: 0 0 0 4px rgba($o-action, .10);
+            }
+        }
+
+        &:focus {
+            outline: 2px solid rgba($o-action, .3);
+            outline-offset: -2px;
         }
-        added {
-            display: inline;
-            background-color: #c8f1af;
+
+        // Timeline line
+        &:after {
+            content: ' ';
+            @include o-position-absolute($top: -#{map-get($spacers, 3)}, $left: -$line-left);
+            height: calc(100% - 1.25rem);       // 20px
+            border-left: $border-width * 2 solid;
+            border-color: $border-color;
+            transform: translateX(-50%);
         }
-        p {
-            margin-bottom: 0.6rem;
+
+        // Timeline dot (small)
+        &:before {
+            content: '';
+            @include o-position-absolute($top: 50%, $left: calc(-#{$line-left} - #{$dot-size-small / 2}));
+            transform: translateY(-50%);
+            border-radius: 50%;
+            width: $dot-size-small;
+            height: $dot-size-small;
+            background-color: $border-color;
+            z-index: 10;
+            transition: width 0.2s ease, height 0.2s ease, left 0.2s ease;
         }
-    }
-    .revision-list {
-        overflow: auto;
-        width: 230px;
-        position: absolute;
-        top:0;
-        left: 0;
-        .btn {
-            --Avatar-size: 24px;
-            display: block;
-            text-align: left;
-            width: 200px;
-            margin-bottom: 8px;
-            position: relative;
-            padding-left: 18px;
-            margin-left: 12px;
-            color: #555;
-            border-radius: 6px;
-            .o_avatar  {
-                position: absolute;
-                right: 6px;
-                top: 3px;
+
+        &.targeted {
+            .revision-item-content {
                 opacity: 0.5;
             }
+
+            .o_avatar {
+                opacity: 0.75;
+                filter: saturate(0);
+            }
+
             &:hover {
-                background-color: rgba($primary, .20);
+                .revision-item-content {
+                    opacity: 0.75;
+                }
             }
-            &:after {
-                content: ' ';
-                position: absolute;
-                left : -1px;
-                top: -16px;
-                border-left: 2px solid;
-                border-color: $secondary;
-                height: 24px;
+        }
+
+        &.selected {
+            background-color: $o-component-active-bg;
+            border-color: $o-component-active-border;
+
+            .revision-info {
+                .revision-date {
+                    color: $o-action;
+                }
             }
+
             &:before {
+                content: '\f04b';
                 font-family: 'FontAwesome';
-                content: '\f068';
-                position: absolute;
-                left : -12px;
-                top: 4px;
-                font-size: 12px;
+                left: calc(-#{$line-left} - #{$dot-size / 2});
+                width: $dot-size;
+                height: $dot-size;
+                line-height: $dot-size;
                 text-align: center;
-                border-radius: 12px;
-                width: 24px;
-                height: 24px;
-                line-height: 24px;
-                background-color: $secondary;
-                z-index: 10;
+                font-size: .5rem;
+                padding-left: 2px;
+                color: white;
+                background-color: $o-action;
             }
-            &.targeted {
-                color: lighten($primary, 20%);
-                &:before {
-                    color: white;
-                    content: '\f00c';
-                    background-color: lighten($primary, 20%);
-                }
-                &:after {
-                    border-color: lighten($primary, 20%);
-                }
+
+            ~ .o_revision_panel_item:before {
+                background-color: $o-action;
             }
-            &.selected {
-                color: $primary;
-                &:before {
-                    color: white;
-                    content: '\f0da';
-                    background-color: $primary;
-                }
-                &:after {
-                    border-color: $primary;
-                }
-                .o_avatar {
-                    opacity: 1;
+        }
+
+        &:first-child:after {
+            content: none;
+        }
+    }
+}
+
+@include media-breakpoint-down(md) {
+    .html-history-dialog-container {
+        .nav-tabs {
+            background-color: $o-view-background-color;
+
+            .nav-link {
+                background-color: $o-gray-100;
+                border-bottom-color: $border-color;
+
+                &.active {
+                    --#{$prefix}nav-tabs-link-active-color: var(--historyDialog__link-color--active, #{$o-brand-odoo});
+                    border-bottom-color: $o-view-background-color;
+
+                    &::after {
+                        @include o-position-absolute($top: -$border-width, $right: -$border-width, $left: -$border-width);
+                        height: $border-width * 3;
+                        background-color: var(--historyDialog__link-border-top-color--active, #{$o-brand-odoo});
+                        content: '';
+                    }
                 }
             }
-            &:first-child:after {
-                content: none !important;
-            }
-
         }
     }
+
+    .o_revision_panel {
+        border-right: none !important;
+    }
 }
diff --git a/addons/html_editor/static/src/components/history_dialog/history_dialog.xml b/addons/html_editor/static/src/components/history_dialog/history_dialog.xml
index 3d2c45ee7ace9..4843069f4abd9 100644
--- a/addons/html_editor/static/src/components/history_dialog/history_dialog.xml
+++ b/addons/html_editor/static/src/components/history_dialog/history_dialog.xml
@@ -1,121 +1,165 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
     <t t-name="html_editor.HistoryDialog">
-        <Dialog size="size" title="title" contentClass="'h-100 html-history-dialog-container'"
+        <Dialog size="state.size" title="title" bodyClass="'p-0'" contentClass="'html-history-dialog-container h-100'"
+                onExpand="toggleFullscreen"
                 t-on-close="props.close" t-on-cancel="props.close" t-on-confirm="_onRestoreRevisionClick"
                 t-on-after-render="_onAfterRender">
-            <div t-attf-class="dialog-container html-history-dialog #{state.revisionLoading ? 'html-history-loading' : 'html-history-loaded'}">
-                <div class="revision-list d-flex flex-column align-content-stretch" t-attf-style="max-height: {{state.cssMaxHeight}}px;">
-                    <t t-if="!state.revisionsData.length">
-                        <div class="text-center w-100 pb-2 pt-0 px-0 fw-bolder">No history</div>
-                    </t>
-
-                    <t t-foreach="state.revisionsData" t-as="rev"
-                       t-key="rev.revision_id">
-                        <a type="object" href="#" role="button"
-                           t-attf-title="Show the document submited by #{rev.create_user_name}, on #{this.getRevisionDate(rev)}"
-                           t-att-class="this.getRevisionClasses(rev)"
-                           t-on-click="() => this.updateCurrentRevision(rev.revision_id )">
-                            <small><t t-esc="this.getRevisionDate(rev)" /></small>
-                            <div class="o_avatar">
-                                <img class="rounded" t-att-src="this.getRevisionAuthorAvatar(rev)"
-                                     t-att-alt="rev.create_user_name" t-att-title="rev.create_user_name"/>
-                            </div>
+            <div class="d-flex flex-column h-100 overflow-hidden">
+                <ul class="nav nav-tabs d-md-none flex-shrink-0" role="tablist">
+                    <li class="nav-item flex-grow-1">
+                        <a
+                            href="#"
+                            id="tab-revisions"
+                            class="nav-link position-relative text-center fw-bold"
+                            t-att-class="{'active': state.mobileActiveTab === 'revisions'}"
+                            t-on-click.prevent="() => this.setMobileTab('revisions')"
+                            role="tab"
+                            aria-controls="revisions-panel"
+                            t-att-aria-selected="state.mobileActiveTab === 'revisions' ? 'true' : 'false'">
+                            <i class="fa fa-list me-1" role="img" aria-hidden="true"/>Revisions
                         </a>
-                    </t>
-                </div>
-                <div class="history-container" t-attf-style="max-height: {{state.cssMaxHeight}}px;">
-                    <div t-attf-class="history-content-view #{state.currentView === 'content' ? '' : 'd-none'}">
-                        <div class="history-view-top-bar">
-                            <div>
-                                <div class="text-info smaller">
-                                    <i class="fa fa-info-circle me-1" title="Version date"/>
-                                    Showing the document as it was on <t t-esc="this.getRevisionDate(this.currentRevision)" />, submited by <t t-esc="this.currentRevision.create_user_name" />
-                                </div>
+                    </li>
+                    <li class="nav-item flex-grow-1">
+                        <a
+                            href="#"
+                            id="tab-preview"
+                            class="nav-link position-relative text-center fw-bold"
+                            t-att-class="{'active': state.mobileActiveTab === 'content'}"
+                            t-on-click.prevent="() => this.setMobileTab('content')"
+                            role="tab"
+                            aria-controls="content-panel"
+                            t-att-aria-selected="state.mobileActiveTab === 'content' ? 'true' : 'false'">
+                            <i class="fa fa-eye me-1" role="img" aria-hidden="true"/>Preview
+                        </a>
+                    </li>
+                </ul>
+
+                <div class="html-history-dialog position-relative d-flex flex-column flex-md-row h-100" t-attf-class="{{state.isLoading ? 'html-history-loading' : 'html-history-loaded'}}">
+                    <div id="revisions-panel" class="o_revision_panel h-100 p-3 border-end overflow-auto d-md-flex flex-md-shrink-0" t-att-class="{'d-none': !isMobileActiveTab('revisions')}" role="region" aria-labelledby="tab-revisions">
+                        <t t-if="!state.revisionsData.length">
+                            <div class="text-center w-100 pb-2 pt-0 px-0 fw-bolder">No history</div>
+                        </t>
+
+                        <ul t-else="" class="list-group w-100" role="listbox" t-ref="listbox" >
+                            <t t-foreach="state.revisionsData" t-as="rev" t-key="rev.revision_id">
+                                <li t-att-data-revision-id="rev.revision_id"
+                                    t-attf-title="Submitted by #{rev.create_user_name} on #{this.getRevisionFullDate(rev)}"
+                                    class="o_revision_panel_item list-group-item rounded-2 mb-2 px-2 py-1 border-1 cursor-pointer user-select-none"
+                                    t-att-class="this.getRevisionClasses(rev)"
+                                    t-on-click="() => this.updateCurrentRevision(rev.revision_id)"
+                                    t-on-keydown="(ev) => this.onRevisionKeydown(rev.revision_id, ev)"
+                                    t-att-aria-selected="this.isRevisionSelected(rev) ? 'true' : 'false'"
+                                    role="option"
+                                    tabindex="0"
+                                    >
+                                    <div class="revision-item-content d-flex justify-content-between align-items-center gap-3">
+                                        <div class="revision-info lh-sm">
+                                            <time class="revision-date fw-bold d-block" t-att-datetime="rev.create_date">
+                                                <t t-esc="this.getRevisionDate(rev)" />
+                                            </time>
+                                            <div class="revision-author text-muted text-truncate">
+                                                <small>by <t t-esc="rev.create_user_name" /></small>
+                                            </div>
+                                        </div>
+                                        <div class="o_avatar">
+                                            <img
+                                                class="rounded"
+                                                t-att-src="this.getRevisionAuthorAvatar(rev)"
+                                                t-att-alt="rev.create_user_name + ' avatar'"
+                                            />
+                                        </div>
+                                    </div>
+                                </li>
+                            </t>
+                        </ul>
+                    </div>
+                    <div id="content-panel"
+                         class="history-container d-md-flex flex-column flex-grow-1 min-w-0 overflow-hidden"
+                         t-att-class="{'d-none': !isMobileActiveTab('content')}"
+                         role="region"
+                         aria-labelledby="tab-preview">
+                        <div class="history-view-top-bar d-flex gap-3 justify-content-between align-items-center px-3 border-bottom bg-view">
+                            <div class="form-check form-switch">
+                                <input class="form-check-input" type="checkbox" role="switch" id="compare-switch"
+                                    t-att-checked="state.currentView === 'comparison'"
+                                    t-on-change="toggleComparison"
+                                    aria-label="Toggle comparison view" />
+                                <label class="form-check-label fw-medium" for="compare-switch">
+                                    Show comparison
+                                </label>
                             </div>
-                            <div>
-                                <a type="object" href="#" role="button" class="btn btn-secondary" t-on-click="() => state.currentView = 'comparison'">
-                                    <i class="fa fa-exchange" title="View comparison" />
-                                    View comparison
-                                </a>
+                            <div t-if="env.debug and state.currentView === 'comparison'" class="btn-group" role="group" aria-label="Diff view mode">
+                                <input type="radio" class="btn-check" name="diff-mode" id="unified-view-btn"
+                                    t-on-click="setComparisonUnified"
+                                    t-att-checked="!state.isComparisonSplit" />
+                                <label class="btn btn-secondary" for="unified-view-btn">Unified</label>
+                                <input type="radio" class="btn-check" name="diff-mode" id="split-view-btn"
+                                    t-on-click="setComparisonSplit"
+                                    t-att-checked="state.isComparisonSplit" />
+                                <label class="btn btn-secondary" for="split-view-btn">Split</label>
                             </div>
                         </div>
-                        <div class="history-view-inner" t-attf-style="max-height: {{state.cssMaxHeight-20}}px;">
-                            <t t-if="state.revisionLoading">
-                                <div class="d-flex flex-column justify-content-center align-items-center">
-                                    <img src="/web/static/img/spin.svg" alt="Loading..." class="me-2"
-                                         style="filter: invert(1); opacity: 0.5; width: 30px; height: 30px;"/>
-                                    <p class="m-0 text-muted loading-text">
-                                        <em>Loading...</em>
-                                    </p>
-                                </div>
-                            </t>
-                            <t t-elif="state.revisionContent?.length">
-                                <div class="pe-none">
-                                    <HtmlViewer config="getConfig('revisionContent')"/>
-                                </div>
-                            </t>
-                            <t t-else="" t-out="props.noContentHelper" />
+                        <div class="history-info-bar flex-shrink-0">
+                            <div class="alert alert-secondary py-2 mb-0 rounded-0 border-0" role="status" aria-live="polite">
+                                <small>
+                                    <i class="fa fa-info-circle me-1" role="img" aria-hidden="true"/>
+                                    <t t-if="state.currentView === 'content'">
+                                        Showing <strong t-esc="this.currentRevision.create_user_name" />'s description from <strong t-esc="this.getRevisionFullDate(this.currentRevision)" />
+                                    </t>
+                                    <t t-else="">
+                                        Comparing current description with <strong t-esc="this.currentRevision.create_user_name" />'s version from <strong t-esc="this.getRevisionFullDate(this.currentRevision)" />
+                                    </t>
+                                </small>
+                            </div>
                         </div>
-                    </div>
-                    <div t-attf-class="history-comparison-view #{state.currentView === 'comparison' ? '' : 'd-none'}">
-                        <div class="history-view-top-bar">
-                            <t t-if="env.debug">
-                                <div class="toggle-view-btns">
-                                    <div class="btn-group" role="group">
-                                        <input type="radio" class="btn-check" name="vbtn-radio" id="unified-view-btn"
-                                               t-on-click="() => state.isComparisonSplit = false"
-                                               t-att-checked="state.isComparisonSplit ? '' : 'checked'" />
-                                        <label class="btn btn-secondary" for="unified-view-btn">Unified view</label>
-                                        <input type="radio" class="btn-check" name="vbtn-radio" id="split-view-btn"
-                                               t-on-click="() => state.isComparisonSplit = true"
-                                               t-att-checked="state.isComparisonSplit ? 'checked' : ''" />
-                                        <label class="btn btn-secondary" for="split-view-btn">Split view</label>
+                        <div t-attf-class="history-content-view d-flex flex-column flex-grow-1 pt-0 #{state.currentView !== 'content' ? 'd-none' : ''}">
+                            <div class="history-view-inner flex-grow-1 p-3 overflow-auto" t-att-aria-busy="state.isLoading ? 'true' : 'false'">
+                                <t t-if="state.isLoading">
+                                    <t t-call="html_editor.HistoryDialog.LoadingSpinner"/>
+                                </t>
+                                <t t-elif="state.revisionContent?.length">
+                                    <div class="pe-none">
+                                        <HtmlViewer config="getConfig('revisionContent')"/>
                                     </div>
-                                </div>
-                            </t>
-                            <div>
-                                <div class="text-info smaller">
-                                    <i class="fa fa-info-circle me-1" title="Version date"/>
-                                    Showing all differences between the current version and the selected one updated by <t t-esc="this.currentRevision.create_user_name" /> on <t t-esc="this.getRevisionDate(this.currentRevision)" />
-                                </div>
-                            </div>
-                            <div>
-                                <a type="object" href="#" role="button" class="btn btn-secondary" t-on-click="() => state.currentView = 'content'">
-                                    <i class="fa fa-eye" title="View Content"/>
-                                    View content
-                                </a>
+                                </t>
+                                <t t-else="" t-out="props.noContentHelper" />
                             </div>
                         </div>
-                        <div class="history-view-inner" t-attf-style="max-height: {{state.cssMaxHeight-60}}px;">
-                            <t t-if="state.revisionLoading">
-                                <div class="d-flex flex-column justify-content-center align-items-center">
-                                    <img src="/web/static/img/spin.svg" alt="Loading..." class="me-2"
-                                         style="filter: invert(1); opacity: 0.5; width: 30px; height: 30px;"/>
-                                    <p class="m-0 text-muted loading-text">
-                                        <em>Loading...</em>
-                                    </p>
-                                </div>
-                            </t>
-                            <t t-elif="state.revisionComparison?.length">
-                                <div t-attf-class="history-comparison-split #{state.isComparisonSplit ? '' : 'd-none'}">
-                                    <HtmlViewer config="getConfig('revisionComparisonSplit')"/>
-                                </div>
-                                <div t-attf-class="pe-none history-comparison-unified #{state.isComparisonSplit ? 'd-none' : ''}">
-                                    <HtmlViewer config="getConfig('revisionComparison')"/>
-                                </div>
-                            </t>
-                            <t t-else="">
-                                <span class="text-muted fst-italic">This is the current version, nothing to compare.</span>
-                            </t>
+                        <div t-attf-class="history-comparison-view d-flex flex-column flex-grow-1 pt-0 #{state.currentView !== 'comparison' ? 'd-none' : ''}">
+                            <div class="history-view-inner flex-grow-1 p-3 overflow-auto" t-att-aria-busy="state.isLoading ? 'true' : 'false'">
+                                <t t-if="state.isLoading">
+                                    <t t-call="html_editor.HistoryDialog.LoadingSpinner"/>
+                                </t>
+                                <t t-elif="state.revisionComparison?.length">
+                                    <div t-attf-class="history-comparison-split position-relative h-100 #{!state.isComparisonSplit ? 'd-none' : ''}">
+                                        <HtmlViewer config="getConfig('revisionComparisonSplit')"/>
+                                    </div>
+                                    <div t-attf-class="pe-none history-comparison-unified #{state.isComparisonSplit ? 'd-none' : ''}">
+                                        <HtmlViewer config="getConfig('revisionComparison')"/>
+                                    </div>
+                                </t>
+                                <t t-else="">
+                                    <span class="text-muted fst-italic">This is the current version, nothing to compare.</span>
+                                </t>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
             <t t-set-slot="footer">
-                <button class="btn btn-primary" t-on-click="_onRestoreRevisionClick" t-att-disabled="state.revisionLoading || state.revisionId === -1">Restore history</button>
+                <button class="btn btn-primary" t-on-click="_onRestoreRevisionClick" t-att-disabled="state.isLoading || state.revisionId === -1">Restore history</button>
                 <button class="btn btn-secondary" t-on-click="props.close">Discard</button>
             </t>
         </Dialog>
     </t>
+
+    <t t-name="html_editor.HistoryDialog.LoadingSpinner">
+        <div class="d-flex flex-column justify-content-center align-items-center">
+            <img src="/web/static/img/spin.svg" alt="Loading..." class="loading-spinner me-2 opacity-50"/>
+            <p class="m-0 text-muted loading-text">
+                <em>Loading...</em>
+            </p>
+        </div>
+    </t>
 </templates>
diff --git a/addons/project/static/tests/tours/project_task_history.js b/addons/project/static/tests/tours/project_task_history.js
index 0b186ff8fb1ca..6e4ffd9efffbd 100644
--- a/addons/project/static/tests/tours/project_task_history.js
+++ b/addons/project/static/tests/tours/project_task_history.js
@@ -97,9 +97,9 @@ registry.category("web_tour.tours").add("project_task_history_tour", {
         trigger: ".modal .html-history-dialog.html-history-loaded",
     }, {
         content: "Verify that 5 revisions are displayed (default empty description after the creation of the task + 3 edits + current version)",
-        trigger: ".modal .html-history-dialog .revision-list .btn",
+        trigger: ".modal .html-history-dialog .o_revision_panel .list-group-item",
         run: function () {
-            const items = document.querySelectorAll(".revision-list .btn");
+            const items = document.querySelectorAll(".o_revision_panel .list-group-item");
             if (items.length !== 5) {
                 console.error("Expect 5 Revisions in the history dialog, got " + items.length);
             }
@@ -109,7 +109,7 @@ registry.category("web_tour.tours").add("project_task_history_tour", {
         trigger: `.modal .history-container .history-content-view .history-view-inner:contains(${baseDescriptionContent} 3)`,
     }, {
         content: "Go to the third revision related to the second edit",
-        trigger: ".modal .html-history-dialog .revision-list .btn:nth-child(3)",
+        trigger: ".modal .html-history-dialog .o_revision_panel .list-group-item:nth-child(3)",
         run: "click",
     }, {
         trigger: ".modal .html-history-dialog.html-history-loaded",
@@ -118,7 +118,7 @@ registry.category("web_tour.tours").add("project_task_history_tour", {
         trigger: `.modal .history-container .history-content-view .history-view-inner:contains(${baseDescriptionContent} 1)`,
     }, {
         // click on the comparison tab
-        trigger: '.history-container .history-view-top-bar a:contains(Comparison)',
+        trigger: '.history-container .history-view-top-bar label:contains(Show comparison)',
         run: "click",
     }, {
         content: "Verify comparison text",
@@ -241,16 +241,16 @@ registry.category("web_tour.tours").add("project_task_last_history_steps_tour",
         trigger: ".modal .html-history-dialog.html-history-loaded",
     }, {
         content: "Verify that 2 revisions are displayed",
-        trigger: ".modal .html-history-dialog .revision-list .btn",
+        trigger: ".modal .html-history-dialog .o_revision_panel .list-group-item",
         run: function () {
-            const items = document.querySelectorAll(".revision-list .btn");
+            const items = document.querySelectorAll(".o_revision_panel .list-group-item");
             if (items.length !== 2) {
                 console.error("Expect 2 Revisions in the history dialog, got " + items.length);
             }
         },
     }, {
         content: "Go to the second revision related to the initial blank document ",
-        trigger: ".modal .html-history-dialog .revision-list .btn:nth-child(2)",
+        trigger: ".modal .html-history-dialog .o_revision_panel .list-group-item:nth-child(2)",
         run: "click",
     }, {
         trigger: ".modal .html-history-dialog.html-history-loaded",
diff --git a/addons/project_todo/static/tests/tours/project_todo_history.js b/addons/project_todo/static/tests/tours/project_todo_history.js
index 44540e3d98e5e..037458461979b 100644
--- a/addons/project_todo/static/tests/tours/project_todo_history.js
+++ b/addons/project_todo/static/tests/tours/project_todo_history.js
@@ -70,9 +70,9 @@ registry.category("web_tour.tours").add("project_todo_history_tour", {
         trigger: ".modal .html-history-dialog.html-history-loaded",
     }, {
         content: "Verify that 5 revisions are displayed (default empty description after the creation of the todo + 3 edits)",
-        trigger: ".modal .html-history-dialog .revision-list .btn",
+        trigger: ".modal .html-history-dialog .o_revision_panel .list-group-item",
         run: function () {
-            const items = document.querySelectorAll(".revision-list .btn");
+            const items = document.querySelectorAll(".o_revision_panel .list-group-item");
             if (items.length !== 5) {
                 throw new Error('Expect 5 Revisions in the history dialog, got ' + items.length);
             }
@@ -82,7 +82,7 @@ registry.category("web_tour.tours").add("project_todo_history_tour", {
         trigger: `.modal .history-container .history-content-view .history-view-inner:contains(${baseDescriptionContent} 3)`,
     }, {
         content: "Go to the third revision related to the second edit",
-        trigger: ".modal .html-history-dialog .revision-list .btn:nth-child(3)",
+        trigger: ".modal .html-history-dialog .o_revision_panel .list-group-item:nth-child(3)",
         run: "click",
     }, {
         trigger: ".modal .html-history-dialog.html-history-loaded",
@@ -91,7 +91,7 @@ registry.category("web_tour.tours").add("project_todo_history_tour", {
         trigger: `.modal .history-container .history-content-view .history-view-inner:contains(${baseDescriptionContent} 1)`,
     }, {
         // click on the split comparison tab
-        trigger: '.history-container .history-view-top-bar a:contains(Comparison)',
+        trigger: '.history-container .history-view-top-bar label:contains(Show comparison)',
         run: "click",
     }, {
         content: "Verify comparaison text",

From 772237f2949a5938b3b8794bf2c396cca06c845a Mon Sep 17 00:00:00 2001
From: Pierre Paridans <app@odoo.com>
Date: Mon, 27 Oct 2025 11:44:54 +0100
Subject: [PATCH 477/673] [REF] web,*: cleanup ControlPanel buttons management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: base_import, calendar, hr_expense, hr_holidays, mail, mrp, product,
    project, spreadsheet_dashboard, stock, website

tl;dr : if you want to customize view's buttons, look for
`buttonTemplate`.

Following last years development (MILK redesign, ControlPanel buttons
structure and cleanup, responsiveness...), the ControlPanel's slots
related to the main buttons (i.e. left part of the ControlPanel) became
redundant. Also, extending the views' buttons with custom JS ones (i.e.
not in the arch) wasn't the clearer to understand.

This commit's purpose is to both clean up and clarify how to manage
those buttons.

In a nutshell, the `control-panel-create-button`,
`control-panel-always-buttons` and `layout-buttons` slots have been
merged into a single `control-panel-buttons` slot. It makes it easier to
know where main buttons (in general) will go in the ControlPanel.

For the views, the goal was also to make it clearer how to extend/modify
the view's main buttons. The main customization point is the
`buttonTemplate` view's property as it allows to override the view's
buttons. Beside very specific case, the `control-panel-buttons`
shouldn't be touched for this purpose.

The Form view has its own specificity: it explicitly handles the buttons
used in dialog (also via the arch's `<footer>`) and in the ControlPanel.
To take this difference into account, a dedicated `buttonDialogTemplate`
property has been introduced for this view, allowing the same kind of
extension as the `buttonTemplate`.

Note: to match the global ControlPanel slots' naming scheme,
`layout-actions` has been renamed to `control-panel-actions`.

task-4277543

Part-of: odoo/odoo#220325
Related: odoo/enterprise#90889
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 .../src/import_action/import_action.xml       |  2 +-
 .../attendee_calendar_controller.xml          |  2 +-
 .../calendar_form/calendar_quick_create.js    |  2 +-
 addons/hr_expense/static/src/views/kanban.js  |  2 ++
 addons/hr_expense/static/src/views/kanban.xml |  4 +++-
 addons/hr_expense/static/src/views/list.xml   |  5 ++--
 .../views/calendar/calendar_controller.xml    |  2 +-
 .../allocation_form_view_dialog.js            |  2 +-
 .../src/views/view_dialog/form_view_dialog.js |  2 +-
 .../web/activity/activity_controller.xml      |  2 +-
 .../avatar_user_form_view_dialog.js           |  2 +-
 .../mrp_bom_overview_control_panel.xml        |  6 ++---
 .../mo_overview/mrp_mo_overview.xml           | 10 ++++----
 .../product_pricelist_report.xml              |  4 ++--
 .../src/product_catalog/kanban_controller.js  |  2 --
 .../src/product_catalog/kanban_controller.xml |  2 +-
 .../static/src/product_catalog/kanban_view.js |  1 +
 .../project_project_form_controller.js        |  1 -
 .../project_project_form_controller.xml       |  2 +-
 .../project_form/project_project_form_view.js |  1 +
 .../project_project_kanban_controller.js      |  1 -
 .../project_project_kanban_controller.xml     |  4 ++--
 .../project_task_kanban_view.js               |  1 +
 .../project_project_list_controller.js        |  1 -
 .../project_project_list_controller.xml       |  4 ++--
 .../project_project_list_view.js              |  1 +
 .../project_task_form_controller.js           |  1 -
 .../project_task_form_controller.xml          |  2 +-
 .../project_task_form_view.js                 |  1 +
 .../project_task_kanban_controller.xml        |  6 +++--
 .../project_task_kanban_view.js               |  1 +
 .../project_task_list_controller.js           |  1 -
 .../project_task_list_controller.xml          |  4 ++--
 .../project_task_list_view.js                 |  1 +
 .../dashboard_action/dashboard_action.xml     |  2 +-
 .../stock_traceability_report_backend.xml     |  2 +-
 .../stock_reception_report_main.xml           |  2 +-
 .../src/stock_forecasted/stock_forecasted.xml |  4 ++--
 .../stock_valuation_report.xml                |  4 ++--
 .../src/search/control_panel/control_panel.js |  2 +-
 .../search/control_panel/control_panel.xml    | 10 +++-----
 addons/web/static/src/search/layout.js        |  2 +-
 addons/web/static/src/search/layout.xml       |  2 +-
 .../views/calendar/calendar_controller.xml    |  4 ++--
 .../static/src/views/form/form_controller.js  |  1 +
 .../static/src/views/form/form_controller.xml | 21 ++++++++---------
 addons/web/static/src/views/form/form_view.js |  2 ++
 .../src/views/graph/graph_controller.xml      |  2 +-
 .../src/views/kanban/kanban_controller.js     |  2 +-
 .../src/views/kanban/kanban_controller.xml    | 19 +++++++--------
 .../static/src/views/list/list_controller.js  |  2 +-
 .../static/src/views/list/list_controller.xml | 23 ++++++-------------
 .../src/views/pivot/pivot_controller.xml      |  2 +-
 .../views/view_dialogs/form_view_dialog.js    |  4 ++--
 .../views/view_dialogs/form_view_dialog.xml   |  4 ++--
 .../src/webclient/actions/blank_component.xml |  2 +-
 .../actions/reports/report_action.xml         |  2 +-
 .../settings_form_view/settings_form_view.xml | 10 ++++----
 addons/web/static/tests/views/layout.test.js  | 16 ++++++-------
 .../static/src/hierarchy_controller.xml       |  4 ++--
 .../website_dashboard/website_dashboard.xml   |  2 +-
 .../src/components/views/theme_preview.xml    |  2 +-
 62 files changed, 113 insertions(+), 126 deletions(-)

diff --git a/addons/base_import/static/src/import_action/import_action.xml b/addons/base_import/static/src/import_action/import_action.xml
index 0b0913c822764..fc9fd1d5b2580 100644
--- a/addons/base_import/static/src/import_action/import_action.xml
+++ b/addons/base_import/static/src/import_action/import_action.xml
@@ -3,7 +3,7 @@
     <t t-name="ImportAction">
         <div t-ref="root" class="h-100 d-flex flex-column">
             <Layout className="'o_import_action d-flex h-100 overflow-auto'" display="display">
-                <t t-set-slot="control-panel-create-button">
+                <t t-set-slot="control-panel-buttons">
                     <t t-if="isPreviewing">
                         <t t-if="!state.isTested">
                             <button type="button" class="btn btn-primary" t-on-click="() => this.handleImport(true)">Test</button>
diff --git a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
index d58eb0db9615a..928da9afca217 100644
--- a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
+++ b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
@@ -2,7 +2,7 @@
 <templates>
     <t t-name="calendar.AttendeeCalendarController" t-inherit="web.CalendarController" t-inherit-mode="primary">
         <xpath expr="//Layout" position="inside">
-            <t t-set-slot="control-panel-create-button">
+            <t t-set-slot="control-panel-buttons">
                 <button class="btn btn-primary o-calendar-button-new" t-on-click="onClickAddButton">New</button>
             </t>
         </xpath>
diff --git a/addons/calendar/static/src/views/calendar_form/calendar_quick_create.js b/addons/calendar/static/src/views/calendar_form/calendar_quick_create.js
index 60c9336707252..14ac3097da720 100644
--- a/addons/calendar/static/src/views/calendar_form/calendar_quick_create.js
+++ b/addons/calendar/static/src/views/calendar_form/calendar_quick_create.js
@@ -82,7 +82,7 @@ export class CalendarQuickCreate extends FormViewDialog {
         super.setup();
         Object.assign(this.viewProps, {
             ...this.viewProps,
-            buttonTemplate: "calendar.CalendarQuickCreateButtons",
+            buttonDialogTemplate: "calendar.CalendarQuickCreateButtons",
         });
     }
 }
diff --git a/addons/hr_expense/static/src/views/kanban.js b/addons/hr_expense/static/src/views/kanban.js
index 06878eeda4e8f..be7a4256b9547 100644
--- a/addons/hr_expense/static/src/views/kanban.js
+++ b/addons/hr_expense/static/src/views/kanban.js
@@ -24,10 +24,12 @@ registry.category('views').add('hr_expense_kanban', {
     ...kanbanView,
     Controller: ExpenseKanbanController,
     Renderer: ExpenseKanbanRenderer,
+    buttonTemplate: "hr_expense.KanbanView.Buttons"
 });
 
 registry.category('views').add('hr_expense_dashboard_kanban', {
     ...kanbanView,
     Controller: ExpenseKanbanController,
     Renderer: ExpenseDashboardKanbanRenderer,
+    buttonTemplate: "hr_expense.KanbanView.Buttons"
 });
diff --git a/addons/hr_expense/static/src/views/kanban.xml b/addons/hr_expense/static/src/views/kanban.xml
index 1ad2253d55072..5ae5075b9541a 100644
--- a/addons/hr_expense/static/src/views/kanban.xml
+++ b/addons/hr_expense/static/src/views/kanban.xml
@@ -17,7 +17,7 @@
         </xpath>
     </t>
 
-    <t t-name="hr_expense.KanbanView" t-inherit="web.KanbanView" t-inherit-mode="primary">
+    <t t-name="hr_expense.KanbanView.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary">
         <xpath expr="//button[hasclass('o-kanban-button-new')]" position="before">
             <input type="file" name="ufile" class="d-none" t-ref="fileInput" multiple="1" accept="*" t-on-change="onChangeFileInput" />
             <button t-if="!env.isSmall" type="button" class="o_button_upload_expense btn btn-primary" t-on-click.prevent="uploadDocument">
@@ -27,7 +27,9 @@
                 Scan
             </button>
         </xpath>
+    </t>
 
+    <t t-name="hr_expense.KanbanView" t-inherit="web.KanbanView" t-inherit-mode="primary">
         <xpath expr="//t[@t-component='props.Renderer']" position="attributes">
             <attribute name="uploadDocument.bind">uploadDocument</attribute>
         </xpath>
diff --git a/addons/hr_expense/static/src/views/list.xml b/addons/hr_expense/static/src/views/list.xml
index 6f94933fcc2d1..f43fda06d5376 100644
--- a/addons/hr_expense/static/src/views/list.xml
+++ b/addons/hr_expense/static/src/views/list.xml
@@ -12,9 +12,6 @@
                 Post Entries
             </button>
         </xpath>
-    </t>
-
-    <t t-name="hr_expense.ListView" t-inherit="web.ListView" t-inherit-mode="primary">
         <xpath expr="//button[hasclass('o_list_button_add')]" position="before">
             <input type="file" name="ufile" class="d-none" t-ref="fileInput" multiple="1" accept="*" t-on-change="onChangeFileInput"/>
             <button t-if="!env.isSmall" type="button" class="o_button_upload_expense btn btn-primary" t-on-click.prevent="uploadDocument">
@@ -24,7 +21,9 @@
                 Scan
             </button>
         </xpath>
+    </t>
 
+    <t t-name="hr_expense.ListView" t-inherit="web.ListView" t-inherit-mode="primary">
         <xpath expr="//t[@t-component='props.Renderer']" position="attributes">
             <attribute name="uploadDocument.bind">uploadDocument</attribute>
         </xpath>
diff --git a/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml b/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml
index a64791105f51f..99c3f477d0f5d 100644
--- a/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml
+++ b/addons/hr_holidays/static/src/views/calendar/calendar_controller.xml
@@ -3,7 +3,7 @@
 
     <t t-name="hr_holidays.CalendarController" t-inherit="web.CalendarController" t-inherit-mode="primary">
         <xpath expr="//Layout" position="inside">
-            <t t-if="props.archInfo.canCreate" t-set-slot="control-panel-create-button">
+            <t t-if="props.archInfo.canCreate" t-set-slot="control-panel-buttons">
                 <span class="o_timeoff_buttons btn-group">
                     <div class="btn-group">
                         <button class="btn btn-primary btn-time-off " t-on-click="newTimeOffRequest" type="button">
diff --git a/addons/hr_holidays/static/src/views/view_dialog/allocation_form_view_dialog.js b/addons/hr_holidays/static/src/views/view_dialog/allocation_form_view_dialog.js
index f7f07b44bca2b..a92aaf180d403 100644
--- a/addons/hr_holidays/static/src/views/view_dialog/allocation_form_view_dialog.js
+++ b/addons/hr_holidays/static/src/views/view_dialog/allocation_form_view_dialog.js
@@ -4,7 +4,7 @@ export class AllocationFormViewDialog extends FormViewDialog {
     setup() {
         super.setup();
         Object.assign(this.viewProps, {
-            buttonTemplate: 'hr_holidays.AllocationFormViewDialog.buttons',
+            buttonDialogTemplate: "hr_holidays.AllocationFormViewDialog.buttons",
         });
     }
 };
diff --git a/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.js b/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.js
index 6f490193bfb27..281719a26849a 100644
--- a/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.js
+++ b/addons/hr_holidays/static/src/views/view_dialog/form_view_dialog.js
@@ -116,7 +116,7 @@ export class TimeOffFormViewDialog extends FormViewDialog {
 
         this.viewProps = Object.assign(this.viewProps, {
             jsClass: "timeoff_dialog_form",
-            buttonTemplate: "hr_holidays.FormViewDialog.buttons",
+            buttonDialogTemplate: "hr_holidays.FormViewDialog.buttons",
             onCancelLeave: () => {
                 this.props.close();
             },
diff --git a/addons/mail/static/src/views/web/activity/activity_controller.xml b/addons/mail/static/src/views/web/activity/activity_controller.xml
index 4245a3ec479d3..de4899d9cb723 100644
--- a/addons/mail/static/src/views/web/activity/activity_controller.xml
+++ b/addons/mail/static/src/views/web/activity/activity_controller.xml
@@ -6,7 +6,7 @@
                 <t t-set-slot="control-panel-additional-actions">
                     <CogMenu/>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar/>
                 </t>
                 <t t-component="props.Renderer" t-props="rendererProps" />
diff --git a/addons/mail/static/src/views/web/view_dialog/avatar_user_form_view_dialog.js b/addons/mail/static/src/views/web/view_dialog/avatar_user_form_view_dialog.js
index fc3c03a928a00..9dc31a5c2a0fe 100644
--- a/addons/mail/static/src/views/web/view_dialog/avatar_user_form_view_dialog.js
+++ b/addons/mail/static/src/views/web/view_dialog/avatar_user_form_view_dialog.js
@@ -5,7 +5,7 @@ export class AvatarUserFormViewDialog extends FormViewDialog {
     setup() {
         super.setup();
         Object.assign(this.viewProps, {
-            buttonTemplate: this.props.isToMany
+            buttonDialogTemplate: this.props.isToMany
                 ? "mail.UserFormViewDialog.ToMany.buttons"
                 : "mail.UserFormViewDialog.ToOne.buttons",
         });
diff --git a/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml b/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml
index bcccb554ca591..8156b27420f7a 100644
--- a/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml
+++ b/addons/mrp/static/src/components/bom_overview_control_panel/mrp_bom_overview_control_panel.xml
@@ -3,10 +3,8 @@
 
     <t t-name="mrp.BomOverviewControlPanel">
         <ControlPanel display="controlPanelDisplay">
-            <t t-set-slot="control-panel-create-button">
+            <t t-set-slot="control-panel-buttons">
                 <button t-if="props.showOptions.mode == 'forecast'" t-on-click="manufactureFromBoM" type="button" class="btn btn-primary">Manufacture</button>
-            </t>
-            <t t-set-slot="control-panel-always-buttons">
                 <button t-on-click="() => this.props.print()" type="button" class="btn btn-secondary">Print</button>
                 <!-- <t t-if="props.showVariants"> commented, waiting for ui update
                     <button t-on-click="() => this.props.print(true)" type="button" class="btn btn-secondary text-nowrap">Print All Variants</button>
@@ -14,7 +12,7 @@
                 </t> -->
                 <button t-if="props.foldable" t-on-click="clickTogglefold" type="button" class="btn btn-secondary" t-esc="foldButtonText"/>
             </t>
-            <t t-set-slot="layout-actions">
+            <t t-set-slot="control-panel-actions">
                 <div t-if="props.showVariants" class="input-group align-items-center">
                     <div class="col-4 col-md-auto pe-2 fw-bold">Variant</div>
                     <div class="col">
diff --git a/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml b/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml
index 87aaa6930d37c..ae5ced7378cc1 100644
--- a/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml
+++ b/addons/mrp/static/src/components/mo_overview/mrp_mo_overview.xml
@@ -3,15 +3,13 @@
 
     <div t-name="mrp.MoOverview" class="o_action">
         <Layout display="{ controlPanel: {} }">
-            <t t-set-slot="layout-actions">
+            <t t-set-slot="control-panel-actions">
                 <MoOverviewDisplayFilter showOptions="state.showOptions" limited="isProductionDone" changeDisplay.bind="onChangeDisplay" isProductionDraft="isProductionDraft"/>
             </t>
 
-            <t t-set-slot="control-panel-create-button">
-                <div class="d-flex gap-1">
-                    <button class="btn btn-primary" t-on-click="onPrint">Print</button>
-                    <button class="btn btn-primary" t-on-click="onUnfold">Unfold</button>
-                </div>
+            <t t-set-slot="control-panel-buttons">
+                <button class="btn btn-primary" t-on-click="onPrint">Print</button>
+                <button class="btn btn-primary" t-on-click="onUnfold">Unfold</button>
             </t>
 
             <div class="overflow-auto border-bottom bg-view container-fluid">
diff --git a/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml b/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
index 293ecc02b922a..300584ee558ac 100644
--- a/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
+++ b/addons/product/static/src/js/pricelist_report/product_pricelist_report.xml
@@ -5,7 +5,7 @@
     <t t-name="product.ProductPricelistReport">
         <div class="o_action">
             <Layout display="{ controlPanel: {} }">
-                <t t-set-slot="control-panel-always-buttons">
+                <t t-set-slot="control-panel-buttons">
                     <button t-on-click="onClickPrint" type="button" class="btn btn-primary" title="Print">Print</button>
                     <select name="formats" id="formats" class="form-select border-1 w-auto">
                         <option value="pdf">pdf</option>
@@ -13,7 +13,7 @@
                         <option value="xlsx">xlsx</option>
                     </select>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <form class="o_pricelist_report_form d-flex flex-row gap-1">
                         <div class="d-flex align-items-center gap-3 w-100">
                             <label class="visually-hidden" for="pricelists">Username</label>
diff --git a/addons/product/static/src/product_catalog/kanban_controller.js b/addons/product/static/src/product_catalog/kanban_controller.js
index ba5efa60de7b3..2e9a1067e188c 100644
--- a/addons/product/static/src/product_catalog/kanban_controller.js
+++ b/addons/product/static/src/product_catalog/kanban_controller.js
@@ -5,8 +5,6 @@ import { useDebounced } from "@web/core/utils/timing";
 import { _t } from "@web/core/l10n/translation";
 
 export class ProductCatalogKanbanController extends KanbanController {
-    static template = "ProductCatalogKanbanController";
-
     setup() {
         super.setup();
         this.orm = useService("orm");
diff --git a/addons/product/static/src/product_catalog/kanban_controller.xml b/addons/product/static/src/product_catalog/kanban_controller.xml
index 5469a528da964..b6877cedb779a 100644
--- a/addons/product/static/src/product_catalog/kanban_controller.xml
+++ b/addons/product/static/src/product_catalog/kanban_controller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="ProductCatalogKanbanController" t-inherit="web.KanbanView" t-inherit-mode="primary">
+    <t t-name="ProductCatalogKanbanController.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary">
         <xpath expr="//button[hasclass('o-kanban-button-new')]" position="replace">
             <button t-out="this.buttonString" type="button" class="btn btn-primary o-kanban-button-back" t-on-click="this.backToQuotationDebounced"/>
         </xpath>
diff --git a/addons/product/static/src/product_catalog/kanban_view.js b/addons/product/static/src/product_catalog/kanban_view.js
index 37818ca3543b3..d4d65aa145e5c 100644
--- a/addons/product/static/src/product_catalog/kanban_view.js
+++ b/addons/product/static/src/product_catalog/kanban_view.js
@@ -11,6 +11,7 @@ export const productCatalogKanbanView = {
     Controller: ProductCatalogKanbanController,
     Model: ProductCatalogKanbanModel,
     Renderer: ProductCatalogKanbanRenderer,
+    buttonTemplate: "ProductCatalogKanbanController.Buttons",
 };
 
 registry.category("views").add("product_kanban_catalog", productCatalogKanbanView);
diff --git a/addons/project/static/src/views/project_form/project_project_form_controller.js b/addons/project/static/src/views/project_form/project_project_form_controller.js
index 060887bf508cc..fca768116e3b4 100644
--- a/addons/project/static/src/views/project_form/project_project_form_controller.js
+++ b/addons/project/static/src/views/project_form/project_project_form_controller.js
@@ -4,7 +4,6 @@ import { FormControllerWithHTMLExpander } from '@resource/views/form_with_html_e
 import { ProjectTemplateDropdown } from "../components/project_template_dropdown";
 
 export class ProjectProjectFormController extends FormControllerWithHTMLExpander {
-    static template = "project.ProjectFormView";
     static components = {
         ...FormControllerWithHTMLExpander.components,
         ProjectTemplateDropdown,
diff --git a/addons/project/static/src/views/project_form/project_project_form_controller.xml b/addons/project/static/src/views/project_form/project_project_form_controller.xml
index e922f5438d784..3d4f06e21ae9c 100644
--- a/addons/project/static/src/views/project_form/project_project_form_controller.xml
+++ b/addons/project/static/src/views/project_form/project_project_form_controller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="project.ProjectFormView" t-inherit="resource.FormViewWithHtmlExpander" t-inherit-mode="primary">
+    <t t-name="project.ProjectFormView.Buttons" t-inherit="web.FormView.Buttons" t-inherit-mode="primary">
         <button class="btn btn-outline-primary o_form_button_create" position="replace">
             <ProjectTemplateDropdown t-if="canCreate"
                 onCreate="() => this.create()"
diff --git a/addons/project/static/src/views/project_form/project_project_form_view.js b/addons/project/static/src/views/project_form/project_project_form_view.js
index b71de4079ac5f..23dbd02c8ddec 100644
--- a/addons/project/static/src/views/project_form/project_project_form_view.js
+++ b/addons/project/static/src/views/project_form/project_project_form_view.js
@@ -5,6 +5,7 @@ import { ProjectProjectFormController } from "./project_project_form_controller"
 export const projectProjectFormView = {
     ...formViewWithHtmlExpander,
     Controller: ProjectProjectFormController,
+    buttonTemplate: "project.ProjectFormView.Buttons",
 };
 
 registry.category("views").add("project_project_form", projectProjectFormView);
diff --git a/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.js b/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.js
index 3db4f03bf6efc..f046ba1fb10c1 100644
--- a/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.js
+++ b/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.js
@@ -5,7 +5,6 @@ import { user } from "@web/core/user";
 import { ProjectTemplateDropdown } from "../components/project_template_dropdown";
 
 export class ProjectKanbanController extends KanbanController {
-    static template = "project.ProjectKanbanView";
     static components = {
         ...KanbanController.components,
         ProjectTemplateDropdown,
diff --git a/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.xml b/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.xml
index 868c474caa684..119541a527192 100644
--- a/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.xml
+++ b/addons/project/static/src/views/project_project_kanban/project_project_kanban_controller.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="project.ProjectKanbanView" t-inherit="web.KanbanView" t-inherit-mode="primary">
+    <t t-name="project.ProjectKanbanView.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary">
         <button class="btn btn-primary o-kanban-button-new" position="replace">
-            <ProjectTemplateDropdown t-if="canCreate and props.showButtons"
+            <ProjectTemplateDropdown t-if="!env.inDialog and canCreate"
                 onCreate="() => this.createRecord()"
                 newButtonClasses="'btn btn-primary o-kanban-button-new'"
                 context="props.context"
diff --git a/addons/project/static/src/views/project_project_kanban/project_task_kanban_view.js b/addons/project/static/src/views/project_project_kanban/project_task_kanban_view.js
index 463ff6417e239..3a0908bbde1b2 100644
--- a/addons/project/static/src/views/project_project_kanban/project_task_kanban_view.js
+++ b/addons/project/static/src/views/project_project_kanban/project_task_kanban_view.js
@@ -9,6 +9,7 @@ export const projectProjectKanbanView = {
     Controller: ProjectKanbanController,
     Renderer: ProjectProjectKanbanRenderer,
     Model: ProjectRelationalModel,
+    buttonTemplate: "project.ProjectKanbanView.Buttons",
 };
 
 registry.category("views").add("project_project_kanban", projectProjectKanbanView);
diff --git a/addons/project/static/src/views/project_project_list/project_project_list_controller.js b/addons/project/static/src/views/project_project_list/project_project_list_controller.js
index 75caf44bc3a6f..ef0c39b558285 100644
--- a/addons/project/static/src/views/project_project_list/project_project_list_controller.js
+++ b/addons/project/static/src/views/project_project_list/project_project_list_controller.js
@@ -5,7 +5,6 @@ import { user } from "@web/core/user";
 import { ProjectTemplateDropdown } from "../components/project_template_dropdown";
 
 export class ProjectListController extends ListController {
-    static template = "project.ProjectListView";
     static components = {
         ...ListController.components,
         ProjectTemplateDropdown,
diff --git a/addons/project/static/src/views/project_project_list/project_project_list_controller.xml b/addons/project/static/src/views/project_project_list/project_project_list_controller.xml
index 4c99908be6b63..0b1953b5f0de4 100644
--- a/addons/project/static/src/views/project_project_list/project_project_list_controller.xml
+++ b/addons/project/static/src/views/project_project_list/project_project_list_controller.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="project.ProjectListView" t-inherit="web.ListView" t-inherit-mode="primary">
+    <t t-name="project.ProjectListView.Buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary">
         <button class="btn btn-primary o_list_button_add" position="replace">
-            <ProjectTemplateDropdown t-if="!editedRecord and activeActions.create and props.showButtons"
+            <ProjectTemplateDropdown t-if="!env.inDialog and !editedRecord and activeActions.create"
                 onCreate="() => this.onClickCreate()"
                 newButtonClasses="'btn btn-primary o_list_button_add'"
                 context="props.context"
diff --git a/addons/project/static/src/views/project_project_list/project_project_list_view.js b/addons/project/static/src/views/project_project_list/project_project_list_view.js
index 4196095a71d45..015909e2b0b03 100644
--- a/addons/project/static/src/views/project_project_list/project_project_list_view.js
+++ b/addons/project/static/src/views/project_project_list/project_project_list_view.js
@@ -9,6 +9,7 @@ export const projectProjectListView = {
     Renderer: ProjectProjectListRenderer,
     Controller: ProjectListController,
     Model: ProjectRelationalModel,
+    buttonTemplate: "project.ProjectListView.Buttons",
 };
 
 registry.category("views").add("project_project_list", projectProjectListView);
diff --git a/addons/project/static/src/views/project_task_form/project_task_form_controller.js b/addons/project/static/src/views/project_task_form/project_task_form_controller.js
index b7132d6bc1f67..7f9ee0b17266b 100644
--- a/addons/project/static/src/views/project_task_form/project_task_form_controller.js
+++ b/addons/project/static/src/views/project_task_form/project_task_form_controller.js
@@ -16,7 +16,6 @@ Are you sure you want to proceed?`
 );
 
 export class ProjectTaskFormController extends FormControllerWithHTMLExpander {
-    static template = "project.ProjectTaskFormView";
     static components = {
         ...FormControllerWithHTMLExpander.components,
         ProjectTaskTemplateDropdown,
diff --git a/addons/project/static/src/views/project_task_form/project_task_form_controller.xml b/addons/project/static/src/views/project_task_form/project_task_form_controller.xml
index 272a9ce75cc3c..3b8dcda090562 100644
--- a/addons/project/static/src/views/project_task_form/project_task_form_controller.xml
+++ b/addons/project/static/src/views/project_task_form/project_task_form_controller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="project.ProjectTaskFormView" t-inherit="resource.FormViewWithHtmlExpander" t-inherit-mode="primary">
+    <t t-name="project.ProjectTaskFormView.Buttons" t-inherit="web.FormView.Buttons" t-inherit-mode="primary">
         <button class="btn btn-outline-primary o_form_button_create" position="replace">
             <ProjectTaskTemplateDropdown t-if="canCreate"
                 projectId="props.context.default_project_id"
diff --git a/addons/project/static/src/views/project_task_form/project_task_form_view.js b/addons/project/static/src/views/project_task_form/project_task_form_view.js
index e9b53f5ac89dd..b80544b902fff 100644
--- a/addons/project/static/src/views/project_task_form/project_task_form_view.js
+++ b/addons/project/static/src/views/project_task_form/project_task_form_view.js
@@ -5,6 +5,7 @@ import { ProjectTaskFormController } from "./project_task_form_controller";
 export const projectTaskFormView = {
     ...formViewWithHtmlExpander,
     Controller: ProjectTaskFormController,
+    buttonTemplate: "project.ProjectTaskFormView.Buttons",
 };
 
 registry.category("views").add("project_task_form", projectTaskFormView);
diff --git a/addons/project/static/src/views/project_task_kanban/project_task_kanban_controller.xml b/addons/project/static/src/views/project_task_kanban/project_task_kanban_controller.xml
index 247e66b8aa967..6310871616819 100644
--- a/addons/project/static/src/views/project_task_kanban/project_task_kanban_controller.xml
+++ b/addons/project/static/src/views/project_task_kanban/project_task_kanban_controller.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="project.ProjectTaskKanbanView" t-inherit="web.KanbanView" t-inherit-mode="primary">
+    <t t-name="project.ProjectTaskKanbanView.Buttons" t-inherit="web.KanbanView.Buttons" t-inherit-mode="primary">
         <button class="btn btn-primary o-kanban-button-new" position="replace">
-            <ProjectTaskTemplateDropdown t-if="canCreate and props.showButtons"
+            <ProjectTaskTemplateDropdown t-if="canCreate"
                 projectId="props.context.default_project_id"
                 onCreate="() => this.createRecord()"
                 newButtonClasses="'btn btn-primary o-kanban-button-new'"
                 context="props.context"
             />
         </button>
+    </t>
+    <t t-name="project.ProjectTaskKanbanView" t-inherit="web.KanbanView" t-inherit-mode="primary">
         <t t-component="props.Renderer" position="attributes">
             <attribute name="hideKanbanStagesNocontent">hideKanbanStagesNocontent</attribute>
         </t>
diff --git a/addons/project/static/src/views/project_task_kanban/project_task_kanban_view.js b/addons/project/static/src/views/project_task_kanban/project_task_kanban_view.js
index b0c74f576f5c1..b3417b8ae199f 100644
--- a/addons/project/static/src/views/project_task_kanban/project_task_kanban_view.js
+++ b/addons/project/static/src/views/project_task_kanban/project_task_kanban_view.js
@@ -12,6 +12,7 @@ export const projectTaskKanbanView = {
     Model: ProjectTaskKanbanModel,
     Renderer: ProjectTaskKanbanRenderer,
     Controller: ProjectTaskKanbanController,
+    buttonTemplate: "project.ProjectTaskKanbanView.Buttons",
 };
 
 registry.category('views').add('project_task_kanban', projectTaskKanbanView);
diff --git a/addons/project/static/src/views/project_task_list/project_task_list_controller.js b/addons/project/static/src/views/project_task_list/project_task_list_controller.js
index 67fd35411d42c..c63b08787415f 100644
--- a/addons/project/static/src/views/project_task_list/project_task_list_controller.js
+++ b/addons/project/static/src/views/project_task_list/project_task_list_controller.js
@@ -4,7 +4,6 @@ import { subTaskDeleteConfirmationMessage } from "@project/views/project_task_fo
 import { ProjectTaskTemplateDropdown } from "../components/project_task_template_dropdown";
 
 export class ProjectTaskListController extends ListController {
-    static template = "project.ProjectTaskListView";
     static components = {
         ...ListController.components,
         ProjectTaskTemplateDropdown,
diff --git a/addons/project/static/src/views/project_task_list/project_task_list_controller.xml b/addons/project/static/src/views/project_task_list/project_task_list_controller.xml
index 9c667e612b7a0..1c3d7e423d3a8 100644
--- a/addons/project/static/src/views/project_task_list/project_task_list_controller.xml
+++ b/addons/project/static/src/views/project_task_list/project_task_list_controller.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="project.ProjectTaskListView" t-inherit="web.ListView" t-inherit-mode="primary">
+    <t t-name="project.ProjectTaskListView.Buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary">
         <button class="btn btn-primary o_list_button_add" position="replace">
-            <ProjectTaskTemplateDropdown t-if="!editedRecord and activeActions.create and props.showButtons"
+            <ProjectTaskTemplateDropdown t-if="!editedRecord and activeActions.create"
                 projectId="props.context.default_project_id"
                 onCreate="() =&gt; this.onClickCreate()"
                 newButtonClasses="'btn btn-primary o_list_button_add'"
diff --git a/addons/project/static/src/views/project_task_list/project_task_list_view.js b/addons/project/static/src/views/project_task_list/project_task_list_view.js
index 49f4b15b5205b..7c8574ecb0437 100644
--- a/addons/project/static/src/views/project_task_list/project_task_list_view.js
+++ b/addons/project/static/src/views/project_task_list/project_task_list_view.js
@@ -11,6 +11,7 @@ export const projectTaskListView = {
     Controller: ProjectTaskListController,
     Model: ProjectTaskRelationalModel,
     Renderer: ProjectTaskListRenderer,
+    buttonTemplate: "project.ProjectTaskListView.Buttons",
 };
 
 registry.category("views").add("project_task_list", projectTaskListView);
diff --git a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml
index 04b1e591a60fd..a81a215aeef7f 100644
--- a/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml
+++ b/addons/spreadsheet_dashboard/static/src/bundle/dashboard_action/dashboard_action.xml
@@ -2,7 +2,7 @@
 <templates>
     <div t-name="spreadsheet_dashboard.DashboardAction" class="o_action o_spreadsheet_dashboard_action o_field_highlight">
         <ControlPanel display="controlPanelDisplay">
-            <t t-set-slot="layout-actions" t-if="!loader.getActiveDashboard()?.isSample">
+            <t t-set-slot="control-panel-actions" t-if="!loader.getActiveDashboard()?.isSample">
                 <t t-set="status" t-value="loader.getActiveDashboard() and loader.getActiveDashboard().status"/>
                 <div class="d-flex flex-wrap w-100">
                     <DashboardSearchBar t-if="status === Status.Loaded and loader.getActiveDashboard().model.getters.getGlobalFilters().length"
diff --git a/addons/stock/static/src/client_actions/stock_traceability_report_backend.xml b/addons/stock/static/src/client_actions/stock_traceability_report_backend.xml
index 14f330edf06e6..b4129227f5b14 100644
--- a/addons/stock/static/src/client_actions/stock_traceability_report_backend.xml
+++ b/addons/stock/static/src/client_actions/stock_traceability_report_backend.xml
@@ -4,7 +4,7 @@
     <t t-name="stock.TraceabilityReport">
         <div class="o_action">
             <Layout display="display">
-                <t t-set-slot="layout-buttons">
+                <t t-set-slot="control-panel-buttons">
                     <div class="o_cp_buttons" role="toolbar" aria-label="Control panel buttons" t-ref="buttons">
                         <button type="button" class="btn btn-primary" t-on-click="() => this.onClickPrint()">Print</button>
                     </div>
diff --git a/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml b/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml
index 17336df3aa864..e30242a5561aa 100644
--- a/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml
+++ b/addons/stock/static/src/components/reception_report_main/stock_reception_report_main.xml
@@ -3,7 +3,7 @@
 
     <div t-name="stock.ReceptionReportMain" class="o_action">
         <ControlPanel display="controlPanelDisplay">
-            <t t-set-slot="control-panel-always-buttons">
+            <t t-set-slot="control-panel-buttons">
                 <button t-on-click="onClickPrint" type="button" class="btn btn-primary" title="Print">Print</button>
                 <button t-on-click="onClickAssignAll" class="btn btn-secondary" t-att-disabled="isAssignAllDisabled">Assign All</button>
                 <button t-on-click="onClickPrintLabels" class="btn btn-secondary" t-att-disabled="isPrintLabelDisabled">Print Labels</button>
diff --git a/addons/stock/static/src/stock_forecasted/stock_forecasted.xml b/addons/stock/static/src/stock_forecasted/stock_forecasted.xml
index e43165f589af4..1058016778eee 100644
--- a/addons/stock/static/src/stock_forecasted/stock_forecasted.xml
+++ b/addons/stock/static/src/stock_forecasted/stock_forecasted.xml
@@ -2,10 +2,10 @@
 <templates id="template" xml:space="preserve">
     <div t-name="stock.Forecasted" class="o_action o_stock_forecast">
         <ControlPanel>
-            <t t-set-slot="layout-buttons">
+            <t t-set-slot="control-panel-buttons">
                 <ForecastedButtons action="props.action" reloadReport.bind="reloadReport" resModel="resModel"/>
             </t>
-            <t t-set-slot="layout-actions">
+            <t t-set-slot="control-panel-actions">
                 <div class="btn-group o_search_options position-static" role="search">
                     <ForecastedWarehouseFilter action="props.action" warehouses="warehouses" setWarehouseInContext.bind="updateWarehouse"/>
                 </div>
diff --git a/addons/stock_account/static/src/stock_valuation/stock_valuation_report.xml b/addons/stock_account/static/src/stock_valuation/stock_valuation_report.xml
index e1f335d01a2fa..edf3d120d68ab 100644
--- a/addons/stock_account/static/src/stock_valuation/stock_valuation_report.xml
+++ b/addons/stock_account/static/src/stock_valuation/stock_valuation_report.xml
@@ -4,7 +4,7 @@
         <div class="o_action account_report">
             <ControlPanel>
                 <!-- Buttons bar -->
-                <t t-set-slot="control-panel-create-button">
+                <t t-set-slot="control-panel-buttons">
                     <StockValuationReportButtonsBar/>
                 </t>
                 <!-- <t t-set-slot="control-panel-additional-actions">
@@ -12,7 +12,7 @@
                 </t> -->
 
                 <!-- Filters -->
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                    <div class="d-flex gap-1 flex-wrap">
                        <StockValuationReportFilters/>
                    </div>
diff --git a/addons/web/static/src/search/control_panel/control_panel.js b/addons/web/static/src/search/control_panel/control_panel.js
index ffba124d53ea3..6246a564a63c6 100644
--- a/addons/web/static/src/search/control_panel/control_panel.js
+++ b/addons/web/static/src/search/control_panel/control_panel.js
@@ -301,7 +301,7 @@ export class ControlPanel extends Component {
      */
     get display() {
         return {
-            layoutActions: true,
+            controlPanelActions: true,
             ...this.props.display,
         };
     }
diff --git a/addons/web/static/src/search/control_panel/control_panel.xml b/addons/web/static/src/search/control_panel/control_panel.xml
index 056d527b9162e..bd992a47d1faa 100644
--- a/addons/web/static/src/search/control_panel/control_panel.xml
+++ b/addons/web/static/src/search/control_panel/control_panel.xml
@@ -22,17 +22,13 @@
             <div class="o_control_panel_main d-flex flex-wrap flex-lg-nowrap justify-content-between align-items-lg-start gap-2 gap-lg-3 flex-grow-1">
                 <div class="o_control_panel_breadcrumbs d-flex align-items-center gap-1 order-0 h-lg-100">
                     <div class="o_control_panel_main_buttons d-flex gap-1 d-empty-none d-print-none" t-on-keydown="onMainButtonsKeydown">
-                        <t t-slot="control-panel-create-button"/>
-                        <t t-slot="layout-buttons"/>
-                        <t t-slot="control-panel-always-buttons"/>
+                        <t t-slot="control-panel-buttons"/>
                         <Dropdown t-if="env.isSmall" menuClass="'o-control-panel-adaptive-dropdown'" onOpened.bind="dropdownifyButtons">
                             <button class="btn btn-secondary o-control-panel-adaptive-dropdown" title="More">
                                 <i class="oi oi-fw oi-ellipsis-v" />
                             </button>
                             <t t-set-slot="content">
-                                <t t-slot="control-panel-create-button"/>
-                                <t t-slot="layout-buttons"/>
-                                <t t-slot="control-panel-always-buttons"/>
+                                <t t-slot="control-panel-buttons"/>
                             </t>
                         </Dropdown>
                     </div>
@@ -73,7 +69,7 @@
                 </div>
 
                 <div class="o_control_panel_actions d-empty-none d-flex align-items-center justify-content-start justify-content-lg-around order-2 order-lg-1 w-100 mw-100 w-lg-auto">
-                    <t t-if="display.layoutActions" t-slot="layout-actions"/>
+                    <t t-if="display.controlPanelActions" t-slot="control-panel-actions"/>
                     <t t-slot="control-panel-selection-actions"/>
                 </div>
 
diff --git a/addons/web/static/src/search/layout.js b/addons/web/static/src/search/layout.js
index b85d858ec3628..fa169448b6c52 100644
--- a/addons/web/static/src/search/layout.js
+++ b/addons/web/static/src/search/layout.js
@@ -31,7 +31,7 @@ export class Layout extends Component {
     get controlPanelSlots() {
         const slots = { ...this.props.slots };
         if (this.env.inDialog) {
-            delete slots["layout-buttons"];
+            delete slots["control-panel-buttons"];
         }
         delete slots.default;
         return slots;
diff --git a/addons/web/static/src/search/layout.xml b/addons/web/static/src/search/layout.xml
index e8f24a0070917..1ebd3374f7089 100644
--- a/addons/web/static/src/search/layout.xml
+++ b/addons/web/static/src/search/layout.xml
@@ -3,7 +3,7 @@
 
     <t t-name="web.Layout">
         <t t-if="env.inDialog" t-portal="'#' + env.dialogId + ' .modal-footer'">
-            <t t-slot="layout-buttons"/>
+            <t t-slot="control-panel-buttons"/>
         </t>
         <t t-component="components.ControlPanel" slots="controlPanelSlots" t-if="props.display.controlPanel" display="props.display.controlPanel"/>
         <main t-ref="content" class="o_content" t-attf-class="{{props.className}}" t-att-class="{ 'o_component_with_search_panel': props.display.searchPanel }">
diff --git a/addons/web/static/src/views/calendar/calendar_controller.xml b/addons/web/static/src/views/calendar/calendar_controller.xml
index f2bc79bdc1493..2dcaac5cc104c 100644
--- a/addons/web/static/src/views/calendar/calendar_controller.xml
+++ b/addons/web/static/src/views/calendar/calendar_controller.xml
@@ -7,10 +7,10 @@
                 <t t-set-slot="control-panel-additional-actions">
                     <CogMenu/>
                 </t>
-                <t t-set-slot="layout-buttons">
+                <t t-set-slot="control-panel-buttons">
                     <t t-call="{{ props.buttonTemplate }}"/>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar toggler="searchBarToggler"/>
                 </t>
                 <t t-set-slot="control-panel-navigation-additional">
diff --git a/addons/web/static/src/views/form/form_controller.js b/addons/web/static/src/views/form/form_controller.js
index a793f0a1330e5..b784c76cb173d 100644
--- a/addons/web/static/src/views/form/form_controller.js
+++ b/addons/web/static/src/views/form/form_controller.js
@@ -145,6 +145,7 @@ export class FormController extends Component {
         Compiler: Function,
         archInfo: Object,
         buttonTemplate: String,
+        buttonDialogTemplate: String,
         preventCreate: { type: Boolean, optional: true },
         preventEdit: { type: Boolean, optional: true },
         onDiscard: { type: Function, optional: true },
diff --git a/addons/web/static/src/views/form/form_controller.xml b/addons/web/static/src/views/form/form_controller.xml
index 0df5fdaaeca0d..3270b7a45451e 100644
--- a/addons/web/static/src/views/form/form_controller.xml
+++ b/addons/web/static/src/views/form/form_controller.xml
@@ -5,26 +5,21 @@
         <div t-att-class="className" t-ref="root">
             <div class="o_form_view_container">
                 <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                    <t t-set-slot="control-panel-create-button">
-                        <button t-if="canCreate" type="button" class="btn btn-outline-primary o_form_button_create" data-hotkey="c" t-on-click.stop="create">New</button>
-                    </t>
-
-                    <t t-set-slot="layout-buttons">
+                    <t t-set-slot="control-panel-buttons">
                         <t t-if="env.inDialog">
                             <t t-if="footerArchInfo">
                                 <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="footerArchInfo">
                                     <t t-set-slot="default_buttons">
-                                        <t t-call="{{ props.buttonTemplate }}"/>
+                                        <t t-call="{{ props.buttonDialogTemplate }}"/>
                                     </t>
                                 </t>
                             </t>
-                            <t t-else="">
-                                <t t-call="{{ props.buttonTemplate }}"/>
-                            </t>
+                            <t t-else="" t-call="{{ props.buttonDialogTemplate }}"/>
                         </t>
+                        <t t-else="" t-call="{{ props.buttonTemplate }}"/>
                     </t>
 
-                    <t t-set-slot="layout-actions">
+                    <t t-set-slot="control-panel-actions">
                         <t t-if="!env.isSmall and buttonBoxTemplate">
                             <t t-call="{{ buttonBoxTemplate }}" t-call-context="{ __comp__: Object.assign(Object.create(this), { this, props: { ...this.props, record: this.model.root } }) }"/>
                         </t>
@@ -49,7 +44,7 @@
         </div>
     </t>
 
-    <t t-name="web.FormView.Buttons">
+    <t t-name="web.FormView.DialogButtons">
         <button t-if="model.root.isInEdition" type="button" class="btn btn-primary o_form_button_save" data-hotkey="s" t-on-click.stop="() => this.saveButtonClicked({closable: true})">
             Save
         </button>
@@ -64,6 +59,10 @@
         </button>
     </t>
 
+    <t t-name="web.FormView.Buttons">
+        <button t-if="canCreate" type="button" class="btn btn-outline-primary o_form_button_create" data-hotkey="c" t-on-click.stop="create">New</button>
+    </t>
+
     <t t-name="web.DefaultButtonsSlot">
         <t t-slot="default_buttons"></t>
     </t>
diff --git a/addons/web/static/src/views/form/form_view.js b/addons/web/static/src/views/form/form_view.js
index 70ed423258bc0..4939380ef3d90 100644
--- a/addons/web/static/src/views/form/form_view.js
+++ b/addons/web/static/src/views/form/form_view.js
@@ -14,6 +14,7 @@ export const formView = {
     Model: RelationalModel,
     Compiler: FormCompiler,
     buttonTemplate: "web.FormView.Buttons",
+    buttonDialogTemplate: "web.FormView.DialogButtons",
 
     props: (genericProps, view) => {
         const { ArchParser } = view;
@@ -28,6 +29,7 @@ export const formView = {
             Model: view.Model,
             Renderer: view.Renderer,
             buttonTemplate: genericProps.buttonTemplate || view.buttonTemplate,
+            buttonDialogTemplate: genericProps.buttonDialogTemplate || view.buttonDialogTemplate,
             Compiler: view.Compiler,
             archInfo,
         };
diff --git a/addons/web/static/src/views/graph/graph_controller.xml b/addons/web/static/src/views/graph/graph_controller.xml
index 10b1aab9810db..f86162325379e 100644
--- a/addons/web/static/src/views/graph/graph_controller.xml
+++ b/addons/web/static/src/views/graph/graph_controller.xml
@@ -57,7 +57,7 @@
                 <t t-set-slot="control-panel-additional-actions">
                     <CogMenu/>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar toggler="searchBarToggler"/>
                 </t>
                 <t t-set-slot="control-panel-navigation-additional">
diff --git a/addons/web/static/src/views/kanban/kanban_controller.js b/addons/web/static/src/views/kanban/kanban_controller.js
index 2248f2b56c7ba..f17c854c9c3aa 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.js
+++ b/addons/web/static/src/views/kanban/kanban_controller.js
@@ -267,7 +267,7 @@ export class KanbanController extends Component {
             ...this.props.display,
             controlPanel: {
                 ...controlPanel,
-                layoutActions: !this.hasSelectedRecords,
+                controlPanelActions: !this.hasSelectedRecords,
             },
         };
     }
diff --git a/addons/web/static/src/views/kanban/kanban_controller.xml b/addons/web/static/src/views/kanban/kanban_controller.xml
index db652ab4f618b..df3815b2bba29 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.xml
+++ b/addons/web/static/src/views/kanban/kanban_controller.xml
@@ -4,15 +4,8 @@
     <t t-name="web.KanbanView">
         <div t-attf-class="{{ className }} {{ hasSelectedRecords ? 'o_kanban_selection_active' : 'o_kanban_selection_available' }}" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                <t t-set-slot="control-panel-create-button">
-                    <button t-if="canCreate and props.showButtons" type="button" t-att-disabled="isNewButtonDisabled" class="btn btn-primary o-kanban-button-new" accesskey="c" t-on-click="() => this.createRecord()" data-bounce-button="">
-                        New
-                    </button>
-                </t>
-                <t t-set-slot="layout-buttons">
-                    <t t-if="props.showButtons" t-call="{{ props.buttonTemplate }}"/>
-                </t>
-                <t t-set-slot="control-panel-always-buttons">
+                <t t-if="props.showButtons" t-set-slot="control-panel-buttons">
+                    <t t-call="{{ props.buttonTemplate }}"/>
                     <t t-foreach="headerButtons" t-as="button" t-key="button.id" t-if="!evalViewModifier(button.invisible)">
                         <MultiRecordViewButton
                             t-if="button.display === 'always'"
@@ -73,7 +66,7 @@
                         </t>
                     </CogMenu>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar toggler="searchBarToggler" autofocus="firstLoad"/>
                 </t>
                 <t t-set-slot="control-panel-navigation-additional">
@@ -97,6 +90,10 @@
         </div>
     </t>
 
-    <t t-name="web.KanbanView.Buttons"/>
+    <t t-name="web.KanbanView.Buttons">
+        <button t-if="!env.inDialog and canCreate" type="button" t-att-disabled="isNewButtonDisabled" class="btn btn-primary o-kanban-button-new" accesskey="c" t-on-click="() => this.createRecord()" data-bounce-button="">
+            New
+        </button>
+    </t>
 
 </templates>
diff --git a/addons/web/static/src/views/list/list_controller.js b/addons/web/static/src/views/list/list_controller.js
index 061cf51326082..3fa8b6307b57f 100644
--- a/addons/web/static/src/views/list/list_controller.js
+++ b/addons/web/static/src/views/list/list_controller.js
@@ -501,7 +501,7 @@ export class ListController extends Component {
             ...this.props.display,
             controlPanel: {
                 ...controlPanel,
-                layoutActions: !this.hasSelectedRecords,
+                controlPanelActions: !this.hasSelectedRecords,
             },
         };
     }
diff --git a/addons/web/static/src/views/list/list_controller.xml b/addons/web/static/src/views/list/list_controller.xml
index 87ae8193c91f7..fa258dc06a6e7 100644
--- a/addons/web/static/src/views/list/list_controller.xml
+++ b/addons/web/static/src/views/list/list_controller.xml
@@ -4,18 +4,8 @@
     <t t-name="web.ListView">
         <div t-att-class="className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                <t t-set-slot="control-panel-create-button">
-                    <button t-if="!editedRecord and activeActions.create and props.showButtons" type="button" class="btn btn-primary o_list_button_add" data-hotkey="c" t-on-click="onClickCreate" data-bounce-button="">
-                        New
-                    </button>
-                    <t t-if="props.showButtons and !env.inDialog" t-call="web.ListView.EditableButtons"/>
-                </t>
-
-                <t t-set-slot="layout-buttons">
-                    <t t-if="props.showButtons and env.inDialog" t-call="web.ListView.EditableButtons"/>
-                    <t t-if="props.showButtons" t-call="{{ props.buttonTemplate }}"/>
-                </t>
-                <t t-set-slot="control-panel-always-buttons">
+                <t t-if="props.showButtons" t-set-slot="control-panel-buttons">
+                    <t t-call="{{ props.buttonTemplate }}"/>
                     <t t-foreach="archInfo.headerButtons" t-as="button" t-key="button.id" t-if="!evalViewModifier(button.invisible)">
                         <MultiRecordViewButton
                             t-if="button.display === 'always'"
@@ -32,7 +22,7 @@
                     </t>
                 </t>
 
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar toggler="searchBarToggler" autofocus="firstLoad"/>
                 </t>
                 <t t-set-slot="control-panel-navigation-additional">
@@ -102,9 +92,10 @@
         </div>
     </t>
 
-    <t t-name="web.ListView.Buttons"/>
-
-    <t t-name="web.ListView.EditableButtons">
+    <t t-name="web.ListView.Buttons">
+        <button t-if="!env.inDialog and !editedRecord and activeActions.create" type="button" class="btn btn-primary o_list_button_add" data-hotkey="c" t-on-click="onClickCreate" data-bounce-button="">
+            New
+        </button>
         <button t-if="editedRecord" type="button" class="btn btn-primary o_list_button_save" data-hotkey="s" t-on-click.stop="onClickSave">
             Save
         </button>
diff --git a/addons/web/static/src/views/pivot/pivot_controller.xml b/addons/web/static/src/views/pivot/pivot_controller.xml
index 152e3b88f670f..528e1b727c04c 100644
--- a/addons/web/static/src/views/pivot/pivot_controller.xml
+++ b/addons/web/static/src/views/pivot/pivot_controller.xml
@@ -25,7 +25,7 @@
                 <t t-set-slot="control-panel-additional-actions">
                     <CogMenu/>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar toggler="searchBarToggler"/>
                 </t>
                 <t t-set-slot="control-panel-navigation-additional">
diff --git a/addons/web/static/src/views/view_dialogs/form_view_dialog.js b/addons/web/static/src/views/view_dialogs/form_view_dialog.js
index ce109be37bbba..cc0d1584558eb 100644
--- a/addons/web/static/src/views/view_dialogs/form_view_dialog.js
+++ b/addons/web/static/src/views/view_dialogs/form_view_dialog.js
@@ -44,7 +44,7 @@ export class FormViewDialog extends Component {
         this.modalRef = useChildRef();
         this.env.dialogData.dismiss = () => this.discardRecord();
 
-        const buttonTemplate = this.props.isToMany
+        const buttonDialogTemplate = this.props.isToMany
             ? "web.FormViewDialog.ToMany.buttons"
             : "web.FormViewDialog.ToOne.buttons";
 
@@ -56,7 +56,7 @@ export class FormViewDialog extends Component {
 
         this.viewProps = {
             type: "form",
-            buttonTemplate,
+            buttonDialogTemplate,
 
             context: this.props.context || {},
             display: { controlPanel: false },
diff --git a/addons/web/static/src/views/view_dialogs/form_view_dialog.xml b/addons/web/static/src/views/view_dialogs/form_view_dialog.xml
index f3d297d2cd6f1..c4f2764ddecec 100644
--- a/addons/web/static/src/views/view_dialogs/form_view_dialog.xml
+++ b/addons/web/static/src/views/view_dialogs/form_view_dialog.xml
@@ -15,14 +15,14 @@
     </Dialog>
   </t>
 
-  <t t-name="web.FormViewDialog.ToMany.buttons" t-inherit="web.FormView.Buttons">
+  <t t-name="web.FormViewDialog.ToMany.buttons" t-inherit="web.FormView.DialogButtons">
     <xpath expr="//button[hasclass('o_form_button_save')]" position="replace">
       <button class="btn btn-primary o_form_button_save" t-on-click="saveButtonClicked" data-hotkey="c">Save</button>
       <button t-if="!env.isSmall" class="btn btn-primary o_form_button_save_new" t-on-click="() => this.saveButtonClicked({saveAndNew: true})" data-hotkey="n">Save &amp; New</button>
     </xpath>
   </t>
 
-  <t t-name="web.FormViewDialog.ToOne.buttons" t-inherit="web.FormView.Buttons">
+  <t t-name="web.FormViewDialog.ToOne.buttons" t-inherit="web.FormView.DialogButtons">
     <xpath expr="//button[hasclass('o_form_button_save')]" position="replace">
       <button class="btn btn-primary o_form_button_save" t-on-click="saveButtonClicked" data-hotkey="c">Save</button>
     </xpath>
diff --git a/addons/web/static/src/webclient/actions/blank_component.xml b/addons/web/static/src/webclient/actions/blank_component.xml
index 5a366459d5f2c..45eb9d3cab010 100644
--- a/addons/web/static/src/webclient/actions/blank_component.xml
+++ b/addons/web/static/src/webclient/actions/blank_component.xml
@@ -2,7 +2,7 @@
 <templates>
 <t t-name="web.BlankComponent">
     <ControlPanel display="{disableDropdown: true}" t-if="props.withControlPanel and !env.isSmall">
-        <t t-set-slot="layout-buttons">
+        <t t-set-slot="control-panel-buttons">
             <button class="btn btn-primary invisible"> empty </button>
         </t>
     </ControlPanel>
diff --git a/addons/web/static/src/webclient/actions/reports/report_action.xml b/addons/web/static/src/webclient/actions/reports/report_action.xml
index abca8ef00b04c..f731d2103837f 100644
--- a/addons/web/static/src/webclient/actions/reports/report_action.xml
+++ b/addons/web/static/src/webclient/actions/reports/report_action.xml
@@ -4,7 +4,7 @@
     <t t-name="web.ReportAction">
         <div class="o_action">
             <Layout display="{ controlPanel: {} }">
-                <t t-set-slot="control-panel-create-button">
+                <t t-set-slot="control-panel-buttons">
                     <button t-on-click="print" type="button" class="btn btn-primary" title="Print">Print</button>
                 </t>
                 <iframe t-ref="iframe" t-on-load="onIframeLoaded" class="h-100 w-100 d-block" t-att-src="reportUrl" />
diff --git a/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml b/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml
index b7f3025de188c..309093e8463ab 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml
+++ b/addons/web/static/src/webclient/settings_form_view/settings_form_view.xml
@@ -4,8 +4,8 @@
         <xpath expr="./div[@t-ref='root']" position="attributes">
             <attribute name="class">o-settings-form-view o_field_highlight</attribute>
         </xpath>
-        <xpath expr="//Layout/t[@t-set-slot='layout-actions']" position="replace">
-            <t t-set-slot="layout-actions">
+        <xpath expr="//Layout/t[@t-set-slot='control-panel-actions']" position="replace">
+            <t t-set-slot="control-panel-actions">
                 <div class="o_cp_searchview d-flex w-100" role="search">
                     <div class="o_searchview form-control d-flex align-items-center py-1" role="search" aria-autocomplete="list">
                         <i class="o_searchview_icon oi oi-search me-2" role="img" aria-label="Search..." title="Search..." />
@@ -16,9 +16,9 @@
                 </div>
             </t>
         </xpath>
-        <xpath expr="//Layout/t[@t-set-slot='control-panel-create-button']" position="replace">
-            <t t-set-slot="control-panel-create-button">
-                <t t-call="{{ props.buttonTemplate }}"/>
+        <xpath expr="//Layout/t[@t-set-slot='control-panel-buttons']" position="replace">
+            <t t-set-slot="control-panel-buttons">
+                <t t-call="{{ props.buttonDialogTemplate }}"/>
             </t>
         </xpath>
         <xpath expr="//Layout/t[@t-set-slot='control-panel-status-indicator']" position="replace">
diff --git a/addons/web/static/tests/views/layout.test.js b/addons/web/static/tests/views/layout.test.js
index a4573f22284a5..039bcb739ce67 100644
--- a/addons/web/static/tests/views/layout.test.js
+++ b/addons/web/static/tests/views/layout.test.js
@@ -78,7 +78,7 @@ test(`Simple rendering: with search`, async () => {
         static props = ["*"];
         static template = xml`
             <Layout display="props.display">
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <div class="toy_search_bar"/>
                 </t>
                 <div class="toy_content"/>
@@ -114,7 +114,7 @@ test(`Rendering with default ControlPanel and SearchPanel`, async () => {
             });
             useSubEnv({ searchModel: this.searchModel });
             onWillStart(async () => {
-                await this.searchModel.load({ resModel: "foo" , searchViewId: false});
+                await this.searchModel.load({ resModel: "foo", searchViewId: false });
             });
         }
     }
@@ -162,7 +162,7 @@ test(`Nested layouts`, async () => {
         static props = ["*"];
         static template = xml`
             <Layout className="'toy_b'" display="props.display">
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <div class="toy_b_breadcrumbs"/>
                 </t>
                 <ToyC/>
@@ -184,7 +184,7 @@ test(`Nested layouts`, async () => {
         static props = ["*"];
         static template = xml`
             <Layout className="'toy_a'" display="props.display">
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <div class="toy_a_search"/>
                 </t>
                 <ToyB display="props.display"/>
@@ -266,13 +266,13 @@ test(`Custom search panel`, async () => {
 });
 
 test(`Simple rendering: with dynamically displayed search`, async () => {
-    const state = reactive({ displayLayoutActions: true });
+    const state = reactive({ displayControlPanelActions: true });
 
     class ToyComponent extends Component {
         static props = ["*"];
         static template = xml`
             <Layout display="display">
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <div class="toy_search_bar"/>
                 </t>
                 <div class="toy_content"/>
@@ -289,7 +289,7 @@ test(`Simple rendering: with dynamically displayed search`, async () => {
                 ...this.props.display,
                 controlPanel: {
                     ...this.props.display.controlPanel,
-                    layoutActions: this.state.displayLayoutActions,
+                    controlPanelActions: this.state.displayControlPanelActions,
                 },
             };
         }
@@ -304,7 +304,7 @@ test(`Simple rendering: with dynamically displayed search`, async () => {
     expect(`.o_cp_searchview`).toHaveCount(0);
     expect(`.o_content > .toy_content`).toHaveCount(1);
 
-    state.displayLayoutActions = false;
+    state.displayControlPanelActions = false;
     await animationFrame();
     expect(`.o_control_panel .o_control_panel_actions .toy_search_bar`).toHaveCount(0);
     expect(`.o_component_with_search_panel .o_search_panel`).toHaveCount(1);
diff --git a/addons/web_hierarchy/static/src/hierarchy_controller.xml b/addons/web_hierarchy/static/src/hierarchy_controller.xml
index 66900d72b8999..293a6fbdc064b 100644
--- a/addons/web_hierarchy/static/src/hierarchy_controller.xml
+++ b/addons/web_hierarchy/static/src/hierarchy_controller.xml
@@ -17,10 +17,10 @@
                 <t t-set-slot="control-panel-additional-actions">
                     <CogMenu/>
                 </t>
-                <t t-set-slot="layout-buttons">
+                <t t-set-slot="control-panel-buttons">
                     <t t-call="{{ props.buttonTemplate }}"/>
                 </t>
-                <t t-set-slot="layout-actions">
+                <t t-set-slot="control-panel-actions">
                     <SearchBar toggler="searchBarToggler"/>
                 </t>
                 <t t-set-slot="control-panel-navigation-additional">
diff --git a/addons/website/static/src/client_actions/website_dashboard/website_dashboard.xml b/addons/website/static/src/client_actions/website_dashboard/website_dashboard.xml
index 7d1d300058da3..89ba9cd367858 100644
--- a/addons/website/static/src/client_actions/website_dashboard/website_dashboard.xml
+++ b/addons/website/static/src/client_actions/website_dashboard/website_dashboard.xml
@@ -14,7 +14,7 @@
                     </t>
                 </div>
             </t>
-            <t t-set-slot="control-panel-create-button">
+            <t t-set-slot="control-panel-buttons">
                 <a role="button" href="/" class="btn btn-primary" title="Go to Website">
                     Go to Website
                 </a>
diff --git a/addons/website/static/src/components/views/theme_preview.xml b/addons/website/static/src/components/views/theme_preview.xml
index 4f47066fa7fbe..b3f1e0882465b 100644
--- a/addons/website/static/src/components/views/theme_preview.xml
+++ b/addons/website/static/src/components/views/theme_preview.xml
@@ -42,7 +42,7 @@
 
     <t t-name="website.ThemePreviewFormController" t-inherit="web.FormView" t-inherit-mode="primary">
         <xpath expr="//Layout" position="inside">
-            <t t-set-slot="layout-actions">
+            <t t-set-slot="control-panel-actions">
                 <ViewButton className="'btn btn-primary o_use_theme'"
                             clickParams="{type: 'object', name: 'button_choose_theme'}"
                             record="this.model.root">

From 8716002df25129cf347fd35823410be955dcd84d Mon Sep 17 00:00:00 2001
From: Pierre Paridans <app@odoo.com>
Date: Wed, 29 Oct 2025 09:47:33 +0100
Subject: [PATCH 478/673] [IMP] web: remove unused flag in BlankComponent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

task-4277543

Part-of: odoo/odoo#220325
Related: odoo/enterprise#90889
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 addons/web/static/src/webclient/actions/blank_component.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/webclient/actions/blank_component.xml b/addons/web/static/src/webclient/actions/blank_component.xml
index 45eb9d3cab010..817197cba5011 100644
--- a/addons/web/static/src/webclient/actions/blank_component.xml
+++ b/addons/web/static/src/webclient/actions/blank_component.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <templates>
 <t t-name="web.BlankComponent">
-    <ControlPanel display="{disableDropdown: true}" t-if="props.withControlPanel and !env.isSmall">
+    <ControlPanel t-if="props.withControlPanel and !env.isSmall">
         <t t-set-slot="control-panel-buttons">
             <button class="btn btn-primary invisible"> empty </button>
         </t>

From 9840dd2279916ced36421af7e1a49b88734f7098 Mon Sep 17 00:00:00 2001
From: Pierre Paridans <app@odoo.com>
Date: Thu, 30 Oct 2025 10:43:44 +0100
Subject: [PATCH 479/673] [REF] web: normalize ControlPanel conditional parts
 display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No more `showButtons` prop for kanban/list. Use the `display` object
instead.

task-4277543

closes odoo/odoo#220325

Related: odoo/enterprise#90889
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 .../web/static/src/search/control_panel/control_panel.js  | 8 +++++++-
 .../web/static/src/search/control_panel/control_panel.xml | 6 +++---
 addons/web/static/src/views/kanban/kanban_controller.js   | 4 +---
 addons/web/static/src/views/kanban/kanban_controller.xml  | 2 +-
 addons/web/static/src/views/list/list_controller.js       | 4 +---
 addons/web/static/src/views/list/list_controller.xml      | 2 +-
 .../static/src/views/view_dialogs/select_create_dialog.js | 3 +--
 addons/web/static/tests/views/layout.test.js              | 2 +-
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/search/control_panel/control_panel.js b/addons/web/static/src/search/control_panel/control_panel.js
index 6246a564a63c6..74bdcb375c3af 100644
--- a/addons/web/static/src/search/control_panel/control_panel.js
+++ b/addons/web/static/src/search/control_panel/control_panel.js
@@ -101,6 +101,12 @@ export class ControlPanel extends Component {
         display: { type: Object, optional: true },
         slots: { type: Object, optional: true },
     };
+    static defaultProps = {
+        display: {
+            actions: true,
+            buttons: true,
+        },
+    };
 
     setup() {
         this.actionService = useService("action");
@@ -301,7 +307,7 @@ export class ControlPanel extends Component {
      */
     get display() {
         return {
-            controlPanelActions: true,
+            ...this.constructor.defaultProps.display,
             ...this.props.display,
         };
     }
diff --git a/addons/web/static/src/search/control_panel/control_panel.xml b/addons/web/static/src/search/control_panel/control_panel.xml
index bd992a47d1faa..a1fd47e54c55f 100644
--- a/addons/web/static/src/search/control_panel/control_panel.xml
+++ b/addons/web/static/src/search/control_panel/control_panel.xml
@@ -22,13 +22,13 @@
             <div class="o_control_panel_main d-flex flex-wrap flex-lg-nowrap justify-content-between align-items-lg-start gap-2 gap-lg-3 flex-grow-1">
                 <div class="o_control_panel_breadcrumbs d-flex align-items-center gap-1 order-0 h-lg-100">
                     <div class="o_control_panel_main_buttons d-flex gap-1 d-empty-none d-print-none" t-on-keydown="onMainButtonsKeydown">
-                        <t t-slot="control-panel-buttons"/>
+                        <t t-if="display.buttons" t-slot="control-panel-buttons"/>
                         <Dropdown t-if="env.isSmall" menuClass="'o-control-panel-adaptive-dropdown'" onOpened.bind="dropdownifyButtons">
                             <button class="btn btn-secondary o-control-panel-adaptive-dropdown" title="More">
                                 <i class="oi oi-fw oi-ellipsis-v" />
                             </button>
                             <t t-set-slot="content">
-                                <t t-slot="control-panel-buttons"/>
+                                <t t-if="display.buttons" t-slot="control-panel-buttons"/>
                             </t>
                         </Dropdown>
                     </div>
@@ -69,7 +69,7 @@
                 </div>
 
                 <div class="o_control_panel_actions d-empty-none d-flex align-items-center justify-content-start justify-content-lg-around order-2 order-lg-1 w-100 mw-100 w-lg-auto">
-                    <t t-if="display.controlPanelActions" t-slot="control-panel-actions"/>
+                    <t t-if="display.actions" t-slot="control-panel-actions"/>
                     <t t-slot="control-panel-selection-actions"/>
                 </div>
 
diff --git a/addons/web/static/src/views/kanban/kanban_controller.js b/addons/web/static/src/views/kanban/kanban_controller.js
index f17c854c9c3aa..9520503db3d70 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.js
+++ b/addons/web/static/src/views/kanban/kanban_controller.js
@@ -56,7 +56,6 @@ export class KanbanController extends Component {
         forceGlobalClick: { type: Boolean, optional: true },
         onSelectionChanged: { type: Function, optional: true },
         readonly: { type: Boolean, optional: true },
-        showButtons: { type: Boolean, optional: true },
         Compiler: Function,
         Model: Function,
         Renderer: Function,
@@ -68,7 +67,6 @@ export class KanbanController extends Component {
         createRecord: () => {},
         forceGlobalClick: false,
         selectRecord: () => {},
-        showButtons: true,
     };
 
     setup() {
@@ -267,7 +265,7 @@ export class KanbanController extends Component {
             ...this.props.display,
             controlPanel: {
                 ...controlPanel,
-                controlPanelActions: !this.hasSelectedRecords,
+                actions: !this.hasSelectedRecords,
             },
         };
     }
diff --git a/addons/web/static/src/views/kanban/kanban_controller.xml b/addons/web/static/src/views/kanban/kanban_controller.xml
index df3815b2bba29..10d6c8ff7010c 100644
--- a/addons/web/static/src/views/kanban/kanban_controller.xml
+++ b/addons/web/static/src/views/kanban/kanban_controller.xml
@@ -4,7 +4,7 @@
     <t t-name="web.KanbanView">
         <div t-attf-class="{{ className }} {{ hasSelectedRecords ? 'o_kanban_selection_active' : 'o_kanban_selection_available' }}" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                <t t-if="props.showButtons" t-set-slot="control-panel-buttons">
+                <t t-set-slot="control-panel-buttons">
                     <t t-call="{{ props.buttonTemplate }}"/>
                     <t t-foreach="headerButtons" t-as="button" t-key="button.id" t-if="!evalViewModifier(button.invisible)">
                         <MultiRecordViewButton
diff --git a/addons/web/static/src/views/list/list_controller.js b/addons/web/static/src/views/list/list_controller.js
index 3fa8b6307b57f..e853bac95c4c1 100644
--- a/addons/web/static/src/views/list/list_controller.js
+++ b/addons/web/static/src/views/list/list_controller.js
@@ -54,7 +54,6 @@ export class ListController extends Component {
         allowSelectors: { type: Boolean, optional: true },
         onSelectionChanged: { type: Function, optional: true },
         readonly: { type: Boolean, optional: true },
-        showButtons: { type: Boolean, optional: true },
         allowOpenAction: { type: Boolean, optional: true },
         Model: Function,
         Renderer: Function,
@@ -65,7 +64,6 @@ export class ListController extends Component {
         allowSelectors: true,
         createRecord: () => {},
         selectRecord: () => {},
-        showButtons: true,
         allowOpenAction: true,
     };
 
@@ -501,7 +499,7 @@ export class ListController extends Component {
             ...this.props.display,
             controlPanel: {
                 ...controlPanel,
-                controlPanelActions: !this.hasSelectedRecords,
+                actions: !this.hasSelectedRecords,
             },
         };
     }
diff --git a/addons/web/static/src/views/list/list_controller.xml b/addons/web/static/src/views/list/list_controller.xml
index fa258dc06a6e7..4ed87dc12ebb6 100644
--- a/addons/web/static/src/views/list/list_controller.xml
+++ b/addons/web/static/src/views/list/list_controller.xml
@@ -4,7 +4,7 @@
     <t t-name="web.ListView">
         <div t-att-class="className" t-ref="root">
             <Layout className="model.useSampleModel ? 'o_view_sample_data' : ''" display="display">
-                <t t-if="props.showButtons" t-set-slot="control-panel-buttons">
+                <t t-set-slot="control-panel-buttons">
                     <t t-call="{{ props.buttonTemplate }}"/>
                     <t t-foreach="archInfo.headerButtons" t-as="button" t-key="button.id" t-if="!evalViewModifier(button.invisible)">
                         <MultiRecordViewButton
diff --git a/addons/web/static/src/views/view_dialogs/select_create_dialog.js b/addons/web/static/src/views/view_dialogs/select_create_dialog.js
index 739e27deceb44..9dac89d291eb0 100644
--- a/addons/web/static/src/views/view_dialogs/select_create_dialog.js
+++ b/addons/web/static/src/views/view_dialogs/select_create_dialog.js
@@ -49,10 +49,9 @@ export class SelectCreateDialog extends Component {
         const noContentHelp = this.props.noContentHelp || getDefaultNoContentHelp();
         this.busy = false; // flag used to ensure we only call once the onSelected/onUnselect props
         this.baseViewProps = {
-            display: { searchPanel: false },
+            display: { searchPanel: false, controlPanel: { buttons: false } },
             noBreadcrumbs: true,
             noContentHelp,
-            showButtons: false,
             selectRecord: (resId) => this.select([resId]),
             onSelectionChanged: (resIds) => {
                 this.state.resIds = resIds;
diff --git a/addons/web/static/tests/views/layout.test.js b/addons/web/static/tests/views/layout.test.js
index 039bcb739ce67..7748d0f920b42 100644
--- a/addons/web/static/tests/views/layout.test.js
+++ b/addons/web/static/tests/views/layout.test.js
@@ -289,7 +289,7 @@ test(`Simple rendering: with dynamically displayed search`, async () => {
                 ...this.props.display,
                 controlPanel: {
                     ...this.props.display.controlPanel,
-                    controlPanelActions: this.state.displayControlPanelActions,
+                    actions: this.state.displayControlPanelActions,
                 },
             };
         }

From 7a974fc16a161f7fadca9c451ff6d5038b0ff3ae Mon Sep 17 00:00:00 2001
From: prgo-odoo <prgo@odoo.com>
Date: Mon, 25 Aug 2025 18:14:36 +0530
Subject: [PATCH 480/673] [IMP] hr_holidays: default filter of active employee
 on allocations

Add Active Employees filter to allocations and set it as default to exclude
archived employees

task-5039208

closes odoo/odoo#224158

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_holidays/views/hr_leave_allocation_views.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/views/hr_leave_allocation_views.xml b/addons/hr_holidays/views/hr_leave_allocation_views.xml
index 13c2417715224..c9da028b18686 100644
--- a/addons/hr_holidays/views/hr_leave_allocation_views.xml
+++ b/addons/hr_holidays/views/hr_leave_allocation_views.xml
@@ -74,6 +74,9 @@
                 <filter name="approved_state" string="To Approve or Approved Allocations" invisible="1"
                     domain="[('state', 'in', ('confirm', 'validate'))]"/>
                 <separator/>
+                <filter string="Active Employees" name="active_employee" domain="[('active_employee', '=', True)]"/>
+                <filter string="Archived Employees" name="archived_employee" domain="[('active_employee', '=', False)]"/>
+                <separator/>
                 <group>
                     <filter name="group_employee" string="Employee" context="{'group_by':'employee_id'}"/>
                     <filter name="group_type" string="Type" context="{'group_by':'holiday_status_id'}"/>
@@ -591,7 +594,7 @@
         <field name="name">Allocations</field>
         <field name="res_model">hr.leave.allocation</field>
         <field name="view_mode">kanban,list,form,activity</field>
-        <field name="context">{'search_default_my_team': 1,'search_default_approve': 2}</field>
+        <field name="context">{'search_default_my_team': 1,'search_default_approve': 2, 'search_default_active_employee': 3}</field>
         <field name="domain">[]</field>
         <field name="search_view_id" ref="hr_holidays.hr_leave_allocation_view_search_manager"/>
         <field name="help" type="html">

From fb01c325ee3dc357af752f20d27a6ec351a21ec6 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Mon, 10 Nov 2025 14:34:26 +0530
Subject: [PATCH 481/673] [FIX] website: fix hoot test case for overlay buttons

The hoot test "The overlay buttons should be hidden when the toolbar is
open" was unstable due to timing issues. Both the overlay button and
the test used a 500 ms debounce, which sometimes caused the test to
check visibility too early.

This commit adds advance time of 550ms, ensuring the test skips time
long enough for the debounce to complete and making the test reliable.

runbot-233948

closes odoo/odoo#235076

Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 addons/website/static/tests/builder/overlay_buttons.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/tests/builder/overlay_buttons.test.js b/addons/website/static/tests/builder/overlay_buttons.test.js
index 8b6afbcaa33f0..06add6d63935c 100644
--- a/addons/website/static/tests/builder/overlay_buttons.test.js
+++ b/addons/website/static/tests/builder/overlay_buttons.test.js
@@ -1,7 +1,7 @@
 import { undo } from "@html_editor/../tests/_helpers/user_actions";
 import { Plugin } from "@html_editor/plugin";
 import { setContent, setSelection } from "@html_editor/../tests/_helpers/selection";
-import { animationFrame, expect, test } from "@odoo/hoot";
+import { advanceTime, animationFrame, expect, test } from "@odoo/hoot";
 import { Deferred, tick, waitFor } from "@odoo/hoot-dom";
 import { xml } from "@odoo/owl";
 import { contains } from "@web/../tests/web_test_helpers";
@@ -376,6 +376,6 @@ test("The overlay buttons should be hidden when the toolbar is open", async () =
     await waitFor(".o-we-toolbar:not(.o_overlay_options)");
     expect(".o-we-toolbar:not(.o_overlay_options)").toHaveCount(1);
     // Check that the overlay buttons are hidden.
-    await waitFor(".o-we-toolbar.o_overlay_options.d-none", { timeout: 500 });
+    await advanceTime(550); // wait for the toolbar hide delay
     expect(".o-we-toolbar.o_overlay_options.d-none").toHaveCount(1);
 });

From b8fc04b51c5f98b5da7cb635f59a891b2479240b Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Mon, 10 Nov 2025 15:26:53 +0100
Subject: [PATCH 482/673] [FIX] account: tests for `review_state` in community

The recent changes[^1] broken the test suite when `account_accountant`
is not installed or when `accountant` is not installed.

The check on `env.su` is needed because by default no user has
`account.group_account_user` by default, not even the cron user.

runbot-233950
runbot-233951

closes odoo/odoo#235131

Signed-off-by: John Laterre (jol) <jol@odoo.com>
---
 addons/account/models/account_move.py         | 4 +++-
 addons/account/tests/test_account_to_check.py | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 7f0033ffb5b7c..95d90956a87e0 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -3729,8 +3729,10 @@ def _get_copy_message_content(self, default):
         return _('This entry has been reversed from %s', self._get_html_link()) if default.get('reversed_entry_id') else _('This entry has been duplicated from %s', self._get_html_link())
 
     def _check_user_access(self, vals_list):
-        is_user_able_to_review = self.env.user.has_group('account.group_account_user')
+        if self.env.su:
+            return
         is_user_able_to_supervise = self.env.user.has_group('account.group_account_manager')
+        is_user_able_to_review = self.env.user.has_group('account.group_account_user')
         for vals in vals_list:
             if (
                 ((vals.get('review_state') == 'reviewed' or not vals.get('review_state', True)) and not is_user_able_to_review)
diff --git a/addons/account/tests/test_account_to_check.py b/addons/account/tests/test_account_to_check.py
index b5a8e62b38c27..a391bbc8b4f28 100644
--- a/addons/account/tests/test_account_to_check.py
+++ b/addons/account/tests/test_account_to_check.py
@@ -126,6 +126,8 @@ def test_post_move_auto_check_with_auto_post_monthly_sales_postreviewed(self):
         self.assertEqual(last_recurring.review_state, 'reviewed')
 
     def test_create_statement_line_auto_check(self):
+        if 'account_accountant' not in self.env["ir.module.module"]._installed():
+            self.skipTest('account_accountant is not installed')  # required for `_try_auto_reconcile_statement_lines`
         """Test if a user changes the reconciliation on a st_line, it marks the bank move as 'To Review'"""
         payment = self.env['account.payment'].create({
             'payment_type': 'inbound',

From 8a70d919d39f5ba10591931629a9a1d1002afff6 Mon Sep 17 00:00:00 2001
From: Ajit Singh <aksi@odoo.com>
Date: Sat, 1 Nov 2025 07:43:47 +0000
Subject: [PATCH 483/673] [FIX] web,test_orm: allow group by for property type
 tag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Step to reproduce:
- open crm and add a property tags field in a lead
- add that tags in few leads
- go to list view and group by that property tags field
- search for a lead (keep groupby as it is)

Observation:
- we receive a traceback

Cause:
- `formatter_property_tags` returns a list in case of tags field.
- these values are used as a key for dict in `_open_groups`, hence only
hashable values are allowed; list is not hashable

Fix:
- cast the list to tuple

opw-5188961

closes odoo/odoo#235126

X-original-commit: 231c727bba3ec0985eb613429e3caf45cf33f16c
Signed-off-by: Rémy Voet (ryv) <ryv@odoo.com>
---
 addons/web/models/models.py                   |  6 ++--
 .../src/model/relational_model/utils.js       |  3 ++
 odoo/addons/test_web/tests/test_properties.py | 31 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/addons/web/models/models.py b/addons/web/models/models.py
index 397513ad570c9..f6537022f1b9c 100644
--- a/addons/web/models/models.py
+++ b/addons/web/models/models.py
@@ -552,7 +552,7 @@ def _open_groups(
             fold = group.pop('__fold', False)
 
             groupby_value = group[groupby_spec]
-            # For relational/date/datetime field
+            # For relational/date/datetime/property tags field
             raw_groupby_value = groupby_value[0] if isinstance(groupby_value, tuple) else groupby_value
 
             limit = unfold_read_default_limit
@@ -1255,7 +1255,7 @@ def formatter_property_many2many(value):
 
         if property_type == 'tags':
             tags = definition.get('tags') or []
-            tags = {tag[0]: tag for tag in tags}
+            tags = {tag[0]: tuple(tag) for tag in tags}
 
             def formatter_property_tags(value):
                 if not value:
@@ -1263,7 +1263,7 @@ def formatter_property_tags(value):
                         Domain(fullname, 'not in', tag) for tag in tags
                     )] if tags else []
 
-                # replace tag raw value with list of raw value, label and color
+                # replace tag raw value with tuple of raw value, label and color
                 return tags.get(value), Domain(fullname, 'in', value)
 
             return formatter_property_tags
diff --git a/addons/web/static/src/model/relational_model/utils.js b/addons/web/static/src/model/relational_model/utils.js
index ef4e4bfd79fab..9f828f262073b 100644
--- a/addons/web/static/src/model/relational_model/utils.js
+++ b/addons/web/static/src/model/relational_model/utils.js
@@ -675,6 +675,9 @@ function getValueFromGroupData(field, rawValue) {
     if (field.type === "many2many") {
         return value ? value[0] : false;
     }
+    if (field.type === "tags") {
+        return value ? value[0] : false;
+    }
     return value;
 }
 
diff --git a/odoo/addons/test_web/tests/test_properties.py b/odoo/addons/test_web/tests/test_properties.py
index 15d3404d8d36a..c3f4195621f1d 100644
--- a/odoo/addons/test_web/tests/test_properties.py
+++ b/odoo/addons/test_web/tests/test_properties.py
@@ -515,6 +515,35 @@ def test_properties_field_web_read_group(self):
         # group False
         self.assertEqual(groups[2]['__records'], [{'id': self.message_4.id}])
 
+    def test_properties_tags_field_web_read_group(self):
+        self.discussion_1.attributes_definition = [
+            {
+                'name': 'my_tags',
+                'string': 'My Tags',
+                'type': 'tags',
+                'tags': [
+                    ('be', 'BE', 1),
+                    ('it', 'IT', 2),
+                ],
+                'default': ['be'],
+            },
+        ]
+        self.env['test_orm.message'].create(
+            {'discussion': self.discussion_1.id, 'author': self.user.id})
+
+        self.env.flush_all()
+        result = self.env['test_orm.message'].web_read_group(
+            domain=[],
+            aggregates=['__count'],
+            groupby=['attributes.my_tags'],
+            opening_info=[{'folded': True, 'value': '1'}],
+            unfold_read_specification={'id': {}},
+        )
+
+        self.assertEqual(len(result['groups']), 2)
+        self.assertEqual(result['groups'][0]['attributes.my_tags'], ('be', 'BE', 1))
+        self.assertEqual(result['groups'][1]['attributes.my_tags'], False)
+
     @mute_logger('odoo.fields')
     def test_properties_field_read_progress_bar(self):
         """Test "_read_progress_bar" with a properties field."""
@@ -1124,7 +1153,7 @@ def test_properties_field_read_group_tags(self):
         self.assertEqual(len(result), 6)
 
         all_tags = self.message_1.read(['attributes'])[0]['attributes'][0]['tags']
-        all_tags = {tag[0]: tag for tag in all_tags}
+        all_tags = {tag[0]: tuple(tag) for tag in all_tags}
 
         for group, (tag, count) in zip(result, (('a', 3), ('c', 1), ('d', 1), ('e', 2), ('g', 2))):
             self.assertEqual(group['attributes.mytags'], all_tags[tag])

From 290962a887712526442ccb37cfa3c709c54fc1fd Mon Sep 17 00:00:00 2001
From: "Julien Launois (jula)" <jula@odoo.com>
Date: Wed, 15 Oct 2025 15:46:18 +0000
Subject: [PATCH 484/673] [IMP] website: improve Google Fonts GDPR compliance
 with cookies bar

__Current behavior before commit:__
When the cookies bar is installed, Google fonts are still loaded from
Google servers by default, which may violate GDPR requirements.

See the PR adding the "Serve from Google"[1] option for more details.

__Description of the change:__
If the cookies bar is enabled, it likely means that the website needs to
be GDPR compliant. In this case the "Serve from Google" option is
disabled by default when adding a new Google Font, preventing it from
being served from Google servers.
The tooltip and setting help text are also updated to clarify GDPR
implications.

[1]: https://github.com/odoo/odoo/pull/101129

task-5111612

closes odoo/odoo#235155

X-original-commit: ffe8cdc1e36080aff9ef84cece09c69c72f6446d
Signed-off-by: Outagant Mehdi (mou) <mou@odoo.com>
Signed-off-by: Julien Launois (jula) <jula@odoo.com>
---
 .../website/static/src/builder/plugins/font/add_font_dialog.js  | 2 +-
 .../website/static/src/builder/plugins/font/add_font_dialog.xml | 2 +-
 addons/website/static/src/services/website_service.js           | 1 +
 addons/website/views/res_config_settings_views.xml              | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/website/static/src/builder/plugins/font/add_font_dialog.js b/addons/website/static/src/builder/plugins/font/add_font_dialog.js
index 1c6e57af3ceba..906ea546675f6 100644
--- a/addons/website/static/src/builder/plugins/font/add_font_dialog.js
+++ b/addons/website/static/src/builder/plugins/font/add_font_dialog.js
@@ -51,7 +51,7 @@ export class AddFontDialog extends Component {
         valid: true,
         loading: false,
         googleFontFamily: undefined,
-        googleServe: true,
+        googleServe: !this.env.services.website.currentWebsite.cookies_bar,
         uploadedFontName: undefined,
         uploadedFonts: [],
         uploadedFontFaces: undefined,
diff --git a/addons/website/static/src/builder/plugins/font/add_font_dialog.xml b/addons/website/static/src/builder/plugins/font/add_font_dialog.xml
index 53beda1fce34e..d5c32ab9e0038 100644
--- a/addons/website/static/src/builder/plugins/font/add_font_dialog.xml
+++ b/addons/website/static/src/builder/plugins/font/add_font_dialog.xml
@@ -50,7 +50,7 @@
                     </div>
                     <label class="col-form-label col-md-4" for="google_font_serve">
                         Serve font from Google servers
-                        <sup class="text-info" title="To comply with some local regulations">
+                        <sup class="text-info" title="Use Google’s servers for fonts. It may impact GDPR compliance">
                             <a target="_blank" href="https://www.odoo.com/forum/help-1/how-to-use-google-fonts-and-respecting-german-requirements-214049">?</a>
                         </sup>
                     </label>
diff --git a/addons/website/static/src/services/website_service.js b/addons/website/static/src/services/website_service.js
index 4d8124a41e5a4..facfb889af979 100644
--- a/addons/website/static/src/services/website_service.js
+++ b/addons/website/static/src/services/website_service.js
@@ -297,6 +297,7 @@ export const websiteService = {
                             name: {},
                             language_ids: {},
                             default_lang_id: { fields: { code: {} } },
+                            cookies_bar: {},
                         },
                     })
                 ).records;
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 6ba2b1cb691b1..e404806caad61 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -214,7 +214,7 @@
                         </setting>
                         <setting
                             id="website_cookies_bar_setting"
-                            help="Display a customizable cookies bar on your website"
+                            help="Display a customizable cookies bar on your website. Please ensure your site is GDPR-compliant (e.g. Google Fonts usage)."
                             documentation="/applications/websites/website/configuration/cookies_bar.html"
                         >
                             <field name="website_cookies_bar"/>

From 695160baac14358311b50a72a81cd4a1265d810f Mon Sep 17 00:00:00 2001
From: dhha-odoo <dhha@odoo.com>
Date: Tue, 11 Nov 2025 12:52:15 +0530
Subject: [PATCH 485/673] [FIX] stock_account: prevent browsing falsy ID when
 valuation account is missing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue before this commit:
=========================
When opening the Inventory Valuation menu without a configured
Valuation Account, the system raised: AssertionError: Invalid falsy real id.

Steps to Reproduce:
=========================
- Install the account and stock_account modules.
- Switch to another company where the default Valuation Account is not set.
- Open the Inventory Valuation menu → traceback occurs.

Cause of the issue:
=========================
After a recent ORM change in this [PR](https://github.com/odoo/odoo/pull/227477),
Calling browse() with falsy IDs is no longer allowed.
When a company has no Valuation Account configured, the code attempts
to browse a falsy ID, triggering this error.

With This Commit:
=========================
Add a safeguard to ensure that only valid valuation account records are added before browsing.
This prevents issues when opening the Inventory Valuation menu for companies that don’t have
a Valuation Account configured.

closes odoo/odoo#235193

Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
---
 addons/stock_account/models/res_company.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock_account/models/res_company.py b/addons/stock_account/models/res_company.py
index 2922ce6395ed5..54a895ee921f8 100644
--- a/addons/stock_account/models/res_company.py
+++ b/addons/stock_account/models/res_company.py
@@ -95,7 +95,8 @@ def stock_accounting_value(self, accounts_by_product=None, at_date=None):
         account_data = defaultdict(float)
         stock_valuation_accounts_ids = set()
         for dummy, accounts in accounts_by_product.items():
-            stock_valuation_accounts_ids.add(accounts['valuation'].id)
+            if accounts['valuation']:
+                stock_valuation_accounts_ids.add(accounts['valuation'].id)
         stock_valuation_accounts = self.env['account.account'].browse(stock_valuation_accounts_ids)
         domain = Domain([
             ('account_id', 'in', stock_valuation_accounts.ids),

From 4f27d1d5281b477ffc136e773b94309a7629a056 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Mon, 4 Aug 2025 12:52:09 +0000
Subject: [PATCH 486/673] [REF] core: simplify cache usage

Clear only one cache at the same time.
For website, review the usages as they are not similar to other ones.

Part-of: odoo/odoo#221896
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/base_automation/models/base_automation.py   |  9 +++++----
 addons/website/models/website.py                   |  6 ++++--
 addons/website/models/website_menu.py              |  3 ++-
 addons/website/models/website_page.py              |  6 ++----
 addons/website/models/website_page_properties.py   |  6 +++++-
 .../tests/test_disable_unused_snippets_assets.py   |  8 ++++----
 odoo/addons/base/models/res_users.py               |  4 ++--
 odoo/orm/registry.py                               | 14 ++++++--------
 8 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/addons/base_automation/models/base_automation.py b/addons/base_automation/models/base_automation.py
index 4bb0ff923e3df..4ae9ec4125b6f 100644
--- a/addons/base_automation/models/base_automation.py
+++ b/addons/base_automation/models/base_automation.py
@@ -489,7 +489,7 @@ def _has_trigger_onchange(self):
 
     @api.model_create_multi
     def create(self, vals_list):
-        base_automations = super(BaseAutomation, self).create(vals_list)
+        base_automations = super().create(vals_list)
         self._update_cron()
         self._update_registry()
         if base_automations._has_trigger_onchange():
@@ -499,11 +499,12 @@ def create(self, vals_list):
 
     def write(self, vals: dict):
         clear_templates = self._has_trigger_onchange()
-        res = super(BaseAutomation, self).write(vals)
+        res = super().write(vals)
         if set(vals).intersection(self.CRITICAL_FIELDS):
             self._update_cron()
             self._update_registry()
-            if clear_templates or self._has_trigger_onchange():
+            clear_templates |= self._has_trigger_onchange()
+            if clear_templates and any(self._ids):
                 # Invalidate templates cache to update on_change attributes if needed
                 self.env.registry.clear_cache('templates')
         elif set(vals).intersection(self.RANGE_FIELDS):
@@ -512,7 +513,7 @@ def write(self, vals: dict):
 
     def unlink(self):
         clear_templates = self._has_trigger_onchange()
-        res = super(BaseAutomation, self).unlink()
+        res = super().unlink()
         self._update_cron()
         self._update_registry()
         if clear_templates:
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 23ba772574731..687b0edbf0711 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -336,7 +336,8 @@ def write(self, vals):
         values = vals
         self._handle_create_write(values)
 
-        self.env.registry.clear_cache()
+        if any(self._ids):
+            self.env.registry.clear_cache()
 
         if 'company_id' in values and 'user_id' not in values:
             public_user_to_change_websites = self.filtered(lambda w: w.sudo().user_id.company_id.id != values['company_id'])
@@ -348,7 +349,8 @@ def write(self, vals):
 
         if 'cdn_activated' in values or 'cdn_url' in values or 'cdn_filters' in values:
             # invalidate the caches from static node at compile time
-            self.env.registry.clear_cache()
+            if any(self._ids):
+                self.env.registry.clear_cache()
 
         # invalidate cache for `company.website_id` to be recomputed
         if 'sequence' in values or 'company_id' in values:
diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py
index 20789b1ff70af..ac0ed6b76e210 100644
--- a/addons/website/models/website_menu.py
+++ b/addons/website/models/website_menu.py
@@ -152,7 +152,8 @@ def create(self, vals_list):
         return menus
 
     def write(self, vals):
-        self.env.registry.clear_cache('templates')
+        if any(self._ids):
+            self.env.registry.clear_cache('templates')
         res = super().write(vals)
         if 'group_ids' in vals and not self.env.context.get("adding_designer_group_to_menu"):
             self.filtered("group_ids").with_context(
diff --git a/addons/website/models/website_page.py b/addons/website/models/website_page.py
index 82e029c5da598..1ba85adae7df3 100644
--- a/addons/website/models/website_page.py
+++ b/addons/website/models/website_page.py
@@ -184,10 +184,8 @@ def write(self, vals):
             if 'visibility' in vals:
                 if vals['visibility'] != 'restricted_group':
                     vals['group_ids'] = False
-
-        if 'url' in vals or 'visibility' in vals or 'group_ids' in vals:
-            self.env.registry.clear_cache('templates')   # Clear cache because the response depends on the path and the rendering of the view changes.
-
+        # write on page == write on view
+        # the view will invalidate the 'templates' cache
         return super().write(vals)
 
     def get_website_meta(self):
diff --git a/addons/website/models/website_page_properties.py b/addons/website/models/website_page_properties.py
index bcd073ed2f1e6..d671a16a8bd22 100644
--- a/addons/website/models/website_page_properties.py
+++ b/addons/website/models/website_page_properties.py
@@ -124,7 +124,6 @@ def _inverse_is_published(self):
                     # Unpublish
                     target.visibility = 'restricted_group'
                     target.group_ids += self._get_ir_ui_view_unpublish_group()
-                self.env.registry.clear_cache('templates')
         elif 'is_published' in target._fields:
             target.is_published = self.is_published
 
@@ -140,6 +139,11 @@ def _is_ir_ui_view_published(self, view):
         view.ensure_one()
         return not view.visibility
 
+    def write(self, vals):
+        if 'is_published' in vals and any(self._ids):
+            self.env.registry.clear_cache('templates')
+        return super().write(vals)
+
 
 class WebsitePageProperties(models.TransientModel):
     _name = 'website.page.properties'
diff --git a/addons/website/tests/test_disable_unused_snippets_assets.py b/addons/website/tests/test_disable_unused_snippets_assets.py
index 8e928d4e036c1..ebffc570ffda6 100644
--- a/addons/website/tests/test_disable_unused_snippets_assets.py
+++ b/addons/website/tests/test_disable_unused_snippets_assets.py
@@ -68,10 +68,10 @@ def test_homepage_up_to_date_and_mega_menu_outdated(self):
         cache_clears = []
 
         init_clear_cache = self.env.registry.clear_cache
-        def patched_clear_cache(*cache_names):
-            for cache_name in cache_names:
-                cache_clears.append(cache_name)
-            init_clear_cache(*cache_names)
+
+        def patched_clear_cache(cache_name):
+            cache_clears.append(cache_name)
+            init_clear_cache(cache_name)
 
         with patch.object(self.env.registry, 'clear_cache', patched_clear_cache):
             self.Website._disable_unused_snippets_assets()
diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index a02eff767f9ef..60e372afad1bf 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -633,7 +633,7 @@ def write(self, vals):
                 if env.user in self:
                     reset_cached_properties(env)
 
-        if 'group_ids' in vals and self.ids:
+        if 'group_ids' in vals and any(self._ids):
             # clear caches linked to the users
             self.env['ir.model.access'].call_cache_clearing_methods()
 
@@ -641,7 +641,7 @@ def write(self, vals):
         # clear_cache/clear_caches methods pretty much just end up calling
         # Registry.clear_cache
         invalidation_fields = self._get_invalidation_fields()
-        if invalidation_fields & vals.keys():
+        if not invalidation_fields.isdisjoint(vals):
             self.env.registry.clear_cache()
 
         return res
diff --git a/odoo/orm/registry.py b/odoo/orm/registry.py
index 897c8e691da5e..f7006aeb48853 100644
--- a/odoo/orm/registry.py
+++ b/odoo/orm/registry.py
@@ -939,22 +939,20 @@ def check_tables_exist(self, cr: Cursor) -> None:
             for table in missing_tables:
                 _logger.error("Model %s has no table.", table2model[table])
 
-    def clear_cache(self, *cache_names: str) -> None:
+    def clear_cache(self, cache_name: str = 'default') -> None:
         """ Clear the caches associated to methods decorated with
         ``tools.ormcache``if cache is in `cache_name` subset. """
-        cache_names = cache_names or ('default',)
-        assert not any('.' in cache_name for cache_name in cache_names)
-        for cache_name in cache_names:
-            for cache in _CACHES_BY_KEY[cache_name]:
-                self.__caches[cache].clear()
-            self.cache_invalidated.add(cache_name)
+        assert '.' not in cache_name
+        for cache in _CACHES_BY_KEY[cache_name]:
+            self.__caches[cache].clear()
+        self.cache_invalidated.add(cache_name)
 
         # log information about invalidation_cause
         if _logger.isEnabledFor(logging.DEBUG):
             # could be interresting to log in info but this will need to minimize invalidation first,
             # mainly in some setupclass and crons
             caller_info = format_frame(inspect.currentframe().f_back)  # type: ignore
-            _logger.debug('Invalidating %s model caches from %s', ','.join(cache_names), caller_info)
+            _logger.debug('Invalidating %s model cache from %s', cache_name, caller_info)
 
     def clear_all_caches(self) -> None:
         """ Clear the caches associated to methods decorated with

From e6bdf7ddda3db7a3b4019a02ac546302cee4c27e Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Mon, 4 Aug 2025 12:16:25 +0000
Subject: [PATCH 487/673] [IMP] core: Model._clear_cache_name

Allow for automatic cache invalidation when updates happend on a model.
It handles properly the invalidation when real records are updated.

```py
class MyModel(models.Model):
  _clear_cache_on_fields = {...}  # optional, always clear by default
  _clear_cache_name = 'default'
```

closes odoo/odoo#221896

Signed-off-by: Raphael Collet <rco@odoo.com>
---
 .../auth_passkey/models/auth_passkey_key.py   |  4 +--
 addons/mail/models/mail_message_subtype.py    | 15 +---------
 addons/product/models/product_product.py      | 22 ++++----------
 addons/product/tests/test_variants.py         | 22 +++++++-------
 .../sale_timesheet/tests/test_sale_service.py |  1 +
 .../models/crm_reveal_rule.py                 | 21 ++-----------
 .../website_sale/models/product_pricelist.py  | 16 ++--------
 odoo/addons/base/models/decimal_precision.py  | 17 +----------
 odoo/addons/base/models/ir_actions.py         | 24 ++-------------
 odoo/addons/base/models/ir_asset.py           | 15 +---------
 .../addons/base/models/ir_config_parameter.py | 11 +------
 odoo/addons/base/models/ir_default.py         |  9 +++---
 odoo/addons/base/models/ir_module.py          |  6 ++--
 odoo/addons/base/models/ir_rule.py            | 15 ++++------
 odoo/addons/base/models/ir_ui_menu.py         |  4 +--
 odoo/addons/base/models/ir_ui_view.py         |  4 +--
 odoo/addons/base/models/res_company.py        | 30 +++++--------------
 odoo/addons/base/models/res_currency.py       | 15 ++++------
 odoo/addons/base/models/res_groups.py         | 16 ++--------
 odoo/addons/base/models/res_lang.py           | 11 ++-----
 odoo/addons/base/tests/test_ir_actions.py     |  2 +-
 odoo/orm/models.py                            | 15 ++++++++++
 22 files changed, 80 insertions(+), 215 deletions(-)

diff --git a/addons/auth_passkey/models/auth_passkey_key.py b/addons/auth_passkey/models/auth_passkey_key.py
index ee8d511a13fe0..e417d0d23071c 100644
--- a/addons/auth_passkey/models/auth_passkey_key.py
+++ b/addons/auth_passkey/models/auth_passkey_key.py
@@ -125,7 +125,7 @@ def action_delete_passkey(self):
         for key in self:
             if key.create_uid.id == self.env.user.id:
                 # Force to go through `res.users.auth_passkey_key_ids` to trigger the session token cache invalidation
-                # See `res.users.write` and `_get_invalidation_fields`
+                # See `res.users.write` and `_clear_cache_on_fields`
                 # `self.env.user` is already sudo, so no need to re-apply `sudo` to get delete access right.
                 self.env.user.write({'auth_passkey_key_ids': [Command.delete(key.id)]})
                 new_token = self.env.user._compute_session_token(request.session.sid)
@@ -167,7 +167,7 @@ def make_key(self, registration=None):
         self.ensure_one()
         verification = request.env['auth.passkey.key']._verify_registration_options(registration)
         # Force to go through `res.users.auth_passkey_key_ids` to trigger the session token cache invalidation
-        # See `res.users.write` and `_get_invalidation_fields`
+        # See `res.users.write` and `_clear_cache_on_fields`
         # `self.env.user` is already sudo, so no need to re-apply `sudo` to get create access right.
         self.env.user.write({'auth_passkey_key_ids': [Command.create({
             'name': self.name,
diff --git a/addons/mail/models/mail_message_subtype.py b/addons/mail/models/mail_message_subtype.py
index cefa05952377c..cba64e87c2f7c 100644
--- a/addons/mail/models/mail_message_subtype.py
+++ b/addons/mail/models/mail_message_subtype.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import api, fields, models, tools
@@ -11,6 +10,7 @@ class MailMessageSubtype(models.Model):
     _name = 'mail.message.subtype'
     _description = 'Message Subtype'
     _order = 'sequence, id'
+    _clear_cache_name = 'default'  # _get_auto_subscription_subtypes
 
     name = fields.Char(
         'Message Type', required=True, translate=True,
@@ -43,19 +43,6 @@ class MailMessageSubtype(models.Model):
     track_recipients = fields.Boolean('Track Recipients',
                                       help="Whether to display all the recipients or only the important ones.")
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        self.env.registry.clear_cache()  # _get_auto_subscription_subtypes
-        return super(MailMessageSubtype, self).create(vals_list)
-
-    def write(self, vals):
-        self.env.registry.clear_cache()  # _get_auto_subscription_subtypes
-        return super(MailMessageSubtype, self).write(vals)
-
-    def unlink(self):
-        self.env.registry.clear_cache()  # _get_auto_subscription_subtypes
-        return super(MailMessageSubtype, self).unlink()
-
     @tools.ormcache('model_name')
     def _get_auto_subscription_subtypes(self, model_name):
         """ Return data related to auto subscription based on subtype matching.
diff --git a/addons/product/models/product_product.py b/addons/product/models/product_product.py
index bb686a5e5779b..e7a89b7dbb62b 100644
--- a/addons/product/models/product_product.py
+++ b/addons/product/models/product_product.py
@@ -16,6 +16,11 @@ class ProductProduct(models.Model):
     _inherits = {'product.template': 'product_tmpl_id'}
     _inherit = ['mail.thread', 'mail.activity.mixin']
     _order = 'default_code, name, id'
+    _clear_cache_name = 'default'
+    _clear_cache_on_fields = {
+        'active',  # _get_first_possible_variant_id
+        'product_template_attribute_value_ids',  # _get_variant_id_for_combination
+    }
     _check_company_domain = models.check_company_domain_parent_of
 
     # price_extra: catalog extra value only, sum of variant extra attributes
@@ -422,20 +427,7 @@ def _onchange_uom_id(self):
 
     @api.model_create_multi
     def create(self, vals_list):
-        products = super(ProductProduct, self.with_context(create_product_product=False)).create(vals_list)
-        # `_get_variant_id_for_combination` depends on existing variants
-        self.env.registry.clear_cache()
-        return products
-
-    def write(self, vals):
-        res = super().write(vals)
-        if 'product_template_attribute_value_ids' in vals:
-            # `_get_variant_id_for_combination` depends on `product_template_attribute_value_ids`
-            self.env.registry.clear_cache()
-        elif 'active' in vals:
-            # `_get_first_possible_variant_id` depends on variants active state
-            self.env.registry.clear_cache()
-        return res
+        return super(ProductProduct, self.with_context(create_product_product=False)).create(vals_list)
 
     def action_archive(self):
         records = self.filtered('active')
@@ -481,8 +473,6 @@ def unlink(self):
         # products due to ondelete='cascade'
         unlink_templates = self.env['product.template'].browse(unlink_templates_ids)
         unlink_templates.unlink()
-        # `_get_variant_id_for_combination` depends on existing variants
-        self.env.registry.clear_cache()
         return res
 
     def _filter_to_unlink(self):
diff --git a/addons/product/tests/test_variants.py b/addons/product/tests/test_variants.py
index 1f59c7ca04b20..88e519804c85e 100644
--- a/addons/product/tests/test_variants.py
+++ b/addons/product/tests/test_variants.py
@@ -1447,26 +1447,26 @@ def test_unlink_and_archive_multiple_variants(self):
         (multiple_archived + multiple_active).unlink()
         self.assertFalse(products.exists())
 
-@tagged('post_install', '-at_install')
-class TestVariantWrite(TransactionCase):
-
     def test_active_one2many(self):
-        template = self.env['product.template'].create({'name': 'Foo', 'description': 'Foo'})
-        self.assertEqual(len(template.product_variant_ids), 1)
+        template = self.template
 
         # check the consistency of one2many field product_variant_ids w.r.t. active variants
-        variant1 = template.product_variant_ids
-        variant2 = self.env['product.product'].create({'product_tmpl_id': template.id})
-        self.assertEqual(template.product_variant_ids, variant1 + variant2)
+        variant1, variant2 = template.product_variant_ids[:2]
+        other = template.product_variant_ids[2:]
+        self.assertEqual(template.product_variant_ids, variant1 + variant2 + other)
 
         variant2.active = False
-        self.assertEqual(template.product_variant_ids, variant1)
+        self.assertEqual(template.product_variant_ids, variant1 + other)
 
         variant2.active = True
-        self.assertEqual(template.product_variant_ids, variant1 + variant2)
+        self.assertEqual(template.product_variant_ids, variant1 + variant2 + other)
 
         variant1.active = False
-        self.assertEqual(template.product_variant_ids, variant2)
+        self.assertEqual(template.product_variant_ids, variant2 + other)
+
+
+@tagged('post_install', '-at_install')
+class TestVariantWrite(TransactionCase):
 
     def test_write_inherited_field(self):
         product = self.env['product.product'].create({'name': 'Foo', 'sequence': 1})
diff --git a/addons/sale_timesheet/tests/test_sale_service.py b/addons/sale_timesheet/tests/test_sale_service.py
index 2f9decda99804..b3112b743e1ab 100644
--- a/addons/sale_timesheet/tests/test_sale_service.py
+++ b/addons/sale_timesheet/tests/test_sale_service.py
@@ -817,6 +817,7 @@ def test_timesheet_hours_delivered_rounding(self):
         Ensure hours are rounded consistently on SO & invoice.
         """
         self.env['decimal.precision'].search([('name', '=', 'Product Unit')]).digits = 0
+        self.env['uom.uom'].invalidate_model(['rounding'])  # rounding depends on precision
         self.env['sale.order.line'].create({
             'name': self.product_delivery_timesheet3.name,
             'product_id': self.product_delivery_timesheet3.id,
diff --git a/addons/website_crm_iap_reveal/models/crm_reveal_rule.py b/addons/website_crm_iap_reveal/models/crm_reveal_rule.py
index 8a3ed29ffc32c..1b31d6ea832ab 100644
--- a/addons/website_crm_iap_reveal/models/crm_reveal_rule.py
+++ b/addons/website_crm_iap_reveal/models/crm_reveal_rule.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import datetime
@@ -7,7 +6,6 @@
 import re
 from dateutil.relativedelta import relativedelta
 
-import odoo
 from odoo import api, fields, models, tools, _
 from odoo.addons.iap.tools import iap_tools
 from odoo.addons.crm.models import crm_stage
@@ -24,6 +22,8 @@ class CrmRevealRule(models.Model):
     _name = 'crm.reveal.rule'
     _description = 'CRM Lead Generation Rule'
     _order = 'sequence'
+    _clear_cache_name = 'default'
+    _clear_cache_on_fields = {'active', 'country_ids', 'regex_url'}  # in order to recompute _get_active_rules
 
     name = fields.Char(string='Rule Name', required=True)
     active = fields.Boolean(default=True)
@@ -85,23 +85,6 @@ def _check_regex_url(self):
         except Exception:
             raise ValidationError(_('Enter Valid Regex.'))
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        self.env.registry.clear_cache() # Clear the cache in order to recompute _get_active_rules
-        return super().create(vals_list)
-
-    def write(self, vals):
-        fields_set = {
-            'country_ids', 'regex_url', 'active'
-        }
-        if set(vals.keys()) & fields_set:
-            self.env.registry.clear_cache() # Clear the cache in order to recompute _get_active_rules
-        return super().write(vals)
-
-    def unlink(self):
-        self.env.registry.clear_cache() # Clear the cache in order to recompute _get_active_rules
-        return super().unlink()
-
     def action_get_lead_tree_view(self):
         action = self.env["ir.actions.actions"]._for_xml_id("crm.crm_lead_all_leads")
         action['domain'] = [('id', 'in', self.lead_ids.ids), ('type', '=', 'lead')]
diff --git a/addons/website_sale/models/product_pricelist.py b/addons/website_sale/models/product_pricelist.py
index 22f4043e09767..605874332ff3d 100644
--- a/addons/website_sale/models/product_pricelist.py
+++ b/addons/website_sale/models/product_pricelist.py
@@ -8,6 +8,7 @@
 
 class ProductPricelist(models.Model):
     _inherit = 'product.pricelist'
+    _clear_cache_name = 'default'
 
     #=== DEFAULT METHODS ===#
 
@@ -64,20 +65,7 @@ def create(self, vals_list):
                 # YTI FIXME: The fix is not at the correct place
                 # It be set when we actually create the pricelist
                 self = self.with_context(default_company_id=vals['company_id'])
-        pricelists = super().create(vals_list)
-        if pricelists:
-            self.env.registry.clear_cache()
-        return pricelists
-
-    def write(self, vals):
-        res = super().write(vals)
-        self and self.env.registry.clear_cache()
-        return res
-
-    def unlink(self):
-        res = super().unlink()
-        self and self.env.registry.clear_cache()
-        return res
+        return super().create(vals_list)
 
     #=== BUSINESS METHODS ===#
 
diff --git a/odoo/addons/base/models/decimal_precision.py b/odoo/addons/base/models/decimal_precision.py
index 3a5b116cff069..140774ca61d90 100644
--- a/odoo/addons/base/models/decimal_precision.py
+++ b/odoo/addons/base/models/decimal_precision.py
@@ -9,6 +9,7 @@
 class DecimalPrecision(models.Model):
     _name = 'decimal.precision'
     _description = 'Decimal Precision'
+    _clear_cache_name = 'stable'
 
     name = fields.Char('Usage', required=True)
     digits = fields.Integer('Digits', required=True, default=2)
@@ -26,22 +27,6 @@ def precision_get(self, application):
         res = self.env.cr.fetchone()
         return res[0] if res else 2
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        res = super().create(vals_list)
-        self.env.registry.clear_cache('stable')
-        return res
-
-    def write(self, vals):
-        res = super().write(vals)
-        self.env.registry.clear_cache('stable')
-        return res
-
-    def unlink(self):
-        res = super().unlink()
-        self.env.registry.clear_cache('stable')
-        return res
-
     @api.onchange('digits')
     def _onchange_digits_warning(self):
         if self.digits < self._origin.digits:
diff --git a/odoo/addons/base/models/ir_actions.py b/odoo/addons/base/models/ir_actions.py
index bbfe4eae99abe..d3edae29a2797 100644
--- a/odoo/addons/base/models/ir_actions.py
+++ b/odoo/addons/base/models/ir_actions.py
@@ -54,6 +54,7 @@ def exception(message, *args, stack_info=False, exc_info=True):
 class IrActionsActions(models.Model):
     _name = 'ir.actions.actions'
     _description = 'Action'
+    _clear_cache_name = 'default'  # self.get_bindings() depends on action records
     _table = 'ir_actions'
     _order = 'name, id'
     _allow_sudo_commands = False
@@ -106,19 +107,6 @@ def _compute_xml_id(self):
         for record in self:
             record.xml_id = res.get(record.id)
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        res = super().create(vals_list)
-        # self.get_bindings() depends on action records
-        self.env.registry.clear_cache()
-        return res
-
-    def write(self, vals):
-        res = super().write(vals)
-        # self.get_bindings() depends on action records
-        self.env.registry.clear_cache()
-        return res
-
     def unlink(self):
         """unlink ir.action.todo/ir.filters which are related to actions which will be deleted.
            NOTE: ondelete cascade will not work on ir.actions.actions so we will need to do it manually."""
@@ -126,10 +114,7 @@ def unlink(self):
         todos.unlink()
         filters = self.env['ir.filters'].search([('action_id', 'in', self.ids)])
         filters.unlink()
-        res = super().unlink()
-        # self.get_bindings() depends on action records
-        self.env.registry.clear_cache()
-        return res
+        return super().unlink()
 
     @api.ondelete(at_uninstall=True)
     def _unlink_check_home_action(self):
@@ -355,16 +340,11 @@ def read(self, fields=None, load='_classic_read'):
 
     @api.model_create_multi
     def create(self, vals_list):
-        self.env.registry.clear_cache()
         for vals in vals_list:
             if not vals.get('name') and vals.get('res_model'):
                 vals['name'] = self.env[vals['res_model']]._description
         return super().create(vals_list)
 
-    def unlink(self):
-        self.env.registry.clear_cache()
-        return super().unlink()
-
     def exists(self):
         ids = self._existing()
         existing = self.filtered(lambda rec: rec.id in ids)
diff --git a/odoo/addons/base/models/ir_asset.py b/odoo/addons/base/models/ir_asset.py
index c11fcbdb445c0..ecdcf737e4650 100644
--- a/odoo/addons/base/models/ir_asset.py
+++ b/odoo/addons/base/models/ir_asset.py
@@ -61,20 +61,7 @@ class IrAsset(models.Model):
     _description = 'Asset'
     _order = 'sequence, id'
     _allow_sudo_commands = False
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        self.env.registry.clear_cache('assets')
-        return super().create(vals_list)
-
-    def write(self, vals):
-        if self:
-            self.env.registry.clear_cache('assets')
-        return super().write(vals)
-
-    def unlink(self):
-        self.env.registry.clear_cache('assets')
-        return super().unlink()
+    _clear_cache_name = 'assets'
 
     name = fields.Char(string='Name', required=True)
     bundle = fields.Char(string='Bundle name', required=True)
diff --git a/odoo/addons/base/models/ir_config_parameter.py b/odoo/addons/base/models/ir_config_parameter.py
index e3114da28ede3..a3e71dcc94809 100644
--- a/odoo/addons/base/models/ir_config_parameter.py
+++ b/odoo/addons/base/models/ir_config_parameter.py
@@ -38,6 +38,7 @@ class IrConfig_Parameter(models.Model):
     _rec_name = 'key'
     _order = 'key'
     _allow_sudo_commands = False
+    _clear_cache_name = 'stable'
 
     key = fields.Char(required=True)
     value = fields.Text(help="Stringified Python variable value. Supported types: str, bool, int, float. Blank means undefined.")
@@ -160,23 +161,13 @@ def _convert(self, value: str, type_: Type_) -> bool | int | float | str:
             return value
         raise ValueError("Invalid type: %s" % type_)
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        self.env.registry.clear_cache('stable')
-        return super().create(vals_list)
-
     def write(self, vals):
         if 'key' in vals:
             illegal = _default_parameters.keys() & self.mapped('key')
             if illegal:
                 raise ValidationError(self.env._("You cannot rename config parameters with keys %s", ', '.join(illegal)))
-        self.env.registry.clear_cache('stable')
         return super().write(vals)
 
-    def unlink(self):
-        self.env.registry.clear_cache('stable')
-        return super().unlink()
-
     @api.ondelete(at_uninstall=False)
     def unlink_default_parameters(self):
         for record in self.filtered(lambda p: p.key in _default_parameters.keys()):
diff --git a/odoo/addons/base/models/ir_default.py b/odoo/addons/base/models/ir_default.py
index c190d6ad59d57..69b9eb3c28d58 100644
--- a/odoo/addons/base/models/ir_default.py
+++ b/odoo/addons/base/models/ir_default.py
@@ -16,6 +16,7 @@ class IrDefault(models.Model):
     _description = 'Default Value'
     _rec_name = 'field_id'
     _allow_sudo_commands = False
+    _clear_cache_name = 'default'
 
     field_id = fields.Many2one('ir.model.fields', string="Field", required=True,
                                ondelete='cascade', index=True)
@@ -38,24 +39,22 @@ def _check_json_format(self):
     def create(self, vals_list):
         # invalidate all company dependent fields since their fallback value in cache may be changed
         self.env.invalidate_all()
-        self.env.registry.clear_cache()
-        return super(IrDefault, self).create(vals_list)
+        return super().create(vals_list)
 
     def write(self, vals):
         if self:
             # invalidate all company dependent fields since their fallback value in cache may be changed
             self.env.invalidate_all()
-            self.env.registry.clear_cache()
         new_default = super().write(vals)
         self.check_access('write')
         return new_default
 
     def unlink(self):
+        res = super().unlink()
         if self:
             # invalidate all company dependent fields since their fallback value in cache may be changed
             self.env.invalidate_all()
-            self.env.registry.clear_cache()
-        return super(IrDefault, self).unlink()
+        return res
 
     @api.model
     def set(self, model_name, field_name, value, user_id=False, company_id=False, condition=False):
diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index ec80b5fad81e4..76174eb017372 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -327,8 +327,10 @@ def _unlink_except_installed(self):
                 raise UserError(_('You are trying to remove a module that is installed or will be installed.'))
 
     def unlink(self):
-        self.env.registry.clear_cache('stable')
-        return super().unlink()
+        res = super().unlink()
+        if self:
+            self.env.registry.clear_cache('stable')
+        return res
 
     def _get_modules_to_load_domain(self):
         """ Domain to retrieve the modules that should be loaded by the registry. """
diff --git a/odoo/addons/base/models/ir_rule.py b/odoo/addons/base/models/ir_rule.py
index abccf6d871d2c..e06a28be2262b 100644
--- a/odoo/addons/base/models/ir_rule.py
+++ b/odoo/addons/base/models/ir_rule.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 import logging
 
@@ -18,6 +17,7 @@ class IrRule(models.Model):
     _order = 'model_id DESC,id'
     _MODES = ('read', 'write', 'create', 'unlink')
     _allow_sudo_commands = False
+    _clear_cache_name = 'default'
 
     name = fields.Char()
     active = fields.Boolean(default=True, help="If you uncheck the active field, it will disable the record rule without deleting it (if you delete a native record rule, it may be re-created when you reload the module).")
@@ -118,6 +118,7 @@ def _get_rules(self, model_name, mode='read'):
         if self.env.su:
             return self.browse(())
 
+        self.flush_model()
         sql = SQL("""
             SELECT r.id FROM ir_rule r
             JOIN ir_model m ON (r.model_id=m.id)
@@ -181,29 +182,25 @@ def _compute_domain_context_values(self):
             yield v
 
     def unlink(self):
-        res = super(IrRule, self).unlink()
+        res = super().unlink()
         self.env.transaction.clear_access_cache()
-        self.env.registry.clear_cache()
         return res
 
     @api.model_create_multi
     def create(self, vals_list):
-        res = super(IrRule, self).create(vals_list)
-        # DLE P33: tests
         self.env.flush_all()
+        res = super().create(vals_list)
         self.env.transaction.clear_access_cache()
-        self.env.registry.clear_cache()
         return res
 
     def write(self, vals):
-        res = super(IrRule, self).write(vals)
-        # DLE P33: tests
+        # DLE P33: tests for cached values
         # - odoo/addons/test_access_rights/tests/test_feedback.py
         # - odoo/addons/test_access_rights/tests/test_ir_rules.py
         # - odoo/addons/base/tests/test_orm.py (/home/dle/src/odoo/master-nochange-fp/odoo/addons/base/tests/test_orm.py)
         self.env.flush_all()
+        res = super().write(vals)
         self.env.transaction.clear_access_cache()
-        self.env.registry.clear_cache()
         return res
 
     def _make_access_error(self, operation, records):
diff --git a/odoo/addons/base/models/ir_ui_menu.py b/odoo/addons/base/models/ir_ui_menu.py
index 94ec22842ddb8..1fa4c26484409 100644
--- a/odoo/addons/base/models/ir_ui_menu.py
+++ b/odoo/addons/base/models/ir_ui_menu.py
@@ -19,6 +19,7 @@ class IrUiMenu(models.Model):
     _order = "sequence,id"
     _parent_store = True
     _allow_sudo_commands = False
+    _clear_cache_name = 'default'
 
     name = fields.Char(string='Menu', required=True, translate=True)
     active = fields.Boolean(default=True)
@@ -145,14 +146,12 @@ def _compute_display_name(self):
 
     @api.model_create_multi
     def create(self, vals_list):
-        self.env.registry.clear_cache()
         for values in vals_list:
             if 'web_icon' in values:
                 values['web_icon_data'] = self._compute_web_icon_data(values.get('web_icon'))
         return super().create(vals_list)
 
     def write(self, vals):
-        self.env.registry.clear_cache()
         if 'web_icon' in vals:
             vals['web_icon_data'] = self._compute_web_icon_data(vals.get('web_icon'))
         return super().write(vals)
@@ -179,7 +178,6 @@ def unlink(self):
         direct_children = self.with_context(active_test=False).search([('parent_id', 'in', self.ids)])
         direct_children.write({'parent_id': False})
 
-        self.env.registry.clear_cache()
         return super(IrUiMenu, self).unlink()
 
     def copy(self, default=None):
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py
index 0f10135bd65b7..7fa49f6b8b23f 100644
--- a/odoo/addons/base/models/ir_ui_view.py
+++ b/odoo/addons/base/models/ir_ui_view.py
@@ -141,6 +141,7 @@ class IrUiView(models.Model):
     _description = 'View'
     _order = "priority,name,id"
     _allow_sudo_commands = False
+    _clear_cache_name = 'templates'
 
     name = fields.Char(string='View Name', required=True)
     model = fields.Char(index=True)
@@ -631,7 +632,6 @@ def create(self, vals_list):
                         values['arch_updated'] = False
             values.update(self._compute_defaults(values))
 
-        self.env.registry.clear_cache('templates')
         result = super().create(vals_list)
         result.with_context(ir_ui_view_partial_validation=True)._check_xml()
         return result
@@ -648,7 +648,6 @@ def write(self, vals):
         if custom_view:
             custom_view.unlink()
 
-        self.env.registry.clear_cache('templates')
         if 'arch_db' in vals and not self.env.context.get('no_save_prev'):
             vals['arch_prev'] = self.arch_db
 
@@ -666,7 +665,6 @@ def unlink(self):
         # if in uninstall mode and has children views, emulate an ondelete cascade
         if self.env.context.get('_force_unlink', False) and self.inherit_children_ids:
             self.inherit_children_ids.unlink()
-        self.env.registry.clear_cache('templates')
         return super().unlink()
 
     def _update_field_translations(self, field_name, translations, digest=None, source_lang=''):
diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py
index 109cdb7888846..936ab247bcfc6 100644
--- a/odoo/addons/base/models/res_company.py
+++ b/odoo/addons/base/models/res_company.py
@@ -19,6 +19,13 @@ class ResCompany(models.Model):
     _order = 'sequence, name'
     _inherit = ['format.address.mixin', 'format.vat.label.mixin']
     _parent_store = True
+    _clear_cache_name = 'default'
+    _clear_cache_on_fields = {
+        # This list is not well defined and tests should be improved
+        'active',  # user._get_company_ids and other potential cached search
+        'sequence',  # user._get_company_ids and other potential cached search
+    }
+    _clear_asset_cache_on_fields = {'font', 'primary_color', 'secondary_color', 'external_report_layout_id'}
 
     def copy(self, default=None):
         raise UserError(self.env._('Duplicating a company is not allowed. Please create a new company instead.'))
@@ -304,7 +311,6 @@ def create(self, vals_list):
                 for fname in self._get_company_root_delegated_field_names():
                     vals.setdefault(fname, self._fields[fname].convert_to_write(parent[fname], parent))
 
-        self.env.registry.clear_cache()
         companies = super().create(vals_list)
 
         # The write is made on the user to set it automatically in the multi company group.
@@ -322,22 +328,6 @@ def create(self, vals_list):
 
         return companies
 
-    def cache_invalidation_fields(self):
-        # This list is not well defined and tests should be improved
-        return {
-            'active', # user._get_company_ids and other potential cached search
-            'sequence', # user._get_company_ids and other potential cached search
-        }
-
-    def unlink(self):
-        """
-        Unlink the companies and clear the cache to make sure that
-        _get_company_ids of res.users gets only existing company ids.
-        """
-        res = super().unlink()
-        self.env.registry.clear_cache()
-        return res
-
     def write(self, vals):
         if 'parent_id' in vals:
             raise UserError(self.env._("The company hierarchy cannot be changed."))
@@ -348,17 +338,13 @@ def write(self, vals):
                 currency.write({'active': True})
 
         res = super().write(vals)
-        invalidation_fields = self.cache_invalidation_fields()
-        asset_invalidation_fields = {'font', 'primary_color', 'secondary_color', 'external_report_layout_id'}
 
         companies_needs_l10n = (
             vals.get('country_id')
             and self.filtered(lambda company: not company.country_id)
         ) or self.browse()
-        if not invalidation_fields.isdisjoint(vals):
-            self.env.registry.clear_cache()
 
-        if not asset_invalidation_fields.isdisjoint(vals):
+        if any(self._ids) and not self._clear_asset_cache_on_fields.isdisjoint(vals):
             # this is used in the content of an asset (see asset_styles_company_report)
             # and thus needs to invalidate the assets cache when this is changed
             self.env.registry.clear_cache('assets')  # not 100% it is useful a test is missing if it is the case
diff --git a/odoo/addons/base/models/res_currency.py b/odoo/addons/base/models/res_currency.py
index 5e9584efa85a7..b4a05240d740a 100644
--- a/odoo/addons/base/models/res_currency.py
+++ b/odoo/addons/base/models/res_currency.py
@@ -23,6 +23,9 @@ class ResCurrency(models.Model):
     _description = "Currency"
     _rec_names_search = ['name', 'full_name']
     _order = 'active desc, name'
+    # invalidate cache for get_all_currencies
+    _clear_cache_name = 'stable'
+    _clear_cache_on_fields = {'active', 'digits', 'name', 'position', 'symbol'}
 
     # Note: 'code' column was removed as of v6.0, the 'name' should now hold the ISO code.
     name = fields.Char(string='Currency', size=3, required=True, help="Currency Code (ISO 4217)")
@@ -60,25 +63,17 @@ class ResCurrency(models.Model):
     def create(self, vals_list):
         res = super().create(vals_list)
         self._toggle_group_multi_currency()
-        # invalidate cache for get_all_currencies
-        self.env.registry.clear_cache('stable')
         return res
 
     def unlink(self):
         res = super().unlink()
         self._toggle_group_multi_currency()
-        # invalidate cache for get_all_currencies
-        self.env.registry.clear_cache('stable')
         return res
 
     def write(self, vals):
         res = super().write(vals)
-        if vals.keys() & {'active', 'digits', 'name', 'position', 'symbol'}:
-            # invalidate cache for get_all_currencies
-            self.env.registry.clear_cache('stable')
-        if 'active' not in vals:
-            return res
-        self._toggle_group_multi_currency()
+        if 'active' in vals:
+            self._toggle_group_multi_currency()
         return res
 
     @api.model
diff --git a/odoo/addons/base/models/res_groups.py b/odoo/addons/base/models/res_groups.py
index 360a2c0160226..cbdfa5491a44a 100644
--- a/odoo/addons/base/models/res_groups.py
+++ b/odoo/addons/base/models/res_groups.py
@@ -12,6 +12,8 @@ class ResGroups(models.Model):
     _rec_name = 'full_name'
     _allow_sudo_commands = False
     _order = 'privilege_id, sequence, name, id'
+    _clear_cache_name = 'groups'
+    _clear_cache_on_fields = {'implied_ids', 'implied_by_ids'}
 
     name = fields.Char(required=True, translate=True)
     user_ids = fields.Many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', help='Users explicitly in this group')
@@ -220,10 +222,9 @@ def write(self, vals):
         # invalidate caches before updating groups, since the recomputation of
         # field 'share' depends on method has_group()
         # DLE P139
-        if self.ids:
+        if any(self._ids):
             self.env['ir.model.access'].call_cache_clearing_methods()
 
-        # The cache of groups and their relationships is invalidated by _check_disjoint_groups
         return super().write(vals)
 
     def _ensure_xml_id(self):
@@ -321,17 +322,6 @@ def _compute_disjoint_ids(self):
             else:
                 group.disjoint_ids = False
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        groups = super().create(vals_list)
-        self.env.registry.clear_cache('groups')
-        return groups
-
-    def unlink(self):
-        res = super().unlink()
-        self.env.registry.clear_cache('groups')
-        return res
-
     def _apply_group(self, implied_group):
         """ Add the given group to the groups implied by the current group
         :param implied_group: the implied group to add
diff --git a/odoo/addons/base/models/res_lang.py b/odoo/addons/base/models/res_lang.py
index a0f05ce493fff..881dfed9369aa 100644
--- a/odoo/addons/base/models/res_lang.py
+++ b/odoo/addons/base/models/res_lang.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import ast
-import json
 import locale
 import logging
 import re
@@ -79,6 +77,7 @@ class ResLang(models.Model):
     _description = "Language"
     _order = "active desc,name"
     _allow_sudo_commands = False
+    _clear_cache_name = 'stable'
 
     _disallowed_datetime_patterns = list(tools.misc.DATETIME_FORMATS_MAP)
     _disallowed_datetime_patterns.remove('%y') # this one is in fact allowed, just not good practice
@@ -361,7 +360,6 @@ def action_unarchive(self):
 
     @api.model_create_multi
     def create(self, vals_list):
-        self.env.registry.clear_cache('stable')
         for vals in vals_list:
             if not vals.get('url_code'):
                 vals['url_code'] = vals.get('iso_code') or vals['code']
@@ -382,6 +380,7 @@ def write(self, vals):
             self.env['ir.default'].discard_values('res.partner', 'lang', lang_codes)
 
         res = super().write(vals)
+        self.flush_recordset(['url_code'])
 
         if vals.get('active'):
             # If we activate a lang, set it's url_code to the shortest version
@@ -402,8 +401,6 @@ def write(self, vals):
                     short_lang.url_code = short_lang.code
                     long_lang.url_code = short_code
 
-        self.env.flush_all()
-        self.env.registry.clear_cache('stable')
         return res
 
     @api.ondelete(at_uninstall=True)
@@ -417,10 +414,6 @@ def _unlink_except_default_lang(self):
             if language.active:
                 raise UserError(_("You cannot delete the language which is Active!\nPlease de-activate the language first."))
 
-    def unlink(self):
-        self.env.registry.clear_cache('stable')
-        return super().unlink()
-
     def copy_data(self, default=None):
         default = dict(default or {})
         vals_list = super().copy_data(default=default)
diff --git a/odoo/addons/base/tests/test_ir_actions.py b/odoo/addons/base/tests/test_ir_actions.py
index 8811c19e8a87b..30ad926f644a2 100644
--- a/odoo/addons/base/tests/test_ir_actions.py
+++ b/odoo/addons/base/tests/test_ir_actions.py
@@ -837,7 +837,7 @@ def test_related_field(self):
 
         # create a non-computed field, and assert how many queries it takes
         model_id = self.env['ir.model']._get_id('res.partner')
-        query_count = 50
+        query_count = 51
         with self.assertQueryCount(query_count):
             self.env.registry.clear_cache()
             self.env['ir.model.fields'].create({
diff --git a/odoo/orm/models.py b/odoo/orm/models.py
index 59eea9269282e..2d12d3bd4df85 100644
--- a/odoo/orm/models.py
+++ b/odoo/orm/models.py
@@ -443,6 +443,8 @@ class BaseModel(metaclass=MetaModel):
     """
     _fold_name: str = 'fold'         #: field to determine folded groups in kanban views
 
+    _clear_cache_name: str = ''      # cache to clear on create/write/update
+
     _translate: bool = True           # False disables translations export for this model (Old API) TODO deprecate/remove
     _check_company_auto: bool = False
     """On write and create, call ``_check_company`` to ensure companies
@@ -3703,6 +3705,8 @@ def unlink(self) -> typing.Literal[True]:
             ir_model_data_unlink.unlink()
         if ir_attachment_unlink:
             ir_attachment_unlink.unlink()
+        if cache_name := self._clear_cache_name:
+            self.env.registry.clear_cache(cache_name)
 
         # auditing: deletions are infrequent and leave no trace in the database
         _unlink.info('User #%s deleted %s records with IDs: %r', self.env.uid, self._name, self.ids)
@@ -3888,6 +3892,13 @@ def write(self, vals: ValuesType) -> typing.Literal[True]:
                         ))
                     raise
 
+            # invalidate the cache
+            if real_recs and (cache_name := self._clear_cache_name) and (
+                not hasattr(self, '_clear_cache_on_fields')
+                or not self._clear_cache_on_fields.isdisjoint(vals)
+            ):
+                self.env.registry.clear_cache(cache_name)
+
             # validate inversed fields
             real_recs._validate_fields(inverse_fields)
 
@@ -4112,6 +4123,10 @@ def create(self, vals_list: list[ValuesType]) -> Self:
                 inv_relational_fnames = [field.name for field in fields if field.type in ('one2many', 'many2many') and not field.store]
                 inv_records.invalidate_recordset(fnames=inv_relational_fnames)
 
+        # invalidate the cache
+        if cache_name := self._clear_cache_name:
+            self.env.registry.clear_cache(cache_name)
+
         # check Python constraints for non-stored inversed fields
         for data in data_list:
             data['record']._validate_fields(data['inversed'], data['stored'])

From 2e0398c1f64780c39fdf96b0a183342fe8aab2e9 Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 12 Nov 2025 12:59:23 +0100
Subject: [PATCH 488/673] [REF] mail: searchChat method use discuss.channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#235278

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/static/src/core/common/res_partner_model.js | 6 +++---
 addons/mail/static/src/core/common/store_service.js     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/core/common/res_partner_model.js b/addons/mail/static/src/core/common/res_partner_model.js
index d872b93fa7ff9..808c190d4fd10 100644
--- a/addons/mail/static/src/core/common/res_partner_model.js
+++ b/addons/mail/static/src/core/common/res_partner_model.js
@@ -122,9 +122,9 @@ export class ResPartner extends Record {
     }
 
     searchChat() {
-        return Object.values(this.store["mail.thread"].records).find(
-            (thread) =>
-                thread.channel?.channel_type === "chat" && thread.correspondent?.persona.eq(this)
+        return Object.values(this.store["discuss.channel"].records).find(
+            (channel) =>
+                channel.channel_type === "chat" && channel.correspondent?.partner_id?.eq(this)
         );
     }
 
diff --git a/addons/mail/static/src/core/common/store_service.js b/addons/mail/static/src/core/common/store_service.js
index 5caca0ca753b3..975afcf1c1d52 100644
--- a/addons/mail/static/src/core/common/store_service.js
+++ b/addons/mail/static/src/core/common/store_service.js
@@ -454,7 +454,7 @@ export class Store extends BaseStore {
      * @param {Object} param0
      * @param {number} param0.userId
      * @param {number} param0.partnerId
-     * @returns {Promise<import("models").Thread | undefined>}
+     * @returns {Promise<import("models").DiscussChannel | undefined>}
      */
     async getChat({ userId, partnerId }) {
         const partner = await this.getPartner({ userId, partnerId });

From b9764e283bb9f7457b668f6303b2fefa33791be5 Mon Sep 17 00:00:00 2001
From: ahta <ahta@odoo.com>
Date: Mon, 6 Oct 2025 15:36:45 +0200
Subject: [PATCH 489/673] [IMP] {l10n_in_,}hr_holidays: modify previous
 holidays legend color

This commit improves the user experience by modifying the color of past
holidays in the legend in the dashboard side panel to a lighter shade,
making it easier to distinguish between past and upcoming holidays.

task-5129928

closes odoo/odoo#230120

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 .../calendar_side_panel/calendar_side_panel.js      |  2 ++
 .../calendar_side_panel/calendar_side_panel.xml     | 13 ++++++++-----
 .../calendar/side_panel/calendar_side_panel.xml     |  5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.js b/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.js
index c32b9eec62a4a..5a4ffbe67afb1 100644
--- a/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.js
+++ b/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.js
@@ -34,6 +34,8 @@ export class TimeOffCalendarSidePanel extends CalendarSidePanel {
             (start, end) => `${serializeDateTime(start)},${serializeDateTime(end)}`
         );
 
+        this.currentDateTime = luxon.DateTime.now();
+
         onWillStart(async () => {
             await this.updateSpecialDays();
             await this.loadHolidayData();
diff --git a/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.xml b/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.xml
index fb23ffdf1ec2d..9477ce0f2e25e 100644
--- a/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.xml
+++ b/addons/hr_holidays/static/src/views/calendar/calendar_side_panel/calendar_side_panel.xml
@@ -24,10 +24,12 @@
                 <div class="d-flex flex-column mt-4" t-if="leaveState.mandatoryDays.length">
                     <h5>Mandatory Days</h5>
                     <ul class="ps-0">
-                        <li t-foreach="leaveState.mandatoryDays" t-as="mandatoryDay" t-key="mandatoryDay.id" class="mt-2 list-unstyled">
-                            <strong
+                        <li t-foreach="leaveState.mandatoryDays" t-as="mandatoryDay" t-key="mandatoryDay.id" class="mt-2 list-unstyled"
+                            t-att-class="mandatoryDay.end &lt; currentDateTime ? 'text-muted' : 'fw-bold'">
+                            <span
                                     t-esc="getFormattedDateSpan(mandatoryDay.start, mandatoryDay.end)"
-                                    t-att-class="'hr_mandatory_day_'+mandatoryDay.colorIndex"/>
+                                    t-attf-class="hr_mandatory_day_{{ mandatoryDay.colorIndex }}"
+                                    t-att-class="{ 'opacity-50': mandatoryDay.end &lt; currentDateTime }"/>
                             : <t t-esc="mandatoryDay.title"/>
                         </li>
                     </ul>
@@ -36,8 +38,9 @@
                 <div class="d-flex flex-column mt-4" t-if="leaveState.bankHolidays.length">
                     <h5>Public Holidays</h5>
                     <ul class="ps-0">
-                        <li t-foreach="leaveState.bankHolidays" t-as="bankHoliday" t-key="bankHoliday.id" class="mt-2 list-unstyled">
-                            <strong
+                        <li t-foreach="leaveState.bankHolidays" t-as="bankHoliday" t-key="bankHoliday.id" class="mt-2 list-unstyled"
+                            t-att-class="bankHoliday.end &lt; currentDateTime ? 'text-muted' : 'fw-bold'">
+                            <span
                                     t-esc="getFormattedDateSpan(bankHoliday.start, bankHoliday.end)"/>
                             : <t t-esc="bankHoliday.title"/>
                         </li>
diff --git a/addons/l10n_in_hr_holidays/static/src/views/calendar/side_panel/calendar_side_panel.xml b/addons/l10n_in_hr_holidays/static/src/views/calendar/side_panel/calendar_side_panel.xml
index 5133ab95f74b5..7a09b025149ca 100644
--- a/addons/l10n_in_hr_holidays/static/src/views/calendar/side_panel/calendar_side_panel.xml
+++ b/addons/l10n_in_hr_holidays/static/src/views/calendar/side_panel/calendar_side_panel.xml
@@ -6,8 +6,9 @@
                 <h5>Optional Holidays</h5>
                 <ul class="ps-0">
                     <li t-foreach="leaveState.optionalHolidays" t-as="optionalHoliday" t-key="optionalHoliday.id"
-                        class="mt-2 list-unstyled">
-                        <strong t-out="getFormattedDateSpan(optionalHoliday.start, optionalHoliday.end)"/>
+                        class="mt-2 list-unstyled"
+                        t-att-class="optionalHoliday.end.startOf('day') &lt; currentDateTime.startOf('day') ? 'text-muted' : 'fw-bold'">
+                        <span t-out="getFormattedDateSpan(optionalHoliday.start, optionalHoliday.end)"/>
                         : <t t-out="optionalHoliday.title"/>
                     </li>
                 </ul>

From 2067b860d2168ff581434f21b49355af92d09780 Mon Sep 17 00:00:00 2001
From: Pierre Paridans <app@odoo.com>
Date: Mon, 10 Nov 2025 15:22:46 +0100
Subject: [PATCH 490/673] [IMP] web,bus,mail: promote Promise.withResolvers

This commit deprecates the `Deferred` class (i.e. basically a
resolvable/rejectable extension of `Promise`), to promote the usage of
the standard `Promise.withResolvers()` instead, which provides similar
features.

While being supported by every modern browsers,
`Promise.withResolvers()` is still relatively new (Baseline since March
2024), a polyfill is provided and can be included in the asset bundles
requiring to support a wider range of browsers (i.e.
website/frontend...).

Reference:
- https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers

closes odoo/odoo#235237

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/bus/static/src/workers/bus_worker_utils.js |  2 ++
 addons/mail/static/src/webclient/web/webclient.js |  4 ++--
 addons/web/__manifest__.py                        |  1 +
 addons/web/static/lib/hoot-dom/helpers/time.js    |  2 ++
 .../static/src/core/autocomplete/autocomplete.js  |  5 ++---
 .../static/src/core/emoji_picker/emoji_picker.js  |  9 ++++-----
 .../static/src/core/l10n/localization_service.js  |  4 ++--
 addons/web/static/src/core/l10n/translation.js    |  4 ++--
 addons/web/static/src/core/name_service.js        |  7 +++----
 addons/web/static/src/core/network/rpc_cache.js   |  5 ++---
 addons/web/static/src/core/utils/concurrency.js   |  2 ++
 .../static/src/legacy/js/public/public_root.js    |  2 +-
 addons/web/static/src/model/model.js              |  6 +++---
 .../model/relational_model/relational_model.js    | 12 ++++++------
 .../static/src/model/relational_model/utils.js    | 15 ++++++---------
 addons/web/static/src/polyfills/promise.js        | 11 +++++++++++
 .../web/static/src/views/list/list_controller.js  |  2 +-
 .../src/webclient/actions/action_service.js       |  8 ++++----
 .../settings_form_view/settings/settings_page.js  |  9 ++++-----
 addons/web/static/src/webclient/webclient.js      |  8 ++++----
 addons/web/static/tests/legacy/helpers/utils.js   |  5 -----
 addons/web/static/tests/legacy/utils.js           |  5 ++---
 22 files changed, 66 insertions(+), 62 deletions(-)
 create mode 100644 addons/web/static/src/polyfills/promise.js

diff --git a/addons/bus/static/src/workers/bus_worker_utils.js b/addons/bus/static/src/workers/bus_worker_utils.js
index 2af7afe2ced64..4e2d72145a11f 100644
--- a/addons/bus/static/src/workers/bus_worker_utils.js
+++ b/addons/bus/static/src/workers/bus_worker_utils.js
@@ -27,6 +27,8 @@ export function debounce(func, wait, immediate) {
 }
 
 /**
+ * @deprecated Use Promise.withResolvers() instead.
+ *
  * Deferred is basically a resolvable/rejectable extension of Promise.
  */
 export class Deferred extends Promise {
diff --git a/addons/mail/static/src/webclient/web/webclient.js b/addons/mail/static/src/webclient/web/webclient.js
index 1d3155141c29f..cc7be0f90363c 100644
--- a/addons/mail/static/src/webclient/web/webclient.js
+++ b/addons/mail/static/src/webclient/web/webclient.js
@@ -54,7 +54,7 @@ patch(WebClient.prototype, {
      * @return {Promise<void>}
      */
     async _subscribePush(numberTry = 1) {
-        await this.serviceWorkerActivatedDeferred;
+        await this.serviceWorkerIsActivated;
         const pushManager = await this.pushManager();
         if (!pushManager) {
             return;
@@ -124,7 +124,7 @@ patch(WebClient.prototype, {
      * @return {Promise<void>}
      */
     async _unsubscribePush() {
-        await this.serviceWorkerActivatedDeferred;
+        await this.serviceWorkerIsActivated;
         const pushManager = await this.pushManager();
         if (!pushManager) {
             return;
diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 6b4b27c6b26fc..5559aa38bf3f5 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -150,6 +150,7 @@
         'web.assets_frontend_minimal': [
             'web/static/src/polyfills/object.js',
             'web/static/src/polyfills/array.js',
+            'web/static/src/polyfills/promise.js',
             'web/static/src/module_loader.js',
             'web/static/src/polyfills/set.js',
             'web/static/src/session.js',
diff --git a/addons/web/static/lib/hoot-dom/helpers/time.js b/addons/web/static/lib/hoot-dom/helpers/time.js
index 294d0886a6d24..c79618796a852 100644
--- a/addons/web/static/lib/hoot-dom/helpers/time.js
+++ b/addons/web/static/lib/hoot-dom/helpers/time.js
@@ -451,6 +451,8 @@ export async function waitUntil(predicate, options) {
 }
 
 /**
+ * @deprecated Use Promise.withResolvers() instead.
+ *
  * Manually resolvable and rejectable promise. It introduces 2 new methods:
  *  - {@link reject} rejects the deferred with the given reason;
  *  - {@link resolve} resolves the deferred with the given value.
diff --git a/addons/web/static/src/core/autocomplete/autocomplete.js b/addons/web/static/src/core/autocomplete/autocomplete.js
index 3498edce88286..912d0491d5864 100644
--- a/addons/web/static/src/core/autocomplete/autocomplete.js
+++ b/addons/web/static/src/core/autocomplete/autocomplete.js
@@ -1,4 +1,3 @@
-import { Deferred } from "@web/core/utils/concurrency";
 import { useAutofocus, useForwardRefToParent, useService } from "@web/core/utils/hooks";
 import { isScrollableY, scrollTo } from "@web/core/utils/scrolling";
 import { useDebounced } from "@web/core/utils/timing";
@@ -362,7 +361,7 @@ export class AutoComplete extends Component {
     }
     async onInput() {
         this.inEdition = true;
-        this.pendingPromise = this.pendingPromise || new Deferred();
+        this.pendingPromise = this.pendingPromise || Promise.withResolvers();
         this.loadingPromise = this.pendingPromise;
         this.debouncedProcessInput();
     }
@@ -400,7 +399,7 @@ export class AutoComplete extends Component {
                 ev.preventDefault();
             }
 
-            await this.loadingPromise;
+            await this.loadingPromise.promise;
         }
 
         switch (hotkey) {
diff --git a/addons/web/static/src/core/emoji_picker/emoji_picker.js b/addons/web/static/src/core/emoji_picker/emoji_picker.js
index dab1b8bc30ad9..932633f72012a 100644
--- a/addons/web/static/src/core/emoji_picker/emoji_picker.js
+++ b/addons/web/static/src/core/emoji_picker/emoji_picker.js
@@ -23,7 +23,6 @@ import { usePopover } from "@web/core/popover/popover_hook";
 import { fuzzyLookup } from "@web/core/utils/search";
 import { useAutofocus, useService } from "@web/core/utils/hooks";
 import { isMobileOS } from "@web/core/browser/feature_detection";
-import { Deferred } from "../utils/concurrency";
 import { Dialog } from "../dialog/dialog";
 import { getTemplate } from "@web/core/templates";
 
@@ -554,13 +553,13 @@ export function usePicker(PickerComponent, ref, props, options = {}) {
     function open(ref, openProps) {
         state.isOpen = true;
         if (ui.isSmall || isMobileOS()) {
-            const def = new Deferred();
+            const { promise, resolve } = Promise.withResolvers();
             const pickerMobileProps = {
                 PickerComponent,
                 onSelect: (...args) => {
                     const func = openProps?.onSelect ?? props?.onSelect;
                     const res = func?.(...args);
-                    def.resolve(true);
+                    resolve(true);
                     return res;
                 },
             };
@@ -585,11 +584,11 @@ export function usePicker(PickerComponent, ref, props, options = {}) {
                     context: component,
                     onClose: () => {
                         state.isOpen = false;
-                        return def.resolve(false);
+                        return resolve(false);
                     },
                 });
             }
-            return def;
+            return promise;
         }
         return popover.open(ref.el, { ...props, ...openProps });
     }
diff --git a/addons/web/static/src/core/l10n/localization_service.js b/addons/web/static/src/core/l10n/localization_service.js
index 355e39764994a..58f815b5db214 100644
--- a/addons/web/static/src/core/l10n/localization_service.js
+++ b/addons/web/static/src/core/l10n/localization_service.js
@@ -9,7 +9,7 @@ import {
     translatedTerms,
     translatedTermsGlobal,
     translationLoaded,
-    translationIsReady,
+    translationResolvers,
 } from "./translation";
 import { objectToUrlEncodedString } from "../utils/urls";
 import { IndexedDB } from "../utils/indexed_db";
@@ -93,7 +93,7 @@ export const localizationService = {
         }
 
         translatedTerms[translationLoaded] = true;
-        translationIsReady.resolve(true);
+        translationResolvers.resolve(true);
 
         const locale = user.lang || browser.navigator.language;
         Settings.defaultLocale = locale;
diff --git a/addons/web/static/src/core/l10n/translation.js b/addons/web/static/src/core/l10n/translation.js
index 65d9cda274454..0f0fc7d71434f 100644
--- a/addons/web/static/src/core/l10n/translation.js
+++ b/addons/web/static/src/core/l10n/translation.js
@@ -2,7 +2,6 @@ import { markup } from "@odoo/owl";
 
 import { formatList } from "@web/core/l10n/utils";
 import { isIterable } from "@web/core/utils/arrays";
-import { Deferred } from "@web/core/utils/concurrency";
 import { htmlSprintf } from "@web/core/utils/html";
 import { isObject } from "@web/core/utils/objects";
 import { sprintf } from "@web/core/utils/strings";
@@ -17,7 +16,8 @@ export const translatedTerms = {
  * found within the module's context, or when the context is not known.
  */
 export const translatedTermsGlobal = {};
-export const translationIsReady = new Deferred();
+export const translationResolvers = Promise.withResolvers();
+export const translationIsReady = translationResolvers.promise;
 
 const Markup = markup().constructor;
 
diff --git a/addons/web/static/src/core/name_service.js b/addons/web/static/src/core/name_service.js
index c120174513e08..e5f695de85c2d 100644
--- a/addons/web/static/src/core/name_service.js
+++ b/addons/web/static/src/core/name_service.js
@@ -1,6 +1,5 @@
 import { registry } from "@web/core/registry";
 import { unique, zip } from "@web/core/utils/arrays";
-import { Deferred } from "@web/core/utils/concurrency";
 
 export const ERROR_INACCESSIBLE_OR_MISSING = Symbol("INACCESSIBLE OR MISSING RECORD ID");
 
@@ -39,7 +38,7 @@ export const nameService = {
         function addDisplayNames(resModel, displayNames) {
             const mapping = getMapping(resModel);
             for (const resId in displayNames) {
-                mapping[resId] = new Deferred();
+                mapping[resId] = Promise.withResolvers();
                 mapping[resId].resolve(displayNames[resId]);
             }
         }
@@ -58,10 +57,10 @@ export const nameService = {
                     throw new Error(`Invalid ID: ${resId}`);
                 }
                 if (!(resId in mapping)) {
-                    mapping[resId] = new Deferred();
+                    mapping[resId] = Promise.withResolvers();
                     resIdsToFetch.push(resId);
                 }
-                proms.push(mapping[resId]);
+                proms.push(mapping[resId].promise);
             }
             if (resIdsToFetch.length) {
                 if (batches[resModel]) {
diff --git a/addons/web/static/src/core/network/rpc_cache.js b/addons/web/static/src/core/network/rpc_cache.js
index d1d9a144225ca..844b03910dadb 100644
--- a/addons/web/static/src/core/network/rpc_cache.js
+++ b/addons/web/static/src/core/network/rpc_cache.js
@@ -1,4 +1,3 @@
-import { Deferred } from "@web/core/utils/concurrency";
 import { IndexedDB } from "@web/core/utils/indexed_db";
 import { deepCopy } from "../utils/objects";
 
@@ -140,7 +139,7 @@ export class RPCCache {
 
             // execute the fallback and write the result in the caches
             const prom = new Promise((resolve, reject) => {
-                const fromCache = new Deferred();
+                const fromCache = Promise.withResolvers();
                 let fromCacheValue;
                 const onFullfilled = (result) => {
                     resolve(result);
@@ -161,7 +160,7 @@ export class RPCCache {
                     return result;
                 };
                 const onRejected = async (error) => {
-                    await fromCache;
+                    await fromCache.promise;
                     if (!request.invalidated) {
                         delete this.pendingRequests[requestKey];
                         if (!fromCacheValue) {
diff --git a/addons/web/static/src/core/utils/concurrency.js b/addons/web/static/src/core/utils/concurrency.js
index a6996bbb2a1d7..30af7377425e7 100644
--- a/addons/web/static/src/core/utils/concurrency.js
+++ b/addons/web/static/src/core/utils/concurrency.js
@@ -177,6 +177,8 @@ export class Race {
 }
 
 /**
+ * @deprecated Use Promise.withResolvers() instead.
+ *
  * Deferred is basically a resolvable/rejectable extension of Promise.
  */
 export class Deferred extends Promise {
diff --git a/addons/web/static/src/legacy/js/public/public_root.js b/addons/web/static/src/legacy/js/public/public_root.js
index 19919fb7a9d6b..498778d4b0db5 100644
--- a/addons/web/static/src/legacy/js/public/public_root.js
+++ b/addons/web/static/src/legacy/js/public/public_root.js
@@ -157,7 +157,7 @@ export const PublicRoot = publicWidget.Widget.extend({
      *        only initialize the public widgets whose `selector` matches the
      *        element or one of its descendant (default to the wrapwrap element)
      * @param {Object} [options]
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     _startWidgets: function ($from, options) {
         var self = this;
diff --git a/addons/web/static/src/model/model.js b/addons/web/static/src/model/model.js
index 81deef6d1b90a..0559887f21210 100644
--- a/addons/web/static/src/model/model.js
+++ b/addons/web/static/src/model/model.js
@@ -1,6 +1,6 @@
 import { RPCError } from "@web/core/network/rpc";
 import { user } from "@web/core/user";
-import { Deferred, Race } from "@web/core/utils/concurrency";
+import { Race } from "@web/core/utils/concurrency";
 import { useService } from "@web/core/utils/hooks";
 import { useSetupAction } from "@web/search/action_hook";
 import { SEARCH_KEYS } from "@web/search/with_search/with_search";
@@ -34,8 +34,8 @@ export class Model {
         this.orm = services.orm;
         this.bus = new EventBus();
         this.isReady = false;
-        this.whenReady = new Deferred();
-        this.whenReady.then(() => {
+        this.whenReady = Promise.withResolvers();
+        this.whenReady.promise.then(() => {
             this.isReady = true;
             this.notify();
         });
diff --git a/addons/web/static/src/model/relational_model/relational_model.js b/addons/web/static/src/model/relational_model/relational_model.js
index a1f81c1d2cf34..d241ad4fd119f 100644
--- a/addons/web/static/src/model/relational_model/relational_model.js
+++ b/addons/web/static/src/model/relational_model/relational_model.js
@@ -7,7 +7,7 @@ import { WarningDialog } from "@web/core/errors/error_dialogs";
 import { rpcBus } from "@web/core/network/rpc";
 import { shallowEqual } from "@web/core/utils/arrays";
 import { pick } from "@web/core/utils/objects";
-import { Deferred, KeepLast, Mutex } from "@web/core/utils/concurrency";
+import { KeepLast, Mutex } from "@web/core/utils/concurrency";
 import { orderByToString } from "@web/search/utils/order_by";
 import { Model } from "../model";
 import { DynamicGroupList } from "./dynamic_group_list";
@@ -202,11 +202,11 @@ export class RelationalModel extends Model {
             this.config = config;
         }
         this.hooks.onWillLoadRoot(config);
-        const rootLoadDef = new Deferred();
-        const cache = this._getCacheParams(config, rootLoadDef);
+        const { promise, resolve } = Promise.withResolvers();
+        const cache = this._getCacheParams(config, promise);
         const data = await this.keepLast.add(this._loadData(config, cache));
         this.root = this._createRoot(config, data);
-        rootLoadDef.resolve({ root: this.root, loadId: config.loadId });
+        resolve({ root: this.root, loadId: config.loadId });
         this.config = config;
         await this.hooks.onRootLoaded(this.root);
     }
@@ -279,7 +279,7 @@ export class RelationalModel extends Model {
         return new this.constructor.DynamicRecordList(this, config, data);
     }
 
-    _getCacheParams(config, rootLoadDef) {
+    _getCacheParams(config, rootLoadProm) {
         if (!this.withCache) {
             return;
         }
@@ -296,7 +296,7 @@ export class RelationalModel extends Model {
                     if (!hasChanged) {
                         return;
                     }
-                    const { root, loadId } = await rootLoadDef;
+                    const { root, loadId } = await rootLoadProm;
                     if (root.id !== this.root.id) {
                         // The root id might have changed, either because:
                         //  1) the user already changed the domain and a second load has been done
diff --git a/addons/web/static/src/model/relational_model/utils.js b/addons/web/static/src/model/relational_model/utils.js
index 9f828f262073b..c1a866332ce91 100644
--- a/addons/web/static/src/model/relational_model/utils.js
+++ b/addons/web/static/src/model/relational_model/utils.js
@@ -9,7 +9,6 @@ import {
 } from "@web/core/l10n/dates";
 import { x2ManyCommands } from "@web/core/orm_service";
 import { evaluateExpr } from "@web/core/py_js/py";
-import { Deferred } from "@web/core/utils/concurrency";
 import { omit } from "@web/core/utils/objects";
 import { effect } from "@web/core/utils/reactive";
 import { batched } from "@web/core/utils/timing";
@@ -767,16 +766,14 @@ export function useRecordObserver(callback) {
         if (!props.record) {
             return;
         }
-        const def = new Deferred();
+        const { promise, resolve, reject } = Promise.withResolvers();
         const effectId = currentId;
         let firstCall = true;
         effect(
             (record) => {
                 if (firstCall) {
                     firstCall = false;
-                    return Promise.resolve(callback(record, props))
-                        .then(def.resolve)
-                        .catch(def.reject);
+                    return Promise.resolve(callback(record, props)).then(resolve).catch(reject);
                 } else {
                     return batched(
                         (record) => {
@@ -786,16 +783,16 @@ export function useRecordObserver(callback) {
                                 return;
                             }
                             return Promise.resolve(callback(record, props))
-                                .then(def.resolve)
-                                .catch(def.reject);
+                                .then(resolve)
+                                .catch(reject);
                         },
-                        () => new Promise((resolve) => window.requestAnimationFrame(resolve))
+                        () => new Promise((res) => window.requestAnimationFrame(res))
                     )(record);
                 }
             },
             [props.record]
         );
-        return def;
+        return promise;
     };
     onWillDestroy(() => {
         currentId = uniqueId();
diff --git a/addons/web/static/src/polyfills/promise.js b/addons/web/static/src/polyfills/promise.js
new file mode 100644
index 0000000000000..8dc487ea18809
--- /dev/null
+++ b/addons/web/static/src/polyfills/promise.js
@@ -0,0 +1,11 @@
+// @odoo-module ignore
+if (!Promise.withResolvers) {
+    Promise.withResolvers = function withResolvers() {
+        let resolve, reject;
+        const promise = new Promise((res, rej) => {
+            resolve = res;
+            reject = rej;
+        });
+        return { promise, resolve, reject };
+    };
+}
diff --git a/addons/web/static/src/views/list/list_controller.js b/addons/web/static/src/views/list/list_controller.js
index e853bac95c4c1..37142970b4ebd 100644
--- a/addons/web/static/src/views/list/list_controller.js
+++ b/addons/web/static/src/views/list/list_controller.js
@@ -323,7 +323,7 @@ export class ListController extends Component {
         if (!this.model.isReady && !this.model.config.groupBy.length && this.editable) {
             // If the view isn't grouped and the list is editable, a new record row will be added,
             // in edition. In this situation, we must wait for the model to be ready.
-            await this.model.whenReady;
+            await this.model.whenReady.promise;
         }
         const list = (group && group.list) || this.model.root;
         if (this.editable && !list.isGrouped) {
diff --git a/addons/web/static/src/webclient/actions/action_service.js b/addons/web/static/src/webclient/actions/action_service.js
index cd03dea6d5f6a..b15140aadcd46 100644
--- a/addons/web/static/src/webclient/actions/action_service.js
+++ b/addons/web/static/src/webclient/actions/action_service.js
@@ -6,7 +6,7 @@ import { evaluateExpr } from "@web/core/py_js/py";
 import { rpc, rpcBus } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { user } from "@web/core/user";
-import { Deferred, KeepLast } from "@web/core/utils/concurrency";
+import { KeepLast } from "@web/core/utils/concurrency";
 import { useBus, useService } from "@web/core/utils/hooks";
 import { View, ViewNotFoundError } from "@web/views/view";
 import { ActionDialog } from "./action_dialog";
@@ -1119,16 +1119,16 @@ export function makeActionManager(env, router = _router) {
         }
 
         if (options.clearBreadcrumbs && !options.noEmptyTransition) {
-            const def = new Deferred();
+            const { promise, resolve } = Promise.withResolvers();
             env.bus.trigger("ACTION_MANAGER:UPDATE", {
                 id: ++id,
                 Component: BlankComponent,
                 componentProps: {
-                    onMounted: () => def.resolve(),
+                    onMounted: () => resolve(),
                     withControlPanel: action.type === "ir.actions.act_window",
                 },
             });
-            await def;
+            await promise;
         }
         if (options.onActionReady) {
             options.onActionReady(action);
diff --git a/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js b/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js
index 431046ba09107..e36c8e41c6c70 100644
--- a/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js
+++ b/addons/web/static/src/webclient/settings_form_view/settings/settings_page.js
@@ -2,7 +2,6 @@ import { ActionSwiper } from "@web/core/action_swiper/action_swiper";
 
 import { Component, useState, useRef, useEffect } from "@odoo/owl";
 import { browser } from "@web/core/browser/browser";
-import { Deferred } from "@web/core/utils/concurrency";
 
 export class SettingsPage extends Component {
     static template = "web.SettingsPage";
@@ -74,14 +73,14 @@ export class SettingsPage extends Component {
         );
     }
     onRightSwipe() {
-        this.tabChangeProm = new Deferred();
+        this.tabChangeProm = Promise.withResolvers();
         this.state.selectedTab = this.props.modules[this.getCurrentIndex() - 1].key;
-        return this.tabChangeProm;
+        return this.tabChangeProm.promise;
     }
     onLeftSwipe() {
-        this.tabChangeProm = new Deferred();
+        this.tabChangeProm = Promise.withResolvers();
         this.state.selectedTab = this.props.modules[this.getCurrentIndex() + 1].key;
-        return this.tabChangeProm;
+        return this.tabChangeProm.promise;
     }
 
     scrollToSelectedTab() {
diff --git a/addons/web/static/src/webclient/webclient.js b/addons/web/static/src/webclient/webclient.js
index e2cbb322330e1..7bca08168f766 100644
--- a/addons/web/static/src/webclient/webclient.js
+++ b/addons/web/static/src/webclient/webclient.js
@@ -1,5 +1,4 @@
 import { useOwnDebugContext } from "@web/core/debug/debug_context";
-import { Deferred } from "@web/core/utils/concurrency";
 import { DebugMenu } from "@web/core/debug/debug_menu";
 import { localization } from "@web/core/l10n/localization";
 import { MainComponentsContainer } from "@web/core/main_components_container";
@@ -61,7 +60,8 @@ export class WebClient extends Component {
             this.env.bus.trigger("WEB_CLIENT_READY");
         });
         useExternalListener(window, "click", this.onGlobalClick, { capture: true });
-        this.serviceWorkerActivatedDeferred = new Deferred();
+        this.serviceWorkerActivationResolvers = Promise.withResolvers();
+        this.serviceWorkerIsActivated = this.serviceWorkerActivationResolvers.promise;
         onWillStart(this.registerServiceWorker);
     }
 
@@ -173,13 +173,13 @@ export class WebClient extends Component {
                 .register("/web/service-worker.js", { scope: "/odoo" })
                 .then((registration) => {
                     if (registration.active && registration.active.state === "activated") {
-                        this.serviceWorkerActivatedDeferred.resolve();
+                        this.serviceWorkerActivationResolvers.resolve();
                     } else {
                         const sw =
                             registration.installing || registration.waiting || registration.active;
                         sw.addEventListener("statechange", (e) => {
                             if (e.target.state === "activated") {
-                                this.serviceWorkerActivatedDeferred.resolve();
+                                this.serviceWorkerActivationResolvers.resolve();
                             }
                         });
                     }
diff --git a/addons/web/static/tests/legacy/helpers/utils.js b/addons/web/static/tests/legacy/helpers/utils.js
index 666ee6f749949..0a44728ecd7ec 100644
--- a/addons/web/static/tests/legacy/helpers/utils.js
+++ b/addons/web/static/tests/legacy/helpers/utils.js
@@ -1,6 +1,5 @@
 /** @odoo-module alias=@web/../tests/helpers/utils default=false */
 
-import { Deferred } from "@web/core/utils/concurrency";
 import { patch } from "@web/core/utils/patch";
 import { isVisible } from "@web/core/utils/ui";
 import { registerCleanup } from "./cleanup";
@@ -47,10 +46,6 @@ export async function nextTick() {
     await new Promise((resolve) => setTimeout(resolve));
 }
 
-export function makeDeferred() {
-    return new Deferred();
-}
-
 function findElement(el, selector) {
     let target = el;
     if (selector) {
diff --git a/addons/web/static/tests/legacy/utils.js b/addons/web/static/tests/legacy/utils.js
index 327cb23a2650b..e486706b7b283 100644
--- a/addons/web/static/tests/legacy/utils.js
+++ b/addons/web/static/tests/legacy/utils.js
@@ -5,7 +5,6 @@ import { registerCleanup } from "@web/../tests/helpers/cleanup";
 import {
     click as webClick,
     getFixture,
-    makeDeferred,
     triggerEvents as webTriggerEvents,
 } from "@web/../tests/helpers/utils";
 
@@ -241,7 +240,7 @@ class Contains {
      */
     run() {
         this.done = false;
-        this.def = makeDeferred();
+        this.def = Promise.withResolvers();
         this.scrollListeners = new Set();
         this.onScroll = () => this.runOnce("after scroll");
         if (!this.runOnce("immediately")) {
@@ -267,7 +266,7 @@ class Contains {
                 }
             });
         }
-        return this.def;
+        return this.def.promise;
     }
 
     /**

From ec916b4433d00004ab3924aeb612109c087aed8e Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 12 Nov 2025 13:27:52 +0100
Subject: [PATCH 491/673] [REF] mail, im_livechat: make channel_member_list use
 channel instead of thread

Before this commit, the channel_member_list component received a thread
as a prop.
This commit updates it to use the channel directly.

closes odoo/odoo#235287

Related: odoo/enterprise#99267
Signed-off-by: Didier Debondt (did) <did@odoo.com>
---
 .../core/common/channel_member_list_patch.xml    |  2 +-
 .../discuss/core/common/channel_member_list.js   | 14 +++++++-------
 .../discuss/core/common/channel_member_list.xml  | 16 ++++++++--------
 .../src/discuss/core/common/thread_actions.js    |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/im_livechat/static/src/core/common/channel_member_list_patch.xml b/addons/im_livechat/static/src/core/common/channel_member_list_patch.xml
index 7c040d9a49bee..ec6bd4d5b15b8 100644
--- a/addons/im_livechat/static/src/core/common/channel_member_list_patch.xml
+++ b/addons/im_livechat/static/src/core/common/channel_member_list_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
     <t t-name="im_livechat.ChannelMemberList" t-inherit="discuss.ChannelMemberList" t-inherit-mode="extension">
         <xpath expr="//button[@name='inviteButton']" position="attributes">
-            <attribute name="t-if">!props.thread.livechat_end_dt</attribute>
+            <attribute name="t-if">!props.channel.livechat_end_dt</attribute>
         </xpath>
     </t>
 </templates>
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.js b/addons/mail/static/src/discuss/core/common/channel_member_list.js
index a5d6fa9d71378..5ae46d04bc809 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_list.js
+++ b/addons/mail/static/src/discuss/core/common/channel_member_list.js
@@ -8,33 +8,33 @@ import { useService } from "@web/core/utils/hooks";
 
 export class ChannelMemberList extends Component {
     static components = { ActionPanel, ChannelMember };
-    static props = ["thread", "openChannelInvitePanel", "className?"];
+    static props = ["channel", "openChannelInvitePanel", "className?"];
     static template = "discuss.ChannelMemberList";
 
     setup() {
         super.setup();
         this.store = useService("mail.store");
         onWillStart(() => {
-            if (this.props.thread.fetchMembersState === "not_fetched") {
-                this.props.thread.fetchChannelMembers();
+            if (this.props.channel.fetchMembersState === "not_fetched") {
+                this.props.channel.fetchChannelMembers();
             }
         });
         onWillUpdateProps((nextProps) => {
-            if (nextProps.thread.fetchMembersState === "not_fetched") {
-                nextProps.thread.fetchChannelMembers();
+            if (nextProps.channel.fetchMembersState === "not_fetched") {
+                nextProps.channel.fetchChannelMembers();
             }
         });
     }
 
     get onlineSectionText() {
         return _t("Online - %(online_count)s", {
-            online_count: this.props.thread.onlineMembers.length,
+            online_count: this.props.channel.onlineMembers.length,
         });
     }
 
     get offlineSectionText() {
         return _t("Offline - %(offline_count)s", {
-            offline_count: this.props.thread.offlineMembers.length,
+            offline_count: this.props.channel.offlineMembers.length,
         });
     }
 }
diff --git a/addons/mail/static/src/discuss/core/common/channel_member_list.xml b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
index 8fe5c5d37df51..7fc90faef3ff3 100644
--- a/addons/mail/static/src/discuss/core/common/channel_member_list.xml
+++ b/addons/mail/static/src/discuss/core/common/channel_member_list.xml
@@ -4,26 +4,26 @@
     <t t-name="discuss.ChannelMemberList">
         <ActionPanel title.translate="Members" minWidth="200" initialWidth="env.inMeetingView ? 400 : 250" icon="'oi oi-users'">
             <button name="inviteButton" t-on-click="() => props.openChannelInvitePanel({ keepPrevious: env.inChatWindow })" class="btn btn-sm btn-secondary mt-2 d-flex align-items-center justify-content-center gap-1 rounded-3"><i class="oi oi-user-plus"/><span>Invite a User</span></button>
-            <t t-if="props.thread.onlineMembers.length > 0">
+            <t t-if="props.channel.onlineMembers.length > 0">
                 <t t-call="discuss.ChannelMemberList.section">
                     <t t-set="sectionName" t-value="onlineSectionText"/>
                 </t>
                 <div class="d-flex flex-column bg-inherit gap-1">
-                    <ChannelMember t-foreach="props.thread.onlineMembers" t-as="member" t-key="member.id" member="member"/>
+                    <ChannelMember t-foreach="props.channel.onlineMembers" t-as="member" t-key="member.id" member="member"/>
                 </div>
             </t>
-            <t name="offlineMembers" t-if="props.thread.offlineMembers.length > 0">
+            <t name="offlineMembers" t-if="props.channel.offlineMembers.length > 0">
                 <t t-call="discuss.ChannelMemberList.section">
                     <t t-set="sectionName" t-value="offlineSectionText"/>
                 </t>
                 <div class="d-flex flex-column bg-inherit gap-1">
-                    <ChannelMember t-foreach="props.thread.offlineMembers" t-as="member" t-key="member.id" member="member"/>
+                    <ChannelMember t-foreach="props.channel.offlineMembers" t-as="member" t-key="member.id" member="member"/>
                 </div>
             </t>
-            <span t-if="props.thread.unknownMembersCount === 1" class="mx-2 mt-2">And 1 other member.</span>
-            <span t-if="props.thread.unknownMembersCount > 1" class="mx-2 mt-2">And <t t-esc="props.thread.unknownMembersCount"/> other members.</span>
-            <div t-if="!props.thread.areAllMembersLoaded" class="mx-2 my-1">
-                <button class="btn btn-secondary" title="Load more" t-on-click.stop="() => props.thread.fetchChannelMembers()">Load more</button>
+            <span t-if="props.channel.unknownMembersCount === 1" class="mx-2 mt-2">And 1 other member.</span>
+            <span t-if="props.channel.unknownMembersCount > 1" class="mx-2 mt-2">And <t t-esc="props.channel.unknownMembersCount"/> other members.</span>
+            <div t-if="!props.channel.areAllMembersLoaded" class="mx-2 my-1">
+                <button class="btn btn-secondary" title="Load more" t-on-click.stop="() => props.channel.fetchChannelMembers()">Load more</button>
             </div>
         </ActionPanel>
     </t>
diff --git a/addons/mail/static/src/discuss/core/common/thread_actions.js b/addons/mail/static/src/discuss/core/common/thread_actions.js
index 6eef35a3d6605..a930de1d77308 100644
--- a/addons/mail/static/src/discuss/core/common/thread_actions.js
+++ b/addons/mail/static/src/discuss/core/common/thread_actions.js
@@ -175,13 +175,13 @@ registerThreadAction("member-list", {
         }
     },
     actionPanelComponent: ChannelMemberList,
-    actionPanelComponentProps: ({ actions, thread }) => ({
+    actionPanelComponentProps: ({ actions, channel }) => ({
         openChannelInvitePanel({ keepPrevious } = {}) {
             actions.actions
                 .find(({ id }) => id === "invite-people")
                 ?.actionPanelOpen({ keepPrevious });
         },
-        thread,
+        channel,
     }),
     actionPanelOpen: ({ owner, store }) => {
         if (owner.env.inDiscussApp) {
@@ -189,8 +189,8 @@ registerThreadAction("member-list", {
         }
     },
     actionPanelOuterClass: "o-discuss-ChannelMemberList bg-inherit",
-    condition: ({ owner, thread }) =>
-        thread?.hasMemberList &&
+    condition: ({ owner, channel }) =>
+        channel?.hasMemberList &&
         (!owner.props.chatWindow || owner.props.chatWindow.isOpen) &&
         !owner.isDiscussSidebarChannelActions,
     icon: "oi oi-fw oi-users",

From 07485f01f6f1ba41e1ebff54a3cd075e847e6e3b Mon Sep 17 00:00:00 2001
From: "Augustin (duau)" <duau@odoo.com>
Date: Fri, 7 Nov 2025 17:22:28 +0100
Subject: [PATCH 492/673] [REM] html_builder: remove obsolete TODO comment in
 SelectMany2X

The TODO referenced features from the pre-website-refactoring [1]
implementation.

`filterInModel` and `filterInField` were originally introduced in [2]
and used only for online appointment option implemented in [3].
After the website refactoring, that logic is now implemented directly in
the updated option code [4], making the old mechanism irrelevant for
SelectMany2X.

`callWith` is already implemented in VisibilityOptionPlugin, as it was
the only use case.
`nullText` is implemented in SelectMany2X.

task-5248164

[1]: https://github.com/odoo/odoo/commit/9fe45e2b7ddbbfd0445ffe25a859e67a316d02b2
[2]: https://github.com/odoo/odoo/commit/be9f264011363565333f450d7601e2bafea3c409
[3]: https://github.com/odoo/enterprise/commit/64a7eb0006a59240f3a95e77628cedfc02b8e585
[4]: https://github.com/odoo/enterprise/commit/689a2186fbe3b932b90bef3b64716c8443bad551#diff-651f0a74ed9cb6ecf1eb5ac2c6e889f59ced60eef289c4949956db721f54e085R30-R35

closes odoo/odoo#234970

Signed-off-by: Robin Lejeune (role) <role@odoo.com>
---
 .../static/src/core/building_blocks/select_many2x.xml           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/html_builder/static/src/core/building_blocks/select_many2x.xml b/addons/html_builder/static/src/core/building_blocks/select_many2x.xml
index 5c7211f4789c3..95cc33fcfa6db 100644
--- a/addons/html_builder/static/src/core/building_blocks/select_many2x.xml
+++ b/addons/html_builder/static/src/core/building_blocks/select_many2x.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
 
-<!-- TODO: support more features from the previous implementation: "callWith", "filterInModel", "filterInField", "nullText" -->
-
 <t t-name="html_builder.SelectMany2X">
     <SelectMenu
         choices="this.filteredSearchResult().map(e => ({ value: e, label: e.display_name  }))"

From 4f85b68dd0ad353b410c417903a55c2cfbe44edb Mon Sep 17 00:00:00 2001
From: Maryam Kia <maki@odoo.com>
Date: Thu, 25 Sep 2025 14:47:55 +0200
Subject: [PATCH 493/673] [IMP] website_livechat, *: visitor history
 calculation on the client side

*: mail, website

This change introduces the `websiteTrack` JS model. By sending related
website track records through the `store`, visitor history is now calculated
based on those records in the client part.
Using a batched query instead of separate searches for each visitor in this
change, significantly reduces the number of queries when fetching data for
multiple visitors.

task-4676121

closes odoo/odoo#228693

Signed-off-by: Maryam Kia (maki) <maki@odoo.com>
---
 .../tests/mock_server/mail_mock_server.js     |  1 +
 .../static/src/common/@types/models.d.ts      |  8 ++
 .../static/src/common/website_page_model.js   | 11 +++
 .../static/src/common/website_track_model.js  | 11 +++
 .../models/discuss_channel.py                 |  3 -
 .../models/website_visitor.py                 | 43 ++++++---
 .../static/src/web/@types/models.d.ts         |  2 +-
 .../src/web/website_visitor_model_patch.js    | 19 ++--
 .../livechat_channel_info_list_patch.test.js  |  2 +-
 .../mock_models/website_visitor.js            | 35 ++++---
 .../tests/test_livechat_basic_flow.py         | 95 +++++++++++--------
 11 files changed, 148 insertions(+), 82 deletions(-)
 create mode 100644 addons/website/static/src/common/website_page_model.js
 create mode 100644 addons/website/static/src/common/website_track_model.js

diff --git a/addons/mail/static/tests/mock_server/mail_mock_server.js b/addons/mail/static/tests/mock_server/mail_mock_server.js
index 0232c1b3404a2..dbfd745e05e23 100644
--- a/addons/mail/static/tests/mock_server/mail_mock_server.js
+++ b/addons/mail/static/tests/mock_server/mail_mock_server.js
@@ -1330,6 +1330,7 @@ export class StoreMany extends StoreRelation {
             })
         );
         this.mode = mode;
+        this.sort = sort;
     }
     _copy_with_records(target, record) {
         const res = super._copy_with_records(target, record);
diff --git a/addons/website/static/src/common/@types/models.d.ts b/addons/website/static/src/common/@types/models.d.ts
index 3bac51a1ff68a..348aa51baa2a8 100644
--- a/addons/website/static/src/common/@types/models.d.ts
+++ b/addons/website/static/src/common/@types/models.d.ts
@@ -1,17 +1,25 @@
 declare module "models" {
     import { Website as WebsiteClass } from "@website/common/website_model";
+    import { WebsitePage as WebsitePageClass } from "@website/common/website_page_model";
+    import { WebsiteTrack as WebsiteTrackClass } from "@website/common/website_track_model";
     import { WebsiteVisitor as WebsiteVisitorClass } from "@website/common/website_visitor_model";
 
     export interface Website extends WebsiteClass {}
+    export interface WebsitePage extends WebsitePageClass {}
+    export interface WebsiteTrack extends WebsiteTrackClass {}
     export interface WebsiteVisitor extends WebsiteVisitorClass {}
 
     export interface Store {
         website: StaticMailRecord<Website, typeof WebsiteClass>;
+        "website.page": StaticMailRecord<WebsitePage, typeof WebsitePageClass>;
+        "website.track": StaticMailRecord<WebsiteTrack, typeof WebsiteTrackClass>;
         "website.visitor": StaticMailRecord<WebsiteVisitor, typeof WebsiteVisitorClass>;
     }
 
     export interface Models {
         "website": Website;
+        "website.page": WebsitePage;
+        "website.track": WebsiteTrack;
         "website.visitor": WebsiteVisitor;
     }
 }
diff --git a/addons/website/static/src/common/website_page_model.js b/addons/website/static/src/common/website_page_model.js
new file mode 100644
index 0000000000000..e65e723cd45e2
--- /dev/null
+++ b/addons/website/static/src/common/website_page_model.js
@@ -0,0 +1,11 @@
+import { Record } from "@mail/model/export";
+
+export class WebsitePage extends Record {
+    static _name = "website.page";
+    static id = "id";
+
+    /** @type {string} */
+    name;
+}
+
+WebsitePage.register();
diff --git a/addons/website/static/src/common/website_track_model.js b/addons/website/static/src/common/website_track_model.js
new file mode 100644
index 0000000000000..d0e9184c19922
--- /dev/null
+++ b/addons/website/static/src/common/website_track_model.js
@@ -0,0 +1,11 @@
+import { fields, Record } from "@mail/model/export";
+
+export class WebsiteTrack extends Record {
+    static _name = "website.track";
+    static id = "id";
+
+    page_id = fields.One("website.page");
+    visit_datetime = fields.Datetime();
+}
+
+WebsiteTrack.register();
diff --git a/addons/website_livechat/models/discuss_channel.py b/addons/website_livechat/models/discuss_channel.py
index 22109123f1d72..dc07296d82967 100644
--- a/addons/website_livechat/models/discuss_channel.py
+++ b/addons/website_livechat/models/discuss_channel.py
@@ -51,9 +51,6 @@ def _to_store_defaults(self, target):
             ),
         ]
 
-    def _get_visitor_history(self, visitor):
-        return visitor._get_visitor_history()
-
     def _get_visitor_leave_message(self, operator=False, cancel=False):
         if not cancel:
             if self.livechat_visitor_id.id:
diff --git a/addons/website_livechat/models/website_visitor.py b/addons/website_livechat/models/website_visitor.py
index 158ae0919dbe7..c7c6ddb2ac414 100644
--- a/addons/website_livechat/models/website_visitor.py
+++ b/addons/website_livechat/models/website_visitor.py
@@ -118,17 +118,38 @@ def _upsert_visitor(self, access_token, force_track_values=None):
         return visitor_id, upsert
 
     def _get_store_visitor_history_fields(self):
-        return [
-            # sudo: website.track - reading the history of accessible visitor is acceptable
-            Store.Attr("page_visit_history", lambda visitor: visitor.sudo()._get_visitor_history()),
-        ]
-
-    def _get_visitor_history(self):
-        self.ensure_one()
-        recent_history = self.env["website.track"].search(
-            [("page_id", "!=", False), ("visitor_id", "=", self.id)], limit=3
+        if not self:
+            return []
+        self.env.cr.execute(
+            """
+                SELECT website_visitor.id AS visitor_id,
+                       ARRAY_AGG(website_track.id ORDER BY website_track.visit_datetime DESC, website_track.id DESC) AS track_ids
+                  FROM website_visitor
+          JOIN LATERAL
+                  (
+                      SELECT website_track.id,
+                             website_track.visit_datetime
+                        FROM website_track
+                       WHERE website_track.visitor_id = website_visitor.id
+                         AND website_track.page_id IS NOT NULL
+                    ORDER BY website_track.visit_datetime DESC, website_track.id DESC
+                       LIMIT 3
+                  ) AS website_track ON TRUE
+                 WHERE website_visitor.id IN %s
+              GROUP BY website_visitor.id;
+            """,
+            [tuple(self.ids)],
         )
+        results = dict(self.env.cr.fetchall())
+        all_track_ids = [track_id for track_list in results.values() for track_id in track_list]
         return [
-            (visit.page_id.name, fields.Datetime.to_string(visit.visit_datetime))
-            for visit in reversed(recent_history)
+            # sudo: website.track - reading the history of accessible visitor is acceptable
+            Store.Many(
+                "last_track_ids",
+                [Store.One("page_id", ["name"]), "visit_datetime"],
+                value=lambda visitor: self.env["website.track"]
+                .browse(results.get(visitor.id))
+                .with_prefetch(all_track_ids),
+                sudo=True,
+            ),
         ]
diff --git a/addons/website_livechat/static/src/web/@types/models.d.ts b/addons/website_livechat/static/src/web/@types/models.d.ts
index dad6fb73c0b53..f38830dc34f06 100644
--- a/addons/website_livechat/static/src/web/@types/models.d.ts
+++ b/addons/website_livechat/static/src/web/@types/models.d.ts
@@ -1,7 +1,7 @@
 declare module "models" {
     export interface WebsiteVisitor {
         discuss_channel_ids: Thread[];
-        page_visit_history: Array<[string, string]>;
+        last_track_ids: WebsiteTrack[];
         pageVisitHistoryText: Readonly<string>;
     }
 }
diff --git a/addons/website_livechat/static/src/web/website_visitor_model_patch.js b/addons/website_livechat/static/src/web/website_visitor_model_patch.js
index 67565c34f1a5e..38d8e275918fa 100644
--- a/addons/website_livechat/static/src/web/website_visitor_model_patch.js
+++ b/addons/website_livechat/static/src/web/website_visitor_model_patch.js
@@ -1,6 +1,5 @@
 import { fields } from "@mail/model/export";
 
-import { deserializeDateTime } from "@web/core/l10n/dates";
 import { patch } from "@web/core/utils/patch";
 
 import { WebsiteVisitor } from "@website/common/website_visitor_model";
@@ -11,19 +10,19 @@ const { DateTime } = luxon;
 const websiteVisitorPatch = {
     setup() {
         super.setup();
-        /** @type {Array<[string, string]>} */
-        this.page_visit_history = [];
         this.discuss_channel_ids = fields.Many("mail.thread");
+        this.last_track_ids = fields.Many("website.track");
     },
     /** @returns {string} */
     get pageVisitHistoryText() {
-        const history = [];
-        for (const h of this.page_visit_history) {
-            const [label, date] = h;
-            const time = deserializeDateTime(date).toLocaleString(DateTime.TIME_24_SIMPLE);
-            history.push(`${label} (${time})`);
-        }
-        return history.join(" → ");
+        return this.last_track_ids
+            .map(
+                (track) =>
+                    `${track.page_id.name} (${track.visit_datetime.toLocaleString(
+                        DateTime.TIME_24_SIMPLE
+                    )})`
+            )
+            .join(" → ");
     },
 };
 patch(WebsiteVisitor.prototype, websiteVisitorPatch);
diff --git a/addons/website_livechat/static/tests/livechat_channel_info_list_patch.test.js b/addons/website_livechat/static/tests/livechat_channel_info_list_patch.test.js
index 96b2d6f2c022f..5973620666470 100644
--- a/addons/website_livechat/static/tests/livechat_channel_info_list_patch.test.js
+++ b/addons/website_livechat/static/tests/livechat_channel_info_list_patch.test.js
@@ -47,5 +47,5 @@ test("shows language, country and recent page views", async () => {
     await contains(`.o_country_flag[data-src*='/country_flags/${country.code.toLowerCase()}.png']`);
     await contains("h6", { text: "Recent page views" });
     await contains("div > span", { text: "General website" });
-    await contains("span", { text: "Home (21:00) → Contact (21:20)" });
+    await contains("span", { text: "Contact (21:20) → Home (21:00)" });
 });
diff --git a/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js b/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js
index dff5661829cbe..85712dabe457c 100644
--- a/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js
+++ b/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js
@@ -1,6 +1,6 @@
 import { mailDataHelpers } from "@mail/../tests/mock_server/mail_mock_server";
 
-import { Command, serverState } from "@web/../tests/web_test_helpers";
+import { Command, makeKwArgs, serverState } from "@web/../tests/web_test_helpers";
 import { websiteModels } from "@website/../tests/helpers";
 
 export class WebsiteVisitor extends websiteModels.WebsiteVisitor {
@@ -57,27 +57,26 @@ export class WebsiteVisitor extends websiteModels.WebsiteVisitor {
 
     _to_store(store) {
         super._to_store(store);
+        /** @type {import("mock_models").WebsiteTrack} */
+        const WebsiteTrack = this.env["website.track"];
         for (const visitor of this) {
             const visitor_model = this.browse(visitor.id);
             const [data] = this._read_format(visitor.id, []);
-            data.page_visit_history = visitor_model._get_visitor_history();
+            const track_records = WebsiteTrack.search_read(
+                [
+                    ["page_id", "!=", false],
+                    ["visitor_id", "=", visitor.id],
+                ],
+                { limit: 3 }
+            );
+            data.last_track_ids = mailDataHelpers.Store.many(
+                WebsiteTrack.browse(track_records.map((t) => t.id)),
+                makeKwArgs({
+                    fields: [mailDataHelpers.Store.one("page_id", ["name"]), "visit_datetime"],
+                    sort: (a, b) => (a.visit_datetime < b.visit_datetime ? 1 : -1),
+                })
+            );
             store._add_record_fields(visitor_model, data);
         }
     }
-
-    _get_visitor_history() {
-        const recent_history = this.env["website.track"].search_read(
-            [
-                ["page_id", "!=", false],
-                ["visitor_id", "=", this[0].id],
-            ],
-            { limit: 3 }
-        );
-        return recent_history
-            .map((track) => [
-                this.env["website.page"].browse(track.page_id)[0].name,
-                track.visit_datetime,
-            ])
-            .sort((a, b) => (a[1] < b[1] ? -1 : 1));
-    }
 }
diff --git a/addons/website_livechat/tests/test_livechat_basic_flow.py b/addons/website_livechat/tests/test_livechat_basic_flow.py
index 6cd651a082495..c2bf3d3169c74 100644
--- a/addons/website_livechat/tests/test_livechat_basic_flow.py
+++ b/addons/website_livechat/tests/test_livechat_basic_flow.py
@@ -23,43 +23,6 @@ def test_channel_created_on_user_interaction(self):
         )
         self.assertTrue(channel, 'Channel should be created after sending the first message')
 
-    def test_visitor_banner_history(self):
-        # create visitor history
-        self.env['website.track'].create([{
-            'page_id': self.env.ref('website.homepage_page').id,
-            'visitor_id': self.visitor.id,
-            'visit_datetime': self.base_datetime,
-        }, {
-            'page_id': self.env.ref('website.contactus_page').id,
-            'visitor_id': self.visitor.id,
-            'visit_datetime': self.base_datetime - datetime.timedelta(minutes=10),
-        }, {
-            'page_id': self.env.ref('website.homepage_page').id,
-            'visitor_id': self.visitor.id,
-            'visit_datetime': self.base_datetime - datetime.timedelta(minutes=20),
-        }])
-
-        handmade_history = [
-            (
-                self.env.ref("website.homepage_page").name,
-                (self.base_datetime - datetime.timedelta(minutes=20)).strftime(
-                    "%Y-%m-%d %H:%M:%S"
-                ),
-            ),
-            (
-                self.env.ref("website.contactus_page").name,
-                (self.base_datetime - datetime.timedelta(minutes=10)).strftime(
-                    "%Y-%m-%d %H:%M:%S"
-                ),
-            ),
-            (
-                self.env.ref("website.homepage_page").name,
-                self.base_datetime.strftime("%Y-%m-%d %H:%M:%S"),
-            ),
-        ]
-
-        self.assertEqual(self.visitor._get_visitor_history(), handmade_history)
-
     def test_livechat_username(self):
         # Open a new live chat
         res = self.url_open(url=self.open_chat_url, json=self.open_chat_params)
@@ -200,6 +163,41 @@ def test_channel_visitor_data(self):
         guest = self.env["mail.guest"].search([], order="id desc", limit=1)
         operator_member = channel.channel_member_ids.filtered(lambda m: m.partner_id == self.operator.partner_id)
         guest_member = channel.channel_member_ids.filtered(lambda m: m.guest_id == guest)
+        page_1, page_2 = self.env["website.page"].create(
+            [
+                {
+                    "name": "Test Page 1",
+                    "type": "qweb",
+                    "url": "/page_1",
+                    "website_id": self.env.ref("website.default_website").id,
+                },
+                {
+                    "name": "Test Page 2",
+                    "type": "qweb",
+                    "url": "/page_2",
+                    "website_id": self.env.ref("website.default_website").id,
+                },
+            ]
+        )
+        track_ids = self.env["website.track"].create(
+            [
+                {
+                    "page_id": page_1.id,
+                    "visitor_id": self.visitor.id,
+                    "visit_datetime": self.base_datetime - datetime.timedelta(minutes=20),
+                },
+                {
+                    "page_id": page_2.id,
+                    "visitor_id": self.visitor.id,
+                    "visit_datetime": self.base_datetime - datetime.timedelta(minutes=10),
+                },
+                {
+                    "page_id": page_1.id,
+                    "visitor_id": self.visitor.id,
+                    "visit_datetime": self.base_datetime,
+                },
+            ]
+        )
         self.assertEqual(
             Store().add(channel).get_result(),
             {
@@ -294,13 +292,34 @@ def test_channel_visitor_data(self):
                 "website": [
                     {"id": self.env.ref("website.default_website").id, "name": "My Website"}
                 ],
+                "website.page": [
+                    {"id": page_1.id, "name": "Test Page 1"},
+                    {"id": page_2.id, "name": "Test Page 2"},
+                ],
+                "website.track": [
+                    {
+                        "id": track_ids[2].id,
+                        "page_id": page_1.id,
+                        "visit_datetime": fields.Datetime.to_string(track_ids[2].visit_datetime),
+                    },
+                    {
+                        "id": track_ids[1].id,
+                        "page_id": page_2.id,
+                        "visit_datetime": fields.Datetime.to_string(track_ids[1].visit_datetime),
+                    },
+                    {
+                        "id": track_ids[0].id,
+                        "page_id": page_1.id,
+                        "visit_datetime": fields.Datetime.to_string(track_ids[0].visit_datetime),
+                    },
+                ],
                 "website.visitor": [
                     {
                         "country_id": self.env["ir.model.data"]._xmlid_to_res_id("base.be"),
                         "display_name": f"Website Visitor #{self.visitor.id}",
-                        "page_visit_history": [],
                         "id": self.visitor.id,
                         "lang_id": self.env.ref("base.lang_en").id,
+                        "last_track_ids": track_ids.ids[::-1],
                         "partner_id": False,
                         "website_id": self.env.ref("website.default_website").id,
                     }

From c18fb61e9528fabbd3ea46f71c5a02f424c39255 Mon Sep 17 00:00:00 2001
From: Antoine Boonen <aboo@odoo.com>
Date: Mon, 20 Oct 2025 11:18:35 +0200
Subject: [PATCH 494/673] [IMP] web, *: Make the logout route POST only

* = auth_timeout, auth_totp, bus, portal, test_website, website,
website_livechat, website_sale, test_http

Currently, it is possible to trick and send an image containg
'/web/session/logout' embedded in the chatter. Anytime, the image gets
loaded, the user gets disconnected which can be pretty annoying.

To avoid such behavior, we made to logout route POST only.

task-5245320

closes odoo/odoo#234753

Related: odoo/enterprise#99018
Signed-off-by: Denis Ledoux (dle) <dle@odoo.com>
---
 .../services/check_identity/check_identity.js |  6 ++--
 addons/auth_totp/tests/test_totp.py           |  8 +++++-
 addons/bus/tests/test_websocket_caryall.py    | 16 +++++++++--
 addons/bus/tests/test_websocket_controller.py |  8 +++++-
 addons/portal/views/portal_templates.xml      |  9 ++++--
 addons/test_website/tests/test_session.py     |  8 +++++-
 addons/web/controllers/session.py             |  2 +-
 .../static/src/core/network/http_service.js   |  3 ++
 .../webclient/user_menu/user_menu_items.js    |  8 ++++--
 addons/web/views/webclient_templates.xml      |  7 ++++-
 addons/website/tests/test_website_visitor.py  | 28 ++++++++++++++++---
 .../website_livechat_session_user_changes.js  |  2 +-
 .../tests/test_website_visitor.py             | 10 +++++--
 .../static/tests/tours/cart_recovery.js       | 13 ++++++---
 .../static/tests/tours/complete_flow.js       |  7 +++--
 odoo/addons/test_http/tests/test_session.py   | 17 +++++++++--
 16 files changed, 122 insertions(+), 30 deletions(-)

diff --git a/addons/auth_timeout/static/src/services/check_identity/check_identity.js b/addons/auth_timeout/static/src/services/check_identity/check_identity.js
index ffd5442111113..4c33b43f7881e 100644
--- a/addons/auth_timeout/static/src/services/check_identity/check_identity.js
+++ b/addons/auth_timeout/static/src/services/check_identity/check_identity.js
@@ -5,6 +5,7 @@ import { registry } from "@web/core/registry";
 import { useService } from "@web/core/utils/hooks";
 import { redirect } from "@web/core/utils/urls";
 import { session } from "@web/session";
+import { post } from "@web/core/network/http_service";
 
 import * as passkeyLib from "@auth_passkey/../lib/simplewebauthn";
 
@@ -154,8 +155,9 @@ export class CheckIdentityDialog extends Component {
         this.formProps = {
             close: this.props.close,
         };
-        this.env.dialogData.dismiss = () => {
-            redirect("/web/session/logout");
+        this.env.dialogData.dismiss = async () => {
+            const url = await post('/web/session/logout', { csrf_token: odoo.csrf_token }, "url");
+            redirect(url);
         };
     }
 }
diff --git a/addons/auth_totp/tests/test_totp.py b/addons/auth_totp/tests/test_totp.py
index 5d6de748f5488..1b270802af48a 100644
--- a/addons/auth_totp/tests/test_totp.py
+++ b/addons/auth_totp/tests/test_totp.py
@@ -135,7 +135,13 @@ def test_totp_authenticate(self):
         user.
         """
         self.start_tour('/odoo', 'totp_tour_setup', login='test_user')
-        self.url_open('/web/session/logout')
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
 
         headers = {
             "Content-Type": "application/json",
diff --git a/addons/bus/tests/test_websocket_caryall.py b/addons/bus/tests/test_websocket_caryall.py
index 622c4284233d1..858f3092e55f0 100644
--- a/addons/bus/tests/test_websocket_caryall.py
+++ b/addons/bus/tests/test_websocket_caryall.py
@@ -125,7 +125,13 @@ def test_user_logout_incoming_message(self):
         new_test_user(self.env, login='test_user', password='Password!1')
         user_session = self.authenticate('test_user', 'Password!1')
         websocket = self.websocket_connect(cookie=f'session_id={user_session.sid};')
-        self.url_open('/web/session/logout')
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
         # The session with whom the websocket connected has been
         # deleted. WebSocket should disconnect in order for the
         # session to be updated.
@@ -137,7 +143,13 @@ def test_user_logout_outgoing_message(self):
         user_session = self.authenticate('test_user', 'Password!1')
         websocket = self.websocket_connect(cookie=f'session_id={user_session.sid};')
         self.subscribe(websocket, ['channel1'], self.env['bus.bus']._bus_last_id())
-        self.url_open('/web/session/logout')
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
         # Simulate postgres notify. The session with whom the websocket
         # connected has been deleted. WebSocket should be closed without
         # receiving the message.
diff --git a/addons/bus/tests/test_websocket_controller.py b/addons/bus/tests/test_websocket_controller.py
index f1cec42ee052e..8869e84bca765 100644
--- a/addons/bus/tests/test_websocket_controller.py
+++ b/addons/bus/tests/test_websocket_controller.py
@@ -1,5 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from odoo import http
 from odoo.tests import tagged, JsonRpcException
 from odoo.addons.base.tests.common import HttpCaseWithUserDemo
 
@@ -57,7 +58,12 @@ def test_websocket_peek_session_expired_logout(self):
             'last': 0,
             'is_first_poll': True,
         })
-        self.url_open('/web/session/logout')
+        self.url_open('/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
         # rpc with outdated session should lead to error.
         with self.assertRaises(JsonRpcException, msg='odoo.http.SessionExpiredException'):
             self.make_jsonrpc_request('/websocket/peek_notifications', {
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 969ca0d5a5e1d..e0f07ef7f3a8f 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -106,9 +106,12 @@
                     <i class="fa fa-fw fa-th me-1 small text-primary-emphasis"/> Apps
                 </a>
                 <div id="o_logout_divider" class="dropdown-divider"/>
-                <a t-attf-href="/web/session/logout?redirect=/" role="menuitem" id="o_logout" class="dropdown-item ps-3">
-                    <i class="fa fa-fw fa-sign-out me-1 small text-primary-emphasis"/> Logout
-                </a>
+                <form method="POST" action="/web/session/logout" role="menuitem" class="dropdown-item p-0">
+                    <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                    <button id="o_logout" type="submit" class="btn w-100 ps-3 text-start">
+                        <i class="fa fa-fw fa-sign-out small text-primary-emphasis"/> Logout
+                    </button>
+                </form>
             </div>
         </li>
     </template>
diff --git a/addons/test_website/tests/test_session.py b/addons/test_website/tests/test_session.py
index 9dfaa514902c6..338f7fe937b1b 100644
--- a/addons/test_website/tests/test_session.py
+++ b/addons/test_website/tests/test_session.py
@@ -62,7 +62,13 @@ def test_04_ensure_website_get_cached_values_can_be_called(self):
                           side_effect=get_cached_values_without_cache, autospec=True):
 
             # ensure that permissions on logout are OK
-            res = self.url_open('/web/session/logout')
+            res = self.url_open(
+                '/web/session/logout',
+                method='POST',
+                data={
+                    "csrf_token": http.Request.csrf_token(self),
+                },
+            )
             self.assertEqual(res.status_code, 200)
 
     def test_branding_cache(self):
diff --git a/addons/web/controllers/session.py b/addons/web/controllers/session.py
index daad0a87ab22e..7c6989006f7c6 100644
--- a/addons/web/controllers/session.py
+++ b/addons/web/controllers/session.py
@@ -85,7 +85,7 @@ def account(self):
     def destroy(self):
         request.session.logout()
 
-    @http.route('/web/session/logout', type='http', auth='none', readonly=True)
+    @http.route('/web/session/logout', type='http', auth='none', methods=['POST'], readonly=True)
     def logout(self, redirect='/odoo'):
         request.session.logout(keep_db=True)
         return request.redirect(redirect, 303)
diff --git a/addons/web/static/src/core/network/http_service.js b/addons/web/static/src/core/network/http_service.js
index b7b28ec025a62..98c9a36e31984 100644
--- a/addons/web/static/src/core/network/http_service.js
+++ b/addons/web/static/src/core/network/http_service.js
@@ -36,6 +36,9 @@ export async function post(route, params = {}, readMethod = "json") {
         method: "POST",
     });
     checkResponseStatus(response);
+    if ( readMethod === "url" ) {
+        return response.url;
+    }
     return response[readMethod]();
 }
 
diff --git a/addons/web/static/src/webclient/user_menu/user_menu_items.js b/addons/web/static/src/webclient/user_menu/user_menu_items.js
index f543013894c95..e351da6fa3170 100644
--- a/addons/web/static/src/webclient/user_menu/user_menu_items.js
+++ b/addons/web/static/src/webclient/user_menu/user_menu_items.js
@@ -6,6 +6,8 @@ import { user } from "@web/core/user";
 import { session } from "@web/session";
 import { browser } from "../../core/browser/browser";
 import { registry } from "../../core/registry";
+import { post } from "@web/core/network/http_service";
+import { redirect } from "@web/core/utils/urls";
 
 function supportItem(env) {
     const url = session.support_url;
@@ -125,10 +127,10 @@ function logOutItem(env) {
         type: "item",
         id: "logout",
         description: _t("Log out"),
-        href: `${browser.location.origin}${route}`,
-        callback: () => {
+        callback: async () => {
             browser.navigator.serviceWorker?.controller?.postMessage("user_logout");
-            browser.location.href = route;
+            const url = await post(route, { csrf_token: odoo.csrf_token }, "url");
+            redirect(url);
         },
         sequence: 70,
     };
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index bb6b33d2b8280..b930032f56ca8 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -191,7 +191,12 @@
                     You are logged in.
                 </p>
                 <div t-attf-class="clearfix oe_login_buttons text-center mb-1 pt-3">
-                    <a class="btn btn-primary" href="/web/session/logout">Log out</a>
+                    <form method="POST" action="/web/session/logout" class="text-center">
+                        <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
+                        <button type="submit" class="btn btn-primary">
+                            Logout
+                        </button>
+                    </form>
                 </div>
             </div>
         </t>
diff --git a/addons/website/tests/test_website_visitor.py b/addons/website/tests/test_website_visitor.py
index c669f6f9b4da6..eeefda37517b3 100644
--- a/addons/website/tests/test_website_visitor.py
+++ b/addons/website/tests/test_website_visitor.py
@@ -6,6 +6,7 @@
 from datetime import datetime, timedelta
 from unittest.mock import patch
 
+from odoo import http
 from odoo.addons.base.tests.common import HttpCaseWithUserDemo
 from odoo.addons.website.models.website_visitor import WebsiteVisitor
 from odoo.tests import common, tagged, HttpCase
@@ -191,11 +192,12 @@ def _authenticate_via_web(self, login, pwd):
         # require the session id.
         res = self.url_open('/web/login')
         csrf_anchor = '<input type="hidden" name="csrf_token" value="'
-        self.url_open('/web/login', timeout=200, data={
+        res = self.url_open('/web/login', timeout=200, data={
             'login': login,
             'password': pwd,
             'csrf_token': res.text.partition(csrf_anchor)[2].partition('"')[0],
         })
+        self.session = http.root.session_store.get(res.cookies["session_id"])
 
 
 class WebsiteVisitorTests(WebsiteVisitorTestsCommon):
@@ -243,7 +245,13 @@ def test_visitor_creation_on_tracked_page(self):
         # Portal connects
         # ------------------------------------------------------------
 
-        self.url_open('/web/session/logout')
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
         self._authenticate_via_web(self.user_portal.login, 'portal')
 
         self.assertFalse(
@@ -268,7 +276,13 @@ def test_visitor_creation_on_tracked_page(self):
         # ------------------------------------------------------------
 
         # portal user disconnects
-        self.url_open('/web/session/logout')
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
 
         # visit some pages
         self.url_open(self.tracked_page.url)
@@ -302,7 +316,13 @@ def test_visitor_creation_on_tracked_page(self):
         # ------------------------------------------------------------
 
         # admin disconnects
-        self.url_open('/web/session/logout')
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
 
         # visit some pages
         self.url_open(self.tracked_page.url)
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js b/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js
index 515a9215a949b..9adad23ad16aa 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_session_user_changes.js
@@ -25,7 +25,7 @@ registry.category("web_tour.tours").add("website_livechat_logout_after_chat_star
             run: "click",
         },
         {
-            trigger: "a:contains(Logout)",
+            trigger: "button:contains(Logout)",
             run: "click",
             expectUnloadPage: true,
         },
diff --git a/addons/website_livechat/tests/test_website_visitor.py b/addons/website_livechat/tests/test_website_visitor.py
index 283211946d83b..e88ab09f27ee8 100644
--- a/addons/website_livechat/tests/test_website_visitor.py
+++ b/addons/website_livechat/tests/test_website_visitor.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import Command, fields
+from odoo import Command, fields, http
 from odoo.addons.website.tests.test_website_visitor import WebsiteVisitorTestsCommon
 from odoo.tests import new_test_user, tagged
 from odoo.exceptions import AccessError
@@ -94,7 +94,13 @@ def test_visitor_id_continuity_across_sessions(self):
         channel_2._close_livechat_session()
 
         # After logout, a new visitor is created and reassigned to the original session
-        self.url_open("/web/session/logout")
+        self.url_open(
+            "/web/session/logout",
+            method='POST',
+            data={
+                "csrf_token": http.Request.csrf_token(self),
+            },
+        )
         self.url_open(self.tracked_page.url)
         visitor_3 = self._get_last_visitor()
         self.assertEqual(channel_1.livechat_visitor_id, visitor_3)
diff --git a/addons/website_sale/static/tests/tours/cart_recovery.js b/addons/website_sale/static/tests/tours/cart_recovery.js
index 3ef9e9c3a9abc..a6c5fb1abeb9b 100644
--- a/addons/website_sale/static/tests/tours/cart_recovery.js
+++ b/addons/website_sale/static/tests/tours/cart_recovery.js
@@ -1,6 +1,7 @@
 import { browser } from "@web/core/browser/browser";
 import { registry } from "@web/core/registry";
 import { redirect } from "@web/core/utils/urls";
+import { post } from "@web/core/network/http_service";
 import * as tourUtils from "@website_sale/js/tours/tour_utils";
 
 var orderIdKey = 'website_sale.tour_shop_cart_recovery.orderId';
@@ -14,10 +15,12 @@ registry.category("web_tour.tours").add('website_sale.cart_recovery', {
         {
             content: "check product is in cart, get cart id, logout, go to login",
             trigger: 'div:has(a>h6:contains("Acoustic Bloc Screens"))',
-            run: function () {
+            run: async function () {
                 const orderId = document.querySelector(".my_cart_quantity").dataset["orderId"];
                 browser.localStorage.setItem(orderIdKey, orderId);
-                redirect("/web/session/logout?redirect=/web/login");
+
+                const url = await post('/web/session/logout?redirect=/web/login', { csrf_token: odoo.csrf_token }, "url");
+                redirect(url);
             },
             expectUnloadPage: true,
         },
@@ -78,10 +81,12 @@ registry.category("web_tour.tours").add('website_sale.cart_recovery', {
         {
             content: "check the mail is sent, grab the recovery link, and logout",
             trigger: ".o-mail-Message-body a:contains(/^Resume order$/)",
-            run({ queryOne }) {
+            async run({ queryOne }) {
                 var link = queryOne('.o-mail-Message-body a:contains("Resume order")').getAttribute('href');
                 browser.localStorage.setItem(recoveryLinkKey, link);
-                redirect("/web/session/logout?redirect=/");
+
+                const url = await post('/web/session/logout?redirect=/', { csrf_token: odoo.csrf_token }, "url");
+                redirect(url);
             },
             expectUnloadPage: true,
         },
diff --git a/addons/website_sale/static/tests/tours/complete_flow.js b/addons/website_sale/static/tests/tours/complete_flow.js
index cc2e590a42893..df4e136e8a2af 100644
--- a/addons/website_sale/static/tests/tours/complete_flow.js
+++ b/addons/website_sale/static/tests/tours/complete_flow.js
@@ -1,5 +1,7 @@
 import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
+import { redirect } from "@web/core/utils/urls";
+import { post } from "@web/core/network/http_service";
 import * as tourUtils from "@website_sale/js/tours/tour_utils";
 
 registry.category("web_tour.tours").add('website_sale.complete_flow_1', {
@@ -263,8 +265,9 @@ registry.category("web_tour.tours").add('website_sale.complete_flow_1', {
                         kwargs: {},
                     });
                 });
-                def2.then(function () {
-                    window.location.href = '/web/session/logout?redirect=/shop?search=Storage Box Test';
+                def2.then(async function () {
+                    const url = await post('/web/session/logout?redirect=/shop?search=Storage Box Test', { csrf_token: odoo.csrf_token }, "url");
+                    redirect(url);
                 });
             },
             expectUnloadPage: true,
diff --git a/odoo/addons/test_http/tests/test_session.py b/odoo/addons/test_http/tests/test_session.py
index 5dae850e3c5d0..6b6addb552be8 100644
--- a/odoo/addons/test_http/tests/test_session.py
+++ b/odoo/addons/test_http/tests/test_session.py
@@ -229,7 +229,14 @@ def test_session08_gc_ignored_no_db_name(self, mock):
     def test_session09_logout(self):
         sid = self.authenticate('admin', 'admin').sid
         self.assertTrue(odoo.http.root.session_store.get(sid), "session should exist")
-        self.url_open('/web/session/logout', allow_redirects=False).raise_for_status()
+        self.url_open(
+            '/web/session/logout',
+            method='POST',
+            data={
+                "csrf_token": odoo.http.Request.csrf_token(self),
+            },
+            allow_redirects=False
+        ).raise_for_status()
         self.assertFalse(odoo.http.root.session_store.get(sid), "session should not exist")
 
     def test_session10_explicit_session(self):
@@ -237,7 +244,13 @@ def test_session10_explicit_session(self):
         admin_session = self.authenticate('admin', 'admin')
         with self.assertLogs('odoo.http') as capture:
             qs = urlencode({'debug': 1, 'session_id': forged_sid})
-            self.url_open(f'/web/session/logout?{qs}').raise_for_status()
+            self.url_open(
+                f'/web/session/logout?{qs}',
+                method='POST',
+                data={
+                    "csrf_token": odoo.http.Request.csrf_token(self),
+                },
+            ).raise_for_status()
         self.assertEqual(len(capture.output), 1)
         self.assertRegex(capture.output[0],
             r"^WARNING:odoo.http:<function odoo\.addons\.\w+\.controllers\.\w+\.logout> "

From 9c39287946385d4726af0704a4e949674c471dbc Mon Sep 17 00:00:00 2001
From: nees-odoo <nees@odoo.com>
Date: Fri, 31 Oct 2025 11:31:52 +0000
Subject: [PATCH 495/673] [FIX] mail: update guest name in member list when
 join using welcome page

Steps to Reproduce:
- Login with Admin, start a meeting, open the member list.
- Join the meeting with a guest, using the invite link.
- Change the guest name from the welcome page.
- Admin member list doesn't show updated guest name.

Before this commit, the guest appeared as `Guest` in the member list
even after updating their name on the welcome page.

This commit ensures the guest name is updated and displayed instantly
upon joining, providing a smoother and more consistent experience.

task-5062702

closes odoo/odoo#235245

X-original-commit: 47e561bd1f6bc14724d60ebf09a66e458dfd4799
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/mail/static/src/discuss/core/public/welcome_page.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/discuss/core/public/welcome_page.js b/addons/mail/static/src/discuss/core/public/welcome_page.js
index 31928c97de7bd..0cdcea6f8e31a 100644
--- a/addons/mail/static/src/discuss/core/public/welcome_page.js
+++ b/addons/mail/static/src/discuss/core/public/welcome_page.js
@@ -31,9 +31,9 @@ export class WelcomePage extends Component {
         }
     }
 
-    joinChannel() {
+    async joinChannel() {
         if (!this.store.self_user) {
-            this.store.self_guest?.updateGuestName(this.state.userName.trim());
+            await this.store.self_guest?.updateGuestName(this.state.userName.trim());
         }
         browser.localStorage.setItem("discuss_call_preview_join_mute", !this.state.hasMicrophone);
         browser.localStorage.setItem(

From 380e093b406264153251b23f63a56848ba9b5ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 12 Nov 2025 14:01:37 +0100
Subject: [PATCH 496/673] [FIX] mail: no crash on closing chat window in
 livechat support page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
- open livechat support with at least 1 human agent available
- click on button to open chat window
- immediately close the chat window
=> crash

This happens from welcome message triggering message seen code, which
triggers access to `hasEveryoneSeen` which implies
`membersThatCanSeen` being accessed in compute. When closing the chat
window, the chat window is closed then the channel is deleted.
Deletion of the the channel makes deletion of channel object and then
the thread object. As the message is still present on channel object
deletion, it retriggers compute of `hasEveryoneSeen` which also
calls `membersThatCanSeen` on `thread` object still alive for a short
time. In this getter, `this.channel` of `thread` was not guarded,
thus it crashed.

This commit fixes the issue by guarding access of `this.channel` in
this flow like in the many other flows of `thread` model that
accesses `this.channel`.

closes odoo/odoo#235310

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/core/common/discuss_channel_model_patch.js    |  3 +++
 .../static/src/embed/common/thread_model_patch.js     |  4 ----
 .../tests/tours/support/im_livechat_basic_tour.js     | 11 +++++++++++
 .../tests/test_im_livechat_support_page.py            |  1 +
 .../src/discuss/core/common/discuss_channel_model.js  |  9 +++++++++
 .../src/discuss/core/common/message_model_patch.js    |  6 +++---
 .../src/discuss/core/common/thread_model_patch.js     |  9 ---------
 7 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js b/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js
index 60d5a7ba9e241..37db4105704e6 100644
--- a/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js
@@ -10,5 +10,8 @@ const discussChannelPatch = {
         super.setup(...arguments);
         this.livechat_channel_id = fields.One("im_livechat.channel", { inverse: "channel_ids" });
     },
+    get membersThatCanSeen() {
+        return super.membersThatCanSeen.filter((member) => member.livechat_member_type !== "bot");
+    },
 };
 patch(DiscussChannel.prototype, discussChannelPatch);
diff --git a/addons/im_livechat/static/src/embed/common/thread_model_patch.js b/addons/im_livechat/static/src/embed/common/thread_model_patch.js
index ec8a5f7c4b78f..684d83fd3c990 100644
--- a/addons/im_livechat/static/src/embed/common/thread_model_patch.js
+++ b/addons/im_livechat/static/src/embed/common/thread_model_patch.js
@@ -66,10 +66,6 @@ patch(Thread.prototype, {
         return this.newestPersistentOfAllMessage?.isSelfAuthored;
     },
 
-    get membersThatCanSeen() {
-        return super.membersThatCanSeen.filter((member) => member.livechat_member_type !== "bot");
-    },
-
     get avatarUrl() {
         if (this.channel?.channel_type === "livechat") {
             return this.livechat_operator_id.avatarUrl;
diff --git a/addons/im_livechat/static/tests/tours/support/im_livechat_basic_tour.js b/addons/im_livechat/static/tests/tours/support/im_livechat_basic_tour.js
index 247be61a86cbb..bdaa53d517a04 100644
--- a/addons/im_livechat/static/tests/tours/support/im_livechat_basic_tour.js
+++ b/addons/im_livechat/static/tests/tours/support/im_livechat_basic_tour.js
@@ -12,5 +12,16 @@ registry.category("web_tour.tours").add("im_livechat.basic_tour", {
         {
             trigger: ".o-livechat-root:shadow .o-mail-ChatWindow",
         },
+        {
+            trigger: ".o-livechat-root:shadow .o-mail-Message",
+        },
+        {
+            trigger: ".o-livechat-root:shadow .o-mail-ChatWindow [title*='Close Chat Window']",
+            run: "click",
+        },
+        {
+            trigger:
+                ".o-livechat-root:shadow .o-mail-ChatHub:not(:visible):not(:has(.o-mail-ChatWindow))",
+        },
     ],
 });
diff --git a/addons/im_livechat/tests/test_im_livechat_support_page.py b/addons/im_livechat/tests/test_im_livechat_support_page.py
index 9e0163cc1f502..134242df91a3a 100644
--- a/addons/im_livechat/tests/test_im_livechat_support_page.py
+++ b/addons/im_livechat/tests/test_im_livechat_support_page.py
@@ -13,6 +13,7 @@ def test_load_modules(self):
             {"name": "Support Channel", "user_ids": [operator.id]}
         )
         self.start_tour(f"/im_livechat/support/{livechat_channel.id}", "im_livechat.basic_tour")
+        self.start_tour(f"/im_livechat/support/{livechat_channel.id}", "im_livechat.basic_tour", login=operator.login)
 
     def test_load_modules_cors(self):
         operator = self._create_operator()
diff --git a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
index b8c43ecf66485..7c7801ee1e5eb 100644
--- a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
+++ b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
@@ -70,6 +70,15 @@ export class DiscussChannel extends Record {
             }
         },
     });
+    /**
+     * To be overridden.
+     * The purpose is to exclude technical channel_member_ids like bots and avoid
+     * "wrong" seen message indicator
+     * @returns {import("models").ChannelMember[]}
+     */
+    get membersThatCanSeen() {
+        return this.channel_member_ids;
+    }
     otherTypingMembers = fields.Many("discuss.channel.member", {
         /** @this {import("models").Thread} */
         compute() {
diff --git a/addons/mail/static/src/discuss/core/common/message_model_patch.js b/addons/mail/static/src/discuss/core/common/message_model_patch.js
index b3a5c6641add9..a6ce8ca57fb1c 100644
--- a/addons/mail/static/src/discuss/core/common/message_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/message_model_patch.js
@@ -15,7 +15,7 @@ const messagePatch = {
         this.hasEveryoneSeen = fields.Attr(false, {
             /** @this {import("models").Message} */
             compute() {
-                return this.thread?.membersThatCanSeen.every((m) => m.hasSeen(this));
+                return this.channel_id?.membersThatCanSeen.every((m) => m.hasSeen(this));
             },
         });
         this.hasNewMessageSeparator = fields.Attr(false, {
@@ -36,7 +36,7 @@ const messagePatch = {
         this.hasSomeoneSeen = fields.Attr(false, {
             /** @this {import("models").Message} */
             compute() {
-                return this.thread?.membersThatCanSeen
+                return this.channel_id?.membersThatCanSeen
                     .filter((member) => member.persona.notEq(this.author))
                     .some((m) => m.hasSeen(this));
             },
@@ -63,7 +63,7 @@ const messagePatch = {
     },
     /** @returns {import("models").ChannelMember[]} */
     get channelMemberHaveSeen() {
-        return this.thread.membersThatCanSeen.filter(
+        return this.channel_id.membersThatCanSeen.filter(
             (m) => m.hasSeen(this) && m.persona.notEq(this.author)
         );
     },
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index e3840c23bdbfb..62624d4d6845a 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -366,15 +366,6 @@ const threadPatch = {
             });
         }).then(() => (this.markingAsRead = false));
     },
-    /**
-     * To be overridden.
-     * The purpose is to exclude technical channel_member_ids like bots and avoid
-     * "wrong" seen message indicator
-     * @returns {import("models").ChannelMember[]}
-     */
-    get membersThatCanSeen() {
-        return this.channel.channel_member_ids;
-    },
     /** @override */
     get needactionCounter() {
         return this.isChatChannel

From 426b1ec44cc44e956681c05a6a46498d5162a7e9 Mon Sep 17 00:00:00 2001
From: Junqi <juwu@odoo.com>
Date: Wed, 5 Nov 2025 21:33:28 +0000
Subject: [PATCH 497/673] [PERF] account: speed up _compute_amount
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently performance on `_compute_amount()` is bottlenecked by `__get__()` calls on fields on `line_ids`.
We tackle this bottleneck by warming the cache with `fetch()`

Benchmark on reconciling 2 account moves with ~70k lines each
|          |Total Time|Allocated Memory|Queries|
|----------|----------|----------------|-------|
|Before    |43.23s    |2GB             |993    |
|After     |18.60s    |1GB             |693    |

opw-5098543

closes odoo/odoo#235217

X-original-commit: 8cdc64bd861f44a81622211d6e38d432305bfb65
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/models/account_move.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 95d90956a87e0..4760ac87ac4b8 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -1176,6 +1176,15 @@ def _compute_direction_sign(self):
         'line_ids.full_reconcile_id',
         'state')
     def _compute_amount(self):
+        self.line_ids.fetch([
+            'debit',
+            'balance',
+            'amount_currency',
+            'amount_residual',
+            'amount_residual_currency',
+            'display_type',
+            'tax_repartition_line_id'
+        ])
         for move in self:
             total_untaxed, total_untaxed_currency = 0.0, 0.0
             total_tax, total_tax_currency = 0.0, 0.0

From 3de56c545e5ff5c4afc0d64826b3778f8d97812c Mon Sep 17 00:00:00 2001
From: thha-odoo <thha@odoo.com>
Date: Wed, 24 Sep 2025 08:47:08 +0000
Subject: [PATCH 498/673] [FIX] hr_attendance: default ruleset for employees

It's impossible to create an attendance for an employee without ruleset.
To solve this problem, this PR adds a default ruleset with 2 rules: one for
overtime, and another one for non working days.

Those data are the same as the data added in the
upgrade/migrations/hr_attendance/saas~18.5.2.0 post-migrate script.

task-5082628

closes odoo/odoo#234628

X-original-commit: bc039d778635bcdd11ce5149b105305b059321c4
Related: odoo/enterprise#98952
Related: odoo/upgrade#8809
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_attendance/__manifest__.py          |  1 +
 .../data/hr_attendance_overtime_rule_data.xml | 35 +++++++++++++++++++
 .../hr_attendance_overtime_ruleset_data.xml   | 17 +++++----
 .../models/hr_attendance_overtime_rule.py     |  4 +--
 addons/hr_attendance/models/hr_version.py     |  1 +
 .../tests/test_hr_attendance_constraints.py   |  2 +-
 .../tests/test_hr_attendance_process.py       |  1 +
 7 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 addons/hr_attendance/data/hr_attendance_overtime_rule_data.xml

diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index 778b7b6f498ed..b1b70984d6b01 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/addons/hr_attendance/__manifest__.py
@@ -21,6 +21,7 @@
         'security/hr_attendance_security.xml',
         'security/ir.model.access.csv',
         'data/hr_attendance_overtime_ruleset_data.xml',
+        'data/hr_attendance_overtime_rule_data.xml',
         'views/hr_attendance_view.xml',
         'views/hr_department_view.xml',
         'views/hr_employee_view.xml',
diff --git a/addons/hr_attendance/data/hr_attendance_overtime_rule_data.xml b/addons/hr_attendance/data/hr_attendance_overtime_rule_data.xml
new file mode 100644
index 0000000000000..82f34cfcfdf13
--- /dev/null
+++ b/addons/hr_attendance/data/hr_attendance_overtime_rule_data.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+<!-- Default Rules -->
+        <record id="hr_attendance_overtime_employee_schedule_rule" model="hr.attendance.overtime.rule">
+            <field name="name">Employee Schedule Rule</field>
+            <field name="base_off">quantity</field>
+            <field name="timing_type">schedule</field>
+            <field name="expected_hours_from_contract" eval="True"/>
+            <field name="paid" eval="True"/>
+            <field name="ruleset_id" ref="hr_attendance_default_ruleset"/>
+        </record>
+
+        <record id="hr_attendance_overtime_non_working_days_rule" model="hr.attendance.overtime.rule">
+            <field name="name">Non Working Days Rule</field>
+            <field name="base_off">timing</field>
+            <field name="timing_type">non_work_days</field>
+            <field name="paid" eval="True"/>
+            <field name="timing_start" eval="0.0"/>
+            <field name="timing_stop" eval="24.0"/>
+            <field name="ruleset_id" ref="hr_attendance_default_ruleset"/>
+        </record>
+    </data>
+
+    <data>
+<!-- SA : Saudi Arabia -->
+        <record id="l10n_sa_workdays_overtime_rule" model="hr.attendance.overtime.rule">
+            <field name="name">Workdays Overtime</field>
+            <field name="ruleset_id" ref="l10n_sa_overtime_ruleset"/>
+            <field name="base_off">quantity</field>
+            <field name="quantity_period">day</field>
+            <field name="expected_hours_from_contract" eval="True"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml b/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml
index f98e0cbd904a3..fa0ec6ceac62a 100644
--- a/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml
+++ b/addons/hr_attendance/data/hr_attendance_overtime_ruleset_data.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
+<!-- Default Ruleset -->
+    <data noupdate="1">
+        <record id="hr_attendance_default_ruleset" model="hr.attendance.overtime.ruleset">
+            <field name="name">Default Ruleset</field>
+            <field name="country_id" eval="False"/>
+            <field name="company_id" eval="False"/>
+            <field name="rate_combination_mode">max</field>
+        </record>
+    </data>
+
     <data>
 <!-- SA : Saudi Arabia -->
         <record id="l10n_sa_overtime_ruleset" model="hr.attendance.overtime.ruleset">
@@ -7,12 +17,5 @@
             <field name="rate_combination_mode">sum</field>
             <field name="country_id" ref="base.sa"/>
         </record>
-        <record id="l10n_sa_workdays_overtime_rule" model="hr.attendance.overtime.rule">
-            <field name="name">Workdays Overtime</field>
-            <field name="ruleset_id" ref="l10n_sa_overtime_ruleset"/>
-            <field name="base_off">quantity</field>
-            <field name="quantity_period">day</field>
-            <field name="expected_hours_from_contract" eval="True"/>
-        </record>
     </data>
 </odoo>
diff --git a/addons/hr_attendance/models/hr_attendance_overtime_rule.py b/addons/hr_attendance/models/hr_attendance_overtime_rule.py
index 295e508c4ddd9..aefffc0c1f2ac 100644
--- a/addons/hr_attendance/models/hr_attendance_overtime_rule.py
+++ b/addons/hr_attendance/models/hr_attendance_overtime_rule.py
@@ -183,8 +183,8 @@ def _get1_timing_overtime_intervals(self, attendances, version_map):
         end_dt = max(attendances.mapped('check_out'))
 
         if self.timing_type in ['work_days', 'non_work_days']:
-
-            unusual_days = self.company_id.resource_calendar_id._get_unusual_days(start_dt, end_dt)
+            company = self.company_id or employee.company_id
+            unusual_days = company.resource_calendar_id._get_unusual_days(start_dt, end_dt)
 
             attendance_intervals = []
             for date, day_attendances in attendances.filtered(
diff --git a/addons/hr_attendance/models/hr_version.py b/addons/hr_attendance/models/hr_version.py
index 301cccc31822d..7bbd73e23de7e 100644
--- a/addons/hr_attendance/models/hr_version.py
+++ b/addons/hr_attendance/models/hr_version.py
@@ -19,6 +19,7 @@ def _domain_current_countries(self):
          domain=_domain_current_countries,
          groups="hr.group_hr_manager",
          tracking=True,
+         default=lambda self: self.env.ref('hr_attendance.hr_attendance_default_ruleset', raise_if_not_found=False),
     )
 
     @api.model
diff --git a/addons/hr_attendance/tests/test_hr_attendance_constraints.py b/addons/hr_attendance/tests/test_hr_attendance_constraints.py
index ffcfcbc75baab..fbc03a7b38c50 100644
--- a/addons/hr_attendance/tests/test_hr_attendance_constraints.py
+++ b/addons/hr_attendance/tests/test_hr_attendance_constraints.py
@@ -14,7 +14,7 @@ class TestHrAttendance(TransactionCase):
     def setUpClass(cls):
         super(TestHrAttendance, cls).setUpClass()
         cls.attendance = cls.env['hr.attendance']
-        cls.test_employee = cls.env['hr.employee'].create({'name': "Jacky"})
+        cls.test_employee = cls.env['hr.employee'].create({'name': "Jacky", 'ruleset_id': False})
         # demo data contains set up for cls.test_employee
         cls.open_attendance = cls.attendance.create({
             'employee_id': cls.test_employee.id,
diff --git a/addons/hr_attendance/tests/test_hr_attendance_process.py b/addons/hr_attendance/tests/test_hr_attendance_process.py
index a2bd4d5fae700..6463ccb6520f4 100644
--- a/addons/hr_attendance/tests/test_hr_attendance_process.py
+++ b/addons/hr_attendance/tests/test_hr_attendance_process.py
@@ -23,6 +23,7 @@ def setUpClass(cls):
             'name': "François Russie",
             'user_id': cls.user.id,
             'pin': '1234',
+            'ruleset_id': False,
         })
         cls.employee_kiosk = cls.env['hr.employee'].create({
             'name': "Machiavel",

From 751955de2584a2b51118d0fd4473e56197334fd5 Mon Sep 17 00:00:00 2001
From: pajo <pajo@odoo.com>
Date: Mon, 3 Nov 2025 05:33:56 +0000
Subject: [PATCH 499/673] [FIX] html_editor: traceback on adding vimeo link in
 knowledge

Steps to reproduce:
-------------------------
1. Install the Knowledge app
2. Open any document and use `/media` to open the media dialog
3. Go to the Videos tab in the dialog
4. In another browser tab, open the Vimeo website
5. Copy any Vimeo video link and paste it into the dialog

Observation:
-------------------------
When pasting a Vimeo link, a traceback occurs:
```
TypeError: Cannot read properties of undefined (reading 'match')
    at EmbeddedVideoSelector.parseTimeToSeconds
```

Issue:
-------------------------
In the following function,
https://github.com/odoo/odoo/blob/b5ed2d5a3e4ac9379ed15549dd9c8e08547181bb/addons/html_editor/static/src/main/media/media_dialog/video_selector.js#L350-L353
This happens because the code splits the Vimeo URL using `#t`. If the URL does
not contain `#t`, the result is undefined, which is then passed to the
`parseTimeToSeconds` function.

Solution:
-------------------------
Added optional chain operator in `parseTimeToSeconds` for safe validation of
`value` before calling `.match()`

opw-5221403

closes odoo/odoo#235271

X-original-commit: 483ce81ba95ddcdeeddafaee7a6c29ae3ae22581
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Joyal Patel (pajo) <pajo@odoo.com>
---
 .../main/media/media_dialog/video_selector.js |  2 +-
 .../static/tests/html_field.test.js           | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
index e496a53faf2a3..73f7001ba1dce 100644
--- a/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
+++ b/addons/html_editor/static/src/main/media/media_dialog/video_selector.js
@@ -454,7 +454,7 @@ export class VideoSelector extends Component {
      * @returns {string} - The start time in seconds.
      */
     parseTimeToSeconds(value) {
-        const match = value.match(/^(?:(\d+)m(\d+)s|(\d+)m|(\d+)s|(\d+))$/);
+        const match = value?.match(/^(?:(\d+)m(\d+)s|(\d+)m|(\d+)s|(\d+))$/);
         if (!match) {
             return value;
         }
diff --git a/addons/html_editor/static/tests/html_field.test.js b/addons/html_editor/static/tests/html_field.test.js
index 9e131462129ba..836bc5e9cc866 100644
--- a/addons/html_editor/static/tests/html_field.test.js
+++ b/addons/html_editor/static/tests/html_field.test.js
@@ -1166,6 +1166,47 @@ test("should display overlay on video hover and handle video replacement and rem
     await expectElementCount('div[data-embedded="video"]', 0);
 });
 
+test.tags("desktop");
+test("add Vimeo video link in 'Videos' tab of MediaDialog", async () => {
+    const vimeoVideoLink = "https://vimeo.com/1128489814?fl=wc";
+    await mountView({
+        type: "form",
+        resId: 1,
+        resModel: "partner",
+        arch: `
+            <form>
+                <field name="txt" widget="html"/>
+            </form>`,
+    });
+    setSelectionInHtmlField();
+
+    await onRpc("/html_editor/video_url/data", async () => {
+        return {
+            video_id: "1128489814",
+            platform: "vimeo",
+            embed_url: vimeoVideoLink,
+        };
+    });
+
+    // Insert Vimeo video link
+    await insertText(htmlEditor, "/video");
+    await waitFor(".o-we-powerbox");
+    expect(queryAllTexts(".o-we-command-name")[0]).toBe("Media");
+
+    await press("Enter");
+    await contains(".modal-body .nav-link:contains('Videos')").click();
+    await waitFor("textarea[id='o_video_text']");
+
+    const input = queryOne("textarea[id='o_video_text']");
+    input.value = vimeoVideoLink;
+    manuallyDispatchProgrammaticEvent(input, "input", {
+        inputType: "insertText",
+    });
+    await waitFor(".o_video_dialog_options", { timeout: 1500 });
+    expect(input).toHaveClass("is-valid");
+    await click(queryOne(".modal-footer").firstChild);
+});
+
 test("MediaDialog contains 'Videos' tab by default in html field", async () => {
     await mountView({
         type: "form",

From 2954a18fcaa760e4344760bd81577fc7e4487aa4 Mon Sep 17 00:00:00 2001
From: dhrp-odoo <dhrp@odoo.com>
Date: Thu, 6 Nov 2025 12:51:42 +0000
Subject: [PATCH 500/673] [FIX] spreadsheet: no-op on re-selecting same date
 filter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Re-clicking the current date filter (relative/month/quarter/year/range)
triggered redundant RPCs and chart re-animations. In Custom Range, clicks
inside inputs also bubbled to the dropdown item, causing unwanted updates.

This commit:

Stop event bubbling inside Custom Range inputs to avoid spurious updates.

In GlobalFiltersCoreViewPlugin.allowDispatch(), return NoChanges when the
incoming value equals the current filter value (currentFilterValue).

closes odoo/odoo#235270

Task: 5187275
X-original-commit: 654a39d742383d28bb6221652d53562715a54013
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Signed-off-by: Dhrutik Patel (dhrp) <dhrp@odoo.com>
---
 .../date_filter_dropdown.xml                  |  2 +-
 .../global_filters_core_view_plugin.js        |  6 +++++
 .../global_filters/date_filter_value.test.js  | 26 +++++++++++++------
 .../global_filters_core_view.test.js          | 10 -------
 .../global_filters_model.test.js              | 22 ++++++++++++++++
 5 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/addons/spreadsheet/static/src/global_filters/components/date_filter_dropdown/date_filter_dropdown.xml b/addons/spreadsheet/static/src/global_filters/components/date_filter_dropdown/date_filter_dropdown.xml
index 382ecf3966dcd..c405337305874 100644
--- a/addons/spreadsheet/static/src/global_filters/components/date_filter_dropdown/date_filter_dropdown.xml
+++ b/addons/spreadsheet/static/src/global_filters/components/date_filter_dropdown/date_filter_dropdown.xml
@@ -10,7 +10,7 @@
 
                 <div class="o-date-option-label" t-esc="option.label"/>
                 <t t-if="option.type === 'range'">
-                    <div class="d-flex flex-row">
+                    <div class="d-flex flex-row" t-on-click.stop="">
                         <DateTimeInput type="'date'" value="dateFrom()" onChange="(dateFrom) => this.setDateFrom(dateFrom)" />
                         <span class="d-flex align-items-center">to</span>
                         <DateTimeInput type="'date'" value="dateTo()" onChange="(dateTo) => this.setDateTo(dateTo)" />
diff --git a/addons/spreadsheet/static/src/global_filters/plugins/global_filters_core_view_plugin.js b/addons/spreadsheet/static/src/global_filters/plugins/global_filters_core_view_plugin.js
index 2cc6fc620cf7b..30f71cfaca796 100644
--- a/addons/spreadsheet/static/src/global_filters/plugins/global_filters_core_view_plugin.js
+++ b/addons/spreadsheet/static/src/global_filters/plugins/global_filters_core_view_plugin.js
@@ -25,6 +25,7 @@ import {
 import { OdooCoreViewPlugin } from "@spreadsheet/plugins";
 import { getItemId } from "../../helpers/model";
 import { serializeDate } from "@web/core/l10n/dates";
+import { deepEqual } from "@web/core/utils/objects";
 import { getFilterCellValue, getFilterValueDomain } from "../helpers";
 const { DateTime } = luxon;
 
@@ -62,6 +63,11 @@ export class GlobalFiltersCoreViewPlugin extends OdooCoreViewPlugin {
                 if (!checkFilterValueIsValid(filter, cmd.value)) {
                     return CommandResult.InvalidValueTypeCombination;
                 }
+
+                const currentFilterValue = this.getters.getGlobalFilterValue(cmd.id);
+                if (deepEqual(currentFilterValue, cmd.value)) {
+                    return CommandResult.NoChanges;
+                }
                 break;
             }
         }
diff --git a/addons/spreadsheet/static/tests/global_filters/date_filter_value.test.js b/addons/spreadsheet/static/tests/global_filters/date_filter_value.test.js
index fb9b0f7d06168..9f9aa9ad528b7 100644
--- a/addons/spreadsheet/static/tests/global_filters/date_filter_value.test.js
+++ b/addons/spreadsheet/static/tests/global_filters/date_filter_value.test.js
@@ -183,6 +183,23 @@ test("All the options should be displayed", async function () {
     expect(options[13].textContent).toBe("Custom Range");
 });
 
+test("Opening the custom range calendar does not trigger update", async function () {
+    const env = await makeMockEnv();
+    await mountDateFilterValue(env, {
+        value: { type: "range", from: "2023-01-01", to: "2023-01-31" },
+        update: () => {
+            expect.step("update");
+        },
+    });
+
+    expect.verifySteps([]);
+    await contains("input").click();
+    expect.verifySteps([]);
+    await contains("input.o_datetime_input:first").click();
+    expect(".o_datetime_picker").toHaveCount(1);
+    expect.verifySteps([]);
+});
+
 test("Can select a relative period", async function () {
     const env = await makeMockEnv();
     await mountDateFilterValue(env, {
@@ -437,24 +454,17 @@ test("Can open date time picker to select a range", async function () {
 });
 
 test("Choosing a from after the to will re-order dates", async function () {
-    let firstCall = true;
     const env = await makeMockEnv();
     await mountDateFilterValue(env, {
         value: { type: "range", from: "2023-01-30", to: "2023-01-31" },
         update: (value) => {
-            if (firstCall) {
-                // Bypass the first call as it is just the initial value
-                // (activate when clicking on the input)
-                firstCall = false;
-                return;
-            }
             expect(value).toEqual({ type: "range", from: "2023-01-01", to: "2023-01-30" });
             expect.step("update");
         },
     });
     await contains("input").click();
     await contains("input.o_datetime_input:last").click();
-    // Select 1th of January 2023
+    // Select 1st of January 2023
     await contains(".o_date_item_cell.o_datetime_button:first").click();
     expect.verifySteps(["update"]);
 });
diff --git a/addons/spreadsheet/static/tests/global_filters/global_filters_core_view.test.js b/addons/spreadsheet/static/tests/global_filters/global_filters_core_view.test.js
index bdf9fac550366..dd371b39bf6d2 100644
--- a/addons/spreadsheet/static/tests/global_filters/global_filters_core_view.test.js
+++ b/addons/spreadsheet/static/tests/global_filters/global_filters_core_view.test.js
@@ -34,11 +34,6 @@ test("Value of text filter", () => {
     });
     expect(result.isSuccessful).toBe(true);
 
-    result = setGlobalFilterValueWithoutReload(model, {
-        id: "1",
-    });
-    expect(result.isSuccessful).toBe(true);
-
     result = setGlobalFilterValueWithoutReload(model, {
         id: "1",
         value: { operator: "ilike", strings: 5 },
@@ -88,11 +83,6 @@ test("Value of selection filter", () => {
     });
     expect(result.isSuccessful).toBe(true);
 
-    result = setGlobalFilterValueWithoutReload(model, {
-        id: "1",
-    });
-    expect(result.isSuccessful).toBe(true);
-
     result = setGlobalFilterValueWithoutReload(model, {
         id: "1",
         value: { operator: "in", selectionValues: 5 },
diff --git a/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js b/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
index 1f7bca5b88bbf..d31ba64345877 100644
--- a/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
+++ b/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
@@ -309,6 +309,28 @@ test("Can save a value to an existing global filter", async function () {
     expect(listDomain.length).toBe(3);
 });
 
+test("Command rejected when setting the same date filter value", async () => {
+    const { model } = await createSpreadsheetWithPivotAndList();
+    await addGlobalFilter(model, THIS_YEAR_GLOBAL_FILTER, {
+        pivot: DEFAULT_FIELD_MATCHINGS,
+        list: DEFAULT_LIST_FIELD_MATCHINGS,
+    });
+    const gf = model.getters.getGlobalFilters()[0];
+    const year = DateTime.local().year;
+
+    let result = await setGlobalFilterValue(model, {
+        id: gf.id,
+        value: { type: "month", month: 2, year },
+    });
+    expect(result).toBe(DispatchResult.Success);
+
+    result = await setGlobalFilterValue(model, {
+        id: gf.id,
+        value: { type: "month", month: 2, year },
+    });
+    expect(result.reasons).toEqual([CommandResult.NoChanges]);
+});
+
 test("Domain of simple date filter", async function () {
     mockDate("2022-07-14 00:00:00");
     const { model } = await createSpreadsheetWithPivotAndList();

From 16e1544557b479e5039d11fbd848571cf5d5a599 Mon Sep 17 00:00:00 2001
From: Benoit Socias <bso@odoo.com>
Date: Wed, 21 Dec 2022 08:51:37 +0000
Subject: [PATCH 501/673] [FIX] tools, *: ignore the active field when updating
 assets

*: test_website, base, website, website_blog, website_event,
   website_event_track, website_payment, website_sale, test_assetsbundle

Before this commit when a module was updated all ir.asset records were
reset to their defined `active` state, if defined.
This causes assets related to old snippet versions to be made inactive
even if those old snippet versions are used inside existing pages.

It used to work when the activation of assets was made through view
inheritance because when views are defined through a `<template>` tag,
the `active` attribute is in fact ignored during updates since [1],
except for new records since [2].

This commit introduces an `<asset>` tag in the XML import format.
It is an alias of `<record ... model="ir.asset">` with the additional
feature that it avoids taking the `active` field into account during
updates for existing `ir_asset` records, just like `<template>` if the
`active` field is mentioned as attribute of the tag.
We then rely on the `website_disable_unused_snippets_assets` cron to
properly disable any unused asset at a later stage (note that the bug
being fixed here was mitigated by the fact that cron also re-enabled
assets which were disabled by mistake... but that might happen only a
few days later).

Another approach was to overload `_load_records_write` in `base`'s
`ir_asset.py` to avoid taking the `active` field into account when
updating records:
```py
    def _load_records_write(self, values):
        values.pop('active', None)
        super()._load_records_write(values)
```
But this is not as stable because it changes the way `ir.asset` records
are imported when the `<record>` tag is used. In the end we chose to be
consistent and do exactly the same as `<template>`, as this also allows
more and should be entirely stable.

[1]: https://github.com/odoo/odoo/commit/2d296cb77922d33be2dc45b900191fac34bda429#diff-175c28787c272a219b9275f79262a48af9aa029e718f45077fd609737559e84eR803-R804
[2]: https://github.com/odoo/odoo/commit/f1c70d4cc943ac4eb81a85a9dc005de34cd2060a#diff-175c28787c272a219b9275f79262a48af9aa029e718f45077fd609737559e84eR801-R804

task-2963840

closes odoo/odoo#235226

X-original-commit: 906ae8a356b956c3586d9397fd480e0353f072a1
Related: odoo/enterprise#99233
Related: odoo/documentation#15239
Related: odoo/design-themes#1179
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
---
 addons/test_website/tests/__init__.py         |  1 +
 addons/test_website/tests/asset_tag.xml       | 35 +++++++++
 .../test_website/tests/test_theme_ir_asset.py | 77 +++++++++++++++++++
 addons/website/data/ir_asset.xml              | 31 +++-----
 addons/website/views/snippets/s_accordion.xml |  9 +--
 addons/website/views/snippets/s_alert.xml     | 19 ++---
 .../views/snippets/s_announcement_scroll.xml  |  9 +--
 .../snippets/s_attributes_horizontal.xml      |  9 +--
 .../views/snippets/s_attributes_vertical.xml  |  9 +--
 addons/website/views/snippets/s_badge.xml     | 18 ++---
 .../views/snippets/s_banner_categories.xml    |  9 +--
 .../website/views/snippets/s_blockquote.xml   | 19 ++---
 addons/website/views/snippets/s_btn.xml       |  9 +--
 addons/website/views/snippets/s_card.xml      |  9 +--
 addons/website/views/snippets/s_carousel.xml  | 19 ++---
 .../views/snippets/s_carousel_cards.xml       |  9 +--
 .../views/snippets/s_carousel_intro.xml       |  9 +--
 .../views/snippets/s_color_blocks_2.xml       |  9 +--
 .../website/views/snippets/s_company_team.xml |  9 +--
 .../website/views/snippets/s_comparisons.xml  | 10 +--
 addons/website/views/snippets/s_countdown.xml |  9 +--
 .../views/snippets/s_dynamic_snippet.xml      | 18 ++---
 .../snippets/s_dynamic_snippet_carousel.xml   | 18 ++---
 .../snippets/s_ecomm_categories_showcase.xml  |  9 +--
 .../website/views/snippets/s_embed_code.xml   |  9 +--
 .../website/views/snippets/s_faq_collapse.xml | 10 +--
 addons/website/views/snippets/s_features.xml  | 10 +--
 .../views/snippets/s_features_grid.xml        | 19 ++---
 .../views/snippets/s_floating_blocks.xml      | 10 +--
 .../website/views/snippets/s_google_map.xml   |  9 +--
 addons/website/views/snippets/s_hr.xml        |  9 +--
 .../views/snippets/s_image_gallery.xml        | 29 +++----
 .../views/snippets/s_instagram_page.xml       |  9 +--
 addons/website/views/snippets/s_map.xml       |  9 +--
 .../views/snippets/s_masonry_block.xml        | 29 +++----
 .../website/views/snippets/s_media_list.xml   | 19 ++---
 .../s_mega_menu_big_icons_subtitles.xml       |  9 +--
 .../views/snippets/s_mega_menu_cards.xml      |  9 +--
 .../snippets/s_mega_menu_images_subtitles.xml |  9 +--
 .../snippets/s_mega_menu_little_icons.xml     |  9 +--
 .../snippets/s_mega_menu_menus_logos.xml      |  9 +--
 .../views/snippets/s_mega_menu_odoo_menu.xml  |  9 +--
 addons/website/views/snippets/s_popup.xml     | 19 ++---
 .../views/snippets/s_pricelist_cafe.xml       |  9 +--
 .../views/snippets/s_process_steps.xml        | 30 +++-----
 .../views/snippets/s_product_catalog.xml      | 10 +--
 .../website/views/snippets/s_product_list.xml | 20 ++---
 .../website/views/snippets/s_progress_bar.xml | 10 +--
 addons/website/views/snippets/s_quadrant.xml  |  9 +--
 .../views/snippets/s_quotes_carousel.xml      | 29 +++----
 addons/website/views/snippets/s_rating.xml    | 19 ++---
 .../website/views/snippets/s_references.xml   |  9 +--
 addons/website/views/snippets/s_searchbar.xml |  9 +--
 addons/website/views/snippets/s_share.xml     |  9 +--
 addons/website/views/snippets/s_showcase.xml  | 39 ++++------
 .../website/views/snippets/s_social_media.xml |  9 +--
 .../views/snippets/s_table_of_content.xml     |  9 +--
 addons/website/views/snippets/s_tabs.xml      | 29 +++----
 .../website/views/snippets/s_tabs_images.xml  |  9 +--
 .../website/views/snippets/s_text_cover.xml   |  9 +--
 .../views/snippets/s_text_highlight.xml       |  9 +--
 .../views/snippets/s_three_columns.xml        | 10 +--
 addons/website/views/snippets/s_timeline.xml  | 29 +++----
 .../views/snippets/s_timeline_list.xml        |  9 +--
 addons/website/views/snippets/s_title.xml     | 10 +--
 .../website/views/snippets/s_website_form.xml | 28 +++----
 .../views/snippets/s_website_form_cover.xml   |  9 +--
 addons/website/views/website_templates.xml    | 20 ++---
 .../views/snippets/s_blog_posts.xml           |  9 +--
 .../website_event/views/snippets/s_events.xml |  9 +--
 .../website_event/views/snippets/snippets.xml |  9 +--
 addons/website_event_track/views/snippets.xml | 10 +--
 .../views/snippets/s_donation.xml             |  9 +--
 .../snippets/s_supported_payment_methods.xml  | 18 ++---
 .../product_snippet_template_data.xml         |  9 +--
 odoo/addons/base/tests/__init__.py            |  1 +
 odoo/addons/base/tests/asset_tag.xml          | 35 +++++++++
 odoo/addons/base/tests/test_ir_asset.py       | 77 +++++++++++++++++++
 .../test_assetsbundle/data/ir_asset.xml       |  9 +--
 odoo/import_xml.rng                           | 21 +++++
 odoo/tools/convert.py                         | 47 +++++++++++
 81 files changed, 717 insertions(+), 563 deletions(-)
 create mode 100644 addons/test_website/tests/asset_tag.xml
 create mode 100644 addons/test_website/tests/test_theme_ir_asset.py
 create mode 100644 odoo/addons/base/tests/asset_tag.xml
 create mode 100644 odoo/addons/base/tests/test_ir_asset.py

diff --git a/addons/test_website/tests/__init__.py b/addons/test_website/tests/__init__.py
index f7487b241cec6..a9058632a3d9e 100644
--- a/addons/test_website/tests/__init__.py
+++ b/addons/test_website/tests/__init__.py
@@ -22,6 +22,7 @@
 from . import test_settings
 from . import test_snippet_background_video
 from . import test_systray
+from . import test_theme_ir_asset
 from . import test_translation
 from . import test_views_during_module_operation
 from . import test_website_controller_page
diff --git a/addons/test_website/tests/asset_tag.xml b/addons/test_website/tests/asset_tag.xml
new file mode 100644
index 0000000000000..a4318e1252ea7
--- /dev/null
+++ b/addons/test_website/tests/asset_tag.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<asset id="theme_default.test_asset_tag_aaa" name="Test asset tag (init active => keep active => update active)">
+    <bundle>test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+</asset>
+<asset id="theme_default.test_asset_tag_aii" name="Test asset tag (init active => make inactive => update inactive)">
+    <bundle>test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+</asset>
+<asset id="theme_default.test_asset_tag_aia" name="Test asset tag (init active => make inactive => update active)">
+    <bundle>test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+    <field name="active">True</field> <!-- Take into account during update -->
+</asset>
+<asset id="theme_default.test_asset_tag_iii" name="Test asset tag (init inactive => keep inactive => update inactive)" active="False">
+    <bundle>test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+</asset>
+<asset id="theme_default.test_asset_tag_iaa" name="Test asset tag (init inactive => make active => update active)" active="False">
+    <bundle>test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+</asset>
+<asset id="theme_default.test_asset_tag_prepend" name="Test asset tag with directive">
+    <bundle directive="prepend">test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+</asset>
+<asset id="theme_default.test_asset_tag_extra" name="Test asset tag with extra field">
+    <bundle>test_asset_bundle</bundle>
+    <path>theme_default/tests/something.scss</path>
+    <field name="sequence" eval="17"/>
+</asset>
+
+</odoo>
diff --git a/addons/test_website/tests/test_theme_ir_asset.py b/addons/test_website/tests/test_theme_ir_asset.py
new file mode 100644
index 0000000000000..d230ec26f7331
--- /dev/null
+++ b/addons/test_website/tests/test_theme_ir_asset.py
@@ -0,0 +1,77 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests.common import TransactionCase, tagged
+from odoo.tools import convert_file
+from odoo.tools.misc import file_path
+
+
+@tagged('-at_install', 'post_install')
+class TestThemeAsset(TransactionCase):
+
+    def test_theme_asset_tag(self):
+        """
+        Verify that assets defined with the <asset> tag are properly imported.
+        """
+        # Load new records
+        convert_file(
+            self.env, 'theme_default',
+            file_path('test_website/tests/asset_tag.xml'),
+            {}, 'init', False,
+        )
+        active_keep_asset = self.env.ref('theme_default.test_asset_tag_aaa')
+        inactive_keep_asset = self.env.ref('theme_default.test_asset_tag_iii')
+        active_switch_asset_reset = self.env.ref('theme_default.test_asset_tag_aia')
+        active_switch_asset_ignore = self.env.ref('theme_default.test_asset_tag_aii')
+        inactive_switch_asset = self.env.ref('theme_default.test_asset_tag_iaa')
+        prepend_asset = self.env.ref('theme_default.test_asset_tag_prepend')
+        asset_with_extra_field = self.env.ref('theme_default.test_asset_tag_extra')
+
+        # Verify initial load
+        self.assertEqual(prepend_asset._name, 'theme.ir.asset', 'Model should be theme.ir.asset')
+        self.assertEqual(prepend_asset.name, 'Test asset tag with directive', 'Name not loaded')
+        self.assertEqual(prepend_asset.directive, 'prepend', 'Directive not loaded')
+        self.assertEqual(prepend_asset.bundle, 'test_asset_bundle', 'Bundle not loaded')
+        self.assertEqual(prepend_asset.path, 'theme_default/tests/something.scss', 'Path not loaded')
+        self.assertEqual(asset_with_extra_field.sequence, 17, 'Sequence not loaded')
+        self.assertTrue(active_keep_asset.active, 'Should be active')
+        self.assertTrue(active_switch_asset_reset.active, 'Should be active')
+        self.assertTrue(active_switch_asset_ignore.active, 'Should be active')
+        self.assertFalse(inactive_keep_asset.active, 'Should be inactive')
+        self.assertFalse(inactive_switch_asset.active, 'Should be inactive')
+
+        # Patch records
+        prepend_asset.name = 'changed'
+        prepend_asset.directive = 'append'
+        prepend_asset.bundle = 'changed'
+        prepend_asset.path = 'theme_default/tests/changed.scss'
+        asset_with_extra_field.sequence = 3
+        active_switch_asset_reset.active = False
+        active_switch_asset_ignore.active = False
+        inactive_switch_asset.active = True
+
+        # Update records
+        convert_file(
+            self.env, 'theme_default',
+            file_path('test_website/tests/asset_tag.xml'),
+            {
+                'theme_default.test_asset_tag_aaa': active_keep_asset.id,
+                'theme_default.test_asset_tag_iii': inactive_keep_asset.id,
+                'theme_default.test_asset_tag_aia': active_switch_asset_reset.id,
+                'theme_default.test_asset_tag_aii': active_switch_asset_ignore.id,
+                'theme_default.test_asset_tag_iaa': inactive_switch_asset.id,
+                'theme_default.test_asset_tag_prepend': prepend_asset.id,
+                'theme_default.test_asset_tag_extra': asset_with_extra_field.id,
+            }, 'update', False,
+        )
+
+        # Verify updated load
+        self.assertEqual(prepend_asset.name, 'Test asset tag with directive', 'Name not restored')
+        self.assertEqual(prepend_asset.directive, 'prepend', 'Directive not restored')
+        self.assertEqual(prepend_asset.bundle, 'test_asset_bundle', 'Bundle not restored')
+        self.assertEqual(prepend_asset.path, 'theme_default/tests/something.scss', 'Path not restored')
+        self.assertEqual(asset_with_extra_field.sequence, 17, 'Sequence not restored')
+        self.assertTrue(active_keep_asset.active, 'Should be active')
+        self.assertTrue(active_switch_asset_reset.active, 'Should be reset to active')
+        self.assertFalse(active_switch_asset_ignore.active, 'Should be kept inactive')
+        self.assertFalse(inactive_keep_asset.active, 'Should be inactive')
+        self.assertTrue(inactive_switch_asset.active, 'Should be kept active')
diff --git a/addons/website/data/ir_asset.xml b/addons/website/data/ir_asset.xml
index b741ccd89b8b9..0b80fa7e7e82c 100644
--- a/addons/website/data/ir_asset.xml
+++ b/addons/website/data/ir_asset.xml
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-
-        <record id="website.user_custom_bootstrap_overridden_scss" model="ir.asset">
-            <field name="name">User custom bootstrap overridden SCSS</field>
-            <field name="bundle">web._assets_frontend_helpers</field>
-            <field name="directive">prepend</field>
-            <field name="path">website/static/src/scss/user_custom_bootstrap_overridden.scss</field>
+        <asset id="website.user_custom_bootstrap_overridden_scss" name="User custom bootstrap overridden SCSS">
+            <bundle directive="prepend">web._assets_frontend_helpers</bundle>
+            <path>website/static/src/scss/user_custom_bootstrap_overridden.scss</path>
             <field name="sequence" eval="99"/>
-        </record>
+        </asset>
 
-        <record id="website.user_custom_rules_scss" model="ir.asset">
-            <field name="name">User custom rules SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">website/static/src/scss/user_custom_rules.scss</field>
+        <asset id="website.user_custom_rules_scss" name="User custom rules SCSS">
+            <bundle>web.assets_frontend</bundle>
+            <path>website/static/src/scss/user_custom_rules.scss</path>
             <field name="sequence" eval="99"/>
-        </record>
+        </asset>
 
-        <record id="website.configurator_tour" model="ir.asset">
+        <asset id="website.configurator_tour" name="Website Configurator Tour" active="False">
             <field name="key">website.configurator_tour</field>
-            <field name="name">Website Configurator Tour</field>
-            <field name="bundle">website.assets_editor</field>
-            <field name="path">website/static/src/js/tours/configurator_tour.js</field>
-            <field name="active" eval="False"/>
-        </record>
-
+            <bundle>website.assets_editor</bundle>
+            <path>website/static/src/js/tours/configurator_tour.js</path>
+        </asset>
     </data>
 </odoo>
diff --git a/addons/website/views/snippets/s_accordion.xml b/addons/website/views/snippets/s_accordion.xml
index 0f1fb0a209f9f..974f214fc26aa 100644
--- a/addons/website/views/snippets/s_accordion.xml
+++ b/addons/website/views/snippets/s_accordion.xml
@@ -34,10 +34,9 @@
     </div>
 </template>
 
-<record id="website.s_accordion_000_scss" model="ir.asset">
-    <field name="name">Accordion 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_accordion/000.scss</field>
-</record>
+<asset id="website.s_accordion_000_scss" name="Accordion 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_accordion/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_alert.xml b/addons/website/views/snippets/s_alert.xml
index 48b5f751b1177..4e56071a9eec5 100644
--- a/addons/website/views/snippets/s_alert.xml
+++ b/addons/website/views/snippets/s_alert.xml
@@ -10,17 +10,14 @@
     </div>
 </template>
 
-<record id="website.s_alert_000_scss" model="ir.asset">
-    <field name="name">Alert 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_alert/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_alert_000_scss" name="Alert 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_alert/000.scss</path>
+</asset>
 
-<record id="website.s_alert_001_scss" model="ir.asset">
-    <field name="name">Alert 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_alert/001.scss</field>
-</record>
+<asset id="website.s_alert_001_scss" name="Alert 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_alert/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_announcement_scroll.xml b/addons/website/views/snippets/s_announcement_scroll.xml
index 56b5adad94d3f..290a254e8ada8 100644
--- a/addons/website/views/snippets/s_announcement_scroll.xml
+++ b/addons/website/views/snippets/s_announcement_scroll.xml
@@ -11,10 +11,9 @@
     </section>
 </template>
 
-<record id="website.s_announcement_scroll_000_scss" model="ir.asset">
-    <field name="name">Announcement Scroll 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_announcement_scroll/000.scss</field>
-</record>
+<asset id="website.s_announcement_scroll_000_scss" name="Announcement Scroll 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_announcement_scroll/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_attributes_horizontal.xml b/addons/website/views/snippets/s_attributes_horizontal.xml
index 8980579e0c8a0..5adc62011aca8 100644
--- a/addons/website/views/snippets/s_attributes_horizontal.xml
+++ b/addons/website/views/snippets/s_attributes_horizontal.xml
@@ -74,10 +74,9 @@
     </section>
 </template>
 
-<record id="website.s_attributes_horizontal_000_scss" model="ir.asset">
-    <field name="name">Horizontal Attributes 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_attributes_horizontal/000.scss</field>
-</record>
+<asset id="website.s_attributes_horizontal_000_scss" name="Horizontal Attributes 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_attributes_horizontal/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_attributes_vertical.xml b/addons/website/views/snippets/s_attributes_vertical.xml
index 7dc2b5e49e181..f3c103988e0d3 100644
--- a/addons/website/views/snippets/s_attributes_vertical.xml
+++ b/addons/website/views/snippets/s_attributes_vertical.xml
@@ -58,10 +58,9 @@
     </section>
 </template>
 
-<record id="website.s_attributes_vertical_000_scss" model="ir.asset">
-    <field name="name">Vertical Attributes 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_attributes_vertical/000.scss</field>
-</record>
+<asset id="website.s_attributes_vertical_000_scss" name="Vertical Attributes 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_attributes_vertical/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_badge.xml b/addons/website/views/snippets/s_badge.xml
index 4ed6b4d779979..439c6565f89b4 100644
--- a/addons/website/views/snippets/s_badge.xml
+++ b/addons/website/views/snippets/s_badge.xml
@@ -7,16 +7,14 @@
     </span>
 </template>
 
-<record id="website.s_badge_000_variables_scss" model="ir.asset">
-    <field name="name">Badge 000 variables SCSS</field>
-    <field name="bundle">web._assets_primary_variables</field>
-    <field name="path">website/static/src/snippets/s_badge/000_variables.scss</field>
-</record>
+<asset id="website.s_badge_000_variables_scss" name="Badge 000 variables SCSS">
+    <bundle>web._assets_primary_variables</bundle>
+    <path>website/static/src/snippets/s_badge/000_variables.scss</path>
+</asset>
 
-<record id="website.s_badge_000_scss" model="ir.asset">
-    <field name="name">Badge 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_badge/000.scss</field>
-</record>
+<asset id="website.s_badge_000_scss" name="Badge 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_badge/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_banner_categories.xml b/addons/website/views/snippets/s_banner_categories.xml
index 4423a1000e31f..c441a32eeabfb 100644
--- a/addons/website/views/snippets/s_banner_categories.xml
+++ b/addons/website/views/snippets/s_banner_categories.xml
@@ -58,10 +58,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_banner_categories_000_scss" model="ir.asset">
-    <field name="name">Banner Categories 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_banner_categories/000.scss</field>
-</record>
+<asset id="website.s_banner_categories_000_scss" name="Banner Categories 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_banner_categories/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_blockquote.xml b/addons/website/views/snippets/s_blockquote.xml
index a301c14ec8061..493109d0352d5 100644
--- a/addons/website/views/snippets/s_blockquote.xml
+++ b/addons/website/views/snippets/s_blockquote.xml
@@ -20,17 +20,14 @@
     </blockquote>
 </template>
 
-<record id="website.s_blockquote_001_scss" model="ir.asset">
-    <field name="name">Blockquote 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_blockquote/001.scss</field>
-</record>
+<asset id="website.s_blockquote_001_scss" name="Blockquote 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_blockquote/001.scss</path>
+</asset>
 
-<record id="website.s_blockquote_000_scss" model="ir.asset">
-    <field name="name">Blockquote 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_blockquote/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_blockquote_000_scss" name="Blockquote 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_blockquote/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_btn.xml b/addons/website/views/snippets/s_btn.xml
index 0f46e5a68550d..33947f017a9c0 100644
--- a/addons/website/views/snippets/s_btn.xml
+++ b/addons/website/views/snippets/s_btn.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<record id="website.s_btn_000_scss" model="ir.asset">
-    <field name="name">Btn 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_btn/000.scss</field>
-</record>
+<asset id="website.s_btn_000_scss" name="Btn 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_btn/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_card.xml b/addons/website/views/snippets/s_card.xml
index 4fd8aeddcb7dc..92258cc3bd016 100644
--- a/addons/website/views/snippets/s_card.xml
+++ b/addons/website/views/snippets/s_card.xml
@@ -14,10 +14,9 @@
     </div>
 </template>
 
-<record id="website.s_card_000_scss" model="ir.asset">
-    <field name="name">Card 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_card/000.scss</field>
-</record>
+<asset id="website.s_card_000_scss" name="Card 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_card/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_carousel.xml b/addons/website/views/snippets/s_carousel.xml
index 93cc96be91e80..dc75cde6f094b 100644
--- a/addons/website/views/snippets/s_carousel.xml
+++ b/addons/website/views/snippets/s_carousel.xml
@@ -70,17 +70,14 @@
     </section>
 </template>
 
-<record id="website.s_carousel_000_scss" model="ir.asset">
-    <field name="name">Carousel 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_carousel/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_carousel_000_scss" name="Carousel 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_carousel/000.scss</path>
+</asset>
 
-<record id="website.s_carousel_001_scss" model="ir.asset">
-    <field name="name">Carousel 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_carousel/001.scss</field>
-</record>
+<asset id="website.s_carousel_001_scss" name="Carousel 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_carousel/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_carousel_cards.xml b/addons/website/views/snippets/s_carousel_cards.xml
index 0f843488b2ba5..5c8819be80881 100644
--- a/addons/website/views/snippets/s_carousel_cards.xml
+++ b/addons/website/views/snippets/s_carousel_cards.xml
@@ -72,10 +72,9 @@
     </section>
 </template>
 
-<record id="website.s_carousel_cards_000_scss" model="ir.asset">
-    <field name="name">Carousel Intro 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_carousel_cards/000.scss</field>
-</record>
+<asset id="website.s_carousel_cards_000_scss" name="Carousel Intro 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_carousel_cards/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_carousel_intro.xml b/addons/website/views/snippets/s_carousel_intro.xml
index 4f647aa77be26..daf6f09526796 100644
--- a/addons/website/views/snippets/s_carousel_intro.xml
+++ b/addons/website/views/snippets/s_carousel_intro.xml
@@ -81,10 +81,9 @@
     </section>
 </template>
 
-<record id="website.s_carousel_intro_000_scss" model="ir.asset">
-    <field name="name">Carousel Intro 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_carousel_intro/000.scss</field>
-</record>
+<asset id="website.s_carousel_intro_000_scss" name="Carousel Intro 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_carousel_intro/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_color_blocks_2.xml b/addons/website/views/snippets/s_color_blocks_2.xml
index c657f4d2ac90c..63ffbdee9fb0c 100644
--- a/addons/website/views/snippets/s_color_blocks_2.xml
+++ b/addons/website/views/snippets/s_color_blocks_2.xml
@@ -20,10 +20,9 @@
     </section>
 </template>
 
-<record id="website.s_color_blocks_2_000_scss" model="ir.asset">
-    <field name="name">Color blocks 2 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_color_blocks_2/000.scss</field>
-</record>
+<asset id="website.s_color_blocks_2_000_scss" name="Color blocks 2 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_color_blocks_2/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_company_team.xml b/addons/website/views/snippets/s_company_team.xml
index 0f07cfca3ec9e..6aa0e70f2b310 100644
--- a/addons/website/views/snippets/s_company_team.xml
+++ b/addons/website/views/snippets/s_company_team.xml
@@ -64,10 +64,9 @@
     </section>
 </template>
 
-<record id="website.s_company_team_000_scss" model="ir.asset">
-    <field name="name">Company team 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_company_team/000.scss</field>
-</record>
+<asset id="website.s_company_team_000_scss" name="Company team 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_company_team/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_comparisons.xml b/addons/website/views/snippets/s_comparisons.xml
index f369493a42b90..3d9074bb62a67 100644
--- a/addons/website/views/snippets/s_comparisons.xml
+++ b/addons/website/views/snippets/s_comparisons.xml
@@ -80,11 +80,9 @@
     </section>
 </template>
 
-<record id="website.s_comparisons_000_scss" model="ir.asset">
-    <field name="name">Comparisons 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_comparisons/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_comparisons_000_scss" name="Comparisons 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_comparisons/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_countdown.xml b/addons/website/views/snippets/s_countdown.xml
index d5011742a4f92..61127d1a124db 100644
--- a/addons/website/views/snippets/s_countdown.xml
+++ b/addons/website/views/snippets/s_countdown.xml
@@ -27,10 +27,9 @@
     </section>
 </template>
 
-<record id="website.s_countdown_000_xml" model="ir.asset">
-    <field name="name">Countdown 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_countdown/000.xml</field>
-</record>
+<asset id="website.s_countdown_000_xml" name="Countdown 000 XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_countdown/000.xml</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_dynamic_snippet.xml b/addons/website/views/snippets/s_dynamic_snippet.xml
index 6666d3b4e3eea..0ab676fc76799 100644
--- a/addons/website/views/snippets/s_dynamic_snippet.xml
+++ b/addons/website/views/snippets/s_dynamic_snippet.xml
@@ -46,16 +46,14 @@
             snippet_name.f="s_dynamic_snippet"/>
     </template>
 
-<record id="website.s_dynamic_snippet_000_scss" model="ir.asset">
-    <field name="name">Dynamic snippet 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_dynamic_snippet/000.scss</field>
-</record>
+<asset id="website.s_dynamic_snippet_000_scss" name="Dynamic snippet 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_dynamic_snippet/000.scss</path>
+</asset>
 
-<record id="website.s_dynamic_snippet_000_xml" model="ir.asset">
-    <field name="name">Dynamic snippet 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_dynamic_snippet/000.xml</field>
-</record>
+<asset id="website.s_dynamic_snippet_000_xml" name="Dynamic snippet 000 XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_dynamic_snippet/000.xml</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_dynamic_snippet_carousel.xml b/addons/website/views/snippets/s_dynamic_snippet_carousel.xml
index 0f1988075556d..85d442514288f 100644
--- a/addons/website/views/snippets/s_dynamic_snippet_carousel.xml
+++ b/addons/website/views/snippets/s_dynamic_snippet_carousel.xml
@@ -5,16 +5,14 @@
             snippet_name.f="s_dynamic_snippet_carousel"/>
     </template>
 
-<record id="website.s_dynamic_snippet_carousel_000_scss" model="ir.asset">
-    <field name="name">Dynamic snippet carousel 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_dynamic_snippet_carousel/000.scss</field>
-</record>
+<asset id="website.s_dynamic_snippet_carousel_000_scss" name="Dynamic snippet carousel 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_dynamic_snippet_carousel/000.scss</path>
+</asset>
 
-<record id="website.s_dynamic_snippet_carousel_000_xml" model="ir.asset">
-    <field name="name">Dynamic snippet carousel 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_dynamic_snippet_carousel/000.xml</field>
-</record>
+<asset id="website.s_dynamic_snippet_carousel_000_xml" name="Dynamic snippet carousel 000 XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_dynamic_snippet_carousel/000.xml</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_ecomm_categories_showcase.xml b/addons/website/views/snippets/s_ecomm_categories_showcase.xml
index 388b629fe8bb3..ad70162eca000 100644
--- a/addons/website/views/snippets/s_ecomm_categories_showcase.xml
+++ b/addons/website/views/snippets/s_ecomm_categories_showcase.xml
@@ -63,10 +63,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_ecomm_categories_showcase_000_scss" model="ir.asset">
-    <field name="name">Categories Grid 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_ecomm_categories_showcase/000.scss</field>
-</record>
+<asset id="website.s_ecomm_categories_showcase_000_scss" name="Categories Grid 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_ecomm_categories_showcase/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_embed_code.xml b/addons/website/views/snippets/s_embed_code.xml
index aa49acea51a20..63cd0929e3296 100644
--- a/addons/website/views/snippets/s_embed_code.xml
+++ b/addons/website/views/snippets/s_embed_code.xml
@@ -19,10 +19,9 @@
 </template>
 
 <!-- Snippet assets -->
-<record id="website.s_embed_code_000_scss" model="ir.asset">
-    <field name="name">Embed Code 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_embed_code/000.scss</field>
-</record>
+<asset id="website.s_embed_code_000_scss" name="Embed Code 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_embed_code/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_faq_collapse.xml b/addons/website/views/snippets/s_faq_collapse.xml
index 977b1726b7138..d503df5909416 100644
--- a/addons/website/views/snippets/s_faq_collapse.xml
+++ b/addons/website/views/snippets/s_faq_collapse.xml
@@ -18,11 +18,9 @@
     </section>
 </template>
 
-<record id="website.s_faq_collapse_000_scss" model="ir.asset">
-    <field name="name">Faq collapse 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_faq_collapse/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_faq_collapse_000_scss" name="Faq collapse 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_faq_collapse/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_features.xml b/addons/website/views/snippets/s_features.xml
index 48a6f3c110c79..08e813a68b399 100644
--- a/addons/website/views/snippets/s_features.xml
+++ b/addons/website/views/snippets/s_features.xml
@@ -43,9 +43,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_features_000_scss" model="ir.asset">
-    <field name="name">Features 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_features/000.scss</field>
-</record>
+<asset id="website.s_features_000_scss" name="Features 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_features/000.scss</path>
+</asset>
+
 </odoo>
diff --git a/addons/website/views/snippets/s_features_grid.xml b/addons/website/views/snippets/s_features_grid.xml
index 93b9f24e320a1..06df488b4ffa3 100644
--- a/addons/website/views/snippets/s_features_grid.xml
+++ b/addons/website/views/snippets/s_features_grid.xml
@@ -74,16 +74,13 @@
     </section>
 </template>
 
-<record id="website.s_features_grid_000_scss" model="ir.asset">
-    <field name="name">Features grid 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_features_grid/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
-<record id="website.s_features_grid_001_scss" model="ir.asset">
-    <field name="name">Features grid 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_features_grid/001.scss</field>
-</record>
+<asset id="website.s_features_grid_000_scss" name="Features grid 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_features_grid/000.scss</path>
+</asset>
+<asset id="website.s_features_grid_001_scss" name="Features grid 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_features_grid/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_floating_blocks.xml b/addons/website/views/snippets/s_floating_blocks.xml
index b6b0a740cce14..dc38dd6d69c05 100644
--- a/addons/website/views/snippets/s_floating_blocks.xml
+++ b/addons/website/views/snippets/s_floating_blocks.xml
@@ -83,9 +83,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_floating_blocks_000_scss" model="ir.asset">
-    <field name="name">Floating Blocks 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_floating_blocks/000.scss</field>
-</record>
+<asset id="website.s_floating_blocks_000_scss" name="Floating Blocks 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_floating_blocks/000.scss</path>
+</asset>
+
 </odoo>
diff --git a/addons/website/views/snippets/s_google_map.xml b/addons/website/views/snippets/s_google_map.xml
index 8f383eab30e03..b677fb776e95a 100644
--- a/addons/website/views/snippets/s_google_map.xml
+++ b/addons/website/views/snippets/s_google_map.xml
@@ -7,10 +7,9 @@
     </section>
 </template>
 
-<record id="website.s_google_map_000_scss" model="ir.asset">
-    <field name="name">Google map 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_google_map/000.scss</field>
-</record>
+<asset id="website.s_google_map_000_scss" name="Google map 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_google_map/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_hr.xml b/addons/website/views/snippets/s_hr.xml
index 95041bdd6cbc8..018df32fa27fd 100644
--- a/addons/website/views/snippets/s_hr.xml
+++ b/addons/website/views/snippets/s_hr.xml
@@ -7,10 +7,9 @@
     </div>
 </template>
 
-<record id="website.s_hr_000_scss" model="ir.asset">
-    <field name="name">Hr 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_hr/000.scss</field>
-</record>
+<asset id="website.s_hr_000_scss" name="Hr 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_hr/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_image_gallery.xml b/addons/website/views/snippets/s_image_gallery.xml
index 508a6dca28915..31ec8fed524a7 100644
--- a/addons/website/views/snippets/s_image_gallery.xml
+++ b/addons/website/views/snippets/s_image_gallery.xml
@@ -57,24 +57,19 @@
     </section>
 </template>
 
-<record id="website.s_image_gallery_000_scss" model="ir.asset">
-    <field name="name">Image gallery 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_image_gallery/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_image_gallery_000_scss" name="Image gallery 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_image_gallery/000.scss</path>
+</asset>
 
-<record id="website.s_image_gallery_001_scss" model="ir.asset">
-    <field name="name">Image gallery 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_image_gallery/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_image_gallery_001_scss" name="Image gallery 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_image_gallery/001.scss</path>
+</asset>
 
-<record id="website.s_image_gallery_002_scss" model="ir.asset">
-    <field name="name">Image gallery 002 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_image_gallery/002.scss</field>
-</record>
+<asset id="website.s_image_gallery_002_scss" name="Image gallery 002 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_image_gallery/002.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_instagram_page.xml b/addons/website/views/snippets/s_instagram_page.xml
index eaa6a65474256..412bf5e7c58cc 100644
--- a/addons/website/views/snippets/s_instagram_page.xml
+++ b/addons/website/views/snippets/s_instagram_page.xml
@@ -9,10 +9,9 @@
     </section>
 </template>
 
-<record id="website.s_instagram_page_000_scss" model="ir.asset">
-    <field name="name">Instagram Page 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_instagram_page/000.scss</field>
-</record>
+<asset id="website.s_instagram_page_000_scss" name="Instagram Page 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_instagram_page/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_map.xml b/addons/website/views/snippets/s_map.xml
index 399dcbe107665..51fc4cb4a095a 100644
--- a/addons/website/views/snippets/s_map.xml
+++ b/addons/website/views/snippets/s_map.xml
@@ -15,10 +15,9 @@
     </section>
 </template>
 
-<record id="website.s_map_000_scss" model="ir.asset">
-    <field name="name">Map 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_map/000.scss</field>
-</record>
+<asset id="website.s_map_000_scss" name="Map 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_map/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_masonry_block.xml b/addons/website/views/snippets/s_masonry_block.xml
index dfa7f133f15b6..7ab174fe88296 100644
--- a/addons/website/views/snippets/s_masonry_block.xml
+++ b/addons/website/views/snippets/s_masonry_block.xml
@@ -164,24 +164,19 @@ Use t-snippet-call and fill it with its inner grid-mode row.
 </template>
 
 <!-- Assets -->
-<record id="website.s_masonry_block_000_scss" model="ir.asset">
-    <field name="name">Masonry block 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_masonry_block/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_masonry_block_000_scss" name="Masonry block 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_masonry_block/000.scss</path>
+</asset>
 
-<record id="website.s_masonry_block_001_scss" model="ir.asset">
-    <field name="name">Masonry block 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_masonry_block/001.scss</field>
-</record>
+<asset id="website.s_masonry_block_001_scss" name="Masonry block 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_masonry_block/001.scss</path>
+</asset>
 
-<record id="website.s_masonry_block_000_variables_scss" model="ir.asset">
-    <field name="name">Masonry block 000 variables SCSS</field>
-    <field name="bundle">web._assets_primary_variables</field>
-    <field name="path">website/static/src/snippets/s_masonry_block/000_variables.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_masonry_block_000_variables_scss" name="Masonry block 000 variables SCSS" active="False">
+    <bundle>web._assets_primary_variables</bundle>
+    <path>website/static/src/snippets/s_masonry_block/000_variables.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_media_list.xml b/addons/website/views/snippets/s_media_list.xml
index 17a9a34d00cb0..e98e363d72e90 100644
--- a/addons/website/views/snippets/s_media_list.xml
+++ b/addons/website/views/snippets/s_media_list.xml
@@ -45,17 +45,14 @@
     </section>
 </template>
 
-<record id="website.s_media_list_000_scss" model="ir.asset">
-    <field name="name">Media list 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_media_list/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_media_list_000_scss" name="Media list 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_media_list/000.scss</path>
+</asset>
 
-<record id="website.s_media_list_001_scss" model="ir.asset">
-    <field name="name">Media list 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_media_list/001.scss</field>
-</record>
+<asset id="website.s_media_list_001_scss" name="Media list 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_media_list/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_mega_menu_big_icons_subtitles.xml b/addons/website/views/snippets/s_mega_menu_big_icons_subtitles.xml
index 3659420e0fc2c..9ff9a510ae406 100644
--- a/addons/website/views/snippets/s_mega_menu_big_icons_subtitles.xml
+++ b/addons/website/views/snippets/s_mega_menu_big_icons_subtitles.xml
@@ -71,10 +71,9 @@
     </a>
 </template>
 
-<record id="website.s_mega_menu_big_icons_subtitles_000_scss" model="ir.asset">
-    <field name="name">Menu - Big icons &amp; subtitles 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_mega_menu_big_icons_subtitles/000.scss</field>
-</record>
+<asset id="website.s_mega_menu_big_icons_subtitles_000_scss" name="Menu - Big icons &amp; subtitles 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_mega_menu_big_icons_subtitles/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_mega_menu_cards.xml b/addons/website/views/snippets/s_mega_menu_cards.xml
index ff4bfaf37ba51..62d1f943f0c0f 100644
--- a/addons/website/views/snippets/s_mega_menu_cards.xml
+++ b/addons/website/views/snippets/s_mega_menu_cards.xml
@@ -55,10 +55,9 @@
     </div>
 </template>
 
-<record id="website.s_mega_menu_cards_000_scss" model="ir.asset">
-    <field name="name">Menu - Cards 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_mega_menu_cards/000.scss</field>
-</record>
+<asset id="website.s_mega_menu_cards_000_scss" name="Menu - Cards 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_mega_menu_cards/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_mega_menu_images_subtitles.xml b/addons/website/views/snippets/s_mega_menu_images_subtitles.xml
index f883fa67a0b08..edfd1136ee1e8 100644
--- a/addons/website/views/snippets/s_mega_menu_images_subtitles.xml
+++ b/addons/website/views/snippets/s_mega_menu_images_subtitles.xml
@@ -62,10 +62,9 @@
     </a>
 </template>
 
-<record id="website.s_mega_menu_images_subtitles_000_scss" model="ir.asset">
-    <field name="name">Menu - images &amp; subtitles 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_mega_menu_images_subtitles/000.scss</field>
-</record>
+<asset id="website.s_mega_menu_images_subtitles_000_scss" name="Menu - images &amp; subtitles 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_mega_menu_images_subtitles/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_mega_menu_little_icons.xml b/addons/website/views/snippets/s_mega_menu_little_icons.xml
index 828ad042358d4..da05d958d854c 100644
--- a/addons/website/views/snippets/s_mega_menu_little_icons.xml
+++ b/addons/website/views/snippets/s_mega_menu_little_icons.xml
@@ -65,10 +65,9 @@
     </section>
 </template>
 
-<record id="website.s_mega_menu_little_icons_000_scss" model="ir.asset">
-    <field name="name">Menu - Little icons 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_mega_menu_little_icons/000.scss</field>
-</record>
+<asset id="website.s_mega_menu_little_icons_000_scss" name="Menu - Little icons 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_mega_menu_little_icons/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_mega_menu_menus_logos.xml b/addons/website/views/snippets/s_mega_menu_menus_logos.xml
index aa818abf18ef8..f6d96a3120c82 100644
--- a/addons/website/views/snippets/s_mega_menu_menus_logos.xml
+++ b/addons/website/views/snippets/s_mega_menu_menus_logos.xml
@@ -81,10 +81,9 @@
     </section>
 </template>
 
-<record id="website.s_mega_menu_menus_logos_000_scss" model="ir.asset">
-    <field name="name">Menus &amp; logos 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_mega_menu_menus_logos/000.scss</field>
-</record>
+<asset id="website.s_mega_menu_menus_logos_000_scss" name="Menus &amp; logos 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_mega_menu_menus_logos/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_mega_menu_odoo_menu.xml b/addons/website/views/snippets/s_mega_menu_odoo_menu.xml
index cfcdad715bf1a..319f9c424a65f 100644
--- a/addons/website/views/snippets/s_mega_menu_odoo_menu.xml
+++ b/addons/website/views/snippets/s_mega_menu_odoo_menu.xml
@@ -93,10 +93,9 @@
     </section>
 </template>
 
-<record id="website.s_mega_menu_odoo_menu_000_scss" model="ir.asset">
-    <field name="name">Odoo Menu 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_mega_menu_odoo_menu/000.scss</field>
-</record>
+<asset id="website.s_mega_menu_odoo_menu_000_scss" name="Odoo Menu 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_mega_menu_odoo_menu/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_popup.xml b/addons/website/views/snippets/s_popup.xml
index 080cf1ac6755f..b141b96149ef3 100644
--- a/addons/website/views/snippets/s_popup.xml
+++ b/addons/website/views/snippets/s_popup.xml
@@ -28,17 +28,14 @@
     </div>
 </template>
 
-<record id="website.s_popup_000_scss" model="ir.asset">
-    <field name="name">Popup 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_popup/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_popup_000_scss" name="Popup 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_popup/000.scss</path>
+</asset>
 
-<record id="website.s_popup_001_scss" model="ir.asset">
-    <field name="name">Popup 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_popup/001.scss</field>
-</record>
+<asset id="website.s_popup_001_scss" name="Popup 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_popup/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_pricelist_cafe.xml b/addons/website/views/snippets/s_pricelist_cafe.xml
index 78750a3c35419..f452aef747c2a 100644
--- a/addons/website/views/snippets/s_pricelist_cafe.xml
+++ b/addons/website/views/snippets/s_pricelist_cafe.xml
@@ -74,10 +74,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_pricelist_cafe_000_scss" model="ir.asset">
-    <field name="name">Pricelist Cafe 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_pricelist_cafe/000.scss</field>
-</record>
+<asset id="website.s_pricelist_cafe_000_scss" name="Pricelist Cafe 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_pricelist_cafe/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_process_steps.xml b/addons/website/views/snippets/s_process_steps.xml
index dc4572036bd46..19da67f27a30d 100644
--- a/addons/website/views/snippets/s_process_steps.xml
+++ b/addons/website/views/snippets/s_process_steps.xml
@@ -66,25 +66,19 @@
     </section>
 </template>
 
-<record id="website.s_process_steps_000_scss" model="ir.asset">
-    <field name="name">Process steps 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_process_steps/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_process_steps_000_scss" name="Process steps 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_process_steps/000.scss</path>
+</asset>
 
-<record id="website.s_process_steps_001_scss" model="ir.asset">
-    <field name="name">Process steps 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_process_steps/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_process_steps_001_scss" name="Process steps 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_process_steps/001.scss</path>
+</asset>
 
-<record id="website.s_process_steps_002_scss" model="ir.asset">
-    <field name="name">Process steps 002 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_process_steps/002.scss</field>
-    <field name="active" eval="True"/>
-</record>
+<asset id="website.s_process_steps_002_scss" name="Process steps 002 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_process_steps/002.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_product_catalog.xml b/addons/website/views/snippets/s_product_catalog.xml
index 261ccad998dcb..c48820b3f05e2 100644
--- a/addons/website/views/snippets/s_product_catalog.xml
+++ b/addons/website/views/snippets/s_product_catalog.xml
@@ -67,11 +67,9 @@
     </li>
 </template>
 
-<record id="website.s_product_catalog_001_scss" model="ir.asset">
-    <field name="name">Product catalog 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_product_catalog/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_product_catalog_001_scss" name="Product catalog 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_product_catalog/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_product_list.xml b/addons/website/views/snippets/s_product_list.xml
index d00b6956e7d37..137cb2cce9dd6 100644
--- a/addons/website/views/snippets/s_product_list.xml
+++ b/addons/website/views/snippets/s_product_list.xml
@@ -84,18 +84,14 @@
     </section>
 </template>
 
-<record id="website.s_product_list_000_variables_scss" model="ir.asset">
-    <field name="name">Product list 000 variables SCSS</field>
-    <field name="bundle">web._assets_primary_variables</field>
-    <field name="path">website/static/src/snippets/s_product_list/000_variables.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_product_list_000_variables_scss" name="Product list 000 variables SCSS" active="False">
+    <bundle>web._assets_primary_variables</bundle>
+    <path>website/static/src/snippets/s_product_list/000_variables.scss</path>
+</asset>
 
-<record id="website.s_product_list_000_scss" model="ir.asset">
-    <field name="name">Product list 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_product_list/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_product_list_000_scss" name="Product list 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_product_list/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_progress_bar.xml b/addons/website/views/snippets/s_progress_bar.xml
index fa76b9b2f1149..e7fb7c3163061 100644
--- a/addons/website/views/snippets/s_progress_bar.xml
+++ b/addons/website/views/snippets/s_progress_bar.xml
@@ -14,11 +14,9 @@
     </div>
 </template>
 
-
-<record id="website.s_progress_bar_001_scss" model="ir.asset">
-    <field name="name">Progress bar 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_progress_bar/001.scss</field>
-</record>
+<asset id="website.s_progress_bar_001_scss" name="Progress bar 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_progress_bar/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_quadrant.xml b/addons/website/views/snippets/s_quadrant.xml
index ec18cc6732fb6..03afa75e2589a 100644
--- a/addons/website/views/snippets/s_quadrant.xml
+++ b/addons/website/views/snippets/s_quadrant.xml
@@ -30,10 +30,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_quadrant_000_scss" model="ir.asset">
-    <field name="name">Quadrant 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_quadrant/000.scss</field>
-</record>
+<asset id="website.s_quadrant_000_scss" name="Quadrant 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_quadrant/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_quotes_carousel.xml b/addons/website/views/snippets/s_quotes_carousel.xml
index 8f94363056117..2306abef0801c 100644
--- a/addons/website/views/snippets/s_quotes_carousel.xml
+++ b/addons/website/views/snippets/s_quotes_carousel.xml
@@ -84,24 +84,19 @@
     </section>
 </template>
 
-<record id="website.s_quotes_carousel_000_scss" model="ir.asset">
-    <field name="name">Quotes carousel 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_quotes_carousel/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_quotes_carousel_000_scss" name="Quotes carousel 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_quotes_carousel/000.scss</path>
+</asset>
 
-<record id="website.s_quotes_carousel_001_scss" model="ir.asset">
-    <field name="name">Quotes carousel 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_quotes_carousel/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_quotes_carousel_001_scss" name="Quotes carousel 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_quotes_carousel/001.scss</path>
+</asset>
 
-<record id="website.s_quotes_carousel_002_scss" model="ir.asset">
-    <field name="name">Quotes carousel 002 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_quotes_carousel/002.scss</field>
-</record>
+<asset id="website.s_quotes_carousel_002_scss" name="Quotes carousel 002 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_quotes_carousel/002.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_rating.xml b/addons/website/views/snippets/s_rating.xml
index b12dd47f2afe4..a5d17a01c8fbf 100644
--- a/addons/website/views/snippets/s_rating.xml
+++ b/addons/website/views/snippets/s_rating.xml
@@ -18,17 +18,14 @@
     </div>
 </template>
 
-<record id="website.s_rating_000_scss" model="ir.asset">
-    <field name="name">Rating 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_rating/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_rating_000_scss" name="Rating 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_rating/000.scss</path>
+</asset>
 
-<record id="website.s_rating_001_scss" model="ir.asset">
-    <field name="name">Rating 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_rating/001.scss</field>
-</record>
+<asset id="website.s_rating_001_scss" name="Rating 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_rating/001.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_references.xml b/addons/website/views/snippets/s_references.xml
index 3d9a95b57e50f..8f88256005d10 100644
--- a/addons/website/views/snippets/s_references.xml
+++ b/addons/website/views/snippets/s_references.xml
@@ -34,10 +34,9 @@
     </section>
 </template>
 
-<record id="website.s_references_000_scss" model="ir.asset">
-    <field name="name">References 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_references/000.scss</field>
-</record>
+<asset id="website.s_references_000_scss" name="References 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_references/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_searchbar.xml b/addons/website/views/snippets/s_searchbar.xml
index 229e60dc6b84a..ce1de47656189 100644
--- a/addons/website/views/snippets/s_searchbar.xml
+++ b/addons/website/views/snippets/s_searchbar.xml
@@ -26,10 +26,9 @@
     </section>
 </template>
 
-<record id="website.s_searchbar_000_xml" model="ir.asset">
-    <field name="name">Searchbar 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_searchbar/000.xml</field>
-</record>
+<asset id="website.s_searchbar_000_xml" name="Searchbar 000 XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_searchbar/000.xml</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_share.xml b/addons/website/views/snippets/s_share.xml
index 1c6b5bffca38a..63739dcfb4537 100644
--- a/addons/website/views/snippets/s_share.xml
+++ b/addons/website/views/snippets/s_share.xml
@@ -25,10 +25,9 @@
     </div>
 </template>
 
-<record id="website.s_share_000_scss" model="ir.asset">
-    <field name="name">Share 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_share/000.scss</field>
-</record>
+<asset id="website.s_share_000_scss" name="Share 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_share/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_showcase.xml b/addons/website/views/snippets/s_showcase.xml
index 2c0d3484affd8..abf737ef3aca7 100644
--- a/addons/website/views/snippets/s_showcase.xml
+++ b/addons/website/views/snippets/s_showcase.xml
@@ -50,31 +50,24 @@
 </template>
 
 <!-- Assets -->
-<record id="website.s_showcase_000_scss" model="ir.asset">
-    <field name="name">Showcase 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_showcase/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_showcase_000_scss" name="Showcase 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_showcase/000.scss</path>
+</asset>
 
-<record id="website.s_showcase_001_scss" model="ir.asset">
-    <field name="name">Showcase 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_showcase/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_showcase_001_scss" name="Showcase 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_showcase/001.scss</path>
+</asset>
 
-<record id="website.s_showcase_002_scss" model="ir.asset">
-    <field name="name">Showcase 002 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_showcase/002.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_showcase_002_scss" name="Showcase 002 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_showcase/002.scss</path>
+</asset>
 
-<record id="website.s_showcase_003_scss" model="ir.asset">
-    <field name="name">Showcase 003 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_showcase/003.scss</field>
-</record>
+<asset id="website.s_showcase_003_scss" name="Showcase 003 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_showcase/003.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_social_media.xml b/addons/website/views/snippets/s_social_media.xml
index 653cee500e11c..b48c5cc335740 100644
--- a/addons/website/views/snippets/s_social_media.xml
+++ b/addons/website/views/snippets/s_social_media.xml
@@ -35,10 +35,9 @@ title stay editable after a save (see SOCIAL_MEDIA_TITLE_CONTENTEDITABLE).
     </div>
 </template>
 
-<record id="website.s_social_media_000_scss" model="ir.asset">
-    <field name="name">SocialMedia 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_social_media/000.scss</field>
-</record>
+<asset id="website.s_social_media_000_scss" name="SocialMedia 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_social_media/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_table_of_content.xml b/addons/website/views/snippets/s_table_of_content.xml
index c5a76d428f7ad..6a2929caad47f 100644
--- a/addons/website/views/snippets/s_table_of_content.xml
+++ b/addons/website/views/snippets/s_table_of_content.xml
@@ -68,10 +68,9 @@
     </section>
 </template>
 
-<record id="website.s_table_of_content_000_scss" model="ir.asset">
-    <field name="name">Table of content 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_table_of_content/000.scss</field>
-</record>
+<asset id="website.s_table_of_content_000_scss" name="Table of content 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_table_of_content/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_tabs.xml b/addons/website/views/snippets/s_tabs.xml
index 74c5b8c0c14a2..2b18e47b52536 100644
--- a/addons/website/views/snippets/s_tabs.xml
+++ b/addons/website/views/snippets/s_tabs.xml
@@ -52,22 +52,17 @@
     </section>
 </template>
 
-<record id="website.s_tabs_001_scss" model="ir.asset">
-    <field name="name">Tabs 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_tabs/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
-<record id="website.s_tabs_002_scss" model="ir.asset">
-    <field name="name">Tabs 002 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_tabs/002.scss</field>
-    <field name="active" eval="False"/>
-</record>
-<record id="website.s_tabs_003_scss" model="ir.asset">
-    <field name="name">Tabs 003 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_tabs/003.scss</field>
-</record>
+<asset id="website.s_tabs_001_scss" name="Tabs 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_tabs/001.scss</path>
+</asset>
+<asset id="website.s_tabs_002_scss" name="Tabs 002 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_tabs/002.scss</path>
+</asset>
+<asset id="website.s_tabs_003_scss" name="Tabs 003 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_tabs/003.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_tabs_images.xml b/addons/website/views/snippets/s_tabs_images.xml
index 82ea4f574c3c1..3640bffa04480 100644
--- a/addons/website/views/snippets/s_tabs_images.xml
+++ b/addons/website/views/snippets/s_tabs_images.xml
@@ -91,10 +91,9 @@
     </section>
 </template>
 
-<record id="website.s_tabs_images_000_scss" model="ir.asset">
-    <field name="name">Tabs Images 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_tabs_images/000.scss</field>
-</record>
+<asset id="website.s_tabs_images_000_scss" name="Tabs Images 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_tabs_images/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_text_cover.xml b/addons/website/views/snippets/s_text_cover.xml
index c3f11332734a4..a5189a5d1fa74 100644
--- a/addons/website/views/snippets/s_text_cover.xml
+++ b/addons/website/views/snippets/s_text_cover.xml
@@ -16,10 +16,9 @@
     </section>
 </template>
 
-<record id="website.s_text_cover_000_scss" model="ir.asset">
-    <field name="name">Text cover 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_text_cover/000.scss</field>
-</record>
+<asset id="website.s_text_cover_000_scss" name="Text cover 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_text_cover/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_text_highlight.xml b/addons/website/views/snippets/s_text_highlight.xml
index 9b0fd8e78dd47..b8c7f60942cd9 100644
--- a/addons/website/views/snippets/s_text_highlight.xml
+++ b/addons/website/views/snippets/s_text_highlight.xml
@@ -10,10 +10,9 @@
     </div>
 </template>
 
-<record id="website.s_text_highlight_000_scss" model="ir.asset">
-    <field name="name">Text highlight 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_text_highlight/000.scss</field>
-</record>
+<asset id="website.s_text_highlight_000_scss" name="Text highlight 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_text_highlight/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_three_columns.xml b/addons/website/views/snippets/s_three_columns.xml
index 5b81ac8218ee0..009abbc971205 100644
--- a/addons/website/views/snippets/s_three_columns.xml
+++ b/addons/website/views/snippets/s_three_columns.xml
@@ -43,11 +43,9 @@
     </section>
 </template>
 
-<record id="website.s_three_columns_000_scss" model="ir.asset">
-    <field name="name">Three columns 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_three_columns/000.scss</field>
-    <field name="active" eval="False"/>
-    </record>
+<asset id="website.s_three_columns_000_scss" name="Three columns 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_three_columns/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_timeline.xml b/addons/website/views/snippets/s_timeline.xml
index 50b87c174f275..ee6db101169d3 100644
--- a/addons/website/views/snippets/s_timeline.xml
+++ b/addons/website/views/snippets/s_timeline.xml
@@ -63,24 +63,19 @@
     </section>
 </template>
 
-<record id="website.s_timeline_000_scss" model="ir.asset">
-    <field name="name">Timeline 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_timeline/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_timeline_000_scss" name="Timeline 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_timeline/000.scss</path>
+</asset>
 
-<record id="website.s_timeline_001_scss" model="ir.asset">
-    <field name="name">Timeline 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_timeline/001.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_timeline_001_scss" name="Timeline 001 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_timeline/001.scss</path>
+</asset>
 
-<record id="website.s_timeline_002_scss" model="ir.asset">
-    <field name="name">Timeline 002 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_timeline/002.scss</field>
-</record>
+<asset id="website.s_timeline_002_scss" name="Timeline 002 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_timeline/002.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_timeline_list.xml b/addons/website/views/snippets/s_timeline_list.xml
index 53c869b33b85c..70be41b355739 100644
--- a/addons/website/views/snippets/s_timeline_list.xml
+++ b/addons/website/views/snippets/s_timeline_list.xml
@@ -51,10 +51,9 @@
     </section>
 </template>
 
-<record id="website.s_timeline_list_000_scss" model="ir.asset">
-    <field name="name">Timeline List 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_timeline_list/000.scss</field>
-</record>
+<asset id="website.s_timeline_list_000_scss" name="Timeline List 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_timeline_list/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_title.xml b/addons/website/views/snippets/s_title.xml
index 058a9f7d4e58e..5e68e2ab4bb76 100644
--- a/addons/website/views/snippets/s_title.xml
+++ b/addons/website/views/snippets/s_title.xml
@@ -9,11 +9,9 @@
     </section>
 </template>
 
-<record id="website.s_title_000_scss" model="ir.asset">
-    <field name="name">Title 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_title/000.scss</field>
-    <field name="active" eval="False"/>
-    </record>
+<asset id="website.s_title_000_scss" name="Title 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_title/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_website_form.xml b/addons/website/views/snippets/s_website_form.xml
index 2d93136b7ef85..83c8d45f9096a 100644
--- a/addons/website/views/snippets/s_website_form.xml
+++ b/addons/website/views/snippets/s_website_form.xml
@@ -91,23 +91,19 @@
     </section>
 </template>
 
-<record id="website.s_website_form_000_scss" model="ir.asset">
-    <field name="name">Website form 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_website_form/000.scss</field>
-    <field name="active" eval="False"/>
-</record>
+<asset id="website.s_website_form_000_scss" name="Website form 000 SCSS" active="False">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_website_form/000.scss</path>
+</asset>
 
-<record id="website.s_website_form_001_scss" model="ir.asset">
-    <field name="name">Website form 001 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_website_form/001.scss</field>
-</record>
+<asset id="website.s_website_form_001_scss" name="Website form 001 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_website_form/001.scss</path>
+</asset>
 
-<record id="website.s_website_form_xml" model="ir.asset">
-    <field name="name">Website form XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/xml/website_form.xml</field>
-</record>
+<asset id="website.s_website_form_xml" name="Website form XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/xml/website_form.xml</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/snippets/s_website_form_cover.xml b/addons/website/views/snippets/s_website_form_cover.xml
index 6853404a355a1..0d119e2bf1a00 100644
--- a/addons/website/views/snippets/s_website_form_cover.xml
+++ b/addons/website/views/snippets/s_website_form_cover.xml
@@ -16,10 +16,9 @@
     </section>
 </template>
 
-<record id="website.s_website_form_cover_000_scss" model="ir.asset">
-    <field name="name">Website Form Cover 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website/static/src/snippets/s_website_form_cover/000.scss</field>
-</record>
+<asset id="website.s_website_form_cover_000_scss" name="Website Form Cover 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website/static/src/snippets/s_website_form_cover/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 340039ff38d55..8f8a86a0f3c93 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -2696,21 +2696,17 @@
 </template>
 
 <!-- Effect options -->
-<record id="website.ripple_effect_scss" model="ir.asset">
+<asset id="website.ripple_effect_scss" name="Ripple effect SCSS" active="False">
     <field name="key">website.ripple_effect_scss</field>
-    <field name="name">Ripple effect SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">/website/static/src/scss/options/ripple_effect.scss</field>
-    <field name="active" eval="False"/>
-</record>
+    <bundle>web.assets_frontend</bundle>
+    <path>/website/static/src/scss/options/ripple_effect.scss</path>
+</asset>
 
-<record id="website.ripple_effect_js" model="ir.asset">
+<asset id="website.ripple_effect_js" name="Ripple effect JS" active="False">
     <field name="key">website.ripple_effect_js</field>
-    <field name="name">Ripple effect JS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">/website/static/src/interactions/ripple_effect.js</field>
-    <field name="active" eval="False"/>
-</record>
+    <bundle>web.assets_frontend</bundle>
+    <path>/website/static/src/interactions/ripple_effect.js</path>
+</asset>
 
 <!-- Error and special pages -->
 <template id="website_info" name="Odoo Information">
diff --git a/addons/website_blog/views/snippets/s_blog_posts.xml b/addons/website_blog/views/snippets/s_blog_posts.xml
index 876eb71e35331..fd3ad718e3080 100644
--- a/addons/website_blog/views/snippets/s_blog_posts.xml
+++ b/addons/website_blog/views/snippets/s_blog_posts.xml
@@ -333,10 +333,9 @@
 </template>
 
 <!-- Assets -->
-<record id="website_blog.s_blog_posts_000_scss" model="ir.asset">
-    <field name="name">Blog posts 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website_blog/static/src/snippets/s_blog_posts/000.scss</field>
-</record>
+<asset id="website_blog.s_blog_posts_000_scss" name="Blog posts 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website_blog/static/src/snippets/s_blog_posts/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website_event/views/snippets/s_events.xml b/addons/website_event/views/snippets/s_events.xml
index bd5f0bc0acee7..4aa19aabcd911 100644
--- a/addons/website_event/views/snippets/s_events.xml
+++ b/addons/website_event/views/snippets/s_events.xml
@@ -316,10 +316,9 @@
 
 <!--ASSETS-->
 
-<record id="website_event.s_events_000_scss" model="ir.asset">
-    <field name="name">Event 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website_event/static/src/snippets/s_events/000.scss</field>
-</record>
+<asset id="website_event.s_events_000_scss" name="Event 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website_event/static/src/snippets/s_events/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website_event/views/snippets/snippets.xml b/addons/website_event/views/snippets/snippets.xml
index 4e96924cdb8d8..377e644e5cca2 100644
--- a/addons/website_event/views/snippets/snippets.xml
+++ b/addons/website_event/views/snippets/snippets.xml
@@ -21,11 +21,10 @@
     </xpath>
 </template>
 
-<record id="website_event.s_searchbar_000_xml" model="ir.asset">
-    <field name="name">Searchbar 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website_event/static/src/snippets/s_searchbar/000.xml</field>
-</record>
+<asset id="website_event.s_searchbar_000_xml" name="Searchbar 000 XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website_event/static/src/snippets/s_searchbar/000.xml</path>
+</asset>
 
 <!--
 grep: /website_event/static/src/img/speaker.png
diff --git a/addons/website_event_track/views/snippets.xml b/addons/website_event_track/views/snippets.xml
index ddc247c0f0565..c894da65818b3 100644
--- a/addons/website_event_track/views/snippets.xml
+++ b/addons/website_event_track/views/snippets.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<record id="website_event_track.s_searchbar_000_xml" model="ir.asset">
-    <field name="name">Searchbar 000 XML</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website_event_track/static/src/snippets/s_searchbar/000.xml</field>
-</record>
+<asset id="website_event_track.s_searchbar_000_xml" name="Searchbar 000 XML">
+    <bundle>web.assets_frontend</bundle>
+    <path>website_event_track/static/src/snippets/s_searchbar/000.xml</path>
+</asset>
+
 </odoo>
diff --git a/addons/website_payment/views/snippets/s_donation.xml b/addons/website_payment/views/snippets/s_donation.xml
index 53644bbdce390..c883462a3a2a5 100644
--- a/addons/website_payment/views/snippets/s_donation.xml
+++ b/addons/website_payment/views/snippets/s_donation.xml
@@ -77,10 +77,9 @@
     </section>
 </template>
 
-<record id="website_payment.s_donation_000_scss" model="ir.asset">
-    <field name="name">Donation 000 SCSS</field>
-    <field name="bundle">web.assets_frontend</field>
-    <field name="path">website_payment/static/src/snippets/s_donation/000.scss</field>
-</record>
+<asset id="website_payment.s_donation_000_scss" name="Donation 000 SCSS">
+    <bundle>web.assets_frontend</bundle>
+    <path>website_payment/static/src/snippets/s_donation/000.scss</path>
+</asset>
 
 </odoo>
diff --git a/addons/website_payment/views/snippets/s_supported_payment_methods.xml b/addons/website_payment/views/snippets/s_supported_payment_methods.xml
index 03b4c7f43c4f8..89ac58124ffa7 100644
--- a/addons/website_payment/views/snippets/s_supported_payment_methods.xml
+++ b/addons/website_payment/views/snippets/s_supported_payment_methods.xml
@@ -15,16 +15,14 @@
         />
     </template>
 
-    <record id="s_supported_payment_methods_OOO_xml" model="ir.asset">
-        <field name="name">Supported Payment Methods 000 XML</field>
-        <field name="bundle">web.assets_frontend</field>
-        <field name="path">/website_payment/static/src/snippets/s_supported_payment_methods/000.xml</field>
-    </record>
+    <asset id="s_supported_payment_methods_OOO_xml" name="Supported Payment Methods 000 XML">
+        <bundle>web.assets_frontend</bundle>
+        <path>/website_payment/static/src/snippets/s_supported_payment_methods/000.xml</path>
+    </asset>
 
-    <record id="s_supported_payment_methods_OOO_edit_xml" model="ir.asset">
-        <field name="name">Supported Payment Methods 000 XML (edit)</field>
-        <field name="bundle">website.assets_inside_builder_iframe</field>
-        <field name="path">/website_payment/static/src/snippets/s_supported_payment_methods/000.edit.xml</field>
-    </record>
+    <asset id="s_supported_payment_methods_OOO_edit_xml" name="Supported Payment Methods 000 XML (edit)">
+        <bundle>website.assets_inside_builder_iframe</bundle>
+        <path>/website_payment/static/src/snippets/s_supported_payment_methods/000.edit.xml</path>
+    </asset>
 
 </odoo>
diff --git a/addons/website_sale/templates/snippets/product_snippet_template_data.xml b/addons/website_sale/templates/snippets/product_snippet_template_data.xml
index 91e062663d756..4e639c33e6db4 100644
--- a/addons/website_sale/templates/snippets/product_snippet_template_data.xml
+++ b/addons/website_sale/templates/snippets/product_snippet_template_data.xml
@@ -139,10 +139,9 @@
         </template>
 
         <!-- Assets -->
-        <record id="website_sale.s_dynamic_snippet_products_000_scss" model="ir.asset">
-            <field name="name">Dynamic snippet products 000 SCSS</field>
-            <field name="bundle">web.assets_frontend</field>
-            <field name="path">website_sale/static/src/snippets/s_dynamic_snippet_products/000.scss</field>
-        </record>
+        <asset id="website_sale.s_dynamic_snippet_products_000_scss" name="Dynamic snippet products 000 SCSS">
+            <bundle>web.assets_frontend</bundle>
+            <path>website_sale/static/src/snippets/s_dynamic_snippet_products/000.scss</path>
+        </asset>
 
 </odoo>
diff --git a/odoo/addons/base/tests/__init__.py b/odoo/addons/base/tests/__init__.py
index 921e0aac3be71..eeaac91a63aca 100644
--- a/odoo/addons/base/tests/__init__.py
+++ b/odoo/addons/base/tests/__init__.py
@@ -24,6 +24,7 @@
 from . import test_avatar_mixin
 from . import test_init
 from . import test_ir_actions
+from . import test_ir_asset
 from . import test_ir_attachment
 from . import test_ir_cron
 from . import test_ir_filters
diff --git a/odoo/addons/base/tests/asset_tag.xml b/odoo/addons/base/tests/asset_tag.xml
new file mode 100644
index 0000000000000..ba1e8bba335f0
--- /dev/null
+++ b/odoo/addons/base/tests/asset_tag.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<asset id="base.test_asset_tag_aaa" name="Test asset tag (init active => keep active => update active)">
+    <bundle>test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+</asset>
+<asset id="base.test_asset_tag_aii" name="Test asset tag (init active => make inactive => update inactive)">
+    <bundle>test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+</asset>
+<asset id="base.test_asset_tag_aia" name="Test asset tag (init active => make inactive => update active)">
+    <bundle>test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+    <field name="active">True</field> <!-- Take into account during update -->
+</asset>
+<asset id="base.test_asset_tag_iii" name="Test asset tag (init inactive => keep inactive => update inactive)" active="False">
+    <bundle>test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+</asset>
+<asset id="base.test_asset_tag_iaa" name="Test asset tag (init inactive => make active => update active)" active="False">
+    <bundle>test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+</asset>
+<asset id="base.test_asset_tag_prepend" name="Test asset tag with directive">
+    <bundle directive="prepend">test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+</asset>
+<asset id="base.test_asset_tag_extra" name="Test asset tag with extra field">
+    <bundle>test_asset_bundle</bundle>
+    <path>base/tests/something.scss</path>
+    <field name="sequence" eval="17"/>
+</asset>
+
+</odoo>
diff --git a/odoo/addons/base/tests/test_ir_asset.py b/odoo/addons/base/tests/test_ir_asset.py
new file mode 100644
index 0000000000000..03361e1dbe3c8
--- /dev/null
+++ b/odoo/addons/base/tests/test_ir_asset.py
@@ -0,0 +1,77 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests.common import TransactionCase, tagged
+from odoo.tools import convert_file
+from odoo.tools.misc import file_path
+
+
+@tagged('-at_install', 'post_install')
+class TestAsset(TransactionCase):
+
+    def test_asset_tag(self):
+        """
+        Verify that assets defined with the <asset> tag are properly imported.
+        """
+        # Load new records
+        convert_file(
+            self.env, 'base',
+            file_path('base/tests/asset_tag.xml'),
+            {}, 'init', False,
+        )
+        active_keep_asset = self.env.ref('base.test_asset_tag_aaa')
+        inactive_keep_asset = self.env.ref('base.test_asset_tag_iii')
+        active_switch_asset_reset = self.env.ref('base.test_asset_tag_aia')
+        active_switch_asset_ignore = self.env.ref('base.test_asset_tag_aii')
+        inactive_switch_asset = self.env.ref('base.test_asset_tag_iaa')
+        prepend_asset = self.env.ref('base.test_asset_tag_prepend')
+        asset_with_extra_field = self.env.ref('base.test_asset_tag_extra')
+
+        # Verify initial load
+        self.assertEqual(prepend_asset._name, 'ir.asset', 'Model should be ir.asset')
+        self.assertEqual(prepend_asset.name, 'Test asset tag with directive', 'Name not loaded')
+        self.assertEqual(prepend_asset.directive, 'prepend', 'Directive not loaded')
+        self.assertEqual(prepend_asset.bundle, 'test_asset_bundle', 'Bundle not loaded')
+        self.assertEqual(prepend_asset.path, 'base/tests/something.scss', 'Path not loaded')
+        self.assertEqual(asset_with_extra_field.sequence, 17, 'Sequence not loaded')
+        self.assertTrue(active_keep_asset.active, 'Should be active')
+        self.assertTrue(active_switch_asset_reset.active, 'Should be active')
+        self.assertTrue(active_switch_asset_ignore.active, 'Should be active')
+        self.assertFalse(inactive_keep_asset.active, 'Should be inactive')
+        self.assertFalse(inactive_switch_asset.active, 'Should be inactive')
+
+        # Patch records
+        prepend_asset.name = 'changed'
+        prepend_asset.directive = 'append'
+        prepend_asset.bundle = 'changed'
+        prepend_asset.path = 'base/tests/changed.scss'
+        asset_with_extra_field.sequence = 3
+        active_switch_asset_reset.active = False
+        active_switch_asset_ignore.active = False
+        inactive_switch_asset.active = True
+
+        # Update records
+        convert_file(
+            self.env, 'base',
+            file_path('base/tests/asset_tag.xml'),
+            {
+                'base.test_asset_tag_aaa': active_keep_asset.id,
+                'base.test_asset_tag_iii': inactive_keep_asset.id,
+                'base.test_asset_tag_aia': active_switch_asset_reset.id,
+                'base.test_asset_tag_aii': active_switch_asset_ignore.id,
+                'base.test_asset_tag_iaa': inactive_switch_asset.id,
+                'base.test_asset_tag_prepend': prepend_asset.id,
+                'base.test_asset_tag_extra': asset_with_extra_field.id,
+            }, 'update', False,
+        )
+
+        # Verify updated load
+        self.assertEqual(prepend_asset.name, 'Test asset tag with directive', 'Name not restored')
+        self.assertEqual(prepend_asset.directive, 'prepend', 'Directive not restored')
+        self.assertEqual(prepend_asset.bundle, 'test_asset_bundle', 'Bundle not restored')
+        self.assertEqual(prepend_asset.path, 'base/tests/something.scss', 'Path not restored')
+        self.assertEqual(asset_with_extra_field.sequence, 17, 'Sequence not restored')
+        self.assertTrue(active_keep_asset.active, 'Should be active')
+        self.assertTrue(active_switch_asset_reset.active, 'Should be reset to active')
+        self.assertFalse(active_switch_asset_ignore.active, 'Should be kept inactive')
+        self.assertFalse(inactive_keep_asset.active, 'Should be inactive')
+        self.assertTrue(inactive_switch_asset.active, 'Should be kept active')
diff --git a/odoo/addons/test_assetsbundle/data/ir_asset.xml b/odoo/addons/test_assetsbundle/data/ir_asset.xml
index 88011f6939dc5..faf1d7872ba5c 100644
--- a/odoo/addons/test_assetsbundle/data/ir_asset.xml
+++ b/odoo/addons/test_assetsbundle/data/ir_asset.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="test_assetsbundle.test_jsfile[!4]_js" model="ir.asset">
-            <field name="name">Test jsfile[!4] JS</field>
-            <field name="bundle">test_assetsbundle.bundle1</field>
-            <field name="path">test_assetsbundle/static/src/js/test_jsfile[!4].js</field>
-        </record>
+        <asset id="test_assetsbundle.test_jsfile[!4]_js" name="Test jsfile[!4] JS">
+            <bundle>test_assetsbundle.bundle1</bundle>
+            <path>test_assetsbundle/static/src/js/test_jsfile[!4].js</path>
+        </asset>
     </data>
 </odoo>
diff --git a/odoo/import_xml.rng b/odoo/import_xml.rng
index 6de956a08a071..279dde573745b 100644
--- a/odoo/import_xml.rng
+++ b/odoo/import_xml.rng
@@ -230,6 +230,26 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="asset">
+        <rng:element name="asset">
+            <rng:attribute name="id" />
+            <rng:attribute name="name" />
+            <rng:optional><rng:attribute name="active" /></rng:optional>
+            <rng:interleave>
+                <rng:element name="bundle">
+                    <rng:optional><rng:attribute name="directive" /></rng:optional>
+                    <rng:text/>
+                </rng:element>
+                <rng:element name="path">
+                    <rng:text/>
+                </rng:element>
+                <rng:zeroOrMore>
+                    <rng:ref name="field" />
+                </rng:zeroOrMore>
+            </rng:interleave>
+        </rng:element>
+    </rng:define>
+
     <rng:define name="delete">
         <rng:element name="delete">
             <rng:attribute name="model" />
@@ -336,6 +356,7 @@
                     <rng:ref name="menuitem" />
                     <rng:ref name="record" />
                     <rng:ref name="template" />
+                    <rng:ref name="asset" />
                     <rng:ref name="delete" />
                     <rng:ref name="act_window" />
                     <rng:ref name="report" />
diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py
index bc7dbe25067e9..c99140870cef8 100644
--- a/odoo/tools/convert.py
+++ b/odoo/tools/convert.py
@@ -516,10 +516,16 @@ def _tag_template(self, el):
             record.append(Field(name='website_id', ref=attrib.pop('website_id')))
         if 'key' in attrib:
             record.append(Field(attrib.pop('key'), name='key'))
+
+        # If the "active" value is set on the root node (instead of an inner
+        # <field>), it is treated as the value for the "active" field but only
+        # when *not updating*. This allows to update the record in a more recent
+        # version without changing its active state (compatibility).
         if (active := attrib.pop('active', None)) in ("True", "False"):
             view_id = self.id_get(tpl_id, raise_if_not_found=False)
             if self.mode != "update" or not view_id:
                 record.append(Field(name='active', eval=active))
+
         if (customize_show := attrib.pop('customize_show', None)) in ("True", "False"):
             record.append(Field(name='customize_show', eval=customize_show))
         groups = attrib.pop('groups', None)
@@ -542,6 +548,46 @@ def _tag_template(self, el):
 
         return self._tag_record(record)
 
+    def _tag_asset(self, el):
+        """
+        Transforms an <asset> element into a <record> and forwards it.
+        """
+        asset_id = el.get('id')
+        Field = builder.E.field
+
+        record = etree.Element('record', attrib={
+            'id': asset_id,
+            'model': 'theme.ir.asset' if self.module.startswith('theme_') else 'ir.asset',
+        })
+
+        name = el.get('name', asset_id)
+        record.append(Field(name, name='name'))
+
+        # E.g. <bundle directive="prepend">web.assets_frontend</bundle>
+        # (directive is optional)
+        bundle_el = el.find('bundle')
+        record.append(Field(bundle_el.text, name='bundle'))
+        if 'directive' in bundle_el.attrib:
+            record.append(Field(bundle_el.get('directive'), name='directive'))
+
+        # E.g. <path>website/static/src/snippets/s_share/000.scss</path>
+        record.append(Field(el.find('path').text, name='path'))
+
+        # Same as <template> for ir.ui.view:
+        # If the "active" value is set on the root node (instead of an inner
+        # <field>), it is treated as the value for the "active" field but only
+        # when *not updating*. This allows to update the record in a more recent
+        # version without changing its active state (compatibility).
+        if el.get('active') in ("True", "False"):
+            record_id = self.id_get(asset_id, raise_if_not_found=False)
+            if self.mode != "update" or not record_id:
+                record.append(Field(name='active', eval=el.get('active')))
+
+        for child in el.iterchildren('field'):
+            record.append(child)
+
+        return self._tag_record(record)
+
     def id_get(self, id_str, raise_if_not_found=True):
         id_str = self.make_xml_id(id_str)
         if id_str in self.idref:
@@ -613,6 +659,7 @@ def __init__(self, env, module, idref: Optional[IdRef], mode: ConvertMode, noupd
             'function': self._tag_function,
             'menuitem': self._tag_menuitem,
             'template': self._tag_template,
+            'asset': self._tag_asset,
 
             **dict.fromkeys(self.DATA_ROOTS, self._tag_root)
         }

From 0c81dde19d87faa9154c0bdb719f966b682975cc Mon Sep 17 00:00:00 2001
From: "Adrien Minne (adrm)" <adrm@odoo.com>
Date: Thu, 23 Oct 2025 06:47:54 +0000
Subject: [PATCH 502/673] [FIX] spreadsheet: crash on freeze & share with
 boolean global filter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The method `getFilterDisplayValue` would not handled `undefined`
values for boolean global filters, causing crashes when exporting
to Excel.

closes odoo/odoo#235284

Task: 5188932
X-original-commit: 9c70239f9c78c83db60ec47e25fa3992845963fb
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Signed-off-by: Adrien Minne (adrm) <adrm@odoo.com>
---
 .../global_filters/global_filters_model.test.js  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js b/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
index d31ba64345877..32948e24310d5 100644
--- a/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
+++ b/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
@@ -1698,6 +1698,22 @@ test("Export from/to global filters for excel", async function () {
     expect(getCell(exportedModel, "C2", sheetId).format).toBe("m/d/yyyy");
 });
 
+test("Export boolean global filters with undefined value for excel", async function () {
+    const { model } = await createSpreadsheetWithPivotAndList();
+    await addGlobalFilter(model, { id: "42", label: "test", type: "boolean" });
+    const filterPlugin = model["handlers"].find(
+        (handler) => handler instanceof GlobalFiltersCoreViewPlugin
+    );
+    const exportData = { styles: [], sheets: [] };
+    filterPlugin.exportForExcel(exportData);
+    const filterSheet = exportData.sheets[0];
+    expect(filterSheet.cells["A1"]).toBe("Filter");
+    expect(filterSheet.cells["A2"]).toBe("test");
+    expect(filterSheet.cells["B1"]).toBe("Value");
+    expect(filterSheet.cells["B2"]).toBe("");
+    model.exportXLSX(); // should not crash
+});
+
 test("Date filter automatic default value for years filter", async function () {
     const label = "This year";
     const { model } = await createSpreadsheetWithPivot();

From 752d1339fdc63b9781194bbea934d92ba3f2789d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 7 Nov 2025 16:57:59 +0000
Subject: [PATCH 503/673] [FIX] mail: no overflow in discuss app on toggling
 call sidebar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, when in a discuss call in the Discuss app with
sidebar not compact and a right panel open, click on Discuss sidebar
would overflow horizontally the UI.

This happens because the rearrange of tiles of the discuss call grid
would be triggered from sidebar toggle state change, but the
rearrange of tiles was mistakenly coded to preserve the height of
main tile. This is a problem with discuss call sidebar because while
the overall height of call view should stay unchanged, the main
card must have its height reduced to compensate with discuss call
sidebar when shown.

This commit fixes the issue by resetting temporarily the height of
call card tile in `arrangeTiles()`, so that it takes into account
when it has to adapt its height.

closes odoo/odoo#235307

X-original-commit: b4ec57fb74ad5d9c739adf3d42d9e8da6edd388a
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/discuss/call/common/call.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/mail/static/src/discuss/call/common/call.js b/addons/mail/static/src/discuss/call/common/call.js
index 132e53cf5e835..b1a58e6a6a4d1 100644
--- a/addons/mail/static/src/discuss/call/common/call.js
+++ b/addons/mail/static/src/discuss/call/common/call.js
@@ -203,6 +203,8 @@ export class Call extends Component {
         if (!this.grid.el) {
             return;
         }
+        this.grid.el.style.setProperty("--width", "0");
+        this.grid.el.style.setProperty("--height", "0");
         const { width, height } = this.grid.el.getBoundingClientRect();
         const aspectRatio = this.minimized ? 1 : 16 / 9;
         const tileCount = this.grid.el.children.length;
@@ -241,5 +243,7 @@ export class Call extends Component {
             tileHeight: optimal.tileHeight,
             columnCount: optimal.columnCount,
         });
+        this.grid.el.style.setProperty("--width", `${this.state.tileWidth}px`);
+        this.grid.el.style.setProperty("--height", `${this.state.tileHeight}px`);
     }
 }

From 4b2d21643b1077e99131cfd04afdcf94105d6c75 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Fri, 26 Sep 2025 11:59:30 +0200
Subject: [PATCH 504/673] [FIX] stock: avoid move a pack dialog when picking
 not ready

Steps to reproduce:
- Install `stock_delivery`
- Have some package in stock
- Create a delivery, and without saving:
  - Add a carrier
  - Click on the 'Move a Pack' button
  - Try to select a package to add.

Issue:
A ValidationError occurs, seemingly for an unsuitable company_id

The main issue is that due to the `partner_id` field that is required if
a carrier is set, the save that precedes the opening of the Dialog isn't
done properly, and no picking can be assigned to the created move lines.

In such cases, we can just avoid opening the Dialog if the picking
cannot be saved.

Task-5116567

X-original-commit: 39d8e8df83cb5edd299a92d30d093e2515608b25
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 .../src/views/picking_form/stock_move_one2many.js    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/static/src/views/picking_form/stock_move_one2many.js b/addons/stock/static/src/views/picking_form/stock_move_one2many.js
index c99ce1fccce02..d6b605cecf7cb 100644
--- a/addons/stock/static/src/views/picking_form/stock_move_one2many.js
+++ b/addons/stock/static/src/views/picking_form/stock_move_one2many.js
@@ -19,8 +19,6 @@ export class MovesListRenderer extends ListRenderer {
         this.actionService = useService("action");
         this.descriptionColumn = "description_picking";
         this.productColumns = ["product_id", "product_template_id"];
-        this.pickingId = this.props.list.context.default_picking_id || 0;
-        this.locationId = this.props.list.context.default_location_id || 0;
 
         onWillStart(async () => {
             this.hasPackageActive = await user.hasGroup("stock.group_tracking_lot");
@@ -28,8 +26,10 @@ export class MovesListRenderer extends ListRenderer {
     }
 
     async onClickMovePackage() {
-        if (!this.pickingId) {
-            await this.forceSave();
+        // If picking doesn't exist yet or location is outdated, it will lead to incorrect results
+        const canOpenDialog = await this.forceSave();
+        if (!canOpenDialog) {
+            return;
         }
         const domain = [];
         if (this.locationId) {
@@ -72,9 +72,10 @@ export class MovesListRenderer extends ListRenderer {
     async forceSave() {
         // This means the record hasn't been saved once, but we need the picking id to know for which picking we create the move lines.
         const record = this.env.model.root;
-        await record.save();
+        const result = await record.save();
         this.pickingId = record.data.id;
         this.locationId = record.data.location_id?.id;
+        return result;
     }
 }
 
@@ -84,7 +85,6 @@ export class StockMoveX2ManyField extends X2ManyField {
     static components = { ...X2ManyField.components, ListRenderer: MovesListRenderer };
 }
 
-
 export const stockMoveX2ManyField = {
     ...x2ManyField,
     component: StockMoveX2ManyField,

From 2dae67c4fa95573726a5166301d49f2c2f994356 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Fri, 26 Sep 2025 17:16:28 +0200
Subject: [PATCH 505/673] [FIX] stock: correctly apply putaway rules on
 multi-level packages

Currently, the putaway rules weren't checking other levels of packages
and were only checking the package directly linked to the move line.

Now, we always want to consider the outermost package of each move line,
rather than its direct package. Which means that if we have a putaway
rule for pallets and one for boxes, if we register a picking that should
move several packages on a pallet, then these should be all moved
towards the pallets location.

Also fixed `outermost_package_id`, as it wasn't properly recomputed when
necessary. Now it always refer to a package, which can be itself if the
package has no destination container.

Task-5116567

X-original-commit: 82e79e7289ee186822ac1497c361ed9f39040252
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/models/stock_move.py      |   2 +-
 addons/stock/models/stock_move_line.py |   6 +-
 addons/stock/models/stock_package.py   |  21 +++--
 addons/stock/models/stock_picking.py   |   2 +-
 addons/stock/tests/test_packing.py     | 116 ++++++++++++++++++-------
 5 files changed, 102 insertions(+), 45 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index fc88b2c7911d9..fdd819abdbe9a 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -272,7 +272,7 @@ def _compute_package_ids(self):
                 move.package_ids = move.move_line_ids.package_history_id.outermost_dest_id
             else:
                 # Only display the top-level packages until the move is done.
-                move.package_ids = move.move_line_ids.result_package_id.mapped(lambda p: p.outermost_package_id or p)
+                move.package_ids = move.move_line_ids.result_package_id.outermost_package_id
 
     @api.depends('move_line_ids.picked', 'state')
     def _compute_picked(self):
diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index 7a1767a6a0f7f..04ca843123099 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -258,7 +258,7 @@ def _apply_putaway_strategy(self):
         if self.env.context.get('avoid_putaway_rules'):
             return
         self = self.with_context(do_not_unreserve=True)
-        for package, smls in groupby(self, lambda sml: sml.result_package_id):
+        for package, smls in groupby(self, lambda sml: sml.result_package_id.outermost_package_id):
             smls = self.env['stock.move.line'].concat(*smls)
             excluded_smls = set(smls.ids)
             if package.package_type_id:
@@ -984,7 +984,7 @@ def _prepare_package_history_vals(self):
                 'parent_orig_name': package.parent_package_id.complete_name,
                 'parent_dest_id': package.package_dest_id.id,
                 'parent_dest_name': package.package_dest_id.dest_complete_name,
-                'outermost_dest_id': package.outermost_package_id.id or package.id,
+                'outermost_dest_id': package.outermost_package_id.id,
             })
 
         return history_vals
@@ -1144,7 +1144,7 @@ def action_put_in_pack(self, *, package_id=False, package_type_id=False, package
         if done_pack and not self.env.context.get('force_move_lines'):
             return done_pack
         elif lines_with_pack_to_pack := move_lines._to_pack(without_pack=False):
-            packs_to_pack = lines_with_pack_to_pack.result_package_id.mapped(lambda p: p.outermost_package_id or p)
+            packs_to_pack = lines_with_pack_to_pack.result_package_id.outermost_package_id
             if done_pack:
                 packs_to_pack = packs_to_pack.filtered(lambda p: p.id != done_pack.id)
                 package_id = done_pack.id
diff --git a/addons/stock/models/stock_package.py b/addons/stock/models/stock_package.py
index ea198e8b5fadb..4814767e77068 100644
--- a/addons/stock/models/stock_package.py
+++ b/addons/stock/models/stock_package.py
@@ -44,7 +44,7 @@ class StockPackage(models.Model):
     child_package_ids = fields.One2many('stock.package', 'parent_package_id', string='Contained Packages')
     all_children_package_ids = fields.One2many('stock.package', compute='_compute_all_children_package_ids', search="_search_all_children_package_ids")
     package_dest_id = fields.Many2one('stock.package', 'Destination Container', index='btree_not_null')
-    outermost_package_id = fields.Many2one('stock.package', 'Outermost Destination Container', compute="_compute_outermost_package_id", search="_search_outermost_package_id")
+    outermost_package_id = fields.Many2one('stock.package', 'Outermost Destination Container', compute="_compute_outermost_package_id", search="_search_outermost_package_id", recursive=True)
     child_package_dest_ids = fields.One2many('stock.package', 'package_dest_id', 'Assigned Contained Packages')
     move_line_ids = fields.One2many('stock.move.line', compute="_compute_move_line_ids", search="_search_move_line_ids")
     picking_ids = fields.Many2many('stock.picking', string='Transfers', compute='_compute_picking_ids', search="_search_picking_ids", help="Transfers in which the Package is set as Destination Package")
@@ -189,15 +189,13 @@ def _compute_owner_id(self):
             ):
                 package.owner_id = package.quant_ids[0].owner_id
 
-    @api.depends()
+    @api.depends('package_dest_id', 'package_dest_id.outermost_package_id')
     def _compute_outermost_package_id(self):
-        def fetch_outermost_package(package):
-            if package.package_dest_id:
-                return fetch_outermost_package(package.package_dest_id)
-            return package
-
         for package in self:
-            package.outermost_package_id = fetch_outermost_package(package.package_dest_id)
+            if package.package_dest_id:
+                package.outermost_package_id = package.package_dest_id.outermost_package_id
+            else:
+                package.outermost_package_id = package
 
     @api.depends('name')
     def _compute_valid_sscc(self):
@@ -351,9 +349,13 @@ def action_put_in_pack(self, *, package_id=False, package_type_id=False, package
         if packs_to_clear := previous_dest_packages.filtered(lambda p: not p.move_line_ids):
             # If following the put in pack, we broke the existing chain somehow, we need to free all now irrelevant packages
             packs_to_clear.package_dest_id = False
+
+        # Since the uppermost package changed, there might be some new putaway to apply.
+        package.move_line_ids._apply_putaway_strategy()
         return package._post_put_in_pack_hook()
 
     def action_remove_package(self):
+        all_move_line_ids = set(self.move_line_ids.ids)
         move_line_ids_to_unlink = set()
         related_move_ids = set()
         move_line_ids_to_update = set()
@@ -375,6 +377,9 @@ def action_remove_package(self):
         # If packages in self are dest containers of other packages, remove them as their dest as well
         self.child_package_dest_ids.package_dest_id = False
         self.package_dest_id = False
+
+        # If outermost packages were changed, different putaway rules may apply.
+        self.env['stock.move.line'].browse(all_move_line_ids - move_line_ids_to_unlink)._apply_putaway_strategy()
         return True
 
     def action_view_picking(self):
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index afa0890b42c72..8cad399b2e79f 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -886,7 +886,7 @@ def _compute_shipping_weight(self):
             packages_weight = picking.move_line_ids.result_package_id.sudo()._get_weight(picking.id)
 
             shipping_weight = picking.weight_bulk
-            relevant_packages = picking.move_line_ids.result_package_id.mapped(lambda p: p.outermost_package_id or p)
+            relevant_packages = picking.move_line_ids.result_package_id.outermost_package_id
             children_packages_by_pack = relevant_packages._get_all_children_package_dest_ids()[0]
             for package in relevant_packages:
                 if package.shipping_weight:
diff --git a/addons/stock/tests/test_packing.py b/addons/stock/tests/test_packing.py
index 2682be71aec4c..df5ce03dfa5b9 100644
--- a/addons/stock/tests/test_packing.py
+++ b/addons/stock/tests/test_packing.py
@@ -13,6 +13,10 @@ def setUpClass(cls):
         cls.warehouse_1.delivery_steps = 'pick_pack_ship'
         cls.picking_type_int.reservation_method = 'manual'
         cls.picking_type_out.reservation_method = 'at_confirm'
+        cls.pack_type_box, cls.pack_type_pallet = cls.env['stock.package.type'].create([
+            {'name': 'Test Box', 'sequence_code': 'TBOX'},
+            {'name': 'Test Pallet', 'sequence_code': 'TPAL'},
+        ])
 
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
@@ -568,6 +572,69 @@ def test_pack_in_receipt_two_step_multi_putaway(self):
             "The move line destination location must be the one from the picking.")
         internal_transfer.button_validate()
 
+    def test_pack_in_pack_putaway(self):
+        """ Ensure that if different putaway rules are set for different package type, then the putaway
+            related to the outermost package of each move line should apply.
+        """
+        supplier_location = self.env.ref('stock.stock_location_suppliers')
+
+        # Creates a new putaway rule for Boxes -> Shelf 1 and Pallets -> Shelf 2.
+        self.env['stock.putaway.rule'].create([
+            {
+                'package_type_ids': [Command.link(self.pack_type_box.id)],
+                'location_in_id': self.stock_location.id,
+                'location_out_id': self.shelf_1.id,
+                },
+            {
+                'package_type_ids': [Command.link(self.pack_type_pallet.id)],
+                'location_in_id': self.stock_location.id,
+                'location_out_id': self.shelf_2.id,
+            },
+        ])
+
+        receipt = self.env['stock.picking'].create({
+            'picking_type_id': self.picking_type_in.id,
+            'location_id': supplier_location.id,
+            'location_dest_id': self.stock_location.id,
+            'move_ids': [
+                Command.create({
+                    'product_id': self.productA.id,
+                    'location_id': supplier_location.id,
+                    'location_dest_id': self.stock_location.id,
+                    'product_uom_qty': 3,
+                }),
+                Command.create({
+                    'product_id': self.productB.id,
+                    'location_id': supplier_location.id,
+                    'location_dest_id': self.stock_location.id,
+                    'product_uom_qty': 5,
+                }),
+            ]
+        })
+        receipt.action_confirm()
+        move_A = receipt.move_ids.filtered(lambda m: m.product_id == self.productA)
+        move_B = receipt.move_ids - move_A
+
+        # Put each line in a different Box, each should now go to Shelf 1
+        pack_A = move_A.move_line_ids.action_put_in_pack(package_type_id=self.pack_type_box.id)
+        pack_B = move_B.move_line_ids.action_put_in_pack(package_type_id=self.pack_type_box.id)
+        self.assertEqual(receipt.move_line_ids.location_dest_id, self.shelf_1)
+
+        # Put the Box of Product A on a Pallet, this move should now go to Shelf 2
+        move_A.move_line_ids.action_put_in_pack(package_type_id=self.pack_type_pallet.id)
+        self.assertEqual(move_A.move_line_ids.location_dest_id, self.shelf_2)
+        self.assertEqual(move_B.move_line_ids.location_dest_id, self.shelf_1)
+
+        # Remove the Pallet as destination for the Box of Product A, should now go back to Shelf 1
+        move_A.move_line_ids.result_package_id.package_dest_id.with_context(picking_id=receipt.id).action_remove_package()
+        self.assertEqual(move_A.move_line_ids.location_dest_id, self.shelf_1)
+
+        # Put both Boxes on a new Pallet, and validate. Both goods should be in Shelf 2
+        receipt.move_line_ids.action_put_in_pack(package_type_id=self.pack_type_pallet.id)
+        receipt.button_validate()
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.productA, self.shelf_2, package_id=pack_A), 3)
+        self.assertEqual(self.env['stock.quant']._get_available_quantity(self.productB, self.shelf_2, package_id=pack_B), 5)
+
     def test_partial_put_in_pack(self):
         """ Create a simple move in a delivery. Reserve the quantity but set as quantity done only a part.
         Call Put In Pack button. """
@@ -868,12 +935,9 @@ def test_pack_in_receipt_two_step_multi_putaway_02(self):
         # Required for `result_package_id` to be visible in the view
         self.env.user.write({'group_ids': [(4, self.env.ref('stock.group_tracking_lot').id)]})
 
-        package_type = self.env['stock.package.type'].create({
-            'name': "Super Pallet",
-        })
         package_01, package_02 = self.env['stock.package'].create([{
             'name': 'Pallet %s' % i,
-            'package_type_id': package_type.id,
+            'package_type_id': self.pack_type_pallet.id,
         } for i in [1, 2]])
 
         # max 100kg (so 100 x P) and max 1 pallet -> we will work with pallets,
@@ -882,7 +946,7 @@ def test_pack_in_receipt_two_step_multi_putaway_02(self):
             'name': 'Super Storage Category',
             'max_weight': 100,
             'package_capacity_ids': [(0, 0, {
-                'package_type_id': package_type.id,
+                'package_type_id': self.pack_type_pallet.id,
                 'quantity': 1,
             })]
         })
@@ -899,7 +963,7 @@ def test_pack_in_receipt_two_step_multi_putaway_02(self):
         self.env['stock.putaway.rule'].create({
             'location_in_id': self.stock_location.id,
             'location_out_id': self.stock_location.id,
-            'package_type_ids': [(4, package_type.id)],
+            'package_type_ids': [Command.link(self.pack_type_pallet.id)],
             'storage_category_id': stor_category.id,
             'sublocation': 'closest_location',
         })
@@ -970,12 +1034,9 @@ def test_pack_in_receipt_two_step_multi_putaway_03(self):
         # Required for `result_package_id` to be visible in the view
         self.env.user.write({'group_ids': [(4, self.env.ref('stock.group_tracking_lot').id)]})
 
-        package_type = self.env['stock.package.type'].create({
-            'name': "Super Pallet",
-        })
         package_01, package_02 = self.env['stock.package'].create([{
             'name': 'Pallet %s' % i,
-            'package_type_id': package_type.id,
+            'package_type_id': self.pack_type_pallet.id,
         } for i in [1, 2]])
 
         # max 100kg and max 2 pallets
@@ -983,7 +1044,7 @@ def test_pack_in_receipt_two_step_multi_putaway_03(self):
             'name': 'Super Storage Category',
             'max_weight': 100,
             'package_capacity_ids': [(0, 0, {
-                'package_type_id': package_type.id,
+                'package_type_id': self.pack_type_pallet.id,
                 'quantity': 2,
             })]
         })
@@ -1002,7 +1063,7 @@ def test_pack_in_receipt_two_step_multi_putaway_03(self):
         self.env['stock.putaway.rule'].create({
             'location_in_id': self.stock_location.id,
             'location_out_id': self.stock_location.id,
-            'package_type_ids': [(4, package_type.id)],
+            'package_type_ids': [Command.link(self.pack_type_pallet.id)],
             'storage_category_id': stor_category.id,
             'sublocation': 'closest_location',
         })
@@ -1072,16 +1133,12 @@ def test_pack_in_receipt_two_step_multi_putaway_04(self):
         """
         self.warehouse_1.reception_steps = "two_steps"
 
-        package_type = self.env['stock.package.type'].create({
-            'name': "package type",
-        })
-
         storage_category = self.env['stock.storage.category'].create({
             'name': "storage category",
             'allow_new_product': "same",
             'max_weight': 1000,
             'package_capacity_ids': [(0, 0, {
-                'package_type_id': package_type.id,
+                'package_type_id': self.pack_type_pallet.id,
                 'quantity': 2,
             })],
         })
@@ -1098,7 +1155,7 @@ def test_pack_in_receipt_two_step_multi_putaway_04(self):
             'location_out_id': self.stock_location.id,
             'storage_category_id': storage_category.id,
             'sublocation': 'closest_location',
-            'package_type_ids': [(4, package_type.id, 0)],
+            'package_type_ids': [Command.link(self.pack_type_pallet.id)],
         })
 
         receipt = self.env['stock.picking'].create({
@@ -1118,7 +1175,7 @@ def test_pack_in_receipt_two_step_multi_putaway_04(self):
 
         moves = receipt.move_ids
         moves.move_line_ids.quantity = 1
-        moves.move_line_ids.result_package_id = self.env['stock.package'].create({'package_type_id': package_type.id})
+        moves.move_line_ids.result_package_id = self.env['stock.package'].create({'package_type_id': self.pack_type_pallet.id})
         moves.picked = True
         receipt.button_validate()
         internal_picking = moves.move_dest_ids.picking_id
@@ -1128,7 +1185,7 @@ def test_pack_in_receipt_two_step_multi_putaway_04(self):
         internal_picking.action_cancel()
 
         # Second test part
-        package = self.env['stock.package'].create({'package_type_id': package_type.id})
+        package = self.env['stock.package'].create({'package_type_id': self.pack_type_pallet.id})
         self.env['stock.quant']._update_available_quantity(self.productA, loc01, 1.0, package_id=package)
 
         receipt = self.env['stock.picking'].create({
@@ -1153,7 +1210,7 @@ def test_pack_in_receipt_two_step_multi_putaway_04(self):
             'product_uom_id': self.productA.uom_id.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': self.input_location.id,
-            'result_package_id': self.env['stock.package'].create({'package_type_id': package_type.id}).id,
+            'result_package_id': self.env['stock.package'].create({'package_type_id': self.pack_type_pallet.id}).id,
             'picking_id': receipt.id,
         } for _ in range(2)])
         receipt.move_ids.picked = True
@@ -1191,7 +1248,7 @@ def test_pack_in_receipt_two_step_multi_putaway_04(self):
             'product_uom_id': product.uom_id.id,
             'location_id': self.supplier_location.id,
             'location_dest_id': self.input_location.id,
-            'result_package_id': self.env['stock.package'].create({'package_type_id': package_type.id}).id,
+            'result_package_id': self.env['stock.package'].create({'package_type_id': self.pack_type_pallet.id}).id,
             'picking_id': receipt.id,
         } for product, move in [
             (self.productA, moves[0]),
@@ -1703,21 +1760,16 @@ class TestPackagePropagation(TestPackingCommon):
     def test_reusable_package_propagation(self):
         """ Test a reusable package should not be propagated to the next picking
         of a mto chain """
-        reusable_type = self.env['stock.package.type'].create({
-            'name': 'Reusable',
-            'package_use': 'reusable',
-        })
+        # Make the Pallet type resuable while the Box type stays disposable.
+        self.pack_type_pallet.package_use = 'reusable'
+        self.pack_type_box.package_use = 'disposable'
         reusable_package = self.env['stock.package'].create({
             'name': 'Reusable Package',
-            'package_type_id': reusable_type.id,
-        })
-        disposable_type = self.env['stock.package.type'].create({
-            'name': 'Disposable',
-            'package_use': 'disposable',
+            'package_type_id': self.pack_type_pallet.id,
         })
         disposable_package = self.env['stock.package'].create({
             'name': 'disposable Package',
-            'package_type_id': disposable_type.id,
+            'package_type_id': self.pack_type_box.id,
         })
         self.productA = self.env['product.product'].create({
             'name': 'productA',

From 06998ca64f27c16c74b8f77270fad104ad458dc5 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Thu, 2 Oct 2025 14:05:01 +0200
Subject: [PATCH 506/673] [FIX] stock: apply routes from higher level package
 in push

As routes can be defined on package types, it's now possible to have
multiple package type that could fit for a single move line.

We now consider every parent package these package have to check if they
have package type with routes linked to them.

Task-5116567

X-original-commit: 5a2ad097a1ac8bc8a8e8f238f545b09bccb44d21
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/models/stock_move.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index fdd819abdbe9a..9b2264c261cc7 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -1119,15 +1119,17 @@ def _push_apply(self):
                 move = move.with_context(allowed_companies=self.env.user.company_ids.ids)
                 warehouse_id = False
 
+            related_packages = self.env['stock.package'].search_fetch([('id', 'parent_of', move.move_line_ids.result_package_id.ids)], ['package_type_id'])
+
             rule = StockRule._get_push_rule(move.product_id, move.location_dest_id, {
-                'route_ids': move.route_ids | move.move_line_ids.result_package_id.package_type_id.route_ids, 'warehouse_id': warehouse_id, 'packaging_uom_id': move.packaging_uom_id,
+                'route_ids': move.route_ids | related_packages.package_type_id.route_ids, 'warehouse_id': warehouse_id, 'packaging_uom_id': move.packaging_uom_id,
             })
 
             excluded_rule_ids = []
             while (rule and rule.push_domain and not move.filtered_domain(literal_eval(rule.push_domain))):
                 excluded_rule_ids.append(rule.id)
                 rule = StockRule._get_push_rule(move.product_id, move.location_dest_id, {
-                    'route_ids': move.route_ids | move.move_line_ids.result_package_id.package_type_id.route_ids, 'warehouse_id': warehouse_id, 'packaging_uom_id': move.packaging_uom_id,
+                    'route_ids': move.route_ids | related_packages.package_type_id.route_ids, 'warehouse_id': warehouse_id, 'packaging_uom_id': move.packaging_uom_id,
                     'domain': [('id', 'not in', excluded_rule_ids)],
                 })
 
@@ -1675,7 +1677,10 @@ def _prepare_procurement_values(self):
         warehouse = self.warehouse_id or self.picking_type_id.warehouse_id
         if not self.location_id.warehouse_id:
             warehouse = self.env['stock.warehouse']
-            route = self.route_ids or self.move_line_ids.result_package_id.package_type_id.route_ids
+            route = self.route_ids
+            if not route:
+                related_packages = self.env['stock.package'].search_fetch([('id', 'parent_of', self.move_line_ids.result_package_id.ids)], ['package_type_id'])
+                route = related_packages.package_type_id.route_ids
         move_dest_ids = False
         if self.procure_method == "make_to_order":
             move_dest_ids = self

From d046c348ced00485458da48fbd845b75d089fe70 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Thu, 2 Oct 2025 14:59:02 +0200
Subject: [PATCH 507/673] [FIX] stock: adapt picking operations pdf

The Picking Operations report should also display the source/destination
parent of packages along with its location.

Task-5116567

X-original-commit: 851643adbb901aea74134947bac6702e78584cfa
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/report/report_stockpicking_operations.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/stock/report/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
index b54ddcea1818c..b259c21aef650 100644
--- a/addons/stock/report/report_stockpicking_operations.xml
+++ b/addons/stock/report/report_stockpicking_operations.xml
@@ -237,9 +237,11 @@
                                             </td>
                                             <td t-if="o.picking_type_id.code != 'incoming'" groups="stock.group_stock_multi_locations">
                                                 <span t-field="package.location_id"/>
+                                                <span t-field="package.parent_package_id"/>
                                             </td>
                                             <td t-if="o.picking_type_id.code != 'outgoing'" groups="stock.group_stock_multi_locations">
                                                 <span t-field="package.location_dest_id"/>
+                                                <span t-field="package.package_dest_id"/>
                                             </td>
                                         </tr>
                                     </t>
@@ -256,9 +258,11 @@
                                             </td>
                                             <td t-if="o.picking_type_id.code != 'incoming'" groups="stock.group_stock_multi_locations">
                                                 <span t-field="package_history.location_id"/>
+                                                <span t-field="package_history.parent_orig_id"/>
                                             </td>
                                             <td t-if="o.picking_type_id.code != 'outgoing'" groups="stock.group_stock_multi_locations">
                                                 <span t-field="package_history.location_dest_id"/>
+                                                <span t-field="package_history.parent_dest_id"/>
                                             </td>
                                         </tr>
                                     </t>

From 283f9cf7043d9d9c717b2f9ea89a37da81605744 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Thu, 9 Oct 2025 10:21:43 +0200
Subject: [PATCH 508/673] [FIX] stock{,_picking_batch}: correctly remove
 packages

Currently, the 'Remove' button on packages from picking/batches was too
strong. There was no easy way of removing just one level of package
(like the outermost one).

Doing it on an entire package would remove all contained packages as
well, which can be very annoying, especially for moving packages from
one pallet to another.

It is still possible to remove all layers at the same time, but you now
need to select all related packages before removing them.

Task-5116567

X-original-commit: e90e5c54bf3744bdc979479b659fb0ff0c658cb3
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/models/stock_move.py             |   2 +-
 addons/stock/models/stock_package.py          |  40 +++++--
 addons/stock/models/stock_picking.py          |   2 +-
 .../views/list/stock_add_package_list_view.js |   4 +-
 addons/stock/tests/test_packing.py            | 105 ++++++++++++++++++
 .../models/stock_picking_batch.py             |   2 +-
 6 files changed, 139 insertions(+), 16 deletions(-)

diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 9b2264c261cc7..e1744df2202fa 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -265,7 +265,7 @@ def _compute_has_lines_without_result_package(self):
         for move in self:
             move.has_lines_without_result_package = move.move_line_ids.result_package_id and any(not line.result_package_id for line in move.move_line_ids)
 
-    @api.depends('move_line_ids', 'move_line_ids.result_package_id')
+    @api.depends('move_line_ids', 'move_line_ids.result_package_id', 'move_line_ids.result_package_id.outermost_package_id')
     def _compute_package_ids(self):
         for move in self:
             if move.state in ['done', 'cancel']:
diff --git a/addons/stock/models/stock_package.py b/addons/stock/models/stock_package.py
index 4814767e77068..6998100f068eb 100644
--- a/addons/stock/models/stock_package.py
+++ b/addons/stock/models/stock_package.py
@@ -1,6 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from collections import defaultdict
+from collections.abc import Iterable
 import json
 from ast import literal_eval
 
@@ -227,15 +228,20 @@ def _search_location_dest_id(self, operator, value):
         return [('id', 'in', all_package_ids)]
 
     def _search_move_line_ids(self, operator, value):
-        if operator not in ['in', 'not in']:
+        if operator != 'in':
             return NotImplemented
 
-        move_lines = self.env['stock.move.line'].search_fetch(
-            domain=[('state', 'not in', ['done', 'cancel']), ('id', operator, value)],
-            field_names=['result_package_id'])
+        domain = Domain('state', 'not in', ['done', 'cancel'])
+        pack_operator = 'in'
+        if isinstance(value, Iterable) and tuple(value) == (False,):
+            # Search for ('move_line_ids', '=', False), which means not assigned to any ongoing picking
+            pack_operator = 'not in'
+        else:
+            domain &= Domain('id', operator, value)
+        move_lines = self.env['stock.move.line'].search_fetch(domain=domain, field_names=['result_package_id'])
         all_package_ids = move_lines.result_package_id._get_all_package_dest_ids()
 
-        return [('id', 'in', all_package_ids)]
+        return [('id', pack_operator, all_package_ids)]
 
     def _search_outermost_package_id(self, operator, value):
         if operator not in ['in', 'not in']:
@@ -355,19 +361,26 @@ def action_put_in_pack(self, *, package_id=False, package_type_id=False, package
         return package._post_put_in_pack_hook()
 
     def action_remove_package(self):
+        """ Removes all packages in self from the destination container tree.
+            For move lines directly linked to a package (through result_package_id)
+            - If the entire package is moved, remove the move lines entirely from the picking
+            - Otherwise, just unset the packages as destination package
+        """
+        all_package_dest_ids = self._get_all_package_dest_ids()
         all_move_line_ids = set(self.move_line_ids.ids)
         move_line_ids_to_unlink = set()
         related_move_ids = set()
         move_line_ids_to_update = set()
         for line in self.move_line_ids:
-            picking_id = self.env.context.get('picking_id')
-            if picking_id and line.picking_id.id != picking_id:
+            picking_ids = self.env.context.get('picking_ids')
+            if picking_ids and line.picking_id.id not in picking_ids:
                 continue
-            if line.is_entire_pack:
-                move_line_ids_to_unlink.add(line.id)
-                related_move_ids.add(line.move_id.id)
-            elif line.result_package_id.id in self.ids:
-                move_line_ids_to_update.add(line.id)
+            if line.result_package_id.id in self.ids:
+                if line.is_entire_pack:
+                    move_line_ids_to_unlink.add(line.id)
+                    related_move_ids.add(line.move_id.id)
+                else:
+                    move_line_ids_to_update.add(line.id)
 
         self.env['stock.move.line'].browse(move_line_ids_to_unlink).unlink()
         self.env['stock.move.line'].browse(move_line_ids_to_update).write({'result_package_id': False})
@@ -378,6 +391,9 @@ def action_remove_package(self):
         self.child_package_dest_ids.package_dest_id = False
         self.package_dest_id = False
 
+        # If parent packages are now isolated from bottom-level packages, clear their destination container as well
+        self.env['stock.package'].search_fetch([('id', 'in', all_package_dest_ids), ('move_line_ids', '=', False)], field_names=['id']).write({'package_dest_id': False})
+
         # If outermost packages were changed, different putaway rules may apply.
         self.env['stock.move.line'].browse(all_move_line_ids - move_line_ids_to_unlink)._apply_putaway_strategy()
         return True
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 8cad399b2e79f..873788e191c0c 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -1910,7 +1910,7 @@ def action_see_packages(self):
             'type': 'ir.actions.act_window',
             'domain': [('picking_ids', 'in', self.ids)],
             'context': {
-                'picking_id': self.id,
+                'picking_ids': self.ids,
                 'location_id': self.location_id.id,
                 'can_add_entire_packs': self.picking_type_code != 'incoming',
                 'search_default_main_packages': True,
diff --git a/addons/stock/static/src/views/list/stock_add_package_list_view.js b/addons/stock/static/src/views/list/stock_add_package_list_view.js
index 62ae4a8a17567..08e3792c1a0ba 100644
--- a/addons/stock/static/src/views/list/stock_add_package_list_view.js
+++ b/addons/stock/static/src/views/list/stock_add_package_list_view.js
@@ -11,7 +11,9 @@ export class AddPackageListRenderer extends ListRenderer {
         this.orm = useService("orm");
         this.actionService = useService("action");
         this.addDialog = useOwnedDialogs();
-        this.pickingId = this.props.list.context.picking_id || 0;
+        this.pickingId = this.props.list.context.picking_ids?.length
+            ? this.props.list.context.picking_ids[0]
+            : 0;
         this.locationId = this.props.list.context.location_id || 0;
         this.canAddEntirePacks = this.props.list.context?.can_add_entire_packs;
     }
diff --git a/addons/stock/tests/test_packing.py b/addons/stock/tests/test_packing.py
index df5ce03dfa5b9..238d0ad78160f 100644
--- a/addons/stock/tests/test_packing.py
+++ b/addons/stock/tests/test_packing.py
@@ -2006,3 +2006,108 @@ def test_pack_in_pack_already_packed(self):
         self.assertEqual(boxes.package_dest_id.picking_ids, receipt)
         self.assertFalse((pallet | container).package_dest_id)
         self.assertFalse((pallet | container).picking_ids)
+
+    def test_package_removal(self):
+        """ Checks that the button 'Remove' in the package view in pickings behaves as expected:
+            - Only removes related move/move lines from the picking if it was only added through an entire pack
+            - Otherwise, just removes the package as destination
+            - When removing a destination container, don't remove its children, just reset their destination
+        """
+        pack1, pack2, pack3 = self.env['stock.package'].create([{} for _ in range(3)])
+        self.env['stock.quant']._update_available_quantity(self.productA, self.warehouse_1.lot_stock_id, 2, package_id=pack1)
+        self.env['stock.quant']._update_available_quantity(self.productB, self.warehouse_1.lot_stock_id, 3, package_id=pack2)
+        (pack1 | pack2).parent_package_id = pack3
+
+        pick = self.env['stock.picking'].create({
+            'picking_type_id': self.warehouse_1.pick_type_id.id,
+            'location_id': self.warehouse_1.lot_stock_id.id,
+            'location_dest_id': self.pack_location.id,
+            'move_ids': [
+                Command.create({
+                    'product_id': self.productB.id,
+                    'product_uom_qty': 2,
+                    'location_id': self.warehouse_1.lot_stock_id.id,
+                    'location_dest_id': self.pack_location.id,
+                }),
+            ],
+        })
+        pick.action_confirm()
+        self.assertRecordValues(pick.move_line_ids, [
+            {'product_id': self.productB.id, 'package_id': pack2.id, 'result_package_id': False, 'is_entire_pack': False},
+        ])
+
+        pick.action_add_entire_packs(pack3.id)
+        self.assertRecordValues(pick.move_ids.sorted('product_id'), [
+            {'product_id': self.productA.id, 'package_ids': pack3.ids, 'product_uom_qty': 0},
+            {'product_id': self.productB.id, 'package_ids': pack3.ids, 'product_uom_qty': 2},
+        ])
+        self.assertRecordValues(pick.move_line_ids.sorted('product_id'), [
+            {'product_id': self.productA.id, 'package_id': pack1.id, 'result_package_id': pack1.id, 'is_entire_pack': True},
+            {'product_id': self.productB.id, 'package_id': pack2.id, 'result_package_id': pack2.id, 'is_entire_pack': True},
+        ])
+        self.assertEqual(pack1.package_dest_id, pack3)
+        self.assertEqual(pack2.package_dest_id, pack3)
+
+        # Remove pack3 from picking, this should only remove it as destination container
+        pack3.with_context(picking_ids=pick.ids).action_remove_package()
+        self.assertRecordValues(pick.move_ids.sorted('product_id'), [
+            {'product_id': self.productA.id, 'package_ids': pack1.ids, 'product_uom_qty': 0},
+            {'product_id': self.productB.id, 'package_ids': pack2.ids, 'product_uom_qty': 2},
+        ])
+        self.assertRecordValues(pick.move_line_ids.sorted('product_id'), [
+            {'product_id': self.productA.id, 'package_id': pack1.id, 'result_package_id': pack1.id, 'is_entire_pack': True},
+            {'product_id': self.productB.id, 'package_id': pack2.id, 'result_package_id': pack2.id, 'is_entire_pack': True},
+        ])
+        self.assertFalse((pack1 | pack2).package_dest_id)
+
+        # Remove pack1 from picking, this should also remove its related move & move line
+        pack1.with_context(picking_ids=pick.ids).action_remove_package()
+        self.assertRecordValues(pick.move_ids.sorted('product_id'), [
+            {'product_id': self.productB.id, 'package_ids': pack2.ids, 'product_uom_qty': 2},
+        ])
+        self.assertRecordValues(pick.move_line_ids.sorted('product_id'), [
+            {'product_id': self.productB.id, 'package_id': pack2.id, 'result_package_id': pack2.id, 'is_entire_pack': True},
+        ])
+
+        # Remove pack2 from picking, this shouldn't remove its related move
+        pack2.with_context(picking_ids=pick.ids).action_remove_package()
+        self.assertRecordValues(pick.move_ids.sorted('product_id'), [
+            {'product_id': self.productB.id, 'package_ids': [], 'product_uom_qty': 2},
+        ])
+        self.assertFalse(pick.move_line_ids)
+
+    def test_mid_level_package_removal(self):
+        """ Checks that if a package is removed from a picking and implicitly disconnects the top-level packages from the bottom level ones,
+            Then those upper level packages reset their package_dest_id.
+        """
+        packages = self.env['stock.package'].create([{
+            'name': f"p{i}",
+        } for i in range(4)])
+        self.env['stock.quant']._update_available_quantity(self.productA, self.warehouse_1.lot_stock_id, 2, package_id=packages[3])
+
+        # From top to bottom, packages should be organized as p0 (highest level) > p1 > p2 > p3 (lowest level, contains products)
+        for ind in range(3, 0, -1):
+            packages[ind].parent_package_id = packages[ind - 1]
+        self.assertEqual(packages[3].complete_name, 'p0 > p1 > p2 > p3')
+
+        pick = self.env['stock.picking'].create({
+            'picking_type_id': self.warehouse_1.pick_type_id.id,
+            'location_id': self.warehouse_1.lot_stock_id.id,
+            'location_dest_id': self.pack_location.id,
+        })
+        pick.action_add_entire_packs(packages[0].id)
+        self.assertEqual(packages[3].dest_complete_name, 'p0 > p1 > p2 > p3')
+
+        # Remove p3, this should break the link with p2 and p1, so we need to make sure their package_dest_id is reset
+        self.assertEqual(packages[0].move_line_ids, pick.move_line_ids)
+        packages[2].with_context(picking_ids=pick.ids).action_remove_package()
+
+        self.assertEqual(packages[3].complete_name, 'p0 > p1 > p2 > p3')
+        self.assertEqual(packages[3].dest_complete_name, 'p3')
+
+        self.assertRecordValues(packages, [
+            {'name': 'p0', 'parent_package_id': False, 'package_dest_id': False},
+            {'name': 'p1', 'parent_package_id': packages[0].id, 'package_dest_id': False},
+            {'name': 'p2', 'parent_package_id': packages[1].id, 'package_dest_id': False},
+            {'name': 'p3', 'parent_package_id': packages[2].id, 'package_dest_id': False},
+        ])
diff --git a/addons/stock_picking_batch/models/stock_picking_batch.py b/addons/stock_picking_batch/models/stock_picking_batch.py
index 9ca3c573108b5..0a8bd311c209d 100644
--- a/addons/stock_picking_batch/models/stock_picking_batch.py
+++ b/addons/stock_picking_batch/models/stock_picking_batch.py
@@ -391,7 +391,7 @@ def action_see_packages(self):
             'type': 'ir.actions.act_window',
             'domain': [('picking_ids', 'in', self.picking_ids.ids)],
             'context': {
-                'picking_id': self.picking_ids[:1].id,
+                'picking_ids': self.picking_ids.ids,
                 'location_id': self.picking_ids[:1].location_id.id,
                 'can_add_entire_packs': self.picking_type_code != 'incoming',
                 'search_default_main_packages': True,

From 668960402dc6a44e29ca2b1b4e019aec73f233b2 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Tue, 7 Oct 2025 16:29:06 +0200
Subject: [PATCH 509/673] [FIX] stock{,_picking_batch}: adapt Packages stat
 button

- Keep the 'Package' stat button in the same order for pickings &
  batches
- Avoid having less space between the fa-icon and the text when the
  picking is done
- Display the 'Package' stat button for package histories for batches as
  well
- Only display the 'Package' stat button for pickings when there's at
  least one destination package. This isn't done for batches on purpose,
  as we need to keep a way to add new entire packages.

Task-5116567

X-original-commit: 6716ab793fe030d7ef5181ed22997582eaf89153
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/views/stock_picking_views.xml         | 10 +++++-----
 .../models/stock_picking_batch.py                  | 13 +++++++++++++
 .../views/stock_picking_batch_views.xml            | 14 +++++++-------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index efbadaba8f320..ed590712c7a58 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -146,15 +146,15 @@
                             invisible="not has_scrap_move"/>
                         <button name="action_see_packages" string="Packages" type="object"
                             class="oe_stat_button" icon="fa-cubes"
-                            invisible="state == 'done'" groups="stock.group_tracking_lot">
-                            <div class="o_form_field o_stat_info">
+                            invisible="state == 'done' or not packages_count" groups="stock.group_tracking_lot">
+                            <div class="o_stat_info">
                                 <span class="o_stat_text">Packages</span>
                             </div>
                         </button>
-                        <button name="action_see_package_histories" type="object"
+                        <button name="action_see_package_histories" string="Packages" type="object"
                             class="oe_stat_button" icon="fa-cubes"
-                            invisible="state != 'done'" groups="stock.group_tracking_lot">
-                            <div class="o_form_field o_stat_info">
+                            invisible="state != 'done' or not packages_count" groups="stock.group_tracking_lot">
+                            <div class="o_stat_info">
                                 <span class="o_stat_text">Packages</span>
                             </div>
                         </button>
diff --git a/addons/stock_picking_batch/models/stock_picking_batch.py b/addons/stock_picking_batch/models/stock_picking_batch.py
index 0a8bd311c209d..92da936bfe45c 100644
--- a/addons/stock_picking_batch/models/stock_picking_batch.py
+++ b/addons/stock_picking_batch/models/stock_picking_batch.py
@@ -383,6 +383,19 @@ def action_batch_detailed_operations(self):
 
     def action_see_packages(self):
         self.ensure_one()
+        if self.state == 'done':
+            return {
+                'name': self.env._("Packages"),
+                'res_model': 'stock.package.history',
+                'view_mode': 'list',
+                'views': [(False, 'list')],
+                'type': 'ir.actions.act_window',
+                'domain': [('picking_ids', 'in', self.picking_ids.ids)],
+                'context': {
+                    'search_default_main_packages': True,
+                }
+            }
+
         return {
             'name': self.env._("Packages"),
             'res_model': 'stock.package',
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 9066052ff1dda..56c57848f0ae9 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -109,6 +109,13 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
+                        <button name="action_see_packages" string="Packages" type="object"
+                            class="oe_stat_button" icon="fa-cubes"
+                            groups="stock.group_tracking_lot">
+                            <div class="o_stat_info">
+                                <span class="o_stat_text">Packages</span>
+                            </div>
+                        </button>
                         <button name="action_batch_detailed_operations"
                                 class="oe_stat_button"
                                 icon="fa-bars"
@@ -122,13 +129,6 @@
                             class="oe_stat_button" icon="fa-list"
                             invisible="not show_allocation"
                             groups="stock.group_reception_report"/>
-                        <button name="action_see_packages" string="Packages" type="object"
-                            class="oe_stat_button" icon="fa-cubes"
-                            invisible="state == 'done'" groups="stock.group_tracking_lot">
-                            <div class="o_form_field o_stat_info">
-                                <span class="o_stat_text">Packages</span>
-                            </div>
-                        </button>
                     </div>
                     <div class="oe_title">
                         <h1><field name="name" class="oe_inline"/></h1>

From 06b4892729f164992b2c322c7fc0b0da1f5729c1 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Fri, 10 Oct 2025 10:02:12 +0200
Subject: [PATCH 510/673] [FIX] stock{,_delivery}: allow to select package with
 same dest loc

Previously, when selecting an existing package to assign to a move line
(either directly or through the put in pack wizard), we could not select
a package used in the picking, even though it had the same destination.

Task-5116567

X-original-commit: 29a714377523bd841dc325c4dcaa0b5051b35ed7
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/models/stock_move_line.py                   | 3 ++-
 addons/stock/models/stock_package.py                     | 6 +++++-
 addons/stock/views/stock_package_views.xml               | 2 +-
 addons/stock/wizard/stock_put_in_pack_views.xml          | 2 +-
 addons/stock_delivery/wizard/stock_put_in_pack_views.xml | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index 04ca843123099..a6d7f8e84bc38 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -52,7 +52,7 @@ class StockMoveLine(models.Model):
     result_package_id = fields.Many2one(
         'stock.package', 'Destination Package',
         ondelete='restrict', required=False, check_company=True,
-        domain="['|', '|', ('location_id', '=', False), ('location_id', '=', location_dest_id), ('id', '=', package_id)]",
+        domain="['|', '|', ('location_id', '=', location_dest_id), ('id', '=', package_id), '&', ('location_id', '=', False), '|', ('move_line_ids', '=', False), ('move_line_ids.location_dest_id', '=?', location_dest_id)]",
         help="If set, the operations are packed into this package")
     result_package_dest_name = fields.Char('Destination Package Name', related='result_package_id.dest_complete_name')
     package_history_id = fields.Many2one('stock.package.history', string="Package History", index='btree_not_null')
@@ -1043,6 +1043,7 @@ def _pre_put_in_pack_hook(self, all_lines=False, package_id=False, package_type_
                 'all_move_line_ids': move_lines.ids,
                 'default_move_line_ids': self.ids,
                 'default_location_dest_id': self.location_dest_id.id,
+                'picking_ids': move_lines.picking_id.ids,
             }
             return action
 
diff --git a/addons/stock/models/stock_package.py b/addons/stock/models/stock_package.py
index 6998100f068eb..b099093962a95 100644
--- a/addons/stock/models/stock_package.py
+++ b/addons/stock/models/stock_package.py
@@ -228,8 +228,12 @@ def _search_location_dest_id(self, operator, value):
         return [('id', 'in', all_package_ids)]
 
     def _search_move_line_ids(self, operator, value):
-        if operator != 'in':
+        if operator not in ('in', 'any'):
             return NotImplemented
+        if operator == 'any':
+            operator = 'in'
+            if isinstance(value, Domain):
+                value = self.env['stock.move.line']._search(value)
 
         domain = Domain('state', 'not in', ['done', 'cancel'])
         pack_operator = 'in'
diff --git a/addons/stock/views/stock_package_views.xml b/addons/stock/views/stock_package_views.xml
index 83e2b14f0ab0c..1e1b338f91f1c 100644
--- a/addons/stock/views/stock_package_views.xml
+++ b/addons/stock/views/stock_package_views.xml
@@ -103,7 +103,7 @@
                 </header>
                 <field name="name" string="Package"/>
                 <field name="package_type_id"/>
-                <field name="json_popover" widget="popover_widget" string=" " invisible="not json_popover" width="20px"/>
+                <field name="json_popover" widget="popover_widget" nolabel="1" invisible="not json_popover" width="18px"/>
                 <field name="location_dest_id" options="{'no_create': True}"/>
                 <field name="parent_package_id" string="Origin Container" readonly="1"/>
                 <field name="package_dest_id" domain="[('id', '!=', id), '|', '|', '|', ('location_id', '=', False), ('location_id', '=', location_dest_id), ('id', '=', parent_package_id), ('location_dest_id', '=', location_dest_id)]"/>
diff --git a/addons/stock/wizard/stock_put_in_pack_views.xml b/addons/stock/wizard/stock_put_in_pack_views.xml
index 9be1bd44e8029..f2efa808f536c 100644
--- a/addons/stock/wizard/stock_put_in_pack_views.xml
+++ b/addons/stock/wizard/stock_put_in_pack_views.xml
@@ -8,7 +8,7 @@
                 <group>
                     <field name="package_type_id" placeholder="Select a Package Type" options="{'no_create': True}"/>
                     <field name="result_package_id"
-                           domain="[('package_type_id', '=?', package_type_id), '|', '|', ('location_id', '=', False), ('location_id', '=', location_dest_id), ('id', 'in', origin_package_ids)]"
+                           domain="[('package_type_id', '=?', package_type_id), '|', '|', ('location_id', '=', location_dest_id), ('id', 'in', origin_package_ids), '&amp;', ('location_id', '=', False), '|', ('move_line_ids', '=', False), ('move_line_ids.location_dest_id', '=', location_dest_id)]"
                            context="{'default_package_type_id': package_type_id, 'show_src_package': 1}"
                            widget="package_m2o"
                            placeholder="Leave empty to create new"/>
diff --git a/addons/stock_delivery/wizard/stock_put_in_pack_views.xml b/addons/stock_delivery/wizard/stock_put_in_pack_views.xml
index 6df35b7ad368f..9ff36c942e0a8 100644
--- a/addons/stock_delivery/wizard/stock_put_in_pack_views.xml
+++ b/addons/stock_delivery/wizard/stock_put_in_pack_views.xml
@@ -22,7 +22,7 @@
             </field>
             <field name="result_package_id" position="attributes">
                 <attribute name="domain">
-                    [('package_carrier_type', '=?', package_carrier_type), ('package_type_id', '=?', package_type_id), '|', '|', ('location_id', '=', False), ('location_id', '=', location_dest_id), ('id', 'in', origin_package_ids)]
+                    [('package_carrier_type', '=?', package_carrier_type), ('package_type_id', '=?', package_type_id), '|', '|', ('location_id', '=', location_dest_id), ('id', 'in', origin_package_ids), '&amp;', ('location_id', '=', False), '|', ('move_line_ids', '=', False), ('move_line_ids.location_dest_id', '=', location_dest_id)]
                 </attribute>
             </field>
         </field>

From bfcdaa922904520fc4c9eb9c1aad80ce263b3740 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Fri, 10 Oct 2025 11:05:10 +0200
Subject: [PATCH 511/673] [FIX] stock: change priority of put in pack

Currently in the put/pack in pack process, the selection of move lines
through `_to_pack` would prioritize picked move lines, but only within
the same "group" (i.e. all move lines that either have a pack or not)

Which means that when you had the following move lines:
- ML1: picked in PACK01
- ML2: not picked without package

If you used the 'Put in Pack' button, it would be ML2 that would be
packed, as that one didn't have any package yet.

Now it would be ML1 that would be selected, until ML2 is picked as well.

Task-5116567

X-original-commit: 4c2b9bb0baf5ca3454a263ccee808403a8a759dc
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/models/stock_move_line.py        | 52 +++++++++++--------
 addons/stock/tests/test_packing.py            |  6 +--
 .../tests/test_packing_delivery.py            |  4 +-
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index a6d7f8e84bc38..27f87c71ea0a7 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -1117,23 +1117,14 @@ def _post_put_in_pack_hook(self, package):
                 return action
         return package
 
-    def _to_pack(self, without_pack=True):
-        if len(self.picking_type_id) > 1:
-            raise UserError(_('You cannot pack products into the same package when they are from different transfers with different operation types'))
-        quantity_move_line_ids = self.filtered(
-            lambda ml: ml.product_uom_id.compare(ml.quantity, 0.0) > 0 and (without_pack != bool(ml.result_package_id))
-            and ml.state not in ('done', 'cancel')
-        )
-        move_line_ids = quantity_move_line_ids.filtered(lambda ml: ml.picked)
-        if not move_line_ids:
-            move_line_ids = quantity_move_line_ids
-        return move_line_ids
-
     def action_put_in_pack(self, *, package_id=False, package_type_id=False, package_name=False):
         move_lines = self
         if self.env.context.get('all_move_line_ids'):
             move_lines = self.env['stock.move.line'].browse(self.env.context['all_move_line_ids'])
-        move_lines_to_pack = move_lines._to_pack()
+        # From the 'Moves' button, we want to take all move lines, without caring for picked or with/without packages.
+        force_move_lines = bool(self.env.context.get('force_move_lines'))
+
+        move_lines_to_pack, packages_to_pack = move_lines._get_lines_and_packages_to_pack(picked_first=not force_move_lines)
         done_pack = False
         if move_lines_to_pack:
             action = move_lines_to_pack._pre_put_in_pack_hook(move_lines, package_id, package_type_id, package_name, self.env.context.get('from_package_wizard'))
@@ -1142,17 +1133,36 @@ def action_put_in_pack(self, *, package_id=False, package_type_id=False, package
 
             package = move_lines_to_pack._put_in_pack(package_id, package_type_id, package_name)
             done_pack = move_lines_to_pack._post_put_in_pack_hook(package)
-        if done_pack and not self.env.context.get('force_move_lines'):
+        if done_pack and not force_move_lines:
             return done_pack
-        elif lines_with_pack_to_pack := move_lines._to_pack(without_pack=False):
-            packs_to_pack = lines_with_pack_to_pack.result_package_id.outermost_package_id
+        elif packages_to_pack:
             if done_pack:
-                packs_to_pack = packs_to_pack.filtered(lambda p: p.id != done_pack.id)
+                packages_to_pack -= done_pack
                 package_id = done_pack.id
-            if packs_to_pack:
-                return packs_to_pack.action_put_in_pack(package_id=package_id, package_type_id=package_type_id, package_name=package_name)
-        if not done_pack:
-            raise UserError(_("There is nothing eligible to put in a pack. Either there are no quantities to put in a pack or moves are already done."))
+            if packages_to_pack:
+                return packages_to_pack.action_put_in_pack(package_id=package_id, package_type_id=package_type_id, package_name=package_name)
+
+    def _get_lines_and_packages_to_pack(self, picked_first=True):
+        """ Get all move lines & packages that need to be put in a pack.
+
+            :param picked_first: If enabled, will prioritize picked move lines over other move lines.
+            :return: move_lines_to_pack: All move lines without a pack that can be packed
+            :return: packages_to_pack: All packages that can be packed
+        """
+        if len(self.picking_type_id) > 1:
+            raise UserError(_('You cannot pack products into the same package when they are from different transfers with different operation types'))
+
+        quantity_move_lines = self.filtered(lambda ml: ml.state not in ('done', 'cancel') and ml.product_uom_id.compare(ml.quantity, 0.0) > 0)
+        if picked_first:
+            picked_move_lines = quantity_move_lines.filtered(lambda ml: ml.picked)
+            if picked_move_lines:
+                # As long as at least a single move line is picked, we ignore the unpicked ones.
+                quantity_move_lines = picked_move_lines
+
+        move_lines_to_pack = quantity_move_lines.filtered(lambda ml: not ml.result_package_id)
+        packages_to_pack = (quantity_move_lines - move_lines_to_pack).result_package_id.outermost_package_id
+
+        return move_lines_to_pack, packages_to_pack
 
     def _get_revert_inventory_move_values(self):
         self.ensure_one()
diff --git a/addons/stock/tests/test_packing.py b/addons/stock/tests/test_packing.py
index 238d0ad78160f..c27351053da36 100644
--- a/addons/stock/tests/test_packing.py
+++ b/addons/stock/tests/test_packing.py
@@ -1370,7 +1370,7 @@ def test_put_out_of_pack_transfer(self):
         self.assertEqual(quantB.package_id.id, pack.id, "Product B should still be in the initial package.")
 
     def test_expected_to_pack(self):
-        """ Test direct calling of `_to_pack` since it doesn't handle all multi-record cases
+        """ Test direct calling of `_get_lines_and_packages_to_pack` since it doesn't handle all multi-record cases
         It's unlikely this situations will occur, but in case it is for customizations/future features,
         ensure that we don't have unexpected behavior """
 
@@ -1424,9 +1424,9 @@ def test_expected_to_pack(self):
 
         # can't mix operation types
         with self.assertRaises(UserError):
-            move_lines_to_pack = (internal_picking_1 | in_picking_1).move_line_ids._to_pack()
+            move_lines_to_pack, __ = (internal_picking_1 | in_picking_1).move_line_ids._get_lines_and_packages_to_pack()
 
-        move_lines_to_pack = (internal_picking_1 | internal_picking_2).move_line_ids._to_pack()
+        move_lines_to_pack, __ = (internal_picking_1 | internal_picking_2).move_line_ids._get_lines_and_packages_to_pack()
         self.assertEqual(len(move_lines_to_pack), 2, "all move lines in pickings should have been selected to pack")
 
     def test_package_selection(self):
diff --git a/addons/stock_delivery/tests/test_packing_delivery.py b/addons/stock_delivery/tests/test_packing_delivery.py
index 7c5d777731e18..ccf5525034935 100644
--- a/addons/stock_delivery/tests/test_packing_delivery.py
+++ b/addons/stock_delivery/tests/test_packing_delivery.py
@@ -253,14 +253,14 @@ def test_batch_picking_delivery(self):
         ml_1.copy({'picking_id': delivery_2.id, 'quantity': 1})
         # recreate the `action_put_in_pack`` steps so we don't have to add test to new module for batch pickings
         # to use batch version of method (which bypass the ensure_one() check in the stock_picking action)
-        move_lines_to_pack = (delivery_1 | delivery_2).move_line_ids._to_pack()
+        move_lines_to_pack, __ = (delivery_1 | delivery_2).move_line_ids._get_lines_and_packages_to_pack()
         self.assertEqual(len(move_lines_to_pack), 2, 'There should be move lines that can be "put in pack"')
         with self.assertRaises(UserError):
             move_lines_to_pack._pre_put_in_pack_hook()
 
         # Test that same carrier + put in pack = OK!
         delivery_2.carrier_id = delivery_1.carrier_id
-        move_lines_to_pack = (delivery_1 | delivery_2).move_line_ids._to_pack()
+        move_lines_to_pack, __ = (delivery_1 | delivery_2).move_line_ids._get_lines_and_packages_to_pack()
         self.assertEqual(len(move_lines_to_pack), 2, 'There should be move lines that can be "put in pack"')
         move_lines_to_pack._pre_put_in_pack_hook()
         package = move_lines_to_pack._put_in_pack()

From f7cdf9d5859ee46d4127b3dcf02a399ba629c9ab Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Tue, 14 Oct 2025 09:51:56 +0200
Subject: [PATCH 512/673] [FIX] stock: avoid 'Unnamed' package names

Steps to reproduce:
- Go to any product, open its quants
- Create a new line and create an empty package without name

The package is displayed as 'Unnamed' until the quant is saved, where
its real name is displayed.

Despite having their name required, packages can be created without one.
In such case, a name will be generated based on their appropriate
sequence (i.e. from package type or base package sequence).

However, when records are created through an auto-complete in js, the
records aren't reloaded after their creation. This meant that since the
name is computed python-side, there would be no name to display until
the whole record is saved (as this would reload the record), thus the
'Unnamed' packages.

To avoid this, we need to override some props of FromViewDialog to force
the reload after creation.

Task-5116567

X-original-commit: aaad780e897e941a3d5cf9b3a881252907ba266a
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Part-of: odoo/odoo#235111
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 .../static/src/widgets/stock_package_m2o.js   | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/addons/stock/static/src/widgets/stock_package_m2o.js b/addons/stock/static/src/widgets/stock_package_m2o.js
index 68869d24d3fd9..4a3d3ce0d7cab 100644
--- a/addons/stock/static/src/widgets/stock_package_m2o.js
+++ b/addons/stock/static/src/widgets/stock_package_m2o.js
@@ -7,10 +7,38 @@ import {
     extractM2OFieldProps,
     Many2OneField,
 } from "@web/views/fields/many2one/many2one_field";
+import { Many2XAutocomplete } from "@web/views/fields/relational_utils";
+import { FormViewDialog } from "@web/views/view_dialogs/form_view_dialog";
+
+class Many2XStockPackageAutocomplete extends Many2XAutocomplete {
+    get createDialog() {
+        const PackageFormDialog = FormViewDialog;
+        PackageFormDialog.defaultProps = {
+            ...PackageFormDialog.defaultProps,
+            onRecordSave: async (record) => {
+                // We need to reload to get the name computed from the backend.
+                const saved = await record.save({ reload: true });
+                if (saved && this.props.update) {
+                    // Without this, the package is named 'Unnamed' in the UI until the record is saved.
+                    this.props.update([{ ...record.data, id: record.resId }]);
+                }
+                return saved;
+            },
+        };
+        return PackageFormDialog;
+    }
+}
+
+class StockPackageMany2OneReplacer extends Many2One {
+    static components = {
+        ...Many2One.components,
+        Many2XAutocomplete: Many2XStockPackageAutocomplete,
+    };
+}
 
 export class StockPackageMany2One extends Component {
     static template = "stock.StockPackageMany2One";
-    static components = { Many2One };
+    static components = { Many2One: StockPackageMany2OneReplacer };
     static props = {
         ...Many2OneField.props,
         displaySource: { type: Boolean },

From 6d8d6117fa9b6f17125fb4173ca5118c47e64e8e Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Tue, 28 Oct 2025 15:27:29 +0100
Subject: [PATCH 513/673] [FIX] stock{,_picking_batch}: display source package
 in 'Pick From'

- Properly displays the current source package in batches 'Moves' list.
- Now uses `display_name` instead of `name` for quant's display_name. It
  allows to use package-specific context for autocomplete as well.

Task-5116567

closes odoo/odoo#228837

closes odoo/odoo#235111

X-original-commit: 2a2b3c5d43d4083c3484e70141368ff49aa78ed6
Related: odoo/enterprise#95648
Related: odoo/enterprise#99187
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/stock/models/stock_move_line.py                        | 2 +-
 addons/stock/models/stock_quant.py                            | 4 ++--
 addons/stock/views/stock_move_views.xml                       | 4 ++--
 .../stock_picking_batch/views/stock_picking_batch_views.xml   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index 27f87c71ea0a7..d99118f8c56a3 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -52,7 +52,7 @@ class StockMoveLine(models.Model):
     result_package_id = fields.Many2one(
         'stock.package', 'Destination Package',
         ondelete='restrict', required=False, check_company=True,
-        domain="['|', '|', ('location_id', '=', location_dest_id), ('id', '=', package_id), '&', ('location_id', '=', False), '|', ('move_line_ids', '=', False), ('move_line_ids.location_dest_id', '=?', location_dest_id)]",
+        domain="['|', '|', ('location_id', '=', location_dest_id), ('id', '=', package_id), '&', ('location_id', '=', False), '|', ('move_line_ids', '=', False), ('move_line_ids.location_dest_id', '=', location_dest_id)]",
         help="If set, the operations are packed into this package")
     result_package_dest_name = fields.Char('Destination Package Name', related='result_package_id.dest_complete_name')
     package_history_id = fields.Many2one('stock.package.history', string="Package History", index='btree_not_null')
diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index c6af261eb6e5d..1c31d49e09842 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -561,7 +561,7 @@ def _compute_display_name(self):
             if record.env.context.get('formatted_display_name'):
                 name = f"{record.location_id.name}"
                 if record.package_id:
-                    name += f"\t--{record.package_id.name}--"
+                    name += f"\t--{record.package_id.display_name}--"
                 if record.lot_id:
                     name += (' ' if record.package_id else '\t') + f"--{record.lot_id.name}--"
                 record.display_name = name
@@ -570,7 +570,7 @@ def _compute_display_name(self):
                 if record.lot_id:
                     name.append(record.lot_id.name)
                 if record.package_id:
-                    name.append(record.package_id.name)
+                    name.append(record.package_id.display_name)
                 if record.owner_id:
                     name.append(record.owner_id.name)
                 record.display_name = ' - '.join(name)
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 9ddc51460f7ea..2c0537f0de920 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -182,7 +182,7 @@
                     <field name="picking_type_id" column_invisible="True"/>
                     <field name="quant_id"
                         domain="[('product_id', '=', product_id), ('location_id', 'child_of', parent.location_id)]"
-                        context="{'default_location_id': location_id, 'default_product_id': product_id, 'search_view_ref': 'stock.quant_search_view', 'list_view_ref': 'stock.view_stock_quant_tree', 'form_view_ref': 'stock.view_stock_quant_form', 'readonly_form': True}"
+                        context="{'default_location_id': location_id, 'default_product_id': product_id, 'search_view_ref': 'stock.quant_search_view', 'list_view_ref': 'stock.view_stock_quant_tree', 'form_view_ref': 'stock.view_stock_quant_form', 'readonly_form': True, 'show_src_package': 1}"
                         widget="pick_from"
                         column_invisible="not parent.show_quant"
                         options="{'no_create': True, 'no_open': True}"/>
@@ -235,7 +235,7 @@
                     <field name="package_id" column_invisible="True" context="{'show_src_package': 1}"/>
                     <field name="quant_id" column_invisible="context.get('picking_code') == 'incoming'"
                         domain="[('product_id', '=', product_id), ('location_id', 'child_of', picking_location_id)]"
-                        context="{'default_location_id': location_id, 'default_product_id': product_id, 'search_view_ref': 'stock.quant_search_view', 'list_view_ref': 'stock.view_stock_quant_tree_simple', 'form_view_ref': 'stock.view_stock_quant_form', 'readonly_form': False}"
+                        context="{'default_location_id': location_id, 'default_product_id': product_id, 'search_view_ref': 'stock.quant_search_view', 'list_view_ref': 'stock.view_stock_quant_tree_simple', 'form_view_ref': 'stock.view_stock_quant_form', 'readonly_form': False, 'show_src_package': 1}"
                         readonly="state in ('done', 'cancel') and is_locked"
                         widget="pick_from"
                         options="{'no_open': True}"/>
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index 56c57848f0ae9..38a627990de04 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -61,15 +61,15 @@
                 <field name="lot_id"   groups="stock.group_production_lot" readonly="tracking not in ['lot', 'serial']" column_invisible="context.get('picking_code') != 'incoming' or context.get('show_lots_text')"/>
                 <field name="lot_name" string="Lot/Serial Number" groups="stock.group_production_lot"
                        readonly="tracking not in ['lot', 'serial']" column_invisible="context.get('picking_code') != 'incoming' or not context.get('show_lots_text')"/>
+                <field name="package_id" groups="stock.group_tracking_lot" column_invisible="True" context="{'show_src_package': 1}"/>
                 <field name="quant_id" column_invisible="context.get('picking_code') == 'incoming'"
                         domain="[('product_id', '=', product_id), ('location_id', 'child_of', picking_location_id)]"
-                        context="{'default_location_id': location_id, 'default_product_id': product_id, 'search_view_ref': 'stock.quant_search_view', 'list_view_ref': 'stock.view_stock_quant_tree_simple', 'form_view_ref': 'stock.view_stock_quant_form', 'readonly_form': False}"
+                        context="{'default_location_id': location_id, 'default_product_id': product_id, 'search_view_ref': 'stock.quant_search_view', 'list_view_ref': 'stock.view_stock_quant_tree_simple', 'form_view_ref': 'stock.view_stock_quant_form', 'readonly_form': False, 'show_src_package': 1}"
                         readonly="state in ('done', 'cancel') and is_locked"
                         widget="pick_from"
                         options="{'no_open': True}"/>
                 <field name="location_id" column_invisible="True"/>
                 <field name="location_dest_id"/>
-                <field name="package_id" groups="stock.group_tracking_lot" column_invisible="True"/>
                 <field name="result_package_id" groups="stock.group_tracking_lot" widget="package_m2o" context="{'show_dest_package': 1}"/>
                 <field name="quantity"/>
                 <field name="product_uom_id" options="{'no_create': True}" widget="many2one_uom"

From 0dfd8f044f1acc252e6f41e0fe1d74f85509f7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Lef=C3=A8vre=20=28mlef=29?= <mlef@odoo.com>
Date: Mon, 10 Nov 2025 16:52:38 +0000
Subject: [PATCH 514/673] [FIX] hr: Fix "no attribute" runbot build error

This test had a bug: `self.env['hr.employee']._fields.keys()` may contain
fields that do not exist in an `hr.employee` record.

Now, employee fields that cannot be accessed are filtered out using
`hasattr()`. To avoid further crashes.

Runbot build error: https://runbot.odoo.com/odoo/runbot.build.error/233942
Bug has been introduced by task-5103739

task-5254322

closes odoo/odoo#235323

X-original-commit: cc4472a8fc4e3981eda2a9c178c25849d3f55f67
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr/tests/test_hr_employee.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/hr/tests/test_hr_employee.py b/addons/hr/tests/test_hr_employee.py
index c19ada86e8805..036bb55866e1e 100644
--- a/addons/hr/tests/test_hr_employee.py
+++ b/addons/hr/tests/test_hr_employee.py
@@ -732,7 +732,12 @@ def test_version_cron_update_no_fields(self):
 
         # Saving current employee data to compare later on
         employee_values = {}
-        employee_fields = self.env['hr.employee']._fields.keys()
+        # some fields cannot be accessed. We need to filter them out
+        employee_fields = [
+            field
+            for field in self.env['hr.employee']._fields
+            if hasattr(self.employee, field)
+        ]
         for field in employee_fields:
             employee_values[field] = self.employee[field]
 

From db80e85e2b89b55dd78ab180ba14663d817c3f4b Mon Sep 17 00:00:00 2001
From: bhra-odoo <bhra@odoo.com>
Date: Tue, 11 Nov 2025 13:19:06 +0000
Subject: [PATCH 515/673] [FIX] l10n_latam_invoice_document: document fields
 visibility on journal change

**Steps to reproduce:**
1. Install `l10n_ar` localization.
2. Create two sales journals with the `Use documents` option enabled and
   disabled.
3) Create an invoice and add a customer and change the journal to with
   `use documents` and save the record
4) Now change the jornal to without `use documents` and try to save it

**Observed behavior:**
The `Document Type` and `Document Number` fields fail to show or hide
properly when switching between journals with different `Use documents`
configurations.

**Cause:**
The `_compute_l10n_latam_use_documents` method lacked the
`@api.depends` decorator with appropriate dependencies. As a result,
when the journal is changed on an invoice, the
`l10n_latam_use_documents` field was not recomputed, leading to incorrect
visibility of related fields.

**Fix:**
Add the missing `@api.depends('journal_id.l10n_latam_use_documents',
'move_type')` decorator to ensure the field recomputes whenever the
journal or its `Use documents` setting changes.

opw-5220202

closes odoo/odoo#235352

X-original-commit: ac5209542c17b640e77134ee1e0ec577f04b29c6
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Raj Bhuva (bhra) <bhra@odoo.com>
---
 addons/l10n_latam_invoice_document/models/account_move.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_latam_invoice_document/models/account_move.py b/addons/l10n_latam_invoice_document/models/account_move.py
index 480c45de2db90..603bbc08a2c46 100644
--- a/addons/l10n_latam_invoice_document/models/account_move.py
+++ b/addons/l10n_latam_invoice_document/models/account_move.py
@@ -101,6 +101,7 @@ def _compute_l10n_latam_manual_document_number(self):
     def _is_manual_document_number(self):
         return self.journal_id.type == 'purchase'
 
+    @api.depends('journal_id')
     def _compute_l10n_latam_use_documents(self):
         for rec in self:
             rec.l10n_latam_use_documents = rec.journal_id.l10n_latam_use_documents and rec.move_type != 'in_receipt'

From d9ddf5d5dba31c22210bc90ed4465f75b4a2b022 Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Mon, 10 Nov 2025 14:52:22 +0000
Subject: [PATCH 516/673] [FIX] account: allow excluding archived journals in
 journal groups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A journal is still excluded from the ledger even if it is archived.
To reproduce:
* create a new journal
* create a journal entry impacting the P&L in that journal
* create a Multi-Ledger (journal group) excluding this journal
* archive the journal
* open the P&L

The journal entry is impacting the report, because the journal is not
excluded.

task-5251383

closes odoo/odoo#235353

X-original-commit: dee42a4c5692071f0dc4573acd509347444a55a6
Signed-off-by: John Laterre (jol) <jol@odoo.com>
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/models/account_journal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/account_journal.py b/addons/account/models/account_journal.py
index b7e8f2d732c6d..4296410bdd80a 100644
--- a/addons/account/models/account_journal.py
+++ b/addons/account/models/account_journal.py
@@ -23,7 +23,7 @@ class AccountJournalGroup(models.Model):
         help="Define which company can select the multi-ledger in report filters. If none is provided, available for all companies",
         default=lambda self: self.env.company,
     )
-    excluded_journal_ids = fields.Many2many('account.journal', string="Excluded Journals")
+    excluded_journal_ids = fields.Many2many('account.journal', string="Excluded Journals", context={'active_test': False})
     sequence = fields.Integer(default=10)
 
     _uniq_name = models.Constraint(

From 561e5dc4c56e05d485039cc0c2a05cd3df642fdb Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Thu, 6 Nov 2025 10:29:34 +0000
Subject: [PATCH 517/673] [FIX] event_product: ensure tickets have correct
 service tracking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps
-----
1. Have `sale_renting` but not `sale_stock_renting` installed;
2. create an event with a ticket;
3. make the ticket's product rentable;
4. change ticket's product type to Goods;
5. publish the event to website;
6. register for the event via website;
7. go to payment.

Issue
-----
AttributeError: 'bool' object has no attribute 'tzinfo'

Cause
-----
By making it a rental product, it creates a rental order, but as
registering for an event via website doesn't have any way to add rental
dates, rental lines cannot be processed & rendered as expected.

Solution
--------
Prevent users from changing the `service_tracking` away from `'event'`
by adding an `api.constrains` to `product.product` on `service_tracking`
and `event_ticket_ids`.

opw-5207045

closes odoo/odoo#235366

X-original-commit: afcbd98594c9f7007f03a343ea40ea122b955459
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 .../event_product/models/product_product.py   | 13 ++++++++++-
 addons/event_product/tests/__init__.py        |  2 ++
 .../event_product/tests/test_event_product.py | 23 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 addons/event_product/tests/test_event_product.py

diff --git a/addons/event_product/models/product_product.py b/addons/event_product/models/product_product.py
index 33ae343c322fb..4d94b04e2863b 100644
--- a/addons/event_product/models/product_product.py
+++ b/addons/event_product/models/product_product.py
@@ -1,7 +1,18 @@
-from odoo import fields, models
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
 
 
 class ProductProduct(models.Model):
     _inherit = 'product.product'
 
     event_ticket_ids = fields.One2many('event.event.ticket', 'product_id', string='Event Tickets')
+
+    @api.constrains('event_ticket_ids', 'service_tracking')
+    def _check_event_ticket_service_tracking(self):
+        if any(product.service_tracking != 'event' for product in self if product.event_ticket_ids):
+            service_tracking = self.fields_get(['service_tracking'], ['string', 'selection'])['service_tracking']
+            raise ValidationError(_(
+                'Products linked to an event ticket must have "%(tracking)s" set to "%(event)s".',
+                tracking=service_tracking['string'],
+                event=dict(service_tracking['selection'])['event'],
+            ))
diff --git a/addons/event_product/tests/__init__.py b/addons/event_product/tests/__init__.py
index e69de29bb2d1d..46db5c5b0b206 100644
--- a/addons/event_product/tests/__init__.py
+++ b/addons/event_product/tests/__init__.py
@@ -0,0 +1,2 @@
+from . import common
+from . import test_event_product
diff --git a/addons/event_product/tests/test_event_product.py b/addons/event_product/tests/test_event_product.py
new file mode 100644
index 0000000000000..2709b81f1800f
--- /dev/null
+++ b/addons/event_product/tests/test_event_product.py
@@ -0,0 +1,23 @@
+from odoo.exceptions import ValidationError
+from odoo.tests import tagged
+
+from odoo.addons.event_product.tests.common import TestEventProductCommon
+
+
+@tagged('post_install', '-at_install')
+class TestEventProduct(TestEventProductCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.test_event = cls.env['event.event'].create({
+            'name': "TestEventProduct",
+            'event_type_id': cls.event_type_tickets.id,
+        })
+
+    def test_ensure_event_service_tracking(self):
+        with self.assertRaises(ValidationError):
+            self.event_product.service_tracking = 'no'
+        with self.assertRaises(ValidationError):
+            self.event_product.type = 'consu'

From f51aad1648b426caae224d16c67ab0abd3a817ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 7 Nov 2025 16:09:21 +0000
Subject: [PATCH 518/673] [FIX] im_livechat: no auto-zoom input for livechat
 visitor in mobile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, when using livechat for visitors on mobile
devices, click on input would zoom on input of about 115%.

This zoom would hide send button at the very end of composer input,
and would force users to pinch-to-unzoom, making the UX quite poor.

This problem happens because mobile devices have an auto-zoom feature
that is triggered when font-size is below 16px. The discuss UI is
designed with 14px font size (web client font size), and since
14px < 16px, it zooms on input focus to about 115%.

This commit fixes the issue by using a font-size of 16px specifically
for livechat visitor on mobile devices, so that this doesn't
auto-zoom. Note that this problem doesn't happen on the web client
even though this uses a font-size of 14px because it specifically
disable the autozoom feature:
https://github.com/odoo/odoo/blob/17.0/addons/web/views/webclient_templates.xml#L250

This solution is not practical for livechat, for which it has to work
on any external website.

opw-5229076

closes odoo/odoo#235355

X-original-commit: 0259ddbc7e43ab156d9bef8ef3531d9734bd3f31
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/im_livechat/static/src/embed/common/composer.scss | 5 +++++
 addons/mail/static/src/core/common/composer.xml          | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 addons/im_livechat/static/src/embed/common/composer.scss

diff --git a/addons/im_livechat/static/src/embed/common/composer.scss b/addons/im_livechat/static/src/embed/common/composer.scss
new file mode 100644
index 0000000000000..91d026446ed31
--- /dev/null
+++ b/addons/im_livechat/static/src/embed/common/composer.scss
@@ -0,0 +1,5 @@
+.o-mail-Composer-input, .o-mail-Composer-fake {
+    &.o-mobile {
+        font-size: 16px;
+    }
+}
diff --git a/addons/mail/static/src/core/common/composer.xml b/addons/mail/static/src/core/common/composer.xml
index 7b18e3bf70324..90ca6d16ab017 100644
--- a/addons/mail/static/src/core/common/composer.xml
+++ b/addons/mail/static/src/core/common/composer.xml
@@ -69,7 +69,8 @@
                     <div class="position-relative flex-grow-1">
                         <t t-set="inputClasses" t-value="{
                             'o-mail-Composer-inputStyle form-control border-0 o-rounded-bubble': true,
-                            'ps-2': partitionedActions.other.length === 0
+                            'o-mobile': isMobileOS,
+                            'ps-2': partitionedActions.other.length === 0,
                         }"/>
                         <Wysiwyg t-if="composerService.htmlEnabled" class="'w-100 text-break overflow-auto'" config="this.wysiwygConfig" onLoad.bind="onLoadWysiwyg"/>
                         <t t-else="">

From 42a5a7d1ba7a54da31e14f88a5cab01a0ed4ba9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20=28blse=29?= <blse@odoo.com>
Date: Wed, 22 Oct 2025 10:54:24 +0000
Subject: [PATCH 519/673] [FIX] html_editor: fix error on delete without
 selection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the selection of the document is not set and the user presses the
delete key, the delete handler of the list plugin throws an error.

Steps to reproduce (in 19.0, where the issue was discovered):
- Open website builder
- Drop the video inner snippet in the header
- Double-click & drag from the video to just outside the video
- Click once on the video
- Press "delete"
- Bug: Traceback

task-5186954

closes odoo/odoo#235362

X-original-commit: 300f3ad010fdff10ca28b151bad1ac13fce55eda
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Sébastien Blondiau (blse) <blse@odoo.com>
---
 addons/html_editor/static/src/main/list/list_plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/html_editor/static/src/main/list/list_plugin.js b/addons/html_editor/static/src/main/list/list_plugin.js
index b568578987c9e..b6e8ac036cc16 100644
--- a/addons/html_editor/static/src/main/list/list_plugin.js
+++ b/addons/html_editor/static/src/main/list/list_plugin.js
@@ -1243,7 +1243,7 @@ export class ListPlugin extends Plugin {
 
     adjustListPaddingOnDelete() {
         const selection = this.document.getSelection();
-        if (!selection.isCollapsed) {
+        if (!selection.isCollapsed || !selection.anchorNode) {
             return;
         }
         const listItem = closestElement(selection.anchorNode);

From 62f13aec4cf593fe64c00918ee687c91a4dea36d Mon Sep 17 00:00:00 2001
From: "Pierre Lamotte (pila)" <pila@odoo.com>
Date: Thu, 4 Sep 2025 14:35:57 +0000
Subject: [PATCH 520/673] [FIX] website_sale: setup markup price with website
 tax configuration

## Version
18.2+
SEO Schema refactoring from task-3866937

## Issue
The markup always contains the price without taxes, no matter the website settings for pricing display (with or without taxes).

## Steps to reproduce
- Go to Website settings:
  - Choose "Taxes Included" for "Display Product Prices".
- Got to the shop and select any product on which taxes apply (e.g. Customizable Desk):
  - Open console and execute `JSON.parse(document.querySelectorAll('[type="application/ld+json"]')[1].innerHTML)[0]['hasVariant'][0]['offers']['price']`;
  - The found price and the displayed price (visible on the page) are different

## Fix
Allow tax inclusion based on parameter to mimic template's behavior on variants too depending on the website.
https://github.com/odoo/odoo/blob/52a6d88a188d5456262428847aed229f117da8ed/addons/website_sale/models/product_template.py#L377-L430

opw-4923780

test

closes odoo/odoo#235364

X-original-commit: eb39d0f1a481f155f45af27ceb006e5bfb549d2a
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
Signed-off-by: Pierre Lamotte (pila) <pila@odoo.com>
---
 addons/website_sale/models/product_product.py | 14 +++++++---
 .../tests/test_product_template.py            | 26 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/models/product_product.py b/addons/website_sale/models/product_product.py
index 12a41b4ef9db5..c240469b7b880 100644
--- a/addons/website_sale/models/product_product.py
+++ b/addons/website_sale/models/product_product.py
@@ -163,6 +163,16 @@ def _to_markup_data(self, website):
         """
         self.ensure_one()
 
+        product_price = request.pricelist._get_product_price(
+            self, quantity=1, target_currency=website.currency_id
+        )
+        # Use sudo to access cross-company taxes.
+        product_taxes_sudo = self.sudo().taxes_id._filter_taxes_by_company(self.env.company)
+        taxes = request.fiscal_position.map_tax(product_taxes_sudo)
+        price = self.product_tmpl_id._apply_taxes_to_price(
+            product_price, website.currency_id, product_taxes_sudo, taxes, self, website=website
+        )
+
         base_url = website.get_base_url()
         markup_data = {
             '@context': 'https://schema.org',
@@ -172,9 +182,7 @@ def _to_markup_data(self, website):
             'image': f'{base_url}{website.image_url(self, "image_1920")}',
             'offers': {
                 '@type': 'Offer',
-                'price': float_round(request.pricelist._get_product_price(
-                    self, quantity=1, target_currency=website.currency_id
-                ), 2),
+                'price': price,
                 'priceCurrency': website.currency_id.name,
             },
         }
diff --git a/addons/website_sale/tests/test_product_template.py b/addons/website_sale/tests/test_product_template.py
index 501477c7862ee..bb883a8a7c107 100644
--- a/addons/website_sale/tests/test_product_template.py
+++ b/addons/website_sale/tests/test_product_template.py
@@ -59,6 +59,32 @@ def test_markup_data_uses_product_schema_when_single_variant(self):
             markup_data = product_template._to_markup_data(self.website)
         self.assertEqual(markup_data['@type'], 'Product')
 
+    def test_markup_data_uses_taxes_excluded_price_when_configured_on_website(self):
+        self.env['res.config.settings'].create({
+            'show_line_subtotals_tax_selection': 'tax_excluded'
+        }).execute()
+        with MockRequest(self.website.env, website=self.website):
+            markup_data = self.product._to_markup_data(self.website)
+            self.assertEqual(
+                markup_data['offers']['price'],
+                self.website.currency_id.round(self.product.base_unit_price),
+            )
+
+    def test_markup_data_uses_taxes_included_price_when_configured_on_website(self):
+        self.env['res.config.settings'].create({
+            'show_line_subtotals_tax_selection': 'tax_included'
+        }).execute()
+        self.product.price_extra = 10
+        with MockRequest(self.website.env, website=self.website):
+            product_tmpl = self.product.product_tmpl_id
+            markup_data = self.product._to_markup_data(self.website)
+            self.assertEqual(
+                markup_data['offers']['price'],
+                self.website.currency_id.round(
+                    self.product.base_unit_price * (1 + product_tmpl.taxes_id[0].amount / 100)
+                ),
+            )
+
     def test_remove_archived_products_from_cart(self):
         """Archived products shouldn't appear in carts"""
         self.product.action_archive()

From ab9f12b06d88249b6ea76c08a29b4b8d34d14504 Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Thu, 30 Oct 2025 10:19:48 +0000
Subject: [PATCH 521/673] [FIX] sale{,_stock{,_margin}}: allow SOL cost update
 post-cancel

Versions
--------
- 17.0+

Steps
-----
1. Have a product with a purchase cost;
2. have sale margins enabled;
3. add a the product to a quotation;
4. change pricelist to one with a different currency;
5. note that the line's cost gets updated;
6. change order state to confirmed, then canceled, then back to draft;
7. change pricelist again.

Issue
-----
The purchase cost no longer update.

Cause
-----
The `_compute_purchase_price` override in `sale_stock_margin` doesn't
pass the line to `super` if it `has_valued_move_ids`. This hook only
checks for the existence of linked `move_ids` on the record with no
regard for their state.

Solution
--------
1. Move the `has_valued_move_ids` hook from `sale` to `sale_stock`.
2. Only return `True` if any of the moves aren't in draft or canceled.

opw-5147321

closes odoo/odoo#235176

X-original-commit: 8769725ffc4f803a865dcd0083f87494f6d064c9
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 addons/sale/models/sale_order_line.py         |  3 --
 addons/sale_stock/models/sale_order_line.py   |  3 ++
 .../tests/test_sale_stock_margin.py           | 32 ++++++++++++-------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/addons/sale/models/sale_order_line.py b/addons/sale/models/sale_order_line.py
index 6e4c217f27dad..098ac365f0c6e 100644
--- a/addons/sale/models/sale_order_line.py
+++ b/addons/sale/models/sale_order_line.py
@@ -1652,9 +1652,6 @@ def _get_discounted_price(self):
         self.ensure_one()
         return self.price_unit * (1 - (self.discount or 0.0) / 100.0)
 
-    def has_valued_move_ids(self):
-        return self.move_ids
-
     def _get_linked_line(self):
         """ Return the linked line of this line, if any.
 
diff --git a/addons/sale_stock/models/sale_order_line.py b/addons/sale_stock/models/sale_order_line.py
index 60aeda639d37f..60c7df4156873 100644
--- a/addons/sale_stock/models/sale_order_line.py
+++ b/addons/sale_stock/models/sale_order_line.py
@@ -441,3 +441,6 @@ def _get_product_catalog_lines_data(self, **kwargs):
             )
         )
         return res
+
+    def has_valued_move_ids(self):
+        return any(move.state not in ('cancel', 'draft') for move in self.move_ids)
diff --git a/addons/sale_stock_margin/tests/test_sale_stock_margin.py b/addons/sale_stock_margin/tests/test_sale_stock_margin.py
index 67ffc480efb78..f8ffbffd5f5b6 100644
--- a/addons/sale_stock_margin/tests/test_sale_stock_margin.py
+++ b/addons/sale_stock_margin/tests/test_sale_stock_margin.py
@@ -52,6 +52,17 @@ def _create_product(self):
         product_template.categ_id.property_cost_method = 'fifo'
         return product_template.product_variant_ids
 
+    def _setup_multicurrency(self):
+        usd = self.env.ref('base.USD')
+        self.company_currency = self.env.company.currency_id
+        self.other_currency = self.env.ref('base.EUR') if self.company_currency == usd else usd
+        date = fields.Date.today()
+        self.env['res.currency.rate'].create([
+            {'currency_id': self.company_currency.id, 'rate': 1, 'name': date},
+            {'currency_id': self.other_currency.id, 'rate': 2, 'name': date},
+        ])
+        return self.company_currency + self.other_currency
+
     #########
     # TESTS #
     #########
@@ -204,18 +215,7 @@ def test_sale_stock_margin_6(self):
         self.assertEqual(order_line_2.purchase_price, 40, "Sales order line cost should be 40.00")
 
     def test_so_and_multicurrency(self):
-        ResCurrencyRate = self.env['res.currency.rate']
-        company_currency = self.env.company.currency_id
-        other_currency = self.env.ref('base.EUR') if company_currency == self.env.ref('base.USD') else self.env.ref('base.USD')
-
-        date = fields.Date.today()
-        ResCurrencyRate.create({'currency_id': company_currency.id, 'rate': 1, 'name': date})
-        other_currency_rate = ResCurrencyRate.search([('name', '=', date), ('currency_id', '=', other_currency.id)])
-        if other_currency_rate:
-            other_currency_rate.rate = 2
-        else:
-            ResCurrencyRate.create({'currency_id': other_currency.id, 'rate': 2, 'name': date})
-
+        _company_currency, other_currency = self._setup_multicurrency()
         so = self._create_sale_order()
         so.pricelist_id = self.env['product.pricelist'].create({
             'name': 'Super Pricelist',
@@ -300,6 +300,7 @@ def test_so_and_multicompany(self):
         self.assertEqual(sol.margin, 100)
 
     def test_purchase_price_changes(self):
+        self._setup_multicurrency()
         so = self._create_sale_order()
         product = self._create_product()
         product.categ_id.property_cost_method = 'standard'
@@ -322,6 +323,13 @@ def test_purchase_price_changes(self):
         so.action_confirm()
         self.assertEqual(so.order_line[0].purchase_price, 15)
 
+        # Set SO back to draft, and trigger purchase price recompute via currency change
+        so.with_context(disable_cancel_warning=True).action_cancel()
+        so.action_draft()
+        so.currency_id = self.other_currency
+        self.assertEqual(so.order_line.move_ids.state, 'cancel')
+        self.assertEqual(so.order_line.purchase_price, 40)
+
     def test_add_product_on_delivery_price_unit_on_sale(self):
         """ Adding a product directly on a sale order's delivery should result in the new SOL
         having its `purchase_price` and `margin` + `margin_percent` fields correctly calculated.

From 092baefa8fffaf0e83148e50803704661b78a535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir=20=28rar=29?= <rar@odoo.com>
Date: Wed, 5 Nov 2025 09:57:55 +0000
Subject: [PATCH 522/673] [FIX] spreadsheet: Fix css overrides
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following the style revamp of the o-spreadsheet lib, we introduced a
class o-input (differs from odoo o_input) in order to avoid collision
with the odoo classes which tend to be altered in dark mode which
spreadsheet does not support.

However, we still relied on the default behaviour of odoo classes to
mark specific inputs as invalid or missing.

This commit ensures that missing/invalid are always marked as such while
make preventing the dark mode to break the default layout.

Task-4878174

closes odoo/odoo#235387

X-original-commit: 5fb5fb4863c762aaaba715b638d67783de279e54
Related: odoo/enterprise#99315
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
---
 .../src/o_spreadsheet/o_spreadsheet_extended.scss   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss
index 4354e0f30a6e8..59526dc668e8a 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss
@@ -10,16 +10,23 @@
 }
 
 .o-sidePanel {
+    --o-spreadsheet-input-border-color: #D8DADD;
     .o_input {
         color: #111827;
-        border-color: #D8DADD;
+        border-color: var(--o-spreadsheet-input-border-color);
         &::placeholder {
             opacity: 0.5;
         }
     }
 
-    .o_required_modifier {
-        .o-input {
+    .o_field_invalid, .o_missing_field{
+        .o-input, .o_input {
+            border-color: var(--o-input-border-color);
+        }
+    }
+
+    .o_required_modifier:not(.o_field_invalid):not(.o_missing_field) {
+        .o_input {
             border-color: #111827;
         }
     }

From 8397223859ce61e2c7106ad1e2dca1151b17536e Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Wed, 12 Nov 2025 10:01:36 +0000
Subject: [PATCH 523/673] [FIX] hr_work_entry: get work entry wihtout being
 attendance manager

When w try to read the work entries, we've got an access rights error if
we are not attendance manager.

As we are still supposed to read the work entries, we get the attendance
interval in sudo

closes odoo/odoo#235383

X-original-commit: 5ac13f1092051759fe36f55b836f8ef27da058c1
Signed-off-by: Pierre Masereel (pim) <pim@odoo.com>
---
 addons/hr_work_entry/models/hr_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_work_entry/models/hr_version.py b/addons/hr_work_entry/models/hr_version.py
index 21ec39bd6566f..f9770029cd719 100644
--- a/addons/hr_work_entry/models/hr_version.py
+++ b/addons/hr_work_entry/models/hr_version.py
@@ -169,7 +169,7 @@ def _get_version_work_entries_values(self, date_start, date_stop):
         version_vals = []
         bypassing_work_entry_type_codes = self._get_bypassing_work_entry_type_codes()
 
-        attendances_by_resource = self._get_attendance_intervals(start_dt, end_dt)
+        attendances_by_resource = self.sudo()._get_attendance_intervals(start_dt, end_dt)
 
         resource_calendar_leaves = self._get_resource_calendar_leaves(start_dt, end_dt)
         # {resource: resource_calendar_leaves}

From e5b8e565ec53bcebceca74535a74847893dbc8fb Mon Sep 17 00:00:00 2001
From: leclerc-leo <leol@odoo.com>
Date: Thu, 16 Oct 2025 14:41:19 +0000
Subject: [PATCH 524/673] [FIX] account: Single write on company with fiscal
 year wizard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When writing value with the wizard, we wrote the value of related field of the company to prevent multiple write from happening.

Now, we handle the write too in case the wizard is created with default value instead of created beforehand.

It's also now possible to specify the fields that are to be written to handle more cases in overrides.

closes odoo/odoo#235382

X-original-commit: 26163c1ca6389cbffeb5de1fc1147452cacda57c
Related: odoo/enterprise#99312
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
Signed-off-by: Léo Leclerc (leol) <leol@odoo.com>
---
 addons/account/wizard/setup_wizards.py | 47 +++++++++++++++++++-------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/addons/account/wizard/setup_wizards.py b/addons/account/wizard/setup_wizards.py
index 5040fe3727aa2..92667fe1684a0 100644
--- a/addons/account/wizard/setup_wizards.py
+++ b/addons/account/wizard/setup_wizards.py
@@ -39,24 +39,47 @@ def _check_fiscalyear(self):
                     month=wiz.fiscalyear_last_month, day=wiz.fiscalyear_last_day)
                 )
 
-    def write(self, vals):
+    @api.model
+    def _company_fields_to_update(self):
+        return {'fiscalyear_last_day', 'fiscalyear_last_month', 'opening_date'}
+
+    @api.model
+    def _update_company(self, company_id, vals):
         # Amazing workaround: non-stored related fields on company are a BAD idea since the 3 fields
         # must follow the constraint '_check_fiscalyear_last_day'. The thing is, in case of related
         # fields, the inverse write is done one value at a time, and thus the constraint is verified
         # one value at a time... so it is likely to fail.
-        for wiz in self:
-            wiz.company_id.write({
-                'fiscalyear_last_day': vals.get('fiscalyear_last_day') or wiz.company_id.fiscalyear_last_day,
-                'fiscalyear_last_month': vals.get('fiscalyear_last_month') or wiz.company_id.fiscalyear_last_month,
-                'account_opening_date': vals.get('opening_date') or wiz.company_id.account_opening_date,
-            })
-            wiz.company_id.account_opening_move_id.write({
-                'date': fields.Date.from_string(vals.get('opening_date') or wiz.company_id.account_opening_date) - timedelta(days=1),
+        company_fields_to_update = {k: k for k in self._company_fields_to_update()}
+        company_fields_to_update['opening_date'] = 'account_opening_date'
+        company_id.write({
+            company_field: vals[wizard_field] for wizard_field, company_field in company_fields_to_update.items() if wizard_field in vals
+        })
+        opening_date = vals.get('opening_date', company_id.account_opening_date)
+        if opening_date:
+            company_id.account_opening_move_id.write({
+                'date': fields.Date.from_string(opening_date) - timedelta(days=1),
             })
 
-        vals.pop('opening_date', None)
-        vals.pop('fiscalyear_last_day', None)
-        vals.pop('fiscalyear_last_month', None)
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if 'company_id' in vals:
+                company = self.env['res.company'].browse(vals['company_id'])
+                self._update_company(company, vals)
+
+                # we need to keep opening_date in vals since it's a required field otherwise the wizard fails to be created
+                for key in self._company_fields_to_update() - {'opening_date'}:
+                    vals.pop(key, None)
+
+        return super().create(vals_list)
+
+    def write(self, vals):
+        for wiz in self:
+            wiz._update_company(wiz.company_id, vals)
+
+        for key in self._company_fields_to_update():
+            vals.pop(key, None)
+
         return super().write(vals)
 
     def action_save_onboarding_fiscal_year(self):

From fb2a35bdc3d3b5bbd24d98a8bc028cfea162e15a Mon Sep 17 00:00:00 2001
From: "Chrysanthe (chgo)" <chgo@odoo.com>
Date: Tue, 4 Nov 2025 14:48:05 +0000
Subject: [PATCH 525/673] [FIX] web: fix `<SearchBarMenu>` flickering icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit fixes an issue related to the edit favourite filter icon.

Prior to this commit, the edit favourite filter icon used `d-none`
by default and `display: block` on hover.

Since `display: none` removes the element from the layout, the parent
popover resized on hover, causing a flickering effect. This did not occur
for filters with short labels (which had enough room for the icon) or
for long labels (where the label was truncated).

To prevent the flickering, the icon now uses `visibility: hidden/visible`,
which keeps its space in the layout and avoids layout shifts.

task-5237493

closes odoo/odoo#234584

X-original-commit: c09838b494963a5fdbe97a90583629beb96e9f65
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Chrysanthe Gomrée (chgo) <chgo@odoo.com>
---
 .../src/search/search_bar_menu/search_bar_menu.scss    | 10 ++++++++--
 .../src/search/search_bar_menu/search_bar_menu.xml     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss b/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss
index 12f3d0816ca25..e7a2672ec7942 100644
--- a/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss
+++ b/addons/web/static/src/search/search_bar_menu/search_bar_menu.scss
@@ -16,8 +16,14 @@ $o-search-bar-menu-max-width: calc(100vw - #{map-get($spacers, 3) * 2 });
         white-space: nowrap;
     }
 
-    .o_favorite_item:hover i {
-        display: block !important;
+    .o_favorite_item {
+        &:hover {
+            --show-on-hover: visible;
+        }
+
+        i {
+            visibility: var(--show-on-hover, hidden);
+        }
     }
 
     @include media-breakpoint-up(lg) {
diff --git a/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml b/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml
index 98cf46edf2b54..af178e9c84f69 100644
--- a/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml
+++ b/addons/web/static/src/search/search_bar_menu/search_bar_menu.xml
@@ -154,7 +154,7 @@
         >
             <span class="d-flex p-0 align-items-center justify-content-between">
                 <span t-esc="item.description" t-att-title="item.description.length > 15 ? item.description : ''" class="text-truncate flex-grow-1"/>
-                <i class="ms-1 fa fa-pencil d-none"
+                <i class="ms-1 fa fa-pencil"
                     title="Edit favorite"
                     t-on-click.stop="() => this.editFavorite(item.id)"
                 />

From f9ef79b2c32b10e291107030a570038e355e8b3d Mon Sep 17 00:00:00 2001
From: pkgu-odoo <pkgu@odoo.com>
Date: Mon, 10 Nov 2025 07:03:06 +0000
Subject: [PATCH 526/673] [FIX] html_editor: fix traceback when editing website
 appointment page

Steps to reproduce:
- Install website_appointment_sale with demo data
- Start booking an appointment and stop at the `Date & Time` selection page
- Open the website editor and click the `edit` option
- A traceback occurs

Issue:
- A traceback occurs when trying to edit the page,

Error:
`TypeError: blocker.hasAttribute is not a function
    at selection_blocker_predicates`

Cause:
- The `selection_blocker_predicates` function assumed every `blocker` was an
Element and called `blocker.hasAttribute(...)`. When a non-element
node (text, comment, or object) was encountered, the call raised a 'TypeError'.

Reference:
https://github.com/odoo/odoo/blob/700fac2532d2de6abc6f87e30a5b056dcfc109d1/
addons/html_editor/static/src/main/selection_placeholder_plugin.js#L39-L45

Solution:
- Make the function defensive by checking that `blocker` is an instance of
`Element`
- before accessing DOM methods. Non-element nodes are now safely ignored by
 returning `false`.

opw : 5241222

closes odoo/odoo#235381

X-original-commit: af26292dfbd5f12a7f4813af8c30b965a9031373
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Pawan Kumar Gupta (pkgu) <pkgu@odoo.com>
---
 .../static/src/plugins/layout_column_option_plugin.js           | 2 +-
 .../html_editor/static/src/main/selection_placeholder_plugin.js | 2 +-
 .../plugins/toggle_block_plugin/toggle_block_plugin.js          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
index 3c1b31bfe762b..82cfcbac99c11 100644
--- a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
@@ -21,7 +21,7 @@ class LayoutColumnOptionPlugin extends Plugin {
             }
         },
         selection_blocker_predicates: (blocker) => {
-            if (blocker.classList.contains("row")) {
+            if (blocker.nodeType === Node.ELEMENT_NODE && blocker.classList.contains("row")) {
                 return false;
             }
         },
diff --git a/addons/html_editor/static/src/main/selection_placeholder_plugin.js b/addons/html_editor/static/src/main/selection_placeholder_plugin.js
index ef1f1e4dd77a1..5be10030be7c2 100644
--- a/addons/html_editor/static/src/main/selection_placeholder_plugin.js
+++ b/addons/html_editor/static/src/main/selection_placeholder_plugin.js
@@ -37,7 +37,7 @@ export class SelectionPlaceholderPlugin extends Plugin {
             }
         },
         selection_blocker_predicates: (blocker) => {
-            if (blocker.hasAttribute(PLACEHOLDER_ATTRIBUTE) || !isBlock(blocker)) {
+            if ((blocker.nodeType === Node.ELEMENT_NODE && blocker.hasAttribute(PLACEHOLDER_ATTRIBUTE)) || !isBlock(blocker)) {
                 return false;
             } else if (isNotEditableNode(blocker)) {
                 return true;
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
index b91de46b00d8d..c7a6d3a967c3f 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
@@ -53,7 +53,7 @@ export class ToggleBlockPlugin extends Plugin {
         move_node_blacklist_selectors: `${toggleSelector} ${titleSelector} *`,
         selection_blocker_predicates: (blocker) => {
             // Prevent the insertion of selection placeholders around toggle blocks.
-            if (blocker.dataset.embedded === "toggleBlock") {
+            if (blocker.nodeType === Node.ELEMENT_NODE && blocker.dataset.embedded === "toggleBlock") {
                 return false;
             }
         },

From f29da6ba10546985fdd4f79b143e6e0181a192ac Mon Sep 17 00:00:00 2001
From: adch-odoo <adch@odoo.com>
Date: Tue, 14 Oct 2025 09:27:08 +0000
Subject: [PATCH 527/673] [FIX] html_editor: removeFormat to clear text color
 classes from list

Steps to reproduce:

- Open the Todo and create a new list.
- Type some text and press `Ctrl + A` to select all.
- Apply a text color class using the color picker.
- Remove formatting from the selected content.

Before this commit:

- When a color was applied through classes inside list items and removeFormat
was triggered, the color classes were not removed.

After this commit:

- All text color styles and classes are removed when using `removeFormat`.

task-5166472

closes odoo/odoo#235306

X-original-commit: 24992d001e586312e91e6671dc386420eb662be9
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Adnan Chaudhary (adch) <adch@odoo.com>
---
 .../static/src/main/list/list_plugin.js       | 18 ++++--
 .../static/tests/list/color_list.test.js      | 57 +++++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/addons/html_editor/static/src/main/list/list_plugin.js b/addons/html_editor/static/src/main/list/list_plugin.js
index b6e8ac036cc16..fc53ddf2b5442 100644
--- a/addons/html_editor/static/src/main/list/list_plugin.js
+++ b/addons/html_editor/static/src/main/list/list_plugin.js
@@ -2,6 +2,7 @@ import { Plugin } from "@html_editor/plugin";
 import { closestBlock, isBlock } from "@html_editor/utils/blocks";
 import {
     removeClass,
+    removeStyle,
     toggleClass,
     unwrapContents,
     wrapInlinesInBlocks,
@@ -35,7 +36,7 @@ import { compareListTypes, createList, insertListAfter, isListItem } from "./uti
 import { callbacksForCursorUpdate } from "@html_editor/utils/selection";
 import { withSequence } from "@html_editor/utils/resource";
 import { FONT_SIZE_CLASSES, getFontSizeOrClass, getHtmlStyle } from "@html_editor/utils/formatting";
-import { getTextColorOrClass } from "@html_editor/utils/color";
+import { getTextColorOrClass, TEXT_CLASSES_REGEX } from "@html_editor/utils/color";
 import { baseContainerGlobalSelector } from "@html_editor/utils/base_container";
 import { ListSelector } from "./list_selector";
 import { reactive } from "@odoo/owl";
@@ -1098,9 +1099,14 @@ export class ListPlugin extends Plugin {
                         (n) => isElement(n) && closestElement(n, "LI") === listItem
                     ),
                 ]) {
-                    removeClass(node, "o_default_color");
+                    // Remove any color-related classes.
+                    const classesToRemove = [...node.classList].filter(
+                        (cls) => cls === "o_default_color" || TEXT_CLASSES_REGEX.test(cls)
+                    );
+                    removeClass(node, ...classesToRemove);
+
                     if (node.style.color) {
-                        node.style.color = "";
+                        removeStyle(node, "color");
                     }
                 }
 
@@ -1111,7 +1117,11 @@ export class ListPlugin extends Plugin {
                         list.classList.add("o_default_color");
                     }
                 }
-            } else if (color === "" && listItem.style.color) {
+            } else if (
+                color === "" &&
+                (listItem.style.color ||
+                    [...listItem.classList].some((cls) => TEXT_CLASSES_REGEX.test(cls)))
+            ) {
                 const textNodes = targetedNodes.filter(
                     (n) => isVisibleTextNode(n) && closestElement(n, "li") === listItem
                 );
diff --git a/addons/html_editor/static/tests/list/color_list.test.js b/addons/html_editor/static/tests/list/color_list.test.js
index 2110f513f8e2b..122b499ac5ce8 100644
--- a/addons/html_editor/static/tests/list/color_list.test.js
+++ b/addons/html_editor/static/tests/list/color_list.test.js
@@ -7,6 +7,7 @@ import {
     toggleUnorderedList,
 } from "../_helpers/user_actions";
 import { execCommand } from "../_helpers/userCommands";
+import { unformat } from "../_helpers/format";
 
 test("should apply color to completely selected list item", async () => {
     await testEditor({
@@ -167,6 +168,62 @@ test("should remove color from partially selected list item", async () => {
     });
 });
 
+test("should remove color from fully selected list item with nested list", async () => {
+    await testEditor({
+        contentBefore: unformat(`
+            <ol>
+                <li class="text-o-color-1">
+                    <p>[abc</p>
+                    <ol class="o_default_color">
+                        <li class="text-o-color-1">def</li>
+                    </ol>
+                </li>
+                <li class="text-o-color-1">ghi]</li>
+            </ol>
+        `),
+        stepFunction: (editor) => execCommand(editor, "removeFormat"),
+        contentAfterEdit: unformat(`
+            <ol>
+                <li>
+                    <p>[abc</p>
+                    <ol>
+                        <li>def</li>
+                    </ol>
+                </li>
+                <li>ghi]</li>
+            </ol>
+        `),
+    });
+});
+
+test("should remove color from partially selected text inside list item", async () => {
+    await testEditor({
+        contentBefore: unformat(`
+            <ol>
+                <li class="text-o-color-1">
+                    <p>abc</p>
+                    <ol class="o_default_color">
+                        <li class="text-o-color-1">d[e]f</li>
+                    </ol>
+                </li>
+            </ol>
+        `),
+        stepFunction: (editor) => execCommand(editor, "removeFormat"),
+        contentAfterEdit: unformat(`
+            <ol>
+                <li class="text-o-color-1">
+                    <p>abc</p>
+                    <ol class="o_default_color">
+                        <li class="text-o-color-1">
+                            d<font class="o_default_color">[e]</font>f
+                        </li>
+                    </ol>
+                </li>
+            </ol>
+        `),
+    });
+});
+
 test("should change color of a list item", async () => {
     await testEditor({
         contentBefore:

From b7bdeef70c188b628050c5659fc73ace382ebb7b Mon Sep 17 00:00:00 2001
From: adch-odoo <adch@odoo.com>
Date: Tue, 7 Oct 2025 06:14:21 +0000
Subject: [PATCH 528/673] [FIX] html_editor: correctly focus image caption
 input

Before this commit:

- Commit [1] changed `selectionchange` listener to `addGlobalDomListener`.
As result, calling this.captionInput.el.focus() in caption.js triggered
`selectionchange` event. Since `<figure>` is contenteditable="false", the
`fixSelectionOnEditableRootGeneric` method moved the selection to
sibling `<div>`, causing the cursor to jump unexpectedly.

After this commit:

- The selection is explicitly set at the end of the `<figure>` when adding
caption, preventing the cursor from moving to a sibling editable `<div>`.

[1] - https://github.com/odoo/odoo/commit/9a3abd5f9e5658b72b8a5d2fa0384bdbb580873f

task-5122745

X-original-commit: 2acd938e9ccbc075ba82d6c4156e35abbdf80eb8
Part-of: odoo/odoo#235305
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Adnan Chaudhary (adch) <adch@odoo.com>
---
 .../plugins/caption_plugin/caption_plugin.js                  | 4 ++++
 addons/html_editor/static/tests/caption.test.js               | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
index 4b3cd6bdef1db..1a58199b5ca8d 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
@@ -140,6 +140,10 @@ export class CaptionPlugin extends Plugin {
             // => <figure><img/></figure></p>
             // but still <p><a><figure><img/></figure></p>
             unwrapContents(figure.parentElement);
+            // Figure is contenteditable="false", so selection would jump
+            // to the nearest editable sibling <div>. Setting cursor at
+            // the end ensures caption input receives focus correctly.
+            this.dependencies.selection.setCursorEnd(figure);
         }
         // Set the caption and its ID.
         const captionId = this.getCaptionId();
diff --git a/addons/html_editor/static/tests/caption.test.js b/addons/html_editor/static/tests/caption.test.js
index e43abca1ab575..e132a698a798b 100644
--- a/addons/html_editor/static/tests/caption.test.js
+++ b/addons/html_editor/static/tests/caption.test.js
@@ -271,6 +271,7 @@ test("leaving the caption persists its value", async () => {
             const heading = queryOne("h1");
             await click(heading);
             expect(editor.document.activeElement).not.toBe(input);
+            editor.shared.selection.setCursorStart(heading);
             await animationFrame(); // Wait for the selection to change.
         },
         contentAfterEdit: unformat(
@@ -310,6 +311,7 @@ test("can't use the powerbox in a caption", async () => {
             await expectElementCount(".o-we-powerbox", 0);
             const heading = queryOne("h1");
             await click(heading);
+            editor.shared.selection.setCursorStart(heading);
             await animationFrame(); // Wait for the selection to change.
         },
         contentAfter: unformat(

From c8e8111c616bcc25515e46670f09c51e694c9f4a Mon Sep 17 00:00:00 2001
From: adch-odoo <adch@odoo.com>
Date: Thu, 30 Oct 2025 08:41:53 +0000
Subject: [PATCH 529/673] [FIX] html_editor: focus description input in image
 description popover

Purpose of this commit:

- When the image description popover opens, the cursor automatically
focuses on the description input field by default.

task-5122745

closes odoo/odoo#235305

X-original-commit: cc9857f242e99772143349679f3f19959b4e97bf
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Adnan Chaudhary (adch) <adch@odoo.com>
---
 .../static/src/main/media/image_description.js     |  7 ++++++-
 .../static/src/main/media/image_description.xml    |  1 +
 addons/html_editor/static/tests/image.test.js      | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/html_editor/static/src/main/media/image_description.js b/addons/html_editor/static/src/main/media/image_description.js
index 96b57bb0c8978..004e69d483d0d 100644
--- a/addons/html_editor/static/src/main/media/image_description.js
+++ b/addons/html_editor/static/src/main/media/image_description.js
@@ -1,4 +1,4 @@
-import { Component } from "@odoo/owl";
+import { Component, useEffect, useRef } from "@odoo/owl";
 import { Dialog } from "@web/core/dialog/dialog";
 import { toolbarButtonProps } from "@html_editor/main/toolbar/toolbar";
 import { useHotkey } from "@web/core/hotkeys/hotkey_hook";
@@ -32,6 +32,11 @@ export class ImageDescriptionPopover extends Component {
             description: this.props.description,
             tooltip: this.props.tooltip,
         };
+        this.inputRef = useRef("description");
+        useEffect(
+            (el) => el?.focus(),
+            () => [this.inputRef.el]
+        );
         useHotkey("escape", () => this.props.close());
     }
 
diff --git a/addons/html_editor/static/src/main/media/image_description.xml b/addons/html_editor/static/src/main/media/image_description.xml
index 4263f00f00038..ada6a79051413 100644
--- a/addons/html_editor/static/src/main/media/image_description.xml
+++ b/addons/html_editor/static/src/main/media/image_description.xml
@@ -8,6 +8,7 @@
     <t t-name="html_editor.ImageDescriptionPopover">
         <div class="o-we-image-description-popover p-3">
             <input
+                t-ref="description"
                 type="text"
                 t-model="this.state.description"
                 placeholder="Description"
diff --git a/addons/html_editor/static/tests/image.test.js b/addons/html_editor/static/tests/image.test.js
index d4e27235d84ec..4e8d5e3ee24a3 100644
--- a/addons/html_editor/static/tests/image.test.js
+++ b/addons/html_editor/static/tests/image.test.js
@@ -104,6 +104,20 @@ test("can undo a shape", async () => {
     expect("img").not.toHaveClass("rounded");
 });
 
+test("focus description input by default when image description popover opens", async () => {
+    await setupEditor(`
+        <img src="${base64Img}">
+    `);
+    await click("img");
+    await waitFor(".o-we-toolbar");
+
+    await click(".o-we-toolbar .btn-group[name='image_description'] button");
+    await animationFrame();
+
+    expect(".o-we-image-description-popover").toHaveCount(1);
+    expect("input[name='description']").toBeFocused();
+});
+
 test("can add an image description & tooltip", async () => {
     await setupEditor(`
         <img src="${base64Img}">

From 3495240a60378292cc11fa281095608824b4c956 Mon Sep 17 00:00:00 2001
From: adch-odoo <adch@odoo.com>
Date: Tue, 7 Oct 2025 08:47:27 +0000
Subject: [PATCH 530/673] [FIX] html_editor: make caption input background
 transparent

Purpose of this commit:

- Set the default background of inputs inside `<figcaption>` to transparent.
This prevents them from appearing dark gray (rgb(59,59,59)) in caption.

task-5122745

closes odoo/odoo#235340

X-original-commit: 2b0aca51d1842e24a8f4dc5de8996425693d7552
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Adnan Chaudhary (adch) <adch@odoo.com>
---
 .../others/embedded_components/backend/caption/caption.scss   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/html_editor/static/src/others/embedded_components/backend/caption/caption.scss b/addons/html_editor/static/src/others/embedded_components/backend/caption/caption.scss
index ba73aebcae9e6..b58086dfd16d4 100644
--- a/addons/html_editor/static/src/others/embedded_components/backend/caption/caption.scss
+++ b/addons/html_editor/static/src/others/embedded_components/backend/caption/caption.scss
@@ -1,3 +1,7 @@
 figcaption {
     color: #9e9d9a;
+
+    input {
+        background-color: transparent;
+    }
 }

From 36c0cc0f648f8e26cd6ca65d73c39eb5147a2740 Mon Sep 17 00:00:00 2001
From: dvsh-odoo <dvsh@odoo.com>
Date: Tue, 15 Jul 2025 12:48:03 +0000
Subject: [PATCH 531/673] [FIX] point_of_sale: redirect QR scan directly to
 ticket validation screen

Before:
QR scan(self invoicing) redirected to /pos/ticket with pre-filled data
but missing ticket code.

After:
Now directly redirects to the validation screen or invoice
if customer is already registered.

closes odoo/odoo#235269

X-original-commit: f0f920bd180c1f8805673dc6d1af3e5cdc9849a6
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Devmitra Vedbandhu Sharma (dvsh) <dvsh@odoo.com>
---
 addons/point_of_sale/controllers/main.py                    | 6 ++----
 .../src/app/screens/receipt_screen/receipt/order_receipt.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 4e0c95883f56b..2f98e0396f319 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -152,10 +152,8 @@ def invoice_request_screen(self, **kwargs):
         elif request.httprequest.method == 'GET':
             if kwargs.get('order_uuid'):
                 order = self.env['pos.order'].sudo().search([('uuid', '=', kwargs['order_uuid'])], limit=1)
-                form_values.update({
-                    'pos_reference': order.pos_reference if order.exists() else '',
-                    'date_order': order.date_order.strftime("%Y-%m-%d") if order.exists() else '',
-                })
+                if order:
+                    return request.redirect('/pos/ticket/validate?access_token=%s' % (order.access_token))
 
         return request.render("point_of_sale.ticket_request_with_code", {
             'errors': errors,
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js
index 83b1c9008a785..040afa492f996 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js
+++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js
@@ -35,7 +35,7 @@ export class OrderReceipt extends Component {
 
     get qrCode() {
         const baseUrl = this.order.config._base_url;
-        const url = `${baseUrl}/pos/ticket?order_uuid=${this.order.uuid}`;
+        const url = `${baseUrl}/pos/ticket/validate?access_token=${this.order.access_token}`;
         return generateQRCodeDataUrl(url);
     }
 

From 5428723d2144b026ea833149385296d0f46b86fb Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Wed, 12 Nov 2025 10:16:32 +0100
Subject: [PATCH 532/673] [FIX] setup: websocket-client version on iot box

Version 1.6 could lead to issues when receiving long messages
in the channel. We removed the version marker in order to get
the latest version.

closes odoo/odoo#235377

Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 setup/iot_box_builder/configuration/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/iot_box_builder/configuration/requirements.txt b/setup/iot_box_builder/configuration/requirements.txt
index a9aba755c47f3..8c3218a499219 100644
--- a/setup/iot_box_builder/configuration/requirements.txt
+++ b/setup/iot_box_builder/configuration/requirements.txt
@@ -13,4 +13,4 @@ schedule==1.2.1; sys_platform == "win32"
 
 # The following requirements are needed on every platforms:
 python-escpos==3.1
-websocket-client==1.6.3
+websocket-client

From a8e0d6d3edb0678b05cbcf4c40ce9e1d41e20465 Mon Sep 17 00:00:00 2001
From: mano-odoo <mano@odoo.com>
Date: Wed, 12 Nov 2025 15:50:26 +0100
Subject: [PATCH 533/673] [IMP] web: improve date time picker week days colors

In commit[1] the days and week cells got a background, however in
darkmode it breaks the elevation. Since neither bg-200 nor bg-400
provides enough contrast it's better to match the background color of
the popover in darkmode.

task-5238000

[1]: odoo/odoo@f65d9a8c87b44558679bf5c6351e439f6ec2e990

closes odoo/odoo#235351

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../web/static/src/core/datetime/datetime_picker.dark.scss | 7 +++++++
 addons/web/static/src/core/datetime/datetime_picker.scss   | 4 ++++
 addons/web/static/src/core/datetime/datetime_picker.xml    | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 addons/web/static/src/core/datetime/datetime_picker.dark.scss

diff --git a/addons/web/static/src/core/datetime/datetime_picker.dark.scss b/addons/web/static/src/core/datetime/datetime_picker.dark.scss
new file mode 100644
index 0000000000000..0817184e20404
--- /dev/null
+++ b/addons/web/static/src/core/datetime/datetime_picker.dark.scss
@@ -0,0 +1,7 @@
+// = DateTime Picker
+// ============================================================================
+// No CSS hacks, variables overrides only
+
+.o_datetime_picker {
+    --DateTimePicker__day-week-cell-bg: #{$gray-300};
+}
diff --git a/addons/web/static/src/core/datetime/datetime_picker.scss b/addons/web/static/src/core/datetime/datetime_picker.scss
index 3f7ec1ffad8b3..f6f1bff6acb74 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.scss
+++ b/addons/web/static/src/core/datetime/datetime_picker.scss
@@ -86,6 +86,10 @@
         }
     }
 
+    .o_day_of_week_cell, .o_week_number_cell {
+        background-color: var(--DateTimePicker__day-week-cell-bg, #{$gray-100});
+    }
+
     .o_week_number_cell {
         font-variant: tabular-nums;
     }
diff --git a/addons/web/static/src/core/datetime/datetime_picker.xml b/addons/web/static/src/core/datetime/datetime_picker.xml
index 04fa270826e7f..ae315b272e29c 100644
--- a/addons/web/static/src/core/datetime/datetime_picker.xml
+++ b/addons/web/static/src/core/datetime/datetime_picker.xml
@@ -9,7 +9,7 @@
                 >
                     <t t-foreach="month.daysOfWeek" t-as="dayOfWeek" t-key="dayOfWeek[0]">
                         <div
-                            class="o_day_of_week_cell bg-100 fw-bolder d-flex align-items-center justify-content-center"
+                            class="o_day_of_week_cell fw-bolder d-flex align-items-center justify-content-center"
                             t-att-title="dayOfWeek[1]"
                         >
                             <div class="text-nowrap overflow-hidden" t-esc="props.daysOfWeekFormat === 'narrow' ? dayOfWeek[2] : dayOfWeek[0]"/>
@@ -18,7 +18,7 @@
                     <t t-foreach="month.weeks" t-as="week" t-key="week.number">
                         <t t-if="props.showWeekNumbers">
                             <div
-                                class="o_week_number_cell d-flex justify-content-end align-items-center pe-3 bg-100 fw-bolder"
+                                class="o_week_number_cell d-flex justify-content-center align-items-center fw-bolder"
                                 t-esc="week.number"
                             />
                         </t>

From 10586fe9b041994fc7b1af7f28139f82ec1654c9 Mon Sep 17 00:00:00 2001
From: abhk-odoo <abhk@odoo.com>
Date: Mon, 3 Nov 2025 06:25:43 +0000
Subject: [PATCH 534/673] [FIX] pos_online_payment_self_order: remove
 unnecessary test flag from tour

In this commit:
- Removed the `test: true` flag from the `test_kiosk_cart_restore_and_cancel`
tour.
- The flag is not required for tours and can cause issues when running in
debug mode.
- This issue only occurs in local environments when debug mode is enabled.
- After this fix, no issue is generated in debug mode.

closes odoo/odoo#234819

X-original-commit: 6cc6ab4bbde9b3152cd94744ab952a9f9f84499c
Signed-off-by: Adrien Guilliams (adgu) <adgu@odoo.com>
Signed-off-by: Abhishek Khant (abhk) <abhk@odoo.com>
---
 .../tests/tours/pos_self_order_mobile_online_payment_tour.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/pos_online_payment_self_order/static/tests/tours/pos_self_order_mobile_online_payment_tour.js b/addons/pos_online_payment_self_order/static/tests/tours/pos_self_order_mobile_online_payment_tour.js
index 83e0a00936395..2b2cf14d49215 100644
--- a/addons/pos_online_payment_self_order/static/tests/tours/pos_self_order_mobile_online_payment_tour.js
+++ b/addons/pos_online_payment_self_order/static/tests/tours/pos_self_order_mobile_online_payment_tour.js
@@ -69,7 +69,6 @@ registry
     });
 
 registry.category("web_tour.tours").add("test_kiosk_cart_restore_and_cancel", {
-    test: true,
     steps: () => [
         Utils.clickBtn("Order Now"),
         ProductPage.clickProduct("Coca-Cola"),

From ca24c1b57d14f8fe34ee6ba477a4d2aa9eb111b9 Mon Sep 17 00:00:00 2001
From: Sanjay Sharma <shsa@odoo.com>
Date: Mon, 27 Jan 2025 13:36:00 +0000
Subject: [PATCH 535/673] [IMP] base: ensure public user exists and prevent
 deletion

Steps to Reproduce:
1. Create a database without installing the Website module.
2. Navigate to archived users and delete the "Public User."
3. Attempt to log in to the database from another browser or incognito
    mode.
4. An internal server error occurs because the public user does not
    exist, making the login page inaccessible.

Issue:
Previously, it was possible to delete the public user, leading to an
internal server error due to its absence, which prevented public access
to the login page.

Solution:
- Implemented a restriction to prevent the deletion of the public user,
    similar to portal and default users.
- Added a test case to validate this functionality and ensure the
    public user cannot be deleted.

task-4423568

closes odoo/odoo#234285

X-original-commit: 0d5cf53197fce5fe60accf8b59aa63007ea8b6fa
Signed-off-by: Raphael Collet <rco@odoo.com>
Signed-off-by: Sanjay Sharma (shsa) <shsa@odoo.com>
---
 odoo/addons/base/models/res_users.py     |  3 +++
 odoo/addons/base/tests/test_res_users.py | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index 60e372afad1bf..1fd6c51dd979c 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -649,6 +649,7 @@ def write(self, vals):
     @api.ondelete(at_uninstall=True)
     def _unlink_except_master_data(self):
         portal_user_template = self.env.ref('base.template_portal_user_id', False)
+        public_user = self.env.ref('base.public_user', False)
         if SUPERUSER_ID in self.ids:
             raise UserError(_('You can not remove the admin user as it is used internally for resources created by Odoo (updates, module installation, ...)'))
         user_admin = self.env.ref('base.user_admin', raise_if_not_found=False)
@@ -657,6 +658,8 @@ def _unlink_except_master_data(self):
         self.env.registry.clear_cache()
         if portal_user_template and portal_user_template in self:
             raise UserError(_('Deleting the template users is not allowed. Deleting this profile will compromise critical functionalities.'))
+        if public_user and public_user in self:
+            raise UserError(_("Deleting the public user is not allowed. Deleting this profile will compromise critical functionalities."))
 
     @api.model
     def name_search(self, name='', domain=None, operator='ilike', limit=100):
diff --git a/odoo/addons/base/tests/test_res_users.py b/odoo/addons/base/tests/test_res_users.py
index 6bc84478b0542..d63a71a7d2fd5 100644
--- a/odoo/addons/base/tests/test_res_users.py
+++ b/odoo/addons/base/tests/test_res_users.py
@@ -222,6 +222,19 @@ def test_deactivate_portal_users_archive_and_remove(self):
         self.assertTrue(portal_partner_2.exists(), 'Should have kept the partner')
         self.assertEqual(asked_deletion_2.state, 'fail', 'Should have marked the deletion as failed')
 
+    def test_delete_public_user(self):
+        """Test that the public user cannot be deleted."""
+        public_user = self.env.ref('base.public_user')
+        public_partner = public_user.partner_id
+
+        # Attempt to delete the public user
+        with self.assertRaises(UserError, msg="Public user should not be deletable"):
+            public_user.unlink()
+
+        # Ensure the public user still exists and is inactive
+        self.assertTrue(public_user.exists() and not public_user.active, "Public user should still exist and be inactive")
+        self.assertTrue(public_partner.exists() and not public_partner.active, "Public partner should still exist and be inactive")
+
     def test_user_home_action_restriction(self):
         test_user = new_test_user(self.env, 'hello world')
 

From 90cefc8ae675aa2d65261d9fe43c0f768bce3a98 Mon Sep 17 00:00:00 2001
From: "lase@odoo.com" <lase@odoo.com>
Date: Thu, 23 Oct 2025 09:50:17 +0200
Subject: [PATCH 536/673] [IMP] stock, product{,_barcodelookup}: allow the user
 to disable the barcodelookup

Issue:

Currently, the `product_barcodelookup` feature is disabled only when no
API key is configured:
https://github.com/odoo/enterprise/blob/86937d9c974125d60f6e2e9dc6bf0b048e20e489/product_barcodelookup/models/product_template.py#L199-L203
https://github.com/odoo/enterprise/blob/86937d9c974125d60f6e2e9dc6bf0b048e20e489/product_barcodelookup/tools/barcode_lookup_service.py#L7-L11
FHowever, for SaaS users, the API key is hardcoded, which makes it
impossible to disable the feature without uninstalling the module.

Improvement:

The purpose of this commit is to add a boolean setting that allows users
to explicitly disable the barcode lookup feature by proposing to
uninstall the module for them.

opw-5096468

closes odoo/odoo#232794

Related: odoo/enterprise#97936
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
---
 addons/product/models/res_config_settings.py       |  1 +
 addons/product/views/res_config_settings_views.xml |  8 ++++++++
 addons/stock/models/res_config_settings.py         | 10 ++++++++++
 addons/stock/views/res_config_settings_views.xml   |  2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/addons/product/models/res_config_settings.py b/addons/product/models/res_config_settings.py
index 9c3bc881feac2..18d93219391a2 100644
--- a/addons/product/models/res_config_settings.py
+++ b/addons/product/models/res_config_settings.py
@@ -9,6 +9,7 @@ class ResConfigSettings(models.TransientModel):
     group_uom = fields.Boolean("Units of Measure & Packagings", implied_group='uom.group_uom')
     group_product_variant = fields.Boolean("Variants", implied_group='product.group_product_variant')
     module_loyalty = fields.Boolean("Promotions, Coupons, Gift Card & Loyalty Program")
+    module_product_barcodelookup = fields.Boolean("Barcode Database")
     group_product_pricelist = fields.Boolean("Pricelists",
         implied_group='product.group_product_pricelist')
     product_weight_in_lbs = fields.Selection([
diff --git a/addons/product/views/res_config_settings_views.xml b/addons/product/views/res_config_settings_views.xml
index 230b824a056d8..d6d38d91d42b5 100644
--- a/addons/product/views/res_config_settings_views.xml
+++ b/addons/product/views/res_config_settings_views.xml
@@ -15,6 +15,14 @@
                         </setting>
                     </block>
                 </xpath>
+                <setting id="module_auth_oauth" position="after">
+                    <setting id="process_barcode_lookup_setting" string="Barcode Database" documentation="https://www.barcodelookup.com/api-documentation">
+                        <field name="module_product_barcodelookup" widget="upgrade_boolean"/>
+                        <span id="barcodelookup_description" class="text-muted">
+                            Create products by scanning using <a href="https://www.barcodelookup.com" target="_blank">barcodelookup.com</a>
+                        </span>
+                    </setting>
+                </setting>
             </field>
         </record>
 </odoo>
diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py
index 272840c6b6975..e66ae2e6842a2 100644
--- a/addons/stock/models/res_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -84,6 +84,16 @@ def _onchange_stock_confirmation_fields(self):
         if self.stock_text_confirmation and self.stock_confirmation_type == 'sms':
             self.module_stock_sms = True
 
+    @api.onchange('module_product_barcodelookup')
+    def onchange_module_product_barcodelookup(self):
+        if not self.module_product_barcodelookup:
+            self.module_stock_barcode_barcodelookup = False
+
+    @api.onchange('module_stock_barcode_barcodelookup')
+    def onchange_module_stock_barcode_barcodelookup(self):
+        if self.module_stock_barcode_barcodelookup:
+            self.module_product_barcodelookup = True
+
     @api.onchange('group_stock_adv_location')
     def onchange_adv_location(self):
         if self.group_stock_adv_location and not self.group_stock_multi_locations:
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index fff741003d911..031c8a3b54c79 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -48,7 +48,7 @@
                                 <field name="module_stock_barcode" widget="upgrade_boolean"/>
                             </setting>
                             <setting id="process_stock_barcodelookup" string="Stock Barcode Database" help="" documentation="https://www.barcodelookup.com/api-documentation">
-                                <field name="module_stock_barcode_barcodelookup" placeholder="e.g. d7vctmiv2rwgenebha8bxq7irooudn"/>
+                                <field name="module_stock_barcode_barcodelookup" widget="upgrade_boolean"/>
                                 <span class="text-muted">
                                     Create products easily by scanning using <a href="https://www.barcodelookup.com" target="_blank">barcodelookup.com</a> in barcode.
                                 </span>

From 626532b01cf7d015c01db68a8389d3412950ce02 Mon Sep 17 00:00:00 2001
From: Bastien PIERRE <ipb@odoo.com>
Date: Mon, 10 Nov 2025 14:14:32 +0100
Subject: [PATCH 537/673] [IMP] web: add __formatted_display_name in
 web_name_search results

Before this commit, the __formatted_display_name returned in web_name_search
when the specifications contain only display_name. If any other field was
requested, the __formatted_display_name wasn't put in the result.

Now, the __formatted_display_name is added to the result of web_name_search
when display_name is in the specifications.

closes odoo/odoo#235113

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/web/models/models.py              |  7 ++++++-
 addons/web/tests/test_web_search_read.py | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/web/models/models.py b/addons/web/models/models.py
index f6537022f1b9c..7511b2ff0344f 100644
--- a/addons/web/models/models.py
+++ b/addons/web/models/models.py
@@ -46,7 +46,12 @@ def web_name_search(self, name, specification, domain=None, operator='ilike', li
         if len(specification) == 1 and 'display_name' in specification:
             return [{'id': id, 'display_name': name, '__formatted_display_name': self.with_context(formatted_display_name=True).browse(id).display_name} for id, name in id_name_pairs]
         records = self.browse([id for id, _ in id_name_pairs])
-        return records.web_read(specification)
+        results = records.with_context(formatted_display_name=True).web_read(specification)
+        if 'display_name' in specification:
+            for i, result in enumerate(results):
+                result["__formatted_display_name"] = result.get("display_name")
+                result["display_name"] = records[i].display_name
+        return results
 
     @api.model
     @api.readonly
diff --git a/addons/web/tests/test_web_search_read.py b/addons/web/tests/test_web_search_read.py
index 43d9e22928e6e..41ccc380c2ca2 100644
--- a/addons/web/tests/test_web_search_read.py
+++ b/addons/web/tests/test_web_search_read.py
@@ -40,3 +40,13 @@ def test_web_name_search(self):
         result = self.env["res.partner"].web_name_search("", {"display_name": {}})[0]
         self.assertTrue("display_name" in result)
         self.assertTrue("__formatted_display_name" in result)
+
+        result = self.env["res.partner"].web_name_search("", {"display_name": {}, "street": {}})[0]
+        self.assertTrue("display_name" in result)
+        self.assertTrue("street" in result)
+        self.assertTrue("__formatted_display_name" in result)
+
+        result = self.env["res.partner"].web_name_search("", {"street": {}})[0]
+        self.assertTrue("display_name" not in result)
+        self.assertTrue("street" in result)
+        self.assertTrue("__formatted_display_name" not in result)

From ae1072d8956f2686f5c2eb74b5c7df074df6da7c Mon Sep 17 00:00:00 2001
From: Paolo Gatti <pgi@odoo.com>
Date: Fri, 31 Oct 2025 12:00:39 +0000
Subject: [PATCH 538/673] [FIX] l10n_it_edi_ndd: Fix Document Type translations

Simplified and fixed labels and labels translations.

closes odoo/odoo#235421

Ref: https://help.fattureincloud.it/help/articolo/544-crea-autofattura-elettronica
Ref: https://fex-app.com/FatturaElettronica/FatturaElettronicaBody/DatiGenerali/DatiGeneraliDocumento/TipoDocumento
X-original-commit: a052df197520885e0733441329d7e90827622c10
Signed-off-by: Paolo Gatti (pgi) <pgi@odoo.com>
Signed-off-by: Maximilien La Barre (malb) <malb@odoo.com>
---
 .../data/l10n_it.document.type.csv            | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/l10n_it_edi/data/l10n_it.document.type.csv b/addons/l10n_it_edi/data/l10n_it.document.type.csv
index b6e5bbf3f0939..086bd93d3cfbf 100644
--- a/addons/l10n_it_edi/data/l10n_it.document.type.csv
+++ b/addons/l10n_it_edi/data/l10n_it.document.type.csv
@@ -1,23 +1,23 @@
 "id","code","name","name@it"
-"l10n_it_document_type_01","TD01","Invoice (Immediate or Accompanying if <DatiTrasporto> or <DatiDDT> are completed)","Fattura (Immediata o di accompagnamento se <DatiTrasporto> o <DatiDDT> sono stati compilati)"
-"l10n_it_document_type_02","TD02","Deposit/advance on invoice","Deposito/anticipo su fattura"
-"l10n_it_document_type_03","TD03","Deposit/advance on parcel","Deposito/anticipo sulla parcella"
+"l10n_it_document_type_01","TD01","Invoice","Fattura"
+"l10n_it_document_type_02","TD02","Deposit/advance on invoice","Acconto/anticipo su fattura"
+"l10n_it_document_type_03","TD03","Deposit/advance on vendor bill","Acconto/anticipo su fattura fornitore"
 "l10n_it_document_type_04","TD04","Credit note","Nota di credito"
 "l10n_it_document_type_05","TD05","Debit note","Nota di debito"
-"l10n_it_document_type_06","TD06","Parcel","Parcella"
+"l10n_it_document_type_06","TD06","Vendor bill","Fattura fornitore"
 "l10n_it_document_type_07","TD07","Simplified invoice","Fattura semplificata"
 "l10n_it_document_type_08","TD08","Simplified credit note","Nota di credito semplificata"
 "l10n_it_document_type_09","TD09","Simplified debit note","Nota di debito semplificata"
-"l10n_it_document_type_16","TD16","Internal reverse charge self-invoice (Article 17 of Presidential Decree no. 633/72 for invoices with Natura subcodes 'N6')","Autofattura interna in reverse charge (art. 17 DPR n. .633/72 per fatture con sottocodice Natura 'N6')"
-"l10n_it_document_type_17","TD17","Self-invoice for purchases of foreign services (both within and outside the EU) - Alternative to esterometro","Autofattura per acquisti di servizi all'estero (sia all'interno che all'esterno dell'UE) - Alternativa all'esterometro"
-"l10n_it_document_type_18","TD18","Self-invoice for the purchase of intra-community goods - Alternative to esterometro","Autofattura per l'acquisto di beni intracomunitari - Alternativa all'esterometro"
-"l10n_it_document_type_19","TD19","Self-invoice for foreign goods (both intra and non-EU) already present in Italy (Article 17 paragraph 2 of Presidential Decree 633/72) - Alternative to esterometro","Autofattura per merci estere (sia intra che extra UE) già presenti in Italia (art. 17 comma 2 del DPR 633/72) - Alternativa all'esterometro"
-"l10n_it_document_type_20","TD20","Self-invoice Report (ex art.6 c8 471/97 or art.46 c5 331/93), or for invoice not received or for a lower amount","Rapporto di autofattura (ex art.6 c8 471/97 o art.46 c5 331/93), oppure per fattura non ricevuta o di importo inferiore"
-"l10n_it_document_type_21","TD21","Self-invoice for ceiling clearance","Autofattura per l'altezza del soffitto"
-"l10n_it_document_type_22","TD22","Self-invoice for extraction of goods from VAT warehouse without VAT liability","Autofattura per l'estrazione di beni dal deposito IVA senza assoggettamento ad IVA"
-"l10n_it_document_type_23","TD23","Self-invoice for extraction of goods from VAT warehouse with VAT liability","Autofattura per l'estrazione di beni dal deposito IVA con IVA a debito"
-"l10n_it_document_type_24","TD24","Deferred invoice (Article 21, paragraph 4, third period letter to Presidential Decree 633/72)","Fattura differita (art. 21, comma 4, terzo periodo del DPR 633/72)"
-"l10n_it_document_type_25","TD25","Deferred invoice (Article 21, paragraph 4, third period, letter b (Dropshipping))","Fattura differita [articolo 21, comma 4, terzo periodo, lettera b (Dropshipping)]"
-"l10n_it_document_type_26","TD26","Transfer of depreciable assets and for internal transfers (ex art.36 Presidential Decree 633/72)","Cessione di beni ammortizzabili e per trasferimenti interni (ex art.36 DPR 633/72)"
-"l10n_it_document_type_27","TD27","Self-invoice for self-consumption or for free transfers without recourse","Autofattura per autoconsumo o per cessione gratuita pro soluto"
-"l10n_it_document_type_28","TD28","Self-invoice for Italian tax from foreign suppliers identified but not established in Italy and for purchases from San Marino with VAT (paper invoice)","Autofattura per imposta italiana da fornitori esteri identificati ma non stabiliti in Italia e per acquisti da San Marino con IVA (fattura cartacea)"
+"l10n_it_document_type_16","TD16","Reverse charged vendor bill integration for domestic reverse charge","Integrazione fattura fornitore con reverse charge interno"
+"l10n_it_document_type_17","TD17","Reverse charged vendor bill integration for purchase of foreign services","Integrazione fattura fornitore con reverse charge per acquisto di servizi dall'estero"
+"l10n_it_document_type_18","TD18","Reverse charged vendor bill integration for the purchase of intra-EU goods","Integrazione fattura fornitore con reverse charge per acquisto di beni intracomunitari"
+"l10n_it_document_type_19","TD19","Reverse charged vendor bill integration for purchase of goods from foreign markets","Integrazione fattura fornitore con reverse charge per acquisto merci estere"
+"l10n_it_document_type_20","TD20","Self-invoice for invoice correction","Autofattura per regolarizzazione e integrazione delle fatture"
+"l10n_it_document_type_21","TD21","Self-invoice for exceeded threshold","Autofattura per splafonamento"
+"l10n_it_document_type_22","TD22","Withdrawal of goods from VAT warehouse","Estrazione beni da Deposito IVA"
+"l10n_it_document_type_23","TD23","Withdrawal of goods from VAT warehouse with VAT settlement","Estrazione beni da Deposito IVA con versamento dell'IVA"
+"l10n_it_document_type_24","TD24","Deferred invoice","Fattura differita"
+"l10n_it_document_type_25","TD25","Deferred invoice for dropshipping","Fattura differita per dropshipping"
+"l10n_it_document_type_26","TD26","Transfer of depreciable assets and internal transfers","Cessione di beni ammortizzabili e per passaggi interni"
+"l10n_it_document_type_27","TD27","Self-invoice for self-consumption, gifts or for free services","Autofattura per autoconsumo, cessioni di beni senza rivalsa o prestazioni gratuite"
+"l10n_it_document_type_28","TD28","Self-invoice for purchases from San Marino with VAT (paper invoice)","Autofattura per acquisti da San Marino con IVA (fattura cartacea)"

From 27ddca67831f5600fca267cd00e0b6e1bde61558 Mon Sep 17 00:00:00 2001
From: Khumam Alzagim <alkh@odoo.com>
Date: Wed, 22 Oct 2025 12:35:49 +0000
Subject: [PATCH 539/673] [FIX] l10n_tr_nilvera_einvoice_extended: prevent
 branch tax duplicates

Adds parent_id check on the domain to ensure taxes are only
loaded for root companies. This prevents duplicate tax creation on
branch (child) companies when initializing tax templates.

task-5176333

closes odoo/odoo#235064

X-original-commit: 920067df6ecaf1cc108761d49614923f80103bbc
Signed-off-by: Khumam Alzagim (alkh) <alkh@odoo.com>
Signed-off-by: Maximilien La Barre (malb) <malb@odoo.com>
---
 .../__init__.py                               | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_tr_nilvera_einvoice_extended/__init__.py b/addons/l10n_tr_nilvera_einvoice_extended/__init__.py
index 40a89137e6db7..87e1eb6dc737e 100644
--- a/addons/l10n_tr_nilvera_einvoice_extended/__init__.py
+++ b/addons/l10n_tr_nilvera_einvoice_extended/__init__.py
@@ -6,16 +6,19 @@
 
 
 def _l10n_tr_nilvera_einvoice_extended_post_init(env):
-    """Existing companies that have the Turkish Chart of Accounts set"""
-    tr_companies = env["res.company"].search([("chart_template", "=", "tr")], order="parent_path")
+    """Existing none branch companies that have the Turkish Chart of Accounts set"""
+    tr_companies = env["res.company"].search([("chart_template", "=", "tr"), ("parent_id", "=", False)], order="parent_path")
     for company in tr_companies:
-        chart_template = env["account.chart.template"].with_company(company)
-        chart_template._load_data({
-            "l10n_tr_nilvera_einvoice_extended.account.tax.code": chart_template._get_tr_withholding_account_tax_code(),
+        ChartTemplate = env["account.chart.template"].with_company(company)
+        data = {
+            "l10n_tr_nilvera_einvoice_extended.account.tax.code": ChartTemplate._get_tr_withholding_account_tax_code(),
             "account.tax": {
                 xml_id: data
-                for xml_id, data in chart_template._get_tr_withholding_account_tax().items()
+                for xml_id, data in ChartTemplate._get_tr_withholding_account_tax().items()
                 if not env.ref(f"account.{company.id}_{xml_id}", raise_if_not_found=False)
             },
-        })
-        chart_template._load_translations(companies=company)
+        }
+        ChartTemplate._deref_account_tags("tr", data["account.tax"])
+        ChartTemplate._pre_reload_data(company, {}, data)
+        ChartTemplate._load_data(data)
+        ChartTemplate._load_translations(companies=company)

From 9c0304ea84223b6bc5cc9c66d5e98b6a70eb184c Mon Sep 17 00:00:00 2001
From: Mathieu Coutant <mcou@odoo.com>
Date: Tue, 4 Nov 2025 10:03:05 +0000
Subject: [PATCH 540/673] [FIX] base: don't filter out attachment fields with
 bypass access

Issue:
The invoices supposed to be sent with follow-ups when the option `join_invoices` is tick are not sent.

Steps to reproduce:
- Install "account_followup"
- Create a new partner
- Create an invoice for this partner with a due date in the past, confirm and send
- Go on the partner form view, under the "Accounting" it should be in the state "In need of action"
- Click "Send", the wizard pops up with the invoice attachment
- Click "Send", the message does have the invoice attachment, only the report

Cause:
The attachment in linked to the wizard in database but when doing a read, the domain
is appended with `'res_field', '=', False` by these lines:

https://github.com/odoo/odoo/blob/f8f72b15598576f5870e49879e96fc5c127a6100/odoo/addons/base/models/ir_attachment.py#L598-L603

But the invoices attachments have res_field set to `invoice_pdf_report_file` so they are filtered out.

The purpose of adding the new leaf to the domain is to filter out attachments that we are not
searching for specifically. As they are linked to a specific field (`res_field`), if we don't
search on this field, we are not supposed to see them.

With the `followup_manual_reminder` wizard, we are linking attachments having a `res_field` to `account_move.invoice_pdf_report_file` to a new field: `followup_manual_reminder.attachment_ids`.
So `'res_field', '=', False` should not be added.

Solution:
The problematic fields are all `Many2Many` fields to `ir.attachment` and
since [this commit](https://github.com/odoo/enterprise/commit/fd4fcb1bd8764dbde1c8b3295623dd020c882a60) these fields have `bypass_search_access=True`.

So the fix consist of not adding the domain `'res_field', '=', False` when `bypass_access` is True.

opw-5164456

closes odoo/odoo#235354

X-original-commit: 045293a6888f0bf1c95a0c8d4ecc341b562d01fb
Signed-off-by: Raphael Collet <rco@odoo.com>
Signed-off-by: Mathieu Coutant (mcou) <mcou@odoo.com>
---
 odoo/addons/base/models/ir_attachment.py     |  1 +
 odoo/addons/test_orm/models/test_orm.py      |  9 ++++++++
 odoo/addons/test_orm/tests/test_many2many.py | 23 ++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/odoo/addons/base/models/ir_attachment.py b/odoo/addons/base/models/ir_attachment.py
index c9da0c2918202..fdbd75cc42ad3 100644
--- a/odoo/addons/base/models/ir_attachment.py
+++ b/odoo/addons/base/models/ir_attachment.py
@@ -598,6 +598,7 @@ def _search(self, domain, offset=0, limit=None, order=None, *, active_test=True,
         if (
             not self.env.context.get('skip_res_field_check')
             and not any(d.field_expr in ('id', 'res_field') for d in domain.iter_conditions())
+            and not bypass_access
         ):
             disable_binary_fields_attachments = True
             domain &= Domain('res_field', '=', False)
diff --git a/odoo/addons/test_orm/models/test_orm.py b/odoo/addons/test_orm/models/test_orm.py
index 93f1e364dd6d7..a48cba674db18 100644
--- a/odoo/addons/test_orm/models/test_orm.py
+++ b/odoo/addons/test_orm/models/test_orm.py
@@ -1243,6 +1243,15 @@ class TestOrmAttachmentHost(models.Model):
         'test_orm.attachment', bypass_search_access=True,
     )
 
+    real_binary = fields.Binary(attachment=True)
+    real_attachment_ids = fields.One2many(
+        'ir.attachment', 'res_id', bypass_search_access=True,
+        domain=lambda self: [('res_model', '=', self._name)],
+    )
+    real_m2m_attachment_ids = fields.Many2many(
+        'ir.attachment', bypass_search_access=True,
+    )
+
 
 class DecimalPrecisionTest(models.Model):
     _name = 'decimal.precision.test'
diff --git a/odoo/addons/test_orm/tests/test_many2many.py b/odoo/addons/test_orm/tests/test_many2many.py
index 2cf3411a3e960..3b825d2df12eb 100644
--- a/odoo/addons/test_orm/tests/test_many2many.py
+++ b/odoo/addons/test_orm/tests/test_many2many.py
@@ -32,6 +32,29 @@ def test_not_in_relation_as_query(self):
         self.assertEqual(len(pirates), 1)
         self.assertEqual(pirates, self.redbeard)
 
+    def test_attachment_m2m_link(self):
+        user = new_test_user(self.env, 'foo', groups='base.group_system')
+
+        attachments = self.env['ir.attachment'].create({
+            'res_model': self.ship._name,
+            'res_id': self.ship.id,
+            'name': 'test',
+        }).with_user(user)
+        record = self.env['test_orm.attachment.host'].create({
+            'real_binary': b'aGV5',
+        }).with_user(user)
+        attachments += attachments.sudo().search([
+            ('res_model', '=', record._name),
+            ('res_field', '=', 'real_binary'),
+        ])
+        self.assertEqual(len(attachments), 2)
+        record.real_m2m_attachment_ids = [Command.link(a.id) for a in attachments]
+
+        self.assertFalse(record.env.su)
+
+        record.invalidate_model()
+        self.assertEqual(len(record.real_m2m_attachment_ids), len(attachments))
+
     def test_bypass_search_access(self):
         user = new_test_user(self.env, 'foo', groups='base.group_system')
 

From ed6f64b2a09e5c464210a2de7baa9c218a78ca92 Mon Sep 17 00:00:00 2001
From: oumaima-aarabe <ouaa@odoo.com>
Date: Tue, 19 Aug 2025 15:50:28 +0000
Subject: [PATCH 541/673] [FIX] hr_work_entry_holidays: singleton error in
 overlaping leaves
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Issue:**
ValueError "Expected singleton: hr.work.entry.type(7, 8)" occurs during work entry
generation when overlapping leaves (sick leave + public holiday) create intervals
containing multiple work entry types.

**Steps to Reproduce:**
1. Go to the **Employees** app and create a new employee.
   * Set the working hours to **empty (fully flexible)**.
2. Create contract fields on the employee:
   * Set **Work Entry Source** to *Attendance*.
   * Set date_version and contract_date_start.
3. Go to **Time Off** → **New**, and create a sick time off for the employee.
   * Example: from **25th to 29th**.
   * Approve the time off.
4. Go to **Configuration** → **Public Holidays**, and create a new public holiday.
   * Example: **27th**, which overlaps with the sick time off.
   * Work Entry Type = **Paid Time Off**.
5. Go to **Payroll** → **Work Entries**.
   * A **traceback** occurs.

**Root Cause:**
In `_get_interval_leave_work_entry_type()`: Direct access to `interval[2].work_entry_type_id.code`
causes singleton violation when overlapping leaves create intervals containing multiple work entry types.

**Fix:**
Replace direct access to `interval[2].work_entry_type_id.code` with safe recordset slicing
`interval[2].work_entry_type_id[:1].code` to prevent singleton violation.

**Note (18.4+):**
Steps updated for versioned contract architecture where contract fields are set directly on employee.

This resolves payroll blocking issues for deployments with overlapping leave scenarios.

closes odoo/odoo#235156

Closes: #4979974
X-original-commit: 4a90af8d913a6a2c645363ee9dcc9a85542ca61b
Related: odoo/enterprise#99208
Signed-off-by: Oumaima Aarabe (ouaa) <ouaa@odoo.com>
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
---
 addons/hr_work_entry/models/hr_work_entry.py       | 2 ++
 addons/hr_work_entry_holidays/models/hr_version.py | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr_work_entry/models/hr_work_entry.py b/addons/hr_work_entry/models/hr_work_entry.py
index b279434d82137..10ef1c52c66ba 100644
--- a/addons/hr_work_entry/models/hr_work_entry.py
+++ b/addons/hr_work_entry/models/hr_work_entry.py
@@ -193,6 +193,8 @@ def _mark_leaves_outside_schedule(self):
 
         outside_entries = self.env['hr.work.entry']
         for calendar, entries in entries_by_calendar.items():
+            if not calendar or calendar.flexible_hours:
+                continue
             datetime_start = datetime.combine(min(entries.mapped('date')), time.min)
             datetime_stop = datetime.combine(max(entries.mapped('date')), time.max)
 
diff --git a/addons/hr_work_entry_holidays/models/hr_version.py b/addons/hr_work_entry_holidays/models/hr_version.py
index 629186696a492..40f27b4423b16 100644
--- a/addons/hr_work_entry_holidays/models/hr_version.py
+++ b/addons/hr_work_entry_holidays/models/hr_version.py
@@ -30,8 +30,10 @@ def _get_interval_leave_work_entry_type(self, interval, leaves, bypassing_codes)
         # Overriden in hr_work_entry_holiday to select the
         # global time off first (eg: Public Holiday > Home Working)
         self.ensure_one()
-        if 'work_entry_type_id' in interval[2] and interval[2].work_entry_type_id.code in bypassing_codes:
-            return interval[2].work_entry_type_id
+        if 'work_entry_type_id' in interval[2]:
+            work_entry_types = interval[2].work_entry_type_id
+            if work_entry_types and work_entry_types[:1].code in bypassing_codes:
+                return work_entry_types[:1]
 
         interval_start = interval[0].astimezone(pytz.utc).replace(tzinfo=None)
         interval_stop = interval[1].astimezone(pytz.utc).replace(tzinfo=None)

From 70011a2f723fe36592a27ec7bd521a8a76cb0e86 Mon Sep 17 00:00:00 2001
From: Maryam Kia <maki@odoo.com>
Date: Tue, 26 Aug 2025 12:38:11 +0000
Subject: [PATCH 542/673] [FIX] mail, *: update the rating summary when a
 message is deleted

*: portal, portal_rating, website_slides

PR #221050, makes it possible to properly remove a message in the portal
and PR #216044 retrieves the rating cards feature. There is an overlap between
what these two PRs do. When a user removes a rating message and there is a
rating cards feature on the page, it should be updated.
Most of the remove method changes are indeed what we did in forward port of
#221050 (#222517)

task-5106543

closes odoo/odoo#235385

X-original-commit: 36a5c03f3bc05ee4bcda2e0804496a090cabe86c
Signed-off-by: Maryam Kia (maki) <maki@odoo.com>
---
 .../chatter/frontend/message_model_patch.js   | 16 +++++++++++++++
 .../chatter/frontend/portal_chatter_patch.xml |  2 +-
 .../slides_course_review_modification.js      | 20 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 addons/portal_rating/static/src/chatter/frontend/message_model_patch.js

diff --git a/addons/portal_rating/static/src/chatter/frontend/message_model_patch.js b/addons/portal_rating/static/src/chatter/frontend/message_model_patch.js
new file mode 100644
index 0000000000000..fb07ae231be3d
--- /dev/null
+++ b/addons/portal_rating/static/src/chatter/frontend/message_model_patch.js
@@ -0,0 +1,16 @@
+import { Message } from "@mail/core/common/message_model";
+import { patch } from "@web/core/utils/patch";
+
+/** @type {import("models").Message} */
+const messagePatch = {
+    async remove({ removeFromThread = false } = {}) {
+        const data = await super.remove(...arguments);
+        if (this.thread && removeFromThread) {
+            this.thread.messages.forEach((message) => {
+                message.rating_stats = this.thread.rating_stats;
+            });
+        }
+        return data;
+    },
+};
+patch(Message.prototype, messagePatch);
diff --git a/addons/portal_rating/static/src/chatter/frontend/portal_chatter_patch.xml b/addons/portal_rating/static/src/chatter/frontend/portal_chatter_patch.xml
index 05c4a58675570..b50321b85bc49 100644
--- a/addons/portal_rating/static/src/chatter/frontend/portal_chatter_patch.xml
+++ b/addons/portal_rating/static/src/chatter/frontend/portal_chatter_patch.xml
@@ -2,7 +2,7 @@
 <templates xml:space="preserve">
     <t t-inherit="portal.Chatter" t-inherit-mode="extension">
         <xpath expr="//div[hasclass('o-mail-Chatter-top')]/*[1]" position="before">
-            <div t-if="ratingStats" class="my-2" t-att-class="{ 'mb-4':props.twoColumns }">
+            <div t-if="ratingStats and ratingStats.total" class="my-2" t-att-class="{ 'mb-4':props.twoColumns }">
                 <t t-call="portal_rating.rating_card">
                     <t t-set="two_columns" t-value="props.twoColumns"/>
                     <t t-set="rating_stats" t-value="ratingStats"/>
diff --git a/addons/website_slides/static/tests/tours/slides_course_review_modification.js b/addons/website_slides/static/tests/tours/slides_course_review_modification.js
index 8ef3e9410ccce..8b5aa494a6d10 100644
--- a/addons/website_slides/static/tests/tours/slides_course_review_modification.js
+++ b/addons/website_slides/static/tests/tours/slides_course_review_modification.js
@@ -37,6 +37,10 @@ registry.category("web_tour.tours").add("course_review_modification", {
             trigger: "a[id=review-tab]:contains(Reviews (1))",
             run: "click",
         },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Chatter .o_website_rating_card_container .o_website_rating_table_row[data-star='4']:contains(100%)",
+        },
         {
             trigger: "#chatterRoot:shadow .o-mail-Message:contains(First review)",
             run: "hover && click #chatterRoot:shadow .o-mail-Message [title='Expand']",
@@ -49,6 +53,10 @@ registry.category("web_tour.tours").add("course_review_modification", {
             trigger: "#chatterRoot:shadow button:contains(Delete)",
             run: "click",
         },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Chatter:not(:has(.o_website_rating_card_container))",
+        },
         {
             trigger: "#chatterRoot:shadow .o-mail-Thread:contains(The conversation is empty.)",
         },
@@ -83,6 +91,10 @@ registry.category("web_tour.tours").add("course_review_modification", {
             trigger: "a[id=review-tab]:contains(Reviews (1))",
             run: "click",
         },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Chatter .o_website_rating_card_container .o_website_rating_table_row[data-star='3']:contains(100%)",
+        },
         {
             trigger:
                 "#chatterRoot:shadow .o-mail-Message:contains(Second review) .o_website_rating_static[title='3 stars on 5']",
@@ -111,6 +123,10 @@ registry.category("web_tour.tours").add("course_review_modification", {
             trigger: "a[id=review-tab]:contains(Reviews (1))",
             run: "click",
         },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Chatter .o_website_rating_card_container .o_website_rating_table_row[data-star='2']:contains(100%)",
+        },
         {
             trigger:
                 "#chatterRoot:shadow .o-mail-Message:contains(Second review is edited in rating composer) .o_website_rating_static[title='2 stars on 5']",
@@ -177,6 +193,10 @@ registry.category("web_tour.tours").add("course_review_modification", {
             trigger: "#chatterRoot:shadow button:contains(Delete)",
             run: "click",
         },
+        {
+            trigger:
+                "#chatterRoot:shadow .o-mail-Chatter:not(:has(.o_website_rating_card_container))",
+        },
         {
             trigger: "span:contains(Add Review)",
             run: "click",

From 7aeb81b11d6c91c4af2c52bbfa68c21c9d3b7726 Mon Sep 17 00:00:00 2001
From: Garvish Panchal <gppa@odoo.com>
Date: Tue, 16 Sep 2025 05:12:41 +0000
Subject: [PATCH 543/673] [FIX] website: autofetch options in many2x field

With the initial [website builder refactor], only 4 options appeared in
the `many2x` dropdown when user try to re-select.

This commit fixes the issue so the dropdown now fetches all required
options through passing domain in rpc call instead of filtering after
rpc call this makes sure we only fetch required data by avoiding
already selected ids.

Steps to Reproduce:
1. Open the website builder.
2. Drop any snippet onto the page.
3. Set the visibility option to conditionally.
4. In the UTM medium dropdown, select any social media option.
5. Try changing the selection again.
6. Only 4 options are shown.

Expected: Dropdown should always display 5 options.

[website builder refactor]: https://github.com/odoo/odoo/commit/9fe45e2b7ddbbfd0445ffe25a859e67a316d02b2

closes odoo/odoo#235430

X-original-commit: 3631757a4766bc59378bb975e01e115c92ef1dd4
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Signed-off-by: Garvish Pramodbhai Panchal (gppa) <gppa@odoo.com>
---
 .../src/core/building_blocks/select_many2x.js | 31 ++++++-
 .../basic_many2many.test.js                   | 80 +++++++++++++++++--
 .../builder_many2many.test.js                 | 17 ++--
 .../model_many2many.test.js                   | 17 ++--
 4 files changed, 126 insertions(+), 19 deletions(-)

diff --git a/addons/html_builder/static/src/core/building_blocks/select_many2x.js b/addons/html_builder/static/src/core/building_blocks/select_many2x.js
index a006db2647d06..1739d6c04e921 100644
--- a/addons/html_builder/static/src/core/building_blocks/select_many2x.js
+++ b/addons/html_builder/static/src/core/building_blocks/select_many2x.js
@@ -4,6 +4,7 @@ import { useCachedModel } from "@html_builder/core/cached_model_utils";
 import { _t } from "@web/core/l10n/translation";
 import { SelectMenu } from "@web/core/select_menu/select_menu";
 import { useDropdownCloser } from "@web/core/dropdown/dropdown_hooks";
+import { shallowEqual } from "@web/core/utils/arrays";
 
 class SelectMany2XCreate extends Component {
     static template = "html_builder.SelectMany2XCreate";
@@ -54,6 +55,8 @@ export class SelectMany2X extends Component {
     setup() {
         this.orm = useService("orm");
         this.cachedModel = useCachedModel();
+        this.prevSelectedIds = undefined;
+        this.prevSearchValue = undefined;
         this.state = useState({
             nameToCreate: "",
             searchResults: [],
@@ -61,6 +64,8 @@ export class SelectMany2X extends Component {
         });
         onWillUpdateProps(async (newProps) => {
             if (this.searchInvalidationKey(this.props) !== this.searchInvalidationKey(newProps)) {
+                this.prevSelectedIds = undefined;
+                this.prevSearchValue = undefined;
                 this.state.searchResults = [];
             }
         });
@@ -94,16 +99,21 @@ export class SelectMany2X extends Component {
         this.search(searchValue);
     }
     async search(searchValue) {
+        const domain = Object.values(this.props.domain).filter((item) => item !== null);
+        const selectedIds = this.props.selected.map((e) => e.id);
+        if (selectedIds.length) {
+            domain.push(["id", "not in", selectedIds]);
+        }
         const tuples = await this.orm.call(this.props.model, "name_search", [], {
             name: searchValue,
-            domain: Object.values(this.props.domain).filter((item) => item !== null),
+            domain: domain,
             operator: "ilike",
             limit: this.state.limit + 1,
         });
         this.state.hasMore = tuples.length > this.state.limit;
         const results = await this.cachedModel.ormRead(
             this.props.model,
-            tuples.slice(0, this.state.limit).map(([id, _name]) => id),
+            tuples.map(([id, _name]) => id),
             [...new Set(this.props.fields).add("display_name").add("name")]
         );
         if (this.props.nullText && (!results.length || results[0].id)) {
@@ -117,7 +127,9 @@ export class SelectMany2X extends Component {
     }
     filteredSearchResult() {
         const selectedIds = new Set(this.props.selected.map((e) => e.id));
-        return this.state.searchResults.filter((entry) => !selectedIds.has(entry.id));
+        return this.state.searchResults
+            .filter((entry) => !selectedIds.has(entry.id))
+            .slice(0, this.state.limit);
     }
     async canCreate(name) {
         if (!this.props.create || !name.length) {
@@ -137,7 +149,18 @@ export class SelectMany2X extends Component {
         return !usedNames.includes(name);
     }
     async onInput(searchValue) {
-        this.search(searchValue);
+        const selectedIds = this.props.selected.map((e) => e.id);
+        // Avoid redundant search queries when the user toggles the dropdown
+        // without changing the search value or the selected options.
+        if (
+            searchValue === this.prevSearchValue &&
+            shallowEqual(selectedIds, this.prevSelectedIds)
+        ) {
+            return;
+        }
+        this.prevSearchValue = searchValue;
+        this.prevSelectedIds = selectedIds;
+        await this.search(searchValue);
         this.state.nameToCreate = (await this.canCreate(searchValue)) ? searchValue : "";
     }
 
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js
index e9bda1f520d81..713675c5ccf9a 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/basic_many2many.test.js
@@ -21,11 +21,17 @@ defineModels([Test]);
 
 test.tags("focus required");
 test("basic many2many: find tag, select tag, unselect tag", async () => {
-    onRpc("test", "name_search", () => [
-        [1, "First"],
-        [2, "Second"],
-        [3, "Third"],
-    ]);
+    let executeCount = 0;
+    onRpc("test", "name_search", ({ kwargs }) => {
+        expect.step("name_search");
+        executeCount++;
+        if (executeCount === 1) {
+            expect(kwargs.domain).toEqual([]);
+        }
+        if (executeCount === 2) {
+            expect(kwargs.domain).toEqual([["id", "not in", [1]]]);
+        }
+    });
     const selection = reactive([]);
     class TestComponent extends BaseOptionComponent {
         static selector = ".test-options-target";
@@ -71,4 +77,68 @@ test("basic many2many: find tag, select tag, unselect tag", async () => {
     expect(selection).toEqual([{ id: 2, name: "Second", display_name: "Second" }]);
     expect("table tr").toHaveCount(1);
     expect("table input").toHaveValue("Second");
+    expect.verifySteps(["name_search", "name_search"]);
+});
+
+test("basic many2many: toggle dropdown without changing search term or selection does not trigger a new search", async () => {
+    let executeCount = 0;
+    onRpc("test", "name_search", ({ kwargs }) => {
+        expect.step("name_search");
+        executeCount++;
+        if (executeCount === 1) {
+            expect(kwargs.domain).toEqual([]);
+        }
+    });
+    const selection = reactive([]);
+    class TestComponent extends BaseOptionComponent {
+        static selector = ".test-options-target";
+        static template = xml`<BasicMany2Many selection="this.selection" model="'test'" setSelection="this.setSelection.bind(this)" limit="1"/>`;
+        selection = selection;
+        setSelection(newSelection) {
+            selection.length = 0;
+            for (const item of newSelection) {
+                selection.push(item);
+            }
+        }
+    }
+    addBuilderOption(TestComponent);
+    await setupHTMLBuilder(`<div class="test-options-target">b</div>`);
+
+    await contains(":iframe .test-options-target").click();
+    expect(".options-container").toBeDisplayed();
+    expect("table tr").toHaveCount(0);
+    expect(selection).toEqual([]);
+
+    // Click to open, 1st search should be done
+    await contains(".btn.o-dropdown").click();
+    await delay(300); // debounce
+    await animationFrame();
+    expect(selection).toEqual([]);
+    expect(executeCount).toBe(1);
+    await contains(".btn.o-dropdown").click();
+
+    // Toogle dropdown, no new search should be done
+    await contains(".btn.o-dropdown").click();
+    await delay(300); // debounce
+    await animationFrame();
+    expect(selection).toEqual([]);
+    // Still same as no item is selected
+    expect(executeCount).toBe(1);
+    await contains(".btn.o-dropdown").click();
+    await contains(".btn.o-dropdown").click();
+    await delay(300); // debounce
+    await animationFrame();
+    expect(selection).toEqual([]);
+    expect("span.o-dropdown-item").toHaveCount(1);
+    await contains("span.o-dropdown-item").click();
+    expect("table tr").toHaveCount(1);
+
+    // Open again, now a second search should be done because selection changed
+    await contains(".btn.o-dropdown").click();
+    await delay(300); // debounce
+    await animationFrame();
+    expect("span.o-dropdown-item").toHaveCount(1);
+    expect(selection).toEqual([{ id: 1, name: "First", display_name: "First" }]);
+    expect(executeCount).toBe(2);
+    expect.verifySteps(["name_search", "name_search"]);
 });
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js
index e5cb05187d68c..d3f65ec91d8a5 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/builder_many2many.test.js
@@ -25,11 +25,17 @@ describe.current.tags("desktop");
 defineModels([Test]);
 
 test("many2many: find tag, select tag, unselect tag", async () => {
-    onRpc("test", "name_search", () => [
-        [1, "First"],
-        [2, "Second"],
-        [3, "Third"],
-    ]);
+    let executeCount = 0;
+    onRpc("test", "name_search", ({ kwargs }) => {
+        expect.step("name_search");
+        executeCount++;
+        if (executeCount === 1) {
+            expect(kwargs.domain).toEqual([]);
+        }
+        if (executeCount === 2) {
+            expect(kwargs.domain).toEqual([["id", "not in", [1]]]);
+        }
+    });
     addBuilderOption(
         class extends BaseOptionComponent {
             static selector = ".test-options-target";
@@ -69,6 +75,7 @@ test("many2many: find tag, select tag, unselect tag", async () => {
     expect("table tr").toHaveCount(2);
 
     await contains("button.fa-minus").click();
+    expect.verifySteps(["name_search", "name_search"]);
     expect(editableContent).toHaveInnerHTML(
         `<div class="test-options-target" data-test="[{&quot;id&quot;:2,&quot;display_name&quot;:&quot;Second&quot;,&quot;name&quot;:&quot;Second&quot;}]">b</div>`
     );
diff --git a/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js b/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js
index 7fbb1f41e924b..fb3235516d15d 100644
--- a/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js
+++ b/addons/html_builder/static/tests/custom_tab/builder_components/model_many2many.test.js
@@ -33,11 +33,17 @@ describe.current.tags("desktop");
 defineModels([Test, TestBase]);
 
 test("model many2many: find tag, select tag, unselect tag", async () => {
-    onRpc("test", "name_search", () => [
-        [1, "First"],
-        [2, "Second"],
-        [3, "Third"],
-    ]);
+    let executeCount = 0;
+    onRpc("test", "name_search", ({ kwargs }) => {
+        expect.step("name_search");
+        executeCount++;
+        if (executeCount === 1) {
+            expect(kwargs.domain).toEqual([]);
+        }
+        if (executeCount === 2) {
+            expect(kwargs.domain).toEqual([["id", "not in", [1]]]);
+        }
+    });
     addBuilderOption(
         class extends BaseOptionComponent {
             static selector = ".test-options-target";
@@ -87,4 +93,5 @@ test("model many2many: find tag, select tag, unselect tag", async () => {
     await contains(":iframe .test-options-target").click();
     expect("table tr").toHaveCount(1);
     expect("table input").toHaveValue("Second");
+    expect.verifySteps(["name_search", "name_search"]);
 });

From 439b3b3b30a68ea84ae84907de350d9a808c2070 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Thu, 13 Nov 2025 08:43:42 +0100
Subject: [PATCH 544/673] [FIX] website_livechat: fix non-deterministic lazy
 bus tour

The `test_bus_not_started` test ensures the live chat only starts
the bus/worker service when needed (i.e. when the customer starts
to chat). This is done to ensure we do not waste any server
resources.

However, this test waits 1 second to see if the worker/bus has
started, which is not always enough: the shared worker script
needs to be fetched, the worker service proceeds to an initial
handshake to ensure the worker is properly started, and the bus
ervice initializes by sending an initial request to the worker
as well.

All those steps can take time, especially when the CPU is bloated
and/or the network is slow.

This worker/bus service only has one entry method: `bus_service@start`,
`worker_service.ensureWorkerStarted`. Instead of waiting for those async
operations to complete, the test now checks whether those methods were
called.

fixes runbot-233814

closes odoo/odoo#235380

X-original-commit: 4c09f28beee7d1f82a308a04074033eed545fc7b
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 .../tests/tours/lazy_frontend_bus_tour.js     | 73 +++++++++----------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/addons/website_livechat/static/tests/tours/lazy_frontend_bus_tour.js b/addons/website_livechat/static/tests/tours/lazy_frontend_bus_tour.js
index 335a22c8d04d3..b5c4fa11d44cb 100644
--- a/addons/website_livechat/static/tests/tours/lazy_frontend_bus_tour.js
+++ b/addons/website_livechat/static/tests/tours/lazy_frontend_bus_tour.js
@@ -1,25 +1,46 @@
-import { delay } from "@web/core/utils/concurrency";
-import { registry } from "@web/core/registry";
 import { WORKER_STATE } from "@bus/services/worker_service";
 
+import { whenReady } from "@odoo/owl";
+
+import { patchWithCleanup } from "@web/../tests/helpers/utils";
+import { registry } from "@web/core/registry";
+
 registry.category("web_tour.tours").add("website_livechat.lazy_frontend_bus", {
     url: "/",
     steps: () => [
         {
-            trigger: ".o-livechat-root:shadow .o-livechat-LivechatButton",
+            trigger: "body",
             async run() {
-                await odoo.__WOWL_DEBUG__.root.env.services["mail.store"].isReady;
-                if (odoo.__WOWL_DEBUG__.root.env.services.bus_service.isActive) {
-                    throw new Error("Bus service should not start when loading the page");
+                await whenReady();
+                const busService = odoo.__WOWL_DEBUG__.root.env.services.bus_service;
+                if (busService.isActive) {
+                    throw new Error("The bus service should not be started at page load.");
                 }
-                if (
-                    odoo.__WOWL_DEBUG__.root.env.services.worker_service.state !==
-                    WORKER_STATE.UNINITIALIZED
-                ) {
-                    throw new Error("Worker service should not start when loading the page");
+                patchWithCleanup(busService, {
+                    start() {
+                        document.body.classList.add("o-bus-service-started");
+                        return super.start(...arguments);
+                    },
+                });
+                const workerService = odoo.__WOWL_DEBUG__.root.env.services.worker_service;
+                if (workerService._state !== WORKER_STATE.UNINITIALIZED) {
+                    throw new Error("The worker service should not be started at page load.");
                 }
+                patchWithCleanup(workerService, {
+                    ensureWorkerStarted() {
+                        document.body.classList.add("o-worker-service-started");
+                        return super.ensureWorkerStarted(...arguments);
+                    },
+                });
+                odoo.__WOWL_DEBUG__.root.env.services["mail.store"].isReady.then(() =>
+                    document.body.classList.add("o-mail-store-ready")
+                );
             },
         },
+        {
+            trigger:
+                "body.o-mail-store-ready:not(.o-bus-service-started):not(.o-worker-service-started)",
+        },
         {
             trigger: ".o-livechat-root:shadow .o-livechat-LivechatButton",
             run: "click",
@@ -29,34 +50,12 @@ registry.category("web_tour.tours").add("website_livechat.lazy_frontend_bus", {
             run: "edit Hello, I need help!",
         },
         {
-            trigger: ".o-livechat-root:shadow .o-mail-Composer-input",
-            async run(helpers) {
-                if (odoo.__WOWL_DEBUG__.root.env.services.bus_service.isActive) {
-                    throw new Error("Bus service should not start for temporary live chat");
-                }
-                if (
-                    odoo.__WOWL_DEBUG__.root.env.services.worker_service.state !==
-                    WORKER_STATE.UNINITIALIZED
-                ) {
-                    throw new Error("Worker service should not start when loading the page");
-                }
-                await helpers.press("Enter");
-                await delay(1000);
-            },
+            trigger: "body:not(.o-bus-service-started):not(.o-worker-service-started)",
         },
         {
-            trigger: ".o-livechat-root:shadow .o-mail-Message:contains(Hello, I need help!)",
-            run() {
-                if (!odoo.__WOWL_DEBUG__.root.env.services.bus_service.isActive) {
-                    throw new Error("Bus service should start after first live chat message");
-                }
-                if (
-                    odoo.__WOWL_DEBUG__.root.env.services.worker_service.state !==
-                    WORKER_STATE.INITIALIZED
-                ) {
-                    throw new Error("Worker service should start after first live chat message");
-                }
-            },
+            trigger: ".o-livechat-root:shadow .o-mail-Composer-input",
+            run: "press Enter",
         },
+        { trigger: "body.o-bus-service-started.o-worker-service-started" },
     ],
 });

From 0280de24ebc484f5d1b70e6085b25fbe0aa31668 Mon Sep 17 00:00:00 2001
From: djameltouati <otd@odoo.com>
Date: Wed, 22 Oct 2025 17:06:23 +0000
Subject: [PATCH 545/673] [FIX] stock_account: avoid traceback acceing stock
 valuation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce the bug:
- activate Arabic language
- Try to open stock valuation

Traceback is triggered:
raise ValueError("time data %r does not match format %r" %
ValueError: time data '٢٠٢٥-١٠-٢٢' does not match format '%Y-%m-%d'

opw-5176859

closes odoo/odoo#233282

X-original-commit: d6e14bddcb2414c09df245b3a7c01c45022c3b48
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
Signed-off-by: Djamel Touati (otd) <otd@odoo.com>
---
 addons/stock_account/static/src/stock_valuation/controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock_account/static/src/stock_valuation/controller.js b/addons/stock_account/static/src/stock_valuation/controller.js
index c775cf705619f..9ecd51b39a635 100644
--- a/addons/stock_account/static/src/stock_valuation/controller.js
+++ b/addons/stock_account/static/src/stock_valuation/controller.js
@@ -1,5 +1,6 @@
 import { reactive } from "@odoo/owl";
 import { useService } from "@web/core/utils/hooks";
+import { serializeDate } from "@web/core/l10n/dates";
 const { DateTime } = luxon;
 
 
@@ -22,7 +23,7 @@ export class StockValuationReportController {
 
     async loadReportData() {
         const kwargs = {
-            date: this.state.date.toFormat("yyyy-MM-dd"),
+            date: serializeDate(this.state.date),
         };
         const res = await this.orm.call(
             "stock_account.stock.valuation.report",

From d1759fe2b4c96008d5c82af794fa5f9c444d539e Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Wed, 12 Nov 2025 15:43:18 +0100
Subject: [PATCH 546/673] [IMP] spreadsheet: update o_spreadsheet to latest
 version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### Contains the following commits:

https://github.com/odoo/o-spreadsheet/commit/6fefc9ceb [REL] 19.1.0-alpha.12 [Task: 0](https://www.odoo.com/odoo/2328/tasks/0)
https://github.com/odoo/o-spreadsheet/commit/8608ee222 [FIX] export: image charts as base64 [Task: 5253880](https://www.odoo.com/odoo/2328/tasks/5253880)
https://github.com/odoo/o-spreadsheet/commit/8a5c1ba08 [IMP] spreadsheet: implement dark mode for UI [Task: 5082659](https://www.odoo.com/odoo/2328/tasks/5082659)
https://github.com/odoo/o-spreadsheet/commit/4cee0c861 [REF] composer: use opacity rather than color alpha [Task: 5082659](https://www.odoo.com/odoo/2328/tasks/5082659)
https://github.com/odoo/o-spreadsheet/commit/eeff28de6 [FIX] demo: log something when catching global errors [Task: 5082659](https://www.odoo.com/odoo/2328/tasks/5082659)
https://github.com/odoo/o-spreadsheet/commit/be1d66d5c [FIX] TopbarMenu: specify `isReadonlyAllowed` [Task: 5245432](https://www.odoo.com/odoo/2328/tasks/5245432)
https://github.com/odoo/o-spreadsheet/commit/b2510d5da [FIX] pivot: error on removing max number of columns/rows [Task: 5220970](https://www.odoo.com/odoo/2328/tasks/5220970)
https://github.com/odoo/o-spreadsheet/commit/65cfa1de1 [IMP] top_bar: export TopBar component for Odoo trash banner integration [Task: 5030282](https://www.odoo.com/odoo/2328/tasks/5030282)
https://github.com/odoo/o-spreadsheet/commit/0bd1110a6 [FIX] range: invalid sheet name with special character [Task: 5125762](https://www.odoo.com/odoo/2328/tasks/5125762)
https://github.com/odoo/o-spreadsheet/commit/99939b91f [FIX] filter menu: truncate long filter values [Task: 5219611](https://www.odoo.com/odoo/2328/tasks/5219611)
https://github.com/odoo/o-spreadsheet/commit/0a554c1aa [FIX] composer: set editionMode to inactive when composer is unmounted [Task: 5149215](https://www.odoo.com/odoo/2328/tasks/5149215)
https://github.com/odoo/o-spreadsheet/commit/726de1931 [FIX] chart: add placeholder for axis title input [Task: 5187080](https://www.odoo.com/odoo/2328/tasks/5187080)
https://github.com/odoo/o-spreadsheet/commit/f89aba363 [PERF] zones: faster isZoneInside [Task: 5213090](https://www.odoo.com/odoo/2328/tasks/5213090)
https://github.com/odoo/o-spreadsheet/commit/440fdd04b [PERF] Renderer: speed-up box generation [Task: 5213090](https://www.odoo.com/odoo/2328/tasks/5213090)
https://github.com/odoo/o-spreadsheet/commit/2ec5b56af [FIX] charts: fix zoomable scatter chart [Task: 5143146](https://www.odoo.com/odoo/2328/tasks/5143146)
https://github.com/odoo/o-spreadsheet/commit/b45ab8b9e [IMP] tests: add zoomable chart plugin tests [Task: 5143146](https://www.odoo.com/odoo/2328/tasks/5143146)
https://github.com/odoo/o-spreadsheet/commit/9950e3173 [MOV] tests: move zoomable chart tests to a dedicated folder [Task: 5143146](https://www.odoo.com/odoo/2328/tasks/5143146)
https://github.com/odoo/o-spreadsheet/commit/ff132df10 [FIX] charts: crash when converting empty chart to scorecard/gauge [Task: 5181741](https://www.odoo.com/odoo/2328/tasks/5181741)
https://github.com/odoo/o-spreadsheet/commit/4b04ee0dc [picvFIX] Package: update owl to 2.8.1 [](https://www.odoo.com/odoo/2328/tasks/)
https://github.com/odoo/o-spreadsheet/commit/555e5bb42 [IMP] update hall of fame [Task: 0](https://www.odoo.com/odoo/2328/tasks/0)
https://github.com/odoo/o-spreadsheet/commit/f3439bbb9 [FIX] NumberEditor: drop unused rule [Task: 0](https://www.odoo.com/odoo/2328/tasks/0)

Part-of: odoo/odoo#235347
Related: odoo/enterprise#99292
Signed-off-by: Vincent Schippefilt (vsc) <vsc@odoo.com>
Co-authored-by: Florian Damhaut (flda) <flda@odoo.com>
Co-authored-by: Anthony Hendrickx (anhe) <anhe@odoo.com>
Co-authored-by: Alexis Lacroix (laa) <laa@odoo.com>
Co-authored-by: Lucas Lefèvre (lul) <lul@odoo.com>
Co-authored-by: Adrien Minne (adrm) <adrm@odoo.com>
Co-authored-by: Ronak Mukeshbhai Bharadiya (rmbh) <rmbh@odoo.com>
Co-authored-by: Dhrutik Patel (dhrp) <dhrp@odoo.com>
Co-authored-by: Rémi Rahir (rar) <rar@odoo.com>
Co-authored-by: Pierre Rousseau (pro) <pro@odoo.com>
Co-authored-by: Vincent Schippefilt (vsc) <vsc@odoo.com>
Co-authored-by: Marceline Thomas (matho) <matho@odoo.com>
---
 .../src/o_spreadsheet/o_spreadsheet.css       | 253 +++++----
 .../static/src/o_spreadsheet/o_spreadsheet.js | 116 ++--
 .../src/o_spreadsheet/o_spreadsheet.xml       | 503 +++++++++++-------
 3 files changed, 513 insertions(+), 359 deletions(-)

diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
index f53ae0494e7ef..8f4632ac9aeb8 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.css
@@ -2,64 +2,77 @@
 /*
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.1.0-alpha.11
- * @date 2025-11-03T12:41:11.975Z
- * @hash d9230f30a
+ * @version 19.1.0-alpha.12
+ * @date 2025-11-12T14:43:18.052Z
+ * @hash 6fefc9ceb
  */
 :root {
-  --os-gray-100: #f9fafb;
-  --os-gray-200: #e7e9ed; /* GRAY_200 */
-  --os-gray-300: #d8dadd; /* GRAY_300 */
-  --os-gray-400: #ced4da;
-  --os-gray-500: #7c7f89;
-  --os-gray-600: #5f636f;
-  --os-gray-700: #374151;
-  --os-gray-800: #1f2937;
-  --os-gray-900: #111827; /* GRAY_900 */
+  --os-gray-100: light-dark(#f9fafb, #1b1d26);
+  --os-gray-200: light-dark(#e7e9ed, #262a36); /* GRAY_200 */
+  --os-gray-300: light-dark(#d8dadd, #3c3e4b); /* GRAY_300 */
+  --os-gray-400: light-dark(#ced4da, #5a5e6b);
+  --os-gray-500: light-dark(#7c7f89, #6b707f);
+  --os-gray-600: light-dark(#5f636f, #7e8392);
+  --os-gray-700: light-dark(#374151, #b1b3bc);
+  --os-gray-800: light-dark(#1f2937, #d1d1d1);
+  --os-gray-900: light-dark(#111827, #e4e4e4); /* GRAY_900 */
+
+  --os-white: light-dark(#ffffff, #000000);
+  --os-black: light-dark(#000000, #ffffff);
+  --os-white-bg: light-dark(#ffffff, #1b1d26);
 
   --os-default-font: "Roboto", "Arial";
   --os-default-font-size: 10px;
-  --os-link-color: #017e84;
-  --os-link-hover-color: #01585c;
-  --os-text-body: #374151; /* TEXT_BODY */
-  --os-text-body-muted: #374151c2; /* TEXT_BODY_MUTED */
-  --os-disabled-text-color: #cacaca;
-
-  --os-button-hover-bg: var(--os-gray-300);
+  --os-link-color: light-dark(#017e84, #02c7b5);
+  --os-link-hover-color: light-dark(#01585c, #4ed8cb);
+  --os-text-body: light-dark(#374151, #e4e4e4); /* TEXT_BODY */
+  --os-text-body-muted: light-dark(#374151c2, #b1b3bcc2); /* TEXT_BODY_MUTED */
+  --os-disabled-text-color: light-dark(#cacaca, #ffffff80);
+
+  --os-button-bg: light-dark(var(--os-gray-200), var(--os-gray-300));
+  --os-button-hover-bg: light-dark(var(--os-gray-300), var(--os-gray-400));
   --os-button-hover-text-color: var(--os-gray-900);
-  --os-button-active-bg: #e6f2f3;
+  --os-button-active-bg: light-dark(#e6f2f3, #17373b);
   --os-button-active-text-color: var(--os-gray-900);
-  --os-primary-button-bg: #714b67;
-  --os-primary-button-hover-bg: #624159;
-  --os-primary-button-active-bg: #f1edf0;
+  --os-primary-button-bg: light-dark(#714b67, #6b3e66);
+  --os-primary-button-hover-bg: light-dark(#624159, #7b4775);
+  --os-primary-button-active-bg: light-dark(#f1edf0, #8b5185);
+  --os-primary-button-text-color: light-dark(#ffffff, #ffffff);
   --os-action-color: var(--os-link-color); /* ACTION_COLOR */
   --os-action-color-hover: var(--os-link-hover-color);
 
-  --os-composer-placeholder-color: #bdbdbd;
+  --os-composer-placeholder-color: light-dark(#bdbdbd, #757a89);
   --os-composer-assistant-color: #9b359b; /* COMPOSER_ASSISTANT_COLOR */
-  --os-composer-assistant-background: #f2f2f2;
+  --os-composer-assistant-background: light-dark(#f2f2f2, var(--os-gray-200));
   --os-composer-highlight-flag-color: #e6edf3;
   --os-composer-selector-flag-color: #a9a9a9;
 
   --os-selection-border-color: #3266ca; /* SELECTION_BORDER_COLOR */
   --os-badge-selected-color: var(--os-button-active-bg);
   --os-figure-border-color: var(--os-gray-400);
-  --os-background-gray-color: #f5f5f5;
+  --os-background-gray-color: light-dark(#f5f5f5, var(--os-white-bg));
+  --os-background-gray-color-hover: light-dark(rgba(0, 0, 0, 0.08), #ffffff40);
   --os-frozen-pane-header-border-color: #bcbcbc; /* FROZEN_PANE_HEADER_BORDER_COLOR */
-  --os-grid-border-color: #e2e3e3; /* CELL_BORDER_COLOR */
+  --os-grid-border-color: light-dark(#e2e3e3, var(--os-gray-200));
   --os-separator-color: var(--os-gray-300);
   --os-green-arrow-color: #6aa84f; /* Same color as CF arrow icon */
   --os-red-arrow-color: #e06666; /* Same color as CF arrow icon */
-
-  --os-alert-warning-bg: #fbebcc;
-  --os-alert-warning-border: #f8e2b3;
-  --os-alert-warning-text-color: #946d23;
-  --os-alert-danger-bg: #d44c591a;
-  --os-alert-danger-border: #c34a41;
-  --os-alert-danger-text-color: #c34a41;
-  --os-alert-info-bg: #cdedf1;
-  --os-alert-info-border: #98dbe2;
-  --os-alert-info-text-color: #09414a;
+  --os-active-sheet-bg: light-dark(#ffffff, var(--os-gray-300));
+
+  --os-alert-warning-bg: light-dark(#fbebcc, #3a2a05);
+  --os-alert-warning-border: light-dark(#f8e2b3, #5a420a);
+  --os-alert-warning-text-color: light-dark(#946d23, #f5d27b);
+  --os-alert-danger-bg: light-dark(#d44c591a, #3a0b0f);
+  --os-alert-danger-border: light-dark(#c34a41, #a23c36);
+  --os-alert-danger-text-color: light-dark(#c34a41, #ffb3a9);
+  --os-alert-info-bg: light-dark(#cdedf1, #062a30);
+  --os-alert-info-border: light-dark(#98dbe2, #22747e);
+  --os-alert-info-text-color: light-dark(#09414a, #9ee3ec);
+
+  --os-chart-preview-orange-line: light-dark(#eb6d00, #ff9d4d);
+  --os-chart-preview-orange-fill: light-dark(#ffe1c8, #734200);
+  --os-chart-preview-blue-line: light-dark(#0074d9, #4cb3ff);
+  --os-chart-preview-blue-fill: light-dark(#c4e4ff, #003e73);
 
   --os-header-height: 26px;
   --os-header-width: 48px;
@@ -160,7 +173,7 @@
   }
 
   @media (max-width: 768px) {
-    .irregularity-map span {
+    .topbar-banner span {
       overflow: auto;
       align-items: normal !important;
     }
@@ -187,7 +200,6 @@
     line-height: 1.2;
     font-size: 14px;
     font-weight: 500;
-    background-color: #fff;
 
     .o-topbar-top {
       border-bottom: 1px solid var(--os-separator-color);
@@ -207,7 +219,7 @@
       }
     }
 
-    .irregularity-map {
+    .topbar-banner {
       border-top: 1px solid var(--os-separator-color);
       height: var(--os-desktop-topbar-toolbar-height);
 
@@ -266,8 +278,6 @@
   }
 
   .o-dropdown-content {
-    background-color: white;
-
     .o-dropdown-line {
       display: flex;
 
@@ -301,7 +311,6 @@
   .o-table-style-popover {
     /* 7 tables preview + padding by line */
     width: calc((66px + 4px * 2) * 7 + 1.5rem * 2);
-    background: #fff;
     font-size: 14px;
     user-select: none;
 
@@ -318,7 +327,7 @@
         transition: color 0.2s, border-color 0.2s;
 
         &.selected {
-          border-bottom-color: #fff;
+          border-bottom-color: var(--os-white);
           border-top-color: var(--os-primary-button-bg);
           color: var(--os-button-active-text-color);
         }
@@ -360,7 +369,6 @@
         display: block !important;
         right: 0;
         top: 0;
-        background: #fff;
         cursor: pointer;
         border: 1px solid var(--os-gray-300);
         padding: 1px 1px 1px 2px;
@@ -416,8 +424,16 @@
 .o-spreadsheet {
   color: var(--os-text-body);
 
+  .bg-white {
+    background-color: var(--os-white-bg) !important;
+  }
+
+  select > option {
+    background-color: var(--os-white-bg);
+  }
+
   input {
-    background-color: white;
+    background-color: var(--os-white-bg);
   }
 
   &.o-spreadsheet-mobile .o-spreadsheet-topbar-wrapper,
@@ -508,7 +524,7 @@
     color: var(--os-gray-900);
 
     &::placeholder {
-      opacity: 0.5;
+      color: var(--os-composer-placeholder-color);
     }
     &:focus {
       border-color: var(--os-action-color);
@@ -587,8 +603,8 @@
     height: 32px;
     line-height: 16px;
     flex-grow: 1;
-    background-color: var(--os-gray-200);
-    border: 1px solid var(--os-gray-200);
+    background-color: var(--os-button-bg);
+    border: 1px solid var(--os-button-bg);
     color: var(--os-text-body);
 
     &:disabled {
@@ -598,9 +614,9 @@
     &.primary {
       background-color: var(--os-primary-button-bg);
       border-color: var(--os-primary-button-bg);
-      color: #fff;
+      color: var(--os-primary-button-text-color);
       &:hover:enabled {
-        color: #fff;
+        color: var(--os-primary-button-text-color);
         background-color: var(--os-primary-button-hover-bg);
       }
       &:active:enabled {
@@ -628,7 +644,7 @@
     }
 
     &.o-button-danger:hover {
-      color: #ffffff;
+      color: var(--os-white);
       background: var(--os-alert-danger-border);
     }
   }
@@ -659,6 +675,14 @@
   }
 }
 
+.o-spreadsheet.dark {
+  select.o-input {
+    background: transparent
+      url("data:image/svg+xml,%3Csvg%20xmlns%3D%27http%3A//www.w3.org/2000/svg%27%20width%3D%277%27%20height%3D%274%27%20viewBox%3D%270%200%207%204%27%3E%3Cpolygon%20fill%3D%27%23e4e4e4%27%20points%3D%273.5%204%207%200%200%200%27/%3E%3C/svg%3E")
+      no-repeat right center;
+  }
+}
+
 /* Originates from src/components/small_bottom_bar/small_bottom_bar.css */
 .o-spreadsheet .o-spreadsheet-small-bottom-bar {
   background-color: var(--os-background-gray-color);
@@ -674,7 +698,6 @@
   }
 
   .o-small-composer {
-    background-color: white;
     border: var(--os-gray-400) solid 1px;
     line-height: 26px;
     display: flex;
@@ -779,7 +802,6 @@
     display: flex;
     flex-direction: column;
     overflow-x: hidden;
-    background-color: white;
     border: solid var(--os-gray-300);
     border-width: 1px 0 0 1px;
     user-select: none;
@@ -879,7 +901,7 @@
 
       &:not(.inactive) {
         color: var(--os-button-active-text-color);
-        border-bottom: 1px solid #fff;
+        border-bottom: 1px solid transparent;
       }
     }
     .o-sidePanel-tab:last-child {
@@ -958,7 +980,6 @@
 /* Originates from src/components/side_panel/pivot/pivot_layout_configurator/pivot_dimension/pivot_dimension.css */
 .o-spreadsheet {
   .pivot-dimension {
-    background-color: white;
     border: 1px solid var(--os-gray-300);
     border-radius: 4px;
 
@@ -966,10 +987,6 @@
       height: inherit;
     }
 
-    select > option {
-      background-color: white;
-    }
-
     .pivot-dim-operator-label {
       min-width: 120px;
     }
@@ -993,9 +1010,6 @@
     width: 13px;
     height: 13px;
   }
-  .pivot-dimension-search {
-    background-color: white;
-  }
   .add-dimension.o-button {
     padding: 2px 7px;
     font-weight: 400;
@@ -1041,10 +1055,9 @@
   .o-more-formats-panel {
     .format-preview {
       height: 49px;
-      background-color: white;
       cursor: pointer;
       &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover) !important;
       }
     }
     .check-icon {
@@ -1104,7 +1117,7 @@
       }
 
       &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover);
       }
 
       &:not(:hover) .o-dv-preview-delete {
@@ -1117,9 +1130,6 @@
 /* Originates from src/components/side_panel/custom_currency/custom_currency.css */
 .o-spreadsheet {
   .o-custom-currency {
-    .o-format-proposals {
-      color: black;
-    }
     .o-format-examples {
       background: var(--os-gray-100);
       padding: 8px;
@@ -1167,7 +1177,6 @@
     }
     .o-cf-preview-icon {
       border: 1px solid var(--os-gray-300);
-      background-color: #fff;
       position: absolute;
       height: 50px;
       width: 50px;
@@ -1246,7 +1255,7 @@
     }
     .o-cf-iconset-rule {
       .o-cf-clickable-icon {
-        border: 1px solid var(--os-gray-200);
+        border: 1px solid var(--os-gray-300);
         border-radius: 4px;
         cursor: pointer;
         &:hover {
@@ -1341,6 +1350,12 @@
   }
 }
 
+.o-spreadsheet.dark {
+  .o-radio input:checked {
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='%23000'/%3e%3c/svg%3e");
+  }
+}
+
 /* Originates from src/components/side_panel/components/collapsible/side_panel_collapsible.css */
 .o-spreadsheet {
   .o_side_panel_collapsible_title {
@@ -1402,6 +1417,12 @@
   }
 }
 
+.o-spreadsheet.dark {
+  label.o-checkbox input:checked {
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23000' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e");
+  }
+}
+
 /* Originates from src/components/side_panel/components/badge_selection/badge_selection.css */
 .o-spreadsheet {
   .o-badge-selection {
@@ -1483,7 +1504,6 @@
   }
 
   .o-popover .o-chart-select-popover {
-    background: #fff;
     .o-chart-type-item {
       cursor: pointer;
       padding: 3px 6px;
@@ -1554,7 +1574,6 @@
 .o-spreadsheet .o-carousel-panel {
   .o-carousel-preview {
     height: 60px;
-    background-color: #fff;
     border-left: 5px solid transparent;
 
     &:not(:hover):not(.o-dragging) .o-drag-handle {
@@ -1649,6 +1668,12 @@
   }
 }
 
+.o-spreadsheet.dark {
+  .o-popover {
+    border: 1px solid var(--os-gray-400);
+  }
+}
+
 /* Originates from src/components/pivot_html_renderer/pivot_html_renderer.css */
 .o-spreadsheet {
   .o_pivot_html_renderer {
@@ -1662,7 +1687,7 @@
     td,
     th {
       border: 1px solid var(--os-gray-300);
-      background-color: #fff;
+      background-color: var(--os-white-bg);
       padding: 0.3rem;
       white-space: nowrap;
 
@@ -1678,7 +1703,7 @@
     th {
       background-color: var(--os-background-gray-color);
       font-weight: bold;
-      color: black;
+      color: var(--os-black);
     }
 
     .o_missing_value {
@@ -1692,7 +1717,7 @@
 .o-spreadsheet {
   .o-number-editor {
     width: max-content !important;
-    height: calc(100% - 4px);
+
     input.o-font-size {
       outline: none;
       height: 20px;
@@ -1705,7 +1730,7 @@
     line-height: 26px;
     padding: 3px 12px;
     &:hover {
-      background-color: rgba(0, 0, 0, 0.08);
+      background-color: var(--os-background-gray-color-hover);
     }
   }
 }
@@ -1714,14 +1739,12 @@
 .o-spreadsheet {
   .o-menu-wrapper {
     padding: var(--os-menu-vertical-padding) 0px;
-    background-color: white;
   }
 }
 
 /* Originates from src/components/menu/menu.css */
 .o-spreadsheet {
   .o-menu {
-    background-color: white;
     user-select: none;
     .o-menu-item {
       cursor: pointer;
@@ -1770,7 +1793,6 @@
 .o-spreadsheet {
   .o-link-editor {
     font-size: 13px;
-    background-color: white;
     box-shadow: 0 1px 4px 3px rgba(60, 64, 67, 0.15);
     padding: 12px;
     display: flex;
@@ -1803,7 +1825,7 @@
         border: none;
         height: 20px;
         width: 20px;
-        background-color: #fff;
+        background-color: var(--os-white-bg);
         margin: 2px 3px 1px 0px;
         padding: 0px 1px 0px 0px;
       }
@@ -1818,7 +1840,6 @@
 .o-spreadsheet {
   .o-link-tool {
     font-size: 13px;
-    background-color: white;
     box-shadow: 0 1px 4px 3px rgba(60, 64, 67, 0.15);
     padding: 6px 12px;
     border-radius: 4px;
@@ -1859,7 +1880,7 @@
   }
   .o-link-icon:hover {
     cursor: pointer;
-    color: #000;
+    color: var(--os-black);
   }
 }
 
@@ -1894,7 +1915,6 @@
   .o-icon-picker {
     position: absolute;
     box-shadow: 1px 2px 5px 2px rgba(51, 51, 51, 0.15);
-    background-color: white;
     padding: 2px 1px;
     z-index: var(--os-components-importance-icon-picker);
   }
@@ -2373,6 +2393,9 @@
 /* Originates from src/components/figures/figure/figure.css */
 .o-spreadsheet {
   div.o-figure {
+    color-scheme: light;
+    color: var(--os-text-body);
+
     position: absolute;
     width: 100%;
     height: 100%;
@@ -2472,7 +2495,7 @@
       &:hover,
       &:target {
         color: var(--os-gray-900) !important;
-        background: rgba(0, 0, 0, 0.1);
+        background: var(--os-background-gray-color-hover);
       }
 
       .o-chart-preview {
@@ -2513,7 +2536,6 @@
 .o-spreadsheet {
   .o-error-tooltip {
     font-size: 13px;
-    background-color: white;
     border-left: 3px solid red;
     padding: 10px;
     overflow-wrap: break-word;
@@ -2606,7 +2628,7 @@
 /* Originates from src/components/composer/speech_bubble/speech_bubble.css */
 .o-spreadsheet {
   .o-speech-bubble {
-    background-color: white;
+    background-color: var(--os-white-bg);
     box-sizing: border-box;
     box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
     border: 1px solid var(--os-gray-400);
@@ -2617,7 +2639,7 @@
       position: absolute;
       top: 100%;
       left: 50%;
-      background-color: white;
+      background-color: var(--os-white-bg);
       height: var(--os-bubble-arrow-size);
       width: var(--os-bubble-arrow-size);
       transform-origin: top left;
@@ -2635,6 +2657,7 @@
 /* Originates from src/components/composer/grid_composer/grid_composer.css */
 .o-spreadsheet {
   div.o-grid-composer {
+    color-scheme: light;
     z-index: var(--os-components-importance-grid-composer);
     position: absolute;
     font-family: var(--os-default-font);
@@ -2657,7 +2680,6 @@
 
 /* Originates from src/components/composer/formula_assistant/formula_assistant.css */
 .o-spreadsheet .o-formula-assistant {
-  background: #ffffff;
   .o-formula-assistant-head {
     background-color: var(--os-composer-assistant-background);
     padding: 10px;
@@ -2672,7 +2694,7 @@
     color: var(--os-composer-assistant-color);
     text-shadow: 0px 0px 1px var(--os-composer-assistant-color);
     & + div {
-      color: black;
+      color: var(--os-black);
     }
   }
   .o-formula-assistant-gray {
@@ -2710,7 +2732,7 @@
       word-break: break-all;
       padding-right: 2px;
 
-      caret-color: black;
+      caret-color: var(--os-black);
       padding-left: 3px;
       padding-right: 3px;
       outline: none;
@@ -2778,6 +2800,12 @@
         font-weight: 600 !important;
       }
     }
+
+    .o-composer-assistant-container {
+      .fa-times-circle {
+        color: var(--os-primary-button-bg);
+      }
+    }
   }
 }
 
@@ -2786,7 +2814,6 @@
   .o-autocomplete-dropdown {
     pointer-events: auto;
     cursor: pointer;
-    background-color: #fff;
     max-width: 400px;
     z-index: 1;
     .o-autocomplete-value-focus {
@@ -2819,7 +2846,7 @@
       border-radius: 2px;
       cursor: pointer;
       &:not([disabled]):hover {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover);
       }
     }
 
@@ -2844,7 +2871,6 @@
     padding: var(--os-picker-padding) 0;
     /* FIXME: this is useless, overiden by the popover container */
     box-shadow: 1px 2px 5px 2px rgba(51, 51, 51, 0.15);
-    background-color: white;
     line-height: 1.2;
     overflow-y: auto;
     overflow-x: hidden;
@@ -2878,12 +2904,11 @@
       height: calc(var(--os-item-edge-length) + (2 * var(--os-item-border-width)));
       margin: 0px;
       border-radius: 50px;
-      border: var(--os-item-border-width) solid var(--os-gray-600);
+      border: var(--os-item-border-width) solid light-dark(var(--os-gray-600), transparent);
       padding: 0px;
       font-size: 16px;
-      background: white;
       &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover);
         outline: 1px solid var(--os-gray-500);
         cursor: pointer;
       }
@@ -2896,20 +2921,20 @@
         width: 100%;
         padding: 5px;
         font-size: 14px;
-        background: white;
+        background-color: var(--os-white-bg);
         border-radius: 4px;
         &:hover:enabled {
-          background-color: rgba(0, 0, 0, 0.08);
+          background-color: var(--os-background-gray-color-hover);
         }
       }
     }
     .o-add-button {
       border: var(--os-item-border-width) solid var(--os-gray-300);
       padding: 4px;
-      background: white;
+      background-color: var(--os-white-bg);
       border-radius: 4px;
       &:hover:enabled {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover);
       }
     }
     .o-separator {
@@ -2933,13 +2958,13 @@
         height: var(--os-magnifier-edge);
         width: var(--os-magnifier-edge);
         border-radius: 50%;
-        border: 2px solid #fff;
+        border: 2px solid var(--os-white);
         box-shadow: 0px 0px 3px var(--os-gray-300);
         position: absolute;
         z-index: 2;
       }
       .saturation {
-        background: linear-gradient(to right, #fff 0%, transparent 100%);
+        background: linear-gradient(to right, var(--os-white) 0%, transparent 100%);
       }
       .lightness {
         background: linear-gradient(to top, #000 0%, transparent 100%);
@@ -3026,7 +3051,7 @@
     .o-sheet-item {
       cursor: pointer;
       &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover);
       }
     }
 
@@ -3088,7 +3113,7 @@
     padding: 4px 4px 4px 8px;
     cursor: pointer;
     &:hover {
-      background-color: rgba(0, 0, 0, 0.08) !important;
+      background-color: var(--os-background-gray-color-hover) !important;
     }
   }
 }
@@ -3104,12 +3129,12 @@
     margin-left: -1px;
     cursor: pointer;
     &:hover {
-      background-color: rgba(0, 0, 0, 0.08);
+      background-color: var(--os-background-gray-color-hover);
     }
 
     &.active {
       color: var(--os-action-color);
-      background-color: #ffffff;
+      background-color: var(--os-active-sheet-bg);
       box-shadow: 0 1px 3px 1px rgba(60, 64, 67, 0.15);
     }
 
@@ -3117,7 +3142,7 @@
       z-index: 1;
 
       &:hover {
-        background-color: rgba(0, 0, 0, 0.08);
+        background-color: var(--os-background-gray-color-hover);
       }
     }
 
@@ -3152,7 +3177,6 @@
 .o-spreadsheet {
   .o-border-selector {
     padding: 4px;
-    background-color: white;
 
     .o-divider {
       border-right: 1px solid var(--os-gray-300);
@@ -3181,7 +3205,6 @@
   }
 
   .o-border-style-dropdown {
-    background: #ffffff;
     padding: 4px;
     .o-style-preview {
       margin: 7px 5px 7px 5px;
@@ -3189,19 +3212,19 @@
       height: 5px;
     }
     .o-style-thin {
-      border-bottom: 1px solid #000000;
+      border-bottom: 1px solid var(--os-black);
     }
     .o-style-medium {
-      border-bottom: 2px solid #000000;
+      border-bottom: 2px solid var(--os-black);
     }
     .o-style-thick {
-      border-bottom: 3px solid #000000;
+      border-bottom: 3px solid var(--os-black);
     }
     .o-style-dashed {
-      border-bottom: 1px dashed #000000;
+      border-bottom: 1px dashed var(--os-black);
     }
     .o-style-dotted {
-      border-bottom: 1px dotted #000000;
+      border-bottom: 1px dotted var(--os-black);
     }
     .o-dropdown-border-type {
       cursor: pointer;
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
index 8db28a3e3bbf9..5e492cdb61f1f 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.js
@@ -1,13 +1,17 @@
-
+// @odoo-module ignore
+// Transpiled AOT with https://github.com/rrahir/spreadsheet-tools
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 19.1.0-alpha.11
- * @date 2025-11-03T12:41:02.741Z
- * @hash d9230f30a
+ * @version 19.1.0-alpha.12
+ * @date 2025-11-12T14:43:08.020Z
+ * @hash 6fefc9ceb
  */
+odoo.define('@spreadsheet/o_spreadsheet/o_spreadsheet', ['@odoo/owl'], function (require) {
+'use strict';
+let __exports = {};
 
-import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
+const { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, useExternalListener, onWillUpdateProps, onWillStart, onWillPatch, xml, useChildSubEnv, markRaw, toRaw } = require('@odoo/owl');
 
 const CANVAS_SHIFT = 0.5;
 // Colors
@@ -247,7 +251,7 @@ const DEFAULT_CAROUSEL_TITLE_STYLE = {
     fontSize: CHART_TITLE_FONT_SIZE,
     color: TEXT_BODY,
 };
-const DEFAULT_TOKEN_COLOR = "#000000";
+const DEFAULT_TOKEN_COLOR = "light-dark(#000000, #ffffff)";
 const functionColor = DEFAULT_TOKEN_COLOR;
 const operatorColor = "#3da4ab";
 const tokenColors = {
@@ -1775,7 +1779,10 @@ function isInside(col, row, zone) {
  * Check if a zone is inside another
  */
 function isZoneInside(smallZone, biggerZone) {
-    return isEqual(union(biggerZone, smallZone), biggerZone);
+    return (smallZone.left >= biggerZone.left &&
+        smallZone.right <= biggerZone.right &&
+        smallZone.top >= biggerZone.top &&
+        smallZone.bottom <= biggerZone.bottom);
 }
 function zoneToDimension(zone) {
     return {
@@ -18389,12 +18396,10 @@ const colors = [
     "#00a3a3",
     "#f012be",
     "#3d9970",
-    "#111111",
     "#62A300",
     "#ff4136",
     "#949494",
-    "#85144b",
-    "#001f3f",
+    "#ff5c9d",
 ];
 /*
  * transform a color number (R * 256^2 + G * 256 + B) into classic hex (+alpha) value
@@ -19419,7 +19424,7 @@ function getRangeString(range, forSheetId, getSheetName, options = { useBoundedR
     let sheetName = "";
     if (prefixSheet) {
         if (range.invalidSheetName) {
-            sheetName = range.invalidSheetName;
+            sheetName = getCanonicalSymbolName(range.invalidSheetName);
         }
         else {
             sheetName = getCanonicalSymbolName(getSheetName(range.sheetId));
@@ -22396,7 +22401,7 @@ let ScorecardChart$1 = class ScorecardChart extends AbstractChart {
         return {
             background: context.background,
             type: "scorecard",
-            keyValue: context.range ? context.range[0].dataRange : undefined,
+            keyValue: context.range?.[0]?.dataRange,
             title: context.title || { text: "" },
             baselineMode: DEFAULT_SCORECARD_BASELINE_MODE,
             baselineColorUp: DEFAULT_SCORECARD_BASELINE_COLOR_UP,
@@ -23320,8 +23325,7 @@ function generateMasterChartConfig(chartJsConfig) {
                 .filter((ds) => !isTrendLineAxis(ds["xAxisID"]))
                 .map((ds) => ({
                 ...ds,
-                pointRadius: 0,
-                showLine: true,
+                pointRadius: ds.showLine === false ? 2 : 0, // Show points only for scatter plots
             })),
         },
         options: {
@@ -23884,9 +23888,13 @@ async function canvasToObjectUrl(canvas) {
     if (!blob) {
         return undefined;
     }
-    if (!URL.createObjectURL)
-        throw new Error("URL.createObjectURL is not supported in this environment");
-    return URL.createObjectURL(blob);
+    return new Promise((resolve) => {
+        const f = new FileReader();
+        f.addEventListener("load", () => {
+            resolve(f.result);
+        });
+        f.readAsDataURL(blob);
+    });
 }
 
 /**
@@ -56920,7 +56928,7 @@ class GaugeChart extends AbstractChart {
             background: context.background,
             title: context.title || { text: "" },
             type: "gauge",
-            dataRange: context.range ? context.range[0].dataRange : undefined,
+            dataRange: context.range?.[0]?.dataRange,
             sectionRule: {
                 colors: {
                     lowerColor: DEFAULT_GAUGE_LOWER_COLOR,
@@ -61730,7 +61738,7 @@ class TextValueProvider extends Component {
     }
     getCss(html) {
         return cssPropertiesToCss({
-            color: html.color || "#000000",
+            color: html.color,
             background: html.backgroundColor,
         });
     }
@@ -61885,6 +61893,9 @@ class ContentEditableHelper {
                 const span = document.createElement("span");
                 span.innerText = content.value;
                 span.style.color = content.color || "";
+                if (content.opacity !== undefined && content.opacity !== 1) {
+                    span.style.opacity = content.opacity.toString();
+                }
                 span.addEventListener("mousemove", () => {
                     content.onHover?.(getBoundingRectAsPOJO(span));
                 });
@@ -61980,12 +61991,14 @@ class ContentEditableHelper {
     }
 }
 function compareContentToSpanElement(content, node) {
-    const contentColor = content.color ? toHex(content.color) : "";
-    const nodeColor = node.style?.color ? toHex(node.style.color) : "";
+    const contentColor = content.color || "";
+    const nodeColor = node.style?.color || "";
+    const nodeOpacity = node.style?.opacity || "1";
     const sameColor = contentColor === nodeColor;
     const sameClass = deepEquals$1(content.classes, [...node.classList]);
     const sameContent = node.innerText === content.value;
-    return sameColor && sameClass && sameContent;
+    const sameOpacity = (content.opacity ?? 1).toString() === nodeOpacity;
+    return sameColor && sameClass && sameContent && sameOpacity;
 }
 const doc = new DOMParser();
 const brNode = doc.parseFromString("<br>", "text/html").body.firstChild;
@@ -62591,10 +62604,6 @@ class Composer extends Component {
         const { end, start } = this.props.composerStore.composerSelection;
         for (let index = 0; index < tokens.length; index++) {
             const token = tokens[index];
-            let color = token.color || DEFAULT_TOKEN_COLOR;
-            if (token.isBlurred) {
-                color = setColorAlpha(color, 0.5);
-            }
             const classes = [];
             if (token.type === "REFERENCE" &&
                 this.props.composerStore.tokenAtCursor === token &&
@@ -62612,7 +62621,8 @@ class Composer extends Component {
             }
             result.push({
                 value: token.value,
-                color,
+                color: token.color || DEFAULT_TOKEN_COLOR,
+                opacity: token.isBlurred ? 0.5 : 1,
                 classes,
                 onHover: (rect) => this.onTokenHover(index, rect),
                 onStopHover: () => this.onTokenHover(undefined),
@@ -63169,6 +63179,7 @@ class AbstractComposerStore extends SpreadsheetStore {
         this.highlightStore.register(this);
         this.onDispose(() => {
             this.highlightStore.unRegister(this);
+            this._cancelEdition();
         });
     }
     handleEvent(event) {
@@ -72287,6 +72298,9 @@ class GridRenderer extends SpreadsheetStore {
                 break;
         }
     }
+    finalize() {
+        this.zonesWithPreventedAnimationsInNextFrame = recomputeZones(this.zonesWithPreventedAnimationsInNextFrame);
+    }
     get renderingLayers() {
         return ["Background", "Headers"];
     }
@@ -76890,15 +76904,19 @@ class ConditionalFormattingEditor extends Component {
         this.updateConditionalFormat({ rule: this.state.rules.colorScale });
         this.closeMenus();
     }
-    getPreviewGradient() {
+    getColorScalePreviewStyle() {
         const rule = this.state.rules.colorScale;
         const minColor = colorNumberToHex(rule.minimum.color);
         const midColor = colorNumberToHex(rule.midpoint?.color || DEFAULT_COLOR_SCALE_MIDPOINT_COLOR);
         const maxColor = colorNumberToHex(rule.maximum.color);
-        const baseString = "background-image: linear-gradient(to right, ";
-        return rule.midpoint === undefined
+        const baseString = "linear-gradient(to right, ";
+        const backgroundImage = rule.midpoint === undefined
             ? baseString + minColor + ", " + maxColor + ")"
             : baseString + minColor + ", " + midColor + ", " + maxColor + ")";
+        return cssPropertiesToCss({
+            "background-image": backgroundImage,
+            color: "#000",
+        });
     }
     getThresholdColor(threshold) {
         return threshold
@@ -79244,11 +79262,15 @@ pivotSidePanelRegistry.add("SPREADSHEET", {
 class PivotDesignPanel extends Component {
     static template = "o-spreadsheet-PivotDesignPanel";
     static props = { pivotId: String };
-    static components = { Section, Checkbox };
+    static components = { Section, Checkbox, NumberInput };
     store;
     setup() {
         this.store = useLocalStore(PivotSidePanelStore, this.props.pivotId, "neverDefer");
     }
+    updatePivotStyleNumberProperty(valueStr, key) {
+        const value = parseInt(valueStr);
+        this.store.update({ style: { ...this.pivotStyle, [key]: isNaN(value) ? undefined : value } });
+    }
     updatePivotStyleProperty(key, value) {
         this.store.update({ style: { ...this.pivotStyle, [key]: value } });
     }
@@ -82055,7 +82077,7 @@ autoCompleteProviders.add("dataValidation", {
                 htmlContent: [
                     {
                         value: value.label,
-                        color: color ? chipTextColor(color) : undefined,
+                        color: chipTextColor(color || GRAY_200),
                         backgroundColor: color || GRAY_200,
                         classes: ["badge rounded-pill fs-6 fw-normal w-100 mt-1 text-start"],
                     },
@@ -82739,6 +82761,7 @@ topbarMenuRegistry
     .add("file", {
     name: _t$1("File"),
     sequence: 10,
+    isReadonlyAllowed: true,
 })
     .addChild("settings", ["file"], {
     name: _t$1("Settings"),
@@ -82753,6 +82776,7 @@ topbarMenuRegistry
     .add("edit", {
     name: _t$1("Edit"),
     sequence: 20,
+    isReadonlyAllowed: true,
 })
     .addChild("undo", ["edit"], {
     ...undo,
@@ -82837,6 +82861,7 @@ topbarMenuRegistry
     .add("view", {
     name: _t$1("View"),
     sequence: 30,
+    isReadonlyAllowed: true,
 })
     .addChild("unfreeze_panes", ["view"], {
     ...unFreezePane,
@@ -82933,6 +82958,7 @@ topbarMenuRegistry
     .add("insert", {
     name: _t$1("Insert"),
     sequence: 40,
+    isReadonlyAllowed: true,
 })
     .addChild("insert_row", ["insert"], {
     ...insertRow,
@@ -83044,7 +83070,11 @@ topbarMenuRegistry
     // ---------------------------------------------------------------------
     // FORMAT MENU ITEMS
     // ---------------------------------------------------------------------
-    .add("format", { name: _t$1("Format"), sequence: 50 })
+    .add("format", {
+    name: _t$1("Format"),
+    sequence: 50,
+    isReadonlyAllowed: true,
+})
     .addChild("format_number", ["format"], {
     ...formatNumberMenuItemSpec,
     name: _t$1("Number"),
@@ -83136,6 +83166,7 @@ topbarMenuRegistry
     .add("data", {
     name: _t$1("Data"),
     sequence: 60,
+    isReadonlyAllowed: true,
 })
     .addChild("sort_range", ["data"], {
     ...sortRange,
@@ -85823,6 +85854,7 @@ class Spreadsheet extends Component {
         notifyUser: { type: Function, optional: true },
         raiseError: { type: Function, optional: true },
         askConfirmation: { type: Function, optional: true },
+        colorScheme: { type: String, optional: true },
     };
     static components = {
         TopBar,
@@ -85858,6 +85890,7 @@ class Spreadsheet extends Component {
             : "auto";
         properties["grid-template-columns"] = `auto ${columnWidth}`;
         properties["--os-scrollbar-width"] = `${scrollbarWidth}px`;
+        properties["color-scheme"] = this.props.colorScheme;
         return cssPropertiesToCss(properties);
     }
     setup() {
@@ -86021,6 +86054,12 @@ class Spreadsheet extends Component {
             height: Math.max(gridHeight / zoom - scrollbarWidth, 0),
         };
     }
+    getSpreadSheetClasses() {
+        return [
+            this.env.isSmall ? "o-spreadsheet-mobile" : "",
+            this.props.colorScheme === "dark" ? "dark" : "",
+        ].join(" ");
+    }
 }
 
 class ComboChart extends AbstractChart {
@@ -88468,6 +88507,7 @@ const components = {
     ChartDashboardMenu,
     FullScreenFigure,
     NumberInput,
+    TopBar,
 };
 const hooks = {
     useDragAndDropListItems,
@@ -88514,10 +88554,12 @@ const constants = {
 };
 const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 
-export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType$1 as CellErrorType, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DEFAULT_LOCALE, DEFAULT_LOCALES, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, categories, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, createAutocompleteArgumentsProvider, findCellInNewZone, functionCache, getCaretDownSvg, getCaretUpSvg, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
+Object.assign(__exports, { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler,CellErrorType:  CellErrorType$1, ClientDisconnectedError, CommandResult, CorePlugin, CoreViewPlugin, DEFAULT_LOCALE, DEFAULT_LOCALES, DispatchResult, EvaluationError, LocalTransportService, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, categories, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, createAutocompleteArgumentsProvider, findCellInNewZone, functionCache, getCaretDownSvg, getCaretUpSvg, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize });
 
 
-__info__.version = "19.1.0-alpha.11";
-__info__.date = "2025-11-03T12:41:02.741Z";
-__info__.hash = "d9230f30a";
+__info__.version = "19.1.0-alpha.12";
+__info__.date = "2025-11-12T14:43:08.020Z";
+__info__.hash = "6fefc9ceb";
 //# sourceMappingURL=o_spreadsheet.esm.js.map
+return __exports;
+});
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
index 0f767f0d3bd43..1a5eb56c59092 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet.xml
@@ -1,9 +1,9 @@
 <!--
  This file is generated by o-spreadsheet build tools. Do not edit it.
  @see https://github.com/odoo/o-spreadsheet
- @version 19.1.0-alpha.11
- @date 2025-11-03T12:41:11.016Z
- @hash d9230f30a
+ @version 19.1.0-alpha.12
+ @date 2025-11-12T14:43:17.146Z
+ @hash 6fefc9ceb
 -->
 <odoo>
   <t t-name="o-spreadsheet-ValidationMessages">
@@ -29,7 +29,7 @@
 
   <t t-name="o-spreadsheet-TopBar">
     <div
-      class="o-spreadsheet-topbar d-flex flex-column user-select-none"
+      class="o-spreadsheet-topbar d-flex flex-column user-select-none bg-white"
       t-on-click="props.onClick">
       <div t-if="!env.isSmall" class="o-topbar-top d-flex justify-content-between">
         <!-- Menus -->
@@ -100,7 +100,7 @@
       </div>
       <div
         t-if="this.fingerprints.isEnabled"
-        class="irregularity-map d-flex align-items-center justify-content-between">
+        class="topbar-banner irregularity-map d-flex align-items-center justify-content-between">
         <div
           t-on-click="() => this.fingerprints.disable()"
           role="button"
@@ -132,7 +132,7 @@
       popoverPositioning="'bottom-left'"
     />
     <Popover t-if="state.toolsPopoverState.isOpen" t-props="toolsPopoverProps">
-      <div class="d-flex px-2 py-1 flex-wrap align-items-center" style="background-color:white;">
+      <div class="d-flex px-2 py-1 flex-wrap align-items-center bg-white">
         <t
           t-foreach="state.invisibleToolsCategories"
           t-as="category"
@@ -206,7 +206,7 @@
       class="props.class"
     />
     <Popover t-if="isActive" t-props="popoverProps">
-      <div class="o-dropdown-content p-1" t-if="isActive" t-on-click.stop="">
+      <div class="o-dropdown-content p-1 bg-white" t-if="isActive" t-on-click.stop="">
         <div class="o-dropdown-line">
           <t t-foreach="props.childActions" t-as="action" t-key="action_index">
             <ActionButton action="action" class="props.childClass"/>
@@ -248,7 +248,7 @@
   <t t-name="o-spreadsheet-TableStylesPopover">
     <Popover t-if="props.popoverProps" t-props="props.popoverProps">
       <div
-        class="o-table-style-popover d-flex flex-column py-3"
+        class="o-table-style-popover d-flex flex-column py-3 bg-white"
         t-ref="tableStyleList"
         t-on-contextmenu.prevent="">
         <div class="d-flex o-notebook ps-4 mb-3">
@@ -297,7 +297,7 @@
         <canvas t-ref="canvas" class="w-100 h-100"/>
       </div>
       <div
-        class="o-table-style-edit-button position-absolute d-none"
+        class="o-table-style-edit-button position-absolute d-none bg-white"
         t-if="isStyleEditable"
         t-on-click="this.editTableStyle"
         title="Edit custom table style">
@@ -369,7 +369,7 @@
   <t t-name="o-spreadsheet-Spreadsheet">
     <div
       class="o-spreadsheet h-100 w-100"
-      t-att-class="{'o-spreadsheet-mobile': env.isSmall}"
+      t-att-class="getSpreadSheetClasses()"
       t-ref="spreadsheet"
       t-att-style="getStyle()">
       <t t-if="env.isDashboard()">
@@ -411,7 +411,7 @@
         <RibbonMenu onClose="() => this.menuState.isOpen=false"/>
       </t>
       <t t-else="">
-        <div class="o-small-composer px-2 py-2 position-relative">
+        <div class="o-small-composer px-2 py-2 position-relative bg-white">
           <div class="w-100" t-ref="bottombarComposer">
             <Composer t-props="composerProps"/>
             <span
@@ -690,7 +690,7 @@
   </t>
 
   <t t-name="o-spreadsheet-SidePanelExtended">
-    <div class="o-sidePanel h-100">
+    <div class="o-sidePanel h-100 bg-white">
       <div class="o-sidePanelHeader d-flex align-items-center justify-content-between">
         <div
           t-if="props.onToggleCollapsePanel"
@@ -735,7 +735,9 @@
   </t>
 
   <t t-name="o-spreadsheet-SidePanelCollapsed">
-    <div class="o-sidePanel collapsed w-100 h-100" t-on-click="props.onToggleCollapsePanel">
+    <div
+      class="o-sidePanel collapsed w-100 h-100 bg-white"
+      t-on-click="props.onToggleCollapsePanel">
       <div class="d-flex flex-column align-items-center">
         <div
           t-if="props.onToggleCollapsePanel"
@@ -972,24 +974,22 @@
           <div class="row mb-2 align-items-center">
             <div class="col-6">Max rows:</div>
             <div class="col-6 d-flex align-items-center">
-              <input
-                t-att-value="pivotStyle.numberOfRows ?? ''"
-                type="number"
-                class="o-pivot-n-of-rows o-input"
-                placeholder="e.g. 10"
-                t-on-change="(ev) => this.updatePivotStyleProperty('numberOfRows', ev.target.valueAsNumber)"
+              <NumberInput
+                value="pivotStyle.numberOfRows ?? ''"
+                class="'o-pivot-n-of-rows'"
+                placeholder.translate="e.g. 10"
+                onChange="(value) => this.updatePivotStyleNumberProperty(value, 'numberOfRows')"
               />
             </div>
           </div>
           <div class="row mb-2 align-items-center">
             <div class="col-6">Max columns:</div>
             <div class="col-6 d-flex align-items-center">
-              <input
-                t-att-value="pivotStyle.numberOfColumns ?? ''"
-                type="number"
-                class="o-pivot-n-of-columns o-input"
-                placeholder="e.g. 5"
-                t-on-change="(ev) => this.updatePivotStyleProperty('numberOfColumns', ev.target.valueAsNumber)"
+              <NumberInput
+                value="pivotStyle.numberOfColumns ?? ''"
+                class="'o-pivot-n-of-columns'"
+                placeholder.translate="e.g. 5"
+                onChange="(value) => this.updatePivotStyleNumberProperty(value, 'numberOfColumns')"
               />
             </div>
           </div>
@@ -1321,7 +1321,7 @@
 
   <t t-name="o-spreadsheet-PivotDimension">
     <div
-      class="py-1 px-2 d-flex flex-column shadow-sm pivot-dimension"
+      class="py-1 px-2 d-flex flex-column shadow-sm pivot-dimension bg-white"
       t-att-class="{'pivot-dimension-invalid': !props.dimension.isValid}">
       <div class="d-flex flex-row justify-content-between align-items-center">
         <div class="d-flex align-items-center overflow-hidden text-nowrap">
@@ -1354,7 +1354,7 @@
     <button class="add-dimension o-button" t-on-click="togglePopover" t-ref="button">Add</button>
     <Popover t-if="popover.isOpen" t-props="popoverProps">
       <div
-        class="p-2 bg-white border-bottom d-flex sticky-top align-items-baseline pivot-dimension-search">
+        class="p-2 bg-white border-bottom d-flex sticky-top align-items-baseline pivot-dimension-search bg-white">
         <i class="pe-1 pivot-dimension-search-field-icon text-muted">
           <t t-call="o-spreadsheet-Icon.SEARCH"/>
         </i>
@@ -1445,7 +1445,7 @@
         t-key="action.name(env)"
         t-att-data-name="action.name(env)"
         t-on-click="() => action.execute(env)"
-        class="w-100 d-flex align-items-center border-bottom format-preview">
+        class="w-100 d-flex align-items-center border-bottom format-preview bg-white">
         <span class="ms-3 check-icon">
           <t t-if="action.isActive(env)" t-call="o-spreadsheet-Icon.CHECK"/>
         </span>
@@ -1932,7 +1932,8 @@
           <t t-call="o-spreadsheet-Icon.THIN_DRAG_HANDLE"/>
         </div>
         <t t-if="cf.rule.type==='IconSetRule'">
-          <div class="o-cf-preview-icon d-flex justify-content-around align-items-center me-2">
+          <div
+            class="o-cf-preview-icon d-flex justify-content-around align-items-center me-2 bg-white">
             <t t-call="o-spreadsheet-Icon.{{icons[cf.rule.icons.upper].template}}"/>
             <t t-call="o-spreadsheet-Icon.{{icons[cf.rule.icons.middle].template}}"/>
             <t t-call="o-spreadsheet-Icon.{{icons[cf.rule.icons.lower].template}}"/>
@@ -1941,7 +1942,7 @@
         <t t-else="">
           <div
             t-att-style="getPreviewImageStyle(cf.rule)"
-            class="o-cf-preview-icon d-flex justify-content-around align-items-center me-2">
+            class="o-cf-preview-icon d-flex justify-content-around align-items-center me-2 bg-white">
             123
           </div>
         </t>
@@ -2191,7 +2192,7 @@
   <t t-name="o-spreadsheet-ColorScaleRuleEditor">
     <div class="o-cf-color-scale-editor">
       <div class="o-section-subtitle">Preview</div>
-      <div class="o-cf-preview-display mb-4" t-attf-style="{{getPreviewGradient()}}">
+      <div class="o-cf-preview-display mb-4" t-attf-style="{{getColorScalePreviewStyle()}}">
         Preview text
       </div>
       <div class="o-section-subtitle">Minpoint</div>
@@ -2463,7 +2464,7 @@
       t-att-class="{'text-muted': props.disabled }"
       t-attf-class="{{props.className}}">
       <input
-        class="me-2"
+        class="me-2 flex-shrink-0"
         type="checkbox"
         t-att-disabled="props.disabled"
         t-att-name="props.name"
@@ -2471,7 +2472,7 @@
         t-on-change="onChange"
         t-on-click.stop=""
       />
-      <t t-if="props.label" t-esc="props.label"/>
+      <span class="text-truncate" t-if="props.label" t-esc="props.label"/>
     </label>
   </t>
 
@@ -3471,7 +3472,7 @@
     <Popover t-if="state.popoverProps" t-props="state.popoverProps">
       <div
         t-ref="popoverRef"
-        class="o-chart-select-popover px-3 pb-4"
+        class="o-chart-select-popover px-3 pb-4 bg-white"
         t-att-style="state.popoverStyle">
         <t t-foreach="categories" t-as="category" t-key="category">
           <t t-if="chartTypeByCategories[category]">
@@ -3499,148 +3500,192 @@
 
   <t t-name="o-spreadsheet-ChartPreview.LINE_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
-      <path stroke="#eb6d00" style="fill:none" d="M6,40 l12,-12 l6,6 l18,-18"/>
-      <path stroke="#0074d9" style="fill:none" d="M6,25 l12,-12 l18,18 l6,-6"/>
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path
+        stroke="var(--os-chart-preview-orange-line)"
+        style="fill:none"
+        d="M6,40 l12,-12 l6,6 l18,-18"
+      />
+      <path
+        stroke="var(--os-chart-preview-blue-line)"
+        style="fill:none"
+        d="M6,25 l12,-12 l18,18 l6,-6"
+      />
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.STACKED_LINE_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path stroke="#0074d9" style="fill:none" d="M3,30 l12,-12 l6,6 l18,-18"/>
-      <path stroke="#eb6d00" style="fill:none" d="M3,40 l12,-12 l6,6 l18,-12"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path
+        stroke="var(--os-chart-preview-blue-line)"
+        style="fill:none"
+        d="M3,30 l12,-12 l6,6 l18,-18"
+      />
+      <path
+        stroke="var(--os-chart-preview-orange-line)"
+        style="fill:none"
+        d="M3,40 l12,-12 l6,6 l18,-12"
+      />
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.AREA_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#c4e4ff" d="M3,45 V25 l12,-12 l18,18 l6,-6 V45"/>
-      <path fill="#ffe1c8" d="M3,45 V40 l12,-12 l6,6 l18,-18 V45"/>
-      <path stroke="#eb6d00" style="fill:none" d="M3,40 l12,-12 l6,6 l18,-18"/>
-      <path stroke="#0074d9" style="fill:none" d="M3,25 l12,-12 l18,18 l6,-6"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M3,45 V25 l12,-12 l18,18 l6,-6 V45"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M3,45 V40 l12,-12 l6,6 l18,-18 V45"/>
+      <path
+        stroke="var(--os-chart-preview-orange-line)"
+        style="fill:none"
+        d="M3,40 l12,-12 l6,6 l18,-18"
+      />
+      <path
+        stroke="var(--os-chart-preview-blue-line)"
+        style="fill:none"
+        d="M3,25 l12,-12 l18,18 l6,-6"
+      />
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.STACKED_AREA_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#c4e4ff" d="M3,45 h36 v-39 l-18,18 l-6,-6 l-12,12"/>
-      <path stroke="#0074d9" style="fill:none" d="M3,30 l12,-12 l6,6 l18,-18"/>
-      <path fill="#ffe1c8" d="M3,45 h36 v-23 l-18,12 l-6,-6 l-12,12"/>
-      <path stroke="#eb6d00" style="fill:none" d="M3,40 l12,-12 l6,6 l18,-12"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M3,45 h36 v-39 l-18,18 l-6,-6 l-12,12"/>
+      <path
+        stroke="var(--os-chart-preview-blue-line)"
+        style="fill:none"
+        d="M3,30 l12,-12 l6,6 l18,-18"
+      />
+      <path fill="var(--os-chart-preview-orange-fill)" d="M3,45 h36 v-23 l-18,12 l-6,-6 l-12,12"/>
+      <path
+        stroke="var(--os-chart-preview-orange-line)"
+        style="fill:none"
+        d="M3,40 l12,-12 l6,6 l18,-12"
+      />
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.COLUMN_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#0074d9" d="M7,45 v-28 h6 v28"/>
-      <path fill="#c4e4ff" d="M8,45 v-27 h4 v27"/>
-      <path fill="#eb6d00" d="M14,45 v-14 h6 v14"/>
-      <path fill="#ffe1c8" d="M15,45 v-13 h4 v13"/>
-      <path fill="#0074d9" d="M26,45 v-22 h6 v22"/>
-      <path fill="#c4e4ff" d="M27,45 v-21 h4 v21"/>
-      <path fill="#eb6d00" d="M33,45 v-32 h6 v32"/>
-      <path fill="#ffe1c8" d="M34,45 v-31 h4 v31"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M7,45 v-28 h6 v28"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M8,45 v-27 h4 v27"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M14,45 v-14 h6 v14"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M15,45 v-13 h4 v13"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M26,45 v-22 h6 v22"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M27,45 v-21 h4 v21"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M33,45 v-32 h6 v32"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M34,45 v-31 h4 v31"/>
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.STACKED_COLUMN_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#0074d9" d="M7,45 v-12 h8 v12"/>
-      <path fill="#c4e4ff" d="M8,45 v-11 h6 v11"/>
-      <path fill="#eb6d00" d="M7,33 v-14 h8 v14"/>
-      <path fill="#ffe1c8" d="M8,33 v-13 h6 v13"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M7,45 v-12 h8 v12"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M8,45 v-11 h6 v11"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M7,33 v-14 h8 v14"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M8,33 v-13 h6 v13"/>
 
-      <path fill="#0074d9" d="M20,45 v-8 h8 v8"/>
-      <path fill="#c4e4ff" d="M21,45 v-7 h6 v7"/>
-      <path fill="#eb6d00" d="M20,37 v-9 h8 v9"/>
-      <path fill="#ffe1c8" d="M21,37 v-8 h6 v8"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M20,45 v-8 h8 v8"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M21,45 v-7 h6 v7"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M20,37 v-9 h8 v9"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M21,37 v-8 h6 v8"/>
 
-      <path fill="#0074d9" d="M33,45 v-18 h8 v18"/>
-      <path fill="#c4e4ff" d="M34,45 v-17 h6 v17"/>
-      <path fill="#eb6d00" d="M33,27 v-16 h8 v16"/>
-      <path fill="#ffe1c8" d="M34,27 v-15 h6 v15"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M33,45 v-18 h8 v18"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M34,45 v-17 h6 v17"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M33,27 v-16 h8 v16"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M34,27 v-15 h6 v15"/>
 
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.BAR_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
       <g transform="matrix(0 1 -1 0 48 3)">
-        <path fill="#0074d9" d="M7,45 v-28 h6 v28"/>
-        <path fill="#c4e4ff" d="M8,45 v-27 h4 v27"/>
-        <path fill="#eb6d00" d="M14,45 v-14 h6 v14"/>
-        <path fill="#ffe1c8" d="M15,45 v-13 h4 v13"/>
-        <path fill="#0074d9" d="M26,45 v-22 h6 v22"/>
-        <path fill="#c4e4ff" d="M27,45 v-21 h4 v21"/>
-        <path fill="#eb6d00" d="M33,45 v-32 h6 v32"/>
-        <path fill="#ffe1c8" d="M34,45 v-31 h4 v31"/>
+        <path fill="var(--os-chart-preview-blue-line)" d="M7,45 v-28 h6 v28"/>
+        <path fill="var(--os-chart-preview-blue-fill)" d="M8,45 v-27 h4 v27"/>
+        <path fill="var(--os-chart-preview-orange-line)" d="M14,45 v-14 h6 v14"/>
+        <path fill="var(--os-chart-preview-orange-fill)" d="M15,45 v-13 h4 v13"/>
+        <path fill="var(--os-chart-preview-blue-line)" d="M26,45 v-22 h6 v22"/>
+        <path fill="var(--os-chart-preview-blue-fill)" d="M27,45 v-21 h4 v21"/>
+        <path fill="var(--os-chart-preview-orange-line)" d="M33,45 v-32 h6 v32"/>
+        <path fill="var(--os-chart-preview-orange-fill)" d="M34,45 v-31 h4 v31"/>
       </g>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.STACKED_BAR_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
       <g transform="matrix(0 1 -1 0 48 1)">
-        <path fill="#0074d9" d="M7,45 v-12 h8 v12"/>
-        <path fill="#c4e4ff" d="M8,45 v-11 h6 v11"/>
-        <path fill="#eb6d00" d="M7,33 v-14 h8 v14"/>
-        <path fill="#ffe1c8" d="M8,33 v-13 h6 v13"/>
-        <path fill="#0074d9" d="M20,45 v-8 h8 v8"/>
-        <path fill="#c4e4ff" d="M21,45 v-7 h6 v7"/>
-        <path fill="#eb6d00" d="M20,37 v-9 h8 v9"/>
-        <path fill="#ffe1c8" d="M21,37 v-8 h6 v8"/>
-        <path fill="#0074d9" d="M33,45 v-18 h8 v18"/>
-        <path fill="#c4e4ff" d="M34,45 v-17 h6 v17"/>
-        <path fill="#eb6d00" d="M33,27 v-16 h8 v16"/>
-        <path fill="#ffe1c8" d="M34,27 v-15 h6 v15"/>
+        <path fill="var(--os-chart-preview-blue-line)" d="M7,45 v-12 h8 v12"/>
+        <path fill="var(--os-chart-preview-blue-fill)" d="M8,45 v-11 h6 v11"/>
+        <path fill="var(--os-chart-preview-orange-line)" d="M7,33 v-14 h8 v14"/>
+        <path fill="var(--os-chart-preview-orange-fill)" d="M8,33 v-13 h6 v13"/>
+        <path fill="var(--os-chart-preview-blue-line)" d="M20,45 v-8 h8 v8"/>
+        <path fill="var(--os-chart-preview-blue-fill)" d="M21,45 v-7 h6 v7"/>
+        <path fill="var(--os-chart-preview-orange-line)" d="M20,37 v-9 h8 v9"/>
+        <path fill="var(--os-chart-preview-orange-fill)" d="M21,37 v-8 h6 v8"/>
+        <path fill="var(--os-chart-preview-blue-line)" d="M33,45 v-18 h8 v18"/>
+        <path fill="var(--os-chart-preview-blue-fill)" d="M34,45 v-17 h6 v17"/>
+        <path fill="var(--os-chart-preview-orange-line)" d="M33,27 v-16 h8 v16"/>
+        <path fill="var(--os-chart-preview-orange-fill)" d="M34,27 v-15 h6 v15"/>
       </g>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.COMBO_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#0074d9" d="M7,45 v-14 h6 v14"/>
-      <path fill="#c4e4ff" d="M8,45 v-13 h4 v13"/>
-      <path fill="#eb6d00" d="M14,45 v-28 h6 v28"/>
-      <path fill="#ffe1c8" d="M15,45 v-27 h4 v27"/>
-      <path fill="#0074d9" d="M26,45 v-22 h6 v22"/>
-      <path fill="#c4e4ff" d="M27,45 v-21 h4 v21"/>
-      <path fill="#eb6d00" d="M33,45 v-32 h6 v32"/>
-      <path fill="#ffe1c8" d="M34,45 v-31 h4 v31"/>
-      <path stroke="#888" style="fill:none;stroke-width:1.5;" d="M4,40 l14,-12 l6,6 l20,-18"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M7,45 v-14 h6 v14"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M8,45 v-13 h4 v13"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M14,45 v-28 h6 v28"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M15,45 v-27 h4 v27"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M26,45 v-22 h6 v22"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M27,45 v-21 h4 v21"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M33,45 v-32 h6 v32"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M34,45 v-31 h4 v31"/>
+      <path
+        stroke="var(--os-gray-500)"
+        style="fill:none;stroke-width:1.5;"
+        d="M4,40 l14,-12 l6,6 l20,-18"
+      />
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.PIE_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#ffe1c8" stroke="#eb6d00" d="M41.32, 34 A20 20, 0, 1, 1, 24, 4 v20"/>
-      <path fill="#c4e4ff" stroke="#0074d9" d="M24,24 v-20 A20 20, 0, 0, 1, 41.32, 34 L24,24"/>
+      <path
+        fill="var(--os-chart-preview-orange-fill)"
+        stroke="var(--os-chart-preview-orange-line)"
+        d="M41.32, 34 A20 20, 0, 1, 1, 24, 4 v20"
+      />
+      <path
+        fill="var(--os-chart-preview-blue-fill)"
+        stroke="var(--os-chart-preview-blue-line)"
+        d="M24,24 v-20 A20 20, 0, 0, 1, 41.32, 34 L24,24"
+      />
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.DOUGHNUT_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
       <path
-        fill="#ffe1c8"
-        stroke="#eb6d00"
+        fill="var(--os-chart-preview-orange-fill)"
+        stroke="var(--os-chart-preview-orange-line)"
         d="M41.32, 34 A20 20, 0, 1, 1, 24, 4 v8 A12,12,0,1,0,34.4,30"
       />
       <path
-        fill="#c4e4ff"
-        stroke="#0074d9"
+        fill="var(--os-chart-preview-blue-fill)"
+        stroke="var(--os-chart-preview-blue-line)"
         d="M24,12 v-8 A20 20, 0, 0, 1, 41.32, 34 L34.4,30 A12,12,0,0,0,24,12"
       />
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.SCATTER_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <circle fill="#0074d9" cx="10" cy="10" r="2"/>
-      <circle fill="#0074d9" cx="15" cy="30" r="2"/>
-      <circle fill="#0074d9" cx="25" cy="36" r="2"/>
-      <circle fill="#0074d9" cx="32" cy="15" r="2"/>
-      <circle fill="#eb6d00" cx="10" cy="40" r="2"/>
-      <circle fill="#eb6d00" cx="18" cy="20" r="2"/>
-      <circle fill="#eb6d00" cx="30" cy="25" r="2"/>
-      <circle fill="#eb6d00" cx="40" cy="33" r="2"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <circle fill="var(--os-chart-preview-blue-line)" cx="10" cy="10" r="2"/>
+      <circle fill="var(--os-chart-preview-blue-line)" cx="15" cy="30" r="2"/>
+      <circle fill="var(--os-chart-preview-blue-line)" cx="25" cy="36" r="2"/>
+      <circle fill="var(--os-chart-preview-blue-line)" cx="32" cy="15" r="2"/>
+      <circle fill="var(--os-chart-preview-orange-line)" cx="10" cy="40" r="2"/>
+      <circle fill="var(--os-chart-preview-orange-line)" cx="18" cy="20" r="2"/>
+      <circle fill="var(--os-chart-preview-orange-line)" cx="30" cy="25" r="2"/>
+      <circle fill="var(--os-chart-preview-orange-line)" cx="40" cy="33" r="2"/>
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.GAUGE_CHART">
@@ -3648,9 +3693,9 @@
       viewBox="0 0 48 48"
       class="o-chart-preview user-select-none"
       xmlns="http://www.w3.org/2000/svg">
-      <path fill="#ccc" d="M2,32 A22,22,0,0,1,46,32 h-6 A16,16,0,0,0,8,32"/>
+      <path fill="var(--os-gray-400)" d="M2,32 A22,22,0,0,1,46,32 h-6 A16,16,0,0,0,8,32"/>
       <path fill="#6aa84f" d="M2,32 A22,22,0,0,1,35,13 L32,18.2 A16,16,0,0,0,8,32"/>
-      <text x="17" y="32" style="font-size:12px;">62</text>
+      <text fill="currentColor" x="17" y="32" style="font-size:12px;">62</text>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.SCORECARD_CHART">
@@ -3658,61 +3703,72 @@
       viewBox="0 0 48 48"
       class="o-chart-preview user-select-none"
       xmlns="http://www.w3.org/2000/svg">
-      <path fill="#ddd" d="M1,8 h46 v32 h-46"/>
-      <path fill="#eee" d="M2,9 h44 v30 h-44"/>
-      <text x="9" y="32" style="font-size:18px;">123</text>
+      <path fill="var(--os-gray-300)" d="M1,8 h46 v32 h-46"/>
+      <path fill="var(--os-gray-200)" d="M2,9 h44 v30 h-44"/>
+      <text fill="currentColor" x="9" y="32" style="font-size:18px;">123</text>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.WATERFALL_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#444" d="M5,45 v-26 h6 v26"/>
-      <path fill="#fff" d="M6,45 v-25 h4 v25"/>
-      <path fill="#eb6d00" d="M13,19 v7 h6 v-7"/>
-      <path fill="#ffe1c8" d="M14,20 v5 h4 v-5"/>
-      <path fill="#eb6d00" d="M21,25 v10 h6 v-10"/>
-      <path fill="#ffe1c8" d="M22,26 v8 h4 v-8"/>
-      <path fill="#0074d9" d="M29,35 v-24 h6 v24"/>
-      <path fill="#c4e4ff" d="M30,34 v-22 h4 v22"/>
-      <path fill="#444" d="M37,45 v-34 h6 v34"/>
-      <path fill="#fff" d="M38,45 v-33 h4 v33"/>
-      <path fill="#444" d="M11,20 v-1 h2 v1 M19,26 v-1 h2 v1 M27,35 v-1 h2 v1 M35,12 v-1 h2 v1"/>
-      <path fill="#444" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
+      <path fill="var(--os-gray-600)" d="M5,45 v-26 h6 v26"/>
+      <path fill="var(--os-white-bg)" d="M6,45 v-25 h4 v25"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M13,19 v7 h6 v-7"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M14,20 v5 h4 v-5"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M21,25 v10 h6 v-10"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M22,26 v8 h4 v-8"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M29,35 v-24 h6 v24"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M30,34 v-22 h4 v22"/>
+      <path fill="var(--os-gray-600)" d="M37,45 v-34 h6 v34"/>
+      <path fill="var(--os-white-bg)" d="M38,45 v-33 h4 v33"/>
+      <path
+        fill="var(--os-gray-600)"
+        d="M11,20 v-1 h2 v1 M19,26 v-1 h2 v1 M27,35 v-1 h2 v1 M35,12 v-1 h2 v1"
+      />
+      <path fill="var(--os-gray-600)" d="M2,2 v44 h1 v-44 M3,45 h42 v1 h-42"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.POPULATION_PYRAMID_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#eb6d00" d="M23,43 v-6 h22 v6"/>
-      <path fill="#ffe1c8" d="M23,42 v-4 h21 v4"/>
-      <path fill="#eb6d00" d="M23,36 v-6 h18 v6"/>
-      <path fill="#ffe1c8" d="M23,35 v-4 h17 v4"/>
-      <path fill="#eb6d00" d="M23,29 v-6 h12 v6"/>
-      <path fill="#ffe1c8" d="M23,28 v-4 h11 v4"/>
-      <path fill="#eb6d00" d="M23,22 v-6 h8 v6"/>
-      <path fill="#ffe1c8" d="M23,21 v-4 h7 v4"/>
-      <path fill="#eb6d00" d="M23,15 v-6 h4 v6"/>
-      <path fill="#ffe1c8" d="M23,14 v-4 h3 v4"/>
-
-      <path fill="#0074d9" d="M24,43 v-6 h-20 v6"/>
-      <path fill="#c4e4ff" d="M24,42 v-4 h-19 v4"/>
-      <path fill="#0074d9" d="M24,36 v-6 h-18 v6"/>
-      <path fill="#c4e4ff" d="M24,35 v-4 h-17 v4"/>
-      <path fill="#0074d9" d="M24,29 v-6 h-12 v6"/>
-      <path fill="#c4e4ff" d="M24,28 v-4 h-11 v4"/>
-      <path fill="#0074d9" d="M24,22 v-6 h-6 v6"/>
-      <path fill="#c4e4ff" d="M24,21 v-4 h-5 v4"/>
-      <path fill="#0074d9" d="M24,15 v-6 h-4 v6"/>
-      <path fill="#c4e4ff" d="M24,14 v-4 h-3 v4"/>
-
-      <path fill="#444" d="M23,2 v43 h1 v-43 M2,45 h44 v1 h-44"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M23,43 v-6 h22 v6"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M23,42 v-4 h21 v4"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M23,36 v-6 h18 v6"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M23,35 v-4 h17 v4"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M23,29 v-6 h12 v6"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M23,28 v-4 h11 v4"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M23,22 v-6 h8 v6"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M23,21 v-4 h7 v4"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M23,15 v-6 h4 v6"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M23,14 v-4 h3 v4"/>
+
+      <path fill="var(--os-chart-preview-blue-line)" d="M24,43 v-6 h-20 v6"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M24,42 v-4 h-19 v4"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M24,36 v-6 h-18 v6"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M24,35 v-4 h-17 v4"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M24,29 v-6 h-12 v6"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M24,28 v-4 h-11 v4"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M24,22 v-6 h-6 v6"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M24,21 v-4 h-5 v4"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M24,15 v-6 h-4 v6"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M24,14 v-4 h-3 v4"/>
+
+      <path fill="var(--os-gray-600)" d="M23,2 v43 h1 v-43 M2,45 h44 v1 h-44"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.RADAR_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="none" stroke="#0074d9" d="m24 16 14.27 3.36-1.93 21.63-18.22-8.9-3.63-11.18Z"/>
-      <path fill="none" stroke="#eb6d00" d="m24 4 7.61 17.53-4.67 6.52-12.34 8.89-7.72-18.5Z"/>
       <path
         fill="none"
-        stroke="#444"
+        stroke="var(--os-chart-preview-blue-line)"
+        d="m24 16 14.27 3.36-1.93 21.63-18.22-8.9-3.63-11.18Z"
+      />
+      <path
+        fill="none"
+        stroke="var(--os-chart-preview-orange-line)"
+        d="m24 4 7.61 17.53-4.67 6.52-12.34 8.89-7.72-18.5Z"
+      />
+      <path
+        fill="none"
+        stroke="var(--os-gray-600)"
         d="M24 2v22l20.92-6.8L24 24l12.93 17.8L24 24 11.07 41.8 24 24 3.08 17.2"
       />
     </svg>
@@ -3720,14 +3776,20 @@
   <t t-name="o-spreadsheet-ChartPreview.FILLED_RADAR_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
       <path
-        fill="#0074d944"
-        stroke="#0074d9"
+        fill="var(--os-chart-preview-blue-line)"
+        fill-opacity="0.25"
+        stroke="var(--os-chart-preview-blue-line)"
         d="m24 16 14.27 3.36-1.93 21.63-18.22-8.9-3.63-11.18Z"
       />
-      <path fill="#eb6d0044" stroke="#eb6d00" d="m24 4 7.61 17.53-4.67 6.52-12.34 8.89-7.72-18.5Z"/>
+      <path
+        fill="var(--os-chart-preview-orange-line)"
+        fill-opacity="0.25"
+        stroke="var(--os-chart-preview-orange-line)"
+        d="m24 4 7.61 17.53-4.67 6.52-12.34 8.89-7.72-18.5Z"
+      />
       <path
         fill="none"
-        stroke="#444"
+        stroke="var(--os-gray-600)"
         d="M24 2v22l20.92-6.8L24 24l12.93 17.8L24 24 11.07 41.8 24 24 3.08 17.2"
       />
     </svg>
@@ -3740,60 +3802,76 @@
       fill="none"
       stroke-width="0.5"
       stroke-linejoin="round">
-      <circle cx="16" cy="16" r="13" fill="#c4e4ff"/>
+      <circle cx="16" cy="16" r="13" fill="var(--os-chart-preview-blue-fill)"/>
       <path
-        stroke="#eb6d00"
-        fill="#ffe1c8"
+        stroke="var(--os-chart-preview-orange-line)"
+        fill="var(--os-chart-preview-orange-fill)"
         d="M12.225 16.293c0 6.8 4 9 5 9 3.5 0 2-5.293 3.5-6.793s5-.707 5-4.207-2-5-5-5c-5 0-8.5 1.5-8.5 7z"
       />
       <path
-        fill="#ffe1c8"
+        fill="var(--os-chart-preview-orange-fill)"
         d="M21.5 4.4c0 1.167-1.735 1.5-3 1.5-5.217 0-10.705 3.48-11.421 8.004C6.992 14.549 6.552 15 6 15H3.07 A 13 13 0 0 1 21.5 4.2
                 M3.8 20.5c.785.262 2.126 1.285 3.44 1.517.57.101 1.153.464 1.299 1.023.303 1.16.548 1.992-.239 3.58 A 13 13 0 0 1 3.8 20.5"
       />
       <path
-        stroke="#eb6d00"
+        stroke="var(--os-chart-preview-orange-line)"
         d="M21.5 4.4c0 1.167-1.735 1.5-3 1.5-5.217 0-10.705 3.48-11.421 8.004C6.992 14.549 6.552 15 6 15H3.07
                 M3.8 20.5c.785.262 2.126 1.285 3.44 1.517.57.101 1.153.464 1.299 1.023.303 1.16.548 1.992-.239 3.58"
       />
-      <circle cx="16" cy="16" r="13" stroke="#444"/>
+      <circle cx="16" cy="16" r="13" stroke="var(--os-gray-600)"/>
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.FUNNEL_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path stroke="#0074d9" fill="#c4e4ff" d="M2.5,6.5 h44 l-5,7 h-34 l-5,-7 h1"/>
-      <path stroke="#eb6d00" fill="#ffe1c8" d="M9.5,16.5 h30 l-3,7 h-25 l-3,-7 h1"/>
-      <path stroke="#0074d9" fill="#c4e4ff" d="M12.5,26.5 h23 l-8,7 h-7 l-8,-7 h1"/>
-      <path stroke="#eb6d00" fill="#ffe1c8" d="M21.5,35.5 h5 l-2.5,7 l-2.5,-7 h1"/>
+      <path
+        stroke="var(--os-chart-preview-blue-line)"
+        fill="var(--os-chart-preview-blue-fill)"
+        d="M2.5,6.5 h44 l-5,7 h-34 l-5,-7 h1"
+      />
+      <path
+        stroke="var(--os-chart-preview-orange-line)"
+        fill="var(--os-chart-preview-orange-fill)"
+        d="M9.5,16.5 h30 l-3,7 h-25 l-3,-7 h1"
+      />
+      <path
+        stroke="var(--os-chart-preview-blue-line)"
+        fill="var(--os-chart-preview-blue-fill)"
+        d="M12.5,26.5 h23 l-8,7 h-7 l-8,-7 h1"
+      />
+      <path
+        stroke="var(--os-chart-preview-orange-line)"
+        fill="var(--os-chart-preview-orange-fill)"
+        d="M21.5,35.5 h5 l-2.5,7 l-2.5,-7 h1"
+      />
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.SUNBURST_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
       <path
-        fill="#ffe1c8"
-        stroke="#eb6d00"
+        fill="var(--os-chart-preview-orange-fill)"
+        stroke="var(--os-chart-preview-orange-line)"
         d="M24,12 v8A4,4,0,1,0,27.46,26 L41.32, 34 A20,20,0,0,1,8.679,36.856 L14.807,31.713 A12,12,0,0,1,24,12 M34.4,30 A12,12,0,0,1,14.807,31.713"
       />
       <path
-        fill="#c4e4ff"
-        stroke="#0074d9"
+        fill="var(--os-chart-preview-blue-fill)"
+        stroke="var(--os-chart-preview-blue-line)"
         d="M24,20 v-16 A20 20, 0, 0, 1, 41.32, 34 L27.46,26 A4,4,0,0,0,24,20 M24,12 A12,12,0,0,1,34.4,30 M33.193,16.287 L39.321,11.144 M36,24 L44,24"
       />
     </svg>
   </t>
   <t t-name="o-spreadsheet-ChartPreview.TREE_MAP_CHART">
     <svg viewBox="0 0 48 48" class="o-chart-preview" xmlns="http://www.w3.org/2000/svg">
-      <path fill="#444" d="M2,4 h44 v5 h-44"/>
-      <path fill="#444" d="M2,10 h28 v5 h-28"/>
-      <path fill="#444" d="M31,10 h15 v5 h-15"/>
-      <path fill="#0074d9" d="M2,16 h28 v14 h-28"/>
-      <path fill="#c4e4ff" d="M3,17 h26 v12 h-26"/>
-      <path fill="#0074d9" d="M2,31 h15 v12 h-15"/>
-      <path fill="#c4e4ff" d="M3,32 h13 v10 h-13"/>
-      <path fill="#0074d9" d="M18,31 h12 v12 h-12"/>
-      <path fill="#c4e4ff" d="M19,32 h10 v10 h-10"/>
-      <path fill="#eb6d00" d="M31,16 h15 v27 h-15"/>
-      <path fill="#ffe1c8" d="M32,17 h13 v25 h-13"/>
+      <path fill="var(--os-gray-600)" d="M2,4 h44 v5 h-44"/>
+      <path fill="var(--os-gray-600)" d="M2,10 h28 v5 h-28"/>
+      <path fill="var(--os-gray-600)" d="M31,10 h15 v5 h-15"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M2,16 h28 v14 h-28"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M3,17 h26 v12 h-26"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M2,31 h15 v12 h-15"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M3,32 h13 v10 h-13"/>
+      <path fill="var(--os-chart-preview-blue-line)" d="M18,31 h12 v12 h-12"/>
+      <path fill="var(--os-chart-preview-blue-fill)" d="M19,32 h10 v10 h-10"/>
+      <path fill="var(--os-chart-preview-orange-line)" d="M31,16 h15 v27 h-15"/>
+      <path fill="var(--os-chart-preview-orange-fill)" d="M32,17 h13 v25 h-13"/>
     </svg>
   </t>
 
@@ -4205,6 +4283,7 @@
       updateStyle.bind="updateAxisTitleStyle"
       name="editor_label"
       style="axisTitleStyle"
+      placeholder.translate="Add a Title"
       defaultStyle="{align: 'center', color: '', fontSize: defaultFontSize}"
     />
   </t>
@@ -4261,7 +4340,7 @@
       <div class="o-section pb-1 pt-0">
         <div class="o-section-title">Carousel Sections</div>
       </div>
-      <div class="o-carousel-preview-list overflow-auto" t-ref="previewList">
+      <div class="o-carousel-preview-list overflow-auto bg-white" t-ref="previewList">
         <t t-foreach="carouselItems" t-as="item" t-key="getItemId(item)">
           <div
             class="o-carousel-preview border-bottom pe-2 position-relative w-100 d-flex align-items-center"
@@ -4528,7 +4607,10 @@
 
   <t t-name="o-spreadsheet-Menu-Popover">
     <Popover t-if="props.menuItems" t-props="popoverProps">
-      <div t-ref="menu" class="o-menu-wrapper" t-on-mouseover="() => this.onMouseOverMainMenu()">
+      <div
+        t-ref="menu"
+        class="o-menu-wrapper bg-white"
+        t-on-mouseover="() => this.onMouseOverMainMenu()">
         <Menu t-props="menuProps"/>
       </div>
       <MenuPopover
@@ -4550,7 +4632,7 @@
   <t t-name="o-spreadsheet-Menu">
     <div
       t-ref="menu"
-      class="o-menu"
+      class="o-menu bg-white"
       t-att-style="menuStyle"
       t-on-scroll="props.onScroll"
       t-on-wheel.stop=""
@@ -4607,7 +4689,7 @@
 
   <t t-name="o-spreadsheet-LinkEditor">
     <div
-      class="o-link-editor"
+      class="o-link-editor bg-white"
       t-on-click.stop="() => this.menu.isOpen=false"
       t-on-keydown="onKeyDown">
       <div class="o-section">
@@ -4649,7 +4731,7 @@
           <button
             t-if="!link.url"
             t-on-click.stop="openMenu"
-            class="o-special-link o-button-icon"
+            class="o-special-link o-button-icon bg-white"
             t-ref="linkEditorMenuButton">
             <t t-call="o-spreadsheet-Icon.LIST"/>
           </button>
@@ -4672,7 +4754,7 @@
   </t>
 
   <t t-name="o-spreadsheet-LinkDisplay">
-    <div class="o-link-tool d-flex align-items-center">
+    <div class="o-link-tool d-flex align-items-center bg-white">
       <!-- t-key to prevent owl from re-using the previous img element when the link changes.
     The wrong/previous image would be displayed while the new one loads -->
       <img
@@ -5665,6 +5747,7 @@
     <div class="o-icon">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 224 256">
         <path
+          fill="currentColor"
           d="M201.4 342.6c12.5 12.5 32.8 12.5 45.3 0l160-160c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L224 274.7 86.6 137.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l160 160z"
           transform="translate(0, 9) scale(0.5,0.5)"
         />
@@ -5768,9 +5851,14 @@
       />
     </svg>
   </t>
+  <t t-name="o-spreadsheet-Icon.DARK_MODE">
+    <div class="o-icon">
+      <i class="fa fa-moon-o"/>
+    </div>
+  </t>
 
   <t t-name="o-spreadsheet-IconPicker">
-    <div class="o-icon-picker">
+    <div class="o-icon-picker bg-white">
       <t t-foreach="iconSets" t-as="iconSet" t-key="iconSet">
         <div class="o-cf-icon-line">
           <div
@@ -6354,8 +6442,9 @@
         name="value.toString()"
         value="this.props.isChecked"
         onChange="this.props.onClick"
-        className="'p-2 w-100 pe-auto text-truncate'"
+        className="'p-2 w-100 pe-auto'"
         label="value.toString()"
+        title="value.toString()"
       />
     </div>
   </t>
@@ -6744,7 +6833,7 @@
   </t>
 
   <t t-name="o-spreadsheet-ErrorToolTip">
-    <div class="o-error-tooltip">
+    <div class="o-error-tooltip bg-white">
       <t t-if="evaluationError">
         <div class="o-error-tooltip-title fw-bold text-danger">Error</div>
         <div class="o-error-tooltip-message">
@@ -6882,7 +6971,7 @@
   <t t-name="o-spreadsheet-FunctionDescriptionProvider">
     <div class="o-formula-assistant-container user-select-none shadow">
       <t t-set="context" t-value="getContext()"/>
-      <div class="o-formula-assistant" t-if="context.functionDescription.name">
+      <div class="o-formula-assistant bg-white" t-if="context.functionDescription.name">
         <div class="o-formula-assistant-head d-flex flex-row justify-content-between">
           <div>
             <t t-foreach="formulaHeaderContent" t-as="part" t-key="part_index">
@@ -7001,7 +7090,7 @@
           t-on-click="closeAssistant"
           class="fa-stack position-absolute top-0 start-100 translate-middle fs-4">
           <i class="fa fa-circle fa-stack-1x fa-inverse"/>
-          <i class="fa fa-times-circle fa-stack-1x text-muted"/>
+          <i class="fa fa-times-circle fa-stack-1x"/>
         </span>
         <div class="o-composer-assistant overflow-auto" t-att-style="assistantStyle">
           <FunctionDescriptionProvider
@@ -7035,7 +7124,7 @@
     <div
       t-ref="autoCompleteList"
       t-att-class="{
-          'o-autocomplete-dropdown': props.proposals.length}">
+          'o-autocomplete-dropdown bg-white': props.proposals.length}">
       <t t-foreach="props.proposals" t-as="proposal" t-key="proposal.text + proposal_index">
         <div
           class="d-flex flex-column text-start"
@@ -7088,7 +7177,7 @@
 
   <t t-name="o-spreadsheet-ColorPicker">
     <Popover t-props="popoverProps">
-      <div class="o-color-picker" t-on-click.stop="" t-att-style="colorPickerStyle">
+      <div class="o-color-picker bg-white" t-on-click.stop="" t-att-style="colorPickerStyle">
         <div class="o-color-picker-section-name">Standard</div>
         <div class="colors-grid">
           <div
@@ -7114,7 +7203,7 @@
           <span>Custom</span>
         </div>
         <div class="colors-grid o-color-picker-toggler" t-on-click.stop="toggleColorPicker">
-          <div class="o-color-picker-line-item o-color-picker-toggler-button">
+          <div class="o-color-picker-line-item bg-white o-color-picker-toggler-button">
             <div class="o-color-picker-toggler-sign">
               <t t-call="o-spreadsheet-Icon.PLUS"/>
             </div>
@@ -7371,7 +7460,7 @@
     <t t-set="border_color">Border Color</t>
     <Popover t-props="popoverProps">
       <div
-        class="d-flex o-border-selector"
+        class="d-flex o-border-selector bg-white"
         t-on-click.stop=""
         t-att-class="props.class ? props.class : ''">
         <div class="o-border-selector-section">
@@ -7420,7 +7509,7 @@
             <Popover
               t-props="lineStylePickerPopoverProps"
               t-if="state.activeTool === 'borderTypeTool'">
-              <div class="o-border-style-dropdown">
+              <div class="o-border-style-dropdown bg-white">
                 <t t-foreach="borderStyles" t-as="borderStyle" t-key="borderStyle">
                   <div
                     t-att-title="borderStyle"

From 86a182f20c228c73b49cad2ed63d60fbd2ae154e Mon Sep 17 00:00:00 2001
From: "Adrien Minne (adrm)" <adrm@odoo.com>
Date: Wed, 22 Oct 2025 15:03:46 +0200
Subject: [PATCH 547/673] [IMP] spreadsheet: implement dark mode for UI of
 spreadsheet

This commits implements dark mode for the user interface in
o-spreadsheet. We can drop the drak mode-specific stylesheets and
use CSS variables using `light-dark()` instead.

Task: 5082659
Part-of: odoo/odoo#235347
Related: odoo/enterprise#99292
Signed-off-by: Vincent Schippefilt (vsc) <vsc@odoo.com>
---
 addons/spreadsheet/__manifest__.py            |  4 --
 .../src/actions/spreadsheet_component.js      |  4 ++
 .../src/actions/spreadsheet_component.xml     |  2 +-
 .../o_spreadsheet_extended.dark.scss          | 49 -------------------
 .../o_spreadsheet/o_spreadsheet_extended.scss | 18 +++----
 5 files changed, 11 insertions(+), 66 deletions(-)
 delete mode 100644 addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.dark.scss

diff --git a/addons/spreadsheet/__manifest__.py b/addons/spreadsheet/__manifest__.py
index 275fba5b2dbf0..df32c84376ecc 100644
--- a/addons/spreadsheet/__manifest__.py
+++ b/addons/spreadsheet/__manifest__.py
@@ -91,12 +91,8 @@
             'spreadsheet/static/src/**/*.scss',
             'spreadsheet/static/src/assets_backend/**/*',
             ('remove', 'spreadsheet/static/src/public_readonly_app/**/*.scss'),
-            ('remove', 'spreadsheet/static/src/**/*.dark.scss'),
             ('remove', 'spreadsheet/static/src/print_assets/**/*'),
         ],
-        "web.assets_web_dark": [
-            'spreadsheet/static/src/**/*.dark.scss',
-        ],
         'web.assets_unit_tests': [
             'spreadsheet/static/tests/**/*',
             ('include', 'spreadsheet.o_spreadsheet'),
diff --git a/addons/spreadsheet/static/src/actions/spreadsheet_component.js b/addons/spreadsheet/static/src/actions/spreadsheet_component.js
index 454b543e27576..bd5fd4a4a0b4d 100644
--- a/addons/spreadsheet/static/src/actions/spreadsheet_component.js
+++ b/addons/spreadsheet/static/src/actions/spreadsheet_component.js
@@ -1,6 +1,7 @@
 import { useSpreadsheetNotificationStore } from "@spreadsheet/hooks";
 import { Spreadsheet, Model } from "@odoo/o-spreadsheet";
 import { Component } from "@odoo/owl";
+import { cookie } from "@web/core/browser/cookie";
 
 /**
  * Component wrapping the <Spreadsheet> component from o-spreadsheet
@@ -20,4 +21,7 @@ export class SpreadsheetComponent extends Component {
     setup() {
         useSpreadsheetNotificationStore();
     }
+    get colorScheme() {
+        return cookie.get("color_scheme");
+    }
 }
diff --git a/addons/spreadsheet/static/src/actions/spreadsheet_component.xml b/addons/spreadsheet/static/src/actions/spreadsheet_component.xml
index 01289c8662144..864ca404f4a15 100644
--- a/addons/spreadsheet/static/src/actions/spreadsheet_component.xml
+++ b/addons/spreadsheet/static/src/actions/spreadsheet_component.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates>
     <div t-name="spreadsheet.SpreadsheetComponent" class="o_spreadsheet_container o_field_highlight">
-        <Spreadsheet model="model"/>
+        <Spreadsheet model="model" colorScheme="colorScheme"/>
     </div>
 </templates>
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.dark.scss b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.dark.scss
deleted file mode 100644
index 5357a50d7e14b..0000000000000
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.dark.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-// Force light theme for everything in o-spreadsheet until
-// we have the proper scss tool chain to support dark theme properly
-// in the library
-.o-spreadsheet {
-  color-scheme: light;
-  select > option {
-    color: inherit;
-    background-color: inherit;
-  }
-
-  .bg-white {
-    background-color: #fff !important;
-  }
-
-  .o_multi_record_selector .badge {
-      background-color: #e6dddd !important;
-      color: #3c3c3c !important;
-  }
-  .o_model_field_selector_chain_part {
-      background: #f6f7fa !important;
-      border-color: #d5dae8 !important;
-  }
-  input {
-      color: #333 !important;
-  }
-  .o_input {
-      color: #3c3c3c !important;
-  }
-  .o_read_mode .o_tree_editor_condition {
-      background: #f6f7fa !important;
-      border-color: #d5dae8 !important;
-  }
-  .o_domain_selector input{
-    background-color: #333 !important;
-  }
-  .btn {
-    color:#374151;
-  }
-  .border {
-    border-color: #d5dae8 !important;
-  }
-  .border-bottom {
-    border-bottom-color: #d5dae8 !important;
-  }
-  .border-top {
-    border-top-color: #d5dae8 !important;
-  }
-
-}
diff --git a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss
index 59526dc668e8a..85d3e0d3c9686 100644
--- a/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss
+++ b/addons/spreadsheet/static/src/o_spreadsheet/o_spreadsheet_extended.scss
@@ -12,22 +12,16 @@
 .o-sidePanel {
     --o-spreadsheet-input-border-color: #D8DADD;
     .o_input {
-        color: #111827;
-        border-color: var(--o-spreadsheet-input-border-color);
+        border-color: var(--os-gray-300);
+        color: var(--os-gray-900);
         &::placeholder {
-            opacity: 0.5;
+            color: var(--os-composer-placeholder-color);
         }
     }
 
-    .o_field_invalid, .o_missing_field{
-        .o-input, .o_input {
-            border-color: var(--o-input-border-color);
-        }
-    }
-
-    .o_required_modifier:not(.o_field_invalid):not(.o_missing_field) {
-        .o_input {
-            border-color: #111827;
+    .o_required_modifier {
+        .o-input {
+            border-color: var(--os-gray-900);
         }
     }
 

From d4ba967f36f9d3e2983f10a904123524d141337d Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Wed, 12 Nov 2025 14:44:45 +0100
Subject: [PATCH 548/673] [REF] mail,im_livechat: channel_invitation use
 channel

closes odoo/odoo#235322

Signed-off-by: Didier Debondt (did) <did@odoo.com>
---
 .../src/core/web/channel_invitation_patch.xml |  6 ++--
 .../static/src/discuss/call/common/meeting.js |  2 --
 .../discuss/core/common/channel_invitation.js | 34 +++++++++----------
 .../core/common/channel_invitation.xml        | 16 ++++-----
 .../src/discuss/core/common/thread_actions.js | 12 +++----
 .../public_web/discuss_command_palette.js     |  2 +-
 6 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/addons/im_livechat/static/src/core/web/channel_invitation_patch.xml b/addons/im_livechat/static/src/core/web/channel_invitation_patch.xml
index 615ef19965fcb..5b8c67f8405d5 100644
--- a/addons/im_livechat/static/src/core/web/channel_invitation_patch.xml
+++ b/addons/im_livechat/static/src/core/web/channel_invitation_patch.xml
@@ -2,14 +2,14 @@
 <templates xml:space="preserve">
     <t t-inherit="discuss.ChannelInvitation-selectableItem" t-inherit-mode="extension">
         <xpath expr="//*[@name='selectablePartnerName']" position="inside">
-            <span t-if="props.thread?.channel_type === 'livechat' and selectablePartner.user_livechat_username" t-esc="selectablePartner.user_livechat_username" class="text-truncate text-muted smaller mx-2"/>
-            <span t-if="props.thread?.channel_type === 'livechat' and selectablePartner.is_in_call" class="flex-shrink-0 opacity-75 smaller mx-2">
+            <span t-if="props.channel?.channel_type === 'livechat' and selectablePartner.user_livechat_username" t-esc="selectablePartner.user_livechat_username" class="text-truncate text-muted smaller mx-2"/>
+            <span t-if="props.channel?.channel_type === 'livechat' and selectablePartner.is_in_call" class="flex-shrink-0 opacity-75 smaller mx-2">
                 <i class="fa fa-volume-up o-discuss-inCallIconColor me-1"/>
                 <span class="o-discuss-ChannelInvitation-inCallTextColor">in a call</span>
             </span>
         </xpath>
         <xpath expr="//*[@name='selectablePartnerDetail']" position="inside">
-            <div t-if="props.thread?.channel_type === 'livechat' and selectablePartner.lang_name" class="d-flex flex-wrap align-items-center gap-1">
+            <div t-if="props.channel?.channel_type === 'livechat' and selectablePartner.lang_name" class="d-flex flex-wrap align-items-center gap-1">
                 <span class="d-flex text-start fs-6 gap-1">
                     <span class="badge rounded text-bg-primary" t-esc="selectablePartner.lang_name"/>
                     <t t-foreach="selectablePartner.livechat_languages" t-as="language" t-key="language_index">
diff --git a/addons/mail/static/src/discuss/call/common/meeting.js b/addons/mail/static/src/discuss/call/common/meeting.js
index 46cf257a91d34..87ad5441c936b 100644
--- a/addons/mail/static/src/discuss/call/common/meeting.js
+++ b/addons/mail/static/src/discuss/call/common/meeting.js
@@ -2,7 +2,6 @@ import { Composer } from "@mail/core/common/composer";
 import { Thread } from "@mail/core/common/thread";
 import { Call } from "@mail/discuss/call/common/call";
 import { CallActionList } from "@mail/discuss/call/common/call_action_list";
-import { ChannelInvitation } from "@mail/discuss/core/common/channel_invitation";
 import {
     inDiscussCallViewProps,
     useInDiscussCallView,
@@ -30,7 +29,6 @@ export class Meeting extends Component {
     static components = {
         Call,
         CallActionList,
-        ChannelInvitation,
         Composer,
         Dropdown,
         MeetingSideActions,
diff --git a/addons/mail/static/src/discuss/core/common/channel_invitation.js b/addons/mail/static/src/discuss/core/common/channel_invitation.js
index f7f73936f20c1..0d1779498793c 100644
--- a/addons/mail/static/src/discuss/core/common/channel_invitation.js
+++ b/addons/mail/static/src/discuss/core/common/channel_invitation.js
@@ -14,7 +14,7 @@ export class ChannelInvitation extends Component {
     static props = [
         "autofocus?",
         "hasSizeConstraints?",
-        "thread?",
+        "channel?",
         "close?",
         "className?",
         "state?",
@@ -50,7 +50,7 @@ export class ChannelInvitation extends Component {
             }
         });
         onMounted(() => {
-            if (this.store.self_user && this.props.thread) {
+            if (this.store.self_user && this.props.channel) {
                 this.inputRef.el.focus();
             }
         });
@@ -111,7 +111,7 @@ export class ChannelInvitation extends Component {
     }
 
     get searchPlaceholder() {
-        if (this.props.thread?.allow_invite_by_email) {
+        if (this.props.channel?.allow_invite_by_email) {
             return _t("Invite people or email");
         }
         return _t("Search people to invite");
@@ -121,7 +121,7 @@ export class ChannelInvitation extends Component {
         const results = await this.sequential(() =>
             this.orm.call("res.partner", "search_for_channel_invite", [
                 this.searchStr,
-                this.props.thread?.id ?? false,
+                this.props.channel?.id ?? false,
             ])
         );
         if (!results) {
@@ -134,7 +134,7 @@ export class ChannelInvitation extends Component {
         this.selectablePartners = this.suggestionService.sortPartnerSuggestions(
             selectablePartners,
             this.searchStr,
-            this.props.thread
+            this.props.channel?.thread
         );
         this.state.searchResultCount = results["count"];
         const selectableEmails = this.state.selectedEmails.filter((addr) =>
@@ -195,7 +195,7 @@ export class ChannelInvitation extends Component {
             ? this.rtc.pipService.pipWindow?.navigator.clipboard
             : navigator.clipboard;
         try {
-            await clipboard.writeText(this.props.thread.invitationLink);
+            await clipboard.writeText(this.props.channel.invitationLink);
         } catch {
             notification = _t("Invitation link copy failed (Permission denied?)!");
             type = "danger";
@@ -204,10 +204,10 @@ export class ChannelInvitation extends Component {
     }
 
     async onClickInvite() {
-        if (this.props.thread.channel?.channel_type === "chat") {
+        if (this.props.channel?.channel_type === "chat") {
             const partnerIds = this.selectedPartners.map((partner) => partner.id);
-            if (this.props.thread.correspondent?.partner_id) {
-                partnerIds.unshift(this.props.thread.correspondent.partner_id.id);
+            if (this.props.channel.correspondent?.partner_id) {
+                partnerIds.unshift(this.props.channel.correspondent.partner_id.id);
             }
             await this.store.startChat(partnerIds);
             return;
@@ -215,15 +215,15 @@ export class ChannelInvitation extends Component {
         const invitePromises = [];
         if (this.selectedPartners.length) {
             invitePromises.push(
-                this.orm.call("discuss.channel", "add_members", [[this.props.thread.id]], {
+                this.orm.call("discuss.channel", "add_members", [[this.props.channel.id]], {
                     partner_ids: this.selectedPartners.map((partner) => partner.id),
-                    invite_to_rtc_call: this.rtc.localChannel?.eq(this.props.thread?.channel),
+                    invite_to_rtc_call: this.rtc.localChannel?.eq(this.props.channel),
                 })
             );
         }
         if (this.state.selectedEmails.length) {
             invitePromises.push(
-                this.orm.call("discuss.channel", "invite_by_email", [this.props.thread.id], {
+                this.orm.call("discuss.channel", "invite_by_email", [this.props.channel.id], {
                     emails: this.state.selectedEmails,
                 })
             );
@@ -235,15 +235,15 @@ export class ChannelInvitation extends Component {
     }
 
     get invitationButtonText() {
-        if (!this.props.thread) {
+        if (!this.props.channel) {
             return "";
         }
-        if (this.props.thread.channel?.channel_type === "channel") {
+        if (this.props.channel?.channel_type === "channel") {
             return _t("Invite");
-        } else if (this.props.thread.channel?.channel_type === "group") {
+        } else if (this.props.channel?.channel_type === "group") {
             return _t("Invite to Group Chat");
-        } else if (this.props.thread.channel?.channel_type === "chat") {
-            if (this.props.thread.correspondent?.persona.eq(this.store.self)) {
+        } else if (this.props.channel?.channel_type === "chat") {
+            if (this.props.channel.correspondent?.persona.eq(this.store.self)) {
                 if (this.selectedPartners.length === 0) {
                     return _t("Invite");
                 }
diff --git a/addons/mail/static/src/discuss/core/common/channel_invitation.xml b/addons/mail/static/src/discuss/core/common/channel_invitation.xml
index 16df82be967fd..c658c81642a90 100644
--- a/addons/mail/static/src/discuss/core/common/channel_invitation.xml
+++ b/addons/mail/static/src/discuss/core/common/channel_invitation.xml
@@ -2,19 +2,19 @@
 <templates xml:space="preserve">
 
     <t t-name="discuss.ChannelInvitation">
-        <ActionPanel t-if="props.thread" title.translate="Invite people" resizable="!!env.inMeetingView" minWidth="env.inMeetingView ? 300 : undefined" initialWidth="env.inMeetingView ? 400 : undefined" icon="'oi oi-user-plus'">
+        <ActionPanel t-if="props.channel" title.translate="Invite people" resizable="!!env.inMeetingView" minWidth="env.inMeetingView ? 300 : undefined" initialWidth="env.inMeetingView ? 400 : undefined" icon="'oi oi-user-plus'">
             <t t-call="discuss.ChannelInvitation.main"/>
         </ActionPanel>
         <t t-else="" t-call="discuss.ChannelInvitation.main"/>
     </t>
 
     <t t-name="discuss.ChannelInvitation.main">
-        <div class="d-flex flex-column flex-grow-1 bg-inherit o-min-height-0" t-att-class="{ 'o-mail-Discuss-threadActionPopover w-100': props.hasSizeConstraints, 'px-1': !props.thread }">
+        <div class="d-flex flex-column flex-grow-1 bg-inherit o-min-height-0" t-att-class="{ 'o-mail-Discuss-threadActionPopover w-100': props.hasSizeConstraints, 'px-1': !props.channel }">
             <t t-if="store.self_user">
                 <input class="o-discuss-ChannelInvitation-search form-control lh-1 px-2 bg-view" t-att-value="searchStr" t-ref="input" t-att-placeholder="searchPlaceholder" t-on-input="onInput"/>
                 <ul class="d-flex flex-column mx-0 pt-1 pb-0 overflow-auto o-scrollbar-thin list-group border-0 flex-grow-1" t-att-class="{ 'align-items-center justify-content-center': selectablePartners.length === 0 and state.selectableEmails.length === 0 }">
                     <div t-if="selectablePartners.length === 0 and state.selectableEmails.length === 0" class="smaller text-muted mx-1 opacity-50">
-                        <t t-if="props.thread">No user found that is not already a member of this channel.</t>
+                        <t t-if="props.channel">No user found that is not already a member of this channel.</t>
                         <t t-else="">No user found.</t>
                     </div>
                     <div t-if="state.searchResultCount > selectablePartners.length" class="smaller text-muted mx-1 mb-1 fst-italic" t-esc="showingResultNarrowText"/>
@@ -47,18 +47,18 @@
                             </t>
                         </div>
                     </div>
-                    <button t-if="props.thread and (selectedPartners.length > 0 or state.selectedEmails.length > 0)" class="btn btn-primary w-100 my-2" t-att-title="invitationButtonText" t-on-click="onClickInvite">
+                    <button t-if="props.channel and (selectedPartners.length > 0 or state.selectedEmails.length > 0)" class="btn btn-primary w-100 my-2" t-att-title="invitationButtonText" t-on-click="onClickInvite">
                         <t t-esc="invitationButtonText"/>
                     </button>
                 </t>
-                <hr t-if="props.thread?.invitationLink" class="border-dark-subtle"/>
-                <div t-if="props.thread?.invitationLink" class="input-group">
-                    <input class="border border-secondary form-control lh-1 rounded-start border-0 smaller" type="text" t-att-value="props.thread.invitationLink" readonly="" disabled="" t-on-focus="onFocusInvitationLinkInput"/>
+                <hr t-if="props.channel?.invitationLink" class="border-dark-subtle"/>
+                <div t-if="props.channel?.invitationLink" class="input-group">
+                    <input class="border border-secondary form-control lh-1 rounded-start border-0 smaller" type="text" t-att-value="props.channel.invitationLink" readonly="" disabled="" t-on-focus="onFocusInvitationLinkInput"/>
                     <button class="btn btn-primary px-2 o-py-0_5" t-on-click="onClickCopy">
                         <i class="fa fa-copy"/>
                     </button>
                 </div>
-                <div t-if="props.thread?.accessRestrictedToGroupText" class="mt-2 text-muted smaller mx-1" t-esc="props.thread.accessRestrictedToGroupText"/>
+                <div t-if="props.channel?.accessRestrictedToGroupText" class="mt-2 text-muted smaller mx-1" t-esc="props.channel.accessRestrictedToGroupText"/>
             </div>
         </div>
     </t>
diff --git a/addons/mail/static/src/discuss/core/common/thread_actions.js b/addons/mail/static/src/discuss/core/common/thread_actions.js
index a930de1d77308..e70e30859fe05 100644
--- a/addons/mail/static/src/discuss/core/common/thread_actions.js
+++ b/addons/mail/static/src/discuss/core/common/thread_actions.js
@@ -127,25 +127,25 @@ registerThreadAction("attachments", {
 registerThreadAction("invite-people", {
     actionPanelClose: ({ action }) => action.popover?.close(),
     actionPanelComponent: ChannelInvitation,
-    actionPanelComponentProps: ({ action, thread }) => ({
+    actionPanelComponentProps: ({ action, channel }) => ({
         close: () => action.actionPanelClose(),
-        thread,
+        channel,
     }),
-    actionPanelOpen({ owner, store, thread }) {
+    actionPanelOpen({ owner, store, channel }) {
         if (owner.isDiscussSidebarChannelActions) {
             store.env.services.dialog?.add(ChannelActionDialog, {
-                title: thread.name,
+                title: channel.name,
                 contentComponent: ChannelInvitation,
                 contentProps: {
                     autofocus: true,
-                    thread,
+                    channel,
                     close: () => store.env.services.dialog.closeAll(),
                 },
             });
         } else if (!owner.env.inMeetingView) {
             this.popover?.open(owner.root.el.querySelector(`[name="${this.id}"]`), {
                 hasSizeConstraints: true,
-                thread,
+                channel,
             });
         }
     },
diff --git a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
index 2803a869219b7..1ef1c74fb1630 100644
--- a/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
+++ b/addons/mail/static/src/discuss/core/public_web/discuss_command_palette.js
@@ -7,7 +7,7 @@ import { registry } from "@web/core/registry";
 import { ImStatus } from "@mail/core/common/im_status";
 import { useService } from "@web/core/utils/hooks";
 import { Dialog } from "@web/core/dialog/dialog";
-import { ChannelInvitation } from "../common/channel_invitation";
+import { ChannelInvitation } from "@mail/discuss/core/common/channel_invitation";
 
 const commandSetupRegistry = registry.category("command_setup");
 const commandProviderRegistry = registry.category("command_provider");

From 1a72d8d18d73a3858a1d9d9e02ce6aed3f9b9dd6 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 13 Nov 2025 09:58:17 +0100
Subject: [PATCH 549/673] [FIX] web: wait for error dialog in tests

This commit is a followup of [1] which introduced a few tests, but
two of them were failing randomly because we didn't correctly wait
for error dialogs to be spawned. The `unhandledrejection` event
being thrown asynchronously, simply waiting for an animation frame
isn't enough. We can only wait for the dialog to be displayed.

[1] https://github.com/odoo/odoo/pull/232523

runbot error~234010

closes odoo/odoo#235446

Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
---
 .../web/static/tests/views/form/auto_save.test.js  | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/tests/views/form/auto_save.test.js b/addons/web/static/tests/views/form/auto_save.test.js
index 099a3ae731ae6..f10418e2ba537 100644
--- a/addons/web/static/tests/views/form/auto_save.test.js
+++ b/addons/web/static/tests/views/form/auto_save.test.js
@@ -1,5 +1,5 @@
 import { expect, test } from "@odoo/hoot";
-import { unload } from "@odoo/hoot-dom";
+import { unload, waitFor } from "@odoo/hoot-dom";
 import { animationFrame, Deferred, mockSendBeacon } from "@odoo/hoot-mock";
 import {
     contains,
@@ -113,16 +113,14 @@ test("hiding tab multiple times (server error)", async () => {
 
     // simulate a tab switch
     await hideTab();
-    await animationFrame();
-    expect(".o_dialog").toHaveCount(1);
+    await waitFor(".o_dialog");
     expect(".o_dialog .modal-body").toHaveText("Cannot save");
     expect.verifySteps(["save"]);
     expect.verifyErrors(["Cannot save"]);
 
     // simulate another tab switch => should not try to save again
     await hideTab();
-    await animationFrame();
-    expect(".o_dialog").toHaveCount(1);
+    await waitFor(".o_dialog");
     expect.verifySteps([]);
     expect.verifyErrors([]);
 });
@@ -144,8 +142,7 @@ test("hiding tab multiple times (server error) + make another change", async ()
 
     // simulate a tab switch
     await hideTab();
-    await animationFrame();
-    expect(".o_dialog").toHaveCount(1);
+    await waitFor(".o_dialog");
     expect(".o_dialog .modal-body").toHaveText("Cannot save");
     expect.verifySteps(["save"]);
     expect.verifyErrors(["Cannot save"]);
@@ -161,8 +158,7 @@ test("hiding tab multiple times (server error) + make another change", async ()
     // make change and simulate another tab switch
     await contains(".o_field_widget[name=name] input").edit("Mathiew Brown 2");
     await hideTab();
-    await animationFrame();
-    expect(".o_dialog").toHaveCount(1);
+    await waitFor(".o_dialog");
     expect(".o_dialog .modal-body").toHaveText("Cannot save");
     expect.verifySteps(["save"]);
     expect.verifyErrors(["Cannot save"]);

From 9557f3ea6e98d0b5a02ca70ee05df7f667d08073 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 12 Nov 2025 13:00:47 +0100
Subject: [PATCH 550/673] [IMP] web,*: kanban,list: use <button> tags to add
 records

Before this commit, the `Add a record` in x2many kanban was a
`<div>`, and the `Add a line` (and other "creates") in lists were
`<a>`. Using buttons is semantically more correct. Morevoer,
buttons are disabled when an action is ongoing in the webclient.
For instance, when the form view is being saved, buttons are
disabled. This allows to avoid concurrent and unwanted behaviors.

Before this commit, such a behavior could happen with x2manys: in
a form view with some changes (and on a slow network), click on the
save icon, and directly click to add a record in the x2many. That
"add" request was done on the current version of the static list,
but that static list was replaced by a new one when the record is
reloaded (post save), so a crash occured. By using `<button>`,
those actions are automatically disabled when saving, thus removing
the race condition.

closes odoo/odoo#235429

Related: odoo/enterprise#99363
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 addons/account/static/src/js/tours/account.js |   2 +-
 .../static/tests/account_widgets.test.js      |   4 +-
 .../static/tests/section_and_note.test.js     |   8 +-
 .../tests/tours/deductible_amount_column.js   |   2 +-
 .../static/tests/tours/tax_group_tests.js     |   2 +-
 .../event/static/src/js/tours/event_tour.js   |   2 +-
 .../static/tests/tours/skills_type_tours.js   |   8 +-
 ...im_livechat_chatbot_steps_sequence_tour.js |   2 +-
 .../static/tests/tours/mailing_campaign.js    |   2 +-
 addons/project/static/src/js/tours/project.js |   2 +-
 .../static/tests/project_task_subtask.test.js |   4 +-
 .../tests/tours/project_sharing_tour.js       |   2 +-
 .../static/tests/tours/project_tour.js        |   4 +-
 .../purchase/static/src/js/tours/purchase.js  |   2 +-
 .../tours/purchase_product_matrix_tour.js     |   4 +-
 addons/sale/static/src/js/tours/sale.js       |   2 +-
 addons/sale/static/src/js/tours/tour_utils.js |   2 +-
 .../static/tests/sale_product_field.test.js   |   2 +-
 .../tests/so_line_create_button.test.js       |   4 +-
 .../tests/so_line_create_button.test.js       |   8 +-
 .../static/tests/so_line_field.test.js        |   2 +-
 .../static/tests/tours/sale_timesheet_tour.js |   4 +-
 .../static/tests/tours/stock_picking_tour.js  |  12 +-
 .../question_page_one2many_field.test.js      |   4 +-
 .../survey/static/tests/tours/survey_form.js  |   6 +-
 .../src/views/kanban/kanban_renderer.xml      |   4 +-
 .../static/src/views/list/list_renderer.js    |   4 +-
 .../static/src/views/list/list_renderer.xml   |   8 +-
 .../tours/test_user_group_settings_tour.js    |   4 +-
 .../tests/views/fields/char_field.test.js     |   6 +-
 .../views/fields/many2many_field.test.js      |  44 +--
 .../views/fields/many2many_tags_field.test.js |   4 +-
 .../tests/views/fields/many2one_field.test.js |  14 +-
 .../tests/views/fields/monetary_field.test.js |   2 +-
 .../tests/views/fields/one2many_field.test.js | 344 +++++++++---------
 .../static/tests/views/form/form_view.test.js |  88 ++---
 .../tests/views/list/column_widths.test.js    |   4 +-
 .../static/tests/views/list/list_view.test.js |  12 +-
 .../view_dialogs/form_view_dialog.test.js     |   2 +-
 .../view_dialogs/select_create_dialog.test.js |   8 +-
 .../settings_form_view.test.js                |  22 +-
 .../website/static/tests/tours/edit_menus.js  |   2 +-
 .../static/tests/tours/website_event.js       |   2 +-
 .../slide_category_one2many_field.test.js     |  17 +-
 .../static/tests/tours/main_flow.js           |  16 +-
 .../test_web/static/tests/tours/x2many.js     |  18 +-
 46 files changed, 351 insertions(+), 370 deletions(-)

diff --git a/addons/account/static/src/js/tours/account.js b/addons/account/static/src/js/tours/account.js
index 557886e84f8d0..ca8e2fd88e5d0 100644
--- a/addons/account/static/src/js/tours/account.js
+++ b/addons/account/static/src/js/tours/account.js
@@ -63,7 +63,7 @@ registry.category("web_tour.tours").add('account_tour', {
         run: "click",
     },
     {
-        trigger: `.o_form_view_container${accountTourSteps.draftInvoiceSelector} div[name=invoice_line_ids] .o_field_x2many_list_row_add a`,
+        trigger: `.o_form_view_container${accountTourSteps.draftInvoiceSelector} div[name=invoice_line_ids] .o_field_x2many_list_row_add button`,
         content: _t("Add a line to your invoice"),
         run: "click",
     },
diff --git a/addons/account/static/tests/account_widgets.test.js b/addons/account/static/tests/account_widgets.test.js
index bc545ba4f0b01..0d5af6359b35e 100644
--- a/addons/account/static/tests/account_widgets.test.js
+++ b/addons/account/static/tests/account_widgets.test.js
@@ -169,7 +169,7 @@ describe("PaymentTermsLineWidget", () => {
         });
         expect(".o_data_row").toHaveCount(2);
         // click the add button
-        await contains(".o_field_x2many_list_row_add > a").click();
+        await contains(".o_field_x2many_list_row_add > button").click();
         // make sure the new record is added
         expect(".o_data_row").toHaveCount(3);
         // global click
@@ -177,7 +177,7 @@ describe("PaymentTermsLineWidget", () => {
         // make sure the new record is still there
         expect(".o_data_row").toHaveCount(3);
         // click the add button again
-        await contains(".o_field_x2many_list_row_add > a").click();
+        await contains(".o_field_x2many_list_row_add > button").click();
         // make sure the new record is added
         expect(".o_data_row").toHaveCount(4);
         // click on an existing record
diff --git a/addons/account/static/tests/section_and_note.test.js b/addons/account/static/tests/section_and_note.test.js
index 71379d69c2c45..4faffd20ac310 100644
--- a/addons/account/static/tests/section_and_note.test.js
+++ b/addons/account/static/tests/section_and_note.test.js
@@ -931,7 +931,7 @@ test("add a section", async () => {
         "C1",
     ]);
     expect(`.o_note_row`).toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a:eq(1)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(1)").click();
     await edit("D");
     await contains(getFixture()).click();
     expect(queryAllTexts(".o_data_row")).toEqual([
@@ -995,7 +995,7 @@ test("add note", async () => {
         "C1",
     ]);
     expect(`.o_note_row`).toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a:last").click();
+    await contains(".o_field_x2many_list_row_add button:last").click();
     await edit("this is a note");
     await contains(getFixture()).click();
     expect(queryAllTexts(".o_data_row")).toEqual([
@@ -1059,7 +1059,7 @@ test("section_and_note_text widget", async () => {
         "C1",
     ]);
     expect(`.o_note_row`).toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a:last").click();
+    await contains(".o_field_x2many_list_row_add button:last").click();
     expect(`.o_is_line_note textarea`).toHaveCount(1);
     await edit("this is a note\non 2 lines");
     await contains(getFixture()).click();
@@ -1123,7 +1123,7 @@ test("sections with required content field", async () => {
     expect(".o_data_row").toHaveCount(14);
     await contains(".o_form_button_cancel").click();
     expect(".o_data_row").toHaveCount(13);
-    await contains(".o_field_x2many_list_row_add a:eq(1)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(1)").click();
     expect(".o_data_row").toHaveCount(14);
     expect(".o_invalid_cell").toHaveCount(0);
     await press("Enter");
diff --git a/addons/account/static/tests/tours/deductible_amount_column.js b/addons/account/static/tests/tours/deductible_amount_column.js
index f96191f152d7f..4f8d4600efcf9 100644
--- a/addons/account/static/tests/tours/deductible_amount_column.js
+++ b/addons/account/static/tests/tours/deductible_amount_column.js
@@ -6,7 +6,7 @@ registry.category("web_tour.tours").add("deductible_amount_column", {
     steps: () => [
     {
         content: "Add item",
-        trigger: "div[name='invoice_line_ids'] .o_field_x2many_list_row_add a:contains('Add a line')",
+        trigger: "div[name='invoice_line_ids'] .o_field_x2many_list_row_add button:contains('Add a line')",
         run: "click",
     },
     {
diff --git a/addons/account/static/tests/tours/tax_group_tests.js b/addons/account/static/tests/tours/tax_group_tests.js
index fb77b79faa748..3a4e53be487b6 100644
--- a/addons/account/static/tests/tours/tax_group_tests.js
+++ b/addons/account/static/tests/tours/tax_group_tests.js
@@ -54,7 +54,7 @@ registry.category("web_tour.tours").add('account_tax_group', {
     // Add First product
     {
         content: "Add items",
-        trigger: 'div[name="invoice_line_ids"] .o_field_x2many_list_row_add a:contains("Add a line")',
+        trigger: 'div[name="invoice_line_ids"] .o_field_x2many_list_row_add button:contains("Add a line")',
         run: "click",
     },
     {
diff --git a/addons/event/static/src/js/tours/event_tour.js b/addons/event/static/src/js/tours/event_tour.js
index 20b12a8468522..dc1fc9d674167 100644
--- a/addons/event/static/src/js/tours/event_tour.js
+++ b/addons/event/static/src/js/tours/event_tour.js
@@ -47,7 +47,7 @@ registry.category("web_tour.tours").add('event_tour', {
     content: markup(_t("Open date range picker.<br/>Pick a Start and End date for your event.")),
     run: "click",
 }, {
-    trigger: '.o_event_form_view div[name="event_ticket_ids"] .o_field_x2many_list_row_add a',
+    trigger: '.o_event_form_view div[name="event_ticket_ids"] .o_field_x2many_list_row_add button',
     content: markup(_t("Ticket types allow you to distinguish your attendees. Let's <b>create</b> a new one.")),
     run: "click",
 }, stepUtils.autoExpandMoreButtons(),
diff --git a/addons/hr_skills/static/tests/tours/skills_type_tours.js b/addons/hr_skills/static/tests/tours/skills_type_tours.js
index dbea933f13412..99683202d23c9 100644
--- a/addons/hr_skills/static/tests/tours/skills_type_tours.js
+++ b/addons/hr_skills/static/tests/tours/skills_type_tours.js
@@ -31,7 +31,7 @@ registry.category("web_tour.tours").add("hr_skills_type_tour", {
             run: "edit Cooking Skill",
         },
         {
-            trigger: "div[name=skill_ids] .o_field_x2many_list_row_add a",
+            trigger: "div[name=skill_ids] .o_field_x2many_list_row_add button",
             run: "click",
         },
         {
@@ -39,7 +39,7 @@ registry.category("web_tour.tours").add("hr_skills_type_tour", {
             run: "edit Macaroon",
         },
         {
-            trigger: "div[name=skill_level_ids] .o_field_x2many_list_row_add a",
+            trigger: "div[name=skill_level_ids] .o_field_x2many_list_row_add button",
             run: "click",
         },
         {
@@ -51,7 +51,7 @@ registry.category("web_tour.tours").add("hr_skills_type_tour", {
             run: "click",
         },
         {
-            trigger: "div[name=skill_level_ids] .o_field_x2many_list_row_add a",
+            trigger: "div[name=skill_level_ids] .o_field_x2many_list_row_add button",
             run: "click",
         },
         {
@@ -63,7 +63,7 @@ registry.category("web_tour.tours").add("hr_skills_type_tour", {
             run: "click",
         },
         {
-            trigger: "div[name=skill_level_ids] .o_field_x2many_list_row_add a",
+            trigger: "div[name=skill_level_ids] .o_field_x2many_list_row_add button",
             run: "click",
         },
         {
diff --git a/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js b/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js
index bf351f9596724..a7e7c18d1b732 100644
--- a/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js
+++ b/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js
@@ -4,7 +4,7 @@ import { stepUtils } from "@web_tour/tour_utils";
 function createChatbotSteps(...stepMessages) {
     return [
         {
-            trigger: "div[name='script_step_ids'] .o_field_x2many_list_row_add a",
+            trigger: "div[name='script_step_ids'] .o_field_x2many_list_row_add button",
             run: "click",
         },
         ...stepMessages
diff --git a/addons/mass_mailing/static/tests/tours/mailing_campaign.js b/addons/mass_mailing/static/tests/tours/mailing_campaign.js
index 868fb023c17c2..e0a7805ba9f1b 100644
--- a/addons/mass_mailing/static/tests/tours/mailing_campaign.js
+++ b/addons/mass_mailing/static/tests/tours/mailing_campaign.js
@@ -22,7 +22,7 @@ registry.category('web_tour.tours').add('mailing_campaign', {
         },
         {
             content: 'Add a line (create new mailing)',
-            trigger: '.o_field_x2many_list_row_add a',
+            trigger: '.o_field_x2many_list_row_add button',
             run: "click",
         },
         {
diff --git a/addons/project/static/src/js/tours/project.js b/addons/project/static/src/js/tours/project.js
index d18bd9e6ee456..a594d22d77e40 100644
--- a/addons/project/static/src/js/tours/project.js
+++ b/addons/project/static/src/js/tours/project.js
@@ -183,7 +183,7 @@ registry.category("web_tour.tours").add('project_tour', {
     run: 'click',
 }, {
     isActive: ["auto"],
-    trigger: '.o_field_subtasks_one2many .o_list_renderer a[role="button"]',
+    trigger: '.o_field_subtasks_one2many .o_list_renderer .o_field_x2many_list_row_add button',
     content: _t('Add a sub-task'),
     run: 'click',
 }, {
diff --git a/addons/project/static/tests/project_task_subtask.test.js b/addons/project/static/tests/project_task_subtask.test.js
index c35db34048f17..2a456ce515329 100644
--- a/addons/project/static/tests/project_task_subtask.test.js
+++ b/addons/project/static/tests/project_task_subtask.test.js
@@ -265,7 +265,7 @@ test("project.task (form): check that the subtask of another project can be adde
         type: "form",
     });
 
-    await click(".o_field_x2many_list_row_add a");
+    await click(".o_field_x2many_list_row_add button");
     await animationFrame();
     await click(".o_field_project input");
     await animationFrame();
@@ -284,7 +284,7 @@ test("project.task (form): check focus on new subtask's name", async () => {
         type: "form",
     });
 
-    await click(".o_field_x2many_list_row_add a");
+    await click(".o_field_x2many_list_row_add button");
     await animationFrame();
     expect(".o_field_char input").toBeFocused({
         message: "Upon clicking on 'Add a line', the new subtask's name should be focused.",
diff --git a/addons/project/static/tests/tours/project_sharing_tour.js b/addons/project/static/tests/tours/project_sharing_tour.js
index 0a86e0d0745d7..844072f94c448 100644
--- a/addons/project/static/tests/tours/project_sharing_tour.js
+++ b/addons/project/static/tests/tours/project_sharing_tour.js
@@ -11,7 +11,7 @@ const projectSharingSteps = [...stepUtils.goToAppSteps("project.menu_main_pm", '
     content: 'Start editing the project.',
     run: "click",
 }, {
-    trigger: '.modal div[name="collaborator_ids"] .o_field_x2many_list_row_add > a',
+    trigger: '.modal div[name="collaborator_ids"] .o_field_x2many_list_row_add > button',
     content: 'Add a collaborator to the project.',
     run: "click",
 }, {
diff --git a/addons/project/static/tests/tours/project_tour.js b/addons/project/static/tests/tours/project_tour.js
index b9c2ae0961f16..f98dc82946c1a 100644
--- a/addons/project/static/tests/tours/project_tour.js
+++ b/addons/project/static/tests/tours/project_tour.js
@@ -68,7 +68,7 @@ registry.category("web_tour.tours").add('project_test_tour', {
         content: 'Open sub-tasks notebook section',
         run: 'click',
     }, {
-        trigger: '.o_field_subtasks_one2many .o_list_renderer a[role="button"]',
+        trigger: '.o_field_subtasks_one2many .o_list_renderer .o_field_x2many_list_row_add button',
         content: 'Add a subtask',
         run: 'click',
     }, {
@@ -139,7 +139,7 @@ registry.category("web_tour.tours").add('project_test_tour', {
         content: 'Open sub-tasks notebook section',
         run: 'click',
     }, {
-        trigger: '.o_field_subtasks_one2many .o_list_renderer a[role="button"]',
+        trigger: '.o_field_subtasks_one2many .o_list_renderer .o_field_x2many_list_row_add button',
         content: 'Add a subtask',
         run: 'click',
     }, {
diff --git a/addons/purchase/static/src/js/tours/purchase.js b/addons/purchase/static/src/js/tours/purchase.js
index ca2feb38dc1c6..051913f925f8e 100644
--- a/addons/purchase/static/src/js/tours/purchase.js
+++ b/addons/purchase/static/src/js/tours/purchase.js
@@ -56,7 +56,7 @@ registry.category("web_tour.tours").add("purchase_tour", {
             trigger: ".o_field_res_partner_many2one[name='partner_id'] .o_external_button",
         },
         {
-            trigger: ".o_field_x2many_list_row_add > a",
+            trigger: ".o_field_x2many_list_row_add > button",
             content: _t("Add some products or services to your quotation."),
             tooltipPosition: "bottom",
             run: "click",
diff --git a/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js b/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
index db3d9d9220a87..eca83e33a3109 100644
--- a/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
+++ b/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
@@ -21,7 +21,7 @@ registry.category("web_tour.tours").add('purchase_matrix_tour', {
     trigger: '.ui-menu-item > a:contains("Agrolait")',
     run: "click",
 }, {
-    trigger: "a:contains('Add a product')",
+    trigger: "button:contains('Add a product')",
     run: "click",
 }, {
     trigger: 'div[name="product_template_id"] input',
@@ -85,7 +85,7 @@ registry.category("web_tour.tours").add('purchase_matrix_tour', {
     trigger: ".o_form_status_indicator_buttons:not(:visible)",
 },
 {
-    trigger: 'a:contains("Add a product")',
+    trigger: 'button:contains("Add a product")',
     run: "click",
 }, {
     trigger: 'div[name="product_template_id"] input',
diff --git a/addons/sale/static/src/js/tours/sale.js b/addons/sale/static/src/js/tours/sale.js
index d9cb2bd6b202e..4374d6d319207 100644
--- a/addons/sale/static/src/js/tours/sale.js
+++ b/addons/sale/static/src/js/tours/sale.js
@@ -45,7 +45,7 @@ registry.category("web_tour.tours").add("sale_tour", {
             run: "click",
         },
         {
-            trigger: ".o_field_x2many_list_row_add > a",
+            trigger: ".o_field_x2many_list_row_add > button",
             content: _t("Click here to add some products or services to your quotation."),
             tooltipPosition: "bottom",
             run: "click",
diff --git a/addons/sale/static/src/js/tours/tour_utils.js b/addons/sale/static/src/js/tours/tour_utils.js
index 88b6094434954..267cb6d6483f8 100644
--- a/addons/sale/static/src/js/tours/tour_utils.js
+++ b/addons/sale/static/src/js/tours/tour_utils.js
@@ -28,7 +28,7 @@ function addProduct(productName, rowNumber=1) {
     return [
         {
             content: `Add product ${productName}`,
-            trigger: 'a:contains("Add a product")',
+            trigger: 'button:contains("Add a product")',
             run: 'click',
         },
         {
diff --git a/addons/sale/static/tests/sale_product_field.test.js b/addons/sale/static/tests/sale_product_field.test.js
index acdf428a14856..99a2aa9a9c1bd 100644
--- a/addons/sale/static/tests/sale_product_field.test.js
+++ b/addons/sale/static/tests/sale_product_field.test.js
@@ -64,7 +64,7 @@ test("pressing tab with incomplete text will create a product", async () => {
     });
 
     // add a line and enter new product name
-    await contains(".o_field_x2many_list .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list .o_field_x2many_list_row_add button").click();
     await contains("[name='product_template_id'] input").edit("new product");
     await press("tab");
     await runAllTimers();
diff --git a/addons/sale_project/static/tests/so_line_create_button.test.js b/addons/sale_project/static/tests/so_line_create_button.test.js
index 1ed6d91a923c0..8b37b51129665 100644
--- a/addons/sale_project/static/tests/so_line_create_button.test.js
+++ b/addons/sale_project/static/tests/so_line_create_button.test.js
@@ -97,7 +97,7 @@ test("test so_line_create_button widget: valid SO", async () => {
             "The default_project_id set in the field context should be passed in the SO form view.",
     });
 
-    await contains(".modal-content .o_field_x2many_list_row_add a").click();
+    await contains(".modal-content .o_field_x2many_list_row_add button").click();
     await contains(".modal-content .o_selected_row td[name='product_id'] input").edit(
         "Service Product 2"
     );
@@ -123,7 +123,7 @@ test("test so_line_create_button widget: invalid SO", async () => {
     await contains("a[aria-label='Create Sales Order']").click();
     await animationFrame();
 
-    await contains(".modal-content .o_field_x2many_list_row_add a").click();
+    await contains(".modal-content .o_field_x2many_list_row_add button").click();
     await contains(".modal-content .o_selected_row td[name='product_id'] input").edit(
         "Consumable Product 1"
     );
diff --git a/addons/sale_timesheet/static/tests/so_line_create_button.test.js b/addons/sale_timesheet/static/tests/so_line_create_button.test.js
index 5730b8a71a08c..bcbec2f85a252 100644
--- a/addons/sale_timesheet/static/tests/so_line_create_button.test.js
+++ b/addons/sale_timesheet/static/tests/so_line_create_button.test.js
@@ -84,7 +84,7 @@ test("test so_line_create_button widget: valid SO", async () => {
         type: "form",
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await focus("[name='sale_line_id'] input");
     const create_so_button = queryOne("a[aria-label='Create Sales Order']");
     expect(create_so_button).toBeVisible({
@@ -102,7 +102,7 @@ test("test so_line_create_button widget: valid SO", async () => {
             "The default_project_id set in the field context should be passed in the SO form view.",
     });
 
-    await contains(".modal-content .o_field_x2many_list_row_add a").click();
+    await contains(".modal-content .o_field_x2many_list_row_add button").click();
     await contains(".modal-content .o_selected_row td[name='product_id'] input").edit(
         "Service Product 2"
     );
@@ -124,12 +124,12 @@ test("test so_line_create_button widget: invalid SO", async () => {
         type: "form",
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await focus("[name='sale_line_id'] input");
     await contains("a[aria-label='Create Sales Order']").click();
     await animationFrame();
 
-    await contains(".modal-content .o_field_x2many_list_row_add a").click();
+    await contains(".modal-content .o_field_x2many_list_row_add button").click();
     await contains(".modal-content .o_selected_row td[name='product_id'] input").edit(
         "Consumable Product 1"
     );
diff --git a/addons/sale_timesheet/static/tests/so_line_field.test.js b/addons/sale_timesheet/static/tests/so_line_field.test.js
index b2f86179e3ce2..8781e1b009311 100644
--- a/addons/sale_timesheet/static/tests/so_line_field.test.js
+++ b/addons/sale_timesheet/static/tests/so_line_field.test.js
@@ -89,7 +89,7 @@ test("Check whether so_line_field widget works as intended in sub-tree view of t
         expect.step("web_save");
     });
     await openFormView("project.task");
-    await click(".o_field_x2many_list_row_add a");
+    await click(".o_field_x2many_list_row_add button");
     await insertText(".o_field_widget[name=so_line] input", "Sale Order Line 2", { replace: true });
     await contains(".ui-autocomplete");
     await click(target.querySelector(".ui-menu-item"));
diff --git a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
index 8b2349961a92d..823a7329c3f07 100644
--- a/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+++ b/addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
@@ -109,7 +109,7 @@ registry.category("web_tour.tours").add('sale_timesheet_tour', {
     content: 'Click on Timesheets page to log a timesheet',
     run: "click",
 }, {
-    trigger: 'div[name="timesheet_ids"] td.o_field_x2many_list_row_add a[role="button"]',
+    trigger: 'div[name="timesheet_ids"] td.o_field_x2many_list_row_add button',
     content: 'Click on Add a line to create a new timesheet into the task.',
     run: "click",
 }, {
@@ -217,7 +217,7 @@ registry.category("web_tour.tours").add('sale_timesheet_tour', {
     content: 'Click on Invoicing tab to configure the invoicing of this project.',
     run: "click",
 }, {
-    trigger: 'div[name="sale_line_employee_ids"] td.o_field_x2many_list_row_add > a[role="button"]',
+    trigger: 'div[name="sale_line_employee_ids"] td.o_field_x2many_list_row_add > button',
     content: 'Click on Add a line on the mapping list view.',
     run: "click",
 }, {
diff --git a/addons/stock/static/tests/tours/stock_picking_tour.js b/addons/stock/static/tests/tours/stock_picking_tour.js
index 327e01ce66c46..972274a47864f 100644
--- a/addons/stock/static/tests/tours/stock_picking_tour.js
+++ b/addons/stock/static/tests/tours/stock_picking_tour.js
@@ -2,7 +2,7 @@ import { registry } from "@web/core/registry";
 
 registry.category("web_tour.tours").add('test_generate_serial_1', {  steps: () => [
     {
-        trigger: '.o_field_x2many_list_row_add > a',
+        trigger: '.o_field_x2many_list_row_add > button',
         run: "click",
     },
     {
@@ -97,7 +97,7 @@ registry.category("web_tour.tours").add('test_generate_serial_1', {  steps: () =
 
 registry.category("web_tour.tours").add('test_generate_serial_2', {  steps: () => [
     {
-        trigger: '.o_field_x2many_list_row_add > a',
+        trigger: '.o_field_x2many_list_row_add > button',
         run: "click",
     },
     {
@@ -302,7 +302,7 @@ registry.category("web_tour.tours").add("test_add_new_line_in_detailled_op", {
             trigger: ".modal-content",
         },
         {
-            trigger: ".modal-content .o_field_x2many_list_row_add > a",
+            trigger: ".modal-content .o_field_x2many_list_row_add > button",
             run: "click",
         },
         {
@@ -321,7 +321,7 @@ registry.category("web_tour.tours").add("test_add_new_line_in_detailled_op", {
                 ".modal-content .o_data_row:has(.o_field_pick_from input:value(WH/Stock - LOT001)):has(.o_field_float[name=quantity] input:value(0.00))",
         },
         {
-            trigger: ".modal-content .o_field_x2many_list_row_add > a",
+            trigger: ".modal-content .o_field_x2many_list_row_add > button",
             run: "click",
         },
         {
@@ -399,7 +399,7 @@ registry.category("web_tour.tours").add("test_add_new_line_in_detailled_op", {
             trigger: ".modal-content .o_list_number:contains(18.00)",
         },
         {
-            trigger: ".modal-content .o_field_x2many_list_row_add > a",
+            trigger: ".modal-content .o_field_x2many_list_row_add > button",
             run: "click",
         },
         {
@@ -477,7 +477,7 @@ registry.category("web_tour.tours").add("test_add_new_line_in_detailled_op", {
             trigger: ".modal-content .o_list_number:contains(17.00)",
         },
         {
-            trigger: ".modal-content .o_field_x2many_list_row_add > a",
+            trigger: ".modal-content .o_field_x2many_list_row_add > button",
             run: "click",
         },
         {
diff --git a/addons/survey/static/tests/components/question_page_one2many_field.test.js b/addons/survey/static/tests/components/question_page_one2many_field.test.js
index bf7620afcf986..f76fa57ea44fe 100644
--- a/addons/survey/static/tests/components/question_page_one2many_field.test.js
+++ b/addons/survey/static/tests/components/question_page_one2many_field.test.js
@@ -224,7 +224,7 @@ test("can create section inline", async () => {
 
     expect(".o_selected_row").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a:eq(1)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(1)").click();
     expect(".o_selected_row.o_is_section").toHaveCount(1);
     expect(".modal .o_form_view").toHaveCount(0);
 });
@@ -251,7 +251,7 @@ test("creates real record in form dialog", async () => {
             `,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_selected_row").toHaveCount(0);
     expect(".modal .o_form_view").toHaveCount(1);
 });
diff --git a/addons/survey/static/tests/tours/survey_form.js b/addons/survey/static/tests/tours/survey_form.js
index 2b3b828590417..6eac19029f59c 100644
--- a/addons/survey/static/tests/tours/survey_form.js
+++ b/addons/survey/static/tests/tours/survey_form.js
@@ -19,7 +19,7 @@ registry.category("web_tour.tours").add('survey_tour_test_survey_form_triggers',
         run: "edit Test survey",
     }, {
         content: "Add a first question",
-        trigger: "td.o_field_x2many_list_row_add a",
+        trigger: "td.o_field_x2many_list_row_add button",
         run: "click",
     }, {
         content: "Set the first question's title",
@@ -238,7 +238,7 @@ function addTwoAnswers() {
         {
             content: "Add the first answer",
             trigger:
-                ".modal div[name=suggested_answer_ids] .o_field_x2many_list_row_add a",
+                ".modal div[name=suggested_answer_ids] .o_field_x2many_list_row_add button",
             run: "click",
         },
         {
@@ -248,7 +248,7 @@ function addTwoAnswers() {
         {
             content: "Add the second answer",
             trigger:
-                ".modal div[name=suggested_answer_ids] .o_field_x2many_list_row_add a",
+                ".modal div[name=suggested_answer_ids] .o_field_x2many_list_row_add button",
             run: "click",
         },
         {
diff --git a/addons/web/static/src/views/kanban/kanban_renderer.xml b/addons/web/static/src/views/kanban/kanban_renderer.xml
index d958c21491e77..bb5233a4229d8 100644
--- a/addons/web/static/src/views/kanban/kanban_renderer.xml
+++ b/addons/web/static/src/views/kanban/kanban_renderer.xml
@@ -108,9 +108,9 @@
                 </t>
             </t>
             <t t-else="">
-                <div t-if="props.addLabel" class="o_kanban_record o-kanban-button-new btn btn-link py-4" accesskey="shift+c" t-on-click.stop.prevent="() => props.onAdd()">
+                <button t-if="props.addLabel" class="o_kanban_record o-kanban-button-new btn btn-link py-4" accesskey="shift+c" t-on-click.stop.prevent="() => props.onAdd()">
                     <t t-out="props.addLabel" />
-                </div>
+                </button>
                 <!-- kanban ghost cards are used to properly space last elements. -->
                 <div t-foreach="[,,,,,,]" t-as="i" t-key="i_index" class="o_kanban_record o_kanban_ghost flex-grow-1 flex-md-shrink-1 flex-shrink-0 my-0" />
             </t>
diff --git a/addons/web/static/src/views/list/list_renderer.js b/addons/web/static/src/views/list/list_renderer.js
index 3121b86d15a17..2cde2cf9e457b 100644
--- a/addons/web/static/src/views/list/list_renderer.js
+++ b/addons/web/static/src/views/list/list_renderer.js
@@ -1796,7 +1796,7 @@ export class ListRenderer extends Component {
                 // TODO this seems bad: refactor this
                 list.leaveEditMode({ discard: true });
                 const firstAddButton = this.tableRef.el.querySelector(
-                    ".o_field_x2many_list_row_add a"
+                    ".o_field_x2many_list_row_add button"
                 );
 
                 if (firstAddButton) {
@@ -2145,7 +2145,7 @@ export class ListRenderer extends Component {
             return;
         }
         // Add row
-        if (target.closest(".o_field_x2many_list_row_add a")) {
+        if (target.closest(".o_field_x2many_list_row_add button")) {
             return;
         }
         // Optional columns
diff --git a/addons/web/static/src/views/list/list_renderer.xml b/addons/web/static/src/views/list/list_renderer.xml
index 065e0c4293a69..549abcf23a35a 100644
--- a/addons/web/static/src/views/list/list_renderer.xml
+++ b/addons/web/static/src/views/list/list_renderer.xml
@@ -147,16 +147,14 @@
                     t-on-keydown="(ev) => this.onCellKeydown(ev, null)"
                 >
                     <t t-foreach="controls" t-as="control" t-key="control_index">
-                        <a
+                        <button
                             t-if="control.type === 'create' and !evalColumnInvisible(control.invisible)"
-                            href="#"
-                            role="button"
-                            t-att-class="control_index !== 0 ? 'ml16' : ''"
+                            t-attf-class="btn btn-link #{control_index !== 0 ? 'ml16' : ''}"
                             t-att-tabindex="props.list.editedRecord ? '-1' : '0'"
                             t-on-click.stop.prevent="() => this.add({ context: control.context })"
                         >
                             <t t-esc="control.string"/>
-                        </a>
+                        </button>
                         <ViewButton
                             t-if="control.type === 'button' and !evalColumnInvisible(control.invisible)"
                             className="`${control.className} ${control_index !== 0 ? 'ml16' : ''}`"
diff --git a/addons/web/static/tests/tours/test_user_group_settings_tour.js b/addons/web/static/tests/tours/test_user_group_settings_tour.js
index 51b1fe920c96b..2c83704e7e036 100644
--- a/addons/web/static/tests/tours/test_user_group_settings_tour.js
+++ b/addons/web/static/tests/tours/test_user_group_settings_tour.js
@@ -28,7 +28,7 @@ registry.category("web_tour.tours").add("test_user_group_settings", {
             run: "edit Privi Foo",
         },
         {
-            trigger: ".o_field_x2many_list_row_add a",
+            trigger: ".o_field_x2many_list_row_add button",
             content: "add groups (open modal)",
             run: "click",
         },
@@ -61,7 +61,7 @@ registry.category("web_tour.tours").add("test_user_group_settings", {
             run: "click",
         },
         {
-            trigger: 'div[name="implied_ids"] .o_field_x2many_list_row_add a',
+            trigger: 'div[name="implied_ids"] .o_field_x2many_list_row_add button',
             content: "switch to implied",
             run: "click",
         },
diff --git a/addons/web/static/tests/views/fields/char_field.test.js b/addons/web/static/tests/views/fields/char_field.test.js
index 957c8b382b4b2..8e555eed54ac9 100644
--- a/addons/web/static/tests/views/fields/char_field.test.js
+++ b/addons/web/static/tests/views/fields/char_field.test.js
@@ -516,7 +516,7 @@ test("input field: change value before pending onchange returns", async () => {
     let def;
     onRpc("onchange", () => def);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_field_widget[name='name'] input").toHaveValue("My little Name Value", {
         message: "should contain the default value",
     });
@@ -608,7 +608,7 @@ test("input field: change value before pending onchange returns (with fieldDebou
 
     onRpc("onchange", () => def);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_field_widget[name='name'] input").toHaveValue("My little Name Value", {
         message: "should contain the default value",
     });
@@ -808,7 +808,7 @@ test("input field: set and remove value, then wait for onchange", async () => {
             </field>
         </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_field_widget[name=name] input").toHaveValue("");
     await fieldInput("name").edit("test", { confirm: false });
     await fieldInput("name").clear({ confirm: false });
diff --git a/addons/web/static/tests/views/fields/many2many_field.test.js b/addons/web/static/tests/views/fields/many2many_field.test.js
index 005909df02681..4e2329e0a130c 100644
--- a/addons/web/static/tests/views/fields/many2many_field.test.js
+++ b/addons/web/static/tests/views/fields/many2many_field.test.js
@@ -391,14 +391,14 @@ test("field string is used in the SelectCreateDialog", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a:eq(0)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(0)").click();
     expect(".modal").toHaveCount(1);
     expect(".modal .modal-title").toHaveText("Add: pokemon");
 
     await contains(".modal .o_form_button_cancel").click();
     expect(".modal").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a:eq(1)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(1)").click();
     expect(".modal").toHaveCount(1);
     expect(".modal .modal-title").toHaveText("Add: Abcde");
 });
@@ -527,7 +527,7 @@ test("many2many list (non editable): create a new record and click on action but
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".modal .o_create_button").click();
     expect.verifySteps([
@@ -580,7 +580,7 @@ test("many2many list (non editable): create a new record and click on action but
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".modal .o_create_button").click();
     expect.verifySteps([
@@ -637,7 +637,7 @@ test("add a new record in a many2many non editable list", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_dialog .o_create_button").click();
     await contains(".o_dialog .o_field_widget[name=name] input").edit("a name");
     await contains(".o_dialog .o_form_button_save").click();
@@ -689,7 +689,7 @@ test("add record in a many2many non editable list with context", async () => {
     });
 
     await contains(".o_field_widget[name=int_field] input").edit("2");
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("many2many list (editable): edition", async () => {
@@ -750,7 +750,7 @@ test("many2many list (editable): edition", async () => {
     expect.verifySteps(["get_views", "web_read"]);
 
     // add new subrecords
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
     expect(".modal .o_list_view .o_data_row").toHaveCount(1);
     await contains(".modal .o_list_view .o_data_row .o_data_cell").click();
@@ -873,7 +873,7 @@ test("fieldmany2many list comodel not writable", async () => {
     });
 
     expect(".o_field_many2many .o_field_x2many_list_row_add").toHaveCount(1);
-    await contains(".o_field_many2many .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_many2many .o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
 
     expect(".modal-footer button").toHaveCount(2);
@@ -922,7 +922,7 @@ test("many2many list: conditional create/delete attrs", async () => {
     });
     expect(".o_list_record_remove").toHaveCount(2);
 
-    await contains(".o_field_x2many_list_row_add a:eq(0)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(0)").click();
 
     expect(".modal .modal-footer button").toHaveCount(3);
 
@@ -936,7 +936,7 @@ test("many2many list: conditional create/delete attrs", async () => {
     expect(".o_field_x2many_list_row_add").toHaveCount(1);
     expect(".o_list_record_remove").toHaveCount(2);
 
-    await contains(".o_field_x2many_list_row_add a:eq(0)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(0)").click();
     expect(".modal .modal-footer button").toHaveCount(2);
 });
 
@@ -965,7 +965,7 @@ test("many2many field with link/unlink attrs (list)", async () => {
     expect(".o_field_x2many_list_row_add").toHaveCount(1);
     expect(".o_list_record_remove").toHaveCount(2);
 
-    await contains(".o_field_x2many_list_row_add a:eq(0)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(0)").click();
 
     expect(".modal .modal-footer button").toHaveCount(3);
 
@@ -1003,7 +1003,7 @@ test('many2many field with link/unlink attrs (list, create="0")', async () => {
     expect(".o_field_x2many_list_row_add").toHaveCount(1);
     expect(".o_list_record_remove").toHaveCount(2);
 
-    await contains(".o_field_x2many_list_row_add a:eq(0)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(0)").click();
 
     expect(".modal .modal-footer button").toHaveCount(2);
 
@@ -1194,7 +1194,7 @@ test("context and domain dependent on an x2m must contain the list of current id
             </field>
         </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("many2many list with x2many: add a record", async () => {
@@ -1226,13 +1226,13 @@ test("many2many list with x2many: add a record", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_data_row:first .o_data_cell:eq(0)").click();
 
     expect(".o_data_row").toHaveCount(1);
     expect(queryAllTexts(".o_data_row:first .o_tag_badge_text")).toEqual(["leonardo", "donatello"]);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_data_row .o_data_cell:eq(1)").click();
 
     expect(".o_data_row").toHaveCount(2);
@@ -1266,7 +1266,7 @@ test("many2many with a domain", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal .o_data_row").toHaveCount(1);
     await contains(`.modal .o_searchview input`).edit("s");
     await press("enter");
@@ -1459,7 +1459,7 @@ test("many2many concurrency edition", async () => {
     expect(".o_data_row").toHaveCount(4);
     await contains(".o_data_row .o_list_record_remove").click();
     await contains(".o_data_row .o_list_record_remove").click();
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_data_row td.o_data_cell:eq(0)").click();
     def.resolve();
     await animationFrame();
@@ -1507,7 +1507,7 @@ test("many2many widget: creates a new record with a context containing the paren
     });
     expect.verifySteps(["get_views", "web_read"]);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect.verifySteps(["get_views", "web_search_read", "has_group"]);
 
     await contains(".o_create_button").click();
@@ -1715,7 +1715,7 @@ test("many2many list add *many* records, remove, re-add", async () => {
     });
 
     // First round: add 51 records in batch
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".modal-lg").toHaveCount(1);
 
@@ -1749,7 +1749,7 @@ test("many2many list add *many* records, remove, re-add", async () => {
     ).toHaveText("50");
 
     // Third round: re-add 1 records
-    await contains(".o_field_x2many_list_row_add a:eq(0)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(0)").click();
 
     expect(".modal-lg").toHaveCount(1);
 
@@ -1992,7 +1992,7 @@ test("`this` inside rendererProps should reference the component", async () => {
                 </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect.verifySteps(["onAdd", "selectCreate"]);
 });
 
@@ -2097,7 +2097,7 @@ test("test view button warning on opening unsaved record", async () => {
         `,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_list_record_open_form_view button").click();
 
     expect.verifySteps(["notification"]);
diff --git a/addons/web/static/tests/views/fields/many2many_tags_field.test.js b/addons/web/static/tests/views/fields/many2many_tags_field.test.js
index 4b80e9edfaf80..aa45bdc48a51e 100644
--- a/addons/web/static/tests/views/fields/many2many_tags_field.test.js
+++ b/addons/web/static/tests/views/fields/many2many_tags_field.test.js
@@ -1764,7 +1764,7 @@ test("Many2ManyTagsField doesn't use virtualId for 'web_name_search' on desktop"
             </field>
         </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
 
     await contains(".modal [name='name'] input").edit("yop");
@@ -1800,7 +1800,7 @@ test("Many2ManyTagsField doesn't use virtualId for 'web_name_search' on mobile",
             </field>
         </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
 
     await contains(".modal [name='name'] input").edit("yop");
diff --git a/addons/web/static/tests/views/fields/many2one_field.test.js b/addons/web/static/tests/views/fields/many2one_field.test.js
index 99a2e1b39bd06..71b258ef252da 100644
--- a/addons/web/static/tests/views/fields/many2one_field.test.js
+++ b/addons/web/static/tests/views/fields/many2one_field.test.js
@@ -1661,7 +1661,7 @@ test("list in form: quick create then save directly", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".o_field_widget[name=trululu] input").edit("b", { confirm: false });
     await runAllTimers();
@@ -1701,7 +1701,7 @@ test("name_create in form dialog", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".modal .o_field_widget[name=product_id] input").edit("new record", {
         confirm: false,
@@ -1800,13 +1800,13 @@ test("list in form: quick create then add a new line directly", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".o_field_widget[name=trululu] input").edit("b", { confirm: false });
     await runAllTimers();
     await contains(".o_m2o_dropdown_option_create").click();
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(1);
     expect(".o_data_row").toHaveClass("o_selected_row");
@@ -2127,7 +2127,7 @@ test('item dropped on discard with empty required field with "Add an item" (inva
     });
 
     // Click on "Add an item"
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_field_widget.o_required_modifier[name=trululu]").toHaveCount(1);
     expect(".o_field_widget.o_required_modifier[name=trululu] input").toHaveValue("");
 
@@ -2163,7 +2163,7 @@ test('item not dropped on discard with empty required field with "Add an item" (
     expect(".o_data_row").toHaveCount(0);
 
     // Click on "Add an item"
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row").toHaveCount(1);
 
     expect(".o_field_widget.o_required_modifier[name=trululu] input").toHaveCount(1);
@@ -2682,7 +2682,7 @@ test("failing quick create on a many2one inside a one2many because ValidationErr
         arch: '<form><field name="p" /></form>',
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name='product_id'] input").edit("abcd", { confirm: false });
     await runAllTimers();
     await contains(".o_field_widget[name='product_id'] .o_m2o_dropdown_option_create").click();
diff --git a/addons/web/static/tests/views/fields/monetary_field.test.js b/addons/web/static/tests/views/fields/monetary_field.test.js
index c049c1f35ceb5..31ca0ce64d572 100644
--- a/addons/web/static/tests/views/fields/monetary_field.test.js
+++ b/addons/web/static/tests/views/fields/monetary_field.test.js
@@ -531,7 +531,7 @@ test("should keep the focus when being edited in x2many lists", async () => {
     });
 
     // test the monetary field inside the one2many
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=float_field] input").edit("22", { confirm: "blur" });
 
     expect(".o_field_widget[name=p] .o_field_widget[name=float_field] span").toHaveInnerHTML(
diff --git a/addons/web/static/tests/views/fields/one2many_field.test.js b/addons/web/static/tests/views/fields/one2many_field.test.js
index b8eab09986bdb..4fb79916df046 100644
--- a/addons/web/static/tests/views/fields/one2many_field.test.js
+++ b/addons/web/static/tests/views/fields/one2many_field.test.js
@@ -360,7 +360,7 @@ test("one2many in a list x2many editable use the right context", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list .o_field_x2many_list_row_add button").click();
     await contains("[name='trululu'] input").edit("new partner");
     await selectFieldDropdownItem("trululu", 'Create "new partner"');
 
@@ -390,7 +390,7 @@ test("one2many in a list x2many non-editable use the right context", async () =>
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list .o_field_x2many_list_row_add button").click();
     await contains("[name='trululu'] input").edit("new partner");
     await selectFieldDropdownItem("trululu", 'Create "new partner"');
 
@@ -416,7 +416,7 @@ test("O2M field without relation_field", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list .o_field_x2many_list_row_add button").click();
     expect(".o_dialog").toHaveCount(1);
 });
 
@@ -463,7 +463,7 @@ test("O2M List with pager, decoration and default_order: add and cancel adding",
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list .o_field_x2many_list_row_add button").click();
 
     expect(".o_field_x2many_list .o_data_row").toHaveCount(2);
 
@@ -512,7 +512,7 @@ test("O2M with parented m2o and domain on parent.m2o", async () => {
                 </field>
             </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await clickFieldDropdown("parent_id");
     // Only one web_name_search since empty search returns no result
     expect.verifySteps(["web_name_search"]);
@@ -549,7 +549,7 @@ test('O2M with buttons with attr "special" in dialog close the dialog', async ()
                 </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_dialog").toHaveCount(1);
 
     expect(".modal .btn").toHaveText("Cancel");
@@ -592,7 +592,7 @@ test("O2M modal buttons are disabled on click", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await clickFieldDropdown("parent_id");
     await contains(".o_field_widget[name=parent_id] input").edit("ABC", { confirm: false });
@@ -734,7 +734,7 @@ test("one2many list editable with cell readonly modifier", async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_selected_row [name=foo] input").toBeFocused({
         message: "The first input of the line should have the focus",
@@ -1570,7 +1570,7 @@ test("onchange followed by edition on the second page", async () => {
         message: "should display '#39' at the first line",
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(40, {
         message: "should display 39 records and the create line",
@@ -1589,7 +1589,7 @@ test("onchange followed by edition on the second page", async () => {
     expect(".o_data_row:eq(0)").toHaveClass(["o_data_row", "o_row_draggable"]);
     expect(".o_field_one2many .o_list_renderer .o_data_cell.o_list_char:eq(1)").toHaveText("#39");
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(40, {
         message: "should display 39 records and the create line",
@@ -1663,7 +1663,7 @@ test("onchange followed by edition on the second page (part 2)", async () => {
         { message: "should display '#77' at the last line" }
     );
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(41, {
         message: "should display 41 records and the create line",
@@ -1680,7 +1680,7 @@ test("onchange followed by edition on the second page (part 2)", async () => {
         "value 3",
         { confirm: "blur" }
     );
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(42, {
         message: "should display 42 records and the create line",
@@ -1881,7 +1881,7 @@ test("onchange on one2many containing x2many in form view", async () => {
     expect(".modal .o_data_row").toHaveCount(0);
 
     // add a many2many subrecord
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal").toHaveCount(2, { message: "should have opened a second dialog" });
 
@@ -1907,7 +1907,7 @@ test("onchange on one2many containing x2many in form view", async () => {
     expect(".modal .o_data_row").toHaveCount(1);
 
     // add another m2m subrecord
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal").toHaveCount(2, { message: "should have opened a second dialog" });
 
@@ -1989,7 +1989,7 @@ test("onchange on one2many with x2many in list (no widget) and form view (list)"
     expect(".modal .o_data_row").toHaveText("hello");
 
     // add a one2many subrecord and check if the default value is correctly applied
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal .o_data_row").toHaveCount(2);
     expect(".modal .o_data_row .o_field_widget[name=turtle_foo] input").toHaveValue(
@@ -2190,7 +2190,7 @@ test("onchange on one2many with x2many in list (many2many_tags) and form view (l
     expect(".modal .o_data_row").toHaveText("hello");
 
     // add a one2many subrecord and check if the default value is correctly applied
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal .o_data_row").toHaveCount(2);
     expect(".modal .o_data_row .o_field_widget[name=turtle_foo] input").toHaveValue(
@@ -3025,7 +3025,7 @@ test("add record in a one2many non editable list with context", async () => {
     });
 
     await contains(".o_field_widget[name=int_field] input").edit("2");
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test.tags("desktop");
@@ -3057,7 +3057,7 @@ test("edition of one2many field, with onchange and not inline sub view", async (
                 </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('div[name="turtle_int"] input').edit("5");
     await contains(".modal-footer button.btn-primary").click();
     let firstCellOfSecondRow = ".o_data_cell.o_list_char:eq(1)";
@@ -3733,7 +3733,7 @@ test("editable one2many list, pager is updated on desktop", async () => {
     });
 
     // add a record, add value to turtle_foo then click in form view to confirm it
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains('div[name="turtle_foo"] input').edit("nora");
 
@@ -3827,12 +3827,12 @@ test("one2many list (editable): edition, part 2", async () => {
         resId: 1,
     });
     // edit mode, then click on Add an item and enter a value
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_selected_row > td input").edit("kartoffel", { confirm: "false" });
     expect("td .o_field_char input").toHaveValue("kartoffel");
 
     // click again on Add an item
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row:eq(0)").toHaveClass("o_selected_row");
     expect(".o_data_cell:eq(1)").toHaveText("kartoffel");
     expect(".o_selected_row > td input").toHaveCount(1);
@@ -3864,9 +3864,9 @@ test("one2many list (editable): edition, part 3", async () => {
 
     // edit mode, then click on Add an item, enter value in turtle_foo and Add an item again
     expect("tr.o_data_row").toHaveCount(1);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('div[name="turtle_foo"] input').edit("nora", { confirm: "false" });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(3);
 
     // cancel the edition
@@ -3907,7 +3907,7 @@ test("one2many list (editable): edition, part 4", async () => {
 
     // edit mode, then click on Add an item
     expect("tr.o_data_row").toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row textarea").toHaveValue("");
 
     // add a value in the turtle_trululu field to trigger an onchange
@@ -3937,7 +3937,7 @@ test("one2many list (editable): edition, part 5", async () => {
     // edit mode, then click on Add an item, enter value in turtle_foo and Add an item again
     expect("tr.o_data_row").toHaveCount(1);
     expect(".o_data_cell").toHaveText("blip");
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=turtle_foo] input").edit("aaa", { confirm: "false" });
     expect("tr.o_data_row").toHaveCount(2);
     await contains(".o_list_record_remove:eq(1)").click();
@@ -3970,12 +3970,12 @@ test("one2many list (editable): discarding required empty data", async () => {
 
     // edit mode, then click on Add an item, then click elsewhere
     expect("tr.o_data_row").toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(getFixture()).click();
     expect("tr.o_data_row").toHaveCount(0);
 
     // click on Add an item again, then click on save
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await clickSave();
     expect("tr.o_data_row").toHaveCount(0);
 
@@ -4033,7 +4033,7 @@ test("editable one2many list, adding line when only one page", async () => {
     });
 
     // add a record, to reach the page size limit
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     // the record currently being added should not count in the pager
     expect(".o_field_widget[name=turtles] .o_pager").toHaveCount(0);
 
@@ -4065,7 +4065,7 @@ test("editable one2many list, adding line when only one page on desktop", async
     });
 
     // add a record, to reach the page size limit
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     // enter value in turtle_foo field and click outside to unselect the row
     await contains('.o_field_widget[name="turtle_foo"] input').edit("nora");
@@ -4093,7 +4093,7 @@ test("editable one2many list, adding line, then discarding", async () => {
     });
 
     // add a record, then discard
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".o_form_button_cancel").click();
     expect(".modal").toHaveCount(0);
@@ -4121,7 +4121,7 @@ test("editable one2many list, adding line, then discarding on desktop", async ()
     });
 
     // add a record, then discard
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_form_button_cancel").click();
     expect(".o_field_widget[name=turtles] .o_pager").toHaveText("1-3 / 4");
 });
@@ -4146,7 +4146,7 @@ test("editable one2many list, required field and pager", async () => {
     });
 
     // add a (empty) record
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     // go on next page. The new record is not valid and should be discarded
     await contains(".o_field_widget[name=turtles] .o_pager_next").click();
@@ -4175,7 +4175,7 @@ test("editable one2many list, required field, pager and confirm discard on deskt
     });
 
     // add a record with a dirty state, but not valid
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.o_field_widget[name="turtle_int"] input').edit(4321);
 
     // try to go to next page. The new record is not valid, but dirty so we should
@@ -4236,13 +4236,13 @@ test("editable one2many list, adding, discarding, and pager", async () => {
     });
 
     // add 4 records (to have more records than the limit)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.o_field_widget[name="turtle_foo"] input').edit("nora", { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.o_field_widget[name="turtle_foo"] input').edit("nora", { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.o_field_widget[name="turtle_foo"] input').edit("nora", { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect("tr.o_data_row").toHaveCount(5);
     expect(".o_field_widget[name=turtles] .o_pager").toHaveCount(0);
@@ -4275,7 +4275,7 @@ test("unselecting a line with missing required data", async () => {
 
     // edit mode, then click on Add an item, then click elsewhere
     expect("tr.o_data_row").toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(1);
 
     // adding a value in the non required field, so it is dirty, but with
@@ -4315,7 +4315,7 @@ test("pressing enter in a o2m with a required empty field", async () => {
     });
 
     // edit mode, then click on Add an item, then press enter
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await press("Enter");
     await animationFrame();
     expect('div[name="turtle_foo"]').toHaveClass("o_field_invalid");
@@ -4337,7 +4337,7 @@ test("pressing enter several times in a one2many", async () => {
         resId: 2,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row").toHaveCount(1);
     expect(".o_data_row:eq(0)").toHaveClass("o_selected_row");
 
@@ -4376,7 +4376,7 @@ test("creating a new line in an o2m with an handle field does not focus the hand
         resId: 2,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("[name='turtle_foo'] input").toBeFocused();
 
     await press("Enter");
@@ -4415,7 +4415,7 @@ test("editing a o2m, with required field and onchange", async () => {
 
     // edit mode, then click on Add an item
     expect("tr.o_data_row").toHaveCount(0);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     // input some text in required turtle_foo field
     await contains('.o_field_widget[name="turtle_foo"] input').edit("aubergine", {
@@ -4450,7 +4450,7 @@ test("editable o2m, pressing ESC discard current changes", async () => {
         resId: 2,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(1);
 
     await press("Escape");
@@ -4478,7 +4478,7 @@ test("editable o2m with required field, pressing ESC discard current changes", a
         resId: 2,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(1);
 
     await press("Escape");
@@ -4513,8 +4513,8 @@ test("pressing escape in editable o2m list in dialog", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal .o_data_row.o_selected_row").toHaveCount(1);
 
@@ -4843,7 +4843,7 @@ test("one2many with CREATE _onChanges correctly refreshed", async () => {
     });
     expect(".o_data_row").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     // trigger the first onchange
     _onChangestep = 1;
     await contains('[name="turtle_int"] input').edit("10", { confirm: "blur" });
@@ -4882,7 +4882,7 @@ test("editable one2many with sub widgets are rendered in readonly", async () =>
     expect(".o_form_view .o_field_x2many_list_row_add ").toHaveCount(1);
     expect(".o_form_view input").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_form_view .o_field_x2many_list_row_add ").toHaveCount(1);
     expect(".o_form_view input").toHaveCount(2);
 });
@@ -4995,7 +4995,7 @@ test("pager of one2many field in new record", async () => {
     });
 
     // click to create a subrecord
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(1);
     expect(".o_x2m_control_panel .o_pager").toHaveCount(0, {
         message: "o2m pager should be hidden",
@@ -5034,7 +5034,7 @@ test("one2many list with a many2one", async () => {
     expect(".o_data_cell[data-tooltip='xphone']").toHaveCount(1);
     expect(".o_data_cell[data-tooltip='xpad']").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     checkOnchange = true;
     await clickFieldDropdown("product_id");
@@ -5083,7 +5083,7 @@ test("one2many list with inline form view", async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     // write in the many2one field, value = 37 (xphone)
     await clickFieldDropdown("product_id");
@@ -5327,7 +5327,7 @@ test("one2many list, editable, with a date in the context", async () => {
         resId: 2,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("one2many field with context", async () => {
@@ -5353,9 +5353,9 @@ test("one2many field with context", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('[name="turtle_foo"] input').edit("hammer", { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("one2many list edition, some basic functionality", async () => {
@@ -5374,7 +5374,7 @@ test("one2many list edition, some basic functionality", async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("td .o_field_widget input").toHaveCount(1);
 
     await contains("td .o_field_widget input").edit("a", { confirm: false });
@@ -5409,7 +5409,7 @@ test("one2many list, the context is properly evaluated and sent", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("one2many list not editable, the context is properly evaluated and sent", async () => {
@@ -5441,7 +5441,7 @@ test("one2many list not editable, the context is properly evaluated and sent", a
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
     expect(".o_readonly_modifier").toHaveCount(1);
     expect(".o_readonly_modifier").toHaveText("5");
@@ -5504,7 +5504,7 @@ test("one2many with many2many widget: create", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".modal .o_data_row").toHaveCount(2);
 
@@ -5514,7 +5514,7 @@ test("one2many with many2many widget: create", async () => {
     expectedCommand = [[4, 1]];
     await clickSave();
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal .o_data_row").toHaveCount(1);
 
     await contains(".modal-footer button:eq(1)").click();
@@ -5616,7 +5616,7 @@ test("one2many with many2many widget: edition", async () => {
     await contains(".modal .o_form_button_save").click();
 
     // add a one2many record
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_data_row:first .o_list_record_selector input:eq(0)").click();
     await animationFrame(); // wait for re-rendering because of the change of selection
     await contains(".modal .o_select_button:eq(0)").click();
@@ -5658,7 +5658,7 @@ test("new record, the context is properly evaluated and sent", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("parent data is properly sent on an onchange rpc", async () => {
@@ -5687,7 +5687,7 @@ test("parent data is properly sent on an onchange rpc", async () => {
     });
 
     await contains("[name=foo] input").edit("hello", { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("parent data is properly sent on an onchange rpc (existing x2many record)", async () => {
@@ -5773,7 +5773,7 @@ test("parent data is properly sent on an onchange rpc, new record", async () =>
                 </field>
             </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect.verifySteps(["get_views", "onchange", "onchange"]);
 });
 
@@ -5824,7 +5824,7 @@ test("id field in one2many in a new record", async () => {
                 </field>
             </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('td [name="turtle_foo"] input').edit("cat", { confirm: false });
     await clickSave();
 });
@@ -5849,7 +5849,7 @@ test("sub form view with a required field", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal-footer button.btn-primary").click();
 
     expect(".modal").toHaveCount(1);
@@ -6142,7 +6142,7 @@ test("onchange many2many in one2many list editable", async () => {
     });
 
     // add new line (first, xpad)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('div[name="name"] input').edit("first", { confirm: false });
     await clickFieldDropdown("product_id");
     await contains('div[name="product_id"] .o_input_dropdown li:eq(1)').click(); // xpad
@@ -6182,7 +6182,7 @@ test("onchange many2many in one2many list editable", async () => {
     // enable the many2many onchange
     enableOnchange = true;
     // add new line (first, xenomorphe)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('div[name="name"] input').edit("first", { confirm: false });
     await clickFieldDropdown("product_id");
     await contains('div[name="product_id"] .o_input_dropdown li:eq(2)').click(); // xenomorphe
@@ -6385,7 +6385,7 @@ test("many2many list in a one2many opened by a many2one", async () => {
     await contains(".o_external_button").click();
 
     // click on add, to add a new partner in the m2m
-    await contains(".modal:eq(1) .o_field_x2many_list_row_add a").click();
+    await contains(".modal:eq(1) .o_field_x2many_list_row_add button").click();
 
     // select the PartnerType 'gold' (this closes the 3rd modal)
     await contains(".o_dialog:not(.o_inactive_modal) td.o_data_cell").click(); // select gold
@@ -6851,7 +6851,7 @@ test("one2many list editable = top", async () => {
     });
     expect(".o_data_row").toHaveCount(1);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(2);
     expect("tr.o_data_row input").toHaveValue("default foo turtle", {
@@ -6887,7 +6887,7 @@ test("one2many list editable = bottom", async () => {
 
     expect(".o_data_row").toHaveCount(1);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_data_row").toHaveCount(2);
     expect("tr.o_data_row input").toHaveValue("default foo turtle", {
@@ -6968,7 +6968,7 @@ test('one2many list edition, no "Remove" button in modal', async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
     expect(".modal .modal-footer .o_btn_remove").toHaveCount(0);
 
@@ -7036,7 +7036,7 @@ test("one2many list editable, onchange and required field", async () => {
     expect('.o_field_widget[name="int_field"] input').toHaveValue("0");
 
     intFieldVal = 1;
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect('.o_field_widget[name="int_field"] input').toHaveValue("0");
     expect.verifySteps(["get_views", "web_read", "onchange"]);
 
@@ -7095,7 +7095,7 @@ test("one2many list editable: trigger onchange when row is valid", async () => {
 
     intFieldVal = 1;
     // add a new row (which is invalid at first)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect('.o_field_widget[name="int_field"] input').toHaveValue("0", {
         message: "int_field should still be 0 (no onchange should have been done yet)",
     });
@@ -7145,7 +7145,7 @@ test("one2many list editable: 'required' modifiers is properly working", async (
     });
     expect('.o_field_widget[name="int_field"] input').toHaveValue("10");
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect('.o_field_widget[name="int_field"] input').toHaveValue("10");
 
     // fill turtle_foo field
@@ -7180,7 +7180,7 @@ test("one2many list editable: 'required' modifiers is properly working, part 2",
     });
     expect('.o_field_widget[name="int_field"] input').toHaveValue("10");
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect('.o_field_widget[name="int_field"] input').toHaveValue("10");
 
     // fill turtle_int field
@@ -7214,7 +7214,7 @@ test("one2many list editable: add new line before onchange returns", async () =>
     });
 
     // add a first line but hold the onchange back
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     def = new Deferred();
     expect(".o_data_row").toHaveCount(1);
     await clickFieldDropdown("turtle_trululu");
@@ -7223,7 +7223,7 @@ test("one2many list editable: add new line before onchange returns", async () =>
 
     // try to add a second line and check that it is correctly waiting
     // for the onchange to return
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(0);
     expect(".o_field_invalid").toHaveCount(0);
     expect(".o_data_row").toHaveCount(1);
@@ -7257,8 +7257,8 @@ test("editable list: multiple clicks on Add an item do not create invalid rows",
     });
     def = new Deferred();
     // click twice to add a new line
-    await contains(".o_field_x2many_list_row_add a").click();
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row").toHaveCount(0);
 
     // resolve the onchange promise
@@ -7304,7 +7304,7 @@ test("editable list: value reset by an onchange", async () => {
     });
 
     // trigger the two _onChanges
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_data_row .o_field_widget input").edit("a name", { confirm: false });
     def = new Deferred();
     await contains(".o_field_datetime .o_input").edit("04/27/2022 14:08:52", { confirm: "blur" });
@@ -7355,11 +7355,11 @@ test("editable list: onchange that returns a warning", async () => {
     });
 
     // add a line (this should trigger an onchange and a warning)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     // check if 'Add an item' still works (this should trigger an onchange
     // and a warning again)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect.verifySteps(["onchange", "warning", "onchange", "warning"]);
 });
@@ -7477,7 +7477,7 @@ test("contexts of nested x2manys are correctly sent (add line)", async () => {
         context: { active_field: 2 },
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("nested x2manys with context referencing parent record", async () => {
@@ -7516,9 +7516,9 @@ test("nested x2manys with context referencing parent record", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_dialog").toHaveCount(1);
-    await contains(".o_dialog .o_field_x2many_list_row_add a").click();
+    await contains(".o_dialog .o_field_x2many_list_row_add button").click();
 });
 
 test("resetting invisible one2manys", async () => {
@@ -7680,7 +7680,7 @@ test("onchange and required fields with override in arch", async () => {
         resId: 1,
     });
     // triggers an onchange on partner, because the new record is valid
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect.verifySteps(["get_views", "web_read", "onchange", "onchange"]);
 });
@@ -7734,8 +7734,8 @@ test("onchange on a one2many containing a one2many", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
     await contains(".modal .o_data_cell input").edit("new record", { confirm: "blur" });
     checkOnchange = true;
     await contains(".modal .modal-footer .btn-primary").click();
@@ -7774,7 +7774,7 @@ test("editing tabbed one2many (editable=bottom)", async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(41);
     expect("tr.o_data_row:last").toHaveClass("o_selected_row");
 
@@ -7809,7 +7809,7 @@ test("editing tabbed one2many (editable=bottom), again...", async () => {
         resId: 1,
     });
     // add a new record page 1 (this increases the limit to 4)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.o_data_row [name="turtle_foo"] input').edit("rainbow dash", {
         confirm: false,
     });
@@ -7853,7 +7853,7 @@ test("editing tabbed one2many (editable=top)", async () => {
     await contains(".o_field_widget[name=turtles] .o_pager_next").click();
     expect("tr.o_data_row").toHaveCount(2);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("tr.o_data_row").toHaveCount(3);
     expect("tr.o_data_row:eq(0)").toHaveClass("o_selected_row");
     expect("tr.o_data_row input").toHaveValue("default foo");
@@ -7888,7 +7888,7 @@ test("one2many field: change value before pending onchange returns", async () =>
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     def = new Deferred();
     await contains(".o_field_widget[name=int_field] input").edit("44", { confirm: false });
 
@@ -7929,7 +7929,7 @@ test("focus is correctly reset after an onchange in an x2many", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     def = new Deferred();
 
@@ -7966,7 +7966,7 @@ test("checkbox in an x2many that triggers an onchange", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_field_widget[name=bar] input").toBeChecked();
 
     await contains(".o_field_widget[name=bar] input").click();
@@ -8167,7 +8167,7 @@ test("propagate context to sub views without default_* keys", async () => {
             default_flutter: "why",
         },
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('[name="turtle_foo"] input').edit("pinky pie", { confirm: false });
     await clickSave();
 });
@@ -8366,7 +8366,7 @@ test("one2many with sequence field, override default_get, bottom when inline", a
     // save the record
     // check line is at the correct place
     const inputText = "ninja";
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('[name="turtle_foo"] input').edit(inputText, { confirm: false });
     await clickSave();
 
@@ -8399,7 +8399,7 @@ test("one2many with sequence field, override default_get, top when inline", asyn
     // save the record
     // check line is at the correct place
     const inputText = "ninja";
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('[name="turtle_foo"] input').edit(inputText, { confirm: false });
     await clickSave();
 
@@ -8436,7 +8436,7 @@ test("one2many with sequence field, override default_get, bottom when popup", as
     // save the record
     // check line is at the correct place
     const inputText = "ninja";
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.modal [name="turtle_foo"] input').edit(inputText, { confirm: false });
     await contains(".modal .o_form_button_save").click();
 
@@ -8470,7 +8470,7 @@ test("one2many with sequence field, override default_get, not last page", async
     });
     // click add a new line
     // check turtle_int for new is the current max of the page
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect('.modal [name="turtle_int"] input').toHaveValue("9");
 });
 
@@ -8496,7 +8496,7 @@ test("one2many with sequence field, override default_get, last page", async () =
     });
     // click add a new line
     // check turtle_int for new is the current max of the page +1
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect('.modal [name="turtle_int"] input').toHaveValue("22");
 });
 
@@ -8533,11 +8533,11 @@ test("one2many with sequence field and text field", async () => {
 
     const inputText1 = "relax";
     const inputText2 = "max";
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('div[name="turtle_foo"] input').edit(inputText1, { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('div[name="turtle_foo"] input').edit(inputText2, { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(queryAllTexts(".o_data_cell.o_list_char")).toEqual([inputText1, inputText2, ""]);
 
@@ -8696,7 +8696,7 @@ test("add a new line after limit is reached should behave nicely", async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row").toHaveCount(4);
 
     await contains('div[name="turtle_foo"] .o_input').edit("a", { confirm: false });
@@ -8771,7 +8771,7 @@ test("onchange in a one2many with non inline view on a new record", async () =>
     });
 
     // add a row and trigger the onchange
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains('.o_data_row div[name="name"] input').edit("a name", { confirm: "blur" });
 
     expect(".o_field_cell[name=turtle_int]").toHaveText("44");
@@ -8805,7 +8805,7 @@ test('add a line, edit it and "Save & New"', async () => {
 
     expect(".o_data_row").toHaveCount(0);
     // add a new record
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_field_widget input").edit("new record", { confirm: false });
 
     await contains(".modal .o_form_button_save").click();
@@ -8854,7 +8854,7 @@ test('add a line with a context depending on the parent record, created a second
     expect(queryAllTexts("[name='p'] .o_data_row")).toEqual([]);
     await contains("[name='name'] input").edit("Jack", { confirm: "blur" });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal [name='name'] input").toHaveValue("Jack");
 
     await contains(".modal .o_form_button_save_new").click();
@@ -8891,7 +8891,7 @@ test("o2m add a line custom control create editable", async () => {
 
     // new controls correctly added
     expect(".o_field_x2many_list_row_add").toHaveCount(1);
-    expect(queryAllTexts(".o_field_x2many_list_row_add a")).toEqual([
+    expect(queryAllTexts(".o_field_x2many_list_row_add button")).toEqual([
         "Add food",
         "Add pizza",
         "Add pasta",
@@ -8899,13 +8899,13 @@ test("o2m add a line custom control create editable", async () => {
 
     // click add food
     // check it's empty
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(queryAllTexts(".o_data_cell")).toEqual([""]);
 
     // click add pizza
     // press enter to save the record
     // check it's pizza
-    await contains(".o_field_x2many_list_row_add a:eq(1)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(1)").click();
 
     expect(
         '.o_field_widget[name="p"] .o_selected_row .o_field_widget[name="name"] input'
@@ -8916,7 +8916,7 @@ test("o2m add a line custom control create editable", async () => {
     expect(queryAllTexts(".o_data_cell")).toEqual(["", "pizza", ""]);
 
     // click add pasta
-    await contains(".o_field_x2many_list_row_add a:eq(2)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(2)").click();
     await clickSave();
     expect(queryAllTexts(".o_data_cell")).toEqual(["", "pizza", "", "pasta"]);
 });
@@ -8947,7 +8947,7 @@ test("o2m add a line custom control create non-editable", async () => {
 
     // new controls correctly added
     expect(".o_field_x2many_list_row_add").toHaveCount(1);
-    expect(queryAllTexts(".o_field_x2many_list_row_add a")).toEqual([
+    expect(queryAllTexts(".o_field_x2many_list_row_add button")).toEqual([
         "Add food",
         "Add pizza",
         "Add pasta",
@@ -8955,21 +8955,21 @@ test("o2m add a line custom control create non-editable", async () => {
 
     // click add food
     // check it's empty
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_form_button_save").click();
     expect(queryAllTexts(".o_data_cell")).toEqual([""]);
 
     // click add pizza
     // save the modal
     // check it's pizza
-    await contains(".o_field_x2many_list_row_add a:eq(1)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(1)").click();
     await contains(".modal .o_form_button_save").click();
     expect(queryAllTexts(".o_data_cell")).toEqual(["", "pizza"]);
 
     // click add pasta
     // save the whole record
     // check it's pizzapasta
-    await contains(".o_field_x2many_list_row_add a:eq(2)").click();
+    await contains(".o_field_x2many_list_row_add button:eq(2)").click();
     await contains(".modal .o_form_button_save").click();
     expect(queryAllTexts(".o_data_cell")).toEqual(["", "pizza", "pasta"]);
 });
@@ -8990,7 +8990,7 @@ test("o2m add an action button control", async () => {
                     <list>
                         <control>
                             <create string="Create" context="{}" />
-                            <button string="Action Button" name="do_something" class="btn-link" type="object" context="{'parent_id': parent.id}"/>
+                            <button string="Action Button" name="do_something" class="btn-link my_btn" type="object" context="{'parent_id': parent.id}"/>
                         </control>
                         <field name="name"/>
                     </list>
@@ -9000,7 +9000,7 @@ test("o2m add an action button control", async () => {
 
     expect(".o_field_x2many_list_row_add").toHaveText("CreateAction Button");
 
-    await contains(".o_field_x2many_list_row_add button").click();
+    await contains(".o_field_x2many_list_row_add button.my_btn").click();
     expect.verifySteps(["do_something"]);
 });
 
@@ -9026,8 +9026,8 @@ test("one2many list with custom control with invisible modifier", async () => {
             </form>`,
     });
 
-    expect(".o_field_x2many_list_row_add a:contains(A)").toHaveCount(0);
-    expect(".o_field_x2many_list_row_add a:contains(B)").toHaveCount(1);
+    expect(".o_field_x2many_list_row_add button:contains(A)").toHaveCount(0);
+    expect(".o_field_x2many_list_row_add button:contains(B)").toHaveCount(1);
     expect(".o_field_x2many_list_row_add button:contains(C)").toHaveCount(0);
     expect(".o_field_x2many_list_row_add button:contains(D)").toHaveCount(1);
 });
@@ -9055,8 +9055,8 @@ test("one2many list with custom control with invisible modifier using context",
         context: { someKey: true },
     });
 
-    expect(".o_field_x2many_list_row_add a:contains(A)").toHaveCount(0);
-    expect(".o_field_x2many_list_row_add a:contains(B)").toHaveCount(1);
+    expect(".o_field_x2many_list_row_add button:contains(A)").toHaveCount(0);
+    expect(".o_field_x2many_list_row_add button:contains(B)").toHaveCount(1);
     expect(".o_field_x2many_list_row_add button:contains(C)").toHaveCount(0);
     expect(".o_field_x2many_list_row_add button:contains(D)").toHaveCount(1);
 });
@@ -9347,7 +9347,7 @@ test("onchange affecting inline unopened list view", async () => {
 
     // add a turtle on second partner
     await contains(".o_data_row:eq(1) .o_data_cell").click();
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
     await contains(".modal .o_field_widget[name=name] input").edit("michelangelo", {
         confirm: false,
     });
@@ -9429,7 +9429,7 @@ test("create and edit on m2o in o2m, and press ESCAPE", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_selected_row").toHaveCount(1);
 
@@ -9475,7 +9475,7 @@ test("one2many add a line should not crash if orderedResIDs is not set on deskto
     });
 
     await contains('button[name="post"]').click();
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row.o_selected_row").toHaveCount(1);
 });
 
@@ -9507,7 +9507,7 @@ test("one2many add a line should not crash if orderedResIDs is not set on mobile
 
     await contains(`.o_cp_action_menus button:has(.fa-cog)`).click();
     await contains('button[name="post"]').click();
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row.o_selected_row").toHaveCount(1);
 });
 
@@ -9528,7 +9528,7 @@ test("one2many shortcut tab should not crash when there is no input widget", asy
     });
 
     // add a row, fill it, then trigger the tab shortcut
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     // This is not how it should happen but non trusted event listeners are called sooner than
     // trusted ones so the update is called after the list's tab listener in which case the field is
     // not dirty when we press tab, therefore we need to set it dirty through onChange before pressing tab
@@ -9610,7 +9610,7 @@ test("one2many with onchange, required field, shortcut enter", async () => {
     expect.verifySteps(["get_views", "onchange"]);
 
     // add a new line
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect.verifySteps(["onchange"]);
 
@@ -9664,7 +9664,7 @@ test("edit a field with a slow onchange in one2many", async () => {
     expect.verifySteps(["get_views", "onchange"]);
 
     // add a new line
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect.verifySteps(["onchange"]);
 
@@ -9711,14 +9711,14 @@ test("no deadlock when leaving a one2many line with uncommitted changes", async
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     await contains(".o_field_widget[name=turtles] input").edit("some foo value", {
         confirm: false,
     });
 
     // click to add a second row to unselect the current one, then save
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await clickSave();
 
     expect(".o_form_editable").toHaveCount(1);
@@ -9756,7 +9756,7 @@ test("one2many with extra field from server not in form", async () => {
     });
 
     // Add a record in the list
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal div[name=name] input").edit("michelangelo", { confirm: false });
 
     // Save the record in the modal (though it is still virtual)
@@ -9997,7 +9997,7 @@ test("one2many editable list: edit and click on add a line", async () => {
         confirm: false,
     });
     expect.verifySteps([]);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect.verifySteps(["onchange", "onchange"]);
 
     expect(".o_data_row").toHaveCount(2);
@@ -10089,7 +10089,7 @@ test("two one2many fields with same relation and _onChanges", async () => {
     });
 
     // trigger first onchange by adding a line in turtles field (should add a line in turtles2)
-    await contains('.o_field_widget[name="turtles"] .o_field_x2many_list_row_add a').click();
+    await contains('.o_field_widget[name="turtles"] .o_field_x2many_list_row_add button').click();
     await contains('.o_field_widget[name="turtles"] .o_field_widget[name="name"] input').edit(
         "ABC",
         { confirm: "blur" }
@@ -10103,7 +10103,7 @@ test("two one2many fields with same relation and _onChanges", async () => {
     });
 
     // add a line in turtles2
-    await contains('.o_field_widget[name="turtles2"] .o_field_x2many_list_row_add a').click();
+    await contains('.o_field_widget[name="turtles2"] .o_field_x2many_list_row_add button').click();
     await contains('.o_field_widget[name="turtles2"] .o_field_widget[name="name"] input').edit(
         "DEF",
         { confirm: false }
@@ -10151,7 +10151,7 @@ test("one2many reset by onchange (of another field) while being edited", async (
     await clickFieldDropdownItem("trululu", `Create "new value"`);
 
     // add a row in p
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row").toHaveCount(0);
 
     // resolve the name_create to trigger the onchange, and the reset of p
@@ -10242,7 +10242,7 @@ test("one2many with many2many_tags in list and list in form, and onchange", asyn
     expect(".modal .o_field_widget[name=turtles] .o_data_row").toHaveCount(1);
     expect(queryAllTexts(".modal .o_data_cell")).toEqual(["new turtle"]);
 
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
     expect(".modal .o_field_widget[name=turtles] .o_data_row").toHaveCount(2);
     expect(queryAllTexts(".modal .o_data_cell")).toEqual(["new turtle", ""]);
     expect(".modal .o_field_widget[name=turtles] .o_data_row:eq(1)").toHaveClass("o_selected_row");
@@ -10303,7 +10303,7 @@ test("one2many with many2many_tags in list and list in form, and onchange (2)",
 
     expect(".modal .o_form_view").toHaveCount(1);
 
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
     expect(".modal .o_field_widget[name=turtles] .o_data_row").toHaveCount(2);
 
     await contains(".modal .o_selected_row input").edit("another one", { confirm: false });
@@ -10417,7 +10417,7 @@ test("nested one2many, onchange, no command value", async () => {
     });
 
     step = 2;
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     step = 3;
     await contains(".o_data_row .o_field_boolean input").click();
 });
@@ -10545,7 +10545,7 @@ test("combine contexts on o2m field and create tags", async () => {
             </form>`,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 });
 
 test("do not call read if name already known", async () => {
@@ -10732,7 +10732,7 @@ test("delete a record while adding another one in a multipage", async () => {
     });
 
     // add a line (virtual record)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=turtle_foo] input").edit("pi", { confirm: false });
     // delete the line above it
     await contains(".o_list_record_remove").click();
@@ -10767,9 +10767,9 @@ test("one2many, onchange, edition and multipage...", async () => {
             </form>`,
         resId: 1,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=turtle_foo] input").edit("nora", { confirm: false });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect.verifySteps([
         "get_views partner",
@@ -10959,7 +10959,7 @@ test("onchange on unloaded record clearing posterious change", async () => {
     await contains(".modal .btn-primary").click();
 
     await contains(".o_data_row:eq(1) .o_data_cell").click();
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
     await contains(".modal .o_field_widget[name=name] input").edit("Michelangelo", {
         confirm: false,
     });
@@ -11057,7 +11057,7 @@ test("one2many column visiblity depends on onchange of parent field", async () =
     expect(".o_list_renderer .o_data_row").toHaveCount(1);
 
     // add a new o2m record
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     triggerOnchange = true;
     await contains(".o_field_one2many input").edit("New line", { confirm: false });
     await contains(".o_form_view").click();
@@ -11156,7 +11156,7 @@ test("one2many field in edit mode with optional fields and trash icon", async ()
         message: "dropdown is still open",
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o-dropdown--menu").toHaveCount(0, { message: "dropdown is closed" });
     expect(".o_field_one2many tr.o_selected_row").toHaveCount(1);
 
@@ -11236,7 +11236,7 @@ test("one2many with extra field from server not in (inline) form", async () => {
     });
 
     // Add a record in the list
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=name] input").edit("michelangelo", { confirm: false });
 
     // Save the record in the modal (though it is still virtual)
@@ -11264,12 +11264,12 @@ test("one2many with extra X2many field from server not in inline form", async ()
     });
 
     // Add a first record in the list
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_field_widget[name=name] input").edit("first", { confirm: false });
 
     // Save & New
     await contains(".modal .btn-primary").click();
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".modal .o_field_widget[name=name] input").edit("second", { confirm: false });
 
     // Save & Close
@@ -11310,7 +11310,7 @@ test("when Navigating to a one2many with tabs, the button add a line receives th
     // go inside one2many
     await press("Tab");
     await animationFrame();
-    expect(".o_field_x2many_list_row_add a").toBeFocused();
+    expect(".o_field_x2many_list_row_add button").toBeFocused();
 });
 
 test("Navigate to a one2many with tab then tab again focus the next field", async () => {
@@ -11351,7 +11351,7 @@ test("Navigate to a one2many with tab then tab again focus the next field", asyn
     await press("Tab");
     await animationFrame();
 
-    expect(".o_field_x2many_list_row_add a").toBeFocused();
+    expect(".o_field_x2many_list_row_add button").toBeFocused();
     expect("[name=turtles] .o_selected_row").toHaveCount(0);
     // trigger Tab event and check that the default behavior can happen.
     expect(getNextFocusableElement()).toBe(queryOne("[name=foo] input"));
@@ -11397,10 +11397,10 @@ test("when Navigating to a one2many with tabs, not filling any field and hitting
     await press("Tab");
     await animationFrame();
 
-    expect(".o_field_x2many_list_row_add a").toBeFocused();
+    expect(".o_field_x2many_list_row_add button").toBeFocused();
     expect("[name=turtles] .o_selected_row").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect("[name=turtle_foo] input").toBeFocused();
 
     await press("Tab"); // go to turtle_description field
@@ -11455,16 +11455,16 @@ test("when Navigating to a one2many with tabs, editing in a popup, the popup sho
     // go inside one2many
     await press("Tab");
     await animationFrame();
-    expect(".o_field_x2many_list_row_add a").toBeFocused();
+    expect(".o_field_x2many_list_row_add button").toBeFocused();
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal [name=turtle_foo] input").toBeFocused();
 
     await press("Escape");
     await animationFrame();
 
     expect(".modal").toHaveCount(0);
-    expect(".o_field_x2many_list_row_add a").toBeFocused();
+    expect(".o_field_x2many_list_row_add button").toBeFocused();
 });
 
 test.tags("desktop");
@@ -11493,7 +11493,7 @@ test("when creating a new many2one on a x2many then discarding it immediately wi
     });
 
     // add a new line
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     expect(".o_selected_row").toHaveCount(1);
 
@@ -11542,25 +11542,25 @@ test("navigating through an editable list with custom controls", async () => {
     expect("[name=p] .o_selected_row").toHaveCount(0);
 
     // press tab to navigate to the list
-    expect(getNextFocusableElement()).toBe(queryFirst(".o_field_x2many_list_row_add a"));
+    expect(getNextFocusableElement()).toBe(queryFirst(".o_field_x2many_list_row_add button"));
     await press("Tab");
 
-    expect(".o_field_x2many_list_row_add a:eq(0)").toBeFocused();
+    expect(".o_field_x2many_list_row_add button:eq(0)").toBeFocused();
 
     // press right to focus the second control
     await press("ArrowRight");
     await animationFrame();
 
-    expect(".o_field_x2many_list_row_add a:eq(1)").toBeFocused();
+    expect(".o_field_x2many_list_row_add button:eq(1)").toBeFocused();
 
     // press left to come back to first control
     await press("ArrowLeft");
     await animationFrame();
 
-    expect(".o_field_x2many_list_row_add a:eq(0)").toBeFocused();
-    expect(getNextFocusableElement()).toBe(queryOne(".o_field_x2many_list_row_add a:eq(1)"));
+    expect(".o_field_x2many_list_row_add button:eq(0)").toBeFocused();
+    expect(getNextFocusableElement()).toBe(queryOne(".o_field_x2many_list_row_add button:eq(1)"));
     await press("Tab");
-    expect(".o_field_x2many_list_row_add a:eq(1)").toBeFocused();
+    expect(".o_field_x2many_list_row_add button:eq(1)").toBeFocused();
 
     expect(getNextFocusableElement()).toBe(queryOne("[name=int_field] input"));
     await press("Tab");
@@ -11869,7 +11869,7 @@ test("if there are less than 4 lines in a one2many, empty lines must be displaye
     expect(".o_list_renderer tbody tr td:eq(0)").toHaveClass("o_field_x2many_list_row_add");
     expect(".o_list_renderer tbody tr").toHaveCount(4);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     // Should only contain a new row, the "Add a line" line and 2 blank lines
     expect(".o_list_renderer tbody tr.o_data_row").toHaveCount(1);
     expect(".o_list_renderer tbody tr:eq(0)").toHaveClass("o_data_row");
@@ -12141,7 +12141,7 @@ test("save a record after creating and editing a new invalid record in a one2man
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=int_field] input").edit("3", { confirm: false });
     await clickSave();
     expect(".o_data_row.o_selected_row").toHaveCount(1, {
@@ -12629,7 +12629,7 @@ test('Add a line, click on "Save & New" with an invalid form', async () => {
 
     expect(".o_data_row").toHaveCount(0);
     // Add a new record
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_dialog .o_form_view").toHaveCount(1);
 
     // Click on "Save & New" with an invalid form
@@ -12675,7 +12675,7 @@ test("field in list but not in fetched form", async () => {
     });
 
     expect.verifySteps(["get_views: partner", "onchange: partner"]);
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect.verifySteps(["get_views: partner.type", "onchange: partner.type"]);
     await contains(".modal .o_field_widget[name='name'] input").edit("changed", {
         confirm: "blur",
@@ -12715,7 +12715,7 @@ test("pressing tab before an onchange is resolved", async () => {
         resId: 1,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     // This is not how it should happen but non trusted event listeners are called sooner than
     // trusted ones so the update is called after the list's tab listener in which case the field is
     // not dirty when we press tab, therefore we need to set it dirty through onChange before pressing tab
@@ -12781,7 +12781,7 @@ test("add a row to an x2many and ask canBeRemoved twice", async () => {
     expect(".o_form_view").toHaveCount(1);
 
     // add a row in the x2many
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=name] input").edit("a name", { confirm: false });
     expect(".o_data_row").toHaveCount(1);
 
@@ -12828,7 +12828,7 @@ test("one2many: save a record before the onchange is complete in a form dialog",
                 </field>
             </form>`,
     });
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal").toHaveCount(1);
 
     await contains(".o_field_widget[name=name] input").edit("new name", { confirm: false });
@@ -13032,7 +13032,7 @@ test("modifiers based on x2many", async () => {
     expect("[name='name'].o_readonly_modifier").toHaveCount(0);
     expect("[name='int_field'].o_required_modifier").toHaveCount(0);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains("[name='foo'] input").edit("Test", { confirm: false });
     expect("button.my_button").toHaveCount(1);
     expect("[name='name'].o_readonly_modifier").toHaveCount(1);
@@ -13390,7 +13390,7 @@ test("onchange on x2many add and delete x2m record, returning to initial state",
     expect(".o_field_widget[name=turtles] .o_data_row").toHaveCount(1);
     expect(".o_data_cell").toHaveText("donatello");
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_field_widget[name=turtles] .o_data_row").toHaveCount(2);
     await contains(".o_list_record_remove:eq(1)").click();
     expect(".o_field_widget[name=turtles] .o_data_row").toHaveCount(1);
@@ -13425,7 +13425,7 @@ test("expand record in dialog", async () => {
     expect(".o_dialog .o_form_view").toHaveCount(1);
     expect(".o_dialog .modal-header .o_expand_button").toHaveCount(1);
     await contains(".o_dialog .modal-header .btn-close").click();
-    await contains(".o_field_widget[name=turtles] .o_field_x2many_list_row_add a").click();
+    await contains(".o_field_widget[name=turtles] .o_field_x2many_list_row_add button").click();
     expect(".o_dialog .o_form_view").toHaveCount(1);
     expect(".o_dialog .modal-header .o_expand_button").toHaveCount(0);
     await contains("[name='name'] input").edit("new turtle");
diff --git a/addons/web/static/tests/views/form/form_view.test.js b/addons/web/static/tests/views/form/form_view.test.js
index 5949afe272ee4..676a6487e431e 100644
--- a/addons/web/static/tests/views/form/form_view.test.js
+++ b/addons/web/static/tests/views/form/form_view.test.js
@@ -632,7 +632,7 @@ test(`duplicate fields rendered properly (one2many)`, async () => {
     await animationFrame();
     expect(`.o_field_one2many:eq(1) .o_data_row:eq(0) .o_data_cell[name=foo]`).toHaveText("hello");
 
-    await contains(`.o_field_one2many:eq(0) .o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_one2many:eq(0) .o_field_x2many_list_row_add button`).click();
     expect(`.o_field_one2many:eq(0) .o_selected_row .o_field_widget[name="foo"] input`).toHaveValue(
         "My little Foo Value"
     );
@@ -814,7 +814,7 @@ test(`form with o2m having a selection field with fieldDependencies`, async () =
     });
     expect(`.o_field_widget[name=o2m] .o_data_row`).toHaveCount(1);
 
-    await contains(`.o_field_widget[name=o2m] .o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_widget[name=o2m] .o_field_x2many_list_row_add button`).click();
     expect(`.modal .o_form_view .o_field_widget[name=display_name]`).toHaveCount(1);
 });
 
@@ -1072,7 +1072,7 @@ test(`field ids are unique (same field name in 2 form views)`, async () => {
 
     expect(".o_field_widget input#foo_0").toHaveCount(1);
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".modal .o_form_view").toHaveCount(1);
     expect(".o_field_widget input#foo_0").toHaveCount(1);
     expect(".modal .o_field_widget input#foo_0").toHaveCount(1);
@@ -1250,7 +1250,7 @@ test(`Form and subsubview with only _view_ref contexts`, async () => {
     });
 
     await contains(
-        `[name=type_ids] .o_field_x2many_list_row_add a, [name=type_ids] .o-kanban-button-new`
+        `[name=type_ids] .o_field_x2many_list_row_add button, [name=type_ids] .o-kanban-button-new`
     ).click();
     expect.verifySteps(["get_views (partner.type)"]);
 
@@ -1270,7 +1270,7 @@ test(`Form and subsubview with only _view_ref contexts`, async () => {
         form_view_ref: "bar.rescompany_form_view",
     });
 
-    await contains(`.modal [name=company_ids] .o_field_x2many_list_row_add a`).click();
+    await contains(`.modal [name=company_ids] .o_field_x2many_list_row_add button`).click();
     expect.verifySteps(["get_views (res.company)", "onchange (res.company)"]);
 });
 
@@ -2361,7 +2361,7 @@ test(`input ids for multiple occurrences of fields in sub form view (inline)`, a
             </form>
         `,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     const fieldIdAttrs = queryAllAttributes(`.modal .o_form_view .o_field_widget input`, "id");
     const labelForAttrs = queryAllAttributes(`.modal .o_form_view .o_form_label`, "for");
     expect(new Set(fieldIdAttrs)).toHaveLength(4);
@@ -2397,7 +2397,7 @@ test(`input ids for multiple occurrences of fields in sub form view (not inline)
         type: "form",
         arch: `<form><field name="child_ids" widget="one2many"/></form>`,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     const fieldIdAttrs = queryAllAttributes(`.modal .o_form_view .o_field_widget input`, "id");
     const labelForAttrs = queryAllAttributes(`.modal .o_form_view .o_form_label`, "for");
     expect(new Set(fieldIdAttrs)).toHaveLength(4);
@@ -2637,7 +2637,7 @@ test(`required field computed by another field in a x2m`, async () => {
             </form>
         `,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_data_row [name='int_field'] input`).edit("1");
     await contains(".o_form_view").click();
     expect(`.o_form_editable`).toHaveCount(1);
@@ -3749,7 +3749,7 @@ test(`onchange only send present fields value`, async () => {
     });
 
     // add a o2m row
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_field_one2many .o_field_widget[name=name] input`).edit("valid line", {
         confirm: false,
     });
@@ -3814,7 +3814,7 @@ test(`onchange send relation parent field values (including readonly)`, async ()
     await contains(`.o_field_widget[name=name] input`).edit("Test");
 
     // add a o2m row
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect.verifySteps([]);
 
     // trigger an onchange by modifying float_field
@@ -3956,7 +3956,7 @@ test(`remove default value in subviews`, async () => {
     });
     expect.verifySteps(["onchange:partner"]);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect.verifySteps(["onchange:product"]);
 });
 
@@ -4003,7 +4003,7 @@ test(`form with one2many with dynamic context`, async () => {
     });
     expect.verifySteps(["web_read"]);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect.verifySteps(["onchange"]);
 });
 
@@ -4975,7 +4975,7 @@ test(`discard changes on relational data on new record`, async () => {
             </form>
         `,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_input_dropdown input`).click();
     await contains(`.dropdown-item:contains(xphone)`).click();
     expect(`.o_field_widget[name="product_id"] input`).toHaveValue("xphone");
@@ -7040,7 +7040,7 @@ test(`args of onchanges in o2m fields are correct (inline edition)`, async () =>
     expect(`.o_data_row td[name=foo]`).toHaveText("[blip] 77");
 
     // create a new o2m record
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.o_data_row input:eq(0)`).toHaveValue("[blip] 14");
 });
 
@@ -7082,7 +7082,7 @@ test(`args of onchanges in o2m fields are correct (dialog edition)`, async () =>
     expect(`.o_data_row .o_data_cell`).toHaveText("[blip] 77");
 
     // create a new o2m record
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.modal .modal-title`).toHaveText("Create custom label");
     expect(`.modal .o_field_widget[name=foo] input`).toHaveValue("[blip] 14");
     await contains(`.modal-footer .btn-primary`).click();
@@ -7508,7 +7508,7 @@ test(`many2manys inside one2manys are saved correctly`, async () => {
         `,
     });
     // add a o2m subrecord with a m2m tag
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_input_dropdown input`).click();
     await contains(`.dropdown-item:contains(gold)`).click();
     await contains(`.o_form_button_save`).click();
@@ -7548,8 +7548,8 @@ test(`one2manys (list editable) inside one2manys are saved correctly`, async ()
     });
 
     // add a o2m subrecord
-    await contains(`.o_field_x2many_list_row_add a`).click();
-    await contains(`.modal .o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
+    await contains(`.modal .o_field_x2many_list_row_add button`).click();
     await contains(`.modal .o_field_widget[name=name] input`).edit("xtv");
     await contains(`.modal-footer .btn-primary`).click();
     expect(`.modal`).toHaveCount(0);
@@ -7735,7 +7735,7 @@ test(`check if id is available in evaluation context`, async () => {
     });
 
     checkOnchange = true;
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect.verifySteps(["onchange"]);
 });
 
@@ -8384,7 +8384,7 @@ test(`check interactions between multiple FormViewDialogs`, async () => {
     expect(`.o_dialog:eq(1) .modal-title`).toHaveText("Open: Product");
     expect(`.o_dialog:eq(1) .o_field_widget[name=name] input`).toHaveValue("xphone");
 
-    await contains(`.o_dialog:eq(1) .o_field_x2many_list_row_add a`).click();
+    await contains(`.o_dialog:eq(1) .o_field_x2many_list_row_add button`).click();
     expect(`.modal`).toHaveCount(3);
 
     await contains(`.o_dialog:eq(2) .o_field_widget[name=name] input`).edit("xtv");
@@ -8572,12 +8572,12 @@ test(`default_order on x2many embedded view`, async () => {
         "My little Foo Value",
     ]);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.modal`).toHaveCount(1);
 
     await contains(`.modal .o_field_widget[name=foo] input`).edit("xop");
     await contains(`.modal-footer .o_form_button_save`).click();
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.modal .o_field_widget[name=foo] input`).edit("zop");
     await contains(`.modal-footer .o_form_button_save`).click();
 
@@ -9356,7 +9356,7 @@ test(`context is correctly passed after save & new in FormViewDialog`, async ()
         arch: `<form><field name="product_ids"/></form>`,
         resId: 4,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.modal`).toHaveCount(1);
 
     // set a value on the m2o and click save & new
@@ -9421,7 +9421,7 @@ test(`readonly fields are not sent when saving`, async () => {
         `,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.modal .o_field_widget[name=foo] input`).toHaveCount(1);
 
     checkOnchange = true;
@@ -10089,7 +10089,7 @@ test(`keep editing after call_button fail`, async () => {
         `,
         resId: 1,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_field_widget[name=name] input`).edit("abc", { confirm: false });
     values = {
         name: "abc",
@@ -10191,7 +10191,7 @@ test(`save record with onchange on one2many with required field`, async () => {
         `,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.o_field_widget[name=name] input`).toHaveValue("");
     expect(`.o_field_widget[name=foo] input`).toHaveValue("");
 
@@ -10590,12 +10590,12 @@ test(`resequence list lines when discardable lines are present`, async () => {
     expect(`[name="foo"] input`).toHaveValue("0");
 
     // Add one line
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_field_cell [name="name"] input`).edit("first line");
     expect.verifySteps(["onchange"]);
     expect(`[name="foo"] input`).toHaveValue("1");
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await animationFrame();
     // Drag and drop second line before first one (with 1 draft and invalid line)
     // TODO JUM: PRHOOT the events
@@ -10607,7 +10607,7 @@ test(`resequence list lines when discardable lines are present`, async () => {
     expect(`[name="foo"] input`).toHaveValue("1");
 
     // Add a second line
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_selected_row input`).edit("second line");
     expect.verifySteps(["onchange"]);
     expect(`[name="foo"] input`).toHaveValue("2");
@@ -10659,7 +10659,7 @@ test("resequence list lines when previous resequencing crashed", async () => {
     });
 
     // Add two lines
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
 
     await contains(".o_data_cell [name='name'] input").edit("first line");
     await animationFrame();
@@ -10939,7 +10939,7 @@ test(`field "length" with value 0: readonly fields are not sent when saving`, as
         `,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.modal .o_field_widget[name=foo] input`).toHaveCount(1);
 
     await contains(`.modal .o_field_widget[name=foo] input`).edit("foo value");
@@ -11172,7 +11172,7 @@ test(`save a form view with an invisible required field in a x2many`, async () =
     });
     expect.verifySteps(["get_views", "onchange"]);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`[name='int_field'] input`).edit("1", { confirm: "blur" });
     expect(`[name='int_field'] input`).toHaveCount(0);
     expect.verifySteps(["onchange"]);
@@ -11651,7 +11651,7 @@ test(`action button in x2many should display a notification if the record is vir
         `,
     });
 
-    await contains(`.o_field_one2many .o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_one2many .o_field_x2many_list_row_add button`).click();
     await contains(`button.oe_stat_button[name='test_action']`).click();
     expect.verifySteps([`danger:Please save your changes first`]);
 });
@@ -11679,7 +11679,7 @@ test(`open form view action in x2many should display a notification if the recor
         `,
     });
 
-    await contains(`.o_field_one2many .o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_one2many .o_field_x2many_list_row_add button`).click();
     await contains(`.o_list_record_open_form_view`).click();
     expect.verifySteps(["web_save", "ir.actions.act_window:partner(7)"]);
 });
@@ -11707,7 +11707,7 @@ test(`open form view action in x2many should work with several virtual record`,
         `,
     });
     async function createVirtualRecord(x) {
-        await contains(`.o_field_x2many_list_row_add a`).click();
+        await contains(`.o_field_x2many_list_row_add button`).click();
         await contains(`.o_data_row [name='foo'] input`).edit(`record ${x}`);
     }
     await createVirtualRecord("a");
@@ -11740,7 +11740,7 @@ test(`open form view action in x2many with several virtual record with limit`, a
         `,
     });
     async function createVirtualRecord(x) {
-        await contains(`.o_field_x2many_list_row_add a`).click();
+        await contains(`.o_field_x2many_list_row_add button`).click();
         await contains(`.o_data_row [name='foo'] input`).edit(`record ${x}`);
     }
     await createVirtualRecord("a");
@@ -11856,7 +11856,9 @@ test(`coming to an action with an error from a form view with a dirty x2m`, asyn
     await mountWithCleanup(WebClient);
     await getService("action").doAction(1);
 
-    await contains(`.o_field_one2many[name="child_ids"] .o_field_x2many_list_row_add a`).click();
+    await contains(
+        `.o_field_one2many[name="child_ids"] .o_field_x2many_list_row_add button`
+    ).click();
     await contains(`[name="child_ids"] input`).edit("new");
     expect.verifySteps(["web_read"]);
 
@@ -12255,7 +12257,7 @@ test(`custom x2many with relatedFields and list view inline`, async () => {
         resId: 2,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_data_row [name='foo'] input`).edit("new record");
     await contains(`.o_form_button_save`).click();
     expect.verifySteps(["web_read", "web_save"]);
@@ -12306,7 +12308,7 @@ test(`custom x2many with a m2o in relatedFields and column_invisible`, async ()
         resId: 2,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_data_row [name='foo'] input`).edit("new record");
     await contains(`.o_form_button_save`).click();
     expect.verifySteps(["web_read", "web_save"]);
@@ -12363,7 +12365,7 @@ test(`custom x2many with relatedFields and list view not inline`, async () => {
         resId: 2,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_data_row [name='foo'] input`).edit("new record");
     await contains(`.o_form_button_save`).click();
     expect.verifySteps(["web_read", "web_save"]);
@@ -12601,7 +12603,7 @@ test(`x2many field in form dialog view is correctly saved when using a view butt
     });
 
     expect(`.o_data_cell`).toHaveCount(0);
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_field_widget[name=name] input`).edit("new value");
     await contains(`.modal-dialog .o_form_button_save`).click();
     await contains(`.o_data_cell`).click();
@@ -12644,11 +12646,11 @@ test(`nested form view doesn't parasite the main one`, async () => {
     expect(`.o_form_view`).toHaveCount(1);
     expect(`.o-form-buttonbox`).toHaveCount(0);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.modal .modal-footer button[name='somename']`).toHaveCount(1);
     expect(`.modal .modal-footer button[name='someothername']`).toHaveCount(0);
 
-    await contains(`.modal .o_field_x2many_list_row_add a`).click();
+    await contains(`.modal .o_field_x2many_list_row_add button`).click();
     expect(`.modal:not(.o_inactive_modal) .modal-footer button[name='someothername']`).toHaveCount(
         1
     );
diff --git a/addons/web/static/tests/views/list/column_widths.test.js b/addons/web/static/tests/views/list/column_widths.test.js
index 26addc579836b..52e7046018363 100644
--- a/addons/web/static/tests/views/list/column_widths.test.js
+++ b/addons/web/static/tests/views/list/column_widths.test.js
@@ -1249,7 +1249,7 @@ test(`freeze widths: x2many, add first record`, async () => {
     });
 
     const initialWidths = getColumnWidths();
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(".o_data_row").toHaveCount(1);
     expect(getColumnWidths()).toEqual(initialWidths);
 });
@@ -1329,7 +1329,7 @@ test(`freeze widths: x2many, toggle optional field`, async () => {
 
     // create a record to store the current widths, but discard it directly to keep
     // the list empty (otherwise, the browser automatically computes the optimal widths)
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     expect(getColumnWidths()).toEqual([110, 626, 32]);
 
     await contains(".o_optional_columns_dropdown_toggle").click();
diff --git a/addons/web/static/tests/views/list/list_view.test.js b/addons/web/static/tests/views/list/list_view.test.js
index 835018356af32..a081afd388141 100644
--- a/addons/web/static/tests/views/list/list_view.test.js
+++ b/addons/web/static/tests/views/list/list_view.test.js
@@ -3473,7 +3473,7 @@ test(`editable list view: click on last element after creation empty new line`,
         `,
         resId: 1,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_data_row:last td.o_list_char`).click();
     // This test ensure that they aren't traceback when clicking on the last row.
     expect(`.o_data_row`).toHaveCount(2, { message: "list should have exactly 2 rows" });
@@ -6845,7 +6845,7 @@ test(`use default_order on editable tree: sort on save`, async () => {
     });
     expect(queryAllTexts(`.o_field_x2many_list .o_data_row`)).toEqual(["Value 1", "Value 3"]);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_field_widget[name=o2m] .o_field_widget input`).edit("Value 2");
     await contains(`.o_form_view`).click();
     expect(queryAllTexts(`.o_field_x2many_list .o_data_row`)).toEqual([
@@ -6886,7 +6886,7 @@ test(`use default_order on editable tree: sort on demand`, async () => {
     });
     expect(queryAllTexts(`.o_field_x2many_list .o_data_row`)).toEqual(["Value 1", "Value 3"]);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(`.o_field_widget[name=o2m] .o_field_widget input`).edit("Value 2");
     await contains(`.o_form_view`).click();
     expect(queryAllTexts(`.o_field_x2many_list .o_data_row`)).toEqual([
@@ -11049,7 +11049,7 @@ test(`list daterange in form: open/close picker`, async () => {
         resId: 1,
     });
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     await contains(".o_field_daterange[name=date]").click();
     await animationFrame();
     await animationFrame();
@@ -12514,7 +12514,7 @@ test(`editable form alongside html field: click out to unselect the row`, async
     });
     expect(`.o_data_row`).toHaveCount(0);
 
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
     expect(`.o_data_row`).toHaveCount(1);
     expect(`.o_data_row`).toHaveClass("o_selected_row");
 
@@ -18039,7 +18039,7 @@ test(`search nested many2one field with early option selection`, async () => {
             </form>
         `,
     });
-    await contains(`.o_field_x2many_list_row_add a`).click();
+    await contains(`.o_field_x2many_list_row_add button`).click();
 
     await edit("alu", { confirm: false });
     await runAllTimers();
diff --git a/addons/web/static/tests/views/view_dialogs/form_view_dialog.test.js b/addons/web/static/tests/views/view_dialogs/form_view_dialog.test.js
index dbdfe656e4edb..7a992f501ef8a 100644
--- a/addons/web/static/tests/views/view_dialogs/form_view_dialog.test.js
+++ b/addons/web/static/tests/views/view_dialogs/form_view_dialog.test.js
@@ -138,7 +138,7 @@ test("formviewdialog buttons in footer are not duplicated", async () => {
     expect(".modal").toHaveCount(1);
     expect(".modal button.my_button").toHaveCount(1, { message: "should have 1 buttons in modal" });
 
-    await click(".o_field_x2many_list_row_add a");
+    await click(".o_field_x2many_list_row_add button");
     await animationFrame();
     await press("escape");
     await animationFrame();
diff --git a/addons/web/static/tests/views/view_dialogs/select_create_dialog.test.js b/addons/web/static/tests/views/view_dialogs/select_create_dialog.test.js
index cebcd3528e240..aed9192573902 100644
--- a/addons/web/static/tests/views/view_dialogs/select_create_dialog.test.js
+++ b/addons/web/static/tests/views/view_dialogs/select_create_dialog.test.js
@@ -377,7 +377,7 @@ test("SelectCreateDialog cascade x2many in create mode on desktop", async () =>
         `,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
     await contains(".o_field_widget[name=instrument] input").edit("ABC", { confirm: false });
     await runAllTimers();
     await contains(
@@ -386,7 +386,7 @@ test("SelectCreateDialog cascade x2many in create mode on desktop", async () =>
 
     expect(".modal .modal-lg").toHaveCount(1);
 
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal .modal-lg").toHaveCount(2);
 
@@ -454,7 +454,7 @@ test("SelectCreateDialog cascade x2many in create mode on mobile", async () => {
         `,
     });
 
-    await contains(".o_field_x2many_list_row_add a").click();
+    await contains(".o_field_x2many_list_row_add button").click();
 
     click(".o_field_widget[name=instrument] input");
     await animationFrame();
@@ -464,7 +464,7 @@ test("SelectCreateDialog cascade x2many in create mode on mobile", async () => {
     expect(".modal .modal-lg").toHaveCount(2);
 
     await contains(".modal .o_field_char[name=name] input").edit("ABC");
-    await contains(".modal .o_field_x2many_list_row_add a").click();
+    await contains(".modal .o_field_x2many_list_row_add button").click();
 
     expect(".modal .modal-lg").toHaveCount(3);
     await contains(
diff --git a/addons/web/static/tests/webclient/settings_form_view/settings_form_view.test.js b/addons/web/static/tests/webclient/settings_form_view/settings_form_view.test.js
index a136a7369c89f..19e48e7c114ba 100644
--- a/addons/web/static/tests/webclient/settings_form_view/settings_form_view.test.js
+++ b/addons/web/static/tests/webclient/settings_form_view/settings_form_view.test.js
@@ -163,14 +163,8 @@ test("change setting on nav bar click in base settings on desktop", async () =>
     expect(".o_searchview input").toBeFocused({ message: "searchview input should be focused" });
     expect(".app_settings_block:not(.d-none) .app_settings_header").toHaveCount(1);
     expect(".o_setting_box a").toHaveCount(2);
-    expect(".o_setting_box span.fa:eq(0)").toHaveAttribute(
-        "title",
-        "this is bar info"
-    );
-    expect(".o_setting_box span.fa:eq(1)").toHaveAttribute(
-        "title",
-        "this is foo info"
-    );
+    expect(".o_setting_box span.fa:eq(0)").toHaveAttribute("title", "this is bar info");
+    expect(".o_setting_box span.fa:eq(1)").toHaveAttribute("title", "this is foo info");
     expect(".o_setting_box a:eq(0)").toHaveAttribute(
         "href",
         "https://www.odoo.com/documentation/1.0/applications/technical/web/settings/this_is_a_test.html"
@@ -319,14 +313,8 @@ test("change setting on nav bar click in base settings on mobile", async () => {
     expect(".o_form_editable").not.toHaveClass("o_form_nosheet");
     expect(".app_settings_block:not(.d-none) .app_settings_header").toHaveCount(1);
     expect(".o_setting_box a").toHaveCount(2);
-    expect(".o_setting_box span.fa:eq(0)").toHaveAttribute(
-        "title",
-        "this is bar info"
-    );
-    expect(".o_setting_box span.fa:eq(1)").toHaveAttribute(
-        "title",
-        "this is foo info"
-    );
+    expect(".o_setting_box span.fa:eq(0)").toHaveAttribute("title", "this is bar info");
+    expect(".o_setting_box span.fa:eq(1)").toHaveAttribute("title", "this is foo info");
     expect(".o_setting_box a:eq(0)").toHaveAttribute(
         "href",
         "https://www.odoo.com/documentation/1.0/applications/technical/web/settings/this_is_a_test.html"
@@ -1630,7 +1618,7 @@ test("settings can contain one2many fields", async () => {
         `,
     });
 
-    await click(".o_field_x2many_list_row_add a");
+    await click(".o_field_x2many_list_row_add button");
     await animationFrame();
     await click(".modal-body input");
     await edit("Added Task");
diff --git a/addons/website/static/tests/tours/edit_menus.js b/addons/website/static/tests/tours/edit_menus.js
index 64bc6f3d17075..3df33c7685121 100644
--- a/addons/website/static/tests/tours/edit_menus.js
+++ b/addons/website/static/tests/tours/edit_menus.js
@@ -37,7 +37,7 @@ registry.category("web_tour.tours").add("parent_child_menu", {
         },
         {
             content: "Click on Add a line button",
-            trigger: "div[name='child_id'] td.o_field_x2many_list_row_add a",
+            trigger: "div[name='child_id'] td.o_field_x2many_list_row_add button",
             run: "click",
         },
         {
diff --git a/addons/website_event/static/tests/tours/website_event.js b/addons/website_event/static/tests/tours/website_event.js
index a509d8cb16972..853c3378f4b46 100644
--- a/addons/website_event/static/tests/tours/website_event.js
+++ b/addons/website_event/static/tests/tours/website_event.js
@@ -48,7 +48,7 @@ function websiteCreateEventTourSteps() {
         },
         {
             trigger:
-                ".modal-dialog div[name='event_ticket_ids'] .o_field_x2many_list_row_add a:contains('Add a line')",
+                ".modal-dialog div[name='event_ticket_ids'] .o_field_x2many_list_row_add button:contains('Add a line')",
             content: "Click here to add a ticket",
             tooltipPosition: "bottom",
             run: "click",
diff --git a/addons/website_slides/static/tests/slide_category_one2many_field.test.js b/addons/website_slides/static/tests/slide_category_one2many_field.test.js
index a90279e03dfc7..b2dbb0ad9cceb 100644
--- a/addons/website_slides/static/tests/slide_category_one2many_field.test.js
+++ b/addons/website_slides/static/tests/slide_category_one2many_field.test.js
@@ -1,19 +1,12 @@
 import { expect, test } from "@odoo/hoot";
 import { click, waitFor } from "@odoo/hoot-dom";
-import {
-    defineModels,
-    fields,
-    models,
-    mountView,
-} from "@web/../tests/web_test_helpers";
+import { defineModels, fields, models, mountView } from "@web/../tests/web_test_helpers";
 import { defineWebsiteSlidesModels } from "@website_slides/../tests/website_slides_test_helpers";
 
 class Partner extends models.Model {
     lines = fields.One2many({ relation: "lines_sections" });
 
-    _records = [
-        { id: 1, lines: [1, 2] },
-    ];
+    _records = [{ id: 1, lines: [1, 2] }];
 }
 
 class LinesSections extends models.Model {
@@ -41,7 +34,7 @@ class LinesSections extends models.Model {
     ];
 
     _views = {
-        form: /*xml*/`
+        form: /*xml*/ `
             <form>
                 <field name="display_name"/>
             </form>
@@ -167,7 +160,7 @@ test("can create section inline", async () => {
     });
     expect(".o_selected_row.o_is_section").toHaveCount(0);
 
-    await click(".o_field_x2many_list_row_add a:nth-child(2)");
+    await click(".o_field_x2many_list_row_add button:nth-child(2)");
     await waitFor(".o_selected_row.o_is_section");
     expect(".o_selected_row.o_is_section").toHaveCount(1);
     expect(".modal .o_form_view").toHaveCount(0);
@@ -194,7 +187,7 @@ test("creates real record in form dialog", async () => {
             </form>`,
     });
 
-    await click(".o_field_x2many_list_row_add a:nth-child(1)");
+    await click(".o_field_x2many_list_row_add button:nth-child(1)");
     await waitFor(".modal .o_form_view");
     expect(".o_selected_row").toHaveCount(0);
     expect(".modal .o_form_view").toHaveCount(1);
diff --git a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
index 7d90fc2cc7a9f..44f2c7ed9bf6e 100644
--- a/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
+++ b/odoo/addons/test_main_flows/static/tests/tours/main_flow.js
@@ -130,7 +130,7 @@ stepUtils.autoExpandMoreButtons(),
 {
 // Add first component
     // FIXME in mobile replace list by kanban + form
-    trigger: ".o_field_x2many_list_row_add > a",
+    trigger: ".o_field_x2many_list_row_add > button",
     content: _t("Click here to add some lines."),
     tooltipPosition: "bottom",
     run: "click",
@@ -188,7 +188,7 @@ stepUtils.autoExpandMoreButtons(),
     run: "click",
 }, {
     isActive: ["desktop"],
-    trigger: ".o_field_widget[name=seller_ids] .o_field_x2many_list_row_add > a",
+    trigger: ".o_field_widget[name=seller_ids] .o_field_x2many_list_row_add > button",
     content: _t("Let's enter the cost price"),
     tooltipPosition: 'right',
     run: "click",
@@ -323,7 +323,7 @@ stepUtils.autoExpandMoreButtons(),
 {
 // Add second component
     isActive: ["desktop"],
-    trigger: ".o_field_x2many_list_row_add > a",
+    trigger: ".o_field_x2many_list_row_add > button",
     content: _t("Click here to add some lines."),
     tooltipPosition: "bottom",
     run: "click",
@@ -334,7 +334,7 @@ stepUtils.autoExpandMoreButtons(),
 },
 {
     isActive: ["mobile"],
-    trigger: ".o_field_x2many_list_row_add > a",
+    trigger: ".o_field_x2many_list_row_add > button",
     content: _t("Click here to add some lines."),
     tooltipPosition: "bottom",
     run: "click",
@@ -406,7 +406,7 @@ stepUtils.autoExpandMoreButtons(),
 ...stepUtils.mobileKanbanSearchMany2X('Vendor', 'the_flow.vendor'),
 {
     isActive: ["desktop"],
-    trigger: ".o_field_widget[name=seller_ids] .o_field_x2many_list_row_add > a",
+    trigger: ".o_field_widget[name=seller_ids] .o_field_x2many_list_row_add > button",
     content: _t("Let's enter the cost price"),
     tooltipPosition: 'right',
     run: "click",
@@ -728,7 +728,7 @@ stepUtils.autoExpandMoreButtons(),
 ...stepUtils.statusbarButtonsSteps('New Quotation', markup(_t('<p><b>Create a quotation</p>'))),
 {
     isActive: ["desktop"],
-    trigger: ".o_field_widget[name=order_line] .o_field_x2many_list_row_add > a",
+    trigger: ".o_field_widget[name=order_line] .o_field_x2many_list_row_add > button",
     content: _t("Click here to add some lines to your quotations."),
     tooltipPosition: "bottom",
     run: "click",
@@ -768,7 +768,7 @@ stepUtils.autoExpandMoreButtons(),
 ...stepUtils.mobileKanbanSearchMany2X('Product', 'the_flow.product'),
 {
     isActive: ["desktop"],
-    trigger: ".o_field_widget[name=order_line] .o_field_x2many_list_row_add > a",
+    trigger: ".o_field_widget[name=order_line] .o_field_x2many_list_row_add > button",
     content: _t("Click here to add some lines to your quotations."),
     tooltipPosition: "bottom",
     run: "click",
@@ -1103,7 +1103,7 @@ stepUtils.autoExpandMoreButtons(true),
     run: "click",
 }, {
     isActive: ["desktop"],
-    trigger: 'div[name="timesheet_ids"] td.o_field_x2many_list_row_add a[role="button"]',
+    trigger: 'div[name="timesheet_ids"] td.o_field_x2many_list_row_add button',
     content: 'Click on Add a line to create a new timesheet into the task.',
     run: "click",
 }, {
diff --git a/odoo/addons/test_web/static/tests/tours/x2many.js b/odoo/addons/test_web/static/tests/tours/x2many.js
index 0fbded12353ee..196261dc95e85 100644
--- a/odoo/addons/test_web/static/tests/tours/x2many.js
+++ b/odoo/addons/test_web/static/tests/tours/x2many.js
@@ -57,7 +57,7 @@
         trigger: '.o_field_widget[name=participants] .o_data_cell:contains(user_test)',
     }, { // add ourself as participant
         content: "click to add participants",
-        trigger: '.o_field_widget[name=participants] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=participants] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "select Admin",
@@ -82,7 +82,7 @@
         run: "click",
     }, {
         content: "create new message a",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "insert body a",
@@ -98,7 +98,7 @@
     },
     { // add message b
         content: "create new message b",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "insert body b",
@@ -138,7 +138,7 @@
     },
     { // add message c
         content: "create new message c",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "insert body",
@@ -158,7 +158,7 @@
         run: "click",
     }, {
         content: "click to add participants",
-        trigger: '.o_field_widget[name=participants] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=participants] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "select Demo User",
@@ -215,7 +215,7 @@
     },
     { // add message d
         content: "create new message d",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "insert body",
@@ -231,7 +231,7 @@
     },
     { // add message e
         content: "create new message e",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "insert body",
@@ -335,7 +335,7 @@
     },
     { // add message ddd
         content: "create new message ddd",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "select another user",
@@ -483,7 +483,7 @@
     },
     { // add message eee
         content: "create new message eee",
-        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add a',
+        trigger: '.o_field_widget[name=messages] .o_field_x2many_list_row_add button',
         run: "click",
     }, {
         content: "change text value",

From 9cf75be0fc0b7c35df8897164048e12836ae0257 Mon Sep 17 00:00:00 2001
From: luvi <luvi@odoo.com>
Date: Wed, 5 Nov 2025 10:11:04 +0000
Subject: [PATCH 551/673] [FIX] web: redirect scoped apps urls without losing
 the state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit fixes the '/scoped_app' redirection to '/odoo' without
loosing the history state.

Previously, when opening a route such as '/scoped_app/discuss', the
webclient would use an empty state and redirect to the home screen with
'/odoo' instead of redirecting to '/odoo/discuss'.

Two tests have been added in router to assert the different redirection
behavior when using scoped apps from the browser instead of a standalone
app.

task-5159471

closes odoo/odoo#235410

X-original-commit: ab480424540207eb358bf7e74063e32d79e7cc56
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 addons/web/static/src/core/browser/router.js |  7 ++++++-
 addons/web/static/tests/core/router.test.js  | 20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/core/browser/router.js b/addons/web/static/src/core/browser/router.js
index 0018932faa87f..9a19b7cf9bd48 100644
--- a/addons/web/static/src/core/browser/router.js
+++ b/addons/web/static/src/core/browser/router.js
@@ -185,7 +185,7 @@ function urlToState(urlObj) {
 
     const [prefix, ...splitPath] = urlObj.pathname.split("/").filter(Boolean);
 
-    if (prefix === "odoo" || isScopedApp()) {
+    if (["odoo", "scoped_app"].includes(prefix)) {
         const actionParts = [...splitPath.entries()].filter(
             ([_, part]) => !isNumeric(part) && part !== "new"
         );
@@ -230,6 +230,11 @@ function urlToState(urlObj) {
             Object.assign(state, activeAction);
             state.actionStack = actions;
         }
+        if (prefix === "scoped_app" && !isDisplayStandalone()) {
+            // make sure /scoped_app are redirected to /odoo when using the browser instead of the PWA
+            const url = browser.location.origin + router.stateToUrl(state);
+            urlObj.href = url;
+        }
     }
     return state;
 }
diff --git a/addons/web/static/tests/core/router.test.js b/addons/web/static/tests/core/router.test.js
index d2967c77441d1..fa1b790bc3f75 100644
--- a/addons/web/static/tests/core/router.test.js
+++ b/addons/web/static/tests/core/router.test.js
@@ -1,6 +1,6 @@
 import { describe, expect, getFixture, test } from "@odoo/hoot";
 import { click, on } from "@odoo/hoot-dom";
-import { tick } from "@odoo/hoot-mock";
+import { mockMatchMedia, tick } from "@odoo/hoot-mock";
 import { patchWithCleanup } from "@web/../tests/web_test_helpers";
 
 import { browser } from "@web/core/browser/browser";
@@ -1677,6 +1677,24 @@ describe("History", () => {
     });
 });
 
+describe("Scoped apps", () => {
+    test("url location is changed to /odoo if the client is not used in a standalone scoped app", async () => {
+        Object.assign(browser.location, { pathname: "/scoped_app/some-path" });
+        createRouter();
+        router.pushState({ app_name: "some_app", path: "scoped_app/some_path" });
+        await tick();
+        expect(browser.location.href).toBe("https://www.hoot.test/odoo/some-path?app_name=some_app&path=scoped_app%2Fsome_path");
+    });
+    test("url location is preserved as /scoped_app if the client is used in a standalone scoped app", async () => {
+        mockMatchMedia({ ["display-mode"]: "standalone" });
+        Object.assign(browser.location, { pathname: "/scoped_app/some-path" });
+        createRouter();
+        router.pushState({ app_name: "some_app", path: "scoped_app/some_path" });
+        await tick();
+        expect(browser.location.href).toBe("https://www.hoot.test/scoped_app/some-path?app_name=some_app&path=scoped_app%2Fsome_path");
+    });
+})
+
 describe("Retrocompatibility", () => {
     test("parse an url with hash (key/values)", async () => {
         Object.assign(browser.location, { pathname: "/web" });

From 71e23d7aa37e38c166c3672811d256574f6200bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 12 Nov 2025 15:44:44 +0000
Subject: [PATCH 552/673] [FIX] mail: edit message does not remove 1st line
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up of https://github.com/odoo/odoo/pull/231004

Before this commit, when editing a message with at least 1 line,
the 1st line was removed after edition.

Steps to reproduce:
- type message with line breaks:
```
line1
line2
line3
```
- posts message
- start editing of message
- add "edit" in its own line in-between line1 and line2:
```
line1
edit
line2
line3
```
- save the edition
=> message saved has lost the 1st line. The resulting message is:
```

edit
line2
line3
```

This happens because message with line breaks are formatted with
`<br/>`:
```
line1<br/>line2<br/>line3
```

When message is edited with new content:
```
line1<br/>edit</br>line2<br/>line3
```

The resulting content was:
```
 <br/>edit</br>line2<br/>line3
```

This happens because the html of body has no wrapped tag and consists
of just text nodes joined by `<br/>`. While client-side DOM would say
each `<br/>` are children (and text nodes are not), the `etree` lib
that is used to parse the html has different definition of children:
```
<br/>edit   # 1st child
<br/>line2  # 2nd child
<br/>line3  # 3rd child
```

Parsing of body as html is used to insert the "(edited)" label at the
end, attempting to insert in the last children for having the label
inline to text content otherwise at the end.
When producing the resulting body with "(edited)" label, only the
children were joined. Therefore the resulting body was produced:
```
 <br/>edit</br>line2<br/>line3<span.o-mail-Message-edited/>
```

Where the `.o-mail-Message-edited` represents the "(edited)" that
is rendered on template for translation and style. `line1` is missing
because this is not a child: this is text content before the 1st
child. This `line1` should still be present in resulting string.

This commit fixes the issue by adding missing `tree.text` to the
resulting message body with "(edited)" label, which is the text
content that is present before the 1st child, i.e. the `line1` in
example above.

closes odoo/odoo#235414

X-original-commit: cdc01d4eac48a7334137a7a95bfcf8543db012e1
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/models/mail_thread.py                    | 2 +-
 addons/test_mail/tests/test_mail_thread_internals.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 9d63bcfa5c469..70bdece51b1ab 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -4938,7 +4938,7 @@ def _message_update_content(self, message, /, *, body, attachment_ids=None, part
                     etree.SubElement(last_div_element, "span", attrib={"class": "o-mail-Message-edited"})
                     msg_values["body"] = (
                         # markup: it is considered safe, as coming from html.fragment_fromstring
-                        Markup("".join(etree.tostring(child, encoding="unicode") for child in tree))
+                        (tree.text or "") + Markup("".join(etree.tostring(child, encoding="unicode") for child in tree))
                     )
                 else:  # body is plain text
                     # keep html if already Markup, otherwise escape
diff --git a/addons/test_mail/tests/test_mail_thread_internals.py b/addons/test_mail/tests/test_mail_thread_internals.py
index 6b5dcbf88193f..f0c61ac841a87 100644
--- a/addons/test_mail/tests/test_mail_thread_internals.py
+++ b/addons/test_mail/tests/test_mail_thread_internals.py
@@ -977,6 +977,12 @@ def test_message_update_content(self):
         self.assertFalse((attachments + new_attachments).exists())
         self.assertEqual(message.body, Markup('<p>Another Body, void attachments <span class="o-mail-Message-edited"></span></p>'))
 
+        ticket_record._message_update_content(
+            message,
+            body=Markup("line1<br>edit<br>line2<br>line3"),
+        )
+        self.assertEqual(message.body, Markup('<p>line1 <br>edit<br>line2<br>line3<span class="o-mail-Message-edited"></span></p>'))
+
     @mute_logger('openerp.addons.mail.models.mail_mail')
     @users('employee')
     def test_message_update_content_check(self):

From b68f02dee695c342775930ba6968fd93f9bfff96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 12 Nov 2025 17:07:08 +0000
Subject: [PATCH 553/673] [FIX] mail: better message list readability in white
 theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- reduce slightly message border opacity, so that they are less
distracting that message list content itself.
- add more weight on message author names so they are more distinct
more message text content. Harmonize weight in message reply but with
reduced opacity.

These changes should make using Discuss in white theme less
fatiguing.

closes odoo/odoo#235413

X-original-commit: 24dc3bd8486d51a285ac2ef037c5caa76d85edb0
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/common/message.scss          | 2 +-
 addons/mail/static/src/core/common/message.xml           | 2 +-
 addons/mail/static/src/core/common/message_in_reply.scss | 4 ++++
 addons/mail/static/src/core/common/message_in_reply.xml  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/core/common/message.scss b/addons/mail/static/src/core/common/message.scss
index 61a6837f34d29..a608a800b9fd9 100644
--- a/addons/mail/static/src/core/common/message.scss
+++ b/addons/mail/static/src/core/common/message.scss
@@ -102,7 +102,7 @@
         &.#{$_type} {
             $_border-base: mix($_color, $body-color, 75%);
             --o-message-bubble-bg: #{mix($o-view-background-color, $_color, 90%)};
-            --o-message-bubble-border-color: #{mix($o-view-background-color, $_border-base, 70%)};
+            --o-message-bubble-border-color: #{mix($o-view-background-color, $_border-base, 80%)};
             --o-message-bubble-color-base: #{$_color};
         }
     }
diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index 0115cb4624f1d..1d522431b8597 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -37,7 +37,7 @@
                     <div class="w-100 o-min-width-0" t-att-class="{ 'flex-grow-1': isEditing }" t-ref="messageContent">
                         <div t-if="!props.squashed" class="o-mail-Message-header d-flex flex-wrap align-items-baseline lh-1" t-att-class="{ 'mb-1': !message.isNote, 'pe-2': props.asCard and isMobileOS }" name="header">
                             <span t-if="message.authorName and shouldDisplayAuthorName" class="o-mail-Message-author smaller" t-att-class="getAuthorAttClass()">
-                                <strong class="me-1 fw-bold" t-esc="message.authorName"/>
+                                <strong class="me-1 o-fw-600" t-esc="message.authorName"/>
                             </span>
                             <t t-if="!isAlignedRight" t-call="mail.Message.notification"/>
                             <t t-if="isAlignedRight and !message.bubbleColor and !(props.asCard and isMobileOS)" t-call="mail.Message.actions"/>
diff --git a/addons/mail/static/src/core/common/message_in_reply.scss b/addons/mail/static/src/core/common/message_in_reply.scss
index 3e62d375a958e..e7aef77c67311 100644
--- a/addons/mail/static/src/core/common/message_in_reply.scss
+++ b/addons/mail/static/src/core/common/message_in_reply.scss
@@ -1,3 +1,7 @@
+.o-mail-MessageInReply-author {
+    opacity: 75%;
+}
+
 .o-mail-MessageInReply-avatar {
     width: $o-mail-Avatar-size / 2;
     aspect-ratio: 1;
diff --git a/addons/mail/static/src/core/common/message_in_reply.xml b/addons/mail/static/src/core/common/message_in_reply.xml
index 05e0e90c5f408..71a6d7b977255 100644
--- a/addons/mail/static/src/core/common/message_in_reply.xml
+++ b/addons/mail/static/src/core/common/message_in_reply.xml
@@ -11,7 +11,7 @@
                     <t t-if="!props.message.parent_id.isEmpty">
                         <img class="o-mail-MessageInReply-avatar me-2 rounded object-fit-cover" t-att-src="authorAvatarUrl" t-att-title="props.message.parent_id.authorName" alt="Avatar"/>
                         <span class="o-mail-MessageInReply-content overflow-hidden smaller">
-                            <b class="o-mail-MessageInReply-author"><t t-out="props.message.parent_id.authorName"/></b>:
+                            <b class="o-mail-MessageInReply-author o-fw-600"><t t-out="props.message.parent_id.authorName"/></b>:
                             <span class="o-mail-MessageInReply-message ms-1 text-break">
                                 <i t-if="props.message.parent_id.hasAttachments" class="fa fa-fw me-1" t-att-class="props.message.parent_id.previewIcon" />
                                 <i t-if="props.message.parent_id.poll" class="fa fa-fw me-1 oi oi-view-cohort"/>

From a8aa024f82932fa395b8e66a156eed541c790f7d Mon Sep 17 00:00:00 2001
From: Serhii Rubanskyi <seru@odoo.com>
Date: Fri, 17 Oct 2025 09:50:24 +0000
Subject: [PATCH 554/673] [FIX] html_builder: fix visually-hidden text causing
 scrollbar in Chrome

This is a known issue [1] in bootstrap, which displays an unexpected
scrollbar when we have a visually-hidden text in the table. The issue
occurs in Chrome, Edge and Safari, but does not in Firefox.

**Steps to see the issue:**
- Open website and start editing
- Drop a table of content
- Drop inside of the ToC a donation snippet
- Click on the donation amounts form

=> A scrollbar appears.
The visually-hidden spans were added in commit [2], but the problem
couldn't be seen until commit [3] removed the `overflow: hidden` style.

[1]: https://github.com/twbs/bootstrap/issues/41554
[2]: https://github.com/odoo/odoo/commit/faafb913a0af5c4bfa7d207e09bbea0d97125aed
[3]: https://github.com/odoo/odoo/commit/10156c10b09dc502a40253d64e2505e817a520bf

task-5169275

closes odoo/odoo#235443

X-original-commit: a1c2d30d1e72b0f3579c7e703e6e22e2862d506c
Signed-off-by: Robin Lejeune (role) <role@odoo.com>
Signed-off-by: Serhii Rubanskyi (seru) <seru@odoo.com>
---
 .../static/src/core/building_blocks/builder_list.scss        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/html_builder/static/src/core/building_blocks/builder_list.scss b/addons/html_builder/static/src/core/building_blocks/builder_list.scss
index 72277600102b4..92e521b82104a 100644
--- a/addons/html_builder/static/src/core/building_blocks/builder_list.scss
+++ b/addons/html_builder/static/src/core/building_blocks/builder_list.scss
@@ -1,3 +1,8 @@
+table .visually-hidden {
+    position: static !important;
+    display: inline-block;
+}
+
 .bl-dropdown-toggle:disabled {
     cursor: default;
     border: 1px solid #00000088;

From a14df52d8a302c7bbf64eb1817401e74787bc46a Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Wed, 12 Nov 2025 09:24:57 +0000
Subject: [PATCH 555/673] [IMP] point_of_sale: force done waiting payment line

If a payment line is stuck in a waiting state (e.g. payment
terminal not responding to a request), we now display the
"force done" button, to avoid blocking the user.

closes odoo/odoo#235445

X-original-commit: 4f6f176ab11670115cff8ba7643186a397e0efae
Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 .../app/screens/payment_screen/payment_lines/payment_lines.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml
index a46c1e2c47145..7be06fec0416f 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_lines/payment_lines.xml
@@ -76,6 +76,9 @@
                                     </div>
                                     <div>
                                         <i class="fa fa-circle-o-notch fa-spin" role="img" />
+                                        <div t-if="line.payment_status == 'waiting'" class="button send_force_done" title="Force Done" t-on-click="() => this.props.sendForceDone(line)">
+                                            Force done
+                                        </div>
                                     </div>
                                 </t>
                                 <t t-elif="line.payment_status == 'reversing'">

From cb7fba0782d8af365e29832ac7dd166590d80b16 Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Mon, 3 Nov 2025 13:08:18 +0000
Subject: [PATCH 556/673] [FIX] account_payment: make previous payment tokens
 selectable again

Versions
--------
- 17.0+

Steps
-----
1. Create a sales order for a company partner;
2. create & copy a payment link;
3. open payment link in new session;
4. using demo provider, make the payment & save payment details;
5. add an invoice address to the company partner;
6. create an invoice for the company partner using the invoice address;
7. confirm invoice;
8. click "Register Payment";
9. select "Demo" as payment provider.

Issue
-----
The saved payment token cannot be selected.

Cause
-----
Before commit 75f4008, the company partner was used to search for tokens
in the payment register wizard. After the commit, the the invoice
partner is used, making it impossible to select previously accessible
payment tokens.

Solution
--------
Search payment tokens linked to either partner.

opw-5193718

closes odoo/odoo#235420

X-original-commit: ec212f38e50520edf612522717952855c8c09a80
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 .../tests/test_account_payment.py             | 78 +++++++++++--------
 .../wizards/account_payment_register.py       | 41 ++++++----
 2 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/addons/account_payment/tests/test_account_payment.py b/addons/account_payment/tests/test_account_payment.py
index 60e360fcbff5e..30354f3e4aead 100644
--- a/addons/account_payment/tests/test_account_payment.py
+++ b/addons/account_payment/tests/test_account_payment.py
@@ -4,9 +4,10 @@
 
 from odoo import Command
 from odoo.exceptions import UserError, ValidationError
-from odoo.addons.account_payment.tests.common import AccountPaymentCommon
 from odoo.tests import tagged
 
+from odoo.addons.account_payment.tests.common import AccountPaymentCommon
+
 
 @tagged('-at_install', 'post_install')
 class TestAccountPayment(AccountPaymentCommon):
@@ -381,36 +382,47 @@ def test_post_process_does_not_fail_on_cancelled_invoice(self):
 
     def test_payment_token_for_invoice_partner_is_available(self):
         """Test that the payment token of the invoice partner is available"""
-        with self.mocked_get_payment_method_information():
-            bank_journal = self.company_data['default_journal_bank']
-            payment_method_line = bank_journal.inbound_payment_method_line_ids\
-                .filtered(lambda line: line.payment_provider_id == self.dummy_provider)
-            self.assertTrue(payment_method_line)
-            child_partner = self.env['res.partner'].create(
-                {
-                    'name': "test_payment_token_for_invoice_partner_is_available",
-                    'is_company': False,
-                    'parent_id': self.partner.id,
-                }
-            )
-            invoice = self.env['account.move'].create({
-                'move_type': 'out_invoice',
-                'partner_id': child_partner.id,
-                'invoice_line_ids': [
-                    Command.create({
-                        'name': 'test line',
-                        'price_unit': 100.0,
-                    }),
-                ],
+        Wizard = self.env['account.payment.register'].with_context(active_model='account.move')
+        bank_journal = self.company_data['default_journal_bank']
+        payment_method_line = bank_journal.inbound_payment_method_line_ids.filtered(
+            lambda line: line.payment_provider_id == self.dummy_provider,
+        )
+        self.assertTrue(payment_method_line)
+
+        def payment_register_wizard(invoices):
+            return Wizard.with_context(active_ids=invoices.ids).create({
+                'payment_method_line_id': payment_method_line.id,
             })
-            invoice.action_post()
-            payment_token = self._create_token(partner_id=child_partner.id)
-            wizard = (
-                self.env["account.payment.register"]
-                .with_context(active_model="account.move", active_ids=invoice.ids)
-                .create({"payment_method_line_id": payment_method_line.id})
-            )
-            self.assertRecordValues(wizard, [{
-                'suitable_payment_token_ids': payment_token.ids,
-                'payment_token_id': payment_token.id,
-            }])
+
+        self.partner.write({
+            'is_company': True,
+            'child_ids': [Command.create({
+                'name': name,
+                'is_company': False,
+            }) for name in ("Child 1", "Child 2")],
+        })
+        child_1, child_2 = self.partner.child_ids
+        invoice_1, invoice_2 = self.env['account.move'].create([{
+            'partner_id': partner.id,
+            'move_type': 'out_invoice',
+            'invoice_line_ids': [Command.create({'product_id': self.product.id})],
+        } for partner in (child_1, child_2)])
+        invoice_1.action_post()
+        payment_token = self._create_token(partner_id=child_1.id)
+        wizard = payment_register_wizard(invoice_1)
+        self.assertRecordValues(wizard, [{
+            'suitable_payment_token_ids': payment_token.ids,
+            'payment_token_id': payment_token.id,
+        }])
+
+        # Check that tokens assigned to the specific partner as well as their
+        # commercial partner can be selected.
+        parent_token = self._create_token(partner_id=self.partner.id)
+        wizard = payment_register_wizard(invoice_1)
+        self.assertEqual(wizard.suitable_payment_token_ids, payment_token + parent_token)
+
+        # Check that payments for multiple invoices with multiple partners
+        # only retrieve tokens assigned to a common commercial partner.
+        invoice_2.action_post()
+        wizard = payment_register_wizard(invoice_1 + invoice_2)
+        self.assertEqual(wizard.suitable_payment_token_ids, parent_token)
diff --git a/addons/account_payment/wizards/account_payment_register.py b/addons/account_payment/wizards/account_payment_register.py
index b43639b141656..6befc092259a8 100644
--- a/addons/account_payment/wizards/account_payment_register.py
+++ b/addons/account_payment/wizards/account_payment_register.py
@@ -1,4 +1,5 @@
-from odoo import api, Command, fields, models
+from odoo import api, fields, models
+from odoo.fields import Command, Domain
 
 
 class AccountPaymentRegister(models.TransientModel):
@@ -33,29 +34,37 @@ class AccountPaymentRegister(models.TransientModel):
     @api.depends('payment_method_line_id')
     def _compute_suitable_payment_token_ids(self):
         for wizard in self:
-            wizard.suitable_payment_token_ids = [Command.clear()]
-            if wizard.can_edit_wizard and wizard.use_electronic_payment_method:
-                batch = wizard.batches[0]
-                partner = batch['lines'].move_id.partner_id
-                if len(partner) == 1:
-                    wizard.suitable_payment_token_ids = self.env['payment.token'].sudo().search([
-                        *self.env['payment.token']._check_company_domain(wizard.company_id),
-                        ('provider_id.capture_manually', '=', False),
-                        ('partner_id', '=', partner.id),
-                        ('provider_id', '=', wizard.payment_method_line_id.payment_provider_id.id),
-                    ])
+            if (
+                wizard.can_edit_wizard
+                and wizard.use_electronic_payment_method
+                and (provider := wizard.payment_method_line_id.payment_provider_id)
+                and not provider.capture_manually
+            ):
+                token_partners = wizard.partner_id
+                lines_partners = wizard.batches[0]['lines'].move_id.partner_id
+                if len(lines_partners) == 1:
+                    token_partners |= lines_partners
+                wizard.suitable_payment_token_ids = self.env['payment.token'].sudo().search(
+                    Domain.AND([
+                        Domain('partner_id', 'in', token_partners.ids),
+                        Domain('provider_id', '=', provider.id),
+                        self.env['payment.token']._check_company_domain(wizard.company_id),
+                    ]),
+                )
+            else:
+                wizard.suitable_payment_token_ids = [Command.clear()]
 
     @api.depends('payment_method_line_id')
     def _compute_use_electronic_payment_method(self):
+        # Get all electronic payment method codes.
+        # These codes are comprised of the codes of each payment provider.
+        codes = dict(self.env['payment.provider']._fields['code']._description_selection(self.env))
         for wizard in self:
-            # Get a list of all electronic payment method codes.
-            # These codes are comprised of the codes of each payment provider.
-            codes = [key for key in dict(self.env['payment.provider']._fields['code']._description_selection(self.env))]
             wizard.use_electronic_payment_method = wizard.payment_method_code in codes
 
     @api.depends('can_edit_wizard', 'suitable_payment_token_ids', 'journal_id')
     def _compute_payment_token_id(self):
-        codes = [key for key in dict(self.env['payment.provider']._fields['code']._description_selection(self.env))]
+        codes = dict(self.env['payment.provider']._fields['code']._description_selection(self.env))
         for wizard in self:
             if wizard.payment_method_line_id and wizard.payment_method_line_id.code not in codes:
                 wizard.payment_token_id = False

From c5afb61b52731515bf33405b3d2bf0545ba43ace Mon Sep 17 00:00:00 2001
From: "Julien Alardot (jual)" <jual@odoo.com>
Date: Tue, 4 Nov 2025 14:18:47 +0000
Subject: [PATCH 557/673] [IMP] hr_expense: Improve sudo awareness in wizard

Rename variables that are not sudo-explicit
to reduce future potential security oversights.

closes odoo/odoo#234519

X-original-commit: b03e01fafba8395141f2bbcda614c035d6cdcc2a
Signed-off-by: Hugo Poncelet (hupo) <hupo@odoo.com>
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
---
 addons/hr_expense/wizard/hr_expense_post_wizard.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_expense/wizard/hr_expense_post_wizard.py b/addons/hr_expense/wizard/hr_expense_post_wizard.py
index 0799a24b8829a..dbb01f3c04e99 100644
--- a/addons/hr_expense/wizard/hr_expense_post_wizard.py
+++ b/addons/hr_expense/wizard/hr_expense_post_wizard.py
@@ -53,16 +53,16 @@ def action_post_entry(self):
             }
             for new_receipt_vals in expenses._prepare_receipts_vals()
         ]
-        moves = self.env['account.move'].sudo().create(expense_receipt_vals_list)
-        for move in moves:
-            move._message_set_main_attachment_id(move.attachment_ids, force=True, filter_xml=False)
-        moves.action_post()
+        moves_sudo = self.env['account.move'].sudo().create(expense_receipt_vals_list)
+        for move_sudo in moves_sudo:
+            move_sudo._message_set_main_attachment_id(move_sudo.attachment_ids, force=True, filter_xml=False)
+        moves_sudo.action_post()
 
         if not self.company_id.expense_journal_id:  # Sets the default one if not specified
             self.sudo().company_id.expense_journal_id = self.employee_journal_id.id
 
         # Add the company_paid ids to the redirect
-        moves_ids = moves.ids + self.env.context.get('company_paid_move_ids', tuple())
+        moves_ids = moves_sudo.ids + self.env.context.get('company_paid_move_ids', tuple())
 
         action = {
             'type': 'ir.actions.act_window',
@@ -70,7 +70,7 @@ def action_post_entry(self):
         }
         if len(moves_ids) == 1:
             action.update({
-                'name': moves.ref,
+                'name': moves_sudo.ref,
                 'view_mode': 'form',
                 'res_id': moves_ids[0],
             })

From c6f149b24bf210446928f5ff281a56ce1a4eee4e Mon Sep 17 00:00:00 2001
From: Adnan Sabbir <adns@odoo.com>
Date: Fri, 24 Oct 2025 08:57:40 +0000
Subject: [PATCH 558/673] [FIX] l10n_tr_nilvera_einvoice: skip PDF attachment
 for ubl_tr payload

Turkish e-invoicing(UBL_TR) throws error when attachment is added to the xml payload.

Steps to reproduce:
  - Install `l10n_tr_einvoice`.
  - Create and post an invoice.
  - Send/Generate the invoice without 'By Nilvera'.
  - Now Send it again using 'By Nilvera'.

Issue:
  - When sending the UBL XML to Nilvera with existing XML, the process fails.

Cause:
  - An <Attachment> node is added to the XML after it is sent. So, if we don't send it to Nilvera on the first attempt, the attachment is sent with the payload to Nilvera
  - UBL Customization 1.2 (Nilvera) does not accept attachments, resulting in an error.

Note:
  - If the user sends to Nilvera on the first attempt, no issue occurs.

Fix:
  - Skip adding the <Attachment> node when the UBL type is `ubl_tr`.

task-5169400

closes odoo/odoo#235451

X-original-commit: af4365421bc7ba990420789c12c98270d723fa1a
Signed-off-by: Ali Alfie (alal) <alal@odoo.com>
---
 .../models/account_move_send.py               | 10 +++++
 .../tests/test_account_move_send.py           | 39 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py b/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py
index 6ca5681dbf227..f37a42c2faf9b 100644
--- a/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py
+++ b/addons/l10n_tr_nilvera_einvoice/models/account_move_send.py
@@ -217,3 +217,13 @@ def _call_web_service_before_invoice_pdf_render(self, invoices_data):
                     invoice._l10n_tr_nilvera_submit_einvoice(xml_file, customer_alias)
                 else:   # E-Archive
                     invoice._l10n_tr_nilvera_submit_earchive(xml_file)
+
+    @api.model
+    def _postprocess_invoice_ubl_xml(self, invoice, invoice_data):
+        # EXTENDS account_edi_ubl_cii
+        # Nilvera rejects XMLs with the PDF attachment.
+
+        if invoice_data['invoice_edi_format'] == 'ubl_tr':
+            return
+
+        return super()._postprocess_invoice_ubl_xml(invoice, invoice_data)
diff --git a/addons/l10n_tr_nilvera_einvoice/tests/test_account_move_send.py b/addons/l10n_tr_nilvera_einvoice/tests/test_account_move_send.py
index 45c2c150d255b..23bdd5a62f0ee 100644
--- a/addons/l10n_tr_nilvera_einvoice/tests/test_account_move_send.py
+++ b/addons/l10n_tr_nilvera_einvoice/tests/test_account_move_send.py
@@ -1,5 +1,6 @@
 from odoo.tests import tagged
 from odoo.addons.account.tests.test_account_move_send import TestAccountMoveSendCommon
+import xml.etree.ElementTree as ET
 
 
 @tagged('post_install_l10n', 'post_install', '-at_install')
@@ -9,6 +10,12 @@ class TestTRAccountMoveSend(TestAccountMoveSendCommon):
     @TestAccountMoveSendCommon.setup_country('tr')
     def setUpClass(cls):
         super().setUpClass()
+        # ==== Partners ====
+        cls.partner_tr = cls.env['res.partner'].create({
+            'name': 'partner_tr',
+            'invoice_edi_format': 'ubl_tr',
+            'l10n_tr_nilvera_customer_status': 'earchive',
+        })
 
     def test_invoice_names_valid_for_nilvera(self):
         valid_names = [
@@ -44,3 +51,35 @@ def test_invoice_names_invalid_for_nilvera(self):
 
             wizard = self.create_send_and_print(invoice)
             self.assertIn('tr_moves_with_invalid_name', wizard.alerts)
+
+    def test_no_attachment_on_ubl_xml_for_ubl_tr(self):
+        # Setup invoice
+        invoice = self.init_invoice(
+            move_type='out_invoice',
+            partner=self.partner_tr,
+            invoice_date='2025-11-28',
+            amounts=[1000],
+            taxes=self.tax_sale_a,
+            post=True,
+        )
+
+        # Execute send
+        wizard = self.create_send_and_print(invoice, True)
+        wizard.sending_methods = False
+        wizard.extra_edis = False
+        wizard.alerts = False
+        wizard.action_send_and_print()
+
+        xml_data = invoice.ubl_cii_xml_id.raw
+        self.assertIsNotNone(xml_data, "XML data should exist")
+
+        xml_tree = ET.fromstring(xml_data.decode('utf-8'))
+
+        ns = {'cac': 'urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2'}
+
+        # Main assertion - no attachments should exist
+        attachments = xml_tree.findall('.//cac:AdditionalDocumentReference/cac:Attachment', ns)
+        self.assertFalse(
+            attachments,
+            f"Found {len(attachments)} unexpected Attachment node(s) in UBL TR XML"
+        )

From d0af0d28c884e1a056adffb8c19b63c617d410b1 Mon Sep 17 00:00:00 2001
From: Yash Vaishnav <yava@odoo.com>
Date: Fri, 7 Nov 2025 14:30:12 +0530
Subject: [PATCH 559/673] [FIX] l10n_in_hr_holidays: fixed the test case

Previously, the hours were hard-coded as 10-13 and 14-19
Now, we derive the hours from the employee calendar and
use that in the calculation.

runbot-error-233869

closes odoo/odoo#234898

Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
---
 .../tests/test_sandwich_leave.py              | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py b/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py
index e6adb1f6f67ce..621213288203d 100644
--- a/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py
+++ b/addons/l10n_in_hr_holidays/tests/test_sandwich_leave.py
@@ -14,6 +14,26 @@ def setUp(self):
             'name': 'Test Indian Company',
             'country_id': self.env.ref('base.in').id,
         })
+        self.test_calendar = self.env["resource.calendar"].create({
+            "name": "Test 8-17 Calendar",
+            "company_id": self.indian_company.id,
+            "attendance_ids": [
+                Command.create({
+                    "name": f"Day {day} {label}",
+                    "dayofweek": str(day),
+                    "hour_from": hour_from,
+                    "hour_to": hour_to,
+                    "day_period": label.lower(),
+                })
+                for day in range(5)
+                for label, hour_from, hour_to in (
+                    ("Morning", 8, 12),
+                    ("Lunch", 12, 13),
+                    ("Afternoon", 13, 17),
+                )
+            ]},
+        )
+        self.indian_company.resource_calendar_id = self.test_calendar
         self.env = self.env(context=dict(self.env.context, allowed_company_ids=self.indian_company.ids))
         self.demo_user = self.env["res.users"].with_company(self.indian_company).create({
             "login": "piyush",
@@ -49,6 +69,7 @@ def setUp(self):
             'name': 'Rahul',
             'country_id': self.env.ref('base.in').id,
             'company_id': self.indian_company.id,
+            'resource_calendar_id': self.test_calendar.id,
         })
         self.wednesday_public_holiday = self.env['resource.calendar.leaves'].create({
             'name': 'test public holiday',
@@ -379,8 +400,8 @@ def test_partial_hour_leave_not_counted(self):
             'holiday_status_id': self.leave_type_hours.id,
             'request_date_from': "2025-01-24",
             'request_date_to': "2025-01-24",
-            'request_hour_from': 10,
-            'request_hour_to': 13,
+            'request_hour_from': 8,
+            'request_hour_to': 12,
         })
         full_leave = self.env['hr.leave'].create({
             'name': 'Full Monday Leave',
@@ -389,9 +410,8 @@ def test_partial_hour_leave_not_counted(self):
             'request_date_from': "2025-01-27",
             'request_date_to': "2025-01-27",
         })
-
         self.assertFalse(partial_leave.l10n_in_contains_sandwich_leaves)
-        self.assertEqual(partial_leave.number_of_hours, 3)
+        self.assertEqual(partial_leave.number_of_hours, 4)
         self.assertFalse(full_leave.l10n_in_contains_sandwich_leaves)
         self.assertEqual(full_leave.number_of_hours, 8)
 

From 366972605a97c59bdcf8fe9efff879b2b3f711e6 Mon Sep 17 00:00:00 2001
From: srap-odoo <srap@odoo.com>
Date: Mon, 16 Jun 2025 17:44:05 +0530
Subject: [PATCH 560/673] [IMP] delivery, *: rename 'Shipping Methods' to
 'Delivery Methods'

_* = stock_delivery, website_sale, sale, website_sale_loyalty

Renamed all user-facing labels of "Shipping Method(s)" to "Delivery Method(s)"
for consistent terminology across apps and improved user clarity, without
altering terminology used by specific delivery providers or third-party
integrations.

Impact:
-------
This avoids confusion between "Shipping Method" and "Delivery Method", as
"Delivery Method" better reflects how an order is handed over to the customer,
making the terminology clearer and more contextual.

task-4720174

Part-of: odoo/odoo#215356
Related: odoo/enterprise#88228
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/delivery/models/delivery_carrier.py           |  2 +-
 addons/delivery/models/sale_order.py                 |  2 +-
 .../delivery/report/ir_actions_report_templates.xml  |  2 +-
 addons/delivery/tests/test_delivery_cost.py          | 12 ++++++------
 addons/delivery/views/delivery_carrier_views.xml     |  4 ++--
 addons/delivery/wizard/choose_delivery_carrier.py    |  4 ++--
 addons/delivery/wizard/res_config_settings_views.xml |  2 +-
 addons/sale/data/mail_template_data.xml              |  4 ++--
 addons/stock_delivery/models/stock_move.py           |  2 +-
 .../stock_delivery/tests/test_carrier_propagation.py |  2 +-
 .../stock_delivery/tests/test_delivery_stock_move.py |  8 ++++----
 addons/stock_delivery/tests/test_packing_delivery.py |  2 +-
 addons/stock_delivery/views/report_shipping.xml      |  2 +-
 .../stock_delivery/views/stock_move_line_views.xml   |  2 +-
 addons/website_sale/controllers/main.py              |  2 +-
 addons/website_sale/models/sale_order.py             |  2 +-
 .../static/tests/tours/shipping_discount.js          |  2 +-
 .../tests/test_website_sale_loyalty_delivery.py      |  2 +-
 18 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index 2f9de9182a389..83927476c7082 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -12,7 +12,7 @@
 
 class DeliveryCarrier(models.Model):
     _name = 'delivery.carrier'
-    _description = "Shipping Method"
+    _description = "Delivery Method"
     _order = 'sequence, id'
 
     ''' A Shipping Provider
diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index e82a7bfb369c0..370b4b9b0e9e9 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -129,7 +129,7 @@ def action_open_delivery_wizard(self):
         if self.env.context.get('carrier_recompute'):
             name = _('Update shipping cost')
         else:
-            name = _('Add a shipping method')
+            name = _('Add a delivery method')
         return {
             'name': name,
             'type': 'ir.actions.act_window',
diff --git a/addons/delivery/report/ir_actions_report_templates.xml b/addons/delivery/report/ir_actions_report_templates.xml
index 9357b8dcffd12..1ac2e9b31b2f8 100644
--- a/addons/delivery/report/ir_actions_report_templates.xml
+++ b/addons/delivery/report/ir_actions_report_templates.xml
@@ -4,7 +4,7 @@
     <template id="delivery_report_saleorder_document" inherit_id="sale.report_saleorder_document">
         <span name="order_note" position="before">
             <p t-if="doc.carrier_id.carrier_description" id="carrier_description">
-                <strong>Shipping Description</strong>
+                <strong>Delivery Description</strong>
                 <span class="d-block" t-out="doc.carrier_id.carrier_description"/>
             </p>
         </span>
diff --git a/addons/delivery/tests/test_delivery_cost.py b/addons/delivery/tests/test_delivery_cost.py
index e0489b9cd71d2..e496a85b0187b 100644
--- a/addons/delivery/tests/test_delivery_cost.py
+++ b/addons/delivery/tests/test_delivery_cost.py
@@ -139,9 +139,9 @@ def test_00_delivery_cost(self):
 
     def test_01_delivery_cost_from_pricelist(self):
         """ This test aims to validate the use of a pricelist to compute the delivery cost in the case the associated
-            product of the shipping method is defined in the pricelist """
+            product of the delivery method is defined in the pricelist """
 
-        # Create pricelist with a custom price for the standard shipping method
+        # Create pricelist with a custom price for the standard delivery method
         my_pricelist = self.env['product.pricelist'].create({
             'name': 'shipping_cost_change',
             'item_ids': [Command.create({
@@ -178,9 +178,9 @@ def test_01_delivery_cost_from_pricelist(self):
 
     def test_02_delivery_cost_from_different_currency(self):
         """ This test aims to validate the use of a pricelist using a different currency to compute the delivery cost in
-            the case the associated product of the shipping method is defined in the pricelist """
+            the case the associated product of the delivery method is defined in the pricelist """
 
-        # Create pricelist with a custom price for the standard shipping method
+        # Create pricelist with a custom price for the standard delivery method
         my_pricelist = self.env['product.pricelist'].create({
             'name': 'shipping_cost_change',
             'item_ids': [Command.create({
@@ -543,7 +543,7 @@ def test_base_on_rule_currency_is_converted(self):
                 'inverse_company_rate': 2,
             })
 
-        # Company less shipping method
+        # Company less delivery method
         product_delivery_rule = self.env['product.product'].with_company(nook_inc).create({
             'name': 'rule delivery charges',
             'type': 'service',
@@ -565,7 +565,7 @@ def test_base_on_rule_currency_is_converted(self):
             'fixed_margin': 10,
         })
 
-        # Create sale using the shipping method
+        # Create sale using the delivery method
         so = self.env['sale.order'].with_company(nook_inc).create({
             'partner_id': self.partner_4.id,
             'partner_invoice_id': self.partner_4.id,
diff --git a/addons/delivery/views/delivery_carrier_views.xml b/addons/delivery/views/delivery_carrier_views.xml
index 7fd45fdb946c1..69b59930ac8ae 100644
--- a/addons/delivery/views/delivery_carrier_views.xml
+++ b/addons/delivery/views/delivery_carrier_views.xml
@@ -148,7 +148,7 @@
                         <page string="Availability" name="destination">
                             <group col="1">
                                 <p name="availability_description">
-                                    Filling this form allows you to make the shipping method available according to the content of the order or its destination.
+                                    Filling this form allows you to make the delivery method available according to the content of the order or its destination.
                                 </p>
                                 <group>
                                     <group name="country_details" string="Destination">
@@ -192,7 +192,7 @@
                             </group>
                         </page>
                         <page string="Description" name="description">
-                            <field name="carrier_description" placeholder="Shipping method details to be included at bottom sales orders and their confirmation emails. E.g. Instructions for customers to follow."/>
+                            <field name="carrier_description" placeholder="Delivery method details to be included at bottom sales orders and their confirmation emails. E.g. Instructions for customers to follow."/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/delivery/wizard/choose_delivery_carrier.py b/addons/delivery/wizard/choose_delivery_carrier.py
index ac569e603cfb6..ed4dc829f102c 100644
--- a/addons/delivery/wizard/choose_delivery_carrier.py
+++ b/addons/delivery/wizard/choose_delivery_carrier.py
@@ -15,7 +15,7 @@ def _get_default_weight_uom(self):
     partner_id = fields.Many2one('res.partner', related='order_id.partner_id', required=True)
     carrier_id = fields.Many2one(
         'delivery.carrier',
-        string="Shipping Method",
+        string="Delivery Method",
         required=True,
         domain="[('id', 'in', available_carrier_ids)]",
     )
@@ -79,7 +79,7 @@ def update_price(self):
         if vals.get('error_message'):
             raise UserError(vals.get('error_message'))
         return {
-            'name': _('Add a shipping method'),
+            'name': _('Add a delivery method'),
             'type': 'ir.actions.act_window',
             'view_mode': 'form',
             'res_model': 'choose.delivery.carrier',
diff --git a/addons/delivery/wizard/res_config_settings_views.xml b/addons/delivery/wizard/res_config_settings_views.xml
index 84f025c2268d7..5bfd59fb73c28 100644
--- a/addons/delivery/wizard/res_config_settings_views.xml
+++ b/addons/delivery/wizard/res_config_settings_views.xml
@@ -13,7 +13,7 @@
                                 type="action"
                                 class="btn-link"
                                 icon="oi-arrow-right"
-                                string="Shipping Methods"/>
+                                string="Delivery Methods"/>
                     </div>
                  </div>
             </setting>
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml
index 0a0baf3bbb71b..d5ee9f0025580 100644
--- a/addons/sale/data/mail_template_data.xml
+++ b/addons/sale/data/mail_template_data.xml
@@ -317,7 +317,7 @@
         <table t-if="hasattr(object, 'carrier_id') and object.carrier_id" width="100%" style="color: #454748; font-size: 12px;">
             <tr>
                 <td>
-                    <span style="font-weight:bold;">Shipping Method:</span>
+                    <span style="font-weight:bold;">Delivery Method:</span>
                     <t t-out="object.carrier_id.name or ''"></t>
                     <t t-if="object.amount_delivery == 0.0">
                         (Free)
@@ -329,7 +329,7 @@
             </tr>
             <tr t-if="object.carrier_id.carrier_description">
                 <td>
-                    <strong>Shipping Description:</strong>
+                    <strong>Delivery Description:</strong>
                     <t t-out="object.carrier_id.carrier_description"/>
                 </td>
             </tr>
diff --git a/addons/stock_delivery/models/stock_move.py b/addons/stock_delivery/models/stock_move.py
index 9c981470a2889..58a0b180a26c9 100644
--- a/addons/stock_delivery/models/stock_move.py
+++ b/addons/stock_delivery/models/stock_move.py
@@ -8,7 +8,7 @@
 class StockRoute(models.Model):
     _inherit = "stock.route"
 
-    shipping_selectable = fields.Boolean("Applicable on Shipping Methods")
+    shipping_selectable = fields.Boolean("Applicable on Delivery Methods")
 
 
 class StockMove(models.Model):
diff --git a/addons/stock_delivery/tests/test_carrier_propagation.py b/addons/stock_delivery/tests/test_carrier_propagation.py
index 946fd42f71274..c364f4f5b75cb 100644
--- a/addons/stock_delivery/tests/test_carrier_propagation.py
+++ b/addons/stock_delivery/tests/test_carrier_propagation.py
@@ -130,7 +130,7 @@ def test_carrier_propagation(self):
     def test_route_based_on_carrier_delivery(self):
         """
             Check that the route on the sale order line is selected as per the first priority even if route on shipping mehod is present
-            Also, Check that the route on the shipping method is selected if there is no route selected on sale order line
+            Also, Check that the route on the delivery method is selected if there is no route selected on sale order line
         """
         route1 = self.env['stock.route'].create({
             'name': 'Route1',
diff --git a/addons/stock_delivery/tests/test_delivery_stock_move.py b/addons/stock_delivery/tests/test_delivery_stock_move.py
index e9ab501a4de8b..f79cea3d207c5 100644
--- a/addons/stock_delivery/tests/test_delivery_stock_move.py
+++ b/addons/stock_delivery/tests/test_delivery_stock_move.py
@@ -185,7 +185,7 @@ def test_03_invoiced_status(self):
         self.assertEqual(so.invoice_status, 'no', 'The status should still be "Nothing To Invoice"')
 
     def test_delivery_carrier_from_confirmed_so(self):
-        """Test if adding shipping method in sale order after confirmation
+        """Test if adding delivery method in sale order after confirmation
            will add it in pickings too"""
 
         sale_order = self.SaleOrder.create({
@@ -231,11 +231,11 @@ def test_delivery_carrier_from_confirmed_so(self):
 
         # Check the carrier in picking after confirm sale order
         delivery_for_product_11 = sale_order.picking_ids.filtered(lambda p: self.product_11 in p.move_ids.product_id)
-        self.assertEqual(delivery_for_product_11.carrier_id, self.normal_delivery, "The shipping method should be set in pending deliveries.")
+        self.assertEqual(delivery_for_product_11.carrier_id, self.normal_delivery, "The delivery method should be set in pending deliveries.")
 
         done_delivery = sale_order.picking_ids.filtered(lambda p: p.state == "done")
-        self.assertFalse(done_delivery.carrier_id.id, "The shipping method should not be set in done deliveries.")
-        self.assertFalse(return_picking.carrier_id.id, "The shipping method should not set in return pickings")
+        self.assertFalse(done_delivery.carrier_id.id, "The delivery method should not be set in done deliveries.")
+        self.assertFalse(return_picking.carrier_id.id, "The delivery method should not set in return pickings")
 
     def test_picking_weight(self):
         """Test if the picking weight is correctly computed when the product of the move changes."""
diff --git a/addons/stock_delivery/tests/test_packing_delivery.py b/addons/stock_delivery/tests/test_packing_delivery.py
index ccf5525034935..92cdb90580d35 100644
--- a/addons/stock_delivery/tests/test_packing_delivery.py
+++ b/addons/stock_delivery/tests/test_packing_delivery.py
@@ -204,7 +204,7 @@ def test_multistep_delivery_tracking(self):
         picking_ship.move_ids.picked = True
         picking_ship.button_validate()
 
-        # Mock carrier shipping method
+        # Mock carrier delivery method
         with patch(
             'odoo.addons.stock_delivery.models.delivery_carrier.DeliveryCarrier.fixed_send_shipping',
             return_value=[{'exact_price': 0, 'tracking_number': "666"}]
diff --git a/addons/stock_delivery/views/report_shipping.xml b/addons/stock_delivery/views/report_shipping.xml
index 8637a1bfe68f8..be884edbe4b10 100644
--- a/addons/stock_delivery/views/report_shipping.xml
+++ b/addons/stock_delivery/views/report_shipping.xml
@@ -13,7 +13,7 @@
                 <span t-field="o.weight_uom_name"/>
             </div>
             <div t-if="o.carrier_id" class="col" name="div_shipping_method">
-                <strong>Shipping Method:</strong>
+                <strong>Delivery Method:</strong>
                 <p t-field="o.carrier_id">FedEx</p>
             </div>
         </xpath>
diff --git a/addons/stock_delivery/views/stock_move_line_views.xml b/addons/stock_delivery/views/stock_move_line_views.xml
index 36f268fccc1bc..836fb060bf4ae 100644
--- a/addons/stock_delivery/views/stock_move_line_views.xml
+++ b/addons/stock_delivery/views/stock_move_line_views.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="stock.stock_location_route_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@name='route_selector']/group" position="inside">
-                <field name="shipping_selectable" string="Shipping Methods"/>
+                <field name="shipping_selectable" string="Delivery Methods"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 94f20d8c36c18..aab0c688ca8c1 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -1561,7 +1561,7 @@ def _get_shop_payment_errors(self, order):
         if order._has_deliverable_products() and not order._get_delivery_methods():
             errors.append((
                 _("Sorry, we are unable to ship your order."),
-                _("No shipping method is available for your current order and shipping address."
+                _("No delivery method is available for your current order and shipping address."
                   " Please contact us for more information."),
             ))
         return errors
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index b77edf4e7d3d6..9a34ea36b7944 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -891,7 +891,7 @@ def _check_cart_is_ready_to_be_paid(self):
             ))
 
         if not self.only_services and not self.carrier_id:
-            raise ValidationError(_("No shipping method is selected."))
+            raise ValidationError(_("No delivery method is selected."))
 
     def _recompute_cart(self):
         """Recompute taxes and prices for the current cart."""
diff --git a/addons/website_sale_loyalty/static/tests/tours/shipping_discount.js b/addons/website_sale_loyalty/static/tests/tours/shipping_discount.js
index 61f951d54ad87..bdc1c507241f6 100644
--- a/addons/website_sale_loyalty/static/tests/tours/shipping_discount.js
+++ b/addons/website_sale_loyalty/static/tests/tours/shipping_discount.js
@@ -31,7 +31,7 @@ registry.category("web_tour.tours").add("website_sale_loyalty.check_shipping_dis
         ...wsTourUtils.assertCartAmounts({ delivery: "5.00" }),
         ...assertRewardAmounts({ discount: "- 300.00", shipping: "- 5.00" }),
         {
-            content: "confirm shipping method",
+            content: "confirm delivery method",
             trigger: ".o_total_card a[name=website_sale_main_button]",
             run: "click",
             expectUnloadPage: true,
diff --git a/addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py b/addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py
index 62832d508ad6b..941fa41e6c52c 100644
--- a/addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py
+++ b/addons/website_sale_loyalty/tests/test_website_sale_loyalty_delivery.py
@@ -134,7 +134,7 @@ def setUpClass(cls):
         }])
 
     def test_shop_sale_gift_card_keep_delivery(self):
-        # Get admin user and set his preferred shipping method to normal delivery
+        # Get admin user and set his preferred delivery method to normal delivery
         # This test also tests that we can indeed pay delivery fees with gift cards/ewallet
         self.partner_admin.property_delivery_carrier_id = self.normal_delivery
         self.start_tour(

From c41ead767e9d719ac89860af03651419612db20b Mon Sep 17 00:00:00 2001
From: srap-odoo <srap@odoo.com>
Date: Mon, 10 Nov 2025 19:31:42 +0530
Subject: [PATCH 561/673] [IMP] delivery, *: rename Delivery Carrier/Carrier to
 Delivery Methods

_* = sale_loyalty_delivery, website_sale, website_sale_mondialrelay

- A Carrier label is used at the stock level, while Delivery Method is used at
  the sales level.
- A Delivery Method represents the complete carrier process along with the
  required parameters defined at the sales level, whereas a Delivery Carrier
  (or Carrier) is used at the transfer/picking level, where the focus is on
  which carrier actually ships the goods rather than the full delivery
  configuration.
- Therefore, all relevant occurrences of Delivery Carrier have been updated to
  Delivery Method.
- The remaining occurrences of Carrier/Delivery Carrier refer either to
  stock-level usage, delivery provider's internal labels, or
  localization-specific terminology.
- Removed the extra "Delivery Method" column from the "Picking Operations"
  report, as it duplicates the "Carrier" column. At the transfer level, we
  primarily refer to the "Carrier" used, so having both columns would only cause
  confusion and redundancy.

task-4720174

closes odoo/odoo#215356

Related: odoo/enterprise#88228
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/delivery/data/neutralize.sql              |  4 ++--
 addons/delivery/models/delivery_carrier.py       |  8 ++++----
 addons/delivery/models/product_category.py       |  2 +-
 addons/delivery/security/ir_rules.xml            |  2 +-
 .../delivery/tests/test_delivery_availability.py | 16 ++++++++--------
 addons/delivery/tests/test_delivery_cost.py      |  2 +-
 addons/delivery/views/delivery_carrier_views.xml |  8 ++++----
 .../delivery/views/delivery_zip_prefix_views.xml |  2 +-
 .../delivery/wizard/choose_delivery_carrier.py   |  2 +-
 .../tests/test_loyalty_delivery.py               |  2 +-
 addons/stock_delivery/views/report_shipping.xml  |  4 ----
 .../static/src/interactions/payment_button.js    |  2 +-
 .../tests/test_delivery_controller.py            |  4 ++--
 .../controllers/controllers.py                   |  2 +-
 14 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/addons/delivery/data/neutralize.sql b/addons/delivery/data/neutralize.sql
index d8fedac97ddaf..313a4c47e3627 100644
--- a/addons/delivery/data/neutralize.sql
+++ b/addons/delivery/data/neutralize.sql
@@ -1,7 +1,7 @@
--- disable prod environment in all delivery carriers
+-- disable prod environment in all delivery methods
 UPDATE delivery_carrier
    SET prod_environment = false;
--- disable delivery carriers from external providers
+-- disable delivery methods from external providers
 UPDATE delivery_carrier
    SET active = false
    WHERE delivery_type NOT IN ('fixed', 'base_on_rule');
diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index 83927476c7082..c102a7bdf7704 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -69,7 +69,7 @@ class DeliveryCarrier(models.Model):
     state_ids = fields.Many2many('res.country.state', 'delivery_carrier_state_rel', 'carrier_id', 'state_id', 'States')
     zip_prefix_ids = fields.Many2many(
         'delivery.zip.prefix', 'delivery_zip_prefix_rel', 'carrier_id', 'zip_prefix_id', 'Zip Prefixes',
-        help="Prefixes of zip codes that this carrier applies to. Note that regular expressions can be used to support countries with varying zip code lengths, i.e. '$' can be added to end of prefix to match the exact zip (e.g. '100$' will only match '100' and not '1000')")
+        help="Prefixes of zip codes that this delivery method applies to. Note that regular expressions can be used to support countries with varying zip code lengths, i.e. '$' can be added to end of prefix to match the exact zip (e.g. '100$' will only match '100' and not '1000')")
 
     max_weight = fields.Float('Max Weight', help="If the total weight of the order is over this weight, the method won't be available.")
     weight_uom_name = fields.Char(string='Weight unit of measure label', compute='_compute_weight_uom_name')
@@ -81,7 +81,7 @@ class DeliveryCarrier(models.Model):
                                         help="The method is NOT available if at least one product of the order has one of these tags.")
 
     carrier_description = fields.Text(
-        'Carrier Description', translate=True,
+        'Description', translate=True,
         help="A description of the delivery method that you want to communicate to your customers on the Sales Order and sales confirmation email."
              "E.g. instructions for customers to follow.")
 
@@ -122,7 +122,7 @@ class DeliveryCarrier(models.Model):
     def _check_tags(self):
         for carrier in self:
             if carrier.must_have_tag_ids & carrier.excluded_tag_ids:
-                raise UserError(_("Carrier %s cannot have the same tag in both Must Have Tags and Excluded Tags.") % carrier.name)
+                raise UserError(_("Delivery method %(name)s cannot have the same tag in both Must Have Tags and Excluded Tags."), name=carrier.name)
 
     def _compute_weight_uom_name(self):
         self.weight_uom_name = self.env['product.template']._get_weight_uom_name_from_ir_config_parameter()
@@ -286,7 +286,7 @@ def copy_data(self, default=None):
     def _get_delivery_type(self):
         """Return the delivery type.
 
-        This method needs to be overridden by a delivery carrier module if the delivery type is not
+        This method needs to be overridden by a delivery method module if the delivery type is not
         stored on the field `delivery_type`.
         """
         self.ensure_one()
diff --git a/addons/delivery/models/product_category.py b/addons/delivery/models/product_category.py
index af24b70978072..cff4c7ac3ff3f 100644
--- a/addons/delivery/models/product_category.py
+++ b/addons/delivery/models/product_category.py
@@ -11,4 +11,4 @@ class ProductCategory(models.Model):
     def _unlink_except_delivery_category(self):
         delivery_category = self.env.ref('delivery.product_category_deliveries', raise_if_not_found=False)
         if delivery_category and delivery_category in self:
-            raise UserError(_("You cannot delete the deliveries product category as it is used on the delivery carriers products."))
+            raise UserError(_("You cannot delete this product category as it is used on the products linked to delivery methods."))
diff --git a/addons/delivery/security/ir_rules.xml b/addons/delivery/security/ir_rules.xml
index 4ca4618dd1cc4..a4bf21578e214 100644
--- a/addons/delivery/security/ir_rules.xml
+++ b/addons/delivery/security/ir_rules.xml
@@ -2,7 +2,7 @@
 <odoo noupdate="1">
 
     <record model="ir.rule" id="delivery_carrier_comp_rule">
-        <field name="name">Delivery Carrier multi-company</field>
+        <field name="name">Delivery Method multi-company</field>
         <field name="model_id" ref="model_delivery_carrier"/>
         <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
diff --git a/addons/delivery/tests/test_delivery_availability.py b/addons/delivery/tests/test_delivery_availability.py
index f04a64cc1b8a5..52746817d3f16 100644
--- a/addons/delivery/tests/test_delivery_availability.py
+++ b/addons/delivery/tests/test_delivery_availability.py
@@ -111,7 +111,7 @@ def test_04_check_must_have_tag(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier must have tag is not set on any product in the order")
+        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's must have tag is not set on any product in the order")
 
         self.product.write({
             'product_tag_ids': [self.must_have_tag.id],
@@ -124,7 +124,7 @@ def test_04_check_must_have_tag(self):
         self.assertIn(
             self.carrier,
             choose_delivery_carrier.available_carrier_ids,
-            "Carrier should be available if at least one must-have tag is present in the products",
+            "Delivery method should be available if at least one must-have tag is present in the products",
         )
 
     def test_05_check_excluded_tag(self):
@@ -137,7 +137,7 @@ def test_05_check_excluded_tag(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertTrue(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier excluded tag is not set on any product in the order")
+        self.assertTrue(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's excluded tag is not set on any product in the order")
 
         self.product.write({
             'product_tag_ids': [self.exclude_tag.id],
@@ -147,7 +147,7 @@ def test_05_check_excluded_tag(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier excluded tag is set on one product in the order")
+        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's excluded tag is set on one product in the order")
 
     def test_06_check_tags_complex(self):
         self.carrier.write({
@@ -160,7 +160,7 @@ def test_06_check_tags_complex(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier must have tag is not set on any product in the order")
+        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's must have tag is not set on any product in the order")
 
         self.product.write({
             'product_tag_ids': [self.must_have_tag.id],
@@ -170,7 +170,7 @@ def test_06_check_tags_complex(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertTrue(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier must have tag is set on one product in the order")
+        self.assertTrue(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's must have tag is set on one product in the order")
 
         self.product.write({
             'product_tag_ids': [self.exclude_tag.id, self.must_have_tag.id],
@@ -180,7 +180,7 @@ def test_06_check_tags_complex(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier excluded tag is set on one product in the order")
+        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's excluded tag is set on one product in the order")
 
         self.product.write({
             'product_tag_ids': [self.must_have_tag.id],
@@ -193,4 +193,4 @@ def test_06_check_tags_complex(self):
             'default_carrier_id': self.non_restricted_carrier.id,
         }))
         choose_delivery_carrier = delivery_wizard.save()
-        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Carrier excluded tag is set on one product in the order")
+        self.assertFalse(self.carrier.id in choose_delivery_carrier.available_carrier_ids.ids, "Delivery method's excluded tag is set on one product in the order")
diff --git a/addons/delivery/tests/test_delivery_cost.py b/addons/delivery/tests/test_delivery_cost.py
index e496a85b0187b..08555ec4565d6 100644
--- a/addons/delivery/tests/test_delivery_cost.py
+++ b/addons/delivery/tests/test_delivery_cost.py
@@ -274,7 +274,7 @@ def test_01_taxes_on_delivery_cost(self):
     def test_estimated_weight(self):
         """
         Test that negative qty SO lines are not included in the estimated weight calculation
-        of delivery carriers (since it's used when calculating their rates).
+        of delivery method (since it's used when calculating their rates).
         """
         sale_order = self.env['sale.order'].create({
             'partner_id': self.partner.id,
diff --git a/addons/delivery/views/delivery_carrier_views.xml b/addons/delivery/views/delivery_carrier_views.xml
index 69b59930ac8ae..657c173956253 100644
--- a/addons/delivery/views/delivery_carrier_views.xml
+++ b/addons/delivery/views/delivery_carrier_views.xml
@@ -5,7 +5,7 @@
         <field name="name">delivery.carrier.list</field>
         <field name="model">delivery.carrier</field>
         <field name="arch" type="xml">
-            <list string="Carrier">
+            <list string="Delivery Method">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>
                 <field name="delivery_type"/>
@@ -23,8 +23,8 @@
         <field name="name">delivery.carrier.search</field>
         <field name="model">delivery.carrier</field>
         <field name="arch" type="xml">
-            <search string="Delivery Carrier">
-                <field name="name" string="Carrier" />
+            <search string="Delivery Method">
+                <field name="name" string="Delivery Method" />
                 <field name="delivery_type"/>
                 <separator/>
                 <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
@@ -39,7 +39,7 @@
         <field name="name">delivery.carrier.form</field>
         <field name="model">delivery.carrier</field>
         <field name="arch" type="xml">
-            <form string="Carrier">
+            <form string="Delivery Method">
                 <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button name="toggle_prod_environment"
diff --git a/addons/delivery/views/delivery_zip_prefix_views.xml b/addons/delivery/views/delivery_zip_prefix_views.xml
index 2f9a01d5a8d08..df1cfa52bfe23 100644
--- a/addons/delivery/views/delivery_zip_prefix_views.xml
+++ b/addons/delivery/views/delivery_zip_prefix_views.xml
@@ -10,7 +10,7 @@
             <p class="o_view_nocontent_smiling_face">
             Manage delivery zip prefixes
             </p><p>
-            Delivery zip prefixes are assigned to delivery carriers to restrict
+            Delivery zip prefixes are assigned to delivery methods to restrict
             which zips it is available to.
             </p>
         </field>
diff --git a/addons/delivery/wizard/choose_delivery_carrier.py b/addons/delivery/wizard/choose_delivery_carrier.py
index ed4dc829f102c..a49ef08c8707b 100644
--- a/addons/delivery/wizard/choose_delivery_carrier.py
+++ b/addons/delivery/wizard/choose_delivery_carrier.py
@@ -6,7 +6,7 @@
 
 class ChooseDeliveryCarrier(models.TransientModel):
     _name = 'choose.delivery.carrier'
-    _description = 'Delivery Carrier Selection Wizard'
+    _description = 'Delivery Method Selection Wizard'
 
     def _get_default_weight_uom(self):
         return self.env['product.template']._get_weight_uom_name_from_ir_config_parameter()
diff --git a/addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py b/addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py
index b643b3781751c..8d96e35de4aa4 100644
--- a/addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py
+++ b/addons/sale_loyalty_delivery/tests/test_loyalty_delivery.py
@@ -94,7 +94,7 @@ def test_delivery_cost_gift_card(self):
 
     def test_free_delivery_cost_with_ewallet(self):
         """
-        Automatic free shipping of a delivery carrier should not be affected by the
+        Automatic free shipping of a delivery method should not be affected by the
         use of an ewallet when paying.
         Paying for an order of value 200 with an ewallet should still trigger the
         free shipping of the selected carrier if the free shipping is for amounts
diff --git a/addons/stock_delivery/views/report_shipping.xml b/addons/stock_delivery/views/report_shipping.xml
index be884edbe4b10..ee424b3497f28 100644
--- a/addons/stock_delivery/views/report_shipping.xml
+++ b/addons/stock_delivery/views/report_shipping.xml
@@ -12,10 +12,6 @@
                 <span t-field="o.shipping_weight"/>
                 <span t-field="o.weight_uom_name"/>
             </div>
-            <div t-if="o.carrier_id" class="col" name="div_shipping_method">
-                <strong>Delivery Method:</strong>
-                <p t-field="o.carrier_id">FedEx</p>
-            </div>
         </xpath>
     </template>
 </odoo>
diff --git a/addons/website_sale/static/src/interactions/payment_button.js b/addons/website_sale/static/src/interactions/payment_button.js
index 6b176e785b925..d110e29734aec 100644
--- a/addons/website_sale/static/src/interactions/payment_button.js
+++ b/addons/website_sale/static/src/interactions/payment_button.js
@@ -7,7 +7,7 @@ patch(PaymentButton.prototype, {
      * Verify that the payment button is ready to be enabled.
      *
      * The conditions are that:
-     * - a delivery carrier is selected and ready (the price is computed) if deliveries are enabled;
+     * - a delivery method is selected and ready (the price is computed) if deliveries are enabled;
      * - the "Terms and Conditions" checkbox is ticked if it is present.
      *
      * @override method from @payment/interactions/payment_button
diff --git a/addons/website_sale/tests/test_delivery_controller.py b/addons/website_sale/tests/test_delivery_controller.py
index 932a8a21bb78d..d9748c7bd4846 100644
--- a/addons/website_sale/tests/test_delivery_controller.py
+++ b/addons/website_sale/tests/test_delivery_controller.py
@@ -15,7 +15,7 @@ def setUp(self):
         super().setUp()
         self.Controller = Delivery()
 
-    # test that changing the carrier while there is a pending transaction raises an error
+    # test that changing the delivery method while there is a pending transaction raises an error
     def test_controller_change_carrier_when_transaction(self):
         website = self.website.with_env(self.env)
         self.empty_cart.transaction_ids = self._create_transaction(flow='redirect', state='pending')
@@ -23,7 +23,7 @@ def test_controller_change_carrier_when_transaction(self):
             request.cart = self.empty_cart
             self.Controller.shop_set_delivery_method(dm_id='1')
 
-    # test that changing the carrier while there is a draft transaction doesn't raise an error
+    # test that changing the delivery method while there is a draft transaction doesn't raise an error
     def test_controller_change_carrier_when_draft_transaction(self):
         website = self.website.with_env(self.env)
         self.empty_cart.transaction_ids = self._create_transaction(flow='redirect', state='draft')
diff --git a/addons/website_sale_mondialrelay/controllers/controllers.py b/addons/website_sale_mondialrelay/controllers/controllers.py
index 60b508f031623..cc6f10f5f6629 100644
--- a/addons/website_sale_mondialrelay/controllers/controllers.py
+++ b/addons/website_sale_mondialrelay/controllers/controllers.py
@@ -19,7 +19,7 @@ def mondial_relay_update_shipping(self, **data):
 
         if order_sudo.carrier_id.country_ids:
             country_is_allowed = data['Pays'][:2].upper() in order_sudo.carrier_id.country_ids.mapped(lambda c: c.code.upper())
-            assert country_is_allowed, _("%s is not allowed for this delivery carrier.", data['Pays'])
+            assert country_is_allowed, _("%s is not allowed for this delivery method.", data['Pays'])
 
         partner_shipping = order_sudo.partner_id.sudo()._mondialrelay_search_or_create({
             'id': data['ID'],

From e4e3b2bc711c44d73ad4a8fc205c766f44321254 Mon Sep 17 00:00:00 2001
From: "Louis Wicket (wil)" <wil@odoo.com>
Date: Thu, 13 Nov 2025 10:24:02 +0100
Subject: [PATCH 562/673] [IMP] web, tools: enable {standard,or}-narrow style
 for format_list

Add the missing standard-narrow and or-narrow styles to the list of
format_list accepted options.

closes odoo/odoo#235454

Signed-off-by: Vincent Larcin (vila) <vila@odoo.com>
---
 .../static/src/core/l10n/utils/format_list.js | 22 +++++++++++++++----
 addons/web/static/tests/l10n/utils.test.js    |  5 +++++
 odoo/addons/base/tests/test_i18n.py           |  6 +++--
 odoo/tools/i18n.py                            | 12 +++++++---
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/core/l10n/utils/format_list.js b/addons/web/static/src/core/l10n/utils/format_list.js
index bd913c974a5c9..76809151df811 100644
--- a/addons/web/static/src/core/l10n/utils/format_list.js
+++ b/addons/web/static/src/core/l10n/utils/format_list.js
@@ -1,7 +1,7 @@
 import { user } from "@web/core/user";
 
 /**
- * Convert Unicode TR35-49 list pattern types to ES Intl.ListFormat options
+ * Maps Unicode UTS-35 list pattern types to Intl.ListFormat options
  */
 const LIST_STYLES = {
     standard: {
@@ -12,6 +12,10 @@ const LIST_STYLES = {
         type: "conjunction",
         style: "short",
     },
+    "standard-narrow": {
+        type: "conjunction",
+        style: "narrow",
+    },
     or: {
         type: "disjunction",
         style: "long",
@@ -20,6 +24,10 @@ const LIST_STYLES = {
         type: "disjunction",
         style: "short",
     },
+    "or-narrow": {
+        type: "disjunction",
+        style: "narrow",
+    },
     unit: {
         type: "unit",
         style: "long",
@@ -37,19 +45,25 @@ const LIST_STYLES = {
 /**
  * Format the items in `list` as a list in a locale-dependent manner with the chosen style.
  *
- * The available styles are defined in the Unicode TR35-49 spec:
+ * The available styles are defined in the Unicode Technical Standard 35:
  * * standard:
  *   A typical "and" list for arbitrary placeholders.
  *   e.g. "January, February, and March"
  * * standard-short:
  *   A short version of an "and" list, suitable for use with short or abbreviated placeholder values.
  *   e.g. "Jan., Feb., and Mar."
+ * * standard-narrow:
+ *   A yet shorter version of a short 'and' list (where possible)
+ *   e.g. "Jan., Feb., Mar."
  * * or:
  *   A typical "or" list for arbitrary placeholders.
  *   e.g. "January, February, or March"
  * * or-short:
  *   A short version of an "or" list.
  *   e.g. "Jan., Feb., or Mar."
+ *   or-narrow:
+ *   A yet shorter version of a short 'or' list (where possible)
+ *   e.g. "Jan., Feb., or Mar."
  * * unit:
  *   A list suitable for wide units.
  *   e.g. "3 feet, 7 inches"
@@ -60,12 +74,12 @@ const LIST_STYLES = {
  *   A list suitable for narrow units, where space on the screen is very limited.
  *   e.g. "3′ 7″"
  *
- * See https://www.unicode.org/reports/tr35/tr35-49/tr35-general.html#ListPatterns for more details.
+ * See https://www.unicode.org/reports/tr35/tr35-general.html#ListPatterns for more details.
  *
  * @param {string[]} list The array of values to format into a list.
  * @param {Object} [param0]
  * @param {string} [param0.localeCode] The locale to use (e.g. en-US).
- * @param {"standard"|"standard-short"|"or"|"or-short"|"unit"|"unit-short"|"unit-narrow"} [param0.style="standard"] The style to format the list with.
+ * @param {"standard"|"standard-short"|"standard-narrow"|"or"|"or-short"|"or-narrow"|"unit"|"unit-short"|"unit-narrow"} [param0.style="standard"] The style to format the list with.
  * @returns {string} The formatted list.
  */
 export function formatList(list, { localeCode = "", style = "standard" } = {}) {
diff --git a/addons/web/static/tests/l10n/utils.test.js b/addons/web/static/tests/l10n/utils.test.js
index af88fd0c956d9..741f57fbab585 100644
--- a/addons/web/static/tests/l10n/utils.test.js
+++ b/addons/web/static/tests/l10n/utils.test.js
@@ -30,6 +30,11 @@ describe("formatList", () => {
         expect(formatList(list, { style: "or" })).toBe("A, B, or C");
     });
 
+    test("supports “narrow” style with “standard” type", () => {
+        const list = ["Veni", "vidi", "vici"];
+        expect(formatList(list, { style: "standard-narrow" })).toBe("Veni, vidi, vici");
+    });
+
     test("uses the specified locale", () => {
         const list = ["A", "B", "C"];
         expect(formatList(list, { localeCode: "fr-FR" })).toBe("A, B et C");
diff --git a/odoo/addons/base/tests/test_i18n.py b/odoo/addons/base/tests/test_i18n.py
index fd8cf055d8b64..cbbcfac2dd998 100644
--- a/odoo/addons/base/tests/test_i18n.py
+++ b/odoo/addons/base/tests/test_i18n.py
@@ -1,8 +1,7 @@
-from odoo.tests import tagged, TransactionCase
+from odoo.tests import TransactionCase
 from odoo.tools import format_list, py_to_js_locale
 
 
-@tagged('at_install', '-post_install')  # LEGACY at_install
 class I18nTest(TransactionCase):
     def test_format_list(self):
         lang = self.env["res.lang"]
@@ -13,6 +12,9 @@ def test_format_list(self):
         formatted_text = format_list(self.env, ["To be", "Not to be"], "or")
         self.assertEqual(formatted_text, "To be or Not to be", "Should take the style into account.")
 
+        formatted_text = format_list(self.env, ["Veni", "vidi", "vici"], "standard-narrow")
+        self.assertEqual(formatted_text, "Veni, vidi, vici", "Should support “narrow” style with “standard” type.")
+
         lang._activate_lang("fr_FR")
 
         formatted_text = format_list(lang.with_context(lang="fr_FR").env, ["Athos", "Porthos", "Aramis"])
diff --git a/odoo/tools/i18n.py b/odoo/tools/i18n.py
index 08aa91e120c90..28b61fb98d746 100644
--- a/odoo/tools/i18n.py
+++ b/odoo/tools/i18n.py
@@ -25,25 +25,31 @@
 def format_list(
     env: odoo.api.Environment,
     lst: Iterable,
-    style: Literal["standard", "standard-short", "or", "or-short", "unit", "unit-short", "unit-narrow"] = "standard",
+    style: Literal["standard", "standard-short", "standard-narrow", "or", "or-short", "or-narrow", "unit", "unit-short", "unit-narrow"] = "standard",
     lang_code: str | None = None,
 ) -> str:
     """
     Format the items in `lst` as a list in a locale-dependent manner with the chosen style.
 
-    The available styles are defined by babel according to the Unicode TR35-49 spec:
+    The available styles are defined by babel according to the Unicode Technical Standard #35:
     * standard:
       A typical 'and' list for arbitrary placeholders.
       e.g. "January, February, and March"
     * standard-short:
       A short version of an 'and' list, suitable for use with short or abbreviated placeholder values.
       e.g. "Jan., Feb., and Mar."
+    * standard-narrow:
+      A yet shorter version of a short 'and' list (where possible).
+      e.g. "Jan., Feb., Mar."
     * or:
       A typical 'or' list for arbitrary placeholders.
       e.g. "January, February, or March"
     * or-short:
       A short version of an 'or' list.
       e.g. "Jan., Feb., or Mar."
+    * or-narrow:
+      A yet shorter version of a short 'or' list (where possible).
+      e.g. "Jan., Feb., or Mar."
     * unit:
       A list suitable for wide units.
       e.g. "3 feet, 7 inches"
@@ -54,7 +60,7 @@ def format_list(
       A list suitable for narrow units, where space on the screen is very limited.
       e.g. "3′ 7″"
 
-    See https://www.unicode.org/reports/tr35/tr35-49/tr35-general.html#ListPatterns for more details.
+    See https://www.unicode.org/reports/tr35/tr35-general.html#ListPatterns for more details.
 
     :param env: the current environment.
     :param lst: the iterable of items to format into a list.

From cba671dfb30de10a805785c43505e3445425b962 Mon Sep 17 00:00:00 2001
From: Abdo Mongy <abmn@odoo.com>
Date: Thu, 13 Nov 2025 11:00:48 +0100
Subject: [PATCH 563/673] [IMP] base: Currency Rates Fetching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currency rates are valid for the next day and should not change during the day.

Use only rates strictly earlier than the requested date

task-5173684

closes odoo/odoo#231948

Related: odoo/enterprise#97967
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/models/res_currency.py         | 20 ++++-----
 addons/account/tests/common.py                |  6 +--
 .../tests/test_account_bank_statement.py      |  4 +-
 .../tests/test_account_move_out_invoice.py    |  8 ++--
 .../test_account_move_payments_widget.py      |  2 +-
 .../tests/test_account_move_reconcile.py      | 40 +++++++++---------
 .../tests/test_account_payment_register.py    |  2 +-
 .../tests/test_duplicate_res_partner_bank.py  |  3 +-
 addons/account/tests/test_invoice_taxes.py    |  6 +--
 addons/hr_expense/tests/test_expenses.py      |  2 +-
 .../tests/test_withholding_ar_ri.py           |  2 +-
 addons/l10n_eg_edi_eta/tests/common.py        |  2 +-
 addons/l10n_es_edi_tbai/tests/test_edi_xml.py |  4 +-
 addons/l10n_hu_edi/tests/common.py            |  4 +-
 addons/l10n_hu_edi/tests/test_flows_mocked.py |  4 +-
 addons/l10n_it_edi/tests/test_edi_export.py   |  2 +-
 .../l10n_ph/tests/test_bir_2307_generation.py |  2 +-
 .../tests/test_subcontracting_account.py      |  3 +-
 addons/point_of_sale/tests/common.py          |  2 +-
 .../product/tests/test_product_pricelist.py   |  6 +--
 .../tests/test_project_profitability.py       |  4 +-
 .../tests/test_purchase_downpayment.py        |  2 +-
 .../tests/test_purchase_product_catalog.py    |  2 +-
 .../tests/test_anglo_saxon_valuation.py       |  6 +--
 .../tests/test_purchase_requisition.py        |  4 +-
 ...st_anglo_saxon_valuation_reconciliation.py |  6 +--
 .../tests/test_purchase_order.py              |  6 +--
 .../tests/test_stockvaluation.py              |  5 +--
 addons/sale/tests/common.py                   |  2 +-
 addons/sale/tests/test_sale_prices.py         |  6 +--
 addons/sale/tests/test_sale_report.py         | 41 +++++++++++--------
 .../tests/test_sale_stock_margin.py           |  4 +-
 addons/spreadsheet/tests/test_currency.py     |  3 +-
 .../spreadsheet/tests/test_currency_rate.py   | 15 +++++--
 .../tests/test_stockvaluationlayer.py         |  4 +-
 addons/website_sale/tests/common_gmc.py       |  6 +--
 odoo/addons/base/models/res_currency.py       |  3 +-
 odoo/addons/base/tests/test_res_currency.py   | 10 ++---
 .../tests/test_read_group_formatted.py        | 16 ++++----
 39 files changed, 137 insertions(+), 132 deletions(-)

diff --git a/addons/account/models/res_currency.py b/addons/account/models/res_currency.py
index 19cdfb101df97..1bcbdfe4976c3 100644
--- a/addons/account/models/res_currency.py
+++ b/addons/account/models/res_currency.py
@@ -176,7 +176,7 @@ def _get_table_builder_current(self, period_key, main_company, other_companies,
                 FROM res_company other_company
                 LEFT JOIN res_currency_rate rate
                     ON rate.currency_id = other_company.currency_id
-                    AND rate.name <= %(date_to)s
+                    AND rate.name < %(date_to)s
                     AND rate.company_id = %(main_company_id)s
                 WHERE
                     other_company.id IN %(other_company_ids)s
@@ -205,14 +205,14 @@ def _get_table_builder_historical(self, main_company, other_companies, date_to,
                 WHERE
                     other_company.id IN %(other_company_ids)s
                     AND rate.company_id = %(main_company_id)s
-                    AND rate.name <= %(date_to)s
+                    AND rate.name < %(date_to)s
                     %(exclusion_condition)s
             """,
             main_company_id=main_company.root_id.id,
             other_company_ids=tuple(other_companies.ids),
             main_company_unit_factor=main_company_unit_factor,
             date_to=date_to,
-            exclusion_condition=SQL("AND rate.name > %(date_exclude)s", date_exclude=date_exclude) if date_exclude else SQL(),
+            exclusion_condition=SQL("AND rate.name >= %(date_exclude)s", date_exclude=date_exclude) if date_exclude else SQL(),
         )
 
     def _get_table_builder_average(self, period_key, main_company, other_companies, date_from, date_to, main_company_unit_factor) -> SQL:
@@ -236,15 +236,15 @@ def _get_table_builder_average(self, period_key, main_company, other_companies,
                         EXTRACT (
                             'Day' FROM COALESCE(
                                 LEAD(rate.name, 1) OVER (PARTITION BY other_company.id, rate.currency_id ORDER BY rate.name ASC)::TIMESTAMP,
-                                %(date_to)s::TIMESTAMP + INTERVAL '1' DAY
+                                %(date_to)s::TIMESTAMP
                             ) - rate.name::TIMESTAMP
                         ) AS number_of_days
                     FROM res_company other_company
                     JOIN res_currency_rate rate
                         ON rate.currency_id = other_company.currency_id
                     WHERE
-                    rate.name <= %(date_to)s
-                    AND rate.name >= %(date_from)s
+                    rate.name < %(date_to)s
+                    AND rate.name >= DATE %(date_from)s - INTERVAL '1 day'
                     AND other_company.id IN %(other_company_ids)s
                     AND rate.company_id = %(main_company_id)s
 
@@ -254,20 +254,20 @@ def _get_table_builder_average(self, period_key, main_company, other_companies,
                         SELECT DISTINCT ON (other_company.id)
                             other_company.id as other_company_id,
                             COALESCE(out_period_rate.rate, 1.0) AS rate,
-                            EXTRACT('Day' FROM COALESCE(in_period_rate.name::TIMESTAMP, %(date_to)s::TIMESTAMP + INTERVAL '1' DAY) - %(date_from)s::TIMESTAMP) AS number_of_days
+                            EXTRACT('Day' FROM COALESCE(in_period_rate.name::TIMESTAMP, %(date_to)s::TIMESTAMP) - %(date_from)s::TIMESTAMP + INTERVAL '1 day') AS number_of_days
 
                         FROM res_company other_company
 
                         LEFT JOIN res_currency_rate in_period_rate
                             ON in_period_rate.currency_id = other_company.currency_id
-                            AND in_period_rate.name <= %(date_to)s
-                            AND in_period_rate.name >= %(date_from)s
+                            AND in_period_rate.name < %(date_to)s
+                            AND in_period_rate.name >= DATE %(date_from)s - INTERVAL '1 day'
                             AND in_period_rate.company_id = %(main_company_id)s
 
                         LEFT JOIN res_currency_rate out_period_rate
                             ON out_period_rate.currency_id = other_company.currency_id
                             AND out_period_rate.company_id = %(main_company_id)s
-                            AND out_period_rate.name < %(date_from)s
+                            AND out_period_rate.name < DATE %(date_from)s - INTERVAL '1 day'
 
                         WHERE
                         other_company.id IN %(other_company_ids)s
diff --git a/addons/account/tests/common.py b/addons/account/tests/common.py
index 3c29d780cdca2..bdf017d5dda2e 100644
--- a/addons/account/tests/common.py
+++ b/addons/account/tests/common.py
@@ -281,8 +281,8 @@ def setup_other_currency(cls, code, **kwargs):
         if 'rates' not in kwargs:
             return super().setup_other_currency(code, rates=[
                 ('1900-01-01', 1.0),
-                ('2016-01-01', 3.0),
-                ('2017-01-01', 2.0),
+                ('2015-12-31', 3.0),
+                ('2016-12-31', 2.0),
             ], **kwargs)
         return super().setup_other_currency(code, **kwargs)
 
@@ -1270,7 +1270,7 @@ def convert_base_line_to_invoice_line(self, document, base_line):
     def convert_document_to_invoice(self, document):
         invoice_date = '2020-01-01'
         currency = document['currency']
-        self._ensure_rate(currency, invoice_date, document['rate'])
+        self._ensure_rate(currency, '2019-12-31', document['rate'])
         invoice = self.env['account.move'].create({
             'move_type': 'out_invoice',
             'invoice_date': invoice_date,
diff --git a/addons/account/tests/test_account_bank_statement.py b/addons/account/tests/test_account_bank_statement.py
index 08f3d8edcf78e..72c1af969d73f 100644
--- a/addons/account/tests/test_account_bank_statement.py
+++ b/addons/account/tests/test_account_bank_statement.py
@@ -16,8 +16,8 @@ def setUpClass(cls):
         cls.currency_1 = cls.company_data['currency']
         # We need a third currency as you could have a company's currency != journal's currency !=
         cls.currency_2 = cls.setup_other_currency('EUR')
-        cls.currency_3 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)])
-        cls.currency_4 = cls.setup_other_currency('GBP', rates=[('2016-01-01', 12.0), ('2017-01-01', 8.0)])
+        cls.currency_3 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 6.0), ('2016-12-31', 4.0)])
+        cls.currency_4 = cls.setup_other_currency('GBP', rates=[('2015-12-31', 12.0), ('2016-12-31', 8.0)])
 
         cls.company_data_2 = cls.setup_other_company()
 
diff --git a/addons/account/tests/test_account_move_out_invoice.py b/addons/account/tests/test_account_move_out_invoice.py
index 5eab77ef8d193..c4e4a0a8d5516 100644
--- a/addons/account/tests/test_account_move_out_invoice.py
+++ b/addons/account/tests/test_account_move_out_invoice.py
@@ -4356,8 +4356,8 @@ def invoice(date):
             )
 
         currency = self.setup_other_currency('EUR', rates=[
-            ('2016-01-01', 3.0),
-            ('2017-01-01', 2.0),
+            ('2015-12-31', 3.0),
+            ('2016-12-31', 2.0),
         ])
         self.assertRecordValues(invoice('2015-01-01'), [{
             'amount_total': 1000.0,
@@ -4681,8 +4681,8 @@ def test_out_invoice_tax_tags(self):
 
     def test_lines_recomputation_after_currency_rate_change(self):
         currency = self.setup_other_currency('EUR', rates=[
-            ('2025-01-01', 0.5),
-            ('2025-02-01', 0.4),
+            ('2024-12-31', 0.5),
+            ('2025-01-31', 0.4),
         ])
 
         with Form(self.env['account.move'].with_context(default_move_type='out_invoice')) as move_form:
diff --git a/addons/account/tests/test_account_move_payments_widget.py b/addons/account/tests/test_account_move_payments_widget.py
index c1b932cda173c..e434ef0b169a6 100644
--- a/addons/account/tests/test_account_move_payments_widget.py
+++ b/addons/account/tests/test_account_move_payments_widget.py
@@ -16,7 +16,7 @@ def setUpClass(cls):
 
         cls.curr_1 = cls.company_data['currency']
         cls.curr_2 = cls.setup_other_currency('EUR')
-        cls.curr_3 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)])
+        cls.curr_3 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 6.0), ('2016-12-31', 4.0)])
 
         cls.payment_2016_curr_1 = cls.env['account.move'].create({
             'date': '2016-01-01',
diff --git a/addons/account/tests/test_account_move_reconcile.py b/addons/account/tests/test_account_move_reconcile.py
index cb415fb07505b..e0f8c67f690bf 100644
--- a/addons/account/tests/test_account_move_reconcile.py
+++ b/addons/account/tests/test_account_move_reconcile.py
@@ -35,8 +35,8 @@ def setUpClass(cls):
 
         # ==== Multi-currency setup ====
         cls.other_currency = cls.setup_other_currency('EUR', rounding=0.001)
-        cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)])
-        cls.other_currency_3 = cls.setup_other_currency('XAF', rates=[('2016-01-01', 0.0001), ('2017-01-01', 0.00001)])
+        cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 6.0), ('2016-12-31', 4.0)])
+        cls.other_currency_3 = cls.setup_other_currency('XAF', rates=[('2015-12-31', 0.0001), ('2016-12-31', 0.00001)])
 
         # ==== Cash Basis Taxes setup ====
 
@@ -1852,7 +1852,7 @@ def test_reconcile_foreign_currency_rounding_issue(self):
             'symbol': '🍞',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2019-06-01', 'rate': 0.052972554919}),
+                Command.create({'name': '2019-05-31', 'rate': 0.052972554919}),
             ],
         })
 
@@ -1949,7 +1949,7 @@ def test_reconcile_partial_exchange_rounding_issue(self):
             'symbol': '🍞',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2019-06-01', 'rate': 0.052972554919}),
+                Command.create({'name': '2019-05-31', 'rate': 0.052972554919}),
             ],
         })
 
@@ -2023,7 +2023,7 @@ def test_full_reconcile_foreign_currency_rounding_difference_credit_larger(self)
             'symbol': '🍞',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2019-06-01', 'rate': 0.648587}),
+                Command.create({'name': '2019-05-31', 'rate': 0.648587}),
             ],
         })
 
@@ -2084,7 +2084,7 @@ def test_full_reconcile_foreign_currency_rounding_difference_debit_larger(self):
             'symbol': '🍞',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2019-06-01', 'rate': 0.648587}),
+                Command.create({'name': '2019-05-31', 'rate': 0.648587}),
             ],
         })
 
@@ -2142,11 +2142,11 @@ def test_reconcile_special_mexican_workflow_1(self):
             'symbol': '🍣',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2019-09-24', 'rate': 0.050800000000}),
-                Command.create({'name': '2019-06-28', 'rate': 0.052235000000}),
-                Command.create({'name': '2019-06-24', 'rate': 0.052686000000}),
-                Command.create({'name': '2019-06-20', 'rate': 0.052353000000}),
-                Command.create({'name': '2019-06-12', 'rate': 0.052072000000}),
+                Command.create({'name': '2019-09-23', 'rate': 0.050800000000}),
+                Command.create({'name': '2019-06-27', 'rate': 0.052235000000}),
+                Command.create({'name': '2019-06-23', 'rate': 0.052686000000}),
+                Command.create({'name': '2019-06-19', 'rate': 0.052353000000}),
+                Command.create({'name': '2019-06-11', 'rate': 0.052072000000}),
             ],
         })
 
@@ -2443,11 +2443,11 @@ def test_reconcile_special_mexican_workflow_2(self):
             'symbol': '🍣',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2019-09-24', 'rate': 0.050800000000}),
-                Command.create({'name': '2019-06-28', 'rate': 0.052235000000}),
-                Command.create({'name': '2019-06-24', 'rate': 0.052686000000}),
-                Command.create({'name': '2019-06-20', 'rate': 0.052353000000}),
-                Command.create({'name': '2019-06-12', 'rate': 0.052072000000}),
+                Command.create({'name': '2019-09-23', 'rate': 0.050800000000}),
+                Command.create({'name': '2019-06-27', 'rate': 0.052235000000}),
+                Command.create({'name': '2019-06-23', 'rate': 0.052686000000}),
+                Command.create({'name': '2019-06-19', 'rate': 0.052353000000}),
+                Command.create({'name': '2019-06-11', 'rate': 0.052072000000}),
             ],
         })
 
@@ -2815,7 +2815,7 @@ def test_migration_to_new_reconciliation_multiple_currencies_fix_residual_with_w
         ])
 
     def test_reconcile_rounding_issue(self):
-        currency = self.setup_other_currency('CHF', rates=[('2016-01-01', 1 / 1.5289), ('2017-01-01', 1 / 1.5289)])
+        currency = self.setup_other_currency('CHF', rates=[('2015-12-31', 1 / 1.5289), ('2016-12-31', 1 / 1.5289)])
 
         # Create an invoice 26.45 XXX = 40.43 USD
         invoice = self.env['account.move'].create({
@@ -3787,7 +3787,7 @@ def test_reconcile_cash_basis_exchange_difference_transfer_account_check_entries
         account is not a reconcile one.
         '''
         self.env.company.tax_exigibility = True
-        currency_id = self.setup_other_currency('CHF', rates=[('2016-01-01', 0.5), ('2017-01-01', 0.66666666666666)]).id
+        currency_id = self.setup_other_currency('CHF', rates=[('2015-12-31', 0.5), ('2016-12-31', 0.66666666666666)]).id
 
         # Rate 2/1 in 2016.
         caba_inv = self.env['account.move'].with_context(skip_invoice_sync=True).create({
@@ -3862,7 +3862,7 @@ def test_reconcile_cash_basis_exchange_difference_transfer_account_check_entries
         account is not a reconcile one.
         '''
         self.env.company.tax_exigibility = True
-        currency_id = self.setup_other_currency('CHF', rates=[('2016-01-01', 0.5), ('2017-01-01', 0.66666666666666)]).id
+        currency_id = self.setup_other_currency('CHF', rates=[('2015-12-31', 0.5), ('2016-12-31', 0.66666666666666)]).id
 
         # Rate 2/1 in 2016.
         caba_inv = self.env['account.move'].with_context(skip_invoice_sync=True).create({
@@ -4043,7 +4043,7 @@ def test_reconcile_cash_basis_exchange_difference_transfer_account_check_entries
 
     def test_reconcile_cash_basis_refund_multicurrency(self):
         self.env.company.tax_exigibility = True
-        currency = self.setup_other_currency('CHF', rates=[('2016-01-01', 0.5), ('2017-01-01', 0.33333333333333333)])
+        currency = self.setup_other_currency('CHF', rates=[('2015-12-31', 0.5), ('2016-12-31', 0.33333333333333333)])
 
         invoice = self.env['account.move'].create({
             'move_type': 'out_invoice',
diff --git a/addons/account/tests/test_account_payment_register.py b/addons/account/tests/test_account_payment_register.py
index 47ecc7b700541..0916e7336e44a 100644
--- a/addons/account/tests/test_account_payment_register.py
+++ b/addons/account/tests/test_account_payment_register.py
@@ -26,7 +26,7 @@ def setUpClass(cls):
         cls.current_year = fields.Date.today().year
 
         cls.other_currency = cls.setup_other_currency('EUR')
-        cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 3.0), ('2017-01-01', 0.01)])
+        cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2015-12-31', 3.0), ('2016-12-31', 0.01)])
 
         cls.payment_debit_account_id = cls.copy_account(cls.inbound_payment_method_line.payment_account_id)
         cls.payment_credit_account_id = cls.copy_account(cls.outbound_payment_method_line.payment_account_id)
diff --git a/addons/account/tests/test_duplicate_res_partner_bank.py b/addons/account/tests/test_duplicate_res_partner_bank.py
index a2d0a8f91e41b..598b459f112d5 100644
--- a/addons/account/tests/test_duplicate_res_partner_bank.py
+++ b/addons/account/tests/test_duplicate_res_partner_bank.py
@@ -1,11 +1,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
-from odoo.tests import tagged, Form
+from odoo.tests import Form
 from odoo.addons.base.tests.common import SavepointCaseWithUserDemo
 
 
-@tagged('at_install', '-post_install')  # LEGACY at_install
 class TestDuplicatePartnerBank(SavepointCaseWithUserDemo):
 
     @classmethod
diff --git a/addons/account/tests/test_invoice_taxes.py b/addons/account/tests/test_invoice_taxes.py
index e6716ad62350c..52721f10963c3 100644
--- a/addons/account/tests/test_invoice_taxes.py
+++ b/addons/account/tests/test_invoice_taxes.py
@@ -626,7 +626,7 @@ def test_tax_calculation_foreign_currency_large_quantity(self):
         2.82       | 20000     | 21% not incl
         '''
         self.env['res.currency.rate'].create({
-            'name': '2018-01-01',
+            'name': '2017-12-31',
             'rate': 1.1726,
             'currency_id': self.other_currency.id,
             'company_id': self.env.company.id,
@@ -655,7 +655,7 @@ def test_tax_calculation_foreign_currency_large_quantity(self):
     def test_ensure_no_unbalanced_entry(self):
         ''' Ensure to not create an unbalanced journal entry when saving. '''
         self.env['res.currency.rate'].create({
-            'name': '2018-01-01',
+            'name': '2017-12-31',
             'rate': 0.654065014,
             'currency_id': self.other_currency.id,
             'company_id': self.env.company.id,
@@ -676,7 +676,7 @@ def test_ensure_no_unbalanced_entry(self):
     @freeze_time('2018-01-01')
     def test_tax_calculation_multi_currency(self):
         self.env['res.currency.rate'].create({
-            'name': '2018-01-01',
+            'name': '2017-12-31',
             'rate': 0.273748,
             'currency_id': self.other_currency.id,
             'company_id': self.env.company.id,
diff --git a/addons/hr_expense/tests/test_expenses.py b/addons/hr_expense/tests/test_expenses.py
index 10adc61e31d21..dbd652f383ad6 100644
--- a/addons/hr_expense/tests/test_expenses.py
+++ b/addons/hr_expense/tests/test_expenses.py
@@ -315,7 +315,7 @@ def test_expense_multi_currencies(self):
         Checks that the currency rate is recomputed properly when the total in company currency is set to a new value
         """
         foreign_currency_1 = self.other_currency
-        foreign_currency_2 = self.setup_other_currency('GBP', rounding=0.01, rates=([('2016-01-01', 1 / 1.52)]))
+        foreign_currency_2 = self.setup_other_currency('GBP', rounding=0.01, rates=([('2015-12-31', 1 / 1.52)]))
         foreign_sale_journal = self.company_data['default_journal_sale'].copy()
         foreign_sale_journal.currency_id = foreign_currency_2.id
 
diff --git a/addons/l10n_ar_withholding/tests/test_withholding_ar_ri.py b/addons/l10n_ar_withholding/tests/test_withholding_ar_ri.py
index d1d02f377e68a..da3357e487e43 100644
--- a/addons/l10n_ar_withholding/tests/test_withholding_ar_ri.py
+++ b/addons/l10n_ar_withholding/tests/test_withholding_ar_ri.py
@@ -37,7 +37,7 @@ def setUpClass(cls):
 
         cls.tax_21 = cls.env.ref('account.%s_ri_tax_vat_21_ventas' % cls.env.company.id)
 
-        cls.other_currency = cls.setup_other_currency('USD', rounding=0.001, rates=[('2023-01-01', 0.01), ('2023-05-01', 0.005)])
+        cls.other_currency = cls.setup_other_currency('USD', rounding=0.001, rates=[('2022-12-31', 0.01), ('2023-04-30', 0.005)])
         cls.tax_wth_earnings_incurred_scale_test_5 = cls.env.ref('account.%i_ex_tax_withholding_profits_regimen_110_insc' % cls.env.company.id)
         cls.tax_wth_earnings_incurred_test_6 = cls.env.ref('account.%i_ex_tax_withholding_profits_regimen_35_insc' % cls.env.company.id)
         cls.earnings_withholding_sequence = cls.env['ir.sequence'].create({
diff --git a/addons/l10n_eg_edi_eta/tests/common.py b/addons/l10n_eg_edi_eta/tests/common.py
index 0fc4b8bafb1e8..b8be5188abf70 100644
--- a/addons/l10n_eg_edi_eta/tests/common.py
+++ b/addons/l10n_eg_edi_eta/tests/common.py
@@ -16,7 +16,7 @@ def setUpClass(cls):
 
         cls.frozen_today = datetime(year=2022, month=3, day=15, hour=0, minute=0, second=0, tzinfo=timezone('utc'))
 
-        cls.currency_aed_id = cls.setup_other_currency('AED', rates=[('2022-03-15', 0.198117095128)])
+        cls.currency_aed_id = cls.setup_other_currency('AED', rates=[('2022-03-14', 0.198117095128)])
 
         # Allow to see the full result of AssertionError.
         cls.maxDiff = None
diff --git a/addons/l10n_es_edi_tbai/tests/test_edi_xml.py b/addons/l10n_es_edi_tbai/tests/test_edi_xml.py
index 5a031ca4a599e..457580ae3d564 100644
--- a/addons/l10n_es_edi_tbai/tests/test_edi_xml.py
+++ b/addons/l10n_es_edi_tbai/tests/test_edi_xml.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from datetime import datetime, date
+from datetime import datetime, date, timedelta
 
 from freezegun import freeze_time
 from lxml import etree
@@ -94,7 +94,7 @@ def test_xml_tree_post_multicurrency(self):
         currency_usd.active = True
         date = str(self.out_invoice.invoice_date)
         self.env['res.currency.rate'].create({
-            'name': date,
+            'name': self.out_invoice.invoice_date - timedelta(days=1),
             'company_id': self.company_data['company'].id,
             'currency_id': currency_usd.id,
             'rate': 0.5})
diff --git a/addons/l10n_hu_edi/tests/common.py b/addons/l10n_hu_edi/tests/common.py
index 348cd6ef5b9c4..7a119db4f82ff 100644
--- a/addons/l10n_hu_edi/tests/common.py
+++ b/addons/l10n_hu_edi/tests/common.py
@@ -78,7 +78,7 @@ def setUpClass(cls):
         currency_eur.active = True
         cls.env['res.currency.rate'].create(
             {
-                'name': cls.today,
+                'name': cls.today - datetime.timedelta(days=1),
                 'currency_id': currency_eur.id,
                 'company_id': company.id,
                 'inverse_company_rate': '380.77',
@@ -86,7 +86,7 @@ def setUpClass(cls):
         )
         cls.env['res.currency.rate'].create(
             {
-                'name': cls.today - datetime.timedelta(days=1),
+                'name': cls.today - datetime.timedelta(days=2),
                 'currency_id': currency_eur.id,
                 'company_id': company.id,
                 'inverse_company_rate': '377.66',
diff --git a/addons/l10n_hu_edi/tests/test_flows_mocked.py b/addons/l10n_hu_edi/tests/test_flows_mocked.py
index bb9ff5c537c66..63c8aade18efb 100644
--- a/addons/l10n_hu_edi/tests/test_flows_mocked.py
+++ b/addons/l10n_hu_edi/tests/test_flows_mocked.py
@@ -204,8 +204,8 @@ def test_invoice_line_currency_rate_from_sale(self):
         if self.env['ir.module.module']._get('sale_stock').state == 'installed':
             self.env.user.group_ids += self.env.ref('sales_team.group_sale_salesman')
             currency = self.setup_other_currency('HRK', rates=[
-                ('2016-01-01', 3.0),
-                ('2017-01-01', 2.0),
+                ('2015-12-31', 3.0),
+                ('2016-12-31', 2.0),
             ])
             pricelist = self.env['product.pricelist'].create({
                 'name': 'Foreign pricelist',
diff --git a/addons/l10n_it_edi/tests/test_edi_export.py b/addons/l10n_it_edi/tests/test_edi_export.py
index bec8b8b12f97a..86e03abd2e82c 100644
--- a/addons/l10n_it_edi/tests/test_edi_export.py
+++ b/addons/l10n_it_edi/tests/test_edi_export.py
@@ -391,7 +391,7 @@ def test_export_foreign_currency(self):
         usd = self.env.ref('base.USD')
 
         self.env['res.currency.rate'].create({
-            'name': '2024-08-06',
+            'name': '2024-08-05',
             'rate': 1.0789,
             'currency_id': usd.id,
             'company_id': self.company.id,
diff --git a/addons/l10n_ph/tests/test_bir_2307_generation.py b/addons/l10n_ph/tests/test_bir_2307_generation.py
index c0cfdde2439a3..0687d5e4b1591 100644
--- a/addons/l10n_ph/tests/test_bir_2307_generation.py
+++ b/addons/l10n_ph/tests/test_bir_2307_generation.py
@@ -56,7 +56,7 @@ def setUpClass(cls):
             'is_company': True,
         })
 
-        cls.other_currency = cls.setup_other_currency('EUR', rates=[('2017-01-01', 2)])
+        cls.other_currency = cls.setup_other_currency('EUR', rates=[('2016-12-31', 2)])
 
     def test_bir_2307_company(self):
         """ Test the report """
diff --git a/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py b/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py
index ebd633ceca328..fa5c12c24296e 100644
--- a/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py
+++ b/addons/mrp_subcontracting_account/tests/test_subcontracting_account.py
@@ -1,5 +1,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
 from unittest import skip
 
 from odoo import Command, fields
@@ -594,7 +593,7 @@ def test_02_compute_price_subcontracting_cost(self):
             'rounding': 0.01,
             'currency_unit_label': 'Zenny',
             'rate_ids': [(0, 0, {
-                'name': fields.Date.today(),
+                'name': fields.Date.subtract(fields.Date.today(), days=1),
                 'company_rate': 0.5,
             })],
         })
diff --git a/addons/point_of_sale/tests/common.py b/addons/point_of_sale/tests/common.py
index 8795a45d09058..b6939302d394f 100644
--- a/addons/point_of_sale/tests/common.py
+++ b/addons/point_of_sale/tests/common.py
@@ -510,7 +510,7 @@ def _create_other_currency_config(cls):
         cls.env['res.currency.rate'].create({
             'rate': 0.5,
             'currency_id': cls.other_currency.id,
-            'name': datetime.today().date(),
+            'name': fields.Date.subtract(datetime.today().date(), days=1),
         })
         other_cash_journal = cls.env['account.journal'].create({
             'name': 'Cash Other',
diff --git a/addons/product/tests/test_product_pricelist.py b/addons/product/tests/test_product_pricelist.py
index 568693f862ac4..415c698b08f69 100644
--- a/addons/product/tests/test_product_pricelist.py
+++ b/addons/product/tests/test_product_pricelist.py
@@ -2,13 +2,11 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import datetime
-import time
 
 from odoo.exceptions import ValidationError
-from odoo.fields import Command
+from odoo.fields import Command, Date
 from odoo.tests import tagged, Form
 from odoo.tools import float_compare
-
 from odoo.addons.product.tests.common import ProductCommon
 
 
@@ -65,7 +63,7 @@ def setUpClass(cls):
         cls.new_currency = cls.env['res.currency'].create({
             'name': 'Wonderful Currency',
             'symbol': ':)',
-            'rate_ids': [Command.create({'rate': 10, 'name': time.strftime('%Y-%m-%d')})],
+            'rate_ids': [Command.create({'rate': 10, 'name': Date.subtract(Date.today(), days=1)})],
         })
 
         cls.ipad_retina_display.write({'uom_id': cls.uom_unit.id, 'categ_id': cls.category_5_id})
diff --git a/addons/project_purchase/tests/test_project_profitability.py b/addons/project_purchase/tests/test_project_profitability.py
index 9d60df44ecb12..025d598e0e2f0 100644
--- a/addons/project_purchase/tests/test_project_profitability.py
+++ b/addons/project_purchase/tests/test_project_profitability.py
@@ -822,13 +822,13 @@ def test_profitability_foreign_currency_rate_on_bill_date(self):
         CurrencyRate.create({
             'currency_id': foreign_currency.id,
             'rate': rate_yesterday,
-            'name': yesterday,
+            'name': yesterday - timedelta(days=1),
             'company_id': company.id,
         })
         CurrencyRate.create({
             'currency_id': foreign_currency.id,
             'rate': rate_today,
-            'name': today,
+            'name': today - timedelta(days=1),
             'company_id': company.id,
         })
 
diff --git a/addons/purchase/tests/test_purchase_downpayment.py b/addons/purchase/tests/test_purchase_downpayment.py
index 38ed184350d66..217b796c23211 100644
--- a/addons/purchase/tests/test_purchase_downpayment.py
+++ b/addons/purchase/tests/test_purchase_downpayment.py
@@ -120,7 +120,7 @@ def test_downpayment_in_accrued_expense_entry(self):
         self.assertFalse(self.env['account.move'].search(accrued_wizard.create_entries()['domain']).line_ids.filtered(lambda l: l.is_downpayment))
 
     def test_downpayment_exchange_rate(self):
-        self.env['res.currency.rate'].create({'currency_id': self.other_currency.id, 'rate': 1.5})
+        self.env['res.currency.rate'].create({'currency_id': self.other_currency.id, 'rate': 1.5, 'name': fields.Date.subtract(fields.Date.today(), days=1)})
 
         po = self.init_purchase(products=[self.product_order])
         po.button_confirm()
diff --git a/addons/purchase/tests/test_purchase_product_catalog.py b/addons/purchase/tests/test_purchase_product_catalog.py
index 930a2b8451345..6f74de51e787b 100644
--- a/addons/purchase/tests/test_purchase_product_catalog.py
+++ b/addons/purchase/tests/test_purchase_product_catalog.py
@@ -16,7 +16,7 @@ def test_catalog_price(self):
         """
         self.authenticate(self.env.user.login, self.env.user.login)
         company_currency = self.env.company.currency_id
-        other_currency = self.setup_other_currency('HRK', rates=[(fields.Date.today(), 0.5)])
+        other_currency = self.setup_other_currency('HRK', rates=[(fields.Date.subtract(fields.Date.today(), days=1), 0.5)])
 
         other_product_price = 100
         company_product_price = 150
diff --git a/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py b/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py
index b267d0ccf3278..9239616b905d3 100644
--- a/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py
+++ b/addons/purchase_mrp/tests/test_anglo_saxon_valuation.py
@@ -1,6 +1,6 @@
 from unittest import skip
 
-from odoo.fields import Date, Datetime
+from odoo.fields import Date
 from odoo.tools import float_is_zero, mute_logger
 from odoo.tests import Form, tagged
 from odoo.addons.stock_account.tests.common import TestStockValuationCommon
@@ -183,11 +183,11 @@ def test_valuation_multicurrency_with_kits(self):
         usd = self.env.ref('base.USD')
         eur = self.env.ref('base.EUR')
         self.env['res.currency.rate'].create({
-            'name': Datetime.today(),
+            'name': Date.subtract(Date.today(), days=1),
             'currency_id': usd.id,
             'rate': 1})
         self.env['res.currency.rate'].create({
-            'name': Datetime.today(),
+            'name': Date.subtract(Date.today(), days=1),
             'currency_id': eur.id,
             'rate': 2})
 
diff --git a/addons/purchase_requisition/tests/test_purchase_requisition.py b/addons/purchase_requisition/tests/test_purchase_requisition.py
index dbb49b34dae7a..ba70e2d2083a0 100644
--- a/addons/purchase_requisition/tests/test_purchase_requisition.py
+++ b/addons/purchase_requisition/tests/test_purchase_requisition.py
@@ -363,11 +363,11 @@ def test_12_alternative_po_line_different_currency(self):
 
         # 1 USD = 0.5 EUR
         self.env['res.currency.rate'].create([{
-            'name': fields.Datetime.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'currency_id': self.env.ref('base.USD').id,
             'rate': 1,
         }, {
-            'name': fields.Datetime.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'currency_id': self.env.ref('base.EUR').id,
             'rate': 0.5,
         }])
diff --git a/addons/purchase_stock/tests/test_anglo_saxon_valuation_reconciliation.py b/addons/purchase_stock/tests/test_anglo_saxon_valuation_reconciliation.py
index b2be4a7b50e17..3600f2328ceb2 100644
--- a/addons/purchase_stock/tests/test_anglo_saxon_valuation_reconciliation.py
+++ b/addons/purchase_stock/tests/test_anglo_saxon_valuation_reconciliation.py
@@ -533,7 +533,7 @@ def test_currency_exchange_journal_items1(self):
         product.standard_price = 500
         self.stock_account_product_categ.property_cost_method = 'average'
         self.env['res.currency.rate'].create({
-            'name': fields.Date.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'company_rate': .00756,
             'currency_id': self.env.ref('base.USD').id,
             'company_id': self.env.company.id,
@@ -582,7 +582,7 @@ def test_currency_exchange_journal_items2(self):
         product = self.test_product_order
         product.write({'purchase_method': 'purchase', 'standard_price': 500})
         self.env['res.currency.rate'].create({
-            'name': fields.Date.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'company_rate': .00756,
             'currency_id': self.env.ref('base.USD').id,
             'company_id': self.env.company.id,
@@ -772,7 +772,7 @@ def test_currency_exchange_and_modified_product_price_precision_valuation_items(
         euro.active = True
         self.env['decimal.precision'].search([('name', '=', 'Product Price')]).digits = 3
         self.env['res.currency.rate'].create({
-            'name': fields.Date.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'rate': 0.2710027100271003,
             'currency_id': euro.id,
             'company_id': self.env.company.id,
diff --git a/addons/purchase_stock/tests/test_purchase_order.py b/addons/purchase_stock/tests/test_purchase_order.py
index d7e6fbeb604b3..532444dd6e0b9 100644
--- a/addons/purchase_stock/tests/test_purchase_order.py
+++ b/addons/purchase_stock/tests/test_purchase_order.py
@@ -721,7 +721,7 @@ def test_foreign_bill_autocomplete_with_payment_term(self):
             'symbol': 'T',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2025-01-01', 'rate': 1.5}),
+                Command.create({'name': '2021-01-13', 'rate': 1.5}),
             ],
         })
         po = self.env['purchase.order'].create({
@@ -759,7 +759,7 @@ def test_bill_on_ordered_qty_correct_converted_amount_on_bill(self):
         euro = self.env.ref('base.EUR')
         euro.active = True
         self.env['res.currency.rate'].create({
-            'name': fields.Date.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'company_rate': 1.10,
             'currency_id': euro.id,
             'company_id': self.env.company.id,
@@ -814,7 +814,7 @@ def test_foreign_bill_tax_included(self):
             'symbol': 'T',
             'rounding': 0.01,
             'rate_ids': [
-                Command.create({'name': '2025-01-01', 'rate': 1.5}),
+                Command.create({'name': '2021-01-13', 'rate': 1.5}),
             ],
         })
         tax_price_include = self.env['account.tax'].create({
diff --git a/addons/purchase_stock/tests/test_stockvaluation.py b/addons/purchase_stock/tests/test_stockvaluation.py
index f86dff00bdba9..d1d91a71879d2 100644
--- a/addons/purchase_stock/tests/test_stockvaluation.py
+++ b/addons/purchase_stock/tests/test_stockvaluation.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import time
 from datetime import datetime, timedelta
 from freezegun import freeze_time
 from unittest import skip
@@ -452,7 +451,7 @@ def test_change_currency_rate_average_1(self):
 
         # change the rate of the currency
         self.env['res.currency.rate'].create({
-            'name': time.strftime('%Y-%m-%d'),
+            'name': fields.Date.today() - timedelta(days=1),
             'rate': 2.0,
             'currency_id': eur_currency.id,
             'company_id': po1.company_id.id,
@@ -1927,7 +1926,7 @@ def test_price_diff_with_partial_bills_and_delivered_qties(self):
 
         eur_curr = self.env.ref('base.EUR')
         self.env['res.currency.rate'].create({
-            'name': fields.Date.today(),
+            'name': fields.Date.today() - timedelta(days=1),
             'company_id': self.env.company.id,
             'currency_id': eur_curr.id,
             'rate': 2,
diff --git a/addons/sale/tests/common.py b/addons/sale/tests/common.py
index d97c1107b4865..97efb44eb6fbe 100644
--- a/addons/sale/tests/common.py
+++ b/addons/sale/tests/common.py
@@ -221,7 +221,7 @@ def setUpClass(cls):
     def convert_document_to_sale_order(self, document):
         order_date = '2020-01-01'
         currency = document['currency']
-        self._ensure_rate(currency, order_date, document['rate'])
+        self._ensure_rate(currency, '2019-12-31', document['rate'])
         self.foreign_currency_pricelist.currency_id = currency
         return self.env['sale.order'].create({
             'date_order': order_date,
diff --git a/addons/sale/tests/test_sale_prices.py b/addons/sale/tests/test_sale_prices.py
index 030f184eb9c7b..8bb3099ffd93c 100644
--- a/addons/sale/tests/test_sale_prices.py
+++ b/addons/sale/tests/test_sale_prices.py
@@ -216,7 +216,7 @@ def test_no_pricelist_rules(self):
         })
         with freeze_time('2022-08-19'):
             self.env['res.currency.rate'].create({
-                'name': fields.Date.today(),
+                'name': fields.Date.today() - timedelta(days=1),
                 'rate': 2.0,
                 'currency_id': other_currency.id,
                 'company_id': self.env.company.id,
@@ -302,7 +302,7 @@ def test_pricelist_with_another_currency(self):
 
         currency_eur = self._enable_currency('EUR')
         self.env['res.currency.rate'].create({
-            'name': '2018-07-11',
+            'name': '2018-07-10',
             'rate': 2.0,
             'currency_id': currency_eur.id,
             'company_id': self.env.company.id,
@@ -437,7 +437,7 @@ def test_multi_currency_discount(self):
         with mute_logger('odoo.models.unlink'):
             self.env['res.currency.rate'].search([]).unlink()
         self.env['res.currency.rate'].create({
-            'name': '2010-01-01',
+            'name': '2009-12-31',
             'rate': 2.0,
             'currency_id': main_curr.id,
             'company_id': False,
diff --git a/addons/sale/tests/test_sale_report.py b/addons/sale/tests/test_sale_report.py
index e2f70e6078975..805e004337331 100644
--- a/addons/sale/tests/test_sale_report.py
+++ b/addons/sale/tests/test_sale_report.py
@@ -1,5 +1,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
 from odoo import fields
 from odoo.fields import Command
 from odoo.tests import tagged
@@ -34,6 +33,9 @@ def test_sale_report_foreign_currency(self):
         companies = self.usd_cmp + self.eur_cmp
         today = fields.Date.today()
         past_day = fields.Date.to_date('2020-01-01')
+        eff_today = fields.Date.subtract(today, days=1)
+        eff_past = fields.Date.subtract(past_day, days=1)
+
         usd = self.usd_cmp.currency_id
         eur = self.eur_cmp.currency_id
         ars = self._enable_currency('ARS')
@@ -45,18 +47,18 @@ def test_sale_report_foreign_currency(self):
             {'name': 'Pricelist (ARS)', 'currency_id': ars.id, 'company_id': False},
         ])
         self.env['res.currency.rate'].create([
-            {'name': past_day, 'rate': 555, 'currency_id': ars.id, 'company_id': self.eur_cmp.id},
-            {'name': past_day, 'rate': 1.0, 'currency_id': eur.id, 'company_id': self.eur_cmp.id},
-            {'name': past_day, 'rate': 999, 'currency_id': usd.id, 'company_id': self.eur_cmp.id},
-            {'name': past_day, 'rate': 3.0, 'currency_id': ars.id, 'company_id': self.usd_cmp.id},
-            {'name': past_day, 'rate': 0.1, 'currency_id': eur.id, 'company_id': self.usd_cmp.id},
-            {'name': past_day, 'rate': 1.0, 'currency_id': usd.id, 'company_id': self.usd_cmp.id},
-            {'name': today, 'rate': 222, 'currency_id': ars.id, 'company_id': self.eur_cmp.id},
-            {'name': today, 'rate': 1.0, 'currency_id': eur.id, 'company_id': self.eur_cmp.id},
-            {'name': today, 'rate': 2.9, 'currency_id': usd.id, 'company_id': self.eur_cmp.id},
-            {'name': today, 'rate': 101, 'currency_id': ars.id, 'company_id': self.usd_cmp.id},
-            {'name': today, 'rate': 0.6, 'currency_id': eur.id, 'company_id': self.usd_cmp.id},
-            {'name': today, 'rate': 1.0, 'currency_id': usd.id, 'company_id': self.usd_cmp.id},
+            {'name': eff_past, 'rate': 555, 'currency_id': ars.id, 'company_id': self.eur_cmp.id},
+            {'name': eff_past, 'rate': 1.0, 'currency_id': eur.id, 'company_id': self.eur_cmp.id},
+            {'name': eff_past, 'rate': 999, 'currency_id': usd.id, 'company_id': self.eur_cmp.id},
+            {'name': eff_past, 'rate': 3.0, 'currency_id': ars.id, 'company_id': self.usd_cmp.id},
+            {'name': eff_past, 'rate': 0.1, 'currency_id': eur.id, 'company_id': self.usd_cmp.id},
+            {'name': eff_past, 'rate': 1.0, 'currency_id': usd.id, 'company_id': self.usd_cmp.id},
+            {'name': eff_today, 'rate': 222, 'currency_id': ars.id, 'company_id': self.eur_cmp.id},
+            {'name': eff_today, 'rate': 1.0, 'currency_id': eur.id, 'company_id': self.eur_cmp.id},
+            {'name': eff_today, 'rate': 2.9, 'currency_id': usd.id, 'company_id': self.eur_cmp.id},
+            {'name': eff_today, 'rate': 101, 'currency_id': ars.id, 'company_id': self.usd_cmp.id},
+            {'name': eff_today, 'rate': 0.6, 'currency_id': eur.id, 'company_id': self.usd_cmp.id},
+            {'name': eff_today, 'rate': 1.0, 'currency_id': usd.id, 'company_id': self.usd_cmp.id},
         ])
 
         self.assertEqual(self.product.currency_id, usd)
@@ -65,6 +67,9 @@ def test_sale_report_foreign_currency(self):
         expected_reported_amount = 0  # The total amount of all sale orders in the report.
         qty = 0  # to add variety to the data
 
+        # Needed to get conversion rates between companies.
+        currency_rates = {k: v[0] for k, v in (companies + self.env.company).mapped('currency_id')._get_rates(self.env.company, today).items()}
+
         # Create sale orders
         for company in companies:
             SaleOrder = self.env['sale.order'].with_company(company)
@@ -81,13 +86,14 @@ def test_sale_report_foreign_currency(self):
                     })
                     sale_orders |= order
 
+                    eff_date = fields.Date.subtract(date, days=1)
                     expected_so_currency_rate = self.env['res.currency.rate'].search([
-                        ('name', '=', date),
+                        ('name', '=', eff_date),
                         ('currency_id', '=', pricelist.currency_id.id),
                         ('company_id', '=', company.id),
                     ]).rate
                     expected_product_currency_rate = self.env['res.currency.rate'].search([
-                        ('name', '=', date),
+                        ('name', '=', eff_date),
                         ('currency_id', '=', self.product.currency_id.id),
                         ('company_id', '=', company.id),
                     ]).rate
@@ -106,7 +112,10 @@ def test_sale_report_foreign_currency(self):
 
                     # The amount in the report is converted first to the currency of the company and
                     # then to the currency of the current company (self.env.company).
-                    conversion_rate = company.currency_id.with_context(date=today).rate
+                    current_company_rate = currency_rates[self.env.company.currency_id.id]
+                    so_company_rate = currency_rates[company.currency_id.id]
+                    conversion_rate = (current_company_rate / so_company_rate)
+
                     expected_reported_amount += (
                         order.amount_total / order.currency_rate * conversion_rate
                     )
diff --git a/addons/sale_stock_margin/tests/test_sale_stock_margin.py b/addons/sale_stock_margin/tests/test_sale_stock_margin.py
index f8ffbffd5f5b6..ab831702a1d5b 100644
--- a/addons/sale_stock_margin/tests/test_sale_stock_margin.py
+++ b/addons/sale_stock_margin/tests/test_sale_stock_margin.py
@@ -56,7 +56,7 @@ def _setup_multicurrency(self):
         usd = self.env.ref('base.USD')
         self.company_currency = self.env.company.currency_id
         self.other_currency = self.env.ref('base.EUR') if self.company_currency == usd else usd
-        date = fields.Date.today()
+        date = fields.Date.subtract(fields.Date.today(), days=1)
         self.env['res.currency.rate'].create([
             {'currency_id': self.company_currency.id, 'rate': 1, 'name': date},
             {'currency_id': self.other_currency.id, 'rate': 2, 'name': date},
@@ -246,7 +246,7 @@ def test_so_and_multicompany(self):
         main_company_currency = main_company.currency_id
         new_company_currency = self.env.ref('base.EUR') if main_company_currency == self.env.ref('base.USD') else self.env.ref('base.USD')
 
-        date = fields.Date.today()
+        date = fields.Date.subtract(fields.Date.today(), days=1)
         self.env['res.currency.rate'].create([
             {'currency_id': main_company_currency.id, 'rate': 1, 'name': date, 'company_id': False},
             {'currency_id': new_company_currency.id, 'rate': 3, 'name': date, 'company_id': False},
diff --git a/addons/spreadsheet/tests/test_currency.py b/addons/spreadsheet/tests/test_currency.py
index 19ea6c3a94791..79df567209425 100644
--- a/addons/spreadsheet/tests/test_currency.py
+++ b/addons/spreadsheet/tests/test_currency.py
@@ -1,7 +1,6 @@
-from odoo.tests.common import tagged, TransactionCase
+from odoo.tests.common import TransactionCase
 
 
-@tagged('at_install', '-post_install')  # LEGACY at_install
 class TestCurrencyRates(TransactionCase):
     @classmethod
     def setUpClass(cls):
diff --git a/addons/spreadsheet/tests/test_currency_rate.py b/addons/spreadsheet/tests/test_currency_rate.py
index 444e20594e66c..86e09d89eb986 100644
--- a/addons/spreadsheet/tests/test_currency_rate.py
+++ b/addons/spreadsheet/tests/test_currency_rate.py
@@ -1,6 +1,7 @@
 from freezegun import freeze_time
 
-from odoo.tests.common import tagged, TransactionCase
+from odoo import fields
+from odoo.tests.common import TransactionCase
 
 CURRENT_USD = 1.5
 CURRENT_EUR = 1
@@ -13,7 +14,6 @@
 fake_now_utc = "2020-01-01 21:00:00"
 
 
-@tagged('at_install', '-post_install')  # LEGACY at_install
 class TestCurrencyRates(TransactionCase):
     @classmethod
     def setUpClass(cls):
@@ -27,23 +27,26 @@ def setUpClass(cls):
         cls.env.user.company_ids |= new_company
         cls.env.user.company_id = new_company
 
+        eff_date = fields.Date.subtract(fields.Date.context_today(cls), days=1)
         cls.env["res.currency.rate"].create(
             [
                 {
+                    "name": eff_date,
                     "currency_id": usd.id,
                     "rate": CURRENT_USD,
                 },
                 {
+                    "name": eff_date,
                     "currency_id": cad.id,
                     "rate": CURRENT_CAD,
                 },
                 {
-                    "name": "2021-11-11",
+                    "name": "2021-11-10",
                     "currency_id": usd.id,
                     "rate": USD_11,
                 },
                 {
-                    "name": "2021-11-11",
+                    "name": "2021-11-10",
                     "currency_id": cad.id,
                     "rate": CAD_11,
                 },
@@ -117,6 +120,7 @@ def test_rate_by_tz(self):
         self.env.transaction.reset()
         self.env["res.currency.rate"].create(
             {
+                "name": fields.Date.subtract(fields.Date.context_today(self), days=1),
                 "currency_id": cad.id,
                 "rate": CAD_UTC,
             }
@@ -126,6 +130,7 @@ def test_rate_by_tz(self):
         self.env.transaction.reset()
         self.env["res.currency.rate"].create(
             {
+                "name": fields.Date.subtract(fields.Date.context_today(self), days=1),
                 "currency_id": cad.id,
                 "rate": CAD_AUS,
             }
@@ -149,11 +154,13 @@ def test_currency_with_company_id(self):
         self.env["res.currency.rate"].create(
             [
                 {
+                    "name": fields.Date.subtract(fields.Date.context_today(self), days=1),
                     "currency_id": usd.id,
                     "rate": 0.5,
                     "company_id": company_eur.id,
                 },
                 {
+                    "name": fields.Date.subtract(fields.Date.context_today(self), days=1),
                     "currency_id": usd.id,
                     "rate": 0.8,
                     "company_id": company_cad.id,
diff --git a/addons/stock_landed_costs/tests/test_stockvaluationlayer.py b/addons/stock_landed_costs/tests/test_stockvaluationlayer.py
index 86e5a489e8258..0df891e07a189 100644
--- a/addons/stock_landed_costs/tests/test_stockvaluationlayer.py
+++ b/addons/stock_landed_costs/tests/test_stockvaluationlayer.py
@@ -1,14 +1,12 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 """ Implementation of "INVENTORY VALUATION TESTS (With valuation layers)" spreadsheet. """
-
 from unittest import skip
 
 from odoo import fields
 from odoo.tests import Form, tagged
 from odoo.addons.stock_landed_costs.tests.common import TestStockLandedCostsCommon
 from freezegun import freeze_time
-import time
 
 
 @skip('Temporary to fast merge new valuation')
@@ -677,7 +675,7 @@ def setUp(self):
 
     def create_rate(self, inv_rate):
         return self.env['res.currency.rate'].create({
-            'name': time.strftime('%Y-%m-%d'),
+            'name': fields.Date.subtract(fields.Date.today(), days=1),
             'inverse_company_rate': inv_rate,
             'currency_id': self.eur.id,
             'company_id': self.env.company.id,
diff --git a/addons/website_sale/tests/common_gmc.py b/addons/website_sale/tests/common_gmc.py
index 402a5229860c8..75a95e06746b1 100644
--- a/addons/website_sale/tests/common_gmc.py
+++ b/addons/website_sale/tests/common_gmc.py
@@ -1,8 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import time
-
-from odoo.fields import Command
+from odoo.fields import Command, Date
 
 from odoo.addons.product.tests.common import ProductVariantsCommon
 from odoo.addons.website_sale.controllers.product_feed import ProductFeed
@@ -60,7 +58,7 @@ def setUpClass(cls):
             'active': True,
             'rate_ids': [
                 Command.clear(),
-                Command.create({'name': time.strftime('%Y-%m-%d'), 'rate': 1.1})
+                Command.create({'name': Date.subtract(Date.today(), days=1), 'rate': 1.1})
             ],
         })
         cls.eur_pricelist = cls._create_pricelist(
diff --git a/odoo/addons/base/models/res_currency.py b/odoo/addons/base/models/res_currency.py
index b4a05240d740a..617c6f0e2f3e8 100644
--- a/odoo/addons/base/models/res_currency.py
+++ b/odoo/addons/base/models/res_currency.py
@@ -127,7 +127,7 @@ def _get_rates_query(self, company, date, currency_ids=None):
         currency_id_field = self.env['res.currency']._field_to_sql(currency_query.table, 'id')
 
         rate_query = Rate._search(
-            [('name', '<=', date), ('company_id', 'in', (False, company.root_id.id))],
+            [('name', '<', date), ('company_id', 'in', (False, company.root_id.id))],
             order='company_id.id, name DESC', limit=1)
         rate_query.add_where(
             SQL("%s = %s", Rate._field_to_sql(rate_query.table, 'currency_id'), currency_id_field))
@@ -136,7 +136,6 @@ def _get_rates_query(self, company, date, currency_ids=None):
             Rate._field_to_sql(Rate._table, 'name', rate_query),
         )
         currency_query.add_join('LEFT JOIN LATERAL', 'before_rate', rate_query, SQL('TRUE'))
-
         rate_query_fallback = Rate._search(
             [('company_id', 'in', (False, company.root_id.id))],
             order='company_id.id, name ASC', limit=1)
diff --git a/odoo/addons/base/tests/test_res_currency.py b/odoo/addons/base/tests/test_res_currency.py
index 2df100a3f6785..bfbb4c2b38e10 100644
--- a/odoo/addons/base/tests/test_res_currency.py
+++ b/odoo/addons/base/tests/test_res_currency.py
@@ -10,13 +10,13 @@ def test_currency_cache(self):
         currencyA, currencyB = self.env['res.currency'].create([{
             'name': 'AAA',
             'symbol': 'AAA',
-            'rate_ids': [Command.create({'name': '2009-09-09', 'rate': 1})]
+            'rate_ids': [Command.create({'name': '2009-09-08', 'rate': 1})],
         }, {
             'name': 'BBB',
             'symbol': 'BBB',
             'rate_ids': [
-                Command.create({'name': '2009-09-09', 'rate': 1}),
-                Command.create({'name': '2011-11-11', 'rate': 2}),
+                Command.create({'name': '2009-09-08', 'rate': 1}),
+                Command.create({'name': '2011-11-10', 'rate': 2}),
             ],
         }])
 
@@ -30,7 +30,7 @@ def test_currency_cache(self):
         # update the (cached) rate of the to_currency used in the previous query
         self.env['res.currency.rate'].search([
             ('currency_id', '=', currencyB.id),
-            ('name', '=', '2009-09-09')]
+            ('name', '=', '2009-09-08')],
         ).rate = 3
 
         # repeat _convert call
@@ -45,7 +45,7 @@ def test_currency_cache(self):
 
         # create a new rate of the to_currency for the date used in the previous query
         self.env['res.currency.rate'].create({
-            'name': '2010-10-10',
+            'name': '2010-10-09',
             'rate': 4,
             'currency_id': currencyB.id,
             'company_id': self.env.company.id,
diff --git a/odoo/addons/test_web/tests/test_read_group_formatted.py b/odoo/addons/test_web/tests/test_read_group_formatted.py
index b6ad37409f84f..51c845be010ac 100644
--- a/odoo/addons/test_web/tests/test_read_group_formatted.py
+++ b/odoo/addons/test_web/tests/test_read_group_formatted.py
@@ -2114,12 +2114,12 @@ def test_sum_monetary_rated_us(self):
         self.env['res.currency.rate'].create([
             {
                 'currency_id': self.eur.id,
-                'name': fields.Date.context_today(self),
+                'name': fields.Date.subtract(fields.Date.context_today(self), days=1),
                 'rate': 0.8,  # 1 $ = 0.8 eur, 1 eur = 1.25 $
             },
             {
                 'currency_id': self.stn.id,
-                'name': fields.Date.context_today(self),
+                'name': fields.Date.subtract(fields.Date.context_today(self), days=1),
                 'rate': 20,  # 1 $ = 20 Db, 1 Db = 0.05 $
             },
         ])
@@ -2155,7 +2155,7 @@ def test_sum_monetary_rated_us(self):
                             FROM "res_currency_rate"
                             WHERE (
                                 ("res_currency_rate"."company_id" IN %s OR "res_currency_rate"."company_id" IS NULL)
-                                AND "res_currency_rate"."name" <= %s
+                                AND "res_currency_rate"."name" < %s
                             ) AND "res_currency_rate"."currency_id" = "res_currency"."id"
                             ORDER BY "res_currency_rate"."company_id", "res_currency_rate"."name" DESC
                             LIMIT %s
@@ -2225,12 +2225,12 @@ def test_sum_monetary_rated_eur_company(self):
         self.env['res.currency.rate'].create([
             {
                 'currency_id': self.usd.id,
-                'name': fields.Date.context_today(self),
+                'name': fields.Date.subtract(fields.Date.context_today(self), days=1),
                 'rate': 1.25,  # 1 $ = 0.8 eur, 1 eur = 1.25 $
             },
             {
                 'currency_id': self.stn.id,
-                'name': fields.Date.context_today(self),
+                'name': fields.Date.subtract(fields.Date.context_today(self), days=1),
                 'rate': 25,  # 1 eur = 25 Db, 1 Db = 0.04 eur
             },
         ])
@@ -2264,7 +2264,7 @@ def test_sum_monetary_rated_eur_company(self):
                             FROM "res_currency_rate"
                             WHERE (
                                 ("res_currency_rate"."company_id" IN %s OR "res_currency_rate"."company_id" IS NULL)
-                                AND "res_currency_rate"."name" <= %s
+                                AND "res_currency_rate"."name" < %s
                             ) AND "res_currency_rate"."currency_id" = "res_currency"."id"
                             ORDER BY "res_currency_rate"."company_id", "res_currency_rate"."name" DESC
                             LIMIT %s
@@ -2299,12 +2299,12 @@ def test_multi_currency_related(self):
         self.env['res.currency.rate'].create([
             {
                 'currency_id': self.eur.id,
-                'name': fields.Date.context_today(self),
+                'name': fields.Date.subtract(fields.Date.context_today(self), days=1),
                 'rate': 0.8,  # 1 $ = 0.8 eur, 1 eur = 1.25 $
             },
             {
                 'currency_id': self.stn.id,
-                'name': fields.Date.context_today(self),
+                'name': fields.Date.subtract(fields.Date.context_today(self), days=1),
                 'rate': 20,  # 1 $ = 20 Db, 1 Db = 0.05 $
             },
         ])

From 661b6d3aec353656250204feac8fb0690820e412 Mon Sep 17 00:00:00 2001
From: Earth Patel <eapa@odoo.com>
Date: Fri, 7 Mar 2025 18:59:36 +0530
Subject: [PATCH 564/673] [IMP] l10n_in: QR Code shown on invoices only if UPI
 ID is set

With this commit, the QR Code is shown on invoices only when a UPI ID is set,
replacing the previous logic based on the qr_code boolean field. Additionally,
the qr_code field has been hidden from the settings for India country.

task-4396931

closes odoo/odoo#203226

Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
---
 addons/account/models/company.py                   |  5 ++++-
 addons/l10n_in/models/account_invoice.py           |  6 +++++-
 addons/l10n_in/models/company.py                   |  8 ++++++++
 addons/l10n_in/models/res_config_settings.py       |  4 ++++
 addons/l10n_in/views/res_config_settings_views.xml | 11 +++++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/addons/account/models/company.py b/addons/account/models/company.py
index c57ab37898271..dd3d88aea2c68 100644
--- a/addons/account/models/company.py
+++ b/addons/account/models/company.py
@@ -146,7 +146,7 @@ class ResCompany(models.Model):
     incoterm_id = fields.Many2one('account.incoterms', string='Default incoterm',
         help='International Commercial Terms are a series of predefined commercial terms used in international transactions.')
 
-    qr_code = fields.Boolean(string='Display QR-code on invoices')
+    qr_code = fields.Boolean(string='Display QR-code on invoices', compute='_compute_qr_code', store=True, readonly=False)
     link_qr_code = fields.Boolean(string='Display Link QR-code')
 
     display_invoice_amount_total_words = fields.Boolean(string='Total amount of invoice in letters')
@@ -464,6 +464,9 @@ def _compute_display_account_storno(self):
         for company in self:
             company.display_account_storno = company.account_fiscal_country_id.code in STORNO_MANDATORY_COUNTRIES | STORNO_OPTIONAL_COUNTRIES
 
+    def _compute_qr_code(self):
+        pass
+
     def _initiate_account_onboardings(self):
         account_onboarding_routes = [
             'account_dashboard',
diff --git a/addons/l10n_in/models/account_invoice.py b/addons/l10n_in/models/account_invoice.py
index 529740b3677ea..7565b9fa1382e 100644
--- a/addons/l10n_in/models/account_invoice.py
+++ b/addons/l10n_in/models/account_invoice.py
@@ -599,7 +599,11 @@ def _can_be_unlinked(self):
 
     def _generate_qr_code(self, silent_errors=False):
         self.ensure_one()
-        if self.company_id.country_code == 'IN' and self.company_id.l10n_in_upi_id:
+        if (
+            self.company_id.l10n_in_upi_id
+            and self.amount_residual
+            and self.move_type == 'out_invoice'
+        ):
             payment_url = 'upi://pay?pa=%s&pn=%s&am=%s&tr=%s&tn=%s' % (
                 self.company_id.l10n_in_upi_id,
                 self.company_id.name,
diff --git a/addons/l10n_in/models/company.py b/addons/l10n_in/models/company.py
index 77baf830df9e5..8713d1c1676a1 100644
--- a/addons/l10n_in/models/company.py
+++ b/addons/l10n_in/models/company.py
@@ -76,6 +76,14 @@ class ResCompany(models.Model):
     )
     l10n_in_gstin_status_feature = fields.Boolean(string="Check GST Number Status")
 
+    @api.depends('l10n_in_upi_id')
+    def _compute_qr_code(self):
+        # EXTENDS 'account'
+        indian_companies = self.filtered(lambda c: c.country_code == 'IN')
+        for company in indian_companies:
+            company.qr_code = bool(company.l10n_in_upi_id)
+        super(ResCompany, self - indian_companies)._compute_qr_code()
+
     def _inverse_l10n_in_tds_feature(self):
         for company in self:
             if company.l10n_in_tds_feature:
diff --git a/addons/l10n_in/models/res_config_settings.py b/addons/l10n_in/models/res_config_settings.py
index b5cff5d527ca8..27d0003f18af8 100644
--- a/addons/l10n_in/models/res_config_settings.py
+++ b/addons/l10n_in/models/res_config_settings.py
@@ -22,6 +22,10 @@ class ResConfigSettings(models.TransientModel):
         related='company_id.l10n_in_hsn_code_digit',
         readonly=False
     )
+    l10n_in_upi_id = fields.Char(
+        related='company_id.l10n_in_upi_id',
+        readonly=False
+    )
 
     # TDS/TCS settings
     l10n_in_tds_feature = fields.Boolean(
diff --git a/addons/l10n_in/views/res_config_settings_views.xml b/addons/l10n_in/views/res_config_settings_views.xml
index 19f061d58b4f9..917d348ede608 100644
--- a/addons/l10n_in/views/res_config_settings_views.xml
+++ b/addons/l10n_in/views/res_config_settings_views.xml
@@ -134,6 +134,17 @@
                     </div>
                 </setting>
             </block>
+            <xpath expr="//setting[@id='qr_code_invoices']" position="attributes">
+                <attribute name="invisible">country_code == 'IN'</attribute>
+            </xpath>
+            <block id="pay_invoice_online_setting_container" position="inside">
+                <setting string="UPI ID"
+                         help="Add a payment QR-code to your invoices."
+                         company_dependent="1"
+                         invisible="country_code != 'IN'">
+                    <field name="l10n_in_upi_id" placeholder="Add UPI ID"/>
+                </setting>
+            </block>
         </field>
     </record>
 </odoo>

From d6716bae8954637876f98a9695d25387512b157d Mon Sep 17 00:00:00 2001
From: adip-odoo <adip@odoo.com>
Date: Thu, 21 Aug 2025 14:45:06 +0530
Subject: [PATCH 565/673] [FIX] account: handle error on uploading empty file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, an error occurs when uploading zero-byte files as attachments.

Steps to Reproduce:
1. Install the Invoicing app.
2. In Customer Invoices, try uploading [this file](https://drive.google.com/file/d/1iWO1pKT9XJbeUPNpqJdbN_Ahea3lK68o/view?usp=drive_link).

Error:
TypeError - a bytes-like object is required, not 'bool'

Cause:
An empty file has no raw data. So at [1], the value of file_data['raw'] is False,
leading to an error when attempting to extract the embedded PDF file at [2].

Fix:
This commit ensures that if the raw data is False, it passes the empty byte
data to prevent the error.

[1]: https://github.com/odoo/odoo/blob/69c8348d5f99e653b31f02b46663dc8ba887bade/addons/account/models/account_document_import_mixin.py#L506
[2]: https://github.com/odoo/odoo/blob/69c8348d5f99e653b31f02b46663dc8ba887bade/addons/account/models/account_document_import_mixin.py#L112

sentry-6820233764, 6781383914

closes odoo/odoo#223861

Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/account/models/account_document_import_mixin.py |  2 +-
 .../tests/test_account_incoming_supplier_invoice.py    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_document_import_mixin.py b/addons/account/models/account_document_import_mixin.py
index 7d7db7c1b8a05..6644a2de27b61 100644
--- a/addons/account/models/account_document_import_mixin.py
+++ b/addons/account/models/account_document_import_mixin.py
@@ -109,7 +109,7 @@ def split_etree_on_tag(tree, tag):
 
 
 def extract_pdf_embedded_files(filename, content):
-    with io.BytesIO(content) as buffer:
+    with io.BytesIO(content or b'') as buffer:
         try:
             pdf_reader = OdooPdfFileReader(buffer, strict=False)
         except Exception as e:  # noqa: BLE001
diff --git a/addons/account/tests/test_account_incoming_supplier_invoice.py b/addons/account/tests/test_account_incoming_supplier_invoice.py
index 503f3779a1a92..1d481db62e1c2 100644
--- a/addons/account/tests/test_account_incoming_supplier_invoice.py
+++ b/addons/account/tests/test_account_incoming_supplier_invoice.py
@@ -937,3 +937,13 @@ def test_74_mail_alias_all(self):
                 }
             },
         )
+
+    def test_75_journal_upload_empty_pdf(self):
+        empty_pdf_vals = {'name': 'empty.pdf', 'raw': False, 'type': 'binary', 'mimetype': 'application/pdf'}
+        self.assert_attachment_import(
+            origin='journal',
+            attachments_vals=[empty_pdf_vals],
+            expected_invoices={
+                1: {'empty.pdf': {'on_invoice': True, 'on_message': True, 'is_decoded': True, 'is_new': True}},
+            },
+        )

From 747e3a946108bbd77cfff06cff4f4b110dc8546e Mon Sep 17 00:00:00 2001
From: alan-odoo <alan@odoo.com>
Date: Wed, 15 Oct 2025 11:44:31 +0200
Subject: [PATCH 566/673] [IMP] crm: change default sales team of the
 opportunity

This commit uses the team of the lead to pre-fill the team_id field of the
opportunity creation form if the salesperson is a member of it.

Previously, the default team of the salesperson was used to pre-fill this
field. So if the user completing the form did not notice it, the team of
the opportunity was not the same as the one of the lead.

Task-5107580

closes odoo/odoo#231679

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/tests/test_crm_lead_convert.py     | 25 +++++++++++++++++++
 addons/crm/wizard/crm_lead_to_opportunity.py  |  5 +++-
 .../wizard/crm_lead_to_opportunity_mass.py    |  5 +++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/addons/crm/tests/test_crm_lead_convert.py b/addons/crm/tests/test_crm_lead_convert.py
index 7528825bd6799..aea1539682a5d 100644
--- a/addons/crm/tests/test_crm_lead_convert.py
+++ b/addons/crm/tests/test_crm_lead_convert.py
@@ -383,6 +383,31 @@ def test_lead_convert_same_partner(self):
         self.assertEqual(lead.city, 'my city', 'City should be preserved during conversion')
         self.assertEqual(partner.lang, 'en_US')
 
+    def test_lead_convert_same_team(self):
+        """Check that the team_id field of the 'crm.lead2opportunity.partner' form is pre-filled with the team of the
+        lead that must be converted and not with the default one of its user."""
+        lead = self.env['crm.lead'].create({
+            'name': 'Convert Same Team LEAD',
+            'type': 'lead',
+            'user_id': self.user_sales_manager.id,
+            'team_id': self.env['crm.team'].create({
+                'name': 'Convert Sales Team 2',
+                'user_id': self.user_sales_manager.id,
+            }).id,
+        })
+        wizard = Form(self.env['crm.lead2opportunity.partner'].with_context({
+            'active_model': 'crm.lead',
+            'active_id': lead.id,
+            'active_ids': lead.ids,
+        }))
+        # Check that the team_id field of the wizard is pre-filled with the lead's team and ensure that it is not
+        # because it is the default team of the user.
+        self.assertEqual(lead.team_id, wizard.team_id)
+        self.assertNotEqual(
+            self.env['crm.team']._get_default_team_id(user_id=self.user_sales_manager.id),
+            lead.team_id
+        )
+
     @users('user_sales_manager')
     def test_lead_convert_properties_preserve(self):
         """Verify that the properties are preserved when converting."""
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 45d73e08a4d36..c2de927259112 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -104,7 +104,7 @@ def _compute_user_id(self):
         for convert in self:
             convert.user_id = convert.lead_id.user_id if convert.lead_id.user_id else False
 
-    @api.depends('user_id')
+    @api.depends('lead_id', 'user_id')
     def _compute_team_id(self):
         """ When changing the user, also set a team_id or restrict team id
         to the ones user_id is member of. """
@@ -115,6 +115,9 @@ def _compute_team_id(self):
             user = convert.user_id
             if convert.team_id and user in convert.team_id.member_ids | convert.team_id.user_id:
                 continue
+            elif user in convert.lead_id.team_id.member_ids | convert.lead_id.team_id.user_id:
+                convert.team_id = convert.lead_id.team_id
+                continue
             team = self.env['crm.team']._get_default_team_id(user_id=user.id, domain=None)
             convert.team_id = team.id
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_mass.py b/addons/crm/wizard/crm_lead_to_opportunity_mass.py
index 4c9a715b62218..d312fa08cf667 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_mass.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity_mass.py
@@ -43,7 +43,7 @@ def _compute_commercial_partner_id(self):
         """Setting a company for each lead in mass mode is not supported."""
         self.commercial_partner_id = False
 
-    @api.depends('user_ids')
+    @api.depends('lead_id', 'user_ids')
     def _compute_team_id(self):
         """ When changing the user, also set a team_id or restrict team id
         to the ones user_id is member of. """
@@ -54,6 +54,9 @@ def _compute_team_id(self):
             user = convert.user_id or convert.user_ids and convert.user_ids[0] or self.env.user
             if convert.team_id and user in convert.team_id.member_ids | convert.team_id.user_id:
                 continue
+            elif user in convert.lead_id.team_id.member_ids | convert.lead_id.team_id.user_id:
+                convert.team_id = convert.lead_id.team_id
+                continue
             team = self.env['crm.team']._get_default_team_id(user_id=user.id, domain=None)
             convert.team_id = team.id
 

From 65ed0728dced9577b48b8323d7d5c186c18b1e0f Mon Sep 17 00:00:00 2001
From: Sven Fuehr <svfu@odoo.com>
Date: Wed, 12 Nov 2025 10:49:38 +0100
Subject: [PATCH 567/673] [FIX] account_peppol: delete (hidden) service
 configuration

In commit 9c0930402ba5fb81ba2e9c0ba085ff3298abaae8 we hid the
service configuration in the wizard view.
It was a FW-port from stable so we did not outright delete it from the view

On master we can just remove it

Task from the commit mentioned above:
task-4737164

closes odoo/odoo#235334

Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
---
 .../wizard/peppol_config_wizard.py            |  5 +----
 .../wizard/peppol_config_wizard.xml           | 19 -------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/addons/account_peppol/wizard/peppol_config_wizard.py b/addons/account_peppol/wizard/peppol_config_wizard.py
index 345116b9c2410..55aa05c441afe 100644
--- a/addons/account_peppol/wizard/peppol_config_wizard.py
+++ b/addons/account_peppol/wizard/peppol_config_wizard.py
@@ -136,10 +136,7 @@ def _inverse_peppol_activate_self_billing(self):
             self_billing_services.write({'enabled': wizard.peppol_activate_self_billing})
 
     def button_sync_form_with_peppol_proxy(self):
-        """Update the peppol contact email on IAP.
-        Note: The service configuration is DEPRECATED / hidden in the view.
-        Disabling services can lead to complicance issues and is not necessary
-        since all existing services should just work."""
+        """Update the peppol contact email on IAP."""
         self.ensure_one()
 
         # Update company details
diff --git a/addons/account_peppol/wizard/peppol_config_wizard.xml b/addons/account_peppol/wizard/peppol_config_wizard.xml
index fd8104ac9f3fd..557b3c8c7968b 100644
--- a/addons/account_peppol/wizard/peppol_config_wizard.xml
+++ b/addons/account_peppol/wizard/peppol_config_wizard.xml
@@ -33,25 +33,6 @@
                     <field name="peppol_activate_self_billing" invisible="account_peppol_proxy_state not in ('sender', 'receiver')"/>
                     <field name="peppol_self_billing_reception_journal_id" invisible="account_peppol_proxy_state != 'receiver'"/>
                 </group>
-                <!-- Note: Deprecated -->
-                <!-- Disabling services can lead to complicance issues and is not necessary -->
-                <!-- since all existing services should just work. -->
-                <group string="Configure your Peppol Services and allowed formats" invisible="1">
-                    <div colspan="2">
-                        <field name="service_info" role="status" class="o_field_html alert alert-info" invisible="not service_info"/>
-                        <field name="service_ids"
-                               nolabel="1"
-                               widget="one2many"
-                               columns="2">
-                            <list create="false" delete="false" edit="true">
-                                <field name="wizard_id" column_invisible="1"/>
-                                <field name="document_name" readonly="1"/>
-                                <field name="document_identifier" invisible="1"/>
-                                <field name="enabled" widget="boolean_toggle"/>
-                            </list>
-                        </field>
-                    </div>
-                </group>
                 <group string="Danger zone" invisible="account_peppol_proxy_state not in ('sender', 'smp_registration', 'receiver')">
                     <button string="Remove from Peppol"
                             name="button_peppol_unregister"

From 0ed1ab3f22271d9fd3f6aaa56d4e3e6a8e4cd1b2 Mon Sep 17 00:00:00 2001
From: dhba <dhba@odoo.com>
Date: Tue, 4 Nov 2025 12:01:24 +0000
Subject: [PATCH 568/673] [FIX] html_editor: avoid inner table overflow of
 parent cell on resize

Before this commit:

- When a table was created inside another table, resizing the inner table could
  cause it to overflow its parent cell, making it uneditable.

After this commit:

- The inner table no longer overflows its parent cell when resized, ensuring it
  remains editable.

task-5216916

closes odoo/odoo#235309

X-original-commit: c758b93a57cd98ab76c26c03bd0097f2eef50961
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../html_editor/static/src/main/table/table_resize_plugin.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/html_editor/static/src/main/table/table_resize_plugin.js b/addons/html_editor/static/src/main/table/table_resize_plugin.js
index c47686a1e8b05..cd49d9a70dc0b 100644
--- a/addons/html_editor/static/src/main/table/table_resize_plugin.js
+++ b/addons/html_editor/static/src/main/table/table_resize_plugin.js
@@ -177,8 +177,11 @@ export class TableResizePlugin extends Plugin {
                 const sizeDelta = newSize - currentSize;
                 const currentNeighborSize = neighborRect[sizeProp];
                 const newNeighborSize = currentNeighborSize - sizeDelta;
+                const enclosingCell = closestElement(table, "td, th");
+                const containerWidth =
+                    enclosingCell?.getBoundingClientRect().width || this.editable.clientWidth;
                 const maxWidth =
-                    this.editable.clientWidth -
+                    containerWidth -
                     parseFloat(editableStyle.paddingLeft) -
                     parseFloat(editableStyle.paddingRight);
                 const tableRect = table.getBoundingClientRect();

From 01513b5512e48763bf161ba8ab7dd2f3a38a5e0c Mon Sep 17 00:00:00 2001
From: Max Whale <mawh@odoo.com>
Date: Mon, 10 Nov 2025 09:01:10 +0000
Subject: [PATCH 569/673] [FIX] hw_drivers: built-in serial port shows as
 device

The serial interface previously included a filter to not include the
built-in serial port on the Pi 5, however this filter is now broken in
Raspberry Pi OS Trixie. To ensure the filter works in all versions, we
now explicitly look for the device `/dev/ttyAMA10` and ignore it.

closes odoo/odoo#235524

X-original-commit: 5241ecc3101422af569ae553f4573bbc75963bf5
Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 addons/iot_drivers/iot_handlers/interfaces/serial_interface.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/iot_drivers/iot_handlers/interfaces/serial_interface.py b/addons/iot_drivers/iot_handlers/interfaces/serial_interface.py
index 7ce886a11d303..ec1e383a051c5 100644
--- a/addons/iot_drivers/iot_handlers/interfaces/serial_interface.py
+++ b/addons/iot_drivers/iot_handlers/interfaces/serial_interface.py
@@ -14,7 +14,7 @@ def get_devices(self):
         serial_devices = {
             port.device: {'identifier': port.device}
             for port in comports()
-            if IS_WINDOWS or port.subsystem != 'amba'
+            if IS_WINDOWS or port.device != '/dev/ttyAMA10'
             # RPI 5 uses ttyAMA10 as a console serial port for system messages: odoo interprets it as scale -> avoid it
         }
         return serial_devices

From eec4bedfcdcf30e8b3cb41a0ba83bf5c712a1c6a Mon Sep 17 00:00:00 2001
From: "Adrien Minne (adrm)" <adrm@odoo.com>
Date: Wed, 15 Oct 2025 12:17:08 +0000
Subject: [PATCH 570/673] [FIX] spreadsheet: fix global filter cell value
 conversion

The helper `getFilterCellValue` would sometime returning POJOS,
sometimes a matrix of POJOs. This made the excel export crash, as
it expected a matrix.

closes odoo/odoo#235519

Task: 5153124
X-original-commit: 001fb1c1700f81cc4cd1977e5293f393798dfdcd
Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
---
 .../static/src/global_filters/helpers.js      | 17 +++++-----
 .../global_filters_model.test.js              | 32 +++++++++++++++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/addons/spreadsheet/static/src/global_filters/helpers.js b/addons/spreadsheet/static/src/global_filters/helpers.js
index a20ea8ae252d2..187c50394b32b 100644
--- a/addons/spreadsheet/static/src/global_filters/helpers.js
+++ b/addons/spreadsheet/static/src/global_filters/helpers.js
@@ -139,7 +139,7 @@ const SET_OPERATORS_BEHAVIORS = {
         return new Domain([[fieldPath, domainOperator, false]]);
     },
     toCellValue(getters, filter, filterValue) {
-        return { value: filterValue.operator === "set" };
+        return [[{ value: filterValue.operator === "set" }]];
     },
 };
 
@@ -157,7 +157,7 @@ const FILTERS_BEHAVIORS = {
                 );
             },
             toCellValue(getters, filter, filterValue) {
-                return { value: filterValue.strings.join(", ") };
+                return [[{ value: filterValue.strings.join(", ") }]];
             },
         },
         {
@@ -170,7 +170,7 @@ const FILTERS_BEHAVIORS = {
                 return new Domain([[fieldPath, filterValue.operator, filterValue.strings]]);
             },
             toCellValue(getters, filter, filterValue) {
-                return { value: filterValue.strings.join(", ") };
+                return [[{ value: filterValue.strings.join(", ") }]];
             },
         },
         {
@@ -185,7 +185,7 @@ const FILTERS_BEHAVIORS = {
                 );
             },
             toCellValue(getters, filter, filterValue) {
-                return { value: filterValue.strings.join(", ") };
+                return [[{ value: filterValue.strings.join(", ") }]];
             },
         },
         SET_OPERATORS_BEHAVIORS,
@@ -224,7 +224,7 @@ const FILTERS_BEHAVIORS = {
                 );
             },
             toCellValue(getters, filter, filterValue) {
-                return { value: filterValue.strings.join(", ") };
+                return [[{ value: filterValue.strings.join(", ") }]];
             },
         },
         SET_OPERATORS_BEHAVIORS,
@@ -252,7 +252,7 @@ const FILTERS_BEHAVIORS = {
                 return new Domain([[fieldPath, filterValue.operator, filterValue.selectionValues]]);
             },
             toCellValue(getters, filter, filterValue) {
-                return { value: filterValue.selectionValues.join(", ") };
+                return [[{ value: filterValue.selectionValues.join(", ") }]];
             },
         },
     ],
@@ -274,9 +274,8 @@ const FILTERS_BEHAVIORS = {
                 return new Domain([[fieldPath, filterValue.operator, filterValue.targetValue]]);
             },
             toCellValue(getters, filter, filterValue) {
-                return {
-                    value: filterValue.targetValue !== undefined ? filterValue.targetValue : "",
-                };
+                const value = filterValue.targetValue !== undefined ? filterValue.targetValue : "";
+                return [[{ value }]];
             },
         },
         {
diff --git a/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js b/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
index 32948e24310d5..0a6e342567324 100644
--- a/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
+++ b/addons/spreadsheet/static/tests/global_filters/global_filters_model.test.js
@@ -1711,6 +1711,38 @@ test("Export boolean global filters with undefined value for excel", async funct
     expect(filterSheet.cells["A2"]).toBe("test");
     expect(filterSheet.cells["B1"]).toBe("Value");
     expect(filterSheet.cells["B2"]).toBe("");
+
+    model.exportXLSX(); // should not crash
+});
+
+test("Export relational global filter for excel", async function () {
+    const { model } = await createSpreadsheetWithPivotAndList();
+    await addGlobalFilter(model, {
+        id: "1",
+        label: "test relation in",
+        type: "relation",
+        defaultValue: { operator: "in", ids: [1, 2] },
+    });
+    await addGlobalFilter(model, {
+        id: "2",
+        label: "test relation ilike",
+        type: "relation",
+        defaultValue: { operator: "ilike", strings: ["hello", "world"] },
+    });
+
+    const filterPlugin = model["handlers"].find(
+        (handler) => handler instanceof GlobalFiltersCoreViewPlugin
+    );
+    const exportData = { styles: [], sheets: [], formats: {} };
+    filterPlugin.exportForExcel(exportData);
+    const filterSheet = exportData.sheets[0];
+
+    expect(filterSheet.cells["A2"]).toBe("test relation in");
+    expect(filterSheet.cells["B2"]).toBe("1, 2");
+
+    expect(filterSheet.cells["A3"]).toBe("test relation ilike");
+    expect(filterSheet.cells["B3"]).toBe("hello, world");
+
     model.exportXLSX(); // should not crash
 });
 

From 717619571d1297d6b299b7c47b728841bcd81e69 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Fri, 17 Oct 2025 13:13:53 +0200
Subject: [PATCH 571/673] [CLN] *: manifests

Part-of: odoo/odoo#232326
Related: odoo/enterprise#97655
Related: odoo/design-themes#1172
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/account/__manifest__.py                |  2 -
 addons/account_check_printing/__manifest__.py |  3 --
 addons/account_debit_note/__manifest__.py     |  9 ++---
 addons/account_edi/__manifest__.py            |  3 --
 .../account_edi_proxy_client/__manifest__.py  |  3 --
 addons/account_edi_ubl_cii/__manifest__.py    |  2 -
 addons/account_fleet/__manifest__.py          |  3 --
 addons/account_qr_code_emv/__manifest__.py    |  1 -
 addons/account_qr_code_sepa/__manifest__.py   |  6 ---
 addons/account_tax_python/__manifest__.py     |  2 -
 addons/account_test/__manifest__.py           |  7 +---
 .../account_update_tax_tags/__manifest__.py   |  1 -
 addons/analytic/__manifest__.py               |  2 -
 addons/api_doc/__manifest__.py                |  1 -
 addons/attachment_indexation/__manifest__.py  |  2 -
 addons/auth_oauth/__manifest__.py             |  1 -
 addons/auth_passkey_portal/__manifest__.py    |  1 -
 addons/auth_signup/__manifest__.py            |  2 -
 addons/barcodes/__manifest__.py               |  1 -
 .../barcodes_gs1_nomenclature/__manifest__.py |  2 -
 addons/base_address_extended/__manifest__.py  |  1 -
 addons/base_automation/__manifest__.py        |  2 -
 addons/base_geolocalize/__manifest__.py       |  2 -
 addons/base_iban/__manifest__.py              |  1 -
 addons/base_import/__manifest__.py            |  1 -
 addons/base_import_module/__manifest__.py     |  2 -
 addons/base_install_request/__manifest__.py   |  1 -
 addons/base_setup/__manifest__.py             |  6 +--
 addons/base_sparse_field/__manifest__.py      |  2 -
 addons/base_vat/__manifest__.py               |  1 -
 addons/board/__manifest__.py                  |  2 -
 addons/bus/__manifest__.py                    |  2 -
 addons/calendar/__manifest__.py               |  1 -
 addons/calendar_sms/__manifest__.py           |  1 -
 addons/certificate/__manifest__.py            |  1 -
 addons/cloud_storage/__manifest__.py          |  1 -
 addons/cloud_storage_azure/__manifest__.py    |  1 -
 addons/cloud_storage_google/__manifest__.py   |  1 -
 addons/contacts/__manifest__.py               |  1 -
 addons/crm/__manifest__.py                    |  2 -
 addons/crm_iap_enrich/__manifest__.py         |  1 -
 addons/crm_iap_mine/__manifest__.py           |  1 -
 addons/crm_livechat/__manifest__.py           |  1 -
 addons/crm_mail_plugin/__manifest__.py        |  3 --
 addons/crm_sms/__manifest__.py                |  2 -
 addons/data_recycle/__manifest__.py           |  2 -
 addons/delivery/__manifest__.py               |  2 -
 addons/delivery_mondialrelay/__manifest__.py  |  1 -
 .../__manifest__.py                           |  3 --
 addons/digest/__manifest__.py                 |  2 -
 addons/event/__manifest__.py                  |  2 -
 addons/event_booth/__manifest__.py            |  1 -
 addons/event_booth_sale/__manifest__.py       |  1 -
 addons/event_crm/__manifest__.py              |  3 --
 addons/event_crm_sale/__manifest__.py         |  3 --
 addons/event_product/__manifest__.py          |  2 -
 addons/event_sale/__manifest__.py             |  2 -
 addons/event_sms/__manifest__.py              |  3 --
 addons/fleet/__manifest__.py                  |  2 -
 addons/gamification/__manifest__.py           |  2 -
 addons/gamification_sale_crm/__manifest__.py  |  2 -
 addons/google_account/__manifest__.py         |  1 -
 .../__manifest__.py                           |  1 -
 addons/google_calendar/__manifest__.py        |  2 -
 addons/google_gmail/__manifest__.py           |  1 -
 addons/google_recaptcha/__manifest__.py       |  2 -
 addons/hr/__manifest__.py                     |  1 -
 addons/hr_attendance/__manifest__.py          |  1 -
 addons/hr_calendar/__manifest__.py            |  1 -
 addons/hr_expense/__manifest__.py             |  2 -
 addons/hr_fleet/__manifest__.py               |  2 -
 addons/hr_gamification/__manifest__.py        |  2 -
 addons/hr_holidays/__manifest__.py            |  2 -
 addons/hr_holidays_attendance/__manifest__.py |  1 -
 addons/hr_homeworking/__manifest__.py         |  1 -
 .../hr_homeworking_calendar/__manifest__.py   |  2 -
 addons/hr_livechat/__manifest__.py            |  1 -
 addons/hr_maintenance/__manifest__.py         |  3 --
 addons/hr_presence/__manifest__.py            |  2 -
 addons/hr_recruitment/__manifest__.py         |  2 -
 addons/hr_recruitment_skills/__manifest__.py  |  3 --
 addons/hr_recruitment_sms/__manifest__.py     |  1 -
 addons/hr_recruitment_survey/__manifest__.py  |  2 -
 addons/hr_skills/__manifest__.py              |  2 -
 addons/hr_skills_event/__manifest__.py        |  1 -
 addons/hr_skills_slides/__manifest__.py       |  1 -
 addons/hr_skills_survey/__manifest__.py       |  1 -
 addons/hr_timesheet/__manifest__.py           |  2 -
 .../hr_timesheet_attendance/__manifest__.py   |  1 -
 addons/hr_work_entry/__manifest__.py          |  1 -
 addons/hr_work_entry_holidays/__manifest__.py |  3 --
 addons/html_builder/__manifest__.py           |  2 -
 addons/html_editor/__manifest__.py            |  5 +--
 addons/iap/__manifest__.py                    |  1 -
 addons/iap_crm/__manifest__.py                |  3 --
 addons/iap_mail/__manifest__.py               |  3 --
 addons/im_livechat/__manifest__.py            |  3 --
 .../__manifest__.py                           |  3 --
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  1 -
 addons/l10n_anz_ubl_pint/__manifest__.py      |  2 -
 addons/l10n_ar/__manifest__.py                |  1 -
 addons/l10n_ar_pos/__manifest__.py            |  3 --
 addons/l10n_ar_stock/__manifest__.py          |  2 -
 addons/l10n_ar_website_sale/__manifest__.py   |  2 -
 addons/l10n_ar_withholding/__manifest__.py    |  3 --
 addons/l10n_bd/__manifest__.py                |  1 -
 addons/l10n_be_pos_restaurant/__manifest__.py |  2 -
 addons/l10n_be_pos_sale/__manifest__.py       |  1 -
 addons/l10n_bg/__manifest__.py                |  1 -
 addons/l10n_bg_ledger/__manifest__.py         |  1 -
 addons/l10n_bh/__manifest__.py                |  1 -
 addons/l10n_br/__manifest__.py                |  1 -
 addons/l10n_br_sales/__manifest__.py          |  3 --
 addons/l10n_br_website_sale/__manifest__.py   |  2 -
 addons/l10n_ch_pos/__manifest__.py            |  1 -
 addons/l10n_cn_city/__manifest__.py           |  1 -
 addons/l10n_co/__manifest__.py                |  1 -
 addons/l10n_co_pos/__manifest__.py            |  2 -
 addons/l10n_cy/__manifest__.py                |  1 -
 addons/l10n_de/__manifest__.py                |  1 -
 addons/l10n_din5008/__manifest__.py           |  2 -
 addons/l10n_din5008_expense/__manifest__.py   |  1 -
 addons/l10n_din5008_purchase/__manifest__.py  |  1 -
 addons/l10n_din5008_repair/__manifest__.py    |  1 -
 addons/l10n_din5008_sale/__manifest__.py      |  1 -
 addons/l10n_din5008_stock/__manifest__.py     |  1 -
 addons/l10n_dz/__manifest__.py                |  1 -
 addons/l10n_ec/__manifest__.py                |  1 -
 addons/l10n_ec_sale/__manifest__.py           |  1 -
 addons/l10n_ec_stock/__manifest__.py          |  1 -
 addons/l10n_eg/__manifest__.py                |  1 -
 addons/l10n_eg_edi_eta/__manifest__.py        |  5 +--
 addons/l10n_es_edi_facturae/__manifest__.py   |  2 -
 addons/l10n_es_edi_sii/__manifest__.py        |  1 -
 addons/l10n_es_edi_tbai/__manifest__.py       |  1 -
 addons/l10n_es_edi_tbai_pos/__manifest__.py   |  1 -
 addons/l10n_es_edi_verifactu/__manifest__.py  |  2 -
 .../l10n_es_edi_verifactu_pos/__manifest__.py |  1 -
 addons/l10n_es_pos/__manifest__.py            |  1 -
 addons/l10n_eu_oss/__manifest__.py            |  1 -
 addons/l10n_fi/__manifest__.py                |  1 -
 addons/l10n_fi_sale/__manifest__.py           |  3 --
 .../__manifest__.py                           |  2 -
 addons/l10n_fr_hr_holidays/__manifest__.py    |  1 -
 .../__manifest__.py                           |  1 -
 addons/l10n_fr_pos_cert/__manifest__.py       |  2 -
 .../__manifest__.py                           |  2 -
 addons/l10n_gcc_pos/__manifest__.py           |  1 -
 addons/l10n_gr/__manifest__.py                |  1 -
 addons/l10n_gr_edi/__manifest__.py            |  2 -
 addons/l10n_hk/__manifest__.py                |  1 -
 addons/l10n_hu_edi/__manifest__.py            |  1 -
 .../l10n_id_efaktur_coretax/__manifest__.py   |  2 -
 addons/l10n_id_pos/__manifest__.py            |  1 -
 addons/l10n_in_edi/__manifest__.py            |  1 -
 addons/l10n_in_ewaybill/__manifest__.py       |  1 -
 addons/l10n_in_ewaybill_stock/__manifest__.py |  1 -
 addons/l10n_in_hr_holidays/__manifest__.py    |  1 -
 addons/l10n_in_pos/__manifest__.py            |  2 -
 addons/l10n_in_purchase_stock/__manifest__.py |  3 --
 addons/l10n_in_sale/__manifest__.py           |  3 --
 addons/l10n_in_sale_stock/__manifest__.py     |  3 --
 addons/l10n_in_stock/__manifest__.py          |  3 --
 addons/l10n_iq/__manifest__.py                |  1 -
 addons/l10n_it_edi_sale/__manifest__.py       |  2 -
 addons/l10n_it_stock_ddt/__manifest__.py      |  1 -
 addons/l10n_jo/__manifest__.py                |  1 -
 addons/l10n_jo_edi/__manifest__.py            |  2 -
 addons/l10n_jp_ubl_pint/__manifest__.py       |  2 -
 addons/l10n_ke/__manifest__.py                |  1 -
 addons/l10n_ke_edi_tremol/__manifest__.py     |  1 -
 addons/l10n_kh/__manifest__.py                |  1 -
 addons/l10n_kr/__manifest__.py                |  1 -
 addons/l10n_kw/__manifest__.py                |  1 -
 addons/l10n_kz/__manifest__.py                |  1 -
 addons/l10n_latam_base/__manifest__.py        |  2 -
 addons/l10n_latam_check/__manifest__.py       |  2 -
 .../__manifest__.py                           |  2 -
 addons/l10n_lb_account/__manifest__.py        |  1 -
 addons/l10n_lk/__manifest__.py                |  1 -
 addons/l10n_lt/__manifest__.py                |  2 -
 addons/l10n_lv/__manifest__.py                |  1 -
 addons/l10n_mt/__manifest__.py                |  1 -
 addons/l10n_mt_pos/__manifest__.py            |  2 -
 addons/l10n_mu_account/__manifest__.py        |  1 -
 addons/l10n_my_edi/__manifest__.py            |  2 -
 addons/l10n_my_edi_pos/__manifest__.py        |  2 -
 addons/l10n_my_ubl_pint/__manifest__.py       |  2 -
 addons/l10n_mz/__manifest__.py                |  1 -
 addons/l10n_ng/__manifest__.py                |  1 -
 addons/l10n_nl/__manifest__.py                |  1 -
 addons/l10n_om/__manifest__.py                |  1 -
 addons/l10n_pe_pos/__manifest__.py            |  2 -
 addons/l10n_pt/__manifest__.py                |  1 -
 addons/l10n_qa/__manifest__.py                |  1 -
 addons/l10n_ro/__manifest__.py                |  1 -
 addons/l10n_ro_edi/__manifest__.py            |  2 -
 addons/l10n_ro_edi_stock/__manifest__.py      |  2 -
 .../l10n_ro_edi_stock_batch/__manifest__.py   |  2 -
 addons/l10n_rs/__manifest__.py                |  1 -
 addons/l10n_rs_edi/__manifest__.py            |  2 -
 addons/l10n_rw/__manifest__.py                |  1 -
 addons/l10n_sa_edi/__manifest__.py            |  5 +--
 addons/l10n_sa_edi_pos/__manifest__.py        |  4 +-
 addons/l10n_sa_pos/__manifest__.py            |  1 -
 addons/l10n_sg_ubl_pint/__manifest__.py       |  2 -
 addons/l10n_sk/__manifest__.py                |  1 -
 .../l10n_test_pos_qr_payment/__manifest__.py  |  3 --
 addons/l10n_tn/__manifest__.py                |  2 -
 addons/l10n_tr_nilvera/__manifest__.py        |  1 -
 .../l10n_tr_nilvera_edispatch/__manifest__.py |  2 -
 .../l10n_tr_nilvera_einvoice/__manifest__.py  |  1 -
 .../__manifest__.py                           |  2 -
 addons/l10n_tw/__manifest__.py                |  1 -
 addons/l10n_tw_edi_ecpay/__manifest__.py      |  2 -
 addons/l10n_tz_account/__manifest__.py        |  1 -
 addons/l10n_ug/__manifest__.py                |  2 -
 addons/l10n_us/__manifest__.py                |  1 -
 addons/l10n_us_account/__manifest__.py        |  2 -
 addons/l10n_uy_pos/__manifest__.py            |  2 -
 addons/l10n_vn_edi_viettel/__manifest__.py    |  2 -
 addons/l10n_za/__manifest__.py                |  1 -
 addons/link_tracker/__manifest__.py           |  1 -
 addons/loyalty/__manifest__.py                |  2 -
 addons/lunch/__manifest__.py                  |  2 -
 addons/mail/__manifest__.py                   |  2 -
 addons/mail_bot/__manifest__.py               |  2 -
 addons/mail_bot_hr/__manifest__.py            |  3 --
 addons/mail_group/__manifest__.py             |  1 -
 addons/mail_plugin/__manifest__.py            |  3 --
 addons/maintenance/__manifest__.py            |  3 --
 addons/marketing_card/__manifest__.py         |  1 -
 addons/mass_mailing/__manifest__.py           |  1 -
 addons/mass_mailing_crm/__manifest__.py       |  2 -
 addons/mass_mailing_crm_sms/__manifest__.py   |  2 -
 addons/mass_mailing_event/__manifest__.py     |  2 -
 addons/mass_mailing_event_sms/__manifest__.py |  2 -
 .../mass_mailing_event_track/__manifest__.py  |  2 -
 .../__manifest__.py                           |  2 -
 addons/mass_mailing_sale/__manifest__.py      |  2 -
 addons/mass_mailing_sale_sms/__manifest__.py  |  2 -
 addons/mass_mailing_slides/__manifest__.py    |  2 -
 addons/mass_mailing_sms/__manifest__.py       |  1 -
 addons/mass_mailing_themes/__manifest__.py    |  2 -
 addons/microsoft_account/__manifest__.py      |  1 -
 addons/microsoft_calendar/__manifest__.py     |  2 -
 addons/microsoft_outlook/__manifest__.py      |  1 -
 addons/mrp/__manifest__.py                    |  1 -
 addons/mrp_account/__manifest__.py            |  3 --
 addons/mrp_landed_costs/__manifest__.py       |  6 +--
 addons/mrp_product_expiry/__manifest__.py     |  3 --
 addons/mrp_repair/__manifest__.py             |  3 --
 addons/mrp_subcontracting/__manifest__.py     |  1 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../mrp_subcontracting_repair/__manifest__.py |  3 --
 addons/onboarding/__manifest__.py             |  2 -
 addons/partner_autocomplete/__manifest__.py   |  1 -
 addons/partnership/__manifest__.py            |  1 -
 addons/payment_aps/__manifest__.py            |  1 -
 addons/payment_asiapay/__manifest__.py        |  1 -
 addons/payment_flutterwave/__manifest__.py    |  1 -
 addons/payment_mercado_pago/__manifest__.py   |  1 -
 addons/payment_mollie/__manifest__.py         |  1 -
 addons/payment_paymob/__manifest__.py         |  1 -
 addons/payment_razorpay/__manifest__.py       |  1 -
 addons/payment_xendit/__manifest__.py         |  1 -
 addons/phone_validation/__manifest__.py       |  1 -
 addons/point_of_sale/__manifest__.py          |  2 -
 addons/portal_rating/__manifest__.py          |  2 -
 addons/pos_account_tax_python/__manifest__.py |  1 -
 addons/pos_adyen/__manifest__.py              |  3 --
 addons/pos_discount/__manifest__.py           |  3 --
 addons/pos_event/__manifest__.py              |  2 -
 addons/pos_event_sale/__manifest__.py         |  1 -
 addons/pos_glory_cash/__manifest__.py         |  2 -
 addons/pos_hr/__manifest__.py                 |  2 -
 addons/pos_hr_restaurant/__manifest__.py      |  2 -
 addons/pos_imin/__manifest__.py               |  1 -
 addons/pos_loyalty/__manifest__.py            |  2 -
 addons/pos_mercado_pago/__manifest__.py       |  2 -
 addons/pos_mrp/__manifest__.py                |  3 --
 addons/pos_online_payment/__manifest__.py     |  2 -
 .../__manifest__.py                           |  3 --
 addons/pos_pine_labs/__manifest__.py          |  2 -
 addons/pos_qfpay/__manifest__.py              |  2 -
 addons/pos_razorpay/__manifest__.py           |  3 --
 addons/pos_repair/__manifest__.py             |  1 -
 addons/pos_restaurant/__manifest__.py         |  3 --
 addons/pos_restaurant_adyen/__manifest__.py   |  2 -
 addons/pos_restaurant_loyalty/__manifest__.py |  2 -
 addons/pos_restaurant_stripe/__manifest__.py  |  2 -
 addons/pos_sale/__manifest__.py               |  2 -
 addons/pos_sale_loyalty/__manifest__.py       |  3 --
 addons/pos_sale_margin/__manifest__.py        |  2 -
 addons/pos_self_order/__manifest__.py         |  2 -
 addons/pos_self_order_adyen/__manifest__.py   |  1 -
 .../pos_self_order_pine_labs/__manifest__.py  |  1 -
 .../pos_self_order_razorpay/__manifest__.py   |  1 -
 addons/pos_self_order_sale/__manifest__.py    |  1 -
 addons/pos_self_order_stripe/__manifest__.py  |  1 -
 addons/pos_stripe/__manifest__.py             |  3 --
 addons/pos_viva_com/__manifest__.py           |  3 --
 addons/privacy_lookup/__manifest__.py         |  2 -
 addons/product/__manifest__.py                |  1 -
 addons/product_email_template/__manifest__.py |  1 -
 addons/product_margin/__manifest__.py         |  1 -
 addons/product_matrix/__manifest__.py         |  2 -
 addons/project/__manifest__.py                |  2 -
 addons/project_account/__manifest__.py        |  1 -
 addons/project_hr_expense/__manifest__.py     |  3 --
 addons/project_hr_skills/__manifest__.py      |  1 -
 addons/project_mail_plugin/__manifest__.py    |  3 --
 addons/project_mrp/__manifest__.py            |  2 -
 addons/project_mrp_account/__manifest__.py    |  1 -
 addons/project_mrp_sale/__manifest__.py       |  1 -
 .../__manifest__.py                           |  1 -
 addons/project_purchase/__manifest__.py       |  2 -
 addons/project_purchase_stock/__manifest__.py |  1 -
 addons/project_sale_expense/__manifest__.py   |  2 -
 addons/project_sms/__manifest__.py            |  1 -
 addons/project_stock/__manifest__.py          |  1 -
 addons/project_stock_account/__manifest__.py  |  1 -
 .../__manifest__.py                           |  1 -
 .../__manifest__.py                           |  3 --
 addons/project_todo/__manifest__.py           |  3 --
 addons/purchase/__manifest__.py               |  2 -
 addons/purchase_edi_ubl_bis3/__manifest__.py  |  2 -
 addons/purchase_mrp/__manifest__.py           |  3 --
 .../purchase_product_matrix/__manifest__.py   |  2 -
 addons/purchase_repair/__manifest__.py        |  2 -
 .../purchase_requisition_sale/__manifest__.py |  2 -
 .../__manifest__.py                           |  2 -
 addons/purchase_stock/__manifest__.py         |  2 -
 addons/rating/__manifest__.py                 |  2 -
 addons/repair/__manifest__.py                 |  3 --
 addons/resource/__manifest__.py               |  1 -
 addons/resource_mail/__manifest__.py          |  2 -
 addons/sale/__manifest__.py                   |  2 -
 addons/sale_crm/__manifest__.py               |  2 -
 addons/sale_edi_ubl/__manifest__.py           |  2 -
 addons/sale_expense/__manifest__.py           |  3 --
 addons/sale_expense_margin/__manifest__.py    |  3 --
 addons/sale_loyalty/__manifest__.py           |  1 -
 addons/sale_management/__manifest__.py        |  1 -
 addons/sale_margin/__manifest__.py            |  2 -
 addons/sale_mrp/__manifest__.py               |  3 --
 addons/sale_mrp_margin/__manifest__.py        |  2 -
 addons/sale_product_matrix/__manifest__.py    |  1 -
 addons/sale_project/__manifest__.py           |  1 -
 addons/sale_project_stock/__manifest__.py     |  2 -
 addons/sale_purchase/__manifest__.py          |  2 -
 addons/sale_purchase_project/__manifest__.py  |  1 -
 addons/sale_purchase_stock/__manifest__.py    |  3 --
 addons/sale_service/__manifest__.py           |  1 -
 addons/sale_sms/__manifest__.py               |  2 -
 addons/sale_stock/__manifest__.py             |  3 --
 addons/sale_stock_margin/__manifest__.py      |  3 --
 .../sale_stock_product_expiry/__manifest__.py |  2 -
 addons/sale_timesheet/__manifest__.py         |  1 -
 addons/sale_timesheet_margin/__manifest__.py  |  2 -
 addons/sales_team/__manifest__.py             |  1 -
 addons/sms/__manifest__.py                    |  2 -
 addons/sms_twilio/__manifest__.py             |  2 -
 addons/snailmail/__manifest__.py              |  1 -
 addons/snailmail_account/__manifest__.py      |  1 -
 addons/social_media/__manifest__.py           |  1 -
 addons/spreadsheet/__manifest__.py            |  3 --
 addons/spreadsheet_account/__manifest__.py    |  3 --
 addons/spreadsheet_dashboard/__manifest__.py  |  3 --
 .../__manifest__.py                           |  3 --
 .../__manifest__.py                           |  3 --
 .../__manifest__.py                           |  3 --
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  3 --
 .../__manifest__.py                           |  3 --
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 .../__manifest__.py                           |  2 -
 addons/stock/__manifest__.py                  |  2 -
 addons/stock_account/__manifest__.py          |  2 -
 addons/stock_delivery/__manifest__.py         |  2 -
 addons/stock_dropshipping/__manifest__.py     |  3 --
 addons/stock_fleet/__manifest__.py            |  1 -
 addons/stock_landed_costs/__manifest__.py     |  2 -
 addons/stock_maintenance/__manifest__.py      |  1 -
 addons/stock_picking_batch/__manifest__.py    |  3 --
 addons/stock_sms/__manifest__.py              |  2 -
 addons/survey/__manifest__.py                 |  2 -
 addons/survey_crm/__manifest__.py             |  1 -
 addons/test_base_automation/__manifest__.py   |  3 --
 addons/test_crm_full/__manifest__.py          |  2 -
 addons/test_discuss_full/__manifest__.py      |  3 --
 addons/test_event_full/__manifest__.py        |  2 -
 .../test_html_field_history/__manifest__.py   |  2 -
 addons/test_import_export/__manifest__.py     |  2 -
 addons/test_mail/__manifest__.py              |  3 --
 addons/test_mail_full/__manifest__.py         |  3 --
 addons/test_mail_sms/__manifest__.py          |  3 --
 addons/test_mass_mailing/__manifest__.py      |  3 --
 addons/test_resource/__manifest__.py          |  1 -
 .../__manifest__.py                           |  1 -
 addons/test_spreadsheet/__manifest__.py       |  2 -
 addons/test_website/__manifest__.py           |  3 --
 addons/test_website_modules/__manifest__.py   |  3 --
 .../test_website_slides_full/__manifest__.py  |  3 --
 addons/theme_default/__manifest__.py          |  2 -
 addons/transifex/__manifest__.py              |  2 -
 addons/uom/__manifest__.py                    |  3 --
 addons/utm/__manifest__.py                    |  1 -
 addons/web/__manifest__.py                    |  2 -
 addons/web_hierarchy/__manifest__.py          |  1 -
 addons/web_tour/__manifest__.py               |  2 -
 addons/web_unsplash/__manifest__.py           |  1 -
 addons/website/__manifest__.py                |  2 -
 addons/website_blog/__manifest__.py           |  2 -
 addons/website_cf_turnstile/__manifest__.py   |  3 --
 addons/website_crm/__manifest__.py            |  2 -
 addons/website_crm_iap_reveal/__manifest__.py |  1 -
 addons/website_crm_livechat/__manifest__.py   |  3 --
 .../__manifest__.py                           |  2 -
 addons/website_crm_sms/__manifest__.py        |  3 --
 addons/website_customer/__manifest__.py       |  3 --
 addons/website_event/__manifest__.py          |  1 -
 addons/website_event_booth/__manifest__.py    |  2 -
 .../__manifest__.py                           |  1 -
 .../website_event_booth_sale/__manifest__.py  |  2 -
 .../__manifest__.py                           |  2 -
 addons/website_event_crm/__manifest__.py      |  3 --
 .../website_event_exhibitor/__manifest__.py   |  2 -
 addons/website_event_sale/__manifest__.py     |  1 -
 addons/website_event_track/__manifest__.py    |  1 -
 .../website_event_track_live/__manifest__.py  |  3 --
 .../__manifest__.py                           |  3 --
 .../website_event_track_quiz/__manifest__.py  |  3 --
 addons/website_forum/__manifest__.py          |  2 -
 addons/website_google_map/__manifest__.py     |  3 --
 addons/website_hr_recruitment/__manifest__.py |  2 -
 .../__manifest__.py                           |  2 -
 addons/website_links/__manifest__.py          |  1 -
 addons/website_livechat/__manifest__.py       |  3 --
 addons/website_mail/__manifest__.py           |  2 -
 addons/website_mail_group/__manifest__.py     |  2 -
 addons/website_mass_mailing/__manifest__.py   |  2 -
 .../website_mass_mailing_sms/__manifest__.py  |  4 +-
 addons/website_partner/__manifest__.py        |  2 -
 addons/website_payment/__manifest__.py        |  2 -
 addons/website_profile/__manifest__.py        |  2 -
 addons/website_project/__manifest__.py        |  3 --
 addons/website_sale/__manifest__.py           |  1 -
 .../website_sale_autocomplete/__manifest__.py |  2 -
 addons/website_sale_collect/__manifest__.py   |  1 -
 .../website_sale_comparison/__manifest__.py   |  2 -
 addons/website_sale_loyalty/__manifest__.py   |  1 -
 .../website_sale_mass_mailing/__manifest__.py |  1 -
 .../website_sale_mondialrelay/__manifest__.py |  1 -
 addons/website_sale_mrp/__manifest__.py       |  1 -
 addons/website_sale_slides/__manifest__.py    |  3 --
 addons/website_sale_wishlist/__manifest__.py  |  2 -
 addons/website_slides/__manifest__.py         |  2 -
 addons/website_slides_forum/__manifest__.py   |  2 -
 addons/website_slides_survey/__manifest__.py  |  3 --
 addons/website_sms/__manifest__.py            |  3 --
 addons/website_timesheet/__manifest__.py      |  2 -
 odoo/addons/base/__manifest__.py              |  2 -
 .../test_install_auto/__manifest__.py         |  1 -
 odoo/addons/test_assetsbundle/__manifest__.py |  2 -
 odoo/addons/test_http/__manifest__.py         |  2 -
 odoo/addons/test_inherit/__manifest__.py      |  2 -
 .../test_inherit_depends/__manifest__.py      |  2 -
 .../test_inherits_depends/__manifest__.py     |  1 -
 odoo/addons/test_l10n/__manifest__.py         |  1 -
 odoo/addons/test_lint/__manifest__.py         |  2 -
 odoo/addons/test_lint/tests/test_manifests.py | 40 ++++++++++++++-----
 odoo/addons/test_main_flows/__manifest__.py   |  3 --
 odoo/addons/test_orm/__manifest__.py          |  2 -
 .../test_testing_utilities/__manifest__.py    |  1 -
 odoo/addons/test_translation/__manifest__.py  |  1 -
 odoo/addons/test_uninstall/__manifest__.py    |  2 -
 .../l10n_payroll/__manifest__.py.template     |  1 -
 486 files changed, 42 insertions(+), 901 deletions(-)

diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index ea7d6da0b053c..9fbd6e83813f3 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Invoicing',
@@ -91,7 +90,6 @@
     'demo': [
         'demo/account_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'post_init_hook': '_account_post_init',
     'assets': {
diff --git a/addons/account_check_printing/__manifest__.py b/addons/account_check_printing/__manifest__.py
index 83af71a2bce17..4c63a8aa520e8 100644
--- a/addons/account_check_printing/__manifest__.py
+++ b/addons/account_check_printing/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Check Printing Base',
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'summary': 'Check printing basic features',
     'description': """
@@ -20,7 +18,6 @@
         'views/res_config_settings_views.xml',
         'wizard/print_prenumbered_checks_views.xml'
     ],
-    'installable': True,
     'post_init_hook': 'create_check_sequence_on_bank_journals',
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/account_debit_note/__manifest__.py b/addons/account_debit_note/__manifest__.py
index dedd43e0c0404..adcfb8e42ca01 100644
--- a/addons/account_debit_note/__manifest__.py
+++ b/addons/account_debit_note/__manifest__.py
@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Debit Notes',
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'summary': 'Debit Notes',
     'description': """
-In a lot of countries, a debit note is used as an increase of the amounts of an existing invoice 
-or in some specific cases to cancel a credit note. 
-It is like a regular invoice, but we need to keep track of the link with the original invoice.  
+In a lot of countries, a debit note is used as an increase of the amounts of an existing invoice
+or in some specific cases to cancel a credit note.
+It is like a regular invoice, but we need to keep track of the link with the original invoice.
 The wizard used is similar as the one for the credit note.
     """,
     'depends': ['account'],
@@ -19,7 +17,6 @@
         'views/account_journal_views.xml',
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/account_edi/__manifest__.py b/addons/account_edi/__manifest__.py
index cb3162420aed6..4e6e68a840e10 100644
--- a/addons/account_edi/__manifest__.py
+++ b/addons/account_edi/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name' : 'Import/Export Invoices From XML/PDF',
     'description':"""
@@ -10,7 +9,6 @@
 the transmission of said documents to various parties involved in the exchange (other company,
 governements, etc.)
     """,
-    'version' : '1.0',
     'category': 'Accounting/Accounting',
     'depends' : ['account'],
     'data': [
@@ -20,7 +18,6 @@
         'views/account_journal_views.xml',
         'data/cron.xml'
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/account_edi_proxy_client/__manifest__.py b/addons/account_edi_proxy_client/__manifest__.py
index dcbfe254b64ff..8ee3e70946745 100644
--- a/addons/account_edi_proxy_client/__manifest__.py
+++ b/addons/account_edi_proxy_client/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'Proxy features for account_edi',
     'description': """
@@ -9,7 +8,6 @@
 - Encryption features allows to decrypt all the user's data when receiving it from the proxy.
 - Authentication offers an additionnal level of security to avoid impersonification, in case someone gains to the user's database.
     """,
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'depends': ['account', 'certificate'],
     'data': [
@@ -17,7 +15,6 @@
         'security/account_edi_proxy_client_security.xml',
         'views/account_edi_proxy_user_views.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
     'post_init_hook': '_create_demo_config_param',
diff --git a/addons/account_edi_ubl_cii/__manifest__.py b/addons/account_edi_ubl_cii/__manifest__.py
index d949090f8053b..913a040cba2c4 100644
--- a/addons/account_edi_ubl_cii/__manifest__.py
+++ b/addons/account_edi_ubl_cii/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': "Import/Export electronic invoices with UBL/CII",
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'description': """
 Electronic invoicing module
@@ -32,7 +31,6 @@
             'account_edi_ubl_cii/static/src/scss/**/*',
         ],
     },
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/account_fleet/__manifest__.py b/addons/account_fleet/__manifest__.py
index 9157a8735b9de..3f92e3741ff24 100644
--- a/addons/account_fleet/__manifest__.py
+++ b/addons/account_fleet/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Accounting/Fleet bridge',
     'category': 'Accounting/Accounting',
     'summary': 'Manage accounting with fleets',
-    'version': '1.0',
     'depends': ['fleet', 'account'],
     'data': [
         'data/fleet_service_type_data.xml',
@@ -12,7 +10,6 @@
         'views/fleet_vehicle_views.xml',
         'views/fleet_vehicle_log_services_views.xml'
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/account_qr_code_emv/__manifest__.py b/addons/account_qr_code_emv/__manifest__.py
index ea7380ed660c8..d90cb0784b403 100644
--- a/addons/account_qr_code_emv/__manifest__.py
+++ b/addons/account_qr_code_emv/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'account_qr_code_emv',
     'category': 'Accounting/Payment',
-    'version': '1.0',
     'description': """
 Bridge module addings support for EMV Merchant-Presented QR-code generation for Payment System.
     """,
diff --git a/addons/account_qr_code_sepa/__manifest__.py b/addons/account_qr_code_sepa/__manifest__.py
index 3892d544e8907..58b6c65da3f8f 100644
--- a/addons/account_qr_code_sepa/__manifest__.py
+++ b/addons/account_qr_code_sepa/__manifest__.py
@@ -1,17 +1,11 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Account SEPA QR Code",
-
     'description': """
 This module adds support for SEPA Credit Transfer QR-code generation.
     """,
-
     'category': 'Accounting/Payment',
     'version': '0.1',
-
-    # any module necessary for this one to work correctly
     'depends': ['account', 'base_iban'],
-
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/account_tax_python/__manifest__.py b/addons/account_tax_python/__manifest__.py
index 90374b1a0b590..f7b4981d22132 100644
--- a/addons/account_tax_python/__manifest__.py
+++ b/addons/account_tax_python/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -12,7 +11,6 @@
 "Python Code" defines the amount of the tax.
         """,
     'category': 'Accounting/Accounting',
-    'version': '1.0',
     'depends': ['account'],
     'data': [
         'views/account_tax_views.xml',
diff --git a/addons/account_test/__manifest__.py b/addons/account_test/__manifest__.py
index 199b436e452d2..d6cf1a89d13fa 100644
--- a/addons/account_test/__manifest__.py
+++ b/addons/account_test/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # Copyright (c) 2011 CCI Connect asbl (http://www.cciconnect.be) All Rights Reserved.
@@ -6,15 +5,14 @@
 
 {
     'name': 'Accounting Consistency Tests',
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'description': """
 Asserts on accounting.
 ======================
 With this module you can manually check consistencies and inconsistencies of accounting module from menu Reporting/Accounting/Accounting Tests.
 
-You can write a query in order to create Consistency Test and you will get the result of the test 
-in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test 
+You can write a query in order to create Consistency Test and you will get the result of the test
+in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test
 and print the report from Print button in header area.
 """,
     'depends': ['account'],
@@ -25,7 +23,6 @@
         'data/accounting_assert_test_data.xml',
         'report/report_account_test_templates.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/account_update_tax_tags/__manifest__.py b/addons/account_update_tax_tags/__manifest__.py
index b3e5344af7d33..28397c8b0c6a2 100644
--- a/addons/account_update_tax_tags/__manifest__.py
+++ b/addons/account_update_tax_tags/__manifest__.py
@@ -2,7 +2,6 @@
     'name': 'Account - Allow updating tax grids',
     'category': 'Accounting/Accounting',
     'summary': 'Allow updating tax grids on existing entries',
-    'version': '1.0',
     'description': """
     This module allows updating tax grids on existing accounting entries.
     In debug mode a button to update your entries' tax grids will be available
diff --git a/addons/analytic/__manifest__.py b/addons/analytic/__manifest__.py
index 900b105554d29..a687924ad70d2 100644
--- a/addons/analytic/__manifest__.py
+++ b/addons/analytic/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -42,7 +41,6 @@
             'analytic/static/tests/**/*',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/api_doc/__manifest__.py b/addons/api_doc/__manifest__.py
index 1e2f864cb7c0f..8b9425a947df4 100644
--- a/addons/api_doc/__manifest__.py
+++ b/addons/api_doc/__manifest__.py
@@ -1,7 +1,6 @@
 {
     'name': 'API Documentation',
     'category': 'Hidden',
-    'version': '1.0',
     'description': """
 Odoo Dynamic API Documentation
 ==============================
diff --git a/addons/attachment_indexation/__manifest__.py b/addons/attachment_indexation/__manifest__.py
index 5707db00accd0..e851f370b7d0d 100644
--- a/addons/attachment_indexation/__manifest__.py
+++ b/addons/attachment_indexation/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Attachments List and Document Indexation',
@@ -13,7 +12,6 @@
 The `pdfminer.six` Python library has to be installed in order to index PDF files
 """,
     'depends': ['web'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/auth_oauth/__manifest__.py b/addons/auth_oauth/__manifest__.py
index 60ed723c3957e..3738973cb2615 100644
--- a/addons/auth_oauth/__manifest__.py
+++ b/addons/auth_oauth/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/auth_passkey_portal/__manifest__.py b/addons/auth_passkey_portal/__manifest__.py
index 7f1390e62ea4d..699bfa4beb74a 100644
--- a/addons/auth_passkey_portal/__manifest__.py
+++ b/addons/auth_passkey_portal/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Passkeys Portal',
-    'version': '1.0',
     'summary': 'Passkeys for portal users',
     'description': """
 The implementation of Passkeys using the webauthn protocol.
diff --git a/addons/auth_signup/__manifest__.py b/addons/auth_signup/__manifest__.py
index 994203390e26e..70478686edccb 100644
--- a/addons/auth_signup/__manifest__.py
+++ b/addons/auth_signup/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -7,7 +6,6 @@
 Allow users to sign up and reset their password
 ===============================================
     """,
-    'version': '1.0',
     'category': 'Hidden/Tools',
     'auto_install': True,
     'depends': [
diff --git a/addons/barcodes/__manifest__.py b/addons/barcodes/__manifest__.py
index 4754f58b0c21b..9e9b1f3450eab 100644
--- a/addons/barcodes/__manifest__.py
+++ b/addons/barcodes/__manifest__.py
@@ -9,7 +9,6 @@
         'views/barcodes_view.xml',
         'security/ir.model.access.csv',
         ],
-    'installable': True,
     'post_init_hook': '_assign_default_nomeclature_id',
     'assets': {
         'web.assets_backend': [
diff --git a/addons/barcodes_gs1_nomenclature/__manifest__.py b/addons/barcodes_gs1_nomenclature/__manifest__.py
index e64bb1eb3a635..a672f3373bb9b 100644
--- a/addons/barcodes_gs1_nomenclature/__manifest__.py
+++ b/addons/barcodes_gs1_nomenclature/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Barcode - GS1 Nomenclature',
-    'version': '1.0',
     'category': 'Supply Chain/Inventory',
     'summary': 'Parse barcodes according to the GS1-128 specifications',
     'depends': ['barcodes', 'uom'],
@@ -10,7 +9,6 @@
         'data/barcodes_gs1_rules.xml',
         'views/barcodes_view.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'barcodes_gs1_nomenclature/static/src/js/barcode_parser.js',
diff --git a/addons/base_address_extended/__manifest__.py b/addons/base_address_extended/__manifest__.py
index 837c5c2861014..e52bf1c01fef0 100644
--- a/addons/base_address_extended/__manifest__.py
+++ b/addons/base_address_extended/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Extended Addresses',
diff --git a/addons/base_automation/__manifest__.py b/addons/base_automation/__manifest__.py
index dc87400390755..be27d8b744c0c 100644
--- a/addons/base_automation/__manifest__.py
+++ b/addons/base_automation/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Automation Rules',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'description': """
 This module allows to implement automation rules for any object.
diff --git a/addons/base_geolocalize/__manifest__.py b/addons/base_geolocalize/__manifest__.py
index e6642575fb22e..eef815c223489 100644
--- a/addons/base_geolocalize/__manifest__.py
+++ b/addons/base_geolocalize/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Partners Geolocation',
@@ -16,7 +15,6 @@
         'views/res_config_settings_views.xml',
         'data/data.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/base_iban/__manifest__.py b/addons/base_iban/__manifest__.py
index 9740004cbce48..977e30fb700aa 100644
--- a/addons/base_iban/__manifest__.py
+++ b/addons/base_iban/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'IBAN Bank Accounts',
diff --git a/addons/base_import/__manifest__.py b/addons/base_import/__manifest__.py
index 6b6e324d5f70f..e8c9efcac7f9d 100644
--- a/addons/base_import/__manifest__.py
+++ b/addons/base_import/__manifest__.py
@@ -24,7 +24,6 @@
     'depends': ['web'],
     'version': '2.0',
     'category': 'Hidden/Tools',
-    'installable': True,
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/base_import_module/__manifest__.py b/addons/base_import_module/__manifest__.py
index 91680b193f5e9..a1b57db884f51 100644
--- a/addons/base_import_module/__manifest__.py
+++ b/addons/base_import_module/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Base import module',
@@ -11,7 +10,6 @@
 """,
     'category': 'Hidden/Tools',
     'depends': ['web'],
-    'installable': True,
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/base_install_request/__manifest__.py b/addons/base_install_request/__manifest__.py
index 3486c969fd931..422a28591a996 100644
--- a/addons/base_install_request/__manifest__.py
+++ b/addons/base_install_request/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/base_setup/__manifest__.py b/addons/base_setup/__manifest__.py
index 92ae94dd346f4..d34741f110a80 100644
--- a/addons/base_setup/__manifest__.py
+++ b/addons/base_setup/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Initial Setup Tools',
-    'version': '1.0',
     'category': 'Hidden',
     'description': """
 This module helps to configure the system at the installation of a new database.
@@ -16,15 +14,13 @@
         'data/base_setup_data.xml',
         'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
-        ],
+    ],
     'assets': {
         'web.assets_backend': [
             'base_setup/static/src/views/**/*',
         ],
     },
     'auto_install': True,
-    'installable': True,
-
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/base_sparse_field/__manifest__.py b/addons/base_sparse_field/__manifest__.py
index c487ecfef4f50..375f8f5989db4 100644
--- a/addons/base_sparse_field/__manifest__.py
+++ b/addons/base_sparse_field/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Sparse Fields",
     'summary': """Implementation of sparse fields.""",
@@ -9,7 +8,6 @@
 fields are stored in a "serialized" field in the form of a JSON mapping.
     """,
     'category': 'Hidden',
-    'version': '1.0',
     'depends': ['base'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/base_vat/__manifest__.py b/addons/base_vat/__manifest__.py
index 1231920ddad64..c48a627c754b7 100644
--- a/addons/base_vat/__manifest__.py
+++ b/addons/base_vat/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/board/__manifest__.py b/addons/board/__manifest__.py
index b74f13bd9bc51..628fb3950a90c 100644
--- a/addons/board/__manifest__.py
+++ b/addons/board/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Dashboards',
-    'version': '1.0',
     'category': 'Productivity',
     'sequence': 225,
     'summary': 'Build your own dashboards',
diff --git a/addons/bus/__manifest__.py b/addons/bus/__manifest__.py
index 2fdfb24697ca6..8eb4fb9920edf 100644
--- a/addons/bus/__manifest__.py
+++ b/addons/bus/__manifest__.py
@@ -1,13 +1,11 @@
 {
     'name' : 'IM Bus',
-    'version': '1.0',
     'category': 'Hidden',
     'description': "Instant Messaging Bus allow you to send messages to users, in live.",
     'depends': ['base', 'web'],
     'data': [
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index 3d14d9e3d6f90..b360571b21952 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -39,7 +39,6 @@
         'wizard/calendar_popover_delete_wizard.xml',
         'wizard/mail_activity_schedule_views.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/calendar_sms/__manifest__.py b/addons/calendar_sms/__manifest__.py
index d6b0501eaaff4..956a8dc2dfd59 100644
--- a/addons/calendar_sms/__manifest__.py
+++ b/addons/calendar_sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/certificate/__manifest__.py b/addons/certificate/__manifest__.py
index 95e5c585e1693..9dab513594c88 100644
--- a/addons/certificate/__manifest__.py
+++ b/addons/certificate/__manifest__.py
@@ -3,7 +3,6 @@
     'version': '0.1',
     'category': 'Hidden/Tools',
     'summary': 'Manage certificate',
-    'installable': True,
     'data': [
         'security/ir.model.access.csv',
         'security/certificate_security.xml',
diff --git a/addons/cloud_storage/__manifest__.py b/addons/cloud_storage/__manifest__.py
index 309c20594cf15..04fb1c67461e6 100644
--- a/addons/cloud_storage/__manifest__.py
+++ b/addons/cloud_storage/__manifest__.py
@@ -4,7 +4,6 @@
     "name": "Cloud Storage",
     "summary": """Store chatter attachments in the cloud""",
     "category": "Technical Settings",
-    "version": "1.0",
     "depends": ["base_setup", "mail"],
     "data": [
         "views/settings.xml",
diff --git a/addons/cloud_storage_azure/__manifest__.py b/addons/cloud_storage_azure/__manifest__.py
index 6be24af978dad..995ac54f1d815 100644
--- a/addons/cloud_storage_azure/__manifest__.py
+++ b/addons/cloud_storage_azure/__manifest__.py
@@ -4,7 +4,6 @@
     "name": "Cloud Storage Azure",
     "summary": """Store chatter attachments in the Azure cloud""",
     "category": "Technical Settings",
-    "version": "1.0",
     "depends": ["cloud_storage"],
     "data": [
         "views/settings.xml",
diff --git a/addons/cloud_storage_google/__manifest__.py b/addons/cloud_storage_google/__manifest__.py
index 1336dcff1c5bc..e95ec4a8d6b3b 100644
--- a/addons/cloud_storage_google/__manifest__.py
+++ b/addons/cloud_storage_google/__manifest__.py
@@ -4,7 +4,6 @@
     "name": "Cloud Storage Google",
     "summary": """Store chatter attachments in the Google cloud""",
     "category": "Technical Settings",
-    "version": "1.0",
     "depends": ["cloud_storage"],
     "data": [
         "views/settings.xml",
diff --git a/addons/contacts/__manifest__.py b/addons/contacts/__manifest__.py
index d82c4fd7d41c1..fab05e43ec4e2 100644
--- a/addons/contacts/__manifest__.py
+++ b/addons/contacts/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index 499c3986b0666..fa3fd8637462e 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -67,7 +66,6 @@
         'data/crm_team_member_demo.xml',
         'data/crm_lead_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/crm_iap_enrich/__manifest__.py b/addons/crm_iap_enrich/__manifest__.py
index 2a7c7fce04c94..55f5a71a713a3 100644
--- a/addons/crm_iap_enrich/__manifest__.py
+++ b/addons/crm_iap_enrich/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/crm_iap_mine/__manifest__.py b/addons/crm_iap_mine/__manifest__.py
index 576ec4e178a64..159f255491f68 100644
--- a/addons/crm_iap_mine/__manifest__.py
+++ b/addons/crm_iap_mine/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/crm_livechat/__manifest__.py b/addons/crm_livechat/__manifest__.py
index d851d57e7637a..fa35aa140993f 100644
--- a/addons/crm_livechat/__manifest__.py
+++ b/addons/crm_livechat/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/crm_mail_plugin/__manifest__.py b/addons/crm_mail_plugin/__manifest__.py
index bc496eeb948fa..b54ee41de44e1 100644
--- a/addons/crm_mail_plugin/__manifest__.py
+++ b/addons/crm_mail_plugin/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'CRM Mail Plugin',
-    'version': '1.0',
     'category': 'Sales/CRM',
     'sequence': 5,
     'summary': 'Turn emails received in your mailbox into leads and log their content as internal notes.',
@@ -17,7 +15,6 @@
         'views/crm_mail_plugin_lead.xml',
         'views/crm_lead_views.xml'
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/crm_sms/__manifest__.py b/addons/crm_sms/__manifest__.py
index 7d4549717359b..b8e7184fff271 100644
--- a/addons/crm_sms/__manifest__.py
+++ b/addons/crm_sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -12,7 +11,6 @@
         'security/ir.model.access.csv',
         'security/sms_security.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/data_recycle/__manifest__.py b/addons/data_recycle/__manifest__.py
index 4b1543579c1f0..16ee1be702f69 100644
--- a/addons/data_recycle/__manifest__.py
+++ b/addons/data_recycle/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -16,7 +15,6 @@
         'views/data_recycle_templates.xml',
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/delivery/__manifest__.py b/addons/delivery/__manifest__.py
index a81fba96f9c33..c54c12cdfa795 100644
--- a/addons/delivery/__manifest__.py
+++ b/addons/delivery/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Delivery Costs',
-    'version': '1.0',
     'category': 'Sales/Delivery',
     'description': """
 Allows you to add delivery methods in sale orders.
@@ -41,7 +40,6 @@
     },
     'post_init_hook': 'post_init_hook',
     'uninstall_hook': 'uninstall_hook',
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/delivery_mondialrelay/__manifest__.py b/addons/delivery_mondialrelay/__manifest__.py
index 8bbe55e7f6999..100e2d8dcae58 100644
--- a/addons/delivery_mondialrelay/__manifest__.py
+++ b/addons/delivery_mondialrelay/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "delivery_mondialrelay",
     'summary': """ Let's choose a Point Relais® as shipping address """,
diff --git a/addons/delivery_stock_picking_batch/__manifest__.py b/addons/delivery_stock_picking_batch/__manifest__.py
index d8cc9a58af882..a20e44c2dacb9 100644
--- a/addons/delivery_stock_picking_batch/__manifest__.py
+++ b/addons/delivery_stock_picking_batch/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Delivery Stock Picking Batch',
-    'version': '1.0',
     'category': 'Supply Chain/Inventory',
     'summary': 'Batch Transfer, Carrier',
     'description': """
@@ -15,7 +13,6 @@
     'data': [
         'views/stock_picking_type_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/digest/__manifest__.py b/addons/digest/__manifest__.py
index 6ee68b6fd27c0..5e0fcae6c14e5 100644
--- a/addons/digest/__manifest__.py
+++ b/addons/digest/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'KPI Digests',
@@ -23,7 +22,6 @@
         'views/digest_templates.xml',
         'views/res_config_settings_views.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index 0894ec14678b7..0312821e7bfd8 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'Events Organization',
     'version': '1.9',
@@ -51,7 +50,6 @@
         'data/event_demo.xml',
         'data/event_registration_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'event/static/src/client_action/**/*',
diff --git a/addons/event_booth/__manifest__.py b/addons/event_booth/__manifest__.py
index 0f44bbc3875b4..b87e554b23ba1 100644
--- a/addons/event_booth/__manifest__.py
+++ b/addons/event_booth/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/event_booth_sale/__manifest__.py b/addons/event_booth_sale/__manifest__.py
index 2dc92e01fab8b..7d346af338f0d 100644
--- a/addons/event_booth_sale/__manifest__.py
+++ b/addons/event_booth_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/event_crm/__manifest__.py b/addons/event_crm/__manifest__.py
index 2a617b66cf921..ed5522922fe29 100644
--- a/addons/event_crm/__manifest__.py
+++ b/addons/event_crm/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Event CRM',
-    'version': '1.0',
     'category': 'Marketing/Events',
     'website': 'https://www.odoo.com/app/events',
     'description': "Create leads from event registrations.",
@@ -28,7 +26,6 @@
             'event_crm/static/tests/tours/*.js',
         ],
     },
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/event_crm_sale/__manifest__.py b/addons/event_crm_sale/__manifest__.py
index d8e088dfc27af..4551bdf16f5db 100644
--- a/addons/event_crm_sale/__manifest__.py
+++ b/addons/event_crm_sale/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Event CRM Sale',
-    'version': '1.0',
     'category': 'Marketing/Events',
     'website': 'https://www.odoo.com/app/events',
     'description': "Add information of sale order linked to the registration for the creation of the lead.",
@@ -11,7 +9,6 @@
     'data': [
         'views/event_lead_rule_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/event_product/__manifest__.py b/addons/event_product/__manifest__.py
index b0742fefb19cd..a26a2ded276b2 100644
--- a/addons/event_product/__manifest__.py
+++ b/addons/event_product/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Events Product',
-    'version': '1.0',
     'category': 'Marketing/Events',
     'depends': ['event', 'product', 'account'],
     'data': [
@@ -12,7 +11,6 @@
         'data/event_product_demo.xml',
         'data/event_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {},
     'author': 'Odoo S.A.',
diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py
index 4f116f541e8a8..5c8373bf9dfde 100644
--- a/addons/event_sale/__manifest__.py
+++ b/addons/event_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Events Sales',
@@ -37,7 +36,6 @@
         'data/event_sale_demo.xml',
         'data/event_registration_demo.xml',  # needs event_sale_demo
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/event_sms/__manifest__.py b/addons/event_sms/__manifest__.py
index 582855ae69060..0f280c5e41556 100644
--- a/addons/event_sms/__manifest__.py
+++ b/addons/event_sms/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'SMS on Events',
-    'version': '1.0',
     'category': 'Marketing/Events',
     'description': """Schedule SMS in event management""",
     'depends': ['event', 'sms'],
@@ -12,7 +10,6 @@
         'security/ir.model.access.csv',
         'security/sms_security.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/fleet/__manifest__.py b/addons/fleet/__manifest__.py
index e65ecab3a3b82..8308bee183dd8 100644
--- a/addons/fleet/__manifest__.py
+++ b/addons/fleet/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name' : 'Fleet',
@@ -47,7 +46,6 @@
 
     'demo': ['data/fleet_demo.xml'],
 
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/gamification/__manifest__.py b/addons/gamification/__manifest__.py
index b68852a98e8b4..871b582b3e7ce 100644
--- a/addons/gamification/__manifest__.py
+++ b/addons/gamification/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Gamification',
-    'version': '1.0',
     'sequence': 160,
     'category': 'Human Resources',
     'depends': ['mail'],
diff --git a/addons/gamification_sale_crm/__manifest__.py b/addons/gamification_sale_crm/__manifest__.py
index c07e2d1bd0f74..1816fe844eff7 100644
--- a/addons/gamification_sale_crm/__manifest__.py
+++ b/addons/gamification_sale_crm/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'CRM Gamification',
-    'version': '1.0',
     'category': 'Sales/CRM',
     'depends': ['gamification', 'sale_crm'],
     'description': """Example of goal definitions and challenges that can be used related to the usage of the CRM Sale module.""",
diff --git a/addons/google_account/__manifest__.py b/addons/google_account/__manifest__.py
index 9a1ffcff4b2e1..44da94f5cb8e2 100644
--- a/addons/google_account/__manifest__.py
+++ b/addons/google_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/google_address_autocomplete/__manifest__.py b/addons/google_address_autocomplete/__manifest__.py
index 44702a6fdc869..3332aa8558538 100644
--- a/addons/google_address_autocomplete/__manifest__.py
+++ b/addons/google_address_autocomplete/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': "Google Address Autocomplete",
     'summary': 'Assist with automatic completion & suggestions when filling address',
-    'version': '1.0',
     'description': """
 This module Auto complete the address data.
     """,
diff --git a/addons/google_calendar/__manifest__.py b/addons/google_calendar/__manifest__.py
index 97d4af8296d73..8840264ccc8c9 100644
--- a/addons/google_calendar/__manifest__.py
+++ b/addons/google_calendar/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Google Calendar',
-    'version': '1.0',
     'category': 'Productivity',
     'depends': ['google_account', 'calendar'],
     'data': [
@@ -13,7 +12,6 @@
         'views/res_users_views.xml',
         'views/google_calendar_views.xml',
         ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'google_calendar/static/src/scss/google_calendar.scss',
diff --git a/addons/google_gmail/__manifest__.py b/addons/google_gmail/__manifest__.py
index 7f19ab5c9df7d..fa88e4b2b4f01 100644
--- a/addons/google_gmail/__manifest__.py
+++ b/addons/google_gmail/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/google_recaptcha/__manifest__.py b/addons/google_recaptcha/__manifest__.py
index 0dcee1649c855..0a3400baab2b1 100644
--- a/addons/google_recaptcha/__manifest__.py
+++ b/addons/google_recaptcha/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Google reCAPTCHA integration',
     'category': 'Hidden',
-    'version': '1.0',
     'description': """
 This module implements reCaptchaV3 so that you can prevent bot spam on your public modules.
     """,
diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py
index d13735f0f687b..0380fd432e755 100644
--- a/addons/hr/__manifest__.py
+++ b/addons/hr/__manifest__.py
@@ -51,7 +51,6 @@
     'demo': [
         'data/hr_demo.xml'
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web._assets_primary_variables': [
diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index b1b70984d6b01..c9625035746c3 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/addons/hr_attendance/__manifest__.py
@@ -33,7 +33,6 @@
     'demo': [
         'data/hr_attendance_demo.xml'
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/hr_calendar/__manifest__.py b/addons/hr_calendar/__manifest__.py
index 0c199f66f4e18..98f4226d0b272 100644
--- a/addons/hr_calendar/__manifest__.py
+++ b/addons/hr_calendar/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Display Working Hours in Calendar",
-    'version': '1.0',
     'category': 'Human Resources/Employees',
     'depends': ['hr', 'calendar'],
     'auto_install': True,
diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index 645913f60cc25..e1adc7c1554b6 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -54,7 +53,6 @@
         'views/hr_employee_views.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/hr_fleet/__manifest__.py b/addons/hr_fleet/__manifest__.py
index 3d86f191611b7..56fc4f371acf6 100644
--- a/addons/hr_fleet/__manifest__.py
+++ b/addons/hr_fleet/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Fleet History',
-    'version': '1.0',
     'category': 'Human Resources',
     'summary': 'Get history of driven cars by employees',
     'depends': ['hr', 'fleet'],
diff --git a/addons/hr_gamification/__manifest__.py b/addons/hr_gamification/__manifest__.py
index 867702d1b7c05..ed41f354461fc 100644
--- a/addons/hr_gamification/__manifest__.py
+++ b/addons/hr_gamification/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'HR Gamification',
-    'version': '1.0',
     'category': 'Human Resources',
     'depends': ['gamification', 'hr'],
     'description': """Use the HR resources for the gamification process.
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index 696aa2f4cbc53..65e456710673b 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -64,7 +63,6 @@
     'demo': [
         'data/hr_holidays_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/hr_holidays_attendance/__manifest__.py b/addons/hr_holidays_attendance/__manifest__.py
index 37db10093cf1f..74c1fdbdef719 100644
--- a/addons/hr_holidays_attendance/__manifest__.py
+++ b/addons/hr_holidays_attendance/__manifest__.py
@@ -6,7 +6,6 @@
     'description': """
 Convert employee's extra hours to leave allocations.
     """,
-    'version': '1.0',
     'depends': ['hr_attendance', 'hr_holidays'],
     'auto_install': True,
     'data': [
diff --git a/addons/hr_homeworking/__manifest__.py b/addons/hr_homeworking/__manifest__.py
index 730ab59a74d2e..d8bfe078f6ee9 100644
--- a/addons/hr_homeworking/__manifest__.py
+++ b/addons/hr_homeworking/__manifest__.py
@@ -11,7 +11,6 @@
         'views/hr_employee_views.xml',
         'views/res_users.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/hr_homeworking_calendar/__manifest__.py b/addons/hr_homeworking_calendar/__manifest__.py
index f9b6715b1ee5a..60b3531684d89 100644
--- a/addons/hr_homeworking_calendar/__manifest__.py
+++ b/addons/hr_homeworking_calendar/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Remote Work with calendar',
-    'version': '1.0',
     'category': 'Human Resources/Remote Work',
     'depends': ['hr_homeworking', 'calendar'],
     'data': [
@@ -10,7 +9,6 @@
         'security/ir.model.access.csv',
         'wizard/homework_location_wizard.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/hr_livechat/__manifest__.py b/addons/hr_livechat/__manifest__.py
index dc4a661dd16b2..aa6f3822d87c0 100644
--- a/addons/hr_livechat/__manifest__.py
+++ b/addons/hr_livechat/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'HR - Livechat',
-    'version': '1.0',
     'category': 'Human Resources',
     'description': """
 Bridge between HR and Livechat.""",
diff --git a/addons/hr_maintenance/__manifest__.py b/addons/hr_maintenance/__manifest__.py
index 91d1858ff2b80..58ce8a76d6703 100644
--- a/addons/hr_maintenance/__manifest__.py
+++ b/addons/hr_maintenance/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Maintenance - HR',
-    'version': '1.0',
     'sequence': 125,
     'category': 'Human Resources',
     'description': """
@@ -15,7 +13,6 @@
         'views/hr_views.xml',
         'wizard/hr_departure_wizard_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/hr_presence/__manifest__.py b/addons/hr_presence/__manifest__.py
index bd94d45d08413..b25699b862d35 100644
--- a/addons/hr_presence/__manifest__.py
+++ b/addons/hr_presence/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Employee Presence Control',
-    'version': '1.0',
     'category': 'Human Resources',
     'description': """
 Control Employees Presence
@@ -24,7 +23,6 @@
         'data/sms_data.xml',
         'data/ir_cron.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
      'assets': {
diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py
index 96360db8e1a25..be0a436669d55 100644
--- a/addons/hr_recruitment/__manifest__.py
+++ b/addons/hr_recruitment/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -48,7 +47,6 @@
     'demo': [
         'data/hr_recruitment_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/hr_recruitment_skills/__manifest__.py b/addons/hr_recruitment_skills/__manifest__.py
index 8a36752978d94..ae15ef5f9d338 100644
--- a/addons/hr_recruitment_skills/__manifest__.py
+++ b/addons/hr_recruitment_skills/__manifest__.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Recruitment - Skills Management',
     'category': 'Human Resources/Recruitment',
     'sequence': 270,
-    'version': '1.0',
     'summary': 'Manage skills of your employees',
     'depends': ['hr_skills', 'hr_recruitment'],
     'data': [
@@ -23,7 +21,6 @@
     'demo': [
         'data/hr_recruitment_skills_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/hr_recruitment_sms/__manifest__.py b/addons/hr_recruitment_sms/__manifest__.py
index 8891f57a2c123..57cc36ac51e6f 100644
--- a/addons/hr_recruitment_sms/__manifest__.py
+++ b/addons/hr_recruitment_sms/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Recruitment - SMS',
-    'version': '1.0',
     'summary': 'Mass mailing sms to job applicants',
     'description': 'Mass mailing sms to job applicants',
     'category': 'Human Resources/Recruitment',
diff --git a/addons/hr_recruitment_survey/__manifest__.py b/addons/hr_recruitment_survey/__manifest__.py
index 53992cebfe741..c6748089dd223 100644
--- a/addons/hr_recruitment_survey/__manifest__.py
+++ b/addons/hr_recruitment_survey/__manifest__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Hr Recruitment Interview Forms",
-    'version': '1.0',
     'category': 'Human Resources',
     'summary': 'Surveys',
     'description': """
diff --git a/addons/hr_skills/__manifest__.py b/addons/hr_skills/__manifest__.py
index ffa6c2f1e1592..4eb49ca7c95e8 100644
--- a/addons/hr_skills/__manifest__.py
+++ b/addons/hr_skills/__manifest__.py
@@ -4,7 +4,6 @@
     'name': 'Skills Management',
     'category': 'Human Resources/Employees',
     'sequence': 270,
-    'version': '1.0',
     'summary': 'Manage skills, knowledge and resume of your employees',
     'description':
         """
@@ -43,7 +42,6 @@
         'data/hr_employee_skill_demo.xml',
         'data/hr.resume.line.csv',
     ],
-    'installable': True,
     'auto_install': True,
     'application': True,
     'assets': {
diff --git a/addons/hr_skills_event/__manifest__.py b/addons/hr_skills_event/__manifest__.py
index 64278fc0554c3..f1c5787fd2ad9 100644
--- a/addons/hr_skills_event/__manifest__.py
+++ b/addons/hr_skills_event/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Skills Events',
     'category': 'Hidden',
-    'version': '1.0',
     'summary': 'Link training events to resume of your employees',
     'description':
         """
diff --git a/addons/hr_skills_slides/__manifest__.py b/addons/hr_skills_slides/__manifest__.py
index 00a87291545e5..7e4cf841bb81e 100644
--- a/addons/hr_skills_slides/__manifest__.py
+++ b/addons/hr_skills_slides/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Skills e-learning',
     'category': 'Human Resources/Employees',
-    'version': '1.0',
     'summary': 'Add completed courses to resume of your employees',
     'description':
         """
diff --git a/addons/hr_skills_survey/__manifest__.py b/addons/hr_skills_survey/__manifest__.py
index 6c3055c125b88..c4ce5ffb2fde8 100644
--- a/addons/hr_skills_survey/__manifest__.py
+++ b/addons/hr_skills_survey/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Skills Certification',
     'category': 'Human Resources/Employees',
-    'version': '1.0',
     'summary': 'Add certification to resume of your employees',
     'description':
         """
diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index 46bcba634898f..75e471a54fa7a 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/addons/hr_timesheet/__manifest__.py
@@ -3,7 +3,6 @@
 
 {
     'name': 'Task Logs',
-    'version': '1.0',
     'category': 'Services/Timesheets',
     'sequence': 23,
     'summary': 'Track employee time on tasks',
@@ -46,7 +45,6 @@
     'demo': [
         'data/hr_timesheet_demo.xml',
     ],
-    'installable': True,
     'post_init_hook': 'create_internal_project',
     'uninstall_hook': '_uninstall_hook',
     'assets': {
diff --git a/addons/hr_timesheet_attendance/__manifest__.py b/addons/hr_timesheet_attendance/__manifest__.py
index 6acc0a10e63b4..6b49a9b63638c 100644
--- a/addons/hr_timesheet_attendance/__manifest__.py
+++ b/addons/hr_timesheet_attendance/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/hr_work_entry/__manifest__.py b/addons/hr_work_entry/__manifest__.py
index 816481bd2028d..c692fe22b391b 100644
--- a/addons/hr_work_entry/__manifest__.py
+++ b/addons/hr_work_entry/__manifest__.py
@@ -5,7 +5,6 @@
     'category': 'Human Resources/Employees',
     'sequence': 39,
     'summary': 'Manage work entries',
-    'installable': True,
     'depends': [
         'hr',
     ],
diff --git a/addons/hr_work_entry_holidays/__manifest__.py b/addons/hr_work_entry_holidays/__manifest__.py
index c00454f773345..ec49457f30b10 100644
--- a/addons/hr_work_entry_holidays/__manifest__.py
+++ b/addons/hr_work_entry_holidays/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Time Off in Payslips',
-    'version': '1.0',
     'category': 'Human Resources/Payroll',
     'sequence': 95,
     'summary': 'Manage Time Off in Payslips',
@@ -21,7 +19,6 @@
         'views/hr_leave_type_views.xml',
     ],
     'demo': ['data/hr_payroll_holidays_demo.xml'],
-    'installable': True,
     'auto_install': True,
     'post_init_hook': '_validate_existing_work_entry',
     'author': 'Odoo S.A.',
diff --git a/addons/html_builder/__manifest__.py b/addons/html_builder/__manifest__.py
index f55fb07044ff6..0f83c41e2a984 100644
--- a/addons/html_builder/__manifest__.py
+++ b/addons/html_builder/__manifest__.py
@@ -12,10 +12,8 @@
     # Categories can be used to filter modules in modules listing
     # Check https://github.com/odoo/odoo/blob/15.0/odoo/addons/base/data/ir_module_category_data.xml
     # for the full list
-    'category': 'Uncategorized',
     'version': '0.1',
 
-    # any module necessary for this one to work correctly
     # so stupid that we need to use the stupid defineMailModel helper, so we need
     # to depend on mail
     'depends': ['base', 'html_editor', 'mail'],
diff --git a/addons/html_editor/__manifest__.py b/addons/html_editor/__manifest__.py
index 2783518f8f749..f8c5a54103dd8 100644
--- a/addons/html_editor/__manifest__.py
+++ b/addons/html_editor/__manifest__.py
@@ -1,8 +1,6 @@
 {
     'name': "HTML Editor",
-    'summary': """
-        A Html Editor component and plugin system
-    """,
+    'summary': "A Html Editor component and plugin system.",
     'description': """
 Html Editor
 ==========================
@@ -11,7 +9,6 @@
 
     'author': "odoo",
     'website': "https://www.odoo.com",
-    'version': '1.0',
     'category': 'Hidden',
     'depends': ['base', 'bus', 'web'],
     'data': [
diff --git a/addons/iap/__manifest__.py b/addons/iap/__manifest__.py
index c7fcf0d1cf0fc..12e3bc980c22d 100644
--- a/addons/iap/__manifest__.py
+++ b/addons/iap/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/iap_crm/__manifest__.py b/addons/iap_crm/__manifest__.py
index e82d9dad129a5..4af4063e9334e 100644
--- a/addons/iap_crm/__manifest__.py
+++ b/addons/iap_crm/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -7,12 +6,10 @@
     'summary': """Bridge between IAP and CRM""",
     'description': """Bridge between IAP and CRM""",
     'category': 'Hidden/Tools',
-    'version': '1.0',
     'depends': [
         'crm',
         'iap_mail',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/iap_mail/__manifest__.py b/addons/iap_mail/__manifest__.py
index 62bb4b100cd2d..a8d0936258bb5 100644
--- a/addons/iap_mail/__manifest__.py
+++ b/addons/iap_mail/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -7,12 +6,10 @@
     'summary': """Bridge between IAP and mail""",
     'description': """Bridge between IAP and mail""",
     'category': 'Hidden/Tools',
-    'version': '1.0',
     'depends': [
         'iap',
         'mail',
     ],
-    'installable': True,
     'auto_install': True,
     'data': [
         'data/mail_templates.xml',
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index 8a8d4bb1b3e55..2d3c1223d8fd2 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'Live Chat',
-    'version': '1.0',
     'sequence': 210,
     'summary': 'Chat with your website visitors',
     'category': 'Website/Live Chat',
@@ -72,7 +70,6 @@
         "demo/im_livechat_channel/im_livechat_support_bot_session_7.xml",
     ],
     'depends': ["mail", "rating", "digest", "utm"],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_frontend': [
diff --git a/addons/l10n_account_edi_ubl_cii_tests/__manifest__.py b/addons/l10n_account_edi_ubl_cii_tests/__manifest__.py
index caa6908c13722..cf78494338e53 100644
--- a/addons/l10n_account_edi_ubl_cii_tests/__manifest__.py
+++ b/addons/l10n_account_edi_ubl_cii_tests/__manifest__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Testing the Import/Export invoices with UBL/CII",
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'description': """
 This module tests the module 'account_edi_ubl_cii', it is separated since dependencies to some
@@ -25,7 +23,6 @@
         'l10n_nl',
         'l10n_au',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_account_withholding_tax/__manifest__.py b/addons/l10n_account_withholding_tax/__manifest__.py
index ef6c0fe761a8d..13fbd1b63f460 100644
--- a/addons/l10n_account_withholding_tax/__manifest__.py
+++ b/addons/l10n_account_withholding_tax/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Withholding Tax on Payment',
-    'version': "1.0",
     'description': """Allows to register withholding taxes during the payment of an invoice or bill.""",
     'category': 'Accounting/Localizations',
     'depends': ['account'],
@@ -23,7 +22,6 @@
             'l10n_account_withholding_tax/static/src/helpers/*.js',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_account_withholding_tax_pos/__manifest__.py b/addons/l10n_account_withholding_tax_pos/__manifest__.py
index a79ac7fa8136c..f0fcbf489a308 100644
--- a/addons/l10n_account_withholding_tax_pos/__manifest__.py
+++ b/addons/l10n_account_withholding_tax_pos/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Withholding Tax on Payment - PoS',
-    'version': "1.0",
     'description': """Add support for the withholding tax module in the PoS.""",
     'category': 'Accounting/Localizations',
     'depends': ['l10n_account_withholding_tax', 'point_of_sale'],
diff --git a/addons/l10n_anz_ubl_pint/__manifest__.py b/addons/l10n_anz_ubl_pint/__manifest__.py
index 74ee0a6f3ea54..092936829b90f 100644
--- a/addons/l10n_anz_ubl_pint/__manifest__.py
+++ b/addons/l10n_anz_ubl_pint/__manifest__.py
@@ -2,13 +2,11 @@
 {
     'name': 'Australia & New Zealand - UBL PINT',
     'countries': ['au', 'nz'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
     The UBL PINT e-invoicing format for Australia & New Zealand is based on the Peppol International (PINT) model for Billing.
     """,
     'depends': ['account_edi_ubl_cii'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3'
 }
diff --git a/addons/l10n_ar/__manifest__.py b/addons/l10n_ar/__manifest__.py
index 33c91c97bf38a..19fa7d0d9be6c 100644
--- a/addons/l10n_ar/__manifest__.py
+++ b/addons/l10n_ar/__manifest__.py
@@ -117,6 +117,5 @@
         'demo/account_supplier_invoice_demo.xml',
         'demo/account_supplier_refund_demo.xml',
     ],
-    'installable': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_ar_pos/__manifest__.py b/addons/l10n_ar_pos/__manifest__.py
index 1103ef040b669..6c4427c544f3a 100644
--- a/addons/l10n_ar_pos/__manifest__.py
+++ b/addons/l10n_ar_pos/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Argentinean - Point of Sale with AR Doc',
-    'version': '1.0',
     'category': 'Accounting/Localizations/Point of Sale',
     'description': """
 This module brings the technical requirement for the Argentinean regulation.
@@ -23,7 +21,6 @@
             'l10n_ar_pos/static/tests/tours/**/*',
         ],
     },
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_ar_stock/__manifest__.py b/addons/l10n_ar_stock/__manifest__.py
index 121e9ab4da06f..68f978cad9e7c 100644
--- a/addons/l10n_ar_stock/__manifest__.py
+++ b/addons/l10n_ar_stock/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Argentinean - Stock',
-    'version': '1.0',
     'description': """Argentinean - Stock""",
     'category': 'Accounting/Localizations',
     'depends': ['l10n_ar', 'stock_account'],
@@ -13,7 +12,6 @@
         # Reports
         'views/report_delivery_guide.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_ar_website_sale/__manifest__.py b/addons/l10n_ar_website_sale/__manifest__.py
index d9c051fae69a0..95d24ccbba55d 100644
--- a/addons/l10n_ar_website_sale/__manifest__.py
+++ b/addons/l10n_ar_website_sale/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Argentinean eCommerce',
-    'version': '1.0',
     'category': 'Accounting/Localizations/Website',
     'countries': ['ar'],
     'icon': '/base/static/img/country_flags/ar.png',
@@ -19,7 +18,6 @@
             'l10n_ar_website_sale/static/src/scss/*.scss',
         ]
     },
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_ar_withholding/__manifest__.py b/addons/l10n_ar_withholding/__manifest__.py
index 3a0c4a6b987dd..60faf674f60f5 100644
--- a/addons/l10n_ar_withholding/__manifest__.py
+++ b/addons/l10n_ar_withholding/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Argentina - Payment Withholdings',
-    'version': "1.0",
     'description': """Allows to register withholdings during the payment of an invoice.""",
     'author': 'ADHOC SA',
     'countries': ['ar'],
@@ -23,6 +21,5 @@
         'security/security.xml',
         'data/earnings_table_data.xml',
     ],
-    'installable': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_bd/__manifest__.py b/addons/l10n_bd/__manifest__.py
index fa901f2d67b7f..804ee294ac532 100644
--- a/addons/l10n_bd/__manifest__.py
+++ b/addons/l10n_bd/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['bd'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Bangladesh in Odoo
diff --git a/addons/l10n_be_pos_restaurant/__manifest__.py b/addons/l10n_be_pos_restaurant/__manifest__.py
index 8e95ec90b7049..0d48089c5e606 100644
--- a/addons/l10n_be_pos_restaurant/__manifest__.py
+++ b/addons/l10n_be_pos_restaurant/__manifest__.py
@@ -1,11 +1,9 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Belgian POS Restaurant Localization',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'depends': ['pos_restaurant', 'l10n_be'],
     'auto_install': True,
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_be_pos_sale/__manifest__.py b/addons/l10n_be_pos_sale/__manifest__.py
index e9c8c58d2fc26..93055eeaa1dea 100644
--- a/addons/l10n_be_pos_sale/__manifest__.py
+++ b/addons/l10n_be_pos_sale/__manifest__.py
@@ -3,7 +3,6 @@
 
 {
     'name': 'l10n_be_pos_sale',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Link module between pos_sale and l10n_be',
diff --git a/addons/l10n_bg/__manifest__.py b/addons/l10n_bg/__manifest__.py
index 64b38b0733f5e..4b4d43b7f2296 100644
--- a/addons/l10n_bg/__manifest__.py
+++ b/addons/l10n_bg/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['bg'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 Chart accounting and taxes for Bulgaria
diff --git a/addons/l10n_bg_ledger/__manifest__.py b/addons/l10n_bg_ledger/__manifest__.py
index f8548304deb92..f15804df8db69 100644
--- a/addons/l10n_bg_ledger/__manifest__.py
+++ b/addons/l10n_bg_ledger/__manifest__.py
@@ -3,7 +3,6 @@
     'name': 'Bulgaria - Report ledger',
     'icon': '/account/static/description/l10n.png',
     'countries': ['bg'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 Report ledger for Bulgaria
diff --git a/addons/l10n_bh/__manifest__.py b/addons/l10n_bh/__manifest__.py
index 6f94fb4ac1685..66b78d9092af5 100644
--- a/addons/l10n_bh/__manifest__.py
+++ b/addons/l10n_bh/__manifest__.py
@@ -2,7 +2,6 @@
     'name': 'Bahrain - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['bh'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Bahrain in Odoo.
diff --git a/addons/l10n_br/__manifest__.py b/addons/l10n_br/__manifest__.py
index 829de3078a687..945b3806c03b0 100644
--- a/addons/l10n_br/__manifest__.py
+++ b/addons/l10n_br/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Brazilian - Accounting',
-    'version': '1.0',
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/brazil.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['br'],
diff --git a/addons/l10n_br_sales/__manifest__.py b/addons/l10n_br_sales/__manifest__.py
index 9ac4002324b60..b91987d3e2775 100644
--- a/addons/l10n_br_sales/__manifest__.py
+++ b/addons/l10n_br_sales/__manifest__.py
@@ -1,8 +1,6 @@
-# coding: utf-8
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Brazil - Sale',
-    'version': '1.0',
     'description': 'Sale modifications for Brazil',
     'category': 'Sales/Sales',
     'depends': [
@@ -14,7 +12,6 @@
         'report/sale_order_templates.xml',
         'report/report_invoice_templates.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_br_website_sale/__manifest__.py b/addons/l10n_br_website_sale/__manifest__.py
index 471b5c764cd96..54247feac5ab3 100644
--- a/addons/l10n_br_website_sale/__manifest__.py
+++ b/addons/l10n_br_website_sale/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Brazil - Website Sale',
-    'version': '1.0',
     'description': 'Bridge Website Sale for Brazil',
     'category': 'Sales/Sales',
     'depends': [
@@ -11,7 +10,6 @@
     'data': [
         'views/templates.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'post_init_hook': '_l10n_br_website_sale_post_init_hook',
     'author': 'Odoo S.A.',
diff --git a/addons/l10n_ch_pos/__manifest__.py b/addons/l10n_ch_pos/__manifest__.py
index 557233364c343..f9b1a4b2d0592 100644
--- a/addons/l10n_ch_pos/__manifest__.py
+++ b/addons/l10n_ch_pos/__manifest__.py
@@ -9,6 +9,5 @@
     """,
     'depends': ['l10n_ch', 'point_of_sale'],
     'auto_install': True,
-    'installable': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_cn_city/__manifest__.py b/addons/l10n_cn_city/__manifest__.py
index 4682a1432ca95..daac4da79a8a0 100644
--- a/addons/l10n_cn_city/__manifest__.py
+++ b/addons/l10n_cn_city/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 # Copyright (C) 2018-now  jeffery9@gmail.com
 
diff --git a/addons/l10n_co/__manifest__.py b/addons/l10n_co/__manifest__.py
index 923324a5d62c3..6d33f4f0a446c 100644
--- a/addons/l10n_co/__manifest__.py
+++ b/addons/l10n_co/__manifest__.py
@@ -3,7 +3,6 @@
     'name': 'Colombia - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['co'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': 'Colombian Accounting and Tax Preconfiguration',
     'author': 'David Arnold (XOE Solutions)',
diff --git a/addons/l10n_co_pos/__manifest__.py b/addons/l10n_co_pos/__manifest__.py
index 62cbbe75bb601..df7fb36267f97 100644
--- a/addons/l10n_co_pos/__manifest__.py
+++ b/addons/l10n_co_pos/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Colombian - Point of Sale',
-    'version': '1.0',
     'description': """Colombian - Point of Sale""",
     'category': 'Accounting/Localizations/Point of Sale',
     'auto_install': True,
diff --git a/addons/l10n_cy/__manifest__.py b/addons/l10n_cy/__manifest__.py
index d5fcde5901004..d15517d38e5fd 100644
--- a/addons/l10n_cy/__manifest__.py
+++ b/addons/l10n_cy/__manifest__.py
@@ -7,7 +7,6 @@
     """,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'depends': [
         'account',
diff --git a/addons/l10n_de/__manifest__.py b/addons/l10n_de/__manifest__.py
index 08c67334b5524..1c0585329893b 100644
--- a/addons/l10n_de/__manifest__.py
+++ b/addons/l10n_de/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_din5008/__manifest__.py b/addons/l10n_din5008/__manifest__.py
index e2d5b62762495..3cbc19317d66c 100644
--- a/addons/l10n_din5008/__manifest__.py
+++ b/addons/l10n_din5008/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'DIN 5008',
-    'version': '1.0',
     'category': 'Accounting/Localizations',
     'description': "This is the base module that defines the DIN 5008 standard in Odoo.",
     'depends': ['account'],
diff --git a/addons/l10n_din5008_expense/__manifest__.py b/addons/l10n_din5008_expense/__manifest__.py
index 83091a19354f0..83b3b23d1fac1 100644
--- a/addons/l10n_din5008_expense/__manifest__.py
+++ b/addons/l10n_din5008_expense/__manifest__.py
@@ -1,7 +1,6 @@
 {
     'name': 'DIN 5008 - Expenses',
     'category': 'Accounting/Localizations',
-    'version': '1.0',
     'depends': [
         'l10n_din5008',
         'hr_expense',
diff --git a/addons/l10n_din5008_purchase/__manifest__.py b/addons/l10n_din5008_purchase/__manifest__.py
index b1a98c7651e3c..c5bc7c42ff2e2 100644
--- a/addons/l10n_din5008_purchase/__manifest__.py
+++ b/addons/l10n_din5008_purchase/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_din5008_repair/__manifest__.py b/addons/l10n_din5008_repair/__manifest__.py
index ddf2684059211..34386ccffd603 100644
--- a/addons/l10n_din5008_repair/__manifest__.py
+++ b/addons/l10n_din5008_repair/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_din5008_sale/__manifest__.py b/addons/l10n_din5008_sale/__manifest__.py
index 0f0c4c1da8396..7c1afa1dbc505 100644
--- a/addons/l10n_din5008_sale/__manifest__.py
+++ b/addons/l10n_din5008_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_din5008_stock/__manifest__.py b/addons/l10n_din5008_stock/__manifest__.py
index 68332137a5358..3cf1c5ee7a7e6 100644
--- a/addons/l10n_din5008_stock/__manifest__.py
+++ b/addons/l10n_din5008_stock/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_dz/__manifest__.py b/addons/l10n_dz/__manifest__.py
index 24c72c4622b2a..2f818f492591d 100755
--- a/addons/l10n_dz/__manifest__.py
+++ b/addons/l10n_dz/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['dz'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the module to manage the accounting chart for Algeria in Odoo.
diff --git a/addons/l10n_ec/__manifest__.py b/addons/l10n_ec/__manifest__.py
index 10c3b8b6979f5..92190a22727f1 100644
--- a/addons/l10n_ec/__manifest__.py
+++ b/addons/l10n_ec/__manifest__.py
@@ -65,5 +65,4 @@
     'demo': [
         'demo/demo_company.xml',
     ],
-    'installable': True,
 }
diff --git a/addons/l10n_ec_sale/__manifest__.py b/addons/l10n_ec_sale/__manifest__.py
index 44f00db3bde8f..78bd063b6810e 100644
--- a/addons/l10n_ec_sale/__manifest__.py
+++ b/addons/l10n_ec_sale/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Ecuador - Sale',
-    'version': '1.0',
     'description': """Ecuador Sale""",
     'category': 'Accounting/Localizations/Sale',
     'depends': [
diff --git a/addons/l10n_ec_stock/__manifest__.py b/addons/l10n_ec_stock/__manifest__.py
index 7930f8cd50190..ab9503b343aef 100644
--- a/addons/l10n_ec_stock/__manifest__.py
+++ b/addons/l10n_ec_stock/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Ecuador - Stock',
     'icon': '/account/static/description/l10n.png',
-    'version': '1.0',
     'description': """Ecuador - Stock""",
     'category': 'Accounting/Localizations',
     'depends': [
diff --git a/addons/l10n_eg/__manifest__.py b/addons/l10n_eg/__manifest__.py
index 8cd43370e2efa..eb282df4dc4b4 100644
--- a/addons/l10n_eg/__manifest__.py
+++ b/addons/l10n_eg/__manifest__.py
@@ -20,7 +20,6 @@
 - Fiscal Positions
     """,
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_eg_edi_eta/__manifest__.py b/addons/l10n_eg_edi_eta/__manifest__.py
index 3315e29936818..11044bdfd06b4 100644
--- a/addons/l10n_eg_edi_eta/__manifest__.py
+++ b/addons/l10n_eg_edi_eta/__manifest__.py
@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Egypt E-Invoicing",
-    'summary': """
-            Egypt Tax Authority Invoice Integration
-        """,
+    'summary': "Egypt Tax Authority Invoice Integration",
     'description': """
 Egypt Tax Authority Invoice Integration
 ==============================================================================
diff --git a/addons/l10n_es_edi_facturae/__manifest__.py b/addons/l10n_es_edi_facturae/__manifest__.py
index aebab7fb4aca5..b0e98d3107ab6 100644
--- a/addons/l10n_es_edi_facturae/__manifest__.py
+++ b/addons/l10n_es_edi_facturae/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Spain - Facturae EDI',
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'website': 'https://www.facturae.gob.es/face/Paginas/FACE.aspx',
     'description': """
@@ -36,7 +35,6 @@
     'demo': [
         'demo/l10n_es_edi_facturae_demo.xml',
     ],
-    'installable': True,
     'auto_install': ['l10n_es'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_es_edi_sii/__manifest__.py b/addons/l10n_es_edi_sii/__manifest__.py
index 5fa47f6d9f187..5f2b0cf79be28 100644
--- a/addons/l10n_es_edi_sii/__manifest__.py
+++ b/addons/l10n_es_edi_sii/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # Thanks to AEOdoo and the Spanish community
diff --git a/addons/l10n_es_edi_tbai/__manifest__.py b/addons/l10n_es_edi_tbai/__manifest__.py
index c095541a04693..64b8c72624299 100644
--- a/addons/l10n_es_edi_tbai/__manifest__.py
+++ b/addons/l10n_es_edi_tbai/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # Thanks to Landoo and the Spanish community
diff --git a/addons/l10n_es_edi_tbai_pos/__manifest__.py b/addons/l10n_es_edi_tbai_pos/__manifest__.py
index d57a5d3e809e2..748467340125f 100644
--- a/addons/l10n_es_edi_tbai_pos/__manifest__.py
+++ b/addons/l10n_es_edi_tbai_pos/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spain - Point of Sale + TicketBAI",
-    'version': '1.0',
     'category': 'Accounting/Localizations/Point of Sale',
     'depends': [
         'l10n_es_edi_tbai',
diff --git a/addons/l10n_es_edi_verifactu/__manifest__.py b/addons/l10n_es_edi_verifactu/__manifest__.py
index 2f1e752be9f3c..4e608b714938a 100644
--- a/addons/l10n_es_edi_verifactu/__manifest__.py
+++ b/addons/l10n_es_edi_verifactu/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Spain - Veri*Factu',
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'summary': "Module for sending Spanish Veri*Factu XML to the AEAT",
     'website': "https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/spain.html#veri-factu",
@@ -28,7 +27,6 @@
             'l10n_es_edi_verifactu/static/src/css/warning.scss',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_es_edi_verifactu_pos/__manifest__.py b/addons/l10n_es_edi_verifactu_pos/__manifest__.py
index 72bd63bba5ba7..6c53abaf5abbf 100644
--- a/addons/l10n_es_edi_verifactu_pos/__manifest__.py
+++ b/addons/l10n_es_edi_verifactu_pos/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Spain - Veri*Factu for Point of Sale',
-    'version': '1.0',
     'category': 'Accounting/Localizations/Point of Sale',
     'summary': "Add Veri*Factu support to Point of Sale",
     'depends': [
diff --git a/addons/l10n_es_pos/__manifest__.py b/addons/l10n_es_pos/__manifest__.py
index c1700b6f79876..396bafe87b991 100644
--- a/addons/l10n_es_pos/__manifest__.py
+++ b/addons/l10n_es_pos/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Spain - Point of Sale',
diff --git a/addons/l10n_eu_oss/__manifest__.py b/addons/l10n_eu_oss/__manifest__.py
index de934443021a3..99d87e11c0ab7 100644
--- a/addons/l10n_eu_oss/__manifest__.py
+++ b/addons/l10n_eu_oss/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_fi/__manifest__.py b/addons/l10n_fi/__manifest__.py
index 7b0e2cca2193b..44f07c565fc0d 100644
--- a/addons/l10n_fi/__manifest__.py
+++ b/addons/l10n_fi/__manifest__.py
@@ -33,6 +33,5 @@
     'demo': [
         'demo/demo_company.xml',
     ],
-    'installable': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_fi_sale/__manifest__.py b/addons/l10n_fi_sale/__manifest__.py
index e9da35c8d8c5c..dd770af7e88c9 100644
--- a/addons/l10n_fi_sale/__manifest__.py
+++ b/addons/l10n_fi_sale/__manifest__.py
@@ -1,16 +1,13 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Finland - Sale',
-    'version': '1.0',
     'description': """Finland Sale""",
     'category': 'Sales/Sales',
     'depends': [
         'l10n_fi',
         'sale',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_fr_facturx_chorus_pro/__manifest__.py b/addons/l10n_fr_facturx_chorus_pro/__manifest__.py
index f657b93387b4d..7ffb2ef338bed 100644
--- a/addons/l10n_fr_facturx_chorus_pro/__manifest__.py
+++ b/addons/l10n_fr_facturx_chorus_pro/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'France - BIS3 integration for Chorus Pro',
     'countries': ['fr'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
 Add support to fill three fields used when using Chorus Pro, especially when invoicing public services.
diff --git a/addons/l10n_fr_hr_holidays/__manifest__.py b/addons/l10n_fr_hr_holidays/__manifest__.py
index 6f35c19e23b7a..4162154446fa1 100644
--- a/addons/l10n_fr_hr_holidays/__manifest__.py
+++ b/addons/l10n_fr_hr_holidays/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'France - Time Off',
     'countries': ['fr'],
-    'version': '1.0',
     'category': 'Human Resources/Time Off',
     'summary': 'Management of leaves for part-time workers in France',
     'depends': ['hr_holidays'],
diff --git a/addons/l10n_fr_hr_work_entry_holidays/__manifest__.py b/addons/l10n_fr_hr_work_entry_holidays/__manifest__.py
index cbdb2252dd61b..e6472b2fc6fe1 100644
--- a/addons/l10n_fr_hr_work_entry_holidays/__manifest__.py
+++ b/addons/l10n_fr_hr_work_entry_holidays/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'France - Work Entries Time Off',
-    'version': '1.0',
     'countries': ['fr'],
     'summary': 'Management of leaves for part-time workers in France',
     'depends': [
diff --git a/addons/l10n_fr_pos_cert/__manifest__.py b/addons/l10n_fr_pos_cert/__manifest__.py
index 6648b84e8c80a..ba280250f6084 100644
--- a/addons/l10n_fr_pos_cert/__manifest__.py
+++ b/addons/l10n_fr_pos_cert/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -22,7 +21,6 @@
     Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)
 """,
     'depends': ['l10n_fr_account', 'point_of_sale'],
-    'installable': True,
     'auto_install': True,
     'data': [
         'views/pos_views.xml',
diff --git a/addons/l10n_gcc_invoice_stock_account/__manifest__.py b/addons/l10n_gcc_invoice_stock_account/__manifest__.py
index 98e836994384c..9831f96a32006 100644
--- a/addons/l10n_gcc_invoice_stock_account/__manifest__.py
+++ b/addons/l10n_gcc_invoice_stock_account/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Gulf Cooperation Council WMS Accounting",
-    'version': '1.0',
     'description': """
 Adds Arabic as a secondary language for the lots and serial numbers
     """,
diff --git a/addons/l10n_gcc_pos/__manifest__.py b/addons/l10n_gcc_pos/__manifest__.py
index 7629b27b13a05..bf8d89886694d 100644
--- a/addons/l10n_gcc_pos/__manifest__.py
+++ b/addons/l10n_gcc_pos/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Gulf Cooperation Council - Point of Sale',
diff --git a/addons/l10n_gr/__manifest__.py b/addons/l10n_gr/__manifest__.py
index 31911c6ca6510..2a257f48d32fb 100644
--- a/addons/l10n_gr/__manifest__.py
+++ b/addons/l10n_gr/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_gr_edi/__manifest__.py b/addons/l10n_gr_edi/__manifest__.py
index 269a9f8ba3991..ffe323cd758f1 100644
--- a/addons/l10n_gr_edi/__manifest__.py
+++ b/addons/l10n_gr_edi/__manifest__.py
@@ -2,7 +2,6 @@
 {
     'author': 'Odoo',
     'name': 'Greece - myDATA',
-    'version': '1.0',
     'category': 'Accounting/Localizations',
     'summary': """Connect to myDATA API implementation for Greece""",
     'description': """
@@ -25,7 +24,6 @@
         'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_hk/__manifest__.py b/addons/l10n_hk/__manifest__.py
index a8ef1d43852b5..966f80a72eacb 100644
--- a/addons/l10n_hk/__manifest__.py
+++ b/addons/l10n_hk/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/hong_kong.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['hk'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': ' This is the base module to manage chart of accounting and localization for Hong Kong ',
     'depends': [
diff --git a/addons/l10n_hu_edi/__manifest__.py b/addons/l10n_hu_edi/__manifest__.py
index 53290bc2bd564..b40440fd334cb 100644
--- a/addons/l10n_hu_edi/__manifest__.py
+++ b/addons/l10n_hu_edi/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Hungary - E-invoicing',
-    'version': '1.0.0',
     'category': 'Accounting/Localizations/EDI',
     'author': 'DO Tech (OdooTech Zrt.), BDSC Business Consulting Kft. & Odoo S.A.',
     'description': """
diff --git a/addons/l10n_id_efaktur_coretax/__manifest__.py b/addons/l10n_id_efaktur_coretax/__manifest__.py
index e60cdd18271af..0b9cc19ff77c1 100644
--- a/addons/l10n_id_efaktur_coretax/__manifest__.py
+++ b/addons/l10n_id_efaktur_coretax/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Indonesia E-faktur (Coretax)',
     'icon': '/account/static/description/l10n.png',
-    'version': '1.0',
     'description': """
         E-invoicing feature provided by DJP (Indonesian Tax Office). As of January 1st 2025,
         Indonesia is using CoreTax system, which changes the file format and content of E-Faktur.
@@ -35,7 +34,6 @@
         "views/efaktur_document.xml",
         "views/uom_uom.xml",
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_id_pos/__manifest__.py b/addons/l10n_id_pos/__manifest__.py
index 7a297da15ced7..53eea0914e4b9 100644
--- a/addons/l10n_id_pos/__manifest__.py
+++ b/addons/l10n_id_pos/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Indonesia - Point of Sale',
-    'version': '1.0',
     'description': """Indonesian Point of Sale""",
     'category': 'Accounting/Localizations/Point of Sale',
     'depends': [
diff --git a/addons/l10n_in_edi/__manifest__.py b/addons/l10n_in_edi/__manifest__.py
index 5ec9a729d86b9..d1d7e99a58903 100644
--- a/addons/l10n_in_edi/__manifest__.py
+++ b/addons/l10n_in_edi/__manifest__.py
@@ -27,7 +27,6 @@
     'demo': [
         "demo/demo_company.xml",
     ],
-    'installable': True,
     'author': "Odoo S.A.",
     'license': "LGPL-3",
 }
diff --git a/addons/l10n_in_ewaybill/__manifest__.py b/addons/l10n_in_ewaybill/__manifest__.py
index b98ca74eff86b..6b8d3fa9632e3 100644
--- a/addons/l10n_in_ewaybill/__manifest__.py
+++ b/addons/l10n_in_ewaybill/__manifest__.py
@@ -31,7 +31,6 @@
         'report/ewaybill_report_views.xml',
         'report/ewaybill_report.xml',
     ],
-    'installable': True,
     'iap_paid_service': True,
     # not auto_install because the company can be related to the service industry
     'author': 'Odoo S.A.',
diff --git a/addons/l10n_in_ewaybill_stock/__manifest__.py b/addons/l10n_in_ewaybill_stock/__manifest__.py
index a905fe4876fd6..87087c0ecd328 100644
--- a/addons/l10n_in_ewaybill_stock/__manifest__.py
+++ b/addons/l10n_in_ewaybill_stock/__manifest__.py
@@ -21,7 +21,6 @@
         'views/stock_picking_views.xml',
         'report/ewaybill_report_inherit.xml'
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_in_hr_holidays/__manifest__.py b/addons/l10n_in_hr_holidays/__manifest__.py
index 1ed0ffd8aba56..69858e58a3844 100644
--- a/addons/l10n_in_hr_holidays/__manifest__.py
+++ b/addons/l10n_in_hr_holidays/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'India - Time Off',
-    'version': '1.0',
     'category': 'Human Resources/Time Off',
     'summary': 'Leave Management of Indian Localization',
     'description': 'The Indian Time Off module provides additional features to the application. With it, you\'ll be able to define Sandwich Leaves on your time off type, including weekends or holidays in the duration of the employee leave\'s request.',
diff --git a/addons/l10n_in_pos/__manifest__.py b/addons/l10n_in_pos/__manifest__.py
index 8e7a6b539576a..88cb0067a3440 100644
--- a/addons/l10n_in_pos/__manifest__.py
+++ b/addons/l10n_in_pos/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Indian - Point of Sale',
-    'version': '1.0',
     'description': """GST Point of Sale""",
     'category': 'Accounting/Localizations/Point of Sale',
     'depends': [
diff --git a/addons/l10n_in_purchase_stock/__manifest__.py b/addons/l10n_in_purchase_stock/__manifest__.py
index 0a6c9b47c83ea..1a8e3ee489b75 100644
--- a/addons/l10n_in_purchase_stock/__manifest__.py
+++ b/addons/l10n_in_purchase_stock/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -12,9 +11,7 @@
 So this module is to get the warehouse address if the bill is created from Purchase Order
     """,
 
-    'website': "https://www.odoo.com",
     'category': 'Accounting/Localizations/Purchase',
-    'version': '1.0',
 
     'depends': [
         'l10n_in_stock',
diff --git a/addons/l10n_in_sale/__manifest__.py b/addons/l10n_in_sale/__manifest__.py
index 45045364feb6d..bb4e8d8d2b195 100644
--- a/addons/l10n_in_sale/__manifest__.py
+++ b/addons/l10n_in_sale/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Indian - Sale Report(GST)',
-    'version': '1.0',
     'description': """GST Sale Report""",
     'category': 'Accounting/Localizations/Sale',
     'depends': [
@@ -16,7 +14,6 @@
     'demo': [
         'data/product_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_in_sale_stock/__manifest__.py b/addons/l10n_in_sale_stock/__manifest__.py
index 11bf53debcb38..719749c871c2f 100644
--- a/addons/l10n_in_sale_stock/__manifest__.py
+++ b/addons/l10n_in_sale_stock/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -13,9 +12,7 @@
 So this module is to get the warehouse address if the invoice is created from Sale Order
     """,
 
-    'website': "https://www.odoo.com",
     'category': 'Accounting/Localizations/Sale',
-    'version': '0.1',
 
     'depends': [
         'l10n_in_sale',
diff --git a/addons/l10n_in_stock/__manifest__.py b/addons/l10n_in_stock/__manifest__.py
index 686e16ff5ca36..3fff8ca3433bb 100644
--- a/addons/l10n_in_stock/__manifest__.py
+++ b/addons/l10n_in_stock/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Indian - Stock Report(GST)',
-    'version': '1.0',
     'description': """GST Stock Report""",
     'category': 'Accounting/Localizations',
     'depends': [
@@ -16,7 +14,6 @@
     'demo': [
         'data/product_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_iq/__manifest__.py b/addons/l10n_iq/__manifest__.py
index fa918ba0c2cee..97a67261e0e0a 100644
--- a/addons/l10n_iq/__manifest__.py
+++ b/addons/l10n_iq/__manifest__.py
@@ -11,7 +11,6 @@
 - Taxes
     """,
     "category": "Accounting/Localizations/Account Charts",
-    "version": "1.0",
     "depends": [
         "account",
     ],
diff --git a/addons/l10n_it_edi_sale/__manifest__.py b/addons/l10n_it_edi_sale/__manifest__.py
index be322af65fc8a..9a2f3f86facc1 100644
--- a/addons/l10n_it_edi_sale/__manifest__.py
+++ b/addons/l10n_it_edi_sale/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Italy - Sale E-invoicing',
-    'version': '1.0',
     'depends': [
         'l10n_it_edi',
         'sale',
@@ -11,7 +10,6 @@
     'data': [
         'views/sale_order_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_it_stock_ddt/__manifest__.py b/addons/l10n_it_stock_ddt/__manifest__.py
index 016ae7fe1ec6a..ba70954b30d13 100644
--- a/addons/l10n_it_stock_ddt/__manifest__.py
+++ b/addons/l10n_it_stock_ddt/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Italy - Stock DDT",
     'website': 'https://www.odoo.com',
diff --git a/addons/l10n_jo/__manifest__.py b/addons/l10n_jo/__manifest__.py
index 660ae1e369076..70268d9819278 100644
--- a/addons/l10n_jo/__manifest__.py
+++ b/addons/l10n_jo/__manifest__.py
@@ -19,7 +19,6 @@
 - Fiscal positions
     """,
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_jo_edi/__manifest__.py b/addons/l10n_jo_edi/__manifest__.py
index e395371c0cdca..16b20229fced7 100644
--- a/addons/l10n_jo_edi/__manifest__.py
+++ b/addons/l10n_jo_edi/__manifest__.py
@@ -1,7 +1,6 @@
 {
     'name': 'Jordan E-Invoicing',
     'countries': ['jo'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'summary': 'Electronic Invoicing for Jordan UBL 2.1',
     'author': 'Odoo S.A., Smart Way Business Solutions',
@@ -17,7 +16,6 @@
     'demo': [
         'demo/demo_company.xml',
     ],
-    'installable': True,
     'auto_install': ['l10n_jo'],
     'license': 'LGPL-3',
     'post_init_hook': '_post_init_hook',
diff --git a/addons/l10n_jp_ubl_pint/__manifest__.py b/addons/l10n_jp_ubl_pint/__manifest__.py
index 53a2319167df7..38e860abf198c 100644
--- a/addons/l10n_jp_ubl_pint/__manifest__.py
+++ b/addons/l10n_jp_ubl_pint/__manifest__.py
@@ -1,13 +1,11 @@
 {
     'name': 'Japan - UBL PINT',
     'countries': ['jp'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
     The UBL PINT e-invoicing format for Japan is based on the Peppol International (PINT) model for Billing.
     """,
     'depends': ['account_edi_ubl_cii'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3'
 }
diff --git a/addons/l10n_ke/__manifest__.py b/addons/l10n_ke/__manifest__.py
index d471887b37684..6698dd5c6d894 100644
--- a/addons/l10n_ke/__manifest__.py
+++ b/addons/l10n_ke/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/kenya.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['ke'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This provides a base chart of accounts and taxes template for use in Odoo.
diff --git a/addons/l10n_ke_edi_tremol/__manifest__.py b/addons/l10n_ke_edi_tremol/__manifest__.py
index 02cb3bc789ebc..0633bffd7e3d9 100644
--- a/addons/l10n_ke_edi_tremol/__manifest__.py
+++ b/addons/l10n_ke_edi_tremol/__manifest__.py
@@ -8,7 +8,6 @@
     """,
     'author': 'Odoo',
     'category': 'Accounting/Localizations/EDI',
-    'version': '1.0',
     'license': 'LGPL-3',
     'depends': ['l10n_ke'],
     'data': [
diff --git a/addons/l10n_kh/__manifest__.py b/addons/l10n_kh/__manifest__.py
index 3138ce372a8d6..24f86f8ab1cf1 100644
--- a/addons/l10n_kh/__manifest__.py
+++ b/addons/l10n_kh/__manifest__.py
@@ -3,7 +3,6 @@
     'name': 'Cambodia - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['kh'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
     Chart Of Account and Taxes for Cambodia.
diff --git a/addons/l10n_kr/__manifest__.py b/addons/l10n_kr/__manifest__.py
index 6de304968dbf7..5a89b64d163e2 100644
--- a/addons/l10n_kr/__manifest__.py
+++ b/addons/l10n_kr/__manifest__.py
@@ -2,7 +2,6 @@
     'name': "Republic of Korea - Accounting",
     'icon': '/account/static/description/l10n.png',
     'countries': ['kr'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 Accounting Module for the Republic of Korea
diff --git a/addons/l10n_kw/__manifest__.py b/addons/l10n_kw/__manifest__.py
index 03de592c33abd..57fdd81112877 100644
--- a/addons/l10n_kw/__manifest__.py
+++ b/addons/l10n_kw/__manifest__.py
@@ -9,7 +9,6 @@
 - Chart of accounts
     """,
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
         'l10n_gcc_invoice',
diff --git a/addons/l10n_kz/__manifest__.py b/addons/l10n_kz/__manifest__.py
index a0be23e181ea9..cd59021ba65ba 100644
--- a/addons/l10n_kz/__manifest__.py
+++ b/addons/l10n_kz/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['kz'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This provides a base chart of accounts and taxes template for use in Odoo for Kazakhstan.
diff --git a/addons/l10n_latam_base/__manifest__.py b/addons/l10n_latam_base/__manifest__.py
index b16df278ef011..c5e3b1aa7b983 100644
--- a/addons/l10n_latam_base/__manifest__.py
+++ b/addons/l10n_latam_base/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'LATAM Localization Base',
-    'version': '1.0',
     'category': 'Accounting/Localizations',
     'sequence': 14,
     'author': 'Odoo S.A., ADHOC SA',
@@ -62,7 +61,6 @@
             'l10n_latam_base/static/src/components/select_menu_wrapper/**.*',
         ],
     },
-    'installable': True,
     'post_init_hook': '_set_default_identification_type',
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_latam_check/__manifest__.py b/addons/l10n_latam_check/__manifest__.py
index 21f2878f2b294..7ac963ea4e69a 100644
--- a/addons/l10n_latam_check/__manifest__.py
+++ b/addons/l10n_latam_check/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Third Party and Deferred/Electronic Checks Management',
-    'version': "1.0.0",
     'category': 'Accounting/Localizations',
     'summary': 'Checks Management',
     'description': """
@@ -56,5 +55,4 @@
         'views/report_payment_receipt_templates.xml',
         'wizards/account_payment_register_views.xml',
     ],
-    'installable': True,
 }
diff --git a/addons/l10n_latam_invoice_document/__manifest__.py b/addons/l10n_latam_invoice_document/__manifest__.py
index 30e310df2d656..4599d1910ee49 100644
--- a/addons/l10n_latam_invoice_document/__manifest__.py
+++ b/addons/l10n_latam_invoice_document/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "LATAM Document",
-    "version": "1.0",
     "author": "ADHOC SA",
     'category': 'Accounting/Localizations',
     "summary": "LATAM Document Types",
@@ -38,6 +37,5 @@
         'wizards/account_move_reversal_view.xml',
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_lb_account/__manifest__.py b/addons/l10n_lb_account/__manifest__.py
index eb3d1c2bef8e8..8f018bf708d8e 100644
--- a/addons/l10n_lb_account/__manifest__.py
+++ b/addons/l10n_lb_account/__manifest__.py
@@ -1,7 +1,6 @@
 {
     "name": "Lebanon - Accounting",
     "countries": ["lb"],
-    "version": "1.0",
     "description": """
 This is the base module to manage the accounting chart for Lebanon in Odoo.
 ==============================================================================
diff --git a/addons/l10n_lk/__manifest__.py b/addons/l10n_lk/__manifest__.py
index 34a74e1249992..a4a22d57e0d0c 100644
--- a/addons/l10n_lk/__manifest__.py
+++ b/addons/l10n_lk/__manifest__.py
@@ -16,7 +16,6 @@
 - VAT001
 - WHT001
     """,
-    "version": "1.0",
     "author": "Odoo S.A.",
     "category": "Accounting/Localizations/Account Charts",
     "website": "https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html",
diff --git a/addons/l10n_lt/__manifest__.py b/addons/l10n_lt/__manifest__.py
index e995b85ebe4e2..2de355775fd7e 100644
--- a/addons/l10n_lt/__manifest__.py
+++ b/addons/l10n_lt/__manifest__.py
@@ -3,7 +3,6 @@
     'name': 'Lithuania - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['lt'],
-    'version': '1.0.0',
     'description': """
 Chart of Accounts (COA) Template for Lithuania's Accounting.
 
@@ -33,5 +32,4 @@
     'demo': [
         'demo/demo_company.xml',
     ],
-    'installable': True,
 }
diff --git a/addons/l10n_lv/__manifest__.py b/addons/l10n_lv/__manifest__.py
index 9307aa71db430..9c5f4f49396f2 100644
--- a/addons/l10n_lv/__manifest__.py
+++ b/addons/l10n_lv/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': "Latvia - Accounting",
-    'version': '1.0.0',
     'icon': '/account/static/description/l10n.png',
     'countries': ['lv'],
     'description': """
diff --git a/addons/l10n_mt/__manifest__.py b/addons/l10n_mt/__manifest__.py
index 5ab2a78486af2..d90c53222712a 100644
--- a/addons/l10n_mt/__manifest__.py
+++ b/addons/l10n_mt/__manifest__.py
@@ -7,7 +7,6 @@
     'description': """
 Malta basic package that contains the chart of accounts, the taxes, tax reports, etc.
     """,
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'depends': [
         'account',
diff --git a/addons/l10n_mt_pos/__manifest__.py b/addons/l10n_mt_pos/__manifest__.py
index 655589aa1b9da..8da11a959e00a 100644
--- a/addons/l10n_mt_pos/__manifest__.py
+++ b/addons/l10n_mt_pos/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "Malta - Point of Sale",
-    "version": "1.0",
     "category": "Accounting/Localizations/Point of Sale",
     "description": """Malta Compliance Letter for EXO Number""",
     "countries": ["mt"],
@@ -13,7 +12,6 @@
         'wizards/compliance_letter_view.xml',
         'reports/compliance_letter_report.xml',
     ],
-    "installable": True,
     "auto_install": True,
     "author": "Odoo S.A.",
     "license": "LGPL-3",
diff --git a/addons/l10n_mu_account/__manifest__.py b/addons/l10n_mu_account/__manifest__.py
index 76bcc81acf826..15c91887aeab7 100644
--- a/addons/l10n_mu_account/__manifest__.py
+++ b/addons/l10n_mu_account/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "Mauritius - Accounting",
-    "version": "1.0",
     'countries': ['mu'],
     "category": "Accounting/Localizations/Account Charts",
     "description": """
diff --git a/addons/l10n_my_edi/__manifest__.py b/addons/l10n_my_edi/__manifest__.py
index b85d02d2baef5..09a06bd9740da 100644
--- a/addons/l10n_my_edi/__manifest__.py
+++ b/addons/l10n_my_edi/__manifest__.py
@@ -2,7 +2,6 @@
 {
     'name': 'Malaysia - E-invoicing',
     'countries': ['my'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'icon': '/account/static/description/l10n.png',
     "summary": "E-invoicing using MyInvois",
@@ -32,7 +31,6 @@
         'wizard/myinvois_consolidate_invoice_wizard.xml',
         'wizard/myinvois_document_status_update_wizard.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3'
 }
diff --git a/addons/l10n_my_edi_pos/__manifest__.py b/addons/l10n_my_edi_pos/__manifest__.py
index 41750eae79be5..fc0181ca4c5cc 100644
--- a/addons/l10n_my_edi_pos/__manifest__.py
+++ b/addons/l10n_my_edi_pos/__manifest__.py
@@ -2,7 +2,6 @@
 {
     "name": "Malaysia - E-invoicing (POS)",
     "countries": ["my"],
-    "version": "1.0",
     "category": "Accounting/Localizations/EDI",
     "icon": "/account/static/description/l10n.png",
     "summary": "Consolidated E-invoicing using MyInvois",
@@ -17,7 +16,6 @@
         "views/pos_order_views.xml",
         "views/product_view.xml",
     ],
-    "installable": True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     "license": "LGPL-3",
diff --git a/addons/l10n_my_ubl_pint/__manifest__.py b/addons/l10n_my_ubl_pint/__manifest__.py
index eb68fc5bc8a3a..219d5495f6093 100644
--- a/addons/l10n_my_ubl_pint/__manifest__.py
+++ b/addons/l10n_my_ubl_pint/__manifest__.py
@@ -2,7 +2,6 @@
 {
     'name': 'Malaysia - UBL PINT',
     'countries': ['my'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'icon': '/account/static/description/l10n.png',
     'description': """
@@ -14,7 +13,6 @@
         'views/res_company_view.xml',
         'views/res_partner_view.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3'
 }
diff --git a/addons/l10n_mz/__manifest__.py b/addons/l10n_mz/__manifest__.py
index 7814cebca0b14..9ad546a63755a 100644
--- a/addons/l10n_mz/__manifest__.py
+++ b/addons/l10n_mz/__manifest__.py
@@ -5,7 +5,6 @@
     'description': """
 Mozambican Accounting localization
     """,
-    'version': '1.0',
     'icon': '/account/static/description/l10n.png',
     'countries': ['mz'],
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_ng/__manifest__.py b/addons/l10n_ng/__manifest__.py
index 74c7fec75196e..d6b3c292c563d 100644
--- a/addons/l10n_ng/__manifest__.py
+++ b/addons/l10n_ng/__manifest__.py
@@ -7,7 +7,6 @@
 =========================================================
     """,
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
-    'version': '1.0',
     'icon': '/account/static/description/l10n.png',
     'countries': ['ng'],
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_nl/__manifest__.py b/addons/l10n_nl/__manifest__.py
index 2b87532b651e5..d38294a06cd24 100644
--- a/addons/l10n_nl/__manifest__.py
+++ b/addons/l10n_nl/__manifest__.py
@@ -23,6 +23,5 @@
     'demo': [
         'demo/demo_company.xml',
     ],
-    'installable': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_om/__manifest__.py b/addons/l10n_om/__manifest__.py
index 5ec8825a55eee..ec2fc8e551526 100644
--- a/addons/l10n_om/__manifest__.py
+++ b/addons/l10n_om/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Oman - Accounting',
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'author': 'Odoo S.A.',
     'description': """
diff --git a/addons/l10n_pe_pos/__manifest__.py b/addons/l10n_pe_pos/__manifest__.py
index b104f8217c9ec..f1b36ccef13af 100644
--- a/addons/l10n_pe_pos/__manifest__.py
+++ b/addons/l10n_pe_pos/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "Peruvian - Point of Sale with Pe Doc",
-    "version": "1.0",
     "category": "Accounting/Localizations/Point of Sale",
     "author": "Vauxoo, Odoo S.A.",
     "description": """
@@ -19,7 +18,6 @@
     "assets": {
         "point_of_sale._assets_pos": ["l10n_pe_pos/static/src/**/*"],
     },
-    "installable": True,
     "auto_install": True,
     "license": "LGPL-3",
 }
diff --git a/addons/l10n_pt/__manifest__.py b/addons/l10n_pt/__manifest__.py
index 3b7d61bce1948..9a234d5a2cde0 100644
--- a/addons/l10n_pt/__manifest__.py
+++ b/addons/l10n_pt/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['pt'],
-    'version': '1.0',
     'author': 'Odoo',
     'category': 'Accounting/Localizations/Account Charts',
     'description': 'Portugal - Accounting',
diff --git a/addons/l10n_qa/__manifest__.py b/addons/l10n_qa/__manifest__.py
index c13f61bea883a..fe00065580f16 100644
--- a/addons/l10n_qa/__manifest__.py
+++ b/addons/l10n_qa/__manifest__.py
@@ -9,7 +9,6 @@
 - Chart of accounts
     """,
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
         'l10n_gcc_invoice',
diff --git a/addons/l10n_ro/__manifest__.py b/addons/l10n_ro/__manifest__.py
index 5360d8d2b6d45..37992b5238cad 100644
--- a/addons/l10n_ro/__manifest__.py
+++ b/addons/l10n_ro/__manifest__.py
@@ -6,7 +6,6 @@
     'icon': '/account/static/description/l10n.png',
     'countries': ['ro'],
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
         'base_vat',
diff --git a/addons/l10n_ro_edi/__manifest__.py b/addons/l10n_ro_edi/__manifest__.py
index 3811b801a1998..6e320ca67821e 100644
--- a/addons/l10n_ro_edi/__manifest__.py
+++ b/addons/l10n_ro_edi/__manifest__.py
@@ -1,7 +1,6 @@
 {
     'author': 'Odoo',
     'name': 'Romania - E-invoicing',
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
 E-invoice implementation for Romania
@@ -17,7 +16,6 @@
         'views/account_move_views.xml',
         'views/res_config_settings_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'license': 'LGPL-3',
     'assets': {
diff --git a/addons/l10n_ro_edi_stock/__manifest__.py b/addons/l10n_ro_edi_stock/__manifest__.py
index eddcdc81f06ef..b4fbf0fad7888 100644
--- a/addons/l10n_ro_edi_stock/__manifest__.py
+++ b/addons/l10n_ro_edi_stock/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Romania - E-Transport',
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
 E-Transport implementation for Romania
@@ -20,7 +19,6 @@
 
         'report/report_deliveryslip.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': "LGPL-3",
 }
diff --git a/addons/l10n_ro_edi_stock_batch/__manifest__.py b/addons/l10n_ro_edi_stock_batch/__manifest__.py
index bb29476e1a932..0371289c345b2 100644
--- a/addons/l10n_ro_edi_stock_batch/__manifest__.py
+++ b/addons/l10n_ro_edi_stock_batch/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Romania - E-Transport Batch Pickings',
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
 E-Transport implementation for Batch Pickings in Romania
@@ -12,7 +11,6 @@
 
         'report/report_picking_batch.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': "LGPL-3",
 }
diff --git a/addons/l10n_rs/__manifest__.py b/addons/l10n_rs/__manifest__.py
index cdc8cca5cfe5c..dba24c919e6ee 100644
--- a/addons/l10n_rs/__manifest__.py
+++ b/addons/l10n_rs/__manifest__.py
@@ -4,7 +4,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['rs'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module of the Serbian localization. It manages chart of accounts and taxes.
diff --git a/addons/l10n_rs_edi/__manifest__.py b/addons/l10n_rs_edi/__manifest__.py
index e4e1191058d5c..3833704dbde48 100644
--- a/addons/l10n_rs_edi/__manifest__.py
+++ b/addons/l10n_rs_edi/__manifest__.py
@@ -1,7 +1,6 @@
 {
     'author': 'Odoo',
     'name': 'Serbia - eFaktura E-invoicing',
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
 eFaktura E-invoice implementation for Serbia
@@ -17,7 +16,6 @@
         'views/account_move.xml',
         'views/res_partner_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'license': 'LGPL-3',
 }
diff --git a/addons/l10n_rw/__manifest__.py b/addons/l10n_rw/__manifest__.py
index 5df4e880679b6..887957213f38a 100644
--- a/addons/l10n_rw/__manifest__.py
+++ b/addons/l10n_rw/__manifest__.py
@@ -4,7 +4,6 @@
     'icon': '/account/static/description/l10n.png',
     'countries': ['rw'],
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_sa_edi/__manifest__.py b/addons/l10n_sa_edi/__manifest__.py
index 5b268eff015d6..136862ddc16b5 100644
--- a/addons/l10n_sa_edi/__manifest__.py
+++ b/addons/l10n_sa_edi/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -13,9 +12,7 @@
         'base_vat',
         'certificate',
     ],
-    'summary': """
-        E-Invoicing, Universal Business Language
-    """,
+    'summary': "E-Invoicing, Universal Business Language",
     'description': """
 E-invoice implementation for Saudi Arabia; Integration with ZATCA
     """,
diff --git a/addons/l10n_sa_edi_pos/__manifest__.py b/addons/l10n_sa_edi_pos/__manifest__.py
index b7bd267cb4487..7d4dbd8954611 100644
--- a/addons/l10n_sa_edi_pos/__manifest__.py
+++ b/addons/l10n_sa_edi_pos/__manifest__.py
@@ -9,9 +9,7 @@
         'l10n_sa_pos',
         'l10n_sa_edi',
     ],
-    'summary': """
-        ZATCA E-Invoicing, support for PoS
-    """,
+    'summary': "ZATCA E-Invoicing, support for PoS",
     'description': """
 E-invoice implementation for Saudi Arabia; Integration with ZATCA (POS)
     """,
diff --git a/addons/l10n_sa_pos/__manifest__.py b/addons/l10n_sa_pos/__manifest__.py
index ba843e5a5038a..84ceb49409c09 100644
--- a/addons/l10n_sa_pos/__manifest__.py
+++ b/addons/l10n_sa_pos/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Saudi Arabia - Point of Sale',
diff --git a/addons/l10n_sg_ubl_pint/__manifest__.py b/addons/l10n_sg_ubl_pint/__manifest__.py
index 83dd034e8366c..4a0378cbebe2b 100644
--- a/addons/l10n_sg_ubl_pint/__manifest__.py
+++ b/addons/l10n_sg_ubl_pint/__manifest__.py
@@ -2,13 +2,11 @@
 {
     'name': 'Singapore - UBL PINT',
     'countries': ['sg'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/EDI',
     'description': """
     The UBL PINT e-invoicing format for Singapore is based on the Peppol International (PINT) model for Billing.
     """,
     'depends': ['account_edi_ubl_cii'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3'
 }
diff --git a/addons/l10n_sk/__manifest__.py b/addons/l10n_sk/__manifest__.py
index e0ee24cf4b44b..0d2c5794d2690 100644
--- a/addons/l10n_sk/__manifest__.py
+++ b/addons/l10n_sk/__manifest__.py
@@ -3,7 +3,6 @@
     'name': 'Slovak - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['sk'],
-    'version': '1.0',
     'author': '26HOUSE (http://www.26house.com)',
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'category': 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_test_pos_qr_payment/__manifest__.py b/addons/l10n_test_pos_qr_payment/__manifest__.py
index bb281cb0d517c..a9f7cd4802f82 100644
--- a/addons/l10n_test_pos_qr_payment/__manifest__.py
+++ b/addons/l10n_test_pos_qr_payment/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'POS QR Tests',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 9876,
     'description': """
@@ -18,7 +16,6 @@
         'l10n_hk',
         'l10n_br',
     ],
-    'installable': True,
     'assets': {
         'web.assets_tests': [
             'l10n_test_pos_qr_payment/static/tests/**/*',
diff --git a/addons/l10n_tn/__manifest__.py b/addons/l10n_tn/__manifest__.py
index 0573b0a494fa3..4f5c8e544a493 100644
--- a/addons/l10n_tn/__manifest__.py
+++ b/addons/l10n_tn/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- encoding: utf-8 -*-
 
 {
     "name": "Tunisia - Accounting",
-    "version": "1.0",
     'icon': '/account/static/description/l10n.png',
     'countries': ['tn'],
     "category": 'Accounting/Localizations/Account Charts',
diff --git a/addons/l10n_tr_nilvera/__manifest__.py b/addons/l10n_tr_nilvera/__manifest__.py
index 15a290104a79f..e7b3a9607ea89 100644
--- a/addons/l10n_tr_nilvera/__manifest__.py
+++ b/addons/l10n_tr_nilvera/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Türkiye - Nilvera',
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'description': """
 Base module containing core functionalities required by other Nilvera modules.
diff --git a/addons/l10n_tr_nilvera_edispatch/__manifest__.py b/addons/l10n_tr_nilvera_edispatch/__manifest__.py
index 6b45e8bd50ef4..964f9c936b109 100644
--- a/addons/l10n_tr_nilvera_edispatch/__manifest__.py
+++ b/addons/l10n_tr_nilvera_edispatch/__manifest__.py
@@ -2,9 +2,7 @@
     'name': "Türkiye - e-Irsaliye (e-Dispatch)",
     'description': "Allows the users to create the UBL 1.2.1 e-Dispatch file",
     'countries': ['tr'],
-    'version': "1.0",
     'depends': ['l10n_tr_nilvera', 'stock'],
-    'installable': True,
     'license': "LGPL-3",
     'category': 'Accounting/Localizations',
     'data': [
diff --git a/addons/l10n_tr_nilvera_einvoice/__manifest__.py b/addons/l10n_tr_nilvera_einvoice/__manifest__.py
index 5fa6415a9bda7..4df7bafe9aeb6 100644
--- a/addons/l10n_tr_nilvera_einvoice/__manifest__.py
+++ b/addons/l10n_tr_nilvera_einvoice/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Türkiye - Nilvera E-Invoice',
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'description': """
 For sending and receiving electronic invoices to Nilvera.
diff --git a/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py b/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py
index e76e8b7e905a3..a397166f5eb09 100644
--- a/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py
+++ b/addons/l10n_tr_nilvera_einvoice_extended/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Türkiye - Nilvera E-Invoice Extended',
-    'version': '1.0',
     'category': 'Accounting/Accounting',
     'description': """
 This module enhances the core Nilvera integration by adding additional invoice scenarios and types required for Turkish e-Invoicing compliance.
@@ -27,7 +26,6 @@
         'views/res_config_settings_views.xml',
     ],
     'auto_install': ['l10n_tr_nilvera_einvoice'],
-    'installable': True,
     'post_init_hook': '_l10n_tr_nilvera_einvoice_extended_post_init',
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_tw/__manifest__.py b/addons/l10n_tw/__manifest__.py
index 323153972456e..3f2ae312f7628 100644
--- a/addons/l10n_tw/__manifest__.py
+++ b/addons/l10n_tw/__manifest__.py
@@ -5,7 +5,6 @@
     'icon': '/account/static/description/l10n.png',
     'countries': ['tw'],
     'author': 'Odoo PS',
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Taiwan in Odoo.
diff --git a/addons/l10n_tw_edi_ecpay/__manifest__.py b/addons/l10n_tw_edi_ecpay/__manifest__.py
index 8f00ac80c6e34..36ab1eb5cc041 100644
--- a/addons/l10n_tw_edi_ecpay/__manifest__.py
+++ b/addons/l10n_tw_edi_ecpay/__manifest__.py
@@ -2,7 +2,6 @@
 {
     "name": "Taiwan - E-invoicing",
     "countries": ["tw"],
-    "version": "1.0",
     'icon': '/account/static/description/l10n.png',
     "category": "Accounting/Localizations/EDI",
     "summary": """E-invoicing using ECpay""",
@@ -24,5 +23,4 @@
         "views/l10n_tw_edi_invoice_cancel_view.xml",
         "views/l10n_tw_edi_invoice_print_view.xml",
     ],
-    "installable": True,
 }
diff --git a/addons/l10n_tz_account/__manifest__.py b/addons/l10n_tz_account/__manifest__.py
index 05498fbb7010f..5718c0c7860c3 100644
--- a/addons/l10n_tz_account/__manifest__.py
+++ b/addons/l10n_tz_account/__manifest__.py
@@ -4,7 +4,6 @@
     'icon': '/account/static/description/l10n.png',
     'countries': ['tz'],
     'category': 'Accounting/Localizations/Account Charts',
-    'version': '1.0',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_ug/__manifest__.py b/addons/l10n_ug/__manifest__.py
index ba5b25ea6604e..9efff2d9d90d4 100644
--- a/addons/l10n_ug/__manifest__.py
+++ b/addons/l10n_ug/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 
 {
     "name": "Uganda - Accounting",
     "countries": ["ug"],
-    "version": "1.0.0",
     "category": "Accounting/Localizations/Account Charts",
     "author": "Odoo S.A.",
     "license": "LGPL-3",
diff --git a/addons/l10n_us/__manifest__.py b/addons/l10n_us/__manifest__.py
index 42730d57b9153..a1be5e224b20e 100644
--- a/addons/l10n_us/__manifest__.py
+++ b/addons/l10n_us/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/l10n_us_account/__manifest__.py b/addons/l10n_us_account/__manifest__.py
index 0468e60902218..c54997d3d8ce9 100644
--- a/addons/l10n_us_account/__manifest__.py
+++ b/addons/l10n_us_account/__manifest__.py
@@ -5,7 +5,6 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['us'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
     """,
@@ -18,7 +17,6 @@
     'demo': [
         'demo/demo_company.xml',
     ],
-    'installable': True,
     'auto_install': ['account'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/l10n_uy_pos/__manifest__.py b/addons/l10n_uy_pos/__manifest__.py
index 67eb02de3580e..fffea6e9aba9b 100644
--- a/addons/l10n_uy_pos/__manifest__.py
+++ b/addons/l10n_uy_pos/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "Uruguayan - Point of Sale",
-    "version": "1.0",
     "category": "Accounting/Localizations/Point of Sale",
     "description": """
 This module brings the technical requirement for the Uruguayan regulation.
@@ -14,7 +13,6 @@
     "assets": {
         "point_of_sale._assets_pos": ["l10n_uy_pos/static/src/**/*"],
     },
-    "installable": True,
     "auto_install": True,
     'author': 'Odoo S.A.',
     "license": "LGPL-3",
diff --git a/addons/l10n_vn_edi_viettel/__manifest__.py b/addons/l10n_vn_edi_viettel/__manifest__.py
index c49aab0231d8f..4a2836d1e10bc 100644
--- a/addons/l10n_vn_edi_viettel/__manifest__.py
+++ b/addons/l10n_vn_edi_viettel/__manifest__.py
@@ -2,7 +2,6 @@
 {
     "name": """Vietnam - E-invoicing""",
     'icon': '/account/static/description/l10n.png',
-    "version": "1.0",
     'countries': ['vn'],
     "category": "Accounting/Localizations/EDI",
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/vietnam.html',
@@ -24,7 +23,6 @@
         "wizard/account_move_reversal_view.xml",
         "wizard/l10n_vn_edi_cancellation_request_views.xml",
     ],
-    "installable": True,
     "author": "Odoo S.A.",
     "license": "LGPL-3",
 }
diff --git a/addons/l10n_za/__manifest__.py b/addons/l10n_za/__manifest__.py
index 2d4cf0da5aefb..e6155e10a6961 100644
--- a/addons/l10n_za/__manifest__.py
+++ b/addons/l10n_za/__manifest__.py
@@ -3,7 +3,6 @@
     'name': 'South Africa - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['za'],
-    'version': '1.0',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the latest basic South African localisation necessary to run Odoo in ZA:
diff --git a/addons/link_tracker/__manifest__.py b/addons/link_tracker/__manifest__.py
index ed99627817139..f1dad90367215 100644
--- a/addons/link_tracker/__manifest__.py
+++ b/addons/link_tracker/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/loyalty/__manifest__.py b/addons/loyalty/__manifest__.py
index dea87b9dc27d8..5185998c823b2 100644
--- a/addons/loyalty/__manifest__.py
+++ b/addons/loyalty/__manifest__.py
@@ -4,7 +4,6 @@
     'name': "Coupons & Loyalty",
     'summary': "Use discounts, gift card, eWallets and loyalty programs in different sales channels",
     'category': 'Sales',
-    'version': '1.0',
     'depends': ['product', 'portal', 'account'],
     'data': [
         'security/ir.model.access.csv',
@@ -40,7 +39,6 @@
             'loyalty/static/src/interactions/*',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/lunch/__manifest__.py b/addons/lunch/__manifest__.py
index 8aa90b1e44a22..9774b920a684c 100644
--- a/addons/lunch/__manifest__.py
+++ b/addons/lunch/__manifest__.py
@@ -1,7 +1,6 @@
 {
     'name': 'Lunch',
     'sequence': 300,
-    'version': '1.0',
     'depends': ['mail'],
     'category': 'Human Resources/Lunch',
     'summary': 'Handle lunch orders of your employees',
@@ -36,7 +35,6 @@
         'data/lunch_data.xml',
     ],
     'demo': ['data/lunch_demo.xml'],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 4b2f384f60399..ddd051dbb3bc0 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Discuss',
@@ -135,7 +134,6 @@
         "demo/mail_poll_demo.xml",
         "demo/mail_canned_response_demo.xml",
     ],
-    'installable': True,
     'application': True,
     'post_init_hook': '_mail_post_init',
     'assets': {
diff --git a/addons/mail_bot/__manifest__.py b/addons/mail_bot/__manifest__.py
index af0b2afa483b0..533eb3c108ce3 100644
--- a/addons/mail_bot/__manifest__.py
+++ b/addons/mail_bot/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -9,7 +8,6 @@
     'website': 'https://www.odoo.com/app/discuss',
     'depends': ['mail'],
     'auto_install': True,
-    'installable': True,
     'data': [
         'views/res_users_views.xml',
         'data/mailbot_data.xml',
diff --git a/addons/mail_bot_hr/__manifest__.py b/addons/mail_bot_hr/__manifest__.py
index 7207f3c60f979..a1eeb64153117 100644
--- a/addons/mail_bot_hr/__manifest__.py
+++ b/addons/mail_bot_hr/__manifest__.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
 {
     'name': "OdooBot - HR",
     'summary': """Bridge module between hr and mailbot.""",
     'description': """This module adds the OdooBot state and notifications in the user form modified by hr.""",
     'website': "https://www.odoo.com/app/discuss",
     'category': 'Productivity/Discuss',
-    'version': '1.0',
     'depends': ['mail_bot', 'hr'],
-    'installable': True,
     'auto_install': True,
     'data': [
         'views/res_users_views.xml',
diff --git a/addons/mail_group/__manifest__.py b/addons/mail_group/__manifest__.py
index 958faa286d162..b6b6e47eeeba3 100644
--- a/addons/mail_group/__manifest__.py
+++ b/addons/mail_group/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/mail_plugin/__manifest__.py b/addons/mail_plugin/__manifest__.py
index af9b5fe616bba..9c0cea4a7fa69 100644
--- a/addons/mail_plugin/__manifest__.py
+++ b/addons/mail_plugin/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mail Plugin',
-    'version': '1.0',
     'category': 'Sales/CRM',
     'sequence': 5,
     'summary': 'Allows integration with mail plugins.',
@@ -18,7 +16,6 @@
         'views/res_partner_iap_views.xml',
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'iap_paid_service': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py
index e5daf4fc75db4..aaea3983224f5 100644
--- a/addons/maintenance/__manifest__.py
+++ b/addons/maintenance/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Maintenance',
-    'version': '1.0',
     'sequence': 100,
     'category': 'Supply Chain/Maintenance',
     'description': """
@@ -21,7 +19,6 @@
         'views/res_config_settings_views.xml',
     ],
     'demo': ['data/maintenance_demo.xml'],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/marketing_card/__manifest__.py b/addons/marketing_card/__manifest__.py
index b9406da64c9af..cb80af7cd31de 100644
--- a/addons/marketing_card/__manifest__.py
+++ b/addons/marketing_card/__manifest__.py
@@ -26,7 +26,6 @@
         ],
     },
     'application': True,
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 62a00dc95e278..4a052382d39c7 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/mass_mailing_crm/__manifest__.py b/addons/mass_mailing_crm/__manifest__.py
index abc8eecdf3533..a4963b95d0360 100644
--- a/addons/mass_mailing_crm/__manifest__.py
+++ b/addons/mass_mailing_crm/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing on lead / opportunities',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'summary': 'Add lead / opportunities UTM info on mass mailing',
     'description': """UTM and mass mailing on lead / opportunities""",
     'depends': ['crm', 'mass_mailing'],
diff --git a/addons/mass_mailing_crm_sms/__manifest__.py b/addons/mass_mailing_crm_sms/__manifest__.py
index d417459bd2fb2..ae4819c784f46 100644
--- a/addons/mass_mailing_crm_sms/__manifest__.py
+++ b/addons/mass_mailing_crm_sms/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing sms on lead / opportunities',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'summary': 'Add lead / opportunities info on mass mailing sms',
     'description': """Mass mailing sms on lead / opportunities""",
     'depends': ['mass_mailing_crm', 'mass_mailing_sms'],
diff --git a/addons/mass_mailing_event/__manifest__.py b/addons/mass_mailing_event/__manifest__.py
index 8e2c33433559b..f6ac1f575aaff 100644
--- a/addons/mass_mailing_event/__manifest__.py
+++ b/addons/mass_mailing_event/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing on attendees',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'description':
         """
 Mass mail event attendees
diff --git a/addons/mass_mailing_event_sms/__manifest__.py b/addons/mass_mailing_event_sms/__manifest__.py
index 6b04ae2a61478..dbaf4f43cc938 100644
--- a/addons/mass_mailing_event_sms/__manifest__.py
+++ b/addons/mass_mailing_event_sms/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Event Attendees SMS Marketing',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'description':
         """
 SMS Marketing on event attendees
diff --git a/addons/mass_mailing_event_track/__manifest__.py b/addons/mass_mailing_event_track/__manifest__.py
index 9a1b5b6310be6..0c5b9ebcc1fde 100644
--- a/addons/mass_mailing_event_track/__manifest__.py
+++ b/addons/mass_mailing_event_track/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing on track speakers',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'description':
         """
 Mass mail event track speakers
diff --git a/addons/mass_mailing_event_track_sms/__manifest__.py b/addons/mass_mailing_event_track_sms/__manifest__.py
index ff28a32e92102..6a69351a7fe41 100644
--- a/addons/mass_mailing_event_track_sms/__manifest__.py
+++ b/addons/mass_mailing_event_track_sms/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Track Speakers SMS Marketing',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'description':
         """
 SMS Marketing on event track speakers
diff --git a/addons/mass_mailing_sale/__manifest__.py b/addons/mass_mailing_sale/__manifest__.py
index 59ef30a71a626..7e1788d8c1691 100644
--- a/addons/mass_mailing_sale/__manifest__.py
+++ b/addons/mass_mailing_sale/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing on sale orders',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'summary': 'Add sale order UTM info on mass mailing',
     'description': """UTM and mass mailing on sale orders""",
     'depends': ['sale', 'mass_mailing'],
diff --git a/addons/mass_mailing_sale_sms/__manifest__.py b/addons/mass_mailing_sale_sms/__manifest__.py
index f6a541717a370..535591c0b4fad 100644
--- a/addons/mass_mailing_sale_sms/__manifest__.py
+++ b/addons/mass_mailing_sale_sms/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing sms on sale orders',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'summary': 'Add sale order info on mass mailing sms',
     'description': """Mass mailing sms on sale orders""",
     'depends': ['mass_mailing_sale', 'mass_mailing_sms'],
diff --git a/addons/mass_mailing_slides/__manifest__.py b/addons/mass_mailing_slides/__manifest__.py
index c61f14e84db27..d09436866656b 100644
--- a/addons/mass_mailing_slides/__manifest__.py
+++ b/addons/mass_mailing_slides/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Mass mailing on course members',
     'category': 'Marketing/Email Marketing',
-    'version': '1.0',
     'description':
         """
 Mass mail course members
diff --git a/addons/mass_mailing_sms/__manifest__.py b/addons/mass_mailing_sms/__manifest__.py
index 87d4e4d16ab28..1852eaf269b88 100644
--- a/addons/mass_mailing_sms/__manifest__.py
+++ b/addons/mass_mailing_sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/mass_mailing_themes/__manifest__.py b/addons/mass_mailing_themes/__manifest__.py
index 964dcc1fe2e91..ee91f39af89e8 100644
--- a/addons/mass_mailing_themes/__manifest__.py
+++ b/addons/mass_mailing_themes/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -18,7 +17,6 @@
         'data/ir_attachment_data.xml',
         'views/mass_mailing_themes_templates.xml'
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/microsoft_account/__manifest__.py b/addons/microsoft_account/__manifest__.py
index 10d68550bea3d..66c6af8550828 100644
--- a/addons/microsoft_account/__manifest__.py
+++ b/addons/microsoft_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/microsoft_calendar/__manifest__.py b/addons/microsoft_calendar/__manifest__.py
index 7e8a54de6e6f3..f05b3e5b3a4dc 100644
--- a/addons/microsoft_calendar/__manifest__.py
+++ b/addons/microsoft_calendar/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Outlook Calendar',
-    'version': '1.0',
     'category': 'Productivity',
     'depends': ['microsoft_account', 'calendar'],
     'data': [
@@ -13,7 +12,6 @@
         'views/res_users_views.xml',
         'views/microsoft_calendar_views.xml',
         ],
-    'installable': True,
     'post_init_hook': 'init_initiating_microsoft_uuid',
     'assets': {
         'web.assets_backend': [
diff --git a/addons/microsoft_outlook/__manifest__.py b/addons/microsoft_outlook/__manifest__.py
index 064d7aee6c1e2..30ddd9dee8734 100644
--- a/addons/microsoft_outlook/__manifest__.py
+++ b/addons/microsoft_outlook/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py
index 74f6225d7175e..ebde8289a2349 100644
--- a/addons/mrp/__manifest__.py
+++ b/addons/mrp/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
diff --git a/addons/mrp_account/__manifest__.py b/addons/mrp_account/__manifest__.py
index 997e1e2f98d7c..ed75fac9d31fe 100644
--- a/addons/mrp_account/__manifest__.py
+++ b/addons/mrp_account/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Accounting - MRP',
-    'version': '1.0',
     'category': 'Supply Chain/Manufacturing',
     'summary': 'Analytic accounting in Manufacturing',
     'description': """
@@ -37,7 +35,6 @@
             'mrp_account/static/src/**/*',
         ],
     },
-    'installable': True,
     'auto_install': True,
     'post_init_hook': '_configure_journals',
     'author': 'Odoo S.A.',
diff --git a/addons/mrp_landed_costs/__manifest__.py b/addons/mrp_landed_costs/__manifest__.py
index 33d9c527c2017..36fc2563f7f42 100644
--- a/addons/mrp_landed_costs/__manifest__.py
+++ b/addons/mrp_landed_costs/__manifest__.py
@@ -1,13 +1,11 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Landed Costs On MO',
-    'version': '1.0',
     'summary': 'Landed Costs on Manufacturing Order',
     'description': """
-This module allows you to easily add extra costs on manufacturing order 
-and decide the split of these costs among their stock moves in order to 
+This module allows you to easily add extra costs on manufacturing order
+and decide the split of these costs among their stock moves in order to
 take them into account in your stock valuation.
     """,
     'depends': ['stock_landed_costs', 'mrp'],
diff --git a/addons/mrp_product_expiry/__manifest__.py b/addons/mrp_product_expiry/__manifest__.py
index 2334955410852..eb1de6f5553f4 100644
--- a/addons/mrp_product_expiry/__manifest__.py
+++ b/addons/mrp_product_expiry/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Manufacturing Expiry',
-    'version': '1.0',
     'category': 'Supply Chain/Manufacturing',
     'summary': 'Manufacturing Expiry',
     'description': """
@@ -13,7 +11,6 @@
     'data': [
         'wizard/confirm_expiry_view.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/mrp_repair/__manifest__.py b/addons/mrp_repair/__manifest__.py
index e05a05f855d28..9dbe6deef5d31 100644
--- a/addons/mrp_repair/__manifest__.py
+++ b/addons/mrp_repair/__manifest__.py
@@ -1,17 +1,14 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Mrp Repairs',
-    'version': '1.0',
     'category': 'Supply Chain/Inventory',
     'depends': ['repair', 'mrp'],
     'data': [
         'views/production_views.xml',
         'views/repair_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/mrp_subcontracting/__manifest__.py b/addons/mrp_subcontracting/__manifest__.py
index 46815890afe61..c783262cc075d 100644
--- a/addons/mrp_subcontracting/__manifest__.py
+++ b/addons/mrp_subcontracting/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/mrp_subcontracting_account/__manifest__.py b/addons/mrp_subcontracting_account/__manifest__.py
index 936768b530af0..abd537dc268fb 100644
--- a/addons/mrp_subcontracting_account/__manifest__.py
+++ b/addons/mrp_subcontracting_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -9,7 +8,6 @@
 This bridge module allows to manage subcontracting with valuation.
     """,
     'depends': ['mrp_subcontracting', 'mrp_account'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/mrp_subcontracting_dropshipping/__manifest__.py b/addons/mrp_subcontracting_dropshipping/__manifest__.py
index df04b778c5bb6..80d43082fc35d 100644
--- a/addons/mrp_subcontracting_dropshipping/__manifest__.py
+++ b/addons/mrp_subcontracting_dropshipping/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -14,7 +13,6 @@
         'data/mrp_subcontracting_dropshipping_data.xml',
         'views/purchase_order_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/mrp_subcontracting_landed_costs/__manifest__.py b/addons/mrp_subcontracting_landed_costs/__manifest__.py
index e24eaf60816d2..3664fbfb369e1 100644
--- a/addons/mrp_subcontracting_landed_costs/__manifest__.py
+++ b/addons/mrp_subcontracting_landed_costs/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Landed Costs With Subcontracting order',
-    'version': '1.0',
     'summary': 'Advanced views to manage landed cost for subcontracting orders',
     'description': """
 This module allows users to more easily identify subcontracting orders when applying landed costs,
diff --git a/addons/mrp_subcontracting_purchase/__manifest__.py b/addons/mrp_subcontracting_purchase/__manifest__.py
index 35536463bc562..4b3def71636c2 100644
--- a/addons/mrp_subcontracting_purchase/__manifest__.py
+++ b/addons/mrp_subcontracting_purchase/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -16,7 +15,6 @@
     'demo': [
         'data/mrp_subcontracting_purchase_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/mrp_subcontracting_repair/__manifest__.py b/addons/mrp_subcontracting_repair/__manifest__.py
index cbb2cc66a67c9..bb8692e761a32 100644
--- a/addons/mrp_subcontracting_repair/__manifest__.py
+++ b/addons/mrp_subcontracting_repair/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'MRP Subcontracting Repair',
-    'version': '1.0',
     'category': 'Supply Chain/Repair',
     'description': """
 Bridge module between MRP subcontracting and Repair
@@ -15,7 +13,6 @@
         'security/ir.model.access.csv',
         'security/mrp_subcontracting_repair_security.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/onboarding/__manifest__.py b/addons/onboarding/__manifest__.py
index eaa50cca7d2c9..f8181f2c0b871 100644
--- a/addons/onboarding/__manifest__.py
+++ b/addons/onboarding/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -11,7 +10,6 @@
 ================================================================================
     """,
     'depends': ['web'],
-    'installable': True,
     'data': [
         'views/onboarding_templates.xml',
         'views/onboarding_views.xml',
diff --git a/addons/partner_autocomplete/__manifest__.py b/addons/partner_autocomplete/__manifest__.py
index 0dd7774110bca..1b3821ed09dee 100644
--- a/addons/partner_autocomplete/__manifest__.py
+++ b/addons/partner_autocomplete/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
diff --git a/addons/partnership/__manifest__.py b/addons/partnership/__manifest__.py
index 165e53e0eb689..aa0a59444ec6f 100644
--- a/addons/partnership/__manifest__.py
+++ b/addons/partnership/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Partnership / Membership',
-    'version': '1.0',
     'category': 'Sales/CRM',
     'description': """
 This module allows you to manage all operations for managing memberships and partnerships.
diff --git a/addons/payment_aps/__manifest__.py b/addons/payment_aps/__manifest__.py
index 902b989969ab2..899797d5e060d 100644
--- a/addons/payment_aps/__manifest__.py
+++ b/addons/payment_aps/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Payment Provider: Amazon Payment Services",
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "An Amazon payment provider covering the MENA region.",
diff --git a/addons/payment_asiapay/__manifest__.py b/addons/payment_asiapay/__manifest__.py
index 823c2b3bb3673..404eb325854b6 100644
--- a/addons/payment_asiapay/__manifest__.py
+++ b/addons/payment_asiapay/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Payment Provider: AsiaPay",
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "An payment provider based in Hong Kong covering most Asian countries.",
diff --git a/addons/payment_flutterwave/__manifest__.py b/addons/payment_flutterwave/__manifest__.py
index 44a7dfcff763f..aa1ccd893f639 100644
--- a/addons/payment_flutterwave/__manifest__.py
+++ b/addons/payment_flutterwave/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Payment Provider: Flutterwave",
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "A Nigerian payment provider covering several African countries.",
diff --git a/addons/payment_mercado_pago/__manifest__.py b/addons/payment_mercado_pago/__manifest__.py
index 971acdebf7873..e781bbe812569 100644
--- a/addons/payment_mercado_pago/__manifest__.py
+++ b/addons/payment_mercado_pago/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Payment Provider: Mercado Pago",
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "A payment provider covering several countries in Latin America.",
diff --git a/addons/payment_mollie/__manifest__.py b/addons/payment_mollie/__manifest__.py
index 3da3a110cda1c..8f6d75902fba7 100755
--- a/addons/payment_mollie/__manifest__.py
+++ b/addons/payment_mollie/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Payment Provider: Mollie',
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "A Dutch payment provider covering several European countries.",
diff --git a/addons/payment_paymob/__manifest__.py b/addons/payment_paymob/__manifest__.py
index e5c93cca98ea9..cb40eee60c0e7 100644
--- a/addons/payment_paymob/__manifest__.py
+++ b/addons/payment_paymob/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Payment Provider: Paymob',
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "An Egyptian payment provider for the Middle East.",
diff --git a/addons/payment_razorpay/__manifest__.py b/addons/payment_razorpay/__manifest__.py
index 4f998bced292b..6fd622492b8db 100644
--- a/addons/payment_razorpay/__manifest__.py
+++ b/addons/payment_razorpay/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Payment Provider: Razorpay",
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "A payment provider covering India.",
diff --git a/addons/payment_xendit/__manifest__.py b/addons/payment_xendit/__manifest__.py
index f0d0555d67e9c..e7c8ce6a2e7a4 100644
--- a/addons/payment_xendit/__manifest__.py
+++ b/addons/payment_xendit/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Payment Provider: Xendit",
-    'version': '1.0',
     'category': 'Accounting/Payment Providers',
     'sequence': 350,
     'summary': "A payment provider for Indonesian and the Philippines.",
diff --git a/addons/phone_validation/__manifest__.py b/addons/phone_validation/__manifest__.py
index 323499d990f7f..caeb3f4ff85d8 100644
--- a/addons/phone_validation/__manifest__.py
+++ b/addons/phone_validation/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index b34369fc43e1f..5c920b0026541 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -60,7 +59,6 @@
     'demo': [
         'data/demo_data.xml',
     ],
-    'installable': True,
     'application': True,
     'website': 'https://www.odoo.com/app/point-of-sale-shop',
     'assets': {
diff --git a/addons/portal_rating/__manifest__.py b/addons/portal_rating/__manifest__.py
index 6fc88dc220909..b64d904e0b3e7 100644
--- a/addons/portal_rating/__manifest__.py
+++ b/addons/portal_rating/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Portal Rating',
     'category': 'Services',
-    'version': '1.0',
     'description': """
 Bridge module adding rating capabilities on portal. It includes notably
 inclusion of rating directly within the customer portal discuss widget.
diff --git a/addons/pos_account_tax_python/__manifest__.py b/addons/pos_account_tax_python/__manifest__.py
index a4467f89fb9f5..8c874bd2df00e 100644
--- a/addons/pos_account_tax_python/__manifest__.py
+++ b/addons/pos_account_tax_python/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': "Allow custom taxes in POS",
     'category': 'Accounting/Accounting',
-    'version': '1.0',
     'description': """Add code to manage custom taxes to the POS assets bundle""",
     'depends': ['account_tax_python', 'point_of_sale'],
     'assets': {
diff --git a/addons/pos_adyen/__manifest__.py b/addons/pos_adyen/__manifest__.py
index 4c3b83b425b78..2c21265367863 100644
--- a/addons/pos_adyen/__manifest__.py
+++ b/addons/pos_adyen/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'POS Adyen',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Integrate your POS with an Adyen payment terminal',
@@ -11,7 +9,6 @@
         'views/pos_payment_method_views.xml',
     ],
     'depends': ['point_of_sale'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_adyen/static/src/**/*',
diff --git a/addons/pos_discount/__manifest__.py b/addons/pos_discount/__manifest__.py
index 4189c350d4f49..2fa708f045616 100644
--- a/addons/pos_discount/__manifest__.py
+++ b/addons/pos_discount/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Point of Sale Discounts',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Simple Discounts in the Point of Sale ',
@@ -20,7 +18,6 @@
         'views/res_config_settings_views.xml',
         'views/pos_config_views.xml',
         ],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_discount/static/src/**/*',
diff --git a/addons/pos_event/__manifest__.py b/addons/pos_event/__manifest__.py
index 4863af1052152..2b22b2e2126d0 100644
--- a/addons/pos_event/__manifest__.py
+++ b/addons/pos_event/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': "POS - Event",
     'category': "Technical",
-    'version': "1.0",
     'summary': 'Link module between Point of Sale and Event',
     'depends': ['point_of_sale', 'event_product'],
     'data': [
@@ -18,7 +17,6 @@
         'data/event_product_demo.xml',
         'data/point_of_sale_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_event_sale/__manifest__.py b/addons/pos_event_sale/__manifest__.py
index 3651e57521bdc..c8590dec44fa5 100644
--- a/addons/pos_event_sale/__manifest__.py
+++ b/addons/pos_event_sale/__manifest__.py
@@ -5,7 +5,6 @@
     'category': "Technical",
     'summary': 'Link module between pos_sale and pos_event',
     'depends': ['pos_event', 'pos_sale'],
-    'installable': True,
     'auto_install': True,
     'license': 'LGPL-3',
     'author': 'Odoo S.A.',
diff --git a/addons/pos_glory_cash/__manifest__.py b/addons/pos_glory_cash/__manifest__.py
index 6ec0721f27001..097324916a081 100644
--- a/addons/pos_glory_cash/__manifest__.py
+++ b/addons/pos_glory_cash/__manifest__.py
@@ -1,10 +1,8 @@
 {
     'name': 'POS Glory Cash Machines',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'summary': 'Integrate your POS with a Glory automatic cash payment device',
     'depends': ['point_of_sale'],
-    'installable': True,
     'data': [
         'views/pos_payment_method_views.xml',
     ],
diff --git a/addons/pos_hr/__manifest__.py b/addons/pos_hr/__manifest__.py
index 97e739a4d218c..216a07e3c5ee6 100644
--- a/addons/pos_hr/__manifest__.py
+++ b/addons/pos_hr/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -22,7 +21,6 @@
         'views/res_config_settings_views.xml',
         'wizard/pos_daily_sales_reports.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_hr_restaurant/__manifest__.py b/addons/pos_hr_restaurant/__manifest__.py
index 9ca1b7d7d783d..420eee3a23a5d 100644
--- a/addons/pos_hr_restaurant/__manifest__.py
+++ b/addons/pos_hr_restaurant/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'POS HR Restaurant',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'summary': 'Link module between pos_hr and pos_restaurant',
     'description': """
diff --git a/addons/pos_imin/__manifest__.py b/addons/pos_imin/__manifest__.py
index 6189775108a1a..fc7335c099739 100644
--- a/addons/pos_imin/__manifest__.py
+++ b/addons/pos_imin/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'POS iMin',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'iMin ePOS Printers in PoS',
diff --git a/addons/pos_loyalty/__manifest__.py b/addons/pos_loyalty/__manifest__.py
index da906d4d4a6da..5ef2490886805 100644
--- a/addons/pos_loyalty/__manifest__.py
+++ b/addons/pos_loyalty/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -22,7 +21,6 @@
     'demo': [
         'data/pos_loyalty_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_frontend': [
diff --git a/addons/pos_mercado_pago/__manifest__.py b/addons/pos_mercado_pago/__manifest__.py
index ecd9385d707aa..1eb8f37f6065c 100644
--- a/addons/pos_mercado_pago/__manifest__.py
+++ b/addons/pos_mercado_pago/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'POS Mercado Pago',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Integrate your POS with the Mercado Pago Smart Point terminal',
@@ -8,7 +7,6 @@
         'views/pos_payment_method_views.xml',
     ],
     'depends': ['point_of_sale'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_mercado_pago/static/**/*',
diff --git a/addons/pos_mrp/__manifest__.py b/addons/pos_mrp/__manifest__.py
index 769f570e847ee..3725f504ed4c7 100644
--- a/addons/pos_mrp/__manifest__.py
+++ b/addons/pos_mrp/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'pos_mrp',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Link module between Point of Sale and Mrp',
@@ -20,7 +18,6 @@
             'pos_mrp/static/tests/tours/**/*',
         ],
     },
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/pos_online_payment/__manifest__.py b/addons/pos_online_payment/__manifest__.py
index d1139bb543c5a..3c2482e5a467d 100644
--- a/addons/pos_online_payment/__manifest__.py
+++ b/addons/pos_online_payment/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -14,7 +13,6 @@
         'views/account_payment_views.xml',
     ],
     'auto_install': True,
-    'installable': True,
     'assets': {
         'point_of_sale.assets_prod': [
             'pos_online_payment/static/src/app/**/*',
diff --git a/addons/pos_online_payment_self_order/__manifest__.py b/addons/pos_online_payment_self_order/__manifest__.py
index 1a968eaaf743a..010dfbd6ba5d8 100644
--- a/addons/pos_online_payment_self_order/__manifest__.py
+++ b/addons/pos_online_payment_self_order/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -6,12 +5,10 @@
     'name': 'POS Self-Order / Online Payment',
     'category': 'Sales/Point of Sale',
     'summary': 'Support online payment in self-order',
-    'version': '1.0',
     'depends': ['pos_online_payment', 'pos_self_order'],
     'data': [
         'views/res_config_settings_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'pos_self_order.assets': [
diff --git a/addons/pos_pine_labs/__manifest__.py b/addons/pos_pine_labs/__manifest__.py
index ed60ad4625981..3075e81cfc533 100644
--- a/addons/pos_pine_labs/__manifest__.py
+++ b/addons/pos_pine_labs/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'POS Pine Labs',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Integrate your POS with Pine Labs payment terminals',
@@ -21,7 +20,6 @@
         'views/pos_payment_method_views.xml',
     ],
     'depends': ['point_of_sale'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_pine_labs/static/src/**/*',
diff --git a/addons/pos_qfpay/__manifest__.py b/addons/pos_qfpay/__manifest__.py
index 539c51d1a7b18..316b40c58a423 100644
--- a/addons/pos_qfpay/__manifest__.py
+++ b/addons/pos_qfpay/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'POS QFPay',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'author': 'Odoo S.A.',
@@ -10,7 +9,6 @@
         'views/pos_payment_method_views.xml',
     ],
     'depends': ['point_of_sale'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_qfpay/static/src/**/*',
diff --git a/addons/pos_razorpay/__manifest__.py b/addons/pos_razorpay/__manifest__.py
index cbae8b03f8b61..5bc8877832112 100644
--- a/addons/pos_razorpay/__manifest__.py
+++ b/addons/pos_razorpay/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'POS Razorpay',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Integrate your POS with a Razorpay payment terminal',
@@ -21,7 +19,6 @@
         'views/pos_payment_method_views.xml',
     ],
     'depends': ['point_of_sale'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_razorpay/static/src/**/*',
diff --git a/addons/pos_repair/__manifest__.py b/addons/pos_repair/__manifest__.py
index 8eb8dbd70f538..324633e5e1ab3 100644
--- a/addons/pos_repair/__manifest__.py
+++ b/addons/pos_repair/__manifest__.py
@@ -5,7 +5,6 @@
     'category': "Technical",
     'summary': 'Link module between Point of Sale and Repair',
     'depends': ['point_of_sale', 'repair'],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_restaurant/__manifest__.py b/addons/pos_restaurant/__manifest__.py
index 670d2d85a5fad..2578b14bce9cf 100644
--- a/addons/pos_restaurant/__manifest__.py
+++ b/addons/pos_restaurant/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Restaurant',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Restaurant extensions for the Point of Sale ',
@@ -31,7 +29,6 @@
     'demo': [
         'data/demo_data.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_restaurant_adyen/__manifest__.py b/addons/pos_restaurant_adyen/__manifest__.py
index ad30f53cb1e22..b1464d0a3081b 100644
--- a/addons/pos_restaurant_adyen/__manifest__.py
+++ b/addons/pos_restaurant_adyen/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'POS Restaurant Adyen',
-    'version': '1.0',
     'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Adds American style tipping to Adyen',
diff --git a/addons/pos_restaurant_loyalty/__manifest__.py b/addons/pos_restaurant_loyalty/__manifest__.py
index 1e250d60e7154..92eb6d8782b58 100644
--- a/addons/pos_restaurant_loyalty/__manifest__.py
+++ b/addons/pos_restaurant_loyalty/__manifest__.py
@@ -3,7 +3,6 @@
 
 {
     'name': 'POS - Restaurant Loyality',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Link module between pos_restaurant and pos_loyalty',
@@ -11,7 +10,6 @@
 This module correct some behaviors when both module are installed.
 """,
     'depends': ['pos_restaurant', 'pos_loyalty'],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_restaurant_stripe/__manifest__.py b/addons/pos_restaurant_stripe/__manifest__.py
index b8e3596351deb..041217f9bda5c 100644
--- a/addons/pos_restaurant_stripe/__manifest__.py
+++ b/addons/pos_restaurant_stripe/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'POS Restaurant Stripe',
-    'version': '1.0',
     'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Adds American style tipping to Stripe',
diff --git a/addons/pos_sale/__manifest__.py b/addons/pos_sale/__manifest__.py
index fc2d612b385dd..0a4c8e305b660 100644
--- a/addons/pos_sale/__manifest__.py
+++ b/addons/pos_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -24,7 +23,6 @@
         'views/res_config_settings_views.xml',
         'views/stock_template.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_sale_loyalty/__manifest__.py b/addons/pos_sale_loyalty/__manifest__.py
index b3e7b2afb20d0..0571aa977b423 100644
--- a/addons/pos_sale_loyalty/__manifest__.py
+++ b/addons/pos_sale_loyalty/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'POS - Sales Loyality',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Link module between pos_sale and pos_loyalty',
@@ -12,7 +10,6 @@
 This module correct some behaviors when both module are installed.
 """,
     'depends': ['pos_sale', 'pos_loyalty'],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'point_of_sale._assets_pos': [
diff --git a/addons/pos_sale_margin/__manifest__.py b/addons/pos_sale_margin/__manifest__.py
index 96d17e4149fd6..d10c00ef2fb13 100644
--- a/addons/pos_sale_margin/__manifest__.py
+++ b/addons/pos_sale_margin/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -12,7 +11,6 @@
 This module adds enable you to view the margin of your Point of Sale orders in the Sales Margin report.
 """,
     'depends': ['pos_sale', 'sale_margin'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/pos_self_order/__manifest__.py b/addons/pos_self_order/__manifest__.py
index c94099e00b242..a7433d5ae3ed3 100644
--- a/addons/pos_self_order/__manifest__.py
+++ b/addons/pos_self_order/__manifest__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 {
     "name": "POS Self Order",
-    'version': '1.0',
     "summary": "Addon for the POS App that allows customers to view the menu on their smartphone.",
     "category": "Sales/Point Of Sale",
     "depends": ["pos_restaurant", "http_routing", "link_tracker"],
diff --git a/addons/pos_self_order_adyen/__manifest__.py b/addons/pos_self_order_adyen/__manifest__.py
index 86093318d7b5a..1d55c56476fa5 100644
--- a/addons/pos_self_order_adyen/__manifest__.py
+++ b/addons/pos_self_order_adyen/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     "name": "POS Self Order Adyen",
     "summary": "Addon for the Self Order App that allows customers to pay by Adyen.",
diff --git a/addons/pos_self_order_pine_labs/__manifest__.py b/addons/pos_self_order_pine_labs/__manifest__.py
index b6d07b8aff0ca..8808db95c9b2e 100644
--- a/addons/pos_self_order_pine_labs/__manifest__.py
+++ b/addons/pos_self_order_pine_labs/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     "name": "POS Self Order Pine Labs",
-    "version": "1.0",
     "summary": "An addon for the Self Order App (KIOSK) that allows customers to pay using the Pine Labs POS Terminal.",
     "category": "Sales/Point Of Sale",
     "depends": ["pos_pine_labs", "pos_self_order"],
diff --git a/addons/pos_self_order_razorpay/__manifest__.py b/addons/pos_self_order_razorpay/__manifest__.py
index 8bfdc9dfa8f9e..5f2f98eb4fe04 100644
--- a/addons/pos_self_order_razorpay/__manifest__.py
+++ b/addons/pos_self_order_razorpay/__manifest__.py
@@ -1,6 +1,5 @@
 {
     "name": "POS Self Order Razorpay",
-    "version": "1.0",
     "summary": "Addon for the Self Order App that allows customers to pay by Razorpay POS Terminal.",
     "category": "Sales/Point Of Sale",
     "depends": ["pos_razorpay", "pos_self_order"],
diff --git a/addons/pos_self_order_sale/__manifest__.py b/addons/pos_self_order_sale/__manifest__.py
index 969112774f4d3..608ec22f3828b 100644
--- a/addons/pos_self_order_sale/__manifest__.py
+++ b/addons/pos_self_order_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     "name": "POS Self Order Sale",
     "category": "Sales/Point Of Sale",
diff --git a/addons/pos_self_order_stripe/__manifest__.py b/addons/pos_self_order_stripe/__manifest__.py
index 3780c08efcad2..8d3e762bc9150 100644
--- a/addons/pos_self_order_stripe/__manifest__.py
+++ b/addons/pos_self_order_stripe/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     "name": "POS Self Order Stripe",
     "summary": "Addon for the Self Order App that allows customers to pay by Stripe.",
diff --git a/addons/pos_stripe/__manifest__.py b/addons/pos_stripe/__manifest__.py
index c8c0492731ea9..ec97b1c1c5b36 100644
--- a/addons/pos_stripe/__manifest__.py
+++ b/addons/pos_stripe/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'POS Stripe',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 6,
     'summary': 'Integrate your POS with a Stripe payment terminal',
@@ -11,7 +9,6 @@
         'views/assets_stripe.xml',
     ],
     'depends': ['point_of_sale', 'payment_stripe'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_stripe/static/src/**/*',
diff --git a/addons/pos_viva_com/__manifest__.py b/addons/pos_viva_com/__manifest__.py
index d47478fba5ba4..694aad8e18a84 100644
--- a/addons/pos_viva_com/__manifest__.py
+++ b/addons/pos_viva_com/__manifest__.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'PoS Viva.com',
-    'version': '1.0',
     'category': 'Sales/Point of Sale',
     'sequence': 7,
     'summary': 'Integrate your PoS with a Viva.com payment terminal',
@@ -9,7 +7,6 @@
         'views/pos_payment_method_views.xml',
     ],
     'depends': ['point_of_sale'],
-    'installable': True,
     'assets': {
         'point_of_sale._assets_pos': [
             'pos_viva_com/static/src/**/*',
diff --git a/addons/privacy_lookup/__manifest__.py b/addons/privacy_lookup/__manifest__.py
index 9eaa9987cdaa9..962bb8961da42 100644
--- a/addons/privacy_lookup/__manifest__.py
+++ b/addons/privacy_lookup/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Privacy',
     'category': 'Hidden',
-    'version': '1.0',
     'depends': ['mail'],
     'data': [
         'wizard/privacy_lookup_wizard_views.xml',
diff --git a/addons/product/__manifest__.py b/addons/product/__manifest__.py
index b96bd1f488de2..f96d34c682ffd 100644
--- a/addons/product/__manifest__.py
+++ b/addons/product/__manifest__.py
@@ -63,7 +63,6 @@
         'data/product_document_demo.xml',
         'data/product_supplierinfo_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'product/static/src/js/**/*',
diff --git a/addons/product_email_template/__manifest__.py b/addons/product_email_template/__manifest__.py
index cedb6264cdd5c..96f8bb5a88cde 100644
--- a/addons/product_email_template/__manifest__.py
+++ b/addons/product_email_template/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Product Email Template',
diff --git a/addons/product_margin/__manifest__.py b/addons/product_margin/__manifest__.py
index ce922f4e36741..3edb0f8e52d48 100644
--- a/addons/product_margin/__manifest__.py
+++ b/addons/product_margin/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
diff --git a/addons/product_matrix/__manifest__.py b/addons/product_matrix/__manifest__.py
index 0fb070a600490..248928055be7c 100644
--- a/addons/product_matrix/__manifest__.py
+++ b/addons/product_matrix/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Product Matrix",
@@ -7,7 +6,6 @@
 Please refer to Sale Matrix or Purchase Matrix for the use of this module.
     """,
     'category': 'Sales/Sales',
-    'version': '1.0',
     'depends': ['account'],
     # Account dependency for section_and_note widget.
     'data': [
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index 265f664a301cf..ab5353f6e275e 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -63,7 +62,6 @@
         'data/mail_template_demo.xml',
         'data/project_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'post_init_hook': '_project_post_init',
     'uninstall_hook': '_project_uninstall_hook',
diff --git a/addons/project_account/__manifest__.py b/addons/project_account/__manifest__.py
index 1c1a6fbf49d8a..e0c9364c40ea2 100644
--- a/addons/project_account/__manifest__.py
+++ b/addons/project_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Project - Account",
diff --git a/addons/project_hr_expense/__manifest__.py b/addons/project_hr_expense/__manifest__.py
index de791a8509bc9..b0edca4f8cc9e 100644
--- a/addons/project_hr_expense/__manifest__.py
+++ b/addons/project_hr_expense/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Project Expenses',
-    'version': '1.0',
     'category': 'Services/expenses',
     'summary': 'Project expenses',
     'description': 'Bridge created to add the number of expenses linked to an AA to a project form',
@@ -15,7 +13,6 @@
     'demo': [
         'data/project_hr_expense_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/project_hr_skills/__manifest__.py b/addons/project_hr_skills/__manifest__.py
index ae59f8bc52535..d5039fd79bbff 100644
--- a/addons/project_hr_skills/__manifest__.py
+++ b/addons/project_hr_skills/__manifest__.py
@@ -7,7 +7,6 @@
         Search project tasks according to the assignees' skills
     """,
     'category': 'Services/Project',
-    'version': '1.0',
     'depends': ['project', 'hr_skills'],
     'auto_install': True,
     'data': [
diff --git a/addons/project_mail_plugin/__manifest__.py b/addons/project_mail_plugin/__manifest__.py
index bbd3776722e44..5a25ecea7f19e 100644
--- a/addons/project_mail_plugin/__manifest__.py
+++ b/addons/project_mail_plugin/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Project Mail Plugin',
-    'version': '1.0',
     'category': 'Services/Project',
     'sequence': 5,
     'summary': 'Integrate your inbox with projects',
@@ -16,7 +14,6 @@
         'project',
         'mail_plugin',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/project_mrp/__manifest__.py b/addons/project_mrp/__manifest__.py
index 2c73c1bdecf9f..f9d62caf335be 100644
--- a/addons/project_mrp/__manifest__.py
+++ b/addons/project_mrp/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': "MRP Project",
-    'version': '1.0',
     'summary': "Monitor MRP using project",
     'category': 'Services/Project',
     'depends': ['mrp', 'project'],
diff --git a/addons/project_mrp_account/__manifest__.py b/addons/project_mrp_account/__manifest__.py
index 55dda21531694..646085b6e8617 100644
--- a/addons/project_mrp_account/__manifest__.py
+++ b/addons/project_mrp_account/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "MRP Account Project",
-    'version': '1.0',
     'summary': "Monitor MRP account using project",
     'category': 'Services/Project',
     'depends': ['mrp_account', 'project_mrp'],
diff --git a/addons/project_mrp_sale/__manifest__.py b/addons/project_mrp_sale/__manifest__.py
index 968c9e9257340..6294fbc95bf7c 100644
--- a/addons/project_mrp_sale/__manifest__.py
+++ b/addons/project_mrp_sale/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "MRP Project Sale",
-    'version': '1.0',
     'summary': "Technical Bridge",
     'category': 'Services/Project',
     'depends': ['project_mrp', 'sale_mrp', 'sale_project'],
diff --git a/addons/project_mrp_stock_landed_costs/__manifest__.py b/addons/project_mrp_stock_landed_costs/__manifest__.py
index af4807b2dd6e5..6d9f036833810 100644
--- a/addons/project_mrp_stock_landed_costs/__manifest__.py
+++ b/addons/project_mrp_stock_landed_costs/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Project MRP Landed Costs',
-    'version': '1.0',
     'summary': 'Technical Bridge',
     'category': 'Supply Chain/Manufacturing',
     'depends': ['project_mrp_account', 'mrp_landed_costs'],
diff --git a/addons/project_purchase/__manifest__.py b/addons/project_purchase/__manifest__.py
index 9198beaba9f86..e3c85901757ec 100644
--- a/addons/project_purchase/__manifest__.py
+++ b/addons/project_purchase/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': "Project Purchase",
-    'version': '1.0',
     'summary': "Monitor purchase in project",
     'category': 'Services/Project',
     'depends': ['purchase', 'project_account'],
diff --git a/addons/project_purchase_stock/__manifest__.py b/addons/project_purchase_stock/__manifest__.py
index b0eb92631f434..166ce3175570d 100644
--- a/addons/project_purchase_stock/__manifest__.py
+++ b/addons/project_purchase_stock/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Project - Purchase - Stock',
-    'version': '1.0',
     'description': 'Add a project link between POs and their generated stock pickings.',
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/project_sale_expense/__manifest__.py b/addons/project_sale_expense/__manifest__.py
index a68b61c98c632..61bb90e1ac254 100644
--- a/addons/project_sale_expense/__manifest__.py
+++ b/addons/project_sale_expense/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Project - Sale - Expense',
-    'version': '1.0',
     'description': 'Adds a full traceability of reinvoice expenses on the profitability report.',
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/project_sms/__manifest__.py b/addons/project_sms/__manifest__.py
index e7710ff6c6282..93b1c6b88f618 100644
--- a/addons/project_sms/__manifest__.py
+++ b/addons/project_sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/project_stock/__manifest__.py b/addons/project_stock/__manifest__.py
index 21668443472f8..6dea2bf30790d 100644
--- a/addons/project_stock/__manifest__.py
+++ b/addons/project_stock/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Project Stock',
-    'version': '1.0',
     'summary': 'Link Stock pickings to Project',
     'category': 'Services/Project',
     'depends': ['stock', 'project'],
diff --git a/addons/project_stock_account/__manifest__.py b/addons/project_stock_account/__manifest__.py
index 4e565d71ac52b..a2525c6ddcea4 100644
--- a/addons/project_stock_account/__manifest__.py
+++ b/addons/project_stock_account/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Project Stock Account',
-    'version': '1.0',
     'summary': 'Handle analytics in Stock pickings with Project',
     'category': 'Services/Project',
     'depends': ['stock_account', 'project_stock'],
diff --git a/addons/project_stock_landed_costs/__manifest__.py b/addons/project_stock_landed_costs/__manifest__.py
index 400cb4279fd3c..800ebc0c4f055 100644
--- a/addons/project_stock_landed_costs/__manifest__.py
+++ b/addons/project_stock_landed_costs/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Project Stock Landed Costs',
-    'version': '1.0',
     'summary': 'Technical Bridge',
     'category': 'Supply Chain/Inventory',
     'depends': ['project_stock_account', 'stock_landed_costs'],
diff --git a/addons/project_timesheet_holidays/__manifest__.py b/addons/project_timesheet_holidays/__manifest__.py
index d79fe96e41c23..cb519e3a6aab5 100644
--- a/addons/project_timesheet_holidays/__manifest__.py
+++ b/addons/project_timesheet_holidays/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Timesheet when on Time Off',
-    'version': '1.0',
     'category': 'Human Resources',
     'summary': 'Schedule timesheet when on time off',
     'description': """
@@ -23,7 +21,6 @@
     'demo': [
         'data/holiday_timesheets_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'post_init_hook': 'post_init',
     'author': 'Odoo S.A.',
diff --git a/addons/project_todo/__manifest__.py b/addons/project_todo/__manifest__.py
index f519d73717b9a..a19fd272f2eef 100644
--- a/addons/project_todo/__manifest__.py
+++ b/addons/project_todo/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'To-Do',
-    'version': '1.0',
     'category': 'Productivity/To-Do',
     'summary': 'Organize your work with memos and to-do lists',
     'sequence': 260,
@@ -19,7 +17,6 @@
         'views/project_todo_menus.xml',
         'wizard/mail_activity_todo_create.xml',
     ],
-    'installable': True,
     'application': True,
     'post_init_hook': '_todo_post_init',
     'assets': {
diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py
index 14f7174ced066..283ec27ff55c7 100644
--- a/addons/purchase/__manifest__.py
+++ b/addons/purchase/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -36,7 +35,6 @@
     'demo': [
         'data/purchase_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/purchase_edi_ubl_bis3/__manifest__.py b/addons/purchase_edi_ubl_bis3/__manifest__.py
index 3c274b80a0b9e..b75f73ad57294 100644
--- a/addons/purchase_edi_ubl_bis3/__manifest__.py
+++ b/addons/purchase_edi_ubl_bis3/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': "Import/Export electronic orders with UBL",
-    'version': '1.0',
     'category': 'Supply Chain/Purchase',
     'description': """
 Allows to export and import formats: UBL Bis 3.
@@ -8,7 +7,6 @@
 receiver to retrieve the PDF with only the xml file.
     """,
     'depends': ['purchase', 'account_edi_ubl_cii'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/purchase_mrp/__manifest__.py b/addons/purchase_mrp/__manifest__.py
index a4a7756b7bc1e..9f1399f1da4dc 100644
--- a/addons/purchase_mrp/__manifest__.py
+++ b/addons/purchase_mrp/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Purchase and MRP Management',
-    'version': '1.0',
     'category': 'Supply Chain/Purchase',
     'description': """
 This module provides facility to the user to install mrp and purchase modules at a time.
@@ -24,7 +22,6 @@
         'data/purchase_mrp_demo.xml',
     ],
     'depends': ['mrp', 'purchase_stock'],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/purchase_product_matrix/__manifest__.py b/addons/purchase_product_matrix/__manifest__.py
index b859d636af0b9..b37bf9a766acc 100644
--- a/addons/purchase_product_matrix/__manifest__.py
+++ b/addons/purchase_product_matrix/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Purchase Matrix",
@@ -8,7 +7,6 @@
 by choosing product variants quantity through a Grid Entry.
     """,
     'category': 'Supply Chain/Purchase',
-    'version': '1.0',
     'depends': ['purchase', 'product_matrix'],
     'data': [
         'views/purchase_views.xml',
diff --git a/addons/purchase_repair/__manifest__.py b/addons/purchase_repair/__manifest__.py
index 0f331bd56524c..d3db2a8535323 100644
--- a/addons/purchase_repair/__manifest__.py
+++ b/addons/purchase_repair/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Purchase Repair',
     'summary': 'Keep track of linked purchase and repair orders',
-    'version': '1.0',
     'category': 'Supply Chain/Purchase',
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
@@ -13,5 +12,4 @@
         'views/repair_views.xml',
     ],
     'auto_install': True,
-    'installable': True,
 }
diff --git a/addons/purchase_requisition_sale/__manifest__.py b/addons/purchase_requisition_sale/__manifest__.py
index 0edbf8d8d10ba..c0ec58723d271 100644
--- a/addons/purchase_requisition_sale/__manifest__.py
+++ b/addons/purchase_requisition_sale/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Purchase Requisition Sale',
     'description': "Bridge module for Purchase requisition and Sales. Used to properly create purchase requisitions for subcontracted services",
-    'version': '1.0',
     'category': 'Supply Chain/Purchase',
     'sequence': 70,
     'depends': ['purchase_requisition', 'sale_purchase'],
diff --git a/addons/purchase_requisition_stock/__manifest__.py b/addons/purchase_requisition_stock/__manifest__.py
index 1cd589c84ad69..67e6b37b527a4 100644
--- a/addons/purchase_requisition_stock/__manifest__.py
+++ b/addons/purchase_requisition_stock/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -13,7 +12,6 @@
         'views/purchase_views.xml',
         'views/purchase_requisition_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/purchase_stock/__manifest__.py b/addons/purchase_stock/__manifest__.py
index 2285f336ab500..8b6933011db72 100644
--- a/addons/purchase_stock/__manifest__.py
+++ b/addons/purchase_stock/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -32,7 +31,6 @@
     'demo': [
         'data/purchase_stock_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'post_init_hook': '_create_buy_rules',
     'assets': {
diff --git a/addons/rating/__manifest__.py b/addons/rating/__manifest__.py
index b74dd2a881c2a..8218daf3bc1bd 100644
--- a/addons/rating/__manifest__.py
+++ b/addons/rating/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -17,7 +16,6 @@
         'views/mail_message_views.xml',
         'security/ir.model.access.csv'
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             "rating/static/src/core/common/**/*",
diff --git a/addons/repair/__manifest__.py b/addons/repair/__manifest__.py
index 48c7dfa42dda3..6ace66732625d 100644
--- a/addons/repair/__manifest__.py
+++ b/addons/repair/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Repairs',
-    'version': '1.0',
     'sequence': 230,
     'category': 'Supply Chain/Inventory',
     'summary': 'Repair damaged products',
@@ -37,7 +35,6 @@
     ],
     'demo': ['data/repair_demo.xml'],
     'post_init_hook': '_create_warehouse_data',
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/resource/__manifest__.py b/addons/resource/__manifest__.py
index 72b99e4faad89..0718905d919e7 100644
--- a/addons/resource/__manifest__.py
+++ b/addons/resource/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/resource_mail/__manifest__.py b/addons/resource_mail/__manifest__.py
index 032a25c2cd5c1..c81ca78f920da 100644
--- a/addons/resource_mail/__manifest__.py
+++ b/addons/resource_mail/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Resource Mail',
-    'version': '1.0',
     'category': 'Hidden',
     'description': """Integrate features developped in Mail in use case involving resources instead of users""",
     'depends': ['resource', 'mail'],
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 5af4e9bc10011..a23b96e1073cf 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Sales',
-    'version': '1.2',
     'category': 'Sales/Sales',
     'summary': 'Sales internal machinery',
     'description': """
@@ -60,7 +59,6 @@
         'data/product_demo.xml',
         'data/sale_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'sale/static/src/scss/sale_onboarding.scss',
diff --git a/addons/sale_crm/__manifest__.py b/addons/sale_crm/__manifest__.py
index 94cc715e1542b..af4e2f8c92fcd 100644
--- a/addons/sale_crm/__manifest__.py
+++ b/addons/sale_crm/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Opportunity to Quotation',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
diff --git a/addons/sale_edi_ubl/__manifest__.py b/addons/sale_edi_ubl/__manifest__.py
index 94bd8b09dd6f3..425baed8ede79 100644
--- a/addons/sale_edi_ubl/__manifest__.py
+++ b/addons/sale_edi_ubl/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': "Import electronic orders with UBL",
-    'version': '1.0',
     'category': 'Sales/Sales',
     'description': """
 Electronic ordering module
@@ -11,7 +10,6 @@
 File with embedded xml data will allow seller to retrieve Order data from Files.
     """,
     'depends': ['sale', 'account_edi_ubl_cii'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_expense/__manifest__.py b/addons/sale_expense/__manifest__.py
index d3ce265d2fdcb..d44c8f2864ea8 100644
--- a/addons/sale_expense/__manifest__.py
+++ b/addons/sale_expense/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Sales Expense',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'summary': 'Quotation, Sales Orders, Delivery & Invoicing Control',
     'description': """
@@ -20,7 +18,6 @@
         'views/hr_expense_views.xml',
         'views/sale_order_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_expense_margin/__manifest__.py b/addons/sale_expense_margin/__manifest__.py
index 1d56fb36e6afc..5aab510720baa 100644
--- a/addons/sale_expense_margin/__manifest__.py
+++ b/addons/sale_expense_margin/__manifest__.py
@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Sales Expense Margin',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'description': 'When re-invoicing the expense on the SO, set the cost to the total untaxed amount of the expense.',
     'depends': ['sale_expense', 'sale_margin'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_loyalty/__manifest__.py b/addons/sale_loyalty/__manifest__.py
index bb0716a9637ec..d45142c5a10e5 100644
--- a/addons/sale_loyalty/__manifest__.py
+++ b/addons/sale_loyalty/__manifest__.py
@@ -5,7 +5,6 @@
     'summary': 'Use discounts and loyalty programs in sales orders',
     'description': 'Integrate discount and loyalty programs mechanisms in sales orders.',
     'category': 'Sales/Sales',
-    'version': '1.0',
     'depends': ['sale', 'loyalty'],
     'auto_install': True,
     'data': [
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index e43885eec46c1..0929da7f3dca9 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Sales',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'sequence': 5,
     'summary': 'From quotations to invoices',
diff --git a/addons/sale_margin/__manifest__.py b/addons/sale_margin/__manifest__.py
index 5f0bd134f2d63..4bd93db104464 100644
--- a/addons/sale_margin/__manifest__.py
+++ b/addons/sale_margin/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Margins in Sales Orders',
-    'version':'1.0',
     'category': 'Sales/Sales',
     'description': """
 This module adds the 'Margin' on sales order.
diff --git a/addons/sale_mrp/__manifest__.py b/addons/sale_mrp/__manifest__.py
index 3bbcabc379fb9..7a11c1591fc47 100644
--- a/addons/sale_mrp/__manifest__.py
+++ b/addons/sale_mrp/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Sales and MRP Management',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'description': """
 This module provides facility to the user to install mrp and sales modulesat a time.
@@ -20,7 +18,6 @@
         'views/sale_order_views.xml',
         'views/sale_portal_templates.xml'
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_mrp_margin/__manifest__.py b/addons/sale_mrp_margin/__manifest__.py
index ed48d0fe52aeb..dbb6fa9fca2b6 100644
--- a/addons/sale_mrp_margin/__manifest__.py
+++ b/addons/sale_mrp_margin/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Sale Mrp Margin",
     'category': 'Sales/Sales',
-    'version': '0.1',
     'description': 'Handle BoM prices to compute sale margin.',
     'depends': ['sale_mrp', 'sale_stock_margin'],
     'author': 'Odoo S.A.',
diff --git a/addons/sale_product_matrix/__manifest__.py b/addons/sale_product_matrix/__manifest__.py
index af9d894c79d27..2e6b8c0118ff1 100644
--- a/addons/sale_product_matrix/__manifest__.py
+++ b/addons/sale_product_matrix/__manifest__.py
@@ -8,7 +8,6 @@
 by choosing product variants quantity through a Grid Entry.
     """,
     'category': 'Sales/Sales',
-    'version': '1.0',
     'depends': ['sale', 'product_matrix'],
     'data': [
         'views/product_template_views.xml',
diff --git a/addons/sale_project/__manifest__.py b/addons/sale_project/__manifest__.py
index 6dd35764b4075..2a6ad9165d811 100644
--- a/addons/sale_project/__manifest__.py
+++ b/addons/sale_project/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Sales - Project",
diff --git a/addons/sale_project_stock/__manifest__.py b/addons/sale_project_stock/__manifest__.py
index edde0bc732303..55c10fe510372 100644
--- a/addons/sale_project_stock/__manifest__.py
+++ b/addons/sale_project_stock/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Sale Project - Sale Stock',
-    'version': '1.0',
     'description': 'Adds a full traceability of inventory operations on the profitability report.',
     'summary': 'Adds a full traceability of inventory operations on the profitability report.',
     'author': 'Odoo S.A.',
diff --git a/addons/sale_purchase/__manifest__.py b/addons/sale_purchase/__manifest__.py
index f7a5cd2575a78..dc15b7017262d 100644
--- a/addons/sale_purchase/__manifest__.py
+++ b/addons/sale_purchase/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -8,7 +7,6 @@
 Allows the outsourcing of services. This module allows one to sell services provided
 by external providers and will automatically generate purchase orders directed to the service seller.
     """,
-    'version': '1.0',
     'website': 'https://www.odoo.com/',
     'category': 'Sales/Sales',
     'depends': [
diff --git a/addons/sale_purchase_project/__manifest__.py b/addons/sale_purchase_project/__manifest__.py
index 958774bdd5fc5..d5662f1aa7e8f 100644
--- a/addons/sale_purchase_project/__manifest__.py
+++ b/addons/sale_purchase_project/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Sale Purchase Project',
-    'version': '1.0',
     'summary': 'Technical Bridge',
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_purchase_stock/__manifest__.py b/addons/sale_purchase_stock/__manifest__.py
index f8d9f994f2213..9bfeca8dd7466 100644
--- a/addons/sale_purchase_stock/__manifest__.py
+++ b/addons/sale_purchase_stock/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'MTO Sale <-> Purchase',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'summary': 'SO/PO relation in case of MTO',
     'description': """
@@ -13,7 +11,6 @@
     'data': [
         'views/purchase_order_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_service/__manifest__.py b/addons/sale_service/__manifest__.py
index 497d4a0f4d79e..4b9263ec96ced 100644
--- a/addons/sale_service/__manifest__.py
+++ b/addons/sale_service/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Sales - Service",
diff --git a/addons/sale_sms/__manifest__.py b/addons/sale_sms/__manifest__.py
index 0a1270d0ad33c..f59af62e42fdb 100644
--- a/addons/sale_sms/__manifest__.py
+++ b/addons/sale_sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -6,7 +5,6 @@
     'summary': "Ease SMS integration with sales capabilities",
     'description': "Ease SMS integration with sales capabilities",
     'category': 'Sales/Sales',
-    'version': '1.0',
     'depends': ['sale', 'sms'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/sale_stock/__manifest__.py b/addons/sale_stock/__manifest__.py
index 1da51c8c1edfb..12a3efbe386a7 100644
--- a/addons/sale_stock/__manifest__.py
+++ b/addons/sale_stock/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Sales and Warehouse Management',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'summary': 'Quotation, Sales Orders, Delivery & Invoicing Control',
     'description': """
@@ -43,7 +41,6 @@
         'wizard/stock_rules_report_views.xml',
     ],
     'demo': ['data/sale_order_demo.xml'],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/sale_stock_margin/__manifest__.py b/addons/sale_stock_margin/__manifest__.py
index 21d59ff476d09..fded4b2833e58 100644
--- a/addons/sale_stock_margin/__manifest__.py
+++ b/addons/sale_stock_margin/__manifest__.py
@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Sale Stock Margin",
     'category': 'Sales/Sales',
     'description': 'Once the delivery is validated, update the cost on the SO to have an exact margin computation.',
-    'version': '0.1',
     'depends': ['sale_stock', 'sale_margin'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/sale_stock_product_expiry/__manifest__.py b/addons/sale_stock_product_expiry/__manifest__.py
index 011eec3b6832a..f06354e6e1522 100644
--- a/addons/sale_stock_product_expiry/__manifest__.py
+++ b/addons/sale_stock_product_expiry/__manifest__.py
@@ -2,9 +2,7 @@
     'name': "Sale Stock Product Expiry",
     'category': 'Sales/Sales',
     'description': 'Modifications to the forecast widget on SO lines to show fresh stock, i.e. ignoring stock to be removed due to expiration.',
-    'version': '0.1',
     'depends': ['sale_stock', 'product_expiry'],
-    'installable': True,
     'auto_install': True,
     'license': 'LGPL-3',
     'author': 'Odoo S.A.',
diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py
index 4dba1ad875d6e..241aa4e0bca40 100644
--- a/addons/sale_timesheet/__manifest__.py
+++ b/addons/sale_timesheet/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/sale_timesheet_margin/__manifest__.py b/addons/sale_timesheet_margin/__manifest__.py
index 4d2be6bdc9158..c59653c657246 100644
--- a/addons/sale_timesheet_margin/__manifest__.py
+++ b/addons/sale_timesheet_margin/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Service Margins in Sales Orders',
-    'version': '1.0',
     'summary': 'Bridge module between Sales Margin and Sales Timesheet',
     'description': """
 Allows to compute accurate margin for Service sales.
diff --git a/addons/sales_team/__manifest__.py b/addons/sales_team/__manifest__.py
index c5aac12a44f57..e0697dd7a1a76 100644
--- a/addons/sales_team/__manifest__.py
+++ b/addons/sales_team/__manifest__.py
@@ -24,7 +24,6 @@
         'data/crm_team_demo.xml',
         'data/crm_tag_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'sales_team/static/src/**/*',
diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index a4cff4b9e91ba..c1ee6a81c4a0e 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -41,7 +40,6 @@
         'data/sms_demo.xml',
         'data/mail_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'iap_paid_service': True,
     'assets': {
diff --git a/addons/sms_twilio/__manifest__.py b/addons/sms_twilio/__manifest__.py
index 14cf391f73bda..8622ec167aab9 100644
--- a/addons/sms_twilio/__manifest__.py
+++ b/addons/sms_twilio/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Twilio SMS',
-    'version': '1.0',
     'summary': 'Send SMS messages using Twilio',
     'category': 'Hidden/Tools',
     'description': """
@@ -17,7 +16,6 @@
         'wizard/sms_twilio_account_manage_views.xml',
         'security/ir.model.access.csv'
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/snailmail/__manifest__.py b/addons/snailmail/__manifest__.py
index df54d0d377d36..9f42dd901d4bc 100644
--- a/addons/snailmail/__manifest__.py
+++ b/addons/snailmail/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Snail Mail",
     'description': """
diff --git a/addons/snailmail_account/__manifest__.py b/addons/snailmail_account/__manifest__.py
index bf70e3b80593d..c84784e4501ae 100644
--- a/addons/snailmail_account/__manifest__.py
+++ b/addons/snailmail_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Snail Mail - Account",
     'description': """
diff --git a/addons/social_media/__manifest__.py b/addons/social_media/__manifest__.py
index 5f1e9c095c775..12c698c2a86d5 100644
--- a/addons/social_media/__manifest__.py
+++ b/addons/social_media/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Social Media",
 
diff --git a/addons/spreadsheet/__manifest__.py b/addons/spreadsheet/__manifest__.py
index df32c84376ecc..6027b9ad81079 100644
--- a/addons/spreadsheet/__manifest__.py
+++ b/addons/spreadsheet/__manifest__.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
     'depends': ['bus', 'web', 'portal'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
     'data': [
diff --git a/addons/spreadsheet_account/__manifest__.py b/addons/spreadsheet_account/__manifest__.py
index 84d5e6b5750b9..267947b8fbc4e 100644
--- a/addons/spreadsheet_account/__manifest__.py
+++ b/addons/spreadsheet_account/__manifest__.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet Accounting Formulas",
-    'version': '1.0',
     'category': 'Accounting',
     'summary': 'Spreadsheet Accounting formulas',
     'description': 'Spreadsheet Accounting formulas',
     'depends': ['spreadsheet', 'account'],
-    'installable': True,
     'auto_install': ['account'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard/__manifest__.py b/addons/spreadsheet_dashboard/__manifest__.py
index 965d54a60a81c..bae6218861ee5 100644
--- a/addons/spreadsheet_dashboard/__manifest__.py
+++ b/addons/spreadsheet_dashboard/__manifest__.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     "name": "Spreadsheet dashboard",
-    "version": "1.0",
     "category": "Productivity/Dashboard",
     "summary": "Spreadsheet",
     "description": "Spreadsheet",
     "depends": ["spreadsheet"],
-    "installable": True,
     "author": "Odoo S.A.",
     "license": "LGPL-3",
     "data": [
diff --git a/addons/spreadsheet_dashboard_account/__manifest__.py b/addons/spreadsheet_dashboard_account/__manifest__.py
index 3a7350019f892..05e87ff1df9eb 100644
--- a/addons/spreadsheet_dashboard_account/__manifest__.py
+++ b/addons/spreadsheet_dashboard_account/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for accounting",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -10,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['spreadsheet_account'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_event_sale/__manifest__.py b/addons/spreadsheet_dashboard_event_sale/__manifest__.py
index 2531840b315dd..ddf64b53305a5 100644
--- a/addons/spreadsheet_dashboard_event_sale/__manifest__.py
+++ b/addons/spreadsheet_dashboard_event_sale/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for events",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -10,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['event_sale'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_hr_expense/__manifest__.py b/addons/spreadsheet_dashboard_hr_expense/__manifest__.py
index 2b9cb3f5a9dff..05ae4ece0f3ca 100644
--- a/addons/spreadsheet_dashboard_hr_expense/__manifest__.py
+++ b/addons/spreadsheet_dashboard_hr_expense/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for expenses",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -10,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['sale_expense'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_hr_timesheet/__manifest__.py b/addons/spreadsheet_dashboard_hr_timesheet/__manifest__.py
index 58c25a2cee631..0de27c8d1ecd2 100644
--- a/addons/spreadsheet_dashboard_hr_timesheet/__manifest__.py
+++ b/addons/spreadsheet_dashboard_hr_timesheet/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for time sheets",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -9,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['hr_timesheet'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_im_livechat/__manifest__.py b/addons/spreadsheet_dashboard_im_livechat/__manifest__.py
index f2cc3bcb8ce11..1f4ee559dac70 100644
--- a/addons/spreadsheet_dashboard_im_livechat/__manifest__.py
+++ b/addons/spreadsheet_dashboard_im_livechat/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for live chat",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -11,7 +9,6 @@
         "data/livechat_ongoing_sessions_actions.xml",
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['im_livechat'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_pos_hr/__manifest__.py b/addons/spreadsheet_dashboard_pos_hr/__manifest__.py
index 3a32cf49e0cce..523bf87f35585 100644
--- a/addons/spreadsheet_dashboard_pos_hr/__manifest__.py
+++ b/addons/spreadsheet_dashboard_pos_hr/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for point of sale",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -10,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['pos_hr'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_pos_restaurant/__manifest__.py b/addons/spreadsheet_dashboard_pos_restaurant/__manifest__.py
index 8126426a9dc26..2ba2e75745327 100644
--- a/addons/spreadsheet_dashboard_pos_restaurant/__manifest__.py
+++ b/addons/spreadsheet_dashboard_pos_restaurant/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for restaurants",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -9,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['pos_hr', 'pos_restaurant'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_sale/__manifest__.py b/addons/spreadsheet_dashboard_sale/__manifest__.py
index 7234fd6324bba..619c6b8f7193a 100644
--- a/addons/spreadsheet_dashboard_sale/__manifest__.py
+++ b/addons/spreadsheet_dashboard_sale/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for sales",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
diff --git a/addons/spreadsheet_dashboard_sale_timesheet/__manifest__.py b/addons/spreadsheet_dashboard_sale_timesheet/__manifest__.py
index 7d3e3b6a5ced7..e5be170f540cf 100644
--- a/addons/spreadsheet_dashboard_sale_timesheet/__manifest__.py
+++ b/addons/spreadsheet_dashboard_sale_timesheet/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for time sheets",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -9,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['sale_timesheet'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_stock_account/__manifest__.py b/addons/spreadsheet_dashboard_stock_account/__manifest__.py
index bdc25f1ee6387..01251ce957c42 100644
--- a/addons/spreadsheet_dashboard_stock_account/__manifest__.py
+++ b/addons/spreadsheet_dashboard_stock_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for stock",
@@ -9,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['stock_account'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_website_sale/__manifest__.py b/addons/spreadsheet_dashboard_website_sale/__manifest__.py
index 874f76fd971fa..dadd31cd0ca54 100644
--- a/addons/spreadsheet_dashboard_website_sale/__manifest__.py
+++ b/addons/spreadsheet_dashboard_website_sale/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for eCommerce",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -9,7 +8,6 @@
     'data': [
         'data/dashboards.xml',
     ],
-    'installable': True,
     'auto_install': ['website_sale'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/spreadsheet_dashboard_website_sale_slides/__manifest__.py b/addons/spreadsheet_dashboard_website_sale_slides/__manifest__.py
index aca08f4c41a00..bd2c8a3b847ee 100644
--- a/addons/spreadsheet_dashboard_website_sale_slides/__manifest__.py
+++ b/addons/spreadsheet_dashboard_website_sale_slides/__manifest__.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Spreadsheet dashboard for eLearning",
-    'version': '1.0',
     'category': 'Productivity/Dashboard',
     'summary': 'Spreadsheet',
     'description': 'Spreadsheet',
@@ -9,7 +8,6 @@
     'data': [
         "data/dashboards.xml",
     ],
-    'installable': True,
     'auto_install': ['website_sale_slides'],
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index c367dcefe0b4c..3d40317dac027 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -89,7 +88,6 @@
         'views/stock_reference_views.xml',
         'views/uom_uom_views.xml',
     ],
-    'installable': True,
     'application': True,
     'pre_init_hook': 'pre_init_hook',
     'post_init_hook': '_assign_default_mail_template_picking_id',
diff --git a/addons/stock_account/__manifest__.py b/addons/stock_account/__manifest__.py
index 2551192309d55..aa774315ef427 100644
--- a/addons/stock_account/__manifest__.py
+++ b/addons/stock_account/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -42,7 +41,6 @@
         'report/stock_avco_audit_report_views.xml',
         'report/stock_valuation_report.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'post_init_hook': '_post_init_hook',
     'assets': {
diff --git a/addons/stock_delivery/__manifest__.py b/addons/stock_delivery/__manifest__.py
index f6220719224d4..8371a5d723180 100644
--- a/addons/stock_delivery/__manifest__.py
+++ b/addons/stock_delivery/__manifest__.py
@@ -3,7 +3,6 @@
 
 {
     'name': 'Delivery - Stock',
-    'version': '1.0',
     'category': 'Shipping Connectors',
     'description': """
 Allows you to add delivery methods in pickings.
@@ -29,7 +28,6 @@
         'report/product_templates.xml',
     ],
     'demo': ['data/delivery_demo.xml'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/stock_dropshipping/__manifest__.py b/addons/stock_dropshipping/__manifest__.py
index 3df643f12cedf..6fdfee9c4dd2c 100644
--- a/addons/stock_dropshipping/__manifest__.py
+++ b/addons/stock_dropshipping/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Drop Shipping',
-    'version': '1.0',
     'category': 'Supply Chain/Inventory',
     'summary': 'Drop Shipping',
     'description': """
@@ -31,7 +29,6 @@
         'data/stock_dropshipping_demo.xml',
     ],
     'uninstall_hook': "uninstall_hook",
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/stock_fleet/__manifest__.py b/addons/stock_fleet/__manifest__.py
index 82c648548d8e2..f6e9518ace688 100644
--- a/addons/stock_fleet/__manifest__.py
+++ b/addons/stock_fleet/__manifest__.py
@@ -4,7 +4,6 @@
     'name': 'Stock Transport',
     'summary': 'Stock Transport: Dispatch Management System',
     'description': 'Transport Management: organize packs in your fleet, or carriers.',
-    'version': '1.0',
     'depends': ['stock_picking_batch', 'fleet'],
     'demo': [
         'data/stock_fleet_demo.xml',
diff --git a/addons/stock_landed_costs/__manifest__.py b/addons/stock_landed_costs/__manifest__.py
index b1a057011ef30..1fdd6122cc495 100644
--- a/addons/stock_landed_costs/__manifest__.py
+++ b/addons/stock_landed_costs/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -22,7 +21,6 @@
         'views/stock_landed_cost_views.xml',
         'views/res_config_settings_views.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/stock_maintenance/__manifest__.py b/addons/stock_maintenance/__manifest__.py
index a57b93e02df50..1e889c0a7d82b 100644
--- a/addons/stock_maintenance/__manifest__.py
+++ b/addons/stock_maintenance/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Stock - Maintenance',
-    'version': '1.0',
     'category': 'Supply Chain/Inventory',
     'description': """
 Stock in Maintenance
diff --git a/addons/stock_picking_batch/__manifest__.py b/addons/stock_picking_batch/__manifest__.py
index af0efbaf50eec..a97ea75a0e040 100644
--- a/addons/stock_picking_batch/__manifest__.py
+++ b/addons/stock_picking_batch/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Warehouse Management: Batch Transfer',
-    'version': '1.0',
     'category': 'Supply Chain/Inventory',
     'description': """
 This module adds the batch transfer option in warehouse management
@@ -27,7 +25,6 @@
     'demo': [
         'data/stock_picking_batch_demo.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
     'assets': {
diff --git a/addons/stock_sms/__manifest__.py b/addons/stock_sms/__manifest__.py
index 9e7843330b004..d204a13116d89 100644
--- a/addons/stock_sms/__manifest__.py
+++ b/addons/stock_sms/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -6,7 +5,6 @@
     'summary': 'Send text messages when final stock move',
     'description': "Send text messages when final stock move",
     'category': 'Supply Chain/Inventory',
-    'version': '1.0',
     'depends': ['stock', 'sms'],
     'data': [
         'data/sms_data.xml',
diff --git a/addons/survey/__manifest__.py b/addons/survey/__manifest__.py
index 9ce3993427534..de21009a6aa76 100644
--- a/addons/survey/__manifest__.py
+++ b/addons/survey/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Surveys',
@@ -55,7 +54,6 @@
         'data/survey_demo_certification_user_input_line.xml',
         'data/survey_demo_conditional.xml',
     ],
-    'installable': True,
     'application': True,
     'sequence': 220,
     'assets': {
diff --git a/addons/survey_crm/__manifest__.py b/addons/survey_crm/__manifest__.py
index 377de36d6762d..03dc42cea9fd7 100644
--- a/addons/survey_crm/__manifest__.py
+++ b/addons/survey_crm/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Survey CRM',
-    'version': '1.0',
     'category': 'Marketing/Surveys',
     'summary': 'Generate leads from surveys',
     'description': """
diff --git a/addons/test_base_automation/__manifest__.py b/addons/test_base_automation/__manifest__.py
index 550aad3c8c239..9f96860a291f4 100644
--- a/addons/test_base_automation/__manifest__.py
+++ b/addons/test_base_automation/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Test - Base Automation',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 9877,
     'summary': 'Base Automation Tests: Ensure Flow Robustness',
@@ -19,7 +17,6 @@
             'test_base_automation/static/tests/**/*',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/test_crm_full/__manifest__.py b/addons/test_crm_full/__manifest__.py
index 8f2caec2aee2b..b3cf8c651c7b1 100644
--- a/addons/test_crm_full/__manifest__.py
+++ b/addons/test_crm_full/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Test Full Crm Flow',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """
 This module is intended to test the main crm flows of Odoo, both frontend and
diff --git a/addons/test_discuss_full/__manifest__.py b/addons/test_discuss_full/__manifest__.py
index bd6bffee4b33a..ef6ea6acf8d09 100644
--- a/addons/test_discuss_full/__manifest__.py
+++ b/addons/test_discuss_full/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     "name": "Test Discuss (full)",
-    "version": "1.0",
     "category": "Productivity/Discuss",
     "sequence": 9877,
     "summary": "Test of Discuss with all possible overrides installed.",
@@ -24,7 +22,6 @@
         "website_sale",
         "website_slides",
     ],
-    "installable": True,
     "assets": {
         "web.assets_tests": [
             "test_discuss_full/static/tests/tours/**/*",
diff --git a/addons/test_event_full/__manifest__.py b/addons/test_event_full/__manifest__.py
index fe828fce3df92..0261e9a50c0cf 100644
--- a/addons/test_event_full/__manifest__.py
+++ b/addons/test_event_full/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Test Full Event Flow',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """
 This module will test the main event flows of Odoo, both frontend and backend.
diff --git a/addons/test_html_field_history/__manifest__.py b/addons/test_html_field_history/__manifest__.py
index e2c51e0a5930d..507e89840c37e 100644
--- a/addons/test_html_field_history/__manifest__.py
+++ b/addons/test_html_field_history/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Test - html_field_history',
-    'version': '1.0',
     'category': 'Hidden',
     'depends': ['html_editor'],
     'data': [
diff --git a/addons/test_import_export/__manifest__.py b/addons/test_import_export/__manifest__.py
index 26b6780de02f4..7186cfd69268c 100644
--- a/addons/test_import_export/__manifest__.py
+++ b/addons/test_import_export/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'Test - Import & Export',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 3843,
     'summary': 'Base Import & Export Tests: Ensure Flow Robustness',
@@ -10,7 +9,6 @@
     'data': [
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/test_mail/__manifest__.py b/addons/test_mail/__manifest__.py
index aa7e91458387d..79ed65891920e 100644
--- a/addons/test_mail/__manifest__.py
+++ b/addons/test_mail/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Mail Tests',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 9876,
     'summary': 'Mail Tests: performances and tests specific to mail',
@@ -28,7 +26,6 @@
             'test_mail/static/tests/tours/*',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/test_mail_full/__manifest__.py b/addons/test_mail_full/__manifest__.py
index 95480f9345113..fe315707a217f 100644
--- a/addons/test_mail_full/__manifest__.py
+++ b/addons/test_mail_full/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Mail Tests (Full)',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 9876,
     'summary': 'Mail Tests: performances and tests specific to mail with all sub-modules',
@@ -39,7 +37,6 @@
             'test_mail_full/static/tests/tours/**/*',
         ],
     },
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/test_mail_sms/__manifest__.py b/addons/test_mail_sms/__manifest__.py
index 36a7a96775b96..2a16a8ec2ac1a 100644
--- a/addons/test_mail_sms/__manifest__.py
+++ b/addons/test_mail_sms/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'SMS Tests',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 9876,
     'summary': 'SMS Tests: performances and tests specific to SMS',
@@ -18,7 +16,6 @@
     'data': [
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/test_mass_mailing/__manifest__.py b/addons/test_mass_mailing/__manifest__.py
index dc6268894e46a..f6defb733b6d3 100644
--- a/addons/test_mass_mailing/__manifest__.py
+++ b/addons/test_mass_mailing/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Mass Mail Tests',
-    'version': '1.0',
     'category': 'Marketing/Email Marketing',
     'sequence': 8765,
     'summary': 'Mass Mail Tests: feature and performance tests for mass mailing',
@@ -19,7 +17,6 @@
     'data': [
         'security/ir.model.access.csv',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/test_resource/__manifest__.py b/addons/test_resource/__manifest__.py
index 3bc2c0dc473cf..3bc9ad2b03457 100644
--- a/addons/test_resource/__manifest__.py
+++ b/addons/test_resource/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/test_sale_product_configurators/__manifest__.py b/addons/test_sale_product_configurators/__manifest__.py
index 595152afbdae8..754839487af81 100644
--- a/addons/test_sale_product_configurators/__manifest__.py
+++ b/addons/test_sale_product_configurators/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/test_spreadsheet/__manifest__.py b/addons/test_spreadsheet/__manifest__.py
index e1ca921f94cca..823c621a3a808 100644
--- a/addons/test_spreadsheet/__manifest__.py
+++ b/addons/test_spreadsheet/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Spreadsheet Test',
-    'version': '1.0',
     'category': 'Hidden',
     'summary': 'Spreadsheet Test, mainly to test the mixin behavior',
     'description': """This module contains tests related to spreadsheet.
diff --git a/addons/test_website/__manifest__.py b/addons/test_website/__manifest__.py
index d78ca02a9f861..19fa8a0b3dab2 100644
--- a/addons/test_website/__manifest__.py
+++ b/addons/test_website/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Website Test',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 9876,
     'summary': 'Website Test, mainly for module install/uninstall tests',
@@ -28,7 +26,6 @@
         'views/test_model_views.xml',
         'data/test_website_data.xml',
     ],
-    'installable': True,
     'assets': {
         'test_website.test_bundle': [
             'http://test.external.link/javascript1.js',
diff --git a/addons/test_website_modules/__manifest__.py b/addons/test_website_modules/__manifest__.py
index 85c7d2d1e4f99..daae96304006f 100644
--- a/addons/test_website_modules/__manifest__.py
+++ b/addons/test_website_modules/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Website Modules Test',
-    'version': '1.0',
     'category': 'Hidden',
     'sequence': 9876,
     'description': """This module contains tests related to website modules.
@@ -20,7 +18,6 @@
         'website_sale_comparison',
         'website_sale_wishlist',
     ],
-    'installable': True,
     'assets': {
         'web.assets_tests': [
             'test_website_modules/static/tests/**/*',
diff --git a/addons/test_website_slides_full/__manifest__.py b/addons/test_website_slides_full/__manifest__.py
index 0e8896821ae5d..3b051f2fb59c0 100644
--- a/addons/test_website_slides_full/__manifest__.py
+++ b/addons/test_website_slides_full/__manifest__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Test Full eLearning Flow',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """
 This module will test the main certification flow of Odoo.
@@ -20,7 +18,6 @@
     'demo': [
         'data/product_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_tests': [
             'test_website_slides_full/static/tests/tours/**/*',
diff --git a/addons/theme_default/__manifest__.py b/addons/theme_default/__manifest__.py
index e4e33d008e8f7..c6214a84d2593 100644
--- a/addons/theme_default/__manifest__.py
+++ b/addons/theme_default/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -6,7 +5,6 @@
     'description': 'Default website theme',
     'category': 'Theme',
     'sequence': 1000,
-    'version': '1.0',
     'depends': ['website'],
     'data': [
         'data/generate_primary_template.xml',
diff --git a/addons/transifex/__manifest__.py b/addons/transifex/__manifest__.py
index 9145a739dc22d..e9397178ae342 100644
--- a/addons/transifex/__manifest__.py
+++ b/addons/transifex/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Transifex integration',
-    'version': '1.0',
     'summary': 'Add a link to edit a translation in Transifex',
     'category': 'Hidden/Tools',
     'description':
diff --git a/addons/uom/__manifest__.py b/addons/uom/__manifest__.py
index 6148b6e7f4976..9ad37685c2f4b 100644
--- a/addons/uom/__manifest__.py
+++ b/addons/uom/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Units of measure',
-    'version': '1.0',
     'category': 'Sales/Sales',
     'depends': ['base'],
     'description': """
@@ -16,7 +14,6 @@
         'security/ir.model.access.csv',
         'views/uom_uom_views.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'uom/static/src/components/**/*',
diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py
index 94c25dc98ad01..75e70b439d0a3 100644
--- a/addons/utm/__manifest__.py
+++ b/addons/utm/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 5559aa38bf3f5..f5ac46ae1b137 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Web',
     'category': 'Hidden',
-    'version': '1.0',
     'description': """
 Odoo Web core module.
 ========================
diff --git a/addons/web_hierarchy/__manifest__.py b/addons/web_hierarchy/__manifest__.py
index 4415a3857877d..9e91c0bfcb468 100644
--- a/addons/web_hierarchy/__manifest__.py
+++ b/addons/web_hierarchy/__manifest__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Web Hierarchy',
     'category': 'Hidden',
-    'version': '1.0',
     'description':
         """
 Odoo Web Hierarchy view
diff --git a/addons/web_tour/__manifest__.py b/addons/web_tour/__manifest__.py
index 5945c1565cf76..6665ffc3c16d0 100644
--- a/addons/web_tour/__manifest__.py
+++ b/addons/web_tour/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -9,7 +8,6 @@
 ========================
 
 """,
-    'version': '1.0',
     'depends': ['web'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/web_unsplash/__manifest__.py b/addons/web_unsplash/__manifest__.py
index 32cfd99d9b25c..96b1693ab61e6 100644
--- a/addons/web_unsplash/__manifest__.py
+++ b/addons/web_unsplash/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Unsplash Image Library',
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 52a4ec0bd83a7..6442a9c7ac805 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -7,7 +7,6 @@
     'sequence': 20,
     'summary': 'Enterprise website builder',
     'website': 'https://www.odoo.com/app/website',
-    'version': '1.0',
     'depends': [
         'digest',
         'web',
@@ -27,7 +26,6 @@
             'geoip2': 'python3-geoip2',
         },
     },
-    'installable': True,
     'data': [
         # security.xml first, data.xml need the group to exist (checking it)
         'security/website_security.xml',
diff --git a/addons/website_blog/__manifest__.py b/addons/website_blog/__manifest__.py
index 54a4de298619a..125eca6d232ab 100644
--- a/addons/website_blog/__manifest__.py
+++ b/addons/website_blog/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -30,7 +29,6 @@
     'demo': [
         'data/website_blog_demo.xml'
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'website_blog/static/src/tours/website_blog.js',
diff --git a/addons/website_cf_turnstile/__manifest__.py b/addons/website_cf_turnstile/__manifest__.py
index 412bd442043d2..9d2d537e2df28 100644
--- a/addons/website_cf_turnstile/__manifest__.py
+++ b/addons/website_cf_turnstile/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Cloudflare Turnstile',
     'category': 'Website/Website',
-    'version': '1.0',
     'description': """
 This module implements Cloudflare Turnstile so that you can prevent bot spam on your forms.
     """,
@@ -27,5 +25,4 @@
     },
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
-    'installable': True,
 }
diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py
index 79e30a91a83ce..e15372b9b34f3 100644
--- a/addons/website_crm/__manifest__.py
+++ b/addons/website_crm/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -22,7 +21,6 @@
         'views/website_visitor_views.xml',
         'views/website_templates_contactus.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'website.website_builder_assets': [
diff --git a/addons/website_crm_iap_reveal/__manifest__.py b/addons/website_crm_iap_reveal/__manifest__.py
index ef768dcb89c3f..a9fa708079128 100644
--- a/addons/website_crm_iap_reveal/__manifest__.py
+++ b/addons/website_crm_iap_reveal/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/website_crm_livechat/__manifest__.py b/addons/website_crm_livechat/__manifest__.py
index d8fba2c01fea8..5e10f4cc3f66c 100644
--- a/addons/website_crm_livechat/__manifest__.py
+++ b/addons/website_crm_livechat/__manifest__.py
@@ -1,16 +1,13 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Lead Livechat Sessions',
     'category': 'Website/Website',
     'summary': 'View livechat sessions for leads',
-    'version': '1.0',
     'description': """ Adds a stat button on lead form view to access their livechat sessions.""",
     'depends': ['website_crm', 'website_livechat'],
     'data': [
         'views/website_crm_lead_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/website_crm_partner_assign/__manifest__.py b/addons/website_crm_partner_assign/__manifest__.py
index 6f60137e6642c..f3e70dbc5378e 100644
--- a/addons/website_crm_partner_assign/__manifest__.py
+++ b/addons/website_crm_partner_assign/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -44,7 +43,6 @@
         'data/crm_lead_demo.xml',
         'data/res_partner_grade_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_frontend': [
             'website_crm_partner_assign/static/src/interactions/**/*',
diff --git a/addons/website_crm_sms/__manifest__.py b/addons/website_crm_sms/__manifest__.py
index e2f902209b67e..2f49133b788a8 100644
--- a/addons/website_crm_sms/__manifest__.py
+++ b/addons/website_crm_sms/__manifest__.py
@@ -1,14 +1,11 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Send SMS to Visitor with leads',
     'category': 'Website/Website',
     'sequence': 54,
     'summary': 'Allows to send sms to website visitor that have lead',
-    'version': '1.0',
     'description': """Allows to send sms to website visitor if the visitor is linked to a lead.""",
     'depends': ['website_sms', 'crm'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/website_customer/__manifest__.py b/addons/website_customer/__manifest__.py
index 10e5a80bb17a5..aa50d6876857d 100644
--- a/addons/website_customer/__manifest__.py
+++ b/addons/website_customer/__manifest__.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Customer References',
     'category': 'Website/Website',
     'summary': 'Publish your customer references',
-    'version': '1.0',
     'description': """
 Publish your customers as business references on your website to attract new potential prospects.
     """,
@@ -23,7 +21,6 @@
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
     'assets': {
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index 719e60ff33d7e..5bfe52fce6d42 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/website_event_booth/__manifest__.py b/addons/website_event_booth/__manifest__.py
index 2d207b700708f..811ba5f55cc0d 100644
--- a/addons/website_event_booth/__manifest__.py
+++ b/addons/website_event_booth/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Online Event Booths',
     'category': 'Marketing/Events',
-    'version': '1.0',
     'summary': 'Events, display your booths on your website',
     'description': """
 Display your booths on your website for the users to register.
diff --git a/addons/website_event_booth_exhibitor/__manifest__.py b/addons/website_event_booth_exhibitor/__manifest__.py
index 44937aba808b5..5a369473b553c 100644
--- a/addons/website_event_booth_exhibitor/__manifest__.py
+++ b/addons/website_event_booth_exhibitor/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Booths/Exhibitors Bridge',
diff --git a/addons/website_event_booth_sale/__manifest__.py b/addons/website_event_booth_sale/__manifest__.py
index ee59a4d72979b..60651bf03b2b9 100644
--- a/addons/website_event_booth_sale/__manifest__.py
+++ b/addons/website_event_booth_sale/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Online Event Booth Sale',
     'category': 'Marketing/Events',
-    'version': '1.0',
     'summary': 'Events, sell your booths online',
     'description': """
 Use the e-commerce to sell your event booths.
diff --git a/addons/website_event_booth_sale_exhibitor/__manifest__.py b/addons/website_event_booth_sale_exhibitor/__manifest__.py
index 2625c8b3749a1..81a587cbec517 100644
--- a/addons/website_event_booth_sale_exhibitor/__manifest__.py
+++ b/addons/website_event_booth_sale_exhibitor/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Booths Sale/Exhibitors Bridge',
     'category': 'Marketing/Events',
-    'version': '1.0',
     'summary': 'Bridge module between website_event_booth_exhibitor and website_event_booth_sale.',
     'depends': ['website_event_exhibitor', 'website_event_booth_sale'],
     'auto_install': True,
diff --git a/addons/website_event_crm/__manifest__.py b/addons/website_event_crm/__manifest__.py
index 4fdd4252f9218..51409caa24807 100644
--- a/addons/website_event_crm/__manifest__.py
+++ b/addons/website_event_crm/__manifest__.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Website Events CRM',
-    'version': '1.0',
     'category': 'Website/Website',
     'website': 'https://www.odoo.com/app/events',
     'description': "Allow per-order lead creation mode",
@@ -14,7 +12,6 @@
     'demo': [
         'data/event_crm_demo.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/website_event_exhibitor/__manifest__.py b/addons/website_event_exhibitor/__manifest__.py
index 79b3f605b135d..b313ee9a1d7f0 100644
--- a/addons/website_event_exhibitor/__manifest__.py
+++ b/addons/website_event_exhibitor/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -29,7 +28,6 @@
         'data/event_demo.xml',
         'data/event_sponsor_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_frontend': [
             'website_event_exhibitor/static/src/scss/event_templates_sponsor.scss',
diff --git a/addons/website_event_sale/__manifest__.py b/addons/website_event_sale/__manifest__.py
index 5f4765d4d3b35..5c5fec2b90de8 100644
--- a/addons/website_event_sale/__manifest__.py
+++ b/addons/website_event_sale/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/website_event_track/__manifest__.py b/addons/website_event_track/__manifest__.py
index 8cdda6951f361..0b26a31bac695 100644
--- a/addons/website_event_track/__manifest__.py
+++ b/addons/website_event_track/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
diff --git a/addons/website_event_track_live/__manifest__.py b/addons/website_event_track_live/__manifest__.py
index eaad14df2d9b6..da9ee2d98e6f6 100644
--- a/addons/website_event_track_live/__manifest__.py
+++ b/addons/website_event_track_live/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -6,7 +5,6 @@
     'name': 'Live Event Tracks',
     'category': 'Marketing/Events',
     'sequence': 1006,
-    'version': '1.0',
     'summary': 'Support live tracks: streaming, participation, youtube',
     'website': 'https://www.odoo.com/app/events',
     'depends': [
@@ -20,7 +18,6 @@
     'demo': [
         'data/event_track_demo.xml'
     ],
-    'installable': True,
     'assets': {
         'web.assets_frontend': [
             'website_event_track_live/static/src/scss/website_event_track_live.scss',
diff --git a/addons/website_event_track_live_quiz/__manifest__.py b/addons/website_event_track_live_quiz/__manifest__.py
index 4c48d2e059c07..356cde7491e2e 100644
--- a/addons/website_event_track_live_quiz/__manifest__.py
+++ b/addons/website_event_track_live_quiz/__manifest__.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
 {
     'name': 'Quiz on Live Event Tracks',
     'category': 'Marketing/Events',
-    'version': '1.0',
     'summary': 'Bridge module to support quiz features during "live" tracks. ',
     'website': 'https://www.odoo.com/app/events',
     'depends': [
@@ -15,7 +13,6 @@
     'data': [
         'views/event_track_templates_page.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_frontend': [
diff --git a/addons/website_event_track_quiz/__manifest__.py b/addons/website_event_track_quiz/__manifest__.py
index 7f6b8327da085..5c988344b58b0 100644
--- a/addons/website_event_track_quiz/__manifest__.py
+++ b/addons/website_event_track_quiz/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -6,7 +5,6 @@
     'name': 'Quizzes on Tracks',
     'category': 'Marketing/Events',
     'sequence': 1007,
-    'version': '1.0',
     'summary': 'Quizzes on tracks',
     'website': 'https://www.odoo.com/app/events',
     'depends': [
@@ -29,7 +27,6 @@
     'demo': [
         'data/quiz_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_frontend': [
             'website_event_track_quiz/static/src/scss/event_quiz.scss',
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index 0822919265f99..e7c2eabfd0ee8 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -57,7 +56,6 @@
         'data/forum_tag_demo.xml',
         'data/forum_post_demo.xml',
     ],
-    'installable': True,
     'assets': {
         'website.assets_editor': [
             'website_forum/static/src/js/systray_items/*.js',
diff --git a/addons/website_google_map/__manifest__.py b/addons/website_google_map/__manifest__.py
index 250eff709baa4..e82a7a9d33b4e 100644
--- a/addons/website_google_map/__manifest__.py
+++ b/addons/website_google_map/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Google Maps',
     'category': 'Website/Website',
     'summary': 'Show your company address on Google Maps',
-    'version': '1.0',
     'description': """
 Show your company address/partner address on Google Maps. Configure an API key in the Website settings.
     """,
@@ -12,7 +10,6 @@
     'data': [
         'views/google_map_templates.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/website_hr_recruitment/__manifest__.py b/addons/website_hr_recruitment/__manifest__.py
index 6d059eaff0e7d..28cd64347fad4 100644
--- a/addons/website_hr_recruitment/__manifest__.py
+++ b/addons/website_hr_recruitment/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -21,7 +20,6 @@
     'demo': [
         'data/hr_job_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'auto_install': ['hr_recruitment', 'website_mail'],
     'assets': {
diff --git a/addons/website_hr_recruitment_livechat/__manifest__.py b/addons/website_hr_recruitment_livechat/__manifest__.py
index b9256f9b1271f..1f19bc7950a30 100644
--- a/addons/website_hr_recruitment_livechat/__manifest__.py
+++ b/addons/website_hr_recruitment_livechat/__manifest__.py
@@ -2,7 +2,6 @@
     'name': 'Website IM Livechat HR Recruitment',
     'category': 'Website/Live Chat',
     'summary': 'Chatbot for the HR Recruitment',
-    'version': '1.0',
     'depends': [
         'website_hr_recruitment',
         'im_livechat'
@@ -10,7 +9,6 @@
     'description': """
 A chatbot to help the user be guided through recruitment process on the website and land on the right jobs position.
     """,
-    'installable': True,
     'demo': [
         'data/website_hr_recruitment_livechat_chatbot_demo.xml'
     ],
diff --git a/addons/website_links/__manifest__.py b/addons/website_links/__manifest__.py
index 7fdda96ed56d1..ed1b56524306e 100644
--- a/addons/website_links/__manifest__.py
+++ b/addons/website_links/__manifest__.py
@@ -6,7 +6,6 @@
 Generate short links with analytics trackers (UTM) to share your pages through marketing campaigns.
 Those trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to analyze the efficiency of those campaigns in terms of lead generation, related revenues (sales orders), recruitment, etc.
     """,
-    'version': '1.0',
     'depends': ['website', 'link_tracker'],
     'data': [
         'views/link_tracker_views.xml',
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index 2fb649b1eaef3..6d0de27d562e6 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'Website Live Chat',
     'category': 'Website/Live Chat',
     'summary': 'Chat with your website visitors',
-    'version': '1.0',
     'description': "Allow website visitors to chat with the collaborators.",
     'depends': ['website', 'im_livechat'],
-    'installable': True,
     'auto_install': True,
     'data': [
         'views/website_livechat.xml',
diff --git a/addons/website_mail/__manifest__.py b/addons/website_mail/__manifest__.py
index 82f65e9b65f39..20ba354660cbf 100644
--- a/addons/website_mail/__manifest__.py
+++ b/addons/website_mail/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -13,7 +12,6 @@
     'data': [
         'views/website_mail_templates.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'web.assets_frontend': [
diff --git a/addons/website_mail_group/__manifest__.py b/addons/website_mail_group/__manifest__.py
index 396cecdbc5dac..2f356534d4d7c 100644
--- a/addons/website_mail_group/__manifest__.py
+++ b/addons/website_mail_group/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': "Website Mail Group",
     'summary': "Add a website snippet for the mail groups.",
-    'version': '1.0',
     'depends': ['mail_group', 'website'],
     'auto_install': True,
     'data': [
diff --git a/addons/website_mass_mailing/__manifest__.py b/addons/website_mass_mailing/__manifest__.py
index 9d6ad34e479bf..5d1d7bdfadb8d 100644
--- a/addons/website_mass_mailing/__manifest__.py
+++ b/addons/website_mass_mailing/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -8,7 +7,6 @@
 This module brings a new building block with a mailing list widget to drop on any page of your website.
 On a simple click, your visitors can subscribe to mailing lists managed in the Email Marketing app.
     """,
-    'version': '1.0',
     'category': 'Website/Website',
     'depends': ['website', 'mass_mailing', 'google_recaptcha'],
     'data': [
diff --git a/addons/website_mass_mailing_sms/__manifest__.py b/addons/website_mass_mailing_sms/__manifest__.py
index a235cdb1ac4b0..b2f6362eced74 100644
--- a/addons/website_mass_mailing_sms/__manifest__.py
+++ b/addons/website_mass_mailing_sms/__manifest__.py
@@ -1,14 +1,12 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Newsletter Subscribe SMS Template',
     'summary': 'Attract visitors to subscribe to mailing lists',
     'description': """
-This module adds a new template to the Newsletter Block to allow 
+This module adds a new template to the Newsletter Block to allow
 your visitors to subscribe with their phone number.
     """,
-    'version': '1.0',
     'category': 'Website/Website',
     'depends': ['website_mass_mailing', 'mass_mailing_sms'],
     'data': [
diff --git a/addons/website_partner/__manifest__.py b/addons/website_partner/__manifest__.py
index af452e8677431..6c3261a246801 100644
--- a/addons/website_partner/__manifest__.py
+++ b/addons/website_partner/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
@@ -16,7 +15,6 @@
         'data/website_partner_data.xml',
     ],
     'demo': ['data/website_partner_demo.xml'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/website_payment/__manifest__.py b/addons/website_payment/__manifest__.py
index f6e45b5d565fd..4c3d957843201 100644
--- a/addons/website_payment/__manifest__.py
+++ b/addons/website_payment/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 
 {
     'name': 'Website Payment',
     'category': 'Website/Website',
     'summary': 'Payment integration with website',
-    'version': '1.0',
     'description': """
 This is a bridge module that adds multi-website support for payment providers.
     """,
diff --git a/addons/website_profile/__manifest__.py b/addons/website_profile/__manifest__.py
index caced76843f03..35678ac61e69f 100644
--- a/addons/website_profile/__manifest__.py
+++ b/addons/website_profile/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Website profile',
     'category': 'Website/Website',
-    'version': '1.0',
     'summary': 'Access the website profile of the users',
     'description': "Allows to access the website profile of the users and see their statistics (karma, badges, etc..)",
     'depends': [
diff --git a/addons/website_project/__manifest__.py b/addons/website_project/__manifest__.py
index 92edaa49791e3..8f8b32aef7f7b 100644
--- a/addons/website_project/__manifest__.py
+++ b/addons/website_project/__manifest__.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Online Task Submission',
     'category': 'Website/Website',
     'summary': 'Add a task suggestion form to your website',
-    'version': '1.0',
     'description': """
 Generate tasks in Project app from a form published on your website. This module requires the use of the *Form Builder* module in order to build the form.
     """,
@@ -15,7 +13,6 @@
         'views/project_portal_project_task_template.xml',
         'views/project_portal_project_project_template.xml',
         ],
-    'installable': True,
     'auto_install': True,
     'assets': {
         'website.website_builder_assets': [
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index c8a65a67ab277..935a5cd39cc86 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -91,7 +91,6 @@
     'demo': [
         'data/demo.xml',
     ],
-    'installable': True,
     'application': True,
     'post_init_hook': '_post_init_hook',
     'uninstall_hook': 'uninstall_hook',
diff --git a/addons/website_sale_autocomplete/__manifest__.py b/addons/website_sale_autocomplete/__manifest__.py
index de3ecc48dd56d..c9709daafbb99 100644
--- a/addons/website_sale_autocomplete/__manifest__.py
+++ b/addons/website_sale_autocomplete/__manifest__.py
@@ -4,7 +4,6 @@
     'name': 'Google places autocompletion',
     'category': 'Website/Website',
     'summary': 'Assist your users with automatic completion & suggestions when filling their address during checkout',
-    'version': '1.0',
     'description': "Assist your users with automatic completion & suggestions when filling their address during checkout",
     'depends': [
         'website_sale',
@@ -25,7 +24,6 @@
         ],
     },
     'auto_install': True,
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/website_sale_collect/__manifest__.py b/addons/website_sale_collect/__manifest__.py
index b6b5359c60c9a..d1996f97c2c1a 100644
--- a/addons/website_sale_collect/__manifest__.py
+++ b/addons/website_sale_collect/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': "Click & Collect",
-    'version': '1.0',
     'category': 'Website/Website',
     'description': """
 Allows customers to check in-store stock, pay on site, and pick up their orders at the shop.
diff --git a/addons/website_sale_comparison/__manifest__.py b/addons/website_sale_comparison/__manifest__.py
index 3583c86bbe5a3..68d52d39155cb 100644
--- a/addons/website_sale_comparison/__manifest__.py
+++ b/addons/website_sale_comparison/__manifest__.py
@@ -11,7 +11,6 @@
 Finally, the module comes with an option to display an attribute summary table in product web pages (available in Customize menu).
     """,
     'category': 'Website/Website',
-    'version': '1.0',
     'depends': ['website_sale'],
     'data': [
         'security/ir.model.access.csv',
@@ -23,7 +22,6 @@
         'data/product_attribute_category_data.xml',
         'data/demo.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_frontend': [
             'website_sale_comparison/static/src/interactions/**/*',
diff --git a/addons/website_sale_loyalty/__manifest__.py b/addons/website_sale_loyalty/__manifest__.py
index 1a7a0e1db2734..f84a6d5aad28b 100644
--- a/addons/website_sale_loyalty/__manifest__.py
+++ b/addons/website_sale_loyalty/__manifest__.py
@@ -9,7 +9,6 @@
 Coupon & promotion programs can be edited in the Catalog menu of the Website app.
     """,
     'category': 'Website/Website',
-    'version': '1.0',
     'depends': ['website_sale', 'website_links', 'sale_loyalty'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/website_sale_mass_mailing/__manifest__.py b/addons/website_sale_mass_mailing/__manifest__.py
index 2411562e5da67..06991824f35d7 100644
--- a/addons/website_sale_mass_mailing/__manifest__.py
+++ b/addons/website_sale_mass_mailing/__manifest__.py
@@ -8,7 +8,6 @@
         process.
     """,
     'category': 'Website/Website',
-    'version': '1.0',
     'depends': ['website_sale', 'website_mass_mailing'],
     'data': [
         'views/res_config_settings_views.xml',
diff --git a/addons/website_sale_mondialrelay/__manifest__.py b/addons/website_sale_mondialrelay/__manifest__.py
index eb8253f6a6bc3..816c5cb6caaba 100644
--- a/addons/website_sale_mondialrelay/__manifest__.py
+++ b/addons/website_sale_mondialrelay/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "eCommerce Mondialrelay Delivery",
     'summary': "Let's choose Point Relais® on your ecommerce",
diff --git a/addons/website_sale_mrp/__manifest__.py b/addons/website_sale_mrp/__manifest__.py
index ecda5ff287916..c31186db60672 100644
--- a/addons/website_sale_mrp/__manifest__.py
+++ b/addons/website_sale_mrp/__manifest__.py
@@ -2,7 +2,6 @@
 
 {
     'name': 'Kit Availability',
-    'version': '1.0',
     'category': 'Website/Website',
     'summary': 'Manage Kit product inventory & availability',
     'description': """
diff --git a/addons/website_sale_slides/__manifest__.py b/addons/website_sale_slides/__manifest__.py
index af24b4e5f700c..92862fc1c6888 100644
--- a/addons/website_sale_slides/__manifest__.py
+++ b/addons/website_sale_slides/__manifest__.py
@@ -1,14 +1,11 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Sell Courses",
     'summary': 'Sell your courses online',
     'description': """Sell your courses using the e-commerce features of the website.""",
     'category': 'Website/eLearning',
-    'version': '1.0',
 
     'depends': ['website_slides', 'website_sale'],
-    'installable': True,
     'data': [
         'data/product_data.xml',
         'report/sale_report_views.xml',
diff --git a/addons/website_sale_wishlist/__manifest__.py b/addons/website_sale_wishlist/__manifest__.py
index a00f307b5e77e..c23a4705e1771 100644
--- a/addons/website_sale_wishlist/__manifest__.py
+++ b/addons/website_sale_wishlist/__manifest__.py
@@ -7,7 +7,6 @@
 Allow shoppers of your eCommerce store to create personalized collections of products they want to buy and save them for future reference.
     """,
     'category': 'Website/Website',
-    'version': '1.0',
     'depends': ['website_sale'],
     'data': [
         'security/ir_rule.xml',
@@ -16,7 +15,6 @@
         'views/templates.xml',
         'views/svg_templates.xml',
     ],
-    'installable': True,
     'assets': {
         'web.assets_frontend': [
             'website_sale_wishlist/static/src/interactions/**/*',
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index e00abf804261d..da997c88e240f 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'eLearning',
     'version': '2.7',
@@ -67,7 +66,6 @@
         'data/slide_user_demo.xml',
         'data/slide_user_gamification_demo.xml',
     ],
-    'installable': True,
     'application': True,
     'assets': {
         'web.assets_backend': [
diff --git a/addons/website_slides_forum/__manifest__.py b/addons/website_slides_forum/__manifest__.py
index 06300cd1f2167..cdeeba47ce94e 100644
--- a/addons/website_slides_forum/__manifest__.py
+++ b/addons/website_slides_forum/__manifest__.py
@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
     'name': 'Forum on Courses',
     'category': 'Website/eLearning',
-    'version': '1.0',
     'summary': 'Allows to link forum on a course',
     'description': """A Slide channel can be linked to forum. Also, profiles from slide and forum are regrouped together""",
     'depends': [
diff --git a/addons/website_slides_survey/__manifest__.py b/addons/website_slides_survey/__manifest__.py
index 70e78a8048ea1..71595e4c4eb32 100644
--- a/addons/website_slides_survey/__manifest__.py
+++ b/addons/website_slides_survey/__manifest__.py
@@ -1,13 +1,10 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': "Course Certifications",
     'summary': 'Add certification capabilities to your courses',
     'description': """This module lets you use the full power of certifications within your courses.""",
     'category': 'Website/eLearning',
-    'version': '1.0',
     'depends': ['website_slides', 'survey'],
-    'installable': True,
     'auto_install': True,
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/website_sms/__manifest__.py b/addons/website_sms/__manifest__.py
index b67e00a6210d5..953736fce0c55 100644
--- a/addons/website_sms/__manifest__.py
+++ b/addons/website_sms/__manifest__.py
@@ -1,17 +1,14 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Send SMS to Visitor',
     'category': 'Website/Website',
     'sequence': 54,
     'summary': 'Allows to send sms to website visitor',
-    'version': '1.0',
     'description': """Allows to send sms to website visitor if the visitor is linked to a partner.""",
     'depends': ['website', 'sms'],
     'data': [
         'views/website_visitor_views.xml',
     ],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/addons/website_timesheet/__manifest__.py b/addons/website_timesheet/__manifest__.py
index 642148fe55cf3..e839a6de5f467 100644
--- a/addons/website_timesheet/__manifest__.py
+++ b/addons/website_timesheet/__manifest__.py
@@ -2,12 +2,10 @@
     'name': 'Hide Portal Timesheet Information',
     'category': 'Website/Website',
     'summary': 'Allow hiding timesheet information in the portal',
-    'version': '1.0',
     'description': """
 When hiding the timesheets in the portal, this module allows also hiding timesheet information on other records.
     """,
     'depends': ['website', 'hr_timesheet'],
-    'installable': True,
     'auto_install': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 5250c85200522..a7aacf95d9168 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 
@@ -91,7 +90,6 @@
             'base/static/tests/**/*',
         ],
     },
-    'installable': True,
     'auto_install': True,
     'post_init_hook': 'post_init',
     'author': 'Odoo S.A.',
diff --git a/odoo/addons/base/tests/test_install_addons/test_install_auto/__manifest__.py b/odoo/addons/base/tests/test_install_addons/test_install_auto/__manifest__.py
index 8c13c6e159a3e..19d86aa29da4d 100644
--- a/odoo/addons/base/tests/test_install_addons/test_install_auto/__manifest__.py
+++ b/odoo/addons/base/tests/test_install_addons/test_install_auto/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': 'test_install_auto',
-    'version': '1.0',
     'category': 'Hidden/Tools',
     'description': "",
     'depends': ['test_install_base'],
diff --git a/odoo/addons/test_assetsbundle/__manifest__.py b/odoo/addons/test_assetsbundle/__manifest__.py
index f3f779fd41e99..51de15c617258 100644
--- a/odoo/addons/test_assetsbundle/__manifest__.py
+++ b/odoo/addons/test_assetsbundle/__manifest__.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'test-assetsbundle',
     'version': '0.1',
     'category': 'Hidden/Tests',
     'description': """A module to verify the Assets Bundle mechanism.""",
     'depends': ['base'],
-    'installable': True,
     'data': [
         "data/ir_asset.xml",
         "views/views.xml",
diff --git a/odoo/addons/test_http/__manifest__.py b/odoo/addons/test_http/__manifest__.py
index 77740ed07d593..d9659858cfb64 100644
--- a/odoo/addons/test_http/__manifest__.py
+++ b/odoo/addons/test_http/__manifest__.py
@@ -1,11 +1,9 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Test HTTP',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """A module to test HTTP""",
     'depends': ['web', 'web_tour', 'mail', 'rpc'],
-    'installable': True,
     'data': [
         'data.xml',
         'ir.model.access.csv',
diff --git a/odoo/addons/test_inherit/__manifest__.py b/odoo/addons/test_inherit/__manifest__.py
index 56f9b88759f91..b11f1d761ff55 100644
--- a/odoo/addons/test_inherit/__manifest__.py
+++ b/odoo/addons/test_inherit/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'test-inherit',
     'version': '0.1',
@@ -9,7 +8,6 @@
         'ir.model.access.csv',
         'demo_data.xml',
     ],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_inherit_depends/__manifest__.py b/odoo/addons/test_inherit_depends/__manifest__.py
index d1705c976846a..6b09a5d15d75f 100644
--- a/odoo/addons/test_inherit_depends/__manifest__.py
+++ b/odoo/addons/test_inherit_depends/__manifest__.py
@@ -2,11 +2,9 @@
 
 {
     'name': 'test-inherit-depends',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """A module to verify the inheritance using _inherit across modules.""",
     'depends': ['test_inherit', 'test_orm'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_inherits_depends/__manifest__.py b/odoo/addons/test_inherits_depends/__manifest__.py
index 89e51856faa0c..af3657aeb2b24 100644
--- a/odoo/addons/test_inherits_depends/__manifest__.py
+++ b/odoo/addons/test_inherits_depends/__manifest__.py
@@ -6,7 +6,6 @@
     'category': 'Hidden/Tests',
     'description': """A module to verify the inheritance using _inherits in non-original modules.""",
     'depends': ['test_orm'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_l10n/__manifest__.py b/odoo/addons/test_l10n/__manifest__.py
index 98c3061aca20e..eb320ed97131b 100644
--- a/odoo/addons/test_l10n/__manifest__.py
+++ b/odoo/addons/test_l10n/__manifest__.py
@@ -4,7 +4,6 @@
     'category': 'Hidden/Tests',
     'description': """A module to test all localizations.""",
     'depends': ['base'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_lint/__manifest__.py b/odoo/addons/test_lint/__manifest__.py
index e9f4b3fe77ceb..69e0a8e560850 100644
--- a/odoo/addons/test_lint/__manifest__.py
+++ b/odoo/addons/test_lint/__manifest__.py
@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 {
     'name': 'test-lint',
     'version': '0.1',
     'category': 'Hidden/Tests',
     'description': """A module to test Odoo code with various linters.""",
     'depends': ['base'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_lint/tests/test_manifests.py b/odoo/addons/test_lint/tests/test_manifests.py
index ea1ab1e272276..020cb2413249a 100644
--- a/odoo/addons/test_lint/tests/test_manifests.py
+++ b/odoo/addons/test_lint/tests/test_manifests.py
@@ -4,7 +4,7 @@
 from os.path import join as opj
 
 from odoo.modules.module import _DEFAULT_MANIFEST, Manifest
-from odoo.tests import tagged, BaseCase
+from odoo.tests import BaseCase, tagged
 from odoo.tools.misc import file_path
 
 _logger = logging.getLogger(__name__)
@@ -38,10 +38,22 @@ def _test_manifest_keys(self, manifest_data: Manifest):
     def _test_manifest_values(self, manifest_data: Manifest):
         module = manifest_data.name
         verified_keys = [
-            'application', 'auto_install',
-            'summary', 'description', 'author',
-            'demo', 'data', 'test',
-            # todo installable ?
+            'application',
+            'auto_install',
+            'category',
+            'data',
+            'demo',
+            'description',
+            'external_dependencies',
+            'iap_paid_service',
+            'installable',
+            'post_init_hook',
+            'post_load',
+            'pre_init_hook',
+            'summary',
+            'test',
+            'version',
+            'website',
         ]
 
         if len(manifest_data.get('countries', [])) == 1 and 'l10n' not in module:
@@ -56,9 +68,16 @@ def _test_manifest_values(self, manifest_data: Manifest):
                        value,
                         _DEFAULT_MANIFEST[key],
                         f"Setting manifest key {key} to the default manifest value for module {module!r}. "
-                        "You can remove this key from the dict to reduce noise/inconsistencies between manifests specifications"
-                        " and ease understanding of manifest content."
+                        "You can remove this key from the dict to reduce noise/inconsistencies"
+                        " between manifests specifications and ease understanding of manifest"
+                        " content."
                     )
+                    if key == 'summary':
+                        self.assertNotIn(
+                            '\n',
+                            value,
+                            f"Module {module!r} summary should be a one-line short description",
+                        )
 
                 expected_type = type(_DEFAULT_MANIFEST[key])
                 if not isinstance(value, expected_type):
@@ -70,9 +89,8 @@ def _test_manifest_values(self, manifest_data: Manifest):
                         _logger.warning(
                             "Wrong type for manifest value %s in module %s, expected bool or list",
                             key, module)
-                else:
-                    if key == 'countries':
-                        self._test_manifest_countries_value(module, value)
+                elif key == 'countries':
+                    self._test_manifest_countries_value(module, value)
             elif key == 'icon':
                 self._test_manifest_icon_value(module, value)
 
@@ -107,6 +125,6 @@ def _test_manifest_countries_value(self, module, values):
         for value in values:
             if value and len(value) != 2:
                 _logger.warning(
-                    "Country value %s specified for the icon in manifest of module %s doesn't look like a country code"
+                    "Country value %s specified for the icon in manifest of module %s doesn't look like a country code."
                     "Please specify a correct value or remove this key from the manifest.",
                     value, module)
diff --git a/odoo/addons/test_main_flows/__manifest__.py b/odoo/addons/test_main_flows/__manifest__.py
index 85a5a9ffd1033..e936f1f965a79 100644
--- a/odoo/addons/test_main_flows/__manifest__.py
+++ b/odoo/addons/test_main_flows/__manifest__.py
@@ -1,15 +1,12 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Test Main Flow',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """
 This module will test the main workflow of Odoo.
 It will install some main apps and will try to execute the most important actions.
 """,
     'depends': ['web_tour', 'crm', 'sale_timesheet', 'purchase_stock', 'mrp', 'account'],
-    'installable': True,
     'post_init_hook': '_auto_install_enterprise_dependencies',
     'data': ['models/ir.model.access.csv'],
     'assets': {
diff --git a/odoo/addons/test_orm/__manifest__.py b/odoo/addons/test_orm/__manifest__.py
index a016f31ad257f..e48e2a20d7b53 100644
--- a/odoo/addons/test_orm/__manifest__.py
+++ b/odoo/addons/test_orm/__manifest__.py
@@ -1,10 +1,8 @@
 {
     'name': 'Test ORM',
-    'version': '1.0',
     'category': 'Hidden/Tests',
     'description': """A module to test the ORM.""",
     'depends': ['base'],
-    'installable': True,
     'data': [
         'data/test_access_rights_data.xml',
         'data/test_action_bindings.xml',
diff --git a/odoo/addons/test_testing_utilities/__manifest__.py b/odoo/addons/test_testing_utilities/__manifest__.py
index db1baba33e9ad..650360bf8f335 100644
--- a/odoo/addons/test_testing_utilities/__manifest__.py
+++ b/odoo/addons/test_testing_utilities/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 {
     'name': "Test testing utilities",
     'category': "Hidden/Tests",
diff --git a/odoo/addons/test_translation/__manifest__.py b/odoo/addons/test_translation/__manifest__.py
index 2f2ac8fe2c0ac..0980252a8d7f3 100644
--- a/odoo/addons/test_translation/__manifest__.py
+++ b/odoo/addons/test_translation/__manifest__.py
@@ -11,7 +11,6 @@
         'data/test.translation.model1.csv',
         'data/test.translation.model1-translated.csv',
     ],
-    'installable': True,
     'assets': {
         'web.assets_backend': [
             'test_translation/static/tests/tours/constraint.js',
diff --git a/odoo/addons/test_uninstall/__manifest__.py b/odoo/addons/test_uninstall/__manifest__.py
index c2293e57bed93..77ee973b27f88 100644
--- a/odoo/addons/test_uninstall/__manifest__.py
+++ b/odoo/addons/test_uninstall/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'test-uninstall',
@@ -7,7 +6,6 @@
     'description': """A module to test the uninstall feature.""",
     'depends': ['base'],
     'data': ['ir.model.access.csv'],
-    'installable': True,
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/odoo/cli/templates/l10n_payroll/__manifest__.py.template b/odoo/cli/templates/l10n_payroll/__manifest__.py.template
index 1169808c4123e..09872550e04ea 100644
--- a/odoo/cli/templates/l10n_payroll/__manifest__.py.template
+++ b/odoo/cli/templates/l10n_payroll/__manifest__.py.template
@@ -7,7 +7,6 @@
     'countries': ['{{code}}'],
     'category': 'Human Resources/Payroll',
     'depends': ['hr_payroll'],
-    'version': '1.0',
     'description': """
 ''Country-ish'' Payroll Rules.
 ==============================

From 5986ff81eae5ff48ec03ffc14ad2926f72af67d4 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Fri, 17 Oct 2025 14:29:27 +0200
Subject: [PATCH 572/673] [FIX] *: wrong manifests licenses

Part-of: odoo/odoo#232326
Related: odoo/enterprise#97655
Related: odoo/design-themes#1172
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/certificate/__manifest__.py            |  2 +-
 addons/project_hr_skills/__manifest__.py      |  2 +-
 odoo/addons/test_lint/tests/test_manifests.py | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/addons/certificate/__manifest__.py b/addons/certificate/__manifest__.py
index 9dab513594c88..088b9162430c6 100644
--- a/addons/certificate/__manifest__.py
+++ b/addons/certificate/__manifest__.py
@@ -13,5 +13,5 @@
     ],
     'depends': ['base_setup'],
     'author': 'Odoo S.A.',
-    'license': 'OEEL-1',
+    'license': 'LGPL-3',
 }
diff --git a/addons/project_hr_skills/__manifest__.py b/addons/project_hr_skills/__manifest__.py
index d5039fd79bbff..dad80828df1a6 100644
--- a/addons/project_hr_skills/__manifest__.py
+++ b/addons/project_hr_skills/__manifest__.py
@@ -13,5 +13,5 @@
         'views/project_task_views.xml',
     ],
     'author': 'Odoo S.A.',
-    'license': 'OEEL-1',
+    'license': 'LGPL-3',
 }
diff --git a/odoo/addons/test_lint/tests/test_manifests.py b/odoo/addons/test_lint/tests/test_manifests.py
index 020cb2413249a..1db62563c8a06 100644
--- a/odoo/addons/test_lint/tests/test_manifests.py
+++ b/odoo/addons/test_lint/tests/test_manifests.py
@@ -93,6 +93,8 @@ def _test_manifest_values(self, manifest_data: Manifest):
                     self._test_manifest_countries_value(module, value)
             elif key == 'icon':
                 self._test_manifest_icon_value(module, value)
+            elif key == 'license':
+                self._test_manifest_license(module, manifest_data, value)
 
     def _test_manifest_icon_value(self, module, value):
         self.assertTrue(
@@ -128,3 +130,18 @@ def _test_manifest_countries_value(self, module, values):
                     "Country value %s specified for the icon in manifest of module %s doesn't look like a country code."
                     "Please specify a correct value or remove this key from the manifest.",
                     value, module)
+
+    def _test_manifest_license(self, module: str, manifest: Manifest, value: str):
+        if "enterprise" in manifest.addons_path:
+            self.assertEqual(
+                "OEEL-1",
+                value,
+                f"Module {module!r} is an enterprise module and should be licensed under the Odoo"
+                " Enterprise License (OEEL-1)",
+            )
+        else:
+            self.assertEqual(
+                "LGPL-3",
+                value,
+                f"Module {module!r} is opensource and should be licensed under the LGPL license.",
+            )

From 208cbaa3712816ca7bfb301eee3af056829eccd6 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Fri, 17 Oct 2025 16:51:30 +0200
Subject: [PATCH 573/673] [IMP] */__manifest__.py: harmonize module authors

All references to Odoo S.A. should be named the same way to
reduce noise when grouping modules by authors.

Part-of: odoo/odoo#232326
Related: odoo/enterprise#97655
Related: odoo/design-themes#1172
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/account_qr_code_emv/__manifest__.py      | 2 +-
 addons/html_builder/__manifest__.py             | 2 +-
 addons/html_editor/__manifest__.py              | 2 +-
 addons/l10n_bo/__manifest__.py                  | 3 +--
 addons/l10n_ca/__manifest__.py                  | 2 +-
 addons/l10n_ch_pos/__manifest__.py              | 2 +-
 addons/l10n_ee/__manifest__.py                  | 2 +-
 addons/l10n_gr_edi/__manifest__.py              | 2 +-
 addons/l10n_ie/__manifest__.py                  | 2 +-
 addons/l10n_ke_edi_tremol/__manifest__.py       | 2 +-
 addons/l10n_ma/__manifest__.py                  | 2 +-
 addons/l10n_mc/__manifest__.py                  | 2 +-
 addons/l10n_mu_account/__manifest__.py          | 2 +-
 addons/l10n_my/__manifest__.py                  | 2 +-
 addons/l10n_ph/__manifest__.py                  | 2 +-
 addons/l10n_pt/__manifest__.py                  | 2 +-
 addons/l10n_ro_edi/__manifest__.py              | 2 +-
 addons/l10n_rs_edi/__manifest__.py              | 2 +-
 addons/l10n_tw/__manifest__.py                  | 2 +-
 addons/pos_self_order_pine_labs/__manifest__.py | 2 +-
 20 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/account_qr_code_emv/__manifest__.py b/addons/account_qr_code_emv/__manifest__.py
index d90cb0784b403..6173df5ac1f0a 100644
--- a/addons/account_qr_code_emv/__manifest__.py
+++ b/addons/account_qr_code_emv/__manifest__.py
@@ -6,7 +6,7 @@
     'description': """
 Bridge module addings support for EMV Merchant-Presented QR-code generation for Payment System.
     """,
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'depends': ['account'],
     'data': [
         'views/res_bank_views.xml',
diff --git a/addons/html_builder/__manifest__.py b/addons/html_builder/__manifest__.py
index 0f83c41e2a984..0c2c7a0c2954f 100644
--- a/addons/html_builder/__manifest__.py
+++ b/addons/html_builder/__manifest__.py
@@ -6,7 +6,7 @@
     used by the website builder and mass mailing editor.
     """,
 
-    'author': "Odoo",
+    'author': 'Odoo S.A.',
     'website': "https://www.odoo.com",
 
     # Categories can be used to filter modules in modules listing
diff --git a/addons/html_editor/__manifest__.py b/addons/html_editor/__manifest__.py
index f8c5a54103dd8..40129c7294abc 100644
--- a/addons/html_editor/__manifest__.py
+++ b/addons/html_editor/__manifest__.py
@@ -7,7 +7,7 @@
 This addon provides an extensible, maintainable editor.
     """,
 
-    'author': "odoo",
+    'author': 'Odoo S.A.',
     'website': "https://www.odoo.com",
     'category': 'Hidden',
     'depends': ['base', 'bus', 'web'],
diff --git a/addons/l10n_bo/__manifest__.py b/addons/l10n_bo/__manifest__.py
index ac2858b292deb..901a21551552c 100644
--- a/addons/l10n_bo/__manifest__.py
+++ b/addons/l10n_bo/__manifest__.py
@@ -9,9 +9,8 @@
 Bolivian accounting chart and tax localization.
 
 Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes
-
     """,
-    'author': 'Odoo / Cubic ERP',
+    'author': 'Odoo S.A. / Cubic ERP',
     'category': 'Accounting/Localizations/Account Charts',
     'depends': [
         'account',
diff --git a/addons/l10n_ca/__manifest__.py b/addons/l10n_ca/__manifest__.py
index a3c30e37705f9..c28fe6b767e5d 100644
--- a/addons/l10n_ca/__manifest__.py
+++ b/addons/l10n_ca/__manifest__.py
@@ -4,7 +4,7 @@
     'version': '1.1',
     'icon': '/account/static/description/l10n.png',
     'countries': ['ca'],
-    'author': 'Savoir-faire Linux (https://www.savoirfairelinux.com); Odoo SA',
+    'author': 'Savoir-faire Linux (https://www.savoirfairelinux.com); Odoo S.A.',
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_ch_pos/__manifest__.py b/addons/l10n_ch_pos/__manifest__.py
index f9b1a4b2d0592..b2b6cf0ccb640 100644
--- a/addons/l10n_ch_pos/__manifest__.py
+++ b/addons/l10n_ch_pos/__manifest__.py
@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Swiss - Point of Sale',
-    'author': 'Odoo PS',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Point of Sale',
     'description': """
 Swiss POS Localization
diff --git a/addons/l10n_ee/__manifest__.py b/addons/l10n_ee/__manifest__.py
index 646deae58425e..e2b5957b6a8cb 100644
--- a/addons/l10n_ee/__manifest__.py
+++ b/addons/l10n_ee/__manifest__.py
@@ -9,7 +9,7 @@
     'description': """
 This is the base module to manage the accounting chart for Estonia in Odoo.
     """,
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'depends': [
         'account',
         'account_edi_ubl_cii',
diff --git a/addons/l10n_gr_edi/__manifest__.py b/addons/l10n_gr_edi/__manifest__.py
index ffe323cd758f1..1fce7a2615dc8 100644
--- a/addons/l10n_gr_edi/__manifest__.py
+++ b/addons/l10n_gr_edi/__manifest__.py
@@ -1,6 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'name': 'Greece - myDATA',
     'category': 'Accounting/Localizations',
     'summary': """Connect to myDATA API implementation for Greece""",
diff --git a/addons/l10n_ie/__manifest__.py b/addons/l10n_ie/__manifest__.py
index b8eddf75040f4..f4d49cc414d7a 100644
--- a/addons/l10n_ie/__manifest__.py
+++ b/addons/l10n_ie/__manifest__.py
@@ -8,7 +8,7 @@
     "description": """
 This is the base module to manage the accounting chart for Republic of Ireland in Odoo.
     """,
-    "author": "Odoo SA",
+    "author": "Odoo S.A.",
     "depends": [
         "account",
         "base_iban",
diff --git a/addons/l10n_ke_edi_tremol/__manifest__.py b/addons/l10n_ke_edi_tremol/__manifest__.py
index 0633bffd7e3d9..e07c3820c1908 100644
--- a/addons/l10n_ke_edi_tremol/__manifest__.py
+++ b/addons/l10n_ke_edi_tremol/__manifest__.py
@@ -6,7 +6,7 @@
     'description': """
 This module integrates with the Kenyan G03 Tremol control unit device to the KRA through TIMS.
     """,
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/EDI',
     'license': 'LGPL-3',
     'depends': ['l10n_ke'],
diff --git a/addons/l10n_ma/__manifest__.py b/addons/l10n_ma/__manifest__.py
index 630d0f9d5af86..74e87ceb8cc20 100644
--- a/addons/l10n_ma/__manifest__.py
+++ b/addons/l10n_ma/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Morocco - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['ma'],
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Morocco.
diff --git a/addons/l10n_mc/__manifest__.py b/addons/l10n_mc/__manifest__.py
index ccdce21dc1c95..cda35b3df7248 100644
--- a/addons/l10n_mc/__manifest__.py
+++ b/addons/l10n_mc/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Monaco - Accounting',
     'icon': '/account/static/description/l10n.png',
     'countries': ['mc'],
-    'author': 'Odoo SA',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Monaco.
diff --git a/addons/l10n_mu_account/__manifest__.py b/addons/l10n_mu_account/__manifest__.py
index 15c91887aeab7..001bd51205fd6 100644
--- a/addons/l10n_mu_account/__manifest__.py
+++ b/addons/l10n_mu_account/__manifest__.py
@@ -11,7 +11,7 @@
     - Fiscal positions
     - Default settings
     """,
-    "author": "Odoo SA",
+    "author": "Odoo S.A.",
     "depends": [
         "account",
     ],
diff --git a/addons/l10n_my/__manifest__.py b/addons/l10n_my/__manifest__.py
index 45be1457f9261..e55c635653eb4 100644
--- a/addons/l10n_my/__manifest__.py
+++ b/addons/l10n_my/__manifest__.py
@@ -4,7 +4,7 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['my'],
-    'author': 'Odoo PS',
+    'author': 'Odoo S.A.',
     'version': '1.1',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
diff --git a/addons/l10n_ph/__manifest__.py b/addons/l10n_ph/__manifest__.py
index 9d031fbd29cd0..434c10b14b189 100644
--- a/addons/l10n_ph/__manifest__.py
+++ b/addons/l10n_ph/__manifest__.py
@@ -6,7 +6,7 @@
     'summary': "This is the module to manage the accounting chart for The Philippines.",
     'category': 'Accounting/Localizations/Account Charts',
     'version': '1.1',
-    'author': 'Odoo PS',
+    'author': 'Odoo S.A.',
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/philippines.html',
     'depends': [
         'account',
diff --git a/addons/l10n_pt/__manifest__.py b/addons/l10n_pt/__manifest__.py
index 9a234d5a2cde0..a03b898c85110 100644
--- a/addons/l10n_pt/__manifest__.py
+++ b/addons/l10n_pt/__manifest__.py
@@ -4,7 +4,7 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['pt'],
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Account Charts',
     'description': 'Portugal - Accounting',
     'depends': [
diff --git a/addons/l10n_ro_edi/__manifest__.py b/addons/l10n_ro_edi/__manifest__.py
index 6e320ca67821e..9b3eefd1f0bfe 100644
--- a/addons/l10n_ro_edi/__manifest__.py
+++ b/addons/l10n_ro_edi/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'name': 'Romania - E-invoicing',
     'category': 'Accounting/Localizations/EDI',
     'description': """
diff --git a/addons/l10n_rs_edi/__manifest__.py b/addons/l10n_rs_edi/__manifest__.py
index 3833704dbde48..73f6d6ea953ab 100644
--- a/addons/l10n_rs_edi/__manifest__.py
+++ b/addons/l10n_rs_edi/__manifest__.py
@@ -1,5 +1,5 @@
 {
-    'author': 'Odoo',
+    'author': 'Odoo S.A.',
     'name': 'Serbia - eFaktura E-invoicing',
     'category': 'Accounting/Localizations/EDI',
     'description': """
diff --git a/addons/l10n_tw/__manifest__.py b/addons/l10n_tw/__manifest__.py
index 3f2ae312f7628..912b900a43236 100644
--- a/addons/l10n_tw/__manifest__.py
+++ b/addons/l10n_tw/__manifest__.py
@@ -4,7 +4,7 @@
     'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations.html',
     'icon': '/account/static/description/l10n.png',
     'countries': ['tw'],
-    'author': 'Odoo PS',
+    'author': 'Odoo S.A.',
     'category': 'Accounting/Localizations/Account Charts',
     'description': """
 This is the base module to manage the accounting chart for Taiwan in Odoo.
diff --git a/addons/pos_self_order_pine_labs/__manifest__.py b/addons/pos_self_order_pine_labs/__manifest__.py
index 8808db95c9b2e..c065ef973ec51 100644
--- a/addons/pos_self_order_pine_labs/__manifest__.py
+++ b/addons/pos_self_order_pine_labs/__manifest__.py
@@ -11,6 +11,6 @@
             "pos_self_order_pine_labs/static/src/**/*",
         ],
     },
-    "author": "Odoo IN Pvt Ltd",
+    "author": "Odoo S.A.",
     "license": "LGPL-3",
 }

From 02efc8a729208dd2be884b837b3c378a41f1b9c3 Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Mon, 20 Oct 2025 11:23:04 +0200
Subject: [PATCH 574/673] [FIX] */__manifest__.py: website validation

Enforce https urls
Avoid dumb www.odoo.com redirections, there should be dedicated
page if a website is mentioned (or it should be the author website)

Part-of: odoo/odoo#232326
Related: odoo/enterprise#97655
Related: odoo/design-themes#1172
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/html_builder/__manifest__.py           |  1 -
 addons/html_editor/__manifest__.py            |  1 -
 addons/l10n_it_edi/__manifest__.py            |  2 +-
 addons/l10n_it_stock_ddt/__manifest__.py      |  1 -
 addons/l10n_syscohada/__manifest__.py         |  2 +-
 addons/l10n_tw_edi_ecpay/__manifest__.py      |  1 -
 addons/sale_purchase/__manifest__.py          |  1 -
 odoo/addons/test_lint/tests/test_manifests.py | 12 ++++++++++++
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/html_builder/__manifest__.py b/addons/html_builder/__manifest__.py
index 0c2c7a0c2954f..2441813556826 100644
--- a/addons/html_builder/__manifest__.py
+++ b/addons/html_builder/__manifest__.py
@@ -7,7 +7,6 @@
     """,
 
     'author': 'Odoo S.A.',
-    'website': "https://www.odoo.com",
 
     # Categories can be used to filter modules in modules listing
     # Check https://github.com/odoo/odoo/blob/15.0/odoo/addons/base/data/ir_module_category_data.xml
diff --git a/addons/html_editor/__manifest__.py b/addons/html_editor/__manifest__.py
index 40129c7294abc..5b3910360a8bd 100644
--- a/addons/html_editor/__manifest__.py
+++ b/addons/html_editor/__manifest__.py
@@ -8,7 +8,6 @@
     """,
 
     'author': 'Odoo S.A.',
-    'website': "https://www.odoo.com",
     'category': 'Hidden',
     'depends': ['base', 'bus', 'web'],
     'data': [
diff --git a/addons/l10n_it_edi/__manifest__.py b/addons/l10n_it_edi/__manifest__.py
index 2b18e82fdaecc..3dc60477b9b89 100644
--- a/addons/l10n_it_edi/__manifest__.py
+++ b/addons/l10n_it_edi/__manifest__.py
@@ -11,7 +11,7 @@
 E-invoice implementation
     """,
     'category': 'Accounting/Localizations/EDI',
-    'website': 'http://www.odoo.com/',
+    'website': 'https://www.odoo.com/documentation/latest/applications/finance/fiscal_localizations/italy.html',
     'data': [
         'security/ir.model.access.csv',
         'data/account.account.tag.csv',
diff --git a/addons/l10n_it_stock_ddt/__manifest__.py b/addons/l10n_it_stock_ddt/__manifest__.py
index ba70954b30d13..12bea2645354e 100644
--- a/addons/l10n_it_stock_ddt/__manifest__.py
+++ b/addons/l10n_it_stock_ddt/__manifest__.py
@@ -1,6 +1,5 @@
 {
     'name': "Italy - Stock DDT",
-    'website': 'https://www.odoo.com',
     'category': 'Accounting/Localizations/EDI',
     'version': '0.1',
     'description': """
diff --git a/addons/l10n_syscohada/__manifest__.py b/addons/l10n_syscohada/__manifest__.py
index 8c5cb9fddaf12..bbe7b4275e7bc 100644
--- a/addons/l10n_syscohada/__manifest__.py
+++ b/addons/l10n_syscohada/__manifest__.py
@@ -16,7 +16,7 @@
 
     Democratic Republic of the Congo, Senegal, Chad, Togo.
     """,
-    'website': 'http://biblio.ohada.org/pmb/opac_css/doc_num.php?explnum_id=2063',
+    'website': 'https://biblio.ohada.org/pmb/opac_css/doc_num.php?explnum_id=2063',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_tw_edi_ecpay/__manifest__.py b/addons/l10n_tw_edi_ecpay/__manifest__.py
index 36ab1eb5cc041..c5f6e01e6d580 100644
--- a/addons/l10n_tw_edi_ecpay/__manifest__.py
+++ b/addons/l10n_tw_edi_ecpay/__manifest__.py
@@ -10,7 +10,6 @@
         =====================
         This module allows the user to send their invoices to the Ecpay system.
     """,
-    "website": "https://www.odoo.com",
     'author': 'Odoo S.A.',
     "license": "LGPL-3",
     "depends": ["l10n_tw"],
diff --git a/addons/sale_purchase/__manifest__.py b/addons/sale_purchase/__manifest__.py
index dc15b7017262d..9393b3c932328 100644
--- a/addons/sale_purchase/__manifest__.py
+++ b/addons/sale_purchase/__manifest__.py
@@ -7,7 +7,6 @@
 Allows the outsourcing of services. This module allows one to sell services provided
 by external providers and will automatically generate purchase orders directed to the service seller.
     """,
-    'website': 'https://www.odoo.com/',
     'category': 'Sales/Sales',
     'depends': [
         'sale',
diff --git a/odoo/addons/test_lint/tests/test_manifests.py b/odoo/addons/test_lint/tests/test_manifests.py
index 1db62563c8a06..2ef76f612e022 100644
--- a/odoo/addons/test_lint/tests/test_manifests.py
+++ b/odoo/addons/test_lint/tests/test_manifests.py
@@ -78,6 +78,18 @@ def _test_manifest_values(self, manifest_data: Manifest):
                             value,
                             f"Module {module!r} summary should be a one-line short description",
                         )
+                    elif key == 'website':
+                        self.assertNotEqual(
+                            value,
+                            'https://www.odoo.com',
+                            f"Module {module!r} website is redirecting to odoo.com, which is"
+                            " useless and should be avoid unless there is a dedicated page for it.",
+                        )
+                        self.assertEqual(
+                            bool(value),
+                            value.startswith('https://'),
+                            f"Module {module!r} website ({value}) should be a valid and secure url",
+                        )
 
                 expected_type = type(_DEFAULT_MANIFEST[key])
                 if not isinstance(value, expected_type):

From 964b984b43c3efdc442ec64846102ad4de2cd8aa Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Mon, 20 Oct 2025 16:13:48 +0200
Subject: [PATCH 575/673] [FIX] test_lint,mass_mailing_themes: validate modules
 websites

closes odoo/odoo#232326

Related: odoo/enterprise#97655
Related: odoo/design-themes#1172
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
---
 addons/mass_mailing_themes/__manifest__.py    |  2 +-
 odoo/addons/test_lint/tests/test_manifests.py | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing_themes/__manifest__.py b/addons/mass_mailing_themes/__manifest__.py
index ee91f39af89e8..8302a61c16c60 100644
--- a/addons/mass_mailing_themes/__manifest__.py
+++ b/addons/mass_mailing_themes/__manifest__.py
@@ -8,7 +8,7 @@
     """,
     'version': '1.2',
     'sequence': 110,
-    'website': 'https://www.odoo.com/app/mailing',
+    'website': 'https://www.odoo.com/app/email-marketing',
     'category': 'Marketing/Email Marketing',
     'depends': [
         'mass_mailing',
diff --git a/odoo/addons/test_lint/tests/test_manifests.py b/odoo/addons/test_lint/tests/test_manifests.py
index 2ef76f612e022..ade6384f430a4 100644
--- a/odoo/addons/test_lint/tests/test_manifests.py
+++ b/odoo/addons/test_lint/tests/test_manifests.py
@@ -4,7 +4,7 @@
 from os.path import join as opj
 
 from odoo.modules.module import _DEFAULT_MANIFEST, Manifest
-from odoo.tests import BaseCase, tagged
+from odoo.tests import BaseCase, HttpCase, tagged
 from odoo.tools.misc import file_path
 
 _logger = logging.getLogger(__name__)
@@ -157,3 +157,25 @@ def _test_manifest_license(self, module: str, manifest: Manifest, value: str):
                 value,
                 f"Module {module!r} is opensource and should be licensed under the LGPL license.",
             )
+
+
+@tagged('-standard', 'external', 'at_install', '-post_install')
+class ManifestNightlyLinter(HttpCase):
+
+    def test_manifests_websites(self):
+        checked = set()
+        for manifest in Manifest.all_addon_manifests():
+            if (
+                (url := manifest.get('website', ''))
+                and url not in checked
+                # Do not request non-odoo pages every night
+                and url.startswith('https://www.odoo.com')
+            ):
+                module = manifest.name
+                with self.subTest(module=module):
+                    res = self.url_open(url)
+                    checked.add(url)
+                    self.assertEqual(
+                        res.status_code, 200,
+                        f"Module {module!r} website link is broken: '{url}'",
+                    )

From 491bcc66b961fa4937266bba79dbfd281904022d Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Fri, 31 Oct 2025 15:59:07 +0100
Subject: [PATCH 576/673] [REF] iot_drivers: all drivers on IoT Box by default

To speed up the IoT Box startup process and reduce the amount of
potential issues, we now avoid downloading handlers from the
database by providing them all by default on the IoT Box.

As boxes checkout every monday, they will also get drivers/interfaces
fixes weekly.

We added an option in the homepage to allow still downloading from the
database for sh clients that need custom handlers.

odoo/enterprise#91884

closes odoo/odoo#221948

Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 addons/iot_drivers/__init__.py                |   8 +-
 addons/iot_drivers/controllers/homepage.py    |  13 +
 addons/iot_drivers/driver.py                  |   3 +-
 addons/iot_drivers/iot_handlers/__init__.py   |  23 ++
 .../drivers/bluetooth_caliper_driver_L.py     |  75 +++++
 .../iot_handlers/drivers/camera_driver_L.py   |  44 +++
 .../drivers/ctypes_terminal_driver.py         | 141 +++++++++
 ...d_usb_driver_L.py => keyboard_driver_L.py} |   0
 .../{l10n_eg_drivers.py => l10n_eg_driver.py} |   0
 .../drivers/l10n_ke_edi_serial_driver.py      |   2 +-
 .../drivers/serial_blackbox_be_driver.py      | 299 ++++++++++++++++++
 .../drivers/serial_blackbox_se_driver.py      | 236 ++++++++++++++
 .../drivers/serial_caliper_driver.py          | 101 ++++++
 ...l_base_driver.py => serial_driver_base.py} |   0
 .../drivers/serial_scale_driver.py            |   2 +-
 .../iot_handlers/drivers/six_driver.py        | 147 +++++++++
 .../drivers/worldline_driver_L.py             | 199 ++++++++++++
 .../drivers/worldline_driver_W.py             | 217 +++++++++++++
 .../interfaces/bluetooth_interface_L.py       |  77 +++++
 .../interfaces/camera_interface_L.py          |  24 ++
 .../interfaces/ctep_interface_L.py            |  61 ++++
 .../interfaces/ctep_interface_W.py            |  52 +++
 .../iot_handlers/interfaces/tim_interface.py  |  96 ++++++
 addons/iot_drivers/main.py                    |   6 +-
 .../app/components/dialog/HandlerDialog.js    |  31 +-
 .../src/app/components/dialog/UpdateDialog.js |  18 --
 addons/iot_drivers/tools/helpers.py           |  45 +--
 27 files changed, 1849 insertions(+), 71 deletions(-)
 create mode 100644 addons/iot_drivers/iot_handlers/__init__.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/bluetooth_caliper_driver_L.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/camera_driver_L.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/ctypes_terminal_driver.py
 rename addons/iot_drivers/iot_handlers/drivers/{keyboard_usb_driver_L.py => keyboard_driver_L.py} (100%)
 rename addons/iot_drivers/iot_handlers/drivers/{l10n_eg_drivers.py => l10n_eg_driver.py} (100%)
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/serial_blackbox_se_driver.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/serial_caliper_driver.py
 rename addons/iot_drivers/iot_handlers/drivers/{serial_base_driver.py => serial_driver_base.py} (100%)
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/six_driver.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/worldline_driver_L.py
 create mode 100644 addons/iot_drivers/iot_handlers/drivers/worldline_driver_W.py
 create mode 100644 addons/iot_drivers/iot_handlers/interfaces/bluetooth_interface_L.py
 create mode 100644 addons/iot_drivers/iot_handlers/interfaces/camera_interface_L.py
 create mode 100644 addons/iot_drivers/iot_handlers/interfaces/ctep_interface_L.py
 create mode 100644 addons/iot_drivers/iot_handlers/interfaces/ctep_interface_W.py
 create mode 100644 addons/iot_drivers/iot_handlers/interfaces/tim_interface.py

diff --git a/addons/iot_drivers/__init__.py b/addons/iot_drivers/__init__.py
index a44cf82342cdc..40021fdb5f740 100644
--- a/addons/iot_drivers/__init__.py
+++ b/addons/iot_drivers/__init__.py
@@ -1,13 +1,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
 from functools import wraps
 import requests
-import logging
 
 from . import server_logger
 from . import connection_manager
 from . import controllers
-from . import driver
 from . import event_manager
 from . import exception_logger
 from . import http
@@ -16,9 +13,10 @@
 from . import tools
 from . import websocket_client
 from . import webrtc_client
+from . import iot_handlers
 
-_logger = logging.getLogger(__name__)
-_logger.info("==== Starting Odoo IoT Box service ====")
+for interface_thread in main.interfaces.values():
+    interface_thread().start()
 
 _get = requests.get
 _post = requests.post
diff --git a/addons/iot_drivers/controllers/homepage.py b/addons/iot_drivers/controllers/homepage.py
index 5c060477b7574..da9f3c25a53db 100644
--- a/addons/iot_drivers/controllers/homepage.py
+++ b/addons/iot_drivers/controllers/homepage.py
@@ -240,6 +240,7 @@ def log_levels(self):
             'available_log_levels': AVAILABLE_LOG_LEVELS,
             'drivers_logger_info': self._get_iot_handlers_logger(drivers_list, 'drivers'),
             'interfaces_logger_info': self._get_iot_handlers_logger(interfaces_list, 'interfaces'),
+            'is_custom_handlers_enabled': system.get_conf('custom_handlers'),
         })
 
     @route.iot_route('/iot_drivers/load_iot_handlers', type="http", cors='*')
@@ -387,6 +388,18 @@ def update_git_tree(self):
             'message': 'Successfully updated the IoT Box',
         }
 
+    @route.iot_route('/iot_drivers/enable_custom_handlers', type="jsonrpc", methods=['POST'], cors='*')
+    def enable_custom_handlers(self, enable):
+        if enable:
+            system.update_conf({'custom_handlers': True})
+            helpers.download_iot_handlers(False)
+        else:
+            system.update_conf({'custom_handlers': False})
+            # Reset to the default handlers and restart
+            system.git("clean", "-dfx")
+            helpers.odoo_restart()
+        return {'status': 'success'}
+
     # ---------------------------------------------------------- #
     # Utils                                                      #
     # ---------------------------------------------------------- #
diff --git a/addons/iot_drivers/driver.py b/addons/iot_drivers/driver.py
index 12be1630418df..fcb204d85c5d5 100644
--- a/addons/iot_drivers/driver.py
+++ b/addons/iot_drivers/driver.py
@@ -1,4 +1,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+import inspect
 import logging
 from threading import Thread, Event
 
@@ -31,7 +32,7 @@ def __init__(self, identifier, device):
 
     def __init_subclass__(cls):
         super().__init_subclass__()
-        if cls not in drivers:
+        if not inspect.isabstract(cls) and cls not in drivers:
             drivers.append(cls)
 
     @classmethod
diff --git a/addons/iot_drivers/iot_handlers/__init__.py b/addons/iot_drivers/iot_handlers/__init__.py
new file mode 100644
index 0000000000000..76cfebcc62e8f
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/__init__.py
@@ -0,0 +1,23 @@
+import logging
+import platform
+import importlib
+from pathlib import Path
+from itertools import chain
+
+_logger = logging.getLogger(__name__)
+
+# Only import files that correspond to the current platform (Linux or Windows)
+exclude_suffix = '_L' if platform.system() == 'Windows' else '_W'
+
+drivers_path = Path(__file__).parent / 'drivers'
+interfaces_path = Path(__file__).parent / 'interfaces'
+
+for file_path in chain(drivers_path.glob('*.py'), interfaces_path.glob('*.py')):
+    module = file_path.stem
+    if any(module.endswith(suffix) for suffix in ['__', exclude_suffix]):
+        continue
+
+    try:
+        importlib.import_module(f'.{file_path.parent.name}.{module}', package=__package__)
+    except Exception:  # noqa: BLE001
+        _logger.exception("Could not load module %s", module)
diff --git a/addons/iot_drivers/iot_handlers/drivers/bluetooth_caliper_driver_L.py b/addons/iot_drivers/iot_handlers/drivers/bluetooth_caliper_driver_L.py
new file mode 100644
index 0000000000000..ab1bfa8a7005f
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/bluetooth_caliper_driver_L.py
@@ -0,0 +1,75 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import dbus
+from gatt import Device
+import logging
+
+from odoo.addons.iot_drivers.iot_handlers.interfaces.bluetooth_interface_L import bluetooth_devices
+from odoo.addons.iot_drivers.driver import Driver
+from odoo.addons.iot_drivers.event_manager import event_manager
+
+_logger = logging.getLogger(__name__)
+
+
+class SylvacBtDriver(Driver):
+    connection_type = 'bluetooth'
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.gatt_device = GattSylvacBtDriver(mac_address=device.mac_address, manager=device.manager)
+        self.gatt_device.btdriver = self
+        self.gatt_device.connect()
+        self.device_type = 'device'
+        self.device_connection = 'bluetooth'
+        self.device_name = device.alias()
+        self._actions['read_once'] = self._action_read_once
+
+    def _action_read_once(self, _data):
+        """Make value available to the longpolling event route"""
+        event_manager.device_changed(self)
+
+    @classmethod
+    def supported(cls, device):
+        try:
+            if device.alias() in ["SY295", "SY304", "SY276"]:
+                return True
+        except dbus.exceptions.DBusException as e:
+            _logger.warning(e.get_dbus_name())
+            _logger.warning(e.get_dbus_message())
+        return False
+
+    def disconnect(self):
+        super().disconnect()
+        del bluetooth_devices[self.device_identifier]
+
+
+class GattSylvacBtDriver(Device):
+    btdriver = False
+
+    def services_resolved(self):
+        super().services_resolved()
+
+        device_information_service = next(
+            s for s in self.services
+            if s.uuid == '00005000-0000-1000-8000-00805f9b34fb')
+
+        measurement_characteristic = next(
+            c for c in device_information_service.characteristics if c.uuid == '00005020-0000-1000-8000-00805f9b34fb')
+        measurement_characteristic.enable_notifications()
+
+    def characteristic_value_updated(self, characteristic, value):
+        total = value[0] + value[1] * 256 + value[2] * 256 * 256 + value[3] * 256 * 256 * 256
+        if total > 256 ** 4 / 2:
+            total = total - 256 ** 4
+        self.btdriver.data['value'] = total / 1000000.0
+        event_manager.device_changed(self.btdriver)
+
+    def characteristic_enable_notification_succeeded(self):
+        _logger.info("Successfully connected to %s", self.device_name)
+
+    def characteristic_enable_notification_failed(self):
+        _logger.info("Problem connecting to %s", self.device_name)
+
+    def disconnect_succeeded(self):
+        super().disconnect_succeeded()
+        self.btdriver.disconnect()
diff --git a/addons/iot_drivers/iot_handlers/drivers/camera_driver_L.py b/addons/iot_drivers/iot_handlers/drivers/camera_driver_L.py
new file mode 100644
index 0000000000000..5f98d4e0d9494
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/camera_driver_L.py
@@ -0,0 +1,44 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import base64
+import logging
+import subprocess
+
+from odoo.addons.iot_drivers.driver import Driver
+
+_logger = logging.getLogger(__name__)
+
+
+class CameraDriver(Driver):
+    connection_type = 'video'
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_type = 'camera'
+        self.device_connection = 'direct'
+        self.device_name = device['name']
+        self.interface = device['interface']
+
+        self._actions.update({
+            '': self._action_default,
+        })
+
+    @classmethod
+    def supported(cls, device):
+        return bool(device['interface'])
+
+    def _action_default(self, _data):
+        """Capture an image from the camera.
+        The resolution is set to 1920x1080, but will be lowered if not supported.
+        """
+        # "-" to output to stdout (avoid writing to disk)
+        image = subprocess.run(
+            ["fswebcam", "-d", self.interface, "-r", "1920x1080", "-"], capture_output=True, check=False
+        )
+        if image.returncode == 0:
+            return {
+                'image': base64.b64encode(image.stdout).decode(),
+            }
+        else:
+            _logger.error('Failed to capture image: %s', image.stderr.decode())
+            raise Exception('Failed to capture image from camera.')
diff --git a/addons/iot_drivers/iot_handlers/drivers/ctypes_terminal_driver.py b/addons/iot_drivers/iot_handlers/drivers/ctypes_terminal_driver.py
new file mode 100644
index 0000000000000..fe9c8d61f4b4a
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/ctypes_terminal_driver.py
@@ -0,0 +1,141 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+import datetime
+import logging
+from abc import abstractmethod, ABC
+from queue import Queue
+from time import sleep
+
+
+from odoo.addons.iot_drivers.driver import Driver
+from odoo.addons.iot_drivers.event_manager import event_manager
+from odoo.addons.iot_drivers.tools.system import IS_WINDOWS
+from odoo.tools.misc import file_path
+
+_logger = logging.getLogger(__name__)
+
+# Buffer size big enough to hold every string incoming from ctypes libraries
+# The biggest strings stored in this buffer are the receipts
+CTYPES_BUFFER_SIZE = 1000
+
+# Define pointers and argument types for ctypes function calls
+ulong_pointer = ctypes.POINTER(ctypes.c_ulong)
+double_pointer = ctypes.POINTER(ctypes.c_double)
+
+
+def import_ctypes_library(lib_subfolder, lib_name):
+    """
+    Import a library using ctypes, independently of the OS.
+    :param lib_subfolder: The subfolder where the library is located under "iot_drivers/iot_handlers/lib"
+    :param lib_name: The name of the library file. Must respect the OS extension (.so/.dll), otherwise ValueError will be raised
+    Example: if the library is located under "iot_drivers/iot_handlers/drivers/ctep/libeasyctep.so", then
+    lib_subfolder = "ctep" and lib_name = "libeasyctep.so"
+    """
+    supported_lib_extensions = '.dll' if IS_WINDOWS else '.so'
+    import_library_method = ctypes.WinDLL if IS_WINDOWS else ctypes.CDLL
+
+    try:
+        lib_path = file_path(f'iot_drivers/iot_handlers/drivers/{lib_subfolder}/{lib_name}', supported_lib_extensions)
+        ctypes_lib = import_library_method(lib_path)
+        _logger.info('Successfully imported ctypes library "%s" from %s', lib_name, lib_path)
+        return ctypes_lib
+    except (OSError, ValueError, FileNotFoundError):
+        _logger.exception('Failed to import ctypes library "%s" from iot_drivers/iot_handlers/drivers/%s/', lib_name, lib_subfolder)
+
+
+def create_ctypes_string_buffer():
+    """
+    Create a ctypes buffer of CTYPES_BUFFER_SIZE size
+    """
+    return ctypes.create_string_buffer(CTYPES_BUFFER_SIZE)
+
+
+class CtypesTerminalDriver(Driver, ABC):
+    """
+    This class is the parent class of all the terminal drivers using ctypes.
+    Worldline and Six drivers are inheriting from this class.
+    """
+
+    DELAY_TIME_BETWEEN_TRANSACTIONS = 5  # seconds
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_type = 'payment'
+        self.device_connection = 'network'
+        self.cid = None
+        self.owner = None
+        self.queue_actions = Queue()
+        self.terminal_busy = False
+
+        self._actions[''] = self._action_default
+        self.next_transaction_min_dt = datetime.datetime.min
+
+    @classmethod
+    def supported(cls, device):
+        # Currently all devices detected through TimInterface or CTEPInterface are supported
+        return True
+
+    def _action_default(self, data):
+        data_message_type = data.get('messageType')
+        _logger.debug('%s: _action_default %s %s', self.device_name, data_message_type, data)
+        if data_message_type == 'Transaction':
+            if self.terminal_busy:
+                self.send_status(error=f'{self.device_name} is currently busy. Try again later.', request_data=data)
+            else:
+                self.terminal_busy = True
+                self.queue_actions.put(data)
+        elif data_message_type == 'Cancel':
+            self.cancelTransaction(data)
+
+    def run(self):
+        while True:
+            # If the queue is empty, the call of "get" will block and wait for it to get an item
+            action = self.queue_actions.get()
+            action_type = action.get('messageType')
+            _logger.debug("%s: Starting next action in queue: %s", self.device_name, action_type)
+            self.processTransaction(action)
+            self.terminal_busy = False
+
+    def _check_transaction_delay(self):
+        # After a payment has been processed, the display on the terminal still shows some
+        # information for about 4-5 seconds. No request can be processed during this period.
+        delay_diff = (self.next_transaction_min_dt - datetime.datetime.now()).total_seconds()
+        if delay_diff > 0:
+            if delay_diff > self.DELAY_TIME_BETWEEN_TRANSACTIONS:
+                # Theoretically not possible, but to avoid sleeping for ages, we cap the value
+                _logger.warning('%s: Transaction delay difference is too high %.2f force set as default', self.device_name, delay_diff)
+                delay_diff = self.DELAY_TIME_BETWEEN_TRANSACTIONS
+            _logger.info('%s: Previous transaction is too recent, will sleep for %.2f seconds', self.device_name, delay_diff)
+            sleep(delay_diff)
+
+    def send_status(self, value='', response=False, stage=False, ticket=False, ticket_merchant=False, card=False, transaction_id=False, error=False, disconnected=False, request_data=False):
+        self.data['status'] = 'success'  # always success: let service handle errors
+        self.data['result'] = {
+            'value': value,
+            'Stage': stage,
+            'Response': response,
+            'Ticket': ticket,
+            'TicketMerchant': ticket_merchant,
+            'Card': card,
+            'PaymentTransactionID': transaction_id,
+            'Error': error,
+            'Disconnected': disconnected,
+            'cid': request_data.get('cid'),
+        }
+        # TODO: add `stacklevel=2` in image with python version > 3.8
+        _logger.debug('%s: send_status data: %s', self.device_name, self.data, stack_info=True)
+        event_manager.device_changed(self)
+
+    # The following methods need to be implemented by the children classes
+    @abstractmethod
+    def processTransaction(self, transaction):
+        """
+        Method implementing the transaction processing
+        """
+
+    @abstractmethod
+    def cancelTransaction(self, transaction):
+        """
+        Method implementing the ongoing transaction request cancellation
+        """
diff --git a/addons/iot_drivers/iot_handlers/drivers/keyboard_usb_driver_L.py b/addons/iot_drivers/iot_handlers/drivers/keyboard_driver_L.py
similarity index 100%
rename from addons/iot_drivers/iot_handlers/drivers/keyboard_usb_driver_L.py
rename to addons/iot_drivers/iot_handlers/drivers/keyboard_driver_L.py
diff --git a/addons/iot_drivers/iot_handlers/drivers/l10n_eg_drivers.py b/addons/iot_drivers/iot_handlers/drivers/l10n_eg_driver.py
similarity index 100%
rename from addons/iot_drivers/iot_handlers/drivers/l10n_eg_drivers.py
rename to addons/iot_drivers/iot_handlers/drivers/l10n_eg_driver.py
diff --git a/addons/iot_drivers/iot_handlers/drivers/l10n_ke_edi_serial_driver.py b/addons/iot_drivers/iot_handlers/drivers/l10n_ke_edi_serial_driver.py
index c311a11caf30b..5d876ee9c727c 100644
--- a/addons/iot_drivers/iot_handlers/drivers/l10n_ke_edi_serial_driver.py
+++ b/addons/iot_drivers/iot_handlers/drivers/l10n_ke_edi_serial_driver.py
@@ -8,7 +8,7 @@
 from functools import reduce
 
 from odoo import http
-from odoo.addons.iot_drivers.iot_handlers.drivers.serial_base_driver import SerialDriver, SerialProtocol, serial_connection
+from odoo.addons.iot_drivers.iot_handlers.drivers.serial_driver_base import SerialDriver, SerialProtocol, serial_connection
 from odoo.addons.iot_drivers.main import iot_devices
 from odoo.addons.iot_drivers.tools import route
 
diff --git a/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py b/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py
new file mode 100644
index 0000000000000..86a2a2243348e
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py
@@ -0,0 +1,299 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import logging
+import requests
+import serial
+import time
+
+from odoo.addons.iot_drivers.tools import helpers, system
+from odoo.addons.iot_drivers.iot_handlers.drivers.serial_driver_base import SerialDriver, SerialProtocol, serial_connection
+
+_logger = logging.getLogger(__name__)
+
+BlackboxProtocol = SerialProtocol(
+    name='Blackbox',
+    baudrate=19200,
+    bytesize=serial.EIGHTBITS,
+    stopbits=serial.STOPBITS_ONE,
+    parity=serial.PARITY_NONE,
+    timeout=3,
+    writeTimeout=0.2,
+    measureRegexp=None,
+    statusRegexp=None,
+    commandTerminator=b'',
+    commandDelay=0.2,
+    measureDelay=0.2,
+    newMeasureDelay=0.2,
+    measureCommand=b'',
+    emptyAnswerValid=False,
+)
+
+STX = b'\x02'
+ETX = b'\x03'
+ACK = b'\x06'
+NACK = b'\x15'
+
+errors = {
+    '000': "No error",
+    '001': "PIN accepted.",
+    '101': "Fiscal Data Module memory 90% full.",
+    '102': "Already handled request.",
+    '103': "No record.",
+    '199': "Unspecified warning.",
+    '201': "No Vat Signing Card or Vat Signing Card broken.",
+    '202': "Please initialize the Vat Signing Card with PIN.",
+    '203': "Vat Signing Card blocked.",
+    '204': "Invalid PIN.",
+    '205': "Fiscal Data Module memory full.",
+    '206': "Unknown identifier.",
+    '207': "Invalid data in message.",
+    '208': "Fiscal Data Module not operational.",
+    '209': "Fiscal Data Module real time clock corrupt.",
+    '210': "Vat Signing Card not compatible with Fiscal Data Module.",
+    '299': "Unspecified error.",
+    '300': "Fiscal Data Module responded with invalid response. Check cable and power supply. Restart if necessary.",
+    '301': "Fiscal Data Module did not respond. Check cable and power supply. Restart if necessary.",
+}
+
+
+class BlackBoxDriver(SerialDriver):
+    """Driver for the blackbox fiscal data module."""
+
+    _protocol = BlackboxProtocol
+    priority = 1
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_type = 'fiscal_data_module'
+        self.sequence_number = 0
+        self._set_actions()
+        self._certified_ref()
+
+    def _set_actions(self):
+        """Initializes `self._actions`, a map of action keys sent by the frontend to backend action methods."""
+
+        self._actions.update({
+            'registerReceiptWeb': self._request_registerReceiptWeb,  # 'H' from server (websocket) so requires an answer
+            'registerReceipt': self._request_registerReceipt,  # 'H'
+            'registerPIN': self._request_registerPIN,  # 'P'
+            'status': self._request_status,  # 'S'
+        })
+
+    @classmethod
+    def supported(cls, device):
+        """Checks whether the device at path `device` is supported by the driver.
+
+        :param dict device: path to the device
+        :return: whether the device is supported by the driver
+        :rtype: bool
+        """
+        for _ in range(3):
+            try:
+                protocol = cls._protocol
+                probe_message = cls._wrap_low_level_message_around("S000")
+                with serial_connection(device['identifier'], protocol) as connection:
+                    connection.reset_output_buffer()
+                    connection.reset_input_buffer()
+                    # ask for status then acknowledge the response
+                    connection.write(probe_message)
+                    buffer = connection.read_until(ETX)
+                    _logger.info('Probing %s as a blackbox. Expecting "%s" in response. Device response: "%s"', device, ACK, buffer)
+                    connection.write(ACK)
+                    connection.reset_input_buffer()  # flush in case bb sends status again (ACK too late)
+                    if len(buffer) > 0 and buffer[0:1] == ACK:
+                        return True
+            except serial.SerialException:
+                _logger.exception('Error while probing %s with protocol %s', device, protocol.name)
+            time.sleep(3)
+        return False
+
+    def _request_status(self, data):
+        """
+        Sends a status request to the blackbox and stores the result status in self.data['message']
+        """
+        packet = self._wrap_low_level_message_around(f'S{str(self.sequence_number % 100).zfill(2)}0')
+        self.sequence_number += 1
+        blackbox_response = self._send_to_blackbox(packet, self._connection)
+        parsed_response = self._parse_blackbox_response(blackbox_response) if blackbox_response else {}
+        if not parsed_response:
+            self.data['message'] = self.data['result']['error']['errorCode']
+        else:
+            self.data['message'] = parsed_response.get('error', {}).get('errorCode', '301')
+
+    @classmethod
+    def _wrap_low_level_message_around(cls, high_level_message):
+        """Builds a low level message to be sent the blackbox.
+        :param high_level_message: The message to be transmitted to the blackbox
+        :type high_level_message: str
+        :return: The modified message as it is transmitted to the blackbox
+        :rtype: bytearray
+        :return: the response to the sent message, or None if no valid response was received
+        """
+
+        bcc = cls._lrc(high_level_message)
+        high_level_message_bytes = (ord(b) for b in high_level_message)
+
+        low_level_message = bytearray()
+        low_level_message.append(0x02)
+        low_level_message.extend(high_level_message_bytes)
+        low_level_message.append(0x03)
+        low_level_message.append(bcc)
+
+        return low_level_message
+
+    @staticmethod
+    def _lrc(msg):
+        """Compute a message's longitudinal redundancy check value.
+
+        :param byte msg: the message the LRC is computed for
+        :return: the message LRC
+        :rtype: int
+        """
+        lrc = 0
+        for character in msg:
+            byte = ord(character)
+            lrc = (lrc + byte) & 0xFF
+
+        lrc = ((lrc ^ 0xFF) + 1) & 0xFF
+        return lrc
+
+    def _box_id(self):
+        return 'BODO001' + system.IOT_IDENTIFIER.upper()[-7:]
+
+    def _certified_ref(self):
+        self.data['value'] = self._box_id()
+
+    def _parse_blackbox_response(self, response):
+        error_code = response[4:10]
+        error_message = errors.get(error_code[:3])
+
+        return {
+            'identifier': response[0:1],
+            'sequence_number': response[1:3],
+            'retry_counter': response[3:4],
+            'error': {'errorCode': error_code, 'errorMessage': error_message},
+            'fdm_number': response[10:21],
+            'vsc': response[21:35],
+            'date': response[35:43],
+            'time': response[43:49],
+            'type': response[49:51],
+            'ticket_counter': response[51:60],
+            'total_ticket_counter': response[60:69],
+            'signature': response[69:109]
+        }
+
+    def send_blackbox_response(self, data, retry_nbr=0):
+        server_url = helpers.get_odoo_server_url() + "/pos_self_blackbox/confirmation"
+        try:
+            response = requests.post(server_url, json=data, timeout=5)
+            response.raise_for_status()
+        except requests.Timeout:
+            if retry_nbr < 3:
+                self.send_blackbox_response(data, retry_nbr + 1)
+            else:
+                _logger.exception('Could not reach confirmation status URL: %s', server_url)
+        except requests.exceptions.RequestException:
+            _logger.exception('Could not reach confirmation status URL: %s', server_url)
+
+    def _request_registerReceiptWeb(self, data):
+        self._request_registerReceipt(data)
+
+        self.send_blackbox_response({
+            'order_id': data['id'],
+            'device_identifier': self.device_identifier,
+            'blackbox_response': self.data['result'],
+            'iot_mac': system.IOT_IDENTIFIER
+        })
+
+    def _request_registerReceipt(self, data):
+        if data['high_level_message'].get('clock'):
+            packet = self._wrap_low_level_message_around(self._wrap_high_level_message_around('I', data['high_level_message']))
+            blackbox_response = self._send_to_blackbox(packet, self._connection)
+
+        packet = self._wrap_low_level_message_around(self._wrap_high_level_message_around('H', data['high_level_message']))
+        blackbox_response = self._send_to_blackbox(packet, self._connection)
+        if blackbox_response:
+            self.data['result'] = self._parse_blackbox_response(blackbox_response)
+
+    def _request_registerPIN(self, data):
+        packet = self._wrap_low_level_message_around("P040%s" % data['high_level_message'])
+        blackbox_response = self._send_to_blackbox(packet, self._connection)
+        if blackbox_response:
+            self.data['result'] = self._parse_blackbox_response(blackbox_response)
+
+    def _send_to_blackbox(self, packet, connection):
+        """Sends a message to and wait for a response from the blackbox.
+
+        :param bytearray packet: the message to be sent to the blackbox
+        :param int response_size: number of bytes of the expected response
+        :param serial.Serial connection: serial connection to the blackbox
+        :return: the response to the message, or None if no valid response was received
+        :rtype: bytearray
+        """
+        connection.reset_output_buffer()
+        connection.reset_input_buffer()
+        error_code = '301'
+        try:
+            connection.write(packet)
+            buffer = connection.read_until(ETX)
+            if len(buffer) and buffer[0:1] == ACK:
+                response = buffer[2:-1].decode()  # remove ACK, STX and ETX
+                if buffer[1:2] == STX and buffer[-1:] == ETX and self._lrc(response) == ord(connection.read(1)):
+                    connection.write(ACK)
+                    return response
+                _logger.error("received ACK but not a valid response, sending NACK... (response: %s)", buffer)
+                connection.write(NACK)
+                # no ACK or not a valid response
+                error_code = '300'
+            elif not len(buffer):
+                # When the blackbox is off or poorly connected its adaptor is still detected but always replies with empty bytestrings b''
+                _logger.error("Blackbox did not respond, check the cable connection and the power supply.")
+        except serial.SerialException:
+            _logger.warning("Error while sending to blackbox with protocol %s", self._protocol.name)
+        self.data['result'] = {
+            'error': {
+                'errorCode': error_code,
+                'errorMessage': errors[error_code],
+            }
+        }
+        return None
+
+    def _wrap_high_level_message_around(self, request_type, data):
+        self.sequence_number += 1
+        wrap = request_type + str(self.sequence_number % 100).zfill(2) + '0'
+
+        if request_type == 'I':
+            return wrap
+
+        wrap += "{:>8}".format(data['date'])
+        wrap += "{:>6}".format(data['ticket_time'])
+        wrap += "{:>11}".format(data['insz_or_bis_number'])
+        wrap += self._box_id()
+        wrap += "{:>6}".format(data['ticket_number'])[-6:]
+        wrap += "{:>2}".format(data['type'])
+        wrap += "{:>11}".format(data['receipt_total'].zfill(3))[-11:]
+        wrap += "2100" + "{:>11}".format(data['vat1'].zfill(3))[-11:]
+        wrap += "1200" + "{:>11}".format(data['vat2'].zfill(3))[-11:]
+        wrap += " 600" + "{:>11}".format(data['vat3'].zfill(3))[-11:]
+        wrap += " 000" + "{:>11}".format(data['vat4'].zfill(3))[-11:]
+        wrap += "{:>40}".format(data['plu'])
+
+        return wrap
+
+    def _set_name(self):
+        """Tries to build the device's name based on its type and protocol name but falls back on a default name if that doesn't work."""
+
+        try:
+            name = '%s serial %s - %s' % (self._protocol.name, self.device_type, self._box_id())
+        except Exception:  # noqa: BLE001
+            name = 'Unknown Serial Device'
+        self.device_name = name
+
+    def run(self):
+        with serial_connection(self.device_identifier, self._protocol) as connection:
+            self._connection = connection
+            self.data['status'] = self.STATUS_CONNECTED
+            while not self._stopped.is_set():
+                time.sleep(self._protocol.newMeasureDelay)
+
+            self.data['status'] = self.STATUS_DISCONNECTED
diff --git a/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_se_driver.py b/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_se_driver.py
new file mode 100644
index 0000000000000..970d92abc9e8c
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_se_driver.py
@@ -0,0 +1,236 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import logging
+import serial
+
+from odoo.addons.iot_drivers.event_manager import event_manager
+from odoo.addons.iot_drivers.iot_handlers.drivers.serial_driver_base import SerialDriver, SerialProtocol, serial_connection
+
+_logger = logging.getLogger(__name__)
+
+""" Protocol used for Swedish blackbox to communicate with RS232"""
+SwedishBlackboxProtocol = SerialProtocol(
+    name="SWEDISH Retail Innovation Cleancash",
+    baudrate=9600,
+    bytesize=serial.EIGHTBITS,
+    stopbits=serial.STOPBITS_ONE,
+    parity=serial.PARITY_NONE,
+    timeout=1,
+    writeTimeout=0.3,
+    measureRegexp=None,
+    statusRegexp=None,
+    commandTerminator=b"",
+    commandDelay=0.2,
+    measureDelay=0.2,
+    newMeasureDelay=0.2,
+    measureCommand=b"",
+    emptyAnswerValid=False,
+)
+
+"""Base Json for Swedish black box Messages.
+Most of these constants are provided by Retail Innovation Cleancash and should not be changed.
+"""
+MainStatus = {
+    "0": "OK",
+    "1": "Warning condition(s) exists",
+    "2": "Protocol error condition(s) exists",
+    "3": "Non fatal error condition(s) exists",
+    "4": "Fatal Error condition(s) exists",
+    "5": "Busy (Not used in CCSP v2 currently).",
+}
+
+ErrorCode = {
+    "001": "Invalid LRC",
+    "002": "Unknown message type",
+    "003": "Invalid data/parameter",
+    "004": "Invalid sequence",
+    "005": "Deprecated (Not used)",
+    "006": "CleanCash® Not operational",
+    "007": "Invalid POS ID",
+    "008": "Internal error",
+    "009": "License exceeded (CCSP v2)",
+    "010": "Internal storage full (CCSP v2)",
+    "011": "Invalid sequence number",
+}
+
+SeverityError = {
+    "0": "Informational",
+    "1": "Warning",
+    "2": "Protocol error",
+    "3": "Non fatal error",
+    "4": "Fatal error",
+}
+
+StorageStatus = {
+    "0": "OK",
+    "1": "High level warning",
+    "2": "Transaction memory full",
+}
+
+
+class SwedishBlackBoxDriver(SerialDriver):
+    """Driver for the Swedish blackbox fiscal data module."""
+
+    _protocol = SwedishBlackboxProtocol
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+
+        self.device_type = "fiscal_data_module"
+        self.data["value"] = device["UnitId"]
+        self.serial_number = 0
+        self._set_actions()
+
+    @classmethod
+    def supported(cls, device):
+        """Checks whether the device at path `device` is supported by the driver.
+        :param device: path to the device
+        :type device: str
+        :return: whether the device is supported by the driver
+        :rtype: bool
+        """
+
+        try:
+            protocol = cls._protocol
+            packet = cls._wrap_message("SQX")
+            with serial_connection(device["identifier"], protocol) as connection:
+                response = cls._send_to_blackbox(packet, connection, 2)
+                if len(response) > 1 and response[3] == "SRX":
+                    device["UnitId"] = cls._get_unit_id(connection)
+                    if response[4] != "0":
+                        _logger.warning(
+                            ("Received error: %s - Severity: %s"),
+                            MainStatus.get(response[4]),
+                            SeverityError.get(response[5][1:2])
+                        )
+                        _logger.warning("Sent request: %s", packet)
+                    return True
+        except serial.serialutil.SerialTimeoutException:
+            pass
+        except Exception:
+            _logger.exception(
+                "Error while probing %s with protocol %s", device, protocol.name
+            )
+
+    @classmethod
+    def _get_unit_id(cls, connection):
+        """ "Get UnitId of Swedish Black box
+        :return: UnitId
+        :rtype: string
+        """
+        try:
+            response = cls._request_action("IQ", connection)
+            if response[3] == "IR":
+                return response[4]
+            else:
+                _logger.error("Sent IQ request error")
+                return False
+        except Exception:  # noqa: BLE001
+            _logger.error("Did not receive a response")
+
+    @staticmethod
+    def _lrc(msg):
+        """ "Compute a message's longitudinal redundancy check value.
+        :param msg: the message the LRC is computed for
+        :type msg: byte
+        :return: the message LRC
+        :rtype: int
+        """
+
+        lrc = ord(msg[0])
+
+        for i in range(1, len(msg)):
+            lrc ^= ord(msg[i])
+
+        return f"{int(lrc):02X}"
+
+    def _register_receipt(self, data):
+        """The register receipt message registers a receipt. CleanCash® responds with Register
+        Receipt Response if OK or Negative Acknowledge if error"""
+
+        self.serial_number += 1
+        message = {"message_type": "RR", "serial_number": str(self.serial_number)}
+        message.update(data.get("high_level_message"))
+        request = "#".join(list(message.values()))
+        _logger.error(request)
+        response = self._request_action(request, self._connection)
+        _logger.error(response)
+        if len(response) > 1:
+            if response[3] == "RRR":
+                self.data["signature_control"] = response[4]
+                self.data["unit_id"] = response[5]
+                self.data["storage_status"] = StorageStatus.get(response[7])
+                self.data["status"] = "ok"
+            elif response[3] == "NAK":
+                _logger.error("Received error: %s", ErrorCode.get(response[4]))
+                _logger.error("Sent request: %s received NACK.", request)
+                self.data["status"] = ErrorCode.get(response[4])
+        else:
+            _logger.error("Error request: %s", data)
+            _logger.error("Response received: %s", response)
+            self.data["status"] = ("Sent request: %s without receiving response.", data)
+        event_manager.device_changed(self)
+
+    @classmethod
+    def _request_action(cls, data, connection):
+
+        packet = cls._wrap_message(data)
+        return cls._send_to_blackbox(packet, connection)
+
+    @classmethod
+    def _send_to_blackbox(cls, packet, connection, retry=1):
+        """Sends a message to and wait for a response from the blackbox.
+        :param packet: the message to be sent to the blackbox
+        :type packet: bytearray
+        :param response_size: number of bytes of the expected response
+        :type response_size: int
+        :param connection: serial connection to the blackbox
+        :type connection: serial.Serial
+        :return: the response to the sent message
+        :rtype: bytearray
+        """
+
+        ACK = ""
+        retries = 0
+        while ACK != "ACK" and retries < retry:
+            connection.write(packet)
+            response = connection.readline().decode().split("#")
+
+            try:
+                if response[3] != "NAK":
+                    ACK = "ACK"
+                else:
+                    _logger.error("Received error: %s", ErrorCode.get(response[4]))
+                    _logger.error("Sent request: %s received NACK.", packet)
+            except Exception:  # noqa: BLE001
+                _logger.error("sent request: %s without receiving response.", packet)
+
+            retries += 1
+
+        return response
+
+    def _set_actions(self):
+        """Initializes `self._actions`, a map of action keys sent by the frontend to backend action methods."""
+
+        self._actions.update(
+            {
+                "registerReceipt": self._register_receipt,
+            }
+        )
+
+    @classmethod
+    def _wrap_message(cls, high_level_message):
+        """Builds a low level message to be sent the blackbox.
+        :param high_level_message: The message to be transmitted to the blackbox
+        :type high_level_message: str
+        :return: The modified message as it is transmitted to the blackbox
+        :rtype: bytearray
+        """
+
+        length = 11 + len(high_level_message)
+        length = f"{int(length):03X}"
+        message = "#!#" + length + "#" + high_level_message + "#"
+        lrc = cls._lrc(message)
+        message += lrc + "\r"
+
+        return message.encode("utf-8")
diff --git a/addons/iot_drivers/iot_handlers/drivers/serial_caliper_driver.py b/addons/iot_drivers/iot_handlers/drivers/serial_caliper_driver.py
new file mode 100644
index 0000000000000..9c13d559e0f55
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/serial_caliper_driver.py
@@ -0,0 +1,101 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import logging
+import serial
+import time
+
+from odoo.addons.iot_drivers.event_manager import event_manager
+from odoo.addons.iot_drivers.iot_handlers.drivers.serial_driver_base import SerialDriver, SerialProtocol, serial_connection
+
+_logger = logging.getLogger(__name__)
+
+
+SylvacSCalProProtocol = SerialProtocol(
+    name='Sylvac S_Cal pro',
+    baudrate=4800,
+    bytesize=serial.SEVENBITS,
+    stopbits=serial.STOPBITS_TWO,
+    parity=serial.PARITY_EVEN,
+    timeout=0.2,
+    writeTimeout=0.2,
+    measureRegexp=b'\\+|-\\d+\\.\\d+\r',
+    statusRegexp=None,
+    commandTerminator=b'\r',
+    commandDelay=0.2,
+    measureDelay=0.2,
+    newMeasureDelay=0.2,
+    measureCommand=b'?',
+    emptyAnswerValid=False,
+)
+
+
+class SylvacSCalProDriver(SerialDriver):
+    """Driver For Sylvac's USB calipers."""
+
+    _protocol = SylvacSCalProProtocol
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_type = 'device'
+        self._actions['read_once'] = self._action_read_once
+
+    def _action_read_once(self, _data):
+        """Make value available to the longpolling event route"""
+        event_manager.device_changed(self)
+
+    def _take_measure(self):
+        """Asks the device for a new value, and pushes that value to the frontend."""
+
+        with self._device_lock:
+            self._connection.write(self._protocol.measureCommand + self._protocol.commandTerminator)
+            measure = self._get_raw_response(self._connection)
+            if measure and measure != self.data['value']:
+                self.data['value'] = measure
+                event_manager.device_changed(self)
+
+    @staticmethod
+    def _get_raw_response(connection):
+        """Gets a raw, unparsed string containing the updated value of the device.
+
+        :param connection: connection to the device's serial port
+        :type connection: pyserial.Serial
+        """
+
+        TIMEOUT = 1
+        answer = []
+        t0 = time.time()
+        while True:
+            char = connection.read()
+            if char:
+                if ord(char) == 13:
+                    return b''.join(answer[:-1]).decode('utf-8')
+                answer.append(char)
+                t0 = time.time()
+            elif time.time() - t0 > TIMEOUT:
+                return ""
+
+    @classmethod
+    def supported(cls, device):
+        """Checks whether the device at path `device` is supported by the driver.
+
+        :param device: path to the device
+        :type device: str
+        :return: whether the device is supported by the driver
+        :rtype: bool
+        """
+
+        protocol = cls._protocol
+
+        try:
+            with serial_connection(device['identifier'], protocol, is_probing=True) as connection:
+                connection.write(protocol.measureCommand + protocol.commandTerminator)
+                time.sleep(protocol.commandDelay)
+                measure = cls._get_raw_response(connection)
+                float(measure)
+                return True
+
+        except (ValueError, TypeError, serial.serialutil.SerialTimeoutException):
+            pass
+        except Exception:
+            _logger.exception('Error while probing %s with protocol %s', device, protocol.name)
+        return False
diff --git a/addons/iot_drivers/iot_handlers/drivers/serial_base_driver.py b/addons/iot_drivers/iot_handlers/drivers/serial_driver_base.py
similarity index 100%
rename from addons/iot_drivers/iot_handlers/drivers/serial_base_driver.py
rename to addons/iot_drivers/iot_handlers/drivers/serial_driver_base.py
diff --git a/addons/iot_drivers/iot_handlers/drivers/serial_scale_driver.py b/addons/iot_drivers/iot_handlers/drivers/serial_scale_driver.py
index 3f103d28fc014..f10727c5b976c 100644
--- a/addons/iot_drivers/iot_handlers/drivers/serial_scale_driver.py
+++ b/addons/iot_drivers/iot_handlers/drivers/serial_scale_driver.py
@@ -9,7 +9,7 @@
 from odoo import http
 from odoo.addons.iot_drivers.controllers.proxy import proxy_drivers
 from odoo.addons.iot_drivers.event_manager import event_manager
-from odoo.addons.iot_drivers.iot_handlers.drivers.serial_base_driver import SerialDriver, SerialProtocol, serial_connection
+from odoo.addons.iot_drivers.iot_handlers.drivers.serial_driver_base import SerialDriver, SerialProtocol, serial_connection
 
 
 _logger = logging.getLogger(__name__)
diff --git a/addons/iot_drivers/iot_handlers/drivers/six_driver.py b/addons/iot_drivers/iot_handlers/drivers/six_driver.py
new file mode 100644
index 0000000000000..22c04adc5aac9
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/six_driver.py
@@ -0,0 +1,147 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+from time import sleep
+from logging import getLogger
+
+from odoo.addons.iot_drivers.tools.system import IS_WINDOWS
+from odoo.addons.iot_drivers.iot_handlers.drivers.ctypes_terminal_driver import (
+    CtypesTerminalDriver,
+    import_ctypes_library,
+    CTYPES_BUFFER_SIZE,
+    create_ctypes_string_buffer
+)
+
+_logger = getLogger(__name__)
+CANCELLED_BY_POS = 2  # Error code returned when you press "cancel" in PoS
+
+# Load library
+LIB_NAME = 'libsix_odoo_w.dll' if IS_WINDOWS else 'libsix_odoo_l.so'
+
+
+class SixDriver(CtypesTerminalDriver):
+    connection_type = 'tim'
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_name = 'Six terminal %s' % self.device_identifier
+        self.device_manufacturer = 'Six'
+
+        self.TIMAPI = import_ctypes_library('tim', LIB_NAME)
+
+        # int six_cancel_transaction(t_terminal_manager *terminal_manager)
+        self.TIMAPI.six_cancel_transaction.argtypes = [ctypes.c_void_p]
+
+        # int six_perform_transaction
+        self.TIMAPI.six_perform_transaction.argtypes = [
+            ctypes.c_void_p,                # t_terminal_manager *terminal_manager
+            ctypes.c_char_p,                # char *pos_id
+            ctypes.c_int,                   # int user_id
+
+            ctypes.c_int,                   # int transaction_type
+            ctypes.c_int,                   # int amount
+            ctypes.c_char_p,                # char *currency_str
+
+            ctypes.c_char_p,                # char *transaction_id,
+            ctypes.c_int,                   # int transaction_id_size
+            ctypes.c_char_p,                # char *merchant_receipt
+            ctypes.c_char_p,                # char *customer_receipt
+            ctypes.c_int,                   # int receipt_size
+            ctypes.c_char_p,                # char *card
+            ctypes.c_int,                   # int card_size
+            ctypes.POINTER(ctypes.c_int),   # int *error_code
+            ctypes.c_char_p,                # char *error
+            ctypes.c_int,                   # int error_size
+        ]
+
+    def processTransaction(self, transaction):
+        if transaction['amount'] <= 0:
+            return self.send_status(error='The terminal cannot process null transactions.', request_data=transaction)
+
+        # Notify PoS about the transaction start
+        self.send_status(stage='WaitingForCard', request_data=transaction)
+
+        # Transaction buffers
+        ctypes_int_buffer_size = ctypes.c_int(CTYPES_BUFFER_SIZE)
+        transaction_id = create_ctypes_string_buffer()
+        merchant_receipt = create_ctypes_string_buffer()
+        customer_receipt = create_ctypes_string_buffer()
+        card = create_ctypes_string_buffer()
+        error_code = ctypes.c_int(CTYPES_BUFFER_SIZE)
+        error = create_ctypes_string_buffer()
+
+        # Transaction
+        try:
+            _logger.info('Start transaction #%s', transaction)
+            result = self.TIMAPI.six_perform_transaction(
+                ctypes.cast(self.dev, ctypes.c_void_p),  # t_terminal_manager *terminal_manager
+                transaction['posId'].encode(),  # char *pos_id
+                ctypes.c_int(transaction['userId']),  # int user_id
+                ctypes.c_int(1) if transaction['transactionType'] == 'Payment' else ctypes.c_int(2),  # int transaction_type
+                ctypes.c_int(transaction['amount']),  # int amount
+                transaction['currency'].encode(),  # char *currency_str
+                transaction_id,  # char *transaction_id
+                ctypes_int_buffer_size,  # int transaction_id_size
+                merchant_receipt,  # char *merchant_receipt
+                customer_receipt,  # char *customer_receipt
+                ctypes_int_buffer_size,   # int receipt_size
+                card,  # char *card
+                ctypes_int_buffer_size,  # int card_size
+                ctypes.byref(error_code),  # int *error_code
+                error,  # char *error
+                ctypes_int_buffer_size  # int error_size
+            )
+            # Transaction successful
+            if result == 1:
+                _logger.info('Successfully finished transaction #%s', transaction)
+                self.send_status(
+                    response='Approved',
+                    ticket=customer_receipt.value.decode(),
+                    ticket_merchant=merchant_receipt.value.decode(),
+                    card=card.value.decode(),
+                    transaction_id=transaction_id.value.decode(),
+                    request_data=transaction,
+                )
+            # Transaction failed
+            elif result == 0:
+                # If cancelled by Odoo Pos
+                if error_code.value == CANCELLED_BY_POS:
+                    sleep(3)  # Wait a couple of seconds between cancel requests as per documentation
+                    _logger.info("Transaction #%s cancelled by PoS user", transaction)
+                    self.send_status(stage='Cancel', request_data=transaction)
+                # If an error was encountered
+                else:
+                    error_message = f"{error_code.value}: {error.value.decode()}"
+                    _logger.info("Transaction #%s failed with error: %s", transaction, error_message)
+                    self.send_status(error=error_message, request_data=transaction)
+            # Terminal disconnected
+            elif result == -1:
+                _logger.warning("Terminal disconnected during transaction #%s", transaction)
+                self.send_status(disconnected=True)
+        except OSError:
+            _logger.exception("Failed to perform Six transaction. Check for potential segmentation faults")
+            sleep(3)  # needed to space out transaction requests
+            self.send_status(
+                error="An error has occured. Check the transaction result manually with the payment provider",
+                request_data=transaction,
+            )
+
+    def cancelTransaction(self, transaction):
+        self.send_status(stage='waitingCancel', request_data=transaction)
+        if not self.terminal_busy:
+            # In case of restart after sending a payment request, the terminal is not busy
+            # but the pos is still waiting for the transaction confirmation: we need to be
+            # able to unblock it pressing cancel
+            return self.send_status(stage="Cancel", request_data=transaction)
+        try:
+            _logger.info("cancel transaction request for %s", transaction)
+            if not self.TIMAPI.six_cancel_transaction(ctypes.cast(self.dev, ctypes.c_void_p)):
+                _logger.info("Transaction #%s could not be cancelled", transaction)
+                self.send_status(stage='Cancel', error='Transaction could not be cancelled', request_data=transaction)
+        except OSError:
+            _logger.exception("Failed to cancel Six transaction. Check for potential segmentation faults.")
+            sleep(3)  # needed to space out cancellation requests
+            self.send_status(
+                error="An error has occured when cancelling Six transaction. Check the transaction result manually with the payment provider",
+                request_data=transaction,
+            )
diff --git a/addons/iot_drivers/iot_handlers/drivers/worldline_driver_L.py b/addons/iot_drivers/iot_handlers/drivers/worldline_driver_L.py
new file mode 100644
index 0000000000000..26c5f9d8499c5
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/worldline_driver_L.py
@@ -0,0 +1,199 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+import datetime
+import logging
+
+from odoo.addons.iot_drivers.iot_handlers.drivers.ctypes_terminal_driver import (
+    CtypesTerminalDriver,
+    ulong_pointer,  # noqa: F401
+    double_pointer,  # noqa: F401
+    import_ctypes_library,
+    create_ctypes_string_buffer,
+)
+
+_logger = logging.getLogger(__name__)
+
+# All the terminal errors can be found in the section "Codes d'erreur" here:
+# https://help.winbooks.be/space/HelpLogFr/1278150/Liaison+vers+le+terminal+de+paiement+Banksys+en+TCP%2FIP#Codes-d'erreur
+TERMINAL_ERRORS = {
+    '1802': 'Terminal is busy',
+    '1803': 'Timeout expired',
+    '1811': 'Technical problem',
+    '1822': 'Connection failure',
+    '2000': 'Unknown acquirer identifier',
+    '2100': 'Action code not supported',
+    '2625': 'Corrupted message',
+    '2629': 'User cancellation',
+    '2631': 'Host cancellation',
+    '2632': 'Host error',
+    '2633': 'Operation already performed',
+    '2634': 'Operation busy',
+    '2635': 'Operation not performed',
+    '2800': 'Doesn’t exist',
+    '2802': 'Not allowed',
+    '2806': 'Bad signature',
+    '2807': 'Conditional field missing',
+    '2808': 'Not found',
+    '2809': 'Dependency not found',
+    '2810': 'Bad value',
+    '2811': 'Bad sequence',
+    '2812': 'Device attachment',
+    '2813': 'Unexpected field',
+    '3100': 'Chip card expected',
+    '3101': 'Card not well read',
+    '3102': 'Condition of use not satisfied',
+    '4000': 'Purse technical problem',
+    '4001': 'Purse host identifier invalid',
+    '4002': 'Purse SDA certificate error',
+    '4003': 'Purse extended SDA certificate error',
+    '4004': 'Purse in red list',
+    '4005': 'Purse is locked for credit',
+    '4006': 'Purse is locked for debit',
+    '4007': 'Purse expired',
+    '4008': 'Purse state error',
+    '4009': 'Purse recovery error',
+    '4010': 'Purse key identifier error',
+    '4011': 'Purse balance too large',
+    '4012': 'Insufficient purse balance',
+    '4100': 'No purse in reader and time out expired',
+    '4101': 'Time-out on fallback card reading',
+    '4102': 'Problem linked to card',
+    '4103': 'Card information not available',
+    '4200': 'Entered amount invalid',
+    '4201': 'Double operation',
+    '4202': 'Invalid currency',
+    '4203': 'Amount higher than authorized amount',
+    '4204': 'Floor limit exceeded in EMV mode',
+    '4205': 'Transaction refused by the terminal in EMV mode',
+    '4206': 'Transaction refused by the card in EMV mode',
+    '4207': 'Product not available',
+    '4300': 'Service (already) activated',
+    '4301': 'Service (already) deactivated',
+    '4302': 'Maximal transaction number per (calendar) month reached',
+    '4303': 'Maximal uncollected journals number reached',
+    '4304': 'Service activation not supported',
+    '4305': 'Maximum transaction records reached',
+    '4306': 'Maximum service activation number reached',
+    '6003': 'Paper jam',
+    '6004': 'Remove previous ticket',
+    '6005': 'No paper',
+    '6006': 'Low paper',
+    '6008': 'Printer specific',
+    '7806': 'Product not allowed',
+    '7808': 'Bad pump number',
+    '7816': 'Incorrect pump session number',
+    '7817': 'Transaction amount null',
+    '7818': 'Transaction amount null and quantity null',
+    '7819': 'Pump unhooked time-out expiration',
+    '9002': 'No key fault',
+    '9003': 'Cryptographic fault',
+    '9004': 'No PIN fault',
+    '9005': 'Bad MAC',
+    '9006': 'Bad MDC',
+}
+
+# Manually cancelled by cashier, do not show these errors
+IGNORE_ERRORS = [
+    '2628',  # External Equipment Cancellation
+    '2630',  # Device Cancellation
+]
+
+
+class WorldlineDriver(CtypesTerminalDriver):
+    connection_type = 'ctep'
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_name = 'Worldline terminal %s' % self.device_identifier
+        self.device_manufacturer = 'Worldline'
+
+        self.easyCTEP = import_ctypes_library('ctep', 'libeasyctep.so')
+
+        # int startTransaction(
+        self.easyCTEP.startTransaction.argtypes = [
+            ctypes.c_void_p,    # std::shared_ptr<ect::CTEPTerminal> trm
+            ctypes.c_char_p,    # char const* amount
+            ctypes.c_char_p,    # char const* reference
+            ctypes.c_ulong,     # unsigned long action_identifier
+            ctypes.c_char_p,    # char* merchant_receipt
+            ctypes.c_char_p,    # char* customer_receipt
+            ctypes.c_char_p,    # char* card
+            ctypes.c_char_p     # char* error
+        ]
+
+        # int abortTransaction(std::shared_ptr<ect::CTEPTerminal> trm, char* error)
+        self.easyCTEP.abortTransaction.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+
+    def processTransaction(self, transaction):
+        if transaction['amount'] <= 0:
+            return self.send_status(error='The terminal cannot process negative or null transactions.', request_data=transaction)
+
+        # Force to wait before starting the transaction if necessary
+        self._check_transaction_delay()
+        # Notify transaction start
+        self.send_status(stage='WaitingForCard', request_data=transaction)
+
+        # Transaction
+        merchant_receipt = create_ctypes_string_buffer()
+        customer_receipt = create_ctypes_string_buffer()
+        card = create_ctypes_string_buffer()
+        error_code = create_ctypes_string_buffer()
+        transaction_id = transaction['TransactionID']
+        transaction_amount = transaction['amount'] / 100
+        transaction_action_identifier = transaction['actionIdentifier']
+        _logger.info('start transaction #%d amount: %f action_identifier: %d', transaction_id, transaction_amount, transaction_action_identifier)
+        result = self.easyCTEP.startTransaction(
+            ctypes.byref(self.dev),  # std::shared_ptr<ect::CTEPTerminal> trm
+            ctypes.c_char_p(str(transaction_amount).encode('utf-8')),  # char const* amount
+            ctypes.c_char_p(str(transaction_id).encode('utf-8')),  # char const* reference
+            ctypes.c_ulong(transaction_action_identifier),  # unsigned long action_identifier
+            merchant_receipt,  # char* merchant_receipt
+            customer_receipt,  # char* customer_receipt
+            card,  # char* card
+            error_code,  # char* error
+        )
+        self.next_transaction_min_dt = datetime.datetime.now() + datetime.timedelta(seconds=self.DELAY_TIME_BETWEEN_TRANSACTIONS)
+
+        if result == 1:
+            _logger.info('succesfully finished transaction #%d', transaction_id)
+            # Transaction successful
+            self.send_status(
+                response='Approved',
+                ticket=customer_receipt.value.decode(),
+                ticket_merchant=merchant_receipt.value.decode(),
+                card=card.value.decode(),
+                transaction_id=transaction['actionIdentifier'],
+                request_data=transaction,
+            )
+        elif result == 0:
+            error_code = error_code.value.decode('utf-8')
+            # Transaction failed
+            if error_code not in IGNORE_ERRORS:
+                error_msg = f'transaction #{transaction_id} error: {error_code}: {TERMINAL_ERRORS.get(error_code, "Transaction Error")}'
+                _logger.info(error_msg)
+                self.send_status(error=error_msg, request_data=transaction)
+            # Transaction was cancelled
+            else:
+                _logger.info("transaction #%d cancelled by PoS user", transaction_id)
+                self.send_status(stage='Cancel', request_data=transaction)
+        elif result == -1:
+            # Terminal disconnection, check status manually
+            _logger.warning("terminal disconnected during transaction #%d", transaction_id)
+            self.send_status(disconnected=True, request_data=transaction)
+
+    def cancelTransaction(self, transaction):
+        # Force to wait before starting the transaction if necessary
+        self._check_transaction_delay()
+        self.send_status(stage='waitingCancel', request_data=transaction)
+
+        error_code = create_ctypes_string_buffer()
+        _logger.info("cancel transaction request for %s", transaction)
+        result = self.easyCTEP.abortTransaction(ctypes.byref(self.dev), error_code)  # std::shared_ptr<ect::CTEPTerminal> trm
+        _logger.debug("end cancel transaction request")
+
+        if not result:
+            error_code = error_code.value.decode('utf-8')
+            error_msg = f'Cancellation failed: {error_code}: {TERMINAL_ERRORS.get(error_code, "cancellation error")}'
+            _logger.info(error_msg)
+            self.send_status(stage='Cancel', error=error_msg, request_data=transaction)
diff --git a/addons/iot_drivers/iot_handlers/drivers/worldline_driver_W.py b/addons/iot_drivers/iot_handlers/drivers/worldline_driver_W.py
new file mode 100644
index 0000000000000..d4441eb21a7ea
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/drivers/worldline_driver_W.py
@@ -0,0 +1,217 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+import datetime
+import logging
+
+from odoo.addons.iot_drivers.iot_handlers.drivers.ctypes_terminal_driver import (
+    CtypesTerminalDriver,
+    ulong_pointer,  # noqa: F401
+    double_pointer,  # noqa: F401
+    import_ctypes_library,
+    create_ctypes_string_buffer,
+)
+
+_logger = logging.getLogger(__name__)
+
+# All the terminal errors can be found in the section "Codes d'erreur" here:
+# https://help.winbooks.be/space/HelpLogFr/1278150/Liaison+vers+le+terminal+de+paiement+Banksys+en+TCP%2FIP#Codes-d'erreur
+TERMINAL_ERRORS = {
+    '1802': 'Terminal is busy',
+    '1803': 'Timeout expired',
+    '1811': 'Technical problem',
+    '1822': 'Connection failure',
+    '2000': 'Unknown acquirer identifier',
+    '2100': 'Action code not supported',
+    '2625': 'Corrupted message',
+    '2629': 'User cancellation',
+    '2631': 'Host cancellation',
+    '2632': 'Host error',
+    '2633': 'Operation already performed',
+    '2634': 'Operation busy',
+    '2635': 'Operation not performed',
+    '2800': 'Doesn’t exist',
+    '2802': 'Not allowed',
+    '2806': 'Bad signature',
+    '2807': 'Conditional field missing',
+    '2808': 'Not found',
+    '2809': 'Dependency not found',
+    '2810': 'Bad value',
+    '2811': 'Bad sequence',
+    '2812': 'Device attachment',
+    '2813': 'Unexpected field',
+    '3100': 'Chip card expected',
+    '3101': 'Card not well read',
+    '3102': 'Condition of use not satisfied',
+    '4000': 'Purse technical problem',
+    '4001': 'Purse host identifier invalid',
+    '4002': 'Purse SDA certificate error',
+    '4003': 'Purse extended SDA certificate error',
+    '4004': 'Purse in red list',
+    '4005': 'Purse is locked for credit',
+    '4006': 'Purse is locked for debit',
+    '4007': 'Purse expired',
+    '4008': 'Purse state error',
+    '4009': 'Purse recovery error',
+    '4010': 'Purse key identifier error',
+    '4011': 'Purse balance too large',
+    '4012': 'Insufficient purse balance',
+    '4100': 'No purse in reader and time out expired',
+    '4101': 'Time-out on fallback card reading',
+    '4102': 'Problem linked to card',
+    '4103': 'Card information not available',
+    '4200': 'Entered amount invalid',
+    '4201': 'Double operation',
+    '4202': 'Invalid currency',
+    '4203': 'Amount higher than authorized amount',
+    '4204': 'Floor limit exceeded in EMV mode',
+    '4205': 'Transaction refused by the terminal in EMV mode',
+    '4206': 'Transaction refused by the card in EMV mode',
+    '4207': 'Product not available',
+    '4300': 'Service (already) activated',
+    '4301': 'Service (already) deactivated',
+    '4302': 'Maximal transaction number per (calendar) month reached',
+    '4303': 'Maximal uncollected journals number reached',
+    '4304': 'Service activation not supported',
+    '4305': 'Maximum transaction records reached',
+    '4306': 'Maximum service activation number reached',
+    '6003': 'Paper jam',
+    '6004': 'Remove previous ticket',
+    '6005': 'No paper',
+    '6006': 'Low paper',
+    '6008': 'Printer specific',
+    '7806': 'Product not allowed',
+    '7808': 'Bad pump number',
+    '7816': 'Incorrect pump session number',
+    '7817': 'Transaction amount null',
+    '7818': 'Transaction amount null and quantity null',
+    '7819': 'Pump unhooked time-out expiration',
+    '9002': 'No key fault',
+    '9003': 'Cryptographic fault',
+    '9004': 'No PIN fault',
+    '9005': 'Bad MAC',
+    '9006': 'Bad MDC',
+}
+
+# Manually cancelled by cashier, do not show these errors
+IGNORE_ERRORS = [
+    '2628',  # External Equipment Cancellation
+    '2630',  # Device Cancellation
+]
+
+
+class WorldlineDriver(CtypesTerminalDriver):
+    connection_type = 'ctep'
+
+    def __init__(self, identifier, device):
+        super().__init__(identifier, device)
+        self.device_name = 'Worldline terminal %s' % self.device_identifier
+        self.device_manufacturer = 'Worldline'
+
+        # Load library
+        self.easyCTEP = import_ctypes_library('ctep_w', 'libeasyctep.dll')
+
+        # int startTransaction(
+        self.easyCTEP.startTransaction.argtypes = [
+            ctypes.c_void_p,  # CTEPManager* manager
+            ctypes.c_char_p,  # char const* amount
+            ctypes.c_char_p,  # char const* reference
+            ctypes.c_ulong,   # unsigned long action_identifier
+            ctypes.c_char_p,  # char* merchant_receipt
+            ctypes.c_char_p,  # char* customer_receipt
+            ctypes.c_char_p,  # char* card
+            ctypes.c_char_p   # char* error
+        ]
+
+        # int abortTransaction(CTEPManager* manager, char* error)
+        self.easyCTEP.abortTransaction.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+
+    def processTransaction(self, transaction):
+        if transaction['amount'] <= 0:
+            return self.send_status(error='The terminal cannot process negative or null transactions.', request_data=transaction)
+
+        # Force to wait before starting the transaction if necessary
+        self._check_transaction_delay()
+        # Notify transaction start
+        self.send_status(stage='WaitingForCard', request_data=transaction)
+
+        # Transaction
+        merchant_receipt = create_ctypes_string_buffer()
+        customer_receipt = create_ctypes_string_buffer()
+        card = create_ctypes_string_buffer()
+        error_code = create_ctypes_string_buffer()
+        transaction_id = transaction['TransactionID']
+        transaction_amount = transaction['amount'] / 100
+        transaction_action_identifier = transaction['actionIdentifier']
+        _logger.info('start transaction #%d amount: %f action_identifier: %d', transaction_id, transaction_amount, transaction_action_identifier)
+
+        try:
+            result = self.easyCTEP.startTransaction(
+                ctypes.cast(self.dev, ctypes.c_void_p),  # CTEPManager* manager
+                ctypes.c_char_p(str(transaction_amount).encode('utf-8')),  # char const* amount
+                ctypes.c_char_p(str(transaction_id).encode('utf-8')),  # char const* reference
+                ctypes.c_ulong(transaction_action_identifier),  # unsigned long action_identifier
+                merchant_receipt,  # char* merchant_receipt
+                customer_receipt,  # char* customer_receipt
+                card,  # char* card
+                error_code,  # char* error
+            )
+            self.next_transaction_min_dt = datetime.datetime.now() + datetime.timedelta(seconds=self.DELAY_TIME_BETWEEN_TRANSACTIONS)
+
+            if result == 1:
+                # Transaction successful
+                _logger.info('succesfully finished transaction #%d', transaction_id)
+                self.send_status(
+                    response='Approved',
+                    ticket=customer_receipt.value.decode(),
+                    ticket_merchant=merchant_receipt.value.decode(),
+                    card=card.value.decode(),
+                    transaction_id=transaction['actionIdentifier'],
+                    request_data=transaction,
+                )
+            elif result == 0:
+                # Transaction failed
+                error_code = error_code.value.decode('utf-8')
+                if error_code not in IGNORE_ERRORS:
+                    error_msg = f'transaction #{transaction_id} error: {error_code}: {TERMINAL_ERRORS.get(error_code, "Transaction Error")}'
+                    _logger.info(error_msg)
+                    self.send_status(error=error_msg, request_data=transaction)
+                # Transaction was cancelled
+                else:
+                    _logger.info("transaction #%d cancelled by PoS user", transaction_id)
+                    self.send_status(stage='Cancel', request_data=transaction)
+            elif result == -1:
+                # Terminal disconnection, check status manually
+                _logger.warning("terminal disconnected during transaction #%d", transaction_id)
+                self.send_status(disconnected=True, request_data=transaction)
+
+        except OSError:
+            _logger.exception("Failed to perform Worldline transaction. Check for potential segmentation faults")
+            self.send_status(
+                error="An error has occured. Check the transaction result manually with the payment provider",
+                request_data=transaction,
+            )
+
+    def cancelTransaction(self, transaction):
+        # Force to wait before starting the transaction if necessary
+        self._check_transaction_delay()
+        self.send_status(stage='waitingCancel', request_data=transaction)
+
+        error_code = create_ctypes_string_buffer()
+        _logger.info("cancel transaction request")
+        try:
+            result = self.easyCTEP.abortTransaction(ctypes.cast(self.dev, ctypes.c_void_p), error_code)
+            _logger.debug("end cancel transaction request")
+
+            if not result:
+                error_code = error_code.value.decode('utf-8')
+                error_msg = '%s (Error code: %s)' % (TERMINAL_ERRORS.get(error_code, 'Transaction could not be cancelled'), error_code)
+                _logger.info(error_msg)
+                self.send_status(stage='Cancel', error=error_msg, request_data=transaction)
+        except OSError:
+            _logger.exception("Failed to cancel Worldline transaction. Check for potential segmentation faults.")
+            self.send_status(
+                stage='Cancel',
+                error="An error has occured when cancelling Worldline transaction. Check the transaction result manually with the payment provider",
+                request_data=transaction,
+            )
diff --git a/addons/iot_drivers/iot_handlers/interfaces/bluetooth_interface_L.py b/addons/iot_drivers/iot_handlers/interfaces/bluetooth_interface_L.py
new file mode 100644
index 0000000000000..10387253003f3
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/interfaces/bluetooth_interface_L.py
@@ -0,0 +1,77 @@
+from gatt import DeviceManager as Gatt_DeviceManager
+import dbus
+from gi.repository import GLib
+import logging
+from threading import Thread
+
+from odoo.addons.iot_drivers.interface import Interface
+
+_logger = logging.getLogger(__name__)
+
+bluetooth_devices = {}
+
+
+class GattBtManager(Gatt_DeviceManager):
+    def device_discovered(self, device):
+        identifier = "bt_%s" % device.mac_address
+        if identifier not in bluetooth_devices:
+            device.manager = self
+            bluetooth_devices[identifier] = device
+
+    def run(self):
+        """ Override gatt.DeviceManager.run() method
+        to avoid calling GObject.MainLoop() deprecated method inside it.
+        MainLoop.run() will 'infinite loop' until MainLoop.quit()
+        method is called which we never do, so we don't need to reimplement
+        the rest of the MainLoop.run() method """
+
+        if self._main_loop:
+            return
+
+        self._interface_added_signal = self._bus.add_signal_receiver(
+            self._interfaces_added,
+            dbus_interface='org.freedesktop.DBus.ObjectManager',
+            signal_name='InterfacesAdded')
+
+        self._properties_changed_signal = self._bus.add_signal_receiver(
+            self._properties_changed,
+            dbus_interface=dbus.PROPERTIES_IFACE,
+            signal_name='PropertiesChanged',
+            arg0='org.bluez.Device1',
+            path_keyword='path')
+
+        def disconnect_signals():
+            for device in self._devices.values():
+                device.invalidate()
+            self._properties_changed_signal.remove()
+            self._interface_added_signal.remove()
+
+        self._main_loop = GLib.MainLoop()
+        try:
+            self._main_loop.run()
+            disconnect_signals()
+        except Exception:
+            disconnect_signals()
+            raise
+
+
+class BtManager(Thread):
+    daemon = True
+
+    def run(self):
+        dm = GattBtManager(adapter_name='hci0')
+        for device in [device_con for device_con in dm.devices() if device_con.is_connected()]:
+            device.disconnect()
+        dm.start_discovery()
+        dm.run()
+
+
+class BTInterface(Interface):
+    connection_type = 'bluetooth'
+
+    def get_devices(self):
+        return bluetooth_devices.copy()
+
+
+bm = BtManager()
+bm.start()
diff --git a/addons/iot_drivers/iot_handlers/interfaces/camera_interface_L.py b/addons/iot_drivers/iot_handlers/interfaces/camera_interface_L.py
new file mode 100644
index 0000000000000..d8b9a03122999
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/interfaces/camera_interface_L.py
@@ -0,0 +1,24 @@
+from libcamera import CameraManager
+from pathlib import Path
+
+from odoo.addons.iot_drivers.interface import Interface
+
+
+class CameraInterface(Interface):
+    connection_type = 'video'
+
+    @staticmethod
+    def get_devices():
+        camera_devices = {}
+        video_devices = {p.stat().st_rdev: p.name for p in Path('/dev').glob('video*')}
+        for camera in CameraManager.singleton().cameras:
+            properties = {key.name: value for key, value in camera.properties.items()}
+            identifier = camera.id
+
+            camera_devices[identifier] = {
+                'name': properties['Model'],
+                'identifier': identifier,
+                'interface': f"/dev/{video_devices.get(properties['SystemDevices'][0])}",
+            }
+
+        return camera_devices
diff --git a/addons/iot_drivers/iot_handlers/interfaces/ctep_interface_L.py b/addons/iot_drivers/iot_handlers/interfaces/ctep_interface_L.py
new file mode 100644
index 0000000000000..dba4df9736b37
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/interfaces/ctep_interface_L.py
@@ -0,0 +1,61 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+import logging
+import subprocess
+
+from odoo.addons.iot_drivers.interface import Interface
+from odoo.addons.iot_drivers.tools import helpers
+from odoo.addons.iot_drivers.tools.system import path_file
+from odoo.addons.iot_drivers.iot_handlers.drivers.ctypes_terminal_driver import import_ctypes_library, create_ctypes_string_buffer
+
+
+_logger = logging.getLogger(__name__)
+
+
+# Check if the Worldline CTEP library exists, download it and set up the linker otherwise
+if not path_file('odoo/addons/iot_drivers/iot_handlers/drivers/ctep/libeasyctep.so').exists():
+    extract_path = path_file("odoo/addons/iot_drivers/iot_handlers/drivers/")
+    try:
+        helpers.download_from_url(
+            "https://download.odoo.com/master/posbox/iotbox/worldline-ctepv21_07.zip", extract_path / "ctep.zip"
+        )
+        helpers.unzip_file(extract_path / "ctep.zip", extract_path)
+
+        worldline_ctep_conf_path = "/etc/ld.so.conf.d/worldline-ctep.conf"
+        subprocess.run(
+            ["sudo", "tee", worldline_ctep_conf_path, f"/root_bypass_ramdisks{worldline_ctep_conf_path}"],
+            text=True,
+            input=str(extract_path / "ctep" / "lib"),
+            check=True,
+        )
+        subprocess.run(["sudo", "ldconfig"], check=True)
+        subprocess.run(["sudo", "cp", "/etc/ld.so.cache", "/root_bypass_ramdisks/etc/ld.so.cache"], check=True)
+
+    except subprocess.CalledProcessError:
+        _logger.exception("Failed to download and set up Worldline CTEP library")
+
+
+easyCTEP = import_ctypes_library('ctep', 'libeasyctep.so')
+
+# CTEPManager* createCTEPManager(void);
+easyCTEP.createCTEPManager.restype = ctypes.c_void_p
+# int connectedTerminal(CTEPManager* manager, char* terminal_id, std::shared_ptr<ect::CTEPTerminal> terminal)
+easyCTEP.connectedTerminal.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_void_p]
+
+
+class CTEPInterface(Interface):
+    _loop_delay = 10
+    connection_type = 'ctep'
+
+    def __init__(self):
+        super().__init__()
+        self.manager = easyCTEP.createCTEPManager()
+
+    def get_devices(self):
+        devices = {}
+        terminal_id = create_ctypes_string_buffer()
+        device = ctypes.c_void_p()
+        if easyCTEP.connectedTerminal(self.manager, terminal_id, ctypes.byref(device)):
+            devices[terminal_id.value.decode('utf-8')] = device
+        return devices
diff --git a/addons/iot_drivers/iot_handlers/interfaces/ctep_interface_W.py b/addons/iot_drivers/iot_handlers/interfaces/ctep_interface_W.py
new file mode 100644
index 0000000000000..17ceba707279c
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/interfaces/ctep_interface_W.py
@@ -0,0 +1,52 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+from pathlib import Path
+import os
+import logging
+
+from odoo.addons.iot_drivers.interface import Interface
+from odoo.addons.iot_drivers.tools.helpers import download_from_url, unzip_file
+from odoo.addons.iot_drivers.iot_handlers.drivers.ctypes_terminal_driver import (
+    import_ctypes_library,
+    create_ctypes_string_buffer
+)
+
+_logger = logging.getLogger(__name__)
+
+libPath = Path('odoo/addons/iot_drivers/iot_handlers/drivers')
+easyCTEPPath = libPath / 'ctep_w/libeasyctep.dll'
+zipPath = libPath / 'ctep_w.zip'
+
+if not easyCTEPPath.exists():
+    download_from_url('https://nightly.odoo.com/master/posbox/iotbox/worldline-ctepv23_02_w.zip', zipPath)
+    unzip_file(zipPath, libPath / 'ctep_w')
+
+# Add Worldline dll path so that the linker can find the required dll files
+os.environ['PATH'] = str(libPath / 'ctep_w') + os.pathsep + os.environ['PATH']
+easyCTEP = import_ctypes_library("ctep_w", "libeasyctep.dll")
+
+easyCTEP.createCTEPManager.restype = ctypes.c_void_p
+easyCTEP.connectedTerminal.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+
+
+class CTEPInterface(Interface):
+    _loop_delay = 10
+    connection_type = 'ctep'
+
+    def __init__(self):
+        super().__init__()
+        try:
+            self.manager = easyCTEP.createCTEPManager()
+        except OSError:
+            _logger.exception("Failed to initalize CTEPManager")
+
+    def get_devices(self):
+        devices = {}
+        terminal_id = create_ctypes_string_buffer()
+        try:
+            if self.manager and easyCTEP.connectedTerminal(self.manager, terminal_id):
+                devices[terminal_id.value.decode('utf-8')] = self.manager
+        except OSError:
+            _logger.exception("Failed to check if the Worldline terminal is connected")
+        return devices
diff --git a/addons/iot_drivers/iot_handlers/interfaces/tim_interface.py b/addons/iot_drivers/iot_handlers/interfaces/tim_interface.py
new file mode 100644
index 0000000000000..862bc399ff418
--- /dev/null
+++ b/addons/iot_drivers/iot_handlers/interfaces/tim_interface.py
@@ -0,0 +1,96 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import ctypes
+import os
+import logging
+from pathlib import Path
+import subprocess
+
+from odoo.addons.iot_drivers.interface import Interface
+from odoo.addons.iot_drivers.tools import helpers, system
+from odoo.addons.iot_drivers.tools.system import IS_WINDOWS
+from odoo.tools.misc import file_path
+from odoo.addons.iot_drivers.iot_handlers.drivers.ctypes_terminal_driver import import_ctypes_library
+
+
+_logger = logging.getLogger(__name__)
+
+LIB_PATH = file_path('iot_drivers/iot_handlers/drivers')
+DOWNLOAD_URL = 'https://nightly.odoo.com/master/posbox/iotbox/six-timapiv23_09_l.zip'
+
+# Download and unzip timapi library, overwriting the existing one
+TIMAPI_ZIP_PATH = Path(LIB_PATH, 'tim.zip')
+helpers.download_from_url(DOWNLOAD_URL, TIMAPI_ZIP_PATH)
+helpers.unzip_file(TIMAPI_ZIP_PATH, Path(LIB_PATH, 'tim'))
+
+# Make TIM SDK dependency libraries visible for the linker
+if IS_WINDOWS:
+    LIB_PATH = file_path('iot_drivers/iot_handlers/drivers')
+    os.environ['PATH'] = file_path('iot_drivers/iot_handlers/drivers/tim') + os.pathsep + os.environ['PATH']
+else:
+    TIMAPI_DEPENDANCY_LIB = 'libtimapi.so.3'
+    TIMAPI_DEPENDANCY_LIB_V = f'{TIMAPI_DEPENDANCY_LIB}.31.1-2272'
+    DEP_LIB_PATH = file_path('iot_drivers/iot_handlers/drivers/tim')
+    USR_LIB_PATH = '/usr/lib'
+    try:
+        subprocess.call([f'sudo cp {DEP_LIB_PATH}/{TIMAPI_DEPENDANCY_LIB_V} {USR_LIB_PATH}'], shell=True)
+        subprocess.call([f'sudo ln -fs {USR_LIB_PATH}/{TIMAPI_DEPENDANCY_LIB_V} {USR_LIB_PATH}/{TIMAPI_DEPENDANCY_LIB}'], shell=True)
+    except subprocess.CalledProcessError as e:
+        _logger.error("Failed to link the TIM SDK dependent library: %s", e.output)
+
+# Import Odoo Timapi Library
+LIB_NAME = 'libsix_odoo_w.dll' if IS_WINDOWS else 'libsix_odoo_l.so'
+TIMAPI = import_ctypes_library('tim', LIB_NAME)
+
+# --- Setup library prototypes ---
+# void *six_initialize_manager(void);
+TIMAPI.six_initialize_manager.restype = ctypes.c_void_p
+
+# int six_setup_terminal_settings(t_terminal_manager *terminal_manager, char *terminal_id);
+TIMAPI.six_setup_terminal_settings.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
+
+# int six_terminal_connected(t_terminal_manager *terminal_manager);
+TIMAPI.six_terminal_connected.argtypes = [ctypes.c_void_p]
+
+
+class TIMInterface(Interface):
+    _loop_delay = 30
+    connection_type = 'tim'
+
+    def __init__(self):
+        super().__init__()
+
+        try:
+            self.manager = TIMAPI.six_initialize_manager()
+        except OSError:
+            _logger.exception("Failed to initalize TIM manager")
+        if not self.manager:
+            _logger.error('Failed to allocate memory for TIM Manager')
+        self.tid = None
+
+    def get_devices(self):
+        if not self.manager:
+            return {}
+
+        new_tid = system.get_conf("six_payment_terminal")
+        devices = {}
+
+        # If the Six TID setup has changed, reset the settings
+        if new_tid != self.tid:
+            self.tid = new_tid
+            encoded_tid = new_tid.encode() if new_tid else None
+            try:
+                if not TIMAPI.six_setup_terminal_settings(self.manager, encoded_tid):
+                    return {}
+            except OSError:
+                _logger.exception("Failed to setup Six terminal settings")
+                return {}
+
+        # Check if the terminal is online and responsive
+        try:
+            if self.tid and TIMAPI.six_terminal_connected(self.manager):
+                devices[self.tid] = self.manager
+        except OSError:
+            _logger.exception("Failed to check if the Six terminal is connected")
+
+        return devices
diff --git a/addons/iot_drivers/main.py b/addons/iot_drivers/main.py
index 20572b1dbc188..6e7aa87c9ece7 100644
--- a/addons/iot_drivers/main.py
+++ b/addons/iot_drivers/main.py
@@ -121,6 +121,8 @@ def run(self):
         """Thread that will load interfaces and drivers and contact the odoo server
         with the updates. It will also reconnect to the Wi-Fi if the connection is lost.
         """
+        _logger.info("==== Starting Odoo IoT Box Service ====")
+
         if system.IS_RPI:
             # ensure that the root filesystem is writable retro compatibility (TODO: remove this in 19.0)
             subprocess.run(["sudo", "mount", "-o", "remount,rw", "/"], check=False)
@@ -141,10 +143,6 @@ def run(self):
         # the identifier of the Box is not found in the DB. So add the Box to the DB.
         self._send_all_devices()
         helpers.download_iot_handlers()
-        helpers.load_iot_handlers()
-
-        for interface in interfaces.values():
-            interface().start()
 
         # Set scheduled actions
         schedule.every().day.at("00:00").do(certificate.ensure_validity)
diff --git a/addons/iot_drivers/static/src/app/components/dialog/HandlerDialog.js b/addons/iot_drivers/static/src/app/components/dialog/HandlerDialog.js
index 63acb4ea74c0f..b1e88cbe7479a 100644
--- a/addons/iot_drivers/static/src/app/components/dialog/HandlerDialog.js
+++ b/addons/iot_drivers/static/src/app/components/dialog/HandlerDialog.js
@@ -57,6 +57,21 @@ export class HandlerDialog extends Component {
         }
     }
 
+    async enableCustomHandlers(value) {
+        this.state.waitRestart = !value;
+        try {
+            await this.store.rpc({
+                url: "/iot_drivers/enable_custom_handlers",
+                method: "POST",
+                params: {
+                    enable: value,
+                },
+            });
+        } catch {
+            console.warn("Error while enabling custom handlers");
+        }
+    }
+
     static template = xml`
     <t t-translation="off">
         <LoadingFullScreen t-if="this.state.waitRestart">
@@ -65,9 +80,9 @@ export class HandlerDialog extends Component {
             </t>
         </LoadingFullScreen>
 
-        <BootstrapDialog identifier="'handler-configuration'" btnName="'Log level'" onOpen.bind="getHandlerData" onClose.bind="onClose">
+        <BootstrapDialog identifier="'handler-configuration'" btnName="'Handlers Configuration'" onOpen.bind="getHandlerData" onClose.bind="onClose">
             <t t-set-slot="header">
-                Handler logging
+                Handlers Configuration
             </t>
             <t t-set-slot="body">
                 <div t-if="this.state.initialization" class="position-absolute top-0 start-0 bg-white h-100 w-100 justify-content-center align-items-center d-flex flex-column gap-3 always-on-top handler-loading">
@@ -77,6 +92,18 @@ export class HandlerDialog extends Component {
                     <p>Currently scanning for initialized drivers and interfaces...</p>
                 </div>
                 <t t-else="">
+                    <div class="mb-3">
+                        <h5>Custom Handlers</h5>
+                        <div class="form-check mb-3">
+                            <input name="custom-handler"
+                                id="custom-handlers"
+                                class="form-check-input cursor-pointer"
+                                type="checkbox"
+                                t-att-checked="this.state.handlerData.is_custom_handlers_enabled"
+                                t-on-change="(ev) => this.enableCustomHandlers(ev.target.checked)" />
+                            <label class="form-check-label cursor-pointer" for="custom-handlers">Download custom handlers from the database</label>
+                        </div>
+                    </div>
                     <div class="mb-3">
                         <h5>Global logs level</h5>
                         <div class="form-check mb-3">
diff --git a/addons/iot_drivers/static/src/app/components/dialog/UpdateDialog.js b/addons/iot_drivers/static/src/app/components/dialog/UpdateDialog.js
index 8a43fc6ffd978..92ba2cbc93b9e 100644
--- a/addons/iot_drivers/static/src/app/components/dialog/UpdateDialog.js
+++ b/addons/iot_drivers/static/src/app/components/dialog/UpdateDialog.js
@@ -63,17 +63,6 @@ export class UpdateDialog extends Component {
         }
     }
 
-    async forceUpdateIotHandlers() {
-        this.state.waitRestart = true;
-        try {
-            await this.store.rpc({
-                url: "/iot_drivers/load_iot_handlers",
-            });
-        } catch {
-            console.warn("Error while downloading handlers from db.");
-        }
-    }
-
     get everythingIsUpToDate() {
         return this.state.odooIsUpToDate && this.state.imageIsUpToDate;
     }
@@ -135,13 +124,6 @@ export class UpdateDialog extends Component {
                         </a>
                     </div>
                 </div>
-
-                <h6>Drivers Update</h6>
-                <div class="d-flex gap-2">
-                    <button class="btn btn-secondary btn-sm" t-on-click="forceUpdateIotHandlers">
-                        Force Drivers Update
-                    </button>
-                </div>
             </t>
             <t t-set-slot="footer">
                 <button 
diff --git a/addons/iot_drivers/tools/helpers.py b/addons/iot_drivers/tools/helpers.py
index 3317ce54dd6cf..0a4e0d5afe504 100644
--- a/addons/iot_drivers/tools/helpers.py
+++ b/addons/iot_drivers/tools/helpers.py
@@ -2,7 +2,6 @@
 
 from enum import Enum
 from functools import cache, wraps
-from importlib import util
 from ipaddress import ip_address
 import inspect
 import io
@@ -17,7 +16,7 @@
 import zipfile
 from werkzeug.exceptions import Locked
 
-from odoo import http, service
+from odoo import service
 from odoo.addons.iot_drivers.tools import system
 from odoo.addons.iot_drivers.tools.system import (
     IOT_IDENTIFIER,
@@ -26,8 +25,6 @@
     IOT_RPI_CHAR,
     IOT_WINDOWS_CHAR,
 )
-from odoo.tools.func import reset_cached_properties
-from odoo.tools.misc import file_path
 
 _logger = logging.getLogger(__name__)
 
@@ -136,20 +133,6 @@ def get_token():
     return system.get_conf('token')
 
 
-def delete_iot_handlers():
-    """Delete all drivers, interfaces and libs if any.
-    This is needed to avoid conflicts with the newly downloaded drivers.
-    """
-    try:
-        iot_handlers = Path(file_path('iot_drivers/iot_handlers'))
-        for file in iot_handlers.glob('**/*'):
-            if file.is_file():
-                file.unlink()
-        _logger.info("Deleted old IoT handlers")
-    except OSError:
-        _logger.exception('Failed to delete old IoT handlers')
-
-
 @toggleable
 @require_db
 def download_iot_handlers(auto=True, server_url=None):
@@ -160,6 +143,10 @@ def download_iot_handlers(auto=True, server_url=None):
     :param auto: If True, the download will depend on the parameter set in the database
     :param server_url: The URL of the connected Odoo database (provided by decorator).
     """
+    if not system.get_conf('custom_handlers'):
+        return
+
+    _logger.info('Custom handlers option enabled, downloading handlers from db')
     etag = system.get_conf('iot_handlers_etag')
     try:
         response = requests.post(
@@ -189,9 +176,9 @@ def download_iot_handlers(auto=True, server_url=None):
         _logger.exception('Bad IoT handlers response received: not a zip file')
         return
 
-    delete_iot_handlers()
     path = system.path_file('odoo', 'addons', 'iot_drivers', 'iot_handlers')
     zip_file.extractall(path)
+    odoo_restart(2)  # Restart Odoo to load the new handlers
 
 
 def compute_iot_handlers_addon_name(handler_kind, handler_file_name):
@@ -199,26 +186,6 @@ def compute_iot_handlers_addon_name(handler_kind, handler_file_name):
         format(handler_kind=handler_kind, handler_name=handler_file_name.removesuffix('.py'))
 
 
-def load_iot_handlers():
-    """
-    This method loads local files: 'odoo/addons/iot_drivers/iot_handlers/drivers' and
-    'odoo/addons/iot_drivers/iot_handlers/interfaces'
-    And execute these python drivers and interfaces
-    """
-    for directory in ['interfaces', 'drivers']:
-        path = file_path(f'iot_drivers/iot_handlers/{directory}')
-        filesList = get_handlers_files_to_load(path)
-        for file in filesList:
-            spec = util.spec_from_file_location(compute_iot_handlers_addon_name(directory, file), str(Path(path).joinpath(file)))
-            if spec:
-                module = util.module_from_spec(spec)
-                try:
-                    spec.loader.exec_module(module)
-                except Exception:
-                    _logger.exception('Unable to load handler file: %s', file)
-    reset_cached_properties(http.root)
-
-
 def get_handlers_files_to_load(handler_path):
     """
     Get all handler files that an IoT system should load in a list.

From a327bae21d5fdeed4b8e9f9a1c37ba85451c2279 Mon Sep 17 00:00:00 2001
From: "Didier (did)" <did@odoo.com>
Date: Thu, 13 Nov 2025 12:10:40 +0100
Subject: [PATCH 577/673] [REF] mail: move fetchChannelMembers to channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#235481

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/core/common/thread_model.js    |  2 --
 .../core/common/discuss_channel_model.js      | 24 +++++++++++++++++++
 .../discuss/core/common/thread_model_patch.js | 22 -----------------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/addons/mail/static/src/core/common/thread_model.js b/addons/mail/static/src/core/common/thread_model.js
index 3a46c38661259..27149a7fdb6b2 100644
--- a/addons/mail/static/src/core/common/thread_model.js
+++ b/addons/mail/static/src/core/common/thread_model.js
@@ -229,8 +229,6 @@ export class Thread extends Record {
             this.onPinStateUpdated();
         },
     });
-    /** @type {"not_fetched"|"pending"|"fetched"} */
-    fetchMembersState = "not_fetched";
     /** @type {integer|null} */
     highlightMessage = fields.One("mail.message");
     /** @type {String|undefined} */
diff --git a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
index 7c7801ee1e5eb..a921cdaf87a7c 100644
--- a/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
+++ b/addons/mail/static/src/discuss/core/common/discuss_channel_model.js
@@ -1,5 +1,6 @@
 import { fields, Record } from "@mail/model/export";
 import { Deferred } from "@web/core/utils/concurrency";
+import { rpc } from "@web/core/network/rpc";
 
 export class DiscussChannel extends Record {
     static _name = "discuss.channel";
@@ -55,6 +56,8 @@ export class DiscussChannel extends Record {
     chatWindow = fields.One("ChatWindow", {
         inverse: "channel",
     });
+    /** @type {"not_fetched"|"pending"|"fetched"} */
+    fetchMembersState = "not_fetched";
     hasOtherMembersTyping = fields.Attr(false, {
         /** @this {import("models").Thread} */
         compute() {
@@ -99,6 +102,27 @@ export class DiscussChannel extends Record {
         super.delete(...arguments);
     }
 
+    async fetchChannelMembers() {
+        if (this.fetchMembersState === "pending") {
+            return;
+        }
+        const previousState = this.fetchMembersState;
+        this.fetchMembersState = "pending";
+        const known_member_ids = this.channel_member_ids.map((channelMember) => channelMember.id);
+        let data;
+        try {
+            data = await rpc("/discuss/channel/members", {
+                channel_id: this.id,
+                known_member_ids: known_member_ids,
+            });
+        } catch (e) {
+            this.fetchMembersState = previousState;
+            throw e;
+        }
+        this.fetchMembersState = "fetched";
+        this.store.insert(data);
+    }
+
     /**
      * @returns {boolean} true if the channel was opened, false otherwise
      */
diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index 62624d4d6845a..a993d307fe3c0 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -254,28 +254,6 @@ const threadPatch = {
         }
         return super.displayName;
     },
-    async fetchChannelMembers() {
-        if (this.fetchMembersState === "pending") {
-            return;
-        }
-        const previousState = this.fetchMembersState;
-        this.fetchMembersState = "pending";
-        const known_member_ids = this.channel.channel_member_ids.map(
-            (channelMember) => channelMember.id
-        );
-        let data;
-        try {
-            data = await rpc("/discuss/channel/members", {
-                channel_id: this.id,
-                known_member_ids: known_member_ids,
-            });
-        } catch (e) {
-            this.fetchMembersState = previousState;
-            throw e;
-        }
-        this.fetchMembersState = "fetched";
-        this.store.insert(data);
-    },
     async fetchMoreAttachments(limit = 30) {
         if (this.isLoadingAttachments || this.areAttachmentsLoaded) {
             return;

From 2ca9bc240151ae46e73ad25b0b2ceac616bcc761 Mon Sep 17 00:00:00 2001
From: Adam Heinz <adam.heinz@metricwise.com>
Date: Tue, 28 Oct 2025 09:00:54 -0400
Subject: [PATCH 578/673] [IMP] mail: return thread instead of thread_id in
 message_process

Up until [1] the way to retrieve the model corresponding to the id
returned by `message_process` was by checking the `thread_model` key
in the context after calling it.

Since then there hasn't been a way to know where a message was posted
as part of processing after calling `message_process` programatically.

We can instead return the recordset so that the model can be known in python.
This effectively does not change RPC results since recordsets are converted
to numbers either way.

[1]: 4b122ad41d873febe288ab1f8c6cdc078ca2a479

closes odoo/odoo#233819

Related: odoo/enterprise#98531
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/crm/tests/test_crm_lead_notification.py      |  7 ++-----
 .../tests/test_recruitment_process.py               |  3 +--
 addons/mail/models/mail_thread.py                   |  7 +++----
 addons/project/tests/test_project_mail_features.py  | 13 +++----------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/addons/crm/tests/test_crm_lead_notification.py b/addons/crm/tests/test_crm_lead_notification.py
index b6d7a725c5303..ac73d46717732 100644
--- a/addons/crm/tests/test_crm_lead_notification.py
+++ b/addons/crm/tests/test_crm_lead_notification.py
@@ -367,11 +367,8 @@ def test_new_lead_from_email_multicompany(self):
 
 --000000000000a47519057e029630--
 """
-        crm_lead0_id = self.env['mail.thread'].message_process('crm.lead', new_message0)
-        crm_lead1_id = self.env['mail.thread'].message_process('crm.lead', new_message1)
-
-        crm_lead0 = self.env['crm.lead'].browse(crm_lead0_id)
-        crm_lead1 = self.env['crm.lead'].browse(crm_lead1_id)
+        crm_lead0 = self.env['mail.thread'].message_process('crm.lead', new_message0)
+        crm_lead1 = self.env['mail.thread'].message_process('crm.lead', new_message1)
 
         self.assertEqual(crm_lead0.team_id, crm_team0)
         self.assertEqual(crm_lead1.team_id, crm_team1)
diff --git a/addons/hr_recruitment/tests/test_recruitment_process.py b/addons/hr_recruitment/tests/test_recruitment_process.py
index c6e06a5e1a390..0f01f5faddf95 100644
--- a/addons/hr_recruitment/tests/test_recruitment_process.py
+++ b/addons/hr_recruitment/tests/test_recruitment_process.py
@@ -184,8 +184,7 @@ def test_email_application_department_with_no_company(self):
 
 I want to work for you!"""
 
-        applicant_from_email = self.env["mail.thread"].message_process("hr.applicant", email)
-        applicant = self.env["hr.applicant"].browse(applicant_from_email)
+        applicant = self.env["mail.thread"].message_process("hr.applicant", email)
         self.assertEqual(
             applicant.department_id, mystery_department, "Applicant should be assigned to the right department"
         )
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 70bdece51b1ab..edbe473e65938 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1344,7 +1344,7 @@ def _message_route_process(self, message, message_dict, routes):
         self = self.with_context(attachments_mime_plainxml=True) # import XML attachments as text
         # postpone setting message_dict.partner_ids after message_post, to avoid double notifications
         original_partner_ids = message_dict.pop('partner_ids', [])
-        thread_id = False
+        thread = self.browse()
         for model, thread_id, custom_values, user_id, alias in routes or ():
             subtype_id = False
             related_user = self.env['res.users'].browse(user_id)
@@ -1428,7 +1428,7 @@ def _message_route_process(self, message, message_dict, routes):
                 # postponed after message_post, because this is an external message and we don't want to create
                 # duplicate emails due to notifications
                 new_msg.write({'partner_ids': original_partner_ids})
-        return thread_id
+        return thread.with_env(self.env)
 
     @api.model
     def message_process(self, model, message, custom_values=None,
@@ -1496,8 +1496,7 @@ def message_process(self, model, message, custom_values=None,
         msg_dict.update(**self._message_parse_post_process(message, msg_dict, routes))
 
         # process routes
-        thread_id = self._message_route_process(message, msg_dict, routes)
-        return thread_id
+        return self._message_route_process(message, msg_dict, routes)
 
     @api.model
     def message_new(self, msg_dict, custom_values=None):
diff --git a/addons/project/tests/test_project_mail_features.py b/addons/project/tests/test_project_mail_features.py
index fca98ad31ccb9..9f16984102c82 100644
--- a/addons/project/tests/test_project_mail_features.py
+++ b/addons/project/tests/test_project_mail_features.py
@@ -644,30 +644,24 @@ def test_task_creation_removes_email_signatures(self):
 """
 
         with self.mock_mail_gateway():
-            gmail_task_id = self.env['mail.thread'].message_process(
+            gmail_task = self.env['mail.thread'].message_process(
                 model='project.task',
                 message=gmail_email_source,
                 custom_values={'project_id': self.project_followers.id}
             )
-            outlook_task_id = self.env['mail.thread'].message_process(
+            outlook_task = self.env['mail.thread'].message_process(
                 model='project.task',
                 message=outlook_email_source,
                 custom_values={'project_id': self.project_followers.id}
             )
 
         # Verify Gmail signature removal
-        self.assertTrue(gmail_task_id, "Gmail task creation should return a valid ID.")
-        gmail_task = self.env['project.task'].browse(gmail_task_id)
-
         self.assertIn("This is the main email content that should be kept", gmail_task.description)
         self.assertNotIn("--", gmail_task.description, "The Gmail signature separator should have been removed.")
         self.assertNotIn("John Doe", gmail_task.description, "The Gmail signature should have been removed.")
         self.assertNotIn("Software Engineer", gmail_task.description, "The Gmail signature should have been removed.")
 
         # Verify Outlook signature removal
-        self.assertTrue(outlook_task_id, "Outlook task creation should return a valid ID.")
-        outlook_task = self.env['project.task'].browse(outlook_task_id)
-
         self.assertIn("This is the main email content that should be kept", outlook_task.description)
         self.assertNotIn("John Smith", outlook_task.description, "The Outlook signature should have been removed.")
         self.assertNotIn("Software Developer", outlook_task.description, "The Outlook signature should have been removed.")
@@ -685,7 +679,7 @@ def test_task_creation_from_mail(self):
             'user': 'test@example.com',
             'password': '',
         })
-        task_id = self.env["mail.thread"].with_context(
+        task = self.env["mail.thread"].with_context(
             default_fetchmail_server_id=server.id
         ).message_process(
             server.object_id.model,
@@ -699,6 +693,5 @@ def test_task_creation_from_mail(self):
             save_original=server.original,
             strip_attachments=not server.attach,
         )
-        task = self.env['project.task'].browse(task_id)
         self.assertEqual(task.name, "In a cage")
         self.assertEqual(task.project_id, self.project_pigs)

From 5268785fb9ecaa0a9de00325254565b7d8704df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Mattiello?= <mcm@odoo.com>
Date: Tue, 30 Sep 2025 10:45:56 +0200
Subject: [PATCH 579/673] [IMP] hr_skills: replace TagsList by t-foreach

This commit replaces the use of component TagsList by t-foreach and tag
component. TagsList will soon not render tags anymore.

task-4660360

Part-of: odoo/odoo#229011
Related: odoo/enterprise#95758
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
---
 .../fields/one2many_tags_skills/one2many_tags_skills.js   | 8 +++-----
 .../fields/one2many_tags_skills/one2many_tags_skills.xml  | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.js b/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.js
index b394f33ce7178..cd8c148dd62fa 100644
--- a/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.js
+++ b/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.js
@@ -2,12 +2,12 @@ import { _t } from "@web/core/l10n/translation";
 import { X2ManyField, x2ManyField } from "@web/views/fields/x2many/x2many_field";
 import { useX2ManyCrud, useOpenX2ManyRecord } from "@web/views/fields/relational_utils";
 import { registry } from "@web/core/registry";
-import { TagsList } from "@web/core/tags_list/tags_list";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
 
 export class One2ManyTagsSkillsField extends X2ManyField {
     static components = {
         ...X2ManyField.components,
-        TagsList,
+        BadgeTag,
     };
     static template = "hr_recruitment_skills.One2ManyTagsSkillsField";
 
@@ -34,10 +34,8 @@ export class One2ManyTagsSkillsField extends X2ManyField {
     getTagProps(record) {
         const tagProps = {
             id: record.id,
-            resId: record.resId,
             text: record.data.display_name,
-            colorIndex: record.data.color,
-            canEdit: true,
+            color: record.data.color,
             onClick: (ev) => this.onTagClick(ev, record),
             onDelete: !this.props.readonly ? () => this.activeActions.onDelete(record) : undefined,
         };
diff --git a/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.xml b/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.xml
index ba9e040e5eb61..91bd73cd53696 100644
--- a/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.xml
+++ b/addons/hr_skills/static/src/fields/one2many_tags_skills/one2many_tags_skills.xml
@@ -5,7 +5,9 @@
         <div class="d-flex align-items-baseline"
             t-attf-class="{{ tags.length &amp;&amp; 'gap-1'}}">
             <div class=" d-inline-flex flex-wrap gap-1 mw-100">
-                <TagsList tags="tags" />
+                <t t-foreach="this.tags" t-as="tag" t-key="tag.id">
+                    <BadgeTag color="tag.color" text="tag.text" onClick="tag.onClick" onDelete="tag.onDelete"/>
+                </t>
             </div>
             <button t-on-click="onAdd"
                 class="btn btn-link text-action"

From 58e9fbf651473dc39214d7faabdfb06606ce92d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Mattiello?= <mcm@odoo.com>
Date: Mon, 29 Sep 2025 11:21:20 +0200
Subject: [PATCH 580/673] [IMP] web,*: reduce TagsList overrides

* account,calendar,hr,hr_skills,hr_work_entry,mail,resource_mail

This commit adds a slot to the component TagsList and removes the tag
part of its template so the component does not render tags anymore.
M2m tags fields needed to be updated to support this change. The change
allows these field to define their tag more easily.

task-4660360

closes odoo/odoo#229011

Related: odoo/enterprise#95758
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
---
 .../many2many_tags_banks.js                   |  14 +-
 .../many2many_tags_banks.xml                  |  13 +-
 .../src/views/fields/attendee_tags_list.js    |   5 -
 .../src/views/fields/attendee_tags_list.xml   |  31 ---
 .../src/views/fields/many2many_attendee.js    |  73 ++++---
 ...tags_list.scss => many2many_attendee.scss} |   0
 .../src/views/fields/many2many_attendee.xml   |  21 ++
 .../fields/many2many_attendee_expandable.js   |   4 +
 .../fields/many2many_attendee_expandable.xml  |   9 +-
 .../many2many_tags_salary_bank.js             |  13 +-
 .../avatar_card_resource_popover.xml          |   4 +-
 .../avatar_card_resource_popover_patch.js     |   9 +-
 .../hr_skills_tags_list.js                    |  10 -
 .../hr_skills_tags_list.xml                   |  14 --
 .../many2many_tags_skills.js                  |  11 +-
 .../many2many_tags_skills.xml                 |  10 +
 .../many2many_avatar_employee_error_field.js  |  11 +-
 .../many2many_avatar_employee_error_field.xml |  12 +-
 .../mail/static/src/core/web/recipient_tag.js |  75 ++++++++
 .../static/src/core/web/recipient_tag.xml     |   5 +
 .../static/src/core/web/recipients_input.js   |  50 ++---
 .../static/src/core/web/recipients_input.xml  |   4 +-
 .../core/web/recipients_input_tags_list.js    |  62 ------
 .../core/web/recipients_input_tags_list.xml   |   7 -
 .../many2many_avatar_user_field.js            |  33 ++--
 .../many2many_avatar_user_field.xml           |  21 --
 .../many2many_tags_email.js                   |  56 ++----
 .../many2many_tags_email.xml                  |  16 --
 .../web/fields/many2many_tags_email.test.js   |   4 +-
 .../many2many_avatar_resource_field.js        |  37 ++--
 .../many2many_avatar_resource_field.xml       |  36 ++--
 .../static/src/core/tags_list/tags_list.js    |  43 ++---
 .../static/src/core/tags_list/tags_list.xml   |  64 +------
 .../kanban_many2many_tags_field.js            |   8 +-
 .../kanban_many2many_tags_field.xml           |   4 +-
 .../many2many_tags/many2many_tags_field.js    |  27 ++-
 .../many2many_tags/many2many_tags_field.xml   |   4 +-
 .../many2many_tags_avatar_field.js            |  80 ++++----
 .../many2many_tags_avatar_field.xml           |  23 +--
 .../web/static/tests/core/tags_list.test.js   | 181 ++----------------
 .../many2many_tags_avatar_field.test.js       |   3 +-
 41 files changed, 412 insertions(+), 695 deletions(-)
 delete mode 100644 addons/calendar/static/src/views/fields/attendee_tags_list.js
 delete mode 100644 addons/calendar/static/src/views/fields/attendee_tags_list.xml
 rename addons/calendar/static/src/views/fields/{attendee_tags_list.scss => many2many_attendee.scss} (100%)
 delete mode 100644 addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.js
 delete mode 100644 addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.xml
 create mode 100644 addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.xml
 create mode 100644 addons/mail/static/src/core/web/recipient_tag.js
 create mode 100644 addons/mail/static/src/core/web/recipient_tag.xml
 delete mode 100644 addons/mail/static/src/core/web/recipients_input_tags_list.js
 delete mode 100644 addons/mail/static/src/core/web/recipients_input_tags_list.xml

diff --git a/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.js b/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.js
index c9530d7fac7a7..687d2572568f8 100644
--- a/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.js
+++ b/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.js
@@ -4,19 +4,21 @@ import {
 } from "@web/views/fields/many2many_tags/many2many_tags_field";
 import { useService } from "@web/core/utils/hooks";
 import { registry } from "@web/core/registry";
-import { TagsList } from "@web/core/tags_list/tags_list";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
 import { _t } from "@web/core/l10n/translation";
-import { onMounted } from "@odoo/owl";
+import { Component, onMounted } from "@odoo/owl";
 
-export class FieldMany2ManyTagsBanksTagsList extends TagsList {
-    static template = "FieldMany2ManyTagsBanksTagsList";
+class BankTag extends Component {
+    static template = "account.BankTag";
+    static components = { BadgeTag };
+    static props = ["allowOutPayment?", "color", "onClick", "onDelete" , "text"];
 }
 
 export class FieldMany2ManyTagsBanks extends Many2ManyTagsFieldColorEditable {
     static template = "account.FieldMany2ManyTagsBanks";
     static components = {
-        ...FieldMany2ManyTagsBanks.components,
-        TagsList: FieldMany2ManyTagsBanksTagsList,
+        ...super.components,
+        Tag: BankTag,
     };
 
     setup() {
diff --git a/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml b/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml
index 6c51d4343bb62..0c5fcebf50d5d 100644
--- a/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml
+++ b/addons/account/static/src/components/many2many_tags_banks/many2many_tags_banks.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="FieldMany2ManyTagsBanksTagsList" t-inherit="web.TagsList" t-inherit-mode="primary">
-        <xpath expr="//div[hasclass('o_tag_badge_text')]" position="before">
-            <span class="me-1">
-                <i t-if="tag.allowOutPayment" class="fa fa-shield text-success" data-tooltip="Trusted"/>
-                <i t-else="" class="fa fa-exclamation-circle text-danger" data-tooltip="Untrusted"/>
-            </span>
-        </xpath>
+    <t t-name="account.BankTag">
+        <BadgeTag color="this.props.color" onClick="this.props.onClick" onDelete="this.props.onDelete">
+            <i t-if="this.props.allowOutPayment" class="fa fa-shield text-success" data-tooltip="Trusted"/>
+            <i t-else="" class="fa fa-exclamation-circle text-danger" data-tooltip="Untrusted"/>
+            <div class="o_tag_badge_text" t-out="this.props.text"/>
+        </BadgeTag>
     </t>
 
     <t t-name="account.FieldMany2ManyTagsBanks" t-inherit="web.Many2ManyTagsField" t-inherit-mode="primary">
diff --git a/addons/calendar/static/src/views/fields/attendee_tags_list.js b/addons/calendar/static/src/views/fields/attendee_tags_list.js
deleted file mode 100644
index b298031d2e565..0000000000000
--- a/addons/calendar/static/src/views/fields/attendee_tags_list.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { TagsList } from "@web/core/tags_list/tags_list";
-
-export class AttendeeTagsList extends TagsList {
-    static template = "calendar.AttendeeTagsList";
-}
diff --git a/addons/calendar/static/src/views/fields/attendee_tags_list.xml b/addons/calendar/static/src/views/fields/attendee_tags_list.xml
deleted file mode 100644
index 5fe3053876982..0000000000000
--- a/addons/calendar/static/src/views/fields/attendee_tags_list.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-    <t t-name="calendar.AttendeeTagsList" t-inherit="web.TagsList" t-inherit-mode="primary">
-        <xpath expr="//span[hasclass('o_avatar_backdrop')]" position="attributes">
-            <attribute name="class" remove="opacity-100-hover" separator=" "/>
-        </xpath>
-
-        <xpath expr="//img[hasclass('o_m2m_avatar')]" position="replace">
-            <div class="o_attendee_tags_list">
-                <img t-if="tag.img"
-                    t-att-src="tag.img"
-                    class="o_avatar o_m2m_avatar position-relative rounded"
-                    t-att-class="tag.imageClass"/>
-                <div t-if="tag.status &amp;&amp; tag.statusIcon" t-attf-class="attendee_tag_status o_attendee_status_{{tag.status}} fa fa-fw {{tag.statusIcon}} rounded-circle"/>
-            </div>
-        </xpath>
-
-        <xpath expr="//div[hasclass('o_tag_badge_text')]" position="after">
-            <div t-if="tag.isUnavailable" title="unavailable" class="ms-1">
-                <i class="fa fa-moon-o position-relative" role="img"/>
-            </div>
-            <div t-if="tag.noEmail" title="no email" class="ms-1">
-                <i class="fa fa-exclamation-triangle position-relative" role="img"/>
-            </div>
-        </xpath>
-
-        <xpath expr="//span[hasclass('o_m2m_avatar_empty')]" position="attributes">
-            <attribute name="class" remove="text-center" separator=" "/>
-        </xpath>
-    </t>
-</templates>
diff --git a/addons/calendar/static/src/views/fields/many2many_attendee.js b/addons/calendar/static/src/views/fields/many2many_attendee.js
index 3a55606cc8082..cba6e623b344a 100644
--- a/addons/calendar/static/src/views/fields/many2many_attendee.js
+++ b/addons/calendar/static/src/views/fields/many2many_attendee.js
@@ -1,10 +1,10 @@
+import { Component } from "@odoo/owl";
 import { registry } from "@web/core/registry";
 import {
     Many2ManyTagsAvatarField,
     many2ManyTagsAvatarField,
 } from "@web/views/fields/many2many_tags_avatar/many2many_tags_avatar_field";
 import { useSpecialData } from "@web/views/fields/relational_utils";
-import { AttendeeTagsList } from "@calendar/views/fields/attendee_tags_list";
 import { ConnectionLostError } from "@web/core/network/rpc";
 
 const ICON_BY_STATUS = {
@@ -12,11 +12,21 @@ const ICON_BY_STATUS = {
     declined: "fa-times",
     tentative: "fa-question",
 };
+
+export class AttendeeTag extends Component {
+    static template = "calendar.AttendeeTag";
+    static props = ["imageUrl", "isUnavailable?", "noEmail?", "onDelete?", "status?", "text", "tooltip"];
+
+    get statusIcon() {
+        return ICON_BY_STATUS[this.props.status];
+    }
+}
+
 export class Many2ManyAttendee extends Many2ManyTagsAvatarField {
     static template = "calendar.Many2ManyAttendee";
     static components = {
-        ...Many2ManyAttendee.components,
-        TagsList: AttendeeTagsList,
+        ...super.components,
+        Tag: AttendeeTag,
     };
     setup() {
         super.setup();
@@ -40,37 +50,46 @@ export class Many2ManyAttendee extends Many2ManyTagsAvatarField {
         });
     }
 
-    get tags() {
-        const partnerIds = this.specialData.data;
+    getTagProps(record) {
+        const tag = super.getTagProps(record);
+        const result = {
+            text: tag.text,
+            tooltip: tag.tooltip,
+            imageUrl: tag.imageUrl,
+            onDelete: tag.onDelete,
+        };
+
+        const partner = this.specialData.data.find((partner) => record.resId === partner.id);
+        if (partner) {
+            result.status = partner.status;
+        }
+
         const noEmailPartnerIds = this.props.record.data.invalid_email_partner_ids
             ? this.props.record.data.invalid_email_partner_ids.records
             : [];
+        const noEmail = noEmailPartnerIds.find(
+            (noEmailPartner) => record.resId == noEmailPartner.resId
+        );
+        if (noEmail) {
+            result.noEmail = true;
+        }
+
         const unavailablePartnerIds = this.props.record.data.unavailable_partner_ids
             ? this.props.record.data.unavailable_partner_ids.records
             : [];
-        const tags = super.tags.map((tag) => {
-            const partner = partnerIds.find((partner) => tag.resId === partner.id);
-            const noEmail = noEmailPartnerIds.find(
-                (noEmailPartner) => tag.resId == noEmailPartner.resId
-            );
-            if (partner) {
-                tag.status = partner.status;
-                tag.statusIcon = ICON_BY_STATUS[partner.status];
-            }
-            if (noEmail) {
-                tag.noEmail = true;
-            }
-            if (
-                unavailablePartnerIds.find(
-                    (unavailablePartner) => tag.resId == unavailablePartner.resId
-                )
-            ) {
-                tag.isUnavailable = true;
-            }
-            return tag;
-        });
+        if (
+            unavailablePartnerIds.find(
+                (unavailablePartner) => record.resId == unavailablePartner.resId
+            )
+        ) {
+            result.isUnavailable = true;
+        }
+        return result;
+    }
 
-        const organizer = partnerIds.find((partner) => partner.is_organizer);
+    get tags() {
+        const tags = super.tags;
+        const organizer = this.specialData.data.find((partner) => partner.is_organizer);
         if (organizer) {
             const orgId = organizer.id;
             // sort elements according to the partner id
diff --git a/addons/calendar/static/src/views/fields/attendee_tags_list.scss b/addons/calendar/static/src/views/fields/many2many_attendee.scss
similarity index 100%
rename from addons/calendar/static/src/views/fields/attendee_tags_list.scss
rename to addons/calendar/static/src/views/fields/many2many_attendee.scss
diff --git a/addons/calendar/static/src/views/fields/many2many_attendee.xml b/addons/calendar/static/src/views/fields/many2many_attendee.xml
index b8ccac2948580..01a113cfd0898 100644
--- a/addons/calendar/static/src/views/fields/many2many_attendee.xml
+++ b/addons/calendar/static/src/views/fields/many2many_attendee.xml
@@ -8,4 +8,25 @@
             <attribute name="placeholder">props.placeholder</attribute>
         </xpath>
     </t>
+
+    <t t-name="calendar.AttendeeTag">
+        <span class="o_tag position-relative d-inline-flex align-items-center user-select-none mw-100 opacity-trigger-hover" tabindex="-1" t-att-data-tooltip="this.props.tooltip" t-att-aria-label="this.props.tooltip">
+            <div class="o_attendee_tags_list">
+                <img class="o_avatar o_m2m_avatar position-relative rounded" t-att-src="this.props.imageUrl"/>
+                <div t-if="this.statusIcon" class="attendee_tag_status fa fa-fw rounded-circle" t-att-class="this.statusIcon" t-attf-class="o_attendee_status_{{this.props.status}}"/>
+            </div>
+            <div class="o_tag_badge_text position-relative ms-1" t-out="this.props.text"/>
+            <div t-if="this.props.isUnavailable" data-tooltip="unavailable" class="ms-1">
+                <i class="fa fa-moon-o position-relative" role="img"/>
+            </div>
+            <div t-if="this.props.noEmail" data-tooltip="no email" class="ms-1">
+                <i class="fa fa-exclamation-triangle position-relative" role="img"/>
+            </div>
+            <t t-if="this.props.onDelete">
+                <a class="o_delete d-flex align-items-center opacity-100-hover btn btn-link position-relative py-0 px-1 text-danger opacity-0" href="#" tabindex="0" aria-label="Delete" data-tooltip="Delete" t-on-click.stop.prevent="() => this.props.onDelete()">
+                    <i class="oi oi-close align-text-top"/>
+                </a>
+            </t>
+        </span>
+    </t>
 </templates>
diff --git a/addons/calendar/static/src/views/fields/many2many_attendee_expandable.js b/addons/calendar/static/src/views/fields/many2many_attendee_expandable.js
index 656f247442247..11c35d3c1935d 100644
--- a/addons/calendar/static/src/views/fields/many2many_attendee_expandable.js
+++ b/addons/calendar/static/src/views/fields/many2many_attendee_expandable.js
@@ -30,6 +30,10 @@ export class Many2ManyAttendeeExpandable extends Many2ManyAttendee {
         }
     }
 
+    get visibleItemsLimit() {
+        return this.state.expanded ? Number.POSITIVE_INFINITY : 5;
+    }
+
     onExpanderClick() {
         this.state.expanded = !this.state.expanded;
     }
diff --git a/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml b/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml
index 3a75f149770f9..523de1b82cf43 100644
--- a/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml
+++ b/addons/calendar/static/src/views/fields/many2many_attendee_expandable.xml
@@ -3,13 +3,10 @@
 
     <t t-name="calendar.Many2ManyAttendeeExpandable" t-inherit="web.Many2ManyTagsAvatarField" t-inherit-mode="primary">
         <xpath expr="//div[hasclass('many2many_tags_avatar_field_container')]" position="attributes">
-            <attribute name="class" remove="mw-100" add="w-100" separator=" "/>
-        </xpath>
-        <xpath expr="//TagsList" position="attributes">
-            <attribute name="visibleItemsLimit">state.expanded ? tags.length : 5</attribute>
+            <attribute name="class" remove="mw-100" add="w-100 align-items-start" separator=" "/>
         </xpath>
         <xpath expr="//TagsList" position="before">
-            <t t-if="tags.length > 5">
+            <t t-if="tags.length gt 5">
                 <div class="d-flex w-100">
                     <div class="flex-grow-1">
                         <strong><t t-out="attendeesCount"/> attendees</strong>
@@ -22,7 +19,7 @@
             </t>
         </xpath>
         <xpath expr="//TagsList" position="replace">
-            <t t-if="!state.expanded &amp;&amp; tags.length > 10"> </t>
+            <t t-if="!state.expanded and tags.length > 10"> </t>
             <t t-else="">$0</t>
         </xpath>
     </t>
diff --git a/addons/hr/static/src/components/many2many_tags_salary_bank/many2many_tags_salary_bank.js b/addons/hr/static/src/components/many2many_tags_salary_bank/many2many_tags_salary_bank.js
index 5dad90a7f5c8e..d7131626a1f4c 100644
--- a/addons/hr/static/src/components/many2many_tags_salary_bank/many2many_tags_salary_bank.js
+++ b/addons/hr/static/src/components/many2many_tags_salary_bank/many2many_tags_salary_bank.js
@@ -3,20 +3,9 @@ import {
     Many2ManyTagsFieldColorEditable,
 } from "@web/views/fields/many2many_tags/many2many_tags_field";
 import { registry } from "@web/core/registry";
-import { TagsList } from "@web/core/tags_list/tags_list";
 import { useService } from "@web/core/utils/hooks";
 
-export class FieldMany2ManyTagsSalaryBankTagsList extends TagsList {
-    static template = "web.TagsList";
-}
-
 export class FieldMany2ManyTagsSalaryBank extends Many2ManyTagsFieldColorEditable {
-    static template = "web.Many2ManyTagsField";
-    static components = {
-        ...Many2ManyTagsFieldColorEditable.components,
-        TagsList: FieldMany2ManyTagsSalaryBankTagsList,
-    };
-
     setup() {
         super.setup();
         this.actionService = useService("action");
@@ -33,7 +22,7 @@ export class FieldMany2ManyTagsSalaryBank extends Many2ManyTagsFieldColorEditabl
     }
 
     getTagProps(record) {
-        var text = record.data?.display_name;
+        var text = record.data?.display_name || "";
         const amount = record.data?.employee_salary_amount;
         const has_multiple_bank_accounts = this.props.record.data["has_multiple_bank_accounts"];
         if (has_multiple_bank_accounts && amount) {
diff --git a/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover.xml b/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover.xml
index 38b41da3fe7f2..7fefdd09e9f55 100644
--- a/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover.xml
+++ b/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover.xml
@@ -5,7 +5,9 @@
             <div t-if="skills?.length">
                 <span class="fw-bold">Skills</span>
                 <div class="d-flex flex-wrap gap-1 o_employee_skills_tags mt-1 overflow-hidden">
-                    <TagsList tags="skillTags" visibleItemsLimit="5"/>
+                    <TagsList tags="skillTags" visibleItemsLimit="5" t-slot-scope="tag">
+                        <SkillTag text="tag.text" color="tag.color"/>
+                    </TagsList>
                 </div>
             </div>
         </xpath>
diff --git a/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover_patch.js b/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover_patch.js
index ae4f09d569826..0aca9fa0c1f31 100644
--- a/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover_patch.js
+++ b/addons/hr_skills/static/src/components/avatar_card_resource/avatar_card_resource_popover_patch.js
@@ -1,4 +1,5 @@
 import { patch } from "@web/core/utils/patch";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
 import { AvatarCardResourcePopover } from "@resource_mail/components/avatar_card_resource/avatar_card_resource_popover";
 
 
@@ -30,9 +31,15 @@ export const patchAvatarCardResourcePopover = {
         return this.skills.map(({ id, display_name, color }) => ({
             id,
             text: display_name,
-            colorIndex: color,
+            color,
         }));
     },
 };
 
 export const unpatchAvatarCardResourcePopover = patch(AvatarCardResourcePopover.prototype, patchAvatarCardResourcePopover);
+patch(AvatarCardResourcePopover, {
+    components: {
+        ...AvatarCardResourcePopover.components,
+        SkillTag: BadgeTag,
+    },
+});
diff --git a/addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.js b/addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.js
deleted file mode 100644
index a93d95feea05a..0000000000000
--- a/addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { TagsList } from "@web/core/tags_list/tags_list";
-
-
-export class SkillsTagList extends TagsList {
-    static template = "hr_skills.SkillsTagsList";
-
-    getTextStyle(tag) {
-        return tag.defaultLevel
-    }
-}
diff --git a/addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.xml b/addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.xml
deleted file mode 100644
index aadf9727efe0d..0000000000000
--- a/addons/hr_skills/static/src/fields/hr_skills_tags_list/hr_skills_tags_list.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-
-    <t t-name="hr_skills.SkillsTagsList" t-inherit="web.TagsList">
-        <xpath expr='//span[hasclass("o_tag")]' position="attributes">
-            <attribute name="t-attf-class" add="{{ getTextStyle(tag) ? 'border border-2' : '' }}" separator=" "/>
-            <attribute name="t-attf-style" add="{{ getTextStyle(tag) ? 'border-color: rgb(140, 140, 140) !important ;' : ''}}" separator=" "/>
-        </xpath>
-        <xpath expr='//div[hasclass("o_tag_badge_text")]' position="attributes">
-            <attribute name="t-attf-class" add="{{ getTextStyle(tag) ? 'fw-bold' : '' }}" separator=" "/>
-        </xpath>
-    </t>
-
-</templates>
diff --git a/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.js b/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.js
index f43b47fea0bc0..0504f0e1b9390 100644
--- a/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.js
+++ b/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.js
@@ -3,12 +3,17 @@ import {
     Many2ManyTagsField,
     many2ManyTagsField,
 } from "@web/views/fields/many2many_tags/many2many_tags_field";
+import { Component } from "@odoo/owl";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
 
-import { SkillsTagList } from "../hr_skills_tags_list/hr_skills_tags_list";
-
+class SkillsTag extends Component {
+    static template = "hr_skills.SkillsTag";
+    static components = { BadgeTag };
+    static props = ["color?", "defaultLevel", "onDelete?", "text", "tooltip"];
+}
 
 class SkillsMany2ManyTags extends Many2ManyTagsField {
-    static components = { ...Many2ManyTagsField.components, TagsList: SkillsTagList };
+    static components = { ...Many2ManyTagsField.components, Tag: SkillsTag };
     getTagProps(record) {
         return { ...super.getTagProps(record), defaultLevel: record.data.default_level };
     }
diff --git a/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.xml b/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.xml
new file mode 100644
index 0000000000000..f9b189b566442
--- /dev/null
+++ b/addons/hr_skills/static/src/fields/many2many_tags_skills/many2many_tags_skills.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="hr_skills.SkillsTag">
+        <BadgeTag cssClass="{'border border-2': this.props.defaultLevel, 'border-dark-subtle': true}" color="this.props.color" onDelete="this.props.onDelete" text="this.props.text" tooltip="this.props.tooltip">
+            <div class="o_tag_badge_text" t-att-class="{'fw-bold': this.props.defaultLevel}" t-out="this.props.text"/>
+        </BadgeTag>
+    </t>
+
+</templates>
diff --git a/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.js b/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.js
index 0ae319f309094..9747ea3c547b7 100644
--- a/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.js
+++ b/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.js
@@ -3,10 +3,13 @@ import {
     Many2ManyTagsAvatarEmployeeField,
     many2ManyTagsAvatarEmployeeField,
 } from "@hr/views/fields/many2many_avatar_employee_field/many2many_avatar_employee_field";
-import { Many2ManyAvatarUserTagsList } from "@mail/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field";
+import { Component } from "@odoo/owl";
+import { AvatarTag } from "@web/core/tags_list/avatar_tag";
 
-export class Many2ManyAvatarUserTagsListError extends Many2ManyAvatarUserTagsList {
-    static template = "hr_work_entry.Many2ManyAvatarUserTagsListError";
+class EmployeeErrorTag extends Component {
+    static template = "hr_work_entry.EmployeeErrorTag";
+    static components = { AvatarTag };
+    static props = ["imageUrl", "inError", "onAvatarClick", "onDelete", "text", "tooltip"];
 }
 
 export class Many2ManyTagsAvatarEmployeeErrorField extends Many2ManyTagsAvatarEmployeeField {
@@ -16,7 +19,7 @@ export class Many2ManyTagsAvatarEmployeeErrorField extends Many2ManyTagsAvatarEm
     };
     static components = {
         ...Many2ManyTagsAvatarEmployeeField.components,
-        TagsList: Many2ManyAvatarUserTagsListError,
+        Tag: EmployeeErrorTag,
     };
 
     /**
diff --git a/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.xml b/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.xml
index d59fd8d434188..223e96d1b7c9a 100644
--- a/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.xml
+++ b/addons/hr_work_entry/static/src/components/class_many2many_avatar_employee_field/many2many_avatar_employee_error_field.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <template>
-    <t t-name="hr_work_entry.Many2ManyAvatarUserTagsListError" t-inherit="mail.Many2ManyAvatarUserTagsList" t-inherit-mode="primary">
-        <xpath expr="//span[hasclass('o_tag')]" position="attributes">
-            <attribute name="t-attf-class" separator=" " add="#{tag.inError ? 'text-danger' : ''}"/>
-        </xpath>
-        <div t-if="props.displayText" position="after">
-            <i t-if="tag.inError" class="ms-1 fa fa-lock z-1"/>
-        </div>
+    <t t-name="hr_work_entry.EmployeeErrorTag">
+        <AvatarTag cssClass="{'text-danger': this.props.inError}" imageUrl="this.props.imageUrl" onAvatarClick="this.props.onAvatarClick" onDelete="this.props.onDelete" tooltip="this.props.tooltip">
+            <div class="o_tag_badge_text position-relative ms-1" t-out="this.props.text"/>
+            <i t-if="this.props.inError" class="ms-1 fa fa-lock z-1"/>
+        </AvatarTag>
     </t>
 </template>
diff --git a/addons/mail/static/src/core/web/recipient_tag.js b/addons/mail/static/src/core/web/recipient_tag.js
new file mode 100644
index 0000000000000..4a996daf58ab8
--- /dev/null
+++ b/addons/mail/static/src/core/web/recipient_tag.js
@@ -0,0 +1,75 @@
+import { usePopover } from "@web/core/popover/popover_hook";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
+import { useBus, useChildRef, useService } from "@web/core/utils/hooks";
+import { RecipientsInputTagsListPopover } from "./recipients_input_tags_list_popover";
+import { RecipientsPopover } from "./recipients_popover";
+
+import { Component, EventBus, useEffect } from "@odoo/owl";
+
+export class RecipientTag extends Component {
+    static template = "mail.RecipientTag";
+    static components = { BadgeTag };
+    static props = ["bus", "color?", "email", "id", "name", "onClick?", "onDelete", "resId?", "text", "tooltip", "updateRecipient"];
+
+    setup() {
+        this.ref = useChildRef();
+        this.action = useService("action");
+
+        this.recipientPopover = usePopover(RecipientsPopover, {
+            position: "bottom-middle",
+        });
+        this.emailSetterPopover = usePopover(RecipientsInputTagsListPopover, {
+            closeOnClickAway: false,
+            position: "bottom-middle",
+        });
+
+        useBus(this.props.bus, "open", (ev) => {
+            if (this.props.id === ev.detail.id) {
+                this.emailSetterPopover.open(this.ref.el, {
+                    tagToUpdate: {
+                        email: this.props.email,
+                        name: this.props.name,
+                        onDelete: this.props.onDelete,
+                    },
+                    onUpdateTag: (newEmail) =>
+                        this.props.updateRecipient(newEmail, this.props.resId),
+                });
+            }
+        });
+    }
+
+    onClick(ev) {
+        if (!this.props.resId || !this.props.email) {
+            return;
+        }
+        const viewProfileBtnOverride = () => {
+            const action = {
+                type: "ir.actions.act_window",
+                res_model: "res.partner",
+                res_id: this.props.resId,
+                views: [[false, "form"]],
+                target: "current",
+            };
+            this.action.doAction(action);
+        };
+        this.recipientPopover.open(ev.target, {
+            viewProfileBtnOverride,
+            id: this.props.resId,
+        });
+    }
+}
+
+export function useRecipientChecker(getTags) {
+    const bus = new EventBus();
+    useEffect(
+        (invalidTag) => {
+            if (invalidTag) {
+                bus.trigger("open", {
+                    id: invalidTag.id,
+                });
+            }
+        },
+        () => [getTags().find((tag) => !tag.email)]
+    );
+    return bus;
+}
diff --git a/addons/mail/static/src/core/web/recipient_tag.xml b/addons/mail/static/src/core/web/recipient_tag.xml
new file mode 100644
index 0000000000000..336f0c00fc642
--- /dev/null
+++ b/addons/mail/static/src/core/web/recipient_tag.xml
@@ -0,0 +1,5 @@
+<templates xml:splace="preserve">
+    <t t-name="mail.RecipientTag">
+        <BadgeTag color="this.props.color" cssClass="{'o_tag_error': this.props.email.indexOf('@') lt 0}" onClick.bind="this.onClick" onDelete="this.props.onDelete" ref="this.ref" text="this.props.text" tooltip="this.props.tooltip"/>
+    </t>
+</templates>
diff --git a/addons/mail/static/src/core/web/recipients_input.js b/addons/mail/static/src/core/web/recipients_input.js
index 32b82e543bd1d..9e45f1f857e54 100644
--- a/addons/mail/static/src/core/web/recipients_input.js
+++ b/addons/mail/static/src/core/web/recipients_input.js
@@ -6,30 +6,32 @@ import { useService } from "@web/core/utils/hooks";
 import { useSelectCreate } from "@web/views/fields/relational_utils";
 
 import { rpc } from "@web/core/network/rpc";
-import { usePopover } from "@web/core/popover/popover_hook";
 import { useTagNavigation } from "@web/core/record_selectors/tag_navigation_hook";
 import { uniqueId } from "@web/core/utils/functions";
-import { RecipientsPopover } from "./recipients_popover";
-import { RecipientsInputTagsList } from "./recipients_input_tags_list";
+import { RecipientTag, useRecipientChecker } from "./recipient_tag";
 
-import { Component } from "@odoo/owl";
+import { Component, onWillRender } from "@odoo/owl";
 
 export class RecipientsInput extends Component {
     static template = "mail.RecipientsInput";
-    static components = { AutoComplete, RecipientsInputTagsList };
+    static components = { AutoComplete, RecipientTag };
     static props = {
         thread: { type: Object },
     };
 
     setup() {
         this.orm = useService("orm");
-        this.action = useService("action");
         this.store = useService("mail.store");
-        this.popover = usePopover(RecipientsPopover, { position: "bottom-middle" });
+        this.recipientCheckerBus = useRecipientChecker(() => this.tags);
         useTagNavigation("recipientsInputRef", {
             delete: this.deleteTagByIndex.bind(this),
         });
 
+        this.tags = [];
+        onWillRender(() => {
+            this.tags = this.getTagsFromMailThread();
+        });
+
         this.openListViewToSelectResPartner = useSelectCreate({
             resModel: "res.partner",
             activeActions: {
@@ -55,9 +57,8 @@ export class RecipientsInput extends Component {
     }
 
     deleteTagByIndex(index) {
-        const tags = this.getTagsFromMailThread();
-        if (tags[index]) {
-            tags[index].onDelete();
+        if (this.tags[index]) {
+            this.tags[index].onDelete();
         }
     }
 
@@ -170,36 +171,17 @@ export class RecipientsInput extends Component {
     getTagsFromMailThread() {
         const tags = [];
         const createTagForRecipient = (recipient, recipientField) => {
-            const title = `${recipient.name || _t("Unnamed")} ${
+            const tooltip = `${recipient.name || _t("Unnamed")} ${
                 recipient.email ? "<" + recipient.email + ">" : ""
             }`;
-            title.trim();
+            tooltip.trim();
             tags.push({
                 id: uniqueId("tag_"),
                 resId: recipient.partner_id,
-                canEdit: true,
                 text: recipient.name || recipient.email || _t("Unnamed"),
                 name: recipient.name || _t("Unnamed"),
-                email: recipient.email,
-                title,
-                onClick: (ev) => {
-                    if (recipient.partner_id && recipient.email) {
-                        const viewProfileBtnOverride = () => {
-                            const action = {
-                                type: "ir.actions.act_window",
-                                res_model: "res.partner",
-                                res_id: recipient.partner_id,
-                                views: [[false, "form"]],
-                                target: "current",
-                            };
-                            this.action.doAction(action);
-                        };
-                        this.popover.open(ev.target, {
-                            viewProfileBtnOverride,
-                            id: recipient.partner_id,
-                        });
-                    }
-                },
+                email: recipient.email || "",
+                tooltip,
                 onDelete: () => {
                     this.props.thread[recipientField] = this.props.thread[recipientField].filter(
                         (additionalOrSuggestedRecipient) =>
@@ -207,6 +189,8 @@ export class RecipientsInput extends Component {
                             additionalOrSuggestedRecipient.email !== recipient.email
                     );
                 },
+                updateRecipient: this.updateRecipient.bind(this),
+                bus: this.recipientCheckerBus,
             });
         };
         for (const recipient of this.props.thread.suggestedRecipients) {
diff --git a/addons/mail/static/src/core/web/recipients_input.xml b/addons/mail/static/src/core/web/recipients_input.xml
index d4357461c470b..8dd6f631e698b 100644
--- a/addons/mail/static/src/core/web/recipients_input.xml
+++ b/addons/mail/static/src/core/web/recipients_input.xml
@@ -2,7 +2,9 @@
 <templates>
     <t t-name="mail.RecipientsInput">
         <div class="o-mail-RecipientsInput d-flex flex-wrap flex-grow-1 align-items-center gap-1 mx-1" t-ref="recipientsInputRef">
-            <RecipientsInputTagsList tags="this.getTagsFromMailThread()" updateRecipient.bind="updateRecipient"/>
+            <t t-foreach="this.tags" t-as="tag" t-key="tag.id">
+                <RecipientTag t-props="tag"/>
+            </t>
             <div class="flex-grow-1">
                 <AutoComplete placeholder="this.getPlaceholder()" sources="this.getAutoCompleteSources()"/>
             </div>
diff --git a/addons/mail/static/src/core/web/recipients_input_tags_list.js b/addons/mail/static/src/core/web/recipients_input_tags_list.js
deleted file mode 100644
index dffaceec6a71f..0000000000000
--- a/addons/mail/static/src/core/web/recipients_input_tags_list.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { usePopover } from "@web/core/popover/popover_hook";
-import { TagsList } from "@web/core/tags_list/tags_list";
-import { RecipientsInputTagsListPopover } from "./recipients_input_tags_list_popover";
-
-import { onWillUpdateProps, toRaw, useEffect, useRef, useState } from "@odoo/owl";
-
-/**
- * Override of the TagsList so that the email address of each recipients can be checked.
- * If a recipient doesn't have an email address set to its partner a popover is opened below the corresponding
- * Tag.
- */
-export class RecipientsInputTagsList extends TagsList {
-    static template = "web.RecipientsInputTagsList";
-    static props = {
-        ...TagsList.props,
-        updateRecipient: { type: Function, optional: true },
-    };
-    static defaultProps = { ...TagsList.defaultProps, updateRecipient: () => {} };
-    setup() {
-        this.popover = usePopover(RecipientsInputTagsListPopover, {
-            closeOnClickAway: false,
-            position: "bottom-middle",
-        });
-        this.tagToUpdateRef = useRef("tagToUpdate");
-        this.state = useState({
-            tagToUpdate: this.getFirstTagToUpdate(this.props.tags),
-        });
-        onWillUpdateProps((nextProps) => {
-            this.state.tagToUpdate = this.getFirstTagToUpdate(nextProps.tags);
-        });
-        useEffect(
-            () => {
-                if (this.state.tagToUpdate && this.tagToUpdateRef.el) {
-                    this.updateTag();
-                } else if (this.popover.isOpen) {
-                    this.popover.close();
-                }
-            },
-            () => [this.state.tagToUpdate, this.tagToUpdateRef.el]
-        );
-    }
-
-    getFirstTagToUpdate(tags) {
-        for (const tag of tags) {
-            if (!tag.email) {
-                return tag;
-            }
-        }
-    }
-
-    tagEquals(tag1, tag2) {
-        return toRaw(tag1) === toRaw(tag2);
-    }
-
-    updateTag() {
-        this.popover.open(this.tagToUpdateRef.el, {
-            tagToUpdate: this.state.tagToUpdate,
-            onUpdateTag: (newEmail) =>
-                this.props.updateRecipient(newEmail, this.state.tagToUpdate.resId),
-        });
-    }
-}
diff --git a/addons/mail/static/src/core/web/recipients_input_tags_list.xml b/addons/mail/static/src/core/web/recipients_input_tags_list.xml
deleted file mode 100644
index 9ee723cf3039b..0000000000000
--- a/addons/mail/static/src/core/web/recipients_input_tags_list.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<templates xml:splace="preserve">
-    <t t-name="web.RecipientsInputTagsList" t-inherit="web.TagsList">
-        <xpath expr="//span[hasclass('o_tag')]" position="attributes">
-            <attribute name="t-ref">{{tagEquals(tag, state.tagToUpdate) ? "tagToUpdate" : `tag_${tag_index}`}}</attribute>
-        </xpath>
-    </t>
-</templates>
diff --git a/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.js b/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.js
index a5b931ad9cab2..193ce83ca29d0 100644
--- a/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.js
+++ b/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.js
@@ -1,7 +1,6 @@
 import { useAssignUserCommand } from "@mail/views/web/fields/assign_user_command_hook";
 
 import { registry } from "@web/core/registry";
-import { TagsList } from "@web/core/tags_list/tags_list";
 import { usePopover } from "@web/core/popover/popover_hook";
 import { AvatarCardPopover } from "@mail/discuss/web/avatar_card/avatar_card_popover";
 import {
@@ -11,14 +10,9 @@ import {
     listMany2ManyTagsAvatarField,
     KanbanMany2ManyTagsAvatarField,
     kanbanMany2ManyTagsAvatarField,
-    KanbanMany2ManyTagsAvatarFieldTagsList,
 } from "@web/views/fields/many2many_tags_avatar/many2many_tags_avatar_field";
 import { Many2XAvatarUserAutocomplete } from "../avatar_autocomplete/avatar_many2x_autocomplete";
 
-export class Many2ManyAvatarUserTagsList extends TagsList {
-    static template = "mail.Many2ManyAvatarUserTagsList";
-}
-
 const WithUserChatter = (T) =>
     class UserChatterMixin extends T {
         setup() {
@@ -43,11 +37,10 @@ const WithUserChatter = (T) =>
         getTagProps(record) {
             return {
                 ...super.getTagProps(...arguments),
-                onImageClicked: (ev) => {
+                onAvatarClick: (target) => {
                     if (!this.displayAvatarCard(record)) {
                         return;
                     }
-                    const target = ev.currentTarget;
                     if (
                         !this.avatarCard.isOpen ||
                         (this.lastOpenedId && record.resId !== this.lastOpenedId)
@@ -64,7 +57,6 @@ export class Many2ManyTagsAvatarUserField extends WithUserChatter(Many2ManyTagsA
     static template = "mail.Many2ManyTagsAvatarUserField";
     static components = {
         ...Many2ManyTagsAvatarField.components,
-        TagsList: Many2ManyAvatarUserTagsList,
         Many2XAutocomplete: Many2XAvatarUserAutocomplete,
     };
 }
@@ -77,21 +69,23 @@ export const many2ManyTagsAvatarUserField = {
 
 registry.category("fields").add("many2many_avatar_user", many2ManyTagsAvatarUserField);
 
-export class KanbanMany2ManyAvatarUserTagsList extends KanbanMany2ManyTagsAvatarFieldTagsList {
-    static template = "mail.KanbanMany2ManyAvatarUserTagsList";
-}
-
 export class KanbanMany2ManyTagsAvatarUserField extends WithUserChatter(
     KanbanMany2ManyTagsAvatarField
 ) {
-    static template = "mail.KanbanMany2ManyTagsAvatarUserField";
     static components = {
         ...KanbanMany2ManyTagsAvatarField.components,
-        TagsList: KanbanMany2ManyAvatarUserTagsList,
     };
     get displayText() {
         return !this.props.readonly;
     }
+
+    getTagProps(record) {
+        const p = super.getTagProps(record);
+        return {
+            ...p,
+            text: this.displayText ? p.text : "",
+        };
+    }
 }
 export const kanbanMany2ManyTagsAvatarUserField = {
     ...kanbanMany2ManyTagsAvatarField,
@@ -106,13 +100,20 @@ export class ListMany2ManyTagsAvatarUserField extends WithUserChatter(
     static template = "mail.ListMany2ManyTagsAvatarUserField";
     static components = {
         ...ListMany2ManyTagsAvatarField.components,
-        TagsList: Many2ManyAvatarUserTagsList,
         Many2XAutocomplete: Many2XAvatarUserAutocomplete,
     };
 
     get displayText() {
         return this.props.record.data[this.props.name].records.length === 1 || !this.props.readonly;
     }
+
+    getTagProps(record) {
+        const p = super.getTagProps(record);
+        return {
+            ...p,
+            text: this.displayText ? p.text : "",
+        };
+    }
 }
 
 export const listMany2ManyTagsAvatarUserField = {
diff --git a/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml b/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml
index 72ba09e65c838..966aff8c7acb3 100644
--- a/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml
+++ b/addons/mail/static/src/views/web/fields/many2many_avatar_user_field/many2many_avatar_user_field.xml
@@ -9,22 +9,7 @@
         </xpath>
     </t>
 
-    <t t-name="mail.Many2ManyAvatarUserTagsList" t-inherit="web.TagsList" t-inherit-mode="primary">
-        <img position="attributes">
-            <attribute name="t-on-click.stop.prevent">tag.onImageClicked</attribute>
-        </img>
-    </t>
-
-    <t t-name="mail.KanbanMany2ManyAvatarUserTagsList" t-inherit="web.KanbanMany2ManyTagsAvatarFieldTagsList" t-inherit-mode="primary">
-        <img position="attributes">
-            <attribute name="t-on-click.stop.prevent">tag.onImageClicked</attribute>
-        </img>
-    </t>
-
     <t t-name="mail.ListMany2ManyTagsAvatarUserField" t-inherit="web.Many2ManyTagsAvatarField" t-inherit-mode="primary">
-        <TagsList position="attributes">
-            <attribute name="displayText">displayText</attribute>
-        </TagsList>
         <xpath expr="//Many2XAutocomplete" position="inside">
             <t t-set-slot="inviteTeammates" t-slot-scope="inviteTeammatesScope">
                 <i class="fa fa-envelope-o fa-lg me-2 d-inline"/>
@@ -32,10 +17,4 @@
             </t>
         </xpath>
     </t>
-
-    <t t-name="mail.KanbanMany2ManyTagsAvatarUserField" t-inherit="web.KanbanMany2ManyTagsAvatarField" t-inherit-mode="primary">
-        <TagsList position="attributes">
-            <attribute name="displayText">displayText</attribute>
-        </TagsList>
-    </t>
 </templates>
diff --git a/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.js b/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.js
index 3dcd7f6358bac..2b52ac70d7bbd 100644
--- a/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.js
+++ b/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.js
@@ -1,21 +1,14 @@
-import { RecipientsInputTagsList } from "@mail/core/web/recipients_input_tags_list";
-import { RecipientsPopover } from "@mail/core/web/recipients_popover";
+import { RecipientTag, useRecipientChecker } from "@mail/core/web/recipient_tag";
 import { parseEmail } from "@mail/utils/common/format";
 import { _t } from "@web/core/l10n/translation";
 import { evaluateBooleanExpr } from "@web/core/py_js/py";
 import { registry } from "@web/core/registry";
-import { usePopover } from "@web/core/popover/popover_hook";
-import { useService } from "@web/core/utils/hooks";
 import {
     Many2ManyTagsField,
     many2ManyTagsField,
 } from "@web/views/fields/many2many_tags/many2many_tags_field";
 import { Many2XAutocomplete } from "@web/views/fields/relational_utils";
 
-export class FieldMany2ManyTagsEmailTagsList extends RecipientsInputTagsList {
-    static template = "FieldMany2ManyTagsEmailTagsList";
-}
-
 export class FieldMany2ManyTagsEmailMany2xAutocomplete extends Many2XAutocomplete {
     /**
      * @override
@@ -35,12 +28,12 @@ export class FieldMany2ManyTagsEmailMany2xAutocomplete extends Many2XAutocomplet
 export class FieldMany2ManyTagsEmail extends Many2ManyTagsField {
     static template = "FieldMany2ManyTagsEmailTags";
     static components = {
-        ...FieldMany2ManyTagsEmail.components,
-        TagsList: FieldMany2ManyTagsEmailTagsList,
+        ...super.components,
+        Tag: RecipientTag,
         Many2XAutocomplete: FieldMany2ManyTagsEmailMany2xAutocomplete,
     };
     static props = {
-        ...Many2ManyTagsField.props,
+        ...super.props,
         context: { type: Object, optional: true },
         canEditTags: { type: Boolean, optional: true },
     };
@@ -50,11 +43,8 @@ export class FieldMany2ManyTagsEmail extends Many2ManyTagsField {
         if (this.quickCreate) {
             this.quickCreate = this.quickCreateRecipient.bind(this);
         }
-        this.openedDialogs = 0;
-        this.recordsIdsToAdd = [];
 
-        this.recipientsPopover = usePopover(RecipientsPopover);
-        this.actionService = useService("action");
+        this.recipientCheckerBus = useRecipientChecker(() => this.tags.map((tag) => ({ id: tag.id, email: tag.props.email })));
 
         const update = this.update;
         this.update = async (object) => {
@@ -73,9 +63,7 @@ export class FieldMany2ManyTagsEmail extends Many2ManyTagsField {
             {}
         );
         tags.forEach((tag) => {
-            tag.email = emailByResId[tag.resId];
-            tag.name = tag.text;
-            tag.title = tag.text;
+            tag.props.email = emailByResId[tag.props.resId];
         });
         return tags;
     }
@@ -86,35 +74,21 @@ export class FieldMany2ManyTagsEmail extends Many2ManyTagsField {
      * @returns {Object}
      */
     getTagProps(record) {
+        const p = super.getTagProps(record);
         return {
-            ...super.getTagProps(record),
+            ...p,
             text:
                 record.data.name || record.data.email || record.data.display_name || _t("Unnamed"),
-            onClick: (ev) => this.onTagClick(ev, record),
+            bus: this.recipientCheckerBus,
+            updateRecipient: this.updateRecipient.bind(this),
+            name: p.text,
+            email: record.data.email,
+            tooltip: record.data.email || p.text,
+            id: record.id,
+            resId: record.resId,
         };
     }
 
-    /**
-     * @param {Event} event
-     * @param {Record} record
-     */
-    onTagClick(event, record) {
-        const viewProfileBtnOverride = () => {
-            const action = {
-                type: "ir.actions.act_window",
-                res_model: "res.partner",
-                res_id: record.resId,
-                views: [[false, "form"]],
-                target: "current",
-            };
-            this.actionService.doAction(action);
-        };
-        this.recipientsPopover.open(event.target, {
-            id: record.resId,
-            viewProfileBtnOverride,
-        });
-    }
-
     async quickCreateRecipient(request) {
         const [name, email] = parseEmail(request);
         const [partnerId] = await this.orm.create("res.partner", [{ name, email }]);
diff --git a/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.xml b/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.xml
index 6907c2bc0161c..ff5eda81f9d9e 100644
--- a/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.xml
+++ b/addons/mail/static/src/views/web/fields/many2many_tags_email/many2many_tags_email.xml
@@ -1,25 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates xml:space="preserve">
-    <t t-name="FieldMany2ManyTagsEmailTagsList" t-inherit="web.TagsList" t-inherit-mode="primary">
-        <xpath expr="//span[hasclass('o_tag')]" position="replace">
-            <div t-attf-class="badge rounded-pill align-items-center dropdown o_tag o_tag_color_0 #{tag.email.indexOf('@') &lt; 0 ? 'o_tag_error' : ''}"
-                 t-att-data-color="tag.colorIndex"
-                 t-att-data-index="tag_index"
-                 t-att-data-id="tag.resId"
-                 t-att-title="tag.text"
-                 t-on-click="(ev) => tag.onClick and tag.onClick(ev)" t-ref="{{tagEquals(tag, state.tagToUpdate) ? 'tagToUpdate' : `tag_${tag_index}`}}">
-                <span class="o_badge_text" t-att-title="tag.email"><t t-esc="tag.text"/></span>
-                <a t-if="!readonly &amp;&amp; tag.onDelete" t-on-click.stop.prevent="tag.onDelete" href="#" class="fa fa-times o_delete ms-1" title="Delete" aria-label="Delete"/>
-            </div>
-        </xpath>
-    </t>
     <t t-name="FieldMany2ManyTagsEmailTags" t-inherit="web.Many2ManyTagsField">
         <xpath expr="//Many2XAutocomplete" position="attributes">
             <attribute name="autofocus">props.context.forward_mode</attribute>
             <attribute name="quickCreate">quickCreate</attribute>
         </xpath>
-        <xpath expr="//TagsList" position="attributes">
-            <attribute name="updateRecipient.bind">updateRecipient</attribute>
-        </xpath>
     </t>
 </templates>
diff --git a/addons/mail/static/tests/web/fields/many2many_tags_email.test.js b/addons/mail/static/tests/web/fields/many2many_tags_email.test.js
index 7c9e6bcc105d3..ec02cdeda3b1d 100644
--- a/addons/mail/static/tests/web/fields/many2many_tags_email.test.js
+++ b/addons/mail/static/tests/web/fields/many2many_tags_email.test.js
@@ -64,8 +64,8 @@ test("fieldmany2many tags email (edition)", async () => {
         count: 2,
     });
     expect(tags[0].innerText).toBe("gold");
-    expect(tags[0].querySelector(".o_badge_text")).toHaveAttribute(
-        "title",
+    expect(tags[0]).toHaveAttribute(
+        "data-tooltip",
         "coucou@petite.perruche"
     );
     // should have read Partner_2 2 times: when opening the dropdown and when saving the new email.
diff --git a/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.js b/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.js
index 2311542dba50a..eca69676dc062 100644
--- a/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.js
+++ b/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.js
@@ -5,7 +5,6 @@ import {
     KanbanMany2ManyTagsAvatarUserField,
     ListMany2ManyTagsAvatarUserField,
     Many2ManyTagsAvatarUserField,
-    Many2ManyAvatarUserTagsList,
     kanbanMany2ManyTagsAvatarUserField,
     listMany2ManyTagsAvatarUserField,
     many2ManyTagsAvatarUserField,
@@ -13,8 +12,8 @@ import {
 import { Many2XAutocomplete } from "@web/views/fields/relational_utils";
 import { AvatarCardResourcePopover } from "@resource_mail/components/avatar_card_resource/avatar_card_resource_popover";
 import { Domain } from "@web/core/domain";
-import { KanbanMany2ManyTagsAvatarFieldTagsList } from "@web/views/fields/many2many_tags_avatar/many2many_tags_avatar_field";
-
+import { AvatarTag } from "@web/core/tags_list/avatar_tag";
+import { Component } from "@odoo/owl";
 
 export class AvatarResourceMany2XAutocomplete extends Many2XAutocomplete {
     /**
@@ -42,8 +41,18 @@ export class AvatarResourceMany2XAutocomplete extends Many2XAutocomplete {
     }
 }
 
-class Many2ManyAvatarResourceTagsList extends Many2ManyAvatarUserTagsList {
-    static template = "resource_mail.Many2ManyAvatarResourceTagsList";
+class ResourceTag extends Component {
+    static template = "resource_mail.ResourceTag";
+    static components = { AvatarTag };
+    static props = {
+        color: { type: Number, optional: true },
+        imageUrl: { type: String, optional: true },
+        onAvatarClick: { type: Function, optional: true },
+        onDelete: { type: Function, optional: true },
+        text: { type: String, optional: true },
+        tooltip: { type: String, optional: true },
+        type: { type: String },
+    };
 }
 
 const WithResourceFieldMixin = (T) => class ResourceFieldMixin extends T {
@@ -57,7 +66,7 @@ const WithResourceFieldMixin = (T) => class ResourceFieldMixin extends T {
     static components = {
         ...super.components,
         Many2XAutocomplete: AvatarResourceMany2XAutocomplete,
-        TagsList: Many2ManyAvatarResourceTagsList,
+        Tag: ResourceTag,
     };
     static optionTemplate = "resource_mail.Many2ManyAvatarResourceField.option";
 
@@ -68,11 +77,11 @@ const WithResourceFieldMixin = (T) => class ResourceFieldMixin extends T {
     getTagProps(record) {
         return {
             ...super.getTagProps(...arguments),
-            icon: record.data.resource_type === "user" ? null : "fa-wrench",
-            colorIndex: record.data.color,
-            img: record.data.resource_type === "user"
+            color: record.data.color,
+            type: record.data.resource_type,
+            imageUrl: record.data.resource_type === "user"
                 ? `/web/image/${this.relation}/${record.resId}/avatar_128`
-                : null,
+                : undefined,
         };
     }
 };
@@ -113,15 +122,7 @@ export const listMany2ManyAvatarResourceField = {
 };
 registry.category("fields").add("list.many2many_avatar_resource", listMany2ManyAvatarResourceField);
 
-export class KanbanMany2ManyAvatarResourceTagsList extends Many2ManyAvatarResourceTagsList {
-    static props = KanbanMany2ManyTagsAvatarFieldTagsList.props;
-}
 export class KanbanMany2ManyAvatarResourceField extends WithResourceFieldMixin(KanbanMany2ManyTagsAvatarUserField) {
-    static components = {
-        ...super.components,
-        TagsList: KanbanMany2ManyAvatarResourceTagsList,
-    };
-
     get tags() {
         return super.tags.reverse();
     }
diff --git a/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.xml b/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.xml
index 8a40fead61d33..ea2862559c23e 100644
--- a/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.xml
+++ b/addons/resource_mail/static/src/views/fields/many2many_avatar_resource/many2many_avatar_resource_field.xml
@@ -10,24 +10,22 @@
         </xpath>
     </t>
 
-    <t t-name="resource_mail.Many2ManyAvatarResourceTagsList" t-inherit="mail.Many2ManyAvatarUserTagsList">
-        <i position="attributes">
-            <attribute name="t-on-click.stop.prevent">tag.onImageClicked</attribute>
-            <attribute name="class">o_avatar o_m2m_avatar position-relative rounded</attribute>
-            <attribute name="t-attf-class" separator=" " add="o_colorlist_item_color_{{ tag.colorIndex }}"/>
-        </i>
-        <xpath expr="//span[hasclass('o_tag')]" position="attributes">
-            <attribute name="t-attf-class"/>
-            <attribute name="t-att-class"/>
-            <attribute name="class" separator=" " add="o_avatar opacity-trigger-hover"/>
-        </xpath>
-        <xpath expr="//div[hasclass('o_tag_badge_text')]" position="attributes">
-            <attribute name="t-attf-class"/>
-            <attribute name="class" separator=" " add="position-relative ms-1"/>
-        </xpath>
-        <a position="attributes">
-            <attribute name="t-attf-class"/>
-            <attribute name="class" separator=" " add="btn btn-link position-relative py-0 px-1 text-danger opacity-0"/>
-        </a>
+    <t t-name="resource_mail.ResourceTag">
+        <t t-if="this.props.type === 'user'">
+            <AvatarTag imageUrl="this.props.imageUrl" onAvatarClick="this.props.onAvatarClick" onDelete="this.props.onDelete" text="this.props.text" tooltip="this.props.tooltip"/>
+        </t>
+        <t t-else="">
+            <span class="o_tag position-relative d-inline-flex align-items-center user-select-none mw-100 opacity-trigger-hover" tabindex="-1" t-att-data-tooltip="this.props.tooltip" t-att-aria-label="this.props.tooltip" t-on-click="(ev) => this.props.onAvatarClick(ev.target)">
+                <i class="fa fa-wrench o_avatar o_m2m_avatar position-relative rounded p-1" t-attf-class="o_colorlist_item_color_{{ this.props.color }}"/>
+                <t t-if="this.props.text">
+                    <div class="o_tag_badge_text position-relative ms-1" t-out="this.props.text"/>
+                </t>
+                <t t-if="this.props.onDelete">
+                    <a class="o_delete d-flex align-items-center btn btn-link position-relative py-0 px-1 text-danger opacity-75 opacity-100-hover" href="#" tabindex="0" aria-label="Delete" data-tooltip="Delete" t-on-click.stop.prevent="() => this.props.onDelete()">
+                        <i class="oi oi-close align-text-top"/>
+                    </a>
+                </t>
+            </span>
+        </t>
     </t>
 </templates>
diff --git a/addons/web/static/src/core/tags_list/tags_list.js b/addons/web/static/src/core/tags_list/tags_list.js
index 9e063679af80b..ca199b89ffc58 100644
--- a/addons/web/static/src/core/tags_list/tags_list.js
+++ b/addons/web/static/src/core/tags_list/tags_list.js
@@ -2,36 +2,33 @@ import { Component } from "@odoo/owl";
 
 export class TagsList extends Component {
     static template = "web.TagsList";
-    static defaultProps = {
-        displayText: true,
-    };
     static props = {
-        displayText: { type: Boolean, optional: true },
-        visibleItemsLimit: { type: Number, optional: true },
+        slots: { type: Object },
         tags: { type: Array, element: Object },
+        mapTooltip: { type: Function, optional: true }, // not great but does the job for now
+        visibleItemsLimit: { type: Number },
+    };
+    static defaultProps = {
+        mapTooltip: (tag) => tag.tooltip || tag.text,
     };
 
-    get visibleTagsCount() {
-        return this.props.visibleItemsLimit - 1;
-    }
-    get visibleTags() {
-        if (this.props.visibleItemsLimit && this.props.tags.length > this.props.visibleItemsLimit) {
-            return this.props.tags.slice(0, this.visibleTagsCount);
-        }
-        return this.props.tags;
-    }
-    get otherTags() {
-        if (this.props.visibleItemsLimit && this.props.tags.length > this.props.visibleItemsLimit) {
-            return this.props.tags.slice(this.visibleTagsCount);
-        }
-        return [];
+    get invisibleTags() {
+        return this.props.tags.slice(this.visibleTagCount);
     }
+
     get tooltipInfo() {
         return JSON.stringify({
-            tags: this.otherTags.map((tag) => ({
-                text: tag.text,
-                id: tag.id,
-            })),
+            tags: this.invisibleTags.map((tag) => this.props.mapTooltip(tag)),
         });
     }
+
+    get visibleTagCount() {
+        // remove an item to display the counter instead
+        const counter = this.props.tags.length > this.props.visibleItemsLimit ? 1 : 0;
+        return this.props.visibleItemsLimit - counter;
+    }
+
+    get visibleTags() {
+        return this.props.tags.slice(0, this.visibleTagCount);
+    }
 }
diff --git a/addons/web/static/src/core/tags_list/tags_list.xml b/addons/web/static/src/core/tags_list/tags_list.xml
index 179d82e5efb9c..0852d12cc4da0 100644
--- a/addons/web/static/src/core/tags_list/tags_list.xml
+++ b/addons/web/static/src/core/tags_list/tags_list.xml
@@ -2,66 +2,20 @@
 <templates xml:space="preserve">
 
     <t t-name="web.TagsList">
-        <t t-foreach="visibleTags" t-as="tag" t-key="tag.id or tag_index">
-            <span
-                class="o_tag position-relative d-inline-flex align-items-center user-select-none mw-100"
-                t-att-class="{
-                    'o_avatar opacity-trigger-hover' : tag.img,
-                    'o_badge badge rounded-pill': !tag.img,
-                    'cursor-pointer': tag.canEdit,
-                }"
-                t-attf-class="{{ !tag.img ? 'o_tag_color_' + (tag.colorIndex ? tag.colorIndex : '0') : '' }}"
-                tabindex="-1"
-                t-att-data-color="tag.colorIndex"
-                t-att-aria-label="tag.title || tag.text"
-                t-att-data-tooltip="tag.title || tag.text"
-                t-on-click="(ev) => tag.onClick and tag.onClick(ev)"
-            >
-
-                <!-- Avatar's :hover backdrop -->
-                <span
-                    t-if="tag.img and props.displayText and tag.onDelete"
-                    class="o_avatar_backdrop position-absolute top-0 end-0 bottom-0 start-0 ms-n2 mt-n1 mb-n1 bg-view rounded border shadow opacity-0 opacity-100-hover"/>
-
-                <img
-                    t-if="tag.img"
-                    t-att-src="tag.img"
-                    class="o_avatar o_m2m_avatar position-relative rounded"
-                    t-att-class="tag.imageClass"/>
-
-                <i t-if="tag.icon" t-attf-class="p-1 fa {{ tag.icon }}" t-att-class="tag.className"/>
-
-                <div
-                    t-if="props.displayText"
-                    class="o_tag_badge_text text-truncate"
-                    t-att-class="{'position-relative ms-1' : tag.img}"
-                    t-out="tag.text"/>
-
-                <a
-                    t-if="tag.onDelete"
-                    t-on-click.stop.prevent="(ev) => tag.onDelete and tag.onDelete(ev)"
-                    class="o_delete opacity-100-hover"
-                    t-att-class="{
-                            'btn btn-link position-relative py-0 px-1 text-danger opacity-0': tag.img,
-                            'ps-1 opacity-75': !tag.img
-                        }"
-                    data-tooltip="Delete"
-                    aria-label="Delete"
-                    tabIndex="-1"
-                    href="#">
-                        <i class="oi oi-close"/>
-                </a>
+        <t t-foreach="this.visibleTags" t-as="tag" t-key="tag.id or tag_index">
+            <t t-slot="default" t-props="tag"/>
+        </t>
+        <t t-set="invisibleTagCount" t-value="this.invisibleTags.length"/>
+        <t t-if="invisibleTagCount">
+            <span class="o_tags_list_counter o_m2m_avatar_empty rounded text-center fw-bold cursor-default" data-tooltip-template="web.TagsList.Tooltip" data-tooltip-position="right" t-att-data-tooltip-info="tooltipInfo" t-on-click.stop="">
+                <span t-out="invisibleTagCount gt 9 ? '9+' : '+' + invisibleTagCount"/>
             </span>
         </t>
-        <span t-if="otherTags.length" class="o_m2m_avatar_empty rounded text-center fw-bold cursor-default" data-tooltip-template="web.TagsList.Tooltip" data-tooltip-position="right" t-att-data-tooltip-info="tooltipInfo" t-on-click.stop="">
-            <span t-if="otherTags.length > 9" t-esc="'9+'" />
-            <span t-else="" t-esc="'+' + otherTags.length" />
-        </span>
     </t>
 
     <t t-name="web.TagsList.Tooltip">
-        <t t-foreach="tags" t-as="tag" t-key="tag.id or tag_index">
-            <div t-esc="tag.text"/>
+        <t t-foreach="tags" t-as="tag" t-key="tag_index">
+            <div t-esc="tag"/>
         </t>
     </t>
 
diff --git a/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.js b/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.js
index 1053cd866271d..86b1fe6a4a039 100644
--- a/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.js
+++ b/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.js
@@ -5,13 +5,7 @@ export class KanbanMany2ManyTagsField extends Many2ManyTagsField {
     static template = "web.KanbanMany2ManyTagsField";
 
     get tags() {
-        return super.tags.reduce((kanbanTags, tag) => {
-            if (tag.colorIndex !== 0) {
-                delete tag.onClick;
-                kanbanTags.push(tag);
-            }
-            return kanbanTags;
-        }, []);
+        return super.tags.filter((tag) => tag.props.color !== 0);
     }
 }
 
diff --git a/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml b/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml
index af042580d02a2..9ac78be986589 100644
--- a/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml
+++ b/addons/web/static/src/views/fields/many2many_tags/kanban_many2many_tags_field.xml
@@ -3,7 +3,9 @@
 
     <t t-name="web.KanbanMany2ManyTagsField">
         <div class="d-flex flex-wrap gap-1">
-            <TagsList tags="tags"/>
+            <t t-foreach="this.tags" t-as="tag" t-key="tag.id">
+                <Tag color="tag.props.color" text="tag.props.text"/>
+            </t>
         </div>
     </t>
 </templates>
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js
index a90e5865df196..c84d0f5c77404 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.js
@@ -12,6 +12,7 @@ import {
 import { registry } from "@web/core/registry";
 import { Mutex } from "@web/core/utils/concurrency";
 import { standardFieldProps } from "../standard_field_props";
+import { BadgeTag } from "@web/core/tags_list/badge_tag";
 import { TagsList } from "@web/core/tags_list/tags_list";
 import { usePopover } from "@web/core/popover/popover_hook";
 import { useService } from "@web/core/utils/hooks";
@@ -38,6 +39,7 @@ class Many2ManyTagsFieldColorListPopover extends Component {
 export class Many2ManyTagsField extends Component {
     static template = "web.Many2ManyTagsField";
     static components = {
+        Tag: BadgeTag,
         TagsList,
         Many2XAutocomplete,
     };
@@ -66,6 +68,8 @@ export class Many2ManyTagsField extends Component {
     static RECORD_COLORS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
     static SEARCH_MORE_LIMIT = 320;
 
+    visibleItemsLimit = Number.POSITIVE_INFINITY;
+
     setup() {
         this.orm = useService("orm");
         this.previousColorsMap = {};
@@ -143,21 +147,28 @@ export class Many2ManyTagsField extends Component {
         return this.props.string || this.props.record.fields[this.props.name].string || "";
     }
 
+    get tagsListProps() {
+        return {
+            mapTooltip: (tag) => tag.props.tooltip,
+            tags: this.tags,
+            visibleItemsLimit: this.visibleItemsLimit,
+        };
+    }
+
     getTagProps(record) {
         return {
-            id: record.id, // datapoint_X
-            resId: record.resId,
-            text: record.data.display_name,
-            colorIndex: record.data[this.props.colorField],
-            canEdit: this.props.canEditTags,
+            color: record.data[this.props.colorField],
             onDelete: !this.props.readonly ? () => this.deleteTag(record.id) : undefined,
+            text: record.data.display_name || "",
+            tooltip: record.data.display_name || "",
         };
     }
 
     get tags() {
-        return this.props.record.data[this.props.name].records.map((record) =>
-            this.getTagProps(record)
-        );
+        return this.props.record.data[this.props.name].records.map((record) => ({
+            id: record.id,
+            props: this.getTagProps(record),
+        }));
     }
 
     get showM2OSelectionField() {
diff --git a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml
index 486e4a06bbe1a..68f42efa477c9 100644
--- a/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml
+++ b/addons/web/static/src/views/fields/many2many_tags/many2many_tags_field.xml
@@ -7,7 +7,9 @@
             t-att-class="{'o_tags_input o_input': !props.readonly}"
             t-ref="many2ManyTagsField"
         >
-            <TagsList tags="tags"/>
+            <TagsList t-props="this.tagsListProps" t-slot-scope="tag">
+                <Tag t-props="tag.props"/>
+            </TagsList>
             <div t-if="showM2OSelectionField" class="o_field_many2many_selection d-inline-flex w-100" t-ref="autoComplete">
                 <Many2XAutocomplete
                     id="props.id"
diff --git a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.js b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.js
index 7682a2cab40ea..1170aec1af26b 100644
--- a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.js
+++ b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.js
@@ -1,29 +1,39 @@
 import { _t } from "@web/core/l10n/translation";
 import { usePopover } from "@web/core/popover/popover_hook";
 import { registry } from "@web/core/registry";
+import { AvatarTag } from "@web/core/tags_list/avatar_tag";
+import { imageUrl } from "@web/core/utils/urls";
 import {
     many2ManyTagsField,
     Many2ManyTagsField,
 } from "@web/views/fields/many2many_tags/many2many_tags_field";
-import { TagsList } from "@web/core/tags_list/tags_list";
-import { imageUrl } from "@web/core/utils/urls";
 
 export class Many2ManyTagsAvatarField extends Many2ManyTagsField {
     static template = "web.Many2ManyTagsAvatarField";
     static optionTemplate = "web.Many2ManyTagsAvatarField.option";
+    static components = {
+        ...super.components,
+        Tag: AvatarTag,
+    };
     static props = {
         ...Many2ManyTagsField.props,
         withCommand: { type: Boolean, optional: true },
     };
 
+    get assignBtnTooltip() {
+        return _t("Assign");
+    }
+
     get specification() {
         return {};
     }
 
     getTagProps(record) {
         return {
-            ...super.getTagProps(record),
-            img: imageUrl(this.relation, record.resId, "avatar_128"),
+            imageUrl: imageUrl(this.relation, record.resId, "avatar_128"),
+            onDelete: !this.props.readonly ? () => this.deleteTag(record.id) : undefined,
+            text: record.data.display_name,
+            tooltip: record.data.display_name,
         };
     }
 }
@@ -86,20 +96,13 @@ export class Many2ManyTagsAvatarFieldPopover extends Many2ManyTagsAvatarField {
     }
 }
 
-export const many2ManyTagsAvatarFieldPopover = {
-    ...many2ManyTagsAvatarField,
-    component: Many2ManyTagsAvatarFieldPopover,
-};
-registry.category("fields").add("many2many_tags_avatar_popover", many2ManyTagsAvatarFieldPopover);
-
-export class KanbanMany2ManyTagsAvatarFieldTagsList extends TagsList {
-    static template = "web.KanbanMany2ManyTagsAvatarFieldTagsList";
-
+export class KanbanMany2ManyTagsAvatarField extends Many2ManyTagsAvatarField {
     static props = {
-        ...TagsList.props,
-        popoverProps: { type: Object },
-        readonly: { type: Boolean, optional: true },
+        ...super.props,
+        isEditable: { type: Boolean, optional: true },
     };
+    visibleItemsLimit = 3;
+
     setup() {
         super.setup();
         this.popover = usePopover(Many2ManyTagsAvatarFieldPopover, {
@@ -108,47 +111,30 @@ export class KanbanMany2ManyTagsAvatarFieldTagsList extends TagsList {
         });
     }
 
-    openPopover(ev) {
-        if (this.props.readonly) {
-            return;
-        }
-        this.popover.open(ev.currentTarget.parentElement, {
-            ...this.props.popoverProps,
-            readonly: false,
-            canCreate: false,
-            canCreateEdit: false,
-            canQuickCreate: false,
-            placeholder: _t("Search users..."),
-        });
-    }
     get canDisplayQuickAssignAvatar() {
-        return !this.props.readonly;
+        return this.props.isEditable;
     }
-}
-
-export class KanbanMany2ManyTagsAvatarField extends Many2ManyTagsAvatarField {
-    static template = "web.KanbanMany2ManyTagsAvatarField";
-    static components = {
-        ...Many2ManyTagsAvatarField.components,
-        TagsList: KanbanMany2ManyTagsAvatarFieldTagsList,
-    };
-    static props = {
-        ...Many2ManyTagsAvatarField.props,
-        isEditable: { type: Boolean, optional: true },
-    };
-    visibleItemsLimit = 3;
 
     get popoverProps() {
-        const props = {
-            ...this.props,
-            readonly: false,
-        };
+        const props = { ...this.props };
         delete props.isEditable;
         return props;
     }
+
     get tags() {
         return super.tags.reverse();
     }
+
+    openPopover(ev) {
+        this.popover.open(ev.currentTarget.parentElement, {
+            ...this.popoverProps,
+            readonly: false,
+            canCreate: false,
+            canCreateEdit: false,
+            canQuickCreate: false,
+            placeholder: _t("Search users..."),
+        });
+    }
 }
 
 export const kanbanMany2ManyTagsAvatarField = {
diff --git a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml
index 1f8fc35adcfe9..5938ec99981fa 100644
--- a/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml
+++ b/addons/web/static/src/views/fields/many2many_tags_avatar/many2many_tags_avatar_field.xml
@@ -7,7 +7,12 @@
             t-att-class="{'o_tags_input o_input': !props.readonly}"
             t-ref="many2ManyTagsField"
         >
-            <TagsList tags="tags" visibleItemsLimit="visibleItemsLimit"/>
+            <t t-if="this.canDisplayQuickAssignAvatar">
+                <a class="o_quick_assign fa o_m2m_avatar btn-link d-flex align-items-center text-dark" href="#" role="button" tabindex="0" t-attf-class="{{ this.tags.length ? 'fa-pencil' : 'fa-user-plus' }}" t-att-data-tooltip="this.assignBtnTooltip" t-att-aria-label="this.assignBtnTooltip" t-on-click.stop.prevent="this.openPopover"/>
+            </t>
+            <TagsList t-props="this.tagsListProps" t-slot-scope="tag">
+                <Tag t-props="tag.props"/>
+            </TagsList>
             <div t-if="showM2OSelectionField" class="o_field_many2many_selection d-inline-flex w-100" t-ref="autoComplete">
                 <Many2XAutocomplete
                     id="props.id"
@@ -39,22 +44,6 @@
         </span>
     </t>
 
-    <t t-name="web.KanbanMany2ManyTagsAvatarFieldTagsList" t-inherit="web.TagsList" t-inherit-mode="primary">
-        <xpath expr="//t[@t-foreach='visibleTags']" position="before">
-            <t t-if="canDisplayQuickAssignAvatar">
-                <a t-on-click.stop.prevent="openPopover" tabIndex="-1" href="#" data-tooltip="Assign"
-                   aria-label="Assign" class="o_quick_assign fa o_m2m_avatar btn-link d-flex align-items-center text-dark" t-attf-class="{{ props.tags.length ? 'fa-pencil' : 'fa-user-plus' }}" role="button"/>
-            </t>
-        </xpath>
-    </t>
-
-    <t t-name="web.KanbanMany2ManyTagsAvatarField" t-inherit="web.Many2ManyTagsAvatarField" t-inherit-mode="primary"
-      >
-        <xpath expr="//TagsList" position="attributes">
-            <attribute name="popoverProps">popoverProps</attribute>
-            <attribute name="readonly">!props.isEditable</attribute>
-        </xpath>
-    </t>
     <t t-name="web.Many2ManyTagsAvatarFieldPopover" t-inherit="web.Many2ManyTagsAvatarField" t-inherit-mode="primary">
         <xpath expr="//div[hasclass('o_field_tags')]" position="attributes">
             <attribute name="class" add="p-2 o_m2m_tags_avatar_field_popover o_field_widget o_field_many2many_tags_avatar" remove="d-inline-flex mw-100" separator=" " />
diff --git a/addons/web/static/tests/core/tags_list.test.js b/addons/web/static/tests/core/tags_list.test.js
index d4948b58252e5..4e6ed85c6bd03 100644
--- a/addons/web/static/tests/core/tags_list.test.js
+++ b/addons/web/static/tests/core/tags_list.test.js
@@ -1,141 +1,30 @@
 import { expect, test } from "@odoo/hoot";
-import { click, queryAttribute } from "@odoo/hoot-dom";
+import { queryAttribute } from "@odoo/hoot-dom";
 import { animationFrame } from "@odoo/hoot-mock";
 import { Component, useState, xml } from "@odoo/owl";
 import { mountWithCleanup } from "@web/../tests/web_test_helpers";
-
 import { TagsList } from "@web/core/tags_list/tags_list";
 
-test("Can be rendered with different tags", async () => {
-    class Parent extends Component {
-        static props = ["*"];
-        static components = { TagsList };
-        static template = xml`<TagsList tags="tags" />`;
-        setup() {
-            this.tags = [
-                {
-                    id: "tag1",
-                    text: "Earth",
-                },
-                {
-                    colorIndex: 1,
-                    id: "tag2",
-                    text: "Wind",
-                    onDelete: () => {
-                        expect.step(`tag2 delete button has been clicked`);
-                    },
-                },
-                {
-                    colorIndex: 2,
-                    id: "tag3",
-                    text: "Fire",
-                    onClick: () => {
-                        expect.step(`tag3 has been clicked`);
-                    },
-                },
-            ];
-        }
-    }
-
-    await mountWithCleanup(Parent);
-    expect(".o_tag").toHaveCount(3);
-
-    await click(".o_tag:nth-of-type(2) .o_delete");
-    expect.verifySteps(["tag2 delete button has been clicked"]);
-
-    await click(".o_tag:nth-of-type(3)");
-    expect.verifySteps(["tag3 has been clicked"]);
-});
-
-test("Tags can be displayed with an image", async () => {
-    class Parent extends Component {
-        static props = ["*"];
-        static components = { TagsList };
-        static template = xml`<TagsList tags="tags" />`;
-        setup() {
-            this.tags = [
-                {
-                    img: "fake/url",
-                    id: "tag1",
-                    text: "Earth",
-                },
-                {
-                    img: "fake/url/2",
-                    id: "tag2",
-                    text: "Wind",
-                },
-            ];
-        }
-    }
-
-    await mountWithCleanup(Parent);
-    expect(".o_tag").toHaveCount(2);
-    expect(".o_tag:nth-of-type(1) img").toHaveAttribute("data-src", "fake/url");
-    expect(".o_tag:nth-of-type(2) img").toHaveAttribute("data-src", "fake/url/2");
-});
-
-test("Tags can be displayed with an icon", async () => {
-    class Parent extends Component {
-        static props = ["*"];
-        static components = { TagsList };
-        static template = xml`<TagsList tags="tags" />`;
-        setup() {
-            this.tags = [
-                {
-                    icon: "fa-trash",
-                    id: "tag1",
-                    text: "Bad",
-                },
-                {
-                    icon: "fa-check",
-                    id: "tag2",
-                    text: "Good",
-                },
-            ];
-        }
-    }
-
-    await mountWithCleanup(Parent);
-    expect(".o_tag").toHaveCount(2);
-    expect(".o_tag:nth-of-type(1) i").toHaveClass("fa fa-trash");
-    expect(".o_tag:nth-of-type(2) i").toHaveClass("fa fa-check");
-});
-
 test("Limiting the visible tags displays a counter", async () => {
     class Parent extends Component {
         static props = ["*"];
         static components = { TagsList };
-        static template = xml`<TagsList tags="tags" visibleItemsLimit="state.visibleItemsLimit" />`;
+        static template = xml`
+            <TagsList tags="tags" visibleItemsLimit="state.visibleItemsLimit" t-slot-scope="tag">
+                <span class="o_tag" t-out="tag.text"/>
+            </TagsList>
+        `;
         setup() {
             this.state = useState({
                 visibleItemsLimit: 3,
             });
             this.tags = [
-                {
-                    id: "tag1",
-                    text: "Water",
-                    onDelete: () => {},
-                },
-                {
-                    id: "tag2",
-                    text: "Grass",
-                },
-                {
-                    id: "tag3",
-                    text: "Fire",
-                },
-                {
-                    id: "tag4",
-                    text: "Earth",
-                },
-                {
-                    id: "tag5",
-                    text: "Wind",
-                },
-                {
-                    id: "tag6",
-                    text: "Dust",
-                },
+                { id: "tag1", text: "Water" },
+                { id: "tag2", text: "Grass" },
+                { id: "tag3", text: "Fire" },
+                { id: "tag4", text: "Earth" },
+                { id: "tag5", text: "Wind" },
+                { id: "tag6", text: "Dust" },
             ];
         }
     }
@@ -143,18 +32,11 @@ test("Limiting the visible tags displays a counter", async () => {
     const parent = await mountWithCleanup(Parent);
     // visibleItemsLimit = 3 -> displays 2 tags + 1 counter (4 tags left)
     expect(".o_tag").toHaveCount(2);
-    expect(".rounded").toHaveText("+4", {
+    expect(".o_tags_list_counter").toHaveText("+4", {
         message: "the counter displays 4 more items",
     });
-    expect(JSON.parse(queryAttribute(".rounded", "data-tooltip-info"))).toEqual(
-        {
-            tags: [
-                { text: "Fire", id: "tag3" },
-                { text: "Earth", id: "tag4" },
-                { text: "Wind", id: "tag5" },
-                { text: "Dust", id: "tag6" },
-            ],
-        },
+    expect(JSON.parse(queryAttribute(".o_tags_list_counter", "data-tooltip-info"))).toEqual(
+        { tags: ["Fire", "Earth", "Wind", "Dust"] },
         { message: "the counter has a tooltip displaying other items" }
     );
 
@@ -162,40 +44,11 @@ test("Limiting the visible tags displays a counter", async () => {
     await animationFrame();
     // visibleItemsLimit = 5 -> displays 4 tags + 1 counter (2 tags left)
     expect(".o_tag").toHaveCount(4);
-    expect(".rounded").toHaveText("+2");
+    expect(".o_tags_list_counter").toHaveText("+2");
 
     parent.state.visibleItemsLimit = 6;
     await animationFrame();
     // visibleItemsLimit = 6 -> displays 6 tags + 0 counter (0 tag left)
     expect(".o_tag").toHaveCount(6);
-    expect(".rounded").toHaveCount(0);
-});
-
-test("Tags with img have a backdrop only if they can be deleted", async () => {
-    class Parent extends Component {
-        static props = ["*"];
-        static components = { TagsList };
-        static template = xml`<TagsList tags="tags" />`;
-        setup() {
-            this.tags = [
-                {
-                    id: "tag1",
-                    text: "Earth",
-                    img: "fake/url",
-                },
-                {
-                    colorIndex: 1,
-                    id: "tag2",
-                    text: "Wind",
-                    img: "fake/url",
-                    onDelete: () => {},
-                },
-            ];
-        }
-    }
-
-    await mountWithCleanup(Parent);
-    expect(".o_tag").toHaveCount(2);
-    expect(".o_tag:nth-of-type(1) .o_avatar_backdrop").toHaveCount(0);
-    expect(".o_tag:nth-of-type(2) .o_avatar_backdrop").toHaveCount(1);
+    expect(".o_tags_list_counter").toHaveCount(0);
 });
diff --git a/addons/web/static/tests/views/fields/many2many_tags_avatar_field.test.js b/addons/web/static/tests/views/fields/many2many_tags_avatar_field.test.js
index 90e57d519e199..062f8b02023be 100644
--- a/addons/web/static/tests/views/fields/many2many_tags_avatar_field.test.js
+++ b/addons/web/static/tests/views/fields/many2many_tags_avatar_field.test.js
@@ -156,8 +156,7 @@ test("widget many2many_tags_avatar in list view", async () => {
         ".o_data_row:nth-child(2) .o_field_many2many_tags_avatar .o_m2m_avatar_empty"
     );
     expect(tag).toHaveAttribute("data-tooltip-template", "web.TagsList.Tooltip");
-    const tooltipInfo = JSON.parse(tag.dataset["tooltipInfo"]);
-    expect(tooltipInfo.tags.map((tag) => tag.text).join(" ")).toBe("record 6 record 7", {
+    expect(tag).toHaveAttribute("data-tooltip-info", JSON.stringify({ tags: ["record 6", "record 7"] }), {
         message: "shows a tooltip on hover",
     });
 

From 3d733138e020726b218cd8855142111edd1d18fd Mon Sep 17 00:00:00 2001
From: "Mehdi Outagant (MOU)" <mou@odoo.com>
Date: Thu, 13 Nov 2025 14:51:01 +0100
Subject: [PATCH 581/673] [FIX] website, test_website: make video upload
 "sanitize friendly"

Steps to reproduce the current behaviour:

- Update the DEMO user to be a website "restricted editor" and sales
"admin" who cannot bypass HTML field sanitization.

- As ADMIN, add a YouTube video to a product page > Save.

- As DEMO, try to update the content on the product page > You cannot
(a dialog informs you that you cannot edit the content because an admin
edited it previously).

Explanation:

Starting from [1], an HTML field can be flagged as `sanitize_overridable`
which allowed users with the `base.group_sanitize_override` group to
skip the HTML field sanitize process.

If such users added some content that is not considered "sanitize
friendly" (e.g. YouTube iframe), a restricted user won't be allowed to
add content in the fields, since the sanitizer will remove the original
content from the DOM.

For this case, the code from [2] added an implementation to consider the
field as none editable and warn the user once he tries to update it.

Implementation:

The goal of this commit it to fix the current limitation for video
upload that currently prevents non admin users to edit a website record
once an admin adds a video on it...

The idea of the fix is the following:

- We already have a technical fallback when uploading a video to save
the iframe `src` to an attribute: `data-oe-expression`.
- The public widget is now destroying the video iframes so they are
never saved in the DOM.
- A non-lazy code will build the iframes immediately on page load.
- The public widget can always create the iframes if they are not
already created (for compatibility).

[1]: cf844e3
[2]: cb80c15

task-3757205

closes odoo/odoo#235166

X-original-commit: 17c84361899f67a4b6ff4cb997dfee1cfb98f000
Signed-off-by: Robin Lejeune (role) <role@odoo.com>
---
 addons/test_website/models/model.py           |   1 +
 .../tests/tours/website_field_sanitize.js     |  60 ++++++++++
 addons/test_website/tests/__init__.py         |   1 +
 .../tests/test_website_field_sanitize.py      |  32 +++++
 addons/website/__manifest__.py                |   3 +
 .../interactions/video/media_video.edit.js    |   9 ++
 .../src/interactions/video/media_video.js     |  69 ++---------
 .../src/js/content/generate_video_iframe.js   | 110 ++++++++++++++++++
 8 files changed, 225 insertions(+), 60 deletions(-)
 create mode 100644 addons/test_website/static/tests/tours/website_field_sanitize.js
 create mode 100644 addons/test_website/tests/test_website_field_sanitize.py
 create mode 100644 addons/website/static/src/js/content/generate_video_iframe.js

diff --git a/addons/test_website/models/model.py b/addons/test_website/models/model.py
index b5334854d20ce..b0c9f6191afd9 100644
--- a/addons/test_website/models/model.py
+++ b/addons/test_website/models/model.py
@@ -28,6 +28,7 @@ class TestModel(models.Model):
         sanitize_overridable=True,
         sanitize_attributes=False,
         sanitize_form=False,
+        default="""<div class="o_test_website_description"><p>A simple website description content.</p></div>""",
     )
     tag_id = fields.Many2one('test.tag')
 
diff --git a/addons/test_website/static/tests/tours/website_field_sanitize.js b/addons/test_website/static/tests/tours/website_field_sanitize.js
new file mode 100644
index 0000000000000..be6f5b3744ffd
--- /dev/null
+++ b/addons/test_website/static/tests/tours/website_field_sanitize.js
@@ -0,0 +1,60 @@
+import { clickOnSave, registerWebsitePreviewTour } from "@website/js/tours/tour_utils";
+
+// As admin, add a YouTube video iframe in a `sanitize_overridable` HTML field.
+registerWebsitePreviewTour("website_designer_iframe_video",
+    {
+        url: "/test_website/model_item/1",
+        edition: true,
+    },
+    () => [
+        {
+            content: "As administrator, add a video block to the description field",
+            trigger: `.o_block_tab:not(.o_we_ongoing_insertion) #snippet_content .o_snippet[name="Video"].o_draggable .o_snippet_thumbnail`,
+            run: "drag_and_drop :iframe .o_test_website_description",
+        },
+        {
+            content: "Add a video URL",
+            trigger: ".o_select_media_dialog #o_video_text",
+            run: `edit https://www.youtube.com/watch?v=G8b4UZIcTfg`,
+        },
+        {
+            content: "Add the video",
+            trigger: ".o_select_media_dialog .modal-footer .btn-primary",
+            run: "click",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the video was correctly saved",
+            trigger: ":iframe .media_iframe_video[data-oe-expression*='G8b4UZIcTfg']",
+            run: () => {},
+        },
+    ]
+);
+
+// Check that a restricted editor can edit the field content (even with
+// a video iframe).
+registerWebsitePreviewTour("website_restricted_editor_iframe_video", {
+        url: "/test_website/model_item/1",
+        edition: true,
+    },
+    () => [
+        {
+            content: "Check that the video iframe was correctly restored after saving the changes",
+            trigger:
+                ":iframe [data-oe-field]:not([data-oe-sanitize-prevent-edition]) .media_iframe_video[data-oe-expression*='G8b4UZIcTfg']",
+            run: () => {},
+        },
+        {
+            content: "As a restricted editor, edit the HTML field content",
+            trigger: ":iframe .o_test_website_description",
+            run: "editor I can still edit the HTML field",
+        },
+        ...clickOnSave(),
+        {
+            content: "Check that the HTML content (with a video iframe) was correctly updated",
+            trigger:
+                ":iframe .o_test_website_description:contains('I can still edit the HTML field')",
+            run: () => {},
+        },
+    ]
+);
diff --git a/addons/test_website/tests/__init__.py b/addons/test_website/tests/__init__.py
index a9058632a3d9e..68eb120b967bb 100644
--- a/addons/test_website/tests/__init__.py
+++ b/addons/test_website/tests/__init__.py
@@ -27,3 +27,4 @@
 from . import test_views_during_module_operation
 from . import test_website_controller_page
 from . import test_website_page_properties
+from . import test_website_field_sanitize
diff --git a/addons/test_website/tests/test_website_field_sanitize.py b/addons/test_website/tests/test_website_field_sanitize.py
new file mode 100644
index 0000000000000..1577f8eefee7e
--- /dev/null
+++ b/addons/test_website/tests/test_website_field_sanitize.py
@@ -0,0 +1,32 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import odoo
+import odoo.tests
+
+
+@odoo.tests.tagged('-at_install', 'post_install')
+class TestWebsiteFieldSanitize(odoo.tests.HttpCase):
+    def test_sanitize_video_iframe(self):
+        self.env['res.users'].create({
+            'name': 'Restricted Editor',
+            'login': 'restricted',
+            'password': 'restricted',
+            'group_ids': [(6, 0, [
+                self.ref('base.group_user'),
+                self.ref('website.group_website_restricted_editor'),
+                self.ref('test_website.group_test_website_admin'),
+            ])]
+        })
+
+        # Add a video to an HTML field (admin).
+        self.start_tour(
+            self.env['website'].get_client_action_url('/test_website/model_item/1'),
+            'website_designer_iframe_video',
+            login='admin'
+        )
+        # Make sure a user can still edit the content (restricted editor).
+        self.start_tour(
+            self.env['website'].get_client_action_url('/test_website/model_item/1'),
+            'website_restricted_editor_iframe_video',
+            login='restricted'
+        )
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 6442a9c7ac805..e9287c62ba7ec 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -270,6 +270,7 @@
             'website/static/src/js/content/auto_hide_menu.js',
             'website/static/src/js/content/redirect.js',
             'website/static/src/js/content/adapt_content.js',
+            'website/static/src/js/content/generate_video_iframe.js',
         ],
         'web.assets_frontend_lazy': [
             # Remove assets_frontend_minimal
@@ -278,6 +279,7 @@
             ('remove', 'website/static/src/js/content/auto_hide_menu.js'),
             ('remove', 'website/static/src/js/content/redirect.js'),
             ('remove', 'website/static/src/js/content/adapt_content.js'),
+            ('remove', 'website/static/src/js/content/generate_video_iframe.js'),
         ],
         'website.assets_inside_builder_iframe': [
             ('include', 'html_builder.assets_inside_builder_iframe'),
@@ -370,6 +372,7 @@
             'website/static/src/xml/**/*.xml',
             'website/static/src/snippets/s_table_of_content/000.scss',
             'google_recaptcha/static/src/js/recaptcha.js',
+            'website/static/src/js/content/generate_video_iframe.js',
         ],
         'web._assets_frontend_helpers': [
             ('prepend', 'website/static/src/scss/bootstrap_overridden.scss'),
diff --git a/addons/website/static/src/interactions/video/media_video.edit.js b/addons/website/static/src/interactions/video/media_video.edit.js
index 16009a27091ad..702b2ddc9375d 100644
--- a/addons/website/static/src/interactions/video/media_video.edit.js
+++ b/addons/website/static/src/interactions/video/media_video.edit.js
@@ -1,6 +1,15 @@
 import { MediaVideo } from "./media_video";
 import { registry } from "@web/core/registry";
 
+export const MediaVideoEdit = (I) =>
+    class extends I {
+        destroy() {
+            // Destroy video iframes so they are never saved in the DOM.
+            this.el?.replaceChildren();
+        }
+    };
+
 registry.category("public.interactions.edit").add("website.media_video", {
     Interaction: MediaVideo,
+    mixin: MediaVideoEdit,
 });
diff --git a/addons/website/static/src/interactions/video/media_video.js b/addons/website/static/src/interactions/video/media_video.js
index 22776f21d0b28..e32930730aa00 100644
--- a/addons/website/static/src/interactions/video/media_video.js
+++ b/addons/website/static/src/interactions/video/media_video.js
@@ -1,10 +1,9 @@
-import { htmlEscape } from "@odoo/owl";
-
 import { Interaction } from "@web/public/interaction";
 import { registry } from "@web/core/registry";
 
 import { _t } from "@web/core/l10n/translation";
 import { setupAutoplay, triggerAutoplay } from "@website/utils/videos";
+import { generateVideoIframe } from "@website/js/content/generate_video_iframe";
 
 export class MediaVideo extends Interaction {
     static selector = ".media_iframe_video";
@@ -42,11 +41,15 @@ export class MediaVideo extends Interaction {
     start() {
         let iframeEl = this.el.querySelector(":scope > iframe");
 
-        // The following code is only there to ensure compatibility with
-        // videos added before bug fixes or new Odoo versions where the
-        // <iframe/> element is properly saved.
+        // Generate the video `<iframe/>` element when restarting interacions.
+        // In some cases (e.g., when adding a new video block), we don’t need
+        // to rebuild the same iframe while starting the widget.
         if (!iframeEl) {
-            iframeEl = this.generateIframe();
+            iframeEl = generateVideoIframe(this.el, this.services.website_cookies.manageIframeSrc);
+        }
+
+        if (iframeEl && !iframeEl.getAttribute("aria-label")) {
+            iframeEl.setAttribute("aria-label", _t("Media video"));
         }
 
         if (iframeEl?.hasAttribute("src")) {
@@ -61,60 +64,6 @@ export class MediaVideo extends Interaction {
             }
         }
     }
-
-    generateIframe() {
-        // Bug fix / compatibility: empty the <div/> element as all information
-        // to rebuild the iframe should have been saved on the <div/> element
-        this.el.textContent = "";
-
-        // Add extra content for size / edition
-        const div1 = document.createElement("div");
-        div1.classList.add("css_editable_mode_display");
-        div1.innerHTML = "&nbsp;";
-        const div2 = document.createElement("div");
-        div2.classList.add("media_iframe_video_size");
-        div2.innerHTML = "&nbsp;";
-        this.insert(div1);
-        this.insert(div2);
-
-        // Rebuild the iframe. Depending on version / compatibility / instance,
-        // the src is saved in the 'data-src' attribute or the
-        // 'data-oe-expression' one (the latter is used as a workaround in 10.0
-        // system but should obviously be reviewed in master).
-
-        const src = htmlEscape(
-            this.el.getAttribute("data-oe-expression") || this.el.getAttribute("data-src")
-        );
-        // Validate the src to only accept supported domains we can trust
-
-        const m = src.match(/^(?:https?:)?\/\/([^/?#]+)/);
-        if (!m) {
-            return;
-        }
-
-        const domain = m[1].replace(/^www\./, "");
-        const supportedDomains = [
-            "youtu.be",
-            "youtube.com",
-            "youtube-nocookie.com",
-            "instagram.com",
-            "player.vimeo.com",
-            "vimeo.com",
-            "dailymotion.com",
-            "facebook.com",
-        ];
-        if (!supportedDomains.includes(domain)) {
-            return;
-        }
-
-        const iframeEl = document.createElement("iframe");
-        iframeEl.frameborder = "0";
-        iframeEl.allowFullscreen = "allowfullscreen";
-        iframeEl.ariaLabel = _t("Media video");
-        this.insert(iframeEl);
-        this.services.website_cookies.manageIframeSrc(iframeEl, src);
-        return iframeEl;
-    }
 }
 
 registry.category("public.interactions").add("website.media_video", MediaVideo);
diff --git a/addons/website/static/src/js/content/generate_video_iframe.js b/addons/website/static/src/js/content/generate_video_iframe.js
new file mode 100644
index 0000000000000..18ec228d6c821
--- /dev/null
+++ b/addons/website/static/src/js/content/generate_video_iframe.js
@@ -0,0 +1,110 @@
+const SUPPORTED_DOMAINS = [
+    "youtu.be",
+    "youtube.com",
+    "youtube-nocookie.com",
+    "instagram.com",
+    "player.vimeo.com",
+    "vimeo.com",
+    "dailymotion.com",
+    "facebook.com",
+];
+
+/**
+ * Escapes a string to HTML interpolation.
+ * Remark: this function is already available in the codebase (see:
+ * `web/.../core/utils/strings.js`), but we need to reimplement it
+ * here for non-lazy code.
+ *
+ * @param {String} str The string to escape.
+ * @returns {String}
+ */
+export function escape(str) {
+    if (!str) {
+        return "";
+    }
+    for (const [unescaped, escaped] of [
+        ["&", "&amp;"],
+        ["<", "&lt;"],
+        [">", "&gt;"],
+        ["'", "&#x27;"],
+        ['"', "&quot;"],
+        ["`", "&#x60;"],
+    ]) {
+        str = str.replaceAll(unescaped, escaped);
+    }
+    return str;
+}
+
+/**
+ * This is a non-lazy version of the `manageIframeSrc` function already
+ * available in the `"website_cookies"` service. It was added here to
+ * adapt video iframe `src` as soon as the HTML document is loaded,
+ * (before interactions start), so that the iframes can be properly
+ * displayed. Remark: the lazy-loaded code should use the function
+ * from the `website_cookies` service.
+ *
+ * @param {HTMLIFrameElement} iframeEl
+ * @param {string} src
+ */
+function manageIframeSrcOnLoad(iframeEl, src) {
+    if (!iframeEl.closest("[data-need-cookies-approval]")) {
+        iframeEl.setAttribute("src", src);
+    } else {
+        iframeEl.dataset.nocookieSrc = src;
+        iframeEl.setAttribute("src", "about:blank");
+        iframeEl.dataset.needCookiesApproval = "true";
+    }
+}
+
+/**
+ * Builds a video iframe for a saved `src` and appends it to the DOM.
+ *
+ * @param {HTMLElement} parentEl The iframe container.
+ * @param {function} manageIframeSrcFct The iframe `src` handler.
+ * @returns {HTMLIframeElement}
+ */
+export function generateVideoIframe(parentEl, manageIframeSrcFct) {
+    // Bug fix / compatibility: empty the <div/> element as all information
+    // to rebuild the iframe should have been saved on the <div/> element
+    parentEl.replaceChildren();
+
+    // Add extra content for size / edition
+    const extraEditionEl = document.createElement("div");
+    extraEditionEl.className = "css_editable_mode_display";
+    const extraSizeEl = document.createElement("div");
+    extraSizeEl.className = "media_iframe_video_size";
+    parentEl.append(extraEditionEl, extraSizeEl);
+
+    // Rebuild the iframe. Depending on version / compatibility / instance, the
+    // src is saved in the 'data-src' attribute or the 'data-oe-expression' one.
+    const src = escape(parentEl.dataset.oeExpression || parentEl.dataset.src);
+    // Validate the src to only accept supported domains we can trust
+    const m = src.match(/^(?:https?:)?\/\/([^/?#]+)/);
+    if (!m) {
+        // Unsupported protocol or wrong URL format, don't inject iframe
+        return;
+    }
+    const domain = m[1].replace(/^www\./, "");
+    if (!SUPPORTED_DOMAINS.includes(domain)) {
+        // Unsupported domain, don't inject iframe
+        return;
+    }
+    const iframeEl = document.createElement("iframe");
+    iframeEl.setAttribute("frameborder", "0");
+    iframeEl.setAttribute("allowfullscreen", "allowfullscreen");
+    parentEl.appendChild(iframeEl);
+    manageIframeSrcFct ? manageIframeSrcFct(iframeEl, src) : manageIframeSrcOnLoad(iframeEl, src);
+
+    return iframeEl;
+}
+
+/**
+ * Auto generate video iframes.
+ */
+document.addEventListener("DOMContentLoaded", () => {
+    for (const videoIframeEl of document.querySelectorAll(".media_iframe_video")) {
+        if (!videoIframeEl.querySelector(":scope > iframe")) {
+            generateVideoIframe(videoIframeEl);
+        }
+    }
+});

From 59342cb0e1c18b809741f67be6003a3b44d4042f Mon Sep 17 00:00:00 2001
From: bhra-odoo <bhra@odoo.com>
Date: Mon, 3 Nov 2025 05:55:38 +0000
Subject: [PATCH 582/673] [FIX] account_fleet: move fleet tax report test and
 query to enterprise

Community build was failing with:
```
FAIL: TestAccountFleet.test_tax_report_with_vehicle_split_repartition
Traceback (most recent call last):
File '/data/build/odoo/addons/account_fleet/tests/test_account_fleet.py',
line 99, in test_tax_report_with_vehicle_split_repartition
self.assertEqual(len(tax_details), 2)
AssertionError: 0 != 2
```

The test and SQL join logic relied on `vehicle_id` propagation that only
exists in the enterprise addon `account_accountant_fleet`. Since the
community edition cannot populate `vehicle_id` on tax lines, the query
always returned zero rows, causing the failure.

To fix this, the fleet-specific tax report query and test have been
moved to the enterprise module, where the vehicle-aware tax reporting
functionality actually resides. This keeps community builds green while
retaining the intended behavior in enterprise.

runbot error:233462

closes odoo/odoo#235659

X-original-commit: 3fca4e1322035fefd2d09056c15355cfe0d286fd
Related: odoo/enterprise#99473
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Raj Bhuva (bhra) <bhra@odoo.com>
---
 addons/account_fleet/tests/test_account_fleet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_fleet/tests/test_account_fleet.py b/addons/account_fleet/tests/test_account_fleet.py
index 055d85253a500..22decdce46b9f 100644
--- a/addons/account_fleet/tests/test_account_fleet.py
+++ b/addons/account_fleet/tests/test_account_fleet.py
@@ -1,7 +1,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from freezegun import freeze_time
-
 from odoo.tests import tagged
 
 from odoo.addons.account.tests.common import AccountTestInvoicingCommon

From 1c9de2c990c63bdaac3f263f5bd32a5f6db1a00e Mon Sep 17 00:00:00 2001
From: hatr-odoo <hatr@odoo.com>
Date: Wed, 17 Sep 2025 13:02:03 +0000
Subject: [PATCH 583/673] [IMP] l10n_in_*: streamline HSN warnings

With this commit, we remove the warning about mismatches between HSN code and
product type. From now on, the product type will be derived directly from the
HSN code: if the HSN starts with '99', it will be considered a 'service';
otherwise, it will be treated as 'goods'. This simplifies the user experience by
reducing unnecessary warnings. This will also cover cases where the product is
service but the HSN is of goods for e.g. Job Work, Discount Line etc.

Additionally, invalid/missing HSN on invoice line will now raise a blocking
warning.

task-5061450

X-original-commit: 41eaffa7fd3db41360cb315520d55a98ad493dd5
Part-of: odoo/odoo#235576
Related: odoo/enterprise#99442
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Harsh Trivedi (hatr) <hatr@odoo.com>
---
 addons/l10n_in/models/account_invoice.py           |  6 +++++-
 addons/l10n_in_edi/i18n/l10n_in_edi.pot            |  4 ++--
 addons/l10n_in_edi/models/account_move.py          |  2 +-
 addons/l10n_in_edi/models/account_move_line.py     |  5 +++--
 addons/l10n_in_ewaybill/i18n/l10n_in_ewaybill.pot  | 12 ++++++++++++
 addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py |  8 ++++++--
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_in/models/account_invoice.py b/addons/l10n_in/models/account_invoice.py
index 7565b9fa1382e..dd8b5748cd44d 100644
--- a/addons/l10n_in/models/account_invoice.py
+++ b/addons/l10n_in/models/account_invoice.py
@@ -683,10 +683,14 @@ def _get_l10n_in_seller_buyer_party(self):
     @api.model
     def _l10n_in_extract_digits(self, string):
         if not string:
-            return string
+            return ""
         matches = re.findall(r"\d+", string)
         return "".join(matches)
 
+    @api.model
+    def _l10n_in_is_service_hsn(self, hsn_code):
+        return self._l10n_in_extract_digits(hsn_code).startswith('99')
+
     @api.model
     def _l10n_in_round_value(self, amount, precision_digits=2):
         """
diff --git a/addons/l10n_in_edi/i18n/l10n_in_edi.pot b/addons/l10n_in_edi/i18n/l10n_in_edi.pot
index b742b2cf23106..ab0c83354c5ba 100644
--- a/addons/l10n_in_edi/i18n/l10n_in_edi.pot
+++ b/addons/l10n_in_edi/i18n/l10n_in_edi.pot
@@ -128,7 +128,7 @@ msgstr ""
 #. module: l10n_in_edi
 #. odoo-python
 #: code:addons/l10n_in_edi/models/account_move_line.py:0
-msgid "Check Invoice Lines"
+msgid "Check Invoice Line(s)"
 msgstr ""
 
 #. module: l10n_in_edi
@@ -565,7 +565,7 @@ msgstr ""
 #. module: l10n_in_edi
 #. odoo-python
 #: code:addons/l10n_in_edi/models/account_move_line.py:0
-msgid "View Invoice Lines"
+msgid "View Invoice Line(s)"
 msgstr ""
 
 #. module: l10n_in_edi
diff --git a/addons/l10n_in_edi/models/account_move.py b/addons/l10n_in_edi/models/account_move.py
index cb7e204aca92b..e312daaf6895f 100644
--- a/addons/l10n_in_edi/models/account_move.py
+++ b/addons/l10n_in_edi/models/account_move.py
@@ -468,7 +468,7 @@ def _get_l10n_in_edi_line_details(self, index, line, line_tax_details):
         in_round = self._l10n_in_round_value
         line_details = {
             'SlNo': str(index),
-            'IsServc': line.product_id.type == 'service' and 'Y' or 'N',
+            'IsServc': self._l10n_in_is_service_hsn(line.l10n_in_hsn_code) and 'Y' or 'N',
             'HsnCd': self._l10n_in_extract_digits(line.l10n_in_hsn_code),
             'Qty': in_round(quantity or 0.0, 3),
             'Unit': (
diff --git a/addons/l10n_in_edi/models/account_move_line.py b/addons/l10n_in_edi/models/account_move_line.py
index a63b259fad9a8..827670774719e 100644
--- a/addons/l10n_in_edi/models/account_move_line.py
+++ b/addons/l10n_in_edi/models/account_move_line.py
@@ -39,15 +39,16 @@ def _l10n_in_check_einvoice_validation(self):
 
         return {
             f"l10n_in_edi_{error_code}": {
+                'level': 'danger' if error_code == 'invalid_hsn' else 'warning',
                 'message': error_messages[error_code],
-                'action_text': _("View Invoice Lines"),
+                'action_text': _("View Invoice Line(s)"),
                 # The context are set in view_move_line_tree_hsn_l10n_in
                 # Please make sure to change, if any change in error codes
                 'action': lines.with_context(**{
                     error_code: True,
                     'send_and_print': True
                 })._get_records_action(
-                    name=_("Check Invoice Lines"),
+                    name=_("Check Invoice Line(s)"),
                     domain=[('id', 'in', lines.ids)],
                     views=[(
                         self.env.ref('l10n_in.view_move_line_tree_hsn_l10n_in').id,
diff --git a/addons/l10n_in_ewaybill/i18n/l10n_in_ewaybill.pot b/addons/l10n_in_ewaybill/i18n/l10n_in_ewaybill.pot
index 4331388dfef9a..7125276ffbda8 100644
--- a/addons/l10n_in_ewaybill/i18n/l10n_in_ewaybill.pot
+++ b/addons/l10n_in_ewaybill/i18n/l10n_in_ewaybill.pot
@@ -419,6 +419,12 @@ msgstr ""
 msgid "Cess value should not be negative"
 msgstr ""
 
+#. module: l10n_in_ewaybill
+#. odoo-python
+#: code:addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py:0
+msgid "Check Invoice Line(s)"
+msgstr ""
+
 #. module: l10n_in_ewaybill
 #: model_terms:ir.ui.view,arch_db:l10n_in_ewaybill.report_ewaybill
 msgid "Combination of 2 and 3"
@@ -2979,6 +2985,12 @@ msgstr ""
 msgid "Verify Username and Password"
 msgstr ""
 
+#. module: l10n_in_ewaybill
+#. odoo-python
+#: code:addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py:0
+msgid "View Invoice Line(s)"
+msgstr ""
+
 #. module: l10n_in_ewaybill
 #: model:ir.model.fields.selection,name:l10n_in_ewaybill.selection__l10n_in_ewaybill__blocking_level__warning
 msgid "Warning"
diff --git a/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py b/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py
index ee8db33d39f2e..5100b011959cc 100644
--- a/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py
+++ b/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py
@@ -385,16 +385,20 @@ def _check_document_number(self):
     def _check_lines(self):
         error_message = []
         invoice_lines = self.account_move_id.invoice_line_ids
+        AccountMove = self.env['account.move']
         if not any(l.product_id for l in invoice_lines):
             error_message.append(_("Ensure that at least one line item includes a product."))
             return error_message
-        if all(l.product_id.type == 'service' for l in invoice_lines if l.product_id):
+        if all(
+            AccountMove._l10n_in_is_service_hsn(l.l10n_in_hsn_code)
+            for l in invoice_lines if l.product_id
+        ):
             error_message.append(_("You need at least one product having 'Product Type' as stockable or consumable."))
             return error_message
         for line in invoice_lines:
             if (
                 line.display_type == 'product'
-                and line.product_id.type != 'service'
+                and not AccountMove._l10n_in_is_service_hsn(line.l10n_in_hsn_code)
                 and (hsn_error_message := line._l10n_in_check_invalid_hsn_code())
             ):
                 error_message.append(hsn_error_message)

From fda5407c833b6d8530909530ad82d63191f9f6bc Mon Sep 17 00:00:00 2001
From: hatr-odoo <hatr@odoo.com>
Date: Thu, 13 Nov 2025 09:19:05 +0000
Subject: [PATCH 584/673] [IMP] l10n_in_*: truncate product descriptions for
 e-invoicing and ewaybill

Product descriptions in invoice lines must comply with character limits for
e-invoicing and e-waybill:

- E-invoicing: maximum 300 characters
- E-waybill: maximum 100 characters for both product names and descriptions

Descriptions exceeding these limits are automatically truncated in the generated
JSON.

task-5061450

closes odoo/odoo#235576

X-original-commit: f1c7d3edc607208b77c1e348e9cde270be652c57
Related: odoo/enterprise#99442
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Harsh Trivedi (hatr) <hatr@odoo.com>
---
 addons/l10n_in_edi/models/account_move.py                     | 2 +-
 addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py            | 4 ++--
 addons/l10n_in_ewaybill_stock/models/l10n_in_ewaybill.py      | 4 ++--
 .../l10n_in_ewaybill_stock/views/l10n_in_ewaybill_views.xml   | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/l10n_in_edi/models/account_move.py b/addons/l10n_in_edi/models/account_move.py
index e312daaf6895f..eefbda21579a6 100644
--- a/addons/l10n_in_edi/models/account_move.py
+++ b/addons/l10n_in_edi/models/account_move.py
@@ -504,7 +504,7 @@ def _get_l10n_in_edi_line_details(self, index, line, line_tax_details):
             'TotItemVal': in_round((sign * line.balance) + line_tax_details.get('tax_amount', 0.00)),
         }
         if line.name:
-            line_details['PrdDesc'] = line.name.replace("\n", "")
+            line_details['PrdDesc'] = line.name.replace("\n", "")[:300]
         return line_details
 
     def _l10n_in_edi_generate_invoice_json_managing_negative_lines(self, json_payload):
diff --git a/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py b/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py
index 5100b011959cc..5cab540b6735e 100644
--- a/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py
+++ b/addons/l10n_in_ewaybill/models/l10n_in_ewaybill.py
@@ -570,9 +570,9 @@ def _get_l10n_in_ewaybill_line_details(self, line, tax_details):
         round_value = self.env['account.move']._l10n_in_round_value
         tax_details_by_code = self.env['account.move']._get_l10n_in_tax_details_by_line_code(tax_details.get('tax_details', {}))
         line_details = {
-            'productName': line.product_id.name,
+            'productName': line.product_id.name[:100] if line.product_id else "",
             'hsnCode': extract_digits(line.l10n_in_hsn_code),
-            'productDesc': line.name,
+            'productDesc': line.name[:100] if line.name else "",
             'quantity': line.quantity,
             'qtyUnit': line.product_uom_id.l10n_in_code and line.product_uom_id.l10n_in_code.split('-')[0] or 'OTH',
             'taxableAmount': round_value(line.balance * sign),
diff --git a/addons/l10n_in_ewaybill_stock/models/l10n_in_ewaybill.py b/addons/l10n_in_ewaybill_stock/models/l10n_in_ewaybill.py
index e4ce82509d8ba..4e1a4a23ac4e3 100644
--- a/addons/l10n_in_ewaybill_stock/models/l10n_in_ewaybill.py
+++ b/addons/l10n_in_ewaybill_stock/models/l10n_in_ewaybill.py
@@ -220,9 +220,9 @@ def _get_l10n_in_ewaybill_line_details(self, line, tax_details):
             AccountMove = self.env['account.move']
             product = line.product_id
             line_details = {
-                'productName': product.name,
+                'productName': product.name[:100],
                 'hsnCode': AccountMove._l10n_in_extract_digits(product.l10n_in_hsn_code),
-                'productDesc': product.name,
+                'productDesc': line.description_picking[:100] if line.description_picking else "",
                 'quantity': line.quantity,
                 'qtyUnit': (
                     line.product_uom.l10n_in_code
diff --git a/addons/l10n_in_ewaybill_stock/views/l10n_in_ewaybill_views.xml b/addons/l10n_in_ewaybill_stock/views/l10n_in_ewaybill_views.xml
index 43f7575d07bcd..49d6d106f6213 100644
--- a/addons/l10n_in_ewaybill_stock/views/l10n_in_ewaybill_views.xml
+++ b/addons/l10n_in_ewaybill_stock/views/l10n_in_ewaybill_views.xml
@@ -54,6 +54,7 @@
                                 <list editable="bottom" create="0" delete="0">
                                     <field name="company_currency_id" column_invisible="1"/> <!-- To display the currency symbol  -->
                                     <field name="product_id" readonly="1"/>
+                                    <field name="description_picking" string="Description" help="Max 100-character description is allowed" readonly="1"/>
                                     <field name="quantity" string="Quantity" readonly="1"/>
                                     <field name="ewaybill_price_unit" string="Unit Price"/>
                                     <field name="ewaybill_tax_ids" widget="many2many_tax_tags"/>

From 353a2973067db1b8d4f7be20e18f58bb3f8d6d09 Mon Sep 17 00:00:00 2001
From: "Sanket Tank(stan)" <stan@odoo.com>
Date: Tue, 4 Nov 2025 12:27:44 +0000
Subject: [PATCH 585/673] [FIX] mrp_subcontracting: allow qty edit for tracked
 non-subcontracted products

Issue Before This Commit:
-----
- When subcontracting was enabled, users were unable to edit the quantity of
traceable products directly on transfer lines, even if those products were not
part of any subcontracting flow. This causes unnecessary limitations in normal
warehouse operations.

Steps to Reproduce:
-----
- Install the `mrp_subcontracting` module.
- Create a transfer containing a traceable product (lot/serial tracked).
- Confirm the transfer (_Mark as Todo_).
- Try to edit the quantity directly on the transfer line.
- Notice that the field is non-editable, even though the transfer is not part of
a subcontracting process.

Cause of the Issue:
-----
- The quantity field was made globally read-only for tracked products in this
[`PR`](https://github.com/odoo/odoo/pull/220383/files#diff-a5b7491ccd078355b6edcbc19b7f85e3847c65c4f953457dd5e668e86299119cR18-R20.

With This Commit:
-----
- Users can now edit quantities of traceable products on transfer lines when
they are not used in subcontracting.
- This helps streamline regular transfer operations by allowing quick quantity
adjustments without affecting subcontracting flows.

Task - 5169885

closes odoo/odoo#235578

X-original-commit: f0c85289cfeb7d848368334ed9d0c46c79315d46
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Sanket Hasmukhbhai Tank (stan) <stan@odoo.com>
---
 addons/mrp_subcontracting/views/stock_picking_views.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/mrp_subcontracting/views/stock_picking_views.xml b/addons/mrp_subcontracting/views/stock_picking_views.xml
index 2ed5eb867f99e..a98f739880966 100644
--- a/addons/mrp_subcontracting/views/stock_picking_views.xml
+++ b/addons/mrp_subcontracting/views/stock_picking_views.xml
@@ -11,9 +11,6 @@
                         type="object" class="oe_stat_button" icon="fa-sitemap"
                         invisible="not show_subcontracting_details_visible"/>
             </xpath>
-            <xpath expr="//field[@name='move_ids']/list//field[@name='quantity']" position="attributes">
-                <attribute name="readonly" separator="or" add="has_tracking != 'none'"/>
-            </xpath>
         </field>
     </record>
 </odoo>

From 309cba8d156e02ef4aea7e272a0dd07d400d645c Mon Sep 17 00:00:00 2001
From: pkgu-odoo <pkgu@odoo.com>
Date: Thu, 6 Nov 2025 05:51:34 +0000
Subject: [PATCH 586/673] [FIX] l10n_din5008: fix missing line numbers in sale
 order report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
- Install sale_management and l10n_de modules with demo data.
- Set the company to a DE company
- From setting activate `Show Position Column in Reports` option.
- Create a sale order with multiple products and add some section lines
- Notice that the sequence number only appears on section lines, not on product
lines

Issue:
- Line numbers are coming to section line instead of product lines in
the sale order report.

Cause:
- The XPath used in the inherited template no longer matches due to changes in
the base report structure, resulting in numbering being applied only to section
lines.

Solution:
- Update the XPath expression to correctly target the updated template structure
so that sequence numbers are displayed for all sale order lines.

opw - 5147198

X-original-commit: 7553f6c3c77d8fc2b4e6625f6a1f17167434210d
Part-of: odoo/odoo#235577
Signed-off-by: Sven Führ (svfu) <svfu@odoo.com>
Signed-off-by: Pawan Kumar Gupta (pkgu) <pkgu@odoo.com>
---
 addons/l10n_din5008_sale/report/din5008_sale_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_din5008_sale/report/din5008_sale_templates.xml b/addons/l10n_din5008_sale/report/din5008_sale_templates.xml
index b885bc129e908..293500b441ec8 100644
--- a/addons/l10n_din5008_sale/report/din5008_sale_templates.xml
+++ b/addons/l10n_din5008_sale/report/din5008_sale_templates.xml
@@ -105,7 +105,7 @@
                 <t t-set="line_number" t-value="1"/>
             </t>
         </xpath>
-        <xpath expr="//table/tbody//tr[1]//td[1]" position="before">
+        <xpath expr="//td[@name='td_product_name']" position="before">
             <t t-if="doc.company_id.has_position_column">
                <td class="text-start" t-out="line_number"/>
                 <t t-set="line_number" t-value="line_number+1"/>

From e2f999e34c2b3cf80b945529e32570aa09421ee2 Mon Sep 17 00:00:00 2001
From: pkgu-odoo <pkgu@odoo.com>
Date: Thu, 13 Nov 2025 11:50:48 +0000
Subject: [PATCH 587/673] [FIX] l10n_din5008_sale: fix section alignment in
 sale order and invoice report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
- Install `sale_management` and `l10n_de` modules with demo data.
- Set the company to a DE company
- From setting activate `Show Position Column in Reports` option
- Create an invoice with multiple products and add some section lines and print
invoice
-Notice that the alignment of the section is misplaced.

Issue:

- Notice that the alignment of the section is misplaced — the amount should be
on the right side, below the “Amount” column.
- The same issue occurs in the Sale Order as well.

Cause:

- Added one extra column ‘Position’ in the line, but the section doesn’t have it
causing misalignment5147198 between the line and section.

Solution:

- Added an XPath for the empty column to resolve the position misalignment issue

opw - 5147198

closes odoo/odoo#235577

X-original-commit: 1fcc9a4a04ef0223049414b1a95f656be69a9dcd
Signed-off-by: Sven Führ (svfu) <svfu@odoo.com>
Signed-off-by: Pawan Kumar Gupta (pkgu) <pkgu@odoo.com>
---
 addons/l10n_din5008/report/din5008_report.xml              | 6 ++++++
 addons/l10n_din5008_sale/report/din5008_sale_templates.xml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/addons/l10n_din5008/report/din5008_report.xml b/addons/l10n_din5008/report/din5008_report.xml
index 26110323975d1..0b2607d6e5c8d 100644
--- a/addons/l10n_din5008/report/din5008_report.xml
+++ b/addons/l10n_din5008/report/din5008_report.xml
@@ -274,6 +274,12 @@
                     <th name="th_position" class="text-start">Position</th>
                 </t>
             </xpath>
+            <!-- Insert Empty Column for Position Numbers to Handle Section Misalignment -->
+            <xpath expr="//td[@name='line_name_td']" position="after">
+                <t t-if="o.company_id.has_position_column">
+                    <td/>
+                </t>
+            </xpath>
 
             <xpath expr="//table[@name='invoice_line_table']/tbody//t[1]" position="before">
                 <t t-if="o.company_id.has_position_column">
diff --git a/addons/l10n_din5008_sale/report/din5008_sale_templates.xml b/addons/l10n_din5008_sale/report/din5008_sale_templates.xml
index 293500b441ec8..5123a121b0d5f 100644
--- a/addons/l10n_din5008_sale/report/din5008_sale_templates.xml
+++ b/addons/l10n_din5008_sale/report/din5008_sale_templates.xml
@@ -100,6 +100,12 @@
                 <th name="th_position" class="text-start">Position</th>
             </t>
         </xpath>
+        <!-- Insert Empty Column for Position Numbers to Handle Section Misalignment -->
+        <xpath expr="//td[@name='td_section_name']" position="after">
+            <t t-if="doc.company_id.has_position_column">
+               <td/>
+            </t>
+        </xpath>
         <xpath expr="//table/tbody" position="before">
             <t t-if="doc.company_id.has_position_column">
                 <t t-set="line_number" t-value="1"/>

From 52e7755c562bfe5487f77c3e8efa971bf9139ea5 Mon Sep 17 00:00:00 2001
From: roto-odoo <roto@odoo.com>
Date: Mon, 27 Oct 2025 14:06:00 +0100
Subject: [PATCH 588/673] [IMP] l10n_es_edi_verifactu: Alert banner resequence
 under veri*factu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If Veri*Factu is enabled in production mode, display a banner if a user
wants to resequence moves because that's illegal.

task-5187419

closes odoo/odoo#234330

Signed-off-by: de Wouters de Bouchout Jean-Benoît (jbw) <jbw@odoo.com>
---
 addons/l10n_es_edi_verifactu/__manifest__.py  |  1 +
 .../l10n_es_edi_verifactu/wizard/__init__.py  |  1 +
 .../wizard/account_resequence.py              | 15 +++++++++++++++
 .../wizard/account_resequence_views.xml       | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 addons/l10n_es_edi_verifactu/wizard/account_resequence.py
 create mode 100644 addons/l10n_es_edi_verifactu/wizard/account_resequence_views.xml

diff --git a/addons/l10n_es_edi_verifactu/__manifest__.py b/addons/l10n_es_edi_verifactu/__manifest__.py
index 4e608b714938a..adc0846f49f4f 100644
--- a/addons/l10n_es_edi_verifactu/__manifest__.py
+++ b/addons/l10n_es_edi_verifactu/__manifest__.py
@@ -9,6 +9,7 @@
     'data': [
         'security/ir.model.access.csv',
         'wizard/account_move_reversal_views.xml',
+        'wizard/account_resequence_views.xml',
         'views/account_move_views.xml',
         'views/account_tax_views.xml',
         'views/certificate_certificate_views.xml',
diff --git a/addons/l10n_es_edi_verifactu/wizard/__init__.py b/addons/l10n_es_edi_verifactu/wizard/__init__.py
index 7076207375e01..39d50c55b5371 100644
--- a/addons/l10n_es_edi_verifactu/wizard/__init__.py
+++ b/addons/l10n_es_edi_verifactu/wizard/__init__.py
@@ -1,3 +1,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import account_move_reversal
+from . import account_resequence
diff --git a/addons/l10n_es_edi_verifactu/wizard/account_resequence.py b/addons/l10n_es_edi_verifactu/wizard/account_resequence.py
new file mode 100644
index 0000000000000..a38cae5ae83b2
--- /dev/null
+++ b/addons/l10n_es_edi_verifactu/wizard/account_resequence.py
@@ -0,0 +1,15 @@
+from odoo import fields, models
+
+
+class AccountResequenceWizard(models.TransientModel):
+    _inherit = 'account.resequence.wizard'
+
+    # Technical field to display (or not) banner in wizard
+    l10n_es_edi_verifactu_required_in_prod = fields.Boolean(compute='_compute_l10n_es_edi_verifactu_required_in_prod')
+
+    def _compute_l10n_es_edi_verifactu_required_in_prod(self):
+        for wizard in self:
+            wizard.l10n_es_edi_verifactu_required_in_prod = (
+                any(move.l10n_es_edi_verifactu_required for move in wizard.move_ids)
+                and any(not company.l10n_es_edi_verifactu_test_environment for company in wizard.move_ids.company_id)
+            )
diff --git a/addons/l10n_es_edi_verifactu/wizard/account_resequence_views.xml b/addons/l10n_es_edi_verifactu/wizard/account_resequence_views.xml
new file mode 100644
index 0000000000000..4874d8235241b
--- /dev/null
+++ b/addons/l10n_es_edi_verifactu/wizard/account_resequence_views.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_account_resequence_inherit_l10n_es_edi_verifactu" model="ir.ui.view">
+            <field name="name">account.resequence.form.inherit.l10n_es_edi_verifactu</field>
+            <field name="model">account.resequence.wizard</field>
+            <field name="inherit_id" ref="account.account_resequence_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='sequence_number_reset']" position="after">
+                    <div class="alert alert-danger" role="alert" invisible="not l10n_es_edi_verifactu_required_in_prod">
+                        Al usar Veri*factu, el número de factura no puede modificarse sin alterar la integridad e
+                        inalterabilidad exigidas por los artículos 8 y 13 del RD 007/2023. Existe un alto riesgo de que
+                        la factura quede invalidada a efectos fiscales.
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>

From ccba334eb06a0ba7cd8cd46fbd163ef78e382790 Mon Sep 17 00:00:00 2001
From: Christopher Rogos <crogos@gmail.com>
Date: Fri, 13 Jun 2025 07:04:18 +0000
Subject: [PATCH 589/673] [IMP] mail: fallback for tracking records without
 display name

closes odoo/odoo#235661

X-original-commit: 7857acbf47a95156a95c0b565f2bc0078333a69a
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/mail/models/mail_tracking_value.py    | 17 +++++++++++++++--
 addons/test_mail/tests/test_message_track.py |  6 ++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/mail/models/mail_tracking_value.py b/addons/mail/models/mail_tracking_value.py
index 5df8731a4734f..c90b022071453 100644
--- a/addons/mail/models/mail_tracking_value.py
+++ b/addons/mail/models/mail_tracking_value.py
@@ -138,16 +138,29 @@ def _create_tracking_values(self, initial_value, new_value, col_name, col_info,
             # - False value
             # - recordset, in case of standard field
             # - [(id, display name), ...], in case of properties (read format)
+            model_name = self.env['ir.model']._get(field.relation).display_name
             if not initial_value:
                 old_value_char = ''
             elif isinstance(initial_value, models.BaseModel):
-                old_value_char = ', '.join(initial_value.mapped('display_name'))
+                old_value_char = ', '.join(
+                    value.display_name or self.env._(
+                        'Unnamed %(record_model_name)s (%(record_id)s)',
+                        record_model_name=model_name, record_id=value.id
+                    )
+                    for value in initial_value
+                )
             else:
                 old_value_char = ', '.join(value[1] for value in initial_value)
             if not new_value:
                 new_value_char = ''
             elif isinstance(new_value, models.BaseModel):
-                new_value_char = ', '.join(new_value.mapped('display_name'))
+                new_value_char = ', '.join(
+                    value.display_name or self.env._(
+                        'Unnamed %(record_model_name)s (%(record_id)s)',
+                        record_model_name=model_name, record_id=value.id
+                    )
+                    for value in new_value
+                )
             else:
                 new_value_char = ', '.join(value[1] for value in new_value)
 
diff --git a/addons/test_mail/tests/test_message_track.py b/addons/test_mail/tests/test_message_track.py
index eede9f6de6204..b0c20f5f44fad 100644
--- a/addons/test_mail/tests/test_message_track.py
+++ b/addons/test_mail/tests/test_message_track.py
@@ -509,15 +509,17 @@ def test_mail_track_2many(self):
                 (0, 0, {'name': 'Child1'}),
                 (0, 0, {'name': 'Child2'}),
                 (0, 0, {'name': 'Child3'}),
+                (0, 0, {'name': False}),
             ],
         })
+        child4_tracking = f'Unnamed Sub-model: pseudo tags for tracking ({test_record.one2many_field[3].id})'
         self.flush_tracking()
         last_message = test_record.message_ids[0]
         self.assertTracking(
             last_message,
             [
                 ('many2many_field', 'many2many', ', '.join(test_tags[:2].mapped('name')), ', '.join((test_tags[1] + test_tags[2]).mapped('name'))),
-                ('one2many_field', 'one2many', '', ', '.join(('Child1', 'Child2', 'Child3'))),
+                ('one2many_field', 'one2many', '', f'Child1, Child2, Child3, {child4_tracking}'),
             ]
         )
 
@@ -527,7 +529,7 @@ def test_mail_track_2many(self):
         last_message = test_record.message_ids[0]
         self.assertTracking(
             last_message,
-            [('one2many_field', 'one2many', ', '.join(('Child1', 'Child2', 'Child3')), ', '.join(('Child2', 'Child3')))]
+            [('one2many_field', 'one2many', f'Child1, Child2, Child3, {child4_tracking}', f'Child2, Child3, {child4_tracking}')]
         )
 
     @users('employee')

From 00e3d6269ab4feab78a4cd40fab85c8f7174ca43 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 14 Nov 2025 07:21:22 +0100
Subject: [PATCH 590/673] [FIX] mail: error when computing last message seen by
 all

The `lastMessageSeenByAllId` compute function sometimes crashes when the
persona linked to a member is unknown. This occurs because the compute
function compares the member's persona to determine if it belongs to
the current user. However, members are not always sent along with their
persona.

The compute function should instead compare the member directly to the
current user's member. This fixes the issue and makes more sense.

closes odoo/odoo#235558

X-original-commit: 16ddbcc94982197b7c6885768eb79a597584c1d7
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 .../mail/static/src/discuss/core/common/thread_model_patch.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/discuss/core/common/thread_model_patch.js b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
index a993d307fe3c0..0c4f6115e4674 100644
--- a/addons/mail/static/src/discuss/core/common/thread_model_patch.js
+++ b/addons/mail/static/src/discuss/core/common/thread_model_patch.js
@@ -97,7 +97,7 @@ const threadPatch = {
                     return;
                 }
                 return this.channel?.channel_member_ids.reduce((lastMessageSeenByAllId, member) => {
-                    if (member.persona.notEq(this.store.self) && member.seen_message_id) {
+                    if (member.notEq(this.self_member_id) && member.seen_message_id) {
                         return lastMessageSeenByAllId
                             ? Math.min(lastMessageSeenByAllId, member.seen_message_id.id)
                             : member.seen_message_id.id;

From 27f9f40d46b3658abe190536bcb27eb734e6eae8 Mon Sep 17 00:00:00 2001
From: "Benoit Socias (bso)" <bso@odoo.com>
Date: Mon, 27 Oct 2025 12:53:14 +0000
Subject: [PATCH 591/673] [FIX] website[_blog]: avoid triggering post link when
 opening a <select>

In some browsers, opening a `<select>` triggers a click event. Because
of this when the blog's sidebar "Archive" dropdown is opened, it might
reload the page before the selection is actually made.

This commit solves this by detecting a distinct event when PostLink is
activated on `<select>` element.

Steps to reproduce:
- Using Firefox
- Install `website_blog`
- Edit the blogs page
- Activate the sidebar
- Save
- Open the "Archive" dropdown

=> The page was reloaded

closes odoo/odoo#235396

X-original-commit: f6bb71ae4c5cedea5c91a31c5ea0a62ad48f8f55
Signed-off-by: Denis Rygaert (dery) <dery@odoo.com>
Signed-off-by: Benoit Socias (bso) <bso@odoo.com>
Co-authored-by: Elier Ayala Bernal <elier@wclik.com>
---
 .../website/static/src/interactions/post_link.js   | 14 +++++++++++++-
 .../website_blog/views/website_blog_components.xml |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/interactions/post_link.js b/addons/website/static/src/interactions/post_link.js
index 516f5880a23fb..e7fc5fc4570f9 100644
--- a/addons/website/static/src/interactions/post_link.js
+++ b/addons/website/static/src/interactions/post_link.js
@@ -5,13 +5,25 @@ import { sendRequest } from "@website/js/utils";
 
 export class PostLink extends Interaction {
     static selector = ".post_link";
+    dynamicSelectors = {
+        ...this.dynamicSelectors,
+        // Distinguish _root according to node type.
+        _select: () => this.el.matches("select") && this.el,
+        _nonSelect: () => !this.el.matches("select") && this.el,
+    };
     dynamicContent = {
         _root: {
-            "t-on-click.prevent": this.onClickPost,
             "t-att-class": () => ({
                 o_post_link_js_loaded: true,
             }),
         },
+        _nonSelect: {
+            "t-on-click.prevent": this.onClickPost,
+        },
+        _select: {
+            // In some browsers the click event is triggered when opening the select.
+            "t-on-change.prevent": this.onClickPost,
+        },
     };
 
     onClickPost() {
diff --git a/addons/website_blog/views/website_blog_components.xml b/addons/website_blog/views/website_blog_components.xml
index a43e57defd427..134af82bd318d 100644
--- a/addons/website_blog/views/website_blog_components.xml
+++ b/addons/website_blog/views/website_blog_components.xml
@@ -116,7 +116,7 @@
 <!-- ======   Template: Date Selector   ========================================
 ============================================================================ -->
 <template id="date_selector">
-    <select name="archive" oninput="location = this.value;" class="form-select post_link">
+    <select name="archive" class="form-select post_link">
         <option t-att-value="blog_url(date_begin=False, date_end=False, tag=tag)"
                 t-att="[('selected' if (not date_begin) else 'unselected' ) , 'true' ]">
                 All dates

From 1069a67384e63a5baa1f1e2add06968c97f031e5 Mon Sep 17 00:00:00 2001
From: sben-odoo <sben@odoo.com>
Date: Wed, 5 Nov 2025 07:47:55 +0000
Subject: [PATCH 592/673] [FIX] website: prevent traceback when clicking on
 Bento block
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
===================
1- Go to Website → Add a Bento block.
2- Click on the block.
→ A traceback occurs.

Cause:
======
The Bento Border XML references `BorderConfigurator` and `ShadowOption`,
but these components were never registered in the `BentoBorderOption`
definition.
https://github.com/odoo/odoo/blob/43654a2a967cb330d65ae0d163a3436462c12c8c/addons/website/static/src/builder/plugins/options/bento_border_option.xml#L8

Solution:
=========
Register BorderConfigurator and ShadowOption as components of
BentoBorderOption to ensure proper initialization.

opw-5234406

closes odoo/odoo#235573

X-original-commit: 51e090babc2c998f93ddfff228ba26b2a4d0f3f9
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
Signed-off-by: Saif Allah Ben Khalil (sben) <sben@odoo.com>
---
 .../src/builder/plugins/options/bento_border_option_plugin.js  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js b/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
index 20a7a1ab7906a..4036b8e822432 100644
--- a/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
@@ -4,10 +4,13 @@ import { withSequence } from "@html_editor/utils/resource";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { BaseOptionComponent } from "@html_builder/core/utils";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+import { ShadowOption } from "@html_builder/plugins/shadow_option";
 
 export class BentoBorderOption extends BaseOptionComponent {
     static template = "html_builder.BentoBorderOption";
     static selector = ".s_bento_banner section[data-name='Card'], .s_bento_block_card";
+    static components = { BorderConfigurator, ShadowOption };
 }
 
 class BentoBorderOptionPlugin extends Plugin {

From b3e7b57a58ae15b54872e03fb9711903ce43445b Mon Sep 17 00:00:00 2001
From: guva-odoo <guva@odoo.com>
Date: Thu, 13 Nov 2025 10:52:24 +0000
Subject: [PATCH 593/673] [FIX] l10n_it_edi: share capital not mandatory

Share capital should not be mandatory for non limited liability
company.

opw-5131029

closes odoo/odoo#235660

X-original-commit: 1abcf116af0002251fc6bc38dc02f511b3545855
Signed-off-by: Paolo Gatti (pgi) <pgi@odoo.com>
---
 addons/l10n_it_edi/models/res_company.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_it_edi/models/res_company.py b/addons/l10n_it_edi/models/res_company.py
index ea8b0bd042cd3..3303a5079103f 100644
--- a/addons/l10n_it_edi/models/res_company.py
+++ b/addons/l10n_it_edi/models/res_company.py
@@ -109,7 +109,8 @@ def _check_eco_incorporated(self):
             must be both present or not present. """
         for record in self:
             if (record.l10n_it_has_eco_index
-                and bool(record.l10n_it_eco_index_share_capital) ^ bool(record.l10n_it_eco_index_sole_shareholder)):
+                and (bool(record.l10n_it_eco_index_share_capital)
+                    ^ (record.l10n_it_eco_index_sole_shareholder and record.l10n_it_eco_index_sole_shareholder != 'NO'))):
                 raise ValidationError(_("If one of Share Capital or Sole Shareholder is present, "
                                         "then they must be both filled out."))
 

From 59a83b13fc30451ea6ca0f373791ac3bb5ac5222 Mon Sep 17 00:00:00 2001
From: Harsh Modi <hamo@odoo.com>
Date: Tue, 11 Nov 2025 10:31:05 +0000
Subject: [PATCH 594/673] [FIX] l10n_in: fix fiscal mapping for branch

In cases, where new taxes are introduced in stable,
and for the fiscal mapping are added as well. But for
existing dbs, the new tax might not be available
and when creating new branch it might lead to
traceback because, we create new fiscals for
intrastate and interstate

closes odoo/odoo#235666

X-original-commit: fe356435dff3d105951d5d13d826c27958649fc7
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Harsh Modi (hamo) <hamo@odoo.com>
---
 addons/l10n_in/models/company.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in/models/company.py b/addons/l10n_in/models/company.py
index 8713d1c1676a1..3b7c748db4d19 100644
--- a/addons/l10n_in/models/company.py
+++ b/addons/l10n_in/models/company.py
@@ -1,7 +1,7 @@
 import pytz
 from stdnum.in_ import pan, gstin
 
-from odoo import _, api, fields, models 
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import RedirectWarning
 
 
@@ -164,6 +164,12 @@ def _update_l10n_in_fiscal_position(self):
         for company in companies_need_update_fp:
             ChartTemplate = self.env['account.chart.template'].with_company(company)
             fiscal_position_data = ChartTemplate._get_in_account_fiscal_position()
+            for values in fiscal_position_data.values():
+                values['tax_ids'] = [Command.set([
+                    xml_id
+                    for xml_id in values['tax_ids'][0][2]
+                    if ChartTemplate.ref(xml_id, raise_if_not_found=False)
+                ])]
             ChartTemplate._load_data({'account.fiscal.position': fiscal_position_data})
 
     def _update_l10n_in_is_gst_registered(self):

From 3e9365af4bf806cc4ca0283ab9a16dc7a8a77530 Mon Sep 17 00:00:00 2001
From: sben-odoo <sben@odoo.com>
Date: Mon, 3 Nov 2025 13:34:21 +0000
Subject: [PATCH 595/673] [FIX] website: Make menu inherit header font-size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:
===================
- Create a menu and a submenu
- Change the header template to the hamburger menu
- Update the navbar format
->The format of the submenu's parent is not updated.

Cause:
======
The menu in the hamburger layout uses the `.accordion-button` class,
which applies a fixed base font size defined here:
https://github.com/odoo/odoo/blob/ebb250d3b56970c09ffb5ebefef38f97c622c33d/addons/web/static/lib/bootstrap/scss/_accordion.scss#L37
This prevents the submenu text from inheriting the updated header
font-size.

Solution:
=========
Allow the `.accordion-button` font size to inherit from its parent.
This ensures that submenu text correctly follows the header's
font-size setting.

opw-5223664

closes odoo/odoo#235634

X-original-commit: 2df70cf4329127c8b6997d063a44d6ab724d00e2
Signed-off-by: Soukéina Bojabza (sobo) <sobo@odoo.com>
Signed-off-by: Saif Allah Ben Khalil (sben) <sben@odoo.com>
---
 addons/website/static/src/scss/website.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index f1ab1d4eb24b3..5ead72f710a25 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -435,6 +435,8 @@ $-navbar-mobile-bg-color: o-color('menu-custom') or o-color('menu');
         }
 
         .accordion-button {
+            font-size: inherit;
+
             &:not(.collapsed) {
                 @if $-navbar-mobile-bg-color != null {
                     background-color: shade-color($-navbar-mobile-bg-color, 5%);

From a981bec84cd835fd1761d7c8fb5476b231e06367 Mon Sep 17 00:00:00 2001
From: Carmine <csan@odoo.com>
Date: Thu, 4 Sep 2025 12:02:27 +0000
Subject: [PATCH 596/673] [FIX] account: ensure unique alias name when alias
 domain is not set

**Issue**
When creating two new journals and selecting the *type*
before the *name*, Odoo generates an alias using the type
(e.g. `sale--...`). When saving a second journal with the
same type, the alias conflicts and raises a
"This alias already exists" error.

**Steps to Reproduce**
1. Navigate to Accounting > Configuration > Journals.
2. Create a new journal.
3. Set the Type to Sales before entering the *Name.
4. Save the journal.
5. Repeat the process to create another journal of the same type.
6. Observe that an error occurs: alias name is already used.

**Root Cause**
The uniqueness check in _ensure_unique_alias only compares
alias_name against existing aliases with the same alias_domain.
However, many aliases are created with alias_domain = False.
Since those were excluded from the domain, the check failed
to detect duplicates correctly.

**Fix**
Update the domain in _ensure_unique_alias to also include
aliases where alias_domain is unset. This ensures that
aliases are always unique regardless of whether a domain is configured.

Opw-5028713

closes odoo/odoo#234601

X-original-commit: bf9f514bc9da8ffe53d35216bc100aaefd8a8f4c
Signed-off-by: Carmine Santomauro (csan) <csan@odoo.com>
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
---
 addons/account/models/account_journal.py     |  2 +-
 addons/account/tests/test_account_journal.py | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_journal.py b/addons/account/models/account_journal.py
index 4296410bdd80a..049668d1025b0 100644
--- a/addons/account/models/account_journal.py
+++ b/addons/account/models/account_journal.py
@@ -842,7 +842,7 @@ def _ensure_unique_alias(self, vals, company):
 
         domain = [('alias_name', '=', alias_name)]
         if alias_domain_name:
-            domain.append(('alias_domain', '=', alias_domain_name))
+            domain.extend(['|', ('alias_domain', '=', alias_domain_name), ('alias_domain_id', '=', False)])
 
         existing_alias = self.env['mail.alias'].search_count(domain, limit=1)
 
diff --git a/addons/account/tests/test_account_journal.py b/addons/account/tests/test_account_journal.py
index 336d5815da005..0e59ec34e788f 100644
--- a/addons/account/tests/test_account_journal.py
+++ b/addons/account/tests/test_account_journal.py
@@ -455,3 +455,23 @@ def test_send_email_to_alias_from_other_company(self):
             msg_id='<test-account-move-alias-id>',
         )
         self.assertTrue(self.env['account.move'].search([('invoice_source_email', '=', 'company_2_user@test.com')]))
+
+    def test_alias_uniqueness_without_domain(self):
+        """Ensure alias_name is unique even if alias_domain is not defined."""
+        default_account = self.env['account.account'].search(
+            domain=[('account_type', 'in', ('income', 'income_other'))],
+            limit=1,
+        )
+        with Form(self.env['account.journal']) as journal_form:
+            journal_form.type = 'sale'
+            journal_form.code = 'A'
+            journal_form.name = 'Test Journal 1'
+            journal_form.default_account_id = default_account
+            journal_1 = journal_form.save()
+        with Form(self.env['account.journal']) as journal_form:
+            journal_form.type = 'sale'
+            journal_form.code = 'B'
+            journal_form.name = 'Test Journal 2'
+            journal_form.default_account_id = default_account
+            journal_2 = journal_form.save()
+        self.assertNotEqual(journal_1.alias_id.alias_name, journal_2.alias_id.alias_name)

From c0eed1c43bbaebb2712ec87b2179c359f9e2b7da Mon Sep 17 00:00:00 2001
From: makb-odoo <makb@odoo.com>
Date: Tue, 19 Aug 2025 14:59:34 +0530
Subject: [PATCH 597/673] [IMP] hr_timesheet,project,sale_*:
 formatted_display_name in M2X fields

_*=sale_service, sale_timesheet

New formatting for M2X selection of:
 - sale order
 - sale order line
 - timesheet task
 - project milestone (with deadline)

 Improved display_name of Sale Orders, Sale Order Lines, Tasks in Timesheets,
 and Project Milestones (including deadline formatting) in M2X dropdowns by
 applying formatted_display_name.

task-4972325

closes odoo/odoo#224393

Related: odoo/enterprise#93259
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/hr_timesheet/models/project_task.py      |  9 ++++++---
 addons/project/models/project_milestone.py      |  5 ++++-
 addons/sale/models/sale_order.py                | 11 +++++++----
 addons/sale_service/models/sale_order_line.py   | 13 +++++++++++++
 addons/sale_timesheet/models/sale_order_line.py |  7 +++++--
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/addons/hr_timesheet/models/project_task.py b/addons/hr_timesheet/models/project_task.py
index 4bccc07ea78bd..e913d3c22b208 100644
--- a/addons/hr_timesheet/models/project_task.py
+++ b/addons/hr_timesheet/models/project_task.py
@@ -221,7 +221,7 @@ def _get_timesheet_report_data(self):
             'timesheets_per_task': timesheets_per_task,
         }
 
-    @api.depends_context('hr_timesheet_display_remaining_hours')
+    @api.depends_context('hr_timesheet_display_remaining_hours', 'formatted_display_name')
     def _compute_display_name(self):
         super()._compute_display_name()
         if self.env.context.get('hr_timesheet_display_remaining_hours'):
@@ -231,13 +231,16 @@ def _compute_display_name(self):
                     task.display_name = task.display_name + "\u00A0" + days_left
                 elif task.allow_timesheets and task.allocated_hours > 0:
                     hours, mins = (str(int(duration)).rjust(2, '0') for duration in divmod(abs(task.remaining_hours) * 60, 60))
-                    hours_left = _(
+                    hours_left = self.env._(
                         "(%(sign)s%(hours)s:%(minutes)s remaining)",
                         sign='-' if task.remaining_hours < 0 else '',
                         hours=hours,
                         minutes=mins,
                     )
-                    task.display_name = task.display_name + "\u00A0" + hours_left
+                    if self.env.context.get('formatted_display_name'):
+                        task.display_name = f"{task.display_name} \t --{hours_left}--"
+                    else:
+                        task.display_name = task.display_name + "\u00A0" + hours_left
 
     @api.ondelete(at_uninstall=False)
     def _unlink_except_contains_entries(self):
diff --git a/addons/project/models/project_milestone.py b/addons/project/models/project_milestone.py
index 44fbaced6a415..42c80080bf17d 100644
--- a/addons/project/models/project_milestone.py
+++ b/addons/project/models/project_milestone.py
@@ -134,10 +134,13 @@ def copy(self, default=None):
                 milestone_mapping[old_milestone.id] = new_milestone.id
         return new_milestones
 
+    @api.depends_context('formatted_display_name')
     def _compute_display_name(self):
         super()._compute_display_name()
         if not self.env.context.get('display_milestone_deadline'):
             return
         for milestone in self:
-            if milestone.deadline:
+            if milestone.deadline and self.env.context.get('formatted_display_name'):
+                milestone.display_name = f'{milestone.display_name} \t --{format_date(self.env, milestone.deadline)}--'
+            elif milestone.deadline:
                 milestone.display_name = f'{milestone.display_name} - {format_date(self.env, milestone.deadline)}'
diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py
index f4c90d7144cce..5dc3ef7ef7e61 100644
--- a/addons/sale/models/sale_order.py
+++ b/addons/sale/models/sale_order.py
@@ -330,15 +330,18 @@ def _rec_names_search(self):
     #=== COMPUTE METHODS ===#
 
     @api.depends('partner_id')
-    @api.depends_context('sale_show_partner_name')
+    @api.depends_context('sale_show_partner_name', 'formatted_display_name')
     def _compute_display_name(self):
         if not self.env.context.get('sale_show_partner_name'):
             return super()._compute_display_name()
         for order in self:
-            name = order.name
             if order.partner_id.name:
-                name = f'{name} - {order.partner_id.name}'
-            order.display_name = name
+                if self.env.context.get('formatted_display_name'):
+                    order.display_name = f"{order.name} \t --{order.partner_id.name}--"
+                else:
+                    order.display_name = f'{order.name} - {order.partner_id.name}'
+            else:
+                order.display_name = order.name
 
     @api.depends('order_line.product_id')
     def _compute_has_archived_products(self):
diff --git a/addons/sale_service/models/sale_order_line.py b/addons/sale_service/models/sale_order_line.py
index cf80eb40f10eb..e35a8109c6b9f 100644
--- a/addons/sale_service/models/sale_order_line.py
+++ b/addons/sale_service/models/sale_order_line.py
@@ -39,6 +39,19 @@ def _compute_is_service(self):
         for so_line in self:
             so_line.is_service = so_line.product_id.type == 'service'
 
+    @api.depends('is_service')
+    @api.depends_context('formatted_display_name')
+    def _compute_display_name(self):
+        sol = self.browse()
+        if self.env.context.get('formatted_display_name'):
+            for line in self:
+                if line.is_service:
+                    name = f"{line.order_id.name} - {line.product_id.display_name}"
+                    formatted_price = format_amount(self.env, line.product_id.lst_price, line.currency_id)
+                    line.display_name = f"{name} --({line.order_partner_id.name})-- --({formatted_price})--"
+                    sol |= line
+        super(SaleOrderLine, self - sol)._compute_display_name()
+
     def _auto_init(self):
         """
         Create column to stop ORM from computing it himself (too slow)
diff --git a/addons/sale_timesheet/models/sale_order_line.py b/addons/sale_timesheet/models/sale_order_line.py
index 8188ed18469d8..0a9795e3a1b64 100644
--- a/addons/sale_timesheet/models/sale_order_line.py
+++ b/addons/sale_timesheet/models/sale_order_line.py
@@ -16,7 +16,7 @@ class SaleOrderLine(models.Model):
     timesheet_ids = fields.One2many('account.analytic.line', 'so_line', domain=[('project_id', '!=', False)], string='Timesheets', export_string_translation=False)
 
     @api.depends('remaining_hours_available', 'remaining_hours')
-    @api.depends_context('with_remaining_hours', 'company')
+    @api.depends_context('with_remaining_hours', 'company', 'formatted_display_name')
     def _compute_display_name(self):
         super()._compute_display_name()
         with_remaining_hours = self.env.context.get('with_remaining_hours')
@@ -39,7 +39,10 @@ def _compute_display_name(self):
                     elif is_day:
                         remaining_days = company.project_time_mode_id._compute_quantity(line.remaining_hours, encoding_uom, round=False)
                         remaining_time = f' ({remaining_days:.02f} {unit_label})'
-                    name = f'{line.display_name}{remaining_time}'
+                    if self.env.context.get('formatted_display_name'):
+                        name = f'{line.display_name} --{remaining_time}--'
+                    else:
+                        name = f'{line.display_name}{remaining_time}'
                     line.display_name = name
 
     @api.depends('product_id.service_policy')

From f02ca037f27cae2a1c68fafaececf2c88164b0ba Mon Sep 17 00:00:00 2001
From: adsh-odoo <adsh@odoo.com>
Date: Mon, 6 Oct 2025 13:18:21 +0530
Subject: [PATCH 598/673] [IMP] sms_twilio: make some ui changes

- Align the `test_number` and `sms_twilio_account_sid` fields with their labels
  and also reduce the width of both fields.
- Allow deleting phone number lines before saving the record.
- Used the `_assert_twilio_sid` method before calling the
  `_action_send_sms` method, so if the format is not even correct, we can avoid
  the entire call stack of `_action_send_sms` and earlier, with the previous
  flow when the UserError was raised by `_assert_twilio_sid` was handled as an
  exception in the `_send_with_api` method, so we just get the Server error as a
  notification, which doesn't give much info related to what went wrong, now
  with the current flow, UserError will be raised in UI.
- Added the new failure_type `wrong_credentials` when we get a credentials
  mismatch error from Twilio.
- Patched the failureMessage method to add Twilio's failure notification.

Task-5085099

Part-of: odoo/odoo#227119
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/sms_twilio/__manifest__.py             |  5 ++++
 addons/sms_twilio/models/mail_notification.py |  1 +
 addons/sms_twilio/models/sms_sms.py           |  1 +
 addons/sms_twilio/models/sms_twilio_number.py |  6 -----
 .../static/src/core/notification_model.js     | 24 +++++++++++++++++++
 addons/sms_twilio/tools/sms_api.py            |  4 ++++
 .../wizard/sms_twilio_account_manage.py       |  1 +
 .../sms_twilio_account_manage_views.xml       | 15 ++++++------
 8 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 addons/sms_twilio/static/src/core/notification_model.js

diff --git a/addons/sms_twilio/__manifest__.py b/addons/sms_twilio/__manifest__.py
index 8622ec167aab9..7c62d97205030 100644
--- a/addons/sms_twilio/__manifest__.py
+++ b/addons/sms_twilio/__manifest__.py
@@ -16,6 +16,11 @@
         'wizard/sms_twilio_account_manage_views.xml',
         'security/ir.model.access.csv'
     ],
+    'assets': {
+        'web.assets_backend': [
+            'sms_twilio/static/src/**/*',
+        ],
+    },
     'author': 'Odoo S.A.',
     'license': 'LGPL-3',
 }
diff --git a/addons/sms_twilio/models/mail_notification.py b/addons/sms_twilio/models/mail_notification.py
index cd9cef6698f36..afa00093138fc 100644
--- a/addons/sms_twilio/models/mail_notification.py
+++ b/addons/sms_twilio/models/mail_notification.py
@@ -10,6 +10,7 @@ class MailNotification(models.Model):
             ('twilio_callback', 'Incorrect callback URL'),
             ('twilio_from_missing', 'Missing From Number'),
             ('twilio_from_to', 'From / To identic'),
+            ('twilio_wrong_credentials', 'Twilio Wrong Credentials'),
         ],
     )
 
diff --git a/addons/sms_twilio/models/sms_sms.py b/addons/sms_twilio/models/sms_sms.py
index cd324974aaf9c..3220b15ba57b0 100644
--- a/addons/sms_twilio/models/sms_sms.py
+++ b/addons/sms_twilio/models/sms_sms.py
@@ -14,6 +14,7 @@ class SmsSms(models.Model):
             ('twilio_callback', 'Incorrect callback URL'),
             ('twilio_from_missing', 'Missing From Number'),
             ('twilio_from_to', 'From / To identic'),
+            ('twilio_wrong_credentials', 'Twilio Wrong Credentials'),
         ],
     )
 
diff --git a/addons/sms_twilio/models/sms_twilio_number.py b/addons/sms_twilio/models/sms_twilio_number.py
index 3478236dcbdd6..dd27e62fbda99 100644
--- a/addons/sms_twilio/models/sms_twilio_number.py
+++ b/addons/sms_twilio/models/sms_twilio_number.py
@@ -18,9 +18,3 @@ class SmsTwilioNumber(models.Model):
     def _compute_display_name(self):
         for record in self:
             record.display_name = f"{record.number} ({record.country_id.name})"
-
-    def action_unlink(self):
-        # First create the action while self exists as it's going to be unlink right after
-        action = self.company_id._action_open_sms_twilio_account_manage()
-        self.unlink()
-        return action
diff --git a/addons/sms_twilio/static/src/core/notification_model.js b/addons/sms_twilio/static/src/core/notification_model.js
new file mode 100644
index 0000000000000..e86803faf4e76
--- /dev/null
+++ b/addons/sms_twilio/static/src/core/notification_model.js
@@ -0,0 +1,24 @@
+import { Notification } from "@mail/core/common/notification_model";
+import { _t } from "@web/core/l10n/translation";
+import { patch } from "@web/core/utils/patch";
+
+/** @type {import("models").Notification} */
+const notificationPatch = {
+    get failureMessage() {
+        switch (this.failure_type) {
+            case "twilio_authentication":
+                return _t("Authentication Error");
+            case "twilio_callback":
+                return _t("Incorrect callback URL");
+            case "twilio_from_missing":
+                return _t("Missing From Number");
+            case "twilio_from_to":
+                return _t("From / To identic");
+            case "twilio_wrong_credentials":
+                return _t("Twilio Wrong Credentials");
+            default:
+                return super.failureMessage;
+        }
+    },
+};
+patch(Notification.prototype, notificationPatch);
diff --git a/addons/sms_twilio/tools/sms_api.py b/addons/sms_twilio/tools/sms_api.py
index c893b02c7c08f..538296b86f0a2 100644
--- a/addons/sms_twilio/tools/sms_api.py
+++ b/addons/sms_twilio/tools/sms_api.py
@@ -15,6 +15,7 @@ class SmsApiTwilio(SmsApiBase):
         'twilio_callback': 'twilio_callback',
         'twilio_from_missing': 'twilio_from_missing',
         'twilio_from_to': 'twilio_from_to',
+        'twilio_wrong_credentials': 'twilio_wrong_credentials',
     }
 
     def _sms_twilio_send_request(self, session, to_number, body, uuid):
@@ -95,6 +96,8 @@ def _twilio_error_code_to_odoo_state(self, response_json):
         elif error_code == 21609:
             # Twilio StatusCallback URL is incorrect
             return "twilio_callback"
+        elif error_code == 20003:
+            return "twilio_wrong_credentials"
         _logger.warning('Twilio SMS: Unknown error "%s" (code: %s)', response_json.get('message'), error_code)
         return "unknown"
 
@@ -110,6 +113,7 @@ def _get_sms_api_error_messages(self):
             'twilio_from_missing': ("A 'From' number is required to send a message"),
             'twilio_from_to': _("'To' and 'From' numbers cannot be the same"),
             'wrong_number_format': _("The number you're trying to reach is not correctly formatted"),
+            'twilio_wrong_credentials': _("Recheck your credentials"),
             # fallback
             'unknown': _("Unknown error, please contact Odoo support"),
         })
diff --git a/addons/sms_twilio/wizard/sms_twilio_account_manage.py b/addons/sms_twilio/wizard/sms_twilio_account_manage.py
index dfe92abf6138b..6b6b3a59ac0b5 100644
--- a/addons/sms_twilio/wizard/sms_twilio_account_manage.py
+++ b/addons/sms_twilio/wizard/sms_twilio_account_manage.py
@@ -74,6 +74,7 @@ def action_reload_numbers(self):
     def action_send_test(self):
         if not self.test_number:
             raise UserError(_("Please set the number to which you want to send a test SMS."))
+        self.company_id._assert_twilio_sid()
         composer = self.env['sms.composer'].create({
             'body': _("This is a test SMS from Odoo"),
             'composition_mode': 'numbers',
diff --git a/addons/sms_twilio/wizard/sms_twilio_account_manage_views.xml b/addons/sms_twilio/wizard/sms_twilio_account_manage_views.xml
index 0a29b7797de00..fe202566c6c6d 100644
--- a/addons/sms_twilio/wizard/sms_twilio_account_manage_views.xml
+++ b/addons/sms_twilio/wizard/sms_twilio_account_manage_views.xml
@@ -11,8 +11,8 @@
                     <label for="sms_twilio_account_sid"/>
                     <div class="d-flex align-items-center">
                         <field name="sms_twilio_account_sid" placeholder="ACabcde12345abcde12345abcde12345ab"
-                            required="1"/>
-                        <a target="_blank" class="btn btn-link ms-1 w-25"
+                            required="1" class="w-75"/>
+                        <a target="_blank" class="btn btn-link ms-1 w-25 p-0"
                             role="button"
                             href="https://www.odoo.com/documentation/latest/applications/marketing/sms_marketing/twilio.html">
                             Need help ?
@@ -20,26 +20,25 @@
                         </a>
                     </div>
                     <field name="sms_twilio_auth_token" password="True" placeholder="abcde12345abcde12345abcde12345ab"
-                        required="1"/>
+                        required="1" class="w-75"/>
                     <label for="test_number"/>
                     <div class="d-flex align-items-center">
-                        <field name="test_number" placeholder="+1 555-123-4567"/>
+                        <field name="test_number" placeholder="+1 555-123-4567" class="w-auto"/>
                         <button name="action_send_test" string="Send test SMS"
                             icon="fa-send" type="object"
-                            class="btn btn-link w-25 ms-1"/>
+                            class="btn btn-link w-auto ms-1 p-0"/>
                     </div>
                 </group>
                 <group string="Phone Numbers">
                     <button
                         class="btn btn-secondary" colspan="2"
                         type="object" name="action_reload_numbers"
-                        string="Reload Numbers from Twilio" icon="fa-refresh"/>
+                        string="Load from Twilio" icon="fa-refresh"/>
                     <field name="sms_twilio_number_ids" colspan="2" nolabel="1">
-                        <list editable="bottom" delete="0">
+                        <list editable="bottom">
                             <field name="sequence" widget="handle"/>
                             <field name="country_id"/>
                             <field name="number" placeholder="+1 555-123-4567"/>
-                            <button name="action_unlink" title="Delete" icon="fa-trash" type="object"/>
                         </list>
                     </field>
                 </group>

From 851293ac77b2b2990e336d62d03d984dc7fb7d3e Mon Sep 17 00:00:00 2001
From: adsh-odoo <adsh@odoo.com>
Date: Fri, 14 Nov 2025 12:27:58 +0530
Subject: [PATCH 599/673] [IMP] sms_twilio: remove overrides of fields_get

- Remove the overrides of fields_get, which were added here https://github.com/odoo/odoo/pull/225036/commits/c4255062ecc2789522516ab988b0474f6b49f589 for
  translation purposes in a stable.

Task-5085099

closes odoo/odoo#227119

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 .../mass_mailing_sms/models/mailing_trace.py  | 28 ----------------
 addons/sms_twilio/models/mail_notification.py | 33 +------------------
 addons/sms_twilio/models/sms_sms.py           | 25 --------------
 3 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/addons/mass_mailing_sms/models/mailing_trace.py b/addons/mass_mailing_sms/models/mailing_trace.py
index 630d08f1abc88..4bbeb53edb0c5 100644
--- a/addons/mass_mailing_sms/models/mailing_trace.py
+++ b/addons/mass_mailing_sms/models/mailing_trace.py
@@ -70,34 +70,6 @@ def create(self, vals_list):
                 values['sms_code'] = self._get_random_code()
         return super().create(vals_list)
 
-    @api.model
-    def fields_get(self, allfields=None, attributes=None):
-        # As we are adding keys in stable, better be sure no-one is getting crashes
-        # due to missing translations
-        # TODO: remove in master
-        res = super().fields_get(allfields=allfields, attributes=attributes)
-
-        existing_selection = res.get('failure_type', {}).get('selection')
-        if existing_selection is None:
-            return res
-
-        updated_stable = {
-            'twilio_authentication', 'twilio_callback',
-            'twilio_from_missing', 'twilio_from_to',
-        }
-        need_update = updated_stable - set(dict(self._fields['failure_type'].selection))
-        if need_update:
-            self.env['ir.model.fields'].invalidate_model(['selection_ids'])
-            self.env['ir.model.fields.selection']._update_selection(
-                self._name,
-                'failure_type',
-                self._fields['failure_type'].selection,
-            )
-            self.env.registry.clear_cache()
-            return super().fields_get(allfields=allfields, attributes=attributes)
-
-        return res
-
     def _get_random_code(self):
         """ Generate a random code for trace. Uniqueness is not really necessary
         as it serves as obfuscation when unsubscribing. A valid trio
diff --git a/addons/sms_twilio/models/mail_notification.py b/addons/sms_twilio/models/mail_notification.py
index afa00093138fc..e273f228bf494 100644
--- a/addons/sms_twilio/models/mail_notification.py
+++ b/addons/sms_twilio/models/mail_notification.py
@@ -1,4 +1,4 @@
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class MailNotification(models.Model):
@@ -13,34 +13,3 @@ class MailNotification(models.Model):
             ('twilio_wrong_credentials', 'Twilio Wrong Credentials'),
         ],
     )
-
-    # CRUD
-    # ------------------------------------------------------------
-
-    @api.model
-    def fields_get(self, allfields=None, attributes=None):
-        # As we are adding keys in stable, better be sure no-one is getting crashes
-        # due to missing translations
-        # TODO: remove in master
-        res = super().fields_get(allfields=allfields, attributes=attributes)
-
-        existing_selection = res.get('failure_type', {}).get('selection')
-        if existing_selection is None:
-            return res
-
-        updated_stable = {
-            'twilio_authentication', 'twilio_callback',
-            'twilio_from_missing', 'twilio_from_to',
-        }
-        need_update = updated_stable - set(dict(self._fields['failure_type'].selection))
-        if need_update:
-            self.env['ir.model.fields'].invalidate_model(['selection_ids'])
-            self.env['ir.model.fields.selection']._update_selection(
-                self._name,
-                'failure_type',
-                self._fields['failure_type'].selection,
-            )
-            self.env.registry.clear_cache()
-            return super().fields_get(allfields=allfields, attributes=attributes)
-
-        return res
diff --git a/addons/sms_twilio/models/sms_sms.py b/addons/sms_twilio/models/sms_sms.py
index 3220b15ba57b0..8d11c2d9fa852 100644
--- a/addons/sms_twilio/models/sms_sms.py
+++ b/addons/sms_twilio/models/sms_sms.py
@@ -27,31 +27,6 @@ def create(self, vals_list):
             vals['record_company_id'] = vals.get('record_company_id') or self.env.company.id  # TODO RIGR in master: move this field to SmsSms, and populate it via vals_list from all flows
         return super().create(vals_list)
 
-    @api.model
-    def fields_get(self, allfields=None, attributes=None):
-        # As we are adding keys in stable, better be sure no-one is getting crashes
-        # due to missing translations
-        # TODO: remove in master
-        res = super().fields_get(allfields=allfields, attributes=attributes)
-
-        existing_selection = res.get('failure_type', {}).get('selection')
-        if existing_selection is None:
-            return res
-
-        updated_stable = {'twilio_from_missing', 'twilio_from_to'}
-        need_update = updated_stable - set(dict(self._fields['failure_type'].selection))
-        if need_update:
-            self.env['ir.model.fields'].invalidate_model(['selection_ids'])
-            self.env['ir.model.fields.selection']._update_selection(
-                self._name,
-                'failure_type',
-                self._fields['failure_type'].selection,
-            )
-            self.env.registry.clear_cache()
-            return super().fields_get(allfields=allfields, attributes=attributes)
-
-        return res
-
     # SEND
     # ------------------------------------------------------------
 

From e3be3b43e6ea1cbfe7228f9e70203c92c64feae4 Mon Sep 17 00:00:00 2001
From: "Saif (segn)" <segn@odoo.com>
Date: Thu, 13 Nov 2025 17:39:29 +0000
Subject: [PATCH 600/673] [FIX] hr_expense: do not depend on chart template for
 outstanding account creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The creation of outstanding accounts should not require a chart template, since companies may have manually configured their chart of accounts.

closes odoo/odoo#235667

X-original-commit: f1e68e16fbba124fd0b7fab4721b4ce8e61acb7b
Signed-off-by: William André (wan) <wan@odoo.com>
Signed-off-by: Seif Gneedy (segn) <segn@odoo.com>
---
 addons/hr_expense/models/hr_expense.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index f82b9b0a327f5..84046bfff68b4 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -1777,13 +1777,10 @@ def _get_outstanding_account_id(self):
         account_ref = 'account_journal_payment_debit_account_id' if self.payment_method_line_id.payment_type == 'inbound' else 'account_journal_payment_credit_account_id'
         chart_template = self.with_context(allowed_company_ids=self.company_id.root_id.ids).env['account.chart.template']
         outstanding_account = chart_template.ref(account_ref, raise_if_not_found=False)
-        if not self.company_id.chart_template:
-            action = self.env.ref('account.action_account_config')
-            raise RedirectWarning(_('You should install a Fiscal Localization first.'), action.id, _('Accounting Settings'))
         if not outstanding_account:
             bank_prefix = self.company_id.bank_account_code_prefix
-            template_data = chart_template._get_chart_template_data(self.company_id.chart_template).get('template_data')
-            code_digits = int(template_data.get('code_digits', 6))
+            first_account = self.env['account.account'].search([('company_ids', 'in', self.company_id.id)], limit=1)
+            code_digits = len(first_account.code or '') or 6
             chart_template._create_outstanding_accounts(self.company_id, bank_prefix, code_digits)
             outstanding_account = chart_template.ref(account_ref, raise_if_not_found=False)
         if not outstanding_account.active:

From e98cce10c1a86ddd3fb4866afee9dbe57ed6bb12 Mon Sep 17 00:00:00 2001
From: "Krzysztof Magusiak (krma)" <krma@odoo.com>
Date: Thu, 13 Nov 2025 07:27:45 +0000
Subject: [PATCH 601/673] [FIX] hr: search on user's employee

Searching tasks with domain `user_ids.employee_id.department_id` is
failing because of access rights to the `hr.employee` model.
There are multiple issues:

First a hack is present to cast a Domain to a list. This was required
because the same domain object was used for both `hr.employee` and
`hr.employee.public` and was not supported in early versions of the
Domain object. This is no longer needed, so we can remove it.

Then the search fails on searching `res.users.employee_ids`. On user
model, `employee_id` is translated into a `employee_ids`. Then
`department_id` is an inherited field, so it gets transformed into a
search on `current_version_id`. However since the user does not have
access to `hr.employee`, we run that search on the public model which
does not have a `current_version_id` field! We remap that condition to a
condition on 'id' which will be simplified.

task-5259549

closes odoo/odoo#235523

X-original-commit: 042a7f36517eb52590a938e9c01dd1796a75d575
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 addons/hr/models/hr_employee.py            | 10 ++++++++--
 addons/hr/models/res_users.py              | 11 ++++++++---
 addons/hr/tests/test_hr_employee_public.py |  4 ++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py
index 0939ac1d19b0b..612f58db40301 100644
--- a/addons/hr/models/hr_employee.py
+++ b/addons/hr/models/hr_employee.py
@@ -1304,10 +1304,16 @@ def _search(self, domain, offset=0, limit=None, order=None, *, bypass_access=Fal
         """
         if self.browse().has_access('read') or bypass_access:
             return super()._search(domain, offset, limit, order, bypass_access=bypass_access, **kwargs)
+        domain = Domain(domain)
+        # HACK Some fields are inherited from the `current_version_id` and may have been already
+        # optimized, showing current_version_id in the domain, but public employee does not have
+        # that field and may have fields directly on the model, just change the condition to `id` in
+        # that case.
+        domain = domain.map_conditions(lambda cond: Domain('id', cond.operator, cond.value) if cond.field_expr == 'current_version_id' else cond)
         try:
             ids = self.env['hr.employee.public']._search(domain, offset, limit, order, **kwargs)
-        except ValueError:
-            raise AccessError(_('You do not have access to this document.'))
+        except ValueError as e:
+            raise AccessError(self.env._('You do not have access to this document.')) from e
         # the result is expected from this table, so we should link tables
         return super(HrEmployee, self.sudo())._search([('id', 'in', ids)], order=order)
 
diff --git a/addons/hr/models/res_users.py b/addons/hr/models/res_users.py
index b83cc4d5b456a..8871dd7fb7eb3 100644
--- a/addons/hr/models/res_users.py
+++ b/addons/hr/models/res_users.py
@@ -7,6 +7,7 @@
 
 from odoo import api, models, fields, _, SUPERUSER_ID
 from odoo.exceptions import AccessError
+from odoo.fields import Domain
 from odoo.tools.misc import clean_context
 from odoo.addons.mail.tools.discuss import Store
 
@@ -58,8 +59,9 @@ def _employee_ids_domain(self):
         # So try to enforce the security rules on the field to make sure we do not load employees outside of active companies
         return [('company_id', 'in', self.env.company.ids + self.env.context.get('allowed_company_ids', []))]
 
-    # note: a user can only be linked to one employee per company (see sql constraint in ´hr.employee´)
+    # note: a user can only be linked to one employee per company (see sql constraint in `hr.employee`)
     employee_ids = fields.One2many('hr.employee', 'user_id', string='Related employee', domain=_employee_ids_domain)
+    employee_public_ids = fields.One2many('hr.employee.public', 'user_id', string='Related employee (public)', domain=_employee_ids_domain, readonly=True)
     employee_id = fields.Many2one('hr.employee', string="Company employee",
         compute='_compute_company_employee', search='_search_company_employee', store=False)
 
@@ -277,10 +279,13 @@ def _search_company_employee(self, operator, value):
         # If we're going to inject too many `ids`, we fall back on the default behavior
         # to avoid a performance regression.
         IN_MAX = 10_000
-        domain = [('employee_ids', operator, value)]
+        # HACK: search directly on public ids to avoid optimization on employee
+        # where we may not have access to all fields.
+        employee_field = 'employee_ids' if self.env['hr.employee'].has_access('read') else 'employee_public_ids'
+        domain = Domain(employee_field, operator, value)
         user_ids = self.env['res.users'].with_context(active_test=False)._search(domain, limit=IN_MAX).get_result_ids()
         if len(user_ids) < IN_MAX:
-            return [('id', 'in', user_ids)]
+            return Domain('id', 'in', user_ids)
 
         return domain
 
diff --git a/addons/hr/tests/test_hr_employee_public.py b/addons/hr/tests/test_hr_employee_public.py
index 4e66e1e6bb1e7..6cc803f29dbc0 100644
--- a/addons/hr/tests/test_hr_employee_public.py
+++ b/addons/hr/tests/test_hr_employee_public.py
@@ -24,3 +24,7 @@ def setUpClass(cls):
     def test_access_related_field_to_hr_employee(self):
         # Check if a related field related to hr_employee is accessible.
         self.env['hr.employee.public'].with_user(self.res_users_without_hr_right).search([("email", "!=", False)])
+
+    def test_access_search_on_users_department(self):
+        User = self.env['res.users'].with_user(self.res_users_without_hr_right)
+        User.search([('employee_id.department_id', '=', 1)])

From 0f5bc8aebf02dae5ea02d57a4341fffc01313f21 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Thu, 13 Nov 2025 14:03:55 +0000
Subject: [PATCH 602/673] [FIX] sale_project: add default search on SO shown
 when we open project

Before this commit, when the user clicks on x projects and x tasks stat
button in the sale order form view and that SO is linked to some task
and more than one project, the user will be redirected in kanban view of
projects and when he will click on a project, he will see all tasks
linked to that project instead of seeing the tasks linked to SO inside
that project.

This commit makes sure a default search is added in the tasks views when
the user open a project from an SO to be sure the user will first see
the tasks linked to that SO.

closes odoo/odoo#235671

X-original-commit: 03d8cd450ac3ac5da14bbf4542388fdcbb43d502
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/sale_project/models/project_project.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_project/models/project_project.py b/addons/sale_project/models/project_project.py
index 3382890133dc1..c6ff56d8ae05d 100644
--- a/addons/sale_project/models/project_project.py
+++ b/addons/sale_project/models/project_project.py
@@ -872,8 +872,8 @@ def action_view_tasks(self):
         if self.env.context.get("from_sale_order_action"):
             context = dict(action.get("context", {}))
             context.pop("search_default_open_tasks", None)
-            if self.sale_order_id:
-                context["search_default_sale_order_id"] = self.sale_order_id.id
+            if sale_order_id := self.env.context.get('default_reinvoiced_sale_order_id') or self.reinvoiced_sale_order_id.id:
+                context["search_default_sale_order_id"] = sale_order_id
             if not self.sale_order_id:
                 sale_order = self.env["sale.order"].browse(self.env.context.get("active_id"))
                 context["default_sale_order_id"] = sale_order.id

From 39091b47740598ed1f64ac01634f9415b680b221 Mon Sep 17 00:00:00 2001
From: "Andrea Grazioso (agr-odoo)" <agr@odoo.com>
Date: Tue, 7 Oct 2025 07:51:12 +0000
Subject: [PATCH 603/673] [FIX] web,l10n_latam_invoice_document,l10n_hu_edi:
 overlapping footer in wave layout

In the Wave layout, a multi-line footer overlaps document information when the
portal view is opened from a mobile interface.

Steps to reproduce:
- Open Settings > General settings > Configure Document Layout
- Select Wave layout and add a multi-line footer
- Open an invoice, go to portal preview, switch to mobile view

Issue: The footer overlaps invoice information.

This occurs because the boundaries of the SVG drawing are not well
defined and it will unexpectedly shrink.

opw-5023032

closes odoo/odoo#235647

X-original-commit: 0a917978af8dfef32051f412c852246f403351bc
Signed-off-by: Andrea Grazioso (agr) <agr@odoo.com>
---
 addons/l10n_hu_edi/views/report_templates.xml          | 10 +++++-----
 .../views/report_templates.xml                         | 10 +++++-----
 addons/web/views/report_templates.xml                  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/l10n_hu_edi/views/report_templates.xml b/addons/l10n_hu_edi/views/report_templates.xml
index 3533aa5657448..583bc06698391 100644
--- a/addons/l10n_hu_edi/views/report_templates.xml
+++ b/addons/l10n_hu_edi/views/report_templates.xml
@@ -131,15 +131,15 @@
         </xpath>
 
         <!-- support for custom footer -->
-        <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center" position="attributes">
+        <xpath expr="//div[contains(@t-attf-class,'o_footer_content')]" position="attributes">
             <attribute name="t-if">not custom_footer</attribute>
-        </div>
-        <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center" position="after">
-            <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center"
+        </xpath>
+        <xpath expr="//div[contains(@t-attf-class,'o_footer_content')]" position="after">
+            <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'mx-5'}} pt-5 text-center"
                  t-if="custom_footer and company.account_fiscal_country_id.code == 'HU'">
                 <t t-out="custom_footer"/>
             </div>
-        </div>
+        </xpath>
     </template>
 
     <template id="external_layout_folder" inherit_id="web.external_layout_folder">
diff --git a/addons/l10n_latam_invoice_document/views/report_templates.xml b/addons/l10n_latam_invoice_document/views/report_templates.xml
index ab1dce3495b8f..2613763df5877 100644
--- a/addons/l10n_latam_invoice_document/views/report_templates.xml
+++ b/addons/l10n_latam_invoice_document/views/report_templates.xml
@@ -130,15 +130,15 @@
         </xpath>
 
         <!-- support for custom footer -->
-        <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center" position="attributes">
+        <xpath expr="//div[contains(@t-attf-class,'o_footer_content')]" position="attributes">
             <attribute name="t-if">not custom_footer</attribute>
-        </div>
-        <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center" position="after">
-            <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center"
+        </xpath>
+        <xpath expr="//div[contains(@t-attf-class,'o_footer_content')]" position="after">
+            <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'mx-5'}} pt-5 text-center"
                  t-if="custom_footer and company._localization_use_documents()">
                 <t t-out="custom_footer"/>
             </div>
-        </div>
+        </xpath>
     </template>
 
     <template id="external_layout_folder" inherit_id="web.external_layout_folder">
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index 6c8dae723b6f9..8ec9f9d4acaea 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -672,10 +672,10 @@
 
         <!-- Footer -->
         <div t-attf-class="footer o_company_#{company.id}_layout {{report_type != 'pdf' and 'position-relative mt-auto mx-n5'}}">
-            <svg t-attf-class="{{report_type == 'pdf' and 'position-fixed start-0'}} w-100" preserveAspectRatio="none" t-att-height="report_type == 'pdf' and '180'" viewBox="0 0 1000 180" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <svg t-attf-class="{{report_type == 'pdf' and 'position-fixed start-0' or 'position-absolute'}} w-100" preserveAspectRatio="none" t-attf-height="{{report_type == 'pdf' and '180' or '100%'}}" viewBox="0 0 1000 180" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path d="M427.731 19.757C686.904 51.3469 898.971 38.039 1000 27.6922V180H0V8.20934C66.363 -0.991089 198.347 -8.20218 427.731 19.757Z" t-att-fill="company.secondary_color" fill-opacity=".1"/>
             </svg>
-            <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'position-absolute end-0 start-0 bottom-0 mx-5'}} pt-5 text-center">
+            <div t-attf-class="o_footer_content {{report_type != 'pdf' and 'mx-5'}} pt-5 text-center">
                 <div t-field="company.report_footer"/>
                 <span t-if="report_type == 'pdf' and display_name_in_footer" class="text-muted" t-out="str(o.name) + ', '">(document name)</span>
                 <span t-if="report_type == 'pdf'" class="text-muted">Page <span class="page"/> / <span class="topage"/></span>

From 09dfd7360b548b3cc5c11f12c473c4becfdec5a0 Mon Sep 17 00:00:00 2001
From: David Monnom <moda@odoo.com>
Date: Tue, 21 Oct 2025 12:56:08 +0000
Subject: [PATCH 604/673] [FIX] pos_self_order: fix menu mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Menu mode was broken in self ordering. This commit fix it.

closes odoo/odoo#235272

X-original-commit: f587676aca0143e59372ee7dd1e135454d91b820
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../tests/test_self_order_mobile.py             |  2 +-
 addons/pos_self_order/controllers/self_entry.py |  3 ++-
 .../static/src/app/services/data_service.js     |  4 +++-
 .../tests/tours/self_order_mobile_tour.js       |  9 +++++++++
 .../static/tests/tours/utils/common.js          | 12 ++++++++++++
 .../tests/test_self_order_kiosk.py              |  2 +-
 .../tests/test_self_order_mobile.py             | 17 +++++++++++++++++
 7 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/addons/pos_online_payment_self_order/tests/test_self_order_mobile.py b/addons/pos_online_payment_self_order/tests/test_self_order_mobile.py
index 58af1b0db87a1..f4c5d4cec22e8 100644
--- a/addons/pos_online_payment_self_order/tests/test_self_order_mobile.py
+++ b/addons/pos_online_payment_self_order/tests/test_self_order_mobile.py
@@ -53,7 +53,6 @@ def test_online_payment_kiosk_qr_code(self):
         """
         Verify that when making an order from kiosk with online payment, a QR code is generated
         """
-        self_route = self.pos_config._get_self_order_route()
         self.pos_config.write({
             'self_ordering_mode': 'kiosk',
             'self_ordering_service_mode': 'counter',
@@ -62,6 +61,7 @@ def test_online_payment_kiosk_qr_code(self):
         })
         self.pos_config.with_user(self.pos_user).open_ui()
         self.pos_config.current_session_id.set_opening_control(0, "")
+        self_route = self.pos_config._get_self_order_route()
         self.start_tour(self_route, "test_online_payment_kiosk_qr_code")
 
     def test_online_payment_mobile_self_order_preparation_changes(self):
diff --git a/addons/pos_self_order/controllers/self_entry.py b/addons/pos_self_order/controllers/self_entry.py
index a083c422fb205..fcf973f921df5 100644
--- a/addons/pos_self_order/controllers/self_entry.py
+++ b/addons/pos_self_order/controllers/self_entry.py
@@ -28,8 +28,9 @@ def start_self_ordering(self, config_id=None, access_token=None, table_identifie
 
     @http.route("/pos-self/data/<config_id>", type='jsonrpc', auth='public', website=True)
     def get_self_ordering_data(self, config_id=None, access_token=None, table_identifier=None):
-        pos_config, _, _ = self._verify_entry_access(config_id, access_token, table_identifier)
+        pos_config, _, config_access_token = self._verify_entry_access(config_id, access_token, table_identifier)
         data = pos_config.load_self_data()
+        data['pos.config'][0]['access_token'] = config_access_token
         return data
 
     @http.route("/pos-self/relations/<config_id>", type='jsonrpc', auth='public')
diff --git a/addons/pos_self_order/static/src/app/services/data_service.js b/addons/pos_self_order/static/src/app/services/data_service.js
index 8ca74997a86ce..6971d4bb7c7a3 100644
--- a/addons/pos_self_order/static/src/app/services/data_service.js
+++ b/addons/pos_self_order/static/src/app/services/data_service.js
@@ -6,7 +6,9 @@ import { rpc } from "@web/core/network/rpc";
 export const unpatchSelf = patch(PosData.prototype, {
     async loadInitialData() {
         const configId = session.data.config_id;
-        return await rpc(`/pos-self/data/${parseInt(configId)}`);
+        return await rpc(`/pos-self/data/${parseInt(configId)}`, {
+            access_token: odoo.access_token,
+        });
     },
     async loadFieldsAndRelations() {
         const configId = session.data.config_id;
diff --git a/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js b/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
index 9d18f9ebc0786..0633b45df71a3 100644
--- a/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
+++ b/addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
@@ -423,3 +423,12 @@ registry.category("web_tour.tours").add("test_self_order_table_sharing-meal_mode
             CartPage.checkProduct("Coca-Cola", "2.20", "1"),
         ].flat(),
 });
+
+registry.category("web_tour.tours").add("self_order_mobile_no_access_token", {
+    steps: () =>
+        [
+            Utils.checkIsNoBtn("My Order"),
+            Utils.clickBtn("Order Now"),
+            Utils.negateStep(Utils.checkBtn("Order")),
+        ].flat(),
+});
diff --git a/addons/pos_self_order/static/tests/tours/utils/common.js b/addons/pos_self_order/static/tests/tours/utils/common.js
index fdf5fad142491..a3b6c737327c5 100644
--- a/addons/pos_self_order/static/tests/tours/utils/common.js
+++ b/addons/pos_self_order/static/tests/tours/utils/common.js
@@ -8,6 +8,18 @@ export function clickBtn(buttonName) {
     };
 }
 
+export function negate(selector, parent = "body") {
+    return `${parent}:not(:has(${selector}))`;
+}
+
+export function negateStep(step) {
+    return {
+        ...step,
+        content: `Check that: ---${step.content}--- is not true`,
+        trigger: negate(step.trigger),
+    };
+}
+
 export function checkBtn(buttonName) {
     return {
         content: `Check is button '${buttonName}'`,
diff --git a/addons/pos_self_order/tests/test_self_order_kiosk.py b/addons/pos_self_order/tests/test_self_order_kiosk.py
index ab1ca27757d02..57d48bfdab860 100644
--- a/addons/pos_self_order/tests/test_self_order_kiosk.py
+++ b/addons/pos_self_order/tests/test_self_order_kiosk.py
@@ -13,7 +13,6 @@
 @odoo.tests.tagged("post_install", "-at_install")
 class TestSelfOrderKiosk(SelfOrderCommonTest):
     def test_self_order_kiosk(self):
-        self_route = self.pos_config._get_self_order_route()
         self.pos_config.write({
             'self_ordering_mode': 'kiosk',
             'self_ordering_pay_after': 'each',
@@ -21,6 +20,7 @@ def test_self_order_kiosk(self):
         })
         self.pos_config.with_user(self.pos_user).open_ui()
         self.pos_config.current_session_id.set_opening_control(0, "")
+        self_route = self.pos_config._get_self_order_route()
 
         tax_10_inc = self.env['account.tax'].create({
             "name": "10% incl",
diff --git a/addons/pos_self_order/tests/test_self_order_mobile.py b/addons/pos_self_order/tests/test_self_order_mobile.py
index 3c17f76066cae..9e62a81c11436 100644
--- a/addons/pos_self_order/tests/test_self_order_mobile.py
+++ b/addons/pos_self_order/tests/test_self_order_mobile.py
@@ -2,6 +2,8 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import odoo.tests
+
+from urllib.parse import urlparse
 from odoo.addons.pos_self_order.tests.self_order_common_test import SelfOrderCommonTest
 from unittest.mock import patch
 from datetime import datetime
@@ -128,6 +130,21 @@ def test_self_order_category_with_only_special_products(self):
         with patch("odoo.addons.point_of_sale.models.pos_config.PosConfig._get_special_products", return_value=prod1 + prod2):
             self.start_tour(self_route, "self_order_mobile_special_products_category")
 
+    def test_self_order_mobile_no_access_token(self):
+        self.pos_config.write({
+            'self_ordering_mode': 'mobile',
+            'self_ordering_pay_after': 'each',
+            'self_ordering_service_mode': 'table',
+        })
+
+        self.pos_config.with_user(self.pos_user).open_ui()
+        self.pos_config.current_session_id.set_opening_control(0, "")
+        self_route = self.pos_config._get_self_order_route()
+
+        # removing access token to simulate a request without it
+        route = urlparse(self_route)
+        self.start_tour(route.path, "self_order_mobile_no_access_token")
+
     def test_self_order_mobile_0_price_order(self):
         self.pos_config.write({
             'self_ordering_mode': 'mobile',

From affa3c481c9e605c993f18087a3cc85c241b129d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Thu, 13 Nov 2025 11:47:43 +0000
Subject: [PATCH 605/673] [FIX] mail: improve message action style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1) increase size, reduce gap

Make icons more readable by being bigger. The gap is reduced so
overall this actually takes slightly less horizontal area.

2) More visible hover effect

Hover effect was inexistent due to typo in chat window style leaking
to message actions, but still the hover effect was to shy, with
75% => 100% opacity. This is increased to 35% => 100% in addition to
true black/white on 100%.

closes odoo/odoo#235651

X-original-commit: bdb29fbca3f559804cacf650ccf85895db973652
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/common/action_list.scss | 5 +++--
 addons/mail/static/src/core/common/chat_window.scss | 2 +-
 addons/mail/static/src/core/common/message.scss     | 9 ++++++---
 addons/mail/static/src/core/common/message.xml      | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/core/common/action_list.scss b/addons/mail/static/src/core/common/action_list.scss
index 731fb7e707053..fe2677418cdd5 100644
--- a/addons/mail/static/src/core/common/action_list.scss
+++ b/addons/mail/static/src/core/common/action_list.scss
@@ -17,13 +17,14 @@
 
         &.o-inline {
             &:where(:has(i:first-child:last-child)) {
-                filter: brightness(var(--o-mail-ActionList-Button-opacity));
+                opacity: var(--o-mail-ActionList-Button-opacity);
 
                 &:where(.rounded-circle) {
                     aspect-ratio: 1;
                 }
                 &:hover, &:focus, &:active, &.active, &:focus-visible {
-                    filter: brightness(var(--o-mail-ActionList-Button-opacity--hover));
+                    color: var(--o-mail-ActionList-Button-color--hover);
+                    opacity: var(--o-mail-ActionList-Button-opacity--hover);
                 }
             }
 
diff --git a/addons/mail/static/src/core/common/chat_window.scss b/addons/mail/static/src/core/common/chat_window.scss
index 27aef684ba2c3..b7680b99bda38 100644
--- a/addons/mail/static/src/core/common/chat_window.scss
+++ b/addons/mail/static/src/core/common/chat_window.scss
@@ -38,7 +38,7 @@
     .o-mail-ActionList-group {
         gap: map-get($spacers, 3);
 
-        button:not(:hover, &:focus-visible, &:active):not(.btn-success) {
+        button:not(:hover):not(:focus-visible):not(:active):not(.btn-success) {
             --o-mail-ActionList-Button-opacity: 1;
         }
 
diff --git a/addons/mail/static/src/core/common/message.scss b/addons/mail/static/src/core/common/message.scss
index a608a800b9fd9..a3c4c7b5237a2 100644
--- a/addons/mail/static/src/core/common/message.scss
+++ b/addons/mail/static/src/core/common/message.scss
@@ -130,15 +130,18 @@
     &:hover, &.focus, &.show {
         i {
             opacity: 100%;
-            color: var(--mail-Message-actionIconHoveredColor, black);
         }
     }
 }
 
 .o-mail-Message-actions {
-    --o-mail-ActionList-Button-aspect-ratio: 0.65;
-    --o-mail-ActionList-Button-opacity: #{$o-opacity-muted};
+    --o-mail-ActionList-Button-opacity: .35;
     --o-mail-ActionList-Button-opacity--hover: 1;
+    --o-mail-ActionList-Button-color--hover: var(--mail-Message-actionIconHoveredColor, black);
+
+    i {
+        font-size: 1rem;
+    }
 
     .o-mail-Message.o-isMobileOS & i.oi-ellipsis-v {
         opacity: 15%;
diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index 1d522431b8597..932dc9ee6c58f 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -176,7 +176,7 @@
         <t t-set="isReverse" t-value="env.inChatWindow and isAlignedRight"/>
         <t t-if="isMobileOS and isReverse" t-call="mail.Message.emptyQuickAction"/>
         <div class="d-flex rounded-1 overflow-hidden gap-1" t-att-class="{ 'flex-row-reverse': isReverse }">
-            <ActionList actions="actions" inline="true" fw="false" groupClass="'gap-1'"/>
+            <ActionList actions="actions" inline="true" fw="false"/>
             <t t-foreach="Array.from({ length: quickActionCount - quickActions.length - 1 })" t-as="emptyQuickAction" t-key="emptyQuickAction_index">
                 <t t-call="mail.Message.emptyQuickAction"/>
             </t>

From d9b4c7a64e7fddb093962e0f97bcbe3a189d13cb Mon Sep 17 00:00:00 2001
From: Bastien PIERRE <ipb@odoo.com>
Date: Thu, 13 Nov 2025 13:02:18 +0000
Subject: [PATCH 606/673] [FIX] web_tour: backward when warn step present in
 the page

Before this commit, the backward wasn't ignoring the warn steps.
So, if the backward go to the previous step (warn's one) and the
trigger is on the page, the tour interactive put the cursor there.
But the step is then ignored and go back the step you came from.

Now, the warn's steps are ignored.

closes odoo/odoo#235645

X-original-commit: 2ca4706c9d6bdf77fa23782a40898a8f24743942
Signed-off-by: Pierre Pulinckx (pipu) <pipu@odoo.com>
Signed-off-by: Bastien Pierre (ipb) <ipb@odoo.com>
---
 .../static/src/js/tour_interactive/tour_interactive.js        | 2 +-
 addons/web_tour/static/tests/tour_interactive.test.js         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web_tour/static/src/js/tour_interactive/tour_interactive.js b/addons/web_tour/static/src/js/tour_interactive/tour_interactive.js
index 8e0b2d6c59cfb..b826739c02e46 100644
--- a/addons/web_tour/static/src/js/tour_interactive/tour_interactive.js
+++ b/addons/web_tour/static/src/js/tour_interactive/tour_interactive.js
@@ -54,7 +54,7 @@ export class TourInteractive {
         while (!tempAnchors.length && tempIndex >= 0) {
             tempIndex--;
             tempAction = this.actions.at(tempIndex);
-            if (!tempAction.step.active) {
+            if (!tempAction.step.active || tempAction.event === "warn") {
                 continue;
             }
             tempAnchors = tempAction && this.findTriggers(tempAction.anchor);
diff --git a/addons/web_tour/static/tests/tour_interactive.test.js b/addons/web_tour/static/tests/tour_interactive.test.js
index 94d489298b239..d99f67420472f 100644
--- a/addons/web_tour/static/tests/tour_interactive.test.js
+++ b/addons/web_tour/static/tests/tour_interactive.test.js
@@ -323,7 +323,7 @@ test("Tour backward when the pointed element disappear and ignore warn step", as
     registry.category("web_tour.tours").add("tour1", {
         steps: () => [
             { trigger: "button.foo", run: "click" },
-            { trigger: "button.bar" },
+            { trigger: "button.foo" },
             { trigger: "button.bar", run: "click" },
         ],
     });
@@ -360,7 +360,7 @@ test("Tour backward when the pointed element disappear and ignore warn step", as
     await contains("button.bar").click();
     await animationFrame();
     expect(".o_tour_pointer").toHaveCount(0);
-    expect.verifySteps(["Step 'button.bar' ignored.", "Step 'button.bar' ignored."]);
+    expect.verifySteps(["Step 'button.foo' ignored.", "Step 'button.foo' ignored."]);
 });
 
 test("Tour started by the URL", async () => {

From ce06941fc080ee48c3ca1101ba26db7db3dd37d5 Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Fri, 7 Nov 2025 11:39:36 +0100
Subject: [PATCH 607/673] [IMP] web: Hoot - add :text pseudo-class

This commit adds the ':text()' pseudo-class to the list of supported
pseudo-classes in Hoot selectors.

Its purpose is the same as ':contains()', with the specificity of being
an *exact* match instead of a *partial* one.

It effectively replaces ':contains(/^<expression>$/)' by
':text(<expression>)', improving the readability and making the
developer experience a bit nicer.

Part-of: odoo/odoo#235658
Related: odoo/enterprise#99472
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
---
 addons/web/static/lib/hoot-dom/helpers/dom.js | 110 ++++++++++--------
 .../lib/hoot/tests/hoot-dom/dom.test.js       |  16 ++-
 2 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/addons/web/static/lib/hoot-dom/helpers/dom.js b/addons/web/static/lib/hoot-dom/helpers/dom.js
index 069b7da9ca9de..e741154f9f794 100644
--- a/addons/web/static/lib/hoot-dom/helpers/dom.js
+++ b/addons/web/static/lib/hoot-dom/helpers/dom.js
@@ -326,6 +326,13 @@ function getFiltersDescription(modifierInfo) {
     return description;
 }
 
+/**
+ * @param {Node} node
+ */
+function getInlineNodeText(node) {
+    return getNodeText(node, { inline: true });
+}
+
 /**
  * @param {Node} node
  * @returns {NodeValue}
@@ -355,6 +362,23 @@ function getNodeShadowRoot(node) {
     return node.shadowRoot;
 }
 
+/**
+ * @param {string} pseudoClass
+ */
+function getQueryFilter(pseudoClass, content) {
+    const makeQueryFilter = customPseudoClasses.get(pseudoClass);
+    try {
+        return makeQueryFilter(content);
+    } catch (err) {
+        let message = `error while parsing pseudo-class ':${pseudoClass}'`;
+        const cause = String(err?.message || err);
+        if (cause) {
+            message += `: ${cause}`;
+        }
+        throw new HootDomError(message);
+    }
+}
+
 /**
  * @param {string} string
  */
@@ -488,28 +512,27 @@ function isWhiteSpace(char) {
 }
 
 /**
- * @param {string} pseudoClass
  * @param {(node: Node) => NodeValue} getContent
+ * @param {boolean} exact
  */
-function makePatternBasedPseudoClass(pseudoClass, getContent) {
-    return (content) => {
-        let regex;
-        try {
-            regex = parseRegExp(content);
-        } catch (err) {
-            throw selectorError(pseudoClass, err.message);
-        }
+function makePseudoClassMatcher(getContent, exact) {
+    return function makePartialMatcher(content) {
+        const regex = parseRegExp(content);
         if (isInstanceOf(regex, RegExp)) {
-            return function containsRegExp(node) {
+            return function stringMatches(node) {
                 return regex.test(String(getContent(node)));
             };
         } else {
             const lowerContent = content.toLowerCase();
-            return function containsString(node) {
-                return getStringContent(String(getContent(node)))
-                    .toLowerCase()
-                    .includes(lowerContent);
-            };
+            if (exact) {
+                return function stringEquals(node) {
+                    return String(getContent(node)).toLowerCase() === lowerContent;
+                };
+            } else {
+                return function stringContains(node) {
+                    return String(getContent(node)).toLowerCase().includes(lowerContent);
+                };
+            }
         }
     };
 }
@@ -720,7 +743,6 @@ function parseSelector(selector) {
         if (currentPseudo) {
             if (parens[0] === parens[1]) {
                 const [pseudo, content] = currentPseudo;
-                const makeFilter = customPseudoClasses.get(pseudo);
                 if (pseudo === "iframe" && !currentPart[0].startsWith("iframe")) {
                     // Special case: to optimise the ":iframe" pseudo class, we
                     // always select actual `iframe` elements.
@@ -728,7 +750,7 @@ function parseSelector(selector) {
                     // but this pseudo won't work on non-iframe elements anyway.
                     currentPart[0] = `iframe${currentPart[0]}`;
                 }
-                const filter = makeFilter(getStringContent(content));
+                const filter = getQueryFilter(pseudo, getStringContent(content));
                 selectorFilterDescriptors.set(filter, [pseudo, content]);
                 currentPart.push(filter);
                 currentPseudo = null;
@@ -883,14 +905,6 @@ function registerQueryMessage(filteredNodes, expectedCount) {
     return invalidCount ? lastQueryMessage : "";
 }
 
-/**
- * @param {string} pseudoClass
- * @param {string} message
- */
-function selectorError(pseudoClass, message) {
-    return new HootDomError(`invalid selector \`:${pseudoClass}\`: ${message}`);
-}
-
 /**
  * Wrapper around '_queryAll' calls to ensure global variables are properly cleaned
  * up on any thrown error.
@@ -960,8 +974,7 @@ function _queryAll(target, options) {
         if (content === false || !customPseudoClasses.has(modifier)) {
             continue;
         }
-        const makeFilter = customPseudoClasses.get(modifier);
-        const filter = makeFilter(content);
+        const filter = getQueryFilter(modifier, content);
         modifierFilters.push(filter);
         globalFilterDescriptors.set(filter, [modifier, content]);
     }
@@ -1095,14 +1108,11 @@ let queryAllLevel = 0;
 const customPseudoClasses = new Map();
 
 customPseudoClasses
-    .set("contains", makePatternBasedPseudoClass("contains", getNodeText))
+    .set("contains", makePseudoClassMatcher(getInlineNodeText, false))
     .set("count", (strCount) => {
         const count = $parseInt(strCount);
         if (!$isInteger(count) || count <= 0) {
-            throw selectorError(
-                "count",
-                `expected count to be a positive integer (got ${strCount})`
-            );
+            throw new HootDomError(`expected count to be a positive integer (got "${strCount}")`);
         }
         return hasNodeCount.bind(null, count);
     })
@@ -1111,7 +1121,7 @@ customPseudoClasses
     .set("eq", (strIndex) => {
         const index = $parseInt(strIndex);
         if (!$isInteger(index)) {
-            throw selectorError("eq", `expected index to be an integer (got ${strIndex})`);
+            throw new HootDomError(`expected index to be an integer (got "${strIndex}")`);
         }
         return index;
     })
@@ -1127,7 +1137,8 @@ customPseudoClasses
     .set("scrollable", (axis) => isNodeScrollable.bind(null, axis))
     .set("selected", () => isNodeSelected)
     .set("shadow", () => getNodeShadowRoot)
-    .set("value", makePatternBasedPseudoClass("value", getNodeValue))
+    .set("text", makePseudoClassMatcher(getInlineNodeText, true))
+    .set("value", makePseudoClassMatcher(getNodeValue, false))
     .set("viewPort", () => isNodeInViewPort)
     .set("visible", () => isNodeVisible);
 
@@ -1883,12 +1894,9 @@ export function observe(target, callback) {
  * This function allows all string selectors supported by the native {@link Element.querySelector}
  * along with some additional custom pseudo-classes:
  *
- * - `:contains(text)`: matches nodes whose *content* matches the given *text*;
- *      * given *text* supports regular expression syntax (e.g. `:contains(/^foo.+/)`)
- *          and is case-insensitive;
- *      * given *text* will be matched against:
- *          - an `<input>`, `<textarea>` or `<select>` element's **value**;
- *          - or any other element's **inner text**.
+ * - `:contains(text)`: matches nodes whose *text content* includes the given *text*.
+ *      * The match is **partial** and **case-insensitive**;
+ *      * Given *text* also supports regular expressions (e.g. `:contains(/^foo.+/)`).
  * - `:count`: return nodes if their count match the given *count*.
  *      If not matching, an error is thrown;
  * - `:displayed`: matches nodes that are "displayed" (see {@link isDisplayed});
@@ -1906,20 +1914,21 @@ export function observe(target, callback) {
  * - `:selected`: matches nodes that are selected (e.g. `<option>` elements);
  * - `:shadow`: matches nodes that have shadow roots, and returns their shadow root;
  * - `:scrollable(axis)`: matches nodes that are scrollable (see {@link isScrollable});
+ * - `:text(text)`: matches nodes whose *content* is strictly equal to the given *text*;
+ *      * The match is **exact**, and **case-insensitive**;
+ *      * Given *text* also supports regular expressions (e.g. `:text(/^foo.+/)`).
+ * - `:value(value)`: matches nodes whose *value* is strictly equal to the given *value*;
+ *      * The match is **partial**, and **case-insensitive**;
+ *      * Given *value* also supports regular expressions (e.g. `:value(/^foo.+/)`).
  * - `:viewPort`: matches nodes that are contained in the current view port (see
  *  {@link isInViewPort});
  * - `:visible`: matches nodes that are "visible" (see {@link isVisible});
  *
  * An `options` object can be specified to filter[1] the results:
- * - `count`: the exact number of nodes to match (throws an error if the number of
- *  nodes doesn't match);
- * - `displayed`: whether the nodes must be "displayed" (see {@link isDisplayed});
- * - `focusable`: whether the nodes must be "focusable" (see {@link isFocusable});
  * - `root`: the root node to query the selector in (defaults to the current fixture);
- * - `viewPort`: whether the nodes must be partially visible in the current viewport
- *  (see {@link isInViewPort});
- * - `visible`: whether the nodes must be "visible" (see {@link isVisible}).
- *      * This option implies `displayed`
+ * - any of the *custom pseudo-classes* can be given as an option, with the value
+ *  being a boolean for standalone pseudo-classes (e.g. `{ empty: true }`), or a
+ *  string for the others (e.g. `{ contains: "text" }`).
  *
  * [1] these filters (except for `count` and `root`) achieve the same result as
  *  using their homonym pseudo-classes on the final group of the given selector
@@ -1945,8 +1954,9 @@ export function observe(target, callback) {
  *  // with options
  *  queryAll(`div:first`, { count: 1 }); // -> [div]
  *  queryAll(`div`, { root: queryOne`iframe` }); // -> [div, div, ...]
- *  // redundant, but possible
- *  queryAll(`button:visible`, { visible: true }); // -> [button, button, ...]
+ *  // the next 2 queries will return the same results
+ *  queryAll(`button:visible`); // -> [button, button, ...]
+ *  queryAll(`button`, { visible: true }); // -> [button, button, ...]
  */
 export function queryAll(target, options) {
     [target, options] = parseRawArgs(arguments);
diff --git a/addons/web/static/lib/hoot/tests/hoot-dom/dom.test.js b/addons/web/static/lib/hoot/tests/hoot-dom/dom.test.js
index fb739dda2b504..a3acfa156f6fa 100644
--- a/addons/web/static/lib/hoot/tests/hoot-dom/dom.test.js
+++ b/addons/web/static/lib/hoot/tests/hoot-dom/dom.test.js
@@ -469,12 +469,16 @@ describe(parseUrl(import.meta.url), () => {
             expectSelector(".title:eq('1')").toEqualNodes(".title", { index: 1 });
             expectSelector('.title:eq("1")').toEqualNodes(".title", { index: 1 });
 
-            // :contains (text)
+            // :contains
             expectSelector("main > .text:contains(ipsum)").toEqualNodes("p");
             expectSelector(".text:contains(/\\bL\\w+\\b\\sipsum/)").toEqualNodes("p");
             expectSelector(".text:contains(item)").toEqualNodes("li");
 
-            // :contains (value)
+            // :text
+            expectSelector(".text:text(item)").toEqualNodes("");
+            expectSelector(".text:text(first item)").toEqualNodes("li:first-of-type");
+
+            // :value
             expectSelector("input:value(john)").toEqualNodes("[name=name],[name=email]");
             expectSelector("input:value(john doe)").toEqualNodes("[name=name]");
             expectSelector("input:value('John Doe (JOD)')").toEqualNodes("[name=name]");
@@ -610,9 +614,9 @@ describe(parseUrl(import.meta.url), () => {
                     <div>PA4: PAV41</div>
                 </span>
             `);
-            expectSelector(
-                `span:contains("Matrix (PAV11, PAV22, PAV31)\nPA4: PAV41")`
-            ).toEqualNodes("span");
+            expectSelector(`span:contains("Matrix (PAV11, PAV22, PAV31) PA4: PAV41")`).toEqualNodes(
+                "span"
+            );
         });
 
         test(":has(...):first", async () => {
@@ -744,7 +748,7 @@ describe(parseUrl(import.meta.url), () => {
             `);
 
             expectSelector(
-                `.o_content:has(.o_field_widget[name=messages]):has(td:contains(/^bbb$/)):has(td:contains(/^\\[test_trigger\\] Mitchell Admin$/))`
+                `.o_content:has(.o_field_widget[name=messages]):has(td:text(bbb)):has(td:contains(/^\\[test_trigger\\] Mitchell Admin/))`
             ).toEqualNodes(".o_content");
         });
 

From 4d4b791146fcb2847393bfeefe3c95631b09248b Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Fri, 14 Nov 2025 10:56:53 +0100
Subject: [PATCH 608/673] [REF] *: use ':text' instead of ':contains'

This commit replaces all found occurrences where ':contains' (with an
exact match regular expression) could be replaced by ':text'.

closes odoo/odoo#235658

Related: odoo/enterprise#99472
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>
---
 .../bus/static/tests/assets_watchdog.test.js  |  2 +-
 addons/bus/static/tests/bus_service.test.js   |  2 +-
 .../tests/tours/event_configurator_ui.js      |  2 +-
 .../static/tests/channel_invite.test.js       |  6 +--
 .../core/public_web/sub_channels.test.js      |  2 +-
 .../static/tests/discuss_app/sidebar.test.js  |  2 +-
 .../mail/static/tests/message/message.test.js |  4 +-
 .../tours/discuss_channel_as_guest_tour.js    |  2 +-
 .../tests/tours/mail_composer_test_tour.js    |  2 +-
 .../static/tests/pos/tours/pos_combo_tour.js  |  2 +-
 .../tests/tours/control_buttons_tour.js       |  6 +--
 .../static/tests/tours/utils/common.js        |  2 +-
 .../static/tests/tours/qfpay_self_tour.js     |  2 +-
 .../tests/tours/project_task_history.js       |  4 +-
 .../tests/tours/project_todo_history.js       |  2 +-
 .../tours/product_configurator_tour_utils.js  |  2 +-
 .../sale/static/tests/tours/sale_signature.js |  2 +-
 .../static/tests/tour/base_automation_tour.js |  8 ++--
 .../static/tests/tours/reset_views.js         |  2 +-
 .../tests/_framework/search_test_helpers.js   | 18 +++----
 .../views/fields/daterange_field.test.js      |  2 +-
 .../fields/state_selection_field.test.js      | 13 ++---
 .../tests/views/kanban/kanban_view.test.js    |  8 ++--
 addons/website/static/tests/tours/rte.js      |  2 +-
 .../tests/tours/snippet_image_gallery.js      |  2 +-
 .../static/tests/tours/website_form_editor.js |  2 +-
 .../tests/tours/website_event_pages_seo.js    |  4 +-
 .../static/src/js/tours/website_forum.js      |  6 +--
 .../static/tests/tours/website_links.js       |  2 +-
 ...website_livechat_chatbot_test_page_tour.js |  4 +-
 .../static/src/js/tours/tour_utils.js         | 12 ++---
 .../static/src/js/tours/website_sale_shop.js  |  2 +-
 .../static/tests/tours/cart_recovery.js       |  4 +-
 .../static/tests/tours/complete_flow.js       |  4 +-
 .../tests/tours/deleted_archived_variants.js  |  2 +-
 .../static/tests/tours/free_delivery.js       |  2 +-
 .../static/tests/tours/google_analytics.js    |  2 +-
 .../static/tests/tours/product_page_zoom.js   |  2 +-
 ...ebsite_sale_free_shipping_discount_line.js |  4 +-
 .../static/tests/tours/tour_utils.js          |  4 +-
 .../static/tests/tours/tour_utils.js          |  6 +--
 .../test_web/static/tests/tours/x2many.js     | 48 +++++++++----------
 42 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/addons/bus/static/tests/assets_watchdog.test.js b/addons/bus/static/tests/assets_watchdog.test.js
index 14fe9fb424db5..1604b1263dc8d 100644
--- a/addons/bus/static/tests/assets_watchdog.test.js
+++ b/addons/bus/static/tests/assets_watchdog.test.js
@@ -17,7 +17,7 @@ test("can listen on bus and display notifications in DOM", async () => {
     });
     await expect.waitForSteps(["bundle_changed"]);
     await runAllTimers();
-    await waitFor(".o_notification", { text: "The page appears to be out of date." });
+    await waitFor(".o_notification", { contains: "The page appears to be out of date." });
     await contains(".o_notification button:contains(Refresh)").click();
     await expect.waitForSteps(["reload-page"]);
 });
diff --git a/addons/bus/static/tests/bus_service.test.js b/addons/bus/static/tests/bus_service.test.js
index 228ae85859dc5..532e92216db3f 100644
--- a/addons/bus/static/tests/bus_service.test.js
+++ b/addons/bus/static/tests/bus_service.test.js
@@ -471,7 +471,7 @@ test("show notification when version is outdated", async () => {
     await expect.waitForSteps(["Worker deactivated due to an outdated version.", "BUS:DISCONNECT"]);
     await runAllTimers();
     await waitFor(".o_notification", {
-        text: "Save your work and refresh to get the latest updates and avoid potential issues.",
+        contains: "Save your work and refresh to get the latest updates and avoid potential issues.",
     });
     await contains(".o_notification button:contains(Refresh)").click();
     await expect.waitForSteps(["reload"]);
diff --git a/addons/event_sale/static/tests/tours/event_configurator_ui.js b/addons/event_sale/static/tests/tours/event_configurator_ui.js
index db368c9cbdd9c..f7366dee66f81 100644
--- a/addons/event_sale/static/tests/tours/event_configurator_ui.js
+++ b/addons/event_sale/static/tests/tours/event_configurator_ui.js
@@ -14,7 +14,7 @@ registry.category("web_tour.tours").add("event_configurator_tour", {
             run: "click",
         },
         {
-            trigger: "ul.ui-autocomplete a:contains(/^Design Fair Los Angeles$/)",
+            trigger: "ul.ui-autocomplete a:text(Design Fair Los Angeles)",
             run: "click",
         },
         {
diff --git a/addons/im_livechat/static/tests/channel_invite.test.js b/addons/im_livechat/static/tests/channel_invite.test.js
index 9e946c7b6ebe9..0d5bf822f045e 100644
--- a/addons/im_livechat/static/tests/channel_invite.test.js
+++ b/addons/im_livechat/static/tests/channel_invite.test.js
@@ -55,7 +55,7 @@ test("Can invite a partner to a livechat channel", async () => {
         parent: [".o-discuss-ChannelInvitation-selectable", { text: "James" }],
     });
     await contains(
-        ".o-discuss-ChannelInvitation-selectable:contains('James\nEnglish\nFrench\nGerman\npricing\nevents')"
+        ".o-discuss-ChannelInvitation-selectable:contains('James English French German pricing events')"
     );
     await click("button:enabled", { text: "Invite" });
     await contains(".o-mail-NotificationMessage", {
@@ -190,9 +190,9 @@ test("shows operators are in call", async () => {
     await start();
     await openDiscuss(channelId);
     await click("[title='Invite People']");
-    await contains(".o-discuss-ChannelInvitation-selectable:contains('bob\nin a call')");
+    await contains(".o-discuss-ChannelInvitation-selectable:contains('bob in a call')");
     await contains(".o-discuss-ChannelInvitation-selectable:contains('john')");
-    await contains(".o-discuss-ChannelInvitation-selectable:contains('john\nin a call')", {
+    await contains(".o-discuss-ChannelInvitation-selectable:contains('john in a call')", {
         count: 0,
     });
 });
diff --git a/addons/mail/static/tests/discuss/core/public_web/sub_channels.test.js b/addons/mail/static/tests/discuss/core/public_web/sub_channels.test.js
index 62617439c82fc..c947010de5a9f 100644
--- a/addons/mail/static/tests/discuss/core/public_web/sub_channels.test.js
+++ b/addons/mail/static/tests/discuss/core/public_web/sub_channels.test.js
@@ -347,6 +347,6 @@ test("Can delete channel thread as author of thread", async () => {
     await click(".modal button:contains('Delete Thread')");
     await contains(".o-mail-DiscussContent-threadName[title='General']");
     await contains(
-        `.o-mail-NotificationMessage :contains(/^Mitchell Admin deleted the thread "test thread"$/)`
+        `.o-mail-NotificationMessage :text(Mitchell Admin deleted the thread "test thread")`
     );
 });
diff --git a/addons/mail/static/tests/discuss_app/sidebar.test.js b/addons/mail/static/tests/discuss_app/sidebar.test.js
index 892c4d274c175..7a3b06af40e92 100644
--- a/addons/mail/static/tests/discuss_app/sidebar.test.js
+++ b/addons/mail/static/tests/discuss_app/sidebar.test.js
@@ -1163,7 +1163,7 @@ test("add and remove channel from favorites updates sidebar", async () => {
         ".o-mail-DiscussSidebarCategory-channel + .o-mail-DiscussSidebarChannel-container";
     const favoriteContainerSelector =
         ".o-mail-DiscussSidebarCategory-favorite + .o-mail-DiscussSidebarChannel-container";
-    const generalChannelSelector = ".o-mail-DiscussSidebarChannel:has(:contains(/^General$/))";
+    const generalChannelSelector = ".o-mail-DiscussSidebarChannel:has(:text(General))";
     await start();
     await openDiscuss();
     await click(`${channelContainerSelector} ${generalChannelSelector} button .oi-ellipsis-h`);
diff --git a/addons/mail/static/tests/message/message.test.js b/addons/mail/static/tests/message/message.test.js
index 495655bdda6ec..efc89d745fcef 100644
--- a/addons/mail/static/tests/message/message.test.js
+++ b/addons/mail/static/tests/message/message.test.js
@@ -218,7 +218,7 @@ test("Can add reaction to a message on an ipad", async () => {
     await advanceTime(LONG_PRESS_DELAY);
     await click("button:contains('Add a Reaction')");
     await click(".o-EmojiPicker-content .o-Emoji:contains('😀')");
-    await contains(".o-mail-MessageReaction:contains('😀\n1')");
+    await contains(".o-mail-MessageReaction:contains('😀 1')");
 });
 
 test("Editing message keeps the mentioned channels", async () => {
@@ -866,7 +866,7 @@ test("Reaction summary", async () => {
         await withUser(userId, async () => {
             await click(".o-mail-Message-actions [title='Add a Reaction']");
             await click(".o-mail-QuickReactionMenu button", { text: "😅" });
-            await waitFor(`.o-mail-MessageReaction:contains(/^😅 ${idx + 1}$/)`, {
+            await waitFor(`.o-mail-MessageReaction:text(😅 ${idx + 1})`, {
                 exact: true,
                 timeout: 3000,
             });
diff --git a/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js b/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js
index a19689c6d24d8..101e9f8f0d40d 100644
--- a/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js
+++ b/addons/mail/static/tests/tours/discuss_channel_as_guest_tour.js
@@ -31,7 +31,7 @@ registry.category("web_tour.tours").add("discuss_channel_as_guest_tour.js", {
         },
         {
             trigger:
-                ".o-mail-DiscussCommand:not(:has(.fa-user)):has(.fa-hashtag):contains(/^Test channel$/)",
+                ".o-mail-DiscussCommand:not(:has(.fa-user)):has(.fa-hashtag):text(Test channel)",
         },
     ],
 });
diff --git a/addons/mail/static/tests/tours/mail_composer_test_tour.js b/addons/mail/static/tests/tours/mail_composer_test_tour.js
index e69eca194b326..420822950a355 100644
--- a/addons/mail/static/tests/tours/mail_composer_test_tour.js
+++ b/addons/mail/static/tests/tours/mail_composer_test_tour.js
@@ -148,7 +148,7 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/mail_composer_t
         {
             content: "Check message has correct recipients",
             trigger:
-                ".o-mail-MessageNotificationPopover:contains('Not A Demo User (NotADemoUser@mail.com)\nJane (jane@example.com)\nMitchell Admin (test.admin@test.example.com)')",
+                ".o-mail-MessageNotificationPopover:contains('Not A Demo User (NotADemoUser@mail.com) Jane (jane@example.com) Mitchell Admin (test.admin@test.example.com)')",
         },
         {
             content: "Check message contains the first attachment",
diff --git a/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js b/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
index 63ee7dce30d6c..342d5999c0a2f 100644
--- a/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
@@ -25,7 +25,7 @@ registry.category("web_tour.tours").add("ProductComboPriceTaxIncludedTour", {
             Dialog.is("Attribute selection"),
             {
                 content: "dialog discard",
-                trigger: ".modal-footer .btn:contains(/^Add$/) + .btn:contains(/^Discard$/)",
+                trigger: ".modal-footer .btn:text(Add) + .btn:text(Discard)",
                 run: "click",
             },
             combo.select("Combo Product 5"),
diff --git a/addons/pos_restaurant/static/tests/tours/control_buttons_tour.js b/addons/pos_restaurant/static/tests/tours/control_buttons_tour.js
index 40f96f02422d6..c29fef6f315b3 100644
--- a/addons/pos_restaurant/static/tests/tours/control_buttons_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/control_buttons_tour.js
@@ -68,12 +68,12 @@ registry.category("web_tour.tours").add("ControlButtonsTour", {
             ProductScreen.clickControlButton("Guests"),
             {
                 content: `click numpad button: 1`,
-                trigger: ".modal div.numpad button:contains(/^1$/)",
+                trigger: ".modal div.numpad button:text(1)",
                 run: "click",
             },
             {
                 content: `click numpad button: 5`,
-                trigger: ".modal div.numpad button:contains(/^5$/)",
+                trigger: ".modal div.numpad button:text(5)",
                 run: "click",
             },
             NumberPopup.isShown("15"),
@@ -86,7 +86,7 @@ registry.category("web_tour.tours").add("ControlButtonsTour", {
             },
             {
                 content: `click numpad button: 5`,
-                trigger: ".modal div.numpad button:contains(/^5$/)",
+                trigger: ".modal div.numpad button:text(5)",
                 run: "click",
             },
             NumberPopup.isShown("5"),
diff --git a/addons/pos_self_order/static/tests/tours/utils/common.js b/addons/pos_self_order/static/tests/tours/utils/common.js
index a3b6c737327c5..6710e283ad2c7 100644
--- a/addons/pos_self_order/static/tests/tours/utils/common.js
+++ b/addons/pos_self_order/static/tests/tours/utils/common.js
@@ -30,7 +30,7 @@ export function checkBtn(buttonName) {
 export function checkIsNoBtn(buttonName) {
     return {
         content: `Check that '${buttonName}' do not exist`,
-        trigger: `body:not(:has(.btn:contains(/^${buttonName}$/)))`,
+        trigger: `body:not(:has(.btn:text(${buttonName})))`,
     };
 }
 
diff --git a/addons/pos_self_order_qfpay/static/tests/tours/qfpay_self_tour.js b/addons/pos_self_order_qfpay/static/tests/tours/qfpay_self_tour.js
index e3d6882b4c431..c33b23a8cedcc 100644
--- a/addons/pos_self_order_qfpay/static/tests/tours/qfpay_self_tour.js
+++ b/addons/pos_self_order_qfpay/static/tests/tours/qfpay_self_tour.js
@@ -39,7 +39,7 @@ registry.category("web_tour.tours").add("kiosk_qfpay_order", {
         Utils.checkIsNoBtn("Pay"),
         {
             content: "Waiting for Qfpay payment to be processed",
-            trigger: "body:not(:has(.btn:contains(/^Retry$/)))",
+            trigger: "body:not(:has(.btn:text(Retry)))",
             run: async function () {
                 const amount = posmodel.currentOrder.amount_total;
                 const paymentMethodId = posmodel.models["pos.payment.method"].getAll()[0].id;
diff --git a/addons/project/static/tests/tours/project_task_history.js b/addons/project/static/tests/tours/project_task_history.js
index 6e4ffd9efffbd..932403b3fa3e0 100644
--- a/addons/project/static/tests/tours/project_task_history.js
+++ b/addons/project/static/tests/tours/project_task_history.js
@@ -138,7 +138,7 @@ registry.category("web_tour.tours").add("project_task_history_tour", {
         run: "click",
     }, {
         content: "Verify the confirmation dialog is opened",
-        trigger: ".modal button.btn-primary:contains(/^Restore$/)",
+        trigger: ".modal button.btn-primary:text(Restore)",
         run: "click",
     }, {
         content: "Verify that the description contains the right text after the restore",
@@ -258,7 +258,7 @@ registry.category("web_tour.tours").add("project_task_last_history_steps_tour",
         trigger: '.modal button.btn-primary:enabled',
         run: "click",
     }, {
-        trigger: '.modal button.btn-primary:contains(/^Restore$/)',
+        trigger: '.modal button.btn-primary:text(Restore)',
         run: "click",
     },
         ...insertEditorContent("2"),
diff --git a/addons/project_todo/static/tests/tours/project_todo_history.js b/addons/project_todo/static/tests/tours/project_todo_history.js
index 037458461979b..a5f95f40e2e5a 100644
--- a/addons/project_todo/static/tests/tours/project_todo_history.js
+++ b/addons/project_todo/static/tests/tours/project_todo_history.js
@@ -111,7 +111,7 @@ registry.category("web_tour.tours").add("project_todo_history_tour", {
         run: "click",
     }, {
         content: "Verify the confirmation dialog is opened",
-        trigger: ".modal button.btn-primary:contains(/^Restore$/)",
+        trigger: ".modal button.btn-primary:text(Restore)",
         run: "click",
     }, {
         content: "Verify that the description contains the right text after the restore",
diff --git a/addons/sale/static/src/js/tours/product_configurator_tour_utils.js b/addons/sale/static/src/js/tours/product_configurator_tour_utils.js
index 31e65fb03b54e..b689d22ee096e 100644
--- a/addons/sale/static/src/js/tours/product_configurator_tour_utils.js
+++ b/addons/sale/static/src/js/tours/product_configurator_tour_utils.js
@@ -119,7 +119,7 @@ function selectAttribute(productName, attributeName, attributeValue, attributeTy
         case 'multi':
             return {
                 content: content,
-                trigger: `${ptalSelector}:has(label:contains(/^${attributeValue}$/)) input[type="checkbox"]`,
+                trigger: `${ptalSelector}:has(label:text(${attributeValue})) input[type="checkbox"]`,
                 run: "click",
             };
         case 'pills':
diff --git a/addons/sale/static/tests/tours/sale_signature.js b/addons/sale/static/tests/tours/sale_signature.js
index 0ccaae4604ced..1c3db016ea2b1 100644
--- a/addons/sale/static/tests/tours/sale_signature.js
+++ b/addons/sale/static/tests/tours/sale_signature.js
@@ -7,7 +7,7 @@ registry.category("web_tour.tours").add('sale_signature', {
     steps: () => [
     {
         content: "open the test SO",
-        trigger: 'a:contains(/^test SO$/)',
+        trigger: 'a:text(test SO)',
         run: "click",
         expectUnloadPage: true,
     },
diff --git a/addons/test_base_automation/static/tests/tour/base_automation_tour.js b/addons/test_base_automation/static/tests/tour/base_automation_tour.js
index 21ef66085270c..0832011774e0c 100644
--- a/addons/test_base_automation/static/tests/tour/base_automation_tour.js
+++ b/addons/test_base_automation/static/tests/tour/base_automation_tour.js
@@ -360,14 +360,14 @@ registry.category("web_tour.tours").add("test_resize_kanban", {
         },
         {
             trigger:
-                ".o_automation_actions:contains(Set Active To False\nSet Active To False\nSet Active To False)",
+                ".o_automation_actions:contains(Set Active To False Set Active To False Set Active To False)",
             async run() {
                 document.body.style.setProperty("width", "500px");
                 window.dispatchEvent(new Event("resize"));
             },
         },
         {
-            trigger: ".o_automation_actions:contains(Set Active To False\n2 actions)",
+            trigger: ".o_automation_actions:contains(Set Active To False 2 actions)",
         },
     ],
 });
@@ -646,7 +646,7 @@ registry.category("web_tour.tours").add("base_automation.on_change_rule_creation
             run: "edit ir.ui.view",
         },
         {
-            trigger: ".ui-menu-item > a:contains(/^View$/)",
+            trigger: ".ui-menu-item > a:text(View)",
             run: "click",
         },
         {
@@ -663,7 +663,7 @@ registry.category("web_tour.tours").add("base_automation.on_change_rule_creation
             run: "edit Active",
         },
         {
-            trigger: ".ui-menu-item > a:contains(/^Active$/)",
+            trigger: ".ui-menu-item > a:text(Active)",
             run: "click",
         },
         ...stepUtils.saveForm(),
diff --git a/addons/test_website/static/tests/tours/reset_views.js b/addons/test_website/static/tests/tours/reset_views.js
index 786e72b588672..5e205c73b2ba2 100644
--- a/addons/test_website/static/tests/tours/reset_views.js
+++ b/addons/test_website/static/tests/tours/reset_views.js
@@ -71,7 +71,7 @@ registerWebsitePreviewTour(
     () => [
         {
             content: "check that the view got fixed",
-            trigger: ":iframe p:contains(/^Test Page View$/)",
+            trigger: ":iframe p:text(Test Page View)",
         },
         {
             content: "check that the inherited COW view is still there (created during edit mode)",
diff --git a/addons/web/static/tests/_framework/search_test_helpers.js b/addons/web/static/tests/_framework/search_test_helpers.js
index 232388e0e3c9d..1d1dd86ee52cc 100644
--- a/addons/web/static/tests/_framework/search_test_helpers.js
+++ b/addons/web/static/tests/_framework/search_test_helpers.js
@@ -113,14 +113,14 @@ export async function mountWithSearch(componentConstructor, searchProps = {}, co
  * @param {string} label
  */
 export async function toggleMenu(label) {
-    await contains(`button.o-dropdown:contains(/^${label}$/i)`).click();
+    await contains(`button.o-dropdown:text(${label})`).click();
 }
 
 /**
  * @param {string} label
  */
 export async function toggleMenuItem(label) {
-    const target = queryOne`.o_menu_item:contains(/^${label}$/i)`;
+    const target = queryOne`.o_menu_item:text(${label})`;
     if (target.classList.contains("dropdown-toggle")) {
         await contains(target).hover();
     } else {
@@ -133,8 +133,8 @@ export async function toggleMenuItem(label) {
  * @param {string} optionLabel
  */
 export async function toggleMenuItemOption(itemLabel, optionLabel) {
-    const { parentElement: root } = queryOne`.o_menu_item:contains(/^${itemLabel}$/i)`;
-    const target = queryOne(`.o_item_option:contains(/^${optionLabel}$/i)`, { root });
+    const { parentElement: root } = queryOne`.o_menu_item:text(${itemLabel})`;
+    const target = queryOne(`.o_item_option:text(${optionLabel})`, { root });
     if (target.classList.contains("dropdown-toggle")) {
         await contains(target).hover();
     } else {
@@ -146,7 +146,7 @@ export async function toggleMenuItemOption(itemLabel, optionLabel) {
  * @param {string} label
  */
 export function isItemSelected(label) {
-    return queryOne`.o_menu_item:contains(/^${label}$/i)`.classList.contains("selected");
+    return queryOne`.o_menu_item:text(${label})`.classList.contains("selected");
 }
 
 /**
@@ -154,8 +154,8 @@ export function isItemSelected(label) {
  * @param {string} optionLabel
  */
 export function isOptionSelected(itemLabel, optionLabel) {
-    const { parentElement: root } = queryOne`.o_menu_item:contains(/^${itemLabel}$/i)`;
-    return queryOne(`.o_item_option:contains(/^${optionLabel}$/i)`, { root }).classList.contains(
+    const { parentElement: root } = queryOne`.o_menu_item:text(${itemLabel})`;
+    return queryOne(`.o_item_option:text(${optionLabel})`, { root }).classList.contains(
         "selected"
     );
 }
@@ -217,7 +217,7 @@ export async function toggleFavoriteMenu() {
  */
 export async function editFavorite(text) {
     await ensureSearchBarMenu();
-    await contains(`.o_favorite_menu .o_menu_item:contains(/^${text}$/i) i.fa-pencil`, {
+    await contains(`.o_favorite_menu .o_menu_item:text(${text}) i.fa-pencil`, {
         visible: false,
     }).click();
 }
@@ -260,7 +260,7 @@ export function getFacetTexts() {
  */
 export async function removeFacet(label) {
     await ensureSearchView();
-    await contains(`.o_searchview_facet:contains(/^${label}$/i) .o_facet_remove`).click();
+    await contains(`.o_searchview_facet:text(${label}) .o_facet_remove`).click();
 }
 
 /**
diff --git a/addons/web/static/tests/views/fields/daterange_field.test.js b/addons/web/static/tests/views/fields/daterange_field.test.js
index 8f0f209d19293..ce12d25e0464b 100644
--- a/addons/web/static/tests/views/fields/daterange_field.test.js
+++ b/addons/web/static/tests/views/fields/daterange_field.test.js
@@ -29,7 +29,7 @@ import {
 import { _makeUser, user } from "@web/core/user";
 
 function getPickerCell(expr) {
-    return queryAll(`.o_datetime_picker .o_date_item_cell:contains(/^${expr}$/)`);
+    return queryAll(`.o_datetime_picker .o_date_item_cell:text(${expr})`);
 }
 
 class Partner extends models.Model {
diff --git a/addons/web/static/tests/views/fields/state_selection_field.test.js b/addons/web/static/tests/views/fields/state_selection_field.test.js
index d8d51495001a6..9c91d6e8a81db 100644
--- a/addons/web/static/tests/views/fields/state_selection_field.test.js
+++ b/addons/web/static/tests/views/fields/state_selection_field.test.js
@@ -395,8 +395,8 @@ test('StateSelectionField edited by the smart actions "Set kanban state as <stat
     expect(".o_status_red").toHaveCount(1);
     await press(["control", "k"]);
     await animationFrame();
-    expect(`.o_command:contains("Set kanban state as Normal\nALT + D")`).toHaveCount(1);
-    const doneItem = `.o_command:contains("Set kanban state as Done\nALT + G")`;
+    expect(`.o_command:contains("Set kanban state as Normal ALT + D")`).toHaveCount(1);
+    const doneItem = `.o_command:contains("Set kanban state as Done ALT + G")`;
     expect(doneItem).toHaveCount(1);
 
     await click(doneItem);
@@ -405,9 +405,9 @@ test('StateSelectionField edited by the smart actions "Set kanban state as <stat
 
     await press(["control", "k"]);
     await animationFrame();
-    expect(`.o_command:contains("Set kanban state as Normal\nALT + D")`).toHaveCount(1);
-    expect(`.o_command:contains("Set kanban state as Blocked\nALT + F")`).toHaveCount(1);
-    expect(`.o_command:contains("Set kanban state as Done\nALT + G")`).toHaveCount(0);
+    expect(`.o_command:contains("Set kanban state as Normal ALT + D")`).toHaveCount(1);
+    expect(`.o_command:contains("Set kanban state as Blocked ALT + F")`).toHaveCount(1);
+    expect(`.o_command:contains("Set kanban state as Done ALT + G")`).toHaveCount(0);
 });
 
 test("StateSelectionField uses legend_* fields", async () => {
@@ -565,7 +565,8 @@ test("StateSelectionField - hotkey handling when there are more than 3 options a
     await press(["control", "k"]);
     await animationFrame();
 
-    expect(".o_command#o_command_2").toHaveText("Set kanban state as Done\nALT + G", {
+    expect(".o_command#o_command_2").toHaveText("Set kanban state as Done ALT + G", {
+        inline: true,
         message: "hotkey and command are present",
     });
     expect(".o_command#o_command_4").toHaveText("Set kanban state as Martine", {
diff --git a/addons/web/static/tests/views/kanban/kanban_view.test.js b/addons/web/static/tests/views/kanban/kanban_view.test.js
index 60aee79d79df4..3f62618e7aa58 100644
--- a/addons/web/static/tests/views/kanban/kanban_view.test.js
+++ b/addons/web/static/tests/views/kanban/kanban_view.test.js
@@ -8577,10 +8577,10 @@ test("groups will be scrolled to on unfold if outside of viewport", async () =>
         message:
             "the next group (which is folded) should stick to the right of the screen after the scroll",
     });
-    expect(".o_column_folded:eq(0)").toHaveText("column 7\n(1)");
-    await contains('.o_kanban_group:contains("column 7\n(1)")').click();
+    expect(".o_column_folded:eq(0)").toHaveText("column 7 (1)", { inline: true });
+    await contains('.o_kanban_group:contains("column 7 (1)")').click();
     expect(".o_content").toHaveProperty("scrollLeft", 2154);
-    ({ x, width } = queryRect('.o_kanban_group:contains("column 7\n(1)")'));
+    ({ x, width } = queryRect('.o_kanban_group:contains("column 7 (1)")'));
     // TODO JUM: change digits option
     expect(x + width).toBeCloseTo(window.innerWidth, {
         digits: 0,
@@ -8592,7 +8592,7 @@ test("groups will be scrolled to on unfold if outside of viewport", async () =>
     expect(".o_content").toHaveProperty("scrollLeft", 3302);
     await contains(".o_kanban_group:last").click();
     expect(".o_content").toHaveProperty("scrollLeft", 3562);
-    ({ x, width } = queryRect('.o_kanban_group:contains("column 11\n(1)")'));
+    ({ x, width } = queryRect('.o_kanban_group:contains("column 11 (1)")'));
     // TODO JUM: change digits option
     expect(x + width).toBeCloseTo(window.innerWidth, {
         digits: 0,
diff --git a/addons/website/static/tests/tours/rte.js b/addons/website/static/tests/tours/rte.js
index af15696a1af30..fb8e7c3193468 100644
--- a/addons/website/static/tests/tours/rte.js
+++ b/addons/website/static/tests/tours/rte.js
@@ -288,7 +288,7 @@ registerWebsitePreviewTour(
         {
             content: "Check body",
             trigger:
-                ":iframe body:not(:has(#wrap p font:first:contains(/^paragraphs <b>describing</b>$/)))",
+                ":iframe body:not(:has(#wrap p font:first:text(paragraphs <b>describing</b>)))",
         },
         ...clickOnEditAndWaitEditModeInTranslatedPage(),
         {
diff --git a/addons/website/static/tests/tours/snippet_image_gallery.js b/addons/website/static/tests/tours/snippet_image_gallery.js
index 4c767c8c6009c..9627c4869fc9e 100644
--- a/addons/website/static/tests/tours/snippet_image_gallery.js
+++ b/addons/website/static/tests/tours/snippet_image_gallery.js
@@ -76,7 +76,7 @@ registerWebsitePreviewTour(
             content:
                 "Check that the Snippet Editor of the clicked image has been loaded with its size",
             trigger:
-                ".o-tab-content [data-container-title='Image']:has([title='Size']:contains(/^.+ kB$/)",
+                ".o-tab-content [data-container-title='Image']:has([title='Size']:text(.+ kB)",
         },
         {
             content: "Click on Remove Block",
diff --git a/addons/website/static/tests/tours/website_form_editor.js b/addons/website/static/tests/tours/website_form_editor.js
index 0e22d8a672c97..6d69bed999b8f 100644
--- a/addons/website/static/tests/tours/website_form_editor.js
+++ b/addons/website/static/tests/tours/website_form_editor.js
@@ -1189,7 +1189,7 @@ registerWebsitePreviewTour(
         },
         {
             content: "Check that the new text value was correctly set",
-            trigger: ":iframe section.s_website_form h2:contains(/^ABC$/)",
+            trigger: ":iframe section.s_website_form h2:text(ABC)",
             run() {
                 this.anchor.scrollIntoView();
             },
diff --git a/addons/website_event/static/tests/tours/website_event_pages_seo.js b/addons/website_event/static/tests/tours/website_event_pages_seo.js
index 3cdfc5ceca43e..46c929833dd20 100644
--- a/addons/website_event/static/tests/tours/website_event_pages_seo.js
+++ b/addons/website_event/static/tests/tours/website_event_pages_seo.js
@@ -31,11 +31,11 @@ registry.category("web_tour.tours").add("website_event_pages_seo", {
             trigger: "body:not(:has(.modal))",
         },
         {
-            trigger: ":iframe head:has(title:contains(/^Hello, world!$/)):not(:visible)",
+            trigger: ":iframe head:has(title:text(Hello, world!)):not(:visible)",
         },
         {
             content: "Check that the page title is adapted, inside and outside the iframe",
-            trigger: "head:has(title:contains(/^Hello, world!$/)):not(:visible)",
+            trigger: "head:has(title:text(Hello, world!)):not(:visible)",
         },
     ],
 });
diff --git a/addons/website_forum/static/src/js/tours/website_forum.js b/addons/website_forum/static/src/js/tours/website_forum.js
index f74300a29afad..cbf4de64cbb7c 100644
--- a/addons/website_forum/static/src/js/tours/website_forum.js
+++ b/addons/website_forum/static/src/js/tours/website_forum.js
@@ -28,7 +28,7 @@ registerBackendAndFrontendTour("question", {
     run: "editor Test",
 },
 {
-    trigger: `.note-editable p:not(:contains(/^<br>$/))`,
+    trigger: `.note-editable p:not(:text(<br>))`,
 },
 {
     trigger: ".o_select_menu_toggler",
@@ -75,7 +75,7 @@ registerBackendAndFrontendTour("question", {
     run: "editor Test",
 },
 {
-    trigger: `.note-editable p:not(:contains(/^<br>$/))`,
+    trigger: `.note-editable p:not(:text(<br>))`,
 },
 {
     trigger: "button:contains(\"Post Answer\")",
@@ -83,7 +83,7 @@ registerBackendAndFrontendTour("question", {
     tooltipPosition: "bottom",
     run: "click",
     expectUnloadPage: true,
-}, 
+},
 {
     trigger: ".o_wforum_content_wrapper .h3:contains(test)",
 },
diff --git a/addons/website_links/static/tests/tours/website_links.js b/addons/website_links/static/tests/tours/website_links.js
index 36e0b108d442b..22c0d7ac14ce8 100644
--- a/addons/website_links/static/tests/tours/website_links.js
+++ b/addons/website_links/static/tests/tours/website_links.js
@@ -79,7 +79,7 @@ registry.category("web_tour.tours").add('website_links_tour', {
         },
         {
             content: "check that we landed on correct page with correct query strings",
-            trigger: ".s_form_aside h1:contains(/^Contact us$/)",
+            trigger: ".s_form_aside h1:text(Contact us)",
             run: function () {
                 const enc = c => encodeURIComponent(c).replace(/%20/g, '+');
                 const expectedUrl = `/contactus?utm_campaign=${enc(campaignValue)}&utm_source=${enc(sourceValue)}&utm_medium=${enc(mediumValue)}`;
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js b/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js
index 8e359d16c6dec..5faa16617a406 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_chatbot_test_page_tour.js
@@ -6,7 +6,7 @@ registry.category("web_tour.tours").add("website_livechat_chatbot_test_page_tour
     steps: () => [
         {
             trigger:
-                ".o-livechat-root:shadow .o-mail-ChatHub:has(.o-mail-ChatWindow .o-mail-ChatWindow-header:contains(/^Testing Bot$/)):count(1) .o-mail-Message-body:contains(/^Hello! I'm a bot!$/)",
+                ".o-livechat-root:shadow .o-mail-ChatHub:has(.o-mail-ChatWindow .o-mail-ChatWindow-header:text(Testing Bot)):count(1) .o-mail-Message-body:text(Hello! I'm a bot!)",
         },
         {
             trigger: messagesContain("I help lost visitors find their way."),
@@ -29,7 +29,7 @@ registry.category("web_tour.tours").add("website_livechat_chatbot_test_page_tour
         },
         {
             trigger:
-                ".o-livechat-root:shadow .o-mail-ChatHub:has(.o-mail-ChatWindow .o-mail-ChatWindow-header:contains(/^Testing Bot$/)):count(1) .o-mail-Message-body:contains(/^Hello! I'm a bot!$/)",
+                ".o-livechat-root:shadow .o-mail-ChatHub:has(.o-mail-ChatWindow .o-mail-ChatWindow-header:text(Testing Bot)):count(1) .o-mail-Message-body:text(Hello! I'm a bot!)",
         },
         {
             trigger: '.o-livechat-root:shadow button:contains("Other & Documentation")',
diff --git a/addons/website_sale/static/src/js/tours/tour_utils.js b/addons/website_sale/static/src/js/tours/tour_utils.js
index 96446619d22a7..a9cd63f260ed1 100644
--- a/addons/website_sale/static/src/js/tours/tour_utils.js
+++ b/addons/website_sale/static/src/js/tours/tour_utils.js
@@ -56,25 +56,25 @@ export function assertCartAmounts({ taxes = false, untaxed = false, total = fals
     if (taxes) {
         steps.push({
             content: 'Check if the tax is correct',
-            trigger: `tr[name="o_order_total_taxes"] .oe_currency_value:contains(/^${taxes}$/)`,
+            trigger: `tr[name="o_order_total_taxes"] .oe_currency_value:text(${taxes})`,
         });
     }
     if (untaxed) {
         steps.push({
             content: 'Check if the subtotal is correct',
-            trigger: `tr[name="o_order_total_untaxed"] .oe_currency_value:contains(/^${untaxed}$/)`,
+            trigger: `tr[name="o_order_total_untaxed"] .oe_currency_value:text(${untaxed})`,
         });
     }
     if (total) {
         steps.push({
             content: 'Check if the total is correct',
-            trigger: `tr[name="o_order_total"] .oe_currency_value:contains(/^${total}$/)`,
+            trigger: `tr[name="o_order_total"] .oe_currency_value:text(${total})`,
         });
     }
     if (delivery) {
         steps.push({
             content: 'Check if the delivery is correct',
-            trigger: `tr[name='o_order_delivery'] .oe_currency_value:contains(/^${delivery}$/)`,
+            trigger: `tr[name='o_order_delivery'] .oe_currency_value:text(${delivery})`,
         });
     }
     return steps
@@ -152,7 +152,7 @@ export function goToCart({
 } = {}) {
     return {
         content: _t("Go to cart"),
-        trigger: `${backend ? ":iframe" : ""} a sup.my_cart_quantity:contains(/^${quantity}$/)`,
+        trigger: `${backend ? ":iframe" : ""} a sup.my_cart_quantity:text(${quantity})`,
         tooltipPosition: position,
         run: "click",
         expectUnloadPage,
@@ -277,7 +277,7 @@ export function searchProduct(productName, { select = false } = {}) {
     if (select) {
         steps.push({
             content: `Select ${productName}`,
-            trigger: `.oe_product_cart:first a:contains(/^${productName}$/i)`,
+            trigger: `.oe_product_cart:first a:text(${productName})`,
             run: "click",
             expectUnloadPage: true,
         });
diff --git a/addons/website_sale/static/src/js/tours/website_sale_shop.js b/addons/website_sale/static/src/js/tours/website_sale_shop.js
index 60abbb0c013df..00a71a3be9491 100644
--- a/addons/website_sale/static/src/js/tours/website_sale_shop.js
+++ b/addons/website_sale/static/src/js/tours/website_sale_shop.js
@@ -51,7 +51,7 @@ registerWebsitePreviewTour(
             timeout: 30000,
         },
         {
-            trigger: ":iframe .product_price .o_dirty .oe_currency_value:not(:contains(/^1.00$/))",
+            trigger: ":iframe .product_price .o_dirty .oe_currency_value:not(:text(1.00))",
         },
         {
             trigger: ":iframe #wrap img.product_detail_img",
diff --git a/addons/website_sale/static/tests/tours/cart_recovery.js b/addons/website_sale/static/tests/tours/cart_recovery.js
index a6c5fb1abeb9b..59e7f7dbabff5 100644
--- a/addons/website_sale/static/tests/tours/cart_recovery.js
+++ b/addons/website_sale/static/tests/tours/cart_recovery.js
@@ -56,7 +56,7 @@ registry.category("web_tour.tours").add('website_sale.cart_recovery', {
         },
         {
             content: "click Send an Email",
-            trigger: "span:contains(/^Send an email$/)",
+            trigger: "span:text(Send an email)",
             run: "click",
         },
         {
@@ -80,7 +80,7 @@ registry.category("web_tour.tours").add('website_sale.cart_recovery', {
         },
         {
             content: "check the mail is sent, grab the recovery link, and logout",
-            trigger: ".o-mail-Message-body a:contains(/^Resume order$/)",
+            trigger: ".o-mail-Message-body a:text(Resume order)",
             async run({ queryOne }) {
                 var link = queryOne('.o-mail-Message-body a:contains("Resume order")').getAttribute('href');
                 browser.localStorage.setItem(recoveryLinkKey, link);
diff --git a/addons/website_sale/static/tests/tours/complete_flow.js b/addons/website_sale/static/tests/tours/complete_flow.js
index df4e136e8a2af..35f71bac14b06 100644
--- a/addons/website_sale/static/tests/tours/complete_flow.js
+++ b/addons/website_sale/static/tests/tours/complete_flow.js
@@ -21,7 +21,7 @@ registry.category("web_tour.tours").add('website_sale.complete_flow_1', {
         },
         {
             content: "Check b2b Tax-Excluded Prices",
-            trigger: ".product_price .oe_price .oe_currency_value:contains(/^79.00$/)",
+            trigger: ".product_price .oe_price .oe_currency_value:text(79.00)",
         },
         ...tourUtils.addToCartFromProductPage(),
         tourUtils.goToCart({ quantity: 2 }),
@@ -286,7 +286,7 @@ registry.category("web_tour.tours").add('website_sale.complete_flow_1', {
         },
         {
             content: "Check b2c Tax-Included Prices",
-            trigger: ".product_price .oe_price .oe_currency_value:contains(/^90.85$/)",
+            trigger: ".product_price .oe_price .oe_currency_value:text(90.85)",
         },
         ...tourUtils.addToCartFromProductPage(),
         tourUtils.goToCart({ quantity: 2 }),
diff --git a/addons/website_sale/static/tests/tours/deleted_archived_variants.js b/addons/website_sale/static/tests/tours/deleted_archived_variants.js
index 0768b3cbcc72c..b8807c09958c3 100644
--- a/addons/website_sale/static/tests/tours/deleted_archived_variants.js
+++ b/addons/website_sale/static/tests/tours/deleted_archived_variants.js
@@ -11,7 +11,7 @@ registry.category("web_tour.tours").add('website_sale.deleted_archived_variants'
         },
         {
             content: "select Test Product 2",
-            trigger: ".oe_product_cart a:contains(/^Test Product 2$/)",
+            trigger: ".oe_product_cart a:text(Test Product 2)",
             run: "click",
             expectUnloadPage: true,
         },
diff --git a/addons/website_sale/static/tests/tours/free_delivery.js b/addons/website_sale/static/tests/tours/free_delivery.js
index ab359b1f66e9f..d4efeaf3352b4 100644
--- a/addons/website_sale/static/tests/tours/free_delivery.js
+++ b/addons/website_sale/static/tests/tours/free_delivery.js
@@ -8,7 +8,7 @@ registry.category("web_tour.tours").add("website_sale.check_free_delivery", {
         tourUtils.goToCart({ quantity: 1 }),
         tourUtils.goToCheckout(),
         {
-            trigger: "#o_delivery_methods label:contains(/^Delivery Now Free Over 10$/)",
+            trigger: "#o_delivery_methods label:text(Delivery Now Free Over 10)",
         },
         {
             content: "Check Free Delivery value to be zero",
diff --git a/addons/website_sale/static/tests/tours/google_analytics.js b/addons/website_sale/static/tests/tours/google_analytics.js
index 6dd83ab4f6750..9310b229d0fb7 100644
--- a/addons/website_sale/static/tests/tours/google_analytics.js
+++ b/addons/website_sale/static/tests/tours/google_analytics.js
@@ -72,7 +72,7 @@ registry.category("web_tour.tours").add('website_sale.google_analytics_add_to_ca
         },
         {
             content: 'check add to cart event',
-            trigger: "a:has(.my_cart_quantity:contains(/^1$/))",
+            trigger: "a:has(.my_cart_quantity:text(1))",
             timeout: 25000,
         },
     ]
diff --git a/addons/website_sale/static/tests/tours/product_page_zoom.js b/addons/website_sale/static/tests/tours/product_page_zoom.js
index 54e39b035b6e0..8c878b0945371 100644
--- a/addons/website_sale/static/tests/tours/product_page_zoom.js
+++ b/addons/website_sale/static/tests/tours/product_page_zoom.js
@@ -10,7 +10,7 @@ registry.category("web_tour.tours").add('website_sale.product_page_zoom', {
     steps: () => [
         {
             content: "select " + imageName,
-            trigger: `.oe_product_cart a:contains(/^${imageName}$/)`,
+            trigger: `.oe_product_cart a:text(${imageName})`,
             run: "click",
             expectUnloadPage: true,
         },
diff --git a/addons/website_sale_loyalty/static/tests/tours/test_website_sale_free_shipping_discount_line.js b/addons/website_sale_loyalty/static/tests/tours/test_website_sale_free_shipping_discount_line.js
index 67212a372397b..8194eeacd32a0 100644
--- a/addons/website_sale_loyalty/static/tests/tours/test_website_sale_free_shipping_discount_line.js
+++ b/addons/website_sale_loyalty/static/tests/tours/test_website_sale_free_shipping_discount_line.js
@@ -31,11 +31,11 @@ registry.category("web_tour.tours").add("website_sale_loyalty.update_shipping_af
         }),
         {
             content: "check discount code discount doesn't apply to shipping",
-            trigger: '[data-reward-type=discount] .oe_currency_value:contains(/^- 50.00$/)',
+            trigger: '[data-reward-type=discount] .oe_currency_value:text(- 50.00)',
         },
         {
             content: "check eWallet discount applies to shipping ($50 for Plumbus + $5 for delivery)",
-            trigger: '[data-reward-type=discount] .oe_currency_value:contains(/^- 55.00$/)',
+            trigger: '[data-reward-type=discount] .oe_currency_value:text(- 55.00)',
         },
     ],
 });
diff --git a/addons/website_sale_loyalty/static/tests/tours/tour_utils.js b/addons/website_sale_loyalty/static/tests/tours/tour_utils.js
index d832d2231df1e..963c72f286d31 100644
--- a/addons/website_sale_loyalty/static/tests/tours/tour_utils.js
+++ b/addons/website_sale_loyalty/static/tests/tours/tour_utils.js
@@ -5,7 +5,7 @@ export function assertRewardAmounts(rewards) {
     for (const [reward, amount] of Object.entries(rewards)) {
         steps.push({
             content: `check if ${reward} reward is correct`,
-            trigger: `[data-reward-type=${reward}] ${currencyValue}:contains(/^${amount}$/)`,
+            trigger: `[data-reward-type=${reward}] ${currencyValue}:text(${amount})`,
         });
     }
     return steps;
@@ -25,4 +25,4 @@ export function submitCouponCode(code) {
             expectUnloadPage: true,
         },
     ]
-}
\ No newline at end of file
+}
diff --git a/addons/website_sale_wishlist/static/tests/tours/tour_utils.js b/addons/website_sale_wishlist/static/tests/tours/tour_utils.js
index 4cb0e6d08c0fe..cf21b790ce579 100644
--- a/addons/website_sale_wishlist/static/tests/tours/tour_utils.js
+++ b/addons/website_sale_wishlist/static/tests/tours/tour_utils.js
@@ -36,7 +36,7 @@ export function goToWishlist({
 } = {}) {
     return {
         content: _t("Go to wishlist"),
-        trigger: `${backend ? ":iframe" : ""} a sup.my_wish_quantity:contains(/^${quantity}$/)`,
+        trigger: `${backend ? ":iframe" : ""} a sup.my_wish_quantity:text(${quantity})`,
         tooltipPosition: position,
         run: "click",
         expectUnloadPage: true,
@@ -46,7 +46,7 @@ export function goToWishlist({
 export function assertWishlistQuantity(quantity = 1) {
     return {
         content: "Check wishlist quantity",
-        trigger: `a sup.my_wish_quantity:contains(/^${quantity}$/)`,
+        trigger: `a sup.my_wish_quantity:text(${quantity})`,
     };
 }
 
@@ -64,4 +64,4 @@ export function submitCouponCode(code) {
             expectUnloadPage: true,
         },
     ]
-}
\ No newline at end of file
+}
diff --git a/odoo/addons/test_web/static/tests/tours/x2many.js b/odoo/addons/test_web/static/tests/tours/x2many.js
index 196261dc95e85..cdbe0e14cc548 100644
--- a/odoo/addons/test_web/static/tests/tours/x2many.js
+++ b/odoo/addons/test_web/static/tests/tours/x2many.js
@@ -61,11 +61,11 @@
         run: "click",
     }, {
         content: "select Admin",
-        trigger: 'tr:has(td:contains(/^Mitchell Admin$/)) .o_list_record_selector input[type="checkbox"]',
+        trigger: 'tr:has(td:text(Mitchell Admin)) .o_list_record_selector input[type="checkbox"]',
         run: "click",
     },
     {
-        trigger: 'tr:has(td:contains(/^Mitchell Admin$/)) .o_list_record_selector input[type="checkbox"]:checked',
+        trigger: 'tr:has(td:text(Mitchell Admin)) .o_list_record_selector input[type="checkbox"]:checked',
     },
     {
         content: "save selected participants",
@@ -73,7 +73,7 @@
         run: "click",
     },
     {
-        trigger: '.o_field_widget[name=participants] .o_data_cell:contains(/^Mitchell Admin$/)',
+        trigger: '.o_field_widget[name=participants] .o_data_cell:text(Mitchell Admin)',
     },
     ...stepUtils.saveForm(),
     { // add message a
@@ -122,7 +122,7 @@
     },
     { // change message b
         content: "edit message b",
-        trigger: '.o_field_widget[name=messages] .o_data_cell:contains(/^b$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_cell:text(b)',
         run: "click",
     }, {
         content: "change the body",
@@ -162,11 +162,11 @@
         run: "click",
     }, {
         content: "select Demo User",
-        trigger: 'tr:has(td:contains(/^Marc Demo$/)) .o_list_record_selector input[type="checkbox"]',
+        trigger: 'tr:has(td:text(Marc Demo)) .o_list_record_selector input[type="checkbox"]',
         run: "click",
     },
     {
-        trigger: 'tr:has(td:contains(/^Marc Demo$/)) .o_list_record_selector input[type="checkbox"]:checked',
+        trigger: 'tr:has(td:text(Marc Demo)) .o_list_record_selector input[type="checkbox"]:checked',
     },
     {
         content: "save selected participants",
@@ -189,7 +189,7 @@
         trigger: '.o_content:has(.o_field_widget[name=messages] tbody .o_data_row:eq(2))',
     }, {
         content: "check data 2",
-        trigger: `.o_content:has(.o_field_widget[name=messages] tr:has(td:contains(/^bbb$/)):has(td:contains(/^\\[test_trigger\\] Mitchell Admin$/)))`,
+        trigger: `.o_content:has(.o_field_widget[name=messages] tr:has(td:text(bbb)):has(td:text([test_trigger] Mitchell Admin)))`,
     }, {
         content: "go to tab 3",
         trigger: '.o_notebook_headers .nav-item a:contains(Participants)',
@@ -227,7 +227,7 @@
         run: "click",
     },
     {
-        trigger: '.o_field_widget[name=messages] .o_data_cell:contains(/^d$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_cell:text(d)',
     },
     { // add message e
         content: "create new message e",
@@ -243,11 +243,11 @@
         run: "click",
     },
     {
-        trigger: '.o_field_widget[name=messages] .o_data_cell:contains(/^e$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_cell:text(e)',
     },
     { // change message a
         content: "edit message a",
-        trigger: '.o_field_widget[name=messages] .o_data_cell:contains(/^a$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_cell:text(a)',
         run: "click",
     }, {
         content: "change the body",
@@ -259,11 +259,11 @@
         run: "click",
     },
     {
-        trigger: '.o_field_widget[name=messages] .o_data_cell:contains(/^aaa$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_cell:text(aaa)',
     },
     { // change message e
         content: "edit message e",
-        trigger: '.o_field_widget[name=messages] .o_data_cell:contains(/^e$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_cell:text(e)',
         run: "click",
     }, {
         content: "open the many2one to select another user",
@@ -291,15 +291,15 @@
         trigger: '.o_field_widget[name="message_concat"] textarea:value([test_trigger] Marc Demo:e)',
     }, { // remove
         content: "remove b",
-        trigger: '.o_field_widget[name=messages] .o_data_row:has(.o_data_cell:contains(/^bbb$/)) .o_list_record_remove',
+        trigger: '.o_field_widget[name=messages] .o_data_row:has(.o_data_cell:text(bbb)) .o_list_record_remove',
         run: "click",
     }, {
         content: "remove e",
-        trigger: '.o_field_widget[name=messages] .o_data_row:has(.o_data_cell:contains(/^e$/)) .o_list_record_remove',
+        trigger: '.o_field_widget[name=messages] .o_data_row:has(.o_data_cell:text(e)) .o_list_record_remove',
         run: "click",
     },
     {
-        trigger: 'body:not(:has(tr:has(td:contains(/^e$/))))',
+        trigger: 'body:not(:has(tr:has(td:text(e))))',
     },
     { // save
         content: "save discussion",
@@ -310,10 +310,10 @@
         trigger: '.o_content:not(:has(.o_field_widget[name=messages] tbody tr:has(.o_list_record_remove):eq(4)))',
     }, {
         content: "check data 5",
-        trigger: '.o_content:has(.o_field_widget[name=messages] tbody:has(tr td:contains(/^aaa$/)):has(tr td:contains(/^c$/)):has(tr td:contains(/^d$/)))',
+        trigger: '.o_content:has(.o_field_widget[name=messages] tbody:has(tr td:text(aaa)):has(tr td:text(c)):has(tr td:text(d)))',
     }, {
         content: "check data 6",
-        trigger: `.o_content:has(.o_field_widget[name=messages] tbody tr:has(td:contains(/^\\[test_trigger\\] Mitchell Admin$/)):has(td:contains(/^aaa$/)))`,
+        trigger: `.o_content:has(.o_field_widget[name=messages] tbody tr:has(td:text([test_trigger] Mitchell Admin)):has(td:text(aaa)))`,
     }, {
         content: "go to Participants",
         trigger: '.o_notebook_headers .nav-item a:contains(Participants)',
@@ -331,7 +331,7 @@
         run: "click",
     },
     {
-        trigger: '.o_form_editable .o_field_widget[name=messages] tbody tr:has(td:contains(/^d$/))',
+        trigger: '.o_form_editable .o_field_widget[name=messages] tbody tr:has(td:text(d))',
     },
     { // add message ddd
         content: "create new message ddd",
@@ -368,7 +368,7 @@
         trigger: '.o_content:has(.o_field_widget[name=messages] .o_data_row:eq(3))',
     },
     {
-        trigger: '.o_field_widget[name=messages]:has(tr td:contains(/^ddd$/))',
+        trigger: '.o_field_widget[name=messages]:has(tr td:text(ddd))',
     },
     ...stepUtils.discardForm({ // cancel
         content: "cancel change",
@@ -464,7 +464,7 @@
         trigger: '.o_content:not(:has(.o_field_widget[name="message_concat"] textarea:value(Mitchell Admin:d)))',
     },
     {
-        trigger: 'body:not(:has(tr:has(td:contains(/^d$/))))',
+        trigger: 'body:not(:has(tr:has(td:text(d))))',
     },
     ...stepUtils.saveForm(),
     { // check saved data
@@ -534,11 +534,11 @@
         run:     "edit {generate_dummy_message} && click body",
     },
     {
-        trigger: '.o_field_widget[name=important_messages] .o_data_row .o_list_number:contains(/^13$/)',
+        trigger: '.o_field_widget[name=important_messages] .o_data_row .o_list_number:text(13)',
     },
     {
         content: "check new dummy message happened",
-        trigger: '.o_field_widget[name=messages] .o_data_row .o_list_number:contains(/^13$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_row .o_list_number:text(13)',
     }, {
         content: "check field not in embedded view received correctly",
         trigger: '.o_field_widget[name=messages] .o_data_row input[type="checkbox"]:checked',
@@ -555,11 +555,11 @@
         run:     "edit {generate_dummy_message} && click body",
     },
     {
-        trigger: '.o_field_widget[name=important_messages] .o_data_row .o_list_number:contains(/^22$/)',
+        trigger: '.o_field_widget[name=important_messages] .o_data_row .o_list_number:text(22)',
     },
     {
         content: "check update and new dummy message happened",
-        trigger: '.o_field_widget[name=messages] .o_data_row .o_list_number:contains(/^22$/)',
+        trigger: '.o_field_widget[name=messages] .o_data_row .o_list_number:text(22)',
     },
     ...stepUtils.discardForm(),
     ]});

From e3cffe0442b9c36806475408c4d57402d00ba3f1 Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Thu, 9 Oct 2025 14:25:47 +0000
Subject: [PATCH 609/673] [FIX] website: wait iframe before open SEO dialog

Steps to reproduce:

- Open Website app and enter edit mode on any page.
- Reload the page with a slow connection.
- Immediately open "Optimize SEO" from the navbar menu.

Before this commit, the dialog accessed the preview document while
the iframe was reloading, so reading location.origin raised a TypeError.

After this commit, the dialog waits for the iframe to finish loading
or returns immediately when it is already complete, preventing crashes.

task-5104033

closes odoo/odoo#235363

X-original-commit: 8d100f70fe3509f84c1cd80803270c6c87c0bf7c
Signed-off-by: Outagant Mehdi (mou) <mou@odoo.com>
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 .../website/static/src/components/dialog/seo.js   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/website/static/src/components/dialog/seo.js b/addons/website/static/src/components/dialog/seo.js
index f6c3b905ecdba..16f32aa39167b 100644
--- a/addons/website/static/src/components/dialog/seo.js
+++ b/addons/website/static/src/components/dialog/seo.js
@@ -952,6 +952,9 @@ export class OptimizeSEODialog extends Component {
         this.contentClass = "oe_seo_configuration";
 
         onWillStart(async () => {
+            // Wait for the preview iframe because this dialog reads directly
+            // from the iframe DOM.
+            await this.waitForIframe();
             const {
                 metadata: { mainObject, seoObject, path },
             } = this.website.currentWebsite;
@@ -998,6 +1001,18 @@ export class OptimizeSEODialog extends Component {
         });
     }
 
+    async waitForIframe() {
+        await new Promise((resolve) => {
+            const iframeEl = document.querySelector(
+                ".o_iframe_container > iframe:not(.o_ignore_in_tour)"
+            );
+            if (!iframeEl || iframeEl.contentDocument?.readyState === "complete") {
+                return resolve();
+            }
+            iframeEl.addEventListener("load", resolve, { once: true });
+        });
+    }
+
     get pageDocumentElement() {
         return this.website.pageDocument.documentElement;
     }

From 9a4c293ac737e1c153058acc06df4531022948dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Thu, 13 Nov 2025 11:16:16 +0000
Subject: [PATCH 610/673] [FIX] mail: show correct call status in discuss
 sidebar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, discuss sidebar call participants had wrong
status shown, e.g. when participants are muted it shows non-slashed
mic icon instead of slashed mic icon.

Steps to reproduce:
- Start a call without being muted or deafen
- Have another person join the call and mute or deafen
=> icon shows unslashed mic or headphone

This happens because the slash variants were coupled with active
button state of call actions, so was based on current session rather
than target session.

This commit fixes the issue by using specific mute and deafen icon
when session is either muted or deafen.

closes odoo/odoo#235650

X-original-commit: 1388d1df13563b7bd32c2fc71081e4246eb0a29c
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../src/discuss/call/common/call_actions.js   |  8 ++++--
 .../discuss_app/sidebar/call_participants.js  |  3 ++
 .../discuss_app/sidebar/call_participants.xml |  7 +++--
 .../static/tests/discuss/call/call.test.js    | 28 +++++++++++++++----
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/addons/mail/static/src/discuss/call/common/call_actions.js b/addons/mail/static/src/discuss/call/common/call_actions.js
index 2bfe53ad99faf..e1caf1bd2825d 100644
--- a/addons/mail/static/src/discuss/call/common/call_actions.js
+++ b/addons/mail/static/src/discuss/call/common/call_actions.js
@@ -8,6 +8,8 @@ import { attClassObjectToString } from "@mail/utils/common/format";
 import { CALL_PROMOTE_FULLSCREEN } from "@mail/discuss/call/common/thread_model_patch";
 
 export const callActionsRegistry = registry.category("discuss.call/actions");
+export const CALL_ICON_DEAFEN = "fa fa-deaf";
+export const CALL_ICON_MUTED = "fa fa-microphone-slash";
 
 /** @typedef {import("@mail/core/common/action").ActionDefinition} ActionDefinition */
 
@@ -40,8 +42,8 @@ export const muteAction = {
     icon: ({ action, store }) =>
         action.isActive
             ? store.rtc.selfSession?.is_deaf
-                ? "fa fa-deaf"
-                : "fa fa-microphone-slash"
+                ? CALL_ICON_DEAFEN
+                : CALL_ICON_MUTED
             : "fa fa-microphone",
     hotkey: "shift+m",
     onSelected: ({ store }) => store.rtc.toggleMicrophone(),
@@ -76,7 +78,7 @@ registerCallAction("deafen", {
     name: ({ store }) => (store.rtc.selfSession.is_deaf ? _t("Undeafen") : _t("Deafen")),
     isActive: ({ store }) => store.rtc.selfSession?.is_deaf,
     isTracked: true,
-    icon: ({ action }) => (action.isActive ? "fa fa-deaf" : "fa fa-headphones"),
+    icon: ({ action }) => (action.isActive ? CALL_ICON_DEAFEN : "fa fa-headphones"),
     hotkey: "shift+d",
     onSelected: ({ store }) => store.rtc.toggleDeafen(),
     sequence: 10,
diff --git a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js
index 2e5b0ce6879f5..12f7a028b7bcb 100644
--- a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js
+++ b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.js
@@ -1,5 +1,6 @@
 import { Component, useEffect, useState } from "@odoo/owl";
 import { useService } from "@web/core/utils/hooks";
+import { CALL_ICON_DEAFEN, CALL_ICON_MUTED } from "@mail/discuss/call/common/call_actions";
 import { AvatarStack } from "@mail/discuss/core/common/avatar_stack";
 import { useHover } from "@mail/utils/common/hooks";
 import { useDropdownState } from "@web/core/dropdown/dropdown_hooks";
@@ -27,6 +28,8 @@ export class DiscussSidebarCallParticipants extends Component {
         });
         this.state = useState({ expanded: false });
         this.floating = useDropdownState();
+        this.CALL_ICON_DEAFEN = CALL_ICON_DEAFEN;
+        this.CALL_ICON_MUTED = CALL_ICON_MUTED;
         useEffect(
             (selfSession, compact) => {
                 if (selfSession?.in(this.sessions) && !compact) {
diff --git a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
index 3b8c432bde3c1..ef81fde1cfc68 100644
--- a/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
+++ b/addons/mail/static/src/discuss/call/public_web/discuss_app/sidebar/call_participants.xml
@@ -78,7 +78,8 @@
                     <t t-set="session" t-value="session"/>
                 </t>
                 <t t-else="">
-                    <span t-if="session.is_muted or session.is_deaf" class="p-1 fa opacity-75" t-att-class="rtc.callActions.find(a => a.id === 'mute').icon"/>
+                    <span t-if="session.is_deaf" class="p-1 fa opacity-75" t-att-class="CALL_ICON_DEAFEN"/>
+                    <span t-elif="session.is_muted" class="p-1 fa opacity-75" t-att-class="CALL_ICON_MUTED"/>
                     <span t-if="session.is_screen_sharing_on" class="o-live bg-danger o-text-white rounded">LIVE</span>
                 </t>
             </div>
@@ -88,8 +89,8 @@
 
     <t t-name="mail.DiscussSidebarCallParticipants.participantShortStatus">
         <span t-if="session?.shortStatus" t-att-class="{
-            [`fa ${rtc.callActions.find(a => a.id === 'mute').icon} opacity-75`]: session.shortStatus === 'mute',
-            [`fa ${rtc.callActions.find(a => a.id === 'deafen').icon} opacity-75`]: session.shortStatus === 'deafen',
+            [`${CALL_ICON_MUTED} opacity-75`]: session.shortStatus === 'mute',
+            [`${CALL_ICON_DEAFEN} opacity-75`]: session.shortStatus === 'deafen',
             'o-live bg-danger o-text-white rounded': session.shortStatus === 'live',
         }"><t t-if="session.shortStatus === 'live'">LIVE</t></span>
     </t>
diff --git a/addons/mail/static/tests/discuss/call/call.test.js b/addons/mail/static/tests/discuss/call/call.test.js
index 8c3a868bf048c..fa6d34ddc8db4 100644
--- a/addons/mail/static/tests/discuss/call/call.test.js
+++ b/addons/mail/static/tests/discuss/call/call.test.js
@@ -1025,16 +1025,34 @@ test("show all participants on other user stops screen share", async () => {
 test("discuss sidebar call participant shows appropriate status icon", async () => {
     const pyEnv = await startServer();
     const channelId = pyEnv["discuss.channel"].create({ name: "General" });
-    await start();
+    const bobMemberId = pyEnv["discuss.channel.member"].create({
+        channel_id: channelId,
+        partner_id: pyEnv["res.partner"].create({ name: "bob" }),
+    });
+    const env = await start();
+    const network = await makeMockRtcNetwork({ env, channelId });
+    const bobRemote = network.makeMockRemote(bobMemberId);
     await openDiscuss(channelId);
-    await click("[title='Start Call']");
+    await click("[title='Join Call']");
+    await bobRemote.updateConnectionState("connected");
     await contains(".o-discuss-Call");
     await click("button[title='Mute']");
-    await contains(".o-mail-DiscussSidebarCallParticipants-status .fa-microphone-slash");
+    await contains(
+        ".o-mail-DiscussSidebarCallParticipants:contains('Mitchell Admin') .fa-microphone-slash"
+    );
     await click("button[title='Voice Settings']");
     await click(".dropdown-menu button:contains('Deafen')");
-    await contains(".o-mail-DiscussSidebarCallParticipants-status .fa-deaf");
-    await contains(".o-mail-DiscussSidebarCallParticipants-status .fa-microphone-slash", {
+    await contains(".o-mail-DiscussSidebarCallParticipants:contains('Mitchell Admin') .fa-deaf");
+    await contains(
+        ".o-mail-DiscussSidebarCallParticipants:contains('Mitchell Admin') .fa-microphone-slash",
+        { count: 0 }
+    );
+    await click("button[title='Unmute']");
+    await contains(".o-mail-DiscussSidebarCallParticipants:contains('Mitchell Admin') .fa-deaf", {
         count: 0,
     });
+    await bobRemote.updateInfo({ is_muted: true });
+    await contains(".o-mail-DiscussSidebarCallParticipants:contains('bob') .fa-microphone-slash");
+    await bobRemote.updateInfo({ is_deaf: true });
+    await contains(".o-mail-DiscussSidebarCallParticipants:contains('bob') .fa-deaf");
 });

From 8712263f64eb62f3a93303f8cc40032affcb2cf9 Mon Sep 17 00:00:00 2001
From: gteboul <gute@odoo.com>
Date: Thu, 4 Sep 2025 09:50:05 +0000
Subject: [PATCH 611/673] [FIX] l10n_latam_invoice_document: create debit note
 from credit note

THE FIX COMES FROM: 37faec2f38c9658a0f491c72f284908dc929fa17

Description of the issue/feature this PR addresses:
- In debit notes wizards: If we make a wrong credit note and we want to correct it we must generate a debit note related to it.
- Currently odoo only allows to generate debit notes from an invoice.

Steps to reproduce the error.
- Install the Argentine localization
- Create an invoice and post it
- From the invoice using the wizard create a credit note and post it.
- From the credit note open the wizard to create a debit note.
On submit the wizard we obtain an exception "You can not use a credit_note document type with a invoice"
This happens because the debit note wizard use copy method without change the l10n_latam_document_type_id value.

Current behavior before PR:
When creating a debit note from a credit note get an error.

Desired behavior after PR is merged:
We can create a debit memo from a credit note.

opw-4304256

closes odoo/odoo#235604

X-original-commit: 73304864572cf703758687302026b83e54e89468
Signed-off-by: Joren Van Onder (jov) <jov@odoo.com>
Signed-off-by: Guillaume Teboul-Tornezy (gute) <gute@odoo.com>
Co-authored-by: Katherine Zaoral <zaoral@users.noreply.github.com>
---
 addons/l10n_ar/tests/test_manual.py           | 26 +++++++++++++++++++
 .../wizards/account_debit_note.py             |  6 +++++
 2 files changed, 32 insertions(+)

diff --git a/addons/l10n_ar/tests/test_manual.py b/addons/l10n_ar/tests/test_manual.py
index 999449ed5f97e..a3e43250ae104 100644
--- a/addons/l10n_ar/tests/test_manual.py
+++ b/addons/l10n_ar/tests/test_manual.py
@@ -402,3 +402,29 @@ def test_l10n_ar_get_invoice_totals_for_report_refund_with_same_code(self):
                 },
             ],
         })
+
+    def test_create_debit_note_for_credit_note(self):
+        """
+        Test that it is possible to create a debit note from a credit note
+        """
+
+        invoice = self.init_invoice('out_invoice', partner=self.partner_afip, products=[self.product_a], post=True)
+
+        credit_note_wizard = self.env['account.move.reversal'].with_context({
+            'active_ids': invoice.ids,
+            'active_model': 'account.move',
+        }).create({
+            'reason': 'credit note',
+            'journal_id': invoice.journal_id.id,
+        })
+        credit_note_wizard.refund_moves()
+        invoice.reversal_move_ids.action_post()
+
+        debit_note_wizard = self.env['account.debit.note'].with_context({
+            'active_ids': invoice.reversal_move_ids.ids,
+            'active_model': 'account.move',
+        }).create({
+            'reason': 'debit_note',
+        })
+        debit_note_wizard.create_debit()
+        self.assertTrue(invoice.reversal_move_ids.debit_note_ids)
diff --git a/addons/l10n_latam_invoice_document/wizards/account_debit_note.py b/addons/l10n_latam_invoice_document/wizards/account_debit_note.py
index f9296c8a04547..b2dc53e3a395b 100644
--- a/addons/l10n_latam_invoice_document/wizards/account_debit_note.py
+++ b/addons/l10n_latam_invoice_document/wizards/account_debit_note.py
@@ -13,3 +13,9 @@ def create_debit(self):
             new_move._compute_l10n_latam_document_type()
             new_move._onchange_l10n_latam_document_type_id()
         return res
+
+    def _prepare_default_values(self, move):
+        """ Needed to avoid constraint when creating Debit Note from Credit Note """
+        vals = super()._prepare_default_values(move)
+        vals['l10n_latam_document_type_id'] = False
+        return vals

From 77d6d1e59d68957903421a263a02906e472f1766 Mon Sep 17 00:00:00 2001
From: path-odoo <path@odoo.com>
Date: Thu, 3 Jul 2025 13:38:53 +0000
Subject: [PATCH 612/673] [FIX] sale: prevent error on clicking Edit
 Configuration

Currently, when a user adds a configurable product to an order line,
and remove the name of product and click on `Edit Configuration` (pencil icon)
error is encountered.

Steps to Reproduce:
- Install Sales module
- Create a Quotation
- Add a product(e.g Acoustic Bloc Screen), then only remove the name from the
  orderline and click on edit button(pencil Icon).

Error:
`TypeError: SaleProductConfiguratorController.sale_product_configurator_get_values()`
 `missing 1 required positional argument: 'product_template_id'`

Root Cause:
When a user clicks on Edit configuration, the client-side JavaScript makes an RPC
call to the server, targeting the `sale_product_configurator_get_values`. which
expects product_template_id at [1] and since it is removed from order line
the error is encountered.

[1]- https://github.com/odoo/odoo/blob/1b657cf1e1ce43874a3ede307b2f8ad68216aa56/addons/sale/controllers/product_configurator.py#L11-L13

Solution:
This commit prevents the error by correcting `depends` on the field
`is_configurable_product`, which will ensure that edit button will be only
present if the configurablt product is selected.

Sentry-5741581459,6925770690

closes odoo/odoo#235724

X-original-commit: a1f87db3548242715040c480745756c967562526
Signed-off-by: Het Patel (path) <path@odoo.com>
---
 addons/sale/models/sale_order_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/models/sale_order_line.py b/addons/sale/models/sale_order_line.py
index 098ac365f0c6e..cd2591c00e9df 100644
--- a/addons/sale/models/sale_order_line.py
+++ b/addons/sale/models/sale_order_line.py
@@ -70,7 +70,7 @@ class SaleOrderLine(models.Model):
     is_configurable_product = fields.Boolean(
         string="Is the product configurable?",
         related='product_template_id.has_configurable_attributes',
-        depends=['product_id'])
+        depends=['product_template_id'])
     is_downpayment = fields.Boolean(
         string="Is a down payment",
         help="Down payments are made when creating invoices from a sales order."

From 6a2ba353aadc01557cf781223f3db10d53555a04 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 13 Nov 2025 10:13:49 +0000
Subject: [PATCH 613/673] [FIX] web: wait for error dialog in test

Before this commit, the test sometimes failed because we didn't
wait enough before checking the presence of the error dialog. The
`unhandledrejection` event being thrown asynchronously, simply
waiting for an animation frame isn't enough. We can only wait for
the dialog to be displayed.

runbot error~234017

closes odoo/odoo#235730

X-original-commit: 4f7e4ef36e4e769f8cdcac1a149cbb170e3d0e83
Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/web/static/tests/views/form/form_view.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/tests/views/form/form_view.test.js b/addons/web/static/tests/views/form/form_view.test.js
index 676a6487e431e..b9cb6bc814690 100644
--- a/addons/web/static/tests/views/form/form_view.test.js
+++ b/addons/web/static/tests/views/form/form_view.test.js
@@ -6401,7 +6401,7 @@ test(`onchange returns an error`, async () => {
 
     await contains(`.o_field_widget[name=int_field] input`).edit("64");
     expect.verifyErrors(["Some business message"]);
-    expect(`.modal`).toHaveCount(1);
+    await waitFor(`.modal`);
     expect(`.modal-body`).toHaveText(/Some business message/);
     expect(`.o_field_widget[name="int_field"] input`).toHaveValue("9");
 

From 537ad08e73373381a577fdd88c18a3d95b104667 Mon Sep 17 00:00:00 2001
From: "Jacob Was (jacw)" <jacw@odoo.com>
Date: Tue, 11 Nov 2025 20:19:46 +0000
Subject: [PATCH 614/673] [FIX] account: Allow deferred invoices to be reset
 multiple times

Resetting a vendor bill or invoice with deferred amounts will
unlink or reset all existing deferred entries. If the audit trail
is enabled, some of these entries must be cancelled instead.

If a protected entry is already cancelled, this _unlink_or_reverse
will still attempt to cancel it. This prevents entries from being
Reset to Draft more than once.

The current commit removes this restriction.

opw-5187737

closes odoo/odoo#235629

X-original-commit: 2b470cd84d53a8a870765a4807fd8c57ad9c5bdf
Signed-off-by: Hugo Poncelet (hupo) <hupo@odoo.com>
Signed-off-by: Jacob Was (jacw) <jacw@odoo.com>
---
 addons/account/models/account_move.py    |  2 +-
 addons/account/tests/test_audit_trail.py | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 4760ac87ac4b8..8baa1233fb295 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -5403,7 +5403,7 @@ def _unlink_or_reverse(self):
                 to_unlink += move
         to_unlink.filtered(lambda m: m.state in ('posted', 'cancel')).button_draft()
         to_unlink.filtered(lambda m: m.state == 'draft').unlink()
-        to_cancel.button_cancel()
+        to_cancel.filtered(lambda m: m.state != 'cancel').button_cancel()
         return to_reverse._reverse_moves(cancel=True)
 
     def _post(self, soft=True):
diff --git a/addons/account/tests/test_audit_trail.py b/addons/account/tests/test_audit_trail.py
index d99ed937dd57e..9b56cf10eb475 100644
--- a/addons/account/tests/test_audit_trail.py
+++ b/addons/account/tests/test_audit_trail.py
@@ -45,6 +45,28 @@ def assertTrail(self, trail, expected):
         for message, expected_needle in zip(trail, expected[::-1]):
             self.assertIn(expected_needle, message.account_audit_log_preview)
 
+    def test_can_reset_deferred_invoice(self):
+        customer = self.env['res.partner'].create({'name': 'Rob Odoo'})
+        invoice = self.env['account.move'].create({
+            'invoice_date': '2025-09-01',
+            'invoice_date_due': '2025-09-01',
+            'invoice_line_ids': [
+                (0, 0, {'name': 'Line1',
+                        'price_unit': 100.0,
+                        'deferred_start_date': '2025-09-01',
+                        'deferred_end_date': '2025-12-31',
+                       }
+                ),
+            ],
+            'move_type': 'out_invoice',
+            'name': 'INVOICE_00001',
+            'partner_id': customer.id,
+        })
+
+        for i in range(4):
+            invoice.action_post()
+            invoice.button_draft()
+
     def test_can_unlink_draft(self):
         self.env.company.restrictive_audit_trail = True
         self.move.unlink()

From 0d4e75475a4ba6e0b1fd9052fc80d83bcd62fe70 Mon Sep 17 00:00:00 2001
From: Maryam Kia <maki@odoo.com>
Date: Mon, 15 Sep 2025 13:25:20 +0200
Subject: [PATCH 615/673] [FIX] mail, *: LC channel sidebar display on new
 member join

This change introduces the `im_livechat.channel.member.history` model on the
client side to properly display the Livechat channel name. In the case of
lacking data for current agents or visitors, we use the history records to
display the channel name.

task-4966319

closes odoo/odoo#227240

Related: odoo/enterprise#94790
Signed-off-by: Maryam Kia (maki) <maki@odoo.com>
---
 addons/im_livechat/models/discuss_channel.py  |  6 ++
 .../models/discuss_channel_member.py          | 15 +++++
 .../im_livechat_channel_member_history.py     | 15 +++++
 .../static/src/core/common/@types/models.d.ts |  7 +++
 .../common/discuss_channel_model_patch.js     | 10 ++++
 .../livechat_channel_member_history_model.js  | 33 +++++++++++
 .../src/core/common/thread_model_patch.js     | 52 +++++++++++++++++
 .../src/core/public_web/thread_model_patch.js | 17 ------
 .../src/embed/common/thread_model_patch.js    |  2 +-
 .../static/tests/chat_window_patch.test.js    |  7 ++-
 .../static/tests/discuss_app_patch.test.js    |  2 +-
 .../static/tests/embed/chat_bubble.test.js    |  1 +
 .../static/tests/embed/chat_window.test.js    | 28 ++++++++-
 .../tests/livechat_channel_info_list.test.js  |  4 +-
 .../static/tests/livechat_test_helpers.js     |  2 +
 .../mock_models/@types/mock_models.d.ts       |  5 +-
 .../mock_models/discuss_channel.js            | 16 +++++
 .../mock_models/discuss_channel_member.js     | 34 +++++++++++
 .../mock_models/im_livechat_channel.js        |  5 +-
 .../im_livechat_channel_member_history.js     | 19 ++++++
 .../static/tests/sidebar_patch.test.js        | 58 +------------------
 .../tests/test_chatbot_internals.py           | 32 ++++++++++
 .../tests/test_get_discuss_channel.py         |  4 +-
 .../mock_models/discuss_channel.js            | 19 +++---
 .../tests/test_performance.py                 | 40 +++++++++++++
 addons/website/static/tests/helpers.js        |  2 -
 .../models/website_visitor.py                 | 41 ++++++++-----
 .../mock_models/website_visitor.js            | 28 ++++++---
 .../tests/test_livechat_basic_flow.py         | 20 +++++++
 29 files changed, 403 insertions(+), 121 deletions(-)
 create mode 100644 addons/im_livechat/static/src/core/common/livechat_channel_member_history_model.js
 create mode 100644 addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel_member_history.js

diff --git a/addons/im_livechat/models/discuss_channel.py b/addons/im_livechat/models/discuss_channel.py
index cf27e7fe32b61..52ffa7237783d 100644
--- a/addons/im_livechat/models/discuss_channel.py
+++ b/addons/im_livechat/models/discuss_channel.py
@@ -428,6 +428,12 @@ def _to_store_defaults(self, target: Store.Target):
                 predicate=is_livechat_channel,
                 sudo=True,
             ),
+            # sudo - visitor can access to the channel member history of an accessible channel
+            Store.Many(
+                "livechat_channel_member_history_ids",
+                predicate=is_livechat_channel,
+                sudo=True,
+            ),
         ]
         if target.is_internal(self.env):
             fields.append(
diff --git a/addons/im_livechat/models/discuss_channel_member.py b/addons/im_livechat/models/discuss_channel_member.py
index 8a16147951ae5..9d56ea9ce1102 100644
--- a/addons/im_livechat/models/discuss_channel_member.py
+++ b/addons/im_livechat/models/discuss_channel_member.py
@@ -5,6 +5,7 @@
 from odoo import api, models, fields
 from odoo.fields import Domain
 from odoo.addons.mail.tools.discuss import Store
+from odoo.addons.web.models.models import lazymapping
 
 
 class DiscussChannelMember(models.Model):
@@ -51,6 +52,20 @@ def create(self, vals_list):
                 member.sudo().livechat_member_type = "visitor"
                 continue
             member.sudo().livechat_member_type = "agent"
+        stores = lazymapping(lambda channel: Store(bus_channel=channel))
+        for history in members.livechat_member_history_ids:
+            # sudo - visitor can access to the channel member history of an accessible channel
+            stores[history.channel_id].add(
+                history.channel_id,
+                Store.Many(
+                    "livechat_channel_member_history_ids",
+                    mode="ADD",
+                    value=history,
+                    sudo=True,
+                ),
+            )
+        for store in stores.values():
+            store.bus_send()
         return members
 
     @api.depends("livechat_member_history_ids.livechat_member_type")
diff --git a/addons/im_livechat/models/im_livechat_channel_member_history.py b/addons/im_livechat/models/im_livechat_channel_member_history.py
index 8ace3193b70b0..a140dc2c73d1f 100644
--- a/addons/im_livechat/models/im_livechat_channel_member_history.py
+++ b/addons/im_livechat/models/im_livechat_channel_member_history.py
@@ -1,5 +1,6 @@
 from odoo import api, models, fields
 from odoo.exceptions import ValidationError
+from odoo.addons.mail.tools.discuss import Store
 
 
 class ImLivechatChannelMemberHistory(models.Model):
@@ -191,3 +192,17 @@ def action_open_discuss_channel_view(self, domain=()):
         action["view_mode"] = "list"
         action["views"] = [view for view in action["views"] if view[1] in ("list", "form")]
         return action
+
+    def _to_store_defaults(self, target):
+        return [
+            "channel_id",
+            Store.One("guest_id", ["name"], predicate=lambda r: not r.partner_id),
+            "livechat_member_type",
+            # sudo: res.partner - reading partner related to an accessible channel member history is considered acceptable
+            Store.One(
+                "partner_id",
+                self.env["res.partner"]._get_store_livechat_username_fields(),
+                predicate=lambda r: not r.guest_id,
+                sudo=True,
+            ),
+        ]
diff --git a/addons/im_livechat/static/src/core/common/@types/models.d.ts b/addons/im_livechat/static/src/core/common/@types/models.d.ts
index 8c237778bdcb6..1441fb44195a3 100644
--- a/addons/im_livechat/static/src/core/common/@types/models.d.ts
+++ b/addons/im_livechat/static/src/core/common/@types/models.d.ts
@@ -5,6 +5,7 @@ declare module "models" {
     import { ChatbotScriptStepAnswer as ChatbotScriptStepAnswerClass } from "@im_livechat/core/common/chatbot_script_step_answer_model";
     import { ChatbotStep as ChatbotStepClass } from "@im_livechat/core/common/chatbot_step_model";
     import { LivechatChannel as LivechatChannelClass } from "@im_livechat/core/common/livechat_channel_model";
+    import { LivechatChannelMemberHistory as LivechatChannelMemberHistoryClass } from "@im_livechat/core/common/livechat_channel_member_history_model";
     import { LivechatChannelRule as LivechatChannelRuleClass } from "@im_livechat/core/common/livechat_channel_rule_model";
     import { LivechatExpertise as LivechatExpertiseClass } from "@im_livechat/core/common/livechat_expertise_model";
 
@@ -14,6 +15,7 @@ declare module "models" {
     export interface ChatbotScriptStepAnswer extends ChatbotScriptStepAnswerClass {}
     export interface ChatbotStep extends ChatbotStepClass {}
     export interface LivechatChannel extends LivechatChannelClass {}
+    export interface LivechatChannelMemberHistory extends LivechatChannelMemberHistoryClass {}
     export interface LivechatChannelRule extends LivechatChannelRuleClass {}
     export interface LivechatExpertise extends LivechatExpertiseClass {}
 
@@ -24,7 +26,10 @@ declare module "models" {
         chatbot_step: ChatbotStep;
     }
     export interface DiscussChannel {
+        livechat_agent_history_ids: LivechatChannelMemberHistory[];
         livechat_channel_id: LivechatChannel;
+        livechat_channel_member_history_ids: LivechatChannelMemberHistory[];
+        livechat_customer_history_ids: LivechatChannelMemberHistory[];
     }
     export interface LivechatChannel {
         channel_ids: DiscussChannel[];
@@ -46,6 +51,7 @@ declare module "models" {
         "chatbot.script.step": StaticMailRecord<ChatbotScriptStep, typeof ChatbotScriptStepClass>;
         ChatbotStep: StaticMailRecord<ChatbotStep, typeof ChatbotStepClass>;
         "im_livechat.channel": StaticMailRecord<LivechatChannel, typeof LivechatChannelClass>;
+        "im_livechat.channel.member.history": StaticMailRecord<LivechatChannelMemberHistory, typeof LivechatChannelMemberHistoryClass>;
         "im_livechat.channel.rule": StaticMailRecord<LivechatChannelRule, typeof LivechatChannelRuleClass>;
         "im_livechat.expertise": StaticMailRecord<LivechatExpertise, typeof LivechatExpertiseClass>;
     }
@@ -64,6 +70,7 @@ declare module "models" {
         "chatbot.script.step": ChatbotScriptStep;
         ChatbotStep: ChatbotStep;
         "im_livechat.channel": LivechatChannel;
+        "im_livechat.channel.member.history": LivechatChannelMemberHistory;
         "im_livechat.channel.rule": LivechatChannelRule;
         "im_livechat.expertise": LivechatExpertise;
     }
diff --git a/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js b/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js
index 37db4105704e6..a107d3782c914 100644
--- a/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/discuss_channel_model_patch.js
@@ -8,7 +8,17 @@ import { patch } from "@web/core/utils/patch";
 const discussChannelPatch = {
     setup() {
         super.setup(...arguments);
+        this.livechat_agent_history_ids = fields.Many("im_livechat.channel.member.history", {
+            inverse: "channelAsAgentHistory",
+        });
         this.livechat_channel_id = fields.One("im_livechat.channel", { inverse: "channel_ids" });
+        this.livechat_channel_member_history_ids = fields.Many(
+            "im_livechat.channel.member.history",
+            { inverse: "channel_id" }
+        );
+        this.livechat_customer_history_ids = fields.Many("im_livechat.channel.member.history", {
+            inverse: "channelAsCustomerHistory",
+        });
     },
     get membersThatCanSeen() {
         return super.membersThatCanSeen.filter((member) => member.livechat_member_type !== "bot");
diff --git a/addons/im_livechat/static/src/core/common/livechat_channel_member_history_model.js b/addons/im_livechat/static/src/core/common/livechat_channel_member_history_model.js
new file mode 100644
index 0000000000000..d17703e85b356
--- /dev/null
+++ b/addons/im_livechat/static/src/core/common/livechat_channel_member_history_model.js
@@ -0,0 +1,33 @@
+import { fields, Record } from "@mail/model/export";
+
+export class LivechatChannelMemberHistory extends Record {
+    static id = "id";
+    static _name = "im_livechat.channel.member.history";
+
+    channel_id = fields.One("discuss.channel", { inverse: "livechat_channel_member_history_ids" });
+    channelAsAgentHistory = fields.One("discuss.channel", {
+        inverse: "livechat_agent_history_ids",
+        compute() {
+            if (this.livechat_member_type === "agent") {
+                return this.channel_id;
+            }
+            return false;
+        },
+    });
+    channelAsCustomerHistory = fields.One("discuss.channel", {
+        inverse: "livechat_customer_history_ids",
+        compute() {
+            if (this.livechat_member_type === "visitor") {
+                return this.channel_id;
+            }
+            return false;
+        },
+    });
+    guest_id = fields.One("mail.guest");
+    /** @type {number} */
+    id;
+    /** @type {"agent"|"visitor"|"bot"} */
+    livechat_member_type;
+    partner_id = fields.One("res.partner");
+}
+LivechatChannelMemberHistory.register();
diff --git a/addons/im_livechat/static/src/core/common/thread_model_patch.js b/addons/im_livechat/static/src/core/common/thread_model_patch.js
index 243b4707c19c9..149815ce92295 100644
--- a/addons/im_livechat/static/src/core/common/thread_model_patch.js
+++ b/addons/im_livechat/static/src/core/common/thread_model_patch.js
@@ -1,6 +1,7 @@
 import { fields } from "@mail/model/export";
 import { Thread } from "@mail/core/common/thread_model";
 
+import { formatList } from "@web/core/l10n/utils";
 import { patch } from "@web/core/utils/patch";
 
 patch(Thread.prototype, {
@@ -77,4 +78,55 @@ patch(Thread.prototype, {
         }
         return super.getPersonaName(persona);
     },
+    get displayName() {
+        if (this.channel?.channel_type !== "livechat" || this.self_member_id?.custom_channel_name) {
+            return super.displayName;
+        }
+        const memberType = this.self_member_id?.livechat_member_type;
+        if (memberType === "visitor") {
+            const agents = this.correspondents.filter((c) => c.livechat_member_type === "agent");
+            if (agents.length) {
+                return formatList(
+                    agents.map((agent) => agent.name),
+                    { style: "standard-narrow" }
+                );
+            }
+            if (this.channel?.livechat_agent_history_ids.length) {
+                return formatList(
+                    this.channel.livechat_agent_history_ids.map((h) =>
+                        this.getPersonaName(h.partner_id)
+                    ),
+                    { style: "standard-narrow" }
+                );
+            }
+        }
+        if (memberType === "agent") {
+            const visitors = this.correspondents.filter(
+                (c) => c.livechat_member_type === "visitor"
+            );
+            if (visitors.length) {
+                return formatList(
+                    visitors.map((visitor) => visitor.name),
+                    { style: "standard-narrow" }
+                );
+            }
+            if (this.channel?.livechat_customer_history_ids.length) {
+                return formatList(
+                    this.channel?.livechat_customer_history_ids.map((h) =>
+                        this.getPersonaName(h.partner_id || h.guest_id)
+                    ),
+                    { style: "standard-narrow" }
+                );
+            }
+        }
+        if (!memberType) {
+            const allNamesFromHistory = this.channel?.livechat_channel_member_history_ids
+                .map((h) => this.getPersonaName(h.partner_id || h.guest_id))
+                .filter(Boolean);
+            if (allNamesFromHistory.length) {
+                return formatList(allNamesFromHistory, { style: "standard-narrow" });
+            }
+        }
+        return super.displayName;
+    },
 });
diff --git a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
index 2667674c66023..3c1ed390ede65 100644
--- a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
+++ b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
@@ -38,23 +38,6 @@ patch(Thread.prototype, {
         return correspondent;
     },
 
-    get displayName() {
-        if (
-            this.channel?.channel_type !== "livechat" ||
-            !this.correspondent ||
-            this.self_member_id?.custom_channel_name
-        ) {
-            return super.displayName;
-        }
-        if (!this.correspondent.persona.is_public && this.correspondent.persona.country) {
-            return `${this.correspondent.name} (${this.correspondent.persona.country.name})`;
-        }
-        if (this.country_id) {
-            return `${this.correspondent.name} (${this.country_id.name})`;
-        }
-        return this.correspondent.name;
-    },
-
     get inChathubOnNewMessage() {
         return this.channel?.channel_type === "livechat" || super.inChathubOnNewMessage;
     },
diff --git a/addons/im_livechat/static/src/embed/common/thread_model_patch.js b/addons/im_livechat/static/src/embed/common/thread_model_patch.js
index 684d83fd3c990..7895d2a0e4681 100644
--- a/addons/im_livechat/static/src/embed/common/thread_model_patch.js
+++ b/addons/im_livechat/static/src/embed/common/thread_model_patch.js
@@ -73,7 +73,7 @@ patch(Thread.prototype, {
         return super.avatarUrl;
     },
     get displayName() {
-        if (this.channel?.channel_type === "livechat" && this.livechat_operator_id) {
+        if (this.channel?.channel_type === "livechat" && this.isTransient && this.livechat_operator_id) {
             return this.getPersonaName(this.livechat_operator_id);
         }
         return super.displayName;
diff --git a/addons/im_livechat/static/tests/chat_window_patch.test.js b/addons/im_livechat/static/tests/chat_window_patch.test.js
index 5d9e312d0f580..71cd67d95593d 100644
--- a/addons/im_livechat/static/tests/chat_window_patch.test.js
+++ b/addons/im_livechat/static/tests/chat_window_patch.test.js
@@ -155,8 +155,11 @@ test("Show livechats with new message in chat hub even when in discuss app)", as
     const [livechatId, channelId] = pyEnv["discuss.channel"].create([
         {
             channel_member_ids: [
-                Command.create({ partner_id: serverState.partnerId }),
-                Command.create({ guest_id: guestId }),
+                Command.create({
+                    partner_id: serverState.partnerId,
+                    livechat_member_type: "agent",
+                }),
+                Command.create({ guest_id: guestId, livechat_member_type: "visitor" }),
             ],
             channel_type: "livechat",
             livechat_operator_id: serverState.partnerId,
diff --git a/addons/im_livechat/static/tests/discuss_app_patch.test.js b/addons/im_livechat/static/tests/discuss_app_patch.test.js
index 3d21051e1fe22..7d9e11163d739 100644
--- a/addons/im_livechat/static/tests/discuss_app_patch.test.js
+++ b/addons/im_livechat/static/tests/discuss_app_patch.test.js
@@ -60,7 +60,7 @@ test("add livechat in the sidebar on visitor sending first message", async () =>
     await contains(
         ".o-mail-DiscussSidebarCategory-livechat + .o-mail-DiscussSidebarChannel-container",
         {
-            text: "Visitor (Belgium)",
+            text: "Visitor",
         }
     );
 });
diff --git a/addons/im_livechat/static/tests/embed/chat_bubble.test.js b/addons/im_livechat/static/tests/embed/chat_bubble.test.js
index c484ffd3eb154..fa44ca5281f14 100644
--- a/addons/im_livechat/static/tests/embed/chat_bubble.test.js
+++ b/addons/im_livechat/static/tests/embed/chat_bubble.test.js
@@ -21,6 +21,7 @@ test("Do not show bot IM status", async () => {
     });
     const partnerId2 = pyEnv["res.partner"].create({ name: "Dummy" });
     const channelId2 = pyEnv["discuss.channel"].create({
+        name: "Dummy",
         channel_member_ids: [
             Command.create({ partner_id: partnerId2, livechat_member_type: "bot" }),
         ],
diff --git a/addons/im_livechat/static/tests/embed/chat_window.test.js b/addons/im_livechat/static/tests/embed/chat_window.test.js
index 28254dc7cff3f..0e228aa03023c 100644
--- a/addons/im_livechat/static/tests/embed/chat_window.test.js
+++ b/addons/im_livechat/static/tests/embed/chat_window.test.js
@@ -1,3 +1,4 @@
+import { waitUntilSubscribe } from "@bus/../tests/bus_test_helpers";
 import {
     defineLivechatModels,
     loadDefaultEmbedConfig,
@@ -13,7 +14,7 @@ import {
     triggerHotkey,
 } from "@mail/../tests/mail_test_helpers";
 import { describe, expect, test } from "@odoo/hoot";
-import { serverState } from "@web/../tests/web_test_helpers";
+import { getService, serverState } from "@web/../tests/web_test_helpers";
 
 import { deserializeDateTime } from "@web/core/l10n/dates";
 import { getOrigin } from "@web/core/utils/urls";
@@ -37,13 +38,36 @@ test("internal users can upload file to temporary thread", async () => {
     await contains(".o-mail-Message .o-mail-AttachmentContainer:contains(text.txt)");
 });
 
-test("Conversation name is operator livechat user name", async () => {
+test("The name of the conversation changes based on the agents' names", async () => {
     const pyEnv = await startServer();
     await loadDefaultEmbedConfig();
     pyEnv["res.partner"].write(serverState.partnerId, { user_livechat_username: "MitchellOp" });
     await start({ authenticateAs: false });
     await click(".o-livechat-LivechatButton");
     await contains(".o-mail-ChatWindow-header", { text: "MitchellOp" });
+    await insertText(".o-mail-Composer-input", "Hello World!");
+    await triggerHotkey("Enter");
+    await waitUntilSubscribe();
+    const [channelId] = pyEnv["discuss.channel"].search([
+        ["channel_type", "=", "livechat"],
+        [
+            "channel_member_ids",
+            "in",
+            pyEnv["discuss.channel.member"].search([["guest_id", "=", pyEnv.cookie.get("dgid")]]),
+        ],
+    ]);
+    const userId = pyEnv["res.users"].create({
+        name: "James",
+    });
+    const secondAgent = pyEnv["res.partner"].create({
+        lang: "en",
+        name: "James",
+        user_ids: [userId],
+    });
+    getService("orm").call("discuss.channel", "add_members", [[channelId]], {
+        partner_ids: [secondAgent],
+    });
+    await contains(".o-mail-ChatWindow-header", { text: "MitchellOp, James" });
 });
 
 test("avatar url contains access token for non-internal users", async () => {
diff --git a/addons/im_livechat/static/tests/livechat_channel_info_list.test.js b/addons/im_livechat/static/tests/livechat_channel_info_list.test.js
index a4c4c4f8d368e..76aac13b0893d 100644
--- a/addons/im_livechat/static/tests/livechat_channel_info_list.test.js
+++ b/addons/im_livechat/static/tests/livechat_channel_info_list.test.js
@@ -92,8 +92,8 @@ test("shows live chat status in discuss sidebar", async () => {
     });
     const channelId = pyEnv["discuss.channel"].create({
         channel_member_ids: [
-            Command.create({ partner_id: serverState.partnerId }),
-            Command.create({ guest_id: guestId }),
+            Command.create({ partner_id: serverState.partnerId, livechat_member_type: "agent" }),
+            Command.create({ guest_id: guestId, livechat_member_type: "visitor" }),
         ],
         country_id: countryId,
         channel_type: "livechat",
diff --git a/addons/im_livechat/static/tests/livechat_test_helpers.js b/addons/im_livechat/static/tests/livechat_test_helpers.js
index 11eb1e33eccc8..45e19ed8253dc 100644
--- a/addons/im_livechat/static/tests/livechat_test_helpers.js
+++ b/addons/im_livechat/static/tests/livechat_test_helpers.js
@@ -9,6 +9,7 @@ import {
 import { DiscussChannel } from "./mock_server/mock_models/discuss_channel";
 import { DiscussChannelMember } from "./mock_server/mock_models/discuss_channel_member";
 import { LivechatChannel } from "./mock_server/mock_models/im_livechat_channel";
+import { LivechatChannelMemberHistory } from "./mock_server/mock_models/im_livechat_channel_member_history";
 import { LivechatChannelRule } from "./mock_server/mock_models/livechat_channel_rule";
 import { Im_LivechatExpertise } from "./mock_server/mock_models/im_livechat_expertise";
 import { ResGroupsPrivilege } from "./mock_server/mock_models/res_groups_privilege";
@@ -26,6 +27,7 @@ export const livechatModels = {
     DiscussChannel,
     DiscussChannelMember,
     LivechatChannel,
+    LivechatChannelMemberHistory,
     LivechatChannelRule,
     Im_LivechatExpertise,
     RatingRating,
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/@types/mock_models.d.ts b/addons/im_livechat/static/tests/mock_server/mock_models/@types/mock_models.d.ts
index 652bedabda3b3..ebf8cc0098bcb 100644
--- a/addons/im_livechat/static/tests/mock_server/mock_models/@types/mock_models.d.ts
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/@types/mock_models.d.ts
@@ -1,11 +1,12 @@
 declare module "mock_models" {
     import { LivechatChannel as LivechatChannel2 } from "../im_livechat_channel";
-    import { RatingRating as RatingRating2 } from "../rating_rating";
+    import { LivechatChannelMemberHistory as LivechatChannelMemberHistory2 } from "../im_livechat_channel_member_history";
 
     export interface LivechatChannel extends LivechatChannel2 {}
-    export interface RatingRating extends RatingRating2 {}
+    export interface LivechatChannelMemberHistory extends LivechatChannelMemberHistory2 {}
 
     export interface Models {
         "im_livechat.channel": LivechatChannel,
+        "im_livechat.channel.member.history": LivechatChannelMemberHistory,
     }
 }
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel.js b/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel.js
index 8b32233a66451..13abede437989 100644
--- a/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel.js
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel.js
@@ -7,6 +7,9 @@ import { ensureArray } from "@web/core/utils/arrays";
 
 export class DiscussChannel extends mailModels.DiscussChannel {
     livechat_channel_id = fields.Many2one({ relation: "im_livechat.channel", string: "Channel" }); // FIXME: somehow not fetched properly
+    livechat_channel_member_history_ids = fields.Many2many({
+        relation: "im_livechat.channel.member.history",
+    });
     livechat_note = fields.Html({ sanitize: true });
     livechat_status = fields.Selection({
         selection: [
@@ -93,6 +96,19 @@ export class DiscussChannel extends mailModels.DiscussChannel {
                       name: country.name,
                   }
                 : false;
+            channelInfo["livechat_channel_member_history_ids"] = mailDataHelpers.Store.many(
+                this.env["im_livechat.channel.member.history"].browse(
+                    channel.livechat_channel_member_history_ids
+                ),
+                makeKwArgs({
+                    fields: [
+                        mailDataHelpers.Store.one("channel_id", makeKwArgs({ as_thread: true })),
+                        mailDataHelpers.Store.one("guest_id", makeKwArgs({ fields: ["name"] })),
+                        "livechat_member_type",
+                        mailDataHelpers.Store.one("partner_id", makeKwArgs({ fields: ["name"] })),
+                    ],
+                })
+            );
             // add the last message date
             if (channel.channel_type === "livechat") {
                 // add the operator id
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel_member.js b/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel_member.js
index 2649aa710a903..2479e9aa19770 100644
--- a/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel_member.js
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/discuss_channel_member.js
@@ -10,6 +10,40 @@ export class DiscussChannelMember extends mailModels.DiscussChannelMember {
         ],
         compute: false,
     });
+
+    create(values) {
+        const idOrIds = super.create(values);
+        const newMembers = this.browse(idOrIds);
+        const historyValues = newMembers.map((member) => ({
+            member_id: member.id,
+            channel_id: member.channel_id,
+            guest_id: member.guest_id,
+            partner_id: member.partner_id,
+            livechat_member_type: member.livechat_member_type,
+        }));
+        this.env["im_livechat.channel.member.history"].create(historyValues);
+        const guest = this.env["mail.guest"]._get_guest_from_context();
+        for (const member of newMembers.filter((m) => {
+            const [channel] = this.env["discuss.channel"].browse(m.channel_id);
+            return channel.channel_type === "livechat" && !m.livechat_member_type;
+        })) {
+            if (guest && member.is_self) {
+                const livechatCustomerGuestIds = this.env["im_livechat.channel.member.history"]
+                    .search_read([
+                        ["channel_id", "=", member.channel_id],
+                        ["guest_id", "=", guest.id],
+                    ])
+                    .map(({ guest_id }) => guest_id[0]);
+                if (livechatCustomerGuestIds.includes(guest.id)) {
+                    member.livechat_member_type = "visitor";
+                }
+            } else {
+                member.livechat_member_type = "agent";
+            }
+        }
+        return idOrIds;
+    }
+
     /**
      * @override
      * @type {typeof mailModels.DiscussChannelMember["prototype"]["_get_store_partner_fields"]}
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel.js b/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel.js
index a967b928a80f8..a8ddbc969d854 100644
--- a/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel.js
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel.js
@@ -57,12 +57,15 @@ export class LivechatChannel extends models.ServerModel {
             Command.create({
                 unpin_dt: "2021-01-01 12:00:00",
                 last_interest_dt: "2021-01-01 10:00:00",
+                livechat_member_type: "agent",
                 partner_id: agent.partner_id,
             }),
         ];
         const guest = ResUsers._is_public(this.env.uid) && MailGuest._get_guest_from_context();
         if (guest) {
-            membersToAdd.push(Command.create({ guest_id: guest.id }));
+            membersToAdd.push(
+                Command.create({ livechat_member_type: "visitor", guest_id: guest.id })
+            );
         }
         let visitorUser;
         if (this.env.user && !ResUsers._is_public(this.env.uid) && this.env.user !== agent) {
diff --git a/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel_member_history.js b/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel_member_history.js
new file mode 100644
index 0000000000000..4ac88ad890002
--- /dev/null
+++ b/addons/im_livechat/static/tests/mock_server/mock_models/im_livechat_channel_member_history.js
@@ -0,0 +1,19 @@
+import { fields, models } from "@web/../tests/web_test_helpers";
+
+export class LivechatChannelMemberHistory extends models.ServerModel {
+    _name = "im_livechat.channel.member.history";
+
+    channel_id = fields.Many2one({ relation: "discuss.channel" });
+    guest_id = fields.Many2one({
+        relation: "mail.guest",
+    });
+    livechat_member_type = fields.Selection({
+        selection: [
+            ["agent", "Agent"],
+            ["visitor", "Visitor"],
+            ["bot", "Chatbot"],
+        ],
+    });
+    member_id = fields.Many2one({ relation: "discuss.channel.member" });
+    partner_id = fields.Many2one({ relation: "res.partner" });
+}
diff --git a/addons/im_livechat/static/tests/sidebar_patch.test.js b/addons/im_livechat/static/tests/sidebar_patch.test.js
index e742e7a13471b..4b0e8e6c6dab7 100644
--- a/addons/im_livechat/static/tests/sidebar_patch.test.js
+++ b/addons/im_livechat/static/tests/sidebar_patch.test.js
@@ -1,14 +1,6 @@
-import { waitForChannels } from "@bus/../tests/bus_test_helpers";
-import {
-    click,
-    contains,
-    insertText,
-    openDiscuss,
-    start,
-    startServer,
-} from "@mail/../tests/mail_test_helpers";
+import { click, contains, openDiscuss, start, startServer } from "@mail/../tests/mail_test_helpers";
 import { withGuest } from "@mail/../tests/mock_server/mail_mock_server";
-import { describe, expect, test } from "@odoo/hoot";
+import { describe, test } from "@odoo/hoot";
 import { mockDate, tick } from "@odoo/hoot-mock";
 import { Command, serverState } from "@web/../tests/web_test_helpers";
 
@@ -16,7 +8,6 @@ import { deserializeDateTime } from "@web/core/l10n/dates";
 import { rpc } from "@web/core/network/rpc";
 import { url } from "@web/core/utils/urls";
 import { defineLivechatModels } from "./livechat_test_helpers";
-import { press } from "@odoo/hoot-dom";
 import { browser } from "@web/core/browser/browser";
 
 describe.current.tags("desktop");
@@ -373,51 +364,6 @@ test("Message unread counter", async () => {
     await contains(".o-mail-DiscussSidebarChannel .badge", { text: "1" });
 });
 
-test("unknown livechat can be displayed and interacted with", async () => {
-    mockDate("2023-01-03 12:00:00");
-    const pyEnv = await startServer();
-    pyEnv["res.users"].write(serverState.userId, { notification_type: "inbox" });
-    const partnerId = pyEnv["res.partner"].create({ name: "Jane" });
-    const channelId = pyEnv["discuss.channel"].create({
-        channel_member_ids: [
-            Command.create({
-                partner_id: partnerId,
-                last_interest_dt: "2021-01-01 10:00:00",
-                livechat_member_type: "agent",
-            }),
-            Command.create({
-                guest_id: pyEnv["mail.guest"].create({ name: "Jane" }),
-                livechat_member_type: "visitor",
-            }),
-        ],
-        channel_type: "livechat",
-        livechat_operator_id: partnerId,
-        create_uid: serverState.publicUserId,
-    });
-    const env = await start();
-    env.services.bus_service.subscribe("discuss.channel/new_message", () =>
-        expect.step("discuss.channel/new_message")
-    );
-    await openDiscuss("mail.box_inbox");
-    await contains("button.o-active", { text: "Inbox" });
-    await contains(".o-mail-DiscussSidebarCategory-livechat", { count: 0 });
-    await contains(".o-mail-DiscussSidebarChannel", { count: 0 });
-    await openDiscuss(channelId);
-    await waitForChannels([`discuss.channel_${channelId}`]);
-    await contains(".o-mail-DiscussSidebarChannel.o-active", { text: "Jane" });
-    await insertText(".o-mail-Composer-input", "Hello", { replace: true });
-    await press("Enter");
-    await contains(".o-mail-Message", { text: "Hello" });
-    await expect.waitForSteps(["discuss.channel/new_message"]);
-    await click("button", { text: "Inbox" });
-    await contains(".o-mail-DiscussSidebarChannel:not(.o-active)", { text: "Jane" });
-    await click("[title='Chat Actions']");
-    await click(".o-dropdown-item:contains('Leave Channel')");
-    await click("button:contains('Leave Conversation')");
-    await contains(".o-mail-DiscussSidebarCategory-livechat", { count: 0 });
-    await contains(".o-mail-DiscussSidebarChannel", { count: 0 });
-});
-
 test("Local sidebar category state is shared between tabs", async () => {
     const pyEnv = await startServer();
     pyEnv["discuss.channel"].create({
diff --git a/addons/im_livechat/tests/test_chatbot_internals.py b/addons/im_livechat/tests/test_chatbot_internals.py
index 29315396d0fc8..f5a8ba51961bd 100644
--- a/addons/im_livechat/tests/test_chatbot_internals.py
+++ b/addons/im_livechat/tests/test_chatbot_internals.py
@@ -244,8 +244,12 @@ def get_forward_op_bus_params():
             channel_data_emp["discuss.channel.member"][1]["message_unread_counter_bus_id"] = 0
             channel_data = Store().add(discuss_channel).get_result()
             channel_data["discuss.channel"][0]["message_needaction_counter_bus_id"] = 0
+            agent_history_id = discuss_channel.livechat_channel_member_history_ids.filtered(
+                lambda h: h.livechat_member_type == "agent"
+            ).id
             channels, message_items = (
                 [
+                    (self.cr.dbname, "discuss.channel", discuss_channel.id),
                     (self.cr.dbname, "discuss.channel", discuss_channel.id),
                     (self.cr.dbname, "res.partner", self.partner_employee.id),
                     (self.cr.dbname, "discuss.channel", discuss_channel.id),
@@ -324,6 +328,34 @@ def get_forward_op_bus_params():
                             ),
                         },
                     },
+                    {
+                        "type": "mail.record/insert",
+                        "payload": {
+                            "discuss.channel": [
+                                {
+                                    "id": discuss_channel.id,
+                                    "livechat_channel_member_history_ids": [
+                                        ["ADD", [agent_history_id]]
+                                    ],
+                                },
+                            ],
+                            "im_livechat.channel.member.history": [
+                                {
+                                    "channel_id": discuss_channel.id,
+                                    "id": agent_history_id,
+                                    "livechat_member_type": "agent",
+                                    "partner_id": self.partner_employee.id,
+                                }
+                            ],
+                            "res.partner": [
+                                {
+                                    "id": self.partner_employee.id,
+                                    "name": "Ernest Employee",
+                                    "user_livechat_username": False,
+                                }
+                            ],
+                        },
+                    },
                     {
                         "type": "mail.record/insert",
                         "payload": {
diff --git a/addons/im_livechat/tests/test_get_discuss_channel.py b/addons/im_livechat/tests/test_get_discuss_channel.py
index 04108e7ba7208..adef47939acac 100644
--- a/addons/im_livechat/tests/test_get_discuss_channel.py
+++ b/addons/im_livechat/tests/test_get_discuss_channel.py
@@ -197,7 +197,7 @@ def test_channel_get_livechat_visitor_info(self):
                     "last_interest_dt": fields.Datetime.to_string(visitor_member.last_interest_dt),
                     "last_seen_dt": False,
                     "message_unread_counter": 0,
-                    "message_unread_counter_bus_id": self.env["bus.bus"]._bus_last_id() - 2,
+                    "message_unread_counter_bus_id": self.env["bus.bus"]._bus_last_id() - 3,
                     "mute_until_dt": False,
                     "new_message_separator": 0,
                     "partner_id": test_user.partner_id.id,
@@ -271,7 +271,7 @@ def test_channel_get_livechat_visitor_info(self):
                     "last_interest_dt": fields.Datetime.to_string(operator_member.last_interest_dt),
                     "last_seen_dt": False,
                     "message_unread_counter": 0,
-                    "message_unread_counter_bus_id": self.env["bus.bus"]._bus_last_id() - 2,
+                    "message_unread_counter_bus_id": self.env["bus.bus"]._bus_last_id() - 3,
                     "mute_until_dt": False,
                     "new_message_separator": 0,
                     "partner_id": operator.partner_id.id,
diff --git a/addons/mail/static/tests/mock_server/mock_models/discuss_channel.js b/addons/mail/static/tests/mock_server/mock_models/discuss_channel.js
index 54d55bedf0e24..55014b0c70d0a 100644
--- a/addons/mail/static/tests/mock_server/mock_models/discuss_channel.js
+++ b/addons/mail/static/tests/mock_server/mock_models/discuss_channel.js
@@ -164,19 +164,11 @@ export class DiscussChannel extends models.ServerModel {
             const subtype_xmlid = "mail.mt_comment";
             this.message_post(channel.id, makeKwArgs({ body, message_type, subtype_xmlid }));
         }
-        const isSelfMember =
-            DiscussChannelMember.search_count([
-                ["partner_id", "=", this.env.user.partner_id],
-                ["channel_id", "=", channel.id],
-            ]) > 0;
-        if (isSelfMember) {
+        if (insertedChannelMembers.length) {
             BusBus._sendone(
                 channel,
                 "mail.record/insert",
                 new mailDataHelpers.Store(this.browse(channel.id), {
-                    invited_member_ids: kwargs.invite_to_rtc_call
-                        ? [["ADD", insertedChannelMembers]]
-                        : false,
                     member_count: DiscussChannelMember.search_count([
                         ["channel_id", "=", channel.id],
                     ]),
@@ -185,6 +177,15 @@ export class DiscussChannel extends models.ServerModel {
                     .get_result()
             );
         }
+        if (kwargs.invite_to_rtc_call) {
+            BusBus._sendone(
+                channel,
+                "mail.record/insert",
+                new mailDataHelpers.Store(this.browse(channel.id), {
+                    invited_member_ids: [["ADD", insertedChannelMembers]],
+                }).get_result()
+            );
+        }
         return DiscussChannelMember.browse(insertedChannelMembers);
     }
 
diff --git a/addons/test_discuss_full/tests/test_performance.py b/addons/test_discuss_full/tests/test_performance.py
index 030c7fbc293b0..fa5a3f4052d6b 100644
--- a/addons/test_discuss_full/tests/test_performance.py
+++ b/addons/test_discuss_full/tests/test_performance.py
@@ -561,6 +561,10 @@ def _get_discuss_channels_result(self):
             "im_livechat.channel": [
                 self._expected_result_for_livechat_channel(),
             ],
+            "im_livechat.channel.member.history": [
+                *self._expected_result_for_livechat_member_history(self.channel_livechat_1),
+                *self._expected_result_for_livechat_member_history(self.channel_livechat_2),
+            ],
             "mail.guest": [
                 self._expected_result_for_persona(guest=True),
             ],
@@ -853,6 +857,7 @@ def _expected_result_for_channel(self, channel):
                 "last_interest_dt": last_interest_dt,
                 "livechat_end_dt": False,
                 "livechat_channel_id": self.im_livechat_channel.id,
+                "livechat_channel_member_history_ids": self.channel_livechat_1.livechat_channel_member_history_ids.ids,
                 "livechat_note": False,
                 "livechat_outcome": "no_answer",
                 "livechat_status": "in_progress",
@@ -881,6 +886,7 @@ def _expected_result_for_channel(self, channel):
                 "last_interest_dt": last_interest_dt,
                 "livechat_end_dt": False,
                 "livechat_channel_id": self.im_livechat_channel.id,
+                "livechat_channel_member_history_ids": self.channel_livechat_2.livechat_channel_member_history_ids.ids,
                 "livechat_note": False,
                 "livechat_outcome": "no_answer",
                 "livechat_status": "in_progress",
@@ -1264,6 +1270,40 @@ def _res_for_member(self, channel, partner=None, guest=None):
     def _expected_result_for_livechat_channel(self):
         return {"id": self.im_livechat_channel.id, "name": "support"}
 
+    def _expected_result_for_livechat_member_history(self, channel):
+        histories = channel.livechat_channel_member_history_ids
+        if channel == self.channel_livechat_1:
+            return [
+                {
+                    "channel_id": channel.id,
+                    "id": histories.filtered(lambda h: h.livechat_member_type == "agent").id,
+                    "livechat_member_type": "agent",
+                    "partner_id": self.users[0].partner_id.id,
+                },
+                {
+                    "channel_id": channel.id,
+                    "id": histories.filtered(lambda h: h.livechat_member_type == "visitor").id,
+                    "livechat_member_type": "visitor",
+                    "partner_id": self.users[1].partner_id.id,
+                },
+            ]
+        if channel == self.channel_livechat_2:
+            return [
+                {
+                    "channel_id": channel.id,
+                    "id": histories.filtered(lambda h: h.livechat_member_type == "agent").id,
+                    "livechat_member_type": "agent",
+                    "partner_id": self.users[0].partner_id.id,
+                },
+                {
+                    "channel_id": channel.id,
+                    "guest_id": self.guest.id,
+                    "id": histories.filtered(lambda h: h.livechat_member_type == "visitor").id,
+                    "livechat_member_type": "visitor",
+                },
+            ]
+        return []
+
     def _expected_result_for_message(self, channel):
         last_message = channel._get_last_messages()
         create_date = fields.Datetime.to_string(last_message.create_date)
diff --git a/addons/website/static/tests/helpers.js b/addons/website/static/tests/helpers.js
index 44cee7427c306..0d2ce319e2ecf 100644
--- a/addons/website/static/tests/helpers.js
+++ b/addons/website/static/tests/helpers.js
@@ -1,4 +1,3 @@
-import { mailModels } from "@mail/../tests/mail_test_helpers";
 import { animationFrame } from "@odoo/hoot-mock";
 import { registry } from "@web/core/registry";
 import { buildEditableInteractions } from "@website/core/website_edit_service";
@@ -28,7 +27,6 @@ export async function switchToEditMode(core) {
 }
 
 export const websiteModels = {
-    ...mailModels,
     Website,
     WebsitePage,
     WebsiteTrack,
diff --git a/addons/website_livechat/models/website_visitor.py b/addons/website_livechat/models/website_visitor.py
index c7c6ddb2ac414..5fa46676c71d6 100644
--- a/addons/website_livechat/models/website_visitor.py
+++ b/addons/website_livechat/models/website_visitor.py
@@ -65,32 +65,41 @@ def action_send_chat_request(self):
             operator = self.env.user
             country = visitor.country_id
             visitor_name = "Visitor #%d (%s)" % (visitor.id, country.name) if country else f"Visitor #{visitor.id}"
-            members_to_add = [Command.link(operator.partner_id.id)]
+            members_to_add = [
+                Command.create(
+                    {"partner_id": operator.partner_id.id, "livechat_member_type": "agent"}
+                )
+            ]
             if visitor.partner_id:
-                members_to_add.append(Command.link(visitor.partner_id.id))
+                members_to_add.append(
+                    Command.create(
+                        {"partner_id": visitor.partner_id.id, "livechat_member_type": "visitor"}
+                    )
+                )
+            else:
+                # sudo: mail.guest - creating a guest in a dedicated channel created from livechat
+                guest = self.env["mail.guest"].sudo().create(
+                    {
+                        "country_id": country.id,
+                        "lang": get_lang(self.env).code,
+                        "name": _("Visitor #%d", visitor.id),
+                        "timezone": visitor.timezone,
+                    }
+                )
+                members_to_add.append(
+                    Command.create({"guest_id": guest.id, "livechat_member_type": "visitor"})
+                )
             discuss_channel_vals_list.append({
-                'channel_partner_ids': members_to_add,
                 "is_pending_chat_request": True,
                 'livechat_channel_id': visitor.website_id.channel_id.id,
-                'livechat_operator_id': self.env.user.partner_id.id,
+                'livechat_operator_id': operator.partner_id.id,
+                "channel_member_ids": members_to_add,
                 'channel_type': 'livechat',
                 'country_id': country.id,
                 'name': ', '.join([visitor_name, operator.livechat_username if operator.livechat_username else operator.name]),
                 'livechat_visitor_id': visitor.id,
             })
         discuss_channels = self.env['discuss.channel'].create(discuss_channel_vals_list)
-        for channel in discuss_channels:
-            if not channel.livechat_visitor_id.partner_id:
-                # sudo: mail.guest - creating a guest in a dedicated channel created from livechat
-                guest = self.env["mail.guest"].sudo().create(
-                    {
-                        "country_id": country.id,
-                        "lang": get_lang(channel.env).code,
-                        "name": _("Visitor #%d", channel.livechat_visitor_id.id),
-                        "timezone": visitor.timezone,
-                    }
-                )
-                channel._add_members(guests=guest, post_joined_message=False)
         # Open empty channel to allow the operator to start chatting with the visitor
         Store(bus_channel=self.env.user).add(
             discuss_channels,
diff --git a/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js b/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js
index 85712dabe457c..b9b17591b7b47 100644
--- a/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js
+++ b/addons/website_livechat/static/tests/mock_server/mock_models/website_visitor.js
@@ -24,9 +24,27 @@ export class WebsiteVisitor extends websiteModels.WebsiteVisitor {
             const operator = this.env.user;
             const country = visitor.country_id ? ResCountry.browse(visitor.country_id) : undefined;
             const visitor_name = `Visitor #${visitor.id}${country ? ` (${country.name})` : ""}`;
-            const membersToAdd = [Command.create({ partner_id: serverState.partnerId })];
+            const membersToAdd = [
+                Command.create({
+                    partner_id: serverState.partnerId,
+                    livechat_member_type: "agent",
+                }),
+            ];
             if (visitor.partner_id) {
-                membersToAdd.push(Command.create({ partner_id: visitor.partner_id }));
+                membersToAdd.push(
+                    Command.create({
+                        partner_id: visitor.partner_id,
+                        livechat_member_type: "visitor",
+                    })
+                );
+            } else {
+                const guestId = MailGuest.create({ name: `Visitor #${visitor.id}` });
+                membersToAdd.push(
+                    Command.create({
+                        guest_id: guestId,
+                        livechat_member_type: "visitor",
+                    })
+                );
             }
             const livechatId = DiscussChannel.create({
                 channel_member_ids: membersToAdd,
@@ -36,12 +54,6 @@ export class WebsiteVisitor extends websiteModels.WebsiteVisitor {
                     operator.livechat_username ? operator.livechat_username : operator.name
                 }`,
             });
-            if (!visitor.partner_id) {
-                const guestId = MailGuest.create({ name: `Visitor #${visitor.id}` });
-                DiscussChannel.write([livechatId], {
-                    channel_member_ids: [Command.create({ guest_id: guestId })],
-                });
-            }
             const [partner] = ResPartner.read(serverState.partnerId);
             const channel = DiscussChannel.browse(livechatId);
             // notify operator
diff --git a/addons/website_livechat/tests/test_livechat_basic_flow.py b/addons/website_livechat/tests/test_livechat_basic_flow.py
index c2bf3d3169c74..e081fdfed8366 100644
--- a/addons/website_livechat/tests/test_livechat_basic_flow.py
+++ b/addons/website_livechat/tests/test_livechat_basic_flow.py
@@ -215,6 +215,7 @@ def test_channel_visitor_data(self):
                         "is_editable": True,
                         "last_interest_dt": fields.Datetime.to_string(channel.last_interest_dt),
                         "livechat_channel_id": self.livechat_channel.id,
+                        "livechat_channel_member_history_ids": channel.livechat_channel_member_history_ids.ids,
                         "livechat_end_dt": False,
                         "livechat_note": False,
                         "livechat_status": "in_progress",
@@ -257,6 +258,24 @@ def test_channel_visitor_data(self):
                 "im_livechat.channel": [
                     {"id": self.livechat_channel.id, "name": "The basic channel"}
                 ],
+                "im_livechat.channel.member.history": [
+                    {
+                        "channel_id": channel.id,
+                        "id": channel.livechat_channel_member_history_ids.filtered(
+                            lambda h: h.partner_id == self.operator.partner_id
+                        ).id,
+                        "livechat_member_type": "agent",
+                        "partner_id": self.operator.partner_id.id,
+                    },
+                    {
+                        "channel_id": channel.id,
+                        "guest_id": guest.id,
+                        "id": channel.livechat_channel_member_history_ids.filtered(
+                            lambda h: h.guest_id == guest
+                        ).id,
+                        "livechat_member_type": "visitor",
+                    },
+                ],
                 "mail.guest": [
                     {
                         "avatar_128_access_token": guest._get_avatar_128_access_token(),
@@ -355,6 +374,7 @@ def test_channel_to_store_after_operator_left(self):
                     "id": channel.id,
                     "is_editable": False,
                     "last_interest_dt": fields.Datetime.to_string(channel.last_interest_dt),
+                    "livechat_channel_member_history_ids": channel.livechat_channel_member_history_ids.ids,
                     "livechat_end_dt": fields.Datetime.to_string(agent_left_dt),
                     "livechat_operator_id": self.operator.partner_id.id,
                     "member_count": 1,

From 97b1d400220dd3131d17b7e8c78d0007d5548f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yagnik=20=E2=9C=97=20=28yagp=29?= <yagp@odoo.com>
Date: Wed, 15 Oct 2025 17:48:46 +0530
Subject: [PATCH 616/673] [IMP] mail: improve activity view

- Moved done filter into the main group so that OR logic can be applied
- Removed unnecessary separator
- Added muted style for done items in List & Kanban to distinguish them

Task-5166994

closes odoo/odoo#231684

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/mail/views/mail_activity_views.xml | 50 ++++++++++++-----------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 1248f00653444..adb3b92aa0a7d 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -235,6 +235,7 @@
                 <filter name="filter_user_id_no_user" string="Unassigned Activities" domain="[('user_id', '=', False)]"/>
                 <separator/>
                 <separator invisible="1"/>
+                <filter string="Done" name="filter_archived" domain="[('active', '=', False)]"/>
                 <filter string="Overdue" name="filter_date_deadline_past"
                         domain="[('date_deadline', '&lt;', 'today')]"
                         help="Show all records whose next activity date is past"/>
@@ -252,8 +253,6 @@
                 <filter string="Future" name="filter_date_deadline_future"
                         domain="[('date_deadline', '&gt;', 'today')
                         ]"/>
-                <separator/>
-                <filter string="Done" name="filter_archived" domain="[('active', '=', False)]"/>
                 <separator />
                 <group>
                     <filter string="Deadline" name="date_deadline" context="{'group_by': 'date_deadline'}"/>
@@ -271,6 +270,7 @@
         <field name="model">mail.activity</field>
         <field name="arch" type="xml">
             <list string="Next Activities"
+                    decoration-muted="(not active)"
                     default_order="date_deadline" create="true">
                 <header>
                     <button name="action_done" type="object" string="Done" icon="fa-check"/>
@@ -337,28 +337,30 @@
                     <field name="active" invisible="1"/>
                     <field name="icon" invisible="1"/>
                     <t t-name="card">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-truncate" invisible="not res_name">
-                                <field name="res_name" class="fw-bold" />
-                                (<field class="text-muted" name="res_model_id" />)
-                            </span>
-                            <field name="summary" class="text-truncate" invisible="res_name"/>
-                            <span class="badge rounded-pill text-bg-300">
-                                <i t-if="record.icon" t-attf-class="fa {{record.icon.raw_value}} me-1"/>
-                                <field name="activity_type_id"/>
-                            </span>
-                        </div>
-                        <field class="text-truncate" name="summary" invisible="not res_name"/>
-                        <footer class="align-items-center">
-                            <field name="user_id" widget="many2one_avatar_user" />
-                            <field name="date_deadline" widget="remaining_days" class="ms-2"/>
-                            <button type="object" name="action_done" class="btn btn-link btn-sm ms-auto me-1" invisible="active == False">
-                                <i class="fa fa-check" /> Done
-                            </button>
-                            <button type="object" name="unlink" class="btn btn-link text-danger btn-sm">
-                                <i class="fa fa-times" /> Cancel
-                            </button>
-                        </footer>
+                        <main t-att-class="(!record.active.raw_value) ? 'opacity-50' : ''">
+                            <div class="d-flex justify-content-between">
+                                <span class="text-truncate" invisible="not res_name">
+                                    <field name="res_name" class="fw-bold" />
+                                    (<field class="text-muted" name="res_model_id" />)
+                                </span>
+                                <field name="summary" class="text-truncate" invisible="res_name"/>
+                                <span class="badge rounded-pill text-bg-300">
+                                    <i t-if="record.icon" t-attf-class="fa {{record.icon.raw_value}} me-1"/>
+                                    <field name="activity_type_id"/>
+                                </span>
+                            </div>
+                            <field class="text-truncate" name="summary" invisible="not res_name"/>
+                            <footer class="align-items-center">
+                                <field name="user_id" widget="many2one_avatar_user" />
+                                <field name="date_deadline" widget="remaining_days" class="ms-2"/>
+                                <button type="object" name="action_done" class="btn btn-link btn-sm ms-auto me-1" invisible="active == False">
+                                    <i class="fa fa-check" /> Done
+                                </button>
+                                <button type="object" name="unlink" class="btn btn-link text-danger btn-sm">
+                                    <i class="fa fa-times" /> Cancel
+                                </button>
+                            </footer>
+                        </main>
                     </t>
                 </templates>
             </kanban>

From 1c12f840503d45bccf155a19af2614a1a87cfc3a Mon Sep 17 00:00:00 2001
From: "Robin Lejeune (role)" <role@odoo.com>
Date: Mon, 3 Nov 2025 16:54:24 +0100
Subject: [PATCH 617/673] [IMP] html_builder, web, website: document services
 and registries

We make use of existing `web` TypeScript interfaces and types (Services
and GlobalRegistryCategories) to better document html_builder and
website services and registry categories, as well as the interactions'
ones.

task-5249231

Part-of: odoo/odoo#234203
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../static/src/@types/services.d.ts           |  7 ++++++
 .../static/src/snippets/snippet_service.js    |  6 +++--
 .../src/@types/registries/registries.d.ts     |  4 ++++
 addons/web/static/src/public/interaction.js   |  1 +
 .../website/static/src/@types/registries.d.ts | 22 +++++++++++++++++++
 .../website/static/src/@types/services.d.ts   | 19 ++++++++++++++++
 .../src/core/website_cookies_service.js       |  6 +++--
 .../static/src/core/website_edit_service.js   |  5 +++--
 .../static/src/core/website_map_service.js    |  6 +++--
 .../static/src/core/website_menus_service.js  |  6 +++--
 .../static/src/core/website_page_service.js   |  6 +++--
 11 files changed, 76 insertions(+), 12 deletions(-)
 create mode 100644 addons/html_builder/static/src/@types/services.d.ts
 create mode 100644 addons/website/static/src/@types/registries.d.ts
 create mode 100644 addons/website/static/src/@types/services.d.ts

diff --git a/addons/html_builder/static/src/@types/services.d.ts b/addons/html_builder/static/src/@types/services.d.ts
new file mode 100644
index 0000000000000..23a22c6d54ca1
--- /dev/null
+++ b/addons/html_builder/static/src/@types/services.d.ts
@@ -0,0 +1,7 @@
+declare module "services" {
+    import { snippetService } from "@html_builder/snippets/snippet_service";
+
+    export interface Services {
+        "html_builder.snippets": typeof snippetService;
+    }
+}
diff --git a/addons/html_builder/static/src/snippets/snippet_service.js b/addons/html_builder/static/src/snippets/snippet_service.js
index 5a484e34f52c1..6fb0ec6ef6404 100644
--- a/addons/html_builder/static/src/snippets/snippet_service.js
+++ b/addons/html_builder/static/src/snippets/snippet_service.js
@@ -336,7 +336,7 @@ export class SnippetModel extends Reactive {
     }
 }
 
-registry.category("services").add("html_builder.snippets", {
+export const snippetService = {
     dependencies: ["orm", "dialog"],
 
     start(env, { orm, dialog }) {
@@ -363,7 +363,9 @@ registry.category("services").add("html_builder.snippets", {
 
         return { getSnippetModel };
     },
-});
+};
+
+registry.category("services").add("html_builder.snippets", snippetService);
 
 export function useSnippets(snippetsName) {
     const snippetsService = useService("html_builder.snippets");
diff --git a/addons/web/static/src/@types/registries/registries.d.ts b/addons/web/static/src/@types/registries/registries.d.ts
index 6a290099b79d0..743b80edea7c0 100644
--- a/addons/web/static/src/@types/registries/registries.d.ts
+++ b/addons/web/static/src/@types/registries/registries.d.ts
@@ -2,6 +2,7 @@ declare module "registries" {
     import { Component } from "@odoo/owl";
     import { OdooEnv } from "@web/env";
     import { NotificationOptions } from "@web/core/notifications/notification_service";
+    import { Interaction } from "@web/public/interaction";
     import { Compiler } from "@web/views/view_compiler";
     import { ActionDescription } from "@web/webclient/actions/action_service";
 
@@ -79,6 +80,8 @@ declare module "registries" {
 
     export type IrActionsReportHandlers = (action: ActionRequest, options: ActionOptions, env: OdooEnv) => (void | boolean | Promise<void | boolean>);
 
+    export type InteractionRegistryItemShape = typeof Interaction;
+
     interface GlobalRegistryCategories {
         action_handlers: ActionHandlersRegistryItemShape;
         actions: ActionsRegistryItemShape;
@@ -96,6 +99,7 @@ declare module "registries" {
         main_components: MainComponentsRegistryItemShape;
         parsers: ParsersRegistryItemShape;
         public_components: PublicComponentsRegistryItemShape;
+        "public.interactions": InteractionRegistryItemShape;
         sample_server: SampleServerRegistryItemShape;
         systray: SystrayRegistryItemShape;
         "ir.actions.report handlers": IrActionsReportHandlers;
diff --git a/addons/web/static/src/public/interaction.js b/addons/web/static/src/public/interaction.js
index b2415b4b2a314..b159f2239c1bc 100644
--- a/addons/web/static/src/public/interaction.js
+++ b/addons/web/static/src/public/interaction.js
@@ -121,6 +121,7 @@ export class Interaction {
         this.__colibri__ = metadata;
         this.el = el;
         this.env = env;
+        /** @type {import("services").ServiceFactories} */
         this.services = env.services;
     }
 
diff --git a/addons/website/static/src/@types/registries.d.ts b/addons/website/static/src/@types/registries.d.ts
new file mode 100644
index 0000000000000..6aeb46af8116c
--- /dev/null
+++ b/addons/website/static/src/@types/registries.d.ts
@@ -0,0 +1,22 @@
+
+declare module "registries" {
+    import { Interaction } from "@web/public/interaction";
+
+    type Constructor<T = {}> = new (arg: T) => T;
+    export type EditInteractionMixin = Constructor<Interaction>;
+    export type PreviewInteractionMixin = Constructor<Interaction>;
+
+    export interface EditInteractionRegistryItemShape {
+        Interaction: Interaction;
+        mixin?: EditInteractionMixin;
+    }
+    export interface PreviewInteractionRegistryItemShape {
+        Interaction: Interaction;
+        mixin?: PreviewInteractionMixin;
+    }
+
+    export interface GlobalRegistryCategories {
+        "public.interactions.edit": EditInteractionRegistryItemShape;
+        "public.interactions.preview": PreviewInteractionRegistryItemShape;
+    }
+}
diff --git a/addons/website/static/src/@types/services.d.ts b/addons/website/static/src/@types/services.d.ts
new file mode 100644
index 0000000000000..e4659fc2b556c
--- /dev/null
+++ b/addons/website/static/src/@types/services.d.ts
@@ -0,0 +1,19 @@
+declare module "services" {
+    import { websiteCookiesService } from "@website/core/website_cookies_service";
+    import { websiteEditService } from "@website/core/website_edit_service";
+    import { websiteMapService } from "@website/core/website_map_service";
+    import { websiteMenusService } from "@website/core/website_menus_service";
+    import { websitePageService } from "@website/core/website_page_service";
+    import { websiteCustomMenus } from "@website/services/website_custom_menus";
+    import { websiteService } from "@website/services/website_service";
+
+    export interface Services {
+        website: typeof websiteService;
+        website_cookies: typeof websiteCookiesService;
+        website_custom_menus: typeof websiteCustomMenus;
+        website_edit: typeof websiteEditService;
+        website_map: typeof websiteMapService;
+        website_menus: typeof websiteMenusService;
+        website_page: typeof websitePageService;
+    }
+}
diff --git a/addons/website/static/src/core/website_cookies_service.js b/addons/website/static/src/core/website_cookies_service.js
index 9703a477d9af9..289897516a6f1 100644
--- a/addons/website/static/src/core/website_cookies_service.js
+++ b/addons/website/static/src/core/website_cookies_service.js
@@ -1,7 +1,7 @@
 import { registry } from "@web/core/registry";
 import { EventBus } from "@website/utils/misc";
 
-registry.category("services").add("website_cookies", {
+export const websiteCookiesService = {
     dependencies: ["public.interactions"],
     start(env, deps) {
         const bus = new EventBus();
@@ -26,4 +26,6 @@ registry.category("services").add("website_cookies", {
 
         return { bus, manageIframeSrc };
     },
-});
+};
+
+registry.category("services").add("website_cookies", websiteCookiesService);
diff --git a/addons/website/static/src/core/website_edit_service.js b/addons/website/static/src/core/website_edit_service.js
index 2254a2cf01303..67e68c926d0d9 100644
--- a/addons/website/static/src/core/website_edit_service.js
+++ b/addons/website/static/src/core/website_edit_service.js
@@ -46,7 +46,7 @@ export function buildEditableInteractions(builders) {
     return result;
 }
 
-registry.category("services").add("website_edit", {
+export const websiteEditService = {
     dependencies: ["public.interactions"],
     start(env, { ["public.interactions"]: publicInteractions }) {
         let editableInteractions = null;
@@ -313,7 +313,8 @@ registry.category("services").add("website_edit", {
 
         return websiteEditService;
     },
-});
+};
+registry.category("services").add("website_edit", websiteEditService);
 
 // Patch PublicRoot.
 
diff --git a/addons/website/static/src/core/website_map_service.js b/addons/website/static/src/core/website_map_service.js
index 0f364ba28b2a0..272e3dc68b152 100644
--- a/addons/website/static/src/core/website_map_service.js
+++ b/addons/website/static/src/core/website_map_service.js
@@ -5,7 +5,7 @@ import { rpc } from "@web/core/network/rpc";
 import { user } from "@web/core/user";
 import { markup } from "@odoo/owl";
 
-registry.category("services").add("website_map", {
+export const websiteMapService = {
     dependencies: ["public.interactions", "notification"],
     start(env, deps) {
         const publicInteractions = deps["public.interactions"];
@@ -137,4 +137,6 @@ registry.category("services").add("website_map", {
             },
         };
     },
-});
+};
+
+registry.category("services").add("website_map", websiteMapService);
diff --git a/addons/website/static/src/core/website_menus_service.js b/addons/website/static/src/core/website_menus_service.js
index 6f5ad6196de5b..251a689e1249e 100644
--- a/addons/website/static/src/core/website_menus_service.js
+++ b/addons/website/static/src/core/website_menus_service.js
@@ -1,6 +1,6 @@
 import { registry } from "@web/core/registry";
 
-registry.category("services").add("website_menus", {
+export const websiteMenusService = {
     start() {
         const updateCallbacks = new Set();
         return {
@@ -16,4 +16,6 @@ registry.category("services").add("website_menus", {
             },
         };
     },
-});
+};
+
+registry.category("services").add("website_menus", websiteMenusService);
diff --git a/addons/website/static/src/core/website_page_service.js b/addons/website/static/src/core/website_page_service.js
index 54b668636fabe..95d42604e9a05 100644
--- a/addons/website/static/src/core/website_page_service.js
+++ b/addons/website/static/src/core/website_page_service.js
@@ -2,7 +2,7 @@ import { jsToPyLocale } from "@web/core/l10n/utils";
 import { registry } from "@web/core/registry";
 import { user } from "@web/core/user";
 
-registry.category("services").add("website_page", {
+export const websitePageService = {
     start() {
         const htmlEl = document.querySelector("html");
         // TODO this is duplicated in website_service.js at least... to share
@@ -21,4 +21,6 @@ registry.category("services").add("website_page", {
             },
         };
     },
-});
+};
+
+registry.category("services").add("website_page", websitePageService);

From 18ed09dd97988362f9b97eb344beb896b5c0bf13 Mon Sep 17 00:00:00 2001
From: "Robin Lejeune (role)" <role@odoo.com>
Date: Tue, 4 Nov 2025 13:12:17 +0100
Subject: [PATCH 618/673] [IMP] html_editor: document Plugins resources

This commit moves the `SharedMethods` JSDoc into a `plugins.d.ts` file,
in order for other modules to add their own shared methods to the
interface.

Additionnally, we also create a resources interface, with the same goal
in mind. It will also make it possible to have autocompletion in IDEs
for methods such as `getResource`, `dispatchTo` and `delegateTo`.

task-5249231

Part-of: odoo/odoo#234203
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../static/src/@types/plugins.d.ts            | 253 ++++++++++++++++++
 .../static/src/core/base_container_plugin.js  |   5 +
 .../static/src/core/clipboard_plugin.js       |  14 +
 .../static/src/core/comment_plugin.js         |   1 +
 .../src/core/content_editable_plugin.js       |  13 +
 .../static/src/core/delete_plugin.js          |  27 +-
 .../html_editor/static/src/core/dom_plugin.js |  13 +
 .../static/src/core/editor_version_plugin.js  |   1 +
 .../static/src/core/format_plugin.js          |  12 +
 .../static/src/core/history_plugin.js         |  38 ++-
 .../static/src/core/input_plugin.js           |   5 +
 .../static/src/core/line_break_plugin.js      |   6 +
 .../static/src/core/no_inline_root_plugin.js  |   1 +
 .../static/src/core/protected_node_plugin.js  |   1 +
 .../static/src/core/sanitize_plugin.js        |   1 +
 .../static/src/core/selection_plugin.js       |  16 ++
 .../static/src/core/shortcut_plugin.js        |  14 +
 .../static/src/core/split_plugin.js           |   9 +
 .../static/src/core/user_command_plugin.js    |   4 +
 addons/html_editor/static/src/editor.js       |  40 ++-
 .../static/src/main/align/align_plugin.js     |   1 +
 .../static/src/main/banner_plugin.js          |   1 +
 .../main/chatgpt/chatgpt_translate_plugin.js  |   1 +
 .../static/src/main/column_plugin.js          |   1 +
 .../static/src/main/emoji_plugin.js           |   1 +
 .../static/src/main/feff_plugin.js            |   7 +
 .../static/src/main/font/color_plugin.js      |  11 +
 .../static/src/main/font/color_ui_plugin.js   |   1 +
 .../src/main/font/font_family_plugin.js       |   1 +
 .../static/src/main/font/font_plugin.js       |   8 +
 .../static/src/main/hint_plugin.js            |  16 ++
 .../static/src/main/inline_code.js            |   1 +
 .../static/src/main/link/link_paste_plugin.js |   5 +
 .../static/src/main/link/link_plugin.js       |  15 ++
 .../main/link/link_selection_odoo_plugin.js   |   1 +
 .../src/main/link/link_selection_plugin.js    |   6 +
 .../main/link/powerbox_url_paste_plugin.js    |   7 +
 .../static/src/main/list/list_plugin.js       |   1 +
 .../static/src/main/media/file_plugin.js      |   1 +
 .../src/main/media/icon_color_plugin.js       |   1 +
 .../static/src/main/media/icon_plugin.js      |   1 +
 .../src/main/media/image_crop_plugin.js       |   1 +
 .../static/src/main/media/image_plugin.js     |   6 +
 .../main/media/image_post_process_plugin.js   |  21 ++
 .../src/main/media/image_save_plugin.js       |   5 +
 .../static/src/main/media/media_plugin.js     |  15 ++
 .../static/src/main/media/video_plugin.js     |   1 +
 .../static/src/main/movenode_plugin.js        |   8 +
 .../static/src/main/placeholder_plugin.js     |   1 +
 .../static/src/main/position_plugin.js        |   4 +
 .../static/src/main/power_buttons_plugin.js   |  45 ++--
 .../src/main/powerbox/powerbox_plugin.js      |  76 +++---
 .../main/powerbox/search_powerbox_plugin.js   |   1 +
 .../static/src/main/separator_plugin.js       |   1 +
 .../static/src/main/star_plugin.js            |   1 +
 .../src/main/table/table_align_plugin.js      |   1 +
 .../static/src/main/table/table_plugin.js     |   5 +
 .../static/src/main/table/table_ui_plugin.js  |   1 +
 .../static/src/main/tabulation_plugin.js      |   6 +
 .../static/src/main/text_direction_plugin.js  |   1 +
 .../static/src/main/toolbar/toolbar_plugin.js |  98 ++++---
 .../static/src/main/youtube_plugin.js         |   1 +
 .../collaboration_odoo_plugin.js              |   1 +
 .../collaboration/collaboration_plugin.js     |   5 +
 .../collaboration_selection_avatar_plugin.js  |   1 +
 .../collaboration_selection_plugin.js         |   1 +
 .../src/others/dynamic_placeholder_plugin.js  |   1 +
 .../src/others/embedded_component_plugin.js   |  11 +
 .../plugins/caption_plugin/caption_plugin.js  |   1 +
 .../embedded_file_plugin.js                   |   1 +
 .../syntax_highlighting_plugin.js             |   1 +
 .../table_of_content_plugin.js                |   1 +
 .../toggle_block_plugin.js                    |   1 +
 .../video_plugin/embedded_video_plugin.js     |   1 +
 .../static/src/others/qweb_plugin.js          |   1 +
 addons/html_editor/static/src/plugin.js       |   4 +-
 addons/html_editor/static/src/plugin_sets.js  |  46 ----
 77 files changed, 778 insertions(+), 160 deletions(-)
 create mode 100644 addons/html_editor/static/src/@types/plugins.d.ts

diff --git a/addons/html_editor/static/src/@types/plugins.d.ts b/addons/html_editor/static/src/@types/plugins.d.ts
new file mode 100644
index 0000000000000..9b38612d75e79
--- /dev/null
+++ b/addons/html_editor/static/src/@types/plugins.d.ts
@@ -0,0 +1,253 @@
+declare module "plugins" {
+    import { clean_for_save_handlers, normalize_handlers, start_edition_handlers } from "@html_editor/editor";
+    import { Plugin } from "@html_editor/plugin";
+
+    import { BaseContainerShared, invalid_for_base_container_predicates } from "@html_editor/core/base_container_plugin";
+    import { added_image_handlers, after_paste_handlers, before_paste_handlers, clipboard_content_processors, clipboard_text_processors, ClipboardShared, paste_text_overrides } from "@html_editor/core/clipboard_plugin";
+    import { content_editable_providers, content_not_editable_providers, contenteditable_to_remove_selector, valid_contenteditable_predicates } from "@html_editor/core/content_editable_plugin";
+    import { before_delete_handlers, delete_backward_line_overrides, delete_backward_overrides, delete_backward_word_overrides, delete_forward_line_overrides, delete_forward_overrides, delete_forward_word_overrides, delete_handlers, delete_range_overrides, DeleteShared, functional_empty_node_predicates, is_empty_predicates, removable_descendants_providers, unremovable_node_predicates } from "@html_editor/core/delete_plugin";
+    import { DialogShared } from "@html_editor/core/dialog_plugin";
+    import { after_insert_handlers, before_insert_processors, before_set_tag_handlers, DomShared, node_to_insert_processors, system_attributes, system_classes, system_style_properties } from "@html_editor/core/dom_plugin";
+    import { format_class_predicates, format_selection_handlers, FormatShared, has_format_predicates, remove_all_formats_handlers } from "@html_editor/core/format_plugin";
+    import { attribute_change_handlers, attribute_change_processors, before_add_step_handlers, before_filter_mutation_record_handlers, content_updated_handlers, external_step_added_handlers, handleNewRecords, history_cleaned_handlers, history_reset_from_steps_handlers, history_reset_handlers, HistoryShared, post_redo_handlers, restore_savepoint_handlers, savable_mutation_record_predicates, serializable_descendants_processors, step_added_handlers } from "@html_editor/core/history_plugin";
+    import { beforeinput_handlers, input_handlers } from "@html_editor/core/input_plugin";
+    import { before_line_break_handlers, insert_line_break_element_overrides, LineBreakShared } from "@html_editor/core/line_break_plugin";
+    import { OverlayShared } from "@html_editor/core/overlay_plugin";
+    import { ProtectedNodeShared } from "@html_editor/core/protected_node_plugin";
+    import { SanitizeShared } from "@html_editor/core/sanitize_plugin";
+    import { double_click_overrides, fix_selection_on_editable_root_overrides, fully_selected_node_predicates, intangible_char_for_keyboard_navigation_predicates, is_node_editable_predicates, selection_leave_handlers, selectionchange_handlers, SelectionShared, targeted_nodes_processors, triple_click_overrides } from "@html_editor/core/selection_plugin";
+    import { shortcuts, shorthands } from "@html_editor/core/shortcut_plugin";
+    import { before_split_block_handlers, split_element_block_overrides, SplitShared, unsplittable_node_predicates } from "@html_editor/core/split_plugin";
+    import { StyleShared } from "@html_editor/core/style_plugin";
+    import { user_commands, UserCommandShared } from "@html_editor/core/user_command_plugin";
+
+    import { BannerShared } from "@html_editor/main/banner_plugin";
+    import { EmojiShared } from "@html_editor/main/emoji_plugin";
+    import { feff_providers, FeffShared, legit_feff_predicates, selectors_for_feff_providers } from "@html_editor/main/feff_plugin";
+    import { apply_background_color_processors, apply_color_style_overrides, color_apply_overrides, color_combination_getters, ColorShared, get_background_color_processors } from "@html_editor/main/font/color_plugin";
+    import { ColorUIShared } from "@html_editor/main/font/color_ui_plugin";
+    import { before_insert_within_pre_processors, font_items } from "@html_editor/main/font/font_plugin";
+    import { hint_targets_providers, hints } from "@html_editor/main/hint_plugin";
+    import { paste_url_overrides } from "@html_editor/main/link/link_paste_plugin";
+    import { immutable_link_selectors, is_link_editable_predicates, legit_empty_link_predicates, link_compatible_selection_predicates, link_popovers, LinkShared } from "@html_editor/main/link/link_plugin";
+    import { ineligible_link_for_selection_indication_predicates, ineligible_link_for_zwnbsp_predicates, LinkSelectionShared } from "@html_editor/main/link/link_selection_plugin";
+    import { paste_media_url_command_providers } from "@html_editor/main/link/powerbox_url_paste_plugin";
+    import { LocalOverlayShared } from "@html_editor/main/local_overlay_plugin";
+    import { ImageCropShared } from "@html_editor/main/media/image_crop_plugin";
+    import { delete_image_overrides, image_name_predicates, ImageShared } from "@html_editor/main/media/image_plugin";
+    import { ImagePostProcessShared, process_image_post_handlers, process_image_warmup_handlers } from "@html_editor/main/media/image_post_process_plugin";
+    import { closest_savable_providers, ImageSaveShared } from "@html_editor/main/media/image_save_plugin";
+    import { after_save_media_dialog_handlers, media_dialog_extra_tabs, MediaShared, on_added_media_handlers, on_media_dialog_saved_handlers, on_replaced_media_handlers } from "@html_editor/main/media/media_plugin";
+    import { move_node_blacklist_selectors, move_node_whitelist_selectors } from "@html_editor/main/movenode_plugin";
+    import { layout_geometry_change_handlers } from "@html_editor/main/position_plugin";
+    import { power_buttons, power_buttons_visibility_predicates } from "@html_editor/main/power_buttons_plugin";
+    import { powerbox_categories, powerbox_items, PowerboxShared } from "@html_editor/main/powerbox/powerbox_plugin";
+    import { deselect_custom_selected_nodes_handlers, TableShared } from "@html_editor/main/table/table_plugin";
+    import { shift_tab_overrides, tab_overrides, TabulationShared } from "@html_editor/main/tabulation_plugin";
+    import { can_display_toolbar, collapsed_selection_toolbar_predicate, toolbar_groups, toolbar_items, toolbar_namespaces, ToolbarShared } from "@html_editor/main/toolbar/toolbar_plugin";
+
+    import { CollaborationOdooShared } from "@html_editor/others/collaboration/collaboration_odoo_plugin";
+    import { CollaborationShared, external_history_step_handlers } from "@html_editor/others/collaboration/collaboration_plugin";
+    import { DynamicPlaceholderShared } from "@html_editor/others/dynamic_placeholder_plugin";
+    import { EmbeddedComponentShared, mount_component_handlers, post_mount_component_handlers } from "@html_editor/others/embedded_component_plugin";
+
+    /* Misc */
+    export interface CSSSelector extends String {}
+    export interface LazyTranslatedString extends String {}
+
+    /** Plugin */
+    export type PluginConstructor = (typeof Plugin) & {
+        static id: string;
+        static dependencies: keyof SharedMethods;
+    };
+
+    export interface SharedMethods {}
+    interface SharedMethods {
+        // Core
+        baseContainer: BaseContainerShared;
+        clipboard: ClipboardShared;
+        delete: DeleteShared;
+        dialog: DialogShared;
+        dom: DomShared;
+        format: FormatShared;
+        history: HistoryShared;
+        lineBreak: LineBreakShared;
+        overlay: OverlayShared;
+        protectedNode: ProtectedNodeShared;
+        sanitize: SanitizeShared;
+        selection: SelectionShared;
+        split: SplitShared;
+        style: StyleShared;
+        userCommand: UserCommandShared;
+
+        // Main
+        color: ColorShared;
+        colorUi: ColorUIShared;
+        link: LinkShared;
+        linkSelection: LinkSelectionShared;
+        media: MediaShared;
+        powerbox: PowerboxShared;
+        table: TableShared;
+        toolbar: ToolbarShared;
+        emoji: EmojiShared;
+        localOverlay: LocalOverlayShared;
+        tabulation: TabulationShared;
+        feff: FeffShared;
+        image: ImageShared;
+        imageCrop: ImageCropShared;
+        imagePostProcess: ImagePostProcessShared;
+        banner: BannerShared;
+        imageSave: ImageSaveShared;
+
+        // Others
+        collaborationOdoo: CollaborationOdooShared;
+        collaboration: CollaborationShared;
+        dynamicPlaceholder: DynamicPlaceholderShared;
+        embeddedComponents: EmbeddedComponentShared;
+    }
+
+    export interface GlobalResources {}
+    export type Resources = { [key: string]: any };
+    export type ResourcesTypesFactory<T> = {
+        [R in keyof T]: Array<T[R][0]>;
+    };
+
+    interface GlobalResources extends EditorResources {}
+    export type EditorResources = ResourcesTypesFactory<EditorResourcesList>;
+
+    export interface EditorResourcesList {
+        // Handlers
+        added_image_handlers: added_image_handlers;
+        after_insert_handlers: after_insert_handlers;
+        after_paste_handlers: after_paste_handlers;
+        after_save_media_dialog_handlers: after_save_media_dialog_handlers;
+        attribute_change_handlers: attribute_change_handlers;
+        before_add_step_handlers: before_add_step_handlers;
+        before_delete_handlers: before_delete_handlers;
+        before_filter_mutation_record_handlers: before_filter_mutation_record_handlers;
+        beforeinput_handlers: beforeinput_handlers;
+        before_line_break_handlers: before_line_break_handlers;
+        before_paste_handlers: before_paste_handlers;
+        before_split_block_handlers: before_split_block_handlers;
+        before_set_tag_handlers: before_set_tag_handlers;
+        clean_for_save_handlers: clean_for_save_handlers;
+        content_updated_handlers: content_updated_handlers;
+        delete_handlers: delete_handlers;
+        deselect_custom_selected_nodes_handlers: deselect_custom_selected_nodes_handlers;
+        external_history_step_handlers: external_history_step_handlers;
+        external_step_added_handlers: external_step_added_handlers;
+        format_selection_handlers: format_selection_handlers;
+        handleNewRecords: handleNewRecords;
+        history_cleaned_handlers: history_cleaned_handlers;
+        history_reset_handlers: history_reset_handlers;
+        history_reset_from_steps_handlers: history_reset_from_steps_handlers;
+        input_handlers: input_handlers;
+        layout_geometry_change_handlers: layout_geometry_change_handlers;
+        mount_component_handlers: mount_component_handlers;
+        normalize_handlers: normalize_handlers;
+        on_added_media_handlers: on_added_media_handlers;
+        on_media_dialog_saved_handlers: on_media_dialog_saved_handlers;
+        on_replaced_media_handlers: on_replaced_media_handlers;
+        post_mount_component_handlers: post_mount_component_handlers;
+        post_redo_handlers: post_redo_handlers;
+        post_undo_handlers: post_undo_handlers;
+        process_image_warmup_handlers: process_image_warmup_handlers;
+        process_image_post_handlers: process_image_post_handlers;
+        remove_all_formats_handlers: remove_all_formats_handlers;
+        restore_savepoint_handlers: restore_savepoint_handlers;
+        selectionchange_handlers: selectionchange_handlers;
+        selection_leave_handlers: selection_leave_handlers;
+        start_edition_handlers: start_edition_handlers;
+        step_added_handlers: step_added_handlers;
+
+        // Overrides
+        apply_color_style_overrides: apply_color_style_overrides;
+        color_apply_overrides: color_apply_overrides;
+        delete_backward_overrides: delete_backward_overrides;
+        delete_backward_word_overrides: delete_backward_word_overrides;
+        delete_backward_line_overrides: delete_backward_line_overrides;
+        delete_forward_overrides: delete_forward_overrides;
+        delete_forward_word_overrides: delete_forward_word_overrides;
+        delete_forward_line_overrides: delete_forward_line_overrides;
+        delete_image_overrides: delete_image_overrides;
+        delete_range_overrides: delete_range_overrides;
+        double_click_overrides: double_click_overrides;
+        triple_click_overrides: triple_click_overrides;
+        fix_selection_on_editable_root_overrides: fix_selection_on_editable_root_overrides;
+        insert_line_break_element_overrides: insert_line_break_element_overrides;
+        paste_text_overrides: paste_text_overrides;
+        paste_url_overrides: paste_url_overrides;
+        shift_tab_overrides: shift_tab_overrides;
+        split_element_block_overrides: split_element_block_overrides;
+        tab_overrides: tab_overrides;
+
+        // Predicates
+        can_display_toolbar: can_display_toolbar;
+        collapsed_selection_toolbar_predicate: collapsed_selection_toolbar_predicate;
+        format_class_predicates: format_class_predicates;
+        fully_selected_node_predicates: fully_selected_node_predicates;
+        functional_empty_node_predicates: functional_empty_node_predicates;
+        has_format_predicates: has_format_predicates;
+        image_name_predicates: image_name_predicates;
+        ineligible_link_for_selection_indication_predicates: ineligible_link_for_selection_indication_predicates;
+        ineligible_link_for_zwnbsp_predicates: ineligible_link_for_zwnbsp_predicates;
+        intangible_char_for_keyboard_navigation_predicates: intangible_char_for_keyboard_navigation_predicates;
+        invalid_for_base_container_predicates: invalid_for_base_container_predicates;
+        is_empty_predicates: is_empty_predicates;
+        is_link_editable_predicates: is_link_editable_predicates;
+        is_node_editable_predicates: is_node_editable_predicates;
+        legit_empty_link_predicates: legit_empty_link_predicates;
+        legit_feff_predicates: legit_feff_predicates;
+        link_compatible_selection_predicates: link_compatible_selection_predicates;
+        power_buttons_visibility_predicates: power_buttons_visibility_predicates;
+        savable_mutation_record_predicates: savable_mutation_record_predicates;
+        unremovable_node_predicates: unremovable_node_predicates;
+        unsplittable_node_predicates: unsplittable_node_predicates;
+        valid_contenteditable_predicates: valid_contenteditable_predicates;
+
+        // Processors
+        apply_background_color_processors: apply_background_color_processors;
+        attribute_change_processors: attribute_change_processors;
+        before_insert_processors: before_insert_processors;
+        before_insert_within_pre_processors: before_insert_within_pre_processors;
+        clipboard_content_processors: clipboard_content_processors;
+        clipboard_text_processors: clipboard_text_processors;
+        get_background_color_processors: get_background_color_processors;
+        node_to_insert_processors: node_to_insert_processors;
+        serializable_descendants_processors: serializable_descendants_processors;
+        targeted_nodes_processors: targeted_nodes_processors;
+
+        // Providers
+        closest_savable_providers: closest_savable_providers;
+        color_combination_getters: color_combination_getters;
+        content_editable_providers: content_editable_providers;
+        content_not_editable_providers: content_not_editable_providers;
+        feff_providers: feff_providers;
+        hint_targets_providers: hint_targets_providers;
+        paste_media_url_command_providers: paste_media_url_command_providers;
+        removable_descendants_providers: removable_descendants_providers;
+        selectors_for_feff_providers: selectors_for_feff_providers;
+
+        // Data
+        contenteditable_to_remove_selector: contenteditable_to_remove_selector;
+        font_items: font_items,
+        hints: hints;
+        immutable_link_selectors: immutable_link_selectors;
+        link_popovers: link_popovers;
+        media_dialog_extra_tabs: media_dialog_extra_tabs;
+        move_node_blacklist_selectors: move_node_blacklist_selectors;
+        move_node_whitelist_selectors: move_node_whitelist_selectors;
+        power_buttons: power_buttons;
+        powerbox_categories: powerbox_categories;
+        powerbox_items: powerbox_items;
+        shortcuts: shortcuts;
+        shorthands: shorthands;
+        system_attributes: system_attributes;
+        system_classes: system_classes;
+        system_style_properties: system_style_properties;
+        toolbar_groups: toolbar_groups;
+        toolbar_items: toolbar_items;
+        toolbar_namespaces: toolbar_namespaces;
+        user_commands: user_commands;
+    }
+}
diff --git a/addons/html_editor/static/src/core/base_container_plugin.js b/addons/html_editor/static/src/core/base_container_plugin.js
index 3e322d58ba804..ca10a481b5f96 100644
--- a/addons/html_editor/static/src/core/base_container_plugin.js
+++ b/addons/html_editor/static/src/core/base_container_plugin.js
@@ -27,6 +27,10 @@ import { childNodeIndex } from "@html_editor/utils/position";
  * @property { BaseContainerPlugin['isCandidateForBaseContainer'] } isCandidateForBaseContainer
  */
 
+/**
+ * @typedef {((node: Node) => boolean)[]} invalid_for_base_container_predicates
+ */
+
 export class BaseContainerPlugin extends Plugin {
     static id = "baseContainer";
     static shared = ["createBaseContainer", "getDefaultNodeName", "isCandidateForBaseContainer"];
@@ -47,6 +51,7 @@ export class BaseContainerPlugin extends Plugin {
      */
     isUnsplittablePredicate = (element) =>
         this.getResource("unsplittable_node_predicates").some((fn) => fn(element));
+    /** @type {import("plugins").EditorResources} */
     resources = {
         clean_for_save_handlers: this.cleanForSave.bind(this),
         // `baseContainer` normalization should occur after every other normalization
diff --git a/addons/html_editor/static/src/core/clipboard_plugin.js b/addons/html_editor/static/src/core/clipboard_plugin.js
index 42d9b60642834..d667967a76011 100644
--- a/addons/html_editor/static/src/core/clipboard_plugin.js
+++ b/addons/html_editor/static/src/core/clipboard_plugin.js
@@ -97,6 +97,20 @@ const ONLY_LINK_REGEX = /^(https?:\/\/)?([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/i;
  * @property {ClipboardPlugin['pasteText']} pasteText
  */
 
+/**
+ * @typedef {((img: HTMLImageElement) => void)[]} added_image_handlers
+ * @typedef {(() => void)[]} after_paste_handlers
+ * @typedef {(() => void)[]} before_paste_handlers
+ *
+ * @typedef {((selection: EditorSelection, text: string) => boolean)[]} paste_text_overrides
+ *
+ * @typedef {((
+ *     clonedContents: DocumentFragment,
+ *     selection: EditorSelection
+ *   ) => void | clonedContents)[]} clipboard_content_processors
+ * @typedef {((textContent: string) => string)[]} clipboard_text_processors
+ */
+
 export class ClipboardPlugin extends Plugin {
     static id = "clipboard";
     static dependencies = [
diff --git a/addons/html_editor/static/src/core/comment_plugin.js b/addons/html_editor/static/src/core/comment_plugin.js
index e0360c80c2085..604ccf553a751 100644
--- a/addons/html_editor/static/src/core/comment_plugin.js
+++ b/addons/html_editor/static/src/core/comment_plugin.js
@@ -4,6 +4,7 @@ import { descendants } from "../utils/dom_traversal";
 
 export class CommentPlugin extends Plugin {
     static id = "comment";
+    /** @type {import("plugins").EditorResources} */
     resources = {
         normalize_handlers: this.removeComment.bind(this),
     };
diff --git a/addons/html_editor/static/src/core/content_editable_plugin.js b/addons/html_editor/static/src/core/content_editable_plugin.js
index c58fe5e5e7844..1f73ebf94b129 100644
--- a/addons/html_editor/static/src/core/content_editable_plugin.js
+++ b/addons/html_editor/static/src/core/content_editable_plugin.js
@@ -3,6 +3,18 @@ import { isMediaElement } from "@html_editor/utils/dom_info";
 import { selectElements } from "@html_editor/utils/dom_traversal";
 import { withSequence } from "@html_editor/utils/resource";
 
+/** @typedef {import("@html_editor/editor").EditorContext} EditorContext */
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+
+/**
+ * @typedef {((el: HTMLElement) => boolean)[]} valid_contenteditable_predicates
+ *
+ * @typedef {((root: EditorContext["editable"]) => HTMLElement[])[]} content_editable_providers
+ * @typedef {((root: EditorContext["editable"]) => HTMLElement[])[]} content_not_editable_providers
+ *
+ * @typedef {CSSSelector[]} contenteditable_to_remove_selector
+ */
+
 /**
  * This plugin is responsible for setting the contenteditable attribute on some
  * elements.
@@ -13,6 +25,7 @@ import { withSequence } from "@html_editor/utils/resource";
 
 export class ContentEditablePlugin extends Plugin {
     static id = "contentEditablePlugin";
+    /** @type {import("plugins").EditorResources} */
     resources = {
         normalize_handlers: withSequence(5, this.normalize.bind(this)),
         clean_for_save_handlers: withSequence(Infinity, this.cleanForSave.bind(this)),
diff --git a/addons/html_editor/static/src/core/delete_plugin.js b/addons/html_editor/static/src/core/delete_plugin.js
index be6ca4c223b7c..ac313c47d792c 100644
--- a/addons/html_editor/static/src/core/delete_plugin.js
+++ b/addons/html_editor/static/src/core/delete_plugin.js
@@ -63,6 +63,30 @@ import { normalizeDeepCursorPosition, normalizeFakeBR } from "@html_editor/utils
  * @property { DeletePlugin['deleteForward'] } deleteForward
  */
 
+/**
+ * @typedef {(() => void)[]} before_delete_handlers
+ * @typedef {(() => void)[]} delete_handlers
+ *
+ * @typedef {((range: RangeLike) => void | true)[]} delete_backward_overrides
+ * @typedef {((range: RangeLike) => void | true)[]} delete_backward_word_overrides
+ * @typedef {((range: RangeLike) => void | true)[]} delete_backward_line_overrides
+ * @typedef {((range: RangeLike) => void | true)[]} delete_forward_overrides
+ * @typedef {((range: RangeLike) => void | true)[]} delete_forward_word_overrides
+ * @typedef {((range: RangeLike) => void | true)[]} delete_forward_line_overrides
+ * @typedef {((range: RangeLike) => void | true)[]} delete_range_overrides
+ *
+ * @typedef {((node: Node) => boolean)[]} functional_empty_node_predicates
+ * @typedef {((node: Node) => boolean)[]} is_empty_predicates
+ *
+ * @typedef {((node: Node) => Node[])[]} removable_descendants_providers
+ */
+/**
+ * The `root` argument is used by some predicates in which a node is
+ * conditionally unremovable (e.g. a table cell is only removable if its
+ * ancestor table is also being removed).
+ * @typedef {((node: Node, root: HTMLElement) => boolean)[]} unremovable_node_predicates
+ */
+
 // @todo @phoenix: move these predicates to different plugins
 export const unremovableNodePredicates = [
     (node) => node.classList?.contains("oe_unremovable"),
@@ -74,6 +98,7 @@ export class DeletePlugin extends Plugin {
     static dependencies = ["baseContainer", "selection", "history", "input", "userCommand"];
     static id = "delete";
     static shared = ["deleteBackward", "deleteForward", "deleteRange", "deleteSelection", "delete"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             { id: "deleteBackward", run: () => this.delete("backward", "character") },
@@ -345,7 +370,7 @@ export class DeletePlugin extends Plugin {
         <b>[abc]</b> -> <b>[]ZWS</b>
         <b>[abc</b> <b>d]ef</b> -> <b>[]ZWS</b> <b>ef</b>
         <b>[abc</b> <b>def]</b> -> <b>[]ZWS</b> <b>ZWS</b>
-        
+
     Block:
         Shrunk blocks get filled.
         <p>[abc]</p> -> <p>[]<br></p>
diff --git a/addons/html_editor/static/src/core/dom_plugin.js b/addons/html_editor/static/src/core/dom_plugin.js
index 6406b0a996c1b..fd70c6bc44800 100644
--- a/addons/html_editor/static/src/core/dom_plugin.js
+++ b/addons/html_editor/static/src/core/dom_plugin.js
@@ -70,6 +70,18 @@ function getConnectedParents(nodes) {
  * @property { DomPlugin['removeSystemProperties'] } removeSystemProperties
  */
 
+/**
+ * @typedef {((insertedNodes: Node[]) => void)[]} after_insert_handlers
+ * @typedef {((el: HTMLElement) => void)[]} before_set_tag_handlers
+ *
+ * @typedef {((insertedNode: Node) => insertedNode)[]} before_insert_processors
+ * @typedef {((arg: { nodeToInsert: Node, container: HTMLElement }) => nodeToInsert)[]} node_to_insert_processors
+ *
+ * @typedef {string[]} system_attributes
+ * @typedef {string[]} system_classes
+ * @typedef {string[]} system_style_properties
+ */
+
 export class DomPlugin extends Plugin {
     static id = "dom";
     static dependencies = ["baseContainer", "selection", "history", "split", "delete", "lineBreak"];
@@ -81,6 +93,7 @@ export class DomPlugin extends Plugin {
         "setTagName",
         "removeSystemProperties",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/core/editor_version_plugin.js b/addons/html_editor/static/src/core/editor_version_plugin.js
index 19ffbe3c1fb4d..e8b1a6dc8648b 100644
--- a/addons/html_editor/static/src/core/editor_version_plugin.js
+++ b/addons/html_editor/static/src/core/editor_version_plugin.js
@@ -7,6 +7,7 @@ import { Plugin } from "@html_editor/plugin";
 
 export class EditorVersionPlugin extends Plugin {
     static id = "editorVersion";
+    /** @type {import("plugins").EditorResources} */
     resources = {
         clean_for_save_handlers: this.cleanForSave.bind(this),
         normalize_handlers: this.normalize.bind(this),
diff --git a/addons/html_editor/static/src/core/format_plugin.js b/addons/html_editor/static/src/core/format_plugin.js
index 5af5de239437b..a47d20cb84338 100644
--- a/addons/html_editor/static/src/core/format_plugin.js
+++ b/addons/html_editor/static/src/core/format_plugin.js
@@ -44,6 +44,17 @@ function isFormatted(formatPlugin, format) {
  * @property { FormatPlugin['formatSelection'] } formatSelection
  */
 
+/**
+ * @typedef {((formatName: string, options: {
+ *      formatProps: object,
+ *      applyStyle: boolean,
+ * }) => void | boolean)[]} format_selection_handlers
+ * @typedef {(() => void)[]} remove_all_formats_handlers
+ *
+ * @typedef {((className: string) => boolean)[]} format_class_predicates
+ * @typedef {((node: Node) => boolean)[]} has_format_predicates
+ */
+
 export class FormatPlugin extends Plugin {
     static id = "format";
     static dependencies = ["selection", "history", "input", "split"];
@@ -54,6 +65,7 @@ export class FormatPlugin extends Plugin {
         "mergeAdjacentInlines",
         "formatSelection",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/core/history_plugin.js b/addons/html_editor/static/src/core/history_plugin.js
index 613e9fadf3f8f..ce2453d7334d1 100644
--- a/addons/html_editor/static/src/core/history_plugin.js
+++ b/addons/html_editor/static/src/core/history_plugin.js
@@ -137,6 +137,36 @@ import { trackOccurrences, trackOccurrencesPair } from "../utils/tracking";
  * @property { HistoryPlugin['getIsCurrentStepModified'] } getIsCurrentStepModified
  */
 
+/**
+ * @typedef {((record: HistoryMutationRecord) => void)[]} attribute_change_handlers
+ * @typedef {(() => void)[]} before_add_step_handlers
+ * @typedef {((records: HistoryMutationRecord[]) => void)[]} before_filter_mutation_record_handlers
+ * @typedef {((root: HTMLElement) => void)[]} content_updated_handlers
+ * @typedef {(() => void)[]} external_step_added_handlers
+ * @typedef {((records: HistoryMutationRecord[], currentOperation: "original"|"undo"|"redo"|"restore") => void)[]} handleNewRecords
+ * @typedef {(() => void)[]} history_cleaned_handlers
+ * @typedef {(() => void)[]} history_reset_handlers
+ * @typedef {(() => void)[]} history_reset_from_steps_handlers
+ * @typedef {((revertedStep: HistoryStep) => void)[]} post_redo_handlers
+ * @typedef {((revertedStep: HistoryStep) => void)[]} post_undo_handlers
+ * @typedef {(() => void)[]} restore_savepoint_handlers
+ * @typedef {((arg: { stepCommonAncestor: HTMLElement }) => void)[]} step_added_handlers
+ *
+ * @typedef {((record: HistoryMutationRecord) => boolean)[]} savable_mutation_record_predicates
+ *
+ * @typedef {((
+ *    arg: {
+ *      target: Node,
+ *      attributeName: string,
+ *      oldValue: string,
+ *      value: string,
+ *      reverse: boolean,
+ *    },
+ *    options: { forNewStep: boolean }
+ *  ) => void)[]} attribute_change_processors
+ * @typedef {((node: Node, childTreesToSerialize: Tree[]) => Tree[])[]} serializable_descendants_processors
+ */
+
 export class HistoryPlugin extends Plugin {
     static id = "history";
     static dependencies = ["selection", "sanitize"];
@@ -165,6 +195,7 @@ export class HistoryPlugin extends Plugin {
         "setStepExtra",
         "getIsCurrentStepModified",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
@@ -209,13 +240,6 @@ export class HistoryPlugin extends Plugin {
             this.reset(this.config.content);
         },
         on_prepare_drag_handlers: this.disableIsCurrentStepModifiedWarning.bind(this),
-        // Resource definitions:
-        normalize_handlers: [
-            // (commonRootOfModifiedEl or editableEl) => {
-            //    clean up DOM before taking into account for next history step
-            //    remaining in edit mode
-            // }
-        ],
     };
 
     setup() {
diff --git a/addons/html_editor/static/src/core/input_plugin.js b/addons/html_editor/static/src/core/input_plugin.js
index a38244f526db0..e2480aabec1a8 100644
--- a/addons/html_editor/static/src/core/input_plugin.js
+++ b/addons/html_editor/static/src/core/input_plugin.js
@@ -1,5 +1,10 @@
 import { Plugin } from "../plugin";
 
+/**
+ * @typedef {((ev: InputEvent) => void)[]} beforeinput_handlers
+ * @typedef {((ev: InputEvent) => void)[]} input_handlers
+ */
+
 export class InputPlugin extends Plugin {
     static id = "input";
     static dependencies = ["history"];
diff --git a/addons/html_editor/static/src/core/line_break_plugin.js b/addons/html_editor/static/src/core/line_break_plugin.js
index 5afebcdd90529..b616733b09720 100644
--- a/addons/html_editor/static/src/core/line_break_plugin.js
+++ b/addons/html_editor/static/src/core/line_break_plugin.js
@@ -14,10 +14,16 @@ import { nextLeaf } from "../utils/dom_info";
  * @property { LineBreakPlugin['insertLineBreakNode'] } insertLineBreakNode
  */
 
+/**
+ * @typedef {(() => void)[]} before_line_break_handlers
+ * @typedef {((params: { targetNode: Element, targetOffset: number }) => void | true)[]} insert_line_break_element_overrides
+ */
+
 export class LineBreakPlugin extends Plugin {
     static dependencies = ["selection", "history", "input", "delete"];
     static id = "lineBreak";
     static shared = ["insertLineBreak", "insertLineBreakNode", "insertLineBreakElement"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         beforeinput_handlers: this.onBeforeInput.bind(this),
         legit_feff_predicates: [
diff --git a/addons/html_editor/static/src/core/no_inline_root_plugin.js b/addons/html_editor/static/src/core/no_inline_root_plugin.js
index 0404bce1de1d6..1c5b73ccbc664 100644
--- a/addons/html_editor/static/src/core/no_inline_root_plugin.js
+++ b/addons/html_editor/static/src/core/no_inline_root_plugin.js
@@ -8,6 +8,7 @@ export class NoInlineRootPlugin extends Plugin {
     static id = "noInlineRoot";
     static dependencies = ["baseContainer", "selection", "history"];
 
+    /** @type {import("plugins").EditorResources} */
     resources = {
         fix_selection_on_editable_root_overrides: this.fixSelectionOnEditableRoot.bind(this),
     };
diff --git a/addons/html_editor/static/src/core/protected_node_plugin.js b/addons/html_editor/static/src/core/protected_node_plugin.js
index 899a31e1ee9a4..d0a549380bdee 100644
--- a/addons/html_editor/static/src/core/protected_node_plugin.js
+++ b/addons/html_editor/static/src/core/protected_node_plugin.js
@@ -16,6 +16,7 @@ const UNPROTECTED_SELECTOR = `[data-oe-protected="false"]`;
 export class ProtectedNodePlugin extends Plugin {
     static id = "protectedNode";
     static shared = ["setProtectingNode"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         clean_for_save_handlers: ({ root }) => this.cleanForSave(root),
diff --git a/addons/html_editor/static/src/core/sanitize_plugin.js b/addons/html_editor/static/src/core/sanitize_plugin.js
index ef43191a8b3ca..865aff0d64472 100644
--- a/addons/html_editor/static/src/core/sanitize_plugin.js
+++ b/addons/html_editor/static/src/core/sanitize_plugin.js
@@ -9,6 +9,7 @@ import { Plugin } from "../plugin";
 export class SanitizePlugin extends Plugin {
     static id = "sanitize";
     static shared = ["sanitize"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         clean_for_save_handlers: this.cleanForSave.bind(this),
         normalize_handlers: this.normalize.bind(this),
diff --git a/addons/html_editor/static/src/core/selection_plugin.js b/addons/html_editor/static/src/core/selection_plugin.js
index f2fea38e606c6..66061d53024fb 100644
--- a/addons/html_editor/static/src/core/selection_plugin.js
+++ b/addons/html_editor/static/src/core/selection_plugin.js
@@ -176,6 +176,21 @@ function scrollToSelection(selection) {
  * @property { SelectionPlugin['selectAroundNonEditable'] } selectAroundNonEditable
  */
 
+/**
+ * @typedef {((selectionData: SelectionData) => void)[]} selectionchange_handlers
+ * @typedef {(() => void)[]} selection_leave_handlers
+ *
+ * @typedef {((ev: PointerEvent) => void | true)[]} double_click_overrides
+ * @typedef {((ev: PointerEvent) => void | true)[]} triple_click_overrides
+ * @typedef {((selection: EditorSelection) => boolean)[]} fix_selection_on_editable_root_overrides
+ *
+ * @typedef {((node: Node, selection: EditorSelection, range: Range) => boolean)[]} fully_selected_node_predicates
+ * @typedef {((ev: Event, char: string, lastSkipped: string) => boolean)[]} intangible_char_for_keyboard_navigation_predicates
+ * @typedef {((node: Node) => boolean)[]} is_node_editable_predicates
+ *
+ * @typedef {((targetedNodes: Node[]) => Node[])[]} targeted_nodes_processors
+ */
+
 export class SelectionPlugin extends Plugin {
     static id = "selection";
     static shared = [
@@ -198,6 +213,7 @@ export class SelectionPlugin extends Plugin {
         "isNodeEditable",
         "selectAroundNonEditable",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: { id: "selectAll", run: this.selectAll.bind(this) },
         shortcuts: [{ hotkey: "control+a", commandId: "selectAll" }],
diff --git a/addons/html_editor/static/src/core/shortcut_plugin.js b/addons/html_editor/static/src/core/shortcut_plugin.js
index 42993f3305b8c..7252e81b29a18 100644
--- a/addons/html_editor/static/src/core/shortcut_plugin.js
+++ b/addons/html_editor/static/src/core/shortcut_plugin.js
@@ -8,23 +8,37 @@ import { leftLeafOnlyNotBlockPath } from "@html_editor/utils/dom_state";
  * @property {string} hotkey
  * @property {string} commandId
  * @property {Object} [commandParams]
+ * @property {boolean} [global]
+ *
+ * @typedef {Shortcut[]} shortcuts
  *
  * Example:
  *
  *     resources = {
+ *         // See UserCommand
  *         user_commands: [
  *             { id: "myCommands", run: myCommandFunction },
  *         ],
+ *         // See Shortcut
  *         shortcuts: [
  *             { hotkey: "control+shift+q", commandId: "myCommands" },
  *         ],
  *     }
  */
 
+/**
+ * @typedef {{
+ *     pattern: RegExp;
+ *     commandId: string;
+ *     commandParams?: object;
+ * }[]} shorthands
+ */
+
 export class ShortCutPlugin extends Plugin {
     static id = "shortcut";
     static dependencies = ["userCommand", "selection"];
 
+    /** @type {import("plugins").EditorResources} */
     resources = {
         input_handlers: this.onInput.bind(this),
     };
diff --git a/addons/html_editor/static/src/core/split_plugin.js b/addons/html_editor/static/src/core/split_plugin.js
index 62619d15f8cb8..58f967254db5a 100644
--- a/addons/html_editor/static/src/core/split_plugin.js
+++ b/addons/html_editor/static/src/core/split_plugin.js
@@ -23,6 +23,14 @@ import { isProtected, isProtecting } from "@html_editor/utils/dom_info";
  * @property { SplitPlugin['splitSelection'] } splitSelection
  */
 
+/**
+ * @typedef {(() => void)[]} before_split_block_handlers
+ *
+ * @typedef {((params: { targetNode: Node, targetOffset: number, blockToSplit: HTMLElement | null }) => void | true)[]} split_element_block_overrides
+ *
+ * @typedef {((node: Node) => boolean)[]} unsplittable_node_predicates
+ */
+
 export class SplitPlugin extends Plugin {
     static dependencies = ["baseContainer", "selection", "history", "input", "delete", "lineBreak"];
     static id = "split";
@@ -35,6 +43,7 @@ export class SplitPlugin extends Plugin {
         "splitSelection",
         "isUnsplittable",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         beforeinput_handlers: this.onBeforeInput.bind(this),
 
diff --git a/addons/html_editor/static/src/core/user_command_plugin.js b/addons/html_editor/static/src/core/user_command_plugin.js
index 295b4acaee623..099483f16c773 100644
--- a/addons/html_editor/static/src/core/user_command_plugin.js
+++ b/addons/html_editor/static/src/core/user_command_plugin.js
@@ -19,6 +19,10 @@ import { Plugin } from "../plugin";
  * @property { UserCommandPlugin['getCommand'] } getCommand
  */
 
+/**
+ * @typedef {UserCommand[]} user_commands
+ */
+
 export class UserCommandPlugin extends Plugin {
     static id = "userCommand";
     static shared = ["getCommand"];
diff --git a/addons/html_editor/static/src/editor.js b/addons/html_editor/static/src/editor.js
index 6e085a5f27c8b..98f7bf18ae831 100644
--- a/addons/html_editor/static/src/editor.js
+++ b/addons/html_editor/static/src/editor.js
@@ -6,9 +6,12 @@ import { resourceSequenceSymbol, withSequence } from "./utils/resource";
 import { fixInvalidHTML, initElementForEdition } from "./utils/sanitize";
 import { setElementContent } from "@web/core/utils/html";
 
+/** @typedef {import("plugins").EditorResources} EditorResources */
+/** @typedef {import("plugins").GlobalResources} GlobalResources */
+/** @typedef {keyof GlobalResources} GlobalResourcesId */
 /**
- * @typedef { import("./plugin_sets").SharedMethods } SharedMethods
- * @typedef {typeof import("./plugin").Plugin} PluginConstructor
+ * @typedef {import("plugins").SharedMethods} SharedMethods
+ * @typedef {import("plugins").PluginConstructor} PluginConstructor
  **/
 
 /**
@@ -42,12 +45,27 @@ import { setElementContent } from "@web/core/utils/html";
  * @property { HTMLElement } editable
  * @property { SharedMethods } dependencies
  * @property { import("./editor").EditorConfig } config
- * @property { * } services
+ * @property { import("services").ServiceFactories } services
  * @property { Editor['getResource'] } getResource
  * @property { Editor['dispatchTo'] } dispatchTo
  * @property { Editor['delegateTo'] } delegateTo
  */
 
+/**
+ * @typedef {((arg: {root: EditorContext["editable"]}) => void)[]} clean_for_save_handlers
+ * @typedef {(() => void)[]} start_edition_handlers
+ */
+
+/**
+ * Clean up DOM before taking into account for next history step remaining in
+ * edit mode
+ * @typedef {((root: EditorContext["editable"] | HTMLElement) => void)[]} normalize_handlers
+ */
+
+/**
+ * @param {PluginConstructor[]} plugins
+ * @returns {PluginConstructor[]}
+ */
 function sortPlugins(plugins) {
     const initialPlugins = new Set(plugins);
     const inResult = new Set();
@@ -90,6 +108,7 @@ export class Editor {
         this.isDestroyed = false;
         this.config = config;
         this.services = services;
+        /** @type { EditorResources } */
         this.resources = null;
         this.plugins = [];
         /** @type { HTMLElement } **/
@@ -248,8 +267,9 @@ export class Editor {
     }
 
     /**
-     * @param {string} resourceId
-     * @returns {Array}
+     * @template {GlobalResourcesId} R
+     * @param {R} resourceId
+     * @returns {GlobalResources[R]}
      */
     getResource(resourceId) {
         return this.resources[resourceId] || [];
@@ -270,8 +290,9 @@ export class Editor {
      * this.dispatchTo("my_event_handlers", arg1, arg2);
      * ```
      *
-     * @param {string} resourceId
-     * @param  {...any} args The arguments to pass to the handlers.
+     * @template {GlobalResourcesId} R
+     * @param {R} resourceId
+     * @param {Parameters<GlobalResources[R][0]>} args The arguments to pass to the handlers.
      */
     dispatchTo(resourceId, ...args) {
         this.getResource(resourceId).forEach((handler) => handler(...args));
@@ -295,8 +316,9 @@ export class Editor {
      * }
      * ```
      *
-     * @param {string} resourceId
-     * @param  {...any} args The arguments to pass to the overrides.
+     * @template {GlobalResourcesId} R
+     * @param {R} resourceId
+     * @param {Parameters<GlobalResources[R][0]>} args The arguments to pass to the overrides.
      * @returns {boolean} Whether one of the overrides returned a truthy value.
      */
     delegateTo(resourceId, ...args) {
diff --git a/addons/html_editor/static/src/main/align/align_plugin.js b/addons/html_editor/static/src/main/align/align_plugin.js
index fe18a2c21432d..cfc37e921b7ff 100644
--- a/addons/html_editor/static/src/main/align/align_plugin.js
+++ b/addons/html_editor/static/src/main/align/align_plugin.js
@@ -17,6 +17,7 @@ const alignmentItems = [
 export class AlignPlugin extends Plugin {
     static id = "align";
     static dependencies = ["history", "selection"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/banner_plugin.js b/addons/html_editor/static/src/main/banner_plugin.js
index aa8da9cf603c3..67619bf4c765a 100644
--- a/addons/html_editor/static/src/main/banner_plugin.js
+++ b/addons/html_editor/static/src/main/banner_plugin.js
@@ -26,6 +26,7 @@ export class BannerPlugin extends Plugin {
     // sanitize plugin is required to handle `contenteditable` attribute.
     static dependencies = ["baseContainer", "history", "dom", "emoji", "selection", "sanitize"];
     static shared = ["insertBanner"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/chatgpt/chatgpt_translate_plugin.js b/addons/html_editor/static/src/main/chatgpt/chatgpt_translate_plugin.js
index 98d119d65709f..2aa2bf142b624 100644
--- a/addons/html_editor/static/src/main/chatgpt/chatgpt_translate_plugin.js
+++ b/addons/html_editor/static/src/main/chatgpt/chatgpt_translate_plugin.js
@@ -18,6 +18,7 @@ export class ChatGPTTranslatePlugin extends Plugin {
         "dialog",
         "split",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         toolbar_groups: withSequence(50, {
             id: "ai",
diff --git a/addons/html_editor/static/src/main/column_plugin.js b/addons/html_editor/static/src/main/column_plugin.js
index 67d6fdd0f4a98..acfa0b775320e 100644
--- a/addons/html_editor/static/src/main/column_plugin.js
+++ b/addons/html_editor/static/src/main/column_plugin.js
@@ -32,6 +32,7 @@ function columnIsAvailable(numberOfColumns) {
 export class ColumnPlugin extends Plugin {
     static id = "column";
     static dependencies = ["baseContainer", "selection", "history", "dom"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/emoji_plugin.js b/addons/html_editor/static/src/main/emoji_plugin.js
index 9ae811d05af4b..e07e3540b9d5e 100644
--- a/addons/html_editor/static/src/main/emoji_plugin.js
+++ b/addons/html_editor/static/src/main/emoji_plugin.js
@@ -11,6 +11,7 @@ export class EmojiPlugin extends Plugin {
     static id = "emoji";
     static dependencies = ["history", "overlay", "dom", "selection"];
     static shared = ["showEmojiPicker"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/feff_plugin.js b/addons/html_editor/static/src/main/feff_plugin.js
index 792b65f5512c7..a54b02917b646 100644
--- a/addons/html_editor/static/src/main/feff_plugin.js
+++ b/addons/html_editor/static/src/main/feff_plugin.js
@@ -14,6 +14,12 @@ import { callbacksForCursorUpdate } from "@html_editor/utils/selection";
  * @property { FeffPlugin['removeFeffs'] } removeFeffs
  */
 
+/**
+ * @typedef {((node: Node) => boolean)[]} legit_feff_predicates
+ * @typedef {((root: EditorContext["editable"], cursors: Cursors) => Node[])[]} feff_providers
+ * @typedef {(() => string)[]} selectors_for_feff_providers
+ */
+
 /**
  * This plugin manages the insertion and removal of the zero-width no-break
  * space character (U+FEFF). These characters enable the user to place the
@@ -26,6 +32,7 @@ export class FeffPlugin extends Plugin {
     static dependencies = ["selection"];
     static shared = ["addFeff", "removeFeffs", "surroundWithFeffs"];
 
+    /** @type {import("plugins").EditorResources} */
     resources = {
         normalize_handlers: this.updateFeffs.bind(this),
         clean_for_save_handlers: this.cleanForSave.bind(this),
diff --git a/addons/html_editor/static/src/main/font/color_plugin.js b/addons/html_editor/static/src/main/font/color_plugin.js
index 233f80eee9b77..74f89f5bd3002 100644
--- a/addons/html_editor/static/src/main/font/color_plugin.js
+++ b/addons/html_editor/static/src/main/font/color_plugin.js
@@ -31,6 +31,16 @@ const COLOR_COMBINATION_SELECTOR = COLOR_COMBINATION_CLASSES.map((c) => `.${c}`)
  * @property { ColorPlugin['getElementColors'] } getElementColors
  * @property { ColorPlugin['applyColor'] } applyColor
  */
+
+/**
+ * @typedef {((element: HTMLElement, cssProp: string, color: string) => boolean)[]} apply_color_style_overrides
+ * @typedef {((color: string, mode: "color" | "backgroundColor") => void)[]} color_apply_overrides
+ * @typedef {((color: string, mode: "color" | "backgroundColor") => string)[]} apply_background_color_processors
+ * @typedef {((color: string) => string)[]} get_background_color_processors
+ *
+ * @typedef {((el: HTMLElement, actionParam: string) => string)[]} color_combination_getters
+ */
+
 export class ColorPlugin extends Plugin {
     static id = "color";
     static dependencies = ["selection", "split", "history", "format"];
@@ -41,6 +51,7 @@ export class ColorPlugin extends Plugin {
         "getColorCombination",
         "applyColor",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/font/color_ui_plugin.js b/addons/html_editor/static/src/main/font/color_ui_plugin.js
index cfd1c73eb6b93..cf02f187aef1d 100644
--- a/addons/html_editor/static/src/main/font/color_ui_plugin.js
+++ b/addons/html_editor/static/src/main/font/color_ui_plugin.js
@@ -19,6 +19,7 @@ export class ColorUIPlugin extends Plugin {
     static id = "colorUi";
     static dependencies = ["color", "history", "selection"];
     static shared = ["getPropsForColorSelector"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         toolbar_items: [
             {
diff --git a/addons/html_editor/static/src/main/font/font_family_plugin.js b/addons/html_editor/static/src/main/font/font_family_plugin.js
index 48ca61191dde5..3e525494e2a0f 100644
--- a/addons/html_editor/static/src/main/font/font_family_plugin.js
+++ b/addons/html_editor/static/src/main/font/font_family_plugin.js
@@ -32,6 +32,7 @@ export class FontFamilyPlugin extends Plugin {
     static id = "fontFamily";
     static dependencies = ["split", "selection", "dom", "format", "font"];
     fontFamily = reactive({ displayName: defaultFontFamily.nameShort });
+    /** @type {import("plugins").EditorResources} */
     resources = {
         toolbar_items: [
             withSequence(15, {
diff --git a/addons/html_editor/static/src/main/font/font_plugin.js b/addons/html_editor/static/src/main/font/font_plugin.js
index 5e992381f75f0..c745a16ff77a8 100644
--- a/addons/html_editor/static/src/main/font/font_plugin.js
+++ b/addons/html_editor/static/src/main/font/font_plugin.js
@@ -36,6 +36,13 @@ import { FontSizeSelector } from "./font_size_selector";
 import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 import { weakMemoize } from "@html_editor/utils/functions";
 
+/** @typedef {import("plugins").LazyTranslatedString} LazyTranslatedString */
+
+/**
+ * @typedef {((insertedNode: Node) => insertedNode)[]} before_insert_within_pre_processors
+ * @typedef {{ name: LazyTranslatedString; tagName: string; extraClass?: string; }[]} font_items
+ */
+
 export const fontSizeItems = [
     { variableName: "display-1-font-size", className: "display-1-fs" },
     { variableName: "display-2-font-size", className: "display-2-fs" },
@@ -71,6 +78,7 @@ export class FontPlugin extends Plugin {
         "format",
         "lineBreak",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         font_items: [
             withSequence(10, {
diff --git a/addons/html_editor/static/src/main/hint_plugin.js b/addons/html_editor/static/src/main/hint_plugin.js
index 912b1e1833951..e64a04577d037 100644
--- a/addons/html_editor/static/src/main/hint_plugin.js
+++ b/addons/html_editor/static/src/main/hint_plugin.js
@@ -4,9 +4,25 @@ import { removeClass } from "@html_editor/utils/dom";
 import { selectElements } from "@html_editor/utils/dom_traversal";
 import { closestBlock } from "../utils/blocks";
 
+/**
+ * @typedef {import("@html_editor/editor").EditorContext} EditorContext
+ * @typedef {import("@html_editor/core/selection_plugin").SelectionData} SelectionData
+ * @typedef {import("plugins").CSSSelector} CSSSelector
+ * @typedef {import("plugins").LazyTranslatedString} LazyTranslatedString
+ */
+
+/**
+ * @typedef {((
+ *   selectionData: SelectionData,
+ *   editable: EditorContext["editable"]
+ * ) => HTMLElement[] | NodeList)[]} hint_targets_providers
+ * @typedef {{ selector: CSSSelector; text: LazyTranslatedString; }[]} hints
+ */
+
 export class HintPlugin extends Plugin {
     static id = "hint";
     static dependencies = ["history", "selection"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         selectionchange_handlers: this.updateHints.bind(this),
diff --git a/addons/html_editor/static/src/main/inline_code.js b/addons/html_editor/static/src/main/inline_code.js
index d4d97feae7ed7..27a7d7d6623b5 100644
--- a/addons/html_editor/static/src/main/inline_code.js
+++ b/addons/html_editor/static/src/main/inline_code.js
@@ -7,6 +7,7 @@ import { DIRECTIONS, nodeSize } from "@html_editor/utils/position";
 export class InlineCodePlugin extends Plugin {
     static id = "inlineCode";
     static dependencies = ["selection", "history", "input", "split", "feff"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         input_handlers: this.onInput.bind(this),
         selectionchange_handlers: this.handleSelectionChange.bind(this),
diff --git a/addons/html_editor/static/src/main/link/link_paste_plugin.js b/addons/html_editor/static/src/main/link/link_paste_plugin.js
index 6868db70c908b..fd8a691f5828c 100644
--- a/addons/html_editor/static/src/main/link/link_paste_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_paste_plugin.js
@@ -4,9 +4,14 @@ import { isImageUrl } from "@html_editor/utils/url";
 import { Plugin } from "@html_editor/plugin";
 import { childNodeIndex } from "@html_editor/utils/position";
 
+/**
+ * @typedef {((text: string, url: string) => void | true)[]} paste_url_overrides
+ */
+
 export class LinkPastePlugin extends Plugin {
     static id = "linkPaste";
     static dependencies = ["link", "clipboard", "selection", "dom", "history"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         before_paste_handlers: this.selectFullySelectedLink.bind(this),
         paste_text_overrides: this.handlePasteText.bind(this),
diff --git a/addons/html_editor/static/src/main/link/link_plugin.js b/addons/html_editor/static/src/main/link/link_plugin.js
index fbdf20f759d6a..f55a26942e20d 100644
--- a/addons/html_editor/static/src/main/link/link_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_plugin.js
@@ -15,6 +15,8 @@ import { isBlock, closestBlock } from "@html_editor/utils/blocks";
 import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 import { isBrowserFirefox } from "@web/core/browser/feature_detection";
 
+/** @typedef {import("@odoo/owl").Component} Component */
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
 /**
  * @typedef {import("@html_editor/core/selection_plugin").EditorSelection} EditorSelection
  */
@@ -124,6 +126,18 @@ async function fetchAttachmentMetaData(url, ormService) {
  * @property { LinkPlugin['insertLink'] } insertLink
  */
 
+/**
+ * @typedef {((link: HTMLLinkElement) => boolean)[]} is_link_editable_predicates
+ * @typedef {((link: HTMLLinkElement) => boolean)[]} legit_empty_link_predicates
+ * @typedef {(() => boolean)[]} link_compatible_selection_predicates
+ * @typedef {CSSSelector[]} immutable_link_selectors
+ * @typedef {{
+ *      PopoverClass: Component;
+ *      isAvailable: (linkEl: HTMLLinkElement) => boolean;
+ *      getProps: (props) => props;
+ *  }[]} link_popovers
+ */
+
 export class LinkPlugin extends Plugin {
     static id = "link";
     static dependencies = [
@@ -143,6 +157,7 @@ export class LinkPlugin extends Plugin {
     };
     // @phoenix @todo: do we want to have createLink and insertLink methods in link plugin?
     static shared = ["createLink", "insertLink", "getPathAsUrlCommand"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/link/link_selection_odoo_plugin.js b/addons/html_editor/static/src/main/link/link_selection_odoo_plugin.js
index 927bf59b8f25e..20d245586cd6d 100644
--- a/addons/html_editor/static/src/main/link/link_selection_odoo_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_selection_odoo_plugin.js
@@ -3,6 +3,7 @@ import { isBlock } from "@html_editor/utils/blocks";
 
 export class OdooLinkSelectionPlugin extends Plugin {
     static id = "odooLinkSelection";
+    /** @type {import("plugins").EditorResources} */
     resources = {
         ineligible_link_for_zwnbsp_predicates: [
             (link) =>
diff --git a/addons/html_editor/static/src/main/link/link_selection_plugin.js b/addons/html_editor/static/src/main/link/link_selection_plugin.js
index 2b57ca02ebf3f..e1229f49f4e26 100644
--- a/addons/html_editor/static/src/main/link/link_selection_plugin.js
+++ b/addons/html_editor/static/src/main/link/link_selection_plugin.js
@@ -26,9 +26,15 @@ import { isProtected, isProtecting } from "@html_editor/utils/dom_info";
     - on non-editable links or links that are not within the editable area
  */
 
+/**
+ * @typedef {((link: HTMLLinkElement) => boolean)[]} ineligible_link_for_selection_indication_predicates
+ * @typedef {((link: HTMLLinkElement) => boolean)[]} ineligible_link_for_zwnbsp_predicates
+ */
+
 export class LinkSelectionPlugin extends Plugin {
     static id = "linkSelection";
     static dependencies = ["selection", "feff"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         selectionchange_handlers: this.resetLinkInSelection.bind(this),
diff --git a/addons/html_editor/static/src/main/link/powerbox_url_paste_plugin.js b/addons/html_editor/static/src/main/link/powerbox_url_paste_plugin.js
index 3048232b58fbd..10ff0d90c8ae5 100644
--- a/addons/html_editor/static/src/main/link/powerbox_url_paste_plugin.js
+++ b/addons/html_editor/static/src/main/link/powerbox_url_paste_plugin.js
@@ -1,8 +1,15 @@
 import { Plugin } from "@html_editor/plugin";
 
+/**
+ * @typedef {import("@html_editor/core/user_command_plugin").UserCommand} UserCommand
+ *
+ * @typedef {((url: string) => UserCommand)[]} paste_media_url_command_providers
+ */
+
 export class MediaUrlPastePlugin extends Plugin {
     static id = "mediaUrlPaste";
     static dependencies = ["link", "dom", "history", "powerbox"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         paste_url_overrides: this.openPowerboxOnUrlPaste.bind(this),
     };
diff --git a/addons/html_editor/static/src/main/list/list_plugin.js b/addons/html_editor/static/src/main/list/list_plugin.js
index fc53ddf2b5442..5a444cc383a6d 100644
--- a/addons/html_editor/static/src/main/list/list_plugin.js
+++ b/addons/html_editor/static/src/main/list/list_plugin.js
@@ -81,6 +81,7 @@ export class ListPlugin extends Plugin {
         allowChecklist: true,
     };
     toolbarListSelectorKey = reactive({ value: 0 });
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/media/file_plugin.js b/addons/html_editor/static/src/main/media/file_plugin.js
index 88a5a6e5ef713..98a73c9f93e8f 100644
--- a/addons/html_editor/static/src/main/media/file_plugin.js
+++ b/addons/html_editor/static/src/main/media/file_plugin.js
@@ -13,6 +13,7 @@ export class FilePlugin extends Plugin {
     static defaultConfig = {
         allowFile: true,
     };
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: {
             id: "uploadFile",
diff --git a/addons/html_editor/static/src/main/media/icon_color_plugin.js b/addons/html_editor/static/src/main/media/icon_color_plugin.js
index 97518573f05a3..8692bfd71237b 100644
--- a/addons/html_editor/static/src/main/media/icon_color_plugin.js
+++ b/addons/html_editor/static/src/main/media/icon_color_plugin.js
@@ -7,6 +7,7 @@ import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 export class IconColorPlugin extends Plugin {
     static id = "iconColor";
     static dependencies = ["icon", "colorUi"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         toolbar_groups: withSequence(1, { id: "icon_color", namespaces: ["icon"] }),
         toolbar_items: [
diff --git a/addons/html_editor/static/src/main/media/icon_plugin.js b/addons/html_editor/static/src/main/media/icon_plugin.js
index 109bfe8698a0d..f4c3fbf7db2b0 100644
--- a/addons/html_editor/static/src/main/media/icon_plugin.js
+++ b/addons/html_editor/static/src/main/media/icon_plugin.js
@@ -8,6 +8,7 @@ import { ICON_SELECTOR, isElement } from "@html_editor/utils/dom_info";
 export class IconPlugin extends Plugin {
     static id = "icon";
     static dependencies = ["history", "selection", "dialog"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/media/image_crop_plugin.js b/addons/html_editor/static/src/main/media/image_crop_plugin.js
index b04ed95220255..066367c9f4f4a 100644
--- a/addons/html_editor/static/src/main/media/image_crop_plugin.js
+++ b/addons/html_editor/static/src/main/media/image_crop_plugin.js
@@ -13,6 +13,7 @@ export class ImageCropPlugin extends Plugin {
     static id = "imageCrop";
     static dependencies = ["selection", "history", "imagePostProcess"];
     static shared = ["openCropImage"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/media/image_plugin.js b/addons/html_editor/static/src/main/media/image_plugin.js
index 49953130b96be..c8f60363703ff 100644
--- a/addons/html_editor/static/src/main/media/image_plugin.js
+++ b/addons/html_editor/static/src/main/media/image_plugin.js
@@ -41,11 +41,17 @@ const IMAGE_SIZE = [
  * @property { ImagePlugin['resetImageTransformation'] } resetImageTransformation
  */
 
+/**
+ * @typedef {((img: HTMLImageElement) => void | true)[]} delete_image_overrides
+ * @typedef {((img: HTMLImageElement) => boolean)[]} image_name_predicates
+ */
+
 export class ImagePlugin extends Plugin {
     static id = "image";
     static dependencies = ["history", "dom", "selection", "overlay"];
     static shared = ["getTargetedImage", "previewImage", "resetImageTransformation"];
     static defaultConfig = { allowImageTransform: true };
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/media/image_post_process_plugin.js b/addons/html_editor/static/src/main/media/image_post_process_plugin.js
index 6ea5bc517fb90..fcd31e2199369 100644
--- a/addons/html_editor/static/src/main/media/image_post_process_plugin.js
+++ b/addons/html_editor/static/src/main/media/image_post_process_plugin.js
@@ -20,6 +20,27 @@ export const DEFAULT_IMAGE_QUALITY = "75";
  * @property { ImagePostProcessPlugin['getProcessedImageSize'] } getProcessedImageSize
  */
 
+/**
+ * @typedef {(
+ *   (img: HTMLImageElement, newDataset: object) => Promise<{
+ *     getHeight: (canvas: HTMLCanvasElement) => number,
+ *     perspective: string | null,
+ *     newDataset: object,
+ *     postProcessCroppedCanvas: (canvas: HTMLCanvasElement) => Promise<HTMLCanvasElement>,
+ *     svg: SVGElement,
+ *     svgAspectRatio: number,
+ *     svgWidth: number,
+ *   }>
+ * )[]} process_image_warmup_handlers
+ * @typedef {(
+ *   (
+ *     url: string,
+ *     newDataset: object,
+ *     processContext: { svg: SVGElement, svgAspectRatio: number, svgWidth: number }
+ *   ) => Promise<[newUrl: string, handlerDataset: object]>
+ * )[]} process_image_post_handlers
+ */
+
 export class ImagePostProcessPlugin extends Plugin {
     static id = "imagePostProcess";
     static dependencies = ["style"];
diff --git a/addons/html_editor/static/src/main/media/image_save_plugin.js b/addons/html_editor/static/src/main/media/image_save_plugin.js
index 19472a3e4ee4c..b6530d244965a 100644
--- a/addons/html_editor/static/src/main/media/image_save_plugin.js
+++ b/addons/html_editor/static/src/main/media/image_save_plugin.js
@@ -11,10 +11,15 @@ import { rpc } from "@web/core/network/rpc";
  * @property { ImageSavePlugin['savePendingImages'] } savePendingImages
  */
 
+/**
+ * @typedef {((el: HTMLElement) => HTMLElement)[]} closest_savable_providers
+ */
+
 export class ImageSavePlugin extends Plugin {
     static id = "imageSave";
     static shared = ["savePendingImages"];
 
+    /** @type {import("plugins").EditorResources} */
     resources = {
         before_save_handlers: this.savePendingImages.bind(this),
 
diff --git a/addons/html_editor/static/src/main/media/media_plugin.js b/addons/html_editor/static/src/main/media/media_plugin.js
index 4dca47cf14934..9c13376e071a1 100644
--- a/addons/html_editor/static/src/main/media/media_plugin.js
+++ b/addons/html_editor/static/src/main/media/media_plugin.js
@@ -23,6 +23,20 @@ import { FORMATTABLE_TAGS } from "@html_editor/utils/formatting";
  * @property { MediaPlugin['openMediaDialog'] } openMediaDialog
  */
 
+/**
+ * @typedef {((mediaEl: HTMLElement) => void)[]} after_save_media_dialog_handlers
+ * @typedef {((arg: { newMediaEl: HTMLElement }) => void)[]} on_added_media_handlers
+ * @typedef {((elements: HTMLElement[], params: { node: Node }) => Promise<void>)[]} on_media_dialog_saved_handlers
+ * @typedef {((arg: { newMediaEl: HTMLElement }) => void)[]} on_replaced_media_handlers
+ *
+ * @typedef {{
+ *      id: "DOCUMENTS" | "ICONS" | "IMAGES" | "VIDEOS";
+ *      title: import("plugins").LazyTranslatedString;
+ *      Component: import("@odoo/owl").Component;
+ *      sequence: number;
+ *  }[]} media_dialog_extra_tabs
+ */
+
 export class MediaPlugin extends Plugin {
     static id = "media";
     static dependencies = ["selection", "history", "dom", "dialog"];
@@ -31,6 +45,7 @@ export class MediaPlugin extends Plugin {
         allowImage: true,
         allowMediaDocuments: true,
     };
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/media/video_plugin.js b/addons/html_editor/static/src/main/media/video_plugin.js
index dd6120da17e78..eed10f551e5e0 100644
--- a/addons/html_editor/static/src/main/media/video_plugin.js
+++ b/addons/html_editor/static/src/main/media/video_plugin.js
@@ -7,6 +7,7 @@ export class VideoPlugin extends Plugin {
     static defaultConfig = {
         allowVideo: true,
     };
+    /** @type {import("plugins").EditorResources} */
     resources = {
         ...(this.config.allowVideo && {
             media_dialog_extra_tabs: {
diff --git a/addons/html_editor/static/src/main/movenode_plugin.js b/addons/html_editor/static/src/main/movenode_plugin.js
index ed45dae7a4b3b..3a0d54834de3a 100644
--- a/addons/html_editor/static/src/main/movenode_plugin.js
+++ b/addons/html_editor/static/src/main/movenode_plugin.js
@@ -7,6 +7,13 @@ import { _t } from "@web/core/l10n/translation";
 import { baseContainerGlobalSelector } from "@html_editor/utils/base_container";
 import { getDeepestPosition, isContentEditable } from "@html_editor/utils/dom_info";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+
+/**
+ * @typedef {CSSSelector[]} move_node_blacklist_selectors
+ * @typedef {CSSSelector[]} move_node_whitelist_selectors
+ */
+
 const WIDGET_CONTAINER_WIDTH = 25;
 const WIDGET_MOVE_SIZE = 20;
 
@@ -15,6 +22,7 @@ const ALLOWED_ELEMENTS = "h1, h2, h3, p, hr, pre, blockquote, li";
 export class MoveNodePlugin extends Plugin {
     static id = "movenode";
     static dependencies = ["baseContainer", "selection", "history", "position", "localOverlay"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         layout_geometry_change_handlers: () => {
             if (this.currentMovableElement) {
diff --git a/addons/html_editor/static/src/main/placeholder_plugin.js b/addons/html_editor/static/src/main/placeholder_plugin.js
index 0d25bbd92452a..bed56221dede7 100644
--- a/addons/html_editor/static/src/main/placeholder_plugin.js
+++ b/addons/html_editor/static/src/main/placeholder_plugin.js
@@ -6,6 +6,7 @@ import { withSequence } from "@html_editor/utils/resource";
 
 export class PlaceholderPlugin extends Plugin {
     static id = "placeholder";
+    /** @type {import("plugins").EditorResources} */
     resources = {
         ...(this.config.placeholder && {
             hints: [
diff --git a/addons/html_editor/static/src/main/position_plugin.js b/addons/html_editor/static/src/main/position_plugin.js
index 772e0205f26ca..9703c764254d9 100644
--- a/addons/html_editor/static/src/main/position_plugin.js
+++ b/addons/html_editor/static/src/main/position_plugin.js
@@ -3,12 +3,16 @@ import { Plugin } from "../plugin";
 import { throttleForAnimation } from "@web/core/utils/timing";
 import { couldBeScrollableX, couldBeScrollableY } from "@web/core/utils/scrolling";
 
+/**
+ * @typedef {(() => void)[]} layout_geometry_change_handlers
+ */
 /**
  * This plugins provides a way to create a "local" overlays so that their
  * visibility is relative to the overflow of their ancestors.
  */
 export class PositionPlugin extends Plugin {
     static id = "position";
+    /** @type {import("plugins").EditorResources} */
     resources = {
         // todo: it is strange that the position plugin is aware of external_history_step_handlers and history_reset_from_steps_handlers.
         external_history_step_handlers: this.layoutGeometryChange.bind(this),
diff --git a/addons/html_editor/static/src/main/power_buttons_plugin.js b/addons/html_editor/static/src/main/power_buttons_plugin.js
index ba704aa5609fa..e98d111fc402b 100644
--- a/addons/html_editor/static/src/main/power_buttons_plugin.js
+++ b/addons/html_editor/static/src/main/power_buttons_plugin.js
@@ -6,6 +6,7 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
 import { omit, pick } from "@web/core/utils/objects";
 
 /** @typedef {import("./powerbox/powerbox_plugin").PowerboxCommand} PowerboxCommand */
+/** @typedef {import("@html_editor/core/selection_plugin").EditorSelection} EditorSelection */
 
 /**
  * @typedef {Object} PowerButton
@@ -16,29 +17,36 @@ import { omit, pick } from "@web/core/utils/objects";
  * @property {string} [text] Mandatory if `icon` is not provided
  * @property {string} [isAvailable] Can be inferred from the user command
  */
+
 /**
+ * @typedef {((selection: EditorSelection) => boolean)[]} power_buttons_visibility_predicates
+ */
+
+/**
+ * @typedef {{ commandId: string }[]} power_buttons
+ *
  * A power button is added by referencing an existing user command.
  *
  * Example:
  *
- * resources = {
- *      user_commands: [
- *          {
- *              id: myCommand,
- *              run: myCommandFunction,
- *              description: _t("Apply my command"),
- *              icon: "fa-bug",
- *          },
- *      ],
- *      power_buttons: [
- *          {
- *              commandId: "myCommand",
- *              commandParams: { myParam: "myValue" },
- *              description: _t("Do powerfull stuff"), // overrides the user command's `description`
- *              // `icon` is derived from the user command
- *          }
- *      ],
- * };
+ *     resources = {
+ *          user_commands: [
+ *              {
+ *                  id: myCommand,
+ *                  run: myCommandFunction,
+ *                  description: _t("Apply my command"),
+ *                  icon: "fa-bug",
+ *              },
+ *          ],
+ *          power_buttons: [
+ *              {
+ *                  commandId: "myCommand",
+ *                  commandParams: { myParam: "myValue" },
+ *                  description: _t("Do powerfull stuff"), // overrides the user command's `description`
+ *                  // `icon` is derived from the user command
+ *              }
+ *          ],
+ *     };
  */
 
 export class PowerButtonsPlugin extends Plugin {
@@ -52,6 +60,7 @@ export class PowerButtonsPlugin extends Plugin {
         "userCommand",
         "history",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         layout_geometry_change_handlers: this.updatePowerButtons.bind(this),
         selectionchange_handlers: this.updatePowerButtons.bind(this),
diff --git a/addons/html_editor/static/src/main/powerbox/powerbox_plugin.js b/addons/html_editor/static/src/main/powerbox/powerbox_plugin.js
index ed9a63e5bb39c..450580f6cc948 100644
--- a/addons/html_editor/static/src/main/powerbox/powerbox_plugin.js
+++ b/addons/html_editor/static/src/main/powerbox/powerbox_plugin.js
@@ -15,8 +15,7 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
 /**
  * @typedef {Object} PowerboxCategory
  * @property {string} id
- * @property {String} name
- *
+ * @property {TranslatedString} name
  *
  * @typedef {Object} PowerboxItem
  * @property {string} categoryId Id of a powerbox category
@@ -29,40 +28,6 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
  * @property {(selection: EditorSelection) => boolean} [isAvailable] Optional and inheritable
  */
 
-/**
- * A powerbox item must derive from a user command ( @see UserCommand )
- * specified by commandId. Properties defined in a powerbox item override those
- * from a user command.
- *
- * Example:
- *
- * resources = {
- *      user_commands: [
- *          @type {UserCommand}
- *          {
- *              id: myCommand,
- *              run: myCommandFunction,
- *              title: _t("My Command"),
- *              description: _t("My command's description"),
- *              icon: "fa-bug",
- *          },
- *      ],
- *      powerbox_categories: [
- *          @type {PowerboxCategory}
- *          { id: "myCategory", name: _t("My Category") }
- *      ],
- *      powerbox_items: [
- *          @type {PowerboxItem}
- *          {
- *              categoryId: "myCategory",
- *              commandId: "myCommand",
- *              title: _t("My Powerbox Command"), // overrides the user command's `title`
- *              // `description` and `icon` are inferred from the user command
- *          }
- *      ],
- * };
- */
-
 /**
  * The resulting powerbox command after deriving properties from a user command
  * (type for internal use).
@@ -85,6 +50,44 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
  * @property { PowerboxPlugin['updatePowerbox'] } updatePowerbox
  */
 
+/** @typedef {PowerboxCategory[]} powerbox_categories */
+/**
+ * @see UserCommand
+ * @typedef {PowerboxItem[]} powerbox_items
+ *
+ * A powerbox item must derive from a user command (see UserCommand) specified
+ * by commandId. Properties defined in a powerbox item override those from a
+ * user command. Other properties are inferred from the UserCommand.
+ *
+ * Example:
+ *
+ *     resources = {
+ *          user_commands: [
+ *              // see {UserCommand}
+ *              {
+ *                  id: myCommand,
+ *                  run: myCommandFunction,
+ *                  title: _t("My Command"),
+ *                  description: _t("My command's description"),
+ *                  icon: "fa-bug",
+ *              },
+ *          ],
+ *          powerbox_categories: [
+ *              // see {PowerboxCategory}
+ *              { id: "myCategory", name: _t("My Category") }
+ *          ],
+ *          powerbox_items: [
+ *              // see {PowerboxItem}
+ *              {
+ *                  categoryId: "myCategory",
+ *                  commandId: "myCommand",
+ *                  title: _t("My Powerbox Command"), // overrides the user command's `title`
+ *                  // `description` and `icon` are inferred from the user command
+ *              }
+ *          ],
+ *     };
+ */
+
 export class PowerboxPlugin extends Plugin {
     static id = "powerbox";
     static dependencies = ["overlay", "selection", "history", "userCommand"];
@@ -94,6 +97,7 @@ export class PowerboxPlugin extends Plugin {
         "openPowerbox",
         "updatePowerbox",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: {
             id: "openPowerbox",
diff --git a/addons/html_editor/static/src/main/powerbox/search_powerbox_plugin.js b/addons/html_editor/static/src/main/powerbox/search_powerbox_plugin.js
index 7545b8a4d1486..2690fe63a32f0 100644
--- a/addons/html_editor/static/src/main/powerbox/search_powerbox_plugin.js
+++ b/addons/html_editor/static/src/main/powerbox/search_powerbox_plugin.js
@@ -9,6 +9,7 @@ import { Plugin } from "../../plugin";
 export class SearchPowerboxPlugin extends Plugin {
     static id = "searchPowerbox";
     static dependencies = ["powerbox", "selection", "history", "input"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         beforeinput_handlers: this.onBeforeInput.bind(this),
         input_handlers: this.onInput.bind(this),
diff --git a/addons/html_editor/static/src/main/separator_plugin.js b/addons/html_editor/static/src/main/separator_plugin.js
index df604c15a72d9..c7b9fc90815ac 100644
--- a/addons/html_editor/static/src/main/separator_plugin.js
+++ b/addons/html_editor/static/src/main/separator_plugin.js
@@ -15,6 +15,7 @@ import { fillEmpty } from "../utils/dom";
 export class SeparatorPlugin extends Plugin {
     static id = "separator";
     static dependencies = ["selection", "history", "split", "delete", "lineBreak", "baseContainer"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/star_plugin.js b/addons/html_editor/static/src/main/star_plugin.js
index dd48c23c70454..ee6f3d10adc8a 100644
--- a/addons/html_editor/static/src/main/star_plugin.js
+++ b/addons/html_editor/static/src/main/star_plugin.js
@@ -6,6 +6,7 @@ import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 export class StarPlugin extends Plugin {
     static id = "star";
     static dependencies = ["dom", "history"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/table/table_align_plugin.js b/addons/html_editor/static/src/main/table/table_align_plugin.js
index e9fedc7b290f8..c397e72249753 100644
--- a/addons/html_editor/static/src/main/table/table_align_plugin.js
+++ b/addons/html_editor/static/src/main/table/table_align_plugin.js
@@ -23,6 +23,7 @@ export class TableAlignPlugin extends Plugin {
     static id = "tableAlign";
     static dependencies = ["history", "selection"];
 
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/table/table_plugin.js b/addons/html_editor/static/src/main/table/table_plugin.js
index da226c8b2ad8a..70dc85e0b8c70 100644
--- a/addons/html_editor/static/src/main/table/table_plugin.js
+++ b/addons/html_editor/static/src/main/table/table_plugin.js
@@ -66,6 +66,10 @@ function isUnremovableTableComponent(node, root) {
  * @property { TablePlugin['toggleAlternatingRows'] } toggleAlternatingRows
  */
 
+/**
+ * @typedef {((el: HTMLElement) => void)[]} deselect_custom_selected_nodes_handlers
+ */
+
 /**
  * This plugin only contains the table manipulation and selection features. All UI overlay
  * code is located in the table_ui plugin
@@ -98,6 +102,7 @@ export class TablePlugin extends Plugin {
         "clearRowContent",
         "toggleAlternatingRows",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/table/table_ui_plugin.js b/addons/html_editor/static/src/main/table/table_ui_plugin.js
index 0346992996296..0c59e1b537f00 100644
--- a/addons/html_editor/static/src/main/table/table_ui_plugin.js
+++ b/addons/html_editor/static/src/main/table/table_ui_plugin.js
@@ -13,6 +13,7 @@ import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 export class TableUIPlugin extends Plugin {
     static id = "tableUi";
     static dependencies = ["history", "overlay", "table"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/tabulation_plugin.js b/addons/html_editor/static/src/main/tabulation_plugin.js
index 5bd4d411d4d51..f4a6ea0f7da82 100644
--- a/addons/html_editor/static/src/main/tabulation_plugin.js
+++ b/addons/html_editor/static/src/main/tabulation_plugin.js
@@ -35,10 +35,16 @@ function isIndentationTab(tab) {
  * @property { TabulationPlugin['outdentBlocks'] } outdentBlocks
  */
 
+/**
+ * @typedef {(() => void | true)[]} shift_tab_overrides
+ * @typedef {(() => void | true)[]} tab_overrides
+ */
+
 export class TabulationPlugin extends Plugin {
     static id = "tabulation";
     static dependencies = ["dom", "selection", "history", "delete"];
     static shared = ["indentBlocks", "outdentBlocks"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/text_direction_plugin.js b/addons/html_editor/static/src/main/text_direction_plugin.js
index f01accc0d7b02..1165e7b331ca3 100644
--- a/addons/html_editor/static/src/main/text_direction_plugin.js
+++ b/addons/html_editor/static/src/main/text_direction_plugin.js
@@ -8,6 +8,7 @@ import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 export class TextDirectionPlugin extends Plugin {
     static id = "textDirection";
     static dependencies = ["selection", "history", "split", "format"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js b/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js
index f1e1824bc7385..cab5e562ae8c2 100644
--- a/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js
+++ b/addons/html_editor/static/src/main/toolbar/toolbar_plugin.js
@@ -13,6 +13,7 @@ import { memoize } from "@web/core/utils/functions";
 import { closestElement } from "@html_editor/utils/dom_traversal";
 
 /** @typedef { import("@html_editor/core/selection_plugin").EditorSelection } EditorSelection */
+/** @typedef {import("@html_editor/core/selection_plugin").SelectionData} SelectionData */
 /** @typedef { import("@html_editor/core/user_command_plugin").UserCommand } UserCommand */
 /** @typedef { import("@web/core/l10n/translation.js")._t} _t */
 /** @typedef { ReturnType<_t> } TranslatedString */
@@ -61,48 +62,6 @@ import { closestElement } from "@html_editor/utils/dom_traversal";
  * ToolbarItem.description maps to the button's `title` attribute (tooltip content)
  */
 
-/**
- * A ToolbarCommandItem must derive from a user command ( @see UserCommand )
- * specified by commandId. Properties defined in a toolbar item override those
- * from a user command.
- *
- * Example:
- *
- * resources = {
- *     user_commands: [
- *         @type {UserCommand}
- *         {
- *             id: myCommand,
- *             run: myCommandFunction,
- *             description: _t("My Command"),
- *             icon: "fa-bug",
- *         },
- *     ],
- *     toolbar_groups: [
- *         @type {ToolbarGroup}
- *         { id: "myGroup" },
- *     ],
- *     toolbar_items: [
- *         @type {ToolbarCommandItem}
- *         {
- *             id: "myButton",
- *             groupId: "myGroup",
- *             commandId: "myCommand",
- *             description: _t("My Toolbar Command Button"), // overrides the user command's `description`
- *             // `icon` is inferred from the user command
- *         },
- *         @type {ToolbarComponentItem}
- *         {
- *             id: "myComponentButton",
- *             groupId: "myGroup",
- *             description: _t("My Toolbar Component Button"),
- *             Component: MyComponent,
- *             props: { myProp: "myValue" },
- *         },
- *     ],
- * };
- */
-
 /**
  * Types after conversion to renderable toolbar buttons:
  *
@@ -138,12 +97,67 @@ const MIN_SIZE_FOR_COMPACT = 7;
 /**
  * @typedef { Object } ToolbarShared
  * @property { ToolbarPlugin['getToolbarInfo'] } getToolbarInfo
+ * @property { ToolbarPlugin['getIsToolbarOpen'] } getIsToolbarOpen
+ */
+
+/**
+ * @typedef {((namespace: string) => boolean)[]} can_display_toolbar
+ * @typedef {((selectionData: SelectionData) => boolean)[]} collapsed_selection_toolbar_predicate
+ *
+ * @typedef {ToolbarGroup[]} toolbar_groups
+ * @typedef {ToolbarNamespace[]} toolbar_namespaces
+ */
+
+/**
+ * @see UserCommand
+ * @typedef {(ToolbarCommandItem | ToolbarComponentItem)[]} toolbar_items
+ *
+ * A ToolbarCommandItem must derive from a user command (see UserCommand)
+ * specified by commandId. Properties defined in a toolbar item override those
+ * from a user command.
+ *
+ * Example:
+ *
+ *     resources = {
+ *         // see UserCommand
+ *         user_commands: [
+ *             {
+ *                 id: myCommand,
+ *                 run: myCommandFunction,
+ *                 description: _t("My Command"),
+ *                 icon: "fa-bug",
+ *             },
+ *         ],
+ *         // see ToolbarGroup
+ *         toolbar_groups: [
+ *             { id: "myGroup" },
+ *         ],
+ *         toolbar_items: [
+ *             // See ToolbarCommandItem
+ *             {
+ *                 id: "myButton",
+ *                 groupId: "myGroup",
+ *                 commandId: "myCommand",
+ *                 description: _t("My Toolbar Command Button"), // overrides the user command's `description`
+ *                 // `icon` is inferred from the user command
+ *             },
+ *             // See ToolbarComponentItem
+ *             {
+ *                 id: "myComponentButton",
+ *                 groupId: "myGroup",
+ *                 description: _t("My Toolbar Component Button"),
+ *                 Component: MyComponent,
+ *                 props: { myProp: "myValue" },
+ *             },
+ *         ],
+ *     };
  */
 
 export class ToolbarPlugin extends Plugin {
     static id = "toolbar";
     static dependencies = ["overlay", "selection", "userCommand"];
     static shared = ["getToolbarInfo", "getIsToolbarOpen"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         selectionchange_handlers: this.handleSelectionChange.bind(this),
         selection_leave_handlers: () => this.closeToolbar(),
diff --git a/addons/html_editor/static/src/main/youtube_plugin.js b/addons/html_editor/static/src/main/youtube_plugin.js
index 242f4d7b1b71c..8aacab5c760c2 100644
--- a/addons/html_editor/static/src/main/youtube_plugin.js
+++ b/addons/html_editor/static/src/main/youtube_plugin.js
@@ -9,6 +9,7 @@ export const YOUTUBE_URL_GET_VIDEO_ID =
 export class YoutubePlugin extends Plugin {
     static id = "youtube";
     static dependencies = ["history", "dom"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         ...(this.config.allowVideo && {
             paste_media_url_command_providers: this.getCommandForVideoUrlPaste.bind(this),
diff --git a/addons/html_editor/static/src/others/collaboration/collaboration_odoo_plugin.js b/addons/html_editor/static/src/others/collaboration/collaboration_odoo_plugin.js
index 16cdde1e891b6..6add050ffefb3 100644
--- a/addons/html_editor/static/src/others/collaboration/collaboration_odoo_plugin.js
+++ b/addons/html_editor/static/src/others/collaboration/collaboration_odoo_plugin.js
@@ -47,6 +47,7 @@ export class CollaborationOdooPlugin extends Plugin {
     static id = "collaborationOdoo";
     static dependencies = ["baseContainer", "history", "collaboration", "selection"];
     static shared = ["getPeerMetadata"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         selectionchange_handlers: debounce(() => {
             this.ptp?.notifyAllPeers(
diff --git a/addons/html_editor/static/src/others/collaboration/collaboration_plugin.js b/addons/html_editor/static/src/others/collaboration/collaboration_plugin.js
index 7783a2b5db91c..96825a566a852 100644
--- a/addons/html_editor/static/src/others/collaboration/collaboration_plugin.js
+++ b/addons/html_editor/static/src/others/collaboration/collaboration_plugin.js
@@ -22,9 +22,14 @@ const HISTORY_SNAPSHOT_BUFFER_TIME = 1000 * 10;
  * @property { CollaborationPlugin['setInitialBranchStepId'] } setInitialBranchStepId
  */
 
+/**
+ * @typedef {(() => void)[]} external_history_step_handlers
+ */
+
 export class CollaborationPlugin extends Plugin {
     static id = "collaboration";
     static dependencies = ["history", "selection", "sanitize"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         history_cleaned_handlers: this.onHistoryClean.bind(this),
diff --git a/addons/html_editor/static/src/others/collaboration/collaboration_selection_avatar_plugin.js b/addons/html_editor/static/src/others/collaboration/collaboration_selection_avatar_plugin.js
index a86fe3cdf31c2..4ff93c18a8232 100644
--- a/addons/html_editor/static/src/others/collaboration/collaboration_selection_avatar_plugin.js
+++ b/addons/html_editor/static/src/others/collaboration/collaboration_selection_avatar_plugin.js
@@ -21,6 +21,7 @@ export const AVATAR_SIZE = 25;
 export class CollaborationSelectionAvatarPlugin extends Plugin {
     static id = "collaborationSelectionAvatar";
     static dependencies = ["history", "position", "localOverlay", "collaborationOdoo"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         collaboration_notification_handlers: this.handleCollaborationNotification.bind(this),
diff --git a/addons/html_editor/static/src/others/collaboration/collaboration_selection_plugin.js b/addons/html_editor/static/src/others/collaboration/collaboration_selection_plugin.js
index 2a894acbaa8b2..b9c53d210b1d9 100644
--- a/addons/html_editor/static/src/others/collaboration/collaboration_selection_plugin.js
+++ b/addons/html_editor/static/src/others/collaboration/collaboration_selection_plugin.js
@@ -13,6 +13,7 @@ import { _t } from "@web/core/l10n/translation";
 export class CollaborationSelectionPlugin extends Plugin {
     static id = "collaborationSelection";
     static dependencies = ["history", "collaborationOdoo", "position", "localOverlay"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         collaboration_notification_handlers: this.handleCollaborationNotification.bind(this),
diff --git a/addons/html_editor/static/src/others/dynamic_placeholder_plugin.js b/addons/html_editor/static/src/others/dynamic_placeholder_plugin.js
index 625db63a3ef6e..49a7de21e1961 100644
--- a/addons/html_editor/static/src/others/dynamic_placeholder_plugin.js
+++ b/addons/html_editor/static/src/others/dynamic_placeholder_plugin.js
@@ -13,6 +13,7 @@ export class DynamicPlaceholderPlugin extends Plugin {
     static id = "dynamicPlaceholder";
     static dependencies = ["overlay", "selection", "history", "dom"];
     static shared = ["updateDphDefaultModel"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/others/embedded_component_plugin.js b/addons/html_editor/static/src/others/embedded_component_plugin.js
index 627b042ef7b53..6fd04e44d4cc9 100644
--- a/addons/html_editor/static/src/others/embedded_component_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_component_plugin.js
@@ -4,6 +4,16 @@ import { withSequence } from "@html_editor/utils/resource";
 import { memoize } from "@web/core/utils/functions";
 import { renderToElement } from "@web/core/utils/render";
 
+/**
+ * @typedef { Object } EmbeddedComponentShared
+ * @property { EmbeddedComponentPlugin['renderBlueprintToElement'] } renderBlueprintToElement
+ */
+
+/**
+ * @typedef {((arg: { name, env, props }) => void)[]} mount_component_handlers
+ * @typedef {(() => void)[]} post_mount_component_handlers
+ */
+
 /**
  * This plugin is responsible with providing the API to manipulate/insert
  * sub components in an editor.
@@ -12,6 +22,7 @@ export class EmbeddedComponentPlugin extends Plugin {
     static id = "embeddedComponents";
     static dependencies = ["history", "protectedNode", "selection"];
     static shared = ["renderBlueprintToElement"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         normalize_handlers: withSequence(0, this.normalize.bind(this)),
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
index 1a58199b5ca8d..b88819f4bdc7a 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/caption_plugin/caption_plugin.js
@@ -19,6 +19,7 @@ export class CaptionPlugin extends Plugin {
         "selection",
         "baseContainer",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js
index 7b859bb7478b0..1a692cf681e15 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/embedded_file_plugin/embedded_file_plugin.js
@@ -15,6 +15,7 @@ export class EmbeddedFilePlugin extends FilePlugin {
     static dependencies = [...super.dependencies, "embeddedComponents", "selection"];
 
     // Extends the base class resources
+    /** @type {import("plugins").EditorResources} */
     resources = {
         ...this.resources,
         mount_component_handlers: this.setupNewFile.bind(this),
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js
index 9e09a735827f2..0c69347893da9 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/syntax_highlighting_plugin/syntax_highlighting_plugin.js
@@ -41,6 +41,7 @@ export class SyntaxHighlightingPlugin extends Plugin {
         "protectedNode",
         "embeddedComponents",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         mount_component_handlers: this.setupNewCodeBlock.bind(this),
         normalize_handlers: (root) => this.addCodeBlocks(root, true),
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js
index f4f149e21a6a2..ae1df98984990 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/table_of_content_plugin/table_of_content_plugin.js
@@ -10,6 +10,7 @@ import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 export class TableOfContentPlugin extends Plugin {
     static id = "tableOfContent";
     static dependencies = ["dom", "selection", "embeddedComponents", "link", "history"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
index c7a6d3a967c3f..7ec1753e0c1e0 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/toggle_block_plugin/toggle_block_plugin.js
@@ -34,6 +34,7 @@ export class ToggleBlockPlugin extends Plugin {
         "selection",
         "split",
     ];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         hints: [
             withSequence(20, {
diff --git a/addons/html_editor/static/src/others/embedded_components/plugins/video_plugin/embedded_video_plugin.js b/addons/html_editor/static/src/others/embedded_components/plugins/video_plugin/embedded_video_plugin.js
index 475cb57ad0ee2..5f97f9d383d1b 100644
--- a/addons/html_editor/static/src/others/embedded_components/plugins/video_plugin/embedded_video_plugin.js
+++ b/addons/html_editor/static/src/others/embedded_components/plugins/video_plugin/embedded_video_plugin.js
@@ -9,6 +9,7 @@ export class EmbeddedVideoPlugin extends VideoPlugin {
     static dependencies = ["embeddedComponents", "selection", "history", "overlay", "media"];
 
     // Extends the base class resources
+    /** @type {import("plugins").EditorResources} */
     resources = {
         ...this.resources,
         mount_component_handlers: this.extendEmbeddedVideoProps.bind(this),
diff --git a/addons/html_editor/static/src/others/qweb_plugin.js b/addons/html_editor/static/src/others/qweb_plugin.js
index b387a77f3228e..789246fa242c8 100644
--- a/addons/html_editor/static/src/others/qweb_plugin.js
+++ b/addons/html_editor/static/src/others/qweb_plugin.js
@@ -35,6 +35,7 @@ export const isUnremovableQWebElement = (node) =>
 export class QWebPlugin extends Plugin {
     static id = "qweb";
     static dependencies = ["overlay", "protectedNode", "selection"];
+    /** @type {import("plugins").EditorResources} */
     resources = {
         /** Handlers */
         selectionchange_handlers: withSequence(8, this.onSelectionChange.bind(this)),
diff --git a/addons/html_editor/static/src/plugin.js b/addons/html_editor/static/src/plugin.js
index e5175537fbfd4..b49fd9969794c 100644
--- a/addons/html_editor/static/src/plugin.js
+++ b/addons/html_editor/static/src/plugin.js
@@ -6,7 +6,6 @@ export const isValidTargetForDomListener = (target) =>
 /**
  * @typedef { import("./editor").Editor } Editor
  * @typedef { import("./editor").EditorContext } EditorContext
- * @typedef { import("./plugin_sets").SharedMethods } SharedMethods
  */
 
 export class Plugin {
@@ -15,6 +14,9 @@ export class Plugin {
     static shared = [];
     static defaultConfig = {};
 
+    /** @type {Partial<import("plugins").Resources>} */
+    resources;
+
     /**
      * @param { EditorContext } context
      */
diff --git a/addons/html_editor/static/src/plugin_sets.js b/addons/html_editor/static/src/plugin_sets.js
index 0caa4baa97ac5..bef66654390d2 100644
--- a/addons/html_editor/static/src/plugin_sets.js
+++ b/addons/html_editor/static/src/plugin_sets.js
@@ -79,52 +79,6 @@ import { StylePlugin } from "./core/style_plugin";
 import { ContentEditablePlugin } from "./core/content_editable_plugin";
 import { SelectionPlaceholderPlugin } from "./main/selection_placeholder_plugin";
 
-/**
- * @typedef { Object } SharedMethods
- *
- * Core
- * @property { import("./core/base_container_plugin").BaseContainerShared } baseContainer
- * @property { import("./core/clipboard_plugin").ClipboardShared } clipboard
- * @property { import("./core/delete_plugin").DeleteShared } delete
- * @property { import("./core/dialog_plugin").DialogShared } dialog
- * @property { import("./core/dom_plugin").DomShared } dom
- * @property { import("./core/format_plugin").FormatShared } format
- * @property { import("./core/history_plugin").HistoryShared } history
- * @property { import("./core/line_break_plugin").LineBreakShared } lineBreak
- * @property { import("./core/overlay_plugin").OverlayShared } overlay
- * @property { import("./core/protected_node_plugin").ProtectedNodeShared } protectedNode
- * @property { import("./core/sanitize_plugin").SanitizeShared } sanitize
- * @property { import("./core/selection_plugin").SelectionShared } selection
- * @property { import("./core/split_plugin").SplitShared } split
- * @property { import("./core/style_plugin").StyleShared } style
- * @property { import("./core/user_command_plugin").UserCommandShared } userCommand
-
- *
- * Main
- * @property { import("./main/font/color_plugin").ColorShared } color
- * @property { import("./main/font/color_ui_plugin").ColorUIShared } colorUi
- * @property { import("./main/link/link_plugin").LinkShared } link
- * @property { import ("./main/link/link_selection_plugin").LinkSelectionShared } linkSelection
- * @property { import ("./main/media/media_plugin").MediaShared } media
- * @property { import("./main/powerbox/powerbox_plugin").PowerboxShared } powerbox
- * @property { import ("./main/table/table_plugin").TableShared } table
- * @property { import ("./main/toolbar/toolbar_plugin").ToolbarShared } toolbar
- * @property { import ("./main/emoji_plugin").EmojiShared } emoji
- * @property { import ("./main/local_overlay_plugin").LocalOverlayShared } localOverlay
- * @property { import ("./main/tabulation_plugin").TabulationShared } tabulation
- * @property { import ("./main/feff_plugin").FeffShared } feff
- * @property { import ("./main/media/image_plugin").ImageShared } image
- * @property { import ("./main/media/image_crop_plugin").ImageCropShared } imageCrop
- * @property { import ("./main/media/image_post_process_plugin").ImagePostProcessShared } imagePostProcess
- * @property { import ("./main/banner_plugin").BannerShared } banner
- * @property { import ("./main/media/image_save_plugin").ImageSaveShared } imageSave
- *
- * Others
- * @property { import("./others/collaboration/collaboration_odoo_plugin").CollaborationOdooShared } collaborationOdoo
- * @property { import("./others/collaboration/collaboration_plugin").CollaborationShared } collaboration
- * @property { import("./others/dynamic_placeholder_plugin").DynamicPlaceholderShared } dynamicPlaceholder
- */
-
 export const CORE_PLUGINS = [
     BaseContainerPlugin,
     ClipboardPlugin,

From 9d9ae7c95dbb8e91f81235a40493600210b906a7 Mon Sep 17 00:00:00 2001
From: "Robin Lejeune (role)" <role@odoo.com>
Date: Tue, 4 Nov 2025 15:32:24 +0100
Subject: [PATCH 619/673] [IMP] html_builder: document Plugins resources and
 sharedMethods

This commit adds `SharedMethods` and `BuilderResources` for the
html_builder plugins.

task-5249231

Part-of: odoo/odoo#234203
Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 .../static/src/@types/plugins.d.ts            | 144 ++++++++++++++++++
 addons/html_builder/static/src/builder.js     |   6 +
 .../static/src/core/anchor/anchor_plugin.js   |   5 +
 .../static/src/core/builder_actions_plugin.js |   6 +
 .../src/core/builder_component_plugin.js      |   9 ++
 .../core/builder_content_editable_plugin.js   |   7 +
 .../static/src/core/builder_options_plugin.js | 108 +++++++++++--
 .../builder_overlay/builder_overlay_plugin.js |   8 +
 .../static/src/core/cached_model_plugin.js    |   8 +
 .../static/src/core/clone_plugin.js           |  25 +--
 .../static/src/core/color_style_plugin.js     |   1 +
 ...patibility_inline_border_removal_plugin.js |   1 +
 .../src/core/composite_action_plugin.js       |   1 +
 .../src/core/core_builder_action_plugin.js    |  11 ++
 .../src/core/core_setup_editor_plugin.js      |   1 +
 .../static/src/core/customize_tab_plugin.js   |   8 +
 .../src/core/disable_snippets_plugin.js       |   6 +
 .../static/src/core/drag_and_drop_plugin.js   |  68 +++++++++
 .../static/src/core/drop_zone_plugin.js       |  24 +++
 .../src/core/dropzone_selector_plugin.js      |   7 +
 .../core/field_change_replication_plugin.js   |   1 +
 .../core/grid_layout/grid_layout_plugin.js    |   1 +
 .../static/src/core/media_website_plugin.js   |   6 +
 .../static/src/core/move_plugin.js            |  10 ++
 .../static/src/core/operation_plugin.js       |   5 +
 .../overlay_buttons/overlay_buttons_plugin.js |  15 ++
 .../static/src/core/remove_plugin.js          |  17 +++
 .../static/src/core/save_plugin.js            |  41 +++--
 .../static/src/core/save_snippet_plugin.js    |   1 +
 .../static/src/core/setup_editor_plugin.js    |  13 ++
 .../static/src/core/visibility_plugin.js      |  14 ++
 .../static/src/plugins/alert_option_plugin.js |   1 +
 .../background_image_option_plugin.js         |   8 +
 .../background_option_plugin.js               |  10 ++
 .../background_position_option_plugin.js      |   1 +
 .../background_shape_option_plugin.js         |   5 +
 .../static/src/plugins/badge_option_plugin.js |   1 +
 .../plugins/block_alignment_option_plugin.js  |   1 +
 .../src/plugins/cta_badge_option_plugin.js    |   1 +
 .../src/plugins/date_time_field_plugin.js     |   1 +
 .../static/src/plugins/font/font_plugin.js    |   5 +
 .../image/image_filter_option_plugin.js       |   1 +
 .../image/image_format_option_plugin.js       |   1 +
 .../image/image_shape_option_plugin.js        |  15 ++
 .../src/plugins/image/image_size_plugin.js    |   1 +
 .../image/image_snippet_option_plugin.js      |   1 +
 .../plugins/image/image_tool_option_plugin.js |   1 +
 .../image/image_transform_option_plugin.js    |   1 +
 .../static/src/plugins/image_field_plugin.js  |   1 +
 .../plugins/layout_column_option_plugin.js    |   1 +
 .../src/plugins/many2one_option_plugin.js     |   1 +
 .../src/plugins/monetary_field_plugin.js      |   1 +
 .../src/plugins/rating_option_plugin.js       |   1 +
 .../src/plugins/separator_option_plugin.js    |   1 +
 .../src/plugins/shadow_option_plugin.js       |   1 +
 .../plugins/text_alignment_option_plugin.js   |   1 +
 .../vertical_alignment_option_plugin.js       |   1 +
 .../plugins/vertical_justify_option_plugin.js |   1 +
 .../static/src/plugins/width_option_plugin.js |   1 +
 .../static/src/sidebar/block_tab.js           |   4 +
 .../src/sidebar/invisible_elements_panel.js   |   4 +
 .../static/src/snippets/add_snippet_dialog.js |   5 +
 62 files changed, 620 insertions(+), 37 deletions(-)
 create mode 100644 addons/html_builder/static/src/@types/plugins.d.ts

diff --git a/addons/html_builder/static/src/@types/plugins.d.ts b/addons/html_builder/static/src/@types/plugins.d.ts
new file mode 100644
index 0000000000000..72f6123db2f5a
--- /dev/null
+++ b/addons/html_builder/static/src/@types/plugins.d.ts
@@ -0,0 +1,144 @@
+declare module "plugins" {
+    import { AnchorShared } from "@html_builder/core/anchor/anchor_plugin";
+    import { builder_components, BuilderComponentShared } from "@html_builder/core/builder_component_plugin";
+    import { builder_header_middle_buttons, builder_options, BuilderOptionsShared, change_current_options_containers_listeners, clone_disabled_reason_providers, container_title, elements_to_options_title_components, get_options_container_top_buttons, has_overlay_options, no_parent_containers, on_restore_containers_handlers, remove_disabled_reason_providers } from "@html_builder/core/builder_options_plugin";
+    import { BuilderOverlayShared } from "@html_builder/core/builder_overlay/builder_overlay_plugin";
+    import { CachedModelShared } from "@html_builder/core/cached_model_plugin";
+    import { CloneShared, on_cloned_handlers, on_will_clone_handlers } from "@html_builder/core/clone_plugin";
+    import { CustomizeTabShared } from "@html_builder/core/customize_tab_plugin";
+    import { DisableSnippetsShared } from "@html_builder/core/disable_snippets_plugin";
+    import { dropzone_selector, DropZoneShared } from "@html_builder/core/drop_zone_plugin";
+    import { MediaWebsiteShared } from "@html_builder/core/media_website_plugin";
+    import { OperationShared } from "@html_builder/core/operation_plugin";
+    import { get_overlay_buttons, OverlayButtonsShared } from "@html_builder/core/overlay_buttons/overlay_buttons_plugin";
+    import { empty_node_predicates, is_unremovable_selector, on_removed_handlers, on_will_remove_handlers, RemoveShared } from "@html_builder/core/remove_plugin";
+    import { after_save_handlers, before_save_handlers, get_dirty_els, savable_selectors, save_element_handlers, save_elements_overrides, save_handlers, SaveShared } from "@html_builder/core/save_plugin";
+    import { after_setup_editor_handlers, before_setup_editor_handlers, o_editable_selectors, SetupEditorShared } from "@html_builder/core/setup_editor_plugin";
+    import { target_hide, target_show, VisibilityShared } from "@html_builder/core/visibility_plugin";
+    import { default_shape_handlers, post_compute_shape_listeners } from "@html_builder/plugins/image/image_shape_option_plugin";
+    import { background_filter_target_providers, get_target_element_providers, on_bg_image_hide_handlers } from "@html_builder/plugins/background_option/background_image_option_plugin";
+    import { is_draggable_handlers, on_element_dragged_handlers, on_element_dropped_handlers, on_element_dropped_near_handlers, on_element_dropped_over_handlers, on_element_move_handlers, on_element_out_dropzone_handlers, on_element_over_dropzone_handlers, on_prepare_drag_handlers } from "@html_builder/core/drag_and_drop_plugin";
+    import { lower_panel_entries, on_mobile_preview_clicked, trigger_dom_updated } from "@html_builder/builder";
+    import { on_reveal_target_handlers } from "@html_builder/sidebar/invisible_elements_panel";
+    import { on_snippet_dropped_handlers } from "@html_builder/sidebar/block_tab";
+    import { snippet_preview_dialog_bundles, snippet_preview_dialog_stylesheets_handlers } from "@html_builder/snippets/add_snippet_dialog";
+    import { background_shape_target_providers } from "@html_builder/plugins/background_option/background_shape_option_plugin";
+    import { mark_color_level_selector_params } from "@html_builder/plugins/background_option/background_option_plugin";
+    import { is_movable_selector } from "@html_builder/core/move_plugin";
+    import { content_editable_selectors, content_not_editable_selectors } from "@html_builder/core/builder_content_editable_plugin";
+    import { builder_actions } from "@html_builder/core/builder_actions_plugin";
+    import { so_content_addition_selector, so_snippet_addition_selector } from "@html_builder/core/dropzone_selector_plugin";
+    import { fontCssVariables } from "@html_builder/plugins/font/font_plugin";
+    import { apply_custom_css_style } from "@html_builder/core/core_builder_action_plugin";
+
+    interface SharedMethods {
+        // Main
+
+        // Core
+        anchor: AnchorShared;
+        builderActions: BuilderActionsShared;
+        builderComponents: BuilderComponentShared;
+        builderOptions: BuilderOptionsShared;
+        builderOverlay: BuilderOverlayShared;
+        cachedModel: CachedModelShared;
+        clone: CloneShared;
+        customizeTab: CustomizeTabShared;
+        disableSnippets: DisableSnippetsShared;
+        dropzone: DropZoneShared;
+        media_website: MediaWebsiteShared;
+        operation: OperationShared;
+        overlayButtons: OverlayButtonsShared;
+        remove: RemoveShared;
+        savePlugin: SaveShared;
+        setup_editor_plugin: SetupEditorShared;
+        visibility: VisibilityShared;
+
+        // Other
+    }
+
+    interface GlobalResources extends BuilderResources {}
+    export type BuilderResources = EditorResources & ResourcesTypesFactory<BuilderResourcesList>;
+    export interface BuilderResourcesList {
+        // Handlers
+        after_save_handlers: after_save_handlers;
+        after_setup_editor_handlers: after_setup_editor_handlers;
+        before_save_handlers: before_save_handlers;
+        before_setup_editor_handlers: before_setup_editor_handlers;
+        change_current_options_containers_listeners: change_current_options_containers_listeners;
+        default_shape_handlers: default_shape_handlers;
+        on_bg_image_hide_handlers: on_bg_image_hide_handlers;
+        on_cloned_handlers: on_cloned_handlers;
+        on_element_dragged_handlers: on_element_dragged_handlers;
+        on_element_dropped_handlers: on_element_dropped_handlers;
+        on_element_dropped_near_handlers: on_element_dropped_near_handlers;
+        on_element_dropped_over_handlers: on_element_dropped_over_handlers;
+        on_element_move_handlers: on_element_move_handlers;
+        on_element_out_dropzone_handlers: on_element_out_dropzone_handlers;
+        on_element_over_dropzone_handlers: on_element_over_dropzone_handlers;
+        on_mobile_preview_clicked: on_mobile_preview_clicked;
+        on_prepare_drag_handlers: on_prepare_drag_handlers;
+        on_removed_handlers: on_removed_handlers;
+        on_restore_containers_handlers: on_restore_containers_handlers;
+        on_reveal_target_handlers: on_reveal_target_handlers;
+        on_snippet_dropped_handlers: on_snippet_dropped_handlers;
+        on_will_clone_handlers: on_will_clone_handlers;
+        on_will_remove_handlers: on_will_remove_handlers;
+        post_compute_shape_listeners: post_compute_shape_listeners;
+        save_element_handlers: save_element_handlers;
+        save_handlers: save_handlers;
+        snippet_preview_dialog_stylesheets_handlers: snippet_preview_dialog_stylesheets_handlers;
+        target_hide: target_hide;
+        target_show: target_show;
+        trigger_dom_updated: trigger_dom_updated;
+
+        // Overrides
+        apply_custom_css_style: apply_custom_css_style;
+        save_elements_overrides: save_elements_overrides;
+
+        // Predicates
+        empty_node_predicates: empty_node_predicates;
+        is_draggable_handlers: is_draggable_handlers;
+
+        // Processors
+
+        // Providers
+        background_filter_target_providers: background_filter_target_providers;
+        background_shape_target_providers: background_shape_target_providers;
+        clone_disabled_reason_providers: clone_disabled_reason_providers;
+        get_dirty_els: get_dirty_els;
+        get_options_container_top_buttons: get_options_container_top_buttons;
+        get_target_element_providers: get_target_element_providers;
+        remove_disabled_reason_providers: remove_disabled_reason_providers;
+
+        // Data
+        builder_actions: builder_actions;
+        builder_components: builder_components;
+        builder_header_middle_buttons: builder_header_middle_buttons;
+        builder_options: builder_options;
+        container_title: container_title;
+        content_editable_selectors: content_editable_selectors;
+        content_not_editable_selectors: content_not_editable_selectors;
+        dropzone_selector: dropzone_selector;
+        elements_to_options_title_components: elements_to_options_title_components;
+        fontCssVariables: fontCssVariables;
+        get_overlay_buttons: get_overlay_buttons;
+        has_overlay_options: has_overlay_options;
+        is_movable_selector: is_movable_selector;
+        is_unremovable_selector: is_unremovable_selector;
+        lower_panel_entries: lower_panel_entries;
+        mark_color_level_selector_params: mark_color_level_selector_params;
+        no_parent_containers: no_parent_containers;
+        o_editable_selectors: o_editable_selectors;
+        /** @deprecated */
+        patch_builder_options: {
+            target_name: string,
+            target_element: "selector" | "exclude" | "applyTo",
+            method: "replace" | "add" | "remove",
+            value: CSSSelector,
+        }[];
+        savable_selectors: savable_selectors;
+        so_content_addition_selector: so_content_addition_selector;
+        so_snippet_addition_selector: so_snippet_addition_selector;
+        snippet_preview_dialog_bundles: snippet_preview_dialog_bundles;
+    }
+}
diff --git a/addons/html_builder/static/src/builder.js b/addons/html_builder/static/src/builder.js
index 7291ae50153a7..fefd5b566a866 100644
--- a/addons/html_builder/static/src/builder.js
+++ b/addons/html_builder/static/src/builder.js
@@ -26,6 +26,12 @@ import { withSequence } from "@html_editor/utils/resource";
 import { getHtmlStyle } from "@html_editor/utils/formatting";
 import { isVisible } from "@html_builder/utils/utils";
 
+/**
+ * @typedef {(() => void)[]} on_mobile_preview_clicked
+ * @typedef {(() => void)[]} trigger_dom_updated
+ * @typedef {{ Component: Component; props: object; }[]} lower_panel_entries
+ */
+
 export class Builder extends Component {
     static template = "html_builder.Builder";
     static components = { BlockTab, CustomizeTab };
diff --git a/addons/html_builder/static/src/core/anchor/anchor_plugin.js b/addons/html_builder/static/src/core/anchor/anchor_plugin.js
index baf7af8121c7f..d65103facb7aa 100644
--- a/addons/html_builder/static/src/core/anchor/anchor_plugin.js
+++ b/addons/html_builder/static/src/core/anchor/anchor_plugin.js
@@ -15,10 +15,15 @@ export function canHaveAnchor(element) {
     return element.matches(anchorSelector) && !element.matches(anchorExclude);
 }
 
+/**
+ * @typedef { Object } AnchorShared
+ * @property { AnchorPlugin['createOrEditAnchorLink'] } createOrEditAnchorLink
+ */
 export class AnchorPlugin extends Plugin {
     static id = "anchor";
     static dependencies = ["history"];
     static shared = ["createOrEditAnchorLink"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         on_cloned_handlers: this.onCloned.bind(this),
         get_options_container_top_buttons: withSequence(
diff --git a/addons/html_builder/static/src/core/builder_actions_plugin.js b/addons/html_builder/static/src/core/builder_actions_plugin.js
index e813bd0f326eb..198e28f690fb3 100644
--- a/addons/html_builder/static/src/core/builder_actions_plugin.js
+++ b/addons/html_builder/static/src/core/builder_actions_plugin.js
@@ -3,8 +3,14 @@ import { Plugin } from "@html_editor/plugin";
 /**
  * @typedef { import("./builder_action").BuilderAction } BuilderAction
  * @typedef {} BuilderActionConstructor
+ *
+ * @typedef { Object } BuilderActionsShared
+ * @property { BuilderActionsPlugin['getAction'] } getAction
+ * @property { BuilderActionsPlugin['applyAction'] } applyAction
  */
 
+/** @typedef {BuilderAction[]} builder_actions */
+
 export class BuilderActionsPlugin extends Plugin {
     static id = "builderActions";
     static shared = ["getAction", "applyAction"];
diff --git a/addons/html_builder/static/src/core/builder_component_plugin.js b/addons/html_builder/static/src/core/builder_component_plugin.js
index 1041889a623d8..b865e14bbabf4 100644
--- a/addons/html_builder/static/src/core/builder_component_plugin.js
+++ b/addons/html_builder/static/src/core/builder_component_plugin.js
@@ -22,10 +22,19 @@ import { Img } from "./img";
 import { BuilderUrlPicker } from "./building_blocks/builder_urlpicker";
 import { BuilderFontFamilyPicker } from "./building_blocks/builder_fontfamilypicker";
 
+/** @typedef {import("@odoo/owl").Component} Component */
+/**
+ * @typedef { Object } BuilderComponentShared
+ * @property { BuilderComponentPlugin['getComponents'] } getComponents
+ */
+
+/** @typedef {Component[]} builder_components */
+
 export class BuilderComponentPlugin extends Plugin {
     static id = "builderComponents";
     static shared = ["getComponents"];
 
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_components: {
             BuilderContext,
diff --git a/addons/html_builder/static/src/core/builder_content_editable_plugin.js b/addons/html_builder/static/src/core/builder_content_editable_plugin.js
index 23659eee47507..9b866fc7ee658 100644
--- a/addons/html_builder/static/src/core/builder_content_editable_plugin.js
+++ b/addons/html_builder/static/src/core/builder_content_editable_plugin.js
@@ -2,8 +2,15 @@ import { Plugin } from "@html_editor/plugin";
 import { selectElements } from "@html_editor/utils/dom_traversal";
 import { registry } from "@web/core/registry";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/**
+ * @typedef {CSSSelector[]} content_editable_selectors
+ * @typedef {CSSSelector[]} content_not_editable_selectors
+ */
+
 export class BuilderContentEditablePlugin extends Plugin {
     static id = "builderContentEditablePlugin";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         content_not_editable_selectors: [
             "section:has(> .o_container_small, > .container, > .container-fluid)",
diff --git a/addons/html_builder/static/src/core/builder_options_plugin.js b/addons/html_builder/static/src/core/builder_options_plugin.js
index fd513f8e87292..4505fa7f89dee 100644
--- a/addons/html_builder/static/src/core/builder_options_plugin.js
+++ b/addons/html_builder/static/src/core/builder_options_plugin.js
@@ -6,6 +6,102 @@ import { getElementsWithOption, isElementInViewport } from "@html_builder/utils/
 import { shouldEditableMediaBeEditable } from "@html_builder/utils/utils_css";
 import { OptionsContainer } from "@html_builder/sidebar/option_container";
 
+/** @typedef {import("@html_builder/core/utils").BaseOptionComponent} BaseOptionComponent */
+/** @typedef {import("@odoo/owl").Component} Component */
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/** @typedef {import("plugins").LazyTranslatedString} LazyTranslatedString */
+/**
+ * @typedef {{
+ *        class: string;
+ *        title: LazyTranslatedString;
+ *        handler: () => Promise<void>;
+ *        disabledReason?: string;
+ * }} BuilderButtonDescriptor
+ *
+ * @typedef {{
+ *     id: string;
+ *     element: HTMLElement;
+ *     options: BaseOptionComponent[];
+ *     optionTitleComponents: BaseOptionComponent[] | [];
+ *     headerMiddleButtons: Component[] | [];
+ *     containerTitle: Component | {};
+ *     hasOverlayOptions: boolean;
+ *     isRemovable: boolean;
+ *     removeDisabledReason: string;
+ *     isClonable: boolean;
+ *     cloneDisabledReason: string;
+ *     optionsContainerTopButtons: BuilderButtonDescriptor[] | [];
+ * }} BuilderOptionContainer
+ */
+
+/**
+ * @typedef { Object } BuilderOptionsShared
+ * @property { BuilderOptionsPlugin['computeContainers'] } computeContainers
+ * @property { BuilderOptionsPlugin['findOption'] } findOption
+ * @property { BuilderOptionsPlugin['getContainers'] } getContainers
+ * @property { BuilderOptionsPlugin['updateContainers'] } updateContainers
+ * @property { BuilderOptionsPlugin['deactivateContainers'] } deactivateContainers
+ * @property { BuilderOptionsPlugin['getTarget'] } getTarget
+ * @property { BuilderOptionsPlugin['getPageContainers'] } getPageContainers
+ * @property { BuilderOptionsPlugin['getRemoveDisabledReason'] } getRemoveDisabledReason
+ * @property { BuilderOptionsPlugin['getCloneDisabledReason'] } getCloneDisabledReason
+ * @property { BuilderOptionsPlugin['getReloadSelector'] } getReloadSelector
+ * @property { BuilderOptionsPlugin['setNextTarget'] } setNextTarget
+ * @property { BuilderOptionsPlugin['getBuilderOptionContext'] } getBuilderOptionContext
+ */
+
+/**
+ * @typedef {((containers: BuilderOptionContainer[]) => void)[]} change_current_options_containers_listeners
+ * @typedef {((newTargetEl: HTMLElement) => void)[]} on_restore_containers_handlers
+ *
+ * @typedef {((el: HTMLElement) => [] | BuilderButtonDescriptor[])[]} get_options_container_top_buttons
+ *
+ * @typedef {{
+ *     Component: Component;
+ *     selector: CSSSelector;
+ *     exclude: CSSSelector;
+ *     applyTo: CSSSelector;
+ *     props: object;
+ *     editableOnly?: boolean;
+ * }[]} builder_header_middle_buttons
+ * @typedef {BaseOptionComponent[]} builder_options
+ * @typedef {{
+ *     selector: CSSSelector;
+ *     getTitleExtraInfo: (editingElement: HTMLElement) => string;
+ * }[]} container_title
+ * @typedef {{
+ *      Component: BaseOptionComponent;
+ *      selector: CSSSelector;
+ * }[]} elements_to_options_title_components
+ * @typedef {{
+ *      hasOption: (el: HTMLElement) => boolean;
+ *      editableOnly?: boolean;
+ * }[]} has_overlay_options
+ * @typedef {CSSSelector[]} no_parent_containers
+ */
+/**
+ * @typedef {((arg: { el: HTMLElement, reasons: [] }) => void)[]} clone_disabled_reason_providers
+ *
+ * Appends new reasons to the `reasons` array given as a parameter.
+ *
+ * Example:
+ *
+ *     ({ el, reasons }) => {
+ *         reasons.push(`I hate ${el.dataset.name}`);
+ *     }
+ */
+/**
+ * @typedef {((arg: { el: HTMLElement, reasons: [] }) => void)[]} remove_disabled_reason_providers
+ *
+ * Appends new reasons to the `reasons` array given as a parameter.
+ *
+ * Example:
+ *
+ *     ({ el, reasons }) => {
+ *         reasons.push(`I hate ${el.dataset.name}`);
+ *     }
+ */
+
 export class BuilderOptionsPlugin extends Plugin {
     static id = "builderOptions";
     static dependencies = [
@@ -30,23 +126,13 @@ export class BuilderOptionsPlugin extends Plugin {
         "setNextTarget",
         "getBuilderOptionContext",
     ];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         before_add_step_handlers: this.onWillAddStep.bind(this),
         step_added_handlers: this.onStepAdded.bind(this),
         post_undo_handlers: (revertedStep) => this.restoreContainers(revertedStep, "undo"),
         post_redo_handlers: (revertedStep) => this.restoreContainers(revertedStep, "redo"),
         clean_for_save_handlers: this.cleanForSave.bind(this),
-        // Resources definitions:
-        remove_disabled_reason_providers: [
-            // ({ el, reasons }) => {
-            //     reasons.push(`I hate ${el.dataset.name}`);
-            // }
-        ],
-        clone_disabled_reason_providers: [
-            // ({ el, reasons }) => {
-            //     reasons.push(`I hate ${el.dataset.name}`);
-            // }
-        ],
         start_edition_handlers: () => {
             if (this.config.initialTarget) {
                 const el = this.editable.querySelector(this.config.initialTarget);
diff --git a/addons/html_builder/static/src/core/builder_overlay/builder_overlay_plugin.js b/addons/html_builder/static/src/core/builder_overlay/builder_overlay_plugin.js
index c987c17cf7469..dc41fbd029bad 100644
--- a/addons/html_builder/static/src/core/builder_overlay/builder_overlay_plugin.js
+++ b/addons/html_builder/static/src/core/builder_overlay/builder_overlay_plugin.js
@@ -12,10 +12,18 @@ function isResizable(el) {
     return isResizableY || isResizableX || isResizableGrid;
 }
 
+/**
+ * @typedef { Object } BuilderOverlayShared
+ * @property { BuilderOverlayPlugin['showOverlayPreview'] } showOverlayPreview
+ * @property { BuilderOverlayPlugin['hideOverlayPreview'] } hideOverlayPreview
+ * @property { BuilderOverlayPlugin['refreshOverlays'] } refreshOverlays
+ */
+
 export class BuilderOverlayPlugin extends Plugin {
     static id = "builderOverlay";
     static dependencies = ["localOverlay", "history", "operation"];
     static shared = ["showOverlayPreview", "hideOverlayPreview", "refreshOverlays"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         step_added_handlers: this.refreshOverlays.bind(this),
         change_current_options_containers_listeners: this.openBuilderOverlays.bind(this),
diff --git a/addons/html_builder/static/src/core/cached_model_plugin.js b/addons/html_builder/static/src/core/cached_model_plugin.js
index 0679e1da7678f..77d36f1dc7e14 100644
--- a/addons/html_builder/static/src/core/cached_model_plugin.js
+++ b/addons/html_builder/static/src/core/cached_model_plugin.js
@@ -2,10 +2,18 @@ import { Plugin } from "@html_editor/plugin";
 import { Cache } from "@web/core/utils/cache";
 import { ModelEdit } from "./cached_model_utils";
 
+/**
+ * @typedef { Object } CachedModelShared
+ * @property { CachedModelPlugin['ormRead'] } ormRead
+ * @property { CachedModelPlugin['ormSearchRead'] } ormSearchRead
+ * @property { CachedModelPlugin['useModelEdit'] } useModelEdit
+ */
+
 export class CachedModelPlugin extends Plugin {
     static id = "cachedModel";
     static shared = ["ormRead", "ormSearchRead", "useModelEdit"];
     static dependencies = ["history"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         save_handlers: this.savePendingRecords.bind(this),
     };
diff --git a/addons/html_builder/static/src/core/clone_plugin.js b/addons/html_builder/static/src/core/clone_plugin.js
index ed67002b83249..aa1b10dcd4cb4 100644
--- a/addons/html_builder/static/src/core/clone_plugin.js
+++ b/addons/html_builder/static/src/core/clone_plugin.js
@@ -5,6 +5,19 @@ import { isElementInViewport } from "@html_builder/utils/utils";
 import { isRemovable } from "./remove_plugin";
 import { BuilderAction } from "@html_builder/core/builder_action";
 
+/**
+ * @typedef { Object } CloneShared
+ * @property { ClonePlugin['cloneElement'] } cloneElement
+ */
+
+/**
+ * @typedef {((arg: { cloneEl: HTMLElement, originalEl: HTMLElement }) => Promise<void>)[]} on_cloned_handlers
+ * Called after an element was cloned and inserted in the DOM.
+ *
+ * @typedef {((arg: { originalEl: HTMLElement }) => void)[]} on_will_clone_handlers
+ * Called on the original element before clone.
+ */
+
 const clonableSelector = "a.btn:not(.oe_unremovable)";
 
 export function isClonable(el) {
@@ -17,6 +30,7 @@ export class ClonePlugin extends Plugin {
     static dependencies = ["history", "builderOptions", "dom"];
     static shared = ["cloneElement"];
 
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             // Maybe rename cloneItem ?
@@ -25,17 +39,6 @@ export class ClonePlugin extends Plugin {
         get_overlay_buttons: withSequence(2, {
             getButtons: this.getActiveOverlayButtons.bind(this),
         }),
-        // Resource definitions:
-        on_will_clone_handlers: [
-            // ({ originalEl: el }) => {
-            //     called on the original element before clone
-            // }
-        ],
-        on_cloned_handlers: [
-            // async ({ cloneEl: cloneEl, originalEl: el }) => {
-            //     called after an element was cloned and inserted in the DOM
-            // }
-        ],
     };
 
     setup() {
diff --git a/addons/html_builder/static/src/core/color_style_plugin.js b/addons/html_builder/static/src/core/color_style_plugin.js
index ac37ee7c37122..591287f14792c 100644
--- a/addons/html_builder/static/src/core/color_style_plugin.js
+++ b/addons/html_builder/static/src/core/color_style_plugin.js
@@ -6,6 +6,7 @@ import { withSequence } from "@html_editor/utils/resource";
 class ColorStylePlugin extends Plugin {
     static id = "colorStyle";
     static dependencies = ["color"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         apply_color_style_overrides: withSequence(5, (element, cssProp, color) => {
             applyNeededCss(element, cssProp, color);
diff --git a/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js b/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js
index b517b5bb172cc..5391b6d741bc0 100644
--- a/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js
+++ b/addons/html_builder/static/src/core/compatibility_inline_border_removal_plugin.js
@@ -15,6 +15,7 @@ const OLD_STYLES = ["border-width", "border-radius"];
 
 export class CompatibilityInlineBorderRemovalPlugin extends Plugin {
     static id = "compatibilityInlineBorderRemoval";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         apply_custom_css_style: withSequence(20, this.removeInlineBorderIfNecessary.bind(this)),
     };
diff --git a/addons/html_builder/static/src/core/composite_action_plugin.js b/addons/html_builder/static/src/core/composite_action_plugin.js
index 7ec33276149e1..378427d1d91e5 100644
--- a/addons/html_builder/static/src/core/composite_action_plugin.js
+++ b/addons/html_builder/static/src/core/composite_action_plugin.js
@@ -6,6 +6,7 @@ export class CompositeActionPlugin extends Plugin {
     static id = "compositeAction";
     static dependencies = ["builderActions"];
 
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             CompositeAction,
diff --git a/addons/html_builder/static/src/core/core_builder_action_plugin.js b/addons/html_builder/static/src/core/core_builder_action_plugin.js
index 1cb2420488c26..e4a85887881b4 100644
--- a/addons/html_builder/static/src/core/core_builder_action_plugin.js
+++ b/addons/html_builder/static/src/core/core_builder_action_plugin.js
@@ -9,6 +9,16 @@ import {
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { getValueFromVar } from "@html_builder/utils/utils";
 
+/** @typedef {import("@html_builder/core/builder_action").ActionParams} ActionParams */
+/** @typedef {import("@html_builder/core/builder_action").ActionValue} ActionValue */
+/**
+ * @typedef {((
+ *      editingElement: HTMLElement,
+ *      params: ActionParams,
+ *      value: ActionValue,
+ * ) => boolean)[]} apply_custom_css_style
+ */
+
 export function withoutTransition(editingElement, callback) {
     if (editingElement.classList.contains("o_we_force_no_transition")) {
         return callback();
@@ -23,6 +33,7 @@ export function withoutTransition(editingElement, callback) {
 
 export class CoreBuilderActionPlugin extends Plugin {
     static id = "coreBuilderAction";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             ClassAction,
diff --git a/addons/html_builder/static/src/core/core_setup_editor_plugin.js b/addons/html_builder/static/src/core/core_setup_editor_plugin.js
index 900036f23cd81..5176f0dba1430 100644
--- a/addons/html_builder/static/src/core/core_setup_editor_plugin.js
+++ b/addons/html_builder/static/src/core/core_setup_editor_plugin.js
@@ -2,6 +2,7 @@ import { Plugin } from "@html_editor/plugin";
 
 export class CoreSetupEditorPlugin extends Plugin {
     static id = "core_setup_editor_plugin";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         o_editable_selectors: "[data-oe-model]",
     };
diff --git a/addons/html_builder/static/src/core/customize_tab_plugin.js b/addons/html_builder/static/src/core/customize_tab_plugin.js
index b9cc9dbfa46a2..028cfc62dd16e 100644
--- a/addons/html_builder/static/src/core/customize_tab_plugin.js
+++ b/addons/html_builder/static/src/core/customize_tab_plugin.js
@@ -2,9 +2,17 @@ import { Plugin } from "@html_editor/plugin";
 import { reactive } from "@odoo/owl";
 import { registry } from "@web/core/registry";
 
+/**
+ * @typedef { Object } CustomizeTabShared
+ * @property { CustomizeTabPlugin['getCustomizeComponent'] } getCustomizeComponent
+ * @property { CustomizeTabPlugin['openCustomizeComponent'] } openCustomizeComponent
+ * @property { CustomizeTabPlugin['closeCustomizeComponent'] } closeCustomizeComponent
+ */
+
 export class CustomizeTabPlugin extends Plugin {
     static id = "customizeTab";
     static shared = ["getCustomizeComponent", "openCustomizeComponent", "closeCustomizeComponent"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         post_redo_handlers: () => this.closeCustomizeComponent(),
         post_undo_handlers: () => this.closeCustomizeComponent(),
diff --git a/addons/html_builder/static/src/core/disable_snippets_plugin.js b/addons/html_builder/static/src/core/disable_snippets_plugin.js
index 54b5c560f906c..c40dac3f75c2f 100644
--- a/addons/html_builder/static/src/core/disable_snippets_plugin.js
+++ b/addons/html_builder/static/src/core/disable_snippets_plugin.js
@@ -2,10 +2,16 @@ import { omit } from "@web/core/utils/objects";
 import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * @typedef { Object } DisableSnippetsShared
+ * @property { DisableSnippetsPlugin['disableUndroppableSnippets'] } disableUndroppableSnippets
+ */
+
 export class DisableSnippetsPlugin extends Plugin {
     static id = "disableSnippets";
     static dependencies = ["setup_editor_plugin", "dropzone", "dropzone_selector"];
     static shared = ["disableUndroppableSnippets"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         on_removed_handlers: this.disableUndroppableSnippets.bind(this),
         post_undo_handlers: this.disableUndroppableSnippets.bind(this),
diff --git a/addons/html_builder/static/src/core/drag_and_drop_plugin.js b/addons/html_builder/static/src/core/drag_and_drop_plugin.js
index 15126b164d654..1da350b2ecbae 100644
--- a/addons/html_builder/static/src/core/drag_and_drop_plugin.js
+++ b/addons/html_builder/static/src/core/drag_and_drop_plugin.js
@@ -8,9 +8,76 @@ import { rowSize } from "@html_builder/utils/grid_layout_utils";
 import { isEditable, isVisible } from "@html_builder/utils/utils";
 import { DragAndDropMoveHandle } from "./drag_and_drop_move_handle";
 
+/**
+ * @typedef {{
+ *     columnWidth: number;
+ *     columnHeight: number;
+ *     columnSpan: number;
+ *     currentDropzoneEl: HTMLElement;
+ *     currentHeight: number;
+ *     draggedEl: HTMLElement;
+ *     dropCloneEl: HTMLElement;
+ *     hasSamePositionAsStart?: () => boolean;
+ *     marginToAdd: string[];
+ *     mousePositionYOnElement: number;
+ *     mousePositionXOnElement: number;
+ *     overFirstDropzone: boolean;
+ *     overGrid: boolean;
+ *     restoreCallbacks?: ReturnType<on_prepare_drag_handlers[0]>[] | null;
+ *     restoreGridItem?: () => void;
+ *     rowSpan: number;
+ *     snippet: { gridColumnSpan?: number };
+ *     startGridArea: string;
+ *     startGridEl: HTMLElement;
+ *     startMiddle: number;
+ *     startNextEl: HTMLElement | undefined;
+ *     startParentEl: HTMLElement;
+ *     startPreviousEl: HTMLElement | undefined;
+ *     startTop: number;
+ *     startZindex: string;
+ * }} DragState
+ */
+/**
+ * @typedef {((arg: {
+ *      draggedEl: HTMLElement,
+ *      dragState: DragState,
+ * }) => void)[]} on_element_dragged_handlers
+ * @typedef {((arg: {
+ *      droppedEl: HTMLElement,
+ *      dragState: DragState,
+ * }) => Promise<boolean>)[]} on_element_dropped_handlers
+ * @typedef {((arg: {
+ *      droppedEl: HTMLElement,
+ *      dropzoneEl: HTMLElement,
+ *      dragState: DragState,
+ * }) => void)[]} on_element_dropped_near_handlers
+ * @typedef {((arg: {
+ *      droppedEl: HTMLElement,
+ *      dragState: DragState,
+ * }) => void)[]} on_element_dropped_over_handlers
+ * @typedef {((arg: {
+ *      draggedEl: HTMLElement,
+ *      dragState: DragState,
+ *      x: number,
+ *      y: number,
+ * }) => void)[]} on_element_move_handlers
+ * @typedef {((arg: {
+ *      draggedEl: HTMLElement,
+ *      dragState: DragState,
+ * }) => void)[]} on_element_out_dropzone_handlers
+ * @typedef {((arg: {
+ *      draggedEl: HTMLElement,
+ *      dragState: DragState,
+ * }) => void)[]} on_element_over_dropzone_handlers
+ * @typedef {(() => (() => void))[]} on_prepare_drag_handlers
+ *
+ * @typedef {((el: HTMLElement) => boolean)[]} is_draggable_handlers
+ */
+
 export class DragAndDropPlugin extends Plugin {
     static id = "dragAndDrop";
     static dependencies = ["dropzone", "history", "operation", "builderOptions"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         has_overlay_options: { hasOption: (el) => this.isDraggable(el) },
         get_overlay_buttons: withSequence(1, {
@@ -162,6 +229,7 @@ export class DragAndDropPlugin extends Plugin {
                 };
 
                 this.dragStarted = true;
+                /** @type {DragState} */
                 this.dragState = {};
                 dropzoneEls = [];
 
diff --git a/addons/html_builder/static/src/core/drop_zone_plugin.js b/addons/html_builder/static/src/core/drop_zone_plugin.js
index 91c136ae7fd1c..87e3f361ad9f1 100644
--- a/addons/html_builder/static/src/core/drop_zone_plugin.js
+++ b/addons/html_builder/static/src/core/drop_zone_plugin.js
@@ -4,6 +4,29 @@ import { isElement } from "@html_editor/utils/dom_info";
 import { closestElement } from "@html_editor/utils/dom_traversal";
 import { _t } from "@web/core/l10n/translation";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/**
+ * @typedef {{
+ *     selector: CSSSelector;
+ *     exclude: CSSSelector;
+ *     dropIn: CSSSelector;
+ *     dropNear: CSSSelector;
+ *     excludeNearParent: CSSSelector;
+ * }} DropzoneSelector
+ *
+ * @typedef { Object } DropZoneShared
+ * @property { DropZonePlugin['activateDropzones'] } activateDropzones
+ * @property { DropZonePlugin['removeDropzones'] } removeDropzones
+ * @property { DropZonePlugin['getDropRootElement'] } getDropRootElement
+ * @property { DropZonePlugin['getSelectorSiblings'] } getSelectorSiblings
+ * @property { DropZonePlugin['getSelectorChildren'] } getSelectorChildren
+ * @property { DropZonePlugin['getSelectors'] } getSelectors
+ */
+
+/**
+ * @typedef {DropzoneSelector[]} dropzone_selector
+ */
+
 export class DropZonePlugin extends Plugin {
     static id = "dropzone";
     static dependencies = ["history", "setup_editor_plugin"];
@@ -15,6 +38,7 @@ export class DropZonePlugin extends Plugin {
         "getSelectorChildren",
         "getSelectors",
     ];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         savable_mutation_record_predicates: (record) => {
             if (record.type === "childList") {
diff --git a/addons/html_builder/static/src/core/dropzone_selector_plugin.js b/addons/html_builder/static/src/core/dropzone_selector_plugin.js
index 96b3990569ba6..ab65884d5edfc 100644
--- a/addons/html_builder/static/src/core/dropzone_selector_plugin.js
+++ b/addons/html_builder/static/src/core/dropzone_selector_plugin.js
@@ -1,5 +1,11 @@
 import { Plugin } from "@html_editor/plugin";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/**
+ * @typedef {CSSSelector[]} so_content_addition_selector
+ * @typedef {CSSSelector[]} so_snippet_addition_selector
+ */
+
 const card_parent_handlers =
     ".s_three_columns .row > div, .s_comparisons .row > div, .s_cards_grid .row > div, .s_cards_soft .row > div, .s_product_list .row > div, .s_newsletter_centered .row > div, .s_company_team_spotlight .row > div, .s_comparisons_horizontal .row > div, .s_company_team_grid .row > div, .s_company_team_card .row > div, .s_carousel_cards_item";
 const special_cards_selector = `.s_card.s_timeline_card, div:is(${card_parent_handlers}) > .s_card`;
@@ -11,6 +17,7 @@ const so_snippet_addition_drop_in =
 
 export class DropZoneSelectorPlugin extends Plugin {
     static id = "dropzone_selector";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         dropzone_selector: [
             {
diff --git a/addons/html_builder/static/src/core/field_change_replication_plugin.js b/addons/html_builder/static/src/core/field_change_replication_plugin.js
index 29b2ae187cdf8..9809ddb568d1b 100644
--- a/addons/html_builder/static/src/core/field_change_replication_plugin.js
+++ b/addons/html_builder/static/src/core/field_change_replication_plugin.js
@@ -6,6 +6,7 @@ export class FieldChangeReplicationPlugin extends Plugin {
     static id = "fieldChangeReplication";
     static dependencies = ["dom"];
 
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         handleNewRecords: this.handleMutations.bind(this),
         normalize_handlers: withSequence(9000, this.normalizeHandler.bind(this)),
diff --git a/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js b/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js
index b00053626ff0f..2d1d9488fb690 100644
--- a/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js
+++ b/addons/html_builder/static/src/core/grid_layout/grid_layout_plugin.js
@@ -26,6 +26,7 @@ function isGridItem(el) {
 export class GridLayoutPlugin extends Plugin {
     static id = "gridLayout";
     static dependencies = ["selection", "builderOptions"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         get_overlay_buttons: withSequence(0, {
             getButtons: this.getActiveOverlayButtons.bind(this),
diff --git a/addons/html_builder/static/src/core/media_website_plugin.js b/addons/html_builder/static/src/core/media_website_plugin.js
index 3606f6039b2fa..91ec724f60824 100644
--- a/addons/html_builder/static/src/core/media_website_plugin.js
+++ b/addons/html_builder/static/src/core/media_website_plugin.js
@@ -5,11 +5,17 @@ import { shouldEditableMediaBeEditable } from "@html_builder/utils/utils_css";
 import { _t } from "@web/core/l10n/translation";
 import { Tooltip } from "@web/core/tooltip/tooltip";
 
+/**
+ * @typedef { Object } MediaWebsiteShared
+ * @property { MediaWebsitePlugin['replaceMedia'] } replaceMedia
+ */
+
 export class MediaWebsitePlugin extends Plugin {
     static id = "media_website";
     static dependencies = ["media", "selection", "builderOptions"];
     static shared = ["replaceMedia"];
 
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         on_replaced_media_handlers: ({ newMediaEl }) =>
             // Activate the new media options.
diff --git a/addons/html_builder/static/src/core/move_plugin.js b/addons/html_builder/static/src/core/move_plugin.js
index 82a3b6a8042bf..2cec1c26f170f 100644
--- a/addons/html_builder/static/src/core/move_plugin.js
+++ b/addons/html_builder/static/src/core/move_plugin.js
@@ -10,9 +10,19 @@ import { isElementInViewport } from "@html_builder/utils/utils";
 import { scrollTo } from "@html_builder/utils/scrolling";
 import { localization } from "@web/core/l10n/localization";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/**
+ * @typedef {{
+ *     selector: CSSSelector;
+ *     exclude?: CSSSelector;
+ *     direction: "horizontal" | "vertical";
+ *     noScroll?: boolean;
+ * }[]} is_movable_selector
+ */
 export class MovePlugin extends Plugin {
     static id = "move";
     static dependencies = ["visibility"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         has_overlay_options: { hasOption: (el) => this.isMovable(el) },
         get_overlay_buttons: withSequence(0, {
diff --git a/addons/html_builder/static/src/core/operation_plugin.js b/addons/html_builder/static/src/core/operation_plugin.js
index c6da8bb8e0997..4ebda55b6a25b 100644
--- a/addons/html_builder/static/src/core/operation_plugin.js
+++ b/addons/html_builder/static/src/core/operation_plugin.js
@@ -4,6 +4,11 @@ import { useComponent } from "@odoo/owl";
 
 /** @typedef {import("./operation").OperationParams} OperationParams */
 
+/**
+ * @typedef { Object } OperationShared
+ * @property { OperationPlugin['next'] } next
+ */
+
 export class OperationPlugin extends Plugin {
     static id = "operation";
     static dependencies = ["history"];
diff --git a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js
index 60b90cc9ded37..01cb45101f6b5 100644
--- a/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js
+++ b/addons/html_builder/static/src/core/overlay_buttons/overlay_buttons_plugin.js
@@ -6,6 +6,20 @@ import { checkElement } from "../builder_options_plugin";
 import { OverlayButtons } from "./overlay_buttons";
 import { withSequence } from "@html_editor/utils/resource";
 
+/** @typedef {import("@html_builder/core/builder_options_plugin").BuilderButtonDescriptor} BuilderButtonDescriptor */
+/**
+ * @typedef { Object } OverlayButtonsShared
+ * @property { OverlayButtonsPlugin['hideOverlayButtons'] } hideOverlayButtons
+ * @property { OverlayButtonsPlugin['showOverlayButtons'] } showOverlayButtons
+ * @property { OverlayButtonsPlugin['hideOverlayButtonsUi'] } hideOverlayButtonsUi
+ * @property { OverlayButtonsPlugin['showOverlayButtonsUi'] } showOverlayButtonsUi
+ */
+/**
+ * @typedef {{
+ *      getButtons: (target: HTMLElement) => BuilderButtonDescriptor;
+ * }[]} get_overlay_buttons
+ */
+
 export class OverlayButtonsPlugin extends Plugin {
     static id = "overlayButtons";
     static dependencies = ["selection", "overlay", "history", "operation", "toolbar"];
@@ -15,6 +29,7 @@ export class OverlayButtonsPlugin extends Plugin {
         "hideOverlayButtonsUi",
         "showOverlayButtonsUi",
     ];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         selectionchange_handlers: this.shouldShowToolbar.bind(this),
         selection_leave_handlers: this.showOverlayButtonsUi.bind(this),
diff --git a/addons/html_builder/static/src/core/remove_plugin.js b/addons/html_builder/static/src/core/remove_plugin.js
index 329f854334b8c..6088101efcd86 100644
--- a/addons/html_builder/static/src/core/remove_plugin.js
+++ b/addons/html_builder/static/src/core/remove_plugin.js
@@ -6,6 +6,22 @@ import { isUnremovableQWebElement as qwebPluginPredicate } from "@html_editor/ot
 import { isEditable } from "@html_builder/utils/utils";
 import { closestElement } from "@html_editor/utils/dom_traversal";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+
+/**
+ * @typedef { Object } RemoveShared
+ * @property { RemovePlugin['removeElement'] } removeElement
+ */
+
+/**
+ * @typedef {((arg: { removedEl: HTMLElement, nextTargetEl: HTMLElement }) => void)[]} on_removed_handlers
+ * @typedef {((toRemoveEl: HTMLElement) => void)[]} on_will_remove_handlers
+ *
+ * @typedef {((el: HTMLElement) => boolean)[]} empty_node_predicates
+ *
+ * @typedef {CSSSelector[]} is_unremovable_selector
+ */
+
 const unremovableNodePredicates = [
     (node) => !isEditable(node.parentNode),
     ...deletePluginPredicates,
@@ -20,6 +36,7 @@ export function isRemovable(el) {
 export class RemovePlugin extends Plugin {
     static id = "remove";
     static dependencies = ["builderOptions", "visibility"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         get_overlay_buttons: withSequence(3, {
             getButtons: this.getActiveOverlayButtons.bind(this),
diff --git a/addons/html_builder/static/src/core/save_plugin.js b/addons/html_builder/static/src/core/save_plugin.js
index 2fd7b78b54273..3722c6a8e9d4c 100644
--- a/addons/html_builder/static/src/core/save_plugin.js
+++ b/addons/html_builder/static/src/core/save_plugin.js
@@ -3,11 +3,37 @@ import { withSequence } from "@html_editor/utils/resource";
 import { groupBy } from "@web/core/utils/arrays";
 import { uniqueId } from "@web/core/utils/functions";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/**
+ * @typedef { Object } SaveShared
+ * @property { SavePlugin['save'] } save
+ * @property { SavePlugin['ignoreDirty'] } ignoreDirty
+ */
+
+/**
+ * @typedef {(() => void)[]} after_save_handlers
+ * @typedef {((el: HTMLElement) => Promise<Map<string,string> | void>)[]} before_save_handlers
+ * Called at the very beginning of the save process.
+ *
+ * @typedef {((el: HTMLElement) => Promise<void>)[]} save_element_handlers
+ * Called when saving an element (in parallel to saving the view).
+ *
+ * @typedef {(() => Promise<boolean>)[]} save_handlers
+ * Called at the very end of the save process.
+ *
+ * @typedef {((cleanedEls: HTMLElement[]) => Promise<boolean>)[]} save_elements_overrides
+ *
+ * @typedef {(() => HTMLElement[] | NodeList)[]} get_dirty_els
+ *
+ * @typedef {CSSSelector[]} savable_selectors
+ */
+
 export class SavePlugin extends Plugin {
     static id = "savePlugin";
     static shared = ["save", "ignoreDirty"];
     static dependencies = ["history"];
 
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         handleNewRecords: this.handleMutations.bind(this),
         start_edition_handlers: this.startObserving.bind(this),
@@ -17,27 +43,12 @@ export class SavePlugin extends Plugin {
             "#wrapwrap [data-oe-field]:not([data-oe-sanitize-prevent-edition])",
             "#wrapwrap .s_cover[data-res-model]",
         ],
-        before_save_handlers: [
-            // async () => {
-            //     called at the very beginning of the save process
-            // }
-        ],
         clean_for_save_handlers: [
             // ({root}) => {
             //     clean DOM before save (leaving edit mode)
             //     root is the clone of a node that was o_dirty
             // }
         ],
-        save_element_handlers: [
-            // async (el) => {
-            //     called when saving an element (in parallel to saving the view)
-            // }
-        ],
-        save_handlers: [
-            // async () => {
-            //     called at the very end of the save process
-            // }
-        ],
         get_dirty_els: () => this.editable.querySelectorAll(".o_dirty"),
         // Do not change the sequence of this resource, it must stay the first
         // one to avoid marking dirty when not needed during the drag and drop.
diff --git a/addons/html_builder/static/src/core/save_snippet_plugin.js b/addons/html_builder/static/src/core/save_snippet_plugin.js
index e68ce000e3cb9..4be24d8ccc20b 100644
--- a/addons/html_builder/static/src/core/save_snippet_plugin.js
+++ b/addons/html_builder/static/src/core/save_snippet_plugin.js
@@ -15,6 +15,7 @@ function isSavable(el) {
 
 export class SaveSnippetPlugin extends Plugin {
     static id = "saveSnippet";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         get_options_container_top_buttons: withSequence(
             1,
diff --git a/addons/html_builder/static/src/core/setup_editor_plugin.js b/addons/html_builder/static/src/core/setup_editor_plugin.js
index c3046edd9c7e6..4903da2f52c8e 100644
--- a/addons/html_builder/static/src/core/setup_editor_plugin.js
+++ b/addons/html_builder/static/src/core/setup_editor_plugin.js
@@ -2,9 +2,22 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { _t } from "@web/core/l10n/translation";
 
+/**
+ * @typedef { Object } SetupEditorShared
+ * @property { SetupEditorPlugin['getEditableAreas'] } getEditableAreas
+ */
+
+/**
+ * @typedef {(() => void | true)[]} after_setup_editor_handlers
+ * @typedef {(() => void)[]} before_setup_editor_handlers
+ *
+ * @typedef {CSSSelector[]} o_editable_selectors
+ */
+
 export class SetupEditorPlugin extends Plugin {
     static id = "setup_editor_plugin";
     static shared = ["getEditableAreas"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         clean_for_save_handlers: this.cleanForSave.bind(this),
         closest_savable_providers: withSequence(10, (el) => el.closest(".o_editable")),
diff --git a/addons/html_builder/static/src/core/visibility_plugin.js b/addons/html_builder/static/src/core/visibility_plugin.js
index 215693c524aeb..3a390aee2b5f7 100644
--- a/addons/html_builder/static/src/core/visibility_plugin.js
+++ b/addons/html_builder/static/src/core/visibility_plugin.js
@@ -2,6 +2,19 @@ import { Plugin } from "@html_editor/plugin";
 import { getElementsWithOption } from "@html_builder/utils/utils";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * @typedef { Object } VisibilityShared
+ * @property { VisibilityPlugin['getVisibleSibling'] } getVisibleSibling
+ * @property { VisibilityPlugin['toggleTargetVisibility'] } toggleTargetVisibility
+ * @property { VisibilityPlugin['onOptionVisibilityUpdate'] } onOptionVisibilityUpdate
+ * @property { VisibilityPlugin['hideElement'] } hideElement
+ */
+
+/**
+ * @typedef {((targetEl: HTMLElement) => void)[]} target_hide
+ * @typedef {((targetEl: HTMLElement) => void)[]} target_show
+ */
+
 const invisibleElementsSelector =
     ".o_snippet_invisible, .o_snippet_mobile_invisible, .o_snippet_desktop_invisible";
 const deviceInvisibleSelector = ".o_snippet_mobile_invisible, .o_snippet_desktop_invisible";
@@ -15,6 +28,7 @@ export class VisibilityPlugin extends Plugin {
         "onOptionVisibilityUpdate",
         "hideElement",
     ];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         on_mobile_preview_clicked: withSequence(10, this.onMobilePreviewClicked.bind(this)),
         system_attributes: ["data-invisible"],
diff --git a/addons/html_builder/static/src/plugins/alert_option_plugin.js b/addons/html_builder/static/src/plugins/alert_option_plugin.js
index 0e56b04940d78..f6ae885aa8ff9 100644
--- a/addons/html_builder/static/src/plugins/alert_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/alert_option_plugin.js
@@ -8,6 +8,7 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class AlertOptionPlugin extends Plugin {
     static id = "alertOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             AlertIconAction,
diff --git a/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
index 7fded20a3bd09..236e40ab5102a 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_image_option_plugin.js
@@ -9,6 +9,13 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { StyleAction } from "@html_builder/core/core_builder_action_plugin";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * @typedef {((editingElement: HTMLElement) => void)[]} on_bg_image_hide_handlers
+ *
+ * @typedef {((editingElement: HTMLElement) => HTMLElement)[]} background_filter_target_providers
+ * @typedef {((el: HTMLElement) => HTMLElement)[]} get_target_element_providers
+ */
+
 export class BackgroundImageOptionPlugin extends Plugin {
     static id = "backgroundImageOption";
     static dependencies = ["builderActions", "media", "style"];
@@ -18,6 +25,7 @@ export class BackgroundImageOptionPlugin extends Plugin {
         "loadReplaceBackgroundImage",
         "applyReplaceBackgroundImage",
     ];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             SelectFilterColorAction,
diff --git a/addons/html_builder/static/src/plugins/background_option/background_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_option_plugin.js
index c0338ae592aff..2e8ef15096381 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_option_plugin.js
@@ -2,8 +2,18 @@ import { applyFunDependOnSelectorAndExclude } from "@html_builder/plugins/utils"
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+/** @typedef {import("plugins").CSSSelector} CSSSelector */
+/**
+ * @typedef {{
+ *     selector: CSSSelector;
+ *     exclude?: CSSSelector;
+ *     applyTo?: CSSSelector;
+ * }[]} mark_color_level_selector_params
+ */
+
 class BackgroundOptionPlugin extends Plugin {
     static id = "backgroundOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         normalize_handlers: this.normalize.bind(this),
         system_classes: ["o_colored_level"],
diff --git a/addons/html_builder/static/src/plugins/background_option/background_position_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_position_option_plugin.js
index 4b9d03708a1ef..a1bc6ba5ccfcb 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_position_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_position_option_plugin.js
@@ -15,6 +15,7 @@ const getBgSizeValue = function ({ editingElement, params: { mainParam: styleNam
 class BackgroundPositionOptionPlugin extends Plugin {
     static id = "backgroundPositionOption";
     static dependencies = ["overlay", "overlayButtons"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             BackgroundTypeAction,
diff --git a/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js b/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
index dfcd49fe00137..ce04ffcc971fc 100644
--- a/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/background_option/background_shape_option_plugin.js
@@ -12,9 +12,14 @@ import { getBgImageURLFromURL } from "@html_editor/utils/image";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { getHtmlStyle } from "@html_editor/utils/formatting";
 
+/**
+ * @typedef {((editingElement: HTMLElement) => HTMLElement)[]} background_shape_target_providers
+ */
+
 export class BackgroundShapeOptionPlugin extends Plugin {
     static id = "backgroundShapeOption";
     static dependencies = ["customizeTab"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             SetBackgroundShapeAction,
diff --git a/addons/html_builder/static/src/plugins/badge_option_plugin.js b/addons/html_builder/static/src/plugins/badge_option_plugin.js
index 6b6e87adebf96..011daadb8913e 100644
--- a/addons/html_builder/static/src/plugins/badge_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/badge_option_plugin.js
@@ -11,6 +11,7 @@ export class BadgeOption extends BaseOptionComponent {
 
 class BadgeOptionPlugin extends Plugin {
     static id = "badgeOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(before(ANIMATE), BadgeOption)],
         so_content_addition_selector: [".s_badge"],
diff --git a/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js
index 9f0c7efe99b33..3084a367ab269 100644
--- a/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/block_alignment_option_plugin.js
@@ -6,6 +6,7 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class BlockAlignmentOptionPlugin extends Plugin {
     static id = "blockAlignmentOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(BLOCK_ALIGN, BlockAlignmentOption)],
     };
diff --git a/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js b/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js
index 1cd4a26fb604f..6eee3b384fe70 100644
--- a/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/cta_badge_option_plugin.js
@@ -12,6 +12,7 @@ export class CTABadgeOption extends BaseOptionComponent {
 
 class CTABadgeOptionPlugin extends Plugin {
     static id = "ctaBadgeOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [CTABadgeOption],
         so_content_addition_selector: [".s_cta_badge"],
diff --git a/addons/html_builder/static/src/plugins/date_time_field_plugin.js b/addons/html_builder/static/src/plugins/date_time_field_plugin.js
index 44909de642eb7..24a438b808f43 100644
--- a/addons/html_builder/static/src/plugins/date_time_field_plugin.js
+++ b/addons/html_builder/static/src/plugins/date_time_field_plugin.js
@@ -3,6 +3,7 @@ import { registry } from "@web/core/registry";
 
 class DateTimeFieldPlugin extends Plugin {
     static id = "dateTimeField";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         content_not_editable_selectors: [
             "[data-oe-field][data-oe-type=date]",
diff --git a/addons/html_builder/static/src/plugins/font/font_plugin.js b/addons/html_builder/static/src/plugins/font/font_plugin.js
index 21d0c74ea9752..a1c1aa26409d6 100644
--- a/addons/html_builder/static/src/plugins/font/font_plugin.js
+++ b/addons/html_builder/static/src/plugins/font/font_plugin.js
@@ -7,10 +7,15 @@ import { loadCSS } from "@web/core/assets";
 import { BuilderFontSizeSelector } from "./font_size_selector";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * @typedef {string[]} fontCssVariables
+ */
+
 export class BuilderFontPlugin extends Plugin {
     static id = "builderFont";
     static shared = ["getFontsCache", "getFontsData"];
     static dependencies = ["toolbar"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         // Lists CSS variables that will be reset when a font is deleted if
         // they refer to that font.
diff --git a/addons/html_builder/static/src/plugins/image/image_filter_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_filter_option_plugin.js
index 374a20acf952a..9f849ce155cef 100644
--- a/addons/html_builder/static/src/plugins/image/image_filter_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_filter_option_plugin.js
@@ -7,6 +7,7 @@ import { registry } from "@web/core/registry";
 
 class ImageFilterOptionPlugin extends Plugin {
     static id = "ImageFilterOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             GlFilterAction,
diff --git a/addons/html_builder/static/src/plugins/image/image_format_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_format_option_plugin.js
index 7b2f7e8edff7e..2d2acbbc5b3b8 100644
--- a/addons/html_builder/static/src/plugins/image/image_format_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_format_option_plugin.js
@@ -12,6 +12,7 @@ import { selectElements } from "@html_editor/utils/dom_traversal";
 class ImageFormatOptionPlugin extends Plugin {
     static id = "imageFormatOption";
     static shared = ["computeAvailableFormats"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             SetImageFormatAction,
diff --git a/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js
index 292b06cd15596..b0536ce732b04 100644
--- a/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_shape_option_plugin.js
@@ -20,6 +20,20 @@ import { _t } from "@web/core/l10n/translation";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { getMimetype } from "@html_editor/utils/image";
 
+/**
+ * @typedef {((dataset: DOMStringMap) => string)[]} default_shape_handlers
+ * @typedef {((
+ *     svg: SVGElement,
+ *     params: {
+ *         shapeId: string,
+ *         shapeFlip: "x" | "y",
+ *         shapeRotate: 0 | "90" | "180" | "270",
+ *         shapeAnimationSpeed: number,
+ *         shapeColors: string,
+ *     }
+ * ) => Promise<void>)[]} post_compute_shape_listeners
+ */
+
 // Regex definitions to apply speed modification in SVG files
 // Note : These regex patterns are duplicated on the server side for
 // background images that are part of a CSS rule "background-image: ...". The
@@ -46,6 +60,7 @@ export class ImageShapeOptionPlugin extends Plugin {
         "getShapeLabel",
         "loadShape",
     ];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             SetImageShapeAction,
diff --git a/addons/html_builder/static/src/plugins/image/image_size_plugin.js b/addons/html_builder/static/src/plugins/image/image_size_plugin.js
index 2388a96f87902..19bf06b47913b 100644
--- a/addons/html_builder/static/src/plugins/image/image_size_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_size_plugin.js
@@ -5,6 +5,7 @@ import { ImageSize } from "./image_size";
 class ImageSizePlugin extends Plugin {
     static id = "imageSize";
     static dependencies = ["imagePostProcess"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         elements_to_options_title_components: {
             Component: ImageSize,
diff --git a/addons/html_builder/static/src/plugins/image/image_snippet_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_snippet_option_plugin.js
index 97a572a68b568..74a37ea72d8b7 100644
--- a/addons/html_builder/static/src/plugins/image/image_snippet_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_snippet_option_plugin.js
@@ -5,6 +5,7 @@ class ImageSnippetOptionPlugin extends Plugin {
     static id = "imageSnippetOption";
     static dependencies = ["media"];
     static shared = ["onSnippetDropped"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
         so_content_addition_selector: [".s_image"],
diff --git a/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
index befccf3e769cb..96ce2505ed4af 100644
--- a/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_tool_option_plugin.js
@@ -35,6 +35,7 @@ class ImageToolOptionPlugin extends Plugin {
         "builderOptions",
     ];
     static shared = ["getCSSColorValue"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [
             withSequence(REPLACE_MEDIA, ReplaceMediaOption),
diff --git a/addons/html_builder/static/src/plugins/image/image_transform_option_plugin.js b/addons/html_builder/static/src/plugins/image/image_transform_option_plugin.js
index f53836147c63f..5df59fc75031a 100644
--- a/addons/html_builder/static/src/plugins/image/image_transform_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/image/image_transform_option_plugin.js
@@ -6,6 +6,7 @@ import { Deferred } from "@web/core/utils/concurrency";
 
 export class ImageTransformOptionPlugin extends Plugin {
     static id = "imageTransformOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             TransformImageAction,
diff --git a/addons/html_builder/static/src/plugins/image_field_plugin.js b/addons/html_builder/static/src/plugins/image_field_plugin.js
index 051567f4e99b0..5fe769e6cbebe 100644
--- a/addons/html_builder/static/src/plugins/image_field_plugin.js
+++ b/addons/html_builder/static/src/plugins/image_field_plugin.js
@@ -3,6 +3,7 @@ import { registry } from "@web/core/registry";
 
 export class ImageFieldPlugin extends Plugin {
     static id = "imageField";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         content_editable_selectors: "[data-oe-field][data-oe-type=image] img",
         content_not_editable_selectors: "[data-oe-field][data-oe-type=image]",
diff --git a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
index 82cfcbac99c11..5c5b02b56da03 100644
--- a/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/layout_column_option_plugin.js
@@ -9,6 +9,7 @@ import { LAYOUT_COLUMN } from "@html_builder/utils/option_sequence";
 class LayoutColumnOptionPlugin extends Plugin {
     static id = "LayoutColumnOption";
     static dependencies = ["clone", "selection"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(LAYOUT_COLUMN, LayoutColumnOption)],
         on_cloned_handlers: this.onCloned.bind(this),
diff --git a/addons/html_builder/static/src/plugins/many2one_option_plugin.js b/addons/html_builder/static/src/plugins/many2one_option_plugin.js
index 65e8ba1d1e957..20843fb6c83aa 100644
--- a/addons/html_builder/static/src/plugins/many2one_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/many2one_option_plugin.js
@@ -5,6 +5,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 
 export class Many2OneOptionPlugin extends Plugin {
     static id = "many2OneOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [Many2OneOption],
         builder_actions: {
diff --git a/addons/html_builder/static/src/plugins/monetary_field_plugin.js b/addons/html_builder/static/src/plugins/monetary_field_plugin.js
index fd3b1027b5c0d..42a529233c0c7 100644
--- a/addons/html_builder/static/src/plugins/monetary_field_plugin.js
+++ b/addons/html_builder/static/src/plugins/monetary_field_plugin.js
@@ -6,6 +6,7 @@ const monetarySel = "[data-oe-field][data-oe-type=monetary]";
 export class MonetaryFieldPlugin extends Plugin {
     static id = "monetaryField";
     static dependencies = ["selection"];
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         content_editable_selectors: `${monetarySel} .oe_currency_value`,
         content_not_editable_selectors: monetarySel,
diff --git a/addons/html_builder/static/src/plugins/rating_option_plugin.js b/addons/html_builder/static/src/plugins/rating_option_plugin.js
index b873e186475f2..966322d00ca9d 100644
--- a/addons/html_builder/static/src/plugins/rating_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/rating_option_plugin.js
@@ -12,6 +12,7 @@ class RatingOptionPlugin extends Plugin {
     static id = "ratingOption";
     static dependencies = ["history", "media"];
     selector = ".s_rating";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: RatingOption,
         so_content_addition_selector: [".s_rating"],
diff --git a/addons/html_builder/static/src/plugins/separator_option_plugin.js b/addons/html_builder/static/src/plugins/separator_option_plugin.js
index bd6de5feca86d..f08a1b6a0e460 100644
--- a/addons/html_builder/static/src/plugins/separator_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/separator_option_plugin.js
@@ -5,6 +5,7 @@ import { BorderConfigurator } from "./border_configurator_option";
 
 class SeparatorOptionPlugin extends Plugin {
     static id = "separatorOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [SeparatorOption],
         dropzone_selector: {
diff --git a/addons/html_builder/static/src/plugins/shadow_option_plugin.js b/addons/html_builder/static/src/plugins/shadow_option_plugin.js
index e84746ef1f05f..0bb6484fb2bad 100644
--- a/addons/html_builder/static/src/plugins/shadow_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/shadow_option_plugin.js
@@ -7,6 +7,7 @@ const shadowClass = "shadow";
 
 export class ShadowOptionPlugin extends Plugin {
     static id = "shadowOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_actions: {
             SetShadowModeAction,
diff --git a/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js
index 25d6931b0d455..91b10b1956e2d 100644
--- a/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/text_alignment_option_plugin.js
@@ -6,6 +6,7 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class TextAlignmentOptionPlugin extends Plugin {
     static id = "textAlignmentOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(TEXT_ALIGNMENT, TextAlignmentOption)],
     };
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
index 7afd60db5e754..4f71a7d85ae95 100644
--- a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
@@ -7,6 +7,7 @@ import { VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
 
 export class VerticalAlignmentOptionPlugin extends Plugin {
     static id = "verticalAlignmentOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(VERTICAL_ALIGNMENT, VerticalAlignmentOption)],
         builder_actions: {
diff --git a/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js b/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js
index a4eed9df3ddae..bbd84968be064 100644
--- a/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/vertical_justify_option_plugin.js
@@ -6,6 +6,7 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class VerticalJustifyOptionPlugin extends Plugin {
     static id = "verticalJustifyOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(END, VerticalJustifyOption)],
     };
diff --git a/addons/html_builder/static/src/plugins/width_option_plugin.js b/addons/html_builder/static/src/plugins/width_option_plugin.js
index 46f026e314dea..2b876b4ec9148 100644
--- a/addons/html_builder/static/src/plugins/width_option_plugin.js
+++ b/addons/html_builder/static/src/plugins/width_option_plugin.js
@@ -6,6 +6,7 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 
 class WidthOptionPlugin extends Plugin {
     static id = "widthOption";
+    /** @type {import("plugins").BuilderResources} */
     resources = {
         builder_options: [withSequence(WIDTH, WidthOption)],
     };
diff --git a/addons/html_builder/static/src/sidebar/block_tab.js b/addons/html_builder/static/src/sidebar/block_tab.js
index 6b2556e6b7807..77847d97273fe 100644
--- a/addons/html_builder/static/src/sidebar/block_tab.js
+++ b/addons/html_builder/static/src/sidebar/block_tab.js
@@ -11,6 +11,10 @@ import { scrollTo } from "@html_builder/utils/scrolling";
 import { Snippet } from "./snippet";
 import { CustomInnerSnippet } from "./custom_inner_snippet";
 
+/**
+ * @typedef {((arg: { snippetEl: HTMLElement }) => void)[]} on_snippet_dropped_handlers
+ */
+
 export class BlockTab extends Component {
     static template = "html_builder.BlockTab";
     static components = { Snippet, CustomInnerSnippet };
diff --git a/addons/html_builder/static/src/sidebar/invisible_elements_panel.js b/addons/html_builder/static/src/sidebar/invisible_elements_panel.js
index efe35080952b2..0db99738c9d20 100644
--- a/addons/html_builder/static/src/sidebar/invisible_elements_panel.js
+++ b/addons/html_builder/static/src/sidebar/invisible_elements_panel.js
@@ -1,6 +1,10 @@
 import { Component, onWillStart, onWillUpdateProps, useState } from "@odoo/owl";
 import { getSnippetName, isElementInViewport } from "@html_builder/utils/utils";
 
+/**
+ * @typedef {((snippetEl: HTMLElement) => void)[]} on_reveal_target_handlers
+ */
+
 export class InvisibleElementsPanel extends Component {
     static template = "html_builder.InvisibleElementsPanel";
     static props = {
diff --git a/addons/html_builder/static/src/snippets/add_snippet_dialog.js b/addons/html_builder/static/src/snippets/add_snippet_dialog.js
index 024e9172c9956..9b738934c8569 100644
--- a/addons/html_builder/static/src/snippets/add_snippet_dialog.js
+++ b/addons/html_builder/static/src/snippets/add_snippet_dialog.js
@@ -8,6 +8,11 @@ import { getFirstAndLastTabableElements } from "@web/core/ui/ui_service";
 import { useChildRef } from "@web/core/utils/hooks";
 import { SnippetViewer } from "./snippet_viewer";
 
+/**
+ * @typedef {((arg: { iframe: HTMLIFrameElement }) => void)[]} snippet_preview_dialog_stylesheets_handlers
+ * @typedef {string[]} snippet_preview_dialog_bundles
+ */
+
 export class AddSnippetDialog extends Component {
     static template = "html_builder.AddSnippetDialog";
     static components = { Dialog };

From d4df17bacfee069d595d52c91a274d875dd231d1 Mon Sep 17 00:00:00 2001
From: "Robin Lejeune (role)" <role@odoo.com>
Date: Thu, 6 Nov 2025 17:15:26 +0100
Subject: [PATCH 620/673] [IMP] website, *: document Plugins shared methods and
 resources

*: website_blog

This commit adds `SharedMethods` and `BuilderResources` for the
website and website_blog plugins.

task-5249231

closes odoo/odoo#234203

Signed-off-by: Francois Georis (fge) <fge@odoo.com>
---
 addons/website/static/src/@types/plugins.d.ts | 97 +++++++++++++++++++
 .../static/src/builder/builder_urlpicker.js   |  1 +
 .../plugins/bootstrap_option_plugin.js        |  1 +
 .../builder/plugins/carousel_option_plugin.js |  8 ++
 .../src/builder/plugins/collapse_plugin.js    |  1 +
 .../builder/plugins/company_team_plugin.js    |  1 +
 .../plugins/content_width_option_plugin.js    |  1 +
 .../plugins/customize_website_plugin.js       | 20 ++++
 .../plugins/dynamic_svg_option_plugin.js      |  1 +
 .../plugins/edit_interaction_plugin.js        | 11 +++
 .../floating_blocks_block_option_plugin.js    |  1 +
 .../floating_blocks_option_plugin.js          |  1 +
 .../src/builder/plugins/font/font_plugin.js   |  6 ++
 .../plugins/font_awesome_option_plugin.js     |  1 +
 .../plugins/form/form_option_plugin.js        | 18 ++++
 .../plugins/highlight/highlight_plugin.js     |  1 +
 .../plugins/image/grid_image_option_plugin.js |  1 +
 .../plugins/image/image_hover_plugin.js       |  7 ++
 .../add_element_option_plugin.js              |  6 ++
 .../grid_column_option_plugin.js              |  1 +
 .../layout_option/layout_option_plugin.js     |  1 +
 .../layout_option/spacing_option_plugin.js    |  1 +
 .../src/builder/plugins/menu_data_plugin.js   |  6 ++
 .../options/accordion_option_plugin.js        |  1 +
 .../builder/plugins/options/animate_option.js |  4 +
 .../plugins/options/animate_option_plugin.js  | 13 +++
 .../announcement_scroll_option_plugin.js      |  1 +
 .../options/background_option_plugin.js       |  9 ++
 .../options/bento_border_option_plugin.js     |  1 +
 .../options/blockquote_option_plugin.js       |  1 +
 .../plugins/options/border_option_plugin.js   |  1 +
 .../plugins/options/button_option_plugin.js   |  1 +
 .../options/card_image_option_plugin.js       |  6 ++
 .../plugins/options/card_option_plugin.js     |  1 +
 .../options/card_width_option_plugin.js       |  1 +
 .../options/carousel_slides_option_plugin.js  |  1 +
 .../plugins/options/chart_option_plugin.js    |  6 ++
 ...oller_page_listing_layout_option_plugin.js |  1 +
 .../plugins/options/cookies_bar_option.js     |  6 ++
 .../options/countdown_option_plugin.js        |  1 +
 .../options/cover_properties_option_plugin.js |  1 +
 .../dynamic_snippet_carousel_option_plugin.js |  8 ++
 .../options/dynamic_snippet_option_plugin.js  | 42 ++++++++
 ...ecomm_categories_showcase_option_plugin.js |  1 +
 .../options/embed_code_option_plugin.js       |  1 +
 .../plugins/options/facebook_option_plugin.js |  1 +
 .../options/faq_horizontal_option_plugin.js   |  1 +
 .../options/footer_copyright_option_plugin.js |  1 +
 .../plugins/options/footer_option_plugin.js   | 15 +++
 .../options/gallery_element_option_plugin.js  | 13 +++
 .../google_maps_option_plugin.js              | 13 +++
 .../header/header_box_option_plugin.js        |  1 +
 .../header/header_navigation_option_plugin.js |  1 +
 .../options/header/header_option_plugin.js    |  1 +
 .../options/icon_snippet_option_plugin.js     |  1 +
 .../options/image_gallery_option_plugin.js    | 10 ++
 .../options/instagram_option_plugin.js        |  6 ++
 .../options/language_selector_option.js       |  1 +
 .../plugins/options/map_option_plugin.js      |  1 +
 .../options/media_list_option_plugin.js       |  1 +
 .../options/mega_menu_option_plugin.js        |  6 ++
 .../options/navbar_logo_option_plugin.js      |  1 +
 .../options/navtabs_header_buttons_plugin.js  |  1 +
 .../options/navtabs_style_option_plugin.js    |  8 ++
 .../plugins/options/parallax_option_plugin.js |  7 ++
 .../plugins/options/popup_option_plugin.js    |  1 +
 .../pricelist_boxed_option_plugin.js          |  1 +
 .../pricelist_option/pricelist_cafe_plugin.js |  1 +
 .../pricelist_option/pricelist_plugin.js      |  1 +
 .../product_catalog_plugin.js                 |  1 +
 .../options/process_steps_option_plugin.js    |  1 +
 .../options/progress_bar_option_plugin.js     |  1 +
 .../options/scroll_button_option_plugin.js    |  1 +
 .../options/searchbar_option_plugin.js        | 50 ++++++++++
 .../options/social_media_option_plugin.js     | 14 +++
 .../options/table_of_content_option_plugin.js |  1 +
 ...able_of_content_option_plugin_translate.js |  1 +
 .../options/timeline_list_option_plugin.js    |  1 +
 .../plugins/options/timeline_option_plugin.js |  1 +
 .../options/visibility_option_plugin.js       |  8 ++
 .../website_background_option_plugin.js       |  1 +
 .../options/website_info_option_plugin.js     |  1 +
 .../website_page_config_option_plugin.js      | 10 ++
 .../plugins/popup_visibility_plugin.js        |  7 ++
 .../plugins/save_translation_plugin.js        |  1 +
 .../builder/plugins/setup_editor_plugin.js    |  1 +
 .../src/builder/plugins/size_option_plugin.js |  1 +
 .../plugins/snippets_powerbox_plugin.js       |  1 +
 .../plugins/switchable_views_plugin.js        |  9 ++
 .../builder/plugins/theme/theme_tab_plugin.js | 10 ++
 .../plugins/timeline_images_option_plugin.js  |  1 +
 .../translate_announcement_scroll_plugin.js   |  1 +
 .../plugins/translate_link_inline_plugin.js   |  1 +
 .../plugins/translate_setup_editor_plugin.js  |  1 +
 .../src/builder/plugins/translation_plugin.js |  5 +
 .../customize_translation_tab_plugin.js       |  6 ++
 .../vertical_alignment_option_plugin.js       |  1 +
 .../builder/plugins/website_save_plugin.js    |  6 ++
 .../builder/plugins/website_session_plugin.js |  5 +
 .../plugins/website_visibility_plugin.js      |  1 +
 .../static/src/@types/plugins.d.ts            |  7 ++
 .../blog_page_option_plugin.js                |  1 +
 .../blog_post_page_option_plugin.js           |  1 +
 .../blog_post_tags_option_plugin.js           |  1 +
 .../blog_searchbar_option_plugin.js           |  1 +
 ...ynamic_snippet_blog_posts_option_plugin.js |  7 ++
 106 files changed, 563 insertions(+)
 create mode 100644 addons/website/static/src/@types/plugins.d.ts
 create mode 100644 addons/website_blog/static/src/@types/plugins.d.ts

diff --git a/addons/website/static/src/@types/plugins.d.ts b/addons/website/static/src/@types/plugins.d.ts
new file mode 100644
index 0000000000000..04e974d52bee7
--- /dev/null
+++ b/addons/website/static/src/@types/plugins.d.ts
@@ -0,0 +1,97 @@
+declare module "plugins" {
+    import { CarouselOptionShared } from "@website/builder/plugins/carousel_option_plugin";
+    import { CustomizeWebsiteShared } from "@website/builder/plugins/customize_website_plugin";
+    import { content_manually_updated_handlers, EditInteractionShared } from "@website/builder/plugins/edit_interaction_plugin";
+    import { WebsiteFontShared } from "@website/builder/plugins/font/font_plugin";
+    import { FormOptionShared } from "@website/builder/plugins/form/form_option_plugin";
+    import { ImageHoverShared } from "@website/builder/plugins/image/image_hover_plugin";
+    import { AddElementOptionShared } from "@website/builder/plugins/layout_option/add_element_option_plugin";
+    import { MenuDataShared } from "@website/builder/plugins/menu_data_plugin";
+    import { hover_effect_allowed_predicates } from "@website/builder/plugins/options/animate_option";
+    import { AnimateOptionShared, remove_hover_effect_handlers, set_hover_effect_handlers } from "@website/builder/plugins/options/animate_option_plugin";
+    import { WebsiteBackgroundVideoShared } from "@website/builder/plugins/options/background_option_plugin";
+    import { CardImageOptionShared } from "@website/builder/plugins/options/card_image_option_plugin";
+    import { ChartOptionShared } from "@website/builder/plugins/options/chart_option_plugin";
+    import { CookiesBarOptionShared } from "@website/builder/plugins/options/cookies_bar_option";
+    import { DynamicSnippetCarouselOptionShared } from "@website/builder/plugins/options/dynamic_snippet_carousel_option_plugin";
+    import { dynamic_snippet_template_updated, DynamicSnippetOptionShared } from "@website/builder/plugins/options/dynamic_snippet_option_plugin";
+    import { footer_templates_providers, FooterOptionShared } from "@website/builder/plugins/options/footer_option_plugin";
+    import { get_gallery_items_handlers, reorder_items_handlers } from "@website/builder/plugins/options/gallery_element_option_plugin";
+    import { GoogleMapsOptionShared } from "@website/builder/plugins/options/google_maps_option/google_maps_option_plugin";
+    import { ImageGalleryOptionShared } from "@website/builder/plugins/options/image_gallery_option_plugin";
+    import { InstagramOptionShared } from "@website/builder/plugins/options/instagram_option_plugin";
+    import { MegaMenuOptionShared } from "@website/builder/plugins/options/mega_menu_option_plugin";
+    import { NavTabsStyleOptionShared } from "@website/builder/plugins/options/navtabs_style_option_plugin";
+    import { WebsiteParallaxShared } from "@website/builder/plugins/options/parallax_option_plugin";
+    import { searchbar_option_display_items, searchbar_option_order_by_items } from "@website/builder/plugins/options/searchbar_option_plugin";
+    import { SocialMediaOptionShared } from "@website/builder/plugins/options/social_media_option_plugin";
+    import { visibility_selector_parameters } from "@website/builder/plugins/options/visibility_option_plugin";
+    import { WebsitePageConfigOptionShared } from "@website/builder/plugins/options/website_page_config_option_plugin";
+    import { PopupVisibilityShared } from "@website/builder/plugins/popup_visibility_plugin";
+    import { SwitchableViewsShared } from "@website/builder/plugins/switchable_views_plugin";
+    import { ThemeTabShared } from "@website/builder/plugins/theme/theme_tab_plugin";
+    import { mark_translatable_nodes } from "@website/builder/plugins/translation_plugin";
+    import { WebsiteSaveShared } from "@website/builder/plugins/website_save_plugin";
+    import { WebsiteSessionShared } from "@website/builder/plugins/website_session_plugin";
+
+    interface SharedMethods {
+        addElementOption: AddElementOptionShared;
+        animateOption: AnimateOptionShared;
+        carouselOption: CarouselOptionShared;
+        cardImageOption: CardImageOptionShared;
+        chartOptionPlugin: ChartOptionShared;
+        CookiesBarOptionPlugin: CookiesBarOptionShared;
+        customizeTranslationTab: CustomizeTranslationTabShared;
+        customizeWebsite: CustomizeWebsiteShared;
+        dynamicSnippetCarouselOption: DynamicSnippetCarouselOptionShared;
+        dynamicSnippetOption: DynamicSnippetOptionShared;
+        edit_interaction: EditInteractionShared;
+        footerOption: FooterOptionShared;
+        googleMapsOption: GoogleMapsOptionShared;
+        imageGalleryOption: ImageGalleryOptionShared;
+        imageHover: ImageHoverShared;
+        instagramOption: InstagramOptionShared;
+        megaMenuOptionPlugin: MegaMenuOptionShared;
+        menuDataPlugin: MenuDataShared;
+        navTabsOptionStyle: NavTabsStyleOptionShared;
+        popupVisibilityPlugin: PopupVisibilityShared;
+        socialMediaOptionPlugin: SocialMediaOptionShared;
+        switchableViews: SwitchableViewsShared;
+        themeTab: ThemeTabShared;
+        websiteBackgroundVideoPlugin: WebsiteBackgroundVideoShared;
+        websiteFont: WebsiteFontShared;
+        websiteFormOption: FormOptionShared;
+        websitePageConfigOptionPlugin: WebsitePageConfigOptionShared;
+        websiteParallaxPlugin: WebsiteParallaxShared;
+        websiteSavePlugin: WebsiteSaveShared;
+        websiteSession: WebsiteSessionShared;
+    }
+
+    interface GlobalResources extends WebsiteResources {}
+    export type WebsiteResources = BuilderResources & ResourcesTypesFactory<WebsiteResourcesList>;
+    export interface WebsiteResourcesList {
+        // Handlers
+        content_manually_updated_handlers: content_manually_updated_handlers;
+        dynamic_snippet_template_updated: dynamic_snippet_template_updated;
+        get_gallery_items_handlers: get_gallery_items_handlers;
+        mark_translatable_nodes: mark_translatable_nodes;
+        remove_hover_effect_handlers: remove_hover_effect_handlers;
+        reorder_items_handlers: reorder_items_handlers;
+        set_hover_effect_handlers: set_hover_effect_handlers;
+
+        // Overrides
+
+        // Predicates
+        hover_effect_allowed_predicates: hover_effect_allowed_predicates;
+
+        // Processors
+
+        // Providers
+        footer_templates_providers: footer_templates_providers;
+
+        // Data
+        searchbar_option_display_items: searchbar_option_display_items;
+        searchbar_option_order_by_items: searchbar_option_order_by_items;
+        visibility_selector_parameters: visibility_selector_parameters;
+    }
+}
diff --git a/addons/website/static/src/builder/builder_urlpicker.js b/addons/website/static/src/builder/builder_urlpicker.js
index 4c16236127c8c..1c6d299e3c91c 100644
--- a/addons/website/static/src/builder/builder_urlpicker.js
+++ b/addons/website/static/src/builder/builder_urlpicker.js
@@ -36,6 +36,7 @@ export class WebsiteUrlPicker extends BuilderUrlPicker {
 class UrlPickerPlugin extends Plugin {
     static id = "urlPickerPlugin";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_components: {
             WebsiteUrlPicker,
diff --git a/addons/website/static/src/builder/plugins/bootstrap_option_plugin.js b/addons/website/static/src/builder/plugins/bootstrap_option_plugin.js
index 5680beb2432b6..93313c0b20cfe 100644
--- a/addons/website/static/src/builder/plugins/bootstrap_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/bootstrap_option_plugin.js
@@ -6,6 +6,7 @@ class BootstrapOptionPlugin extends Plugin {
     static id = "bootstrapOption";
     static dependencies = ["customizeWebsite"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         savable_mutation_record_predicates: this.filterBootstrapMutations.bind(this),
     };
diff --git a/addons/website/static/src/builder/plugins/carousel_option_plugin.js b/addons/website/static/src/builder/plugins/carousel_option_plugin.js
index 3415c1c1f9008..380220504c4e4 100644
--- a/addons/website/static/src/builder/plugins/carousel_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/carousel_option_plugin.js
@@ -10,6 +10,13 @@ import { WEBSITE_BACKGROUND_OPTIONS, BOX_BORDER_SHADOW } from "@website/builder/
 import { selectElements } from "@html_editor/utils/dom_traversal";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } CarouselOptionShared
+ * @property { CarouselOptionPlugin['addSlide'] } addSlide
+ * @property { CarouselOptionPlugin['removeSlide'] } removeSlide
+ * @property { CarouselOptionPlugin['slideCarousel'] } slideCarousel
+ */
+
 export const CAROUSEL_CARDS_SEQUENCE = between(WEBSITE_BACKGROUND_OPTIONS, BOX_BORDER_SHADOW);
 
 const carouselWrapperSelector =
@@ -45,6 +52,7 @@ export class CarouselOptionPlugin extends Plugin {
     static dependencies = ["clone", "builderOptions", "builderActions"];
     static shared = ["addSlide", "removeSlide", "slideCarousel"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             CarouselOption,
diff --git a/addons/website/static/src/builder/plugins/collapse_plugin.js b/addons/website/static/src/builder/plugins/collapse_plugin.js
index 133d24f49f1d5..84d8db8691b1d 100644
--- a/addons/website/static/src/builder/plugins/collapse_plugin.js
+++ b/addons/website/static/src/builder/plugins/collapse_plugin.js
@@ -4,6 +4,7 @@ import { registry } from "@web/core/registry";
 export class CollapsePlugin extends Plugin {
     static id = "collapse";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
         on_cloned_handlers: this.onCloned.bind(this),
diff --git a/addons/website/static/src/builder/plugins/company_team_plugin.js b/addons/website/static/src/builder/plugins/company_team_plugin.js
index 5c569aec07664..defc5c92bd058 100644
--- a/addons/website/static/src/builder/plugins/company_team_plugin.js
+++ b/addons/website/static/src/builder/plugins/company_team_plugin.js
@@ -5,6 +5,7 @@ import { selectElements } from "@html_editor/utils/dom_traversal";
 
 class CompanyTeamPlugin extends Plugin {
     static id = "companyTeam";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         content_editable_providers: this.getEditableEls.bind(this),
     };
diff --git a/addons/website/static/src/builder/plugins/content_width_option_plugin.js b/addons/website/static/src/builder/plugins/content_width_option_plugin.js
index 21ddf9b966d67..55b8c5e356f11 100644
--- a/addons/website/static/src/builder/plugins/content_width_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/content_width_option_plugin.js
@@ -15,6 +15,7 @@ export class ContentWidthOption extends BaseOptionComponent {
 
 class ContentWidthOptionPlugin extends Plugin {
     static id = "contentWidthOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(CONTAINER_WIDTH, ContentWidthOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/customize_website_plugin.js b/addons/website/static/src/builder/plugins/customize_website_plugin.js
index 37b31e5cc5f2c..6ce4c3dcbc93e 100644
--- a/addons/website/static/src/builder/plugins/customize_website_plugin.js
+++ b/addons/website/static/src/builder/plugins/customize_website_plugin.js
@@ -14,6 +14,25 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { renderToElement } from "@web/core/utils/render";
 import { CompositeAction } from "@html_builder/core/composite_action_plugin";
 
+/**
+ * @typedef { Object } CustomizeWebsiteShared
+ * @property { CustomizeWebsitePlugin['customizeWebsiteColors'] } customizeWebsiteColors
+ * @property { CustomizeWebsitePlugin['customizeWebsiteVariables'] } customizeWebsiteVariables
+ * @property { CustomizeWebsitePlugin['loadTemplateKey'] } loadTemplateKey
+ * @property { CustomizeWebsitePlugin['makeSCSSCusto'] } makeSCSSCusto
+ * @property { CustomizeWebsitePlugin['toggleTemplate'] } toggleTemplate
+ * @property { CustomizeWebsitePlugin['withCustomHistory'] } withCustomHistory
+ * @property { CustomizeWebsitePlugin['populateCache'] } populateCache
+ * @property { CustomizeWebsitePlugin['loadConfigKey'] } loadConfigKey
+ * @property { CustomizeWebsitePlugin['getConfigKey'] } getConfigKey
+ * @property { CustomizeWebsitePlugin['getWebsiteVariableValue'] } getWebsiteVariableValue
+ * @property { CustomizeWebsitePlugin['getPendingThemeRequests'] } getPendingThemeRequests
+ * @property { CustomizeWebsitePlugin['setPendingThemeRequests'] } setPendingThemeRequests
+ * @property { CustomizeWebsitePlugin['isPluginDestroyed'] } isPluginDestroyed
+ * @property { CustomizeWebsitePlugin['reloadBundles'] } reloadBundles
+ * @property { CustomizeWebsitePlugin['setViewsOnSave'] } setViewsOnSave
+ */
+
 export const NO_IMAGE_SELECTION = Symbol.for("NoImageSelection");
 
 export class CustomizeWebsitePlugin extends Plugin {
@@ -37,6 +56,7 @@ export class CustomizeWebsitePlugin extends Plugin {
         "setViewsOnSave",
     ];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             CustomizeWebsiteVariableAction,
diff --git a/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js b/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js
index 5bcd2e2376211..74fbbe4b2440c 100644
--- a/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/dynamic_svg_option_plugin.js
@@ -10,6 +10,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 
 class DynamicSvgOptionPlugin extends Plugin {
     static id = "DynamicSvgOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(DYNAMIC_SVG, DynamicSvgOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/edit_interaction_plugin.js b/addons/website/static/src/builder/plugins/edit_interaction_plugin.js
index 99d0b693e467d..bc0660e3af5ff 100644
--- a/addons/website/static/src/builder/plugins/edit_interaction_plugin.js
+++ b/addons/website/static/src/builder/plugins/edit_interaction_plugin.js
@@ -2,11 +2,22 @@ import { Plugin } from "@html_editor/plugin";
 import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 
+/**
+ * @typedef { Object } EditInteractionShared
+ * @property { EditInteractionPlugin['restartInteractions'] } restartInteractions
+ * @property { EditInteractionPlugin['stopInteractions'] } stopInteractions
+ */
+
+/**
+ * @typedef {((commonAncestorEl: HTMLElement) => void)[]} content_manually_updated_handlers
+ */
+
 export class EditInteractionPlugin extends Plugin {
     static id = "edit_interaction";
 
     static shared = ["restartInteractions", "stopInteraction"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         normalize_handlers: this.refreshInteractions.bind(this),
         content_manually_updated_handlers: this.refreshInteractions.bind(this),
diff --git a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js
index f0dd4c501f8fb..b112d8239342c 100644
--- a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_block_option_plugin.js
@@ -8,6 +8,7 @@ import { FloatingBlocksBlockMobileOption } from "./floating_blocks_block_mobile_
 
 class FloatingBlocksBlockOptionPlugin extends Plugin {
     static id = "floatingBlocksBlockOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(BEGIN, FloatingBlocksBlockMobileOption),
diff --git a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js
index 6034d5c43cf32..3457ce2d83abc 100644
--- a/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/floating_blocks/floating_blocks_option_plugin.js
@@ -14,6 +14,7 @@ export class FloatingBlocksOption extends BaseOptionComponent {
 
 export class FloatingBlocksOptionPlugin extends Plugin {
     static id = "floatingBlocksOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(after(DEVICE_VISIBILITY), FloatingBlocksOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/font/font_plugin.js b/addons/website/static/src/builder/plugins/font/font_plugin.js
index a54853a8410ff..381eddfd90357 100644
--- a/addons/website/static/src/builder/plugins/font/font_plugin.js
+++ b/addons/website/static/src/builder/plugins/font/font_plugin.js
@@ -3,6 +3,12 @@ import { Plugin } from "@html_editor/plugin";
 import { getCSSVariableValue, getHtmlStyle } from "@html_editor/utils/formatting";
 import { showAddFontDialog } from "./add_font_dialog";
 
+/**
+ * @typedef { Object } WebsiteFontShared
+ * @property { WebsiteFontPlugin['addFont'] } addFont
+ * @property { WebsiteFontPlugin['deleteFont'] } deleteFont
+ */
+
 // TODO Website-specific
 class WebsiteFontPlugin extends Plugin {
     static id = "websiteFont";
diff --git a/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js b/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js
index d18a1a6aa649a..02bb0dadac70e 100644
--- a/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/font_awesome_option_plugin.js
@@ -8,6 +8,7 @@ import { BorderConfigurator } from "@html_builder/plugins/border_configurator_op
 
 class FontAwesomeOptionPlugin extends Plugin {
     static id = "fontAwesomeOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(FONT_AWESOME, FontAwesomeOptionComponent)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/form/form_option_plugin.js b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
index e900d4f5db8fb..70662d5374e17 100644
--- a/addons/website/static/src/builder/plugins/form/form_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/form/form_option_plugin.js
@@ -45,6 +45,23 @@ import { localization } from "@web/core/l10n/localization";
 import { formatDate } from "@web/core/l10n/dates";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } FormOptionShared
+ * @property { FormOptionPlugin['prepareFormModel'] } prepareFormModel
+ * @property { FormOptionPlugin['getModelsCache'] } getModelsCache
+ * @property { FormOptionPlugin['applyFormModel'] } applyFormModel
+ * @property { FormOptionPlugin['addHiddenField'] } addHiddenField
+ * @property { FormOptionPlugin['fetchAuthorizedFields'] } fetchAuthorizedFields
+ * @property { FormOptionPlugin['loadFieldOptionData'] } loadFieldOptionData
+ * @property { FormOptionPlugin['prepareFields'] } prepareFields
+ * @property { FormOptionPlugin['replaceField'] } replaceField
+ * @property { FormOptionPlugin['prepareConditionInputs'] } prepareConditionInputs
+ * @property { FormOptionPlugin['setLabelsMark'] } setLabelsMark
+ * @property { FormOptionPlugin['clearValidationDataset'] } clearValidationDataset
+ * @property { FormOptionPlugin['defaultMessage'] } defaultMessage
+ * @property { FormOptionPlugin['fetchModels'] } fetchModels
+ */
+
 const { DateTime } = luxon;
 
 export class WebsiteFormSubmitOption extends BaseOptionComponent {
@@ -72,6 +89,7 @@ export class FormOptionPlugin extends Plugin {
         "defaultMessage",
         "fetchModels",
     ];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_header_middle_buttons: [
             {
diff --git a/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js b/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js
index a63e784ba64c7..81f0a96aa98ce 100644
--- a/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js
+++ b/addons/website/static/src/builder/plugins/highlight/highlight_plugin.js
@@ -19,6 +19,7 @@ import { toolbarButtonProps } from "@html_editor/main/toolbar/toolbar";
 export class HighlightPlugin extends Plugin {
     static id = "highlight";
     static dependencies = ["history", "selection", "split", "format", "edit_interaction"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         toolbar_groups: [withSequence(50, { id: "websiteDecoration" })],
         toolbar_items: [
diff --git a/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js b/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js
index 498b5d0d4ff65..5ee935a4144ae 100644
--- a/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/image/grid_image_option_plugin.js
@@ -8,6 +8,7 @@ import { GridImageOption } from "./grid_image_option";
 class GridImageOptionPlugin extends Plugin {
     static id = "gridImageOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(GRID_IMAGE, GridImageOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/image/image_hover_plugin.js b/addons/website/static/src/builder/plugins/image/image_hover_plugin.js
index 3bb332e755e13..811e5419c1546 100644
--- a/addons/website/static/src/builder/plugins/image/image_hover_plugin.js
+++ b/addons/website/static/src/builder/plugins/image/image_hover_plugin.js
@@ -3,11 +3,18 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { convertCSSColorToRgba } from "@web/core/utils/colors";
 
+/**
+ * @typedef { Object } ImageHoverShared
+ * @property { ImageHoverPlugin['setHoverEffect'] } setHoverEffect
+ * @property { ImageHoverPlugin['removeHoverEffect'] } removeHoverEffect
+ */
+
 export class ImageHoverPlugin extends Plugin {
     static id = "imageHover";
     static shared = ["setHoverEffect", "removeHoverEffect"];
     static dependencies = ["imagePostProcess", "imageToolOption"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetHoverEffectAction,
diff --git a/addons/website/static/src/builder/plugins/layout_option/add_element_option_plugin.js b/addons/website/static/src/builder/plugins/layout_option/add_element_option_plugin.js
index 0dd9808f0c4f9..6845cdfe69855 100644
--- a/addons/website/static/src/builder/plugins/layout_option/add_element_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/layout_option/add_element_option_plugin.js
@@ -4,10 +4,16 @@ import { Plugin } from "@html_editor/plugin";
 import { _t } from "@web/core/l10n/translation";
 import { registry } from "@web/core/registry";
 
+/**
+ * @typedef { Object } AddElementOptionShared
+ * @property { AddElementOptionPlugin['addGridElement'] } addGridElement
+ */
+
 export class AddElementOptionPlugin extends Plugin {
     static id = "addElementOption";
     static dependencies = ["builderOptions"];
     static shared = ["addGridElement"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             AddGridElementAction,
diff --git a/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js b/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js
index 16068718b4732..7d699a0db4c43 100644
--- a/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/layout_option/grid_column_option_plugin.js
@@ -7,6 +7,7 @@ import { StyleAction } from "@html_builder/core/core_builder_action_plugin";
 
 export class GridColumnsOptionPlugin extends Plugin {
     static id = "GridColumnsOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(GRID_COLUMNS, GridColumnsOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js b/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js
index 1edb11f32d3be..16a3aa2098e5e 100644
--- a/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/layout_option/layout_option_plugin.js
@@ -14,6 +14,7 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 class LayoutOptionPlugin extends Plugin {
     static id = "LayoutOption";
     static dependencies = ["clone", "selection"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(LAYOUT, LayoutOption),
diff --git a/addons/website/static/src/builder/plugins/layout_option/spacing_option_plugin.js b/addons/website/static/src/builder/plugins/layout_option/spacing_option_plugin.js
index c997afe0d7938..5b67d3f358baf 100644
--- a/addons/website/static/src/builder/plugins/layout_option/spacing_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/layout_option/spacing_option_plugin.js
@@ -6,6 +6,7 @@ import { StyleAction } from "@html_builder/core/core_builder_action_plugin";
 
 class SpacingOptionPlugin extends Plugin {
     static id = "SpacingOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetGridSpacingAction,
diff --git a/addons/website/static/src/builder/plugins/menu_data_plugin.js b/addons/website/static/src/builder/plugins/menu_data_plugin.js
index ec31aefc5276f..a947f6a056a4e 100644
--- a/addons/website/static/src/builder/plugins/menu_data_plugin.js
+++ b/addons/website/static/src/builder/plugins/menu_data_plugin.js
@@ -4,10 +4,16 @@ import { NavbarLinkPopover } from "./navbar_link_popover/navbar_link_popover";
 import { MenuDialog, EditMenuDialog } from "@website/components/dialog/edit_menu";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * @typedef { Object } MenuDataShared
+ * @property { MenuDataPlugin['openEditMenu'] } openEditMenu
+ */
+
 export class MenuDataPlugin extends Plugin {
     static id = "menuDataPlugin";
     static shared = ["openEditMenu"];
     static dependencies = ["savePlugin"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         link_popovers: [
             withSequence(10, {
diff --git a/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js b/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
index 2d08dc965851b..58d7d726629ad 100644
--- a/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/accordion_option_plugin.js
@@ -17,6 +17,7 @@ export class AccordionItemOption extends BaseOptionComponent {
 
 class accordionOptionPlugin extends Plugin {
     static id = "accordionOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(SNIPPET_SPECIFIC, AccordionOption),
diff --git a/addons/website/static/src/builder/plugins/options/animate_option.js b/addons/website/static/src/builder/plugins/options/animate_option.js
index 8ee47834e2e95..8a7eedf10eb53 100644
--- a/addons/website/static/src/builder/plugins/options/animate_option.js
+++ b/addons/website/static/src/builder/plugins/options/animate_option.js
@@ -1,6 +1,10 @@
 import { BaseOptionComponent, useDomState } from "@html_builder/core/utils";
 import { isImageSupportedForStyle } from "@html_builder/plugins/image/replace_media_option";
 
+/**
+ * @typedef {((el: HTMLElement) => Promise<boolean>)[]} hover_effect_allowed_predicates
+ */
+
 export class AnimateOption extends BaseOptionComponent {
     static template = "website.AnimateOption";
     static dependencies = ["animateOption"];
diff --git a/addons/website/static/src/builder/plugins/options/animate_option_plugin.js b/addons/website/static/src/builder/plugins/options/animate_option_plugin.js
index 953c7cd49c33b..5401950f9eac0 100644
--- a/addons/website/static/src/builder/plugins/options/animate_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/animate_option_plugin.js
@@ -12,10 +12,23 @@ import { childNodeIndex, DIRECTIONS, nodeSize } from "@html_editor/utils/positio
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { EmphasizeAnimatedText } from "./emphasize_animated_text";
 
+/**
+ * @typedef { Object } AnimateOptionShared
+ * @property { AnimateOptionPlugin['forceAnimation'] } forceAnimation
+ * @property { AnimateOptionPlugin['getDirectionsItems'] } getDirectionsItems
+ * @property { AnimateOptionPlugin['getEffectsItems'] } getEffectsItems
+ */
+
+/**
+ * @typedef {((editingElement: HTMLElement) => Promise<void>)[]} remove_hover_effect_handlers
+ * @typedef {((editingElement: HTMLElement) => Promise<void>)[]} set_hover_effect_handlers
+ */
+
 export class AnimateOptionPlugin extends Plugin {
     static id = "animateOption";
     static dependencies = ["history", "selection", "split"];
     static shared = ["forceAnimation", "getDirectionsItems", "getEffectsItems"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(ANIMATE, AnimateOption)],
         toolbar_items: [
diff --git a/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js b/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
index 05d0b68a20fb8..9290e4e873c5d 100644
--- a/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/announcement_scroll_option_plugin.js
@@ -26,6 +26,7 @@ export class AnnouncementScrollOption extends BaseOptionComponent {
 export class AnnouncementScrollOptionPlugin extends Plugin {
     static id = "announcementScrollOptionPlugin";
     selector = AnnouncementScrollOption.selector;
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(after(WEBSITE_BACKGROUND_OPTIONS), AnnouncementScrollOption),
diff --git a/addons/website/static/src/builder/plugins/options/background_option_plugin.js b/addons/website/static/src/builder/plugins/options/background_option_plugin.js
index 7eaf222244428..6242bafd5532c 100644
--- a/addons/website/static/src/builder/plugins/options/background_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/background_option_plugin.js
@@ -5,6 +5,12 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { _t } from "@web/core/l10n/translation";
 import { VideoSelector } from "@html_editor/main/media/media_dialog/video_selector";
 
+/**
+ * @typedef { Object } WebsiteBackgroundVideoShared
+ * @property { WebsiteBackgroundVideoPlugin['loadReplaceBackgroundVideo'] } loadReplaceBackgroundVideo
+ * @property { WebsiteBackgroundVideoPlugin['applyReplaceBackgroundVideo'] } applyReplaceBackgroundVideo
+ */
+
 function getBgVideoOrParallax(editingElement) {
     // Make sure parallax and video element are considered to be below the
     // color filters / shape
@@ -20,6 +26,7 @@ function getBgVideoOrParallax(editingElement) {
 
 class WebsiteBackgroundImageOptionPlugin extends Plugin {
     static id = "websiteBackgroundImageOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         background_filter_target_providers: withSequence(10, getBgVideoOrParallax),
     };
@@ -27,6 +34,7 @@ class WebsiteBackgroundImageOptionPlugin extends Plugin {
 
 class WebsiteBackgroundShapeOptionPlugin extends Plugin {
     static id = "websiteBackgroundShapeOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         background_shape_target_providers: withSequence(10, getBgVideoOrParallax),
     };
@@ -36,6 +44,7 @@ class WebsiteBackgroundVideoPlugin extends Plugin {
     static id = "websiteBackgroundVideoPlugin";
     static dependencies = ["media"];
     static shared = ["loadReplaceBackgroundVideo", "applyReplaceBackgroundVideo"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             ToggleBgVideoAction,
diff --git a/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js b/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
index 4036b8e822432..2da6cf725f975 100644
--- a/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/bento_border_option_plugin.js
@@ -15,6 +15,7 @@ export class BentoBorderOption extends BaseOptionComponent {
 
 class BentoBorderOptionPlugin extends Plugin {
     static id = "BentoBorderOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(after(WEBSITE_BACKGROUND_OPTIONS), BentoBorderOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js b/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js
index 1f734a8cc80b7..b941febb93fb7 100644
--- a/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/blockquote_option_plugin.js
@@ -25,6 +25,7 @@ export class WebsiteBackgroundBlockquoteOption extends BaseWebsiteBackgroundOpti
 
 class BlockquoteOptionPlugin extends Plugin {
     static id = "blockquoteOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         mark_color_level_selector_params: [{ selector: ".s_blockquote" }],
         builder_options: [
diff --git a/addons/website/static/src/builder/plugins/options/border_option_plugin.js b/addons/website/static/src/builder/plugins/options/border_option_plugin.js
index 69c9ff83de74a..b1ec3b9f9e58b 100644
--- a/addons/website/static/src/builder/plugins/options/border_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/border_option_plugin.js
@@ -19,6 +19,7 @@ export class BorderOption extends BaseOptionComponent {
 
 class BorderOptionPlugin extends Plugin {
     static id = "borderOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(BOX_BORDER_SHADOW, BorderOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/options/button_option_plugin.js b/addons/website/static/src/builder/plugins/options/button_option_plugin.js
index bb2c00b1b74ea..7c7d0de427891 100644
--- a/addons/website/static/src/builder/plugins/options/button_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/button_option_plugin.js
@@ -15,6 +15,7 @@ const sizeClasses = ["btn-sm", "btn-lg"];
 
 class ButtonOptionPlugin extends Plugin {
     static id = "buttonOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         on_cloned_handlers: this.onCloned.bind(this),
         // Drag and drop from sidebar: manage the button preview.
diff --git a/addons/website/static/src/builder/plugins/options/card_image_option_plugin.js b/addons/website/static/src/builder/plugins/options/card_image_option_plugin.js
index 863b01db9ae53..0505c1f1db754 100644
--- a/addons/website/static/src/builder/plugins/options/card_image_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/card_image_option_plugin.js
@@ -4,6 +4,11 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { renderToElement } from "@web/core/utils/render";
 
+/**
+ * @typedef { Object } CardImageOptionShared
+ * @property { CardImageOptionPlugin['adaptRatio'] } adaptRatio
+ */
+
 const ratiosOnlySupportedForTopImage = [
     "ratio ratio-4x3",
     "ratio ratio-16x9",
@@ -26,6 +31,7 @@ class CardImageOptionPlugin extends Plugin {
     static id = "cardImageOption";
     static dependencies = ["remove", "history", "builderOptions"];
     static shared = ["adaptRatio"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetCoverImagePositionAction,
diff --git a/addons/website/static/src/builder/plugins/options/card_option_plugin.js b/addons/website/static/src/builder/plugins/options/card_option_plugin.js
index 16378e4e0c7c6..cea720493ac32 100644
--- a/addons/website/static/src/builder/plugins/options/card_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/card_option_plugin.js
@@ -23,6 +23,7 @@ export class WebsiteBackgroundCardOption extends BaseWebsiteBackgroundOption {
 class CardOptionPlugin extends Plugin {
     static id = "cardOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             CardOption,
diff --git a/addons/website/static/src/builder/plugins/options/card_width_option_plugin.js b/addons/website/static/src/builder/plugins/options/card_width_option_plugin.js
index cb6f008c386fb..1a26bff5276d2 100644
--- a/addons/website/static/src/builder/plugins/options/card_width_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/card_width_option_plugin.js
@@ -4,6 +4,7 @@ import { registry } from "@web/core/registry";
 
 class CardWidthOptionPlugin extends Plugin {
     static id = "cardWidthOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetCardWidthAction,
diff --git a/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js b/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js
index 22c79fe556d36..5da9b98d16747 100644
--- a/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/carousel_slides_option_plugin.js
@@ -13,6 +13,7 @@ export class CarouselSlidesOption extends BaseOptionComponent {
 
 export class CarouselSlidesOptionPlugin extends Plugin {
     static id = "carouselSlidesOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(SNIPPET_SPECIFIC_END, CarouselSlidesOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/chart_option_plugin.js b/addons/website/static/src/builder/plugins/options/chart_option_plugin.js
index c0db34368956d..03f3aeed3e031 100644
--- a/addons/website/static/src/builder/plugins/options/chart_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/chart_option_plugin.js
@@ -3,11 +3,17 @@ import { ChartOption, DATASET_KEY_PREFIX, getColor } from "./chart_option";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+/**
+ * @typedef { Object } ChartOptionShared
+ * @property { ChartOptionPlugin['isPieChart'] } isPieChart
+ */
+
 class ChartOptionPlugin extends Plugin {
     static id = "chartOptionPlugin";
     static dependencies = ["history"];
     static shared = ["isPieChart"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [ChartOption],
         so_content_addition_selector: [".s_chart"],
diff --git a/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js b/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js
index c9625adf41aad..58db3448b817d 100644
--- a/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/controller_page_listing_layout_option_plugin.js
@@ -18,6 +18,7 @@ export class ControllerPageListingLayoutOption extends BaseOptionComponent {
 class ControllerPageListingLayoutOptionPlugin extends Plugin {
     static id = "controllerPageListingLayoutOption";
     static dependencies = ["builderActions"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [ControllerPageListingLayoutOption],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/cookies_bar_option.js b/addons/website/static/src/builder/plugins/options/cookies_bar_option.js
index 9b84730054fd8..a75b33acc36a2 100644
--- a/addons/website/static/src/builder/plugins/options/cookies_bar_option.js
+++ b/addons/website/static/src/builder/plugins/options/cookies_bar_option.js
@@ -4,6 +4,11 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { renderToElement } from "@web/core/utils/render";
 
+/**
+ * @typedef { Object } CookiesBarOptionShared
+ * @property { CookiesBarOptionPlugin['getSavedSelectors'] } getSavedSelectors
+ */
+
 export class CookiesBarOption extends BaseOptionComponent {
     static template = "website.CookiesBarOption";
     static selector = "#website_cookies_bar";
@@ -12,6 +17,7 @@ export class CookiesBarOption extends BaseOptionComponent {
 class CookiesBarOptionPlugin extends Plugin {
     static id = "CookiesBarOptionPlugin";
     static shared = ["getSavedSelectors"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [CookiesBarOption],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js b/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js
index 9e7172477563f..d01378ccebfe5 100644
--- a/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/countdown_option_plugin.js
@@ -17,6 +17,7 @@ export class CountdownOption extends BaseOptionComponent {
 
 class CountdownOptionPlugin extends Plugin {
     static id = "CountdownOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(before(SNIPPET_SPECIFIC_END), CountdownOption)],
         so_content_addition_selector: [".s_countdown"],
diff --git a/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js b/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js
index 956ebfe9fb462..4b2677b52f49a 100644
--- a/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/cover_properties_option_plugin.js
@@ -10,6 +10,7 @@ import { coverSizeClassLabels } from "./cover_properties_option";
 class CoverPropertiesOptionPlugin extends Plugin {
     static id = "coverPropertiesOption";
     static dependencies = ["builderActions", "media", "imagePostProcess"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(COVER_PROPERTIES, CoverPropertiesOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js
index 4448c4107fcdf..7ce1e9e3b32fc 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_carousel_option_plugin.js
@@ -5,6 +5,13 @@ import { DynamicSnippetCarouselOption } from "./dynamic_snippet_carousel_option"
 import { DYNAMIC_SNIPPET, setDatasetIfUndefined } from "./dynamic_snippet_option_plugin";
 import { BuilderAction } from "@html_builder/core/builder_action";
 
+/**
+ * @typedef { Object } DynamicSnippetCarouselOptionShared
+ * @property { DynamicSnippetCarouselOptionPlugin['setOptionsDefaultValues'] } setOptionsDefaultValues
+ * @property { DynamicSnippetCarouselOptionPlugin['updateTemplateSnippetCarousel'] } updateTemplateSnippetCarousel
+ * @property { DynamicSnippetCarouselOptionPlugin['getModelNameFilter'] } getModelNameFilter
+ */
+
 export const DYNAMIC_SNIPPET_CAROUSEL = DYNAMIC_SNIPPET;
 
 class DynamicSnippetCarouselOptionPlugin extends Plugin {
@@ -16,6 +23,7 @@ class DynamicSnippetCarouselOptionPlugin extends Plugin {
     ];
     static dependencies = ["dynamicSnippetOption"];
     modelNameFilter = "";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetCarouselSliderSpeedAction,
diff --git a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
index baa2e519fb65b..8e56643429b33 100644
--- a/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/dynamic_snippet_option_plugin.js
@@ -7,6 +7,47 @@ import { Cache } from "@web/core/utils/cache";
 import { DynamicSnippetOption } from "./dynamic_snippet_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
 
+/**
+ * @typedef {object} Template
+ * @property {string} arrowPosition
+ * @property {string} columnClasses
+ * @property {string} containerClasses
+ * @property {string} contentClasses
+ * @property {string} extraClasses
+ * @property {string} extraSnippetClasses
+ * @property {string} key
+ * @property {string} numberOfElements
+ * @property {string} numberOfElementsSmallDevices
+ * @property {string} numberOfRecords
+ * @property {string} rowPerSlide
+ * @property {string} thumb
+ */
+
+/**
+ * @typedef { Object } DynamicSnippetOptionShared
+ * @property { DynamicSnippetOptionPlugin['fetchDynamicFilters'] } fetchDynamicFilters
+ * @property { DynamicSnippetOptionPlugin['fetchDynamicSnippetTemplates'] } fetchDynamicSnippetTemplates
+ * @property { DynamicSnippetOptionPlugin['getDefaultSnippetFilterId'] } getDefaultSnippetFilterId
+ * @property { DynamicSnippetOptionPlugin['getDefaultSnippetRecordId'] } getDefaultSnippetRecordId
+ * @property { DynamicSnippetOptionPlugin['getDefaultSnippetTemplate'] } getDefaultSnippetTemplate
+ * @property { DynamicSnippetOptionPlugin['getSnippetModelName'] } getSnippetModelName
+ * @property { DynamicSnippetOptionPlugin['getSnippetTitleClasses'] } getSnippetTitleClasses
+ * @property { DynamicSnippetOptionPlugin['getTemplateByKey'] } getTemplateByKey
+ * @property { DynamicSnippetOptionPlugin['isModelSnippetTemplate'] } isModelSnippetTemplate
+ * @property { DynamicSnippetOptionPlugin['isSingleModeSnippet'] } isSingleModeSnippet
+ * @property { DynamicSnippetOptionPlugin['isSingleModeSnippetTemplate'] } isSingleModeSnippetTemplate
+ * @property { DynamicSnippetOptionPlugin['setOptionsDefaultValues'] } setOptionsDefaultValues
+ * @property { DynamicSnippetOptionPlugin['updateTemplate'] } updateTemplate
+ * @property { DynamicSnippetOptionPlugin['getModelNameFilter'] } getModelNameFilter
+ */
+
+/**
+ * @typedef {((arg: {
+ *      el: HTMLElement;
+ *      template: Template;
+ * }) => void)[]} dynamic_snippet_template_updated
+ */
+
 export const DYNAMIC_SNIPPET = SNIPPET_SPECIFIC_END;
 
 class DynamicSnippetOptionPlugin extends Plugin {
@@ -30,6 +71,7 @@ class DynamicSnippetOptionPlugin extends Plugin {
     modelNameFilter = "";
     fetchedDynamicFilters = [];
     fetchedDynamicFilterTemplates = [];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(DYNAMIC_SNIPPET, DynamicSnippetOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js b/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
index 3dd90520bc33b..02bcf96e25d2d 100644
--- a/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/ecomm_categories_showcase_option_plugin.js
@@ -40,6 +40,7 @@ class EcommCategoriesShowcaseOptionPlugin extends Plugin {
         "rounded-5",
     ];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(SNIPPET_SPECIFIC_BEFORE, EcommCategoriesShowcaseOption),
diff --git a/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js b/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js
index 3e487db064c13..6cc6156acef45 100644
--- a/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/embed_code_option_plugin.js
@@ -16,6 +16,7 @@ export class EmbedCodeOption extends BaseOptionComponent {
 class EmbedCodeOptionPlugin extends Plugin {
     static id = "embedCodeOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(BEGIN, EmbedCodeOption)],
         so_content_addition_selector: [".s_embed_code"],
diff --git a/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js b/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
index 077f513e4b757..157878628111d 100644
--- a/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/facebook_option_plugin.js
@@ -13,6 +13,7 @@ export class FacebookOption extends BaseOptionComponent {
 class FacebookOptionPlugin extends Plugin {
     static id = "facebookOption";
     static dependencies = ["history"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [FacebookOption],
         so_content_addition_selector: [".o_facebook_page"],
diff --git a/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js b/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js
index 8747b0da35c70..31d1eef61b7ca 100644
--- a/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/faq_horizontal_option_plugin.js
@@ -11,6 +11,7 @@ export class FaqHorizontalOption extends BaseOptionComponent {
 
 class FaqHorizontalOptionPlugin extends Plugin {
     static id = "faqHorizontalOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(BEGIN, FaqHorizontalOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js b/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js
index 8d8e394e66d30..ed569c19dca8a 100644
--- a/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/footer_copyright_option_plugin.js
@@ -5,6 +5,7 @@ import { FooterCopyrightOption } from "@website/builder/plugins/options/footer_c
 class FooterCopyrightOptionPlugin extends Plugin {
     static id = "footerCopyrightOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [FooterCopyrightOption],
     };
diff --git a/addons/website/static/src/builder/plugins/options/footer_option_plugin.js b/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
index 0ab0af23e6ff7..0e4964d073504 100644
--- a/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/footer_option_plugin.js
@@ -15,6 +15,20 @@ import { BaseOptionComponent } from "@html_builder/core/utils";
 import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
 import { ShadowOption } from "@html_builder/plugins/shadow_option";
 
+/** @typedef {import("@odoo/owl").Component} Component */
+
+/**
+ * @typedef { Object } FooterOptionShared
+ * @property { FooterOptionPlugin['getFooterTemplates'] } getFooterTemplates
+ */
+/**
+ * @typedef {(() => Promise<{
+ *     key: string,
+ *     Component: Component,
+ *     props: any,
+ * }[]>)[]} footer_templates_providers
+ */
+
 const [
     FOOTER_TEMPLATE,
     FOOTER_COLORS,
@@ -90,6 +104,7 @@ class FooterOptionPlugin extends Plugin {
     static dependencies = ["customizeWebsite", "builderActions"];
     static shared = ["getFooterTemplates"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(FOOTER_TEMPLATE, FooterTemplateOption),
diff --git a/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js b/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js
index 3ae10a1790f77..5c3bffd6673c9 100644
--- a/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/gallery_element_option_plugin.js
@@ -5,6 +5,18 @@ import { SNIPPET_SPECIFIC } from "@html_builder/utils/option_sequence";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef {((
+ *      activeItemEl: HTMLElement,
+ *      optionName: string
+ * ) => HTMLElement[])[]} get_gallery_items_handlers
+ * @typedef {((
+ *      activeItemEl: HTMLElement,
+ *      itemEls: HTMLElement[],
+ *      optionName: string
+ * ) => void)[]} reorder_items_handlers
+ */
+
 export class GalleryElementOption extends BaseOptionComponent {
     static template = "website.GalleryElementOption";
     static selector =
@@ -14,6 +26,7 @@ export class GalleryElementOption extends BaseOptionComponent {
 export class GalleryElementOptionPlugin extends Plugin {
     static id = "galleryElementOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(SNIPPET_SPECIFIC, GalleryElementOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
index 59a02c40fb796..b6db0d9607aa9 100644
--- a/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/google_maps_option/google_maps_option_plugin.js
@@ -26,6 +26,18 @@ import { BuilderAction } from "@html_builder/core/builder_action";
  * @typedef {{ isValid: boolean, message?: string }} ApiKeyValidation
  */
 
+/**
+ * @typedef { Object } GoogleMapsOptionShared
+ * @property { GoogleMapsOptionPlugin['configureGMapsAPI'] } configureGMapsAPI
+ * @property { GoogleMapsOptionPlugin['initializeGoogleMaps'] } initializeGoogleMaps
+ * @property { GoogleMapsOptionPlugin['failedToInitializeGoogleMaps'] } failedToInitializeGoogleMaps
+ * @property { GoogleMapsOptionPlugin['shouldRefetchApiKey'] } shouldRefetchApiKey
+ * @property { GoogleMapsOptionPlugin['shouldNotRefetchApiKey'] } shouldNotRefetchApiKey
+ * @property { GoogleMapsOptionPlugin['commitPlace'] } commitPlace
+ * @property { GoogleMapsOptionPlugin['getPlace'] } getPlace
+ * @property { GoogleMapsOptionPlugin['getMapsAPI'] } getMapsAPI
+ */
+
 export class GoogleMapsOptionPlugin extends Plugin {
     static id = "googleMapsOption";
     static dependencies = ["history", "edit_interaction"];
@@ -39,6 +51,7 @@ export class GoogleMapsOptionPlugin extends Plugin {
         "getPlace",
         "getMapsAPI",
     ];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [GoogleMapsOption],
         so_content_addition_selector: [".s_google_map"],
diff --git a/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
index 34675243853d5..d711270ebe7fd 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_box_option_plugin.js
@@ -16,6 +16,7 @@ class HeaderBoxOptionPlugin extends Plugin {
     static id = "HeaderBoxOptionPlugin";
     static dependencies = ["customizeWebsite"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(HEADER_BOX, HeaderBoxOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
index e999fa1042aad..51c8feb50fb1f 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_navigation_option_plugin.js
@@ -8,6 +8,7 @@ class HeaderNavigationOptionPlugin extends Plugin {
     static id = "HeaderNavigationOptionPlugin";
     static dependencies = ["customizeWebsite"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(HEADER_NAVIGATION, HeaderNavigationOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js b/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
index 6503390acad79..20bef89993451 100644
--- a/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/header/header_option_plugin.js
@@ -40,6 +40,7 @@ class HeaderOptionPlugin extends Plugin {
     static id = "headerOption";
     static dependencies = ["customizeWebsite", "menuDataPlugin"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_header_middle_buttons: [
             {
diff --git a/addons/website/static/src/builder/plugins/options/icon_snippet_option_plugin.js b/addons/website/static/src/builder/plugins/options/icon_snippet_option_plugin.js
index bfc956c86c3f4..27209dfcb18b3 100644
--- a/addons/website/static/src/builder/plugins/options/icon_snippet_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/icon_snippet_option_plugin.js
@@ -5,6 +5,7 @@ import { registry } from "@web/core/registry";
 export class IconSnippetOptionPlugin extends Plugin {
     static id = "iconSnippetOption";
     static dependencies = ["media"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
         so_content_addition_selector: [".s_icon"],
diff --git a/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js b/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
index 66513a94b2c27..ba9a122ae4531 100644
--- a/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/image_gallery_option_plugin.js
@@ -11,6 +11,15 @@ import { uniqueId } from "@web/core/utils/functions";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 import { forwardToThumbnail } from "@html_builder/utils/utils_css";
 
+/**
+ * @typedef { Object } ImageGalleryOptionShared
+ * @property { ImageGalleryOption['getColumns'] } getColumns
+ * @property { ImageGalleryOption['getMode'] } getMode
+ * @property { ImageGalleryOption['processImage'] } processImage
+ * @property { ImageGalleryOption['restoreSelection'] } restoreSelection
+ * @property { ImageGalleryOption['setImages'] } setImages
+ */
+
 export class ImageGalleryImagesOption extends BaseOptionComponent {
     static template = "website.ImageGalleryImagesOption";
     static selector = ".s_image_gallery";
@@ -28,6 +37,7 @@ class ImageGalleryOption extends Plugin {
         "imagePostProcess",
     ];
     static shared = ["processImages", "getMode", "setImages", "restoreSelection", "getColumns"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(SNIPPET_SPECIFIC, ImageGalleryImagesOption),
diff --git a/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js b/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js
index 767cfea2029cf..62777ce183fb1 100644
--- a/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/instagram_option_plugin.js
@@ -7,6 +7,11 @@ import { withSequence } from "@html_editor/utils/resource";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } InstagramOptionShared
+ * @property { InstagramOptionPlugin['instagramPageNameFromUrl'] } instagramPageNameFromUrl
+ */
+
 export class InstagramOption extends BaseOptionComponent {
     static template = "website.InstagramOption";
     static selector = ".s_instagram_page";
@@ -17,6 +22,7 @@ class InstagramOptionPlugin extends Plugin {
     static dependencies = ["history"];
     static shared = ["instagramPageNameFromUrl"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(SNIPPET_SPECIFIC_END, InstagramOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/language_selector_option.js b/addons/website/static/src/builder/plugins/options/language_selector_option.js
index 0981d5329772a..a120e85050a34 100644
--- a/addons/website/static/src/builder/plugins/options/language_selector_option.js
+++ b/addons/website/static/src/builder/plugins/options/language_selector_option.js
@@ -17,6 +17,7 @@ const LANGUAGE_SELECTOR = after(HEADER_BOX);
 class LanguageSelectorOptionPlugin extends Plugin {
     static id = "languageSelectorOption";
     static dependencies = ["builderActions"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(LANGUAGE_SELECTOR, LanguageSelectorOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/options/map_option_plugin.js b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
index 74d04e1741172..8cdbd1ab570b5 100644
--- a/addons/website/static/src/builder/plugins/options/map_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/map_option_plugin.js
@@ -12,6 +12,7 @@ export class MapOption extends BaseOptionComponent {
 
 class MapOptionPlugin extends Plugin {
     static id = "mapOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [MapOption],
         so_content_addition_selector: [".s_map"],
diff --git a/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js b/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js
index df98448b8655f..01d5cbd084f07 100644
--- a/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/media_list_option_plugin.js
@@ -14,6 +14,7 @@ export class MediaListOption extends BaseOptionComponent {
 class MediaListOptionPlugin extends Plugin {
     static id = "mediaListOption";
     mediaListItemOptionSelector = ".s_media_list_item";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(BEGIN, MediaListOption),
diff --git a/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js b/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js
index 784f92487013c..e45037172896f 100644
--- a/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/mega_menu_option_plugin.js
@@ -4,11 +4,17 @@ import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
 import { SNIPPET_SPECIFIC_NEXT } from "@html_builder/utils/option_sequence";
 
+/**
+ * @typedef { Object } MegaMenuOptionShared
+ * @property { MegaMenuOptionPlugin['getTemplatePrefix'] } getTemplatePrefix
+ */
+
 export class MegaMenuOptionPlugin extends Plugin {
     static id = "megaMenuOptionPlugin";
     static dependencies = [];
     static shared = ["getTemplatePrefix"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(SNIPPET_SPECIFIC_NEXT, MegaMenuOption)],
         dropzone_selector: {
diff --git a/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js b/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js
index 2c5b47b7e7100..9b70c32d482af 100644
--- a/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/navbar_logo_option_plugin.js
@@ -15,6 +15,7 @@ export class NavbarLogoOption extends BaseOptionComponent {
 
 class NavbarLogoOptionPlugin extends Plugin {
     static id = "navbarLogoOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(SNIPPET_SPECIFIC_NEXT, NavbarLogoOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/options/navtabs_header_buttons_plugin.js b/addons/website/static/src/builder/plugins/options/navtabs_header_buttons_plugin.js
index b62203b5581a7..33d0c5a5a527b 100644
--- a/addons/website/static/src/builder/plugins/options/navtabs_header_buttons_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/navtabs_header_buttons_plugin.js
@@ -9,6 +9,7 @@ const tabsSectionSelector = "section.s_tabs, section.s_tabs_images";
 class NavTabsOptionPlugin extends Plugin {
     static id = "navTabsOption";
     static dependencies = ["clone"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_header_middle_buttons: {
             Component: NavTabsHeaderMiddleButtons,
diff --git a/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js b/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
index 9dfba409382b8..9c6a3df2b731b 100644
--- a/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/navtabs_style_option_plugin.js
@@ -7,6 +7,13 @@ import { _t } from "@web/core/l10n/translation";
 import { localization } from "@web/core/l10n/localization";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } NavTabsStyleOptionShared
+ * @property { NavTabsStyleOptionPlugin['isNavItem'] } isNavItem
+ * @property { NavTabsStyleOptionPlugin['getActiveOverlayButtons'] } getActiveOverlayButtons
+ * @property { NavTabsStyleOptionPlugin['moveNavItem'] } moveNavItem
+ */
+
 export class NavTabsStyleOption extends BaseOptionComponent {
     static template = "website.NavTabsStyleOption";
     static selector = ".s_tabs";
@@ -22,6 +29,7 @@ export class NavTabsImagesStyleOption extends BaseOptionComponent {
 class NavTabsStyleOptionPlugin extends Plugin {
     static id = "navTabsOptionStyle";
     static shared = ["isNavItem", "getActiveOverlayButtons", "moveNavItem"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(SNIPPET_SPECIFIC_END, NavTabsStyleOption),
diff --git a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
index 7bcbba6e9d948..a9ee4e7943bc5 100644
--- a/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/parallax_option_plugin.js
@@ -5,10 +5,17 @@ import { registry } from "@web/core/registry";
 import { BaseWebsiteBackgroundOption } from "./background_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { withSequence } from "@html_editor/utils/resource";
+
+/**
+ * @typedef { Object } WebsiteParallaxShared
+ * @property { WebsiteParallaxPlugin['applyParallaxType'] } applyParallaxType
+ */
+
 class WebsiteParallaxPlugin extends Plugin {
     static id = "websiteParallaxPlugin";
     static dependencies = ["builderActions", "backgroundImageOption"];
     static shared = ["applyParallaxType"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetParallaxTypeAction,
diff --git a/addons/website/static/src/builder/plugins/options/popup_option_plugin.js b/addons/website/static/src/builder/plugins/options/popup_option_plugin.js
index 3086ea473dcb7..dbf63c7526737 100644
--- a/addons/website/static/src/builder/plugins/options/popup_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/popup_option_plugin.js
@@ -25,6 +25,7 @@ class PopupOptionPlugin extends Plugin {
     static id = "PopupOption";
     static dependencies = ["anchor", "visibility", "history", "popupVisibilityPlugin"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(POPUP, PopupOption),
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js
index 9c91f925e287b..72b809197f2b6 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_boxed_option_plugin.js
@@ -28,6 +28,7 @@ export class AddProductPricelistBoxedSectionOption extends BaseAddProductOption
 
 class PriceListBoxedOptionPlugin extends Plugin {
     static id = "priceListBoxedOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(BEGIN, AddProductPricelistBoxedOption),
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js
index 38da2c1475b18..1761fd8ab66cc 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_cafe_plugin.js
@@ -35,6 +35,7 @@ export class AddProductPricelistCafeRowOption extends BaseAddProductOption {
 
 class PriceListCafePlugin extends Plugin {
     static id = "priceList";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(BEGIN, AddProductPricelistCafeOption),
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_plugin.js
index 82257c1efa499..6fa167875517e 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/pricelist_plugin.js
@@ -5,6 +5,7 @@ import { registry } from "@web/core/registry";
 
 class PriceListPlugin extends Plugin {
     static id = "priceListPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             TogglePriceListDescriptionAction,
diff --git a/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js b/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js
index 0a27c6d6287fe..4c65f606ba959 100644
--- a/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/pricelist_option/product_catalog_plugin.js
@@ -28,6 +28,7 @@ export class AddProductCatalogSectionOption extends BaseAddProductOption {
 
 class ProductCatalogOptionPlugin extends Plugin {
     static id = "productCatalogOptionPlugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(BEGIN, AddProductCatalogOption),
diff --git a/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js b/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js
index a867b1072523d..8a7d02b43b0e5 100644
--- a/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/process_steps_option_plugin.js
@@ -20,6 +20,7 @@ export class WebsiteBackgroundProcessStepOption extends BaseWebsiteBackgroundOpt
 
 class ProcessStepsOptionPlugin extends Plugin {
     static id = "processStepsOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(after(CONTAINER_WIDTH), ProcessStepsOption),
diff --git a/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js b/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js
index b46f41c807fdd..8716d3eeecd34 100644
--- a/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/progress_bar_option_plugin.js
@@ -24,6 +24,7 @@ export class ProgressBarOption extends BaseOptionComponent {
 
 class ProgressBarOptionPlugin extends Plugin {
     static id = "progressBarOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: ProgressBarOption,
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js b/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js
index 8f1a7ffa10063..a825518cc1692 100644
--- a/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/scroll_button_option_plugin.js
@@ -9,6 +9,7 @@ import { SCROLL_BUTTON } from "@website/builder/option_sequence";
 
 class ScrollButtonOptionPlugin extends Plugin {
     static id = "scrollButtonOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(SCROLL_BUTTON, ScrollButtonOption)],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js b/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
index eefd582f0a764..ff6ce169fbd91 100644
--- a/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/searchbar_option_plugin.js
@@ -4,8 +4,58 @@ import { registry } from "@web/core/registry";
 import { SearchbarOption } from "./searchbar_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
 
+/** @typedef {import("plugins").LazyTranslatedString} LazyTranslatedString */
+
+/**
+ * @typedef {{
+ *      label: LazyTranslatedString;
+ *      orderBy: string;
+ *      dependency?: string;
+ *      id?: string;
+ * }[]} searchbar_option_order_by_items
+ *
+ * Register orderBy options for the website searchbar.
+ * `orderBy` takes a string like `record_field_name` + `asc` or `desc`.
+ * `dependency` takes an id of another builder option. You can omit it if the
+ * orderBy option should always be visible.
+ * You can reference `id` if you need the new option to have an id (if another
+ * option depends on it being active).
+ *
+ * Example:
+ *
+ *      resources: {
+ *          searchbar_option_order_by_items: {
+ *              label: _t("Date (old to new)"),
+ *              orderBy: "published_date asc",
+ *              dependency: "search_blogs_opt",
+ *          },
+ *      };
+ */
+/**
+ * @typedef {{
+ *      label: LazyTranslatedString;
+ *      dataAttribute: string;
+ *      dependency: string;
+ * }[]} searchbar_option_display_items
+ *
+ * Register display options for the website searchbar.
+ * `dataAttribute` is the attribute which will be used to display the data.
+ * `dependency` takes an id of another builder option.
+ *
+ * Example:
+ *
+ *      resources: {
+ *          searchbar_option_display_items: {
+ *              label: _t("Description"),
+ *              dataAttribute: "displayDescription",
+ *              dependency: "search_all_opt",
+ *          },
+ *      };
+ */
+
 class SearchbarOptionPlugin extends Plugin {
     static id = "searchbarOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [SearchbarOption],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js b/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
index a346eb95b721b..1afde6e1df073 100644
--- a/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/social_media_option_plugin.js
@@ -12,6 +12,19 @@ import { BuilderAction } from "@html_builder/core/builder_action";
 import { AnimateOption } from "./animate_option";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } SocialMediaOptionShared
+ * @property { SocialMediaOptionPlugin['newLinkElement'] } newLinkElement
+ * @property { SocialMediaOptionPlugin['getRecordedSocialMedia'] } getRecordedSocialMedia
+ * @property { SocialMediaOptionPlugin['setRecordedSocialMedia'] } setRecordedSocialMedia
+ * @property { SocialMediaOptionPlugin['setRecordedSocialMediaAreEdited'] } setRecordedSocialMediaAreEdited
+ * @property { SocialMediaOptionPlugin['getAssociatedSocialMedia'] } getAssociatedSocialMedia
+ * @property { SocialMediaOptionPlugin['removeSocialMediaClasses'] } removeSocialMediaClasses
+ * @property { SocialMediaOptionPlugin['removeIconClasses'] } removeIconClasses
+ * @property { SocialMediaOptionPlugin['getRecordedSocialMediaNames'] } getRecordedSocialMediaNames
+ * @property { SocialMediaOptionPlugin['reorderSocialMediaLink'] } reorderSocialMediaLink
+ */
+
 /**
  * @typedef { Object } SocialMediaInfo
  * @property { boolean } [recorded] whether the social media is one from the orm
@@ -132,6 +145,7 @@ class SocialMediaOptionPlugin extends Plugin {
         "getRecordedSocialMediaNames",
         "reorderSocialMediaLink",
     ];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(TITLE_LAYOUT_SIZE, SocialMediaOption),
diff --git a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
index a3b2392df7c63..18a30dd00ae03 100644
--- a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin.js
@@ -33,6 +33,7 @@ export class TableOfContentNavbarOption extends BaseOptionComponent {
 class TableOfContentOptionPlugin extends Plugin {
     static id = "tableOfContentOption";
     static dependencies = ["remove"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [TableOfContentOption, TableOfContentNavbarOption],
         builder_actions: {
diff --git a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js
index 36af8399dc46f..297c12d5e5aae 100644
--- a/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js
+++ b/addons/website/static/src/builder/plugins/options/table_of_content_option_plugin_translate.js
@@ -4,6 +4,7 @@ import { applyFunDependOnSelectorAndExclude } from "@html_builder/plugins/utils"
 export class TranslateTableOfContentOptionPlugin extends Plugin {
     static id = "tableOfContentOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         normalize_handlers: this.normalize.bind(this),
         content_not_editable_selectors: [".s_table_of_content_navbar"],
diff --git a/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js b/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js
index 990721f1e8914..3032c44a90508 100644
--- a/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/timeline_list_option_plugin.js
@@ -21,6 +21,7 @@ export class DotColorOption extends BaseOptionComponent {
 
 class TimelineListOptionPlugin extends Plugin {
     static id = "timelineListOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             // TODO AGAU: alignment option sequence doesn't match master, must split template
diff --git a/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js b/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js
index 678dc7f5825a2..dc9ae21e915fa 100644
--- a/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/timeline_option_plugin.js
@@ -32,6 +32,7 @@ export class DotColorOption extends BaseOptionComponent {
 
 class TimelineOptionPlugin extends Plugin {
     static id = "timelineOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(TIMELINE, TimelineOption),
diff --git a/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js b/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js
index 8c7fdef5c7599..1f6b5896944fd 100644
--- a/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/visibility_option_plugin.js
@@ -8,6 +8,13 @@ import { CONDITIONAL_VISIBILITY, DEVICE_VISIBILITY } from "@website/builder/opti
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef {{
+ *      saveAttribute: string;
+ *      attributeName: string;
+ *      callWith: "code" | "name" | "value" | "id";
+ * }[]} visibility_selector_parameters
+ */
 export const DEVICE_VISIBILITY_OPTION_SELECTOR = "section .row > div";
 
 export class DeviceVisibilityOption extends BaseOptionComponent {
@@ -20,6 +27,7 @@ export class DeviceVisibilityOption extends BaseOptionComponent {
 class VisibilityOptionPlugin extends Plugin {
     static id = "visibilityOption";
     static dependencies = ["visibility", "websiteSession"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(CONDITIONAL_VISIBILITY, VisibilityOption),
diff --git a/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
index 9a2db7d081f07..2bf3cc865e8e9 100644
--- a/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_background_option_plugin.js
@@ -56,6 +56,7 @@ export class WebsiteBackgroundOnlyBGImageOption extends BaseWebsiteBackgroundOpt
 class WebsiteBackgroundOptionPlugin extends Plugin {
     static id = "websiteOption";
     carouselApplyTo = ":scope > .carousel:not(.s_carousel_cards)";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(SNIPPET_SPECIFIC_BEFORE, WebsiteBackgroundCarouselOption),
diff --git a/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js
index ca62b31402190..a3231e038c22c 100644
--- a/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_info_option_plugin.js
@@ -13,6 +13,7 @@ export class InfoPageOption extends BaseOptionComponent {
 
 class WebsiteInfoPageOption extends Plugin {
     static id = "websiteInfoPageOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [InfoPageOption],
     };
diff --git a/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js b/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js
index ee405d34f9a09..d6e3d2de3ff60 100644
--- a/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/options/website_page_config_option_plugin.js
@@ -9,6 +9,15 @@ import { TopMenuVisibilityOption } from "./website_page_config_option";
 import { BuilderAction } from "@html_builder/core/builder_action";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } WebsitePageConfigOptionShared
+ * @property { WebsitePageConfigOptionPlugin['setDirty'] } setDirty
+ * @property { WebsitePageConfigOptionPlugin['setFooterVisible'] } setFooterVisible
+ * @property { WebsitePageConfigOptionPlugin['getVisibilityItem'] } getVisibilityItem
+ * @property { WebsitePageConfigOptionPlugin['getFooterVisibility'] } getFooterVisibility
+ * @property { WebsitePageConfigOptionPlugin['doesPageOptionExist'] } doesPageOptionExist
+ */
+
 export const TOP_MENU_VISIBILITY = after(HEADER_TEMPLATE);
 export const HIDE_FOOTER = after(FOOTER_COPYRIGHT);
 
@@ -30,6 +39,7 @@ class WebsitePageConfigOptionPlugin extends Plugin {
         "getFooterVisibility",
         "doesPageOptionExist",
     ];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             SetWebsiteHeaderVisibilityAction,
diff --git a/addons/website/static/src/builder/plugins/popup_visibility_plugin.js b/addons/website/static/src/builder/plugins/popup_visibility_plugin.js
index 92a5891582730..9faa699559357 100644
--- a/addons/website/static/src/builder/plugins/popup_visibility_plugin.js
+++ b/addons/website/static/src/builder/plugins/popup_visibility_plugin.js
@@ -2,11 +2,18 @@ import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { patch } from "@web/core/utils/patch";
 
+/**
+ * @typedef { Object } PopupVisibilityShared
+ * @property { PopupVisibilityPlugin['onTargetHide'] } onTargetHide
+ * @property { PopupVisibilityPlugin['onTargetShow'] } onTargetShow
+ */
+
 export class PopupVisibilityPlugin extends Plugin {
     static id = "popupVisibilityPlugin";
     static dependencies = ["visibility", "history"];
     static shared = ["onTargetShow", "onTargetHide"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         target_show: this.onTargetShow.bind(this),
         target_hide: this.onTargetHide.bind(this),
diff --git a/addons/website/static/src/builder/plugins/save_translation_plugin.js b/addons/website/static/src/builder/plugins/save_translation_plugin.js
index fba26624e9f40..a5ad0612e4dc7 100644
--- a/addons/website/static/src/builder/plugins/save_translation_plugin.js
+++ b/addons/website/static/src/builder/plugins/save_translation_plugin.js
@@ -6,6 +6,7 @@ export class SaveTranslationPlugin extends Plugin {
     static id = "saveTranslation";
     static dependencies = ["websiteSavePlugin"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         save_elements_overrides: withSequence(20, this.saveTranslationElements.bind(this)),
     };
diff --git a/addons/website/static/src/builder/plugins/setup_editor_plugin.js b/addons/website/static/src/builder/plugins/setup_editor_plugin.js
index b055a9f6b7e68..f86fc70f9e33f 100644
--- a/addons/website/static/src/builder/plugins/setup_editor_plugin.js
+++ b/addons/website/static/src/builder/plugins/setup_editor_plugin.js
@@ -3,6 +3,7 @@ import { registry } from "@web/core/registry";
 
 export class WebsiteSetupEditorPlugin extends Plugin {
     static id = "website.setup_editor_plugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         snippet_preview_dialog_bundles: ["web.assets_frontend"],
     };
diff --git a/addons/website/static/src/builder/plugins/size_option_plugin.js b/addons/website/static/src/builder/plugins/size_option_plugin.js
index 03c8a1c36df47..048ccbcd83a09 100644
--- a/addons/website/static/src/builder/plugins/size_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/size_option_plugin.js
@@ -11,6 +11,7 @@ export class SizeOption extends BaseOptionComponent {
 
 class SizeOptionPlugin extends Plugin {
     static id = "sizeOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(after(BLOCK_ALIGN), SizeOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js b/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js
index 123251539fb71..77ac75c10089e 100644
--- a/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js
+++ b/addons/website/static/src/builder/plugins/snippets_powerbox_plugin.js
@@ -7,6 +7,7 @@ import { isHtmlContentSupported } from "@html_editor/core/selection_plugin";
 class SnippetsPowerboxPlugin extends Plugin {
     static id = "alert";
     static dependencies = ["dom", "history"];
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         user_commands: [
             {
diff --git a/addons/website/static/src/builder/plugins/switchable_views_plugin.js b/addons/website/static/src/builder/plugins/switchable_views_plugin.js
index e4d82f50b8c14..c2099e5a6bbf1 100644
--- a/addons/website/static/src/builder/plugins/switchable_views_plugin.js
+++ b/addons/website/static/src/builder/plugins/switchable_views_plugin.js
@@ -3,15 +3,24 @@ import { rpc } from "@web/core/network/rpc";
 import { registry } from "@web/core/registry";
 import { SwitchableViews } from "./switchable_views";
 
+/**
+ * @typedef { Object } SwitchableViewsShared
+ * @property { SwitchableViewsPlugin['getSwitchableRelatedViews'] } getSwitchableRelatedViews
+ */
+
 export class SwitchableViewsPlugin extends Plugin {
     static id = "switchableViews";
     static dependencies = ["customizeWebsite"];
     static shared = ["getSwitchableRelatedViews"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [SwitchableViews],
     };
 
+    /**
+     * @returns {Promise<[]>}
+     */
     getSwitchableRelatedViews() {
         if (!this.prom) {
             const viewKey = this.document.querySelector("html").dataset.viewXmlid;
diff --git a/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js b/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js
index 6372284ac2aa4..5406898e56607 100644
--- a/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js
+++ b/addons/website/static/src/builder/plugins/theme/theme_tab_plugin.js
@@ -21,6 +21,15 @@ import { CustomizeWebsiteVariableAction } from "../customize_website_plugin";
 import { EditHeadBodyDialog } from "@website/components/edit_head_body_dialog/edit_head_body_dialog";
 import { BaseOptionComponent } from "@html_builder/core/utils";
 
+/**
+ * @typedef { Object } ThemeTabShared
+ * @property { ThemeTabPlugin['buildGray'] } buildGray
+ * @property { ThemeTabPlugin['getGrays'] } getGrays
+ * @property { ThemeTabPlugin['getGrayParams'] } getGrayParams
+ * @property { ThemeTabPlugin['setGrays'] } setGrays
+ * @property { ThemeTabPlugin['setGrayParams'] } setGrayParams
+ */
+
 export const GRAY_PARAMS = {
     EXTRA_SATURATION: "gray-extra-saturation",
     HUE: "gray-hue",
@@ -43,6 +52,7 @@ export class ThemeTabPlugin extends Plugin {
     grayParams = {};
     grays = reactive({});
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             CustomizeGrayAction,
diff --git a/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js b/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js
index 5de21d8e1ab17..71e979923988f 100644
--- a/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/timeline_images_option_plugin.js
@@ -21,6 +21,7 @@ export class DotColorOption extends BaseOptionComponent {
 
 class TimelineImagesOptionPlugin extends Plugin {
     static id = "timelineImagesOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [
             withSequence(BEGIN, TimelineImagesOption),
diff --git a/addons/website/static/src/builder/plugins/translate_announcement_scroll_plugin.js b/addons/website/static/src/builder/plugins/translate_announcement_scroll_plugin.js
index af38008b28fb8..019d5d38cdf82 100644
--- a/addons/website/static/src/builder/plugins/translate_announcement_scroll_plugin.js
+++ b/addons/website/static/src/builder/plugins/translate_announcement_scroll_plugin.js
@@ -6,6 +6,7 @@ export class TranslateAnnouncementScrollPlugin extends Plugin {
     static id = "translateAnnouncementScroll";
     static dependencies = ["history"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         mark_translatable_nodes: this.listenToAnnouncementScrollClick.bind(this),
     };
diff --git a/addons/website/static/src/builder/plugins/translate_link_inline_plugin.js b/addons/website/static/src/builder/plugins/translate_link_inline_plugin.js
index cb60878d62831..a77c3cbfbac47 100644
--- a/addons/website/static/src/builder/plugins/translate_link_inline_plugin.js
+++ b/addons/website/static/src/builder/plugins/translate_link_inline_plugin.js
@@ -3,6 +3,7 @@ import { registry } from "@web/core/registry";
 
 export class TranslateLinkInlinePlugin extends Plugin {
     static id = "translateLinkInline";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         create_link_handlers: (linkEl) => linkEl.classList.add("o_translate_inline"),
     };
diff --git a/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js b/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js
index 2bd9449f60bb3..915fa8a585b1d 100644
--- a/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js
+++ b/addons/website/static/src/builder/plugins/translate_setup_editor_plugin.js
@@ -2,6 +2,7 @@ import { Plugin } from "@html_editor/plugin";
 
 export class TranslateSetupEditorPlugin extends Plugin {
     static id = "translate_setup_editor_plugin";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         o_editable_selectors: "[data-oe-model][data-oe-translation-source-sha]",
     };
diff --git a/addons/website/static/src/builder/plugins/translation_plugin.js b/addons/website/static/src/builder/plugins/translation_plugin.js
index 0b11521f2937e..d1332842c6abf 100644
--- a/addons/website/static/src/builder/plugins/translation_plugin.js
+++ b/addons/website/static/src/builder/plugins/translation_plugin.js
@@ -9,6 +9,10 @@ import {
 } from "../translation_components/translatorInfoDialog";
 import { withSequence } from "@html_editor/utils/resource";
 
+/**
+ * @typedef {((editableEls: HTMLElement[]) => void)[]} mark_translatable_nodes
+ */
+
 export const translationAttributeSelector =
     '[placeholder*="data-oe-translation-source-sha="], ' +
     '[title*="data-oe-translation-source-sha="], ' +
@@ -50,6 +54,7 @@ export class TranslationPlugin extends Plugin {
     static id = "translation";
     static dependencies = ["history"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         clean_for_save_handlers: this.cleanForSave.bind(this),
         get_dirty_els: this.getDirtyTranslations.bind(this),
diff --git a/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js b/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
index 9766f9999b21e..f1e47afd5b727 100644
--- a/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
+++ b/addons/website/static/src/builder/plugins/translation_tab/customize_translation_tab_plugin.js
@@ -8,6 +8,11 @@ import { registry } from "@web/core/registry";
 import { uniqueId } from "@web/core/utils/functions";
 import { TranslateWebpageOption } from "./translate_webpage_option";
 
+/**
+ * @typedef { Object } CustomizeTranslationTabShared
+ * @property { CustomizeTranslationTabPlugin['getTranslationState'] } getTranslationState
+ */
+
 /**
  * Action to translate the entire webpage using AI.
  */
@@ -241,6 +246,7 @@ export class CustomizeTranslationTabPlugin extends Plugin {
         isTranslating: false,
     });
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_actions: {
             TranslateToAction,
diff --git a/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js b/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js
index a6f59274ef3df..01fdd6aa6cc65 100644
--- a/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js
+++ b/addons/website/static/src/builder/plugins/vertical_alignment_option_plugin.js
@@ -13,6 +13,7 @@ export class WebsiteVerticalAlignmentOption extends BaseVerticalAlignmentOption
 
 class VerticalAlignmentOptionPlugin extends Plugin {
     static id = "websiteVerticalAlignmentOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [withSequence(BOX_BORDER_SHADOW, WebsiteVerticalAlignmentOption)],
     };
diff --git a/addons/website/static/src/builder/plugins/website_save_plugin.js b/addons/website/static/src/builder/plugins/website_save_plugin.js
index 0915470350e71..5228dd66022c6 100644
--- a/addons/website/static/src/builder/plugins/website_save_plugin.js
+++ b/addons/website/static/src/builder/plugins/website_save_plugin.js
@@ -2,10 +2,16 @@ import { escapeTextNodes } from "@html_builder/utils/escaping";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+/**
+ * @typedef { Object } WebsiteSaveShared
+ * @property { WebsiteSavePlugin['saveView'] } saveView
+ */
+
 export class WebsiteSavePlugin extends Plugin {
     static id = "websiteSavePlugin";
     static shared = ["saveView"];
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         save_element_handlers: this.saveView.bind(this),
     };
diff --git a/addons/website/static/src/builder/plugins/website_session_plugin.js b/addons/website/static/src/builder/plugins/website_session_plugin.js
index ff4e179c53b7e..557cc57d33941 100644
--- a/addons/website/static/src/builder/plugins/website_session_plugin.js
+++ b/addons/website/static/src/builder/plugins/website_session_plugin.js
@@ -1,6 +1,11 @@
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 
+/**
+ * @typedef { Object } WebsiteSessionShared
+ * @property { WebsiteSessionPlugin['getSession'] } getSession
+ */
+
 export class WebsiteSessionPlugin extends Plugin {
     static id = "websiteSession";
     static shared = ["getSession"];
diff --git a/addons/website/static/src/builder/plugins/website_visibility_plugin.js b/addons/website/static/src/builder/plugins/website_visibility_plugin.js
index 7dad888382ab4..b3202709b9415 100644
--- a/addons/website/static/src/builder/plugins/website_visibility_plugin.js
+++ b/addons/website/static/src/builder/plugins/website_visibility_plugin.js
@@ -6,6 +6,7 @@ import { VisibilityOption } from "./options/visibility_option";
 export class WebsiteVisibilityPlugin extends Plugin {
     static id = "websiteVisibilityPlugin";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         system_classes: ["o_conditional_hidden"],
         target_show: this.onTargetShow.bind(this),
diff --git a/addons/website_blog/static/src/@types/plugins.d.ts b/addons/website_blog/static/src/@types/plugins.d.ts
new file mode 100644
index 0000000000000..20aac6a3399f6
--- /dev/null
+++ b/addons/website_blog/static/src/@types/plugins.d.ts
@@ -0,0 +1,7 @@
+declare module "plugins" {
+    import { DynamicSnippetBlogPostsOptionShared } from "../website_builder/dynamic_snippet_blog_posts_option_plugin";
+
+    interface SharedMethods {
+        dynamicSnippetBlogPostsOption: DynamicSnippetBlogPostsOptionShared;
+    }
+}
diff --git a/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js
index 50ce4b181a3c1..a118e86b3c887 100644
--- a/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_page_option_plugin.js
@@ -13,6 +13,7 @@ export class BlogPageOption extends BaseOptionComponent {
 
 export class BlogPageOptionPlugin extends Plugin {
     static id = "blogPageOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [BlogPageOption],
     };
diff --git a/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js
index 2ca464313a24a..96781ca61cf84 100644
--- a/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_post_page_option_plugin.js
@@ -13,6 +13,7 @@ export class BlogPostPageOption extends BaseOptionComponent {
 
 export class BlogPostPageOptionPlugin extends Plugin {
     static id = "blogPostPageOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [BlogPostPageOption],
     };
diff --git a/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js
index 0a8f19ee764f3..435ce3ab778e0 100644
--- a/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_post_tags_option_plugin.js
@@ -4,6 +4,7 @@ import { BlogPostTagsOption } from "./blog_post_tags_option";
 
 class BlogPostTagsOptionPlugin extends Plugin {
     static id = "blogPostTagsOption";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: [BlogPostTagsOption],
     };
diff --git a/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js b/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js
index bbc0090b71915..e3a10a11d4e04 100644
--- a/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/blog_searchbar_option_plugin.js
@@ -5,6 +5,7 @@ import { registry } from "@web/core/registry";
 class BlogSearchbarOptionPlugin extends Plugin {
     static id = "blogSearchbarOption";
 
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         searchbar_option_order_by_items: [
             {
diff --git a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
index 2dd6bed3d52c4..7f6e87013eeb4 100644
--- a/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
+++ b/addons/website_blog/static/src/website_builder/dynamic_snippet_blog_posts_option_plugin.js
@@ -7,11 +7,18 @@ import { withSequence } from "@html_editor/utils/resource";
 import { registry } from "@web/core/registry";
 import { DynamicSnippetBlogPostsOption } from "./dynamic_snippet_blog_posts_option";
 
+/**
+ * @typedef { Object } DynamicSnippetBlogPostsOptionShared
+ * @property { DynamicSnippetBlogPostsOptionPlugin['fetchBlogs'] } fetchBlogs
+ * @property { DynamicSnippetBlogPostsOptionPlugin['getModelNameFilter'] } getModelNameFilter
+ */
+
 class DynamicSnippetBlogPostsOptionPlugin extends Plugin {
     static id = "dynamicSnippetBlogPostsOption";
     static dependencies = ["dynamicSnippetOption"];
     static shared = ["fetchBlogs", "getModelNameFilter"];
     modelNameFilter = "blog.post";
+    /** @type {import("plugins").WebsiteResources} */
     resources = {
         builder_options: withSequence(DYNAMIC_SNIPPET, DynamicSnippetBlogPostsOption),
         on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),

From e831fa39ce4f667f94c65142e7b7c0f42fe7835b Mon Sep 17 00:00:00 2001
From: william-andre <wan@odoo.com>
Date: Thu, 13 Nov 2025 16:46:39 +0100
Subject: [PATCH 621/673] [FIX] account: allow trivial changes on reviewed
 moves

Updating a field that doesn't impact accounting shouldn't be blocked,
even if the move has already been reviewed.
Also, don't block re-writing the current value in order to not block
idempotent writes during imports for instance.

runbot-233955

closes odoo/odoo#235559

Related: odoo/enterprise#99512
Signed-off-by: John Laterre (jol) <jol@odoo.com>
---
 addons/account/models/account_move.py         | 30 ++++++++++++++-----
 .../account/tests/test_account_move_entry.py  | 24 ++++++++++++---
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 8baa1233fb295..d68321d115f30 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -3812,11 +3812,21 @@ def write(self, vals):
         self._sanitize_vals(vals)
         self._check_user_access([vals])
 
+        unmodifiable_fields = [
+            'line_ids', 'invoice_line_ids', 'journal_line_ids',
+            'date', 'invoice_date',
+            'partner_id', 'fiscal_position_id',
+            'invoice_payment_term_id',
+            'currency_id',
+            'invoice_cash_rounding_id',
+        ]
+
         is_user_able_to_supervise = self.env.user.has_group('account.group_account_manager')
         is_user_able_to_review = self.env.user.has_group('account.group_account_user') or is_user_able_to_supervise
         move_ids_review_done = []
         move_ids_review_todo = []
         for move in self:
+            modified_accounting_fields = self._field_will_change_list(move, vals, unmodifiable_fields)
             if vals.get('state') == 'draft' and (
                 ((move.review_state == 'reviewed' or not move.review_state) and not is_user_able_to_review)
                 or (move.review_state == 'supervised' and not is_user_able_to_supervise)
@@ -3828,7 +3838,7 @@ def write(self, vals):
                         move_ids_review_done.append(move.id)
                 else:
                     move_ids_review_todo.append(move.id)
-            if not is_user_able_to_review and move.review_state in ('reviewed', 'supervised'):
+            if not is_user_able_to_review and move.review_state in ('reviewed', 'supervised') and modified_accounting_fields:
                 move_ids_review_todo.append(move.id)
 
             violated_fields = set(vals).intersection(move._get_integrity_hash_fields() + ['inalterable_hash'])
@@ -3868,12 +3878,11 @@ def write(self, vals):
 
             # Disallow modifying readonly fields on a posted move
             move_state = vals.get('state', move.state)
-            unmodifiable_fields = (
-                'invoice_line_ids', 'line_ids', 'invoice_date', 'date', 'partner_id',
-                'invoice_payment_term_id', 'currency_id', 'fiscal_position_id', 'invoice_cash_rounding_id')
-            readonly_fields = [val for val in vals if val in unmodifiable_fields]
-            if not self.env.context.get('skip_readonly_check') and move_state == "posted" and readonly_fields:
-                raise UserError(_("You cannot modify the following readonly fields on a posted move: %s", ', '.join(readonly_fields)))
+            if not self.env.context.get('skip_readonly_check') and move_state == "posted" and modified_accounting_fields:
+                raise UserError(_("You cannot modify the following readonly fields on a posted move: %s", ', '.join(
+                    self._fields[fname]._description_string(self.env)
+                    for fname in modified_accounting_fields
+                )))
 
             if move.journal_id.sequence_override_regex and vals.get('name') and vals['name'] != '/' and not re.match(move.journal_id.sequence_override_regex, vals['name']):
                 if not self.env.user.has_group('account.group_account_manager'):
@@ -6680,6 +6689,13 @@ def _cleanup_write_orm_values(self, record, vals):
                 del cleaned_vals[field_name]
         return cleaned_vals
 
+    def _field_will_change_list(self, record, vals, fname_list):
+        return [
+            fname
+            for fname in fname_list
+            if self._field_will_change(record, vals, fname)
+        ]
+
     @contextmanager
     def _disable_recursion(self, container, key, default=None, target=True):
         """Apply the context key to all environments inside this context manager.
diff --git a/addons/account/tests/test_account_move_entry.py b/addons/account/tests/test_account_move_entry.py
index be62bde355dfd..ec80309e88fa0 100644
--- a/addons/account/tests/test_account_move_entry.py
+++ b/addons/account/tests/test_account_move_entry.py
@@ -312,11 +312,27 @@ def test_misc_draft_reconciled_entries_1(self):
     def test_modify_posted_move_readonly_fields(self):
         self.test_move.action_post()
 
-        readonly_fields = ('invoice_line_ids', 'line_ids', 'invoice_date', 'date', 'partner_id',
-                           'invoice_payment_term_id', 'currency_id', 'fiscal_position_id', 'invoice_cash_rounding_id')
-        for field in readonly_fields:
+        readonly_fields = {
+            'invoice_line_ids': False,
+            'line_ids': False,
+            'invoice_date': '4321-11-11',
+            'date': '4321-11-11',
+            'partner_id': 42424242,
+            'invoice_payment_term_id': 42424242,
+            'currency_id': 42424242,
+            'fiscal_position_id': 42424242,
+            'invoice_cash_rounding_id': 42424242,
+        }
+        for fname, value in readonly_fields.items():
             with self.assertRaisesRegex(UserError, "You cannot modify the following readonly fields on a posted move"):
-                self.test_move.write({field: False})
+                self.test_move.write({fname: value})
+        for fname in readonly_fields:
+            if fname.endswith('_ids'):
+                continue  # x2m are always raising
+            elif fname.endswith('_id'):
+                self.test_move.write({fname: self.test_move[fname].id})
+            else:
+                self.test_move.write({fname: self.test_move[fname]})
 
     def test_misc_move_onchange(self):
         ''' Test the behavior on onchanges for account.move having 'entry' as type. '''

From eb1f76e4a223764f1cac92256ff5290004fa715b Mon Sep 17 00:00:00 2001
From: leclerc-leo <leol@odoo.com>
Date: Thu, 13 Nov 2025 08:31:47 +0100
Subject: [PATCH 622/673] [FIX] account: invalid field in accounting setup
 wizard

When creating the setup wizard, if created beforehand and shown to the user it will try to save when the wizard is opened. Since the opening date has no value and is a required field, it will fail and display the field red.

To fix this, we are creating the wizard by passing a default company_id which mean the wizard hasn't been created yet and so it's not trying to save when opening the wizard.

odoo/odoo#231956
odoo/enterprise#95760

closes odoo/odoo#235428

Related: odoo/enterprise#99348
Signed-off-by: Julien Alardot (jual) <jual@odoo.com>
---
 addons/account/models/onboarding_onboarding_step.py | 3 +--
 addons/account/wizard/setup_wizards_view.xml        | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/models/onboarding_onboarding_step.py b/addons/account/models/onboarding_onboarding_step.py
index 8456210e0c8f1..21f9e479d9f4d 100644
--- a/addons/account/models/onboarding_onboarding_step.py
+++ b/addons/account/models/onboarding_onboarding_step.py
@@ -60,7 +60,6 @@ def action_open_step_create_invoice(self):
     @api.model
     def action_open_step_fiscal_year(self):
         company = self.env['account.journal'].browse(self.env.context.get('journal_id', None)).company_id or self.env.company
-        new_wizard = self.env['account.financial.year.op'].create({'company_id': company.id})
         view_id = self.env.ref('account.setup_financial_year_opening_form').id
 
         return {
@@ -69,10 +68,10 @@ def action_open_step_fiscal_year(self):
             'view_mode': 'form',
             'res_model': 'account.financial.year.op',
             'target': 'new',
-            'res_id': new_wizard.id,
             'views': [[view_id, 'form']],
             'context': {
                 'dialog_size': 'medium',
+                'default_company_id': company.id,
             }
         }
 
diff --git a/addons/account/wizard/setup_wizards_view.xml b/addons/account/wizard/setup_wizards_view.xml
index 550864730afd2..12543e58931f7 100644
--- a/addons/account/wizard/setup_wizards_view.xml
+++ b/addons/account/wizard/setup_wizards_view.xml
@@ -12,6 +12,7 @@
                     </div>
                     <sheet>
                         <group>
+                            <field name="company_id" invisible="1"/>  <!-- Otherwise not present in the vals in the create -->
                             <field name="opening_move_posted" invisible="1"/>
                             <field name="opening_date" readonly="opening_move_posted"/>
 

From 1583a7f6ee9a829cf91e46727e2e4b6afcb0d965 Mon Sep 17 00:00:00 2001
From: Max Whale <mawh@odoo.com>
Date: Fri, 14 Nov 2025 14:55:49 +0100
Subject: [PATCH 623/673] [FIX] iot_box_builder: allow local network access on
 IoT box Chromium

Chromium 142 added a permission prompt whenever a page tries to access
something on the local network (including localhost). This causes an
issue on the IoT box as it is intended to be used without user input,
but in some cases (such as using it as a Customer Display in the POS)
the local network permission prompt can appear.

The fix is to add a policy file to allow local network access by
default. This prevents the popup from ever appearing, and the local
requests work as expected.

closes odoo/odoo#235771

Signed-off-by: Louis Travaux (lotr) <lotr@odoo.com>
---
 .../etc/chromium/policies/managed/local_access.json            | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 setup/iot_box_builder/overwrite_after_init/etc/chromium/policies/managed/local_access.json

diff --git a/setup/iot_box_builder/overwrite_after_init/etc/chromium/policies/managed/local_access.json b/setup/iot_box_builder/overwrite_after_init/etc/chromium/policies/managed/local_access.json
new file mode 100644
index 0000000000000..811357a6ce27f
--- /dev/null
+++ b/setup/iot_box_builder/overwrite_after_init/etc/chromium/policies/managed/local_access.json
@@ -0,0 +1,3 @@
+{
+  "LocalNetworkAccessAllowedForUrls": ["*"]
+}

From df30685835f9e2f06429c7b97c608340999b43cf Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <huvw@odoo.com>
Date: Mon, 26 May 2025 15:17:45 +0000
Subject: [PATCH 624/673] [FIX] web: close datepicker when owner is destroyed

Note
====

This only forward ports the test. The issue doesn't occur in 19.0

Steps to reproduce
==================

- Go to project
- Open a project
- Open a task
- Click on the deadline field
- Go to the previous page using the browser back button

=> The datepicker stays open

Cause of the issue
==================

`datetimePicker.create` was called using three parameters.
But since bb1f912f04fbc4b1efe57847bceffce5895ced9b, it only accepts two.

Solution
========

`createPopover` should be added to the `hookParams`

This allows the popover to be closed when the owner component is
destroyed.

https://github.com/odoo/odoo/blob/bb1f912f04fbc4b1efe57847bceffce5895ced9b/addons/web/static/src/core/popover/popover_hook.js#L65

opw-4811594

closes odoo/odoo#235804

X-original-commit: f11f0e32a2a3a03a90a4729efa919a908da8ef4a
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Hubert Van De Walle <huvw@odoo.com>
---
 .../components/datetime/datetime_hook.test.js | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/addons/web/static/tests/core/components/datetime/datetime_hook.test.js b/addons/web/static/tests/core/components/datetime/datetime_hook.test.js
index 845d222a1bbb4..d73c41c86c3e9 100644
--- a/addons/web/static/tests/core/components/datetime/datetime_hook.test.js
+++ b/addons/web/static/tests/core/components/datetime/datetime_hook.test.js
@@ -5,6 +5,7 @@ import { Component, reactive, useState, xml } from "@odoo/owl";
 import { mountWithCleanup } from "@web/../tests/web_test_helpers";
 import { DateTimeInput } from "@web/core/datetime/datetime_input";
 import { useDateTimePicker } from "@web/core/datetime/datetime_picker_hook";
+import { usePopover } from "@web/core/popover/popover_hook";
 
 const { DateTime } = luxon;
 
@@ -143,3 +144,55 @@ test("value is not updated if it did not change", async () => {
     expect(getShortDate(pickerProps.value)).toBe("2023-07-07");
     expect.verifySteps(["2023-07-07"]);
 });
+
+test("close popover when owner component is unmounted", async() => {
+    class Child extends Component {
+        static components = { DateTimeInput };
+        static props = [];
+        static template = xml`
+            <div>
+                <input type="text" class="datetime_hook_input" t-ref="start-date"/>
+            </div>
+        `;
+
+        setup() {
+            useDateTimePicker({
+                createPopover: usePopover,
+                pickerProps: {
+                    value: [false, false],
+                    type: "date",
+                    range: true,
+                }
+            });
+        }
+    }
+
+    const { resolve: hidePopover, promise } = Promise.withResolvers();
+
+    class DateTimeToggler extends Component {
+        static components = { Child };
+        static props = [];
+        static template = xml`<Child t-if="!state.hidden"/>`;
+
+        setup() {
+            this.state = useState({
+                hidden: false,
+            });
+            promise.then(() => {
+                this.state.hidden = true;
+            });
+        }
+    }
+
+    await mountWithCleanup(DateTimeToggler);
+
+    await click("input.datetime_hook_input");
+    await animationFrame();
+    expect(".o_datetime_picker").toHaveCount(1);
+
+    // we can't simply add a button because `useClickAway` will be triggered, thus closing the popover properly
+    hidePopover();
+    await animationFrame();
+    await animationFrame();
+    expect(".o_datetime_picker").toHaveCount(0);
+});

From 08132a43c8cc10e1808a40edd9996b3842486dfd Mon Sep 17 00:00:00 2001
From: Alessandro Lupo <alup@odoo.com>
Date: Wed, 15 Oct 2025 15:52:22 +0200
Subject: [PATCH 625/673] [FIX] html_builder: fix thumbnails for custom social
 inner snippets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

** Description of the Problem **

Custom inner snippets based on `s_facebook_page` and `s_instagram_page` do not display
a thumbnail when listed in the “Custom Inner Content” section of the website builder.

** Why the Problem Happens **

Commit [1] introduced the ability to drop the Facebook and Instagram snippets both as
inner content and as building blocks, by defining a snippet structure and a snippet inner
content with the same name (`s_facebook_page` and `s_instagram_page`). Since commit [2],
when a snippet structure and a snippet inner content share the same name, the thumbnail
information is stored on both snippets to avoid problems, but this was not done in [1].

In `SnippetModel`, the thumbnail image for custom inner content is retrieved by the method
`getSnippetThumbnailURL()`, which relies on `getOriginalSnippet()` to get the snippet
object from its name. However, this workflow is not designed to handle cases where an
inner content and a building block share the same name. `getOriginalSnippet()` searched
for snippets first among `snippetStructures` and then among `snippetInnerContents`. If
a name match is found in `snippetStructures`, the method attempts to retrieve the thumbnail
URL from there. Since social thumbnails are only defined in `snippetInnerContents`, no
thumbnail was found.

** Proposed Solution **

This commit fixes the issue by reversing the search order in `getOriginalSnippet()`, so that
`snippetInnerContents` are checked before `snippetStructures`. In this way, it is no more
necessary to replicate the thumbnail info on both snippet when the name is shared.

[1]: odoo/odoo@18b1170
[2]: odoo/odoo@a40c360

task-5165956

closes odoo/odoo#231714

Signed-off-by: Robin Lejeune (role) <role@odoo.com>
---
 .../static/src/snippets/snippet_service.js    |  2 +-
 .../tests/builder/snippet_custom.test.js      | 51 ++++++++++++++++++-
 addons/website/views/snippets/snippets.xml    | 12 ++---
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/addons/html_builder/static/src/snippets/snippet_service.js b/addons/html_builder/static/src/snippets/snippet_service.js
index 6fb0ec6ef6404..c659cf320fbcf 100644
--- a/addons/html_builder/static/src/snippets/snippet_service.js
+++ b/addons/html_builder/static/src/snippets/snippet_service.js
@@ -280,7 +280,7 @@ export class SnippetModel extends Reactive {
         if (!snippetKey) {
             return;
         }
-        return [...this.snippetStructures, ...this.snippetInnerContents].find(
+        return [...this.snippetInnerContents, ...this.snippetStructures].find(
             (snippet) => snippet.name === snippetKey
         );
     }
diff --git a/addons/website/static/tests/builder/snippet_custom.test.js b/addons/website/static/tests/builder/snippet_custom.test.js
index f8129d7216290..7ba2850a76976 100644
--- a/addons/website/static/tests/builder/snippet_custom.test.js
+++ b/addons/website/static/tests/builder/snippet_custom.test.js
@@ -1,4 +1,9 @@
-import { createTestSnippets, getSnippetStructure } from "@html_builder/../tests/helpers";
+import {
+    createTestSnippets,
+    getSnippetStructure,
+    getSnippetView,
+    getInnerContent,
+} from "@html_builder/../tests/helpers";
 import { Plugin } from "@html_editor/plugin";
 import { expect, test } from "@odoo/hoot";
 import { animationFrame } from "@odoo/hoot-dom";
@@ -86,3 +91,47 @@ test("Renaming custom snippets don't make an orm call", async () => {
         ".o_add_snippet_dialog .o_add_snippet_iframe:iframe .o_custom_snippet_edit>span:contains('new custom name')"
     ).toHaveCount(1);
 });
+
+test("thumbnails are displayed on custom inner snippets even if they have the same name of a snippet structure", async () => {
+    const testSnippetContent = `<section class="s_test" data-snippet="s_test" data-name="test"><p>test snippet</p></section>`;
+    const structureSnippetDesc = {
+        name: "test",
+        groupName: "a",
+        content: testSnippetContent,
+    };
+    const innerContentDesc = {
+        name: "test",
+        content: testSnippetContent,
+        thumbnail: "/website/static/src/img/snippets_thumbs/s_countdown.svg",
+    };
+    const snippets = {
+        snippet_groups: [
+            '<div name="A" data-oe-thumbnail="a.svg" data-oe-snippet-id="123" data-o-snippet-group="a"><section data-snippet="s_snippet_group"></section></div>',
+            '<div name="Custom" data-oe-thumbnail="custom.svg" data-oe-snippet-id="123" data-o-snippet-group="custom"><section data-snippet="s_snippet_group"></section></div>',
+        ],
+        snippet_structure: [getSnippetStructure(structureSnippetDesc)],
+        snippet_content: [getInnerContent(innerContentDesc)],
+        snippet_custom: [],
+    };
+    onRpc("ir.ui.view", "save_snippet", ({ kwargs }) => {
+        const { name, arch, thumbnail_url } = kwargs;
+        const customSnippet = `<div name="${name}" data-oe-type="snippet" data-oe-snippet-id="123" data-o-image-preview="" data-oe-thumbnail="${thumbnail_url}" data-oe-keywords="">${arch}</div>`;
+        snippets.snippet_custom.push(customSnippet);
+        return name;
+    });
+    onRpc("ir.ui.view", "render_public_asset", (args) => getSnippetView(snippets));
+    await setupWebsiteBuilder(
+        `<div class="container">
+            <p>test</p>
+            ${testSnippetContent}
+        </div>`,
+        { snippets }
+    );
+    await contains(":iframe .s_test").click();
+    await contains("div[data-container-title='test'] button.oe_snippet_save").click();
+    await contains(".modal-dialog button.btn-primary").click();
+    await contains("button[data-name='blocks']").click();
+    expect("div.o_snippet[name='Custom test'] div.o_snippet_thumbnail_img").toHaveStyle({
+        "background-image": /url\(.*s_countdown/,
+    });
+});
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index df5e4892a73fd..0f3647db56468 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -173,7 +173,7 @@
                 <keywords>columns, containers, layouts, large, panels, modules</keywords>
             </t>
             <t t-snippet="website.s_popup" string="Popup" group="content" label="Popup"/>
-            <t t-snippet="website.s_countdown" string="Countdown" t-thumbnail="/website/static/src/img/snippets_thumbs/s_countdown.svg" group="content">
+            <t t-snippet="website.s_countdown" string="Countdown" group="content">
                 <keywords>celebration, launch</keywords>
             </t>
             <t t-snippet="website.s_numbers_charts" string="Numbers Charts" group="content">
@@ -248,7 +248,7 @@
 
             <!-- Keep `s_embed_code` snippet at the very end of the "Content" group -->
             <t t-snippet="website.s_embed_code" string="Embed Code" t-forbid-sanitize="true"
-                t-image-preview="/website/static/src/img/snippets_previews/s_embed_code_preview.png" t-thumbnail="/website/static/src/img/snippets_thumbs/s_embed_code.svg" group="content"/>
+                t-image-preview="/website/static/src/img/snippets_previews/s_embed_code_preview.png" group="content"/>
 
 
             <!-- Images group -->
@@ -379,7 +379,7 @@
             </t>
 
             <!-- Contact & Forms group -->
-            <t t-snippet="website.s_title_form" string="Title - Form" t-forbid-sanitize="form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_website_form.svg" group="contact_and_forms">
+            <t t-snippet="website.s_title_form" string="Title - Form" t-forbid-sanitize="form" group="contact_and_forms">
                 <keywords>contact, collect, submission, input, fields, questionnaire, survey, registration, request</keywords>
             </t>
             <t t-snippet="website.s_opening_hours" string="Opening Hours" group="contact_and_forms"/>
@@ -459,11 +459,9 @@
                 <keywords>social media, fb, feed</keywords>
             </t>
             <t t-set="google_maps_api_key" t-value="request.env['website'].get_current_website().google_maps_api_key"/>
-            <t t-if="debug or not google_maps_api_key" t-snippet="website.s_map" string="Map"
-                t-thumbnail="/website/static/src/img/snippets_thumbs/s_map.svg" group="social"
+            <t t-if="debug or not google_maps_api_key" t-snippet="website.s_map" string="Map" group="social"
                 t-image-preview="/website/static/src/img/snippets_previews/s_map_preview.png"/>
-            <t t-if="debug or google_maps_api_key" t-snippet="website.s_google_map" string="Map"
-                t-thumbnail="/website/static/src/img/snippets_thumbs/s_google_map.svg" group="social"
+            <t t-if="debug or google_maps_api_key" t-snippet="website.s_google_map" string="Map" group="social"
                 t-image-preview="/website/static/src/img/snippets_previews/s_map_preview.png"/>
 
             <!-- Debug group -->

From c0b10f18568292919d937306f34dade734d13c4f Mon Sep 17 00:00:00 2001
From: "Adrien Guilliams (adgu)" <adgu@odoo.com>
Date: Wed, 12 Nov 2025 14:21:24 +0100
Subject: [PATCH 626/673] [IMP] pos*: remove receipt screen

pos*: l10n_ar_pos, l10n_be_pos_sale, l10n_es_pos, l10n_fr_pos_cert,
l10n_gcc_pos, l10n_id_pos, l10n_in_pos, l10n_sa_pos,
l10n_test_pos_qr_payment, point_of_sale, pos_adyen, pos_discount,
pos_event, pos_hr, pos_loyalty, pos_mrp, pos_qfpay, pos_razorpay,
pos_restaurant, pos_sale, pos_sale_loyalty, pos_sms

This commit aims at removing the receipt screen and replacing it
with the feedback screen. Of course, the feedback screen needs some
adaptations done in this commit to keep every existing feature.

closes odoo/odoo#235316

Task-id: 5149815
Related: odoo/enterprise#99277
Signed-off-by: David Monnom (moda) <moda@odoo.com>
---
 .../receipt/order_receipt.xml                 |   0
 .../static/tests/tours/l10n_ar_tour.js        |   6 +-
 .../tests/tours/l10n_be_pos_sale_tour.js      |   8 +-
 .../receipt}/order_receipt/order_receipt.xml  |   0
 .../receipt}/order_receipt.xml                |   0
 .../receipt_header/receipt_header.xml         |   0
 .../static/tests/tours/spanish_pos_tour.js    |  60 ++-
 .../static/tests/tours/utils/receipt_util.js  |  22 +-
 .../tests/tours/l10n_fr_pos_cert_tour.js      |  15 +-
 .../receipt/order_receipt.xml                 |   4 +-
 .../tests/test_pos_qris_payment.tour.js       |   4 +-
 .../receipt}/pos_receipt.xml                  |   0
 .../static/tests/tours/test_hsn_summary.js    |  42 +-
 .../tours/test_taxes_tax_totals_summary.js    |  10 +-
 .../static/tests/tours/sa_pos_tour.js         |   9 +-
 .../static/tests/test_pos_payment_tour.js     |  15 +-
 .../src/app/components/navbar/navbar.js       |   2 +-
 .../app/components/orderline/orderline.xml    |   5 +-
 .../cash_move_receipt/cash_move_receipt.js    |   2 +-
 .../popups/print_popup/print_popup.js         |  60 +++
 .../popups/print_popup/print_popup.scss       |  12 +
 .../popups/print_popup/print_popup.xml        |  17 +
 .../send_receipt_popup/send_receipt_popup.js  | 122 +++++
 .../send_receipt_popup.scss                   |   4 +
 .../send_receipt_popup/send_receipt_popup.xml |  27 ++
 .../app/components/receipt/order-receipt.scss |  23 +
 .../receipt/order_receipt.js                  |   2 +-
 .../receipt/order_receipt.xml                 |   8 +-
 .../receipt/receipt_header/receipt_header.js  |   0
 .../receipt/receipt_header/receipt_header.xml |   0
 .../models/accounting/pos_order_accounting.js |   6 +-
 .../feedback_screen/feedback_screen.js        |  92 +++-
 .../feedback_screen/feedback_screen.scss      |  94 +++-
 .../feedback_screen/feedback_screen.xml       |  36 +-
 .../screens/payment_screen/payment_screen.js  |   2 +-
 .../product_screen/action_pad/action_pad.xml  |   2 +-
 .../screens/receipt_screen/receipt_screen.js  | 121 -----
 .../receipt_screen/receipt_screen.scss        |  64 ---
 .../screens/receipt_screen/receipt_screen.xml |  75 ---
 .../screens/ticket_screen/ticket_screen.js    |   4 +-
 .../static/src/app/services/pos_store.js      |   4 +-
 .../src/app/utils/order_payment_validation.js |  28 +-
 .../src/customer_display/customer_display.xml |   2 +-
 .../static/tests/pos/tours/chrome_tour.js     |  78 ++--
 .../static/tests/pos/tours/fake_tours.js      |   4 +-
 .../tests/pos/tours/feedback_screen_tour.js   | 320 +++++++++++++
 .../tours/fixed_price_negative_qty_tour.js    |   4 +-
 .../static/tests/pos/tours/generic_tour.js    |  10 +-
 .../tests/pos/tours/pos_cash_rounding_tour.js |  94 ++--
 .../static/tests/pos/tours/pos_combo_tour.js  |  10 +-
 .../static/tests/pos/tours/pricelist_tour.js  |   6 +-
 .../tests/pos/tours/product_screen_tour.js    |  58 ++-
 .../tests/pos/tours/receipt_screen_tour.js    | 254 -----------
 .../tests/pos/tours/shipping_date_tour.js     |  17 +-
 .../tests/pos/tours/ticket_screen_tour.js     |  47 +-
 .../pos/tours/utils/feedback_screen_util.js   | 431 +++++++++++++++++-
 .../pos/tours/utils/product_screen_util.js    |  20 +-
 .../pos/tours/utils/receipt_screen_util.js    | 217 ---------
 .../pos/tours/utils/ticket_screen_util.js     |  14 -
 .../unit/components/feedback_screen.test.js   |  28 ++
 .../unit/components/receipt_screen.test.js    |  22 -
 .../tools/order_payment_validation.test.js    |   6 +-
 addons/point_of_sale/tests/test_frontend.py   |   8 +-
 .../static/tests/tours/adyen_tour.js          |   4 +-
 .../tours/test_pos_global_discount_flow.js    |   8 +-
 .../tests/tours/test_taxes_global_discount.js |   8 +-
 .../popup/print_popup/print_popup.js          |  49 ++
 .../screens/receipt_screen/receipt_screen.js  |  31 --
 .../screens/receipt_screen/receipt_screen.xml |  18 -
 .../static/tests/tours/pos_event_tour.js      |  26 +-
 .../tests/tours/pos_multi_slot_event_tour.js  |  10 +-
 .../tests/tours/utils/event_tour_utils.js     |  10 -
 .../feedback_screen/feedback_screen.js        |   8 +
 .../screens/receipt_screen/receipt_screen.xml |   8 -
 .../pos_hr/static/tests/tours/pos_hr_tour.js  |   8 +-
 .../receipt}/order_receipt/order_receipt.xml  |   0
 .../tests/tours/gift_card_program_tour.js     |   8 +-
 .../static/tests/tours/pos_loyalty_tour.js    |  24 +-
 .../tests/tours/utils/pos_loyalty_util.js     |  12 +-
 .../tools/order_payment_validation.test.js    |   4 +-
 .../static/tests/tours/pos_mrp_tour.js        |   4 +-
 .../static/tests/tours/qfpay_tour.js          |   6 +-
 .../static/tests/tours/razorpay_tour.js       |  12 +-
 .../receipt}/order_receipt/order_receipt.xml  |   0
 .../app/components/tip_receipt/tip_receipt.js |   2 +-
 .../feedback_screen.js}                       |  11 +-
 .../src/app/screens/receipt_header_patch.js   |   2 +-
 .../screens/receipt_screen/receipt_screen.xml |  22 -
 .../src/app/screens/tip_screen/tip_screen.js  |   2 +-
 .../static/src/app/services/pos_store.js      |   2 +-
 .../tours/devices_synchronization_tour.js     |   6 +-
 .../static/tests/tours/fake_tours.js          |   4 +-
 .../static/tests/tours/floor_screen_tour.js   |   4 +-
 .../static/tests/tours/pos_restaurant_tour.js |  39 +-
 .../static/tests/tours/refund_tour.js         |   6 +-
 .../tests/tours/split_bill_screen_tour.js     |  18 +-
 .../static/tests/tours/tip_screen_tour.js     |  10 +-
 .../static/tests/tours/pos_sale_tour.js       |  63 +--
 .../tests/tours/test_taxes_downpayment.js     |   9 +-
 .../tests/tours/pos_sale_loyalty_tour.js      |   5 +-
 addons/pos_self_order/__manifest__.py         |   2 +-
 .../src/app/pages/cart_page/cart_page.js      |   2 +-
 .../confirmation_page/confirmation_page.js    |   2 +-
 .../src/app/services/self_order_service.js    |   2 +-
 .../send_receipt_popup/send_receipt_popup.js  |  27 ++
 .../screens/receipt_screen/receipt_screen.js  |  15 -
 .../screens/receipt_screen/receipt_screen.xml |  10 -
 .../static/tests/tours/test_pos_sms_tour.js   |   4 +-
 .../tests/tours/utils/test_pos_sms_util.js    |   5 +-
 109 files changed, 1824 insertions(+), 1365 deletions(-)
 rename addons/l10n_ae_pos/static/src/overrides/{screens/receipt_screen => components}/receipt/order_receipt.xml (100%)
 rename addons/l10n_co_pos/static/src/app/{screens/receipt_screen => components/receipt}/order_receipt/order_receipt.xml (100%)
 rename addons/l10n_es_edi_tbai_pos/static/src/app/{screens/receipt_screen => components/receipt}/order_receipt.xml (100%)
 rename addons/l10n_es_pos/static/src/app/{screens/receipt_screen => components/receipt}/receipt_header/receipt_header.xml (100%)
 rename addons/l10n_gcc_pos/static/src/app/{screens/receipt_screen => components}/receipt/order_receipt.xml (96%)
 rename addons/l10n_in_pos/static/src/app/{screens/receipt_screen => components/receipt}/pos_receipt.xml (100%)
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.js
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.scss
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.xml
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.scss
 create mode 100644 addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.xml
 create mode 100644 addons/point_of_sale/static/src/app/components/receipt/order-receipt.scss
 rename addons/point_of_sale/static/src/app/{screens/receipt_screen => components}/receipt/order_receipt.js (94%)
 rename addons/point_of_sale/static/src/app/{screens/receipt_screen => components}/receipt/order_receipt.xml (97%)
 rename addons/point_of_sale/static/src/app/{screens/receipt_screen => components}/receipt/receipt_header/receipt_header.js (100%)
 rename addons/point_of_sale/static/src/app/{screens/receipt_screen => components}/receipt/receipt_header/receipt_header.xml (100%)
 delete mode 100644 addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
 delete mode 100644 addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.scss
 delete mode 100644 addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.xml
 delete mode 100644 addons/point_of_sale/static/tests/pos/tours/receipt_screen_tour.js
 delete mode 100644 addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js
 create mode 100644 addons/point_of_sale/static/tests/unit/components/feedback_screen.test.js
 delete mode 100644 addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js
 create mode 100644 addons/pos_event/static/src/app/components/popup/print_popup/print_popup.js
 delete mode 100644 addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.js
 delete mode 100644 addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.xml
 create mode 100644 addons/pos_hr/static/src/app/screens/feedback_screen/feedback_screen.js
 delete mode 100644 addons/pos_hr/static/src/app/screens/receipt_screen/receipt_screen.xml
 rename addons/pos_loyalty/static/src/app/{screens/receipt_screen => components/receipt}/order_receipt/order_receipt.xml (100%)
 rename addons/pos_restaurant/static/src/app/{screens/receipt_screen => components/receipt}/order_receipt/order_receipt.xml (100%)
 rename addons/pos_restaurant/static/src/app/screens/{receipt_screen/receipt_screen.js => feedback_screen/feedback_screen.js} (74%)
 delete mode 100644 addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.xml
 create mode 100644 addons/pos_sms/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js
 delete mode 100644 addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.js
 delete mode 100644 addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.xml

diff --git a/addons/l10n_ae_pos/static/src/overrides/screens/receipt_screen/receipt/order_receipt.xml b/addons/l10n_ae_pos/static/src/overrides/components/receipt/order_receipt.xml
similarity index 100%
rename from addons/l10n_ae_pos/static/src/overrides/screens/receipt_screen/receipt/order_receipt.xml
rename to addons/l10n_ae_pos/static/src/overrides/components/receipt/order_receipt.xml
diff --git a/addons/l10n_ar_pos/static/tests/tours/l10n_ar_tour.js b/addons/l10n_ar_pos/static/tests/tours/l10n_ar_tour.js
index 06aa54bd28ff7..c7458eabe03f4 100644
--- a/addons/l10n_ar_pos/static/tests/tours/l10n_ar_tour.js
+++ b/addons/l10n_ar_pos/static/tests/tours/l10n_ar_tour.js
@@ -1,5 +1,5 @@
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
@@ -15,7 +15,7 @@ registry.category("web_tour.tours").add("PosARBaseFlow", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
diff --git a/addons/l10n_be_pos_sale/static/tests/tours/l10n_be_pos_sale_tour.js b/addons/l10n_be_pos_sale/static/tests/tours/l10n_be_pos_sale_tour.js
index 52683b784d0dc..3fd9dfca125ba 100644
--- a/addons/l10n_be_pos_sale/static/tests/tours/l10n_be_pos_sale_tour.js
+++ b/addons/l10n_be_pos_sale/static/tests/tours/l10n_be_pos_sale_tour.js
@@ -4,7 +4,7 @@ import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as PosSale from "@pos_sale/../tests/tours/utils/pos_sale_utils";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { negateStep } from "@point_of_sale/../tests/generic_helpers/utils";
 import { registry } from "@web/core/registry";
 
@@ -23,8 +23,8 @@ registry.category("web_tour.tours").add("PosSettleOrderIsInvoice", {
             PaymentScreen.isInvoiceButtonChecked(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
 
             PosSale.settleNthOrder(1),
             ProductScreen.clickPayButton(),
@@ -55,6 +55,6 @@ registry.category("web_tour.tours").add("test_pos_branch_company_access", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/l10n_co_pos/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml b/addons/l10n_co_pos/static/src/app/components/receipt/order_receipt/order_receipt.xml
similarity index 100%
rename from addons/l10n_co_pos/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml
rename to addons/l10n_co_pos/static/src/app/components/receipt/order_receipt/order_receipt.xml
diff --git a/addons/l10n_es_edi_tbai_pos/static/src/app/screens/receipt_screen/order_receipt.xml b/addons/l10n_es_edi_tbai_pos/static/src/app/components/receipt/order_receipt.xml
similarity index 100%
rename from addons/l10n_es_edi_tbai_pos/static/src/app/screens/receipt_screen/order_receipt.xml
rename to addons/l10n_es_edi_tbai_pos/static/src/app/components/receipt/order_receipt.xml
diff --git a/addons/l10n_es_pos/static/src/app/screens/receipt_screen/receipt_header/receipt_header.xml b/addons/l10n_es_pos/static/src/app/components/receipt/receipt_header/receipt_header.xml
similarity index 100%
rename from addons/l10n_es_pos/static/src/app/screens/receipt_screen/receipt_header/receipt_header.xml
rename to addons/l10n_es_pos/static/src/app/components/receipt/receipt_header/receipt_header.xml
diff --git a/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js b/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js
index d45ddc33741bf..ef253ad5dc170 100644
--- a/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js
+++ b/addons/l10n_es_pos/static/tests/tours/spanish_pos_tour.js
@@ -1,11 +1,11 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as PartnerList from "@point_of_sale/../tests/pos/tours/utils/partner_list_util";
 import { registry } from "@web/core/registry";
-import { checkSimplifiedInvoiceNumber, checkCompanyState, pay } from "./utils/receipt_util";
+import { checkSimplifiedInvoiceNumber, pay } from "./utils/receipt_util";
 
 const SIMPLIFIED_INVOICE_LIMIT = 1000;
 
@@ -17,13 +17,15 @@ registry.category("web_tour.tours").add("spanish_pos_tour", {
 
             ProductScreen.addOrderline("Desk Pad", "1"),
             pay(),
+            FeedbackScreen.isShown(),
             checkSimplifiedInvoiceNumber("0001"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             ProductScreen.addOrderline("Desk Pad", "1", SIMPLIFIED_INVOICE_LIMIT - 1),
             pay(),
+            FeedbackScreen.isShown(),
             checkSimplifiedInvoiceNumber("0002"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             ProductScreen.addOrderline("Desk Pad", "1", SIMPLIFIED_INVOICE_LIMIT + 1),
             pay(),
@@ -37,19 +39,37 @@ registry.category("web_tour.tours").add("spanish_pos_tour", {
 
             PaymentScreen.isInvoiceOptionSelected(),
             PaymentScreen.clickValidate(),
-            {
-                content:
-                    "verify that the simplified invoice number does not appear on the receipt, because this order is invoiced, so it does not have a simplified invoice number",
-                trigger: ".receipt-screen:not(:has(.simplified-invoice-number))",
-            },
-            checkCompanyState("Badajoz"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".simplified-invoice-number",
+                        negation: true,
+                    },
+                    {
+                        css: "pos-receipt-container div",
+                        text: "Badajoz",
+                    },
+                ],
+            }),
+            FeedbackScreen.clickNextOrder(),
 
             ProductScreen.addOrderline("Desk Pad", "1"),
             pay(),
-            checkSimplifiedInvoiceNumber("0003"),
-            checkCompanyState("Badajoz"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".simplified-invoice-number",
+                        text: "0003",
+                    },
+                    {
+                        css: "pos-receipt-container div",
+                        text: "Badajoz",
+                    },
+                ],
+            }),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.addOrderline("Desk Pad", "1"),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Customer Account"),
@@ -69,9 +89,13 @@ registry.category("web_tour.tours").add("l10n_es_pos_settle_account_due", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
             Chrome.confirmPopup(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.paymentLineContains("Bank", "10.00"),
-            ReceiptScreen.paymentLineContains("Customer Account", "-10.00"),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                payment_lines: [
+                    { name: "Bank", amount: "10.0" },
+                    { name: "Customer Account", amount: "-10.0" },
+                ],
+            }),
             Chrome.endTour(),
         ].flat(),
 });
@@ -87,6 +111,6 @@ registry.category("web_tour.tours").add("test_simplified_invoice_not_override_se
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/l10n_es_pos/static/tests/tours/utils/receipt_util.js b/addons/l10n_es_pos/static/tests/tours/utils/receipt_util.js
index 00e5e62c496b6..f8a7f67404129 100644
--- a/addons/l10n_es_pos/static/tests/tours/utils/receipt_util.js
+++ b/addons/l10n_es_pos/static/tests/tours/utils/receipt_util.js
@@ -1,12 +1,17 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 
 export function checkSimplifiedInvoiceNumber(number) {
     return [
-        {
-            content: "verify that the simplified invoice number appears correctly on the receipt",
-            trigger: `.receipt-screen .simplified-invoice-number:contains('${number}')`,
-        },
+        ...FeedbackScreen.checkTicketData({
+            cssRules: [
+                {
+                    css: ".simplified-invoice-number",
+                    text: number,
+                },
+            ],
+        }),
     ];
 }
 
@@ -17,12 +22,3 @@ export function pay() {
         ...PaymentScreen.clickValidate(),
     ];
 }
-
-export function checkCompanyState(state) {
-    return [
-        {
-            content: "verify that the company state is on the receipt",
-            trigger: `.pos-receipt-container div:contains('(${state})')`,
-        },
-    ];
-}
diff --git a/addons/l10n_fr_pos_cert/static/tests/tours/l10n_fr_pos_cert_tour.js b/addons/l10n_fr_pos_cert/static/tests/tours/l10n_fr_pos_cert_tour.js
index beade2d21295a..c44bd9dfce846 100644
--- a/addons/l10n_fr_pos_cert/static/tests/tours/l10n_fr_pos_cert_tour.js
+++ b/addons/l10n_fr_pos_cert/static/tests/tours/l10n_fr_pos_cert_tour.js
@@ -1,6 +1,6 @@
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import { registry } from "@web/core/registry";
@@ -14,10 +14,13 @@ registry.category("web_tour.tours").add("l10nFrPosCertSelfInvoicingTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            {
-                trigger: ".pos-receipt #posqrcode",
-                content: "QR code is visible on the receipt",
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".pos-receipt #posqrcode",
+                    },
+                ],
+            }),
         ].flat(),
 });
diff --git a/addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml b/addons/l10n_gcc_pos/static/src/app/components/receipt/order_receipt.xml
similarity index 96%
rename from addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
rename to addons/l10n_gcc_pos/static/src/app/components/receipt/order_receipt.xml
index 547e078211d37..b4b24878297dc 100644
--- a/addons/l10n_gcc_pos/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
+++ b/addons/l10n_gcc_pos/static/src/app/components/receipt/order_receipt.xml
@@ -40,10 +40,10 @@
     </t>
 
     <t t-inherit="point_of_sale.OrderReceipt" t-inherit-mode="extension">
-        <xpath expr="//t[@t-as='subtotal']//span" position="attributes">
+        <xpath expr="//div[@t-as='subtotal']//span" position="attributes">
             <attribute name="t-if">!order.isGccCountry or !order.config_id.l10n_gcc_dual_language_receipt</attribute>
         </xpath>
-        <xpath expr="//t[@t-as='subtotal']//span" position="after">
+        <xpath expr="//div[@t-as='subtotal']//span" position="after">
             <span name="subtotal_span_dual" t-elif="order.isGccCountry and order.config_id.l10n_gcc_dual_language_receipt" class="text-nowrap mw-100" t-translation="off">Subtotal / الإجمالي الفرعي</span>
         </xpath>
         <xpath expr="//span[hasclass('label-rounding')]" position="attributes">
diff --git a/addons/l10n_id_pos/static/tests/test_pos_qris_payment.tour.js b/addons/l10n_id_pos/static/tests/test_pos_qris_payment.tour.js
index b6bfc4348a832..acfe5b03e9c65 100644
--- a/addons/l10n_id_pos/static/tests/test_pos_qris_payment.tour.js
+++ b/addons/l10n_id_pos/static/tests/test_pos_qris_payment.tour.js
@@ -1,7 +1,7 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 
 import { registry } from "@web/core/registry";
@@ -53,7 +53,7 @@ registry.category("web_tour.tours").add("PaymentScreenQRISPaymentSuccess", {
             addProductandPay(),
             isQRDisplayedinDialog(),
             Dialog.confirm("Confirm Payment"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
diff --git a/addons/l10n_in_pos/static/src/app/screens/receipt_screen/pos_receipt.xml b/addons/l10n_in_pos/static/src/app/components/receipt/pos_receipt.xml
similarity index 100%
rename from addons/l10n_in_pos/static/src/app/screens/receipt_screen/pos_receipt.xml
rename to addons/l10n_in_pos/static/src/app/components/receipt/pos_receipt.xml
diff --git a/addons/l10n_in_pos/static/tests/tours/test_hsn_summary.js b/addons/l10n_in_pos/static/tests/tours/test_hsn_summary.js
index efa6e2decd5d7..6a44fc7a28058 100644
--- a/addons/l10n_in_pos/static/tests/tours/test_hsn_summary.js
+++ b/addons/l10n_in_pos/static/tests/tours/test_hsn_summary.js
@@ -2,6 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { registry } from "@web/core/registry";
 
 export function addDocument(documentParams) {
@@ -34,25 +35,26 @@ registry.category("web_tour.tours").add("test_l10n_in_hsn_summary_pos", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.remainingIs("0.0"),
             PaymentScreen.clickValidate(),
-            {
-                isActive: ["desktop"], // not rendered on mobile
-                trigger:
-                    '.receipt-screen .l10n_in_hsn_summary_table tr:nth-child(3) td:nth-child(3):contains("57.50")',
-            },
-            {
-                isActive: ["desktop"], // not rendered on mobile
-                trigger:
-                    '.receipt-screen .l10n_in_hsn_summary_table tr:nth-child(3) td:nth-child(4):contains("57.50")',
-            },
-            {
-                isActive: ["desktop"], // not rendered on mobile
-                trigger:
-                    '.receipt-screen .l10n_in_hsn_summary_table tr:nth-child(4) td:nth-child(3):contains("207.00")',
-            },
-            {
-                isActive: ["desktop"], // not rendered on mobile
-                trigger:
-                    '.receipt-screen .l10n_in_hsn_summary_table tr:nth-child(4) td:nth-child(4):contains("207.00")',
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".l10n_in_hsn_summary_table tr:nth-child(3) td:nth-child(3)",
+                        text: "57.50",
+                    },
+                    {
+                        css: ".l10n_in_hsn_summary_table tr:nth-child(3) td:nth-child(4)",
+                        text: "57.50",
+                    },
+                    {
+                        css: ".l10n_in_hsn_summary_table tr:nth-child(4) td:nth-child(3)",
+                        text: "207.00",
+                    },
+                    {
+                        css: ".l10n_in_hsn_summary_table tr:nth-child(4) td:nth-child(4)",
+                        text: "207.00",
+                    },
+                ],
+            }),
         ].flat(),
 });
diff --git a/addons/l10n_in_pos/static/tests/tours/test_taxes_tax_totals_summary.js b/addons/l10n_in_pos/static/tests/tours/test_taxes_tax_totals_summary.js
index 1c6677d1db24a..72e573f203920 100644
--- a/addons/l10n_in_pos/static/tests/tours/test_taxes_tax_totals_summary.js
+++ b/addons/l10n_in_pos/static/tests/tours/test_taxes_tax_totals_summary.js
@@ -2,7 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { registry } from "@web/core/registry";
 
 export function addDocument(documentParams) {
@@ -31,9 +31,11 @@ export function assertTaxTotals(baseAmount, taxAmount, totalAmount) {
 
         PaymentScreen.clickInvoiceButton(),
         PaymentScreen.clickValidate(),
-
-        ReceiptScreen.receiptAmountTotalIs(totalAmount),
-        ReceiptScreen.clickNextOrder(),
+        FeedbackScreen.isShown(),
+        FeedbackScreen.checkTicketData({
+            total_amount: totalAmount,
+        }),
+        FeedbackScreen.clickNextOrder(),
     ];
 }
 
diff --git a/addons/l10n_sa_pos/static/tests/tours/sa_pos_tour.js b/addons/l10n_sa_pos/static/tests/tours/sa_pos_tour.js
index 792d56b03ddd3..67e115d757dfb 100644
--- a/addons/l10n_sa_pos/static/tests/tours/sa_pos_tour.js
+++ b/addons/l10n_sa_pos/static/tests/tours/sa_pos_tour.js
@@ -2,6 +2,7 @@ import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { registry } from "@web/core/registry";
 
 registry.category("web_tour.tours").add("test_sa_qr_is_shown", {
@@ -13,9 +14,9 @@ registry.category("web_tour.tours").add("test_sa_qr_is_shown", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            {
-                trigger: "#qrcode.pos-receipt-qrcode",
-                content: "QR code should be visible on the receipt.",
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [{ css: "#qrcode.pos-receipt-qrcode" }],
+            }),
         ].flat(),
 });
diff --git a/addons/l10n_test_pos_qr_payment/static/tests/test_pos_payment_tour.js b/addons/l10n_test_pos_qr_payment/static/tests/test_pos_payment_tour.js
index 8b79a6465b30f..4d9b4fffd4260 100644
--- a/addons/l10n_test_pos_qr_payment/static/tests/test_pos_payment_tour.js
+++ b/addons/l10n_test_pos_qr_payment/static/tests/test_pos_payment_tour.js
@@ -2,6 +2,7 @@ import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 
 import { registry } from "@web/core/registry";
 
@@ -67,11 +68,8 @@ registry.category("web_tour.tours").add("PaymentScreenWithQRPayment", {
             },
             isQRDisplayedinDialog(),
             Dialog.confirm(),
-            {
-                content: "Immediately at the receipt screen.",
-                trigger: '.receipt-screen .button.next.highlight:contains("New Order")',
-                run: "click",
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -95,10 +93,7 @@ registry.category("web_tour.tours").add("PaymentScreenWithQRPaymentSwiss", {
             PaymentScreen.validateButtonIsHighlighted(false),
             isQRDisplayedinDialog(),
             Dialog.confirm(),
-            {
-                content: "Immediately at the receipt screen.",
-                trigger: '.receipt-screen .button.next.highlight:contains("New Order")',
-                run: "click",
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/src/app/components/navbar/navbar.js b/addons/point_of_sale/static/src/app/components/navbar/navbar.js
index cce314b6056b0..f0f90ab893704 100644
--- a/addons/point_of_sale/static/src/app/components/navbar/navbar.js
+++ b/addons/point_of_sale/static/src/app/components/navbar/navbar.js
@@ -178,7 +178,7 @@ export class Navbar extends Component {
     }
 
     get mainButton() {
-        const screens = ["ProductScreen", "PaymentScreen", "ReceiptScreen", "TipScreen"];
+        const screens = ["ProductScreen", "PaymentScreen", "TipScreen"];
         return screens.includes(this.pos.router.state.current) ? "register" : "order";
     }
 }
diff --git a/addons/point_of_sale/static/src/app/components/orderline/orderline.xml b/addons/point_of_sale/static/src/app/components/orderline/orderline.xml
index 8996360e0261f..a5624d1449a8c 100644
--- a/addons/point_of_sale/static/src/app/components/orderline/orderline.xml
+++ b/addons/point_of_sale/static/src/app/components/orderline/orderline.xml
@@ -18,9 +18,8 @@
                             <small t-if="vals.attributeString" t-out="vals.attributeString" class="attribute-line fst-italic" />
                         </span>
                     </div>
-                    <div t-if="vals.price" t-out="vals.price" class="product-price price" t-attf-class="{{ vals.isReceipt ? 'font-monospace' : 'fw-bolder' }}"
-                    />
-                    <div t-if="vals.taxGroup" t-esc="vals.taxGroup" class="text-end" style="width: 2rem"/>
+                    <div t-if="vals.price" t-out="vals.price" class="product-price price" t-attf-class="{{ vals.isReceipt ? 'font-monospace' : 'fw-bolder' }}"/>
+                    <div t-if="vals.taxGroup" t-esc="vals.taxGroup" class="text-end tax-group" style="width: 2rem"/>
                 </div>
                 <ul class="info-list d-flex flex-column mb-0 ms-2" t-att-style="vals.isReceipt and 'font-size: 75%;'" t-att-class="infoListClasses">
                     <li class="price-per-unit" t-if="vals.displayPriceUnit" t-out="vals.displayPriceUnit" />
diff --git a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_receipt/cash_move_receipt.js b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_receipt/cash_move_receipt.js
index 9881b3bfbac72..cd3db37c2c60c 100644
--- a/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_receipt/cash_move_receipt.js
+++ b/addons/point_of_sale/static/src/app/components/popups/cash_move_popup/cash_move_receipt/cash_move_receipt.js
@@ -1,5 +1,5 @@
 import { Component } from "@odoo/owl";
-import { ReceiptHeader } from "@point_of_sale/app/screens/receipt_screen/receipt/receipt_header/receipt_header";
+import { ReceiptHeader } from "@point_of_sale/app/components/receipt/receipt_header/receipt_header";
 
 export class CashMoveReceipt extends Component {
     static template = "point_of_sale.CashMoveReceipt";
diff --git a/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.js b/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.js
new file mode 100644
index 0000000000000..2b9c8c2701ef4
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.js
@@ -0,0 +1,60 @@
+import { _t } from "@web/core/l10n/translation";
+import { Component } from "@odoo/owl";
+import { Dialog } from "@web/core/dialog/dialog";
+import { useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
+import { useService } from "@web/core/utils/hooks";
+import { usePos } from "@point_of_sale/app/hooks/pos_hook";
+
+export class PrintPopup extends Component {
+    static template = "point_of_sale.PrintPopup";
+    static components = { Dialog };
+    static props = {
+        order: Object,
+        close: Function,
+    };
+
+    setup() {
+        this.pos = usePos();
+        this.ui = useService("ui");
+        this.doFullPrint = useTrackedAsync(() => this.pos.printReceipt({ order: this.order }));
+        this.doBasicPrint = useTrackedAsync(() =>
+            this.pos.printReceipt({ order: this.order, basic: true })
+        );
+        if (this.printList.length === 1) {
+            this.printList[0].method();
+            this.props.close();
+        }
+    }
+
+    get order() {
+        return this.props.order;
+    }
+
+    get printList() {
+        const list = [
+            {
+                label: _t("Print Receipt"),
+                method: () => this.doFullPrint.call(),
+                status: this.doFullPrint.status,
+                icon: "fa-print",
+                isPrimary: true,
+            },
+        ];
+        if (this.pos.config.basic_receipt) {
+            list[0].label = _t("Print Full Receipt");
+            list.push({
+                label: _t("Print Basic Receipt"),
+                method: () => this.doBasicPrint.call(),
+                status: this.doBasicPrint.status,
+                icon: "fa-gift",
+                isPrimary: false,
+            });
+        }
+        return list;
+    }
+
+    clickPrintButton(item) {
+        item.method();
+        this.props.close();
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.scss b/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.scss
new file mode 100644
index 0000000000000..a0f36478fbcb1
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.scss
@@ -0,0 +1,12 @@
+.print-popup .modal-header {
+    border: none;
+    padding-bottom: 8px !important;
+}
+
+.print-popup-modal {
+    grid-template-columns: repeat(2, 1fr);
+
+    @include media-breakpoint-down(sm) {
+        grid-template-columns: 1fr;
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.xml b/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.xml
new file mode 100644
index 0000000000000..97ca6b8d0f28e
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/print_popup/print_popup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="point_of_sale.PrintPopup">
+        <Dialog title="''" footer="false" size="'md'" contentClass="`print-popup ${!this.ui.isSmall? 'rounded-4' : ''}`" bodyClass="">
+            <div class="print-popup-modal d-grid gap-2 py-3">
+                <button t-foreach="printList" t-as="item" t-key="item_index"
+                        class="btn btn-lg py-3 rounded-3 d-flex gap-2 align-items-center justify-content-center"
+                        t-att-class="item.isPrimary ? 'btn-primary' : 'btn-secondary'"
+                        t-on-click="() => this.clickPrintButton(item)">
+                        <i t-attf-class="fa fa-2x {{item.status === 'loading' ? 'fa-fw fa-spin fa-circle-o-notch' : item.icon}} me-1" /><t t-esc="item.label" />
+                </button>
+            </div>
+        </Dialog>
+    </t>
+
+</templates>
diff --git a/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js b/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js
new file mode 100644
index 0000000000000..9d35afed65d3b
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js
@@ -0,0 +1,122 @@
+import { _t } from "@web/core/l10n/translation";
+import { useState, Component } from "@odoo/owl";
+import { Dialog } from "@web/core/dialog/dialog";
+import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
+import { OrderReceipt } from "@point_of_sale/app/components/receipt/order_receipt";
+import { useService } from "@web/core/utils/hooks";
+import { useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
+import { usePos } from "@point_of_sale/app/hooks/pos_hook";
+import { isValidEmail } from "@point_of_sale/utils";
+
+export class SendReceiptPopup extends Component {
+    static template = "point_of_sale.SendReceiptPopup";
+    static components = { Dialog };
+    static props = {
+        order: Object,
+        close: Function,
+    };
+
+    setup() {
+        this.pos = usePos();
+        this.renderer = useService("renderer");
+        this.ui = useService("ui");
+        this.dialog = useService("dialog");
+        const partner = this.order.getPartner();
+        const email = partner?.invoice_emails || partner?.email || "";
+        this.state = useState({
+            email: email,
+            phone: partner?.phone || "",
+        });
+        this.sendReceipt = useTrackedAsync(this._sendReceiptToCustomer.bind(this));
+    }
+
+    actionSendReceiptOnEmail() {
+        this.sendReceipt.call({
+            action: "action_send_receipt",
+            destination: this.state.email,
+            name: "Email",
+        });
+    }
+
+    get order() {
+        return this.props.order;
+    }
+
+    get isValidEmail() {
+        return isValidEmail(this.state.email);
+    }
+
+    get isValidPhone() {
+        return this.state.phone && /^\+?[()\d\s-.]{8,18}$/.test(this.state.phone);
+    }
+
+    async generateTicketImage(basicReceipt = false) {
+        await this.renderer.toJpeg(
+            OrderReceipt,
+            {
+                order: this.order,
+                basic_receipt: basicReceipt,
+            },
+            { addClass: "pos-receipt-print p-3" }
+        );
+    }
+
+    async _sendReceiptToCustomer({ action, destination }) {
+        if (!this.order.isSynced) {
+            this.dialog.add(ConfirmationDialog, {
+                title: _t("Unsynced order"),
+                body: _t(
+                    "This order is not yet synced to server. Make sure it is synced then try again."
+                ),
+            });
+            return Promise.reject();
+        }
+        const fullTicketImage = await this.generateTicketImage();
+        const basicTicketImage = this.pos.config.basic_receipt
+            ? await this.generateTicketImage(true)
+            : null;
+        await this.pos.data.call("pos.order", action, [
+            [this.order.id],
+            destination,
+            fullTicketImage,
+            basicTicketImage,
+        ]);
+    }
+
+    get sendList() {
+        const list = [
+            {
+                inputClass: "send-receipt-email-input",
+                buttons: [
+                    {
+                        click: () => this.actionSendReceiptOnEmail(),
+                        status:
+                            this.sendReceipt.lastArgs?.[0]?.name == "Email" &&
+                            this.sendReceipt.status,
+                        icon: "fa-paper-plane",
+                        disabled: () => !this.isValidEmail,
+                    },
+                ],
+                placeholder: _t("Email"),
+                model: "email",
+                show: () => true,
+            },
+            {
+                inputClass: "send-receipt-phone-input",
+                buttons: [],
+                placeholder: _t("Phone"),
+                model: "phone",
+                show: () => this.showPhoneInput(),
+            },
+        ];
+        return list;
+    }
+
+    showPhoneInput() {
+        return false;
+    }
+
+    actionSendReceiptOnPhone() {
+        return false;
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.scss b/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.scss
new file mode 100644
index 0000000000000..74cb08b1f42b6
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.scss
@@ -0,0 +1,4 @@
+.send-receipt-popup .modal-header {
+    border: none;
+    padding-bottom: 8px !important;
+}
diff --git a/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.xml b/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.xml
new file mode 100644
index 0000000000000..c1db5f95e77a2
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="point_of_sale.SendReceiptPopup">
+        <Dialog title="''" footer="false" size="'md'" contentClass="`send-receipt-popup ${!this.ui.isSmall? 'rounded-4' : ''}`" bodyClass="'d-flex flex-column gap-2 py-3'">
+            <t t-foreach="sendList" t-as="item" t-key="item_index">
+                <div t-if="item.show()" class="d-flex">
+                    <input type="text" t-attf-class="{{ item.inputClass }} o_input position-relative p-3 border border-end-0 rounded-start-2 text-body" t-att-placeholder="item.placeholder" t-model="this.state[item.model]" />
+                    <div class="d-flex gap-1">
+                        <button t-foreach="item.buttons" t-as="button" t-key="button_index" t-att-style="`width: ${this.ui.isSmall ? '4rem' : '8rem'}`" class="btn btn-primary btn-lg lh-lg rounded-start-0 h-100" t-att-disabled="button.disabled()" t-on-click="() => button.click.call()">
+                            <i t-attf-class="fa {{button.status === 'loading' ? 'fa-fw fa-spin fa-circle-o-notch' : button.icon}}" />
+                        </button>
+                    </div>
+                </div>
+            </t>
+            <div class="notice text-center">
+                <t t-set="usedMethod" t-value="sendReceipt.lastArgs?.[0]?.name" />
+                <div t-if="this.sendReceipt.status === 'loading'" class="text-info">Sending <t t-esc="usedMethod"/> in progress</div>
+                <div t-if="this.sendReceipt.status === 'success'" class="text-success">
+                    <t t-if="this.order.is_invoiced">Receipt and invoice sent successfully</t>
+                    <t t-else="">Receipt sent successfully</t></div>
+                <div t-if="this.sendReceipt.status === 'error'" class="text-danger">Sending <t t-esc="usedMethod"/> failed. Please try again</div>
+            </div>
+        </Dialog>
+    </t>
+
+</templates>
diff --git a/addons/point_of_sale/static/src/app/components/receipt/order-receipt.scss b/addons/point_of_sale/static/src/app/components/receipt/order-receipt.scss
new file mode 100644
index 0000000000000..2e3f62487a2c0
--- /dev/null
+++ b/addons/point_of_sale/static/src/app/components/receipt/order-receipt.scss
@@ -0,0 +1,23 @@
+.pos-receipt-container {
+    direction: ltr;
+
+    > div {
+        background-color: #FFFFFF;
+        color: #000000;
+    }
+}
+
+.pos-receipt {
+    .order-container {
+        padding: 0;
+        pointer-events: none;
+
+        .orderline:hover {
+            background: none;
+        }
+
+        .orderline::before {
+            display: none;
+        }
+    }
+}
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js b/addons/point_of_sale/static/src/app/components/receipt/order_receipt.js
similarity index 94%
rename from addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js
rename to addons/point_of_sale/static/src/app/components/receipt/order_receipt.js
index 040afa492f996..44bb2f8762235 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.js
+++ b/addons/point_of_sale/static/src/app/components/receipt/order_receipt.js
@@ -1,6 +1,6 @@
 import { Component } from "@odoo/owl";
 import { Orderline } from "@point_of_sale/app/components/orderline/orderline";
-import { ReceiptHeader } from "@point_of_sale/app/screens/receipt_screen/receipt/receipt_header/receipt_header";
+import { ReceiptHeader } from "@point_of_sale/app/components/receipt/receipt_header/receipt_header";
 import { OrderDisplay } from "@point_of_sale/app/components/order_display/order_display";
 import { _t } from "@web/core/l10n/translation";
 import { formatCurrency } from "@web/core/currency";
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml b/addons/point_of_sale/static/src/app/components/receipt/order_receipt.xml
similarity index 97%
rename from addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
rename to addons/point_of_sale/static/src/app/components/receipt/order_receipt.xml
index ae5687e6fc4d5..cb0b78f2502cb 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/order_receipt.xml
+++ b/addons/point_of_sale/static/src/app/components/receipt/order_receipt.xml
@@ -17,7 +17,7 @@
             <t t-if="!props.basic_receipt">
                 <t t-set="taxTotals" t-value="order.prices.taxDetails"/>
                 <div t-if="taxTotals and taxTotals.has_tax_groups" class="pos-receipt-taxes pt-3">
-                    <t t-foreach="taxTotals.subtotals" t-as="subtotal" t-key="subtotal.name">
+                    <div t-foreach="taxTotals.subtotals" t-as="subtotal" t-key="subtotal.name" class="taxes">
                         <div class="d-flex">
                             <span class="text-nowrap mw-100">Subtotal</span>
                             <span t-out="formatCurrency(order.priceExcl)" class="ms-auto font-monospace"/>
@@ -36,7 +36,7 @@
                             </span>
                             <span t-out="formatCurrency(tax_group.tax_amount_currency)" class="ms-auto font-monospace"/>
                         </div>
-                    </t>
+                    </div>
                 </div>
 
                 <!-- Total -->
@@ -69,7 +69,7 @@
                 <!-- Extra Payment Info -->
                 <t t-set="totalDiscount" t-value="order.getTotalDiscount()" />
                 <t t-if="totalDiscount">
-                    <div class="text-start">
+                    <div class="text-start receipt-discount">
                         <span class="label-discount">Discounts</span>
                         <span t-out="formatCurrency(totalDiscount)" class="pos-receipt-right-align font-monospace"/>
                     </div>
@@ -111,7 +111,7 @@
             </div>
 
             <t t-if="order.shipping_date">
-                <div class="pos-receipt-order-data d-flex gap-2 pt-3">
+                <div class="pos-receipt-order-data d-flex gap-2 pt-3 receipt-shipping-date">
                     Expected delivery:
                     <div><t t-esc="order.formatDateOrTime('shipping_date', 'date')" /></div>
                 </div>
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.js b/addons/point_of_sale/static/src/app/components/receipt/receipt_header/receipt_header.js
similarity index 100%
rename from addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.js
rename to addons/point_of_sale/static/src/app/components/receipt/receipt_header/receipt_header.js
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.xml b/addons/point_of_sale/static/src/app/components/receipt/receipt_header/receipt_header.xml
similarity index 100%
rename from addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.xml
rename to addons/point_of_sale/static/src/app/components/receipt/receipt_header/receipt_header.xml
diff --git a/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js b/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
index 2288615a748db..6b14e1ddc0a8b 100644
--- a/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
+++ b/addons/point_of_sale/static/src/app/models/accounting/pos_order_accounting.js
@@ -75,15 +75,15 @@ export class PosOrderAccounting extends Base {
         }
 
         const tolerance = this.orderIsRounded ? this.config.rounding_method.rounding : 0;
-        const amount = Math.abs(total - this.amountPaid) <= tolerance ? 0 : Math.abs(remaining);
-        return isNegative ? this.currency.round(-amount) : this.currency.round(amount);
+        const amount = Math.abs(remaining) <= tolerance ? 0 : remaining;
+        return this.currency.round(amount);
     }
     get change() {
         const isNegative = this.totalDue < 0;
         const roundingSanatizer = this.orderIsRounded ? this.appliedRounding : 0;
         const remaining = this.totalDue - this.amountPaid;
 
-        // Amount paid covers the total due
+        // Amount paid does not exceed total due
         if ((isNegative && remaining <= 0) || (!isNegative && remaining >= 0)) {
             return 0;
         }
diff --git a/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.js b/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.js
index 48521c73d5f6d..5b691eef3df3d 100644
--- a/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.js
@@ -4,6 +4,10 @@ import { usePos } from "@point_of_sale/app/hooks/pos_hook";
 import { PriceFormatter } from "@point_of_sale/app/components/price_formatter/price_formatter";
 import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
+import { useErrorHandlers } from "@point_of_sale/app/hooks/hooks";
+import { useRouterParamsChecker } from "@point_of_sale/app/hooks/pos_router_hook";
+import { PrintPopup } from "@point_of_sale/app/components/popups/print_popup/print_popup";
+import { SendReceiptPopup } from "@point_of_sale/app/components/popups/send_receipt_popup/send_receipt_popup";
 
 export class FeedbackScreen extends Component {
     static template = "point_of_sale.FeedbackScreen";
@@ -12,17 +16,21 @@ export class FeedbackScreen extends Component {
     static props = {
         orderUuid: String,
         waitFor: { type: Object, optional: true },
-        paymentMethodId: { type: Number, optional: true, default: null },
     };
 
     setup() {
         super.setup();
         this.pos = usePos();
+        useRouterParamsChecker();
+        useErrorHandlers();
         this.notification = useService("notification");
+        this.ui = useService("ui");
+        this.dialog = useService("dialog");
         this.containerRef = useRef("feedback-screen");
         this.amountRef = useRef("amount");
         this.state = useState({
             loading: true,
+            timeout: false,
         });
 
         onMounted(() => {
@@ -38,9 +46,11 @@ export class FeedbackScreen extends Component {
                         }
                     } finally {
                         this.state.loading = false;
-                        this.timeout = setTimeout(() => {
-                            this.pos.orderDone(this.currentOrder);
-                        }, 5000);
+                        if (this.isAutoSkip && !this.ignoreTimeout) {
+                            this.state.timeout = setTimeout(() => {
+                                this.pos.orderDone(this.currentOrder);
+                            }, this.pos.feedbackScreenAutoSkipDelay);
+                        }
                     }
                 };
 
@@ -50,10 +60,16 @@ export class FeedbackScreen extends Component {
         );
 
         onWillUnmount(() => {
-            clearTimeout(this.timeout);
+            clearTimeout(this.state.timeout);
         });
     }
 
+    get isAutoSkip() {
+        return (
+            this.pos.config.iface_print_auto && this.currentOrder.payment_ids[0]?.payment_method_id
+        );
+    }
+
     scaleText() {
         const containerWidth = this.containerRef.el.offsetWidth * 0.8; // 80% of the container width to have some space on the sides
         const textWidth = this.amountRef.el.scrollWidth;
@@ -66,19 +82,67 @@ export class FeedbackScreen extends Component {
         return this.pos.models["pos.order"].getBy("uuid", this.props.orderUuid);
     }
 
-    onClick() {
-        if (this.state.loading) {
-            this.notification.add(
-                _t("A request is still being processed in the background. Please wait."),
-                {
-                    type: "warning",
-                }
-            );
+    onClick(buttonClicked = false) {
+        if (!this.isAutoSkip || buttonClicked) {
+            if (this.state.loading) {
+                this.notification.add(
+                    _t("A request is still being processed in the background. Please wait."),
+                    {
+                        type: "warning",
+                    }
+                );
+                return;
+            }
+            this.goNext();
+        } else {
+            this.stopAutomaticSkip();
+        }
+    }
+
+    stopAutomaticSkip() {
+        if (!this.isAutoSkip) {
             return;
         }
-        clearTimeout(this.timeout);
+        if (this.state.timeout) {
+            clearTimeout(this.state.timeout);
+            this.state.timeout = false;
+        } else {
+            this.ignoreTimeout = true;
+        }
+    }
+
+    goNext() {
         this.pos.orderDone(this.currentOrder);
     }
+
+    get canSendReceipt() {
+        return true;
+    }
+
+    get canEditPayment() {
+        return !this.pos.config.iface_print_auto && this.currentOrder.nb_print === 0;
+    }
+
+    clickPrint() {
+        this.stopAutomaticSkip();
+        this.dialog.add(PrintPopup, {
+            order: this.currentOrder,
+        });
+    }
+
+    clickSend() {
+        this.stopAutomaticSkip();
+        if (this.canSendReceipt) {
+            this.dialog.add(SendReceiptPopup, {
+                order: this.currentOrder,
+            });
+        }
+    }
+
+    clickEditPayment() {
+        this.stopAutomaticSkip();
+        this.pos.orderDetails(this.currentOrder);
+    }
 }
 
 registry.category("pos_pages").add("FeedbackScreen", {
diff --git a/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.scss b/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.scss
index 4cdd5ae9ca33d..cfb1e9894fd27 100644
--- a/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.scss
+++ b/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.scss
@@ -3,12 +3,100 @@
         font-size: clamp(2rem, 4vw, 5rem);
     }
 
+    .amount-container {
+        transform: scale(0.95);
+        opacity: 0;
+        animation: smoothZoomIn 0.6s ease-out forwards;
+    }
+
     .amount {
         font-size: clamp(10rem, 25vw, 30rem);
     }
 
-    .loading {
-        bottom: 1rem;
-        left: 1rem;
+    @keyframes smoothZoomIn {
+      0% {
+        transform: scale(0.95);
+        opacity: 0;
+      }
+      100% {
+        transform: scale(1);
+        opacity: 1;
+      }
+    }
+
+    .validation {
+        position: relative;
+        overflow: hidden;
+    }
+
+    .wipe-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(255,255,255,0.1);
+        border: 1px solid rgba(255,255,255,0.1);
+        transform: translateX(0);
+        animation: wipe-away 5s linear forwards;
+        z-index: 3;
+        pointer-events: none;
+    }
+
+    .validation > *:not(.wipe-overlay) {
+        position: relative;
+        z-index: 4;
+    }
+
+    @keyframes wipe-away {
+        from { transform: translateX(0); }
+        to   { transform: translateX(100%); }
+    }
+
+    button {
+        min-height: 70px;
+    }
+}
+
+
+
+@page {
+    padding: 15px;
+}
+
+@media print {
+    .pos-receipt {
+        contain: paint;
+        background-color: transparent;
+    }
+    .pos, .pos * {
+        position: static !important;
+    }
+    .render-container .pos-receipt * {
+        background-color: transparent !important;
+        color: black !important;
+    }
+    .render-container .pos-receipt {
+        margin: 0 !important;
+        margin-left: auto !important;
+        margin-right: auto !important;
+        border: none !important;
+        font-size: 14px !important;
+        width: 266px !important;
+    }
+    .render-container {
+        position: absolute !important;
+        top: 10px;
+        left: 10px;
+    }
+    .o-main-components-container  {
+        position: absolute !important;
+        top: 0;
+        left: 0;
+    }
+    body > *:not(.o-main-components-container),
+    .o-main-components-container > *:not(.render-container-parent),
+    .render-container-parent > *:not(.render-container) {
+        display: none !important;
     }
 }
diff --git a/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.xml b/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.xml
index 0f216dc4f85f3..16682fbf3a84e 100644
--- a/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.xml
+++ b/addons/point_of_sale/static/src/app/screens/feedback_screen/feedback_screen.xml
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="point_of_sale.FeedbackScreen">
-        <div t-ref="feedback-screen" class="feedback-screen bg-100 fixed-top w-100 h-100 d-flex flex-column align-items-center justify-content-center" t-on-click="onClick">
+        <div t-ref="feedback-screen" class="feedback-screen bg-100 fixed-top w-100 h-100 d-flex flex-column align-items-center justify-content-center" t-on-click="() => this.onClick()">
             <div class="amount-paid fw-bolder">Amount Paid</div>
-            <div t-ref="amount" class="amount lh-sm"><PriceFormatter price="this.env.utils.formatCurrency(this.currentOrder.amount_total, false)"/></div>
-            <div class="loading position-absolute w-100 align-items-center justify-content-center">
-                <div class="fs-3 text-center">
-                    <t t-if="state.loading">
-                        Some process are still running in background, please wait...
-                    </t>
-                    <t t-else="">
-                        Everything is ready to go!
-                    </t>
+            <div class="amount-container">
+                <div t-ref="amount" class="amount lh-sm">
+                    <PriceFormatter price="this.env.utils.formatCurrency(this.currentOrder.totalDue, false)"/>
+                </div>
+            </div>
+            <div t-if="!ui.isSmall" class="desktop-format w-75 d-flex gap-3 flex-row align-items-center justify-content-around p-2">
+                <button t-att-disabled="state.loading || currentOrder.state == 'draft'" class="print-ticket-button button btn btn-secondary btn-lg lh-lg text-truncate flex-basis-25 py-3 rounded-3" t-on-click.stop="() => this.clickPrint()"><i class="fa fa-print" role="img" aria-label="Print" title="Print"></i> Print</button>
+                <button t-if="canSendReceipt" t-att-disabled="state.loading || currentOrder.state == 'draft'" class="send-receipt button btn btn-secondary btn-lg lh-lg text-truncate flex-basis-25 py-3 rounded-3" t-on-click.stop="() => this.clickSend()"><i class="fa fa-paper-plane" role="img" aria-label="Send" title="Send"></i> Send Receipt</button>
+                <button t-if="canEditPayment" t-att-disabled="state.loading" class="button btn btn-secondary btn-lg lh-lg text-truncate flex-basis-25 py-3 rounded-3 edit-order-payment" t-on-click.stop="() => this.clickEditPayment()"><i class="fa fa-pencil-square-o" role="img" aria-label="Edit" title="Edit"></i> Edit</button>
+                <button t-att-disabled="state.loading" class="validation button btn btn-primary btn-lg lh-lg text-truncate flex-basis-25 py-3 rounded-3" t-on-click.stop="() => this.onClick(true)">
+                    Continue
+                    <div t-if="this.state.timeout" class="wipe-overlay"/>
+                </button>
+            </div>
+            <div t-else="" class="mobile-format position-absolute bottom-0 w-100 d-flex flex-column gap-1 p-1">
+                <div class="d-flex w-100 gap-1">
+                    <button t-if="canSendReceipt" t-att-disabled="state.loading || currentOrder.state == 'draft'" class="send-receipt btn btn-secondary btn-lg lh-lg text-truncate flex-basis-50" t-on-click.stop="() => this.clickSend()">Send Receipt</button>
+                    <button t-att-disabled="state.loading || currentOrder.state == 'draft'" class="print-ticket-button btn btn-secondary btn-lg lh-lg text-truncate flex-grow-1" t-on-click.stop="() => this.clickPrint()">Print</button>
+                </div>
+                <div class="d-flex w-100 gap-1">
+                    <button t-if="canEditPayment" t-att-disabled="state.loading" class="back-button btn btn-secondary btn-lg lh-lg text-truncate flex-basis-50 edit-order-payment" t-on-click.stop="() => this.clickEditPayment()">Edit</button>
+                    <button t-att-disabled="state.loading" class="validation button btn btn-primary btn-lg btn-lg lg-lh flex-grow-1" t-on-click.stop="() => this.onClick(true)">
+                        Continue
+                        <div t-if="this.state.timeout" class="wipe-overlay"/>
+                    </button>
                 </div>
             </div>
         </div>
diff --git a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
index c3f7fa125c199..cbf2c83995b02 100644
--- a/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/payment_screen/payment_screen.js
@@ -160,7 +160,7 @@ export class PaymentScreen extends Component {
         } else {
             this.dialog.add(AlertDialog, {
                 title: _t("Oh snap !"),
-                body: _t("There is already an electronic payment in progress."),
+                body: result.data,
             });
             return false;
         }
diff --git a/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.xml b/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.xml
index 58e5575b0bbcd..4207455a92ce2 100644
--- a/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.xml
+++ b/addons/point_of_sale/static/src/app/screens/product_screen/action_pad/action_pad.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="point_of_sale.ActionpadWidget">
-        <div class="actionpad d-flex flex-column" t-att-class="{'gap-2': showFastPaymentMethods}">
+        <div class="actionpad d-flex flex-column" t-att-class="{'gap-2': showFastPaymentMethods || ui.isSmall}">
             <div t-if="ui.isSmall" class="d-flex gap-2">
                 <BackButton t-if="!props.showActionButton and pos.showBackButton()" onClick="() => pos.onClickBackButton()"/>
                 <t t-if="props.onClickMore">
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
deleted file mode 100644
index 6a2d417571d02..0000000000000
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { _t } from "@web/core/l10n/translation";
-import { useErrorHandlers, useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
-import { registry } from "@web/core/registry";
-import { OrderReceipt } from "@point_of_sale/app/screens/receipt_screen/receipt/order_receipt";
-import { useState, Component } from "@odoo/owl";
-import { usePos } from "@point_of_sale/app/hooks/pos_hook";
-import { useService } from "@web/core/utils/hooks";
-import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
-import { isValidEmail } from "@point_of_sale/utils";
-import { useRouterParamsChecker } from "@point_of_sale/app/hooks/pos_router_hook";
-
-export class ReceiptScreen extends Component {
-    static template = "point_of_sale.ReceiptScreen";
-    static components = { OrderReceipt };
-    static props = {
-        orderUuid: { type: String },
-    };
-
-    setup() {
-        super.setup();
-        this.pos = usePos();
-        useRouterParamsChecker();
-        useErrorHandlers();
-        this.ui = useService("ui");
-        this.renderer = useService("renderer");
-        this.notification = useService("notification");
-        this.dialog = useService("dialog");
-        const partner = this.currentOrder.getPartner();
-        const email = partner?.invoice_emails || partner?.email || "";
-        this.state = useState({
-            email: email,
-            phone: partner?.phone || "",
-        });
-        this.sendReceipt = useTrackedAsync(this._sendReceiptToCustomer.bind(this));
-        this.doFullPrint = useTrackedAsync(() =>
-            this.pos.printReceipt({ order: this.currentOrder })
-        );
-        this.doBasicPrint = useTrackedAsync(() =>
-            this.pos.printReceipt({ order: this.currentOrder, basic: true })
-        );
-    }
-    actionSendReceiptOnEmail() {
-        this.sendReceipt.call({
-            action: "action_send_receipt",
-            destination: this.state.email,
-            name: "Email",
-        });
-    }
-    get currentOrder() {
-        return this.pos.models["pos.order"].getBy("uuid", this.props.orderUuid);
-    }
-    get orderAmountPlusTip() {
-        const order = this.currentOrder;
-        const orderTotalAmount = order.priceIncl;
-        const tip_product_id = this.pos.config.tip_product_id?.id;
-        const tipLine = order
-            .getOrderlines()
-            .find((line) => tip_product_id && line.product_id.id === tip_product_id);
-        const tipAmount = tipLine ? tipLine.prices.total_included : 0;
-        const orderAmountStr = this.env.utils.formatCurrency(orderTotalAmount - tipAmount);
-        if (!tipAmount) {
-            return orderAmountStr;
-        }
-        const tipAmountStr = this.env.utils.formatCurrency(tipAmount);
-        return `${orderAmountStr} + ${tipAmountStr} tip`;
-    }
-    get ticketScreen() {
-        return { name: "TicketScreen" };
-    }
-    get isValidEmail() {
-        return isValidEmail(this.state.email);
-    }
-    get isValidPhone() {
-        return this.state.phone && /^\+?[()\d\s-.]{8,18}$/.test(this.state.phone);
-    }
-    showPhoneInput() {
-        return false;
-    }
-
-    generateTicketImage = async (basicReceipt = false) =>
-        await this.renderer.toJpeg(
-            OrderReceipt,
-            {
-                order: this.currentOrder,
-                basic_receipt: basicReceipt,
-            },
-            { addClass: "pos-receipt-print p-3" }
-        );
-    async _sendReceiptToCustomer({ action, destination }) {
-        const order = this.currentOrder;
-        if (!order.isSynced) {
-            this.dialog.add(ConfirmationDialog, {
-                title: _t("Unsynced order"),
-                body: _t(
-                    "This order is not yet synced to server. Make sure it is synced then try again."
-                ),
-            });
-            return Promise.reject();
-        }
-        const fullTicketImage = await this.generateTicketImage();
-        const basicTicketImage = this.pos.config.basic_receipt
-            ? await this.generateTicketImage(true)
-            : null;
-        await this.pos.data.call("pos.order", action, [
-            [order.id],
-            destination,
-            fullTicketImage,
-            basicTicketImage,
-        ]);
-    }
-}
-
-registry.category("pos_pages").add("ReceiptScreen", {
-    name: "ReceiptScreen",
-    component: ReceiptScreen,
-    route: `/pos/ui/${odoo.pos_config_id}/receipt/{string:orderUuid}`,
-    params: {
-        orderUuid: true,
-        orderFinalized: true,
-    },
-});
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.scss b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.scss
deleted file mode 100644
index fac434ed5915d..0000000000000
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-.pos-receipt-container {
-    direction: ltr;
-
-    > div {
-        background-color: #FFFFFF;
-        color: #000000;
-    }
-}
-
-.pos-receipt {
-    .order-container {
-        padding: 0;
-        pointer-events: none;
-
-        .orderline:hover {
-            background: none;
-        }
-
-        .orderline::before {
-            display: none;
-        }
-    }
-}
-
-@page {
-    padding: 15px;
-}
-
-@media print {
-    .pos-receipt {
-        contain: paint;
-        background-color: transparent;
-    }
-    .pos, .pos * {
-        position: static !important;
-    }
-    .render-container .pos-receipt * {
-        background-color: transparent !important;
-        color: black !important;
-    }
-    .render-container .pos-receipt {
-        margin: 0 !important;
-        margin-left: auto !important;
-        margin-right: auto !important;
-        border: none !important;
-        font-size: 14px !important;
-        width: 266px !important;
-    }
-    .render-container {
-        position: absolute !important;
-        top: 10px;
-        left: 10px;
-    }
-    .o-main-components-container  {
-        position: absolute !important;
-        top: 0;
-        left: 0;
-    }
-    body > *:not(.o-main-components-container),
-    .o-main-components-container > *:not(.render-container-parent),
-    .render-container-parent > *:not(.render-container) {
-        display: none !important;
-    }
-}
diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.xml b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.xml
deleted file mode 100644
index a2dd3bdd52797..0000000000000
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt_screen.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-
-    <t t-name="point_of_sale.ReceiptScreen">
-        <div class="receipt-screen screen h-100 bg-100">
-            <div class="screen-content d-flex flex-column h-100">
-                <div class="default-view d-flex flex-lg-row flex-column overflow-hidden flex-grow-1">
-                    <div class="actions d-flex flex-column justify-content-between flex-lg-grow-1 flex-grow-0 flex-shrink-1 flex-basis-0 border-end">
-                        <div class="o_payment_successful d-flex flex-column w-100 w-xxl-75 p-3 pt-xxl-5 mx-auto">
-                            <div class="d-flex flex-column align-items-center mb-3 p-1 p-lg-3 border border-success rounded-3 bg-success-subtle text-success fs-3">
-                                <i t-if="!ui.isSmall" class="fa fa-fw fa-2x fa-check-circle"/>
-                                <span class="fs-3 fw-bolder">
-                                    <t t-if="currentOrder.isRefund">Refund Initiated</t>
-                                    <t t-else="">Payment Successful</t>
-                                </span>
-                                <div class="fs-4 fw-bold d-flex justify-content-center align-items-center gap-2">
-                                    <span t-esc="orderAmountPlusTip" />
-                                    <span t-if="this.currentOrder.nb_print === 0" class="edit-order-payment badge bg-success text-white rounded cursor-pointer pt-1" t-on-click="() => this.pos.orderDetails(this.currentOrder)">Edit Payment</span>
-                                </div>
-                            </div>
-                            <div class="receipt-options d-flex flex-column gap-2">
-                                <div class="d-flex gap-1">
-                                    <button class="button print btn btn-lg btn-secondary w-100 py-3" t-on-click="() => doFullPrint.call()">
-                                        <i t-attf-class="fa {{doFullPrint.status === 'loading' ? 'fa-fw fa-spin fa-circle-o-notch' : 'fa-print'}} me-1" />Print Full Receipt
-                                    </button>
-                                    <button t-if="pos.config.basic_receipt" class="button print btn btn-lg btn-secondary w-100 py-3" t-on-click="() => doBasicPrint.call()">
-                                        <i t-attf-class="fa {{doBasicPrint.status === 'loading' ? 'fa-fw fa-spin fa-circle-o-notch' : 'fa-print'}} me-1" />Print Basic Receipt
-                                    </button>
-                                </div>
-                                <div class="d-flex flex-column gap-2">
-                                    <div class="d-flex">
-                                        <input type="text" class="send-receipt-email-input o_input position-relative p-3 border border-end-0 rounded-start-2 text-body" t-attf-placeholder="e.g. john.doe@mail.com" t-model="state.email" />
-                                        <div>
-                                            <button t-att-style="`width: ${this.ui.isSmall ? '4rem' : '8rem'}`" class="btn btn-primary btn-lg lh-lg rounded-start-0 h-100" t-att-disabled="!isValidEmail" t-on-click="() => this.actionSendReceiptOnEmail()">
-                                                <i t-attf-class="fa {{sendReceipt.status === 'loading' and sendReceipt.lastArgs?.[0]?.name === 'Email' ? 'fa-fw fa-spin fa-circle-o-notch' : 'fa-paper-plane'}}" />
-                                            </button>
-                                        </div>
-                                    </div>
-                                    <div class="d-flex">
-                                        <input t-if="showPhoneInput()" type="text" class="send-receipt-phone-input o_input position-relative p-3 border border-end-0 rounded-2 text-body" t-attf-placeholder="e.g. 0123456789" t-model="state.phone" />
-                                        <div class="sending-receipt-management d-flex gap-1" />
-                                    </div>
-                                </div>
-                                <div class="notice text-center">
-                                    <t t-set="usedMethod" t-value="sendReceipt.lastArgs?.[0]?.name" />
-                                    <div t-if="sendReceipt.status === 'loading'" class="text-info">Sending <t t-esc="usedMethod"/> in progress</div>
-                                    <div t-if="sendReceipt.status === 'success'" class="text-success">
-                                        <t t-if="this.currentOrder.is_invoiced">Receipt and invoice sent successfully</t>
-                                        <t t-else="">Receipt sent successfully</t></div>
-                                    <div t-if="sendReceipt.status === 'error'" class="text-danger">Sending <t t-esc="usedMethod"/> failed. Please try again</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div id="action_btn_desktop" t-if="!ui.isSmall" class="validation-buttons d-flex w-100 gap-2 p-2 sticky-bottom">
-                            <button class="button next validation btn btn-primary btn-lg w-100 py-4 lh-lg" t-att-class="{ highlight: !locked }" t-on-click="() => this.pos.orderDone(this.currentOrder)" name="done">
-                                New Order
-                            </button>
-                        </div>
-                    </div>
-                    <div class="pos-receipt-container d-flex flex-grow-1 flex-lg-grow-0 w-100 w-lg-50 user-select-none justify-content-center bg-200 text-center overflow-hidden">
-                        <div t-att-class="{ 'w-50': !ui.isSmall }" class="d-inline-block m-2 m-lg-3 p-3 border rounded text-start overflow-y-auto">
-                            <OrderReceipt order="this.currentOrder" />
-                        </div>
-                    </div>
-                </div>
-                <div  id="action_btn_mobile" t-if="ui.isSmall" class="switchpane d-flex gap-2 p-2">
-                    <div class="btn-switchpane validation-button btn btn-primary btn-lg py-3 flex-fill lh-lg" t-att-class="{ highlight: !locked }" t-on-click="() => this.pos.orderDone(this.currentOrder)" name="done">
-                                New Order
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
-
-</templates>
diff --git a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
index 43b6693916307..cd3a2445f21dc 100644
--- a/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
+++ b/addons/point_of_sale/static/src/app/screens/ticket_screen/ticket_screen.js
@@ -395,9 +395,8 @@ export class TicketScreen extends Component {
         );
     }
     activeOrderFilter(o) {
-        const screen = ["ReceiptScreen", "TipScreen"];
         const oScreen = o.getScreenData();
-        return (!o.finalized || screen.includes(oScreen.name)) && o.uiState.displayed;
+        return (!o.finalized || oScreen.name == "TipScreen") && o.uiState.displayed;
     }
     getFilteredOrderList() {
         const orderModel = this.pos.models["pos.order"];
@@ -732,7 +731,6 @@ export class TicketScreen extends Component {
         return {
             ProductScreen: "ONGOING",
             PaymentScreen: "PAYMENT",
-            ReceiptScreen: "RECEIPT",
         };
     }
     _getOrderStates() {
diff --git a/addons/point_of_sale/static/src/app/services/pos_store.js b/addons/point_of_sale/static/src/app/services/pos_store.js
index bf9b217f74f8b..971697c079c55 100644
--- a/addons/point_of_sale/static/src/app/services/pos_store.js
+++ b/addons/point_of_sale/static/src/app/services/pos_store.js
@@ -14,7 +14,7 @@ import {
 } from "@point_of_sale/utils";
 import { HWPrinter } from "@point_of_sale/app/utils/printer/hw_printer";
 import { ConnectionLostError } from "@web/core/network/rpc";
-import { OrderReceipt } from "@point_of_sale/app/screens/receipt_screen/receipt/order_receipt";
+import { OrderReceipt } from "@point_of_sale/app/components/receipt/order_receipt";
 import { _t } from "@web/core/l10n/translation";
 import { OpeningControlPopup } from "@point_of_sale/app/components/popups/opening_control_popup/opening_control_popup";
 import { SelectLotPopup } from "@point_of_sale/app/components/popups/select_lot_popup/select_lot_popup";
@@ -61,6 +61,8 @@ export const CONSOLE_COLOR = "#F5B427";
 export class PosStore extends WithLazyGetterTrap {
     loadingSkipButtonIsShown = false;
     mainScreen = { name: null, component: null };
+    orderReceiptComponent = OrderReceipt;
+    feedbackScreenAutoSkipDelay = 5000;
 
     static serviceDependencies = [
         "bus_service",
diff --git a/addons/point_of_sale/static/src/app/utils/order_payment_validation.js b/addons/point_of_sale/static/src/app/utils/order_payment_validation.js
index b225423f195d4..05d77e623c3da 100644
--- a/addons/point_of_sale/static/src/app/utils/order_payment_validation.js
+++ b/addons/point_of_sale/static/src/app/utils/order_payment_validation.js
@@ -38,28 +38,12 @@ export default class OrderPaymentValidation {
     }
 
     get nextPage() {
-        if (
-            this.pos.config.iface_print_auto &&
-            this.pos.config.iface_print_skip_screen &&
-            this.order.payment_ids[0]?.payment_method_id
-        ) {
-            return {
-                page: "FeedbackScreen",
-                params: {
-                    orderUuid: this.order.uuid,
-                    paymentMethodId: this.order.payment_ids[0]?.payment_method_id.id,
-                },
-            };
-        }
-
-        return !this.error
-            ? {
-                  page: "ReceiptScreen",
-                  params: {
-                      orderUuid: this.order.uuid,
-                  },
-              }
-            : this.pos.defaultPage;
+        return {
+            page: "FeedbackScreen",
+            params: {
+                orderUuid: this.order.uuid,
+            },
+        };
     }
 
     get paymentLines() {
diff --git a/addons/point_of_sale/static/src/customer_display/customer_display.xml b/addons/point_of_sale/static/src/customer_display/customer_display.xml
index c4b00e210ecc3..e6cdb61eaab66 100644
--- a/addons/point_of_sale/static/src/customer_display/customer_display.xml
+++ b/addons/point_of_sale/static/src/customer_display/customer_display.xml
@@ -51,7 +51,7 @@
                             </div>
                         </li>
                         <div t-if="props.generalCustomerNote"
-                            t-attf-class="{{ props.screenName == 'ReceiptScreen' ? 'mt-1 bg-opacity-75 p-0' : 'customer-note w-100 p-2 mt-2 rounded text-break text-bg-warning bg-opacity-25 mt-0'}}">
+                            t-attf-class="{{ props.screenName == 'FeedbackScreen' ? 'mt-1 bg-opacity-75 p-0' : 'customer-note w-100 p-2 mt-2 rounded text-break text-bg-warning bg-opacity-25 mt-0'}}">
                             <div class="row flex-wrap w-100 m-0"> <!-- Add w-100 and remove margins -->
                                 <div class="col-auto px-1">
                                     <i class="fa fa-sticky-note me-1 fa-lg" role="img"
diff --git a/addons/point_of_sale/static/tests/pos/tours/chrome_tour.js b/addons/point_of_sale/static/tests/pos/tours/chrome_tour.js
index f09df8f0804b1..247f817a9a8ff 100644
--- a/addons/point_of_sale/static/tests/pos/tours/chrome_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/chrome_tour.js
@@ -1,5 +1,5 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as CashMoveList from "@point_of_sale/../tests/pos/tours/utils/cash_move_list_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
@@ -35,18 +35,18 @@ registry.category("web_tour.tours").add("ChromeTour", {
             Chrome.clickOrders(),
             TicketScreen.checkStatus("002", "Payment"),
 
-            // Order 3 is at Receipt Screen
+            // Order 3 is paid
             Chrome.createFloatingOrder(),
             ProductScreen.addOrderline("Whiteboard Pen", "5", "6", "30.0"),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.0" }),
             PaymentScreen.validateButtonIsHighlighted(true),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            Chrome.clickOrders(),
-            TicketScreen.checkStatus("003", "Receipt"),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickScreen(),
 
             // Select order 1, should be at Product Screen
+            Chrome.clickOrders(),
             TicketScreen.selectOrder("001"),
             TicketScreen.loadSelectedOrder(),
             ProductScreen.productIsDisplayed("Desk Pad"),
@@ -62,12 +62,6 @@ registry.category("web_tour.tours").add("ChromeTour", {
             PaymentScreen.emptyPaymentlines("12.0"),
             PaymentScreen.validateButtonIsHighlighted(false),
 
-            // Select order 3, should be at Receipt Screen
-            Chrome.clickOrders(),
-            TicketScreen.selectOrder("003"),
-            TicketScreen.loadSelectedOrder(),
-            ReceiptScreen.totalAmountContains("30.0"),
-
             // Pay order 1, with change
             Chrome.clickOrders(),
             TicketScreen.selectOrder("001"),
@@ -78,26 +72,19 @@ registry.category("web_tour.tours").add("ChromeTour", {
             PaymentScreen.enterPaymentLineAmount("Cash", "20", true, { change: "18.0" }),
             PaymentScreen.validateButtonIsHighlighted(true),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.totalAmountContains("2.0"),
-
-            // Order 1 now should have Receipt status
-            Chrome.clickOrders(),
-            TicketScreen.checkStatus("001", "Receipt"),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                total_amount: "2.0",
+            }),
 
-            // Select order 3, should still be at Receipt Screen
-            // and the total amount doesn't change.
-            TicketScreen.selectOrder("003"),
-            TicketScreen.loadSelectedOrder(),
-            ReceiptScreen.totalAmountContains("30.0"),
-
-            // click next screen on order 3
+            // click next screen on order 1
             // then delete the new empty order
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.orderIsEmpty(),
             Chrome.clickOrders(),
             TicketScreen.deleteOrder("004"),
 
-            // After deleting order 1 above, order 2 became
+            // After paying order 1 above, order 2 became
             // the 1st-row order and it has payment status
             TicketScreen.nthRowContains(1, "Payment"),
             TicketScreen.deleteOrder("002"),
@@ -112,11 +99,18 @@ registry.category("web_tour.tours").add("ChromeTour", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickInvoiceButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            { trigger: ".receipt-screen .pos-config-name:contains(Shop)" },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".pos-config-name",
+                        text: "Shop",
+                    },
+                ],
+            }),
 
             // Cancelling a floating order should remove it from the floating orders list.
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             Chrome.hasFloatingOrder("004"),
         ].flat(),
 });
@@ -130,13 +124,21 @@ registry.category("web_tour.tours").add("OrderModificationAfterValidationError",
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.0" }),
             PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
 
             // Dialog showing the error
             Dialog.confirm(),
 
+            FeedbackScreen.clickNextOrder(),
+            ProductScreen.isShown(),
+            ProductScreen.selectFloatingOrder(0),
+            PaymentScreen.isShown(),
             PaymentScreen.clickBack(),
-            { ...ProductScreen.back(), isActive: ["mobile"] },
             ProductScreen.isShown(),
+            {
+                isActive: ["mobile"],
+                ...ProductScreen.back(),
+            },
 
             // Allow order changes after the error
             ProductScreen.clickDisplayedProduct("Test Product", true, "2"),
@@ -152,7 +154,7 @@ registry.category("web_tour.tours").add("test_tracking_number_closing_session",
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             Chrome.clickMenuOption("Close Register"),
             {
@@ -168,8 +170,8 @@ registry.category("web_tour.tours").add("test_tracking_number_closing_session",
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.enterPaymentLineAmount("Bank", "20"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -186,7 +188,7 @@ registry.category("web_tour.tours").add("test_reload_page_before_payment_with_cu
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Customer Account"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             ProductScreen.clickDisplayedProduct("Desk Organizer", true, "1.0"),
             ProductScreen.clickPayButton(),
@@ -230,8 +232,10 @@ registry.category("web_tour.tours").add("test_zero_decimal_places_currency", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.totalAmountContains("100"),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                total_amount: "100",
+            }),
         ].flat(),
 });
 
@@ -246,14 +250,14 @@ registry.category("web_tour.tours").add("SessionStatisticsDisplay", {
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.validateButtonIsHighlighted(true),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             ProductScreen.addOrderline("Monitor Stand", "2", "10"),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.validateButtonIsHighlighted(true),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             Chrome.clickMenuOption("Backend", { expectUnloadPage: true }),
             {
diff --git a/addons/point_of_sale/static/tests/pos/tours/fake_tours.js b/addons/point_of_sale/static/tests/pos/tours/fake_tours.js
index df958aa0a6836..32f308d1f7eab 100644
--- a/addons/point_of_sale/static/tests/pos/tours/fake_tours.js
+++ b/addons/point_of_sale/static/tests/pos/tours/fake_tours.js
@@ -1,7 +1,7 @@
 import { registry } from "@web/core/registry";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 
 registry.category("web_tour.tours").add("PoSFakeTourSimpleOrder", {
     steps: () =>
@@ -10,6 +10,6 @@ registry.category("web_tour.tours").add("PoSFakeTourSimpleOrder", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/feedback_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/feedback_screen_tour.js
index 3c450453d0573..b0fe7c3613084 100644
--- a/addons/point_of_sale/static/tests/pos/tours/feedback_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/feedback_screen_tour.js
@@ -1,13 +1,321 @@
+/* global posmodel */
+
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
+import * as NumberPopup from "@point_of_sale/../tests/generic_helpers/number_popup_util";
+import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
+import * as Numpad from "@point_of_sale/../tests/generic_helpers/numpad_util";
+import * as OfflineUtil from "@point_of_sale/../tests/generic_helpers/offline_util";
 import { registry } from "@web/core/registry";
+import { inLeftSide } from "@point_of_sale/../tests/pos/tours/utils/common";
+import { negateStep } from "@point_of_sale/../tests/generic_helpers/utils";
+
+registry.category("web_tour.tours").add("FeedbackScreenTour", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            OfflineUtil.setOfflineMode(),
+            ProductScreen.addOrderline("Letter Tray", "10", "5"),
+            ProductScreen.clickPartnerButton(),
+            ProductScreen.clickCustomer("Partner Full"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.validateButtonIsHighlighted(true),
+            PaymentScreen.clickShipLaterButton(),
+            PaymentScreen.shippingLaterHighlighted(),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                total_amount: "55.00", // letter tray has 10% tax (search SRC)
+                cashier_name: "A", // A simple PoS man! (Take the first word)
+                is_shipping_date: true,
+                is_shipping_date_today: true, //receipt had expected delivery printed
+            }),
+            Dialog.confirm("Continue with limited functionality"),
+            FeedbackScreen.clickNextOrder(),
+
+            // send email in receipt screen
+            ProductScreen.addOrderline("Desk Pad", "6", "5", "30.0"),
+            ProductScreen.addOrderline("Whiteboard Pen", "6", "6", "36.0"),
+            ProductScreen.addOrderline("Monitor Stand", "6", "1", "6.0"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            PaymentScreen.enterPaymentLineAmount("Cash", "70", true, { remaining: "2.0" }),
+            PaymentScreen.clickNumpad("0"),
+            PaymentScreen.fillPaymentLineAmountMobile("Cash", "700"),
+            PaymentScreen.changeIs("628.0"),
+            OfflineUtil.setOnlineMode(),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                total_amount: "72.00",
+            }),
+            FeedbackScreen.sendEmail("test@feedbackscreen.com", true),
+            OfflineUtil.setOfflineMode(),
+            FeedbackScreen.clickNextOrder(),
+
+            // order with tip
+            // check if tip amount is displayed
+            ProductScreen.addOrderline("Desk Pad", "6", "5"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickTipButton(),
+            {
+                content: "click numpad button: 1",
+                trigger: ".modal div.numpad button:contains(/^1/)",
+                run: "click",
+            },
+            NumberPopup.isShown("1"),
+            Dialog.confirm(),
+            PaymentScreen.emptyPaymentlines("31.0"),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                total_amount: "31.00",
+                orderlines: [{ name: "Desk Pad" }, { name: "Tips", amount: "1.00" }],
+            }),
+            FeedbackScreen.clickNextOrder(),
+
+            // Test customer note in receipt
+            ProductScreen.addOrderline("Desk Pad", "1", "5"),
+            inLeftSide([
+                { ...ProductScreen.clickLine("Desk Pad")[0], isActive: ["mobile"] },
+                ...ProductScreen.addCustomerNote("Test customer note"),
+            ]),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    {
+                        name: "Desk Pad",
+                        cssRules: [
+                            {
+                                css: ".info-list .customer-note",
+                                text: "Test customer note",
+                            },
+                        ],
+                    },
+                ],
+            }),
+            FeedbackScreen.clickNextOrder(),
+
+            // Test that Internal notes are not available on receipt
+            ProductScreen.addOrderline("Desk Pad", "1", "5"),
+            inLeftSide([
+                { ...ProductScreen.clickLine("Desk Pad")[0], isActive: ["mobile"] },
+                ...ProductScreen.addInternalNote("Test internal note"),
+                ...ProductScreen.clickSelectedLine("Desk Pad"),
+                ...ProductScreen.addInternalNote("Test internal note on order"),
+                ...Order.hasInternalNote("Test internal note on order"),
+            ]),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    {
+                        name: "Desk Pad",
+                        cssRules: [
+                            {
+                                css: ".info-list .o_tag_badge_text",
+                                text: "Test internal note",
+                                negation: true,
+                            },
+                        ],
+                    },
+                ],
+                cssRules: [
+                    {
+                        css: ".order-container .internal-note-container span div",
+                        text: "Test internal note on order",
+                        negation: true,
+                    },
+                ],
+            }),
+            FeedbackScreen.clickNextOrder(),
+
+            // Test discount and original price
+            ProductScreen.addOrderline("Desk Pad", "1", "20"),
+            inLeftSide([
+                { ...ProductScreen.clickLine("Desk Pad")[0], isActive: ["mobile"] },
+                Numpad.click("%"),
+                ...ProductScreen.selectedOrderlineHasDirect("Desk Pad", "1", "20"),
+                Numpad.click("5"),
+                ...ProductScreen.selectedOrderlineHasDirect("Desk Pad", "1", "19.0"),
+                Numpad.click("."),
+            ]),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    {
+                        name: "Desk Pad",
+                        price_unit: "20",
+                    },
+                ],
+                total_amount: "19.00",
+            }),
+            FeedbackScreen.clickNextOrder(),
+            OfflineUtil.setOnlineMode(),
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("FeedbackScreenDiscountWithPricelistTour", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            ProductScreen.addOrderline("Test Product", "1"),
+            ProductScreen.clickPriceList("special_pricelist"),
+            inLeftSide(Order.hasLine({ productName: "Test Product", price: "6.30" })),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    {
+                        name: "Test Product",
+                        line_price: "6.30",
+                    },
+                ],
+            }),
+
+            FeedbackScreen.clickNextOrder(),
+            ProductScreen.addOrderline("Test Product", "1"),
+            inLeftSide([
+                { ...ProductScreen.clickLine("Test Product")[0], isActive: ["mobile"] },
+                Numpad.click("Price"),
+                Numpad.isActive("Price"),
+                Numpad.click("9"),
+            ]),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.checkTicketData({
+                is_discount: false,
+            }),
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("OrderPaidInCash", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            ProductScreen.addOrderline("Desk Pad", "5", "5"),
+            inLeftSide(ProductScreen.orderLineHas("Desk Pad", "5")),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            PaymentScreen.validateButtonIsHighlighted(true),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
+            ProductScreen.isShown(),
+            // Close the session
+            Chrome.clickMenuOption("Close Register"),
+            ProductScreen.closeWithCashAmount("25"),
+            ProductScreen.cashDifferenceIs("0.00"),
+            {
+                trigger: ".modal .modal-footer .btn:contains(close register)",
+                run: "click",
+                expectUnloadPage: true,
+            },
+            {
+                trigger: "button:contains(backend)",
+                run: "click",
+                expectUnloadPage: true,
+            },
+            {
+                trigger: "body",
+                expectUnloadPage: true,
+            },
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("ReceiptTrackingMethodTour", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            ProductScreen.clickDisplayedProduct("Product A"),
+            ProductScreen.enterLotNumber("123456789", "lot"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    { name: "Product A", cssRules: [{ css: ".lot-number", text: "123456789" }] },
+                ],
+            }),
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("point_of_sale.test_printed_receipt_tour", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            ProductScreen.addOrderline("Desk Pad", "1", "5"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData(
+                {
+                    orderlines: [
+                        {
+                            name: "Desk Pad",
+                        },
+                    ],
+                },
+                true
+            ),
+        ].flat(),
+});
+
+registry.category("web_tour.tours").add("test_auto_validate_force_done", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            ProductScreen.addOrderline("Whiteboard Pen", "1"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Cash"),
+            {
+                trigger: "body",
+                run: () => {
+                    posmodel.getOrder().payment_ids[0].setPaymentStatus("force_done");
+                },
+            },
+            {
+                trigger: ".send_force_done",
+                run: "click",
+            },
+            FeedbackScreen.isShown(),
+        ].flat(),
+});
 
 registry.category("web_tour.tours").add("test_automatic_receipt_printing", {
     steps: () =>
         [
+            {
+                content:
+                    "Change feedback feedbackScreenAutoSkipDelay to 0.5 seconds to not slow down the tests too much.",
+                trigger: "body",
+                run: () => {
+                    posmodel.feedbackScreenAutoSkipDelay = 500;
+                },
+            },
             Chrome.startPoS(),
             Dialog.confirm("Open Register"),
             ProductScreen.clickDisplayedProduct("Desk Organizer"),
@@ -15,7 +323,19 @@ registry.category("web_tour.tours").add("test_automatic_receipt_printing", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
             FeedbackScreen.isShown(),
+            FeedbackScreen.isContinueEnabled(),
+            FeedbackScreen.isTransitioning(),
             FeedbackScreen.clickScreen(),
+            FeedbackScreen.isTransitioning().map(negateStep),
+            FeedbackScreen.clickNextOrder(),
+            ProductScreen.isShown(),
+            ProductScreen.clickDisplayedProduct("Desk Organizer"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.isContinueEnabled(),
+            FeedbackScreen.isTransitioning(),
             ProductScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/fixed_price_negative_qty_tour.js b/addons/point_of_sale/static/tests/pos/tours/fixed_price_negative_qty_tour.js
index b2817016c9cf2..98ab42f5dd6fd 100644
--- a/addons/point_of_sale/static/tests/pos/tours/fixed_price_negative_qty_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/fixed_price_negative_qty_tour.js
@@ -1,7 +1,7 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { registry } from "@web/core/registry";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import { inLeftSide } from "@point_of_sale/../tests/pos/tours/utils/common";
@@ -25,6 +25,6 @@ registry.category("web_tour.tours").add("FixedTaxNegativeQty", {
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
 
-            ReceiptScreen.receiptIsThere(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/generic_tour.js b/addons/point_of_sale/static/tests/pos/tours/generic_tour.js
index 49daccc2332bf..2e3ee17fca5d2 100644
--- a/addons/point_of_sale/static/tests/pos/tours/generic_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/generic_tour.js
@@ -2,7 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { GenericHooks } from "@point_of_sale/../tests/pos/tours/utils/generic_hooks";
 import { registry } from "@web/core/registry";
 
@@ -19,14 +19,14 @@ registry.category("web_tour.tours").add("generic_localization_tour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
             GenericHooks.afterValidateHook(),
             {
                 timeout: 20000,
-                content: "receipt screen is shown",
-                trigger: ".pos .receipt-screen",
+                content: "feedback screen has finished the validation",
+                trigger: ".feedback-screen .button.validation:not([disabled])",
             },
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             Chrome.endTour(),
         ].flat(),
diff --git a/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js b/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js
index 64b0972c3ce87..2e29f2dba3e46 100644
--- a/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/pos_cash_rounding_tour.js
@@ -2,7 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import { registry } from "@web/core/registry";
 
@@ -29,10 +29,12 @@ registry
                 PaymentScreen.clickInvoiceButton(),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("15.70"),
-                ReceiptScreen.receiptToPayAmountIsNotThere(),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "15.70",
+                    is_to_pay: false,
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
 
                 // Refund.
                 Chrome.clickOrders(),
@@ -54,10 +56,12 @@ registry
                 PaymentScreen.remainingIs("0.0"),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("-15.70"),
-                ReceiptScreen.receiptToPayAmountIsNotThere(),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "-15.70",
+                    is_to_pay: false,
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
             ].flat(),
     });
 
@@ -88,11 +92,13 @@ registry
                 PaymentScreen.clickInvoiceButton(),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("15.70"),
-                ReceiptScreen.receiptRoundingAmountIs("0.02"),
-                ReceiptScreen.receiptToPayAmountIs("15.72"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "15.70",
+                    to_pay_amount: "15.72",
+                    rounding_amount: "0.02",
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
 
                 // Refund.
                 Chrome.clickOrders(),
@@ -118,11 +124,13 @@ registry
                 PaymentScreen.remainingIs("0.0"),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("-15.70"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-                ReceiptScreen.receiptToPayAmountIs("-15.72"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "-15.70",
+                    rounding_amount: "-0.02",
+                    to_pay_amount: "-15.72",
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
             ].flat(),
     });
 
@@ -149,11 +157,13 @@ registry
                 PaymentScreen.clickInvoiceButton(),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.02"),
-                ReceiptScreen.receiptToPayAmountIs("15.70"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "15.72",
+                    to_pay_amount: "15.70",
+                    rounding_amount: "-0.02",
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
 
                 // Refund.
                 Chrome.clickOrders(),
@@ -175,11 +185,13 @@ registry
                 PaymentScreen.remainingIs("0.0"),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("0.02"),
-                ReceiptScreen.receiptToPayAmountIs("-15.70"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "-15.72",
+                    to_pay_amount: "-15.70",
+                    rounding_amount: "0.02",
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
             ].flat(),
     });
 
@@ -210,11 +222,13 @@ registry
                 PaymentScreen.clickInvoiceButton(),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("0.01"),
-                ReceiptScreen.receiptToPayAmountIs("15.73"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "15.72",
+                    to_pay_amount: "15.73",
+                    rounding_amount: "0.01",
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
 
                 // Refund.
                 Chrome.clickOrders(),
@@ -240,10 +254,12 @@ registry
                 PaymentScreen.remainingIs("0.0"),
                 PaymentScreen.clickValidate(),
 
-                ReceiptScreen.receiptAmountTotalIs("-15.72"),
-                ReceiptScreen.receiptRoundingAmountIs("-0.01"),
-                ReceiptScreen.receiptToPayAmountIs("-15.73"),
-                ReceiptScreen.receiptChangeAmountIsNotThere(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.checkTicketData({
+                    total_amount: "-15.72",
+                    to_pay_amount: "-15.73",
+                    rounding_amount: "-0.01",
+                    is_change: false,
+                }),
+                FeedbackScreen.clickNextOrder(),
             ].flat(),
     });
diff --git a/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js b/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
index 342d5999c0a2f..4432541462d21 100644
--- a/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/pos_combo_tour.js
@@ -1,6 +1,6 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as combo from "@point_of_sale/../tests/pos/tours/utils/combo_popup_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
@@ -78,8 +78,8 @@ registry.category("web_tour.tours").add("ProductComboPriceTaxIncludedTour", {
             ...ProductScreen.clickPayButton(),
             ...PaymentScreen.clickPaymentMethod("Bank"),
             ...PaymentScreen.clickValidate(),
-            ...ReceiptScreen.isShown(),
-            ...ReceiptScreen.clickNextOrder(),
+            ...FeedbackScreen.isShown(),
+            ...FeedbackScreen.clickNextOrder(),
 
             // another order but won't be sent to the backend
             ...ProductScreen.clickDisplayedProduct("Office Combo"),
@@ -114,7 +114,7 @@ registry.category("web_tour.tours").add("ProductComboPriceCheckTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -193,7 +193,7 @@ registry.category("web_tour.tours").add("ProductComboMaxFreeQtyTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
diff --git a/addons/point_of_sale/static/tests/pos/tours/pricelist_tour.js b/addons/point_of_sale/static/tests/pos/tours/pricelist_tour.js
index 8a0df2d087869..d016bbe0cf213 100644
--- a/addons/point_of_sale/static/tests/pos/tours/pricelist_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/pricelist_tour.js
@@ -10,7 +10,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as OfflineUtil from "@point_of_sale/../tests/generic_helpers/offline_util";
 import * as ProductConfigurator from "@point_of_sale/../tests/pos/tours/utils/product_configurator_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { refresh, scan_barcode } from "@point_of_sale/../tests/generic_helpers/utils";
 
 registry.category("web_tour.tours").add("pos_pricelist", {
@@ -143,8 +143,8 @@ const test_pricelists_in_pos_steps = [
     ProductScreen.clickPayButton(),
     PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
     PaymentScreen.clickValidate(),
-    ReceiptScreen.isShown(),
-    ReceiptScreen.clickNextOrder(),
+    FeedbackScreen.isShown(),
+    FeedbackScreen.clickNextOrder(),
 ];
 
 registry.category("web_tour.tours").add("test_pricelists_in_pos", {
diff --git a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
index 364195f2cba72..afaa58e4e504f 100644
--- a/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/product_screen_tour.js
@@ -6,7 +6,6 @@ import * as PartnerList from "@point_of_sale/../tests/pos/tours/utils/partner_li
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as ProductScreenPartnerList from "@point_of_sale/../tests/pos/tours/utils/product_screen_partner_list_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
 import { registry } from "@web/core/registry";
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
 import { back, inLeftSide, selectButton } from "@point_of_sale/../tests/pos/tours/utils/common";
@@ -251,8 +250,8 @@ registry.category("web_tour.tours").add("test_reuse_empty_floating_order", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             // Should reuse previously created empty floating order
             ProductScreen.checkFloatingOrderCount(1),
         ].flat(),
@@ -270,7 +269,7 @@ registry.category("web_tour.tours").add("FiscalPositionNoTax", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             Order.doesNotHaveLine({ discount: "" }),
         ].flat(),
 });
@@ -290,8 +289,8 @@ registry.category("web_tour.tours").add("FiscalPositionIncl", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -596,7 +595,7 @@ registry.category("web_tour.tours").add("AutofillCashCount", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             Chrome.clickMenuOption("Close Register"),
             {
@@ -861,7 +860,7 @@ registry.category("web_tour.tours").add("test_draft_orders_not_syncing", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             Chrome.endTour(),
         ].flat(),
 });
@@ -878,15 +877,26 @@ registry.category("web_tour.tours").add("test_fiscal_position_tax_group_labels",
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            {
-                content: "Make sure orderline tax label is correct",
-                trigger: ".orderline:contains('Tax Group 2')",
-            },
-            {
-                content: "Make sure receipt tax label is correct and correspond to the orderline",
-                trigger: ".pos-receipt-taxes:contains('Tax Group 2')",
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    {
+                        name: "Test Product",
+                        cssRules: [
+                            {
+                                css: ".tax-group",
+                                text: "Tax Group 2",
+                            },
+                        ],
+                    },
+                ],
+                cssRules: [
+                    {
+                        css: ".pos-receipt-taxes",
+                        text: "Tax Group 2",
+                    },
+                ],
+            }),
         ].flat(),
 });
 
@@ -972,7 +982,7 @@ registry.category("web_tour.tours").add("test_remove_archived_product_from_cache
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             Chrome.clickMenuOption("Close Register"),
             {
                 trigger: ".modal .modal-footer .btn:contains(close register)",
@@ -1033,13 +1043,13 @@ registry
                 Dialog.confirm("Open Register"),
                 ProductScreen.clickDisplayedProduct("Desk Organizer"),
                 ProductScreen.clickFastPaymentButton("Bank"),
-                ReceiptScreen.isShown(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.isShown(),
+                FeedbackScreen.clickNextOrder(),
                 ProductScreen.clickDisplayedProduct("Desk Organizer"),
                 ProductScreen.clickPayButton(),
                 PaymentScreen.clickPaymentMethod("Bank"),
                 PaymentScreen.clickValidate(),
-                ReceiptScreen.isShown(),
+                FeedbackScreen.isShown(),
             ].flat(),
     });
 
@@ -1054,7 +1064,7 @@ registry
                 ProductScreen.clickFastPaymentButton("Bank"),
                 FeedbackScreen.isShown(),
                 Dialog.confirm(),
-                FeedbackScreen.clickScreen(),
+                FeedbackScreen.clickNextOrder(),
                 ProductScreen.isShown(),
                 ProductScreen.clickDisplayedProduct("Desk Organizer"),
                 ProductScreen.clickPayButton(),
@@ -1062,7 +1072,7 @@ registry
                 PaymentScreen.clickValidate(),
                 FeedbackScreen.isShown(),
                 Dialog.confirm(),
-                FeedbackScreen.clickScreen(),
+                FeedbackScreen.clickNextOrder(),
                 ProductScreen.isShown(),
             ].flat(),
     });
@@ -1168,7 +1178,7 @@ registry.category("web_tour.tours").add("test_pos_ui_round_globally", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             Chrome.endTour(),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/receipt_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/receipt_screen_tour.js
deleted file mode 100644
index 5165cf25a5d3d..0000000000000
--- a/addons/point_of_sale/static/tests/pos/tours/receipt_screen_tour.js
+++ /dev/null
@@ -1,254 +0,0 @@
-/* global posmodel */
-
-import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
-import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
-import * as NumberPopup from "@point_of_sale/../tests/generic_helpers/number_popup_util";
-import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
-import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as Numpad from "@point_of_sale/../tests/generic_helpers/numpad_util";
-import { registry } from "@web/core/registry";
-import { inLeftSide } from "@point_of_sale/../tests/pos/tours/utils/common";
-import * as OfflineUtil from "@point_of_sale/../tests/generic_helpers/offline_util";
-import { run, negateStep } from "@point_of_sale/../tests/generic_helpers/utils";
-
-registry.category("web_tour.tours").add("ReceiptScreenTour", {
-    steps: () =>
-        [
-            // press close button in receipt screen
-            Chrome.startPoS(),
-            OfflineUtil.setOfflineMode(),
-            ProductScreen.addOrderline("Letter Tray", "10", "5"),
-            ProductScreen.clickPartnerButton(),
-            ProductScreen.clickCustomer("Partner Full"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Bank"),
-            PaymentScreen.validateButtonIsHighlighted(true),
-            PaymentScreen.clickShipLaterButton(),
-            PaymentScreen.shippingLaterHighlighted(),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.cashierNameExists("A"), // A simple PoS man! (Take the first word)
-            Dialog.confirm("Continue with limited functionality"),
-            //receipt had expected delivery printed
-            ReceiptScreen.shippingDateExists(),
-            ReceiptScreen.shippingDateIsToday(),
-            // letter tray has 10% tax (search SRC)
-            ReceiptScreen.totalAmountContains("55.0"),
-            ReceiptScreen.clickNextOrder(),
-
-            // send email in receipt screen
-            ProductScreen.addOrderline("Desk Pad", "6", "5", "30.0"),
-            ProductScreen.addOrderline("Whiteboard Pen", "6", "6", "36.0"),
-            ProductScreen.addOrderline("Monitor Stand", "6", "1", "6.0"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.enterPaymentLineAmount("Cash", "70", true, { remaining: "2.0" }),
-            PaymentScreen.clickNumpad("0"),
-            PaymentScreen.fillPaymentLineAmountMobile("Cash", "700"),
-            PaymentScreen.changeIs("628.0"),
-            OfflineUtil.setOnlineMode(),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.totalAmountContains("72.0"),
-            ReceiptScreen.setEmail("test@receiptscreen.com"),
-            ReceiptScreen.clickSend(),
-            ReceiptScreen.emailIsSuccessful(),
-            OfflineUtil.setOfflineMode(),
-            ReceiptScreen.clickNextOrder(),
-
-            // order with tip
-            // check if tip amount is displayed
-            ProductScreen.addOrderline("Desk Pad", "6", "5"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickTipButton(),
-            {
-                content: "click numpad button: 1",
-                trigger: ".modal div.numpad button:contains(/^1/)",
-                run: "click",
-            },
-            NumberPopup.isShown("1"),
-            Dialog.confirm(),
-            PaymentScreen.emptyPaymentlines("31.0"),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.totalAmountContains(`$ 30.00 + $ 1.00 tip`),
-            ReceiptScreen.clickNextOrder(),
-
-            // Test customer note in receipt
-            ProductScreen.addOrderline("Desk Pad", "1", "5"),
-            inLeftSide([
-                { ...ProductScreen.clickLine("Desk Pad")[0], isActive: ["mobile"] },
-                ...ProductScreen.addCustomerNote("Test customer note"),
-            ]),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Bank"),
-            PaymentScreen.clickValidate(),
-            Order.hasLine({ customerNote: "Test customer note" }),
-            ReceiptScreen.clickNextOrder(),
-
-            // Test that Internal notes are not available on receipt
-            ProductScreen.addOrderline("Desk Pad", "1", "5"),
-            inLeftSide([
-                { ...ProductScreen.clickLine("Desk Pad")[0], isActive: ["mobile"] },
-                ...ProductScreen.addInternalNote("Test internal note"),
-                ...ProductScreen.clickSelectedLine("Desk Pad"),
-                ...ProductScreen.addInternalNote("Test internal note on order"),
-                ...Order.hasInternalNote("Test internal note on order"),
-            ]),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Bank"),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            negateStep(...Order.hasLine({ internalNote: "Test internal note" })),
-            negateStep(...Order.hasInternalNote("Test internal note on order")),
-            ReceiptScreen.clickNextOrder(),
-
-            // Test discount and original price
-            ProductScreen.addOrderline("Desk Pad", "1", "20"),
-            inLeftSide([
-                { ...ProductScreen.clickLine("Desk Pad")[0], isActive: ["mobile"] },
-                Numpad.click("%"),
-                ...ProductScreen.selectedOrderlineHasDirect("Desk Pad", "1", "20"),
-                Numpad.click("5"),
-                ...ProductScreen.selectedOrderlineHasDirect("Desk Pad", "1", "19.0"),
-                Numpad.click("."),
-            ]),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Bank"),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            Order.hasLine({ productName: "Desk Pad", priceNoDiscount: "20" }),
-            ReceiptScreen.totalAmountContains("19.00"),
-            ReceiptScreen.clickNextOrder(),
-            OfflineUtil.setOnlineMode(),
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("ReceiptScreenDiscountWithPricelistTour", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.addOrderline("Test Product", "1"),
-            ProductScreen.clickPriceList("special_pricelist"),
-            inLeftSide(Order.hasLine({ productName: "Test Product", price: "6.30" })),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickValidate(),
-            Order.hasLine({ price: "6.30" }),
-
-            ReceiptScreen.clickNextOrder(),
-            ProductScreen.addOrderline("Test Product", "1"),
-            inLeftSide([
-                { ...ProductScreen.clickLine("Test Product")[0], isActive: ["mobile"] },
-                Numpad.click("Price"),
-                Numpad.isActive("Price"),
-                Numpad.click("9"),
-            ]),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.noDiscountAmount(),
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("OrderPaidInCash", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.addOrderline("Desk Pad", "5", "5"),
-            inLeftSide(ProductScreen.orderLineHas("Desk Pad", "5")),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.validateButtonIsHighlighted(true),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.clickNextOrder(),
-            ProductScreen.isShown(),
-            // Close the session
-            Chrome.clickMenuOption("Close Register"),
-            ProductScreen.closeWithCashAmount("25"),
-            ProductScreen.cashDifferenceIs("0.00"),
-            {
-                trigger: ".modal .modal-footer .btn:contains(close register)",
-                run: "click",
-                expectUnloadPage: true,
-            },
-            {
-                trigger: "button:contains(backend)",
-                run: "click",
-                expectUnloadPage: true,
-            },
-            {
-                trigger: "body",
-                expectUnloadPage: true,
-            },
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("ReceiptTrackingMethodTour", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.clickDisplayedProduct("Product A"),
-            ProductScreen.enterLotNumber("123456789", "lot"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.trackingMethodIsLot("123456789"),
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("point_of_sale.test_printed_receipt_tour", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.addOrderline("Desk Pad", "1", "5"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Bank"),
-            PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-
-            run(async () => {
-                window.print = (e) => {
-                    const rendered = e.innerHTML;
-                    if (!rendered.includes("Desk Pad")) {
-                        throw new Error("Desk Pad is not present on the ticket");
-                    }
-
-                    if (rendered.includes("5.00 / Units")) {
-                        throw new Error("The price should not be included on a basic receipt");
-                    }
-                };
-                await posmodel.printReceipt({ basic: true });
-            }, "Basic receipt doesn't have price"),
-        ].flat(),
-});
-
-registry.category("web_tour.tours").add("test_auto_validate_force_done", {
-    steps: () =>
-        [
-            Chrome.startPoS(),
-            Dialog.confirm("Open Register"),
-            ProductScreen.addOrderline("Whiteboard Pen", "1"),
-            ProductScreen.clickPayButton(),
-            PaymentScreen.clickPaymentMethod("Cash"),
-            {
-                trigger: "body",
-                run: () => {
-                    posmodel.getOrder().payment_ids[0].setPaymentStatus("force_done");
-                },
-            },
-            {
-                trigger: ".send_force_done",
-                run: "click",
-            },
-            ReceiptScreen.receiptIsThere(),
-        ].flat(),
-});
diff --git a/addons/point_of_sale/static/tests/pos/tours/shipping_date_tour.js b/addons/point_of_sale/static/tests/pos/tours/shipping_date_tour.js
index e01bf4d9d89b3..26c946d6b1696 100644
--- a/addons/point_of_sale/static/tests/pos/tours/shipping_date_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/shipping_date_tour.js
@@ -3,6 +3,7 @@ import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import { registry } from "@web/core/registry";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 
 registry.category("web_tour.tours").add("test_pos_order_shipping_date", {
     steps: () =>
@@ -51,17 +52,9 @@ registry.category("web_tour.tours").add("test_pos_order_shipping_date", {
                 },
             },
             PaymentScreen.clickValidate(),
-            {
-                content: "Assert shipping date in receipt",
-                trigger: ".pos-receipt-order-data",
-                run: () => {
-                    const dateDiv = document.querySelector(".pos-receipt-order-data div");
-                    const nextYear = new Date().getFullYear() + 1;
-                    const expectedDate = `5/30/${nextYear}`;
-                    if (dateDiv.innerText !== expectedDate) {
-                        throw new Error("Expected shipping date is not set in receipt");
-                    }
-                },
-            },
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                is_shipping_date: true,
+            }),
         ].flat(),
 });
diff --git a/addons/point_of_sale/static/tests/pos/tours/ticket_screen_tour.js b/addons/point_of_sale/static/tests/pos/tours/ticket_screen_tour.js
index ae01a323205d7..8dc848ca85615 100644
--- a/addons/point_of_sale/static/tests/pos/tours/ticket_screen_tour.js
+++ b/addons/point_of_sale/static/tests/pos/tours/ticket_screen_tour.js
@@ -1,6 +1,6 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as Numpad from "@point_of_sale/../tests/generic_helpers/numpad_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as PartnerList from "@point_of_sale/../tests/pos/tours/utils/partner_list_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
@@ -54,7 +54,8 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickScreen(),
             Chrome.clickOrders(),
             TicketScreen.nthRowContains(3, "Receipt"),
             TicketScreen.selectFilter("Receipt"),
@@ -71,10 +72,10 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
             TicketScreen.nthRowContains(1, "Partner Test 1", false),
             TicketScreen.search("Customer", "Partner Test 2"),
             TicketScreen.nthRowContains(1, "Partner Test 2", false),
-            // Close the TicketScreen to see the current order which is in ReceiptScreen.
+            // Close the TicketScreen to see the current order which is in FeedbackScreen.
             // This is just to remove the search string in the search bar.
             Chrome.clickRegister(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             // Open again the TicketScreen to check the Paid filter.
             Chrome.clickOrders(),
             TicketScreen.selectFilter("Paid"),
@@ -86,8 +87,8 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
             TicketScreen.loadSelectedOrder(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.isShown(),
             // Check that the Paid filter will show the 2 synced orders.
             Chrome.clickOrders(),
@@ -153,8 +154,8 @@ registry.category("web_tour.tours").add("TicketScreenTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             // Check refunded quantity.
             ...ProductScreen.clickRefund(),
             TicketScreen.selectOrder("003"),
@@ -174,8 +175,8 @@ registry.category("web_tour.tours").add("FiscalPositionNoTaxRefund", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ...ProductScreen.clickRefund(),
             TicketScreen.selectOrder("001"),
             ProductScreen.clickNumpad("1"),
@@ -188,7 +189,7 @@ registry.category("web_tour.tours").add("FiscalPositionNoTaxRefund", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -214,8 +215,8 @@ registry.category("web_tour.tours").add("LotRefundTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ...ProductScreen.clickRefund(),
             TicketScreen.selectOrder("001"),
             ProductScreen.clickNumpad("1"),
@@ -244,8 +245,8 @@ registry.category("web_tour.tours").add("RefundFewQuantities", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ...ProductScreen.clickRefund(),
             TicketScreen.selectOrder("001"),
             ProductScreen.clickNumpad("0", "."),
@@ -310,8 +311,8 @@ registry.category("web_tour.tours").add("LotTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ...ProductScreen.clickRefund(),
             TicketScreen.selectOrder("002"),
             inLeftSide(
@@ -321,8 +322,8 @@ registry.category("web_tour.tours").add("LotTour", {
             PaymentScreen.isShown(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -380,8 +381,8 @@ registry
                 ProductScreen.clickPayButton(),
                 PaymentScreen.clickPaymentMethod("Bank"),
                 PaymentScreen.clickValidate(),
-                ReceiptScreen.isShown(),
-                ReceiptScreen.clickNextOrder(),
+                FeedbackScreen.isShown(),
+                FeedbackScreen.clickNextOrder(),
                 ...ProductScreen.clickRefund(),
                 TicketScreen.selectOrder("001"),
                 inLeftSide(Order.hasLine({ productName: "Desk Pad", withClass: ".selected" })),
@@ -390,7 +391,7 @@ registry
                 TicketScreen.confirmRefund(),
                 PaymentScreen.clickPaymentMethod("Bank"),
                 PaymentScreen.clickValidate(),
-                ReceiptScreen.isShown(),
+                FeedbackScreen.isShown(),
             ].flat(),
     });
 
@@ -421,7 +422,7 @@ registry.category("web_tour.tours").add("test_order_invoice_search", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickInvoiceButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             Chrome.clickOrders(),
             TicketScreen.selectFilter("Paid"),
             TicketScreen.search("Invoice Number", "00001"),
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/feedback_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/feedback_screen_util.js
index 93dd3c1f0ea1c..7e8a4b4baebc2 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/feedback_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/feedback_screen_util.js
@@ -1,14 +1,427 @@
+/* global posmodel */
+
+import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
+
+export function clickNextOrder() {
+    return [
+        ...isContinueEnabled(),
+        {
+            content: "go to next screen",
+            trigger: ".feedback-screen .button.validation",
+            run: "click",
+        },
+    ];
+}
+export function isContinueEnabled() {
+    return [
+        {
+            content: "wait for next order button to be enabled",
+            trigger: ".feedback-screen .button.validation:not([disabled])",
+        },
+    ];
+}
+export function isTransitioning() {
+    return [
+        {
+            content: "wait for next order button to be in transitioning state",
+            trigger: ".feedback-screen .button.validation .wipe-overlay",
+        },
+    ];
+}
+export function clickScreen() {
+    return [
+        {
+            content: "click on feedback screen",
+            trigger: ".feedback-screen",
+            run: "click",
+        },
+    ];
+}
+
 export function isShown() {
-    return {
-        content: "feedback screen is shown",
-        trigger: ".feedback-screen",
-    };
+    return [
+        {
+            content: "feedback screen is shown",
+            trigger: ".pos .feedback-screen",
+        },
+    ];
+}
+export function totalAmountContains(value) {
+    return [
+        {
+            content: `total amount contains ${value}`,
+            trigger: `.feedback-screen .amount-container.amount:contains("${value}")`,
+        },
+    ];
 }
 
-export function clickScreen() {
-    return {
-        content: "click on feedback screen",
-        trigger: ".feedback-screen",
-        run: "click",
+export function checkTicketData(data, basic = false) {
+    // data is an object like:
+    // {
+    //   total_amount,
+    //   is_rounding,
+    //   rounding_amount,
+    //   is_to_pay,
+    //   to_pay_amount,
+    //   is_change,
+    //   change_amount,
+    //   is_discount,
+    //   is_shipping_date,
+    //   is_shipping_date_today,
+    //   is_cashier,
+    //   cashier_name,
+    //   is_qr_code,
+    //   payment_lines: [{
+    // 	  name,
+    // 	  amount,
+    //   }],
+    //   orderlines: [{
+    // 	  name,
+    // 	  quantity,
+    // 	  price_unit,
+    // 	  line_price,
+    // 	  cssRules (array with other things to check): [{
+    //      css: ".some-css-selector",
+    //      text: "text that should be in the element",
+    //      negation: true/false (if true, the text should NOT be in the element)
+    //      length: number of elements that should be found with the css selector
+    //     }],
+    //   }],
+    //   cssRules (array with other things to check): [{
+    //     css: ".some-css-selector",
+    //     text: "text that should be in the element",
+    //     negation: true/false (if true, the text should NOT be in the element)
+    //     length: number of elements that should be found with the css selector
+    //   }],
+    // }
+    const check = async (data, basic) => {
+        const ticket = await posmodel.printer.renderer.toHtml(posmodel.orderReceiptComponent, {
+            order: posmodel.getOrder(),
+            basic_receipt: basic,
+        });
+
+        if (!ticket && !Object.keys(data).length) {
+            return true;
+        }
+
+        if (data.total_amount) {
+            ticket
+                .querySelector(".pos-receipt-amount.receipt-total .pos-receipt-right-align")
+                .innerHTML.includes(data.total_amount);
+        }
+
+        if (data.is_rounding || data.rounding_amount) {
+            if (!ticket.querySelector(".receipt-rounding")) {
+                throw new Error("No rounding amount has been found in receipt.");
+            }
+            if (data.rounding_amount) {
+                ticket.querySelector(".receipt-rounding").innerHTML.includes(data.rounding_amount);
+            }
+        } else if (data.is_rounding === false) {
+            if (ticket.querySelector(".receipt-rounding")) {
+                throw new Error("A rounding amount has been found in receipt.");
+            }
+        }
+
+        if (data.is_to_pay || data.to_pay_amount) {
+            if (!ticket.querySelector(".receipt-to-pay")) {
+                throw new Error("No amount to pay has been found in receipt.");
+            }
+            if (data.to_pay_amount) {
+                ticket.querySelector(".receipt-to-pay").innerHTML.includes(data.to_pay_amount);
+            }
+        } else if (data.is_to_pay === false) {
+            if (ticket.querySelector(".receipt-to-pay")) {
+                throw new Error("An amount to pay has been found in receipt.");
+            }
+        }
+
+        if (data.is_change || data.change_amount) {
+            if (!ticket.querySelector(".receipt-change")) {
+                throw new Error("No change amount has been found in receipt.");
+            }
+            if (data.change_amount) {
+                ticket.querySelector(".receipt-change").innerHTML.includes(data.change_amount);
+            }
+        } else if (data.is_change === false) {
+            if (ticket.querySelector(".receipt-change")) {
+                throw new Error("A change amount has been found in receipt.");
+            }
+        }
+
+        if (data.is_discount) {
+            if (!ticket.querySelector(".receipt-discount")) {
+                throw new Error("No discount amount has been found in receipt.");
+            }
+        } else if (data.is_discount === false) {
+            if (ticket.querySelector(".receipt-discount")) {
+                throw new Error("A discount amount has been found in receipt.");
+            }
+        }
+
+        if (data.is_shipping_date || data.is_shipping_date_today) {
+            if (!ticket.querySelector(".receipt-shipping-date")) {
+                throw new Error("No shipping date has been found in receipt.");
+            }
+            if (data.is_shipping_date_today) {
+                const expectedDelivery = new Date().toLocaleString(
+                    "en-US",
+                    luxon.DateTime.DATE_SHORT
+                );
+                ticket
+                    .querySelector(".receipt-shipping-date > div")
+                    .innerHTML.includes(expectedDelivery);
+            }
+        } else if (data.is_shipping_date === false) {
+            if (ticket.querySelector(".receipt-shipping-date")) {
+                throw new Error("A shipping date has been found in receipt.");
+            }
+        }
+
+        if (data.is_cashier || data.cashier_name) {
+            if (!ticket.querySelector(".pos-receipt-contact .cashier")) {
+                throw new Error("No cashier name has been found in receipt.");
+            }
+            if (data.cashier_name) {
+                ticket
+                    .querySelector(".pos-receipt-contact .cashier")
+                    .innerHTML.includes(data.cashier_name);
+            }
+        } else if (data.is_cashier === false) {
+            if (ticket.querySelector(".pos-receipt-contact .cashier")) {
+                throw new Error("A cashier name has been found in receipt.");
+            }
+        }
+
+        if (data.is_qr_code) {
+            if (!ticket.querySelector(".pos-receipt #posqrcode")) {
+                throw new Error("No QR code has been found in receipt.");
+            }
+        } else if (data.is_qr_code === false) {
+            if (ticket.querySelector(".pos-receipt #posqrcode")) {
+                throw new Error("A QR code has been found in receipt.");
+            }
+        }
+
+        if (data.payment_lines) {
+            const paymentLines = ticket.querySelectorAll(".paymentlines");
+
+            for (const [index, line] of data.payment_lines.entries()) {
+                const paymentLine = paymentLines[index];
+                if (!paymentLine) {
+                    throw new Error(`No payment line found for ${line.name}`);
+                }
+                const name = paymentLine.firstChild.textContent;
+                if (line.name != name) {
+                    throw new Error(
+                        `Payment line name mismatch: expected ${line.name}, got ${name}`
+                    );
+                }
+
+                if (line.amount) {
+                    const amount = paymentLine.children[0].textContent;
+                    if (!amount.includes(line.amount)) {
+                        throw new Error(
+                            `Payment line amount mismatch for ${line.name}: expected ${line.amount}, got ${amount}`
+                        );
+                    }
+                }
+            }
+        }
+
+        if (data.orderlines) {
+            const lines = ticket.querySelectorAll(".orderline");
+
+            for (const [index, line] of data.orderlines.entries()) {
+                const orderline = lines[index];
+                if (!orderline) {
+                    throw new Error(`No order line found for ${line.name}`);
+                }
+                const name = orderline.querySelector(".product-name").textContent;
+                if (!name.includes(line.name)) {
+                    throw new Error(
+                        `Order line name mismatch: expected ${line.name}, got ${name}.`
+                    );
+                }
+
+                if (line.quantity) {
+                    const qty = orderline.querySelector(".qty").textContent;
+                    if (line.quantity != qty) {
+                        throw new Error(
+                            `Order line quantity mismatch for ${name}: expected ${line.quantity}, got ${qty}.`
+                        );
+                    }
+                }
+
+                if (basic) {
+                    if (
+                        orderline.querySelector(".price-per-unit") ||
+                        orderline.querySelector(".product-price")
+                    ) {
+                        throw new Error("The price should not be included on a basic receipt");
+                    }
+                } else {
+                    if (line.price_unit) {
+                        const price_unit = orderline.querySelectorAll(".price-per-unit");
+                        if (price_unit.length === 0) {
+                            throw new Error(
+                                `No price per unit found for order line ${name} in receipt.`
+                            );
+                        }
+                        const priceFound = [...price_unit].some((p) =>
+                            p.textContent.includes(line.price_unit)
+                        );
+                        if (!priceFound) {
+                            throw new Error(
+                                `Order line price per unit mismatch for ${name}: expected ${line.price_unit}.`
+                            );
+                        }
+                    }
+
+                    if (line.line_price) {
+                        const line_price = orderline.querySelector(".product-price").textContent;
+                        if (!line_price.includes(line.line_price)) {
+                            throw new Error(
+                                `Order line price mismatch for ${name}: expected ${line.line_price}, got ${line_price}.`
+                            );
+                        }
+                    }
+                }
+
+                if (line.cssRules) {
+                    for (const rule of line.cssRules) {
+                        const statement = orderline.querySelectorAll(rule.css);
+                        if (!statement && rule.negation) {
+                            continue; // No statement found and negation is true so the rule is validated
+                        }
+                        if (!statement) {
+                            throw new Error(`CSS rule ${rule.css} not found in receipt.`);
+                        }
+                        if (rule.length && rule.length !== statement.length) {
+                            throw new Error(
+                                `CSS rule ${rule.css} length mismatch: expected ${rule.length} elements, got ${statement.length}.`
+                            );
+                        }
+                        if (rule.text) {
+                            const ruleFound = [...statement].some((s) =>
+                                s.textContent.includes(rule.text)
+                            );
+                            if (ruleFound == rule.negation) {
+                                throw new Error(`Rule ${rule.css} not found in printed receipt.`);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (data.cssRules) {
+            for (const rule of data.cssRules) {
+                const statement = ticket.querySelectorAll(rule.css);
+                if (!statement && rule.negation) {
+                    continue; // No statement found and negation is true so the rule is validated
+                }
+                if (!statement) {
+                    throw new Error(`CSS rule ${rule.css} not found in receipt.`);
+                }
+                if (rule.text) {
+                    const ruleFound = [...statement].some((s) => s.textContent.includes(rule.text));
+                    if (ruleFound == rule.negation) {
+                        throw new Error(`Rule ${rule.css} not found in printed receipt.`);
+                    }
+                }
+            }
+        }
+
+        return true;
     };
+
+    return [
+        {
+            trigger: "body",
+            run: async () => await check(data, basic),
+        },
+    ];
+}
+export function trackingMethodIsLot(lot) {
+    return [
+        {
+            content: `tracking method is Lot`,
+            trigger: `li.lot-number:contains("Lot Number ${lot}")`,
+            run: function () {
+                if (document.querySelectorAll("li.lot-number").length !== 1) {
+                    throw new Error(`Expected exactly one 'Lot Number ${lot}' element.`);
+                }
+            },
+        },
+    ];
+}
+
+export function clickSendButton() {
+    return [
+        {
+            content: "click on send button",
+            trigger: ".feedback-screen button.send-receipt",
+            run: "click",
+        },
+    ];
+}
+
+export function setEmail(email) {
+    return [
+        {
+            content: "set email",
+            trigger: ".modal-body .send-receipt-email-input",
+            run: `edit ${email}`,
+        },
+    ];
+}
+
+export function clickEmailButton() {
+    return [
+        {
+            content: "send email",
+            trigger: ".modal-body .fa-paper-plane",
+            run: "click",
+        },
+    ];
+}
+
+export function emailIsSuccessful() {
+    return [
+        {
+            trigger: `.modal-body .notice .text-success`,
+        },
+    ];
+}
+
+export function sendEmail(email, expectSuccess = true) {
+    return [
+        ...clickSendButton(),
+        ...setEmail(email),
+        ...clickEmailButton(),
+        ...(expectSuccess ? emailIsSuccessful() : []),
+        Dialog.cancel(),
+    ];
+}
+
+function clickPrintButton() {
+    return [
+        {
+            content: "click on print button",
+            trigger: ".feedback-screen button.print-ticket-button",
+            run: "click",
+        },
+    ];
+}
+
+export function printTicket(ticketLabel) {
+    return [
+        ...clickPrintButton(),
+        {
+            content: `print ${ticketLabel} ticket`,
+            trigger: `.modal-body button:contains(${ticketLabel})`,
+            run: "click",
+        },
+    ];
 }
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
index f39f27a2a26ff..731a517e69f48 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js
@@ -8,6 +8,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as ChoseComboPopup from "@point_of_sale/../tests/pos/tours/utils/chose_combo_popup_util";
 import { LONG_PRESS_DURATION } from "@point_of_sale/utils";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 
 export function firstProductIsFavorite(name) {
     return [
@@ -779,22 +780,9 @@ export function finishOrder() {
     return [
         ...PaymentScreen.clickValidate(),
         Chrome.isSyncStatusConnected(),
-        {
-            isActive: ["desktop"],
-            content: "click Next Order",
-            trigger: ".receipt-screen .button.next.highlight:visible",
-            run: "click",
-        },
-        {
-            isActive: ["mobile"],
-            content: "Click Next Order",
-            trigger: ".receipt-screen .btn-switchpane.validation-button.highlight[name='done']",
-            run: "click",
-        },
-        {
-            content: "check if we left the receipt screen",
-            trigger: ".pos-content div:not(:has(.receipt-screen))",
-        },
+        ...FeedbackScreen.isShown(),
+        ...FeedbackScreen.clickNextOrder(),
+        ...isShown(),
     ];
 }
 
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js
deleted file mode 100644
index 91fc8fc357007..0000000000000
--- a/addons/point_of_sale/static/tests/pos/tours/utils/receipt_screen_util.js
+++ /dev/null
@@ -1,217 +0,0 @@
-export function clickNextOrder() {
-    return [
-        {
-            isActive: ["desktop"],
-            content: "go to next screen",
-            trigger: ".receipt-screen .button.next.highlight[name='done']",
-            run: "click",
-        },
-        {
-            isActive: ["mobile"],
-            content: "go to next screen",
-            trigger: ".receipt-screen .btn-switchpane.validation-button.highlight[name='done']",
-            run: "click",
-        },
-    ];
-}
-export function clickContinueOrder() {
-    return [
-        {
-            content: "go to next screen",
-            trigger: ".receipt-screen .button.next.highlight[name='resume']",
-            run: "click",
-        },
-    ];
-}
-export function setEmail(email) {
-    return [
-        {
-            trigger: ".receipt-screen .send-receipt-email-input",
-            run: `edit ${email}`,
-        },
-    ];
-}
-export function clickSend() {
-    return [
-        {
-            run: "click",
-            trigger: `.receipt-screen button i.fa-paper-plane`,
-        },
-    ];
-}
-export function clickBack() {
-    return [
-        {
-            trigger: ".receipt-screen .button.back",
-            run: "click",
-        },
-    ];
-}
-
-export function isShown() {
-    return [
-        {
-            content: "receipt screen is shown",
-            trigger: ".pos .receipt-screen",
-        },
-    ];
-}
-export function receiptIsThere() {
-    return [
-        {
-            content: "there should be the receipt",
-            trigger: ".receipt-screen .pos-receipt",
-        },
-    ];
-}
-export function totalAmountContains(value) {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: `.receipt-screen .o_payment_successful:contains("${value}")`,
-        },
-        {
-            isActive: ["mobile"], // On mobile, at least wait for the receipt screen to show
-            trigger: `.receipt-screen`,
-        },
-    ];
-}
-export function receiptAmountTotalIs(value) {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: `.receipt-screen .receipt-total:contains("${value}")`,
-        },
-        {
-            isActive: ["mobile"], // On mobile, at least wait for the receipt screen to show
-            trigger: `.receipt-screen`,
-        },
-    ];
-}
-export function receiptRoundingAmountIs(value) {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: `.receipt-screen .receipt-rounding:contains("${value}")`,
-        },
-    ];
-}
-export function paymentLineContains(paymentMethodName, amount) {
-    return [
-        {
-            content: `Check if payment line contains ${paymentMethodName} with amount ${amount}`,
-            trigger: `.receipt-screen .paymentlines:contains("${paymentMethodName}"):has(.pos-receipt-right-align:contains("${amount}"))`,
-        },
-    ];
-}
-export function receiptToPayAmountIs(value) {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: `.receipt-screen .receipt-to-pay:contains("${value}")`,
-        },
-    ];
-}
-export function receiptToPayAmountIsNotThere() {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: ".receipt-screen",
-            run: function () {
-                if (document.querySelector(".receipt-to-pay")) {
-                    throw new Error("An amount to pay has been found in receipt.");
-                }
-            },
-        },
-    ];
-}
-export function receiptChangeAmountIs(value) {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: `.receipt-screen .receipt-change:contains("${value}")`,
-        },
-    ];
-}
-export function receiptChangeAmountIsNotThere() {
-    return [
-        {
-            isActive: ["desktop"], // not rendered on mobile
-            trigger: ".receipt-screen",
-            run: function () {
-                if (document.querySelector(".receipt-change")) {
-                    throw new Error("An change amount has been found in receipt.");
-                }
-            },
-        },
-    ];
-}
-export function emailIsSuccessful() {
-    return [
-        {
-            trigger: `.receipt-screen .notice .text-success`,
-        },
-    ];
-}
-export function trackingMethodIsLot(lot) {
-    return [
-        {
-            content: `tracking method is Lot`,
-            trigger: `li.lot-number:contains("Lot Number ${lot}")`,
-            run: function () {
-                if (document.querySelectorAll("li.lot-number").length !== 1) {
-                    throw new Error(`Expected exactly one 'Lot Number ${lot}' element.`);
-                }
-            },
-        },
-    ];
-}
-
-export function noDiscountAmount() {
-    return [
-        {
-            trigger: `.pos-receipt:not(:contains("Discounts"))`,
-            run: () => {},
-        },
-    ];
-}
-
-export function shippingDateExists() {
-    return [
-        {
-            content: "Shipping date must be printed",
-            trigger: ".pos-receipt-order-data:contains('Expected delivery:')",
-            run: "click",
-        },
-    ];
-}
-
-export function shippingDateIsToday() {
-    // format the date in US, the language used by the tests
-    const expectedDelivery = new Date().toLocaleString("en-US", luxon.DateTime.DATE_SHORT);
-
-    return [
-        {
-            content: "Shipping date must be today",
-            trigger: `.pos-receipt-order-data:contains('Expected delivery:') > div:contains('${expectedDelivery}')`,
-        },
-    ];
-}
-
-export function cashierNameExists(name) {
-    return [
-        {
-            content: `Cashier ${name} exists on the receipt`,
-            trigger: `.pos-receipt-contact .cashier:contains(Served by):contains(${name})`,
-        },
-    ];
-}
-
-export function containsOrderLine(name, quantity, price_unit, line_price) {
-    return [
-        {
-            content: `Order line with name: ${name}, quantity: ${quantity}, price per unit: ${price_unit}, and line price: ${line_price} exists`,
-            trigger: `.pos-receipt .orderline:has(.product-name:contains('${name}')):has(.qty:contains('${quantity}')):has(.product-price:contains('${line_price}')):has(.price-per-unit:contains('${price_unit}'))`,
-        },
-    ];
-}
diff --git a/addons/point_of_sale/static/tests/pos/tours/utils/ticket_screen_util.js b/addons/point_of_sale/static/tests/pos/tours/utils/ticket_screen_util.js
index f34ed19d21ae9..36b492f9b348f 100644
--- a/addons/point_of_sale/static/tests/pos/tours/utils/ticket_screen_util.js
+++ b/addons/point_of_sale/static/tests/pos/tours/utils/ticket_screen_util.js
@@ -213,20 +213,6 @@ export function tipContains(amount) {
         },
     ];
 }
-export function receiptTotalIs(amount) {
-    return [
-        {
-            trigger: `.receipt-screen .pos-receipt-amount:contains("${amount}")`,
-        },
-    ];
-}
-export function receiptChangeIs(amount) {
-    return [
-        {
-            trigger: `.receipt-screen .receipt-change:contains("${amount}")`,
-        },
-    ];
-}
 export function back() {
     return {
         isActive: ["mobile"],
diff --git a/addons/point_of_sale/static/tests/unit/components/feedback_screen.test.js b/addons/point_of_sale/static/tests/unit/components/feedback_screen.test.js
new file mode 100644
index 0000000000000..0713a5f81a370
--- /dev/null
+++ b/addons/point_of_sale/static/tests/unit/components/feedback_screen.test.js
@@ -0,0 +1,28 @@
+import { test, expect, destroy } from "@odoo/hoot";
+import { mountWithCleanup } from "@web/../tests/web_test_helpers";
+import { setupPosEnv, getFilledOrder } from "../utils";
+import { definePosModels } from "../data/generate_model_definitions";
+import { queryOne } from "@odoo/hoot-dom";
+import { FeedbackScreen } from "@point_of_sale/app/screens/feedback_screen/feedback_screen";
+
+definePosModels();
+
+test("Total on receipt always incl", async () => {
+    const store = await setupPosEnv();
+    const order = await getFilledOrder(store);
+    order.config.iface_tax_included = "total";
+    const feedbackScreen = await mountWithCleanup(FeedbackScreen, {
+        props: { orderUuid: order.uuid },
+    });
+    let total = queryOne(".feedback-screen .amount-container .amount");
+    expect(total).toHaveText("17.85");
+    destroy(feedbackScreen);
+
+    // create new feedback screen with tax excluded
+    order.config.iface_tax_included = "subtotal";
+    await mountWithCleanup(FeedbackScreen, {
+        props: { orderUuid: order.uuid },
+    });
+    total = queryOne(".feedback-screen .amount-container .amount");
+    expect(total).toHaveText("17.85");
+});
diff --git a/addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js b/addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js
deleted file mode 100644
index 48425674fda55..0000000000000
--- a/addons/point_of_sale/static/tests/unit/components/receipt_screen.test.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { test, expect } from "@odoo/hoot";
-import { mountWithCleanup } from "@web/../tests/web_test_helpers";
-import { setupPosEnv, getFilledOrder } from "../utils";
-import { definePosModels } from "../data/generate_model_definitions";
-import { queryOne } from "@odoo/hoot-dom";
-import { ReceiptScreen } from "@point_of_sale/app/screens/receipt_screen/receipt_screen";
-
-definePosModels();
-
-test("Total on receipt always incl", async () => {
-    const store = await setupPosEnv();
-    const order = await getFilledOrder(store);
-    order.config.iface_tax_included = "total";
-    await mountWithCleanup(ReceiptScreen, {
-        props: { orderUuid: order.uuid },
-    });
-    const total = queryOne(".pos-receipt-amount .pos-receipt-right-align");
-    expect(total.innerHTML).toBe("$&nbsp;17.85");
-    order.config.iface_tax_included = "subtotal";
-    const subtotal = queryOne(".pos-receipt-amount .pos-receipt-right-align");
-    expect(subtotal.innerHTML).toBe("$&nbsp;17.85");
-});
diff --git a/addons/point_of_sale/static/tests/unit/tools/order_payment_validation.test.js b/addons/point_of_sale/static/tests/unit/tools/order_payment_validation.test.js
index f9a005009768f..f31f43399078c 100644
--- a/addons/point_of_sale/static/tests/unit/tools/order_payment_validation.test.js
+++ b/addons/point_of_sale/static/tests/unit/tools/order_payment_validation.test.js
@@ -1,4 +1,4 @@
-import { expect, test } from "@odoo/hoot";
+import { expect, test, tick } from "@odoo/hoot";
 import OrderPaymentValidation from "@point_of_sale/app/utils/order_payment_validation";
 import { getFilledOrder, setupPosEnv } from "../utils";
 import { definePosModels } from "../data/generate_model_definitions";
@@ -15,6 +15,10 @@ test("validateOrder", async () => {
         fastPaymentMethod: fastPaymentMethod,
     });
     await validation.validateOrder(false);
+    // validateOrder launches a promise. We need to wait for its resolution.
+    // tick will ensure that all microtasks like resolved promises are handled.
+    // Here the promise is resolved as it is only synchronous code.
+    await tick();
     expect(order.payment_ids[0].payment_method_id).toEqual(fastPaymentMethod);
     expect(order.state).toBe("paid");
     expect(order.amount_paid).toBe(17.85);
diff --git a/addons/point_of_sale/tests/test_frontend.py b/addons/point_of_sale/tests/test_frontend.py
index b484e76d83231..feb0bdb065567 100644
--- a/addons/point_of_sale/tests/test_frontend.py
+++ b/addons/point_of_sale/tests/test_frontend.py
@@ -632,13 +632,13 @@ def test_01_pos_basic_order(self):
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'FloatingOrderTour', login="pos_user")
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'ProductScreenTour', login="pos_user")
         self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'PaymentScreenTour', login="pos_user")
-        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'ReceiptScreenTour', login="pos_user")
+        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'FeedbackScreenTour', login="pos_user")
 
         for order in self.env['pos.order'].search([]):
             self.assertEqual(order.state, 'paid', "Validated order has payment of " + str(order.amount_paid) + " and total of " + str(order.amount_total))
 
-        # check if email from ReceiptScreenTour is properly sent
-        email_count = self.env['mail.mail'].search_count([('email_to', '=', 'test@receiptscreen.com')])
+        # check if email from FeedbackScreenTour is properly sent
+        email_count = self.env['mail.mail'].search_count([('email_to', '=', 'test@feedbackscreen.com')])
         self.assertEqual(email_count, 1)
 
     @skip('Temporary to fast merge new valuation')
@@ -1055,7 +1055,7 @@ def test_06_pos_discount_display_with_multiple_pricelist(self):
         })
 
         self.main_pos_config.with_user(self.pos_user).open_ui()
-        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'ReceiptScreenDiscountWithPricelistTour', login="pos_user")
+        self.start_tour("/pos/ui/%d" % self.main_pos_config.id, 'FeedbackScreenDiscountWithPricelistTour', login="pos_user")
 
     def test_07_product_combo(self):
         self.env['decimal.precision'].search([('name', '=', 'Product Price')]).digits = 4
diff --git a/addons/pos_adyen/static/tests/tours/adyen_tour.js b/addons/pos_adyen/static/tests/tours/adyen_tour.js
index 34421a427305c..929080e9b1e90 100644
--- a/addons/pos_adyen/static/tests/tours/adyen_tour.js
+++ b/addons/pos_adyen/static/tests/tours/adyen_tour.js
@@ -1,6 +1,6 @@
 /* global posmodel */
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
@@ -109,6 +109,6 @@ registry.category("web_tour.tours").add("PosAdyenTour", {
                 },
             },
 
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/pos_discount/static/tests/tours/test_pos_global_discount_flow.js b/addons/pos_discount/static/tests/tours/test_pos_global_discount_flow.js
index 613ba4f6e9379..e7332ccdefe13 100644
--- a/addons/pos_discount/static/tests/tours/test_pos_global_discount_flow.js
+++ b/addons/pos_discount/static/tests/tours/test_pos_global_discount_flow.js
@@ -1,5 +1,5 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
@@ -42,8 +42,8 @@ registry.category("web_tour.tours").add("test_pos_global_discount_sell_and_refun
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ...ProductScreen.clickRefund(),
             TicketScreen.selectOrder("001"),
             ProductScreen.clickNumpad("1"),
@@ -61,6 +61,6 @@ registry.category("web_tour.tours").add("test_pos_global_discount_sell_and_refun
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/pos_discount/static/tests/tours/test_taxes_global_discount.js b/addons/pos_discount/static/tests/tours/test_taxes_global_discount.js
index 8ef4ff6f05ebc..fc17ad9d464da 100644
--- a/addons/pos_discount/static/tests/tours/test_taxes_global_discount.js
+++ b/addons/pos_discount/static/tests/tours/test_taxes_global_discount.js
@@ -2,7 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import { escapeRegExp } from "@web/core/utils/strings";
 import { registry } from "@web/core/registry";
@@ -48,8 +48,10 @@ export function payAndInvoice(totalAmount) {
         PaymentScreen.clickInvoiceButton(),
         PaymentScreen.clickValidate(),
 
-        ReceiptScreen.receiptAmountTotalIs(totalAmount),
-        ReceiptScreen.clickNextOrder(),
+        FeedbackScreen.checkTicketData({
+            total_amount: totalAmount,
+        }),
+        FeedbackScreen.clickNextOrder(),
     ];
 }
 
diff --git a/addons/pos_event/static/src/app/components/popup/print_popup/print_popup.js b/addons/pos_event/static/src/app/components/popup/print_popup/print_popup.js
new file mode 100644
index 0000000000000..290d21e5e12c2
--- /dev/null
+++ b/addons/pos_event/static/src/app/components/popup/print_popup/print_popup.js
@@ -0,0 +1,49 @@
+// Part of Odoo. See LICENSE file for full copyright and licensing details.
+import { patch } from "@web/core/utils/patch";
+import { useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
+import { useService } from "@web/core/utils/hooks";
+import { PrintPopup } from "@point_of_sale/app/components/popups/print_popup/print_popup";
+
+patch(PrintPopup.prototype, {
+    setup() {
+        this.report = useService("report");
+        this.doPrintEventFull = useTrackedAsync(() => this.printEventFull());
+        this.doPrintEventBadge = useTrackedAsync(() => this.printEventBadge());
+        super.setup(...arguments);
+    },
+    get printList() {
+        const list = super.printList;
+        if (this.order.eventRegistrations.length > 0) {
+            list.push({
+                label: "Print Full Page Ticket",
+                method: () => this.doPrintEventFull.call(),
+                status: this.doPrintEventFull.status,
+                icon: "fa-ticket",
+                isPrimary: false,
+            });
+            list.push({
+                label: "Print Badge",
+                method: () => this.doPrintEventBadge.call(),
+                status: this.doPrintEventBadge.status,
+                icon: "fa-id-badge",
+                isPrimary: false,
+            });
+        }
+        return list;
+    },
+    async printEventFull() {
+        const registrations = this.order.eventRegistrations.map((reg) => reg.id);
+        await this.report.doAction("event.action_report_event_registration_full_page_ticket", [
+            registrations,
+        ]);
+    },
+    async printEventBadge() {
+        const registrations = this.order.eventRegistrations.map((reg) => reg.id);
+        await this.report.doAction("event.action_report_event_registration_badge", [registrations]);
+
+        // Update the status to "attended" if we print the attendee badge
+        if (registrations.length > 0) {
+            await this.pos.data.ormWrite("event.registration", registrations, { state: "done" });
+        }
+    },
+});
diff --git a/addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.js b/addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.js
deleted file mode 100644
index 18181decb587a..0000000000000
--- a/addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Part of Odoo. See LICENSE file for full copyright and licensing details.
-import { ReceiptScreen } from "@point_of_sale/app/screens/receipt_screen/receipt_screen";
-import { patch } from "@web/core/utils/patch";
-import { useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
-import { useService } from "@web/core/utils/hooks";
-
-patch(ReceiptScreen.prototype, {
-    setup() {
-        super.setup(...arguments);
-
-        this.report = useService("report");
-        this.orm = useService("orm");
-        this.doPrintEventFull = useTrackedAsync(() => this.printEventFull());
-        this.doPrintEventBadge = useTrackedAsync(() => this.printEventBadge());
-    },
-    async printEventFull() {
-        const registrations = this.currentOrder.eventRegistrations.map((reg) => reg.id);
-        await this.report.doAction("event.action_report_event_registration_full_page_ticket", [
-            registrations,
-        ]);
-    },
-    async printEventBadge() {
-        const registrations = this.currentOrder.eventRegistrations.map((reg) => reg.id);
-        await this.report.doAction("event.action_report_event_registration_badge", [registrations]);
-
-        // Update the status to "attended" if we print the attendee badge
-        if (registrations.length > 0) {
-            await this.orm.write("event.registration", registrations, { state: "done" });
-        }
-    },
-});
diff --git a/addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.xml b/addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.xml
deleted file mode 100644
index e8513262f020e..0000000000000
--- a/addons/pos_event/static/src/app/screens/receipt_screen/receipt_screen.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-name="pos_event.ReceiptScreen" t-inherit="point_of_sale.ReceiptScreen" t-inherit-mode="extension">
-        <xpath expr="//div[hasclass('o_payment_successful')]" position="inside">
-            <t t-if="this.currentOrder.eventRegistrations.length > 0">
-                <h2 class="mt-3">Event Registrations</h2>
-                <div class="o-event-button buttons mb-3 d-flex gap-1">
-                    <button class="o-event-full button print btn btn-md btn-secondary w-50 py-3" t-on-click="() => doPrintEventFull.call()">
-                        <i t-attf-class="fa {{doPrintEventFull.status === 'loading' ? 'fa-fw fa-spin fa-circle-o-notch' : 'fa-print'}} me-1" />Print Full Page Ticket
-                    </button>
-                    <button class="o-event-badge button print btn btn-md btn-secondary w-50 py-3" t-on-click="() => doPrintEventBadge.call()">
-                        <i t-attf-class="fa {{doPrintEventBadge.status === 'loading' ? 'fa-fw fa-spin fa-circle-o-notch' : 'fa-print'}} me-1" />Print Badge
-                    </button>
-                </div>
-            </t>
-        </xpath>
-    </t>
-</templates>
diff --git a/addons/pos_event/static/tests/tours/pos_event_tour.js b/addons/pos_event/static/tests/tours/pos_event_tour.js
index fe361892d87dd..8c7679d219789 100644
--- a/addons/pos_event/static/tests/tours/pos_event_tour.js
+++ b/addons/pos_event/static/tests/tours/pos_event_tour.js
@@ -1,6 +1,6 @@
 // Part of Odoo. See LICENSE file for full copyright and licensing details.
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as EventTourUtils from "@pos_event/../tests/tours/utils/event_tour_utils";
@@ -34,10 +34,10 @@ registry.category("web_tour.tours").add("SellingEventInPos", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            EventTourUtils.printTicket("full"),
-            EventTourUtils.printTicket("badge"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.printTicket("Full Page"),
+            FeedbackScreen.printTicket("Badge"),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -57,10 +57,10 @@ registry.category("web_tour.tours").add("test_selling_multiple_ticket_saved", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            EventTourUtils.printTicket("full"),
-            EventTourUtils.printTicket("badge"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.printTicket("Full Page"),
+            FeedbackScreen.printTicket("Badge"),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -83,9 +83,9 @@ registry.category("web_tour.tours").add("test_orderline_price_remain_same_as_tic
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            EventTourUtils.printTicket("full"),
-            EventTourUtils.printTicket("badge"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.printTicket("Full Page"),
+            FeedbackScreen.printTicket("Badge"),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
diff --git a/addons/pos_event/static/tests/tours/pos_multi_slot_event_tour.js b/addons/pos_event/static/tests/tours/pos_multi_slot_event_tour.js
index 3b3cc551a1236..38c3af34ad0fe 100644
--- a/addons/pos_event/static/tests/tours/pos_multi_slot_event_tour.js
+++ b/addons/pos_event/static/tests/tours/pos_multi_slot_event_tour.js
@@ -1,6 +1,6 @@
 // Part of Odoo. See LICENSE file for full copyright and licensing details.
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as SlotSelectionScreen from "@pos_event/../tests/tours/utils/slot_selection_screen_utils";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
@@ -44,10 +44,10 @@ registry.category("web_tour.tours").add("SellingMultiSlotEventInPos", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.00" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            EventTourUtils.printTicket("full"),
-            EventTourUtils.printTicket("badge"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.printTicket("Full Page"),
+            FeedbackScreen.printTicket("Badge"),
+            FeedbackScreen.clickNextOrder(),
 
             // Slot is now unavailable
             ProductScreen.clickDisplayedProduct("My Awesome Event"),
diff --git a/addons/pos_event/static/tests/tours/utils/event_tour_utils.js b/addons/pos_event/static/tests/tours/utils/event_tour_utils.js
index 317f156d7a8d3..9cae2c08de8a6 100644
--- a/addons/pos_event/static/tests/tours/utils/event_tour_utils.js
+++ b/addons/pos_event/static/tests/tours/utils/event_tour_utils.js
@@ -49,16 +49,6 @@ export function pickTicket(name) {
     ];
 }
 
-export function printTicket(mode) {
-    return [
-        {
-            content: `print ticket with mode: ${mode}`,
-            trigger: `.o-event-button .o-event-${mode}`,
-            run: "click",
-        },
-    ];
-}
-
 export function eventRemainingSeat(name, seats) {
     return [
         {
diff --git a/addons/pos_hr/static/src/app/screens/feedback_screen/feedback_screen.js b/addons/pos_hr/static/src/app/screens/feedback_screen/feedback_screen.js
new file mode 100644
index 0000000000000..2a3eb8c507d26
--- /dev/null
+++ b/addons/pos_hr/static/src/app/screens/feedback_screen/feedback_screen.js
@@ -0,0 +1,8 @@
+import { patch } from "@web/core/utils/patch";
+import { FeedbackScreen } from "@point_of_sale/app/screens/feedback_screen/feedback_screen";
+
+patch(FeedbackScreen.prototype, {
+    get canEditPayment() {
+        return super.canEditPayment && (!this.pos.config.module_pos_hr || this.pos.employeeIsAdmin);
+    },
+});
diff --git a/addons/pos_hr/static/src/app/screens/receipt_screen/receipt_screen.xml b/addons/pos_hr/static/src/app/screens/receipt_screen/receipt_screen.xml
deleted file mode 100644
index 40d8c0563b159..0000000000000
--- a/addons/pos_hr/static/src/app/screens/receipt_screen/receipt_screen.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-name="ReceiptScreen" t-inherit="point_of_sale.ReceiptScreen" t-inherit-mode="extension">
-        <xpath expr="//span[hasclass('edit-order-payment')]" position="attributes">
-            <attribute name="t-if">(!this.pos.config.module_pos_hr || this.pos.employeeIsAdmin) and this.currentOrder.nb_print === 0</attribute>
-        </xpath>
-    </t>
-</templates>
diff --git a/addons/pos_hr/static/tests/tours/pos_hr_tour.js b/addons/pos_hr/static/tests/tours/pos_hr_tour.js
index 91eae06ca1647..9c55ed55f4e61 100644
--- a/addons/pos_hr/static/tests/tours/pos_hr_tour.js
+++ b/addons/pos_hr/static/tests/tours/pos_hr_tour.js
@@ -1,7 +1,7 @@
 import * as PosHr from "@pos_hr/../tests/tours/utils/pos_hr_helpers";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as NumberPopup from "@point_of_sale/../tests/generic_helpers/number_popup_util";
@@ -228,8 +228,10 @@ registry.category("web_tour.tours").add("test_cashier_changed_in_receipt", {
             PosHr.clickCashierName(),
             CashierSelectionPopup.has("Test Employee 3", { run: "click" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.cashierNameExists("Test"), // Test Employee 3 (Take the first word)
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.checkTicketData({
+                cashier_name: "Test", // Test Employee 3 (Take the first word)
+            }),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
diff --git a/addons/pos_loyalty/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml b/addons/pos_loyalty/static/src/app/components/receipt/order_receipt/order_receipt.xml
similarity index 100%
rename from addons/pos_loyalty/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml
rename to addons/pos_loyalty/static/src/app/components/receipt/order_receipt/order_receipt.xml
diff --git a/addons/pos_loyalty/static/tests/tours/gift_card_program_tour.js b/addons/pos_loyalty/static/tests/tours/gift_card_program_tour.js
index a90bc53937838..ab373dac38460 100644
--- a/addons/pos_loyalty/static/tests/tours/gift_card_program_tour.js
+++ b/addons/pos_loyalty/static/tests/tours/gift_card_program_tour.js
@@ -5,7 +5,7 @@ import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import { registry } from "@web/core/registry";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 
 registry.category("web_tour.tours").add("GiftCardProgramTour1", {
@@ -172,7 +172,8 @@ registry.category("web_tour.tours").add("GiftCardProgramInvoice", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickInvoiceButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -202,7 +203,8 @@ registry.category("web_tour.tours").add("test_physical_gift_card_invoiced", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickInvoiceButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
diff --git a/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js b/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js
index 31c89576769ab..2a6140f5d9407 100644
--- a/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js
+++ b/addons/pos_loyalty/static/tests/tours/pos_loyalty_tour.js
@@ -1,14 +1,13 @@
 import * as PosLoyalty from "@pos_loyalty/../tests/tours/utils/pos_loyalty_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as SelectionPopup from "@point_of_sale/../tests/generic_helpers/selection_popup_util";
 import * as PartnerList from "@point_of_sale/../tests/pos/tours/utils/partner_list_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Notification from "@point_of_sale/../tests/generic_helpers/notification_util";
-import * as Utils from "@point_of_sale/../tests/generic_helpers/utils";
 import { registry } from "@web/core/registry";
 import { scan_barcode } from "@point_of_sale/../tests/generic_helpers/utils";
 
@@ -236,11 +235,22 @@ registry.category("web_tour.tours").add("PosLoyaltyTour6", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            PosLoyalty.isLoyaltyPointsAvailable(),
-            Utils.refresh(),
-            ReceiptScreen.isShown(),
-            PosLoyalty.isLoyaltyPointsAvailable(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".loyalty",
+                    },
+                ],
+            }),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                cssRules: [
+                    {
+                        css: ".loyalty",
+                    },
+                ],
+            }),
         ].flat(),
 });
 
diff --git a/addons/pos_loyalty/static/tests/tours/utils/pos_loyalty_util.js b/addons/pos_loyalty/static/tests/tours/utils/pos_loyalty_util.js
index 064f56e189bf5..1b62453b8692f 100644
--- a/addons/pos_loyalty/static/tests/tours/utils/pos_loyalty_util.js
+++ b/addons/pos_loyalty/static/tests/tours/utils/pos_loyalty_util.js
@@ -2,7 +2,7 @@ import * as Order from "@point_of_sale/../tests/generic_helpers/order_widget_uti
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as TextInputPopup from "@point_of_sale/../tests/generic_helpers/text_input_popup_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import { negate } from "@point_of_sale/../tests/generic_helpers/utils";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
@@ -144,7 +144,8 @@ export function finalizeOrder(paymentMethod, amount) {
         ...PaymentScreen.clickPaymentMethod(paymentMethod),
         ...PaymentScreen.clickNumpad([...amount].join(" ")),
         ...PaymentScreen.clickValidate(),
-        ...ReceiptScreen.clickNextOrder(),
+        ...FeedbackScreen.isShown(),
+        ...FeedbackScreen.clickNextOrder(),
     ];
 }
 export function removeRewardLine(name) {
@@ -250,10 +251,3 @@ export function checkPartnerPoints(name, points) {
         },
     ];
 }
-
-export function isLoyaltyPointsAvailable() {
-    return {
-        content: "Loyalty Points are visible on the receipt",
-        trigger: ".pos-receipt .loyalty",
-    };
-}
diff --git a/addons/pos_loyalty/static/tests/unit/tools/order_payment_validation.test.js b/addons/pos_loyalty/static/tests/unit/tools/order_payment_validation.test.js
index 64b51cf8a848a..ab29c1323a610 100644
--- a/addons/pos_loyalty/static/tests/unit/tools/order_payment_validation.test.js
+++ b/addons/pos_loyalty/static/tests/unit/tools/order_payment_validation.test.js
@@ -1,4 +1,4 @@
-import { test, expect } from "@odoo/hoot";
+import { test, expect, tick } from "@odoo/hoot";
 import { setupPosEnv } from "@point_of_sale/../tests/unit/utils";
 import { definePosModels } from "@point_of_sale/../tests/unit/data/generate_model_definitions";
 import { addProductLineToOrder } from "@pos_loyalty/../tests/unit/utils";
@@ -40,6 +40,8 @@ test("validateOrder", async () => {
     validation.isOrderValid = async () => true;
 
     await validation.validateOrder();
+    // validateOrder launches a promise. We need to wait for its resolution.
+    await tick();
 
     expect(card.points).toBe(50);
     expect(loyaltyProgram.total_order_count).toBe(0);
diff --git a/addons/pos_mrp/static/tests/tours/pos_mrp_tour.js b/addons/pos_mrp/static/tests/tours/pos_mrp_tour.js
index 7035bba38cee7..2c2e1e82c359b 100644
--- a/addons/pos_mrp/static/tests/tours/pos_mrp_tour.js
+++ b/addons/pos_mrp/static/tests/tours/pos_mrp_tour.js
@@ -2,7 +2,7 @@
 
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import { waitForLoading } from "@point_of_sale/../tests/pos/tours/utils/common";
@@ -25,6 +25,6 @@ registry.category("web_tour.tours").add("test_ship_later_kit_and_mto_manufacture
             PaymentScreen.clickShipLaterButton(),
             PaymentScreen.shippingLaterHighlighted(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/pos_qfpay/static/tests/tours/qfpay_tour.js b/addons/pos_qfpay/static/tests/tours/qfpay_tour.js
index 1954a7db993d6..301f0cbeb2cf8 100644
--- a/addons/pos_qfpay/static/tests/tours/qfpay_tour.js
+++ b/addons/pos_qfpay/static/tests/tours/qfpay_tour.js
@@ -1,6 +1,6 @@
 /* global posmodel */
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
@@ -71,7 +71,7 @@ registry.category("web_tour.tours").add("qfpay_order_and_refund", {
                     mockQFPayWebhook(paymentUuid, paymentMethodId, paymentLine.amount, false);
                 },
             },
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
 
             // REFUND
             Chrome.clickOrders(),
@@ -90,7 +90,7 @@ registry.category("web_tour.tours").add("qfpay_order_and_refund", {
                     mockQFPayWebhook(paymentUuid, paymentMethodId, paymentLine.amount, true);
                 },
             },
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
 
             Chrome.endTour(),
         ].flat(),
diff --git a/addons/pos_razorpay/static/tests/tours/razorpay_tour.js b/addons/pos_razorpay/static/tests/tours/razorpay_tour.js
index aa26af263dcd7..be2fd9bf8e427 100644
--- a/addons/pos_razorpay/static/tests/tours/razorpay_tour.js
+++ b/addons/pos_razorpay/static/tests/tours/razorpay_tour.js
@@ -2,7 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import { registry } from "@web/core/registry";
 
@@ -14,7 +14,7 @@ registry.category("web_tour.tours").add("PosRazorpayTour", {
             ProductScreen.addOrderline("Desk Pad"),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Razorpay"),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -32,7 +32,7 @@ registry.category("web_tour.tours").add("PosRazorpayCancelTour", {
             Dialog.confirm(),
             PaymentScreen.isShown(),
             PaymentScreen.clickRetryButton(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -44,13 +44,13 @@ registry.category("web_tour.tours").add("PosRazorpayRefundTour", {
             ProductScreen.addOrderline("Desk Pad"),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Razorpay"),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             ProductScreen.clickRefund(),
             TicketScreen.selectOrder("001"),
             TicketScreen.confirmRefund(),
             PaymentScreen.clickPaymentMethod("Razorpay"),
             PaymentScreen.clickRefundButton(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/pos_restaurant/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml b/addons/pos_restaurant/static/src/app/components/receipt/order_receipt/order_receipt.xml
similarity index 100%
rename from addons/pos_restaurant/static/src/app/screens/receipt_screen/order_receipt/order_receipt.xml
rename to addons/pos_restaurant/static/src/app/components/receipt/order_receipt/order_receipt.xml
diff --git a/addons/pos_restaurant/static/src/app/components/tip_receipt/tip_receipt.js b/addons/pos_restaurant/static/src/app/components/tip_receipt/tip_receipt.js
index 51a7e3e81834d..7d692c705092b 100644
--- a/addons/pos_restaurant/static/src/app/components/tip_receipt/tip_receipt.js
+++ b/addons/pos_restaurant/static/src/app/components/tip_receipt/tip_receipt.js
@@ -1,5 +1,5 @@
 import { Component } from "@odoo/owl";
-import { ReceiptHeader } from "@point_of_sale/app/screens/receipt_screen/receipt/receipt_header/receipt_header";
+import { ReceiptHeader } from "@point_of_sale/app/components/receipt/receipt_header/receipt_header";
 
 export class TipReceipt extends Component {
     static template = "pos_restaurant.TipReceipt";
diff --git a/addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.js b/addons/pos_restaurant/static/src/app/screens/feedback_screen/feedback_screen.js
similarity index 74%
rename from addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.js
rename to addons/pos_restaurant/static/src/app/screens/feedback_screen/feedback_screen.js
index 4926f595639e7..78b8b9553b774 100644
--- a/addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.js
+++ b/addons/pos_restaurant/static/src/app/screens/feedback_screen/feedback_screen.js
@@ -1,7 +1,14 @@
-import { ReceiptScreen } from "@point_of_sale/app/screens/receipt_screen/receipt_screen";
+import { FeedbackScreen } from "@point_of_sale/app/screens/feedback_screen/feedback_screen";
 import { patch } from "@web/core/utils/patch";
 
-patch(ReceiptScreen.prototype, {
+patch(FeedbackScreen.prototype, {
+    goNext() {
+        if (this.isContinueSplitting()) {
+            this.continueSplitting();
+        } else {
+            super.goNext();
+        }
+    },
     continueSplitting() {
         const originalOrderUuid = this.currentOrder.uiState.splittedOrderUuid;
         this.currentOrder.uiState.screen_data.value = "";
diff --git a/addons/pos_restaurant/static/src/app/screens/receipt_header_patch.js b/addons/pos_restaurant/static/src/app/screens/receipt_header_patch.js
index 820b42277a486..0b03b3ff83a74 100644
--- a/addons/pos_restaurant/static/src/app/screens/receipt_header_patch.js
+++ b/addons/pos_restaurant/static/src/app/screens/receipt_header_patch.js
@@ -1,4 +1,4 @@
-import { ReceiptHeader } from "@point_of_sale/app/screens/receipt_screen/receipt/receipt_header/receipt_header";
+import { ReceiptHeader } from "@point_of_sale/app/components/receipt/receipt_header/receipt_header";
 
 import { _t } from "@web/core/l10n/translation";
 import { patch } from "@web/core/utils/patch";
diff --git a/addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.xml b/addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.xml
deleted file mode 100644
index b312db001b6eb..0000000000000
--- a/addons/pos_restaurant/static/src/app/screens/receipt_screen/receipt_screen.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-name="pos_restaurant.ReceiptScreen" t-inherit="point_of_sale.ReceiptScreen" t-inherit-mode="extension">
-        <xpath expr="//div[@id='action_btn_desktop']" position="inside">
-            <button t-if="isContinueSplitting()" class="button next validation btn btn-primary w-100 py-5 rounded-0 fs-2" t-att-class="{ highlight: !locked }" t-on-click="continueSplitting" name="resume">
-                <i class="fa fa-chevron-right" role="img" aria-label="Pay" title="Pay" />
-                Continue
-            </button>
-        </xpath>
-        <xpath expr="//div[@id='action_btn_mobile']" position="inside">
-            <div t-if="isContinueSplitting()" class="btn-switchpane validation-button btn btn-primary flex-fill d-flex justify-content-center align-items-center rounded-0 fw-bolder fs-1" t-att-class="{ highlight: !locked }" t-on-click="continueSplitting" name="resume">
-                Continue
-            </div>
-        </xpath>
-        <xpath expr="//div[@id='action_btn_desktop']/button[hasclass('validation')]" position="attributes">
-            <attribute name="t-if">!isContinueSplitting()</attribute>
-        </xpath>
-        <xpath expr="//div[@id='action_btn_mobile']/div[hasclass('validation-button')]" position="attributes">
-            <attribute name="t-if">!isContinueSplitting()</attribute>
-        </xpath>
-    </t>
-</templates>
diff --git a/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js b/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
index 0b67231a113f2..9befd96d037ae 100644
--- a/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
+++ b/addons/pos_restaurant/static/src/app/screens/tip_screen/tip_screen.js
@@ -104,7 +104,7 @@ export class TipScreen extends Component {
         if (!this.pos.config.module_pos_restaurant) {
             this.pos.addNewOrder();
         }
-        this.pos.navigate("ReceiptScreen", {
+        this.pos.navigate("FeedbackScreen", {
             orderUuid: this.pos.getOrder().uuid,
         });
     }
diff --git a/addons/pos_restaurant/static/src/app/services/pos_store.js b/addons/pos_restaurant/static/src/app/services/pos_store.js
index c0d6c97036ff9..ef02fea41853f 100644
--- a/addons/pos_restaurant/static/src/app/services/pos_store.js
+++ b/addons/pos_restaurant/static/src/app/services/pos_store.js
@@ -703,7 +703,7 @@ patch(PosStore.prototype, {
             }
             if (!this.isOrderTransferMode) {
                 this.syncAllOrders();
-            } else if (order && this.previousScreen !== "ReceiptScreen") {
+            } else if (order && this.previousScreen !== "FeedbackScreen") {
                 await this.syncAllOrders({ orders: [order] });
             }
         }
diff --git a/addons/pos_restaurant/static/tests/tours/devices_synchronization_tour.js b/addons/pos_restaurant/static/tests/tours/devices_synchronization_tour.js
index 5d33296a276ca..dd24f42fa3b4b 100644
--- a/addons/pos_restaurant/static/tests/tours/devices_synchronization_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/devices_synchronization_tour.js
@@ -6,7 +6,7 @@ import * as ProductScreenResto from "@pos_restaurant/../tests/tours/utils/produc
 import * as FloorScreen from "@pos_restaurant/../tests/tours/utils/floor_screen_util";
 import * as DeviceSynchronization from "@pos_restaurant/../tests/tours/utils/devices_synchronization";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import { registry } from "@web/core/registry";
 
@@ -65,7 +65,7 @@ registry.category("web_tour.tours").add("test_devices_synchronization", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             Chrome.clickPlanButton(),
             FloorScreen.clickTable("4"),
             ProductScreen.checkTotalAmount(176.0),
@@ -73,7 +73,7 @@ registry.category("web_tour.tours").add("test_devices_synchronization", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // product_screen
             // Check if creating an order one same table from two devices
diff --git a/addons/pos_restaurant/static/tests/tours/fake_tours.js b/addons/pos_restaurant/static/tests/tours/fake_tours.js
index d9d918c7ee0a8..6c1b1d0efda2e 100644
--- a/addons/pos_restaurant/static/tests/tours/fake_tours.js
+++ b/addons/pos_restaurant/static/tests/tours/fake_tours.js
@@ -2,7 +2,7 @@
 
 import { registry } from "@web/core/registry";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as FloorScreen from "@pos_restaurant/../tests/tours/utils/floor_screen_util";
 import * as ChromePos from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as ChromeRestaurant from "@pos_restaurant/../tests/tours/utils/chrome";
@@ -51,7 +51,7 @@ registry.category("web_tour.tours").add("PoSFakeTourRestaurant", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
diff --git a/addons/pos_restaurant/static/tests/tours/floor_screen_tour.js b/addons/pos_restaurant/static/tests/tours/floor_screen_tour.js
index 3e6d1e68d060a..cf6265b0e6c0f 100644
--- a/addons/pos_restaurant/static/tests/tours/floor_screen_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/floor_screen_tour.js
@@ -8,7 +8,7 @@ import * as ProductScreenPos from "@point_of_sale/../tests/pos/tours/utils/produ
 import * as ProductScreenResto from "@pos_restaurant/../tests/tours/utils/product_screen_util";
 import * as Utils from "@point_of_sale/../tests/generic_helpers/utils";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 const ProductScreen = { ...ProductScreenPos, ...ProductScreenResto };
 import { registry } from "@web/core/registry";
 import { inLeftSide } from "@point_of_sale/../tests/pos/tours/utils/common";
@@ -177,7 +177,7 @@ registry.category("web_tour.tours").add("TableMergeUnmergeTour", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             Utils.negateStep(FloorScreen.isChildTable("5")),
 
             FloorScreen.linkTables("5", "4"),
diff --git a/addons/pos_restaurant/static/tests/tours/pos_restaurant_tour.js b/addons/pos_restaurant/static/tests/tours/pos_restaurant_tour.js
index c180fbe4803cc..c93b4a4b49911 100644
--- a/addons/pos_restaurant/static/tests/tours/pos_restaurant_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/pos_restaurant_tour.js
@@ -1,6 +1,6 @@
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as ChromePos from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as PartnerList from "@point_of_sale/../tests/pos/tours/utils/partner_list_util";
 import * as ChromeRestaurant from "@pos_restaurant/../tests/tours/utils/chrome";
@@ -19,7 +19,6 @@ import * as PreparationReceipt from "@point_of_sale/../tests/pos/tours/utils/pre
 import * as NumberPopup from "@point_of_sale/../tests/generic_helpers/number_popup_util";
 import { checkPreparationTicketData } from "@point_of_sale/../tests/pos/tours/utils/preparation_receipt_util";
 import { negateStep, assertCurrentOrderDirty } from "@point_of_sale/../tests/generic_helpers/utils";
-import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 const ProductScreen = { ...ProductScreenPos, ...ProductScreenResto };
 
 registry.category("web_tour.tours").add("pos_restaurant_sync", {
@@ -70,7 +69,7 @@ registry.category("web_tour.tours").add("pos_restaurant_sync", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // order on another table with a product variant
             FloorScreen.orderCountSyncedInTableIs("5", "0"),
@@ -93,7 +92,7 @@ registry.category("web_tour.tours").add("pos_restaurant_sync", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // After clicking next order, floor screen is shown.
             // It should have 1 as number of draft synced order.
@@ -176,7 +175,7 @@ registry.category("web_tour.tours").add("pos_restaurant_sync_second_login", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             // At this point, there are no draft orders.
 
             FloorScreen.clickTable("2"),
@@ -312,7 +311,7 @@ registry.category("web_tour.tours").add("OrderTrackingTour", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 registry.category("web_tour.tours").add("CategLabelCheck", {
@@ -340,8 +339,10 @@ registry.category("web_tour.tours").add("OrderChange", {
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickNumpad("+10"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            TicketScreen.receiptChangeIs("10"),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                change_amount: "10",
+            }),
         ].flat(),
 });
 
@@ -581,7 +582,7 @@ registry.category("web_tour.tours").add("LeaveResidualOrder", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             FloorScreen.clickTable("5"),
             ProductScreen.clickDisplayedProduct("Coca-Cola"),
             Chrome.clickPlanButton(),
@@ -606,7 +607,7 @@ registry.category("web_tour.tours").add("FinishResidualOrder", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -627,7 +628,7 @@ registry.category("web_tour.tours").add("test_multiple_preparation_printer_diffe
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -720,7 +721,7 @@ registry.category("web_tour.tours").add("test_no_kitchen_confirmation_for_deposi
             PaymentScreen.clickValidate(),
             Dialog.is("The order is empty"),
             Dialog.confirm("Yes"),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
             Chrome.endTour(),
         ].flat(),
 });
@@ -763,7 +764,7 @@ registry
                     Dialog.discard(),
                     FeedbackScreen.isShown(),
                     Dialog.confirm(),
-                    FeedbackScreen.clickScreen(),
+                    FeedbackScreen.clickNextOrder(),
                     FloorScreen.isShown(),
                     FloorScreen.clickTable("2"),
                     ProductScreen.clickDisplayedProduct("Coca-Cola"),
@@ -786,7 +787,7 @@ registry
                     PaymentScreen.clickValidate(),
                     FeedbackScreen.isShown(),
                     Dialog.confirm(),
-                    FeedbackScreen.clickScreen(),
+                    FeedbackScreen.clickNextOrder(),
                     FloorScreen.isShown(),
                 ].flat(),
         }
@@ -818,8 +819,8 @@ registry
                     },
                     ProductScreen.clickFastPaymentButton("Bank"),
                     Dialog.discard(),
-                    ReceiptScreen.isShown(),
-                    ReceiptScreen.clickNextOrder(),
+                    FeedbackScreen.isShown(),
+                    FeedbackScreen.clickNextOrder(),
                     FloorScreen.isShown(),
                     FloorScreen.clickTable("2"),
                     ProductScreen.clickDisplayedProduct("Coca-Cola"),
@@ -840,8 +841,8 @@ registry
                     ProductScreen.discardOrderWarningDialog(),
                     PaymentScreen.clickPaymentMethod("Bank"),
                     PaymentScreen.clickValidate(),
-                    ReceiptScreen.isShown(),
-                    ReceiptScreen.clickNextOrder(),
+                    FeedbackScreen.isShown(),
+                    FeedbackScreen.clickNextOrder(),
                     FloorScreen.isShown(),
                 ].flat(),
         }
@@ -964,6 +965,8 @@ registry.category("web_tour.tours").add("test_direct_sales", {
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.syncCurrentOrder(),
             PaymentScreen.clickValidate(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
 
             Chrome.clickPlanButton(),
             FloorScreen.clickNewOrder(),
diff --git a/addons/pos_restaurant/static/tests/tours/refund_tour.js b/addons/pos_restaurant/static/tests/tours/refund_tour.js
index 32b0503ea9701..fe354d24a1932 100644
--- a/addons/pos_restaurant/static/tests/tours/refund_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/refund_tour.js
@@ -3,7 +3,7 @@ import * as ProductScreenResto from "@pos_restaurant/../tests/tours/utils/produc
 const ProductScreen = { ...ProductScreenPos, ...ProductScreenResto };
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as FloorScreen from "@pos_restaurant/../tests/tours/utils/floor_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
@@ -27,7 +27,7 @@ registry.category("web_tour.tours").add("RefundStayCurrentTableTour", {
             ProductScreen.discardOrderWarningDialog(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // Go to another table and refund one of the products
             FloorScreen.clickTable("4"),
@@ -48,6 +48,6 @@ registry.category("web_tour.tours").add("RefundStayCurrentTableTour", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/pos_restaurant/static/tests/tours/split_bill_screen_tour.js b/addons/pos_restaurant/static/tests/tours/split_bill_screen_tour.js
index 96b498ed3a2b3..ce8be7dc266b1 100644
--- a/addons/pos_restaurant/static/tests/tours/split_bill_screen_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/split_bill_screen_tour.js
@@ -1,6 +1,6 @@
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as ChromePos from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as ChromeRestaurant from "@pos_restaurant/../tests/tours/utils/chrome";
 const Chrome = { ...ChromePos, ...ChromeRestaurant };
@@ -93,13 +93,13 @@ registry.category("web_tour.tours").add("SplitBillScreenTourPay", {
             SplitBillScreen.clickButton("Pay"),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickContinueOrder(),
+            FeedbackScreen.clickNextOrder(),
             SplitBillScreen.clickOrderline("Minute Maid"),
             SplitBillScreen.clickOrderline("Minute Maid"),
             SplitBillScreen.clickButton("Pay"),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -160,7 +160,7 @@ registry.category("web_tour.tours").add("SplitBillScreenTour3", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickContinueOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // Check if there is still water in the order
             ProductScreen.isShown(),
@@ -169,7 +169,7 @@ registry.category("web_tour.tours").add("SplitBillScreenTour3", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
             // Check if there is no more order to continue
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -223,7 +223,7 @@ registry.category("web_tour.tours").add("SplitBillScreenTour4ProductCombo", {
             ProductScreen.clickPayButton(),
             ...PaymentScreen.clickPaymentMethod("Bank"),
             ...PaymentScreen.clickValidate(),
-            ...ReceiptScreen.clickContinueOrder(),
+            ...FeedbackScreen.clickNextOrder(),
 
             // Check if there is still water in the order
             ...ProductScreen.isShown(),
@@ -264,7 +264,7 @@ registry.category("web_tour.tours").add("SplitBillScreenTour5Actions", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // Add products in order
             FloorScreen.clickTable("2"),
@@ -281,7 +281,7 @@ registry.category("web_tour.tours").add("SplitBillScreenTour5Actions", {
             PaymentScreen.isShown(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickContinueOrder(),
+            FeedbackScreen.clickNextOrder(),
 
             // Check if redirect to split bill screen of original order
             SplitBillScreen.orderlineHas("Minute Maid", "1", "0"),
@@ -289,6 +289,6 @@ registry.category("web_tour.tours").add("SplitBillScreenTour5Actions", {
             PaymentScreen.isShown(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
diff --git a/addons/pos_restaurant/static/tests/tours/tip_screen_tour.js b/addons/pos_restaurant/static/tests/tours/tip_screen_tour.js
index 6322faeb0def6..88904adb77890 100644
--- a/addons/pos_restaurant/static/tests/tours/tip_screen_tour.js
+++ b/addons/pos_restaurant/static/tests/tours/tip_screen_tour.js
@@ -3,7 +3,7 @@ import * as ProductScreenResto from "@pos_restaurant/../tests/tours/utils/produc
 const ProductScreen = { ...ProductScreenPos, ...ProductScreenResto };
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as FloorScreen from "@pos_restaurant/../tests/tours/utils/floor_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import * as TipScreen from "@pos_restaurant/../tests/tours/utils/tip_screen_util";
@@ -143,11 +143,11 @@ registry.category("web_tour.tours").add("PosResTipScreenTour", {
             PaymentScreen.emptyPaymentlines("5.0"),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
 
             // order 5
             // Click directly on "settle" without selecting a Tip
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             FloorScreen.clickTable("2"),
             ProductScreen.addOrderline("Minute Maid", "3", "2"),
             ProductScreen.totalAmountIs("6.0"),
@@ -157,8 +157,8 @@ registry.category("web_tour.tours").add("PosResTipScreenTour", {
             PaymentScreen.clickValidate(),
             TipScreen.isShown(),
             TipScreen.clickSettle(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             FloorScreen.isShown(),
         ].flat(),
 });
diff --git a/addons/pos_sale/static/tests/tours/pos_sale_tour.js b/addons/pos_sale/static/tests/tours/pos_sale_tour.js
index 8f705ae78d3bc..5754c11041e70 100644
--- a/addons/pos_sale/static/tests/tours/pos_sale_tour.js
+++ b/addons/pos_sale/static/tests/tours/pos_sale_tour.js
@@ -1,6 +1,6 @@
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as TicketScreen from "@point_of_sale/../tests/pos/tours/utils/ticket_screen_util";
 import * as PosSale from "@pos_sale/../tests/tours/utils/pos_sale_utils";
@@ -21,7 +21,7 @@ registry.category("web_tour.tours").add("PosSettleOrder", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
             Chrome.clickOrders(),
         ].flat(),
 });
@@ -59,7 +59,7 @@ registry.category("web_tour.tours").add("PosSettleOrder2", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.0" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -72,7 +72,7 @@ registry.category("web_tour.tours").add("PosRefundDownpayment", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             ...ProductScreen.clickRefund(),
             // Filter should be automatically 'Paid'.
             TicketScreen.filterIs("Paid"),
@@ -87,7 +87,7 @@ registry.category("web_tour.tours").add("PosRefundDownpayment", {
             PaymentScreen.isShown(),
             PaymentScreen.clickPaymentMethod("Cash"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -101,7 +101,7 @@ registry.category("web_tour.tours").add("PosSettleOrderRealTime", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -115,7 +115,7 @@ registry.category("web_tour.tours").add("PosSettleOrder3", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank", true, { remaining: "0.0" }),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -145,10 +145,21 @@ registry.category("web_tour.tours").add("PosSettleOrderWithNote", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
             // Check in the receipt
-            Order.hasLine({
-                customerNote: "Customer note 2--Customer note 3",
+            FeedbackScreen.isShown(),
+            FeedbackScreen.checkTicketData({
+                orderlines: [
+                    {
+                        name: "Whiteboard Pen",
+                        cssRules: [
+                            {
+                                css: ".info-list .customer-note",
+                                text: "Customer note 2--Customer note 3",
+                            },
+                        ],
+                    },
+                ],
             }),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -175,7 +186,7 @@ registry.category("web_tour.tours").add("PosOrderDoesNotRemainInList", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             PosSale.checkOrdersListEmpty(),
         ].flat(),
 });
@@ -239,7 +250,7 @@ registry.category("web_tour.tours").add("PoSDownPaymentLinesPerTax", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickInvoiceButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -322,7 +333,7 @@ registry.category("web_tour.tours").add("PosSettleOrder4", {
             PaymentScreen.remainingIs("0.0"),
             PaymentScreen.clickShipLaterButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -338,8 +349,8 @@ registry.category("web_tour.tours").add("PosSettleOrderShipLater", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.remainingIs("0.0"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             PosSale.settleNthOrder(1),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickShipLaterButton(),
@@ -347,7 +358,7 @@ registry.category("web_tour.tours").add("PosSettleOrderShipLater", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.remainingIs("0.0"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -396,7 +407,7 @@ registry.category("web_tour.tours").add("PosSaleWarning", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.remainingIs("0.0"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -409,7 +420,7 @@ registry.category("web_tour.tours").add("PoSSettleQuotation", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
@@ -426,7 +437,7 @@ registry.category("web_tour.tours").add("POSSalePaymentScreenInvoiceOrder", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickInvoiceButton(),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
+            FeedbackScreen.isShown(),
             Chrome.waitRequest(),
         ].flat(),
 });
@@ -450,7 +461,7 @@ registry.category("web_tour.tours").add("test_down_payment_displayed", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             PosSale.settleNthOrder(1),
             Order.hasLine({
                 productName: "Down Payment",
@@ -471,16 +482,16 @@ registry.category("web_tour.tours").add("test_sale_order_fp_different_from_partn
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
             PosSale.settleSaleOrderByPrice("10.00"),
             ProductScreen.checkTaxAmount("0.00"),
             ProductScreen.checkFiscalPosition("Sale Order FP"),
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
@@ -495,7 +506,7 @@ registry.category("web_tour.tours").add("test_quantity_updated_settle", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.clickNextOrder(),
+            FeedbackScreen.clickNextOrder(),
             PosSale.settleNthOrder(1),
             Order.hasLine({
                 productName: "Product A",
@@ -543,7 +554,7 @@ registry.category("web_tour.tours").add("test_multiple_lots_sale_order_3", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
         ].flat(),
 });
 
diff --git a/addons/pos_sale/static/tests/tours/test_taxes_downpayment.js b/addons/pos_sale/static/tests/tours/test_taxes_downpayment.js
index 9681d877fdfac..4c9152733b618 100644
--- a/addons/pos_sale/static/tests/tours/test_taxes_downpayment.js
+++ b/addons/pos_sale/static/tests/tours/test_taxes_downpayment.js
@@ -2,7 +2,7 @@ import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import { escapeRegExp } from "@web/core/utils/strings";
 import { registry } from "@web/core/registry";
 
@@ -58,8 +58,11 @@ export function payAndInvoice(totalAmount) {
         PaymentScreen.clickInvoiceButton(),
         PaymentScreen.clickValidate(),
 
-        ReceiptScreen.receiptAmountTotalIs(totalAmount),
-        ReceiptScreen.clickNextOrder(),
+        FeedbackScreen.isShown(),
+        FeedbackScreen.checkTicketData({
+            total_amount: totalAmount,
+        }),
+        FeedbackScreen.clickNextOrder(),
     ];
 }
 
diff --git a/addons/pos_sale_loyalty/static/tests/tours/pos_sale_loyalty_tour.js b/addons/pos_sale_loyalty/static/tests/tours/pos_sale_loyalty_tour.js
index c71f7a8fccc79..1e796ae834140 100644
--- a/addons/pos_sale_loyalty/static/tests/tours/pos_sale_loyalty_tour.js
+++ b/addons/pos_sale_loyalty/static/tests/tours/pos_sale_loyalty_tour.js
@@ -1,7 +1,7 @@
 import * as Dialog from "@point_of_sale/../tests/generic_helpers/dialog_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
 import * as PosSale from "@pos_sale/../tests/tours/utils/pos_sale_utils";
 import { registry } from "@web/core/registry";
@@ -16,7 +16,8 @@ registry.category("web_tour.tours").add("PosSaleLoyaltyTour1", {
             ProductScreen.clickPayButton(),
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.isShown(),
+            FeedbackScreen.isShown(),
+            FeedbackScreen.clickNextOrder(),
         ].flat(),
 });
 
diff --git a/addons/pos_self_order/__manifest__.py b/addons/pos_self_order/__manifest__.py
index a7433d5ae3ed3..4883594232377 100644
--- a/addons/pos_self_order/__manifest__.py
+++ b/addons/pos_self_order/__manifest__.py
@@ -82,7 +82,7 @@
             "point_of_sale/static/src/app/components/centered_icon/*",
             "point_of_sale/static/src/app/components/epos_templates.xml",
             "point_of_sale/static/src/css/pos_receipts.css",
-            "point_of_sale/static/src/app/screens/receipt_screen/receipt/**/*",
+            "point_of_sale/static/src/app/components/receipt/**/*",
             "pos_self_order/static/src/overrides/components/receipt_header/*",
             "point_of_sale/static/src/app/utils/printer/*",
             "point_of_sale/static/src/app/services/printer_service.js",
diff --git a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
index f59feabe0fc49..a91a2662fa97e 100644
--- a/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
+++ b/addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
@@ -6,7 +6,7 @@ import { OrderWidget } from "@pos_self_order/app/components/order_widget/order_w
 import { PresetInfoPopup } from "@pos_self_order/app/components/preset_info_popup/preset_info_popup";
 import { useScrollShadow } from "../../utils/scroll_shadow_hook";
 import { useTrackedAsync } from "@point_of_sale/app/hooks/hooks";
-import { OrderReceipt } from "@point_of_sale/app/screens/receipt_screen/receipt/order_receipt";
+import { OrderReceipt } from "@point_of_sale/app/components/receipt/order_receipt";
 import { CancelPopup } from "@pos_self_order/app/components/cancel_popup/cancel_popup";
 import { _t } from "@web/core/l10n/translation";
 
diff --git a/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js b/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js
index 28c081b683cc1..5389474c18b71 100644
--- a/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js
+++ b/addons/pos_self_order/static/src/app/pages/confirmation_page/confirmation_page.js
@@ -2,7 +2,7 @@ import { Component, onMounted, onWillUnmount, useState, useEffect } from "@odoo/
 import { useSelfOrder } from "@pos_self_order/app/services/self_order_service";
 import { cookie } from "@web/core/browser/cookie";
 import { useService } from "@web/core/utils/hooks";
-import { OrderReceipt } from "@point_of_sale/app/screens/receipt_screen/receipt/order_receipt";
+import { OrderReceipt } from "@point_of_sale/app/components/receipt/order_receipt";
 import { rpc } from "@web/core/network/rpc";
 import { PrintingFailurePopup } from "@pos_self_order/app/components/printing_failure_popup/printing_failure_popup";
 
diff --git a/addons/pos_self_order/static/src/app/services/self_order_service.js b/addons/pos_self_order/static/src/app/services/self_order_service.js
index def6d78a9634d..b18691362e13a 100644
--- a/addons/pos_self_order/static/src/app/services/self_order_service.js
+++ b/addons/pos_self_order/static/src/app/services/self_order_service.js
@@ -7,7 +7,7 @@ import { useService } from "@web/core/utils/hooks";
 import { registry } from "@web/core/registry";
 import { cookie } from "@web/core/browser/cookie";
 import { formatDateTime, serializeDateTime } from "@web/core/l10n/dates";
-import { OrderReceipt } from "@point_of_sale/app/screens/receipt_screen/receipt/order_receipt";
+import { OrderReceipt } from "@point_of_sale/app/components/receipt/order_receipt";
 import { HWPrinter } from "@point_of_sale/app/utils/printer/hw_printer";
 import { renderToElement } from "@web/core/utils/render";
 import { TimeoutPopup } from "@pos_self_order/app/components/timeout_popup/timeout_popup";
diff --git a/addons/pos_sms/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js b/addons/pos_sms/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js
new file mode 100644
index 0000000000000..4da52f9309b4d
--- /dev/null
+++ b/addons/pos_sms/static/src/app/components/popups/send_receipt_popup/send_receipt_popup.js
@@ -0,0 +1,27 @@
+import { patch } from "@web/core/utils/patch";
+import { SendReceiptPopup } from "@point_of_sale/app/components/popups/send_receipt_popup/send_receipt_popup";
+
+patch(SendReceiptPopup.prototype, {
+    showPhoneInput() {
+        return super.showPhoneInput() || this.pos.config.module_pos_sms;
+    },
+    actionSendReceiptOnSMS() {
+        this.sendReceipt.call({
+            action: "action_sent_message_on_sms",
+            destination: this.state.phone,
+            name: "SMS",
+        });
+    },
+    get sendList() {
+        const list = super.sendList;
+        if (this.pos.config.module_pos_sms) {
+            list.find((item) => item.model === "phone").buttons.push({
+                click: () => this.actionSendReceiptOnSMS(),
+                status: this.sendReceipt.lastArgs?.[0]?.name == "SMS" && this.sendReceipt.status,
+                icon: "fa-lg fa-mobile",
+                disabled: () => !this.isValidPhone,
+            });
+        }
+        return list;
+    },
+});
diff --git a/addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.js b/addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.js
deleted file mode 100644
index 6f627e33e95f2..0000000000000
--- a/addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { patch } from "@web/core/utils/patch";
-import { ReceiptScreen } from "@point_of_sale/app/screens/receipt_screen/receipt_screen";
-
-patch(ReceiptScreen.prototype, {
-    showPhoneInput() {
-        return super.showPhoneInput() || this.pos.config.module_pos_sms;
-    },
-    actionSendReceiptOnSMS() {
-        this.sendReceipt.call({
-            action: "action_sent_message_on_sms",
-            destination: this.state.phone,
-            name: "SMS",
-        });
-    },
-});
diff --git a/addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.xml b/addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.xml
deleted file mode 100644
index 180c6bb896b8a..0000000000000
--- a/addons/pos_sms/static/src/app/screens/receipt_screen/receipt_screen.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-name="ReceiptScreen" t-inherit="point_of_sale.ReceiptScreen" t-inherit-mode="extension">
-        <xpath expr="//div[hasclass('sending-receipt-management')]" position="inside">
-            <button t-if="pos.config.module_pos_sms" t-att-style="`width: ${this.ui.isSmall ? '4rem' : '8rem'}`"  class="btn btn-primary btn-lg h-100 rounded-start-0 lh-lg" t-att-disabled="!isValidPhone" t-on-click="() => this.actionSendReceiptOnSMS()">
-                <i t-attf-class="fa {{sendReceipt.status === 'loading' and sendReceipt.lastArgs?.[0]?.name === 'SMS' ? 'fa-fw fa-spin fa-circle-o-notch' : 'fa-lg fa-mobile'}}" />
-            </button>
-        </xpath>
-    </t>
-</templates>
diff --git a/addons/pos_sms/static/tests/tours/test_pos_sms_tour.js b/addons/pos_sms/static/tests/tours/test_pos_sms_tour.js
index 7a097aa18c5f5..b4d87d8a61226 100644
--- a/addons/pos_sms/static/tests/tours/test_pos_sms_tour.js
+++ b/addons/pos_sms/static/tests/tours/test_pos_sms_tour.js
@@ -1,5 +1,5 @@
 import * as ProductScreen from "@point_of_sale/../tests/pos/tours/utils/product_screen_util";
-import * as ReceiptScreen from "@point_of_sale/../tests/pos/tours/utils/receipt_screen_util";
+import * as FeedbackScreen from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
 import * as Sms from "@pos_sms/../tests/tours/utils/test_pos_sms_util";
 import * as PaymentScreen from "@point_of_sale/../tests/pos/tours/utils/payment_screen_util";
 import * as Chrome from "@point_of_sale/../tests/pos/tours/utils/chrome_util";
@@ -18,7 +18,7 @@ registry.category("web_tour.tours").add("AutofillTour", {
             PaymentScreen.clickPaymentMethod("Bank"),
             PaymentScreen.validateButtonIsHighlighted(true),
             PaymentScreen.clickValidate(),
-            ReceiptScreen.receiptIsThere(),
+            FeedbackScreen.isShown(),
             // Check pre-filled partner phone
             Sms.CheckNumber("9876543210"),
         ].flat(),
diff --git a/addons/pos_sms/static/tests/tours/utils/test_pos_sms_util.js b/addons/pos_sms/static/tests/tours/utils/test_pos_sms_util.js
index 0f87d3cbd9136..a4df218b08d89 100644
--- a/addons/pos_sms/static/tests/tours/utils/test_pos_sms_util.js
+++ b/addons/pos_sms/static/tests/tours/utils/test_pos_sms_util.js
@@ -1,8 +1,11 @@
+import { clickSendButton } from "@point_of_sale/../tests/pos/tours/utils/feedback_screen_util";
+
 export function CheckNumber(val) {
     return [
+        ...clickSendButton(),
         {
             content: "Check pre-filled partner phone",
-            trigger: `.receipt-screen .send-receipt-phone-input:value('${val}')`,
+            trigger: `.send-receipt-phone-input:value('${val}')`,
         },
     ];
 }

From 81766b81c6f573c20cac7a833bdaa436b13c4881 Mon Sep 17 00:00:00 2001
From: Xavier-Do <xdo@odoo.com>
Date: Thu, 30 Oct 2025 10:00:06 +0100
Subject: [PATCH 627/673] [IMP] tests: add dynamic config files

A new mechanism was added on runbot, allowing to specify how to run the
tests from a json file located in the code.

Those file are currently located in odoo/tests/runbot/ but this could
change in the future.

The main motivation is to be able to define how to split the modules
from the odoo code, allowing easier testing and different split per
versions.
This should also help external runbot deployment to use similar config
without needing to create the same config, either by copying the file
of using the config extension mechanism (change the modules to install
as an example)
Finally, some basic config will be added in the code to help to debug
some use cases (enabling the profiler, running basic multibuild,
faketime,...)

More config will be moved from runbot database to the community code in
the future.

Note that this version is only a prototype and may change in the
following weeks.

Part-of: odoo/odoo#234132
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 odoo/tests/runbot/parallel_testing.json | 70 +++++++++++++++++++++++++
 odoo/tests/runbot/readme.md             | 12 +++++
 2 files changed, 82 insertions(+)
 create mode 100644 odoo/tests/runbot/parallel_testing.json
 create mode 100644 odoo/tests/runbot/readme.md

diff --git a/odoo/tests/runbot/parallel_testing.json b/odoo/tests/runbot/parallel_testing.json
new file mode 100644
index 0000000000000..0b25aa2084ac1
--- /dev/null
+++ b/odoo/tests/runbot/parallel_testing.json
@@ -0,0 +1,70 @@
+{
+    "name": "Parallel testing",
+    "vars": {
+        "module_filter": "*,-hw_*,-*l10n_*,-theme_*,-account_bacs,-account_reports_cash_basis,-auth_ldap,-base_gengo,-document_ftp,-iot_drivers,-note_pad,-odoo_referral,-odoo_referral_portal,-pad,-pad_project,-pos_blackbox_be,-pos_cache,-pos_six,-social_demo,-website_gengo,-website_instantclick,test_l10n_be_hr_payroll_account,test_l10n_us_hr_payroll_account"
+    },
+    "steps": [
+        {
+            "name": "Create at install",
+            "job_type": "create_build",
+            "children": [
+                {
+                    "name": "Test at install",
+                    "steps":[{
+                        "name": "Start at install",
+                        "job_type": "odoo",
+                        "install_modules": "{{module_filter}},-test_lint",
+                        "test_tags": "-post_install,-/test_lint"
+                        }]
+                },
+                {
+                    "name": "Test pylint",
+                    "steps":[{
+                        "name": "Start test lint",
+                        "job_type": "odoo",
+                        "install_modules": "test_lint",
+                        "test_tags": "-post_install,/test_lint"
+                    }]
+                }
+            ]
+        },
+        {
+            "name": "Install all",
+            "db_name": "all",
+            "job_type": "odoo",
+            "install_modules": "{{module_filter}}"
+        },
+        {
+            "name": "Create post install",
+            "job_type": "create_build",
+            "for_each_vars": [
+                {"test_module_filter": "-> !account_auto_transfer"},
+                {"test_module_filter": "account_auto_transfer -> !auth_totp"},
+                {"test_module_filter": "auth_totp -> !mrp"},
+                {"test_module_filter": "mrp -> !pos"},
+                {"test_module_filter": "pos -> !sale"},
+                {"test_module_filter": "sale -> !sale_timesheet"},
+                {"test_module_filter": "sale_timesheet -> !stock_barcode_mrp_subcontracting"},
+                {"test_module_filter": "stock_barcode_mrp_subcontracting -> !test_main_flows"},
+                {"test_module_filter": "test_main_flows -> !web"},
+                {"test_module_filter": "web -> web"},
+                {"test_module_filter": "!web -> !website"},
+                {"test_module_filter": "website -> website"},
+                {"test_module_filter": "!website -> "}
+            ],
+            "children": [{
+                "name": "Test Post Install",
+                "description": "Post install tests for **{{test_module_filter}}**",
+                "steps": [
+                    {"name": "restore", "job_type": "restore", "db_name": "all"},
+                    {
+                        "name": "Start post install tests",
+                        "job_type": "odoo",
+                        "test_tags": "-at_install,{{test_module_filter|filter_all_modules|make_module_test_tags}}",
+                        "db_name": "all"
+                    }
+                ]
+            }]
+        }
+    ]
+}
diff --git a/odoo/tests/runbot/readme.md b/odoo/tests/runbot/readme.md
new file mode 100644
index 0000000000000..a4b392a6a30ce
--- /dev/null
+++ b/odoo/tests/runbot/readme.md
@@ -0,0 +1,12 @@
+# Runbot config
+
+This directory contains configuration files that will be loaded by runbot to define how to run specific tests.
+
+## Parallel testing
+The parallel_testing.json file describes how to run the test for all modules in parallel
+- starting first subbuild for the at install tests
+- then installing a database with all modules
+- and finally starting multiple subbuilds to test all post install in parallel.
+
+Note that the test-tags do not use the blacklist, this is to replicate the default odoo --test-enable behaviour. 
+Even if a module is blacklisted, it could be installed via an auto_install or if required by another module, and should be tested.

From 898af7dd9b1303426ab37d8d643dc128620a5277 Mon Sep 17 00:00:00 2001
From: Xavier-Do <xdo@odoo.com>
Date: Thu, 9 Oct 2025 16:18:11 +0200
Subject: [PATCH 628/673] [IMP] tests: allow to test specific test for all
 modules

Some tests are ran as part of a specific module even if they are
testing many modules (js tests, liniting, ...).

If running --test-tags /project, the js tests are not ran meaning that
to run all tests we may need to do something like
    --test-tags /project,/web:WebSuite[@account],/web:MobileWebSuite[@account],..

This is nor practical, nor intuitive and lead to the /web module taking
a lot of time.

The proposed solution would behave somehoe like the test /web:WebSuite
was defined in all modules.

A parameter will be given to the test with the list of module to test
when executed. An alternative solution could be to run it once per
module but some experiments where done for that and the overhead can be
massive in some cases, mainly when the test spawns a subprocess
(chrome, pylint, ...)

Part-of: odoo/odoo#234132
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 odoo/addons/base/tests/test_tests_tags.py | 52 +++++++++++++++++-
 odoo/tests/common.py                      |  9 ++++
 odoo/tests/loader.py                      |  5 +-
 odoo/tests/tag_selector.py                | 64 +++++++++++++++++++----
 4 files changed, 115 insertions(+), 15 deletions(-)

diff --git a/odoo/addons/base/tests/test_tests_tags.py b/odoo/addons/base/tests/test_tests_tags.py
index 1c36e610b76e1..b6a55eb423d62 100644
--- a/odoo/addons/base/tests/test_tests_tags.py
+++ b/odoo/addons/base/tests/test_tests_tags.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.tests.common import TransactionCase, tagged, BaseCase
+from odoo.tests.common import TransactionCase, tagged, BaseCase, CrossModule
 from odoo.tests.tag_selector import TagsSelector
 
 
@@ -223,7 +223,6 @@ def test_selector_parser(self):
         tags = TagsSelector('/module.method')
         self.assertEqual({('standard', 'module', None, 'method', None), }, tags.include)  # all in module
 
-
 @tagged('nodatabase')
 @tagged('at_install', '-post_install')  # LEGACY at_install
 class TestSelectorSelection(TransactionCase):
@@ -382,7 +381,56 @@ class Test_E(TransactionCase):
         tags = TagsSelector(__file__)
         self.assertTrue(tags.check(no_tags_obj), 'Test should its absolute file path')
 
+    def test_selector_cross_module_selection(self):
+        class TestLintingCrossModule(TransactionCase, CrossModule):
+            def test_linting(self, modules):
+                pass
+
+        tags = TagsSelector('/base:TestLintingCrossModule', available_modules=['base', 'mail', 'web'])
+        instance = TestLintingCrossModule('test_linting')
+        self.assertTrue(tags.check(instance), "The cross module test should be selected by its class and module")
+        self.assertEqual(instance._test_modules, ['base'])
+
+        tags = TagsSelector(':TestLintingCrossModule', available_modules=['base', 'mail', 'web'])
+        self.assertTrue(tags.check(instance), "The cross module test should be selected by its class")
+        self.assertEqual(instance._test_modules, ['base', 'mail', 'web'])
+
+        tags = TagsSelector('/mail:TestLintingCrossModule', available_modules=['base', 'mail', 'web'])
+        self.assertTrue(tags.check(instance), "The cross module test should be selected by its class and another module")
+        self.assertEqual(instance._test_modules, ['mail'])
+
+        tags = TagsSelector('/mail', available_modules=['base', 'mail', 'web'])
+        self.assertTrue(tags.check(instance), "The cross module test should be selected any module")
+        self.assertEqual(instance._test_modules, ['mail'])
+
+        tags = TagsSelector('/mail,-:TestLintingCrossModule', available_modules=['base', 'mail', 'web'])
+        self.assertFalse(tags.check(instance), "The cross module test should not be selected if explicilty blacklisted by its class")
+
+        self.assertEqual(instance.__module__.split('.')[2], 'base', "Ensure that module is define in base for following checks")
+
+        tags = TagsSelector(':TestLintingCrossModule,-/base', available_modules=['base', 'mail', 'web'])
+        self.assertTrue(tags.check(instance), "The cross module test should be selected by its class even when declaring module is blacklisted")
+        self.assertEqual(instance._test_modules, ['mail', 'web'])
+
+        tags = TagsSelector(':TestLintingCrossModule,-/base,-/web,-/mail ', available_modules=['base', 'mail', 'web'])
+        self.assertFalse(tags.check(instance), "The cross module test should not be selected by its class if the module list is empty")
+
+        tags = TagsSelector(':TestLintingCrossModule,-/base,-/web.test_linting,-/mail.test_other ', available_modules=['base', 'mail', 'web'])
+        self.assertTrue(tags.check(instance), "The cross module test should be selected for mail")
+        self.assertEqual(instance._test_modules, ['mail'])
+
     def test_selector_parser_parameters(self):
+        tags = ':FakeClassA[@web/test],-/web:FakeClassA[@web/test/x]'
+        tags = TagsSelector(tags, available_modules=['base', 'mail', 'web'])
+
+        class FakeClassA(TransactionCase, CrossModule):
+            pass
+
+        fc = FakeClassA()
+        tags.check(fc)
+        self.assertEqual(fc._test_params, [('+', '@web/test'), ('-', '@web/test/x')])
+
+    def test_selector_parser_cross_module_parameters(self):
         tags = ','.join([
             '/base:FakeClassA[failfast=0,filter=-livechat]',
             #'/base:FakeClassA[filter=[-barecode,-stock_x]]',
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index f24661fdbfaa8..9f2f8f4418efa 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -940,6 +940,15 @@ def get_method_additional_tags(self, test_method):
                 additional_tags.append('is_query_count')
         return additional_tags
 
+
+class CrossModule(case.TestCase):
+    _cross_module = True
+    _test_modules = []
+
+    def _callTestMethod(self, method):
+        method(self._test_modules)
+
+
 class Like:
     """
         A string-like object comparable to other strings but where the substring
diff --git a/odoo/tests/loader.py b/odoo/tests/loader.py
index 44e7a7a4fc53d..f6378cc4147df 100644
--- a/odoo/tests/loader.py
+++ b/odoo/tests/loader.py
@@ -95,8 +95,9 @@ def make_suite(module_names, position='at_install'):
     :param list[str] module_names: modules to load tests from
     :param str position: "at_install" or "post_install"
     """
-    config_tags = TagsSelector(tools.config['test_tags'])
-    position_tag = TagsSelector(position)
+    available_modules = module_names if position == 'post_install' else None
+    config_tags = TagsSelector(tools.config['test_tags'], available_modules)
+    position_tag = TagsSelector(position, available_modules)
     tests = (
         t
         for module_name in module_names
diff --git a/odoo/tests/tag_selector.py b/odoo/tests/tag_selector.py
index 400e7be2c28c8..660f620010ad5 100644
--- a/odoo/tests/tag_selector.py
+++ b/odoo/tests/tag_selector.py
@@ -19,14 +19,15 @@ class TagsSelector(object):
                                 (?:\[(.*)\])?               # parameters
                                 $''', re.VERBOSE)  # [-][tag][/module][:class][.method][[params]]
 
-    def __init__(self, spec):
+    def __init__(self, spec, available_modules=None):
         """ Parse the spec to determine tags to include and exclude. """
         parts = re.split(r',(?![^\[]*\])', spec)  # split on all comma not inside [] (not followed by ])
         filter_specs = [t.strip() for t in parts if t.strip()]
         self.exclude = set()
         self.include = set()
         self.parameters = OrderedSet()
-
+        self.available_modules = available_modules and set(available_modules)
+        self.has_include = False
         for filter_spec in filter_specs:
             match = self.filter_spec_re.match(filter_spec)
             if not match:
@@ -50,12 +51,19 @@ def __init__(self, spec):
                 self.parameters.add((test_filter, ('-' if is_exclude else '+', parameters)))
                 is_exclude = False
 
+            if is_include:
+                self.has_include = True  # this is important for tags like /nonexistingmodule,-test_x
+
+            if is_include and module and self.available_modules and module not in self.available_modules:
+                _logger.debug("Module '%s' in tag selector not in the list of installed modules %s", module, available_modules)
+                continue
+
             if is_include:
                 self.include.add(test_filter)
             if is_exclude:
                 self.exclude.add(test_filter)
 
-        if (self.exclude or self.parameters) and not self.include:
+        if (self.exclude or self.parameters) and not self.has_include:
             self.include.add(('standard', None, None, None, None))
 
     def check(self, test):
@@ -76,29 +84,63 @@ def check(self, test):
         test_module_path = test_module_path.replace('.', '/') + '.py'
 
         test._test_params = []
+        included_modules = set()
+        excluded_modules = set()
+
+        cross_module_test = hasattr(test, '_cross_module')
+
+        if cross_module_test and not self.available_modules:
+            _logger.debug("Skipping test '%s' because no available modules found.", test)
+            return False
 
         def _is_matching(test_filter):
             (tag, module, klass, method, file_path) = test_filter
             if tag and tag not in test_tags:
                 return False
-            elif file_path and not file_path.endswith(test_module_path):
+            if file_path and not file_path.endswith(test_module_path):
                 return False
-            elif not file_path and module and module != test_module:
+            if not file_path and module and module != test_module and not cross_module_test:
                 return False
-            elif klass and klass != test_class:
+            if klass and klass != test_class:
                 return False
-            elif method and test_method and method != test_method:
+            if method and test_method and method != test_method:  # noqa: SIM103
                 return False
             return True
 
-        if any(_is_matching(test_filter) for test_filter in self.exclude):
+        match_include = False
+        for test_filter in self.include:
+            if _is_matching(test_filter):
+                match_include = True
+                if cross_module_test:
+                    test_filter_module = test_filter[1]
+                    if test_filter_module:
+                        included_modules.add(test_filter_module)
+                    else:
+                        included_modules |= self.available_modules
+                else:
+                    break
+
+        if not match_include:
             return False
 
-        if not any(_is_matching(test_filter) for test_filter in self.include):
-            return False
-        
+        for test_filter in self.exclude:
+            if _is_matching(test_filter):
+                if cross_module_test:
+                    test_filter_module = test_filter[1]
+                    if test_filter_module:
+                        excluded_modules.add(test_filter_module)
+                    else:
+                        return False
+                else:
+                    return False
+
         for test_filter, parameter in self.parameters:
             if _is_matching(test_filter):
                 test._test_params.append(parameter)
 
+        test._test_modules = sorted(included_modules - excluded_modules)
+
+        if cross_module_test and not test._test_modules:  # noqa: SIM103
+            return False
+
         return True

From 8d210fc9e118ccaa04808ce36ec268affb682556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Mattiello?= <mcm@odoo.com>
Date: Fri, 10 Oct 2025 12:11:20 +0200
Subject: [PATCH 629/673] [IMP] web: allow to test specific js tests

Before this commit, executing the test `:WebSuite.test_unit_desktop` would
launch js tests for every addon installed no matter the addon is excluded
by a "--test-tags". So executing odoo-bin with --test-tags /web,-/mail
-/project would launch js tests even for mail and project addons.

Now, it would launch the js tests for every addon that are not excluded
by a "--test-tags". So executing odoo-bin with --test-tags /web,-/mail,
-/project would now launch js tests without mail and project addons.

task-5042253

Part-of: odoo/odoo#234132
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 addons/web/tests/test_js.py | 236 +++++++++++++++++++++---------------
 1 file changed, 136 insertions(+), 100 deletions(-)

diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py
index f731300ff8f27..27270590c6e5b 100644
--- a/addons/web/tests/test_js.py
+++ b/addons/web/tests/test_js.py
@@ -10,6 +10,7 @@
 
 RE_FORBIDDEN_STATEMENTS = re.compile(r'test.*\.(only|debug)\(')
 RE_ONLY = re.compile(r'QUnit\.(only|debug)\(')
+RE_ASSET_ADDON = re.compile(r'^/(\w+)/')
 
 
 def unit_test_error_checker(message):
@@ -46,62 +47,20 @@ def _get_filters(test_params):
             filters.append((part_sign, part))
     return sorted(filters)
 
-@odoo.tests.tagged('post_install', '-at_install')
-class QunitCommon(odoo.tests.HttpCase):
-
-    def setUp(self):
-        super().setUp()
-        self.qunit_filters = self.get_qunit_filters()
 
-    def get_qunit_regex(self, test_params):
-        filters = _get_filters(test_params)
-        positive = [f'({re.escape(f)}.*)' for sign, f in filters if sign == '+']
-        negative = [f'({re.escape(f)}.*)' for sign, f in filters if sign == '-']
-        filter = ''
-        if filters:
-            positive_re = '|'.join(positive) or '.*'
-            negative_re = '|'.join(negative)
-            negative_re = f'(?!{negative_re})' if negative_re else ''
-            filter = f'^({negative_re})({positive_re})$'
-        return filter
-
-    def get_qunit_filters(self):
-        filter_param = ''
-        filter = self.get_qunit_regex(self._test_params)
-        if filter:
-            url_filter = url_quote_plus(filter)
-            filter_param = f'&filter=/{url_filter}/'
-        return filter_param
-
-    def test_get_qunit_regex(self):
-        f = self.get_qunit_regex([('+', 'utils,mail,-utils > bl1,-utils > bl2')])
-        f2 = self.get_qunit_regex([('+', 'utils'), ('-', 'utils > bl1,utils > bl2'), ('+', 'mail')])
-        self.assertEqual(f, f2)
-        self.assertRegex('utils', f)
-        self.assertRegex('mail', f)
-        self.assertRegex('utils > something', f)
-
-        self.assertNotRegex('utils > bl1', f)
-        self.assertNotRegex('utils > bl2', f)
-        self.assertNotRegex('web', f)
-
-        f2 = self.get_qunit_regex([('+', '-utils > bl1,-utils > bl2')])
-        f3 = self.get_qunit_regex([('-', 'utils > bl1,utils > bl2')])
-        for f in (f2, f3):
-            self.assertRegex('utils', f)
-            self.assertRegex('mail', f)
-            self.assertRegex('utils > something', f)
-            self.assertRegex('web', f)
-
-            self.assertNotRegex('utils > bl1', f)
-            self.assertNotRegex('utils > bl2', f)
-
-@odoo.tests.tagged('post_install', '-at_install')
-class HOOTCommon(odoo.tests.HttpCase):
-
-    def setUp(self):
-        super().setUp()
-        self.hoot_filters = self.get_hoot_filters()
+class HootCommon(odoo.tests.HttpCase):
+    def _check_forbidden_statements(self, bundle):
+        # As we currently are not in a request context, we cannot render `web.layout`.
+        # We then re-define it as a minimal proxy template.
+        self.env.ref('web.layout').write({'arch_db': '<t t-name="web.layout"><html><head><meta charset="utf-8"/><link/><script id="web.layout.odooscript"/><meta/><t t-out="head"/></head><body><t t-out="0"/></body></html></t>'})
+        for asset in self._get_bundle_assets(bundle):
+            filename = asset['filename']
+            if not filename.endswith('.test.js'):
+                continue
+            with suppress(FileNotFoundError):
+                with file_open(filename, 'rb', filter_ext=('.js',)) as fp:
+                    if RE_FORBIDDEN_STATEMENTS.search(fp.read().decode('utf-8')):
+                        self.fail("`only()` or `debug()` used in file %r" % asset['url'])
 
     def _generate_hash(self, test_string):
         hash = 0
@@ -110,7 +69,27 @@ def _generate_hash(self, test_string):
             hash = hash & 0xFFFFFFFF
         return f'{hash:08x}'
 
-    def get_hoot_filters(self):
+    def _get_addons_from_asset_bundle(self, bundle):
+        return {
+            RE_ASSET_ADDON.match(asset['url'])[1]
+            for asset in self._get_bundle_assets(bundle)
+            if asset['filename'].endswith('.test.js')
+        }
+
+    def _get_bundle_assets(self, bundle):
+        assets = self.env['ir.qweb']._get_asset_content(bundle)[0]
+        if len(assets) == 0:
+            self.fail("No assets found in the given test bundle")
+        return assets
+
+    def _get_hoot_module_filters(self, addons_from_asset_bundle, available_modules):
+        module_filter = ''
+        for module in available_modules:
+            if module in addons_from_asset_bundle:
+                module_filter += f'&id={self._generate_hash(f'@{module}')}'
+        return module_filter
+
+    def _get_hoot_param_filters(self):
         filters = _get_filters(self._test_params)
         filter = ''
         for sign, f in filters:
@@ -121,64 +100,80 @@ def get_hoot_filters(self):
             filter += f'&id={h}'
         return filter
 
+
+@odoo.tests.tagged('post_install', '-at_install')
+class HootSuite(HootCommon):
+    def test_check_suite(self):
+        self._check_forbidden_statements('web.assets_unit_tests')
+
     def test_generate_hoot_hash(self):
         self.assertEqual(self._generate_hash('@web/core'), 'e39ce9ba')
         self.assertEqual(self._generate_hash('@web/core/autocomplete'), '69a6561d') # suite
         self.assertEqual(self._generate_hash('@web/core/autocomplete/open dropdown on input'), 'ee565d54') # test
 
-    def test_get_hoot_filter(self):
+    def test_get_hoot_module_filters(self):
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], []), '')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['account']), '&id=b21ec1ed')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['mail']), '&id=03b8e5f7')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['web']), '&id=001ee314')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['account', 'web']), '&id=b21ec1ed&id=001ee314')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['account', 'mail', 'web']), '&id=b21ec1ed&id=03b8e5f7&id=001ee314')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['project']), '')
+        self.assertEqual(self._get_hoot_module_filters(['account', 'mail', 'web'], ['project', 'web']), '&id=001ee314')
+
+    def test_get_hoot_param_filters(self):
         self._test_params = []
-        self.assertEqual(self.get_hoot_filters(), '')
+        self.assertEqual(self._get_hoot_param_filters(), '')
         expected = '&id=e39ce9ba&id=-69a6561d'
         self._test_params = [('+', '@web/core,-@web/core/autocomplete')]
-        self.assertEqual(self.get_hoot_filters(), expected)
+        self.assertEqual(self._get_hoot_param_filters(), expected)
         self._test_params = [('+', '@web/core'), ('-', '@web/core/autocomplete')]
-        self.assertEqual(self.get_hoot_filters(), expected)
+        self.assertEqual(self._get_hoot_param_filters(), expected)
         self._test_params = [('+', '-@web/core/autocomplete,-@web/core/autocomplete2')]
-        self.assertEqual(self.get_hoot_filters(), '&id=-69a6561d&id=-cb246db5')
+        self.assertEqual(self._get_hoot_param_filters(), '&id=-69a6561d&id=-cb246db5')
         self._test_params = [('-', '-@web/core/autocomplete,-@web/core/autocomplete2')]
-        self.assertEqual(self.get_hoot_filters(), '&id=69a6561d&id=cb246db5')
-
-@odoo.tests.tagged('post_install', '-at_install')
-class WebSuite(QunitCommon, HOOTCommon):
-
-    @odoo.tests.no_retry
-    def test_unit_desktop(self):
-        # Unit tests suite (desktop)
-        self.browser_js(f'/web/tests?headless&loglevel=2&preset=desktop&timeout=15000{self.hoot_filters}', "", "", login='admin', timeout=3000, success_signal="[HOOT] Test suite succeeded", error_checker=unit_test_error_checker)
+        self.assertEqual(self._get_hoot_param_filters(), '&id=69a6561d&id=cb246db5')
 
     @odoo.tests.no_retry
     def test_hoot(self):
         # HOOT tests suite
-        self.browser_js(f'/web/static/lib/hoot/tests/index.html?headless&loglevel=2{self.hoot_filters}', "", "", login='admin', timeout=1800, success_signal="[HOOT] Test suite succeeded", error_checker=unit_test_error_checker)
+        self.browser_js('/web/static/lib/hoot/tests/index.html?headless&loglevel=2', "", "", login='admin', timeout=1800, success_signal="[HOOT] Test suite succeeded", error_checker=unit_test_error_checker)
 
+
+@odoo.tests.tagged('hoot', 'post_install', '-at_install')
+class WebSuite(HootCommon, odoo.tests.CrossModule):
     @odoo.tests.no_retry
-    def test_qunit_desktop(self):
-        # ! DEPRECATED
-        self.browser_js(f'/web/tests/legacy?mod=web{self.qunit_filters}', "", "", login='admin', timeout=1800, success_signal="QUnit test suite done.", error_checker=qunit_error_checker)
+    def test_unit_desktop(self, modules):
+        # Unit tests suite (desktop)
+        addons_from_asset_bundle = self._get_addons_from_asset_bundle('web.assets_unit_tests')
+        filters = self._get_hoot_module_filters(addons_from_asset_bundle, modules)
+        if not filters:
+            return
+        filters += self._get_hoot_param_filters()
+        self.browser_js(f'/web/tests?&headless&loglevel=2&preset=desktop&timeout=15000{filters}', "", "", login='admin', timeout=3000, success_signal="[HOOT] Test suite succeeded", error_checker=unit_test_error_checker)
 
-    def test_check_suite(self):
-        self._check_forbidden_statements('web.assets_unit_tests')
-        # Checks that no test is using `only` or `debug` as it prevents other tests to be run
-        self._check_only_call('web.qunit_suite_tests')
 
-    def _check_forbidden_statements(self, bundle):
-        # As we currently are not in a request context, we cannot render `web.layout`.
-        # We then re-define it as a minimal proxy template.
-        self.env.ref('web.layout').write({'arch_db': '<t t-name="web.layout"><html><head><meta charset="utf-8"/><link/><script id="web.layout.odooscript"/><meta/><t t-out="head"/></head><body><t t-out="0"/></body></html></t>'})
+@odoo.tests.tagged('hoot', 'post_install', '-at_install')
+class MobileWebSuite(HootCommon, odoo.tests.CrossModule):
+    browser_size = '375x667'
+    touch_enabled = True
 
-        assets = self.env['ir.qweb']._get_asset_content(bundle)[0]
-        if len(assets) == 0:
-            self.fail("No assets found in the given test bundle")
+    @odoo.tests.no_retry
+    def test_unit_mobile(self, modules):
+        # Unit tests suite (mobile)
+        addons_from_asset_bundle = self._get_addons_from_asset_bundle('web.assets_unit_tests')
+        filters = self._get_hoot_module_filters(addons_from_asset_bundle, modules)
+        if not filters:
+            return
+        filters += self._get_hoot_param_filters()
+        self.browser_js(f'/web/tests?&headless&loglevel=2&preset=mobile&tag=-headless&timeout=15000{filters}', "", "", login='admin', timeout=2100, success_signal="[HOOT] Test suite succeeded", error_checker=unit_test_error_checker)
 
-        for asset in assets:
-            filename = asset['filename']
-            if not filename.endswith('.test.js'):
-                continue
-            with suppress(FileNotFoundError):
-                with file_open(filename, 'rb', filter_ext=('.js',)) as fp:
-                    if RE_FORBIDDEN_STATEMENTS.search(fp.read().decode('utf-8')):
-                        self.fail("`only()` or `debug()` used in file %r" % asset['url'])
+
+@odoo.tests.tagged('post_install', '-at_install')
+class LegacyWebSuite(odoo.tests.HttpCase):
+    def setUp(self):
+        super().setUp()
+        self.qunit_filters = self.get_qunit_filters()
 
     def _check_only_call(self, suite):
         # ! DEPRECATED
@@ -199,13 +194,54 @@ def _check_only_call(self, suite):
                     if RE_ONLY.search(fp.read().decode('utf-8')):
                         self.fail("`QUnit.only()` or `QUnit.debug()` used in file %r" % asset['url'])
 
+    def get_qunit_regex(self, test_params):
+        filters = _get_filters(test_params)
+        positive = [f'({re.escape(f)}.*)' for sign, f in filters if sign == '+']
+        negative = [f'({re.escape(f)}.*)' for sign, f in filters if sign == '-']
+        filter = ''
+        if filters:
+            positive_re = '|'.join(positive) or '.*'
+            negative_re = '|'.join(negative)
+            negative_re = f'(?!{negative_re})' if negative_re else ''
+            filter = f'^({negative_re})({positive_re})$'
+        return filter
 
-@odoo.tests.tagged('post_install', '-at_install')
-class MobileWebSuite(QunitCommon, HOOTCommon):
-    browser_size = '375x667'
-    touch_enabled = True
+    def get_qunit_filters(self):
+        filter_param = ''
+        filter = self.get_qunit_regex(self._test_params)
+        if filter:
+            url_filter = url_quote_plus(filter)
+            filter_param = f'&filter=/{url_filter}/'
+        return filter_param
+
+    def test_check_suite(self):
+        # Checks that no test is using `only` or `debug` as it prevents other tests to be run
+        self._check_only_call('web.qunit_suite_tests')
+
+    def test_get_qunit_regex(self):
+        f = self.get_qunit_regex([('+', 'utils,mail,-utils > bl1,-utils > bl2')])
+        f2 = self.get_qunit_regex([('+', 'utils'), ('-', 'utils > bl1,utils > bl2'), ('+', 'mail')])
+        self.assertEqual(f, f2)
+        self.assertRegex('utils', f)
+        self.assertRegex('mail', f)
+        self.assertRegex('utils > something', f)
+
+        self.assertNotRegex('utils > bl1', f)
+        self.assertNotRegex('utils > bl2', f)
+        self.assertNotRegex('web', f)
+
+        f2 = self.get_qunit_regex([('+', '-utils > bl1,-utils > bl2')])
+        f3 = self.get_qunit_regex([('-', 'utils > bl1,utils > bl2')])
+        for f in (f2, f3):
+            self.assertRegex('utils', f)
+            self.assertRegex('mail', f)
+            self.assertRegex('utils > something', f)
+            self.assertRegex('web', f)
+
+            self.assertNotRegex('utils > bl1', f)
+            self.assertNotRegex('utils > bl2', f)
 
     @odoo.tests.no_retry
-    def test_unit_mobile(self):
-        # Unit tests suite (mobile)
-        self.browser_js(f'/web/tests?headless&loglevel=2&preset=mobile&tag=-headless&timeout=15000{self.hoot_filters}', "", "", login='admin', timeout=2100, success_signal="[HOOT] Test suite succeeded", error_checker=unit_test_error_checker)
+    def test_qunit(self):
+        # ! DEPRECATED
+        self.browser_js(f'/web/tests/legacy?mod=web{self.qunit_filters}', "", "", login='admin', timeout=1800, success_signal="QUnit test suite done.", error_checker=qunit_error_checker)

From 8d169401f71493f5fc735de18c2a90484614e331 Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Thu, 30 Oct 2025 11:50:43 +0100
Subject: [PATCH 630/673] [IMP] web: Hoot - log root suites at end of run

This commit makes the unit test runner log all root suites results
after each test run, only in headless mode.

Part-of: odoo/odoo#234132
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 addons/web/static/lib/hoot/core/expect.js |  1 +
 addons/web/static/lib/hoot/core/logger.js |  2 +-
 addons/web/static/lib/hoot/core/runner.js | 11 +++++++++++
 addons/web/static/lib/hoot/hoot_utils.js  |  1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/lib/hoot/core/expect.js b/addons/web/static/lib/hoot/core/expect.js
index 394c94821ad9c..e8f60d11d4509 100644
--- a/addons/web/static/lib/hoot/core/expect.js
+++ b/addons/web/static/lib/hoot/core/expect.js
@@ -545,6 +545,7 @@ export function makeExpect(params) {
             /** @type {import("../hoot_utils").Reporting} */
             const report = {
                 assertions: assertionCount,
+                duration: test.lastResults?.duration || 0,
                 tests: 1,
             };
             if (!currentResult.pass) {
diff --git a/addons/web/static/lib/hoot/core/logger.js b/addons/web/static/lib/hoot/core/logger.js
index ed135df4fa841..a7b2bdc2f71fb 100644
--- a/addons/web/static/lib/hoot/core/logger.js
+++ b/addons/web/static/lib/hoot/core/logger.js
@@ -190,7 +190,7 @@ class Logger {
                 `(${withArgs.shift()}`,
                 ...withArgs,
                 "time:",
-                suite.jobs.reduce((acc, job) => acc + (job.duration || 0), 0),
+                suite.reporting.duration,
                 "ms)"
             );
         }
diff --git a/addons/web/static/lib/hoot/core/runner.js b/addons/web/static/lib/hoot/core/runner.js
index 7c4d1222181bc..0e2cbb2a81012 100644
--- a/addons/web/static/lib/hoot/core/runner.js
+++ b/addons/web/static/lib/hoot/core/runner.js
@@ -1161,6 +1161,17 @@ export class Runner {
 
         await this._callbacks.call("after-all", this, logger.error);
 
+        if (this.headless) {
+            // Log root suite results in headless
+            const restoreLogLevel = logger.setLogLevel("suites");
+            for (const suite of this.suites.values()) {
+                if (!suite.parent) {
+                    logger.logSuite(suite);
+                }
+            }
+            restoreLogLevel();
+        }
+
         const { passed, failed, assertions } = this.reporting;
         if (failed > 0) {
             const errorMessage = ["Some tests failed: see above for details"];
diff --git a/addons/web/static/lib/hoot/hoot_utils.js b/addons/web/static/lib/hoot/hoot_utils.js
index 66ff36d698547..4fa9c0c01f59b 100644
--- a/addons/web/static/lib/hoot/hoot_utils.js
+++ b/addons/web/static/lib/hoot/hoot_utils.js
@@ -740,6 +740,7 @@ export function createReporting(parentReporting) {
 
     const reporting = reactive({
         assertions: 0,
+        duration: 0,
         failed: 0,
         passed: 0,
         skipped: 0,

From 8b0178d29e2d82a7ccc8de66025f41d77d3899d7 Mon Sep 17 00:00:00 2001
From: Xavier-Do <xdo@odoo.com>
Date: Mon, 3 Nov 2025 13:35:42 +0100
Subject: [PATCH 631/673] [IMP] test: equilibrate split builds

Since web tests are now run with the corresponding module, the time of
each subuild is impacted.

Creating some new subbuld maily for mail and pos to keep them balanced
and reach an execution time under one hour.

No need to go further since we are limited by the at_install that will
be modified in a future pr.

closes odoo/odoo#234132

Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
---
 odoo/tests/runbot/parallel_testing.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/odoo/tests/runbot/parallel_testing.json b/odoo/tests/runbot/parallel_testing.json
index 0b25aa2084ac1..bacc60c7288be 100644
--- a/odoo/tests/runbot/parallel_testing.json
+++ b/odoo/tests/runbot/parallel_testing.json
@@ -40,9 +40,11 @@
             "for_each_vars": [
                 {"test_module_filter": "-> !account_auto_transfer"},
                 {"test_module_filter": "account_auto_transfer -> !auth_totp"},
-                {"test_module_filter": "auth_totp -> !mrp"},
+                {"test_module_filter": "auth_totp -> !mail"},
+                {"test_module_filter": "mail -> !mrp"},
                 {"test_module_filter": "mrp -> !pos"},
-                {"test_module_filter": "pos -> !sale"},
+                {"test_module_filter": "pos -> !pos_restaurant"},
+                {"test_module_filter": "pos_restaurant -> !sale"},
                 {"test_module_filter": "sale -> !sale_timesheet"},
                 {"test_module_filter": "sale_timesheet -> !stock_barcode_mrp_subcontracting"},
                 {"test_module_filter": "stock_barcode_mrp_subcontracting -> !test_main_flows"},

From d6a72edaa808feeae7a7ffb9841cd800690cc660 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 14 Nov 2025 06:55:12 +0000
Subject: [PATCH 632/673] [FIX] bus: ensure consistent events when closing
 handshake is incomplete
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The websocket worker broadcasts events that track connection state changes
(connect, disconnect, reconnecting, reconnect).

Sometimes a WebSocket can close without the client noticing, leaving it stuck
in the `CLOSING` state. If the client starts the worker during this period, the
worker detects the issue and triggers a disconnect event, but neither
reconnecting nor reconnect is emitted.

Conceptually, reconnecting/reconnect should fire on any unexpected loss of
connection. This patch ensures those events are properly triggered in this
case.

This also fixes a runbot error ([1]) where a test simulates the loss
of the connection. The test sometimes runs before another service's call to
`bus_service.start`, reproducing this exact scenario.

[1]: https://runbot.odoo.com/odoo/runbot.build.error/223185

closes odoo/odoo#235734

X-original-commit: 58f08104764f29fe902e0541f8622239f9bb218d
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/workers/websocket_worker.js    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/bus/static/src/workers/websocket_worker.js b/addons/bus/static/src/workers/websocket_worker.js
index 095de5574c3ed..2578ff4181e00 100644
--- a/addons/bus/static/src/workers/websocket_worker.js
+++ b/addons/bus/static/src/workers/websocket_worker.js
@@ -29,6 +29,7 @@ export const WEBSOCKET_CLOSE_CODES = Object.freeze({
     SESSION_EXPIRED: 4001,
     KEEP_ALIVE_TIMEOUT: 4002,
     RECONNECTING: 4003,
+    CLOSING_HANDSHAKE_ABORTED: 4004,
 });
 export const WORKER_STATE = Object.freeze({
     CONNECTED: "CONNECTED",
@@ -373,8 +374,15 @@ export class WebsocketWorker {
         // WebSocket was not closed cleanly, let's try to reconnect.
         this.broadcast("BUS:RECONNECTING", { closeCode: code });
         this.isReconnecting = true;
-        if (code === WEBSOCKET_CLOSE_CODES.KEEP_ALIVE_TIMEOUT) {
-            // Don't wait to reconnect on keep alive timeout.
+        if (
+            [
+                WEBSOCKET_CLOSE_CODES.KEEP_ALIVE_TIMEOUT,
+                WEBSOCKET_CLOSE_CODES.CLOSING_HANDSHAKE_ABORTED,
+            ].includes(code)
+        ) {
+            // Don't wait to reconnect: keep-alive shouldn't be noticed, and the
+            // closing handshake was aborted because the client explicitly tried
+            // to connect while the socket was stuck in the closing state.
             this.connectRetryDelay = 0;
         }
         if (code === WEBSOCKET_CLOSE_CODES.SESSION_EXPIRED) {
@@ -519,10 +527,12 @@ export class WebsocketWorker {
         }
         this._removeWebsocketListeners();
         if (this._isWebsocketClosing()) {
-            // close event was not triggered and will never be, broadcast the
-            // disconnect event for consistency sake.
-            this.lastChannelSubscription = null;
-            this.broadcast("BUS:DISCONNECT", { code: WEBSOCKET_CLOSE_CODES.ABNORMAL_CLOSURE });
+            // The close event didn’t trigger. Trigger manually to maintain
+            // correct state and lifecycle handling.
+            this._onWebsocketClose(
+                new CloseEvent("close", { code: WEBSOCKET_CLOSE_CODES.CLOSING_HANDSHAKE_ABORTED })
+            );
+            return;
         }
         this._updateState(WORKER_STATE.CONNECTING);
         this.websocket = new WebSocket(this.websocketURL);

From 8ad581eb86fdd40472b00dd6a32c28f23f151cb5 Mon Sep 17 00:00:00 2001
From: kinhosz <jcsc@odoo.com>
Date: Tue, 4 Nov 2025 13:14:43 +0000
Subject: [PATCH 633/673] [FIX] resource: force intervals normalization

Note:

The `WorkIntervals` class has been removed, and the
`keep_distinct` flag has been introduced to simplify its logic.
For the following explanation, we will refer to an `Intervals`
class with `keep_distinct = False`, as 'Intervals', and to one
with `keep_distinct = True` as 'WorkIntervals'.

Issue:

Prior to this commit, the `other` parameter in the `_merge`
method could belong to a different class, not necessarily an
instance of `Intervals`.
For example, in Planning module, we perform operations between
`Intervals` and `WorkIntervals`.

The `WorkIntervals` class behaves differently from `Intervals`:
while `Intervals` uses disjoint closed intervals, `WorkIntervals`
uses disjoint semi-closed intervals.

During these operations, the `_merge` method was not normalizing
the `_items`, which caused inconsistencies and errors (when we are
merging two intervals ([0, 10], [10, 20]) unnormalized with an empty
`others`).

This commit ensures that the `other` parameter is normalized before
processing the `_merge` operation. The fix ensures that normalized
intervals are always produced after `_merge`, even when unnormalized
intervals are provided as input.

That issue has been found in that ticket: 5184291

closes odoo/odoo#235741

X-original-commit: 3c97f48b47f538fd3f307aa2ad388c0b8f458995
Signed-off-by: Raphael Collet <rco@odoo.com>
---
 odoo/addons/base/tests/test_intervals.py | 22 ++++++++++++++++++++++
 odoo/tools/intervals.py                  |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/odoo/addons/base/tests/test_intervals.py b/odoo/addons/base/tests/test_intervals.py
index 1f71f3d0f73b9..d51feaed4bf2f 100644
--- a/odoo/addons/base/tests/test_intervals.py
+++ b/odoo/addons/base/tests/test_intervals.py
@@ -71,6 +71,28 @@ def check(a, b, c):
             [(0, 5), (12, 13), (20, 22), (23, 24)],
         )
 
+    def test_keep_distinct(self):
+        """ Test merge operations between two Intervals
+            instances with different _keep_distinct flags.
+        """
+
+        A = Intervals(self.ints([(0, 10)]), keep_distinct=False)
+        B = Intervals(self.ints([(-5, 5), (5, 15)]), keep_distinct=True)
+
+        C = A & B
+        # The _keep_distinct flag must be the same as the left one
+        self.assertFalse(C._keep_distinct)
+        self.assertEqual(len(C), 1)
+        self.assertEqual(list(C), self.ints([(0, 10)]))
+
+        # If, as a result of the above operation, C has _keep_distinct = False
+        # but is not preserving its _items, the following operation must raise
+        # an error
+        D = Intervals()
+        C = C - D
+        self.assertFalse(C._keep_distinct)
+        self.assertEqual(C._items, self.ints([(0, 10)]))
+
 
 @tagged('at_install', '-post_install')  # LEGACY at_install
 class TestUtils(TransactionCase):
diff --git a/odoo/tools/intervals.py b/odoo/tools/intervals.py
index c07026ebe0540..4c18a4f68a16b 100644
--- a/odoo/tools/intervals.py
+++ b/odoo/tools/intervals.py
@@ -86,7 +86,7 @@ def _merge(self, other: Intervals | Iterable[tuple[T, T, AbstractSet]], differen
 
         # using 'self' and 'other' below forces normalization
         bounds1 = _boundaries(self, 'start', 'stop')
-        bounds2 = _boundaries(other, 'switch', 'switch')
+        bounds2 = _boundaries(Intervals(other, keep_distinct=self._keep_distinct), 'switch', 'switch')
 
         start = None                    # set by start/stop
         recs1 = None                    # set by start

From da480c8eb633b8c24109b35c212e5c10ff2f8927 Mon Sep 17 00:00:00 2001
From: "Florian(flg)" <flg@odoo.com>
Date: Thu, 13 Nov 2025 15:48:52 +0000
Subject: [PATCH 634/673] [FIX] account: Bank statement first line index
 compute

Ensure proper computation of first_line_index when
line.internal_index or line.state changes.

Previously, the computation of first_line_index was
grouped with the date computation. However, due to a
specific ORM behavior, the compute method is not
triggered when one of the computed fields (in this
case, the date) is provided in the create values.
As a result, first_line_index could remain falsy,
leading to an incorrect balance in the bank journal.

no task id

closes odoo/odoo#235735

X-original-commit: e0e88cab33c2530caca4859c0515111873111481
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Florian Gilbert (flg) <flg@odoo.com>
Co-authored-by: Laurent Smet (las) <las@odoo.com>
---
 addons/account/models/account_bank_statement.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index 58fc216ec73e9..14c169207ef42 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -27,8 +27,8 @@ class AccountBankStatement(models.Model):
     )
 
     date = fields.Date(
-        compute='_compute_date_index', store=True,
-        index=True, readonly=False
+        compute='_compute_date', store=True,
+        index=True, readonly=False,
     )
 
     # The internal index of the first line of a statement, it is used for sorting the statements
@@ -36,7 +36,7 @@ class AccountBankStatement(models.Model):
     # keeping this order is important because the validity of the statements are based on their order
     first_line_index = fields.Char(
         comodel_name='account.bank.statement.line',
-        compute='_compute_date_index', store=True,
+        compute='_compute_first_line_index', store=True,
     )
 
     balance_start = fields.Monetary(
@@ -124,12 +124,18 @@ def _compute_name(self):
             stmt.name = name +_("Statement %(date)s", date=stmt.date or fields.Date.to_date(stmt.create_date))
 
     @api.depends('line_ids.internal_index', 'line_ids.state')
-    def _compute_date_index(self):
+    def _compute_first_line_index(self):
         for stmt in self:
             # When we create lines manually from the form view, they don't have any `internal_index` set yet.
             sorted_lines = stmt.line_ids.filtered("internal_index").sorted('internal_index')
             stmt.first_line_index = sorted_lines[:1].internal_index
-            stmt.date = sorted_lines.filtered(lambda l: l.state == 'posted')[-1:].date
+
+    @api.depends('line_ids.internal_index', 'line_ids.state')
+    def _compute_date(self):
+        for statement in self:
+            # When we create lines manually from the form view, they don't have any `internal_index` set yet.
+            sorted_lines = statement.line_ids.filtered('internal_index').sorted('internal_index')
+            statement.date = sorted_lines.filtered(lambda l: l.state == 'posted')[-1:].date
 
     @api.depends('create_date')
     def _compute_balance_start(self):

From 04a4b531a577ddb6632440a2714985457a0a3739 Mon Sep 17 00:00:00 2001
From: abd-msyukyu-odoo <abd@odoo.com>
Date: Thu, 13 Nov 2025 14:35:39 +0000
Subject: [PATCH 635/673] [FIX] mass_mailing: fix infinite scrolling and ghost
 paragraphs

This [commit] introduced 2 issues in `mass_mailing`:
- when creating a mailing with the basic editor, it adds an empty paragraph
  above the `o_layout` block, even thought the entire mailing content should be
  enclosed inside the `o_layout` block.
- when sending such an email (with the wrong paragraph) and consulting the
  readonly value in the `mass_mailing` Form view, the view started growing
  indefinitely.

How to reproduce:
- create a mailing using the basic editor and send the email
- open the mailing in readonly

Issues:
- there is a paragraph outside the `o_layout` element in the DOM
- the page scrolls indefinitely because `o_layout` has `min-height: 100%`.

Resolution:
- don't force `o_layout` to have a `min-height`, which will prevent the infinite
  scrolling for mailing that were sent with a wrongly placed paragraph.
- configure the mailing so that the editable element has
  `contenteditable="false"`, and the element with `o_mail_no_options` coming
  from the basic template gets `contenteditable="true"` so that the editor is
  informed that the user is only allowed to edit the content of that node, not
  the outside of it, which will prevent the empty paragraph insertion.

[commit]: https://github.com/odoo/odoo/commit/edf7f7bb0c62978640c181eccb4934855d5d872d

task-5263045

closes odoo/odoo#235733

X-original-commit: 0ee7413cc9a79d1788bf4c3406d440cb4f7c6d36
Signed-off-by: Julien Banken (jbn) <jbn@odoo.com>
Signed-off-by: Damien Abeloos (abd) <abd@odoo.com>
---
 addons/mass_mailing/__manifest__.py           |  1 +
 .../mass_mailing_contenteditable_plugin.js    | 25 +++++++++++++++++++
 .../html_field/mass_mailing_html_field.js     |  6 ++++-
 .../static/src/scss/themes/theme_default.scss |  2 --
 .../tests/mass_mailing_html_field.test.js     | 11 ++++----
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 addons/mass_mailing/static/src/editor/plugins/mass_mailing_contenteditable_plugin.js

diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 4a052382d39c7..a7fb01ed9119c 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -135,6 +135,7 @@
             'mass_mailing/static/src/xml/mailing_portal_subscription_form.xml',
         ],
         'web.assets_backend': [
+            'mass_mailing/static/src/editor/**/*',
             'mass_mailing/static/src/fields/**/*',
             'mass_mailing/static/src/themes/**/*',
             'mass_mailing/static/src/iframe/**/*',
diff --git a/addons/mass_mailing/static/src/editor/plugins/mass_mailing_contenteditable_plugin.js b/addons/mass_mailing/static/src/editor/plugins/mass_mailing_contenteditable_plugin.js
new file mode 100644
index 0000000000000..aeb6dc19c53d1
--- /dev/null
+++ b/addons/mass_mailing/static/src/editor/plugins/mass_mailing_contenteditable_plugin.js
@@ -0,0 +1,25 @@
+import { Plugin } from "@html_editor/plugin";
+import { registry } from "@web/core/registry";
+
+export class MassMailingContenteditablePlugin extends Plugin {
+    static id = "massMailingContenteditablePlugin";
+    resources = {
+        clean_for_save_handlers: this.cleanForSave.bind(this),
+    };
+
+    setup() {
+        const layoutEditable = this.editable.querySelector(".o_layout .o_mail_no_options");
+        if (layoutEditable) {
+            this.editable.setAttribute("contenteditable", "false");
+            layoutEditable.setAttribute("contenteditable", "true");
+        }
+    }
+
+    cleanForSave({ root: clone }) {
+        clone.querySelector(".o_layout .o_mail_no_options")?.removeAttribute("contenteditable");
+    }
+}
+
+registry
+    .category("basic-editor-plugins")
+    .add(MassMailingContenteditablePlugin.id, MassMailingContenteditablePlugin);
diff --git a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
index 0d8c33b47830f..5c72fbb63aeff 100644
--- a/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/fields/html_field/mass_mailing_html_field.js
@@ -256,7 +256,11 @@ export class MassMailingHtmlField extends HtmlField {
         return {
             ...config,
             onEditorReady: () => this.commitChanges(),
-            Plugins: [...MAIN_EDITOR_PLUGINS, ...DYNAMIC_PLACEHOLDER_PLUGINS],
+            Plugins: [
+                ...MAIN_EDITOR_PLUGINS,
+                ...DYNAMIC_PLACEHOLDER_PLUGINS,
+                ...registry.category("basic-editor-plugins").getAll(),
+            ],
         };
     }
 
diff --git a/addons/mass_mailing/static/src/scss/themes/theme_default.scss b/addons/mass_mailing/static/src/scss/themes/theme_default.scss
index 3f277b3ee0943..7c5bd7e457e37 100644
--- a/addons/mass_mailing/static/src/scss/themes/theme_default.scss
+++ b/addons/mass_mailing/static/src/scss/themes/theme_default.scss
@@ -30,8 +30,6 @@ div.col:not([align]) {
 // ===== Layout =====
 .o_layout {
     overflow: hidden;
-    box-sizing: content-box;
-    min-height: 100%;
 
     > .o_mail_wrapper {
         width: 100%;
diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
index 95429e8589c83..47c74b03c06ab 100644
--- a/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
+++ b/addons/mass_mailing/static/tests/mass_mailing_html_field.test.js
@@ -350,7 +350,7 @@ describe("field HTML", () => {
         expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(0);
         // editable basic
         await contains(`.o_pager_next`).click();
-        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_basic_theme", {
+        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_basic_theme:only-child", {
             timeout: 3000,
         });
         expect(getPagerValue()).toEqual([2]);
@@ -358,7 +358,7 @@ describe("field HTML", () => {
         expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(0);
         // editable builder
         await contains(`.o_pager_next`).click();
-        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_empty_theme", {
+        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_empty_theme:only-child", {
             timeout: 3000,
         });
         expect(getPagerValue()).toEqual([3]);
@@ -366,9 +366,10 @@ describe("field HTML", () => {
         expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(1);
         // readonly default
         await contains(`.o_pager_next`).click();
-        await waitFor(".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_default_theme", {
-            timeout: 3000,
-        });
+        await waitFor(
+            ".o_mass_mailing_iframe_wrapper :iframe .o_layout.o_default_theme:only-child",
+            { timeout: 3000 }
+        );
         expect(getPagerValue()).toEqual([1]);
         expect(htmlField.state.activeTheme).toBe("default");
         expect(fixture.querySelectorAll(".o_mass_mailing-builder_sidebar")).toHaveCount(0);

From a2ef96e5ff62b6892cbf01a5c1cc33f6e4cc9ee7 Mon Sep 17 00:00:00 2001
From: khfa <khfa@odoo.com>
Date: Tue, 4 Nov 2025 12:13:36 +0000
Subject: [PATCH 636/673] [FIX] l10n_sa_edi: use commercial partner to decide
 whether to use clearance or reporting api

When sending an invoice to ZATCA, if the contact is an individual, the invoice is sent
through the reporting API, and if the contact is a company, the invoice is sent through
the clearance API.

As of now, if the contact has a parent company, the invoice is sent through the report api.
However, we need to make sure that in this case, the invoice goes through the clearance api.

The fix introduced simply checks the partner_id.commercial_partner_id to decide whether the invoice
is a simplified invoice (i.e. through the reporting api) or not.

Task-5085142

closes odoo/odoo#235725

X-original-commit: d6bc2c2fa78cb702d9b20d27103b444a72d101f9
Signed-off-by: Wala Gauthier (gawa) <gawa@odoo.com>
Signed-off-by: Khaled Fahmy (khfa) <khfa@odoo.com>
---
 addons/l10n_sa_edi/models/account_move.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_sa_edi/models/account_move.py b/addons/l10n_sa_edi/models/account_move.py
index fb0c4a68420e8..8d2c0482b272c 100644
--- a/addons/l10n_sa_edi/models/account_move.py
+++ b/addons/l10n_sa_edi/models/account_move.py
@@ -42,7 +42,12 @@ def _l10n_sa_is_simplified(self):
         :return:
         """
         self.ensure_one()
-        return self.partner_id.company_type == 'person'
+
+        return (
+            self.partner_id.commercial_partner_id.company_type == "person"
+            if self.partner_id.commercial_partner_id
+            else self.partner_id.company_type == "person"
+        )
 
     @api.ondelete(at_uninstall=False)
     def _prevent_zatca_rejected_invoice_deletion(self):

From afeb4437a6e3858d9d7430f7b06449eb3bb7962d Mon Sep 17 00:00:00 2001
From: Ethan Vincent <etvi@odoo.com>
Date: Thu, 10 Jul 2025 08:52:35 +0000
Subject: [PATCH 637/673] [FIX] mrp: dont compute oee with intermediary
 rounding

**Current behavior:**
The form view for a workcenter has an OEE smart button which can
display a different value from the real OEE displayed by the
`mrp_workcenter_productivity_report_oee` displayed when actually
clicking the button and looking at the report.

**Expected behavior:**
Same values

**Steps to reproduce:**
1. Make a workcenter and a BoM with an operation performed at
the workcenter

2. Use the BoM in an MO such that there is some un-productive
time (e.g., recorded production duration takes longer than
expected duration)
* example: 0:20 expected, 1:01 actual

3. Go to the workcenter list view -> click on the created
workcenter -> look at OEE smart button display value -> click on
it to see report -> report values are different

**Cause of the issue:**
the `oee` field on the workcenter is computed with rounded
intermediary `blocked_time` and `productive_time` values, the
actual report uses the raw values.

**Fix:**
Don't use the rounded intermediary values in computing `oee`.

Post-this-diff, we actually do one less `_read_group` (along
with computing a more accurate field value).

opw-4795463

closes odoo/odoo#235571

X-original-commit: ecf4345bb7b4091767198c3a59ab7e0a3fe86067
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 addons/mrp/models/mrp_workcenter.py | 26 ++++++++++++++++++++++----
 addons/mrp/tests/test_oee.py        | 16 ++++++++--------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py
index 9a08c2d1e910c..faf7bb1066362 100644
--- a/addons/mrp/models/mrp_workcenter.py
+++ b/addons/mrp/models/mrp_workcenter.py
@@ -3,6 +3,7 @@
 import json
 
 from babel.dates import format_date
+from collections import defaultdict
 from dateutil import relativedelta
 from datetime import timedelta, datetime
 from functools import partial
@@ -240,11 +241,28 @@ def _compute_productive_time(self):
 
     @api.depends('blocked_time', 'productive_time')
     def _compute_oee(self):
-        for order in self:
-            if order.productive_time:
-                order.oee = round(order.productive_time * 100.0 / (order.productive_time + order.blocked_time), 2)
+        time_data = self.env['mrp.workcenter.productivity']._read_group(
+            domain=[
+                ('date_start', '>=', fields.Datetime.to_string(datetime.now() - relativedelta.relativedelta(months=1))),
+                ('workcenter_id', 'in', self.ids),
+                ('date_end', '!=', False),
+            ],
+            groupby=['workcenter_id', 'loss_type'],
+            aggregates=['duration:sum'],
+        )
+        time_by_workcenter = defaultdict(lambda: {'productive_time': 0.0, 'blocked_time': 0.0})
+        for data in time_data:
+            workcenter, loss_type, duration = data
+            time_to_update = 'productive_time' if loss_type == 'productive' else 'blocked_time'
+            time_by_workcenter[workcenter.id][time_to_update] += duration
+        for workcenter in self:
+            workcenter_time = time_by_workcenter[workcenter.id]
+            productive_time = workcenter_time['productive_time']
+            if productive_time:
+                blocked_time = workcenter_time['blocked_time']
+                workcenter.oee = float_round(productive_time * 100.0 / (productive_time + blocked_time), precision_digits=2)
             else:
-                order.oee = 0.0
+                workcenter.oee = 0.0
 
     def _compute_performance(self):
         wo_data = self.env['mrp.workorder']._read_group([
diff --git a/addons/mrp/tests/test_oee.py b/addons/mrp/tests/test_oee.py
index 36733186d8f53..03b57522b3263 100644
--- a/addons/mrp/tests/test_oee.py
+++ b/addons/mrp/tests/test_oee.py
@@ -77,15 +77,15 @@ def time_to_string_utc_datetime(time):
         end_time = time_to_string_utc_datetime(time(10, 53, 22))
         self.create_productivity_line(self.env.ref('mrp.block_reason4'), start_time, end_time)
 
-        # Block time : ( Process Defact (1.33 min) + Reduced Speed (3.0 min) + Material Availability (1.52 min)) = 5.85 min
-        blocked_time_in_hour = round(((1.33 + 3.0 + 1.52) / 60.0), 2)
+        # Blocked time : ( Process Defect (1.33 min) + Reduced Speed (3.0 min) + Material Availability (1.52 min)) = 5.85 min
+        blocked_time = 1.33 + 3.0 + 1.52
         # Productive time : Productive time duration (13 min)
-        productive_time_in_hour = round((13.0 / 60.0), 2)
+        productive_time = 13.0
 
-        # Check blocked time and productive time
-        self.assertEqual(self.workcenter_1.blocked_time, blocked_time_in_hour, "Wrong block time on workcenter.")
-        self.assertEqual(self.workcenter_1.productive_time, productive_time_in_hour, "Wrong productive time on workcenter.")
+        # Blocked & Productive time are rounded to 2 digits when computed
+        self.assertEqual(self.workcenter_1.blocked_time, round(blocked_time / 60, 2), "Wrong blocked time on workcenter.")
+        self.assertEqual(self.workcenter_1.productive_time, round(productive_time / 60, 2), "Wrong productive time on workcenter.")
 
-        # Check overall equipment effectiveness
-        computed_oee = round(((productive_time_in_hour * 100.0)/(productive_time_in_hour + blocked_time_in_hour)), 2)
+        # OEE is not calculated with intermediary rounding
+        computed_oee = round((((productive_time / 60) * 100.0) / ((productive_time / 60) + (blocked_time / 60))), 2)
         self.assertEqual(self.workcenter_1.oee, computed_oee, "Wrong oee on workcenter.")

From 02e9fac3a3ba098689c7328fd03b868081e01667 Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Tue, 14 Oct 2025 11:10:20 +0000
Subject: [PATCH 638/673] [FIX] purchase: prevent access error in branch
 companies

Versions
--------
- saas-18.4+

Steps
-----
1. Create a branch company B;
2. create a branch C for the branch company B;
3. change to branch C;
4. create a warehouse;
5. enable dropshipping;
6. add a vendor to a stored product with the Dropship route enabled;
7. log in as a sales user with access to branch C only;
8. add product to a sales order & confirm.

Issue
-----
> Access Error
> Uh-oh! Looks like you have stumbled upon some top-secret records.
> Sorry, Marc Demo (id=5) doesn't have 'read' access to:
> - Companies, YourBranch (res.company: 3)

Cause
-----
The error gets thrown during the `_prepare_purchase_order_line` method,
specifically on the line which filters `supplier_taxes_id` using
`lambda x: x.company_id in company_id.parent_ids`.

This passes via the field's `convert_to_record` method, which attempts
to access the `active` field of the companies to filter out any that
are archived.

In previous versions, this wasn't an issue, because the `active` field
was still present in cache from the `_compute_parent_ids` which is
called with `sudo`, but as of saas-18.4, it attempts to refetch these
values, leading to the error.

Solution
--------
Instead of using `filtered`, use `filtered_domain` using the result of
`account.tax._get_company_domain`.

opw-5112625

closes odoo/odoo#235672

X-original-commit: c02dc571b6b4ad821133a858c9dcf6e9cfd6cf04
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 addons/purchase/models/purchase_order_line.py |  8 +++--
 addons/purchase/tests/test_access_rights.py   | 32 +++++++++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/models/purchase_order_line.py b/addons/purchase/models/purchase_order_line.py
index 018c5654f4124..0b65bdca00c39 100644
--- a/addons/purchase/models/purchase_order_line.py
+++ b/addons/purchase/models/purchase_order_line.py
@@ -1,11 +1,12 @@
 from datetime import datetime, time
+
 from dateutil.relativedelta import relativedelta
 from pytz import UTC
 
-from odoo import api, fields, models, _
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT, get_lang
 from odoo.tools.float_utils import float_compare, float_round
-from odoo.exceptions import UserError
 
 
 class PurchaseOrderLine(models.Model):
@@ -549,7 +550,8 @@ def _prepare_purchase_order_line(self, product_id, product_qty, product_uom, com
         if seller and (seller.product_uom_id or seller.product_tmpl_id.uom_id) != product_uom:
             uom_po_qty = product_id.uom_id._compute_quantity(uom_po_qty, seller.product_uom_id, rounding_method='HALF-UP')
 
-        product_taxes = product_id.supplier_taxes_id.filtered(lambda x: x.company_id in company_id.parent_ids)
+        tax_domain = self.env['account.tax']._check_company_domain(company_id)
+        product_taxes = product_id.supplier_taxes_id.filtered_domain(tax_domain)
         taxes = po.fiscal_position_id.map_tax(product_taxes)
 
         if seller:
diff --git a/addons/purchase/tests/test_access_rights.py b/addons/purchase/tests/test_access_rights.py
index e16eb375be6e3..7ea3092af4a21 100644
--- a/addons/purchase/tests/test_access_rights.py
+++ b/addons/purchase/tests/test_access_rights.py
@@ -1,8 +1,10 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo.addons.account.tests.common import AccountTestInvoicingCommon
-from odoo.tests import Form, tagged
+
+from odoo import Command
 from odoo.exceptions import AccessError
+from odoo.tests import Form, tagged
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
 
 
 @tagged('post_install', '-at_install')
@@ -136,3 +138,27 @@ def test_create_product_purchase_user(self):
             'uom_id': uom.id,
         })
         self.assertTrue(product, "The default purchase UOM should be in the same category as the sale UOM.")
+
+    def test_prepare_purchase_order_line_from_branch_company(self):
+        """Check that a purchase order line can be created from a nested branch company."""
+        self.env.company.child_ids = [Command.create({
+            'name': "Test Branch",
+            'child_ids': [Command.create({'name': "Nested Branch"})],
+        })]
+        nested_branch = self.env.company.child_ids.child_ids
+        self.purchase_user.write({
+            'company_ids': [Command.set(nested_branch.ids)],
+            'company_id': nested_branch.id,
+        })
+
+        PurchaseOrder = self.env['purchase.order'].with_user(self.purchase_user)
+        order = PurchaseOrder.create({'partner_id': self.vendor.id})
+        nested_branch = nested_branch.with_env(PurchaseOrder.env)
+        product = self.product.with_env(PurchaseOrder.env)
+        vendor = self.vendor.with_env(PurchaseOrder.env)
+
+        self.env.invalidate_all()
+        po_line_vals = PurchaseOrder.order_line._prepare_purchase_order_line(
+            product, 1, product.uom_id, nested_branch, vendor, order,
+        )
+        self.assertTrue(PurchaseOrder.order_line.create(po_line_vals))

From aa514b0a29aa05f79cd6e3e58d0e1dd6774b51a3 Mon Sep 17 00:00:00 2001
From: "lase@odoo.com" <lase@odoo.com>
Date: Mon, 3 Nov 2025 13:44:23 +0000
Subject: [PATCH 639/673] [FIX] stock_account: make product total value
 warehouse sensitive

Steps to reproduce:
- In the settings enable "Multi-steps routes"
- Inventory > Configuration > Warehouse Management > Warehouses
- Create a second warehouse
- Create a new storable product with a product category:
    - Costing Method: AVCO
    - Inventory Valuation: Perpetual
- Change the cost of your product to 10 and put:
    - 10 units in the stock of WH1
    - 1 unit in the stock of WH2
- Inventory > Reporting > Stock
- Select WH2 in the left panel filter
> The total value is still 110 and avg cost is 110.

Cause of the issue:

Selecting warehouses on the left panel of the report alters the context
to set a `warehouse_id`:
https://github.com/odoo/odoo/blob/16dc62e9a14f84b4953fb9b39e4ad71ec454faff/addons/stock/static/src/views/search/stock_report_search_panel.js#L23-L26
https://github.com/odoo/odoo/blob/16dc62e9a14f84b4953fb9b39e4ad71ec454faff/addons/stock/static/src/views/search/stock_report_search_model.js#L37-L45
However, while the `qty_available` of the product is context dependant:
https://github.com/odoo/odoo/blob/16dc62e9a14f84b4953fb9b39e4ad71ec454faff/addons/stock/models/product.py#L146-L150
The methods used in the `_compute_value`to compute the corresponding
values corresponding to this qty are not:
https://github.com/odoo/odoo/blob/16dc62e9a14f84b4953fb9b39e4ad71ec454faff/addons/stock_account/models/product.py#L137-L160

opw-5181954

closes odoo/odoo#235518

X-original-commit: d7a56941eed0df6b39a0843c3af95517c6185517
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
Signed-off-by: Lancelot Semal (lase) <lase@odoo.com>
---
 addons/stock_account/models/product.py        | 19 +++++---
 .../tests/test_stockvaluation.py              | 45 +++++++++++++++++++
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 7482c85a7f6b3..5e3df88c54918 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -136,7 +136,7 @@ class ProductProduct(models.Model):
         help="Technical field to correctly show the currently selected company's currency that corresponds "
              "to the totaled value of the product's valuation layers")
 
-    @api.depends_context('to_date', 'company')
+    @api.depends_context('to_date', 'company', 'warehouse_id')
     @api.depends('cost_method', 'stock_move_ids.value', 'standard_price')
     def _compute_value(self):
         """Compute totals of multiple svl related values"""
@@ -147,19 +147,28 @@ def _compute_value(self):
             at_date = fields.Datetime.to_datetime(product.env.context.get('to_date'))
             if at_date:
                 product = product.with_context(at_date=at_date)
-            qty_available = product.sudo(False)._with_valuation_context().qty_available
+            valuated_product = product.sudo(False)._with_valuation_context()
+            qty_available = valuated_product.qty_available
+            total_qty_available = valuated_product.with_context(warehouse_id=False).qty_available if self.env.context.get('warehouse_id') else qty_available
             if product.lot_valuated:
                 product.total_value = product._get_value_from_lots()
+            elif product.uom_id.is_zero(qty_available):
+                product.total_value = 0
+            elif product.uom_id.is_zero(total_qty_available):
+                product.total_value = product._get_standard_price_at_date() * qty_available
             elif product.cost_method == 'standard':
                 standard_price = product.standard_price
                 if at_date:
                     standard_price = product._get_standard_price_at_date(at_date)
                 product.total_value = standard_price * qty_available
             elif product.cost_method == 'average':
-                product.total_value = product._run_avco(at_date=at_date)[1]
+                product.total_value = product._run_avco(at_date=at_date)[1] * qty_available / total_qty_available
             else:
-                product.total_value = product._run_fifo(qty_available, at_date=at_date)
-            product.avg_cost = product.total_value / qty_available if qty_available else 0.0
+                product.total_value = product.with_context(warehouse_id=False)._run_fifo(total_qty_available, at_date=at_date) * qty_available / total_qty_available
+            if product.company_currency_id.is_zero(product.total_value):
+                product.avg_cost = product._get_standard_price_at_date()
+            else:
+                product.avg_cost = product.total_value / qty_available if not product.uom_id.is_zero(qty_available) else product._get_standard_price_at_date()
 
     def write(self, vals):
         old_price = False
diff --git a/addons/stock_account/tests/test_stockvaluation.py b/addons/stock_account/tests/test_stockvaluation.py
index 79c93b9315910..5929bfa70dc57 100644
--- a/addons/stock_account/tests/test_stockvaluation.py
+++ b/addons/stock_account/tests/test_stockvaluation.py
@@ -2253,6 +2253,51 @@ def test_forecast_report_value(self):
         self.assertEqual(report_value_1['docs']['value'], "U 50.00")
         self.assertEqual(report_value_2['docs']['value'], "48.00 DD")
 
+    def test_stock_report_avco_warehouse_dependency(self):
+        """
+        Create two warehouses and check that the total value and the on hand quantity
+        displayed in the stock report accurately depends on the contextual warehouse.
+        """
+        product = self.product_avco_auto
+        warehouse_1, warehouse_2 = self.env['stock.warehouse'].search([('company_id', '=', self.env.company.id)], limit=2)
+
+        inventory_adjustment_loc = self.env['stock.location'].search([('usage', '=', 'inventory'), ('company_id', '=', self.env.company.id)], limit=1)
+        self._make_in_move(product=product, quantity=15.0, location_id=inventory_adjustment_loc.id, location_dest_id=warehouse_1.lot_stock_id.id)
+        self._make_in_move(product=product, quantity=5.0, unit_cost=50, location_dest_id=warehouse_2.lot_stock_id.id)
+        self.assertRecordValues(product, [{'avg_cost': 20.0, 'total_value': 400, 'qty_available': 20}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_1.id), [{'avg_cost': 20.0, 'total_value': 300, 'qty_available': 15}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_2.id), [{'avg_cost': 20.0, 'total_value': 100, 'qty_available': 5}])
+
+        warehouse_3 = self.env['stock.warehouse'].create({'code': 'WH-neg'})
+        self._make_out_move(product=product, quantity=20.0, location_id=warehouse_3.lot_stock_id.id)
+        self.assertRecordValues(product, [{'avg_cost': 20.0, 'total_value': 0.0, 'qty_available': 0.0}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_1.id), [{'avg_cost': 20.0, 'total_value': 300, 'qty_available': 15}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_2.id), [{'avg_cost': 20.0, 'total_value': 100, 'qty_available': 5}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_3.id), [{'avg_cost': 20.0, 'total_value': -400, 'qty_available': -20}])
+
+    def test_stock_report_fifo_warehouse_dependency(self):
+        """
+        Create two warehouses and check that the total value and the on hand quantity
+        displayed in the stock report accurately depends on the contextual warehouse.
+        """
+        product = self.product_fifo_auto
+        warehouse_1, warehouse_2 = self.env['stock.warehouse'].search([('company_id', '=', self.env.company.id)], limit=2)
+
+        inventory_adjustment_loc = self.env['stock.location'].search([('usage', '=', 'inventory'), ('company_id', '=', self.env.company.id)], limit=1)
+        self._make_in_move(product=product, quantity=15.0, location_id=inventory_adjustment_loc.id, location_dest_id=warehouse_1.lot_stock_id.id)
+        self._make_in_move(product=product, quantity=10.0, unit_cost=30, location_dest_id=warehouse_2.lot_stock_id.id)
+        self._make_out_move(product=product, quantity=5.0, location_id=warehouse_2.lot_stock_id.id)
+        self.assertRecordValues(product, [{'avg_cost': 20.0, 'total_value': 400, 'qty_available': 20}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_1.id), [{'avg_cost': 20.0, 'total_value': 300, 'qty_available': 15}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_2.id), [{'avg_cost': 20.0, 'total_value': 100, 'qty_available': 5}])
+
+        warehouse_3 = self.env['stock.warehouse'].create({'code': 'WH-neg'})
+        self._make_out_move(product=product, quantity=20.0, location_id=warehouse_3.lot_stock_id.id)
+        self.assertRecordValues(product, [{'avg_cost': 30.0, 'total_value': 0.0, 'qty_available': 0.0}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_1.id), [{'avg_cost': 30.0, 'total_value': 450, 'qty_available': 15}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_2.id), [{'avg_cost': 30.0, 'total_value': 150, 'qty_available': 5}])
+        self.assertRecordValues(product.with_context(warehouse_id=warehouse_3.id), [{'avg_cost': 30.0, 'total_value': -600, 'qty_available': -20}])
+
     def test_fifo_and_sml_owned_by_company(self):
         """
         When receiving a FIFO product, if the picking is owned by the company,

From 4accf62bdd83b449f2862ffa10bd8a99c3257ff9 Mon Sep 17 00:00:00 2001
From: "Gauthier Wala (gawa)" <gawa@odoo.com>
Date: Mon, 3 Nov 2025 16:57:43 +0000
Subject: [PATCH 640/673] [FIX] account: re-put rounding where it should have
 been

Also fixes the comments that were wrong.

closes odoo/odoo#235792

X-original-commit: 9a185706830e3d5c1ee6af186baf8faa2f6c4823
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Wala Gauthier (gawa) <gawa@odoo.com>
---
 addons/account/tests/test_account_move_in_invoice.py  | 2 ++
 addons/account/tests/test_account_move_in_refund.py   | 2 ++
 addons/account/tests/test_account_move_out_invoice.py | 2 ++
 addons/account/tests/test_account_move_out_refund.py  | 2 ++
 addons/account/tests/test_account_move_reconcile.py   | 1 +
 5 files changed, 9 insertions(+)

diff --git a/addons/account/tests/test_account_move_in_invoice.py b/addons/account/tests/test_account_move_in_invoice.py
index c440a70a18942..606e5500edd43 100644
--- a/addons/account/tests/test_account_move_in_invoice.py
+++ b/addons/account/tests/test_account_move_in_invoice.py
@@ -943,6 +943,8 @@ def test_in_invoice_line_onchange_cash_rounding_1(self):
         })
 
     def test_in_invoice_line_onchange_currency_1(self):
+        self.other_currency.rounding = 0.001
+
         move_form = Form(self.invoice)
         move_form.currency_id = self.other_currency
         move_form.save()
diff --git a/addons/account/tests/test_account_move_in_refund.py b/addons/account/tests/test_account_move_in_refund.py
index 585f4195aaa43..8cb8009845afc 100644
--- a/addons/account/tests/test_account_move_in_refund.py
+++ b/addons/account/tests/test_account_move_in_refund.py
@@ -605,6 +605,8 @@ def test_in_refund_line_onchange_cash_rounding_1(self):
         })
 
     def test_in_refund_line_onchange_currency_1(self):
+        self.other_currency.rounding = 0.001
+
         move_form = Form(self.invoice)
         move_form.currency_id = self.other_currency
         move_form.save()
diff --git a/addons/account/tests/test_account_move_out_invoice.py b/addons/account/tests/test_account_move_out_invoice.py
index c4e4a0a8d5516..e709722b69edf 100644
--- a/addons/account/tests/test_account_move_out_invoice.py
+++ b/addons/account/tests/test_account_move_out_invoice.py
@@ -1528,6 +1528,8 @@ def test_out_invoice_line_onchange_cash_rounding_1(self):
         })
 
     def test_out_invoice_line_onchange_currency_1(self):
+        self.other_currency.rounding = 0.001
+
         move_form = Form(self.invoice)
         move_form.currency_id = self.other_currency
         move_form.save()
diff --git a/addons/account/tests/test_account_move_out_refund.py b/addons/account/tests/test_account_move_out_refund.py
index 7680b1e6e4316..8e777e0c74e0e 100644
--- a/addons/account/tests/test_account_move_out_refund.py
+++ b/addons/account/tests/test_account_move_out_refund.py
@@ -590,6 +590,8 @@ def test_out_refund_line_onchange_cash_rounding_1(self):
         })
 
     def test_out_refund_line_onchange_currency_1(self):
+        self.other_currency.rounding = 0.001
+
         move_form = Form(self.invoice)
         move_form.currency_id = self.other_currency
         move_form.save()
diff --git a/addons/account/tests/test_account_move_reconcile.py b/addons/account/tests/test_account_move_reconcile.py
index e0f8c67f690bf..68a663542c46f 100644
--- a/addons/account/tests/test_account_move_reconcile.py
+++ b/addons/account/tests/test_account_move_reconcile.py
@@ -1122,6 +1122,7 @@ def test_reconcile_exchange_difference_on_partial_one_credit_foreign_currency_cr
     def test_reconcile_one_foreign_currency_fallback_company_currency(self):
         comp_curr = self.company_data['currency']
         foreign_curr = self.other_currency_3
+        foreign_curr.rounding = 0.001   # to be able to check the amounts up to the 3rd digit
 
         line_1 = self.create_line_for_reconciliation(-10.0, -10.0, comp_curr, '2017-01-01')
         line_2 = self.create_line_for_reconciliation(1000000.0, 100.0, foreign_curr, '2017-01-01')

From 95314a24a6142eb27cfbe4746492ca031228b6f4 Mon Sep 17 00:00:00 2001
From: Zelong Lin <zel@odoo.com>
Date: Thu, 13 Nov 2025 15:17:01 +0000
Subject: [PATCH 641/673] [FIX] mail: url paste issue in composer

When pasting a URL in the html composer, the link was not being correctly
parsed and converted into a clickable hyperlink.
This commit fixes the issue by ensuring that the LinkPastePlugin is included
in the composer plugin set, allowing for proper link detection and conversion.

Also, this commit forced links to open in a new tab when being parsed with
LinkPlugin.

task-5259858

closes odoo/odoo#235806

X-original-commit: 04794445b368052556d12db91ce2a948ced858a8
Signed-off-by: Zelong Lin (zel) <zel@odoo.com>
---
 .../static/src/core/common/plugin/mail_composer_plugin.js  | 1 +
 addons/mail/static/src/core/common/plugin/plugin_sets.js   | 2 ++
 addons/mail/static/tests/composer/composer.test.js         | 7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js b/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js
index 901fafe25589c..cd7b1f0f978db 100644
--- a/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js
+++ b/addons/mail/static/src/core/common/plugin/mail_composer_plugin.js
@@ -14,6 +14,7 @@ export class MailComposerPlugin extends Plugin {
     resources = {
         before_paste_handlers: this.config.composerPluginDependencies.onBeforePaste.bind(this),
         bypass_paste_image_files: () => true,
+        create_link_handlers: (linkEl) => (linkEl.target = "_blank"),
         hints: [
             withSequence(1, {
                 selector: `.odoo-editor-editable > ${baseContainerGlobalSelector}:only-child`,
diff --git a/addons/mail/static/src/core/common/plugin/plugin_sets.js b/addons/mail/static/src/core/common/plugin/plugin_sets.js
index 1bdfe54359f37..ef43badc24615 100644
--- a/addons/mail/static/src/core/common/plugin/plugin_sets.js
+++ b/addons/mail/static/src/core/common/plugin/plugin_sets.js
@@ -4,6 +4,7 @@ import { CORE_PLUGINS } from "@html_editor/plugin_sets";
 import { FeffPlugin } from "@html_editor/main/feff_plugin";
 import { HintPlugin } from "@html_editor/main/hint_plugin";
 import { InlineCodePlugin } from "@html_editor/main/inline_code";
+import { LinkPastePlugin } from "@html_editor/main/link/link_paste_plugin";
 import { LinkPlugin } from "@html_editor/main/link/link_plugin";
 import { ShortCutPlugin } from "@html_editor/core/shortcut_plugin";
 import { TabulationPlugin } from "@html_editor/main/tabulation_plugin";
@@ -19,6 +20,7 @@ export const MAIL_CORE_PLUGINS = [
     FeffPlugin,
     HintPlugin,
     InlineCodePlugin,
+    LinkPastePlugin,
     LinkPlugin,
     MailComposerPlugin,
     MentionPlugin,
diff --git a/addons/mail/static/tests/composer/composer.test.js b/addons/mail/static/tests/composer/composer.test.js
index c0bbf70e5ad39..2a95358653fd9 100644
--- a/addons/mail/static/tests/composer/composer.test.js
+++ b/addons/mail/static/tests/composer/composer.test.js
@@ -1,5 +1,6 @@
 import {
     insertText as htmlInsertText,
+    pasteText,
     tripleClick,
 } from "@html_editor/../tests/_helpers/user_actions";
 
@@ -1661,5 +1662,9 @@ test("parse link correctly in html composer", async () => {
     await contains(editor.editable, { text: "www.google.com", count: 1 });
     await contains(editor.editable.querySelector("a"), { text: "www.google.com", count: 0 });
     await htmlInsertText(editor, " ");
-    await contains(editor.editable.querySelector("a"), { text: "www.google.com" });
+    await contains(editor.editable.querySelector("a[target='_blank']"), { text: "www.google.com" });
+    await press("Enter");
+    await contains(editor.editable, { text: "www.google.com", count: 0 });
+    await pasteText(editor, "www.baidu.com");
+    await contains(editor.editable.querySelector("a[target='_blank']"), { text: "www.baidu.com" });
 });

From 89786c93b60dc811e12ea19bf230dce9091fd5e0 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Fri, 14 Nov 2025 08:01:47 +0000
Subject: [PATCH 642/673] [FIX] hr: display job title instead of job position
 in employee public

Before this commit, the job title is no longer displayed in employee
public views since the merge of contract and version.

This commit adds the job title in the employee public kanban and form
views.

task-5264472

closes odoo/odoo#235805

X-original-commit: 37dfb763be8ada70603d39ab2439c2f8e5733cae
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
---
 addons/hr/views/hr_employee_public_views.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr/views/hr_employee_public_views.xml b/addons/hr/views/hr_employee_public_views.xml
index 4e4cf945c7369..00437cea0c224 100644
--- a/addons/hr/views/hr_employee_public_views.xml
+++ b/addons/hr/views/hr_employee_public_views.xml
@@ -13,7 +13,8 @@
                         <field name="department_id" icon="fa-users" enable_counters="1"/>
                     </searchpanel>
                     <field name="parent_id" string="Manager" domain="[('company_id', 'in', allowed_company_ids)]"/>
-                    <field name="job_id"/>
+                    <field name="job_title"/>
+                    <field name="job_id" invisible="1"/>
                     <separator/>
                     <filter name="my_team" string="My Team" domain="[('parent_id.user_id', '=', uid)]"/>
                     <filter name="my_department" string="My Department" domain="[('member_of_department', '=', True)]"/>
@@ -98,7 +99,8 @@
                                         <group string="work">
                                             <field name="company_id" groups="base.group_multi_company"/>
                                             <field name="department_id"/>
-                                            <field name="job_id" string="Job Position" context="{'default_no_of_recruitment': 0, 'default_is_favorite': False}" placeholder="e.g. Sales Manager"/>
+                                            <field name="job_title" string="Job Title"/>
+                                            <field name="job_id" string="Job Position" context="{'default_no_of_recruitment': 0, 'default_is_favorite': False}" placeholder="e.g. Sales Manager" invisible="1"/>
                                             <field name="parent_id" widget="many2one_avatar_employee"/>
                                         </group>
                                         <group string="Location" name="location">
@@ -189,7 +191,8 @@
                                     </div>
                                     <field class="fw-bolder" name="name" placeholder="Employee's Name"/>
                                 </div>
-                                <field t-if="record.job_id.raw_value" name="job_id"/>
+                                <field t-if="record.job_title.raw_value" name="job_title"/>
+                                <field t-elif="record.job_id.raw_value" name="job_id"/>
                                 <div t-if="record.work_email.raw_value" class="text-truncate">
                                     <i class="fa fa-fw me-2 fa-envelope text-primary" title="Email"/>
                                     <field name="work_email"/>

From d7b4ec95895e1c7b1da5883bd43a8c68869fb27d Mon Sep 17 00:00:00 2001
From: "Maruan Aguerdouh (magm)" <magm@odoo.com>
Date: Thu, 13 Nov 2025 11:09:44 +0000
Subject: [PATCH 643/673] [FIX] event: set total price in event registration
 email
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Steps to reproduce:

1. Create a new sale order with an event ticket line
2. Apply a 100% discount on the ticket line
3. Confirm the sale order
4. Check on the new attendee created, the mail sent
to the attendee.

Current behavior:
The email shows the unit price without the discount applied which
can be confusing for the customer as it might look like they
need to pay that amount.

After this commit:
The email will just show the confirmation of the registration
to the event withouth mentioning the price when the total price
is 0.

opw-5122776

closes odoo/odoo#235814

X-original-commit: cfdb48afd0c445a62eb15f7838497ed804d5f1c1
Signed-off-by: Jérémy Hennecart (jeh) <jeh@odoo.com>
---
 addons/event/data/mail_template_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/data/mail_template_data.xml b/addons/event/data/mail_template_data.xml
index 969b796bc4c03..24536adb69954 100644
--- a/addons/event/data/mail_template_data.xml
+++ b/addons/event/data/mail_template_data.xml
@@ -347,8 +347,8 @@
                         <br/>
                         The order for this ticket has reference <t t-out="object.sale_order_id.name"/>
                         and was placed on <t t-out="object.sale_order_id.date_order.date()"/>
-                        <t t-if="object.sale_order_line_id.price_unit"> for an amount of
-                            <t t-out="object.sale_order_line_id.price_unit" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
+                        <t t-if="object.sale_order_line_id.price_total"> for an amount of
+                            <t t-out="object.sale_order_line_id.price_total" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
                         </t>.
                     </div>
                     <br/>

From 56ac3b352ba3ef065c6805d5dd00302bda32591e Mon Sep 17 00:00:00 2001
From: "Levi Siuzdak (sile)" <sile@odoo.com>
Date: Tue, 21 Oct 2025 09:46:09 +0000
Subject: [PATCH 644/673] [FIX] l10n_ar_website_sale: update Argentinian no-tax
 price on website

Versions
--------
- saas-18.4+

Steps
-----
1. Have a company with Argentinian localization;
2. in Website settings, enable "Display Price without National Taxes";
3. add a quantity-based fixed price on the website's pricelist;
4. go to a product page where the fixed price can be applied;
5. increase quantity so the fixed price should apply.

Issue
-----
The price without national taxes isn't getting updated.

Cause
-----
In the `_get_additional_combination_info` override, the given `quantity`
gets ignored, as well as the pricelist price for product variants,
instead defaulting to their `lst_price`.

Solution
--------
Pass the quantity to `_compute_price_rule`, and use the result for both
templates & variants.

opw-5040056

closes odoo/odoo#235791

X-original-commit: 2c1438990723b6a33eaaa5a2071572740d986829
Signed-off-by: Laurent Smet (las) <las@odoo.com>
Signed-off-by: Levi Siuzdak <sile@odoo.com>
---
 .../models/product_template.py                | 14 ++--
 .../tests/test_l10n_ar_website_sale.py        | 71 +++++++++++++------
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/addons/l10n_ar_website_sale/models/product_template.py b/addons/l10n_ar_website_sale/models/product_template.py
index 647ca1a903b12..7010b3d426ad5 100644
--- a/addons/l10n_ar_website_sale/models/product_template.py
+++ b/addons/l10n_ar_website_sale/models/product_template.py
@@ -16,8 +16,6 @@ def _get_sales_prices(self, website):
         '''
 
         res = super()._get_sales_prices(website)
-        fiscal_position_id = request.fiscal_position
-        pricelist_prices = request.pricelist._compute_price_rule(self, 1.0)
 
         if (
             website
@@ -25,11 +23,12 @@ def _get_sales_prices(self, website):
             and website.l10n_ar_website_sale_show_both_prices
             and website.show_line_subtotals_tax_selection == 'tax_included'
         ):
+            pricelist_prices = request.pricelist._compute_price_rule(self, 1.0)
             for template_id, template_val in res.items():
                 # Get applicable taxes for the product and map them using the website's FPOS
                 template = self.env['product.template'].browse(template_id)
                 product_taxes = template.sudo().taxes_id._filter_taxes_by_company(self.env.company)
-                mapped_taxes = fiscal_position_id.map_tax(product_taxes)
+                mapped_taxes = request.fiscal_position.map_tax(product_taxes)
 
                 # Compute the tax-excluded value
                 total_excluded_value = mapped_taxes.compute_all(
@@ -47,8 +46,6 @@ def _get_additionnal_combination_info(self, product_or_template, quantity, uom,
         combination_info = super()._get_additionnal_combination_info(
             product_or_template, quantity, uom, date, website
         )
-        pricelist_prices = request.pricelist._compute_price_rule(self, 1.0)
-
         if (
             website
             and website.company_id.country_code == 'AR'
@@ -60,11 +57,8 @@ def _get_additionnal_combination_info(self, product_or_template, quantity, uom,
             mapped_taxes = request.fiscal_position.map_tax(product_taxes)
 
             # Compute price per unit of product or template
-            unit_price = (
-                pricelist_prices[self.id][0]
-                if product_or_template._name == 'product.template'
-                else product_or_template.lst_price
-            )
+            pricelist_prices = request.pricelist._compute_price_rule(product_or_template, quantity)
+            unit_price = pricelist_prices[product_or_template.id][0]
 
             # Compute the tax-excluded value
             total_excluded_value = mapped_taxes.compute_all(
diff --git a/addons/l10n_ar_website_sale/tests/test_l10n_ar_website_sale.py b/addons/l10n_ar_website_sale/tests/test_l10n_ar_website_sale.py
index 56ef9f4a8b231..d935cc47cb6f7 100644
--- a/addons/l10n_ar_website_sale/tests/test_l10n_ar_website_sale.py
+++ b/addons/l10n_ar_website_sale/tests/test_l10n_ar_website_sale.py
@@ -1,8 +1,8 @@
-from datetime import datetime
+from odoo.fields import Command, Datetime
+from odoo.tests import tagged
 
 from odoo.addons.l10n_ar.tests.common import TestAr
 from odoo.addons.website_sale.tests.common import MockRequest
-from odoo.tests import tagged
 
 
 @tagged('post_install_l10n', 'post_install', '-at_install')
@@ -32,16 +32,15 @@ def setUpClass(cls):
             'name': 'Color',
             'display_type': 'color',
         })
-        cls.color_white = cls.env['product.attribute.value'].create({
+        cls.color_white, cls.color_black = cls.env['product.attribute.value'].create([{
             'name': 'White',
             'html_color': '#FFFFFF',
             'attribute_id': cls.color_attribute.id,
-        })
-        cls.color_black = cls.env['product.attribute.value'].create({
+        }, {
             'name': 'Black',
             'html_color': '#000000',
             'attribute_id': cls.color_attribute.id,
-        })
+        }])
 
     def assertDictContains(self, actual_dict, expected_subset):
         """Assert that actual_dict contains all key-value pairs from expected_subset."""
@@ -55,8 +54,8 @@ def _get_combination_info(self, product_id=None, quantity=1):
                 product_or_template=product_id or self.product_1,
                 quantity=quantity,
                 uom=self.uom_unit,
-                date=datetime(2025, 5, 21),
-                website=self.ar_website
+                date=Datetime.today(),
+                website=self.ar_website,
             )
 
     def test_default_website_sale_legal_values(self):
@@ -73,21 +72,47 @@ def test_price_calculation_with_tax_changes(self):
                 'l10n_ar_price_tax_excluded': 1000.00,
             })
 
-        with self.cr.savepoint():
-            with self.subTest(scenario="Mixed taxes - 10.5% excluded + 27% included"):
-                template = self.env['account.chart.template']
-                tax_27_included = template.ref('ri_tax_vat_27_ventas')
-                tax_10_5_excluded = template.ref('ri_tax_vat_10_ventas')
-
-                tax_27_included.price_include = True
-                tax_10_5_excluded.price_include = False
-
-                self.product_1.taxes_id = (tax_27_included + tax_10_5_excluded).ids
-                combo = self._get_combination_info()
-                self.assertDictContains(combo, {
-                    'list_price': 1082.68,                 # Computed price including all taxes
-                    'l10n_ar_price_tax_excluded': 787.40,  # Reverse calculated base price
-                })
+        with self.subTest(scenario="Mixed taxes - 10.5% excluded + 27% included"):
+            AccountChartTemplate = self.env['account.chart.template']
+            tax_27_included = AccountChartTemplate.ref('ri_tax_vat_27_ventas')
+            tax_10_5_excluded = AccountChartTemplate.ref('ri_tax_vat_10_ventas')
+
+            tax_27_included.price_include = True
+            tax_10_5_excluded.price_include = False
+
+            self.product_1.taxes_id = tax_27_included + tax_10_5_excluded
+            combo = self._get_combination_info()
+            self.assertDictContains(combo, {
+                'list_price': 1082.68,                 # Computed price including all taxes
+                'l10n_ar_price_tax_excluded': 787.40,  # Reverse calculated base price
+            })
+
+    def test_price_calculation_with_pricelist_rules(self):
+        """Check that pricelist rules are taken into account."""
+        self._enable_pricelists()
+        self.pricelist.update({
+            'website_id': self.ar_website.id,
+            'item_ids': [
+                Command.create({
+                    'compute_price': 'fixed',
+                    'fixed_price': 888.0,
+                    'min_quantity': 5.0,
+                    'applied_on': '1_product',
+                    'product_tmpl_id': self.product_1.id,
+                }),
+                Command.create({
+                    'compute_price': 'formula',
+                    'price_surcharge': 2.0,
+                    'applied_on': '3_global',
+                }),
+            ],
+        })
+
+        info_qty_3 = self._get_combination_info(quantity=3)
+        self.assertEqual(info_qty_3['l10n_ar_price_tax_excluded'], 1002.0)
+
+        info_qty_5 = self._get_combination_info(quantity=5)
+        self.assertEqual(info_qty_5['l10n_ar_price_tax_excluded'], 888.0)
 
     def test_product_variant_prices_with_attributes(self):
         """Test variant-specific price calculation with color attribute values."""

From 5562ba912cfc5b4be7c470ca39b2bb85d63aa8a0 Mon Sep 17 00:00:00 2001
From: utma-odoo <utma@odoo.com>
Date: Mon, 3 Nov 2025 12:08:41 +0000
Subject: [PATCH 645/673] [FIX] account: prevent error when adding an
 attachment after saving email template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, an error occurs when trying to add an attachment after saving an
invoice email as a template in the Send wizard.

Steps to produce:
- Install the account module.
- Create a new invoice, fill in all required details, then confirm and click Send.
- Click the three-dot (⋮) menu and select Save as Template, enter a name,
  and save the template.
- Try to add an attachment.

Error:
AttributeError: 'account.move.send.wizard' object has no attribute '_mail_post_access'
AttributeError: 'account.move.send.wizard' object has no attribute '_get_thread_with_access'

Root cause:
At[1], the code sets a new `template_id` when the template is saved. This
triggers _compute_model() at [2], which updates the model field to
`account.move.send.wizard` instead of `account.move`, using the `active_model`
context, causing the error.

Fix:
This commit ensures that after saving a mail template, the wizard retains the
correct model, same as [3], and prevents the attachment upload error.

[1]:
https://github.com/odoo/odoo/blob/5c6afcbffb49803a03e3a384ed60de68093dca04/addons/account/wizard/account_move_send_wizard.py#L296

[2]:
https://github.com/odoo/odoo/blob/5c6afcbffb49803a03e3a384ed60de68093dca04/addons/account/wizard/account_move_send_wizard.py#L244-L248

[3]:
https://github.com/odoo/odoo/blob/5c6afcbffb49803a03e3a384ed60de68093dca04/addons/mail/wizard/mail_compose_message.py#L380-L389

sentry-6987172677

closes odoo/odoo#235811

X-original-commit: 591eca1cfd3597f2ad8227fc2a947072c924c15a
Signed-off-by: de Wouters de Bouchout Jean-Benoît (jbw) <jbw@odoo.com>
Signed-off-by: Utsav Maru (utma) <utma@odoo.com>
---
 addons/account/wizard/account_move_send_wizard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/account/wizard/account_move_send_wizard.py b/addons/account/wizard/account_move_send_wizard.py
index a70f51ca7c35d..4c5d515cdad3e 100644
--- a/addons/account/wizard/account_move_send_wizard.py
+++ b/addons/account/wizard/account_move_send_wizard.py
@@ -246,6 +246,8 @@ def _compute_res_ids(self):
     @api.depends('template_id')
     def _compute_model(self):
         for wizard in self:
+            if wizard.model:
+                continue
             wizard.model = self.env.context.get('active_model')
 
     # Similar of mail.compose.message

From 9a8b8952cb20f0aff5776defdb7bb3fbc4123e17 Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Thu, 13 Nov 2025 23:40:17 +0000
Subject: [PATCH 646/673] [FIX] account: deduplicate res.partner
 fiscal_country_codes

Recently we started considering `country_code` as part of the
`fiscal_country_codes` [1]. Because of this, the field can now contain
duplicates. If your active company is a US one, and you set United
States as the country on the partner you end up with `US,US`.

It breaks some (admittedly fragile) invisible conditions on the
`res.partner` form view [2]. Although we could fix those conditions, it
would require everyone to update the module, and having duplicate
country codes in `fiscal_country_codes` field doesn't serve any purpose
anyway.

[1] https://github.com/odoo/odoo/pull/229584
[2] https://github.com/odoo/enterprise/pull/62615

opw-5248844
opw-5241556

closes odoo/odoo#235829

X-original-commit: 5f7c9762900d46732f10a3e67cffa2b99ec8f6f9
Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
---
 addons/account/models/partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index 9746140a50d4e..6d30276de8161 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -345,7 +345,7 @@ def _compute_fiscal_country_codes(self):
             country_codes = allowed_companies.mapped('account_fiscal_country_id.code')
             if record.country_code:
                 country_codes.append(record.country_code)
-            record.fiscal_country_codes = ",".join(country_codes)
+            record.fiscal_country_codes = ",".join(set(country_codes))
 
     @api.depends('company_id')
     @api.depends_context('allowed_company_ids')

From c74d58a98d11530f9266339c081dfae8136d4282 Mon Sep 17 00:00:00 2001
From: Quentin Wolfs <quwo@odoo.com>
Date: Thu, 13 Nov 2025 09:00:28 +0000
Subject: [PATCH 647/673] [FIX] mrp_account: generate correct cogs when kit
 dropship avco comp

**Problem:**
When confirming the invoice of an order delivered via dropship for some kit bom
product with fifo/avco comp, if the price was manually set on the purchase order,
the invoice lines generated for the cogs are inaccurate

**Steps to reproduce:**
- In settings enable dropshipping
- Create a kit product with one component (both storable).
- Set the route as Dropship for the component.
- add a vendor in the purchase tab of the component.
- set the cost of the component at 2
- and set an on hand quanity
- Set the product category to AVCO and perpetual for the
component and the product.
- Set the cost to 5 on the product.
- Create and confirm a sales order with a quantity
of 2 for the product.
- On the purchase order set the unit price at 20 for the component.
- Confirm the purchase order, then validate the delivery and
create the customer invoice.
- Confirm the invoice

**Current behavior:**
In the journal items tab of the invoice the lines for the cogs (expenses
and stock interim) have a value of 10

**Expected behavior:**
The value should be 40, in accordance with the purchase order

**Cause of the issue:**
In this forward port, the fix is different.
- Prior to this commit https://github.com/odoo/odoo/pull/222169/commits,
the cogs of a dropship kit were handled in this way:
When _stock_account_prepare_anglo_saxon_out_lines_vals() computes the
price_unit, it calls _stock_account_get_anglo_saxon_price_unit().
https://github.com/odoo/odoo/blob/88043b84f7a017dfff790deeb64510fc62698c96/addons/stock_account/models/account_move.py#L131
For regular kits, the sale_mrp override of this method computes the correct
price. But for dropshipped kits, because the moves are generated
from the purchase order, they do not have a bom linked, so the
variable 'boms' is empty and the override do not modify price_unit.
https://github.com/odoo/odoo/blob/88043b84f7a017dfff790deeb64510fc62698c96/addons/sale_mrp/models/account_move.py#L17-L18
However, the sale_stock override of this method calls
_compute_average_price()
https://github.com/odoo/odoo/blob/88043b84f7a017dfff790deeb64510fc62698c96/addons/sale_stock/models/account_move.py#L212
The computation is handled in the mrp_account override, because
the product of the moves is different than self (because it's a kit).
There, for each component there is a call to _compute_average_price().
https://github.com/odoo/odoo/blob/88043b84f7a017dfff790deeb64510fc62698c96/addons/mrp_account/models/product.py#L73
This time the computation is done in the super method where the value
is computed based on the stock.valuation.layer created by the purchase
order.
So the price taken into account is, rightly so, the one of the purchase order.

As the issue was largely modified due to the refactor of the stock
valuation in 19.0, this has been fixed as part of #233488.
However, we propagate the test to include the change of behavior
regarding the location of the expense lines in the PO/SO bill/invoices.

opw-4985440

closes odoo/odoo#235836

X-original-commit: 25399bffa9e0fb3adec5a604aed602896f7381d6
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
---
 .../tests/test_anglo_saxon_valuation.py       | 58 +++++++++++--------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/addons/mrp_subcontracting_dropshipping/tests/test_anglo_saxon_valuation.py b/addons/mrp_subcontracting_dropshipping/tests/test_anglo_saxon_valuation.py
index a7c4a5cce18b4..28b50aef82fe1 100644
--- a/addons/mrp_subcontracting_dropshipping/tests/test_anglo_saxon_valuation.py
+++ b/addons/mrp_subcontracting_dropshipping/tests/test_anglo_saxon_valuation.py
@@ -227,13 +227,18 @@ def test_account_line_entry_kit_bom_dropship(self):
             'product_qty': 1.0,
             'type': 'phantom',
         })
-        kit_bom.bom_line_ids = [(0, 0, {
-            'product_id': self.product_b.id,
-            'product_qty': 4,
-        }), (0, 0, {
-            'product_id': product_c.id,
-            'product_qty': 2,
-        })]
+        # bom line of product_c is expressed in unit to check the uom conversion (24 unit should give the same result as 2 dozens)
+        kit_bom.bom_line_ids = [
+            Command.create({
+                'product_id': self.product_b.id,
+                'product_qty': 4,
+            }),
+            Command.create({
+                'product_id': product_c.id,
+                'product_qty': 24,
+                'product_uom_id': self.env.ref('uom.product_uom_unit').id
+            }),
+        ]
 
         self.env['product.supplierinfo'].create({
             'product_id': self.product_b.id,
@@ -245,7 +250,7 @@ def test_account_line_entry_kit_bom_dropship(self):
             'partner_id': self.partner_a.id,
             'price': 100,
         })
-
+        self.product_b.standard_price = 10
         (kit_final_prod + self.product_b).categ_id.write({
             'property_cost_method': 'fifo',
             'property_valuation': 'real_time',
@@ -253,7 +258,7 @@ def test_account_line_entry_kit_bom_dropship(self):
 
         sale_order = self.env['sale.order'].sudo().create({
             'partner_id': self.partner_b.id,
-            'order_line': [(0, 0, {
+            'order_line': [Command.create({
                 'price_unit': 900,
                 'product_id': kit_final_prod.id,
                 'route_ids': [Command.link(self.dropship_route.id)],
@@ -264,24 +269,31 @@ def test_account_line_entry_kit_bom_dropship(self):
         purchase_order = sale_order._get_purchase_orders()[0]
         purchase_order.button_confirm()
         dropship_transfer = purchase_order.picking_ids[0]
-        dropship_transfer.move_ids[0].quantity = 2.0
         dropship_transfer.button_validate()
 
-        account_move = sale_order._create_invoices()
-        account_move.action_post()
+        purchase_order.action_create_invoice()
+        bill = purchase_order.invoice_ids
+        bill.action_post()
+        invoice = sale_order._create_invoices()
+        invoice.action_post()
 
         # Each product_a should cost:
         # 4x product_b = 160 * 4 = 640 +
         # 2x product_c = 100 * 2 = 200
         #                        = 840
-        self.assertRecordValues(
-            account_move.line_ids.sorted('balance'),
-            [
-                {'name': 'product_a',                                               'debit': 0.0,       'credit': 1800.0},
-                {'name': 'product_a',                                               'debit': 0.0,       'credit': 1680.0},
-                {'name': '15% (Copy)',                                              'debit': 0.0,       'credit': 270.0},
-                {'name': f'{sale_order.name} - {account_move.name} installment #1', 'debit': 621.0,     'credit': 0.0},
-                {'name': f'{sale_order.name} - {account_move.name} installment #2', 'debit': 1449.0,    'credit': 0.0},
-                {'name': 'product_a',                                               'debit': 1680.0,    'credit': 0.0},
-            ]
-        )
+
+        # Since the kit is dropshipped, the expense should be recorded in the PO directly, as it never enter the stock.
+        self.assertRecordValues(bill.line_ids.sorted('balance'), [
+            {'name': False,          'account_name': 'Account Payable',   'debit': 0.0,      'credit': 2184.0},
+            {'name': '15%',          'account_name': 'Tax Paid',          'debit': 252.0,    'credit': 0.0},
+            {'name': '15% (copy)',   'account_name': 'Tax Paid',          'debit': 252.0,    'credit': 0.0},
+            {'name': 'product_c',    'account_name': 'Expenses',          'debit': 400.0,    'credit': 0.0},
+            {'name': 'product_b',    'account_name': 'Expenses',          'debit': 1280.0,   'credit': 0.0},
+        ])
+
+        self.assertRecordValues(invoice.line_ids.sorted('balance'), [
+            {'name': 'product_a',                                            'account_name': 'Product Sales',               'debit': 0.0,      'credit': 1800.0},
+            {'name': '15% (copy)',                                           'account_name': 'Tax Received',                'debit': 0.0,      'credit': 270.0},
+            {'name': f'{sale_order.name} - {invoice.name} installment #1',   'account_name': 'Account Receivable (copy)',   'debit': 621.0,    'credit': 0.0},
+            {'name': f'{sale_order.name} - {invoice.name} installment #2',   'account_name': 'Account Receivable (copy)',   'debit': 1449.0,   'credit': 0.0},
+        ])

From 0b7885050ef2316e0ce6c19295b324bb2e3c7270 Mon Sep 17 00:00:00 2001
From: dhha-odoo <dhha@odoo.com>
Date: Tue, 29 Jul 2025 10:22:53 +0000
Subject: [PATCH 648/673] [FIX] purchase: prevent cancellation of locked
 purchase orders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue before this commit:
==========================
Locked purchase orders could still be cancelled, which defeats
the purpose of locking them.

Steps to reproduce:
==========================
1. Install the `purchase` module.
2. Enable "Lock Confirmed Orders" in the configuration.
3. Create and confirm a purchase order.
4. Lock the purchase order.
5. Try to cancel it → the PO still gets cancelled despite being locked.

After this commit:
===========================
Cancelling a locked purchase order is no longer allowed. If a user tries to
cancel a locked PO, a UserError will be raised instructing them to unlock
it first. Locking a purchase order is intended to prevent accidental
changes, including edits and cancellations, once the order is confirmed.

With this change, users must explicitly unlock a purchase order
before cancelling it, ensuring better control and data integrity.

closes odoo/odoo#235839

Taskid: 4760864
X-original-commit: ca2783068d3ad9cc6a8c896092f0578b51d9a5db
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
---
 addons/purchase/models/purchase_order.py |  4 ++++
 addons/purchase/tests/test_purchase.py   | 22 ++++++++++++++++++++++
 addons/purchase/views/purchase_views.xml |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/models/purchase_order.py b/addons/purchase/models/purchase_order.py
index 20438c13791ec..dc03e6e97b97a 100644
--- a/addons/purchase/models/purchase_order.py
+++ b/addons/purchase/models/purchase_order.py
@@ -619,6 +619,10 @@ def button_confirm(self):
         return True
 
     def button_cancel(self):
+        locked_purchase_orders = self.filtered(lambda po: po.locked)
+        if locked_purchase_orders:
+            raise UserError(self.env._("Unable to cancel purchase order(s): %s. You must first unlock them.", locked_purchase_orders.mapped('display_name')))
+
         purchase_orders_with_invoices = self.filtered(lambda po: any(i.state not in ('cancel', 'draft') for i in po.invoice_ids))
         if purchase_orders_with_invoices:
             raise UserError(_("Unable to cancel purchase order(s): %s. You must first cancel their related vendor bills.", purchase_orders_with_invoices.mapped('display_name')))
diff --git a/addons/purchase/tests/test_purchase.py b/addons/purchase/tests/test_purchase.py
index c6dbe93d80173..95db5eda8970b 100644
--- a/addons/purchase/tests/test_purchase.py
+++ b/addons/purchase/tests/test_purchase.py
@@ -1144,3 +1144,25 @@ def test_purchase_order_line_without_uom(self):
             uom_test.unlink()
 
         self.assertEqual(po.order_line[0].product_uom_id, uom_test)
+
+    def test_locked_purchase_order_cannot_cancel(self):
+        """Test that a locked purchase order cannot be cancelled.
+        A purchase order must be unlocked before it can be cancelled.
+        """
+        po = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+        })
+        po.button_confirm()
+        self.assertFalse(po.locked)
+        # Lock the purchase order.
+        po.button_lock()
+        self.assertTrue(po.locked, "The purchase order should be locked.")
+
+        # Try to cancel the locked PO, should raise a UserError.
+        with self.assertRaises(UserError):
+            po.button_cancel()
+
+        # Unlock the PO and then cancel it, should succeed.
+        po.button_unlock()
+        po.button_cancel()
+        self.assertEqual(po.state, 'cancel', "The purchase order should be cancelled.")
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index edd238b667097..23d53a62d9d57 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -142,7 +142,7 @@
                     <button name="button_draft" invisible="state != 'cancel'" string="Set to Draft" type="object" data-hotkey="o"/>
                     <button name="print_quotation" string="Print" type="object" groups="base.group_user" data-hotkey="k" invisible="state == 'purchase'"/>
                     <button name="%(purchase.action_report_purchase_order)d" string="Print" type="action" groups="base.group_user" data-hotkey="k" invisible="state != 'purchase'"/>
-                    <button name="button_cancel" invisible="state not in ('draft', 'to approve', 'sent', 'purchase')" string="Cancel" type="object" data-hotkey="x" />
+                    <button name="button_cancel" invisible="state not in ('draft', 'to approve', 'sent', 'purchase') or locked" string="Cancel" type="object" data-hotkey="x"/>
                     <button name="button_lock" type="object" string="Lock" invisible="locked or state != 'purchase' or not lock_confirmed_po == 'lock'" data-hotkey="l"/>
                     <button name="button_unlock" type="object" string="Unlock" invisible="not locked" groups="purchase.group_purchase_manager" data-hotkey="l"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,purchase" readonly="1"/>

From 555ce602a85a7c3b29bdae1b2380cfe4f0c1c22e Mon Sep 17 00:00:00 2001
From: David Monjoie <dmo@odoo.com>
Date: Wed, 12 Nov 2025 13:09:21 +0000
Subject: [PATCH 649/673] [FIX] html_editor: fix non-deterministic tests

Split the test timer between the four tests rather than applying
a single timer over all of them, for when the runbot is slower.

runbot-233772

closes odoo/odoo#235835

X-original-commit: 2346d0048e1287821bf5cf6787f4128b70ebd43a
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../html_editor/static/tests/list/delete_backward.test.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/html_editor/static/tests/list/delete_backward.test.js b/addons/html_editor/static/tests/list/delete_backward.test.js
index 05d6f18d8eb0d..12326a3035b3b 100644
--- a/addons/html_editor/static/tests/list/delete_backward.test.js
+++ b/addons/html_editor/static/tests/list/delete_backward.test.js
@@ -1925,7 +1925,7 @@ describe("Selection collapsed", () => {
             });
         });
         describe("Unordered to checklist", () => {
-            test("should merge an unordered list into an checklist list", async () => {
+            test("should merge an unordered list into an checklist list (1)", async () => {
                 await testEditor({
                     contentBefore:
                         '<ul class="o_checklist"><li class="o_checked">a</li></ul><ul><li>[]b</li></ul>',
@@ -1936,6 +1936,8 @@ describe("Selection collapsed", () => {
                     },
                     contentAfter: '<ul class="o_checklist"><li class="o_checked">a[]b</li></ul>',
                 });
+            });
+            test("should merge an unordered list into an checklist list (2)", async () => {
                 await testEditor({
                     contentBefore:
                         '<ul class="o_checklist"><li class="o_checked">a</li></ul><ul><li><p>[]b</p></li></ul>',
@@ -1947,6 +1949,8 @@ describe("Selection collapsed", () => {
                     // Paragraphs in list items are treated as nonsense.
                     contentAfter: '<ul class="o_checklist"><li class="o_checked">a[]b</li></ul>',
                 });
+            });
+            test("should merge an unordered list into an checklist list (3)", async () => {
                 await testEditor({
                     contentBefore:
                         '<ul class="o_checklist"><li class="o_checked"><p>a</p></li></ul><ul><li>[]b</li></ul>',
@@ -1959,6 +1963,8 @@ describe("Selection collapsed", () => {
                     contentAfter:
                         '<ul class="o_checklist"><li class="o_checked"><p>a[]b</p></li></ul>',
                 });
+            });
+            test("should merge an unordered list into an checklist list (4)", async () => {
                 await testEditor({
                     contentBefore:
                         '<ul class="o_checklist"><li class="o_checked"><p>a</p></li></ul><ul><li><p>[]b</p></li></ul>',

From 00b3abd00c2ad64d33c7961fc2453937585c1b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 14 Nov 2025 15:00:21 +0000
Subject: [PATCH 650/673] [FIX] mail: reduce eye fatigue when using discuss in
 white theme

Main text color in white theme was increased from gray-700 to
gray-900, increasing the overall contrast of the web client [1].

This change, in addition to reducing the color of message bubble,
has the effect to increase contrast of message list by a lot in
white theme, which leads to complain of eyes being hurt.

This commit reduces the black level of message text content color in
white theme, to match text color as it was before [1].

[1]: https://github.com/odoo/odoo/pull/209125

Part of Task-5265246

closes odoo/odoo#235870

X-original-commit: 3557de4232ebc307c8861379f6573d7b36cd8db6
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/mail/static/src/core/common/composer.xml   | 2 +-
 addons/mail/static/src/core/common/core.dark.scss | 4 ++++
 addons/mail/static/src/core/common/core.scss      | 4 ++++
 addons/mail/static/src/core/common/message.xml    | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/core/common/composer.xml b/addons/mail/static/src/core/common/composer.xml
index 90ca6d16ab017..47e9149f42505 100644
--- a/addons/mail/static/src/core/common/composer.xml
+++ b/addons/mail/static/src/core/common/composer.xml
@@ -74,7 +74,7 @@
                         }"/>
                         <Wysiwyg t-if="composerService.htmlEnabled" class="'w-100 text-break overflow-auto'" config="this.wysiwygConfig" onLoad.bind="onLoadWysiwyg"/>
                         <t t-else="">
-                                <textarea class="o-mail-Composer-input o-mail-Composer-bg shadow-none overflow-auto o-scrollbar-thin text-body user-select-auto"
+                                <textarea class="o-mail-Composer-input o-mail-Composer-bg shadow-none overflow-auto o-scrollbar-thin o-discuss-text-body user-select-auto"
                                 t-att-class="inputClasses"
                                 t-ref="textarea"
                                 t-on-keydown="onKeydown"
diff --git a/addons/mail/static/src/core/common/core.dark.scss b/addons/mail/static/src/core/common/core.dark.scss
index 238cbb8133d0c..1c43e82d63011 100644
--- a/addons/mail/static/src/core/common/core.dark.scss
+++ b/addons/mail/static/src/core/common/core.dark.scss
@@ -10,6 +10,10 @@ a.o-discuss-mention {
     @include o-mention-variant(rgba(lighten($o-action, 5%), .075), rgba(lighten($o-action, 10%), .25), lighten($o-action, 10%), rgba(lighten($o-action, 5%), .075), rgba(lighten($o-action, 10%), .25), lighten($o-action, 10%));
 }
 
+.o-discuss-text-body {
+    color: $o-main-text-color;
+}
+
 .o-secondary {
     --o-secondary: #{$o-gray-700};
 }
diff --git a/addons/mail/static/src/core/common/core.scss b/addons/mail/static/src/core/common/core.scss
index e7cfd71a83ed8..5420596e03191 100644
--- a/addons/mail/static/src/core/common/core.scss
+++ b/addons/mail/static/src/core/common/core.scss
@@ -82,6 +82,10 @@ $o-discuss-talkingColor: lighten($success, 10%);
     opacity: $hr-opacity / 2;
 }
 
+.o-discuss-text-body {
+    color: $gray-700;
+}
+
 .o-discuss-badge, .o-discuss-badgeShape {
     &, & .o-innerBadge {
         display: flex;
diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index 932dc9ee6c58f..5972c93731dbf 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -78,7 +78,7 @@
                                                     <path class="o-mail-Message-bubbleTailBg" fill="currentColor" d="M 2, 1 L 5, 7 V 1 z"/>
                                                 </svg>
                                             </div>
-                                            <div class="position-relative overflow-x-auto overflow-y-hidden d-inline-block text-body" t-att-class="{
+                                            <div class="position-relative overflow-x-auto overflow-y-hidden d-inline-block o-discuss-text-body" t-att-class="{
                                                 'w-100': isEditing,
                                                 'o-rounded-bubble': message.bubbleColor and props.squashed,
                                                 'o-rounded-bottom-bubble': message.bubbleColor and !props.squashed,

From d86b39f103f3bb34e8d95c89308e747d084cf299 Mon Sep 17 00:00:00 2001
From: Xavier ALT <xal@odoo.com>
Date: Fri, 14 Nov 2025 10:09:12 +0000
Subject: [PATCH 651/673] [FIX] payment_adyen: skip amount validation for 3ds
 challenge flow

When Adyen request a 3DS challenge for the payment, we should not
enforce amount and currency validation at that time (no amount
are provided in the Adyen response).

closes odoo/odoo#235868

X-original-commit: 89d24a708d8509570e70107487b83c1a8ba0578e
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
Signed-off-by: Xavier Alt (xal) <xal@odoo.com>
---
 addons/payment_adyen/models/payment_transaction.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/payment_adyen/models/payment_transaction.py b/addons/payment_adyen/models/payment_transaction.py
index c1932b4556bbe..06f93e56351ce 100644
--- a/addons/payment_adyen/models/payment_transaction.py
+++ b/addons/payment_adyen/models/payment_transaction.py
@@ -313,9 +313,9 @@ def _extract_amount_data(self, payment_data):
         if self.provider_code != 'adyen':
             return super()._extract_amount_data(payment_data)
 
-        # Redirection payments don't have the amount or currency in their payment_data, but
-        # processing them results in a pending transaction anyway.
-        if payment_data.get('action', {}).get('type') == 'redirect':
+        # Redirection payments and 3DS challenges don't have the amount or currency in their
+        # payment_data, but processing them results in a pending transaction anyway.
+        if payment_data.get('action', {}).get('type') in ['redirect', 'threeDS2']:
             return None  # Skip the validation
 
         amount_data = payment_data.get('amount', {})

From 8f08f2dc51b9c207a66b4bc500bd5aa98fddd5b4 Mon Sep 17 00:00:00 2001
From: npm <npm@odoo.com>
Date: Mon, 13 Oct 2025 13:48:38 +0000
Subject: [PATCH 652/673] [FIX] hr_holidays: corrected the allocation_type

When creating a new allocation,
selecting "Accrual" with an accrual plan, and then re-selecting "Regular,"
the accrual plan is registered in the backend,
Flush accrual_plan_id when changing the allocation type.

closes odoo/odoo#235889

X-original-commit: ee1a21d9ea9acc273f6f82f396489d77070d5ad6
Signed-off-by: Nimesh Parmar (npm) <npm@odoo.com>
Signed-off-by: Bertrand Dossogne (bedo) <bedo@odoo.com>
---
 .../hr_holidays/models/hr_leave_allocation.py |  4 +++-
 .../tests/test_accrual_allocations.py         | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py
index 0e91ae52fdde0..2f4703c760e28 100644
--- a/addons/hr_holidays/models/hr_leave_allocation.py
+++ b/addons/hr_holidays/models/hr_leave_allocation.py
@@ -285,7 +285,7 @@ def _compute_accrual_plan_id(self):
         )
         accruals_dict = {time_off_type.id: ids for time_off_type, ids in accruals_read_group}
         for allocation in self:
-            if allocation.accrual_plan_id.time_off_type_id.id not in (False, allocation.holiday_status_id.id):
+            if (allocation.allocation_type == 'regular' and allocation.accrual_plan_id) or allocation.accrual_plan_id.time_off_type_id.id not in (False, allocation.holiday_status_id.id):
                 allocation.accrual_plan_id = False
             if allocation.allocation_type == 'accrual' and not allocation.accrual_plan_id:
                 if allocation.holiday_status_id:
@@ -438,6 +438,8 @@ def _process_accrual_plans(self, date_to=False, force_period=False, log=True):
         first_allocation = _("""This allocation have already ran once, any modification won't be effective to the days allocated to the employee. If you need to change the configuration of the allocation, delete and create a new one.""")
         for allocation in self:
             expiration_date = False
+            if allocation.allocation_type != 'accrual':
+                continue
             level_ids = allocation.accrual_plan_id.level_ids.sorted('sequence')
             if not level_ids:
                 continue
diff --git a/addons/hr_holidays/tests/test_accrual_allocations.py b/addons/hr_holidays/tests/test_accrual_allocations.py
index baaab7b122c0a..bcd6479332b66 100644
--- a/addons/hr_holidays/tests/test_accrual_allocations.py
+++ b/addons/hr_holidays/tests/test_accrual_allocations.py
@@ -4358,3 +4358,25 @@ def test_accrual_allocation_date_in_the_future(self):
         self.assertEqual(allocation_data[self.employee_emp][0][1]['virtual_remaining_leaves'], 28, "The carryover did not expire yet so the remaining leaves should be 28")
         allocation_data = leave_type.get_allocation_data(self.employee_emp, '2031-09-01')
         self.assertEqual(allocation_data[self.employee_emp][0][1]['virtual_remaining_leaves'], 23, "The carryover expired after 6 month so the remaining leaves should be 23")
+
+    def test_accrual_plan_cleared_when_switch_to_regular(self):
+        accrual_plan = self.env['hr.leave.accrual.plan'].with_context(tracking_disable=True).create({
+            'name': 'Accrual Plan For Test',
+        })
+        allocation = self.env['hr.leave.allocation'].with_context(tracking_disable=True).create({
+            'name': 'Accrual allocation for employee',
+            'allocation_type': 'accrual',
+            'holiday_status_id': self.leave_type.id,
+            'accrual_plan_id': accrual_plan.id,
+            'employee_id': self.employee_emp.id,
+            'number_of_days': 10,
+        })
+        self.assertEqual(allocation.accrual_plan_id, accrual_plan, "Accrual plan should initially be set.")
+
+        with Form(allocation) as alloc_form:
+            alloc_form.allocation_type = 'regular'
+        self.assertFalse(
+            allocation.accrual_plan_id,
+            "accrual_plan_id should be cleared automatically when type becomes 'regular'."
+        )
+        self.assertEqual(accrual_plan.employees_count, 0, "Accrual plan should not have any linked employees.")

From 7c011fb487af19fe0a84fab48a26ee9441573c7d Mon Sep 17 00:00:00 2001
From: jorv-odoo <jorv@odoo.com>
Date: Fri, 14 Nov 2025 09:36:25 +0000
Subject: [PATCH 653/673] [FIX] mail: add encoding alias for cp-850
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While investigating a few support tickets related to how the l10n_cl
override the fetch mail methods, we noticed a more general issue:

As of now, the payload parsing business logic of Odoo can't handle
emails encoding parts with `charset=cp-850`.

This is due to the fact that `cp-850` is not a accepted/standard encoding
alias for cp850 charsets in python's `encoding` library.

Whether or not a mail stack should generate mail using `charset=cp-850`
or not, we this fix aims at pro-actively declaring `cp-850` as a valid
alias for cp850, so that implicitly the email CPython library can correctly
decode the payloads in emails.

Before this bug:

Sending a mail using `charset=cp-850` would generate a traceback.

Example:
```
From: Sender Name <sender@example.com>
To: Recipient Name <odooalias@example.com>
Subject: Test Email with CP-850 Encoding
Date: Thu, 13 Nov 2025 12:00:00 +0100
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----------=_4987654321-00000000"

This is a multi-part message in MIME format.
------------=_4987654321-00000000
Content-Type: text/plain; charset=cp-850
Content-Transfer-Encoding: quoted-printable

Hallo, dit is een test met een =82 speciale letter.
=
------------=_4987654321-00000000--
```

Would generate:
```
  File "/home/odoo/src/odoo/addons/mail/models/mail_thread.py", line 1398, in message_process
    msg_dict = self.message_parse(message, save_original=save_original)
  File "/home/odoo/src/odoo/addons/mail/models/mail_thread.py", line 1792, in message_parse
    msg_dict.update(self._message_parse_extract_payload(message, msg_dict, save_original=save_original))
  File "/home/odoo/src/odoo/addons/mail/models/mail_thread.py", line 1592, in _message_parse_extract_payload
    content = part.get_content()
  File "/home/odoo/miniconda3/lib/python3.10/email/message.py", line 1096, in get_content
    return content_manager.get_content(self, *args, **kw)
  File "/home/odoo/miniconda3/lib/python3.10/email/contentmanager.py", line 22, in get_content
    return self.get_handlers[maintype](msg, *args, **kw)
  File "/home/odoo/miniconda3/lib/python3.10/email/contentmanager.py", line 67, in get_text_content
    return content.decode(charset, errors=errors)
LookupError: unknown encoding: cp-850
```

After fix:
`content = part.get_content()` correctly handles the `cp-850` alias

PR review:
- added test by reusing `test_message_process_file_encoding`

OPW-5171501
OPW-5247486

closes odoo/odoo#235891

X-original-commit: 5d7bd894ff2b30312d9a0a5094ef08997ea423d0
Signed-off-by: Florian Charlier (flch) <flch@odoo.com>
Signed-off-by: Joel Rodrigues Vitória (jorv) <jorv@odoo.com>
---
 addons/mail/models/mail_thread.py           | 7 +++++++
 addons/test_mail/tests/test_mail_gateway.py | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index edbe473e65938..d88325e51e968 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -6,6 +6,7 @@
 import dateutil
 import email
 import email.policy
+import encodings
 import hashlib
 import hmac
 import json
@@ -51,6 +52,12 @@
 
 _logger = logging.getLogger(__name__)
 
+# monkey-patching encodings so that it will recognize `charset=cp-850` in emails
+# as a correct alias for cp850 when decoding email parts with the email python library.
+# The key "cp_850" will implicitly match "cp_850" and "cp-850"
+# See https://stackoverflow.com/a/51961225
+encodings.aliases.aliases['cp_850'] = 'cp850'
+
 
 class MailThread(models.AbstractModel):
     ''' mail_thread model is meant to be inherited by any model that needs to
diff --git a/addons/test_mail/tests/test_mail_gateway.py b/addons/test_mail/tests/test_mail_gateway.py
index 885e22831710d..b6d17218a4147 100644
--- a/addons/test_mail/tests/test_mail_gateway.py
+++ b/addons/test_mail/tests/test_mail_gateway.py
@@ -1795,7 +1795,7 @@ def test_message_process_fallback(self):
     def test_message_process_file_encoding(self):
         """ Incoming email with file encoding """
         file_content = 'Hello World'
-        for encoding in ['', 'UTF-8', 'UTF-16LE', 'UTF-32BE']:
+        for encoding in ['', 'UTF-8', 'UTF-16LE', 'UTF-32BE', 'cp-850']:
             file_content_b64 = base64.b64encode(file_content.encode(encoding or 'utf-8')).decode()
             record = self.format_and_process(test_mail_data.MAIL_FILE_ENCODING,
                 self.email_from, f'groups@{self.alias_domain}',
@@ -1805,7 +1805,7 @@ def test_message_process_file_encoding(self):
             )
             attachment = record.message_ids.attachment_ids
             self.assertEqual(file_content, attachment.raw.decode(encoding or 'utf-8'))
-            if encoding not in ['', 'UTF-8']:
+            if encoding not in ['', 'UTF-8', 'cp-850']:
                 self.assertNotEqual(file_content, attachment.raw.decode('utf-8'))
 
     def test_message_hebrew_iso8859_8_i(self):

From 209bcf862e0a21a03778cb5fe3f34bb803247acd Mon Sep 17 00:00:00 2001
From: Stanislas Sobieski <sts@odoo.com>
Date: Wed, 12 Nov 2025 16:03:55 +0000
Subject: [PATCH 654/673] [FIX] auth_timeout: adapt update_presence to ws or
 http request

update_presence can both be called in http and with websocket as
explained here:
https://github.com/odoo/odoo/commit/de6de48deb983be910876c6133c2869907c142f7

closes odoo/odoo#235894

X-original-commit: 12ff6fea879af120d33eab1d5e4871cb251f06f4
Signed-off-by: Denis Ledoux (dle) <dle@odoo.com>
Signed-off-by: Stanislas Sobieski (sts) <sts@odoo.com>
---
 addons/auth_timeout/models/ir_websocket.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/auth_timeout/models/ir_websocket.py b/addons/auth_timeout/models/ir_websocket.py
index a860957155d5c..07f8b88a97344 100644
--- a/addons/auth_timeout/models/ir_websocket.py
+++ b/addons/auth_timeout/models/ir_websocket.py
@@ -1,5 +1,5 @@
 from odoo import models
-from odoo.http import root
+from odoo.http import request, root
 from odoo.addons.bus.websocket import wsrequest
 
 
@@ -16,7 +16,10 @@ def _update_mail_presence(self, inactivity_period):
         :param float inactivity_period: Duration of user inactivity in milliseconds.
         :return: None
         """
-        self.env["ir.http"]._set_session_inactivity(wsrequest.session, inactivity_period)
+        #  This method can either be called due to an http (/websocket/update_bus_presence)
+        # or a websocket request.
+        req = request or wsrequest
+        self.env["ir.http"]._set_session_inactivity(req.session, inactivity_period)
         super()._update_mail_presence(inactivity_period)
 
     def _on_websocket_closed(self, cookies):

From f8e8a62972cc452f99f1aba2332d6faa49440fef Mon Sep 17 00:00:00 2001
From: pmah-odoo <pmah@odoo.com>
Date: Thu, 9 Oct 2025 12:27:42 +0000
Subject: [PATCH 655/673] [FIX] mail: call settings select's options text
 visibility and styling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, the call settings dropdown in light mode had several issues:
- Unreadable select options.
- Invisible select arrow icon.
- Barely visible toggle thumb when unchecked.
- Unnecessary border on dropdown click (in both light and dark mode).
- Incorrect spacing on the blur background toggle.

This commit resolves these issues by improving contrast with background color
changes, removing the border, and adjusting the toggle spacing.

task-5163527

closes odoo/odoo#235897

X-original-commit: 576b2e610b5b353efe5baf22f9d93e9d98abce76
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Mahavir Patel (pmah) <pmah@odoo.com>
---
 addons/mail/static/src/core/common/core.scss       | 14 ++++++++++++++
 .../discuss/call/common/quick_video_settings.xml   |  6 +++---
 .../discuss/call/common/quick_voice_settings.xml   | 10 +++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/core/common/core.scss b/addons/mail/static/src/core/common/core.scss
index 5420596e03191..f7424972f185d 100644
--- a/addons/mail/static/src/core/common/core.scss
+++ b/addons/mail/static/src/core/common/core.scss
@@ -66,6 +66,20 @@ $o-discuss-talkingColor: lighten($success, 10%);
         select, .form-check-input {
             border-color: $gray-600;
         }
+
+        .form-select {
+            --#{$prefix}form-select-bg-img: #{escape-svg($form-select-indicator-dark)};
+        }
+
+        .form-switch .form-check-input {
+            &:not(:checked):not(:focus) {
+                --#{$prefix}form-switch-bg: #{escape-svg($form-switch-bg-image-dark)};
+            }
+        }
+
+        select option {
+            background-color: $gray-700;
+        }
     }
 
     .o_bottom_sheet_sheet:has(&) {
diff --git a/addons/mail/static/src/discuss/call/common/quick_video_settings.xml b/addons/mail/static/src/discuss/call/common/quick_video_settings.xml
index cba9450713f7b..fea86ad6166a2 100644
--- a/addons/mail/static/src/discuss/call/common/quick_video_settings.xml
+++ b/addons/mail/static/src/discuss/call/common/quick_video_settings.xml
@@ -3,14 +3,14 @@
 
     <t t-name="discuss.QuickVideoSettings">
         <div class="o-discuss-QuickVideoSettings d-flex flex-column gap-1">
-            <label class="btn d-flex flex-column align-items-baseline">
+            <label class="btn border-transparent d-flex flex-column align-items-baseline">
                 <span class="flex-shrink-0 pe-2">
                     Camera
                 </span>
                 <div class="flex-grow-1"/>
                 <DeviceSelect kind="'videoinput'"/>
             </label>
-            <div t-if="!isBrowserSafari()" class="btn d-flex" t-on-click="() => store.settings.useBlur = !store.settings.useBlur">
+            <div t-if="!isBrowserSafari()" class="btn d-flex gap-2" t-on-click="() => store.settings.useBlur = !store.settings.useBlur">
                 <label class="d-flex align-items-center flex-wrap mw-100 cursor-pointer gap-2">
                     <i class="fa fa-fw fa-photo"/><span class="text-truncate text-wrap">Blur background</span>
                 </label>
@@ -19,7 +19,7 @@
                     <input class="form-check-input" type="checkbox" role="switch" t-att-checked="store.settings?.useBlur ? 'checked' : ''"/>
                 </div>
             </div>
-            <button class="btn d-flex align-items-center gap-2" t-on-click="onClickVideoSettings">
+            <button class="btn border-transparent d-flex align-items-center gap-2" t-on-click="onClickVideoSettings">
                 <i class="fa fa-fw fa-gear"/><span>Video Settings</span>
             </button>
         </div>
diff --git a/addons/mail/static/src/discuss/call/common/quick_voice_settings.xml b/addons/mail/static/src/discuss/call/common/quick_voice_settings.xml
index 8d22a13a30a7e..6cdabd0f872b6 100644
--- a/addons/mail/static/src/discuss/call/common/quick_voice_settings.xml
+++ b/addons/mail/static/src/discuss/call/common/quick_voice_settings.xml
@@ -3,21 +3,21 @@
 
     <t t-name="discuss.QuickVoiceSettings">
         <div class="o-discuss-QuickVoiceSettings d-flex flex-column gap-1">
-            <label class="btn d-flex flex-column align-items-baseline">
+            <label class="btn border-transparent d-flex flex-column align-items-baseline">
                 <span class="flex-shrink-0 pe-2">
                     Microphone
                 </span>
                 <div class="flex-grow-1"/>
                 <DeviceSelect kind="'audioinput'"/>
             </label>
-            <label class="btn d-flex flex-column align-items-baseline">
+            <label class="btn border-transparent d-flex flex-column align-items-baseline">
                 <span class="flex-shrink-0 pe-2">
                     Audio Output
                 </span>
                 <div class="flex-grow-1"/>
                 <DeviceSelect kind="'audiooutput'"/>
             </label>
-            <button t-if="store.rtc.selfSession" class="btn d-flex" t-on-click="() => this.store.rtc.toggleDeafen()">
+            <button t-if="store.rtc.selfSession" class="btn border-transparent d-flex" t-on-click="() => this.store.rtc.toggleDeafen()">
                 <label class="d-flex align-items-center flex-wrap mw-100 cursor-pointer">
                     <span class="text-truncate text-wrap">Deafen</span>
                 </label>
@@ -26,7 +26,7 @@
                     <input class="form-check-input" type="checkbox" role="switch" t-att-checked="store.rtc.selfSession?.is_deaf ? 'checked' : ''"/>
                 </div>
             </button>
-            <button class="btn d-flex" t-on-click="() => this.store.settings.use_push_to_talk = !this.store.settings.use_push_to_talk">
+            <button class="btn border-transparent d-flex" t-on-click="() => this.store.settings.use_push_to_talk = !this.store.settings.use_push_to_talk">
                 <label class="d-flex align-items-center flex-wrap mw-100 cursor-pointer">
                     <span class="text-truncate text-wrap">Push-to-Talk</span>
                 </label>
@@ -35,7 +35,7 @@
                     <input class="form-check-input" type="checkbox" role="switch" t-att-checked="store.settings.use_push_to_talk ? 'checked' : ''"/>
                 </div>
             </button>
-            <button class="btn d-flex align-items-center gap-2" t-on-click="onClickVoiceSettings">
+            <button class="btn border-transparent d-flex align-items-center gap-2" t-on-click="onClickVoiceSettings">
                 <i class="fa fa-fw fa-gear"/><span>Voice Settings</span>
             </button>
         </div>

From dda2141b832306f95f0a1d7878e725c3c92c5a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir=20=28rar=29?= <rar@odoo.com>
Date: Fri, 24 Oct 2025 09:34:14 +0000
Subject: [PATCH 656/673] [FIX] spreadsheet: getter should not throw outside of
 evaluation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some getters are (too) tied with the evaluation and sometimes take the
liberty to throw evaluation-related errors.
This can only work if the said getter is called exclusively in the
within the context of the evaluation (which has a splendid try/catch
statement to this effect).

Issues start to appear when we start using the said getters outside the
evaluation and this is what happens.

Since https://github.com/odoo/o-spreadsheet/issues/6083, we call the
getter `getPivotCellFromPosition` which in specific cases call
`getCompanyCurrencyFormat` and the latter will throw errors when
starting an RPC. However, its effect was hidden by the sortcut added in
https://github.com/odoo/odoo/pull/151725.

The effect could only be seen in a version history action where we did
not provide a default currency to the model config.

This commit fixes the symptom but not the original cause: having getters
that throw and are not handled in the components life-cycle. Such
getters should probably disappear in a future refactoring.

Task-5187293

closes odoo/odoo#234910

X-original-commit: 84ea2d3febae7891670d2d9f0cb20fea4ca2ef52
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
---
 .../static/src/pivot/odoo_pivot.js            |  6 +++-
 .../tests/pivots/model/pivot_plugin.test.js   | 33 +++++++++++++++++--
 .../tests/public_spreadsheet/freeze.test.js   |  3 +-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/addons/spreadsheet/static/src/pivot/odoo_pivot.js b/addons/spreadsheet/static/src/pivot/odoo_pivot.js
index 3db23824a89e4..f1db37f2ad2b2 100644
--- a/addons/spreadsheet/static/src/pivot/odoo_pivot.js
+++ b/addons/spreadsheet/static/src/pivot/odoo_pivot.js
@@ -377,7 +377,11 @@ export class OdooPivot {
             case "float":
                 return "#,##0.00";
             case "monetary":
-                return this.getters.getCompanyCurrencyFormat() || "#,##0.00";
+                try {
+                    return this.getters.getCompanyCurrencyFormat() || "#,##0.00";
+                } catch {
+                    return "#,##0.00";
+                }
             case "date":
             case "datetime": {
                 const timeAdapter = pivotTimeAdapter(granularity);
diff --git a/addons/spreadsheet/static/tests/pivots/model/pivot_plugin.test.js b/addons/spreadsheet/static/tests/pivots/model/pivot_plugin.test.js
index f2e407c86361e..21026f2e57622 100644
--- a/addons/spreadsheet/static/tests/pivots/model/pivot_plugin.test.js
+++ b/addons/spreadsheet/static/tests/pivots/model/pivot_plugin.test.js
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "@odoo/hoot";
+import { describe, expect, test, Deferred } from "@odoo/hoot";
 import { animationFrame, mockDate } from "@odoo/hoot-mock";
 import {
     defineSpreadsheetActions,
@@ -12,7 +12,6 @@ import {
     patchWithCleanup,
     serverState,
 } from "@web/../tests/web_test_helpers";
-import { Deferred } from "@web/core/utils/concurrency";
 
 import {
     addGlobalFilter,
@@ -1112,6 +1111,7 @@ test("PIVOT formulas with monetary measure are correctly formatted at evaluation
                     <field name="pognon" type="measure"/>
                 </pivot>`,
     });
+    await animationFrame();
     expect(getEvaluatedCell(model, "B3").format).toBe("#,##0.00[$€]");
 });
 
@@ -2348,3 +2348,32 @@ test("Pivot headers day of week are still correct after updating the locale's we
     await waitForDataLoaded(model);
     expect(getEvaluatedGrid(model, "A22:A24")).toEqual([["Sunday"], ["Wednesday"], ["Thursday"]]);
 });
+
+test("`getPivotCellFromPosition` should not throw on missing company default currency", async function () {
+    const { model } = await createSpreadsheetWithPivot({
+        mockRPC: async function (route, args) {
+            if (args.method === "get_company_currency_for_spreadsheet") {
+                return false;
+            }
+        },
+        arch: /* xml */ `
+            <pivot>
+                <field name="foo" type="col"/>
+                <field name="bar" type="row"/>
+                <field name="pognon" type="measure"/>
+            </pivot>`,
+    });
+    const sheetId = model.getters.getActiveSheetId();
+    const [pivotId] = model.getters.getPivotIds();
+    updatePivot(model, pivotId, {
+        sortedColumn: {
+            domain: [],
+            order: "desc",
+            measure: "pognon:avg",
+        },
+    });
+    await animationFrame();
+    expect(() => {
+        model.getters.getPivotCellFromPosition({ sheetId, col: 0, row: 0 });
+    }).not.toThrow();
+});
diff --git a/addons/spreadsheet/static/tests/public_spreadsheet/freeze.test.js b/addons/spreadsheet/static/tests/public_spreadsheet/freeze.test.js
index 082b7561aab79..7c0c703246a82 100644
--- a/addons/spreadsheet/static/tests/public_spreadsheet/freeze.test.js
+++ b/addons/spreadsheet/static/tests/public_spreadsheet/freeze.test.js
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "@odoo/hoot";
+import { animationFrame, describe, expect, test } from "@odoo/hoot";
 import { registries } from "@odoo/o-spreadsheet";
 import { createSpreadsheetWithChart } from "@spreadsheet/../tests/helpers/chart";
 import {
@@ -126,6 +126,7 @@ test("computed format is exported", async function () {
             `,
     });
     setCellContent(model, "A1", '=PIVOT.VALUE(1,"pognon:avg")');
+    await animationFrame();
     expect(getCell(model, "A1").format).toBe(undefined);
     expect(getEvaluatedCell(model, "A1").format).toBe("#,##0.00[$€]");
     const data = await freezeOdooData(model);

From 71e57c07b6895d5e4242511363c5d1ef31521bff Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Fri, 14 Nov 2025 15:18:21 +0000
Subject: [PATCH 657/673] [FIX] bus: ensure consistent events when closing
 handshake is incomplete
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In [1], the websoket worker was updated to properly trigger
disconnect/reconnecting/reconnect event when calling `_start` with
a socket stuck in the closing state. Calling close will trigger a
call to `_retryConnectionWithDelay` thus calling `_start` again.

However, we need to clear the websocket as well otherwise it will
still be in the closing state, preventing reconnect.

[1]: https://github.com/odoo/odoo/pull/235623

closes odoo/odoo#235913

X-original-commit: 8bb47a1f86ac3f778a4ec3ce1ffe77a4e417110e
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
---
 addons/bus/static/src/workers/websocket_worker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/bus/static/src/workers/websocket_worker.js b/addons/bus/static/src/workers/websocket_worker.js
index 2578ff4181e00..7dcbfd38ebcd8 100644
--- a/addons/bus/static/src/workers/websocket_worker.js
+++ b/addons/bus/static/src/workers/websocket_worker.js
@@ -532,6 +532,7 @@ export class WebsocketWorker {
             this._onWebsocketClose(
                 new CloseEvent("close", { code: WEBSOCKET_CLOSE_CODES.CLOSING_HANDSHAKE_ABORTED })
             );
+            this.websocket = null;
             return;
         }
         this._updateState(WORKER_STATE.CONNECTING);

From 5539313b6567572ae9da65261c118f017e096654 Mon Sep 17 00:00:00 2001
From: Jay Savaliya <jasa@odoo.com>
Date: Thu, 13 Nov 2025 05:51:33 +0000
Subject: [PATCH 658/673] [IMP] l10n_in: add country_id to account tags

Some account tags specific to India were missing the `country_id`.
With this commit, the `country_id` is added to those tags, enabling easier
group by and making them usable for other cases also.

closes odoo/odoo#235927

X-original-commit: 6512d190b9300a2058ea1d4aa34b0818cc556a11
Signed-off-by: Josse Colpaert (jco) <jco@odoo.com>
Signed-off-by: Jay Savaliya (jasa) <jasa@odoo.com>
---
 addons/l10n_in/data/account.account.tag.csv | 32 ++++++++++-----------
 addons/l10n_in/data/l10n_in_chart_data.xml  |  4 +++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/addons/l10n_in/data/account.account.tag.csv b/addons/l10n_in/data/account.account.tag.csv
index 3ed15c539cf0d..c233202ab0805 100644
--- a/addons/l10n_in/data/account.account.tag.csv
+++ b/addons/l10n_in/data/account.account.tag.csv
@@ -1,16 +1,16 @@
-"id","name","applicability"
-"tax_tag_base_sgst","BASE SGST","taxes"
-"tax_tag_base_cgst","BASE CGST","taxes"
-"tax_tag_base_igst","BASE IGST","taxes"
-"tax_tag_base_cess","BASE CESS","taxes"
-"tax_tag_base_state_cess","BASE STATE CESS","taxes"
-"tax_tag_sgst","SGST","taxes"
-"tax_tag_cgst","CGST","taxes"
-"tax_tag_igst","IGST","taxes"
-"tax_tag_cess","CESS","taxes"
-"tax_tag_state_cess","STATE CESS","taxes"
-"tax_tag_non_itc","NON ITC","taxes"
-"tax_tag_other_non_itc","Other NON ITC","taxes"
-"tax_tag_eco_9_5","ECO 9(5)","taxes"
-"tax_tag_eco_tcs_52","ECO TCS 52","taxes"
-"account_tag_closing_stock","Closing Stock","accounts"
+"id","name","applicability","country_id/id"
+"tax_tag_base_sgst","BASE SGST","taxes","base.in"
+"tax_tag_base_cgst","BASE CGST","taxes","base.in"
+"tax_tag_base_igst","BASE IGST","taxes","base.in"
+"tax_tag_base_cess","BASE CESS","taxes","base.in"
+"tax_tag_base_state_cess","BASE STATE CESS","taxes","base.in"
+"tax_tag_sgst","SGST","taxes","base.in"
+"tax_tag_cgst","CGST","taxes","base.in"
+"tax_tag_igst","IGST","taxes","base.in"
+"tax_tag_cess","CESS","taxes","base.in"
+"tax_tag_state_cess","STATE CESS","taxes","base.in"
+"tax_tag_non_itc","NON ITC","taxes","base.in"
+"tax_tag_other_non_itc","Other NON ITC","taxes","base.in"
+"tax_tag_eco_9_5","ECO 9(5)","taxes","base.in"
+"tax_tag_eco_tcs_52","ECO TCS 52","taxes","base.in"
+"account_tag_closing_stock","Closing Stock","accounts","base.in"
diff --git a/addons/l10n_in/data/l10n_in_chart_data.xml b/addons/l10n_in/data/l10n_in_chart_data.xml
index 00181e1120c51..d030b08147e66 100644
--- a/addons/l10n_in/data/l10n_in_chart_data.xml
+++ b/addons/l10n_in/data/l10n_in_chart_data.xml
@@ -5,17 +5,21 @@
         <record id="sgst_tag_account" model="account.account.tag">
             <field name="name">SGST</field>
             <field name="applicability">accounts</field>
+            <field name="country_id" ref="base.in"/>
         </record>
         <record id="cgst_tag_account" model="account.account.tag">
             <field name="name">CGST</field>
             <field name="applicability">accounts</field>
+            <field name="country_id" ref="base.in"/>
         </record>
         <record id="igst_tag_account" model="account.account.tag">
             <field name="name">IGST</field>
             <field name="applicability">accounts</field>
+            <field name="country_id" ref="base.in"/>
         </record>
         <record id="cess_tag_account" model="account.account.tag">
             <field name="name">CESS</field>
             <field name="applicability">accounts</field>
+            <field name="country_id" ref="base.in"/>
         </record>
         </odoo>

From b8b126f2bebe319242c1b817303b4cc762897428 Mon Sep 17 00:00:00 2001
From: hapt-odoo <hapt@odoo.com>
Date: Mon, 15 Sep 2025 12:03:58 +0000
Subject: [PATCH 659/673] [FIX] stock: display correct packaging unit on
 delivery slip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit:
-------------------------
When printing the delivery slip of a Purchase Order containing products with
different packaging units of measure (UoM), all units of the same product were
aggregated into a single line, regardless of their packaging type.

Steps to reproduce:
-------------------------
1. Install the 'purchase_stock' module.
2. Create Purchase Order.
3. Add 3 move lines for the same product, each with a different packaging UOM:
      - Product 1 - Pack of 2
      - Product 1 - Pack of 4
      - Product 1 - Pack of 6
4. Confirm the PO and click Receive.
5. Validate the receipt.
6. Go to Actions → Print → Delivery Slip.

Cause of the issue
-------------------------
The aggregation logic in _get_aggregated_properties grouped move lines only by
product, ignoring differences in packaging UoM. As a result, product lines with
different packaging types were incorrectly merged into a single line.

After this commit:
-----------------------
- Delivery slips now correctly separate product lines by packaging UoM and move
  lines for the same product but with different packaging are displayed
  individually.
- This provides a clearer and more accurate delivery report.

Task Id: 4879373

closes odoo/odoo#235928

X-original-commit: 0313a5e47cfa3f338bd80ac25becd09862f0e11c
Signed-off-by: Arnold Moyaux (arm) <arm@odoo.com>
Signed-off-by: Harshil Patel (hapt) <hapt@odoo.com>
---
 addons/stock/models/stock_move_line.py |  2 +-
 addons/stock/tests/test_move.py        | 50 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index d99118f8c56a3..7517d38302c3f 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -859,7 +859,7 @@ def _get_aggregated_properties(self, move_line=False, move=False):
             description = description.removeprefix(name).strip()
         elif description.startswith(product.name):
             description = description.removeprefix(product.name).strip()
-        line_key = f'{product.id}_{product.display_name}_{description or ""}_{uom.id}'
+        line_key = f'{product.id}_{product.display_name}_{description or ""}_{uom.id}_{packaging_uom.id}'
         properties = {
             'line_key': line_key,
             'name': name,
diff --git a/addons/stock/tests/test_move.py b/addons/stock/tests/test_move.py
index 18bab77c44b52..6fe1d100c22b8 100644
--- a/addons/stock/tests/test_move.py
+++ b/addons/stock/tests/test_move.py
@@ -5607,9 +5607,9 @@ def test_move_line_aggregated_product_quantities(self):
         sml1 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == self.productA)
         sml2 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == product2)
         sml3 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == product4)
-        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}']
-        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}']
-        aggregate_val_3 = aggregate_values[f'{product4.id}_{product4.name}__{sml3.product_uom_id.id}']
+        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}_{sml1.move_id.packaging_uom_id.id}']
+        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}_{sml2.move_id.packaging_uom_id.id}']
+        aggregate_val_3 = aggregate_values[f'{product4.id}_{product4.name}__{sml3.product_uom_id.id}_{sml3.move_id.packaging_uom_id.id}']
         self.assertEqual(aggregate_val_1['qty_ordered'], 10)
         self.assertEqual(aggregate_val_1['quantity'], 6)
         self.assertEqual(aggregate_val_2['qty_ordered'], 10)
@@ -5634,9 +5634,9 @@ def test_move_line_aggregated_product_quantities(self):
         sml1 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == self.productA)
         sml2 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == product2)
         sml3 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == product4)
-        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}']
-        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}']
-        aggregate_val_3 = aggregate_values[f'{product4.id}_{product4.name}__{sml3.product_uom_id.id}']
+        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}_{sml1.move_id.packaging_uom_id.id}']
+        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}_{sml2.move_id.packaging_uom_id.id}']
+        aggregate_val_3 = aggregate_values[f'{product4.id}_{product4.name}__{sml3.product_uom_id.id}_{sml3.move_id.packaging_uom_id.id}']
         self.assertEqual(aggregate_val_1['qty_ordered'], 10)
         self.assertEqual(aggregate_val_1['quantity'], 6)
         self.assertEqual(aggregate_val_2['qty_ordered'], 10)
@@ -5650,10 +5650,10 @@ def test_move_line_aggregated_product_quantities(self):
         sml2 = first_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product2)
         sml3 = first_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product3)
         sml4 = first_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product4)
-        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}']
-        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}']
-        aggregate_val_3 = aggregate_values[f'{product3.id}_{product3.name}_Description3_{sml3.product_uom_id.id}']
-        aggregate_val_4 = aggregate_values[f'{product4.id}_{product4.name}__{sml4.product_uom_id.id}']
+        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}_{sml1.move_id.packaging_uom_id.id}']
+        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}_{sml2.move_id.packaging_uom_id.id}']
+        aggregate_val_3 = aggregate_values[f'{product3.id}_{product3.name}_Description3_{sml3.product_uom_id.id}_{sml3.move_id.packaging_uom_id.id}']
+        aggregate_val_4 = aggregate_values[f'{product4.id}_{product4.name}__{sml4.product_uom_id.id}_{sml4.move_id.packaging_uom_id.id}']
         self.assertEqual(aggregate_val_1['qty_ordered'], 4)
         self.assertEqual(aggregate_val_1['quantity'], 4)
         self.assertEqual(aggregate_val_2['qty_ordered'], 8)
@@ -5681,9 +5681,9 @@ def test_move_line_aggregated_product_quantities(self):
         sml1 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == self.productA)
         sml2 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == product2)
         sml3 = delivery.move_line_ids.filtered(lambda ml: ml.product_id == product4)
-        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}']
-        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}']
-        aggregate_val_3 = aggregate_values[f'{product4.id}_{product4.name}__{sml3.product_uom_id.id}']
+        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}_{sml1.move_id.packaging_uom_id.id}']
+        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}_{sml2.move_id.packaging_uom_id.id}']
+        aggregate_val_3 = aggregate_values[f'{product4.id}_{product4.name}__{sml3.product_uom_id.id}_{sml3.move_id.packaging_uom_id.id}']
         self.assertEqual(aggregate_val_1['qty_ordered'], 10)
         self.assertEqual(aggregate_val_1['quantity'], 6)
         self.assertEqual(aggregate_val_2['qty_ordered'], 10)
@@ -5697,10 +5697,10 @@ def test_move_line_aggregated_product_quantities(self):
         sml2 = first_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product2)
         sml3 = first_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product3)
         sml4 = first_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product4)
-        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}']
-        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}']
-        aggregate_val_3 = aggregate_values[f'{product3.id}_{product3.name}_Description3_{sml3.product_uom_id.id}']
-        aggregate_val_4 = aggregate_values[f'{product4.id}_{product4.name}__{sml4.product_uom_id.id}']
+        aggregate_val_1 = aggregate_values[f'{self.productA.id}_{self.productA.name}__{sml1.product_uom_id.id}_{sml1.move_id.packaging_uom_id.id}']
+        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sml2.product_uom_id.id}_{sml2.move_id.packaging_uom_id.id}']
+        aggregate_val_3 = aggregate_values[f'{product3.id}_{product3.name}_Description3_{sml3.product_uom_id.id}_{sml3.move_id.packaging_uom_id.id}']
+        aggregate_val_4 = aggregate_values[f'{product4.id}_{product4.name}__{sml4.product_uom_id.id}_{sml4.move_id.packaging_uom_id.id}']
         self.assertEqual(aggregate_val_1['qty_ordered'], 4)
         self.assertEqual(aggregate_val_1['quantity'], 4)
         self.assertEqual(aggregate_val_2['qty_ordered'], 8)
@@ -5714,8 +5714,8 @@ def test_move_line_aggregated_product_quantities(self):
         self.assertEqual(len(aggregate_values), 2)
         sml1 = second_backorder.move_line_ids.filtered(lambda ml: ml.product_id == product3)
         sm2 = second_backorder.move_ids.filtered(lambda ml: ml.product_id == product2)
-        aggregate_val_1 = aggregate_values[f'{product3.id}_{product3.name}_Description3_{sml1.product_uom_id.id}']
-        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sm2.product_uom.id}']
+        aggregate_val_1 = aggregate_values[f'{product3.id}_{product3.name}_Description3_{sml1.product_uom_id.id}_{sml1.move_id.packaging_uom_id.id}']
+        aggregate_val_2 = aggregate_values[f'{product2.id}_{product2.name}_Description2_{sm2.product_uom.id}_{sml2.move_id.packaging_uom_id.id}']
         self.assertEqual(aggregate_val_1['qty_ordered'], 3)
         self.assertEqual(aggregate_val_1['quantity'], 3)
         self.assertEqual(aggregate_val_2['qty_ordered'], 2)
@@ -5769,7 +5769,7 @@ def test_move_line_aggregated_product_quantities_duplicate_stock_move(self):
             'location_dest_id': move2.location_dest_id.id,
         })
         aggregate_values = picking.move_line_ids._get_aggregated_product_quantities()
-        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}']
+        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{self.productA.uom_id.id}']
         self.assertEqual(aggregated_val['qty_ordered'], 15)
         picking.move_ids.picked = True
         picking.button_validate()
@@ -5818,11 +5818,11 @@ def test_move_line_aggregated_product_quantities_two_packages(self):
         self.assertEqual(self.env['stock.quant']._get_available_quantity(self.productA, self.customer_location), 15)
 
         aggregate_values1 = picking.move_line_ids[0]._get_aggregated_product_quantities(strict=True)
-        aggregated_val = aggregate_values1[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{picking.move_line_ids[0].result_package_id.id}']
+        aggregated_val = aggregate_values1[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{self.productA.uom_id.id}_{picking.move_line_ids[0].result_package_id.id}']
         self.assertEqual(aggregated_val['qty_ordered'], 5)
 
         aggregate_values2 = picking.move_line_ids[1]._get_aggregated_product_quantities(strict=True)
-        aggregated_val = aggregate_values2[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{picking.move_line_ids[1].result_package_id.id}']
+        aggregated_val = aggregate_values2[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{self.productA.uom_id.id}_{picking.move_line_ids[1].result_package_id.id}']
         self.assertEqual(aggregated_val['qty_ordered'], 10)
 
     def test_move_line_aggregated_product_quantities_incomplete_package(self):
@@ -5860,17 +5860,17 @@ def test_move_line_aggregated_product_quantities_incomplete_package(self):
         picking.backorder_ids.action_cancel()
 
         aggregate_values = picking.move_line_ids._get_aggregated_product_quantities()
-        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{package.id}']
+        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{self.productA.uom_id.id}_{package.id}']
         self.assertEqual(aggregated_val['qty_ordered'], 15)
         self.assertEqual(aggregated_val['quantity'], 5)
 
         aggregate_values = picking.move_line_ids._get_aggregated_product_quantities(strict=True)
-        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{package.id}']
+        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{self.productA.uom_id.id}_{package.id}']
         self.assertEqual(aggregated_val['qty_ordered'], 5)
         self.assertEqual(aggregated_val['quantity'], 5)
 
         aggregate_values = picking.move_line_ids._get_aggregated_product_quantities(except_package=True)
-        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}']
+        aggregated_val = aggregate_values[f'{self.productA.id}_{self.productA.name}__{self.productA.uom_id.id}_{self.productA.uom_id.id}']
         self.assertEqual(aggregated_val['qty_ordered'], 10)
         self.assertEqual(aggregated_val['quantity'], False)
 

From 3b463fbf97105d99965ee3a751d428c9a55ae1b0 Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <huvw@odoo.com>
Date: Mon, 10 Nov 2025 13:15:12 +0000
Subject: [PATCH 660/673] [FIX] web: reset limit when restoring a view after
 ungrouping

Steps to reproduce
==================

- Add a group by in the kanban product view
- Switch to the list view
- Remove the group by
- Switch back to the kanban view
-> No limit is applied, and the webclient can crash if too many records
   are returned.

Cause of the issue
==================

The groupsLimit is set as MAX_SAFE_INTEGER in the kanban view

https://github.com/odoo/odoo/blob/df959e05ac9cf3136d1724bc80b7597a70932225/addons/web/static/src/views/kanban/kanban_controller.js#L168

Which is then reused as the limit

https://github.com/odoo/odoo/blob/df959e05ac9cf3136d1724bc80b7597a70932225/addons/web/static/src/model/relational_model/relational_model.js#L368

Solution
========

There is already a code path to reset the limit when switching from
grouped to ungrouped, but is wasn't called on the first load (when
this.root isn't set yet)

opw-5167769

closes odoo/odoo#235914

X-original-commit: 6dd1fe8e668084ab70338b6cbef45d4ef4b02c16
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Hubert Van De Walle <huvw@odoo.com>
---
 .../relational_model/relational_model.js      |  8 ++-
 .../tests/views/kanban/kanban_view.test.js    | 56 +++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/model/relational_model/relational_model.js b/addons/web/static/src/model/relational_model/relational_model.js
index d241ad4fd119f..654eebd0bbd35 100644
--- a/addons/web/static/src/model/relational_model/relational_model.js
+++ b/addons/web/static/src/model/relational_model/relational_model.js
@@ -406,7 +406,7 @@ export class RelationalModel extends Model {
                 config.orderBy = config.orderBy.filter((order) => order.name !== "__count");
             }
         }
-        if (!config.isMonoRecord && this.root && params.domain) {
+        if (!config.isMonoRecord && params.domain) {
             // always reset the offset to 0 when reloading from above with a domain
             const resetOffset = (config) => {
                 config.offset = 0;
@@ -414,8 +414,10 @@ export class RelationalModel extends Model {
                     resetOffset(group.list);
                 }
             };
-            resetOffset(config);
-            if (!!config.groupBy.length !== !!currentGroupBy.length) {
+            if (this.root) {
+                resetOffset(config);
+            }
+            if (!!config.groupBy.length !== !!currentGroupBy?.length) {
                 // from grouped to ungrouped or the other way around -> force the limit to be reset
                 delete config.limit;
             }
diff --git a/addons/web/static/tests/views/kanban/kanban_view.test.js b/addons/web/static/tests/views/kanban/kanban_view.test.js
index 3f62618e7aa58..abf2e778927ee 100644
--- a/addons/web/static/tests/views/kanban/kanban_view.test.js
+++ b/addons/web/static/tests/views/kanban/kanban_view.test.js
@@ -61,8 +61,10 @@ import {
     patchWithCleanup,
     quickCreateKanbanColumn,
     quickCreateKanbanRecord,
+    removeFacet,
     serverState,
     stepAllNetworkCalls,
+    switchView,
     toggleKanbanColumnActions,
     toggleKanbanRecordDropdown,
     toggleMenuItem,
@@ -79,6 +81,7 @@ import { FileInput } from "@web/core/file_input/file_input";
 import { browser } from "@web/core/browser/browser";
 import { currencies } from "@web/core/currency";
 import { registry } from "@web/core/registry";
+import { user } from "@web/core/user";
 import { RelationalModel } from "@web/model/relational_model/relational_model";
 import { SampleServer } from "@web/model/sample_server";
 import { KanbanCompiler } from "@web/views/kanban/kanban_compiler";
@@ -9532,3 +9535,56 @@ test("scroll position is restored when coming back to kanban view (grouped, mobi
     expect(".o_kanban_group:eq(2)").toHaveProperty("scrollTop", 200);
     expect(".o_kanban_renderer").toHaveProperty("scrollLeft", 656);
 });
+
+test.tags("desktop");
+test("limit is reset when restoring a view after ungrouping", async () => {
+    Partner._views["kanban"] = `
+        <kanban sample="1">
+            <templates>
+                <t t-name="card">
+                    <field name="foo"/>
+                </t>
+            </templates>
+        </kanban>`;
+    Partner._views["list"] = '<list><field name="foo"/></list>';
+    Partner._views.search = `
+        <search>
+            <group>
+                <filter name="foo" string="Foo" context="{'group_by': 'foo'}"/>
+            </group>
+        </search>
+    `;
+
+    onRpc("partner", "web_search_read", ({ kwargs }) => {
+        const { domain, limit } = kwargs;
+        if (!domain.length) {
+            expect.step(`limit=${limit}`);
+        }
+    });
+
+    patchWithCleanup(user, {
+        hasGroup: () => true,
+    });
+
+    await mountWithCleanup(WebClient);
+
+    await getService("action").doAction({
+        type: "ir.actions.act_window",
+        id: 450,
+        xml_id: "action_450",
+        name: "Partners",
+        res_model: "partner",
+        views: [
+            [false, "kanban"],
+            [false, "list"],
+            [false, "form"],
+        ],
+        context: { search_default_foo: true },
+    });
+
+    await switchView("list");
+    await removeFacet("Foo");
+    expect.verifySteps(["limit=80"]);
+    await switchView("kanban");
+    expect.verifySteps(["limit=40"]);
+});

From 5937642155b438b5ca3b9ab54163e54004ae647c Mon Sep 17 00:00:00 2001
From: Sherif Gabr <sgab@odoo.com>
Date: Fri, 14 Nov 2025 13:50:05 +0000
Subject: [PATCH 661/673] [IMP] l10n_ch: structured address in CH QR codes

This commit changes the creditor's and debtor's address
to a structured format inside the CH QR-code in invoices.
The address type was changed from "K" to "S" due to legal
requirements.

task-5149417

closes odoo/odoo#235920

X-original-commit: 83b1cac42629ea8a91b82547121acb5004dc8156
Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
---
 addons/l10n_ch/demo/demo_company.xml     |  5 ++-
 addons/l10n_ch/demo/res_partner_demo.xml |  2 +-
 addons/l10n_ch/models/res_bank.py        | 56 +++++++++++++++---------
 addons/l10n_ch/tests/test_swissqr.py     | 18 ++++----
 4 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/addons/l10n_ch/demo/demo_company.xml b/addons/l10n_ch/demo/demo_company.xml
index 9ce0ad5ef488c..8e90d77c1ec85 100644
--- a/addons/l10n_ch/demo/demo_company.xml
+++ b/addons/l10n_ch/demo/demo_company.xml
@@ -3,7 +3,7 @@
     <record id="base.partner_demo_company_ch" model="res.partner" forcecreate="1">
         <field name="name">CH Company</field>
         <field name="vat">CHE-530781296TVA</field>
-        <field name="street">14 Meierskappelerstrasse</field>
+        <field name="street">Meierskappelerstrasse 14</field>
         <field name="city">Risch-Rotkreuz</field>
         <field name="country_id" ref="base.ch"/>
 
@@ -16,7 +16,8 @@
 
     <record id="base.demo_bank_ch" model="res.partner.bank" forcecreate="1">
         <field name="acc_type">iban</field>
-        <field name="acc_number">CH4431999123000889012</field>
+        <field name="acc_number">CH1500240123456789012</field>
+        <field name="l10n_ch_qr_iban">CH4431999123000889012</field>
         <field name="partner_id" ref="base.partner_demo_company_ch"/>
     </record>
 
diff --git a/addons/l10n_ch/demo/res_partner_demo.xml b/addons/l10n_ch/demo/res_partner_demo.xml
index 2861bd253317a..6011d4764d3d8 100644
--- a/addons/l10n_ch/demo/res_partner_demo.xml
+++ b/addons/l10n_ch/demo/res_partner_demo.xml
@@ -7,7 +7,7 @@
         <field name="city">Lausanne</field>
         <field name="zip">1004</field>
         <field name="country_id" ref="base.ch"/>
-        <field name="street">Rte de Prilly 18, 1004 Lausanne, Suisse</field>
+        <field name="street">Rte de Prilly 18</field>
         <field name="email">info@easycleanlausanne.ch</field>
         <field name="phone">+41 21 796 73 24</field>
         <field name="website">http://www.easycleanlausanne.ch</field>
diff --git a/addons/l10n_ch/models/res_bank.py b/addons/l10n_ch/models/res_bank.py
index 3ff9f59d92587..ef7cc0921e208 100644
--- a/addons/l10n_ch/models/res_bank.py
+++ b/addons/l10n_ch/models/res_bank.py
@@ -8,7 +8,7 @@
 from odoo.addons.base.models.res_bank import sanitize_account_number
 from odoo.addons.base_iban.models.res_partner_bank import normalize_iban, pretty_iban, validate_iban, get_iban_part
 from odoo.exceptions import ValidationError
-from odoo.tools import LazyTranslate
+from odoo.tools import LazyTranslate, street_split
 from odoo.tools.misc import mod10r
 
 _lt = LazyTranslate(__name__)
@@ -93,8 +93,8 @@ def _l10n_ch_get_qr_vals(self, amount, currency, debtor_partner, free_communicat
         if free_communication:
             comment = (free_communication[:137] + '...') if len(free_communication) > 140 else free_communication
 
-        creditor_addr_1, creditor_addr_2 = self._get_partner_address_lines(self.partner_id)
-        debtor_addr_1, debtor_addr_2 = self._get_partner_address_lines(debtor_partner)
+        cred_street, cred_street_number, cred_zip, cred_city = self._get_partner_address_lines(self.partner_id)
+        debt_street, debt_street_number, debt_zip, debt_city = self._get_partner_address_lines(debtor_partner)
 
         # Compute reference type (empty by default, only mandatory for QR-IBAN,
         # and must then be 27 characters-long, with mod10r check digit as the 27th one)
@@ -118,12 +118,12 @@ def _l10n_ch_get_qr_vals(self, amount, currency, debtor_partner, free_communicat
             '0200',                                               # Version
             '1',                                                  # Coding Type
             acc_number,                                           # IBAN / QR-IBAN
-            'K',                                                  # Creditor Address Type
+            'S',                                                  # Creditor Address Type
             (self.acc_holder_name or self.partner_id.name)[:70],  # Creditor Name
-            creditor_addr_1,                                      # Creditor Address Line 1
-            creditor_addr_2,                                      # Creditor Address Line 2
-            '',                                                   # Creditor Postal Code (empty, since we're using combined addres elements)
-            '',                                                   # Creditor Town (empty, since we're using combined addres elements)
+            cred_street,                                          # Creditor Street Name
+            cred_street_number,                                   # Creditor Building Number
+            cred_zip,                                             # Creditor Postal Code
+            cred_city,                                            # Creditor Town
             self.partner_id.country_id.code,                      # Creditor Country
             '',                                                   # Ultimate Creditor Address Type
             '',                                                   # Name
@@ -134,13 +134,13 @@ def _l10n_ch_get_qr_vals(self, amount, currency, debtor_partner, free_communicat
             '',                                                   # Ultimate Creditor Country
             '{:.2f}'.format(amount),                              # Amount
             currency.name,                                        # Currency
-            'K',                                                  # Ultimate Debtor Address Type
+            'S',                                                  # Ultimate Debtor Address Type
             debtor_partner.commercial_partner_id.name[:70],       # Ultimate Debtor Name
-            debtor_addr_1,                                        # Ultimate Debtor Address Line 1
-            debtor_addr_2,                                        # Ultimate Debtor Address Line 2
-            '',                                                   # Ultimate Debtor Postal Code (not to be provided for address type K)
-            '',                                                   # Ultimate Debtor Postal City (not to be provided for address type K)
-            debtor_partner.country_id.code,                       # Ultimate Debtor Postal Country
+            debt_street,                                          # Ultimate Debtor Street Name
+            debt_street_number,                                   # Ultimate Debtor Building Number
+            debt_zip,                                             # Ultimate Debtor Postal Code
+            debt_city,                                            # Ultimate Debtor Town
+            debtor_partner.country_id.code,                       # Ultimate Debtor Country
             reference_type,                                       # Reference Type
             reference,                                            # Reference
             comment,                                              # Unstructured Message
@@ -167,14 +167,28 @@ def _get_qr_code_generation_params(self, qr_method, amount, currency, debtor_par
         return super()._get_qr_code_generation_params(qr_method, amount, currency, debtor_partner, free_communication, structured_communication)
 
     def _get_partner_address_lines(self, partner):
-        """ Returns a tuple of two elements containing the address lines to use
-        for this partner. Line 1 contains the street and number, line 2 contains
-        zip and city. Those two lines are limited to 70 characters
+        """ Retrieves the partner's address fields, truncated to respect the line specs.
+        :returns: tuple(street, street_number, zip, city)
         """
-        streets = [partner.street, partner.street2]
-        line_1 = ' '.join(filter(None, streets))
-        line_2 = partner.zip + ' ' + partner.city
-        return line_1[:70], line_2[:70]
+        street_1_split = street_split(partner.street or '')
+        street_name = street_1_split['street_name']
+        building_number = f"{street_1_split['street_number']} {street_1_split['street_number2']}".strip()
+
+        if building_number:
+            concatenated_building_number = f"{building_number} {partner.street2 or ''}".strip()
+            if len(concatenated_building_number) <= 16:
+                building_number = concatenated_building_number
+        else:
+            # Try to complete the address with street2
+            street_2_split = street_split(partner.street2 or '')
+
+            building_number = f"{street_2_split['street_number']} {street_2_split['street_number2']}".strip()
+            if building_number:
+                street_name = f"{street_name} {street_2_split['street_name']}".strip()
+            else:
+                building_number = (partner.street2 or '').strip()
+
+        return street_name[:70], building_number[:16], partner.zip[:16], partner.city[:35]
 
     @api.model
     def _is_qr_reference(self, reference):
diff --git a/addons/l10n_ch/tests/test_swissqr.py b/addons/l10n_ch/tests/test_swissqr.py
index eb5b82756e6c0..481af39d82e47 100644
--- a/addons/l10n_ch/tests/test_swissqr.py
+++ b/addons/l10n_ch/tests/test_swissqr.py
@@ -96,20 +96,22 @@ def swissqr_generated(self, invoice, ref_type='NON'):
             "0200\n"
             "1\n"
             "{iban}\n"
-            "K\n"
+            "S\n"
             "company_1_data\n"
-            "Route de Berne 88\n"
-            "2000 Neuchâtel\n"
-            "\n\n"
+            "Route de Berne\n"
+            "88\n"
+            "2000\n"
+            "Neuchâtel\n"
             "CH\n"
             "\n\n\n\n\n\n\n"
             "42.00\n"
             "CHF\n"
-            "K\n"
+            "S\n"
             "Partner\n"
-            "Route de Berne 41\n"
-            "1000 Lausanne\n"
-            "\n\n"
+            "Route de Berne\n"
+            "41\n"
+            "1000\n"
+            "Lausanne\n"
             "CH\n"
             "{ref_type}\n"
             "{struct_ref}\n"

From 7ee247396a2b54f9efdc89cc5140d5a959524401 Mon Sep 17 00:00:00 2001
From: sben-odoo <sben@odoo.com>
Date: Tue, 30 Sep 2025 12:16:21 +0000
Subject: [PATCH 662/673] [FIX] portal: Prevent rating cards showing through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To reproduce:
=============
1- Enable product reviews on the website
2- Add a few reviews
3- Switch to mobile view
-> Scroll to see the behavior

Why:
====
This commit did the problem
https://github.com/odoo/odoo/commit/f13ee41a4a62f7fedbddc4245e52ee8e9dce9e0e
Specifically this change:
https://github.com/odoo/odoo/commit/f13ee41a4a62f7fedbddc4245e52ee8e9dce9e0e#diff-6e5197b652583a0032baba5d873fb639b7567600f54b58acce137945ca072b03L23-R24
So the value of the background-color for the portal Chatter is no
longer getting background-color of the body.

Solution:
=========
Apply the body background-color to the sticky part.

opw-5098372

closes odoo/odoo#235912

X-original-commit: 6913bf2a03c283360501548064e280df47e1f3f6
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/portal/static/src/chatter/scss/shadow.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal/static/src/chatter/scss/shadow.scss b/addons/portal/static/src/chatter/scss/shadow.scss
index 1d493ce5abd5a..c2d1c915c690f 100644
--- a/addons/portal/static/src/chatter/scss/shadow.scss
+++ b/addons/portal/static/src/chatter/scss/shadow.scss
@@ -21,5 +21,5 @@
 }
 
 .o-portal-Chatter .o-mail-Chatter-top {
-    background-color: inherit;
+    background-color: var(--body-bg);
 }

From 2cd6faab1e9952ee0347e831e0b1d338ce25cdc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20K=C3=BChn?= <aku@odoo.com>
Date: Thu, 13 Nov 2025 16:42:18 +0000
Subject: [PATCH 663/673] [FIX] mail: view image in full-size in message list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, images attached to a message had their preview
cropped and forced people to view with file viewer.

This square and cropped visual looks good in contexts other than
message, e.g. chatter attachment list. In message, however, most of
the time people want to share images and be able to see whole content
just from preview.

This commit fixes the issue by making image preview of message see
whole content.

Task-5259604

closes odoo/odoo#235896

X-original-commit: 7d9c3fa3e969861cf2c784275d5f2e7800e6e42b
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/core/common/attachment_list.scss    | 14 ++++++++++++--
 .../static/src/core/common/attachment_list.xml     |  9 ++++++---
 addons/mail/static/src/core/common/message.js      |  3 ++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/core/common/attachment_list.scss b/addons/mail/static/src/core/common/attachment_list.scss
index f0f2c183e98bf..a1ce677b00c73 100644
--- a/addons/mail/static/src/core/common/attachment_list.scss
+++ b/addons/mail/static/src/core/common/attachment_list.scss
@@ -1,6 +1,12 @@
 .o-mail-AttachmentContainer {
-    width: 13em;
-    height: 10em;
+    &.o-inMessage.o-isImage {
+        min-width: 13em;
+        min-height: 10em;
+    }
+    &:not(.o-inMessage.o-isImage) {
+        width: 13em;
+        height: 10em;
+    }
     background-color: $gray-200;
 
     @include media-breakpoint-down(sm) {
@@ -32,6 +38,10 @@
     line-height: 1.25;
 }
 
+.o-mail-AttachmentImage.o-inMessage {
+    max-height: 300px;
+}
+
 .o-viewable {
     cursor: zoom-in;
 }
diff --git a/addons/mail/static/src/core/common/attachment_list.xml b/addons/mail/static/src/core/common/attachment_list.xml
index 2697b925d39f3..e733d04765e98 100644
--- a/addons/mail/static/src/core/common/attachment_list.xml
+++ b/addons/mail/static/src/core/common/attachment_list.xml
@@ -14,8 +14,10 @@
                      class="o-mail-AttachmentContainer d-flex border position-relative rounded-3"
                      t-att-title="attachment.name ? attachment.name : undefined"
                      t-att-class="{
-                        'o-viewable': attachment.isViewable,
+                        'o-inMessage': env.inMessage,
+                        'o-isImage': attachment.isImage,
                         'o-isUploading opacity-25': attachment.uploading,
+                        'o-viewable': attachment.isViewable,
                     }"
                      tabindex="0"
                      t-att-data-mimetype="attachment.mimetype"
@@ -28,11 +30,12 @@
                         src="getImageUrl(attachment)"
                         paused="attachment.gifPaused"
                         alt="attachment.name"
-                        class="'o-mail-AttachmentImage img img-fluid object-fit-cover w-100 rounded-3'"
+                        class="'o-mail-AttachmentImage img img-fluid w-100 rounded-3 ' + (env.inMessage ? 'object-fit-contain o-inMessage' : 'object-fit-cover')"
                     />
                     <img
                         t-elif="attachment.isImage"
-                        class="o-mail-AttachmentImage img img-fluid object-fit-cover w-100 rounded-3"
+                        class="o-mail-AttachmentImage img img-fluid w-100 rounded-3"
+                        t-att-class="{ 'object-fit-contain o-inMessage': env.inMessage, 'object-fit-cover': !env.inMessage }"
                         t-att-src="getImageUrl(attachment)"
                         t-att-alt="attachment.name"
                         t-on-load="onImageLoaded"
diff --git a/addons/mail/static/src/core/common/message.js b/addons/mail/static/src/core/common/message.js
index 282efb4ee8a48..a56142db566cc 100644
--- a/addons/mail/static/src/core/common/message.js
+++ b/addons/mail/static/src/core/common/message.js
@@ -21,6 +21,7 @@ import {
     useEffect,
     useRef,
     useState,
+    useSubEnv,
 } from "@odoo/owl";
 
 import { ActionSwiper } from "@web/core/action_swiper/action_swiper";
@@ -122,10 +123,10 @@ export class Message extends Component {
         this.ui = useService("ui");
         this.openReactionMenu = this.openReactionMenu.bind(this);
         this.optionsDropdown = useDropdownState();
+        useSubEnv({ inMessage: true });
         useChildSubEnv({
             message: this.props.message,
             alignedRight: this.isAlignedRight,
-            inMessage: true,
         });
         onMounted(() => {
             if (this.shadowBody.el) {

From 919e8aa9333e406563f58bc65cf89027d5d30fe9 Mon Sep 17 00:00:00 2001
From: rmbh-odoo <rmbh@odoo.com>
Date: Mon, 10 Nov 2025 14:02:53 +0530
Subject: [PATCH 664/673] [REF] spreadsheet: rename isReadonly to
 has_write_access for clarity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit:
- The variable isReadonly was used to represent both the spreadsheet
readonly mode and user access control, leading to confusion.

After this commit:
- Renamed the user access variable to 'has_write_access' on the server
side for clarity.
- In the web client, it is exposed as 'hasWriteAccess' to follow
camelCase convention.
- When 'has_write_access' is not provided by the server, the spreadsheet
opens in readonly mode by default.

closes odoo/odoo#235108

Task: 5030282
Related: odoo/enterprise#98537
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
---
 addons/spreadsheet/static/tests/helpers/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/spreadsheet/static/tests/helpers/data.js b/addons/spreadsheet/static/tests/helpers/data.js
index ae9337f588602..169ce65f31fec 100644
--- a/addons/spreadsheet/static/tests/helpers/data.js
+++ b/addons/spreadsheet/static/tests/helpers/data.js
@@ -133,7 +133,7 @@ function mockSpreadsheetDataController(_request, { res_model, res_id }) {
         data: JSON.parse(record.spreadsheet_data),
         name: record.name,
         revisions: [],
-        isReadonly: false,
+        has_write_access: true,
         writable_rec_name_field: "name",
     };
 }

From fd7e6e5ad34b9bf6e24ea300e9da79220bb185f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yagnik=20=E2=9C=97=20=28yagp=29?= <yagp@odoo.com>
Date: Mon, 29 Sep 2025 12:39:05 +0530
Subject: [PATCH 665/673] [IMP] event_crm: propagate company name from event
 registration to lead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When an event registration includes a question of type Company(company_name),
the provided value was not being set on the generated lead.

As a result, the lead’s partner_name (company name) remained empty, even though
the attendee supplied the information.

This commit ensures that the company name from the registration is propagated to
the generated lead.

Task-5106882

closes odoo/odoo#229507

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/event_crm/models/event_registration.py |  4 +++
 addons/event_crm/tests/common.py              |  5 ++--
 addons/event_crm/tests/test_event_crm_flow.py | 30 +++++++++++--------
 .../event_crm/views/event_lead_rule_views.xml |  2 +-
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/addons/event_crm/models/event_registration.py b/addons/event_crm/models/event_registration.py
index 178f726a5ab5b..7befcaf2c5fd3 100644
--- a/addons/event_crm/models/event_registration.py
+++ b/addons/event_crm/models/event_registration.py
@@ -236,6 +236,7 @@ def _get_lead_contact_values(self):
                     valid_partner = self.env['res.partner']
 
         registration_phone = sorted_self._find_first_notnull('phone')
+        registration_company = sorted_self._find_first_notnull('company_name')
         if valid_partner:
             contact_vals = self.env['crm.lead']._prepare_values_from_partner(valid_partner)
             # force email_from / phone only if not set on partner because those fields are now synchronized automatically
@@ -243,11 +244,14 @@ def _get_lead_contact_values(self):
                 contact_vals['email_from'] = sorted_self._find_first_notnull('email')
             if not valid_partner.phone:
                 contact_vals['phone'] = registration_phone
+            if not valid_partner.company_name:
+                contact_vals['partner_name'] = registration_company
         else:
             # don't force email_from + partner_id because those fields are now synchronized automatically
             contact_vals = {
                 'contact_name': sorted_self._find_first_notnull('name'),
                 'email_from': sorted_self._find_first_notnull('email'),
+                'partner_name': registration_company,
                 'phone': registration_phone,
                 'lang_id': False,
             }
diff --git a/addons/event_crm/tests/common.py b/addons/event_crm/tests/common.py
index 6da029ca4dbfd..21906433a0c70 100644
--- a/addons/event_crm/tests/common.py
+++ b/addons/event_crm/tests/common.py
@@ -81,13 +81,14 @@ def assertLeadConvertion(self, rule, registrations, partner=None, **expected):
 
         if partner is None:
             partner = self.env['res.partner']
+        registration_company = registrations._find_first_notnull('company_name')
         expected_reg_name = partner.name or registrations._find_first_notnull('name') or registrations._find_first_notnull('email')
         if partner:
             expected_contact_name = partner.name if not partner.is_company else False
-            expected_partner_name = partner.name if partner.is_company else False
+            expected_partner_name = (partner.is_company and partner.name) or partner.company_name or registration_company
         else:
             expected_contact_name = registrations._find_first_notnull('name')
-            expected_partner_name = False
+            expected_partner_name = registration_company
 
         # event information
         self.assertEqual(lead.event_id, event)
diff --git a/addons/event_crm/tests/test_event_crm_flow.py b/addons/event_crm/tests/test_event_crm_flow.py
index 9042207b175e6..b3bba081e4112 100644
--- a/addons/event_crm/tests/test_event_crm_flow.py
+++ b/addons/event_crm/tests/test_event_crm_flow.py
@@ -145,18 +145,19 @@ def test_event_crm_flow_batch_update(self):
     def test_event_crm_flow_per_attendee_single_wo_partner(self):
         """ Single registration, attendee based, no partner involved, check
         contact info propagation """
-        for name, email, phone in [
-            ('My Name', 'super.email@test.example.com', '0456442211'),
-            (False, 'super.email@test.example.com', False),
-            ('"My Name"', '"My Name" <my.name@test.example.com>', False),
+        for name, email, phone, company_name in [
+            ('My Name', 'super.email@test.example.com', '0456442211', 'My Super Company'),
+            (False, 'super.email@test.example.com', False, False),
+            ('"My Name"', '"My Name" <my.name@test.example.com>', False, 'My Company'),
         ]:
-            with self.subTest(name=name, email=email, phone=phone):
+            with self.subTest(name=name, email=email, phone=phone, company_name=company_name):
                 registration = self.env['event.registration'].create({
                     'name': name,
                     'partner_id': False,
                     'email': email,
                     'phone': phone,
                     'event_id': self.event_0.id,
+                    'company_name': company_name,
                 })
                 self.assertLeadConvertion(self.test_rule_attendee, registration, partner=None)
 
@@ -166,6 +167,7 @@ def test_event_crm_flow_per_attendee_single_wo_partner(self):
             'email': 'other.email@test.example.com',
             'phone': '0456112233',
             'event_id': self.event_0.id,
+            'company_name': 'Other Company',
         })
         self.assertLeadConvertion(self.test_rule_attendee, registration, partner=None)
 
@@ -173,6 +175,7 @@ def test_event_crm_flow_per_attendee_single_wo_partner(self):
     def test_event_crm_flow_per_attendee_single_wpartner(self):
         """ Single registration, attendee based, with partner involved, check
         contact information, check synchronization and update """
+        self.event_customer.write({'company_name': 'Event Company'})
         self.event_customer2.write({
             'email': False,
             'phone': False,
@@ -180,20 +183,21 @@ def test_event_crm_flow_per_attendee_single_wpartner(self):
         self.test_rule_attendee.write({
             'event_registration_filter': '[]',  # try various email combinations
         })
-        for email, phone, base_partner, expected_partner in [
-            (False, False, self.event_customer, self.event_customer),  # should take partner info
-            ('"Other Name" <constantin@test.example.com>', False, self.event_customer, self.event_customer),  # same email normalized
-            ('other.email@test.example.com', False, self.event_customer, self.env['res.partner']),  # not same email -> no partner on lead
-            (False, '+32485112233', self.event_customer, self.event_customer),  # same phone but differently formatted
-            (False, '0485112244', self.event_customer, self.env['res.partner']),  # other phone -> no partner on lead
-            ('other.email@test.example.com', '0485112244', self.event_customer2, self.event_customer2),  # mail / phone update from registration as void on partner
+        for email, phone, company_name, base_partner, expected_partner in [
+            (False, False, False, self.event_customer, self.event_customer),  # should take partner info
+            ('"Other Name" <constantin@test.example.com>', False, False, self.event_customer, self.event_customer),  # same email normalized
+            ('other.email@test.example.com', False, 'Other Company', self.event_customer, self.env['res.partner']),  # not same email -> no partner on lead
+            (False, '+32485112233', False, self.event_customer, self.event_customer),  # same phone but differently formatted
+            (False, '0485112244', False, self.event_customer, self.env['res.partner']),  # other phone -> no partner on lead
+            ('other.email@test.example.com', '0485112244', 'Other Company', self.event_customer2, self.event_customer2),  # mail / phone / company_name update from registration as void on partner
         ]:
-            with self.subTest(email=email, phone=phone, base_partner=base_partner):
+            with self.subTest(email=email, phone=phone, base_partner=base_partner, company_name=company_name):
                 registration = self.env['event.registration'].create({
                     'partner_id': base_partner.id,
                     'email': email,
                     'phone': phone,
                     'event_id': self.event_0.id,
+                    'company_name': company_name,
                 })
                 self.assertLeadConvertion(self.test_rule_attendee, registration, partner=expected_partner)
 
diff --git a/addons/event_crm/views/event_lead_rule_views.xml b/addons/event_crm/views/event_lead_rule_views.xml
index 40c6b8e7f3bfd..8775d5a9cf870 100644
--- a/addons/event_crm/views/event_lead_rule_views.xml
+++ b/addons/event_crm/views/event_lead_rule_views.xml
@@ -36,7 +36,7 @@
         <field name="arch" type="xml">
             <form string="Lead Generation Rule">
                 <header>
-                    <button class="btn btn-primary" name="action_execute_rule" type="object" string="Execute Rule" help="Execute this rule for all ongoing and future events."/>
+                    <button class="btn btn-primary" name="action_execute_rule" type="object" string="Run Rule" help="Execute this rule for all ongoing and future events."/>
                 </header>
                 <sheet>
                     <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>

From 594d400eea06f6329e34ecabe74d4ef13ae7a2c2 Mon Sep 17 00:00:00 2001
From: Louis Travaux <lotr@odoo.com>
Date: Fri, 14 Nov 2025 17:35:49 +0100
Subject: [PATCH 666/673] [FIX] iot_drivers: missing changes blackbox driver

In odoo/odoo#221948, we moved drivers from enterprise to community.
During development, the bb driver had changed, and we didn't update
the moved driver in community.
This commit provides the missing changes.

closes odoo/odoo#235831

Signed-off-by: Max Whale (mawh) <mawh@odoo.com>
---
 .../drivers/serial_blackbox_be_driver.py      | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py b/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py
index 86a2a2243348e..ef818d994061b 100644
--- a/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py
+++ b/addons/iot_drivers/iot_handlers/drivers/serial_blackbox_be_driver.py
@@ -73,6 +73,7 @@ def _set_actions(self):
         """Initializes `self._actions`, a map of action keys sent by the frontend to backend action methods."""
 
         self._actions.update({
+            'batchAction': self._batch_action,  # Batch of multiple actions to be done one after another and send all reponse at once
             'registerReceiptWeb': self._request_registerReceiptWeb,  # 'H' from server (websocket) so requires an answer
             'registerReceipt': self._request_registerReceipt,  # 'H'
             'registerPIN': self._request_registerPIN,  # 'P'
@@ -195,8 +196,32 @@ def send_blackbox_response(self, data, retry_nbr=0):
         except requests.exceptions.RequestException:
             _logger.exception('Could not reach confirmation status URL: %s', server_url)
 
+    def _batch_action(self, batch):
+        """Handles a batch of multiple actions to be done one after another and send all response at once.
+        :param batch: batch of arrays of action and the data to be sent to the blackbox
+        :type batch: array of tuples
+        """
+        responses = []
+        for (data, action) in batch['high_level_message']:
+            if action == 'registerReceipt':
+                self._registerReceipt(data)
+            elif action == 'registerPIN':
+                self._registerPIN(data)
+            else:
+                _logger.error("Unknown action '%s' in batch", action)
+                continue
+            responses.append(self.data['result'])
+            if self._is_last_response_error():
+                # If the last response was an error, we do not send the next messages in the batch. They will be sent later in a new batch.
+                break
+
+        self.data['result'] = responses
+
+    def _is_last_response_error(self):
+        return 'error' in self.data['result'] and self.data['result']['error']['errorCode'][:3] != '000'
+
     def _request_registerReceiptWeb(self, data):
-        self._request_registerReceipt(data)
+        self._registerReceipt(data['high_level_message'])
 
         self.send_blackbox_response({
             'order_id': data['id'],
@@ -205,22 +230,28 @@ def _request_registerReceiptWeb(self, data):
             'iot_mac': system.IOT_IDENTIFIER
         })
 
-    def _request_registerReceipt(self, data):
-        if data['high_level_message'].get('clock'):
-            packet = self._wrap_low_level_message_around(self._wrap_high_level_message_around('I', data['high_level_message']))
+    def _registerReceipt(self, data):
+        if data.get('clock'):
+            packet = self._wrap_low_level_message_around(self._wrap_high_level_message_around('I', data))
             blackbox_response = self._send_to_blackbox(packet, self._connection)
 
-        packet = self._wrap_low_level_message_around(self._wrap_high_level_message_around('H', data['high_level_message']))
+        packet = self._wrap_low_level_message_around(self._wrap_high_level_message_around('H', data))
         blackbox_response = self._send_to_blackbox(packet, self._connection)
         if blackbox_response:
             self.data['result'] = self._parse_blackbox_response(blackbox_response)
 
-    def _request_registerPIN(self, data):
-        packet = self._wrap_low_level_message_around("P040%s" % data['high_level_message'])
+    def _request_registerReceipt(self, data):
+        self._registerReceipt(data['high_level_message'])
+
+    def _registerPIN(self, data):
+        packet = self._wrap_low_level_message_around("P040%s" % data)
         blackbox_response = self._send_to_blackbox(packet, self._connection)
         if blackbox_response:
             self.data['result'] = self._parse_blackbox_response(blackbox_response)
 
+    def _request_registerPIN(self, data):
+        self._registerPIN(data['high_level_message'])
+
     def _send_to_blackbox(self, packet, connection):
         """Sends a message to and wait for a response from the blackbox.
 
@@ -265,6 +296,10 @@ def _wrap_high_level_message_around(self, request_type, data):
         if request_type == 'I':
             return wrap
 
+        if request_type == 'P':
+            wrap += f"{data:0>5}"
+            return wrap
+
         wrap += "{:>8}".format(data['date'])
         wrap += "{:>6}".format(data['ticket_time'])
         wrap += "{:>11}".format(data['insz_or_bis_number'])

From b1bd255471cbe3222032f9ca73a0b80cd3ebe733 Mon Sep 17 00:00:00 2001
From: "Valeriya (vchu)" <vchu@odoo.com>
Date: Tue, 4 Nov 2025 10:00:29 +0100
Subject: [PATCH 667/673] [CLN] website_sale_collect: improve the style

Part-of: odoo/odoo#233059
Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
---
 .../models/delivery_carrier.py                |  2 +-
 .../models/product_template.py                |  2 +-
 .../website_sale_collect/models/sale_order.py | 19 +++++++++----------
 addons/website_sale_collect/utils.py          |  4 +---
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/addons/website_sale_collect/models/delivery_carrier.py b/addons/website_sale_collect/models/delivery_carrier.py
index 88f62e9ae8192..c9407bc84200c 100644
--- a/addons/website_sale_collect/models/delivery_carrier.py
+++ b/addons/website_sale_collect/models/delivery_carrier.py
@@ -68,7 +68,7 @@ def write(self, vals):
     # === BUSINESS METHODS ===#
 
     def _in_store_get_close_locations(self, partner_address, product_id=None):
-        """ Get the formatted close pickup locations sorted by distance to the partner address.
+        """Get the formatted close pickup locations sorted by distance to the partner address.
 
         :param res.partner partner_address: The address to use to sort the pickup locations.
         :param str product_id: The product whose product page was used to open the location
diff --git a/addons/website_sale_collect/models/product_template.py b/addons/website_sale_collect/models/product_template.py
index 53216905f16ec..0d72bd3d3245e 100644
--- a/addons/website_sale_collect/models/product_template.py
+++ b/addons/website_sale_collect/models/product_template.py
@@ -10,7 +10,7 @@ class ProductTemplate(models.Model):
     _inherit = 'product.template'
 
     def _get_additionnal_combination_info(self, product_or_template, quantity, uom, date, website):
-        """ Override of `website_sale` to add information on whether Click & Collect is enabled and
+        """Override of `website_sale` to add information on whether Click & Collect is enabled and
         on the stock of the product. """
         res = super()._get_additionnal_combination_info(
             product_or_template, quantity, uom, date, website
diff --git a/addons/website_sale_collect/models/sale_order.py b/addons/website_sale_collect/models/sale_order.py
index a5f0cc43c7cca..3f8e55a9cb843 100644
--- a/addons/website_sale_collect/models/sale_order.py
+++ b/addons/website_sale_collect/models/sale_order.py
@@ -11,8 +11,8 @@ class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
     def _compute_warehouse_id(self):
-        """ Override of `website_sale_stock` to avoid recomputations for in_store orders
-        when the warehouse was set by the pickup_location_data"""
+        """Override of `website_sale_stock` to avoid recomputations for in_store orders
+        when the warehouse was set by the pickup_location_data."""
         in_store_orders_with_pickup_data = self.filtered(
             lambda so: (
                 so.carrier_id.delivery_type == 'in_store' and so.pickup_location_data
@@ -36,9 +36,8 @@ def _compute_fiscal_position_id(self):
         super(SaleOrder, self - in_store_orders)._compute_fiscal_position_id()
 
     def _set_delivery_method(self, delivery_method, rate=None):
-        """ Override of `website_sale` to recompute warehouse and fiscal position when a new
+        """Override of `website_sale` to recompute warehouse and fiscal position when a new
         delivery method is not in-store anymore. """
-
         self.ensure_one()
         was_in_store_order = (
             self.carrier_id.delivery_type == 'in_store'
@@ -50,7 +49,7 @@ def _set_delivery_method(self, delivery_method, rate=None):
             self._compute_fiscal_position_id()
 
     def _set_pickup_location(self, pickup_location_data):
-        """ Override `website_sale` to set the pickup location for in-store delivery methods.
+        """Override `website_sale` to set the pickup location for in-store delivery methods.
         Set account fiscal position depending on selected pickup location to correctly calculate
         taxes.
         """
@@ -66,7 +65,7 @@ def _set_pickup_location(self, pickup_location_data):
             self._compute_warehouse_id()
 
     def _get_pickup_locations(self, zip_code=None, country=None, **kwargs):
-        """ Override of `website_sale` to ensure that a country is provided when there is a zip
+        """Override of `website_sale` to ensure that a country is provided when there is a zip
         code.
 
         If the country cannot be found (e.g., the GeoIP request fails), the zip code is cleared to
@@ -91,7 +90,7 @@ def _get_shop_warehouse_id(self):
         return super()._get_shop_warehouse_id()
 
     def _check_cart_is_ready_to_be_paid(self):
-        """ Override of `website_sale` to check if all products are in stock in the selected
+        """Override of `website_sale` to check if all products are in stock in the selected
         warehouse. """
         if (
             self._has_deliverable_products()
@@ -106,7 +105,7 @@ def _check_cart_is_ready_to_be_paid(self):
     # === TOOLING ===#
 
     def _prepare_in_store_default_location_data(self):
-        """ Prepare the default pickup location values for each in-store delivery method available
+        """Prepare the default pickup location values for each in-store delivery method available
         for the order. """
         default_pickup_locations = {}
         for dm in self._get_delivery_methods():
@@ -127,7 +126,7 @@ def _prepare_in_store_default_location_data(self):
         return {'default_pickup_locations': default_pickup_locations}
 
     def _is_in_stock(self, wh_id):
-        """ Check whether all storable products of the cart are in stock in the given warehouse.
+        """Check whether all storable products of the cart are in stock in the given warehouse.
 
         :param int wh_id: The warehouse in which to check the stock, as a `stock.warehouse` id.
         :return: Whether all storable products are in stock.
@@ -166,7 +165,7 @@ def _get_insufficient_stock_data(self, wh_id):
         return insufficient_stock_data
 
     def _verify_updated_quantity(self, order_line, product_id, new_qty, uom_id, **kwargs):
-        """ Override of `website_sale_stock` to skip the verification when click and collect
+        """Override of `website_sale_stock` to skip the verification when click and collect
         is activated. The quantity is verified later. """
         product = self.env['product.product'].browse(product_id)
         if (
diff --git a/addons/website_sale_collect/utils.py b/addons/website_sale_collect/utils.py
index 38385d6574d73..8748189060152 100644
--- a/addons/website_sale_collect/utils.py
+++ b/addons/website_sale_collect/utils.py
@@ -47,6 +47,4 @@ def calculate_partner_distance(partner1, partner2):
         + math.cos(math.radians(lat1)) * math.cos(math.radians(lat2))
         * (math.sin(dlong / 2) * math.sin(dlong / 2))
     )
-    d = 2 * R * math.atan2(math.sqrt(arcsin), math.sqrt(1 - arcsin))
-
-    return d
+    return 2 * R * math.atan2(math.sqrt(arcsin), math.sqrt(1 - arcsin))

From f55bb10999ee2b2edb820498e4835218817b8864 Mon Sep 17 00:00:00 2001
From: "Valeriya (vchu)" <vchu@odoo.com>
Date: Tue, 4 Nov 2025 10:01:55 +0100
Subject: [PATCH 668/673] [IMP] website_sale_collect: adapt to UoM

1. Show qty in the selected UoM on the widget
2. Take into account the qty in the cart

closes odoo/odoo#233059

Signed-off-by: Valeriya Chuprina (vchu) <vchu@odoo.com>
---
 .../models/delivery_carrier.py                |  9 +++++++--
 .../models/product_template.py                | 20 ++++++++++++-------
 .../website_sale_collect/models/sale_order.py |  2 +-
 .../click_and_collect_availability.js         |  2 ++
 .../click_and_collect_availability.xml        | 10 ++++++----
 .../location_selector/location/location.xml   |  6 +++---
 .../location_selector_dialog.js               |  7 ++++---
 addons/website_sale_collect/utils.py          | 18 +++++++++++++----
 8 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/addons/website_sale_collect/models/delivery_carrier.py b/addons/website_sale_collect/models/delivery_carrier.py
index c9407bc84200c..a828297a978ef 100644
--- a/addons/website_sale_collect/models/delivery_carrier.py
+++ b/addons/website_sale_collect/models/delivery_carrier.py
@@ -67,12 +67,13 @@ def write(self, vals):
 
     # === BUSINESS METHODS ===#
 
-    def _in_store_get_close_locations(self, partner_address, product_id=None):
+    def _in_store_get_close_locations(self, partner_address, product_id=None, uom_id=None):
         """Get the formatted close pickup locations sorted by distance to the partner address.
 
         :param res.partner partner_address: The address to use to sort the pickup locations.
         :param str product_id: The product whose product page was used to open the location
                                selector, if any, as a `product.product` id.
+        :param int uom_id: The unit of measure to use for the product stock values, if any.
         :return: The sorted and formatted close pickup locations.
         :rtype: list[dict]
         """
@@ -94,7 +95,11 @@ def _in_store_get_close_locations(self, partner_address, product_id=None):
 
             # Prepare the stock data based on either the product or the order.
             if product:  # Called from the product page.
-                in_store_stock_data = utils.format_product_stock_values(product, wh.id)
+                uom = self.env['uom.uom'].browse(uom_id)
+                cart_qty = order_sudo._get_cart_qty(product.id)
+                in_store_stock_data = utils.format_product_stock_values(
+                    product, wh_id=wh.id, uom=uom, cart_qty=cart_qty
+                )
             else:  # Called from the checkout page.
                 in_store_stock_data = {'in_stock': order_sudo._is_in_stock(wh.id)}
 
diff --git a/addons/website_sale_collect/models/product_template.py b/addons/website_sale_collect/models/product_template.py
index 0d72bd3d3245e..83a602ba11bbb 100644
--- a/addons/website_sale_collect/models/product_template.py
+++ b/addons/website_sale_collect/models/product_template.py
@@ -20,8 +20,12 @@ def _get_additionnal_combination_info(self, product_or_template, quantity, uom,
             and product_or_template.is_product_variant
             and product_or_template.is_storable
         ):
+            product_sudo = product_or_template.sudo()  # To read the stock values when public user.
+            order_sudo = request.cart
+            cart_qty = order_sudo._get_cart_qty(product_sudo.id)
             # Enable the Click & Collect Availability widget.
             res['show_click_and_collect_availability'] = True
+            res['uom_id'] = uom.id
 
             # Prepare the delivery stock data.
             available_delivery_methods_sudo = self.env['delivery.carrier'].sudo().search([
@@ -31,26 +35,28 @@ def _get_additionnal_combination_info(self, product_or_template, quantity, uom,
             ])
             if available_delivery_methods_sudo:
                 res['delivery_stock_data'] = utils.format_product_stock_values(
-                    product_or_template.sudo(), wh_id=website.warehouse_id.id
+                    product_sudo, uom=uom, cart_qty=cart_qty
                 )
             else:
                 res['delivery_stock_data'] = {}
 
             # Prepare the in-store stock data.
-            order_sudo = request.cart
             if (
                 order_sudo
                 and order_sudo.carrier_id.delivery_type == 'in_store'
                 and order_sudo.pickup_location_data
             ):  # Get stock values for the product variant in the selected store.
                 res['in_store_stock_data'] = utils.format_product_stock_values(
-                    product_or_template.sudo(), wh_id=order_sudo.pickup_location_data['id']
+                    product_sudo,
+                    uom=uom,
+                    wh_id=order_sudo.pickup_location_data['id'],
+                    cart_qty=cart_qty,
                 )
             else:
                 res['in_store_stock_data'] = utils.format_product_stock_values(
-                    product_or_template.sudo(),
-                    free_qty=website.sudo()._get_max_in_store_product_available_qty(
-                        product_or_template.sudo()
-                    )
+                    product_sudo,
+                    uom=uom,
+                    free_qty=website.sudo()._get_max_in_store_product_available_qty(product_sudo),
+                    cart_qty=cart_qty,
                 )
         return res
diff --git a/addons/website_sale_collect/models/sale_order.py b/addons/website_sale_collect/models/sale_order.py
index 3f8e55a9cb843..5dac4b6fbba92 100644
--- a/addons/website_sale_collect/models/sale_order.py
+++ b/addons/website_sale_collect/models/sale_order.py
@@ -151,7 +151,7 @@ def _get_insufficient_stock_data(self, wh_id):
             free_qty = product.with_context(warehouse_id=wh_id).free_qty
             for ol in ols:
                 free_qty_in_uom = max(int(product.uom_id._compute_quantity(
-                    free_qty, ol.product_uom_id, rounding_method="DOWN"
+                    free_qty, ol.product_uom_id, rounding_method='DOWN'
                 )), 0)  # Round down as only integer quantities can be sold.
                 line_qty_in_uom = ol.product_uom_qty
                 if line_qty_in_uom > free_qty_in_uom:  # Not enough stock.
diff --git a/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.js b/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.js
index 9f67bf9a35f1c..bd3660c130bd7 100644
--- a/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.js
+++ b/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.js
@@ -50,6 +50,7 @@ export class ClickAndCollectAvailability extends Component {
         this.state.inStoreStockData = combinationInfo.in_store_stock_data;
         this.state.deliveryStockData = combinationInfo.delivery_stock_data;
         this.state.active = combinationInfo.is_combination_possible;
+        this.state.uomId = combinationInfo.uom_id;
     }
 
     /**
@@ -66,6 +67,7 @@ export class ClickAndCollectAvailability extends Component {
             isProductPage: true,
             isFrontend: true,
             productId: this.state.productId,
+            uomId: this.state.uomId,
             zipCode: zip_code || this.props.zipCode,
             selectedLocationId: String(id),
             save: async location => {
diff --git a/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.xml b/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.xml
index 0710e9d5d9140..4032c90653917 100644
--- a/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.xml
+++ b/addons/website_sale_collect/static/src/js/click_and_collect_availability/click_and_collect_availability.xml
@@ -22,8 +22,9 @@
                             t-if="this.state.inStoreStockData.show_quantity &amp;&amp; this.state.selectedLocationData.id"
                             class="text-muted"
                         >
-                            <i class="fa fa-fw fa-circle text-warning"/>
-                            Only <t t-out="this.state.inStoreStockData.quantity"/> available
+                            <i class="fa fa-fw fa-circle text-warning me-1"/>
+                            <t t-out="this.state.inStoreStockData.quantity"/> <t t-out="this.state.deliveryStockData.uom_name"/>
+                            in stock
                         </div>
                         <div t-else="" class="text-muted">
                             <i class="fa fa-fw fa-circle text-success"/> Available
@@ -58,8 +59,9 @@
                         t-if="this.state.deliveryStockData.show_quantity"
                         class="text-muted"
                     >
-                        <i class="fa fa-fw fa-circle text-warning"/>
-                        Only <t t-out="this.state.deliveryStockData.quantity"/> available
+                        <i class="fa fa-fw fa-circle text-warning me-1"/>
+                        <t t-out="this.state.deliveryStockData.quantity"/> <t t-out="this.state.deliveryStockData.uom_name"/>
+                        in stock
                     </div>
                     <div t-else="" class="text-muted">
                         <i class="fa fa-fw fa-circle text-success"/> Available
diff --git a/addons/website_sale_collect/static/src/js/location_selector/location/location.xml b/addons/website_sale_collect/static/src/js/location_selector/location/location.xml
index 82bf7c16e3ad1..d3bcc74f637d6 100644
--- a/addons/website_sale_collect/static/src/js/location_selector/location/location.xml
+++ b/addons/website_sale_collect/static/src/js/location_selector/location/location.xml
@@ -7,9 +7,9 @@
                 <t t-if="!!props.additionalData.in_store_stock_data.in_stock">
                     <t t-if="!!props.additionalData.in_store_stock_data.show_quantity">
                         <span class="text-warning">
-                            <i class="fa fa-circle"/>
-                            Only <t t-out="props.additionalData.in_store_stock_data.quantity"/>
-                            available
+                            <i class="fa fa-circle me-1"/>
+                            <t t-out="props.additionalData.in_store_stock_data.quantity"/> <t t-out="props.additionalData.in_store_stock_data.uom_name"/>
+                            in stock
                         </span>
                     </t>
                     <t t-else="">
diff --git a/addons/website_sale_collect/static/src/js/location_selector/location_selector_dialog/location_selector_dialog.js b/addons/website_sale_collect/static/src/js/location_selector/location_selector_dialog/location_selector_dialog.js
index c7ffd417c04f8..0d332808d66df 100644
--- a/addons/website_sale_collect/static/src/js/location_selector/location_selector_dialog/location_selector_dialog.js
+++ b/addons/website_sale_collect/static/src/js/location_selector/location_selector_dialog/location_selector_dialog.js
@@ -10,15 +10,16 @@ patch(LocationSelectorDialog, {
         ...LocationSelectorDialog.props,
         productId: { type: Number, optional: true },
         isProductPage: { type: Boolean, optional: true },
+        uomId: { type: Number, optional: true },
     },
 });
 
 patch(LocationSelectorDialog.prototype, {
     async _getLocations(zip) {
          if (this.props.isProductPage) {
-             return await rpc(
-                 this.getLocationUrl, {zip_code: zip, product_id: this.props.productId}
-             );
+             return await rpc(this.getLocationUrl, {
+                 zip_code: zip, product_id: this.props.productId, uom_id: this.props.uomId
+             });
          }
         else {
             return await super._getLocations(...arguments);
diff --git a/addons/website_sale_collect/utils.py b/addons/website_sale_collect/utils.py
index 8748189060152..751943a33623a 100644
--- a/addons/website_sale_collect/utils.py
+++ b/addons/website_sale_collect/utils.py
@@ -1,28 +1,38 @@
 import math
 
 
-def format_product_stock_values(product, wh_id=None, free_qty=None):
+def format_product_stock_values(product, wh_id=None, uom=None, free_qty=None, cart_qty=None):
     """Format product stock values for the location selector.
 
     :param product.product|product.template product: The product whose stock values to format.
     :param int wh_id: The warehouse whose stock to check for the given product.
+    :param uom.uom uom: The unit of measure to use for the quantity. If not given, the product's.
     :param int free_qty: The free quantity of the product. If not given, calculated from the
                          warehouse.
+    :param int cart_qty: The quantity of the product in the cart.
     :return: The formatted product stock values.
     :rtype: dict
     """
-    if product.is_product_variant:  # Only available for `product.product` records.
+    if product.is_product_variant:
+        uom = uom or product.uom_id
+        # Only available for `product.product` records.
         if free_qty is None:
             free_qty = product.with_context(warehouse_id=wh_id).free_qty
+        if cart_qty is not None:
+            free_qty -= cart_qty or 0
+        free_qty_in_uom = max(int(product.uom_id._compute_quantity(
+            free_qty, to_unit=uom, rounding_method='DOWN'
+        )), 0)
 
-        in_stock = free_qty > 0
+        in_stock = free_qty_in_uom > 0
         show_quantity = (
             product.show_availability and in_stock and product.available_threshold >= free_qty
         )
         return {
             'in_stock': in_stock or product.allow_out_of_stock_order,
+            'uom_name': uom.name,
             'show_quantity': show_quantity,
-            'quantity': free_qty,
+            'quantity': free_qty_in_uom,
         }
     return {}
 

From 1342c85c745296353488b45975a8d1085de7c396 Mon Sep 17 00:00:00 2001
From: ELCO <elco@odoo.com>
Date: Fri, 14 Nov 2025 12:01:41 +0000
Subject: [PATCH 669/673] [FIX] web: Add opacity back to sample data

The opacity effect was removed from Sample Data in #233205 and caused
issue when sample data are present without an ActionHelper.

This commit reverts these changes.

closes odoo/odoo#235863

X-original-commit: 9ec33168f1e655eea3c3b3274ec81cef232f0b80
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 addons/web/static/src/scss/utils.scss | 1 +
 addons/web/static/src/views/view.scss | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss
index 346c1276cc99b..3b7a70bc9441e 100644
--- a/addons/web/static/src/scss/utils.scss
+++ b/addons/web/static/src/scss/utils.scss
@@ -332,6 +332,7 @@
 
 // Sample data
 @mixin o-sample-data-disabled {
+    opacity: 0.06;
     pointer-events: none;
     user-select: none;
 }
diff --git a/addons/web/static/src/views/view.scss b/addons/web/static/src/views/view.scss
index 3101716a98f43..0074ab67b6741 100644
--- a/addons/web/static/src/views/view.scss
+++ b/addons/web/static/src/views/view.scss
@@ -18,11 +18,6 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    background-image:  radial-gradient(
-        at 50% 50%,
-        #{$o-view-background-color} 0px,
-        #{rgba($o-view-background-color, 0.5)} 100%
-    );
 
     .o_nocontent_help {
         @include o-nocontent-empty;

From 01917f16cdc2741c43eeba579ca69f487efbf616 Mon Sep 17 00:00:00 2001
From: "Laetitia (ldau)" <ldau@odoo.com>
Date: Mon, 13 Oct 2025 12:56:47 +0000
Subject: [PATCH 670/673] [FIX] website: generate language selector only when
 needed

This commit generates the language selector element only when multiple
languages exist, avoiding an empty header list item that creates
an unnecessary border or empty space.

task-5150808

closes odoo/odoo#235909

X-original-commit: 9000e99acf8e7c004cd25e9bd0e032e6603616b6
Signed-off-by: Laetitia Daubechies (ldau) <ldau@odoo.com>
Signed-off-by: Romaric Moyeuvre (romo) <romo@odoo.com>
---
 addons/website/views/website_templates.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 8f8a86a0f3c93..ef36a3f9397c2 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -1042,8 +1042,8 @@
                 <div class="o_header_hide_on_scroll">
                     <div aria-label="Top" t-if="is_view_active('website.header_text_element') or is_view_active('website.header_social_links') or is_view_active('website.header_language_selector')" class="o_header_sales_two_top py-1">
                         <ul t-attf-class="#{header_content_width} navbar-nav d-grid h-100 px-3 o_grid_header_3_cols">
-                            <!-- Return empty placeholder if the element is not active to keep the right layout -->
-                            <li class="o_header_sales_two_lang_selector_placeholder" t-if="is_view_active('website.header_language_selector') == False"/>
+                            <!-- Return empty placeholder if the element is not active or if there is only one language to keep the right layout -->
+                            <li class="o_header_sales_two_lang_selector_placeholder" t-if="is_view_active('website.header_language_selector') == False or len(frontend_languages) == 1"/>
                             <!-- Language Selector -->
                             <t t-call="website.placeholder_header_language_selector"
                                 _div_classes.f="d-flex align-items-center h-100"
@@ -2564,7 +2564,7 @@
 
 <template id="header_language_selector" inherit_id="website.placeholder_header_language_selector" name="Header Language Selector" active="True">
     <xpath expr="." position="inside">
-        <li data-name="Language Selector" t-attf-class="o_header_language_selector #{_item_class}">
+        <li t-if="len(frontend_languages) > 1" data-name="Language Selector" t-attf-class="o_header_language_selector #{_item_class}">
             <t id="header_language_selector_call"
                 t-call="portal.language_selector"
                 _div_classes="(_div_classes or '') + ' dropdown'"/>

From 6130e4d8cf6252f77447996a55f49514c555e5cd Mon Sep 17 00:00:00 2001
From: Mathieu Duckerts-Antoine <dam@odoo.com>
Date: Mon, 17 Nov 2025 11:11:07 +0100
Subject: [PATCH 671/673] [IMP] mail: force direct send of notifications

---
 addons/mail/models/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index d88325e51e968..71e9cfd72dcc5 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -3917,12 +3917,12 @@ def _web_push_get_partners_parameters(self, partner_ids):
             return devices_su, None, None
         return devices_su.search([("partner_id", "in", partner_ids)]), vapid_private_key, vapid_public_key
 
-    def _web_push_send_notification(self, devices, private_key, public_key, payload_by_lang=None, payload=None):
+    def _web_push_send_notification(self, devices, private_key, public_key, payload_by_lang=None, payload=None, force_direct_send=False):
         """
         :param payload: JSON serializable dict following the notification api specs https://notifications.spec.whatwg.org/#api
         :param payload_by_lang a dict mapping payload by lang, either this or payload must be provided
         """
-        if len(devices) < MAX_DIRECT_PUSH:
+        if len(devices) < MAX_DIRECT_PUSH or force_direct_send is True:
             session = Session()
             devices_to_unlink = set()
             for device in devices:

From c2593f7769285810e348a4744dfa91f8f549b0b7 Mon Sep 17 00:00:00 2001
From: Mathieu Duckerts-Antoine <dam@odoo.com>
Date: Mon, 17 Nov 2025 11:12:39 +0100
Subject: [PATCH 672/673] [REF] mail: expose handleNotificationClick for
 override

---
 addons/mail/static/src/service_worker.js | 59 +++++++++++++-----------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/addons/mail/static/src/service_worker.js b/addons/mail/static/src/service_worker.js
index 7a1a96bdbd8fc..ab7cac70ef9a3 100644
--- a/addons/mail/static/src/service_worker.js
+++ b/addons/mail/static/src/service_worker.js
@@ -160,40 +160,43 @@ async function openDiscussChannel(channelId, { action, joinCall = false, source
     }
 }
 
-self.addEventListener("notificationclick", (event) => {
-    event.notification.close();
-    if (event.notification.data) {
-        const { action, model, res_id } = event.notification.data;
-        if (model === "discuss.channel") {
-            if (event.action === PUSH_NOTIFICATION_ACTION.DECLINE) {
-                event.waitUntil(
-                    fetch("/mail/rtc/channel/leave_call", {
-                        headers: { "Content-type": "application/json" },
-                        body: JSON.stringify({
-                            id: 1,
-                            jsonrpc: "2.0",
-                            method: "call",
-                            params: { channel_id: res_id },
-                        }),
-                        method: "POST",
-                        mode: "cors",
-                        credentials: "include",
-                    })
-                );
-                return;
-            }
+async function handleNotificationClick(event) {
+    const { action, model, res_id } = event.notification.data;
+    if (model === "discuss.channel") {
+        if (event.action === PUSH_NOTIFICATION_ACTION.DECLINE) {
             event.waitUntil(
-                openDiscussChannel(res_id, {
-                    action,
-                    joinCall: event.action === PUSH_NOTIFICATION_ACTION.ACCEPT,
+                fetch("/mail/rtc/channel/leave_call", {
+                    headers: { "Content-type": "application/json" },
+                    body: JSON.stringify({
+                        id: 1,
+                        jsonrpc: "2.0",
+                        method: "call",
+                        params: { channel_id: res_id },
+                    }),
+                    method: "POST",
+                    mode: "cors",
+                    credentials: "include",
                 })
             );
-        } else {
-            const modelPath = model.includes(".") ? model : `m-${model}`;
-            event.waitUntil(clients.openWindow(`/odoo/${modelPath}/${res_id}`));
+            return;
         }
+        return openDiscussChannel(res_id, {
+            action,
+            joinCall: event.action === PUSH_NOTIFICATION_ACTION.ACCEPT,
+        });
+    } else {
+        const modelPath = model.includes(".") ? model : `m-${model}`;
+        return clients.openWindow(`/odoo/${modelPath}/${res_id}`);
+    }
+}
+
+self.addEventListener("notificationclick", async (event) => {
+    event.notification.close();
+    if (event.notification.data) {
+        event.waitUntil(handleNotificationClick(event));
     }
 });
+
 self.addEventListener("push", async (event) => {
     const notification = event.data.json();
     switch (notification.options?.data?.type) {

From 8d087e44c2ec62ec68620821871274f63a62e699 Mon Sep 17 00:00:00 2001
From: Mathieu Duckerts-Antoine <dam@odoo.com>
Date: Mon, 17 Nov 2025 11:13:40 +0100
Subject: [PATCH 673/673] [IMP] web: wait message from a given client

---
 addons/web/static/src/service_worker.js | 34 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/service_worker.js b/addons/web/static/src/service_worker.js
index c6b2137931dd7..1be2d386ff5fb 100644
--- a/addons/web/static/src/service_worker.js
+++ b/addons/web/static/src/service_worker.js
@@ -140,21 +140,41 @@ const nextMessageMap = new Map();
  * @param message : string
  * @return {Promise}
  */
-const waitingMessage = async (message) =>
-    new Promise((resolve) => {
-        if (!nextMessageMap.has(message)) {
-            nextMessageMap.set(message, []);
+const waitingMessage = async (message, clientId = false) => {
+    if (typeof message !== "string") {
+        throw new Error("message must be a string");
+    }
+    return new Promise((resolve) => {
+        if (!nextMessageMap.has(clientId)) {
+            nextMessageMap.set(clientId, new Map());
+        }
+        if (!nextMessageMap.get(clientId).has(message)) {
+            nextMessageMap.get(clientId).set(message, []);
         }
-        nextMessageMap.get(message).push(resolve);
+        nextMessageMap.get(clientId).get(message).push(resolve);
     });
+};
 
 self.addEventListener("message", (event) => {
-    const messageNotifiers = nextMessageMap.get(event.data);
+    if (typeof event.data !== "string") {
+        return;
+    }
+    const messageNotifiers = [
+        ...(nextMessageMap.get(false)?.get(event.data) || []),
+        ...(nextMessageMap.get(event.source.id)?.get(event.data) || []),
+    ];
     if (messageNotifiers) {
         for (const messageNotified of messageNotifiers) {
             messageNotified();
         }
-        nextMessageMap.delete(event.data);
+        nextMessageMap.get(false)?.delete(event.data);
+        nextMessageMap.get(event.source.id)?.delete(event.data);
+        if (nextMessageMap.has(false) && !nextMessageMap.get(false).size) {
+            nextMessageMap.delete(false);
+        }
+        if (nextMessageMap.has(event.source.id) && !nextMessageMap.get(event.source.id).size) {
+            nextMessageMap.delete(event.source.id);
+        }
     }
     if (event.data === "user_logout") {
         sessionInfo = null;